git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v4 06/22] git-p4: remove commented code

From
Joel Holdsworth <jholdsworth@nvidia.com>
Date
Feb 10, 2022, 16:46 UTC
Message-ID
<20220210164627.279520-7-jholdsworth@nvidia.com>
In-Reply-To
<20220210164627.279520-1-jholdsworth@nvidia.com>

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>
---
 git-p4.py | 7 -------
 1 file changed, 7 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 892b964eec..53e99f81b7 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -3583,23 +3583,18 @@ def importNewBranch(self, branch, maxChange):
         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 @@ def importHeadRevision(self, revision):
                 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" ]:
-- 
2.35.GIT
Previous: Joel HoldsworthNext: Joel Holdsworth
Message 7 of 31 in “git-p4: Various code tidy-ups”
  1. 00/22 git-p4: Various code tidy-upsJoel Holdsworth, Feb 10, 2022
  2. 01/22 git-p4: add blank lines between functions and class definitionsJoel Holdsworth, Feb 10, 2022
  3. 02/22 git-p4: remove unneeded semicolons from statementsJoel Holdsworth, Feb 10, 2022
  4. 03/22 git-p4: indent with 4-spacesJoel Holdsworth, Feb 10, 2022
  5. 05/22 git-p4: convert descriptive class and function comments into docstringsJoel Holdsworth, Feb 10, 2022
  6. 04/22 git-p4: improve consistency of docstring formattingJoel Holdsworth, Feb 10, 2022
  7. 06/22 git-p4: remove commented codeJoel Holdsworth, Feb 10, 2022
  8. 07/22 git-p4: sort and de-duplcate pylint disable listJoel Holdsworth, Feb 10, 2022
  9. 09/22 git-p4: remove spaces around default argumentsJoel Holdsworth, Feb 10, 2022
  10. 08/22 git-p4: remove padding from lists, tuples and function argumentsJoel Holdsworth, Feb 10, 2022
  11. 10/22 git-p4: removed brackets when assigning multiple return valuesJoel Holdsworth, Feb 10, 2022
  12. 12/22 git-p4: remove extraneous spaces before function argumentsJoel Holdsworth, Feb 10, 2022
  13. 11/22 git-p4: place a single space after every commaJoel Holdsworth, Feb 10, 2022
  14. 13/22 git-p4: remove redundant backslash-continuations inside bracketsJoel Holdsworth, Feb 10, 2022
  15. 14/22 git-p4: remove spaces between dictionary keys and colonsJoel Holdsworth, Feb 10, 2022
  16. 15/22 git-p4: ensure every comment has a single #Joel Holdsworth, Feb 10, 2022
  17. 16/22 git-p4: ensure there is a single space around all operatorsJoel Holdsworth, Feb 10, 2022
  18. 17/22 git-p4: normalize indentation of lines in conditionalsJoel Holdsworth, Feb 10, 2022
  19. 19/22 git-p4: only seperate code blocks by a single empty lineJoel Holdsworth, Feb 10, 2022
  20. 20/22 git-p4: move inline comments to line aboveJoel Holdsworth, Feb 10, 2022
  21. 22/22 git-p4: sort importsJoel Holdsworth, Feb 10, 2022
  22. 18/22 git-p4: compare to singletons with "is" and "is not"Joel Holdsworth, Feb 10, 2022
  23. 21/22 git-p4: seperate multiple statements onto seperate linesJoel Holdsworth, Feb 10, 2022
  24. Tao KlerksApr 2, 2022
  25. Tao KlerksApr 2, 2022
  26. Joel HoldsworthApr 4, 2022
  27. Tao KlerksApr 5, 2022
  28. Tao KlerksApr 5, 2022
  29. Joel HoldsworthApr 5, 2022
  30. Tao KlerksApr 5, 2022
  31. Tao KlerksApr 11, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.