$ cat <<EOF >> $HGRCPATH

  > [extensions]

  > mq =

  > shelve =

  > [defaults]

  > diff = --nodates --git

  > qnew = --date '0 0'

  > EOF

  $ hg init repo

  $ cd repo

  $ mkdir a b

  $ echo a > a/a

  $ echo b > b/b

  $ echo c > c

  $ echo d > d

  $ echo x > x

  $ hg addremove -q

shelve has a help message

  $ hg shelve -h

  hg shelve [OPTION]... [FILE]...

  save and set aside changes from the working directory

      Shelving takes files that "hg status" reports as not clean, saves the

      modifications to a bundle (a shelved change), and reverts the files so

      that their state in the working directory becomes clean.

      To restore these changes to the working directory, using "hg unshelve";

      this will work even if you switch to a different commit.

      When no files are specified, "hg shelve" saves all not-clean files. If

      specific files or directories are named, only changes to those files are

      shelved.

      Each shelved change has a name that makes it easier to find later. The

      name of a shelved change defaults to being based on the active bookmark,

      or if there is no active bookmark, the current named branch.  To specify a

      different name, use "--name".

      To see a list of existing shelved changes, use the "--list" option. For

      each shelved change, this will print its name, age, and description; use "

      --patch" or "--stat" for more details.

      To delete specific shelved changes, use "--delete". To delete all shelved

      changes, use "--cleanup".

  (use "hg help -e shelve" to show help for the shelve extension)

  options ([+] can be repeated):

   -A --addremove           mark new/missing files as added/removed before

                            shelving

      --cleanup             delete all shelved changes

      --date DATE           shelve with the specified commit date

   -d --delete              delete the named shelved change(s)

   -e --edit                invoke editor on commit messages

   -l --list                list current shelves

   -m --message TEXT        use text as shelve message

   -n --name NAME           use the given name for the shelved commit

   -p --patch               show patch

   -i --interactive         interactive mode, only works while creating a shelve

      --stat                output diffstat-style summary of changes

   -I --include PATTERN [+] include names matching the given patterns

   -X --exclude PATTERN [+] exclude names matching the given patterns

      --mq                  operate on patch repository

  (some details hidden, use --verbose to show complete help)

shelving in an empty repo should be possible

(this tests also that editor is not invoked, if '--edit' is not

specified)

  $ HGEDITOR=cat hg shelve

  shelved as default

  0 files updated, 0 files merged, 5 files removed, 0 files unresolved

  $ hg unshelve

  unshelving change 'default'

  $ hg commit -q -m 'initial commit'

  $ hg shelve

  nothing changed

  [1]

create an mq patch - shelving should work fine with a patch applied

  $ echo n > n

  $ hg add n

  $ hg commit n -m second

  $ hg qnew second.patch

shelve a change that we will delete later

  $ echo a >> a/a

  $ hg shelve

  shelved as default

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

set up some more complex changes to shelve

  $ echo a >> a/a

  $ hg mv b b.rename

  moving b/b to b.rename/b (glob)

  $ hg cp c c.copy

  $ hg status -C

  M a/a

  A b.rename/b

    b/b

  A c.copy

    c

  R b/b

prevent some foot-shooting

  $ hg shelve -n foo/bar

  abort: shelved change names may not contain slashes

  [255]

  $ hg shelve -n .baz

  abort: shelved change names may not start with '.'

  [255]

the common case - no options or filenames

  $ hg shelve

  shelved as default-01

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

  $ hg status -C

ensure that our shelved changes exist

  $ hg shelve -l

  default-01      (*)* changes to '[mq]: second.patch' (glob)

  default         (*)* changes to '[mq]: second.patch' (glob)

  $ hg shelve -l -p default

  default         (*)* changes to '[mq]: second.patch' (glob)

  diff --git a/a/a b/a/a

  --- a/a/a

  +++ b/a/a

  @@ -1,1 +1,2 @@

   a

  +a

  $ hg shelve --list --addremove

  abort: options '--list' and '--addremove' may not be used together

  [255]

delete our older shelved change

  $ hg shelve -d default

  $ hg qfinish -a -q

local edits should not prevent a shelved change from applying

  $ printf "z\na\n" > a/a

  $ hg unshelve --keep

  unshelving change 'default-01'

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

  rebasing shelved changes

  rebasing 4:4702e8911fe0 "changes to '[mq]: second.patch'" (tip)

  merging a/a

  $ hg revert --all -q

  $ rm a/a.orig b.rename/b c.copy

apply it and make sure our state is as expected

  $ hg unshelve

  unshelving change 'default-01'

  $ hg status -C

  M a/a

  A b.rename/b

    b/b

  A c.copy

    c

  R b/b

  $ hg shelve -l

  $ hg unshelve

  abort: no shelved changes to apply!

  [255]

  $ hg unshelve foo

  abort: shelved change 'foo' not found

  [255]

