( )⚙ D6354 absorb: be more specific when erroring out on merge commit

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6354

absorb: be more specific when erroring out on merge commit
ClosedPublic

Authored by martinvonz on May 9 2019, 12:25 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb3fc78c028ef: absorb: be more specific when erroring out on merge commit
Summary

When you have a merge commit checked out and run hg absorb, it would
tell you

abort: no mutable changeset to change

That makes it sound like the problem is public commits when isn't
really. Let's be more specific in this case.

There was already a test case that test this, so that now prints the
new message. I added a new test case that shows the old message (when
a public commit is checked out).

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.

Event Timeline

martinvonz created this revision.May 9 2019, 12:25 AM
pulkit accepted this revision.May 9 2019, 5:25 AM
Closed by commit rHGb3fc78c028ef: absorb: be more specific when erroring out on merge commit (authored by martinvonz). · Explain WhyMay 9 2019, 6:06 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/absorb.py (5 lines)
Mtests/test-absorb.t (13 lines)

Diff 15044

hgext/absorb.py

"""pick fixup chunks from targetctx, apply them to stack. """pick fixup chunks from targetctx, apply them to stack.
if targetctx is None, the working copy context will be used. if targetctx is None, the working copy context will be used.
if stack is None, the current draft stack will be used. if stack is None, the current draft stack will be used.
return fixupstate. return fixupstate.
""" """
if stack is None: if stack is None:
limit = ui.configint('absorb', 'max-stack-size') limit = ui.configint('absorb', 'max-stack-size')
stack = getdraftstack(repo['.'], limit) headctx = repo['.']
if len(headctx.parents()) > 1:
raise error.Abort(_('cannot absorb into a merge'))
stack = getdraftstack(headctx, limit)
if limit and len(stack) >= limit: if limit and len(stack) >= limit:
ui.warn(_('absorb: only the recent %d changesets will ' ui.warn(_('absorb: only the recent %d changesets will '
'be analysed\n') 'be analysed\n')
% limit) % limit)
if not stack: if not stack:
raise error.Abort(_('no mutable changeset to change')) raise error.Abort(_('no mutable changeset to change'))
if targetctx is None: # default to working copy if targetctx is None: # default to working copy
targetctx = repo[None] targetctx = repo[None]

tests/test-absorb.t

$ sedi 's/insert/INSERT/' a $ sedi 's/insert/INSERT/' a
$ hg absorb -q --apply-changes $ hg absorb -q --apply-changes
$ hg status $ hg status
$ hg bookmarks $ hg bookmarks
b1 1:a4183e9b3d31 b1 1:a4183e9b3d31
b2 2:c9b20c925790 b2 2:c9b20c925790
* ba 2:c9b20c925790 * ba 2:c9b20c925790
Non-mofified files are ignored: Non-modified files are ignored:
$ touch b $ touch b
$ hg commit -A b -m b $ hg commit -A b -m b
$ touch c $ touch c
$ hg add c $ hg add c
$ hg rm b $ hg rm b
$ hg absorb --apply-changes $ hg absorb --apply-changes
nothing applied nothing applied
-Insert before 2b -Insert before 2b
+insert before 2b +insert before 2b
$ hg annotate a $ hg annotate a
1: Insert before 2b 1: Insert before 2b
1: 2b 1: 2b
2: 4d 2: 4d
2: insert aftert 4d 2: insert aftert 4d
$ hg co -qC 1
$ sedi 's/Insert/insert/' a
$ hg absorb --apply-changes
abort: no mutable changeset to change
[255]
Make working copy clean: Make working copy clean:
$ hg revert -q -C a b $ hg co -qC ba
$ hg forget c
$ rm c $ rm c
$ hg status $ hg status
Merge commit will not be changed: Merge commit will not be changed:
$ echo 1 > m1 $ echo 1 > m1
$ hg commit -A m1 -m m1 $ hg commit -A m1 -m m1
$ hg bookmark -q -i m1 $ hg bookmark -q -i m1
| |
o 1 commit 2 public o 1 commit 2 public
| |
o 0 commit 1 public o 0 commit 1 public
$ echo 2 >> m1 $ echo 2 >> m1
$ echo 2 >> m2 $ echo 2 >> m2
$ hg absorb --apply-changes $ hg absorb --apply-changes
abort: no mutable changeset to change abort: cannot absorb into a merge
[255] [255]
$ hg revert -q -C m1 m2 $ hg revert -q -C m1 m2
Use a new repo: Use a new repo:
$ cd .. $ cd ..
$ hg init repo2 $ hg init repo2
$ cd repo2 $ cd repo2