( )⚙ D11040 amend: make `hg amend -r` update to the rewritten working copy parent

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11040

amend: make `hg amend -r` update to the rewritten working copy parent
AbandonedPublic

Authored by martinvonz on Jul 9 2021, 4:28 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Jul 9 2021, 4:28 PM
Alphare accepted this revision as: Alphare.Jul 12 2021, 5:30 AM
martinvonz abandoned this revision.Jul 12 2021, 2:21 PM

I won't actually need this. I'm going to make the command update to the old working copy parent before doing the rebasing, which will result in rebase taking care of the update for us.

Revision Contents
Changeset List

PathPackages
Mhgext/amend.py (4 lines)
Mtests/test-amend-rev.t (12 lines)

Diff 29053

hgext/amend.py

) )
amended_ctx = _fold_temp_node( amended_ctx = _fold_temp_node(
ui, repo, state, rebase, rebased_temp_ctx, target_ctx ui, repo, state, rebase, rebased_temp_ctx, target_ctx
) )
_rebase_descendants( _rebase_descendants(
ui, repo, state, rebase, amended_ctx, target_ctx, wc_pctx ui, repo, state, rebase, amended_ctx, target_ctx, wc_pctx
) )
# Check out the new tip commit (typically the successor of the
# old working copy parent).
merge.clean_update(repo[b'tip'])
def _rebase_temp_node(ui, repo, state, rebase, temp_ctx, target_ctx): def _rebase_temp_node(ui, repo, state, rebase, temp_ctx, target_ctx):
if b'rebased_temp_node' in state: if b'rebased_temp_node' in state:
return repo.unfiltered()[state[b'rebased_temp_node']] return repo.unfiltered()[state[b'rebased_temp_node']]
elif statemod.ischildunfinished(repo, b'amend', b'rebase'): elif statemod.ischildunfinished(repo, b'amend', b'rebase'):
with ui.silent(), statemod.delegating(repo, b'amend', b'rebase'): with ui.silent(), statemod.delegating(repo, b'amend', b'rebase'):
ret = statemod.continuechild(ui, repo, b'amend', b'rebase') ret = statemod.continuechild(ui, repo, b'amend', b'rebase')
elif temp_ctx.p1() != target_ctx: elif temp_ctx.p1() != target_ctx:

tests/test-amend-rev.t

abort: --rev requires evolution.createmarkers to be enabled abort: --rev requires evolution.createmarkers to be enabled
[20] [20]
Can amend into grandparent Can amend into grandparent
$ hg amend -r 'desc("modify a")' $ hg amend -r 'desc("modify a")'
rebasing 2:42e29cb5ca48 "add b" rebasing 2:42e29cb5ca48 "add b"
$ hg log -G -T '{rev} {desc}' $ hg log -G -T '{rev} {desc}'
o 6 add b (known-bad-output !) @ 6 add b
| |
@ 5 modify a (known-bad-output !) o 5 modify a
| |
o 0 add a o 0 add a
Target commit has new content Target commit has new content
$ hg cat -r 'desc("modify a")' a $ hg cat -r 'desc("modify a")' a
a3 a3
The working copy is clean and there is no unfinished operation The working copy is clean and there is no unfinished operation
$ hg st -v $ hg st -v
$ echo resolved again > a $ echo resolved again > a
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg amend --continue continue: hg amend --continue
$ hg continue $ hg continue
rebasing 1:41c4ea50d4cf "modify a" rebasing 1:41c4ea50d4cf "modify a"
$ hg log -G -T '{rev} {desc}' $ hg log -G -T '{rev} {desc}'
o 5 modify a (known-bad-output !) @ 5 modify a
| |
@ 4 add a (known-bad-output !) o 4 add a
Target commit has new content Target commit has new content
$ hg cat -r 'desc("add a")' a $ hg cat -r 'desc("add a")' a
resolved resolved
The working copy is clean and there is no unfinished operation The working copy is clean and there is no unfinished operation
$ hg st -v $ hg st -v
? a.orig ? a.orig
$ echo resolved again > a $ echo resolved again > a
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg amend --continue continue: hg amend --continue
$ hg continue $ hg continue
already rebased 1:41c4ea50d4cf "modify a" as 79b758e3d369 already rebased 1:41c4ea50d4cf "modify a" as 79b758e3d369
rebasing 2:43217edd8bde "revert a" rebasing 2:43217edd8bde "revert a"
$ hg log -G -T '{rev} {desc}' $ hg log -G -T '{rev} {desc}'
o 7 revert a (known-bad-output !) @ 7 revert a
| |
o 6 modify a o 6 modify a
| |
@ 5 add a (known-bad-output !) o 5 add a
Target commit has new content Target commit has new content
$ hg cat -r 'desc("add a")' a $ hg cat -r 'desc("add a")' a
a3 a3
The working copy is clean and there is no unfinished operation The working copy is clean and there is no unfinished operation
$ hg st -v $ hg st -v
? a.orig ? a.orig