Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git p4: update name in script
author
Pete Wyckoff
<pw@padd.com>
Mon, 9 Apr 2012 00:18:01 +0000
(20:18 -0400)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 9 Apr 2012 21:59:40 +0000
(14:59 -0700)
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>
git-p4.py
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
b6f9305
)
diff --git
a/git-p4.py
b/git-p4.py
index c5362c4c11d00e169781ff7da89c88a3051f6227..f910d5af1c93562deaf6bc17b4e9d81beb40a6cb 100755
(executable)
--- a/
git-p4.py
+++ b/
git-p4.py
@@
-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 "
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 "
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)
system(applyPatchCmd)
@@
-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
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"
separatorLine = "######## everything below this line is just the diff #######\n"
@@
-2254,7
+2254,7
@@
def importHeadRevision(self, revision):
details["change"] = newestRevision
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
# the same p4 repo have the same commit SHA1s.
res = p4CmdList("describe -s %d" % newestRevision)
newestTime = None
@@
-2474,8
+2474,8
@@
def run(self, args):
changes.sort()
else:
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:
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: