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

git-p4: ensure every comment has a single #

Browse Source 
PEP8 recommends that every comment should begin with a single '#'
character.

This guideline is described here:
https://www.python.org/dev/peps/pep-0008/#comments

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:57 +01:00 committed by Junio C Hamano
parent 2bcf611088
commit c785e2029c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-p4.py
View File

@ -895,7 +895,7 @@ def branchExists(ref):
def extractLogMessageFromGitCommit(commit): def extractLogMessageFromGitCommit(commit):
logMessage = "" logMessage = ""
## fixme: title is first line of commit, not 1st paragraph. # fixme: title is first line of commit, not 1st paragraph.
foundTitle = False foundTitle = False
for log in read_pipe_lines(["git", "cat-file", "commit", commit]): for log in read_pipe_lines(["git", "cat-file", "commit", commit]):
if not foundTitle: if not foundTitle:
@ -3485,7 +3485,7 @@ def getBranchMapping(self):
continue continue
source = paths[0] source = paths[0]
destination = paths[1] destination = paths[1]
## HACK # HACK
if p4PathStartsWith(source, self.depotPaths[0]) and p4PathStartsWith(destination, self.depotPaths[0]): if p4PathStartsWith(source, self.depotPaths[0]) and p4PathStartsWith(destination, self.depotPaths[0]):
source = source[len(self.depotPaths[0]):-4] source = source[len(self.depotPaths[0]):-4]
destination = destination[len(self.depotPaths[0]):-4] destination = destination[len(self.depotPaths[0]):-4]
@ -3644,7 +3644,7 @@ def importChanges(self, changes, origin_revision=0):
if self.detectBranches: if self.detectBranches:
branches = self.splitFilesIntoBranches(description) branches = self.splitFilesIntoBranches(description)
for branch in branches.keys(): for branch in branches.keys():
## HACK --hwn # HACK --hwn
branchPrefix = self.depotPaths[0] + branch + "/" branchPrefix = self.depotPaths[0] + branch + "/"
self.branchPrefixes = [branchPrefix] self.branchPrefixes = [branchPrefix]
@ -4035,7 +4035,7 @@ def run(self, args):
self.getLabels() self.getLabels()
if self.detectBranches: if self.detectBranches:
## FIXME - what's a P4 projectName ? # FIXME - what's a P4 projectName ?
self.projectName = self.guessProjectName() self.projectName = self.guessProjectName()
if self.hasOrigin: if self.hasOrigin:
@ -4048,7 +4048,7 @@ def run(self, args):
for b in self.p4BranchesInGit: for b in self.p4BranchesInGit:
if b != "master": if b != "master":
## FIXME # FIXME
b = b[len(self.projectName):] b = b[len(self.projectName):]
self.createdBranches.add(b) self.createdBranches.add(b)
@ -4154,7 +4154,7 @@ def __init__(self):
self.cloneBare = False self.cloneBare = False
def defaultDestination(self, args): def defaultDestination(self, args):
## TODO: use common prefix of args? # TODO: use common prefix of args?
depotPath = args[0] depotPath = args[0]
depotDir = re.sub("(@[^@]*)$", "", depotPath) depotDir = re.sub("(@[^@]*)$", "", depotPath)
depotDir = re.sub("(#[^#]*)$", "", depotDir) depotDir = re.sub("(#[^#]*)$", "", depotDir)