#testcases stripbased phasebased

#testcases abortflag abortcommand

#testcases continueflag continuecommand

  $ cat <<EOF >> $HGRCPATH

  > [extensions]

  > mq =

  > [defaults]

  > diff = --nodates --git

  > qnew = --date '0 0'

  > [shelve]

  > maxbackups = 2

  > EOF

#if phasebased

  $ cat <<EOF >> $HGRCPATH

  > [format]

  > use-internal-phase = yes

  > EOF

#endif

#if abortflag

  $ cat >> $HGRCPATH <<EOF

  > [alias]

  > abort = unshelve --abort

  > EOF

#endif

#if continueflag

  $ cat >> $HGRCPATH <<EOF

  > [alias]

  > continue = unshelve --continue

  > EOF

#endif

shelve should leave dirstate clean (issue4055)

  $ hg init shelverebase

  $ cd shelverebase

  $ printf 'x\ny\n' > x

  $ echo z > z

  $ hg commit -Aqm xy

  $ echo z >> x

  $ hg commit -Aqm z

  $ hg up 5c4c67fb7dce

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ printf 'a\nx\ny\nz\n' > x

  $ hg commit -Aqm xyz

  $ echo c >> z

  $ hg shelve

  shelved as default

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg rebase -d 6c103be8f4e4 --config extensions.rebase=

  rebasing 2:323bfa07f744( tip)? "xyz" (re)

  merging x

  saved backup bundle to \$TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-(78114325|7ae538ef)-rebase.hg (re)

  $ hg unshelve

  unshelving change 'default'

  rebasing shelved changes

  $ hg status

  M z

  $ cd ..

shelve should only unshelve pending changes (issue4068)

  $ hg init onlypendingchanges

  $ cd onlypendingchanges

  $ touch a

  $ hg ci -Aqm a

  $ touch b

  $ hg ci -Aqm b

  $ hg up -q 3903775176ed

  $ touch c

  $ hg ci -Aqm c

  $ touch d

  $ hg add d

  $ hg shelve

  shelved as default

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg up -q 0e067c57feba

  $ hg unshelve

  unshelving change 'default'

  rebasing shelved changes

  $ hg status

  A d

unshelve should work on an ancestor of the original commit

  $ hg shelve

  shelved as default

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg up 3903775176ed

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg unshelve

  unshelving change 'default'

  rebasing shelved changes

  $ hg status

  A d

test bug 4073 we need to enable obsolete markers for it

  $ cat >> $HGRCPATH << EOF

  > [experimental]

  > evolution.createmarkers=True

  > EOF

  $ hg shelve

  shelved as default

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg debugobsolete `hg log -r 0e067c57feba -T '{node}'`

  1 new obsolescence markers

  obsoleted 1 changesets

  $ hg unshelve

  unshelving change 'default'

unshelve should leave unknown files alone (issue4113)

  $ echo e > e

  $ hg shelve

  shelved as default

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg status

  ? e

  $ hg unshelve

  unshelving change 'default'

  $ hg status

  A d

  ? e

  $ cat e

  e

unshelve should keep a copy of unknown files

  $ hg add e

  $ hg shelve

  shelved as default

  0 files updated, 0 files merged, 2 files removed, 0 files unresolved

  $ echo z > e

  $ hg unshelve

  unshelving change 'default'

  $ cat e

  e

  $ cat e.orig

  z

  $ rm e.orig

restores backup of unknown file to right directory

  $ hg shelve

  shelved as default

  0 files updated, 0 files merged, 2 files removed, 0 files unresolved

  $ echo z > e

  $ mkdir dir

  $ hg unshelve --cwd dir

  unshelving change 'default'

  $ rmdir dir

  $ cat e

  e

  $ cat e.orig

  z

unshelve and conflicts with tracked and untracked files

 preparing:

  $ rm -f *.orig

  $ hg ci -qm 'commit stuff'

  $ hg phase -p null:

 no other changes - no merge:

  $ echo f > f

  $ hg add f

  $ hg shelve

  shelved as default

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ echo g > f

  $ hg unshelve

  unshelving change 'default'

  $ hg st

  A f

  ? f.orig

  $ cat f

  f

  $ cat f.orig

  g

 other uncommitted changes - merge:

  $ hg st

  A f

  ? f.orig

  $ hg shelve

  shelved as default

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

#if repobundlerepo

  $ hg log -G --template '{rev}  {desc|firstline}  {author}' -R bundle://.hg/shelved/default.hg -r 'bundle()' --hidden

  o  [48]  changes to: commit stuff  shelve@localhost (re)

  |

  ~