named shelves, specific filenames, and "commit messages" should all work

(this tests also that editor is invoked, if '--edit' is specified)

  $ hg status -C

  M a/a

  A b.rename/b

    b/b

  A c.copy

    c

  R b/b

  $ HGEDITOR=cat hg shelve -q -n wibble -m wat -e a

  wat

  HG: Enter commit message.  Lines beginning with 'HG:' are removed.

  HG: Leave message empty to abort commit.

  HG: --

  HG: user: shelve@localhost

  HG: branch 'default'

  HG: changed a/a

expect "a" to no longer be present, but status otherwise unchanged

  $ hg status -C

  A b.rename/b

    b/b

  A c.copy

    c

  R b/b

  $ hg shelve -l --stat

  wibble          (*)    wat (glob)

   a/a |  1 +

   1 files changed, 1 insertions(+), 0 deletions(-)

and now "a/a" should reappear

  $ cd a

  $ hg unshelve -q wibble

  $ cd ..

  $ hg status -C

  M a/a

  A b.rename/b

    b/b

  A c.copy

    c

  R b/b

cause unshelving to result in a merge with 'a' conflicting

  $ hg shelve -q

  $ echo c>>a/a

  $ hg commit -m second

  $ hg tip --template '{files}\n'

  a/a

add an unrelated change that should be preserved

  $ mkdir foo

  $ echo foo > foo/foo

  $ hg add foo/foo

force a conflicted merge to occur

  $ hg unshelve

  unshelving change 'default'

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

  rebasing shelved changes

  rebasing 5:4702e8911fe0 "changes to '[mq]: second.patch'" (tip)

  merging a/a

  warning: conflicts during merge.

  merging a/a incomplete! (edit conflicts, then use 'hg resolve --mark')

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

  [1]

ensure that we have a merge with unresolved conflicts

  $ hg heads -q --template '{rev}\n'

  5

  4

  $ hg parents -q --template '{rev}\n'

  4

  5

  $ hg status

  M a/a

  M b.rename/b

  M c.copy

  R b/b

  ? a/a.orig

  $ hg diff

  diff --git a/a/a b/a/a

  --- a/a/a

  +++ b/a/a

  @@ -1,2 +1,6 @@

   a

  +<<<<<<< dest:   *  - shelve: pending changes temporary commit (glob)

   c

  +=======

  +a

  +>>>>>>> source: 4702e8911fe0 - shelve: changes to '[mq]: second.patch'

  diff --git a/b/b b/b.rename/b

  rename from b/b

  rename to b.rename/b

  diff --git a/c b/c.copy

  copy from c

  copy to c.copy

  $ hg resolve -l

  U a/a

  $ hg shelve

  abort: unshelve already in progress

  (use 'hg unshelve --continue' or 'hg unshelve --abort')

  [255]

abort the unshelve and be happy

  $ hg status

  M a/a

  M b.rename/b

  M c.copy

  R b/b

  ? a/a.orig

  $ hg unshelve -a

  rebase aborted

  unshelve of 'default' aborted

  $ hg heads -q

  3:2e69b451d1ea

  $ hg parents

  changeset:   3:2e69b451d1ea

  tag:         tip

  user:        test

  date:        Thu Jan 01 00:00:00 1970 +0000

  summary:     second

  $ hg resolve -l

  $ hg status

  A foo/foo

  ? a/a.orig

try to continue with no unshelve underway

  $ hg unshelve -c

  abort: no unshelve operation underway

  [255]

  $ hg status

  A foo/foo

  ? a/a.orig

redo the unshelve to get a conflict

  $ hg unshelve -q

  warning: conflicts during merge.

  merging a/a incomplete! (edit conflicts, then use 'hg resolve --mark')

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

  [1]

attempt to continue

  $ hg unshelve -c

  abort: unresolved conflicts, can't continue

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

  [255]

  $ hg revert -r . a/a

  $ hg resolve -m a/a

  (no more unresolved files)

  $ hg commit -m 'commit while unshelve in progress'

  abort: unshelve already in progress

  (use 'hg unshelve --continue' or 'hg unshelve --abort')

  [255]

  $ hg unshelve -c

  rebasing 5:4702e8911fe0 "changes to '[mq]: second.patch'" (tip)

  unshelve of 'default' complete

ensure the repo is as we hope

  $ hg parents

  changeset:   3:2e69b451d1ea

  tag:         tip

  user:        test

  date:        Thu Jan 01 00:00:00 1970 +0000

  summary:     second

  $ hg heads -q

  3:2e69b451d1ea

  $ hg status -C

  A b.rename/b

    b/b

  A c.copy

    c

  A foo/foo

  R b/b

  ? a/a.orig

there should be no shelves left

  $ hg shelve -l

#if execbit

ensure that metadata-only changes are shelved