This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8732

rebase: correctly check for empty commit in in-memory mode
ClosedPublic

Authored by mjacob on Jul 11 2020, 5:12 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG0ecb3b11fcad: rebase: correctly check for empty commit in in-memory mode
Summary

The new code has a small overhead in the empty commit case, as a memctx object
is always created, but I don’t think it’s justified here to duplicate code
to optimize a relatively unlikely code path.

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 (8 lines)
Mtests/test-rebase-inmemory.t (4 lines)

Diff 21883

hgext/rebase.py

) )
% (max(destancestors), b', '.join(b"%d" % p for p in sorted(parents))) % (max(destancestors), b', '.join(b"%d" % p for p in sorted(parents)))
) )
def commitmemorynode(repo, wctx, editor, extra, user, date, commitmsg): def commitmemorynode(repo, wctx, editor, extra, user, date, commitmsg):
'''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.'''
# FIXME: make empty commit check consistent with ``repo.commit``
if wctx.nofilechanges() and not repo.ui.configbool(
b'ui', b'allowemptycommit'
):
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 = None 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,
date=date, date=date,
extra=extra, extra=extra,
user=user, user=user,
branch=branch, branch=branch,
editor=editor, editor=editor,
) )
if memctx.isempty() and not repo.ui.configbool(b'ui', b'allowemptycommit'):
return None
commitres = repo.commitctx(memctx) commitres = repo.commitctx(memctx)
wctx.clean() # Might be reused wctx.clean() # Might be reused
return commitres return commitres
def commitnode(repo, editor, extra, user, date, commitmsg): def commitnode(repo, editor, extra, user, date, commitmsg):
'''Commit the wd changes with parents p1 and p2. '''Commit the wd changes with parents p1 and p2.
Return node of committed revision.''' Return node of committed revision.'''

tests/test-rebase-inmemory.t

| | o 3: 531f80391e4a 'c' | | o 3: 531f80391e4a 'c'
| | | | | |
| o | 2: 0194f1db184a 'b' | o | 2: 0194f1db184a 'b'
| |/ | |/
o / 1: 6f252845ea45 'a' o / 1: 6f252845ea45 'a'
|/ |/
o 0: d20a80d4def3 'base' o 0: d20a80d4def3 'base'
FIXME: It's broken for inmemory merges.
$ hg rebase -s 2 -d 3 $ hg rebase -s 2 -d 3
rebasing 2:0194f1db184a "b" rebasing 2:0194f1db184a "b"
note: not rebasing 2:0194f1db184a "b", its destination already has all its changes note: not rebasing 2:0194f1db184a "b", its destination already has all its changes
rebasing 4:59c8292117b1 "merge" (tip) rebasing 4:59c8292117b1 "merge" (tip)
note: not rebasing 4:59c8292117b1 "merge" (tip), its destination already has all its changes (true !)
saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/0194f1db184a-aee31d03-rebase.hg saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/0194f1db184a-aee31d03-rebase.hg
#if false
$ hg tglog $ hg tglog
o 3: 506e2454484b 'merge' o 3: 506e2454484b 'merge'
|\ |\
| o 2: 531f80391e4a 'c' | o 2: 531f80391e4a 'c'
| | | |
o | 1: 6f252845ea45 'a' o | 1: 6f252845ea45 'a'
|/ |/
o 0: d20a80d4def3 'base' o 0: d20a80d4def3 'base'
#endif