Sourcery refactored master branch #1

sourcery-ai · 2023-08-11T15:24:11Z

Branch master refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the master branch, then run:

git fetch origin sourcery/master
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai · 2023-08-11T15:24:13Z

git-p4.py

-    if not d or len(d) == 0:
-        return None
-    else:
-        return d
+    return None if not d or len(d) == 0 else d


Function git_dir refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-08-11T15:24:13Z

git-p4.py

-    else:
-        sys.stderr.write(msg + "\n")
-        sys.exit(1)
+    sys.stderr.write(msg + "\n")
+    sys.exit(1)


Function die refactored with the following changes:

Remove unnecessary else after guard condition (remove-unnecessary-else)

sourcery-ai · 2023-08-11T15:24:13Z

git-p4.py

-    choices = set(m.group(1) for m in re.finditer(r"\[(.)\]", prompt_text))
+    choices = {m.group(1) for m in re.finditer(r"\[(.)\]", prompt_text)}


Function prompt refactored with the following changes:

Replace list(), dict() or set() with comprehension (collection-builtin-to-comprehension)

sourcery-ai · 2023-08-11T15:24:13Z

git-p4.py

-    else:
-        try:
-            path.decode('ascii')
-        except:
-            path = path.decode(encoding, errors='replace')
-            if verbose:
-                print('Path with non-ASCII characters detected. Used {} to decode: {}'.format(encoding, path))
-        return path
+    try:
+        path.decode('ascii')
+    except:
+        path = path.decode(encoding, errors='replace')
+        if verbose:
+            print(
+                f'Path with non-ASCII characters detected. Used {encoding} to decode: {path}'
+            )
+    return path


Function decode_path refactored with the following changes:

Swap if/else branches [×2] (swap-if-else-branches)

Remove unnecessary else after guard condition (remove-unnecessary-else)

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-08-11T15:24:14Z

git-p4.py

-        for p in param:
-            args.append(p)
+        args.extend(iter(param))


Function run_git_hook refactored with the following changes:

Replace a for append loop with list extend (for-append-to-extend)

Simplify generator expression (simplify-generator)

sourcery-ai · 2023-08-11T15:24:15Z

git-p4.py

-    else:
-        type_base, type_mods = split_p4_type(p4_type(file))
-        return p4_keywords_regexp_for_type(type_base, type_mods)
+    type_base, type_mods = split_p4_type(p4_type(file))
+    return p4_keywords_regexp_for_type(type_base, type_mods)


Function p4_keywords_regexp_for_file refactored with the following changes:

Swap if/else branches [×2] (swap-if-else-branches)

Remove unnecessary else after guard condition (remove-unnecessary-else)

sourcery-ai · 2023-08-11T15:24:15Z

git-p4.py

-            p4Type = p4Type[0:-1]
+            p4Type = p4Type[:-1]


Function setP4ExecBit refactored with the following changes:

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (remove-redundant-slice-index)

sourcery-ai · 2023-08-11T15:24:15Z

git-p4.py

-    match = re.match(".*\((.+)\)( \*exclusive\*)?\r?$", result)
-    if match:
-        return match.group(1)
+    if match := re.match(".*\((.+)\)( \*exclusive\*)?\r?$", result):
+        return match[1]
    else:
-        die("Could not determine file type for %s (result: '%s')" % (file, result))
+        die(f"Could not determine file type for {file} (result: '{result}')")


Function getP4OpenedType refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

Replace m.group(x) with m[x] for re.Match objects (use-getitem-for-re-match-groups)

sourcery-ai · 2023-08-11T15:24:15Z

git-p4.py

-    for l in p4CmdList(["labels"] + ["%s..." % p for p in depotPaths]):
+    for l in p4CmdList(["labels"] + [f"{p}..." for p in depotPaths]):


Function getP4Labels refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

sourcery-ai · 2023-08-11T15:24:15Z

git-p4.py

-    match = _diff_tree_pattern.match(entry)
-    if match:
+    if match := _diff_tree_pattern.match(entry):


Function parseDiffTreeEntry refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2023-08-11T15:24:19Z

git-p4.py

-    if key in p4KeysContainingNonUtf8Chars() or \
-       key in p4KeysContainingBinaryData() or  \
-       p4KeyContainsFilePaths(key):
-        return False
-    return True
+    return (
+        key not in p4KeysContainingNonUtf8Chars()
+        and key not in p4KeysContainingBinaryData()
+        and not p4KeyContainsFilePaths(key)
+    )


Function p4KeyWhichCanBeDirectlyDecoded refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

Simplify boolean if expression (boolean-if-exp-identity)

Remove unnecessary casts to int, str, float or bool (remove-unnecessary-cast)

