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

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

From
Joel Holdsworth <jholdsworth@nvidia.com>
Date
Jan 12, 2022, 13:46 UTC
Message-ID
<20220112134635.177877-7-jholdsworth@nvidia.com>
In-Reply-To
<20220112134635.177877-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, commented code and therefore this patch removes them.

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 0bd1ba00ba..ad385d6919 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -3654,23 +3654,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
@@ -3813,8 +3808,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.34.1
Previous: Eric SunshineNext: Eric Sunshine
Message 9 of 27 in “git-p4: Various code tidy-ups”
  1. 00/20 git-p4: Various code tidy-upsJoel Holdsworth, Jan 12, 2022
  2. 01/20 git-p4: add blank lines between functions and class definitionsJoel Holdsworth, Jan 12, 2022
  3. 02/20 git-p4: remove unneeded semicolons from statementsJoel Holdsworth, Jan 12, 2022
  4. 03/20 git-p4: indent with 4-spacesJoel Holdsworth, Jan 12, 2022
  5. 04/20 git-p4: improve consistency of docstring formattingJoel Holdsworth, Jan 12, 2022
  6. Eric SunshineJan 12, 2022
  7. 05/20 git-p4: convert descriptive class and function comments into docstringsJoel Holdsworth, Jan 12, 2022
  8. Eric SunshineJan 12, 2022
  9. 06/20 git-p4: remove commented codeJoel Holdsworth, Jan 12, 2022
  10. Eric SunshineJan 12, 2022
  11. 09/20 git-p4: remove spaces around default argumentsJoel Holdsworth, Jan 12, 2022
  12. 07/20 git-p4: sort and de-duplcate pylint disable listJoel Holdsworth, Jan 12, 2022
  13. 08/20 git-p4: remove padding from lists, tuples and function argumentsJoel Holdsworth, Jan 12, 2022
  14. 10/20 git-p4: place a single space after every commaJoel Holdsworth, Jan 12, 2022
  15. Eric SunshineJan 12, 2022
  16. 16/20 git-p4: tidied visual indented lines of conditionalsJoel Holdsworth, Jan 12, 2022
  17. Eric SunshineJan 12, 2022
  18. 11/20 git-p4: remove extraneous spaces before function argumentsJoel Holdsworth, Jan 12, 2022
  19. 12/20 git-p4: remove redundant backslash-continuations inside bracketsJoel Holdsworth, Jan 12, 2022
  20. 13/20 git-p4: remove spaces between dictionary keys and colonsJoel Holdsworth, Jan 12, 2022
  21. 14/20 git-p4: ensure every comment has a single #Joel Holdsworth, Jan 12, 2022
  22. 17/20 git-p4: compare to singletons with "is" and "is not"Joel Holdsworth, Jan 12, 2022
  23. Eric SunshineJan 12, 2022
  24. 15/20 git-p4: ensure there is a single space around all operatorsJoel Holdsworth, Jan 12, 2022
  25. 18/20 git-p4: only seperate code blocks by a single empty lineJoel Holdsworth, Jan 12, 2022
  26. 19/20 git-p4: move inline comments to line aboveJoel Holdsworth, Jan 12, 2022
  27. 20/20 git-p4: seperate multiple statements onto seperate linesJoel Holdsworth, Jan 12, 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.