mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-p4: remove unneeded semicolons from statements

Browse Source 
Python allows the usage of compound statements where multiple statements
are written on a single line separared by semicolons. It is also
possible to add a semicolon after a single statement, however this is
generally considered to be untidy, and is unnecessary.

Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Joel Holdsworth
2022-04-01 15:24:44 +01:00
committed by Junio C Hamano
parent adf159b441
commit 990547aa2b
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
git-p4.py
View File

@ -813,7 +813,7 @@ def p4Cmd(cmd, *k, **kw):
result = {} result = {}
for entry in list: for entry in list:
result.update(entry) result.update(entry)
return result; return result
def p4Where(depotPath): def p4Where(depotPath):
@ -914,8 +914,8 @@ def extractSettingsGitLog(log):
def gitBranchExists(branch): def gitBranchExists(branch):
proc = subprocess.Popen(["git", "rev-parse", branch], proc = subprocess.Popen(["git", "rev-parse", branch],
stderr=subprocess.PIPE, stdout=subprocess.PIPE); stderr=subprocess.PIPE, stdout=subprocess.PIPE)
return proc.wait() == 0; return proc.wait() == 0
def gitUpdateRef(ref, newvalue): def gitUpdateRef(ref, newvalue):
@ -3530,8 +3530,8 @@ class P4Sync(Command, P4UserMap):
def importNewBranch(self, branch, maxChange): def importNewBranch(self, branch, maxChange):
# make fast-import flush all changes to disk and update the refs using the checkpoint # make fast-import flush all changes to disk and update the refs using the checkpoint
# command so that we can try to find the branch parent in the git history # command so that we can try to find the branch parent in the git history
self.gitStream.write("checkpoint\n\n"); self.gitStream.write("checkpoint\n\n")
self.gitStream.flush(); self.gitStream.flush()
branchPrefix = self.depotPaths[0] + branch + "/" branchPrefix = self.depotPaths[0] + branch + "/"
range = "@1,%s" % maxChange range = "@1,%s" % maxChange
#print "prefix" + branchPrefix #print "prefix" + branchPrefix
@ -3607,12 +3607,12 @@ class P4Sync(Command, P4UserMap):
fullBranch = self.projectName + branch fullBranch = self.projectName + branch
if fullBranch not in self.p4BranchesInGit: if fullBranch not in self.p4BranchesInGit:
if not self.silent: if not self.silent:
print("\n Importing new branch %s" % fullBranch); print("\n Importing new branch %s" % fullBranch)
if self.importNewBranch(branch, change - 1): if self.importNewBranch(branch, change - 1):
parent = "" parent = ""
self.p4BranchesInGit.append(fullBranch) self.p4BranchesInGit.append(fullBranch)
if not self.silent: if not self.silent:
print("\n Resuming with change %s" % change); print("\n Resuming with change %s" % change)
if self.verbose: if self.verbose:
print("parent determined through known branches: %s" % parent) print("parent determined through known branches: %s" % parent)
@ -3680,7 +3680,7 @@ class P4Sync(Command, P4UserMap):
% info['data']) % info['data'])
if info['data'].find("must refer to client") >= 0: if info['data'].find("must refer to client") >= 0:
sys.stderr.write("This particular p4 error is misleading.\n") sys.stderr.write("This particular p4 error is misleading.\n")
sys.stderr.write("Perhaps the depot path was misspelled.\n"); sys.stderr.write("Perhaps the depot path was misspelled.\n")
sys.stderr.write("Depot path: %s\n" % " ".join(self.depotPaths)) sys.stderr.write("Depot path: %s\n" % " ".join(self.depotPaths))
sys.exit(1) sys.exit(1)
if 'p4ExitCode' in info: if 'p4ExitCode' in info:
@ -3789,7 +3789,7 @@ class P4Sync(Command, P4UserMap):
self.importProcess = subprocess.Popen(["git", "fast-import"], self.importProcess = subprocess.Popen(["git", "fast-import"],
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE); stderr=subprocess.PIPE)
self.gitOutput = self.importProcess.stdout self.gitOutput = self.importProcess.stdout
self.gitStream = self.importProcess.stdin self.gitStream = self.importProcess.stdin
self.gitError = self.importProcess.stderr self.gitError = self.importProcess.stderr
@ -3975,7 +3975,7 @@ class P4Sync(Command, P4UserMap):
self.loadUserMapFromCache() self.loadUserMapFromCache()
self.labels = {} self.labels = {}
if self.detectLabels: if self.detectLabels:
self.getLabels(); self.getLabels()
if self.detectBranches: if self.detectBranches:
## FIXME - what's a P4 projectName ? ## FIXME - what's a P4 projectName ?
@ -4061,9 +4061,9 @@ class P4Rebase(Command):
def rebase(self): def rebase(self):
if os.system("git update-index --refresh") != 0: if os.system("git update-index --refresh") != 0:
die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up to date or stash away all your changes with git stash."); die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up to date or stash away all your changes with git stash.")
if len(read_pipe(["git", "diff-index", "HEAD", "--"])) > 0: if len(read_pipe(["git", "diff-index", "HEAD", "--"])) > 0:
die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash."); die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.")
[upstream, settings] = findUpstreamBranchPoint() [upstream, settings] = findUpstreamBranchPoint()
if len(upstream) == 0: if len(upstream) == 0:
@ -4362,7 +4362,7 @@ def main():
formatter = HelpFormatter()) formatter = HelpFormatter())
try: try:
(cmd, args) = parser.parse_args(sys.argv[2:], cmd); (cmd, args) = parser.parse_args(sys.argv[2:], cmd)
except: except:
parser.print_help() parser.print_help()
raise raise
@ -4378,7 +4378,7 @@ def main():
if os.path.exists(cmd.gitdir): if os.path.exists(cmd.gitdir):
cdup = read_pipe(["git", "rev-parse", "--show-cdup"]).strip() cdup = read_pipe(["git", "rev-parse", "--show-cdup"]).strip()
if len(cdup) > 0: if len(cdup) > 0:
chdir(cdup); chdir(cdup)
if not isValidGitDir(cmd.gitdir): if not isValidGitDir(cmd.gitdir):
if isValidGitDir(cmd.gitdir + "/.git"): if isValidGitDir(cmd.gitdir + "/.git"):