This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9088

changing-files: record merged files at commit time
ClosedPublic

Authored by marmoute on Sep 26 2020, 8:10 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG094a91a183f1: changing-files: record merged files at commit time
Summary

The data is easy to gather at commit time, and we need it for changeset centric
copy tracing. Right now, it is not persisted so we cannot use it. However we
will fix this part very soon, gathering something to persist was necessary
first.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Sep 26 2020, 8:10 AM
marmoute updated this revision to Diff 22899.Sep 28 2020, 12:32 PM
pulkit accepted this revision.Oct 1 2020, 5:19 AM
pulkit added a subscriber: pulkit.
pulkit added inline comments.
mercurial/commit.py
355

nit: it will be nice to have constants for these magic strings.

This revision is now accepted and ready to land.Oct 1 2020, 5:19 AM
marmoute added a commit: rHG094a91a183f1: changing-files: record merged files at commit time.Oct 1 2020, 7:36 AM
Closed by commit rHG094a91a183f1: changing-files: record merged files at commit time (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commit.py (7 lines)

Diff 22967

mercurial/commit.py

else: else:
added.append(f) added.append(f)
m[f], is_touched = _filecommit( m[f], is_touched = _filecommit(
repo, fctx, m1, m2, linkrev, tr, writefilecopymeta, ms repo, fctx, m1, m2, linkrev, tr, writefilecopymeta, ms
) )
if is_touched: if is_touched:
if is_touched == 'added': if is_touched == 'added':
files.mark_added(f) files.mark_added(f)
elif is_touched == 'merged':
files.mark_merged(f)
else: else:
files.mark_touched(f) files.mark_touched(f)
m.setflag(f, fctx.flags()) m.setflag(f, fctx.flags())
except OSError: except OSError:
repo.ui.warn(_(b"trouble committing %s!\n") % uipathfn(f)) repo.ui.warn(_(b"trouble committing %s!\n") % uipathfn(f))
raise raise
except IOError as inst: except IOError as inst:
errcode = getattr(inst, 'errno', errno.ENOENT) errcode = getattr(inst, 'errno', errno.ENOENT)
and ms.active() and ms.active()
and ms.extras(fname).get(b'merge-removal-candidate') == b'yes' and ms.extras(fname).get(b'merge-removal-candidate') == b'yes'
): ):
force_new_node = True force_new_node = True
# is the file changed? # is the file changed?
text = fctx.data() text = fctx.data()
if fparent2 != nullid or meta or flog.cmp(fparent1, text) or force_new_node: if fparent2 != nullid or meta or flog.cmp(fparent1, text) or force_new_node:
if touched is None: # do not overwrite added if touched is None: # do not overwrite added
if fparent2 == nullid:
touched = 'modified' touched = 'modified'
else:
touched = 'merged'
pulkitUnsubmitted
Not Done

nit: it will be nice to have constants for these magic strings.

pulkit: nit: it will be nice to have constants for these magic strings.
fnode = flog.add(text, meta, tr, linkrev, fparent1, fparent2) fnode = flog.add(text, meta, tr, linkrev, fparent1, fparent2)
# are just the flags changed during merge? # are just the flags changed during merge?
elif fname in manifest1 and manifest1.flags(fname) != fctx.flags(): elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():
touched = 'modified' touched = 'modified'
fnode = fparent1 fnode = fparent1
else: else:
fnode = fparent1 fnode = fparent1
return fnode, touched return fnode, touched