pick: remove transaction on the whole command (issue6037)
At its core, pick is a pretty straightforward and well-behaving command, it
uses functions already in core hg, it checks that wdir is clean and that
changeset to pick is not public, it checks if there happen to be merge
conflicts and can be --continue'd later, etc.
It is very similar to graft in core (it also uses mergemod.graft function), but
it obsoletes the original changeset. However, graft does not experience this
incorrect behavior from issue 6037.
What happens in the test case for this issue when we pick a revision that
touches both "a" and "b": mergemod.graft() takes the original changeset and
tries to apply it to the wdir, which results in "b" being marked as newly added
and ready to be committed, "a" updated with the new content and being marked as
modified, but "a" also has conflicts. Pick correctly notices this and saves its
state before asking for user intervention. So far so good. However, when the
command raises InterventionRequired to print a user-facing message and exit
while being wrapped in repo.transaction() context manager, the latter partially
undoes what mergemod.graft() did: it unmarks "b" as added. And when user
continues pick, "b" is therefore not tracked and is not included in the
resulting commit.
The transaction is not useful here, because it doesn't touch wdir (it's still
dirty), it doesn't remove pickstate (and other commands will refuse to work
until pick --abort or --continue), it just makes "b" untracked.
The solution is to use repo.transaction() only to wrap code that writes data to
hg store in the final stages of the command after all checks have passed and is
not expected to fail on trivial cases like merge conflicts. For example,
committing the picked changeset. But since pick uses repo.commit() for that,
and because that function already uses a transaction, wrapping it in another
transaction doesn't make sense.
=======================================================
Tests the resolution of orphan changesets: corner cases
=======================================================
Setup
=====
$ cat >> $HGRCPATH <<EOF
> [alias]
> glog = log -GT "{rev}:{node|short} {desc|firstline}\n {phase} {troubles}\n\n"
> [phases]
> publish = False
> [extensions]
> rebase =
> EOF
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
$ glog() {
> hg log -G --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@"
> }
Test to make sure that `lastsolved` always has correct value and things don't break:
------------------------------------------------------------------------------------
(before we were not updating it in case of orphan merge)
Prepare the repo:
$ hg init orphanmergerepo
$ cd orphanmergerepo
$ for fn in a b c; do echo foo > $fn; hg ci -Am "added "$fn; done;
adding a
adding b
adding c
Let's create a merge commit so that we can create orphan merge later:
$ hg up 1 -q
$ echo feature > f
$ hg ci -Am "added feature f"
adding f
created new head
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "merge feature branch"
$ glog
@ 4:2c0a98d38026@default(draft) merge feature branch
|\
| o 3:4c33e511041e@default(draft) added feature f
| |
o | 2:8be98ac1a569@default(draft) added c
|/
o 1:80e6d2c47cfe@default(draft) added b
|
o 0:f7ad41964313@default(draft) added a
Now make the parents of merge commit obsolete to get a orphan merge:
$ hg up 2 -q
$ echo "fixit" > c
$ hg ci --amend -m "updated c"
1 new orphan changesets
$ hg up 3 -q
$ echo "fixit" > c
$ hg ci --amend -m "updated f"
$ glog
@ 6:086d9bedcd75@default(draft) updated f
|
| o 5:f84f2c548fbc@default(draft) updated c
|/
| * 4:2c0a98d38026@default(draft) merge feature branch
| |\
+---x 3:4c33e511041e@default(draft) added feature f
| |
| x 2:8be98ac1a569@default(draft) added c
|/
o 1:80e6d2c47cfe@default(draft) added b
|
o 0:f7ad41964313@default(draft) added a
To check `lastsolved` contain right value after completion of orphan-merge
resolution there should be one more instability to be evolved; lets create one:
$ hg up 1 -q
$ echo d > d
$ hg ci -Am "added d"
adding c
adding d
created new head
$ echo e > e
$ hg ci -Am "added e"
adding e
$ hg up .^
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "updated d" >> d
$ hg ci --amend -m "updated d"
1 new orphan changesets
$ glog
@ 9:7c4d1834c346@default(draft) updated d
|
| * 8:421f7614462a@default(draft) added e
| |
| x 7:afe5acea1990@default(draft) added d
|/
| o 6:086d9bedcd75@default(draft) updated f
|/
| o 5:f84f2c548fbc@default(draft) updated c
|/
| * 4:2c0a98d38026@default(draft) merge feature branch
| |\
+---x 3:4c33e511041e@default(draft) added feature f
| |
| x 2:8be98ac1a569@default(draft) added c
|/
o 1:80e6d2c47cfe@default(draft) added b
|
o 0:f7ad41964313@default(draft) added a
Now we have one orphan merge and one more orphan cset that we just created.
Lets evolve:
$ hg evolve --all --any
move:[4] merge feature branch
atop:[5] updated c
move:[10] merge feature branch
atop:[6] updated f
move:[8] added e
atop:[9] updated d