This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8708

commitctx: move a tiny else clause above the very long one
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG55464c0b3a89: commitctx: move a tiny else clause above the very long one
rHG1386a2292d93: commitctx: move a tiny else clause above the very long one
Summary

This is simple to have all the simple case unfold before the 100+ line one. Otherwise it is hard to relate the else to the initial conditionnal.

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 (10 lines)

Diff 21805

mercurial/localrepo.py

if ctx.manifestnode(): if ctx.manifestnode():
# reuse an existing manifest revision # reuse an existing manifest revision
self.ui.debug(b'reusing known manifest\n') self.ui.debug(b'reusing known manifest\n')
mn = ctx.manifestnode() mn = ctx.manifestnode()
files = ctx.files() files = ctx.files()
if writechangesetcopy: if writechangesetcopy:
filesadded = ctx.filesadded() filesadded = ctx.filesadded()
filesremoved = ctx.filesremoved() filesremoved = ctx.filesremoved()
elif ctx.files(): elif not ctx.files():
self.ui.debug(b'reusing manifest from p1 (no file change)\n')
mn = p1.manifestnode()
files = []
else:
m1ctx = p1.manifestctx() m1ctx = p1.manifestctx()
m2ctx = p2.manifestctx() m2ctx = p2.manifestctx()
mctx = m1ctx.copy() mctx = m1ctx.copy()
m = mctx.read() m = mctx.read()
m1 = m1ctx.read() m1 = m1ctx.read()
m2 = m2ctx.read() m2 = m2ctx.read()
match=self.narrowmatch(), match=self.narrowmatch(),
) )
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:
self.ui.debug(b'reusing manifest from p1 (no file change)\n')
mn = p1.manifestnode()
files = []
if writecopiesto == b'changeset-only': if writecopiesto == b'changeset-only':
# If writing only to changeset extras, use None to indicate that # If writing only to changeset extras, use None to indicate that
# no entry should be written. If writing to both, write an empty # no entry should be written. If writing to both, write an empty
# entry to prevent the reader from falling back to reading # entry to prevent the reader from falling back to reading
# filelogs. # filelogs.
p1copies = p1copies or None p1copies = p1copies or None
p2copies = p2copies or None p2copies = p2copies or None