This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8706

commitctx: rename "changed" to touched
ClosedPublic

Authored by marmoute on Jul 8 2020, 4:37 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG025ee25b5b23: commitctx: rename "changed" to touched
rHG765c3b4e2176: commitctx: rename "changed" to touched
Summary

The variable contains content that are both added and modified. "changed" could
be confused with "modified" only, so we pick a less ambiguous naming that will
help with more unification.

For example, it would make sense to shove the "removed" item in there since
this is how the variable is used.

This is part of a larger refactoring/cleanup of the commitctx code to clarify
and augment the logic gathering metadata useful for copy tracing. The current
code is a tad too long and entangled to make such update easy. We start with
easy and small cleanup.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (6 lines)

Diff 22014

mercurial/localrepo.py

m = mctx.read() m = mctx.read()
m1 = m1ctx.read() m1 = m1ctx.read()
m2 = m2ctx.read() m2 = m2ctx.read()
# check in files # check in files
added = [] added = []
filesadded = [] filesadded = []
changed = []
removed = list(ctx.removed()) removed = list(ctx.removed())
touched = []
linkrev = len(self) linkrev = len(self)
self.ui.note(_(b"committing files:\n")) self.ui.note(_(b"committing files:\n"))
uipathfn = scmutil.getuipathfn(self) uipathfn = scmutil.getuipathfn(self)
for f in sorted(ctx.modified() + ctx.added()): for f in sorted(ctx.modified() + ctx.added()):
self.ui.note(uipathfn(f) + b"\n") self.ui.note(uipathfn(f) + b"\n")
try: try:
fctx = ctx[f] fctx = ctx[f]
if fctx is None: if fctx is None:
removed.append(f) removed.append(f)
else: else:
added.append(f) added.append(f)
m[f], is_touched = self._filecommit( m[f], is_touched = self._filecommit(
fctx, m1, m2, linkrev, trp, writefilecopymeta, fctx, m1, m2, linkrev, trp, writefilecopymeta,
) )
if is_touched: if is_touched:
changed.append(f) touched.append(f)
if writechangesetcopy and is_touched == 'added': if writechangesetcopy and is_touched == 'added':
filesadded.append(f) filesadded.append(f)
m.setflag(f, fctx.flags()) m.setflag(f, fctx.flags())
except OSError: except OSError:
self.ui.warn( self.ui.warn(
_(b"trouble committing %s!\n") % uipathfn(f) _(b"trouble committing %s!\n") % uipathfn(f)
) )
raise raise
del m[f] del m[f]
if p2.rev() != nullrev: if p2.rev() != nullrev:
rf = metadata.get_removal_filter(ctx, (p1, p2, m1, m2)) rf = metadata.get_removal_filter(ctx, (p1, p2, m1, m2))
removed = [f for f in removed if not rf(f)] removed = [f for f in removed if not rf(f)]
if writechangesetcopy: if writechangesetcopy:
filesremoved = removed filesremoved = removed
files = changed + removed files = touched + removed
md = None md = None
if not files: if not files:
# if no "files" actually changed in terms of the changelog, # if no "files" actually changed in terms of the changelog,
# try hard to detect unmodified manifest entry so that the # try hard to detect unmodified manifest entry so that the
# exact same commit can be reproduced later on convert. # exact same commit can be reproduced later on convert.
md = m1.diff(m, scmutil.matchfiles(self, ctx.files())) md = m1.diff(m, scmutil.matchfiles(self, ctx.files()))
if not files and md: if not files and md:
self.ui.debug( self.ui.debug(