merge-halt: demonstrate unshelve issue with merge.on-failure=halt

Differential Revision: https://phab.mercurial-scm.org/D11705

tests/test-merge-halt.t

@@ -1,164 +1,218 b''
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > rebase=
   > [phases]
   > publish=False
   > [merge]
   > EOF
 
   $ hg init repo
   $ cd repo
   $ echo a > a
   $ echo b > b
   $ hg commit -qAm ab
   $ echo c >> a
   $ echo c >> b
   $ hg commit -qAm c
   $ hg up -q ".^"
   $ echo d >> a
   $ echo d >> b
   $ hg commit -qAm d
 
 Testing on-failure=continue
   $ echo on-failure=continue >> $HGRCPATH
   $ hg rebase -s 1 -d 2 --tool false
   rebasing 1:1f28a51c3c9b "c"
   merging a
   merging b
   merging a failed!
   merging b failed!
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   [240]
 
   $ hg resolve --list
   U a
   U b
 
   $ hg rebase --abort
   rebase aborted
 
 Testing on-failure=halt
   $ echo on-failure=halt >> $HGRCPATH
   $ hg rebase -s 1 -d 2 --tool false
   rebasing 1:1f28a51c3c9b "c"
   merging a
   merging b
   merging a failed!
   merge halted after failed merge (see hg resolve)
   [240]
 
   $ hg resolve --list
   U a
   U b
 
   $ hg rebase --abort
   rebase aborted
 
 Testing on-failure=prompt
   $ cat <<EOS >> $HGRCPATH
   > [merge]
   > on-failure=prompt
   > [ui]
   > interactive=1
   > EOS
   $ cat <<EOS | hg rebase -s 1 -d 2 --tool false
   > y
   > n
   > EOS
   rebasing 1:1f28a51c3c9b "c"
   merging a
   merging b
   merging a failed!
   continue merge operation (yn)? y
   merging b failed!
   continue merge operation (yn)? n
   merge halted after failed merge (see hg resolve)
   [240]
 
   $ hg resolve --list
   U a
   U b
 
   $ hg rebase --abort
   rebase aborted
 
 Check that successful tool with failed post-check halts the merge
   $ cat <<EOS >> $HGRCPATH
   > [merge-tools]
   > true.check=changed
   > EOS
   $ cat <<EOS | hg rebase -s 1 -d 2 --tool true
   > y
   > n
   > n
   > EOS
   rebasing 1:1f28a51c3c9b "c"
   merging a
   merging b
    output file a appears unchanged
   was merge successful (yn)? y
    output file b appears unchanged
   was merge successful (yn)? n
   merging b failed!
   continue merge operation (yn)? n
   merge halted after failed merge (see hg resolve)
   [240]
 
   $ hg resolve --list
   R a
   U b
 
   $ hg rebase --abort
   rebase aborted
 
 Check that conflicts with conflict check also halts the merge
   $ cat <<EOS >> $HGRCPATH
   > [merge-tools]
   > true.check=conflicts
   > true.premerge=keep
   > [merge]
   > on-failure=halt
   > EOS
   $ hg rebase -s 1 -d 2 --tool true
   rebasing 1:1f28a51c3c9b "c"
   merging a
   merging b
   merging a failed!
   merge halted after failed merge (see hg resolve)
   [240]
 
   $ hg resolve --list
   U a
   U b
 
   $ hg rebase --abort
   rebase aborted
 
 Check that always-prompt also can halt the merge
   $ cat <<EOS | hg rebase -s 1 -d 2 --tool true --config merge-tools.true.check=prompt
   > y
   > n
   > EOS
   rebasing 1:1f28a51c3c9b "c"
   merging a
   merging b
   was merge of 'a' successful (yn)? y
   was merge of 'b' successful (yn)? n
   merging b failed!
   merge halted after failed merge (see hg resolve)
   [240]
 
   $ hg resolve --list
   R a
   U b
 
   $ hg rebase --abort
   rebase aborted
 
 Check that successful tool otherwise allows the merge to continue
   $ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep
   rebasing 1:1f28a51c3c9b "c"
   merging a
   merging b
   $TESTTMP/repo/a *a~base* *a~other* (glob)
   $TESTTMP/repo/b *b~base* *b~other* (glob)
+
+Check that unshelve isn't broken by halting the merge
+  $ cat <<EOS >> $HGRCPATH
+  > [extensions]
+  > shelve =
+  > EOS
+  $ echo foo > shelve_file1
+  $ echo foo > shelve_file2
+  $ hg ci -qAm foo
+  $ echo bar >> shelve_file1
+  $ echo bar >> shelve_file2
+  $ hg shelve --list
+  $ hg shelve
+  shelved as default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo baz >> shelve_file1
+  $ echo baz >> shelve_file2
+  $ hg ci -m baz
+  $ hg unshelve --tool false --config merge-tools.false.premerge=keep
+  unshelving change 'default'
+  rebasing shelved changes
+  merging shelve_file1
+  merging shelve_file2
+  merging shelve_file1 failed!
+  merge halted after failed merge (see hg resolve)
+  [240]
+FIXME: This should claim it's in an 'unshelve' state
+  $ hg status --config commands.status.verbose=True
+  M shelve_file1
+  M shelve_file2
+  ? shelve_file1.orig
+  ? shelve_file2.orig
+  # The repository is in an unfinished *update* state.
+  
+  # Unresolved merge conflicts:
+  # 
+  #     shelve_file1
+  #     shelve_file2
+  # 
+  # To mark files as resolved:  hg resolve --mark FILE
+  
+  # To continue:    hg update .
+  
+FIXME: This should not be referencing a stripped commit.
+  $ hg resolve --tool false --all --re-merge
+  abort: unknown revision '4a1d727ea5bb6aed9adfacb2a8f776bae44301d6'
+  [255]
+Ensure the shelve is still around, since we haven't finished the operation yet.
+  $ hg shelve --list
+  default         (* ago)    changes to: foo (glob)
+FIXME: `hg unshelve --abort` should work.
+  $ hg unshelve --abort
+  abort: no unshelve in progress
+  [20]