test-shelve.t
662 lines
| 13.4 KiB
| text/troff
|
Tads3Lexer
/ tests / test-shelve.t
|
r19854 | $ echo "[extensions]" >> $HGRCPATH | ||
|
r19856 | $ echo "mq=" >> $HGRCPATH | ||
|
r19854 | $ echo "shelve=" >> $HGRCPATH | ||
$ echo "[defaults]" >> $HGRCPATH | ||||
$ echo "diff = --nodates --git" >> $HGRCPATH | ||||
|
r19856 | $ echo "qnew = --date '0 0'" >> $HGRCPATH | ||
|
r19854 | |||
$ 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 | ||||
shelving in an empty repo should be possible | ||||
$ 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] | ||||
|
r19856 | create an mq patch - shelving should work fine with a patch applied | ||
|
r19854 | |||
$ echo n > n | ||||
$ hg add n | ||||
$ hg commit n -m second | ||||
|
r19856 | $ hg qnew second.patch | ||
|
r19854 | |||
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 | ||||
|
r20411 | default-01 (*) changes to '[mq]: second.patch' (glob) | ||
default (*) changes to '[mq]: second.patch' (glob) | ||||
|
r19854 | |||
$ hg shelve -l -p default | ||||
|
r20411 | default (*) changes to '[mq]: second.patch' (glob) | ||
|
r19854 | |||
diff --git a/a/a b/a/a | ||||
--- a/a/a | ||||
+++ b/a/a | ||||
@@ -1,1 +1,2 @@ | ||||
a | ||||
+a | ||||
delete our older shelved change | ||||
$ hg shelve -d default | ||||
|
r19856 | $ hg qfinish -a -q | ||
|
r19854 | |||
|
r19961 | local edits should not prevent a shelved change from applying | ||
|
r19854 | |||
|
r19961 | $ printf "z\na\n" > a/a | ||
$ hg unshelve --keep | ||||
|
r19854 | unshelving change 'default-01' | ||
|
r20413 | temporarily committing pending changes (restore with 'hg unshelve --abort') | ||
rebasing shelved changes | ||||
|
r19961 | merging a/a | ||
|
r19854 | |||
|
r19961 | $ hg revert --all -q | ||
$ rm a/a.orig b.rename/b c.copy | ||||
|
r19854 | |||
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 | ||||
$ hg status -C | ||||
M a/a | ||||
A b.rename/b | ||||
b/b | ||||
A c.copy | ||||
c | ||||
R b/b | ||||
$ hg shelve -q -n wibble -m wat 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 | ||||
|
r19855 | wibble (*) wat (glob) | ||
|
r19854 | a/a | 1 + | ||
1 files changed, 1 insertions(+), 0 deletions(-) | ||||
and now "a/a" should reappear | ||||
|
r19943 | $ cd a | ||
|
r19854 | $ hg unshelve -q wibble | ||
|
r19943 | $ cd .. | ||
|
r19854 | $ 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' | ||||
|
r20413 | temporarily committing pending changes (restore with 'hg unshelve --abort') | ||
rebasing shelved changes | ||||
|
r19854 | 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 | ||||
|
r19961 | $ hg heads -q --template '{rev}\n' | ||
5 | ||||
4 | ||||
$ hg parents -q --template '{rev}\n' | ||||
4 | ||||
5 | ||||
|
r19854 | $ 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 | ||||
+<<<<<<< local | ||||
c | ||||
+======= | ||||
+a | ||||
+>>>>>>> other | ||||
diff --git a/b.rename/b b/b.rename/b | ||||
|
r19973 | new file mode 100644 | ||
|
r19854 | --- /dev/null | ||
+++ b/b.rename/b | ||||
@@ -0,0 +1,1 @@ | ||||
+b | ||||
diff --git a/b/b b/b/b | ||||
deleted file mode 100644 | ||||
--- a/b/b | ||||
+++ /dev/null | ||||
@@ -1,1 +0,0 @@ | ||||
-b | ||||
diff --git a/c.copy b/c.copy | ||||
|
r19973 | new file mode 100644 | ||
|
r19854 | --- /dev/null | ||
+++ b/c.copy | ||||
@@ -0,0 +1,1 @@ | ||||
+c | ||||
$ 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 | ||||
|
r19961 | rebase aborted | ||
|
r19854 | unshelve of 'default' aborted | ||
$ hg heads -q | ||||
|
r19856 | 3:2e69b451d1ea | ||
|
r19854 | $ hg parents | ||
|
r19856 | changeset: 3:2e69b451d1ea | ||
|
r19854 | 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 | ||||
|
r19963 | $ hg commit -m 'commit while unshelve in progress' | ||
abort: unshelve already in progress | ||||
(use 'hg unshelve --continue' or 'hg unshelve --abort') | ||||
[255] | ||||
|
r19854 | $ hg unshelve -c | ||
unshelve of 'default' complete | ||||
ensure the repo is as we hope | ||||
$ hg parents | ||||
|
r19856 | changeset: 3:2e69b451d1ea | ||
|
r19854 | tag: tip | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: second | ||||
$ hg heads -q | ||||
|
r19856 | 3:2e69b451d1ea | ||
|
r19854 | |||
$ hg status -C | ||||
|
r19961 | A b.rename/b | ||
|
r19854 | b/b | ||
|
r19961 | A c.copy | ||
|
r19854 | 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 | ||||
$ chmod +x a/a | ||||
$ hg shelve -q -n execbit a/a | ||||
$ hg status a/a | ||||
$ hg unshelve -q execbit | ||||
$ hg status a/a | ||||
M a/a | ||||
$ hg revert a/a | ||||
#endif | ||||
#if symlink | ||||
$ rm a/a | ||||
$ ln -s foo a/a | ||||
$ hg shelve -q -n symlink a/a | ||||
$ hg status a/a | ||||
$ hg unshelve -q symlink | ||||
$ hg status a/a | ||||
M a/a | ||||
$ hg revert a/a | ||||
#endif | ||||
set up another conflict between a commit and a shelved change | ||||
$ hg revert -q -C -a | ||||
|
r19961 | $ rm a/a.orig b.rename/b c.copy | ||
|
r19854 | $ echo a >> a/a | ||
$ hg shelve -q | ||||
$ echo x >> a/a | ||||
$ hg ci -m 'create conflict' | ||||
$ hg add foo/foo | ||||
if we resolve a conflict while unshelving, the unshelve should succeed | ||||
$ HGMERGE=true hg unshelve | ||||
unshelving change 'default' | ||||
|
r20413 | temporarily committing pending changes (restore with 'hg unshelve --abort') | ||
rebasing shelved changes | ||||
|
r19854 | merging a/a | ||
$ hg parents -q | ||||
|
r19887 | 4:33f7f61e6c5e | ||
|
r19854 | $ hg shelve -l | ||
$ hg status | ||||
A foo/foo | ||||
$ cat a/a | ||||
a | ||||
c | ||||
x | ||||
test keep and cleanup | ||||
$ hg shelve | ||||
shelved as default | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg shelve --list | ||||
|
r20411 | default (*) changes to 'create conflict' (glob) | ||
|
r19854 | $ hg unshelve --keep | ||
unshelving change 'default' | ||||
$ hg shelve --list | ||||
|
r20411 | default (*) changes to 'create conflict' (glob) | ||
|
r19854 | $ hg shelve --cleanup | ||
$ hg shelve --list | ||||
|
r19874 | |||
test bookmarks | ||||
$ hg bookmark test | ||||
$ hg bookmark | ||||
|
r19887 | * test 4:33f7f61e6c5e | ||
|
r19874 | $ hg shelve | ||
shelved as test | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg bookmark | ||||
|
r19887 | * test 4:33f7f61e6c5e | ||
|
r19874 | $ hg unshelve | ||
unshelving change 'test' | ||||
$ hg bookmark | ||||
|
r19887 | * test 4:33f7f61e6c5e | ||
|
r19885 | |||
shelve should still work even if mq is disabled | ||||
$ hg --config extensions.mq=! shelve | ||||
shelved as test | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg --config extensions.mq=! shelve --list | ||||
|
r20411 | test (*) changes to 'create conflict' (glob) | ||
|
r19885 | $ hg --config extensions.mq=! unshelve | ||
unshelving change 'test' | ||||
|
r19887 | |||
shelve should leave dirstate clean (issue 4055) | ||||
$ cd .. | ||||
$ 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 0 | ||||
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 1 --config extensions.rebase= | ||||
merging x | ||||
saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-backup.hg (glob) | ||||
$ hg unshelve | ||||
unshelving change 'default' | ||||
|
r20413 | rebasing shelved changes | ||
|
r19887 | $ hg status | ||
M z | ||||
$ cd .. | ||||
|
r19961 | |||
shelve should only unshelve pending changes (issue 4068) | ||||
$ hg init onlypendingchanges | ||||
$ cd onlypendingchanges | ||||
$ touch a | ||||
$ hg ci -Aqm a | ||||
$ touch b | ||||
$ hg ci -Aqm b | ||||
$ hg up -q 0 | ||||
$ 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 1 | ||||
$ hg unshelve | ||||
unshelving change 'default' | ||||
|
r20413 | rebasing shelved changes | ||
|
r19961 | $ 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 0 | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg unshelve | ||||
unshelving change 'default' | ||||
|
r20413 | rebasing shelved changes | ||
|
r19961 | $ hg status | ||
A d | ||||
|
r20064 | test bug 4073 we need to enable obsolete markers for it | ||
$ cat > ../obs.py << EOF | ||||
> import mercurial.obsolete | ||||
> mercurial.obsolete._enabled = True | ||||
> EOF | ||||
$ echo '[extensions]' >> $HGRCPATH | ||||
$ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH | ||||
$ hg shelve | ||||
shelved as default | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg debugobsolete `hg --debug id -i -r 1` | ||||
$ hg unshelve | ||||
unshelving change 'default' | ||||
|
r20150 | 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 | ||||
|
r20414 | |||
unshelve and conflicts with untracked files | ||||
preparing: | ||||
$ rm *.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 gold > f | ||||
$ hg unshelve | ||||
unshelving change 'default' | ||||
$ hg st | ||||
A f | ||||
? f.orig | ||||
$ cat f | ||||
f | ||||
$ cat f.orig | ||||
gold | ||||
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 | ||||
|
r20423 | $ hg log -G --template '{rev} {desc|firstline} {author}' -R bundle://.hg/shelved/default.hg -r 'bundle()' | ||
|
r20414 | o 4 changes to 'commit stuff' shelve@localhost | ||
| | ||||
$ hg log -G --template '{rev} {desc|firstline} {author}' | ||||
@ 3 commit stuff test | ||||
| | ||||
| o 2 c test | ||||
|/ | ||||
o 0 a test | ||||
$ mv f.orig f | ||||
$ echo other change >> a | ||||
|
r20960 | $ hg unshelve --date '1073741824 0' | ||
|
r20414 | unshelving change 'default' | ||
temporarily committing pending changes (restore with 'hg unshelve --abort') | ||||
rebasing shelved changes | ||||
merging f | ||||
warning: conflicts during merge. | ||||
merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | ||||
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') | ||||
[1] | ||||
|
r20960 | $ hg log -G --template '{rev} {desc|firstline} {author} {date|isodate}' | ||
@ 5 changes to 'commit stuff' shelve@localhost 1970-01-01 00:00 +0000 | ||||
|
r20414 | | | ||
|
r20960 | | @ 4 pending changes temporary commit shelve@localhost 2004-01-10 13:37 +0000 | ||
|
r20414 | |/ | ||
|
r20960 | o 3 commit stuff test 1970-01-01 00:00 +0000 | ||
|
r20414 | | | ||
|
r20960 | | o 2 c test 1970-01-01 00:00 +0000 | ||
|
r20414 | |/ | ||
|
r20960 | o 0 a test 1970-01-01 00:00 +0000 | ||
|
r20414 | |||
$ hg st | ||||
M f | ||||
? f.orig | ||||
$ cat f | ||||
<<<<<<< local | ||||
gold | ||||
======= | ||||
f | ||||
>>>>>>> other | ||||
$ cat f.orig | ||||
gold | ||||
$ hg unshelve --abort | ||||
rebase aborted | ||||
unshelve of 'default' aborted | ||||
$ hg st | ||||
M a | ||||
? f.orig | ||||
$ cat f.orig | ||||
gold | ||||
$ 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 during merge. | ||||
merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | ||||
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') | ||||
[1] | ||||
$ hg st | ||||
M f | ||||
? f.orig | ||||
$ cat f | ||||
<<<<<<< local | ||||
gold | ||||
======= | ||||
f | ||||
>>>>>>> other | ||||
$ cat f.orig | ||||
gold | ||||
$ hg unshelve --abort | ||||
rebase aborted | ||||
no changes needed to a | ||||
no changes needed to d | ||||
no changes needed to e | ||||
unshelve of 'default' aborted | ||||
$ hg shelve --delete default | ||||
|
r19961 | $ cd .. | ||