importtest/git-importer
4
0
Fork 0
forked from adamm/git-importer
Code Pull Requests Activity

Ignore commits after the merge

Browse Source
This commit is contained in:
Stephan Kulow
2022-10-25 13:24:08 +02:00
parent 2784171f75
commit d961c13614
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tree_builder.py
View File

@@ -12,7 +12,6 @@ class TreeBuilder:
ret = [] ret = []
prev = None prev = None
for rev in revisions: for rev in revisions:
print(rev, rev.files_hash)
if rev.broken: if rev.broken:
continue continue
if prev and prev.files_hash == rev.files_hash: if prev and prev.files_hash == rev.files_hash:
@@ -35,5 +34,8 @@ class TreeBuilder:
req.source_project, req.source_package req.source_project, req.source_package
) )
for rev2 in source_revisions.get(key): for rev2 in source_revisions.get(key):
# this happened after the fact - possibly a revert
if rev2.commit_time > rev.commit_time:
continue
if rev2.files_hash == rev.files_hash: if rev2.files_hash == rev.files_hash:
print(" ", rev2) print(" ", rev2)