shelve: add a shelve extension to save/restore working changes
This extension saves shelved changes using a temporary draft commit,
and bundles the temporary commit and its draft ancestors, then
strips them.
This strategy makes it possible to use Mercurial's bundle and merge
machinery to resolve conflicts if necessary when unshelving, even
when the destination commit or its ancestors have been amended,
squashed, or evolved. (Once a change has been unshelved, its
associated unbundled commits are either rolled back or stripped.)
Storing the shelved change as a bundle also avoids the difficulty
that hidden commits would cause, of making it impossible to amend
the parent if it is a draft commits (a common scenario).
Although this extension shares its name and some functionality with
the third party hgshelve extension, it has little else in common.
Notably, the hgshelve extension shelves changes as unified diffs,
which makes conflict resolution a matter of finding .rej files and
conflict markers, and cleaning up the mess by hand.
We do not yet allow hunk-level choosing of changes to record.
Compared to the hgshelve extension, this is a small regression in
usability, but we hope to integrate that at a later point, once the
record machinery becomes more reusable and robust.
run only on case-sensitive filesystems
$ "$TESTDIR/hghave" no-icasefs || exit 80
test file addition with colliding case
$ hg init repo1
$ cd repo1
$ echo a > a
$ echo A > A
$ hg add a
$ hg st
A a
? A
$ hg add --config ui.portablefilenames=abort A
abort: possible case-folding collision for A
[255]
$ hg st
A a
? A
$ hg add A
warning: possible case-folding collision for A
$ hg st
A A
A a
$ hg forget A
$ hg st
A a
? A
$ hg add --config ui.portablefilenames=no A
$ hg st
A A
A a
$ mkdir b
$ touch b/c b/D
$ hg add b
adding b/D
adding b/c
$ touch b/d b/C
$ hg add b/C
warning: possible case-folding collision for b/C
$ hg add b/d
warning: possible case-folding collision for b/d
$ touch b/a1 b/a2
$ hg add b
adding b/a1
adding b/a2
$ touch b/A2 b/a1.1
$ hg add b/a1.1 b/A2
warning: possible case-folding collision for b/A2
$ touch b/f b/F
$ hg add b/f b/F
warning: possible case-folding collision for b/f
$ touch g G
$ hg add g G
warning: possible case-folding collision for g
$ mkdir h H
$ touch h/x H/x
$ hg add h/x H/x
warning: possible case-folding collision for h/x
$ touch h/s H/s
$ hg add h/s
$ hg add H/s
warning: possible case-folding collision for H/s
case changing rename must not warn or abort
$ echo c > c
$ hg ci -qAmx
$ hg mv c C
$ cd ..