Nemcio/Fast-Export
1
0
Fork 0
mirror of https://github.com/frej/fast-export.git synced 2025-11-02 01:05:48 +01:00
Code Issues Packages Projects Releases Activity

Move parents logic inside get_filechanges

Browse Source 
This way export_commit is much simpler (already quite complex), and it's
easier to modify the logic.

No functional changes.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
Felipe Contreras
2023-03-13 20:37:19 -06:00
parent 9df2f97f6c
commit e09a14a266
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
hg-fast-export.py
View File

@@ -92,15 +92,31 @@ def split_dict(dleft,dright,c=[],r=[],match=file_mismatch):
# change is already handled when comparing child against parent # change is already handled when comparing child against parent
return c,r return c,r
def get_filechanges(repo,revision,parents,mleft): def get_filechanges(repo,revision,parents,files,mleft):
"""Given some repository and revision, find all changed/deleted files.""" """Given some repository and revision, find all changed/deleted files."""
modified,removed=[],[] if not parents:
for p in parents: # first revision: feed in full manifest
if p<0: continue modified=files
mright=repo[p].manifest() removed=[]
modified,removed=split_dict(mleft,mright,modified,removed) else:
modified.sort() if len(parents) == 1:
removed.sort() # later non-merge revision: feed in changed manifest
# if we have exactly one parent, just take the changes from the
# manifest without expensively comparing checksums
f=repo.status(parents[0],revision)
modified=f.modified + f.added
removed=f.removed
else: # a merge with two parents
# later merge revision: feed in changed manifest
# for many files comparing checksums is expensive so only do it for
# merges where we really need it due to hg's revlog logic
modified,removed=[],[]
for p in parents:
if p<0: continue
mright=repo[p].manifest()
modified,removed=split_dict(mleft,mright,modified,removed)
modified.sort()
removed.sort()
return modified,removed return modified,removed
def get_author(logmessage,committer,authors): def get_author(logmessage,committer,authors):
@@ -331,30 +347,19 @@ def export_commit(ui,repo,revision,old_marks,max,count,authors,
wr_data(desc) wr_data(desc)
man=ctx.manifest() man=ctx.manifest()
modified,removed,type=[],[],''
if not parents: if not parents:
# first revision: feed in full manifest
modified=files
type='full' type='full'
else: else:
wr(b'from %s' % revnum_to_revref(parents[0], old_marks)) wr(b'from %s' % revnum_to_revref(parents[0], old_marks))
if len(parents) == 1: if len(parents) == 1:
# later non-merge revision: feed in changed manifest
# if we have exactly one parent, just take the changes from the
# manifest without expensively comparing checksums
f=repo.status(parents[0],revision)
modified=f.modified + f.added
removed=f.removed
type='simple delta' type='simple delta'
else: # a merge with two parents else: # a merge with two parents
wr(b'merge %s' % revnum_to_revref(parents[1], old_marks)) wr(b'merge %s' % revnum_to_revref(parents[1], old_marks))
# later merge revision: feed in changed manifest
# for many files comparing checksums is expensive so only do it for
# merges where we really need it due to hg's revlog logic
modified,removed=get_filechanges(repo,revision,parents,man)
type='thorough delta' type='thorough delta'
modified,removed=get_filechanges(repo,revision,parents,files,man)
stderr_buffer.write( stderr_buffer.write(
b'%s: Exporting %s revision %d/%d with %d/%d modified/removed files\n' b'%s: Exporting %s revision %d/%d with %d/%d modified/removed files\n'
% (branch, type.encode(), revision + 1, max, len(modified), len(removed)) % (branch, type.encode(), revision + 1, max, len(modified), len(removed))