Marown/git-filter-repo
1
0
Fork 0
mirror of https://github.com/newren/git-filter-repo.git synced 2024-07-06 18:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

filter-repo (python3): bytestr splicing and iterating is different

Browse Source 
Unlike how str works, if we grab an array index of a bytestr we get an
integer (corresponding to the ASCII value) instead of a bytestr of
length 1.  Adjust code accordingly.

Signed-off-by: Elijah Newren <newren@gmail.com>
This commit is contained in:
Elijah Newren 2019-04-27 15:00:42 -07:00
parent 12602dae9c
commit 385b0586ca
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
git-filter-repo
View File

@ -181,11 +181,11 @@ class PathQuoting:
def enquote(unquoted_string): def enquote(unquoted_string):
# Option 1: Quoting when fast-export would: # Option 1: Quoting when fast-export would:
# pqsc = PathQuoting._special_chars # pqsc = PathQuoting._special_chars
# if any(pqsc[ord(x)] for x in set(unquoted_string)): # if any(pqsc[x] for x in set(unquoted_string)):
# Option 2, perf hack: do minimal amount of quoting required by fast-import # Option 2, perf hack: do minimal amount of quoting required by fast-import
if unquoted_string.startswith('"') or '\n' in unquoted_string: if unquoted_string.startswith('"') or '\n' in unquoted_string:
pqe = PathQuoting._escape pqe = PathQuoting._escape
return '"' + ''.join(pqe[ord(x)] for x in unquoted_string) + '"' return '"' + ''.join(pqe[x] for x in unquoted_string) + '"'
return unquoted_string return unquoted_string
class AncestryGraph(object): class AncestryGraph(object):
@ -975,10 +975,10 @@ class FastExportFilter(object):
of file-changes that fast-export will provide). of file-changes that fast-export will provide).
""" """
filechange = None filechange = None
changetype = self._currentline[0] changetype = self._currentline[0:1]
if changetype == 'M': if changetype == 'M':
(changetype, mode, idnum, path) = self._currentline.split(None, 3) (changetype, mode, idnum, path) = self._currentline.split(None, 3)
if idnum[0] == ':': if idnum[0:1] == ':':
idnum = idnum[1:] idnum = idnum[1:]
path = path.rstrip('\n') path = path.rstrip('\n')
# We translate the idnum to our id system # We translate the idnum to our id system
@ -2136,7 +2136,7 @@ class RepoAnalyze(object):
@staticmethod @staticmethod
def handle_renames(stats, commit, change_types, filenames): def handle_renames(stats, commit, change_types, filenames):
for index, change_type in enumerate(change_types): for index, change_type in enumerate(change_types):
if change_type == 'R': if change_type == ord(b'R'):
oldname, newname = filenames[index], filenames[-1] oldname, newname = filenames[index], filenames[-1]
RepoAnalyze.setup_equivalence_for_rename(stats, oldname, newname) RepoAnalyze.setup_equivalence_for_rename(stats, oldname, newname)
RepoAnalyze.setup_or_update_rename_history(stats, commit, RepoAnalyze.setup_or_update_rename_history(stats, commit,
@ -2780,9 +2780,9 @@ class RepoFilter(object):
return True return True
n = len(path_expression) n = len(path_expression)
if (pathname.startswith(path_expression) and if (pathname.startswith(path_expression) and
(path_expression[n-1] == '/' or (path_expression[n-1:n] == '/' or
len(pathname) == n or len(pathname) == n or
pathname[n] == '/')): pathname[n:n+1] == '/')):
return True return True
return False return False