Skip to content

Commit

Permalink
git p4: update name in script
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pete Wyckoff authored and Junio C Hamano committed Apr 9, 2012
1 parent b6f9305 commit 9dcb9f2
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions git-p4.py
Original file line number Diff line number Diff line change
Expand Up @@ -1129,12 +1129,12 @@ def applyCommit(self, id):
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)

Expand Down Expand Up @@ -1178,8 +1178,8 @@ def applyCommit(self, id):

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"

Expand Down Expand Up @@ -2254,7 +2254,7 @@ def importHeadRevision(self, revision):

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
Expand Down Expand Up @@ -2474,8 +2474,8 @@ def run(self, args):

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:
Expand Down

0 comments on commit 9dcb9f2

Please sign in to comment.