This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7821

overlayworkingctx: default branch to base context's branch
ClosedPublic

Authored by martinvonz on Jan 11 2020, 1:46 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG2ecbc4ec87d8: overlayworkingctx: default branch to base context's branch
Summary

This matches what the dirstate does (it reuses working copy parent's
branch unless told otherwise). By moving the default out of
rebase.commitmemorynode(), it will let us clean that up better
later.

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
Mhgext/rebase.py (2 lines)
Mmercurial/context.py (3 lines)

Diff 19161

hgext/rebase.py

'''Commit the memory changes with parents p1 and p2. '''Commit the memory changes with parents p1 and p2.
Return node of committed revision.''' Return node of committed revision.'''
# Replicates the empty check in ``repo.commit``. # Replicates the empty check in ``repo.commit``.
if wctx.isempty() and not repo.ui.configbool(b'ui', b'allowemptycommit'): if wctx.isempty() and not repo.ui.configbool(b'ui', b'allowemptycommit'):
return None return None
# By convention, ``extra['branch']`` (set by extrafn) clobbers # By convention, ``extra['branch']`` (set by extrafn) clobbers
# ``branch`` (used when passing ``--keepbranches``). # ``branch`` (used when passing ``--keepbranches``).
branch = repo[p1].branch() branch = None
if b'branch' in extra: if b'branch' in extra:
branch = extra[b'branch'] branch = extra[b'branch']
memctx = wctx.tomemctx( memctx = wctx.tomemctx(
commitmsg, commitmsg,
parents=(p1, p2), parents=(p1, p2),
date=date, date=date,
extra=extra, extra=extra,

mercurial/context.py

b'x' in self._cache[path][b'flags'], b'x' in self._cache[path][b'flags'],
self._cache[path][b'copied'], self._cache[path][b'copied'],
) )
else: else:
# Returning None, but including the path in `files`, is # Returning None, but including the path in `files`, is
# necessary for memctx to register a deletion. # necessary for memctx to register a deletion.
return None return None
if branch is None:
branch = self._wrappedctx.branch()
return memctx( return memctx(
self._repo, self._repo,
parents, parents,
text, text,
files, files,
getfile, getfile,
date=date, date=date,
extra=extra, extra=extra,