undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reformatting: break long lines.

Browse Source 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
This commit is contained in:
Han-Wen Nienhuys 2007-05-23 16:53:11 -03:00 committed by Simon Hausmann
parent ce6f33c835
commit cebdf5af31
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
contrib/fast-import/git-p4
View File

@ -222,7 +222,9 @@ class P4Submit(Command):
def start(self): def start(self):
if len(self.config) > 0 and not self.reset: if len(self.config) > 0 and not self.reset:
die("Cannot start sync. Previous sync config found at %s\nIf you want to start submitting again from scratch maybe you want to call git-p4 submit --reset" % self.configFile) die("Cannot start sync. Previous sync config found at %s\n"
"If you want to start submitting again from scratch "
"maybe you want to call git-p4 submit --reset" % self.configFile)
commits = [] commits = []
if self.directSubmit: if self.directSubmit:
@ -297,7 +299,8 @@ class P4Submit(Command):
print "What do you want to do?" print "What do you want to do?"
response = "x" response = "x"
while response != "s" and response != "a" and response != "w": while response != "s" and response != "a" and response != "w":
response = raw_input("[s]kip this patch / [a]pply the patch forcibly and with .rej files / [w]rite the patch to a file (patch.txt) ") response = raw_input("[s]kip this patch / [a]pply the patch forcibly "
"and with .rej files / [w]rite the patch to a file (patch.txt) ")
if response == "s": if response == "s":
print "Skipping! Good luck with the next patches..." print "Skipping! Good luck with the next patches..."
return return
@ -309,11 +312,13 @@ class P4Submit(Command):
if len(filesToDelete): if len(filesToDelete):
print "The following files should be scheduled for deletion with p4 delete:" print "The following files should be scheduled for deletion with p4 delete:"
print " ".join(filesToDelete) print " ".join(filesToDelete)
die("Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue") die("Please resolve and submit the conflict manually and "
+ "continue afterwards with git-p4 submit --continue")
elif response == "w": elif response == "w":
system(diffcmd + " > patch.txt") system(diffcmd + " > patch.txt")
print "Patch saved to patch.txt in %s !" % self.clientPath 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") die("Please resolve and submit the conflict manually and "
"continue afterwards with git-p4 submit --continue")
system(applyPatchCmd) system(applyPatchCmd)
@ -407,7 +412,9 @@ class P4Submit(Command):
file = open(fileName, "w+") file = open(fileName, "w+")
file.write(self.prepareLogMessage(template, logMessage)) file.write(self.prepareLogMessage(template, logMessage))
file.close() file.close()
print "Perforce submit template written as %s. Please review/edit and then use p4 submit -i < %s to submit directly!" % (fileName, fileName) print ("Perforce submit template written as %s. "
+ "Please review/edit and then use p4 submit -i < %s to submit directly!"
% (fileName, fileName))
def run(self, args): def run(self, args):
global gitdir global gitdir
@ -634,7 +641,6 @@ class P4Sync(Command):
for file in files: for file in files:
path = file["path"] path = file["path"]
if not path.startswith(branchPrefix): if not path.startswith(branchPrefix):
# if not silent:
# print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"]) # print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"])
continue continue
rev = file["rev"] rev = file["rev"]
@ -701,11 +707,13 @@ class P4Sync(Command):
else: else:
if not self.silent: if not self.silent:
print "Tag %s does not match with change %s: files do not match." % (labelDetails["label"], change) print ("Tag %s does not match with change %s: files do not match."
% (labelDetails["label"], change))
else: else:
if not self.silent: if not self.silent:
print "Tag %s does not match with change %s: file count is different." % (labelDetails["label"], change) print ("Tag %s does not match with change %s: file count is different."
% (labelDetails["label"], change))
def getUserMapFromPerforceServer(self): def getUserMapFromPerforceServer(self):
if self.userMapFromPerforceServer: if self.userMapFromPerforceServer:
@ -854,11 +862,10 @@ class P4Sync(Command):
else: else:
self.refPrefix = "refs/heads/" self.refPrefix = "refs/heads/"
if self.syncWithOrigin: if self.syncWithOrigin and self.hasOrigin:
if self.hasOrigin: if not self.silent:
if not self.silent: print "Syncing with origin first by calling git fetch origin"
print "Syncing with origin first by calling git fetch origin" system("git fetch origin")
system("git fetch origin")
if len(self.branch) == 0: if len(self.branch) == 0:
self.branch = self.refPrefix + "master" self.branch = self.refPrefix + "master"
@ -884,7 +891,8 @@ class P4Sync(Command):
p4Change = 0 p4Change = 0
for branch in self.p4BranchesInGit: for branch in self.p4BranchesInGit:
depotPath, change = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self.refPrefix + branch)) logMsg = extractLogMessageFromGitCommit(self.refPrefix + branch)
(depotPath, change) = extractDepotPathAndChangeFromGitLog(logMsg)
if self.verbose: if self.verbose:
print "path %s change %s" % (depotPath, change) print "path %s change %s" % (depotPath, change)
@ -922,7 +930,8 @@ class P4Sync(Command):
return False return False
else: else:
if len(self.depotPath) != 0 and self.depotPath != args[0]: if len(self.depotPath) != 0 and self.depotPath != args[0]:
print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self.depotPath, args[0]) print ("previous import used depot path %s and now %s was specified. "
"This doesn't work!" % (self.depotPath, args[0]))
sys.exit(1) sys.exit(1)
self.depotPath = args[0] self.depotPath = args[0]
@ -968,7 +977,8 @@ class P4Sync(Command):
self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60)) self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
importProcess = subprocess.Popen(["git", "fast-import"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE); importProcess = subprocess.Popen(["git", "fast-import"],
stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE);
self.gitOutput = importProcess.stdout self.gitOutput = importProcess.stdout
self.gitStream = importProcess.stdin self.gitStream = importProcess.stdin
self.gitError = importProcess.stderr self.gitError = importProcess.stderr
@ -977,7 +987,8 @@ class P4Sync(Command):
print "Doing initial import of %s from revision %s" % (self.depotPath, self.revision) print "Doing initial import of %s from revision %s" % (self.depotPath, self.revision)
details = { "user" : "git perforce import user", "time" : int(time.time()) } details = { "user" : "git perforce import user", "time" : int(time.time()) }
details["desc"] = "Initial import of %s from the state at revision %s" % (self.depotPath, self.revision) details["desc"] = ("Initial import of %s from the state at revision %s"
% (self.depotPath, self.revision))
details["change"] = self.revision details["change"] = self.revision
newestRevision = 0 newestRevision = 0
@ -1123,7 +1134,8 @@ class P4Rebase(Command):
def __init__(self): def __init__(self):
Command.__init__(self) Command.__init__(self)
self.options = [ ] self.options = [ ]
self.description = "Fetches the latest revision from perforce and rebases the current work (branch) against it" self.description = ("Fetches the latest revision from perforce and "
+ "rebases the current work (branch) against it")
def run(self, args): def run(self, args):
sync = P4Sync() sync = P4Sync()