]> git.ipfire.org Git - thirdparty/git.git/commitdiff
git-p4: remove commented code
authorJoel Holdsworth <jholdsworth@nvidia.com>
Fri, 1 Apr 2022 14:24:48 +0000 (15:24 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2022 20:15:43 +0000 (13:15 -0700)
Previously, the script contained commented code including Python 2 print
statements. Presumably, these were used as a developer aid at some point
in history. However, the commented code is generally undesirable, and
this commented code serves no useful purpose. Therefore this patch
removes it.

Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-p4.py

index 892b964eeca1cef8e72f3f4adacfb9d88af06d31..53e99f81b7c2ccfa434fadc6b98350dde788b1ef 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -3583,23 +3583,18 @@ class P4Sync(Command, P4UserMap):
         self.gitStream.flush()
         branchPrefix = self.depotPaths[0] + branch + "/"
         range = "@1,%s" % maxChange
-        #print "prefix" + branchPrefix
         changes = p4ChangesForPaths([branchPrefix], range, self.changes_block_size)
         if len(changes) <= 0:
             return False
         firstChange = changes[0]
-        #print "first change in branch: %s" % firstChange
         sourceBranch = self.knownBranches[branch]
         sourceDepotPath = self.depotPaths[0] + sourceBranch
         sourceRef = self.gitRefForBranch(sourceBranch)
-        #print "source " + sourceBranch
 
         branchParentChange = int(p4Cmd(["changes", "-m", "1", "%s...@1,%s" % (sourceDepotPath, firstChange)])["change"])
-        #print "branch parent: %s" % branchParentChange
         gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)
         if len(gitParent) > 0:
             self.initialParents[self.gitRefForBranch(branch)] = gitParent
-            #print "parent git commit: %s" % gitParent
 
         self.importChanges(changes)
         return True
@@ -3742,8 +3737,6 @@ class P4Sync(Command, P4UserMap):
                 newestRevision = change
 
             if info["action"] in self.delete_actions:
-                # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
-                #fileCnt = fileCnt + 1
                 continue
 
             for prop in ["depotFile", "rev", "action", "type" ]: