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

Coalesce modified files

Browse Source 
Git doesn't care if they are added or changed: they are modified.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
Felipe Contreras
2023-03-09 15:32:54 -06:00
parent c666fd9c95
commit a229b39d66
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hg-fast-export.py
View File

@@ -102,7 +102,7 @@ def get_filechanges(repo,revision,parents,mleft):
l.sort() l.sort()
c.sort() c.sort()
r.sort() r.sort()
return l,c,r return c+l,r
def get_author(logmessage,committer,authors): def get_author(logmessage,committer,authors):
"""As git distincts between author and committer of a patch, try to """As git distincts between author and committer of a patch, try to
@@ -332,11 +332,11 @@ def export_commit(ui,repo,revision,old_marks,max,count,authors,
wr_data(desc) wr_data(desc)
man=ctx.manifest() man=ctx.manifest()
added,changed,removed,type=[],[],[],'' modified,removed,type=[],[],''
if not parents: if not parents:
# first revision: feed in full manifest # first revision: feed in full manifest
added=files 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))
@@ -345,19 +345,20 @@ def export_commit(ui,repo,revision,old_marks,max,count,authors,
# if we have exactly one parent, just take the changes from the # if we have exactly one parent, just take the changes from the
# manifest without expensively comparing checksums # manifest without expensively comparing checksums
f=repo.status(parents[0],revision) f=repo.status(parents[0],revision)
added,changed,removed=f.added,f.modified,f.removed 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 # later merge revision: feed in changed manifest
# for many files comparing checksums is expensive so only do it for # for many files comparing checksums is expensive so only do it for
# merges where we really need it due to hg's revlog logic # merges where we really need it due to hg's revlog logic
added,changed,removed=get_filechanges(repo,revision,parents,man) modified,removed=get_filechanges(repo,revision,parents,man)
type='thorough delta' type='thorough delta'
stderr_buffer.write( stderr_buffer.write(
b'%s: Exporting %s revision %d/%d with %d/%d/%d added/changed/removed files\n' b'%s: Exporting %s revision %d/%d with %d/%d modified/removed files\n'
% (branch, type.encode(), revision + 1, max, len(added), len(changed), len(removed)) % (branch, type.encode(), revision + 1, max, len(modified), len(removed))
) )
for filename in removed: for filename in removed:
@@ -368,8 +369,7 @@ def export_commit(ui,repo,revision,old_marks,max,count,authors,
remove_gitmodules(ctx) remove_gitmodules(ctx)
wr(b'D %s' % filename) wr(b'D %s' % filename)
export_file_contents(ctx,man,added,hgtags,fn_encoding,plugins) export_file_contents(ctx,man,modified,hgtags,fn_encoding,plugins)
export_file_contents(ctx,man,changed,hgtags,fn_encoding,plugins)
wr() wr()
return checkpoint(count) return checkpoint(count)