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