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: avoid using mark ids referred to in an --import-marks file

Browse Source 
Signed-off-by: Elijah Newren <newren@gmail.com>
This commit is contained in:
Elijah Newren 2009-03-21 11:50:20 -06:00
parent a20bf1957f
commit 85b1980d17
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git-filter-repo
View File

@ -73,6 +73,10 @@ current_stream_number = 0
def record_id_rename(old_id, new_id, handle_transitivity = False):
ids.record_rename(old_id, new_id, handle_transitivity)
def avoid_ids_below(skip_value):
'''Make sure that we don't use ids <= skip_value '''
ids.count = max(ids.count, skip_value)
class GitElement(object):
def __init__(self):
self.type = None
@ -476,6 +480,13 @@ class FastExportFilter(object):
def FastExportOutput(source_repo, extra_args = []):
if not extra_args:
extra_args = ["--all"]
for arg in extra_args:
if arg.startswith("--import-marks"):
filename = arg[len("--import-marks="):]
lines = open(filename,'r').read().strip().splitlines()
if lines:
biggest_mark = max([int(line.split()[0][1:]) for line in lines])
avoid_ids_below(biggest_mark)
return Popen(["git", "fast-export", "--topo-order"] + extra_args,
stdout = PIPE,
cwd = source_repo)