summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2012-04-09 00:18:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-09 21:59:40 (GMT)
commit9dcb9f24f8f97c5d0d3224791506161dfeac5a69 (patch)
treef1645c04046f1f541b6304c93fbfcf0da2b1a377 /git-p4.py
parentb6f930576469052af87e96b549c37630b56aab93 (diff)
downloadgit-9dcb9f24f8f97c5d0d3224791506161dfeac5a69.zip
git-9dcb9f24f8f97c5d0d3224791506161dfeac5a69.tar.gz
git-9dcb9f24f8f97c5d0d3224791506161dfeac5a69.tar.bz2
git p4: update name in script
In messages to the user and comments, change "git-p4" to "git p4". Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/git-p4.py b/git-p4.py
index c5362c4..f910d5a 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1129,12 +1129,12 @@ class P4Submit(Command, P4UserMap):
print "The following files should be scheduled for deletion with p4 delete:"
print " ".join(filesToDelete)
die("Please resolve and submit the conflict manually and "
- + "continue afterwards with git-p4 submit --continue")
+ + "continue afterwards with git p4 submit --continue")
elif response == "w":
system(diffcmd + " > patch.txt")
print "Patch saved to patch.txt in %s !" % self.clientPath
die("Please resolve and submit the conflict manually and "
- "continue afterwards with git-p4 submit --continue")
+ "continue afterwards with git p4 submit --continue")
system(applyPatchCmd)
@@ -1178,8 +1178,8 @@ class P4Submit(Command, P4UserMap):
if self.checkAuthorship and not self.p4UserIsMe(p4User):
submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail
- submitTemplate += "######## Use git-p4 option --preserve-user to modify authorship\n"
- submitTemplate += "######## Use git-p4 config git-p4.skipUserNameCheck hides this message.\n"
+ submitTemplate += "######## Use option --preserve-user to modify authorship.\n"
+ submitTemplate += "######## Variable git-p4.skipUserNameCheck hides this message.\n"
separatorLine = "######## everything below this line is just the diff #######\n"
@@ -2254,7 +2254,7 @@ class P4Sync(Command, P4UserMap):
details["change"] = newestRevision
- # Use time from top-most change so that all git-p4 clones of
+ # Use time from top-most change so that all git p4 clones of
# the same p4 repo have the same commit SHA1s.
res = p4CmdList("describe -s %d" % newestRevision)
newestTime = None
@@ -2474,8 +2474,8 @@ class P4Sync(Command, P4UserMap):
changes.sort()
else:
- # catch "git-p4 sync" with no new branches, in a repo that
- # does not have any existing git-p4 branches
+ # catch "git p4 sync" with no new branches, in a repo that
+ # does not have any existing p4 branches
if len(args) == 0 and not self.p4BranchesInGit:
die("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here.");
if self.verbose: