This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8704

commitctx: more filesremoved assignment closer to removed computation
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6979a20ff004: commitctx: more filesremoved assignment closer to removed computation
rHG25fc080eed1a: commitctx: more filesremoved assignment closer to removed computation
Summary

A small change that makes the code flow clearer.

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
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (6 lines)

Diff 21801

mercurial/localrepo.py

removed = [f for f in removed if f in m1 or f in m2] removed = [f for f in removed if f in m1 or f in m2]
drop = sorted([f for f in removed if f in m]) drop = sorted([f for f in removed if f in m])
for f in drop: for f in drop:
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:
filesremoved = removed
files = changed + removed files = changed + 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:
trp, trp,
linkrev, linkrev,
p1.manifestnode(), p1.manifestnode(),
p2.manifestnode(), p2.manifestnode(),
added, added,
drop, drop,
match=self.narrowmatch(), match=self.narrowmatch(),
) )
if writechangesetcopy:
filesremoved = removed
else: else:
self.ui.debug( self.ui.debug(
b'reusing manifest from p1 (listed files ' b'reusing manifest from p1 (listed files '
b'actually unchanged)\n' b'actually unchanged)\n'
) )
mn = p1.manifestnode() mn = p1.manifestnode()
else: else:
self.ui.debug(b'reusing manifest from p1 (no file change)\n') self.ui.debug(b'reusing manifest from p1 (no file change)\n')