sourcery-ai · 2023-08-11T15:24:19Z

git-p4.py

-        sys.stderr.write("Opening pipe: {}\n".format(' '.join(cmd)))
+        sys.stderr.write(f"Opening pipe: {' '.join(cmd)}\n")


Function p4CmdList refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

Swap if/else branches (swap-if-else-branches)

Remove unnecessary else after guard condition (remove-unnecessary-else)

Simplify sequence length comparison (simplify-len-comparison)

Use named expression to simplify assignment and conditional (use-named-expression)

Replace m.group(x) with m[x] for re.Match objects (use-getitem-for-re-match-groups)

sourcery-ai · 2023-08-11T15:24:19Z

git-p4.py

-        result.update(entry)
+        result |= entry


Function p4Cmd refactored with the following changes:

Merge dictionary updates via the union operator (dict-assign-update-to-union)

sourcery-ai · 2023-08-11T15:24:19Z

git-p4.py

-    depotPathLong = depotPath + "..."
+    depotPathLong = f"{depotPath}..."


Function p4Where refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2023-08-11T15:24:19Z

git-p4.py

-        assignments = m.group(1).split(':')
+        assignments = m[1].split(':')


Function extractSettingsGitLog refactored with the following changes:

Replace m.group(x) with m[x] for re.Match objects (use-getitem-for-re-match-groups)

sourcery-ai · 2023-08-11T15:24:20Z

git-p4.py

-        assert False, "Method 'generatePointer' required in " + self.__class__.__name__
+        assert False, f"Method 'generatePointer' required in {self.__class__.__name__}"


Function LargeFileSystem.generatePointer refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2023-08-11T15:24:21Z

git-p4.py

-        assert False, "Method 'pushFile' required in " + self.__class__.__name__
+        assert False, f"Method 'pushFile' required in {self.__class__.__name__}"


Function LargeFileSystem.pushFile refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2023-08-11T15:24:21Z

git-p4.py

-            [relPath.endswith('.' + e) for e in gitConfigList('git-p4.largeFileExtensions')],
-            False
+            [
+                relPath.endswith(f'.{e}')
+                for e in gitConfigList('git-p4.largeFileExtensions')
+            ],
+            False,


Function LargeFileSystem.hasLargeFileExtension refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2023-08-11T15:24:21Z

git-p4.py

-            pointerContents = 'pointer-' + content
+            pointerContents = f'pointer-{content}'


Function MockLFS.generatePointer refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2023-08-11T15:24:21Z

git-p4.py

-            ['git', 'lfs', 'pointer', '--file=' + contentFile],
-            stdout=subprocess.PIPE
+            ['git', 'lfs', 'pointer', f'--file={contentFile}'],
+            stdout=subprocess.PIPE,


Function GitLFS.generatePointer refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

Replace m.group(x) with m[x] for re.Match objects (use-getitem-for-re-match-groups)

sourcery-ai · 2023-08-11T15:24:26Z

git-p4.py

-        if relPath == '.gitattributes':
-            self.baseGitAttributes = contents
-            return (git_mode, self.generateGitAttributes())
-        else:
+        if relPath != '.gitattributes':
            return LargeFileSystem.processContent(self, git_mode, relPath, contents)
+        self.baseGitAttributes = contents
+        return (git_mode, self.generateGitAttributes())


Function GitLFS.processContent refactored with the following changes:

Swap if/else branches (swap-if-else-branches)

Remove unnecessary else after guard condition (remove-unnecessary-else)

sourcery-ai · 2023-08-11T15:24:26Z

git-p4.py

-        if not p4User or p4User != me:
-            return False
-        else:
-            return True
+        return bool(p4User and p4User == me)


Function P4UserMap.p4UserIsMe refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

Simplify boolean if expression (boolean-if-exp-identity)

sourcery-ai · 2023-08-11T15:24:26Z

git-p4.py

-        return home + "/.gitp4-usercache.txt"
+        return f"{home}/.gitp4-usercache.txt"


Function P4UserMap.getUserCacheFilename refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2023-08-11T15:24:26Z

git-p4.py

-                fulluser = fullname + " <" + email + ">"
+                fulluser = f"{fullname} <{email}>"


Function P4UserMap.getUserMapFromPerforceServer refactored with the following changes:

Use f-string instead of string concatenation [×3] (use-fstring-for-concatenation)

sourcery-ai · 2023-08-11T15:24:27Z

git-p4.py

-            cache = open(self.getUserCacheFilename(), 'rb')
-            lines = cache.readlines()
-            cache.close()
+            with open(self.getUserCacheFilename(), 'rb') as cache:
+                lines = cache.readlines()


Function P4UserMap.loadUserMapFromCache refactored with the following changes:

Use with when opening file to ensure closure (ensure-file-closed)

sourcery-ai · 2023-08-11T15:24:28Z

git-p4.py

-        system(["sh", "-c", ('%s "$@"' % editor), editor, template_file])
+        system(["sh", "-c", f'{editor} "$@"', editor, template_file])


Function P4Submit.edit_template refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

sourcery-ai · 2023-08-11T15:24:28Z

git-p4.py

-        diff = ""
-        for editedFile in editedFiles:
-            diff += p4_read_pipe(['diff', '-du',
-                                  wildcard_encode(editedFile)])
-
+        diff = "".join(
+            p4_read_pipe(['diff', '-du', wildcard_encode(editedFile)])
+            for editedFile in editedFiles
+        )


Function P4Submit.get_diff_description refactored with the following changes:

Use str.join() instead of for loop (use-join)

Iterate over files directly rather than using readlines() (use-file-iterator)

Use with when opening file to ensure closure (ensure-file-closed)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2023-08-11T15:24:28Z

contrib/fast-import/import-zips.py

-    mark = dict()
+    mark = {}


Lines 38-75 refactored with the following changes:

Replace dict() with {} (dict-literal)

Replace comparison with min/max call (min-max-identity)

Use x is None rather than x == None (none-compare)

Use f-string instead of string concatenation [×16] (use-fstring-for-concatenation)

Use items() to directly unpack dictionary values (use-dict-items)

Remove unnecessary call to keys() (remove-dict-keys)

sourcery-ai · 2023-08-11T15:24:28Z

contrib/hg-to-git/hg-to-git.py

-    env = ''
-    elems = re.compile('(.*?)\s+<(.*)>').match(user)
-    if elems:
-        env += 'export GIT_AUTHOR_NAME="%s" ;' % elems.group(1)
-        env += 'export GIT_COMMITTER_NAME="%s" ;' % elems.group(1)
-        env += 'export GIT_AUTHOR_EMAIL="%s" ;' % elems.group(2)
-        env += 'export GIT_COMMITTER_EMAIL="%s" ;' % elems.group(2)
-    else:
-        env += 'export GIT_AUTHOR_NAME="%s" ;' % user
-        env += 'export GIT_COMMITTER_NAME="%s" ;' % user
-        env += 'export GIT_AUTHOR_EMAIL= ;'
-        env += 'export GIT_COMMITTER_EMAIL= ;'
-
-    env += 'export GIT_AUTHOR_DATE="%s" ;' % date
-    env += 'export GIT_COMMITTER_DATE="%s" ;' % date
-    return env
+   env = ''
+   if elems := re.compile('(.*?)\s+<(.*)>').match(user):
+      env += f'export GIT_AUTHOR_NAME="{elems[1]}" ;'
+      env += f'export GIT_COMMITTER_NAME="{elems[1]}" ;'
+      env += f'export GIT_AUTHOR_EMAIL="{elems[2]}" ;'
+      env += f'export GIT_COMMITTER_EMAIL="{elems[2]}" ;'
+   else:
+      env += f'export GIT_AUTHOR_NAME="{user}" ;'
+      env += f'export GIT_COMMITTER_NAME="{user}" ;'
+      env += 'export GIT_AUTHOR_EMAIL= ;'
+      env += 'export GIT_COMMITTER_EMAIL= ;'
+
+   env += f'export GIT_AUTHOR_DATE="{date}" ;'
+   env += f'export GIT_COMMITTER_DATE="{date}" ;'
+   return env


Function getgitenv refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

Replace interpolated string formatting with f-string [×8] (replace-interpolation-with-fstring)

Replace m.group(x) with m[x] for re.Match objects [×4] (use-getitem-for-re-match-groups)

sourcery-ai · 2023-08-11T15:24:28Z

contrib/hg-to-git/hg-to-git.py

-    hgchildren[str(cset)] = ()
-    prnts = os.popen('hg log -r %d --template "{parents}"' % cset).read().strip().split(' ')
-    prnts = map(lambda x: x[:x.find(':')], prnts)
-    if prnts[0] != '':
-        parent = prnts[0].strip()
-    else:
-        parent = str(cset - 1)
-    hgchildren[parent] += ( str(cset), )
-    if len(prnts) > 1:
-        mparent = prnts[1].strip()
-        hgchildren[mparent] += ( str(cset), )
-    else:
-        mparent = None
-
-    hgparents[str(cset)] = (parent, mparent)
-
-    if mparent:
+   hgchildren[str(cset)] = ()
+   prnts = os.popen('hg log -r %d --template "{parents}"' % cset).read().strip().split(' ')
+   prnts = map(lambda x: x[:x.find(':')], prnts)
+   parent = prnts[0].strip() if prnts[0] != '' else str(cset - 1)
+   hgchildren[parent] += ( str(cset), )
+   if len(prnts) > 1:
+       mparent = prnts[1].strip()
+       hgchildren[mparent] += ( str(cset), )
+   else:
+       mparent = None
+
+   hgparents[str(cset)] = (parent, mparent)
+
+   if mparent:
        # For merge changesets, take either one, preferably the 'master' branch
-        if hgbranch[mparent] == 'master':
-            hgbranch[str(cset)] = 'master'
-        else:
-            hgbranch[str(cset)] = hgbranch[parent]
-    else:
-        # Normal changesets
-        # For first children, take the parent branch, for the others create a new branch
-        if hgchildren[parent][0] == str(cset):
-            hgbranch[str(cset)] = hgbranch[parent]
-        else:
-            hgbranch[str(cset)] = "branch-" + str(cset)
+      hgbranch[str(cset)] = ('master' if hgbranch[mparent] == 'master' else
+                             hgbranch[parent])
+   elif hgchildren[parent][0] == str(cset):
+      hgbranch[str(cset)] = hgbranch[parent]
+   else:
+      hgbranch[str(cset)] = f"branch-{str(cset)}"


Lines 127-242 refactored with the following changes:

Replace if statement with if expression [×2] (assign-if-exp)

Merge else clause's nested if statement into elif (merge-else-if-into-elif)

Use f-string instead of string concatenation [×5] (use-fstring-for-concatenation)

Replace interpolated string formatting with f-string [×6] (replace-interpolation-with-fstring)

This removes the following comments ( why? ):

# For first children, take the parent branch, for the others create a new branch # Normal changesets

what-the-diff · 2023-08-11T15:24:51Z

PR Summary

Refactoring the file import-zips.py
The variable 'mark' was updated to start as an empty dictionary. Added code to update the 'commit_time' using the maximum value between 'commit_time' and 'info.date_time'. Made several improvements in the areas of the code that print lines or write data, providing more detailed and updated output.
Refactoring the file hg-to-git.py
The function 'getgitenv(user, date)' has been updated for better efficiency using the walrus operator. Furthermore, the way we create a new branch or switch to an existing one has seen some improvements. Other commands such as the ones used for file management, committing changes, handling tags, deleting branches, and showing information, are now using a more efficient string formatting method, making our code more modern and maintainable. A new line of code has been added to update the version control system's data, which will keep our version history more accurate.

Benefits of this PR include greater efficiency, improved maintainability, and a more accurate version control history.

'Refactored by Sourcery'

f863dc7

sourcery-ai bot requested a review from ia-kobos August 11, 2023 15:24

sourcery-ai bot commented Aug 11, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored master branch #1

Sourcery refactored master branch #1

sourcery-ai bot commented Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

sourcery-ai bot Aug 11, 2023

what-the-diff bot commented Aug 11, 2023

		choices = set(m.group(1) for m in re.finditer(r"\[(.)\]", prompt_text))
		choices = {m.group(1) for m in re.finditer(r"\[(.)\]", prompt_text)}

		for l in p4CmdList(["labels"] + ["%s..." % p for p in depotPaths]):
		for l in p4CmdList(["labels"] + [f"{p}..." for p in depotPaths]):

		sys.stderr.write("Opening pipe: {}\n".format(' '.join(cmd)))
		sys.stderr.write(f"Opening pipe: {' '.join(cmd)}\n")

		depotPathLong = depotPath + "..."
		depotPathLong = f"{depotPath}..."

		assignments = m.group(1).split(':')
		assignments = m[1].split(':')

		assert False, "Method 'generatePointer' required in " + self.__class__.__name__
		assert False, f"Method 'generatePointer' required in {self.__class__.__name__}"

		assert False, "Method 'pushFile' required in " + self.__class__.__name__
		assert False, f"Method 'pushFile' required in {self.__class__.__name__}"

		pointerContents = 'pointer-' + content
		pointerContents = f'pointer-{content}'

		return home + "/.gitp4-usercache.txt"
		return f"{home}/.gitp4-usercache.txt"

		fulluser = fullname + " <" + email + ">"
		fulluser = f"{fullname} <{email}>"

		system(["sh", "-c", ('%s "$@"' % editor), editor, template_file])
		system(["sh", "-c", f'{editor} "$@"', editor, template_file])

Sourcery refactored master branch #1

Are you sure you want to change the base?

Sourcery refactored master branch #1

Conversation

sourcery-ai bot commented Aug 11, 2023

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

sourcery-ai bot Aug 11, 2023

Choose a reason for hiding this comment

what-the-diff bot commented Aug 11, 2023

PR Summary