#endif

  $ hg log -G --template '{rev}  {desc|firstline}  {author}'

  @  [37]  commit stuff  test (re)

  |

  | o  2  c  test

  |/

  o  0  a  test

  $ mv f.orig f

  $ echo 1 > a

  $ hg unshelve --date '1073741824 0'

  unshelving change 'default'

  temporarily committing pending changes (restore with 'hg unshelve --abort')

  rebasing shelved changes

  merging f

  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')

  unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')

  [240]

#if phasebased

  $ hg log -G --template '{rev}  {desc|firstline}  {author}  {date|isodate}'

  @  9  pending changes temporary commit  shelve@localhost  2004-01-10 13:37 +0000

  |

  | @  8  changes to: commit stuff  shelve@localhost  1970-01-01 00:00 +0000

  |/

  o  7  commit stuff  test  1970-01-01 00:00 +0000

  |

  | o  2  c  test  1970-01-01 00:00 +0000

  |/

  o  0  a  test  1970-01-01 00:00 +0000

#endif

#if stripbased

  $ hg log -G --template '{rev}  {desc|firstline}  {author}  {date|isodate}'

  @  5  changes to: commit stuff  shelve@localhost  1970-01-01 00:00 +0000

  |

  | @  4  pending changes temporary commit  shelve@localhost  2004-01-10 13:37 +0000

  |/

  o  3  commit stuff  test  1970-01-01 00:00 +0000

  |

  | o  2  c  test  1970-01-01 00:00 +0000

  |/

  o  0  a  test  1970-01-01 00:00 +0000

#endif

  $ hg st

  M f

  ? f.orig

  $ cat f

  <<<<<<< working-copy:   d44eae5c3d33 - shelve: pending changes temporary commit

  g

  =======

  f

  >>>>>>> shelved change: aef214a5229c - shelve: changes to: commit stuff

  $ cat f.orig

  g

  $ hg unshelve --abort -t false

  tool option will be ignored

  unshelve of 'default' aborted

  $ hg st

  M a

  ? f.orig

  $ cat f.orig

  g

  $ hg unshelve

  unshelving change 'default'

  temporarily committing pending changes (restore with 'hg unshelve --abort')

  rebasing shelved changes

  $ hg st

  M a

  A f

  ? f.orig

 other committed changes - merge:

  $ hg shelve f

  shelved as default

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg ci a -m 'intermediate other change'

  $ mv f.orig f

  $ hg unshelve

  unshelving change 'default'

  rebasing shelved changes

  merging f

  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')

  unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')

  [240]

  $ hg st

  M f

  ? f.orig

  $ cat f

  <<<<<<< working-copy:   6b563750f973 - test: intermediate other change

  g

  =======

  f

  >>>>>>> shelved change: aef214a5229c - shelve: changes to: commit stuff

  $ cat f.orig

  g

#if abortcommand

when in dry-run mode

  $ hg abort --dry-run

  unshelve in progress, will be aborted

#endif

  $ hg abort

  unshelve of 'default' aborted

  $ hg st

  ? f.orig

  $ cat f.orig

  g

  $ hg shelve --delete default

  $ cd ..

you shouldn't be able to ask for the patch/stats of the most recent shelve if

there are no shelves

  $ hg init noshelves

  $ cd noshelves

  $ hg shelve --patch

  abort: there are no shelves to show

  [255]

  $ hg shelve --stat

  abort: there are no shelves to show

  [255]

  $ cd ..

test .orig files go where the user wants them to

---------------------------------------------------------------

  $ hg init salvage

  $ cd salvage

  $ echo 'content' > root

  $ hg commit -A -m 'root' -q

  $ echo '' > root

  $ hg shelve -q

  $ echo 'contADDent' > root

  $ hg unshelve -q --config 'ui.origbackuppath=.hg/origbackups'

  warning: conflicts while merging root! (edit, then use 'hg resolve --mark')

  unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')

  [240]

  $ ls .hg/origbackups

  root

  $ rm -rf .hg/origbackups

test Abort unshelve always gets user out of the unshelved state

---------------------------------------------------------------

with a corrupted shelve state file

  $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate

  $ mv ../corrupt-shelvedstate .hg/shelvestate

  $ hg unshelve --abort 2>&1 | grep 'aborted'

  unshelve of 'default' aborted

  $ hg summary

  parent: 0:ae8c668541e8 tip

   root

  branch: default

  commit: 1 modified

  update: (current)

  phases: 1 draft

  $ hg up -C .

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ cd ..

Shelve and unshelve unknown files. For the purposes of unshelve, a shelved

unknown file is the same as a shelved added file, except that it will be in

unknown state after unshelve if and only if it was either absent or unknown

before the unshelve operation.

  $ hg init unknowns

  $ cd unknowns

The simplest case is if I simply have an unknown file that I shelve and unshelve

  $ echo unknown > unknown

  $ hg status

  ? unknown

  $ hg shelve --unknown

  shelved as default

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg status

  $ hg unshelve