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>
Pete Wyckoff committed
Apr 8, 2012 at 20:18 UTC
9dcb9f24f8f97c5d0d3224791506161dfeac5a69
1 file changed
+7
-7
git-p4.py
+7
-7
@@ -1129,12 +1129,12 @@ class P4Submit(Command, P4UserMap):
1129
print "The following files should be scheduled for deletion with p4 delete:"
1130
print " ".join(filesToDelete)
1131
die("Please resolve and submit the conflict manually and "
1132
- + "continue afterwards with git-p4 submit --continue")
1132
+ + "continue afterwards with git p4 submit --continue")
1133
elif response == "w":
1134
system(diffcmd + " > patch.txt")
1135
print "Patch saved to patch.txt in %s !" % self.clientPath
1136
die("Please resolve and submit the conflict manually and "
1137
- "continue afterwards with git-p4 submit --continue")
1137
+ "continue afterwards with git p4 submit --continue")
1138
1139
system(applyPatchCmd)
1140
@@ -1178,8 +1178,8 @@ class P4Submit(Command, P4UserMap):
1178
1179
if self.checkAuthorship and not self.p4UserIsMe(p4User):
1180
submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail
1181
- submitTemplate += "######## Use git-p4 option --preserve-user to modify authorship\n"
1182
- submitTemplate += "######## Use git-p4 config git-p4.skipUserNameCheck hides this message.\n"
1181
+ submitTemplate += "######## Use option --preserve-user to modify authorship.\n"
1182
+ submitTemplate += "######## Variable git-p4.skipUserNameCheck hides this message.\n"
1183
1184
separatorLine = "######## everything below this line is just the diff #######\n"
1185
@@ -2254,7 +2254,7 @@ class P4Sync(Command, P4UserMap):
2254
2255
details["change"] = newestRevision
2256
2257
- # Use time from top-most change so that all git-p4 clones of
2257
+ # Use time from top-most change so that all git p4 clones of
2258
# the same p4 repo have the same commit SHA1s.
2259
res = p4CmdList("describe -s %d" % newestRevision)
2260
newestTime = None
@@ -2474,8 +2474,8 @@ class P4Sync(Command, P4UserMap):
2474
2475
changes.sort()
2476
else:
2477
- # catch "git-p4 sync" with no new branches, in a repo that
2478
- # does not have any existing git-p4 branches
2477
+ # catch "git p4 sync" with no new branches, in a repo that
2478
+ # does not have any existing p4 branches
2479
if len(args) == 0 and not self.p4BranchesInGit:
2480
die("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here.");
2481
if self.verbose: