This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8045

tests: add test showing crash when shelving ghosted rename target
ClosedPublic

Authored by martinvonz on Jan 30 2020, 2:34 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGae4d729eb3c8: tests: add test showing crash when shelving ghosted rename target
rHGb3c08e1b2cd8: tests: add test showing crash when shelving ghosted rename target
Summary

When you hg rename a file and then delete the rename target, `hg
shelve` will give you a traceback.

Note that the shelve succeeds and the shelve is correct, it's just the
update to the parent that fails (i.e. to the parent of the commit that
was created for the shelve).

This can be squashed into the next commit if the reviewer prefers.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mtests/test-shelve.t (36 lines)

Diff 19715

tests/test-shelve.t

1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
set up some more complex changes to shelve set up some more complex changes to shelve
$ echo a >> a/a $ echo a >> a/a
$ hg mv b b.rename $ hg mv b b.rename
moving b/b to b.rename/b moving b/b to b.rename/b
$ hg cp c c.copy $ hg cp c c.copy
$ hg mv d ghost
$ rm ghost
$ hg status -C $ hg status -C
M a/a M a/a
A b.rename/b A b.rename/b
b/b b/b
A c.copy A c.copy
c c
R b/b R b/b
R d
! ghost
d
the common case - no options or filenames the common case - no options or filenames
$ hg shelve $ hg shelve 2>&1 | grep KeyError
shelved as default-01 KeyError: 'No such manifest entry.' (no-pure !)
2 files updated, 0 files merged, 2 files removed, 0 files unresolved raise KeyError (pure !)
KeyError (pure !)
# Get out of the broken state so later tests work
$ hg forget b.rename/b c.copy ghost
$ hg revert a/a b/b d
$ rm a/a.orig b.rename/b c.copy
$ hg status -C $ hg status -C
ensure that our shelved changes exist ensure that our shelved changes exist
$ hg shelve -l $ hg shelve -l
default-01 (*)* changes to: [mq]: second.patch (glob) default-01 (*)* changes to: [mq]: second.patch (glob)
default (*)* changes to: [mq]: second.patch (glob) default (*)* changes to: [mq]: second.patch (glob)
unshelving change 'default-01' unshelving change 'default-01'
$ hg status -C $ hg status -C
M a/a M a/a
A b.rename/b A b.rename/b
b/b b/b
A c.copy A c.copy
c c
R b/b R b/b
R d
$ hg shelve -l $ hg shelve -l
(both of default.hg and default-1.hg should be still kept, because it (both of default.hg and default-1.hg should be still kept, because it
is difficult to decide actual order of them from same timestamp) is difficult to decide actual order of them from same timestamp)
$ ls .hg/shelve-backup/ $ ls .hg/shelve-backup/
default-01.hg default-01.hg
default-01.patch default-01.patch
$ hg status -C $ hg status -C
M a/a M a/a
A b.rename/b A b.rename/b
b/b b/b
A c.copy A c.copy
c c
R b/b R b/b
R d
$ HGEDITOR=cat hg shelve -q -n wibble -m wat -e a $ HGEDITOR=cat hg shelve -q -n wibble -m wat -e a
wat wat
HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to abort commit. HG: Leave message empty to abort commit.
HG: -- HG: --
HG: user: shelve@localhost HG: user: shelve@localhost
HG: branch 'default' HG: branch 'default'
HG: changed a/a HG: changed a/a
expect "a" to no longer be present, but status otherwise unchanged expect "a" to no longer be present, but status otherwise unchanged
$ hg status -C $ hg status -C
A b.rename/b A b.rename/b
b/b b/b
A c.copy A c.copy
c c
R b/b R b/b
R d
$ hg shelve -l --stat $ hg shelve -l --stat
wibble (*) wat (glob) wibble (*) wat (glob)
a/a | 1 + a/a | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
and now "a/a" should reappear and now "a/a" should reappear
$ cd a $ cd a
$ hg unshelve -q wibble $ hg unshelve -q wibble
$ cd .. $ cd ..
$ hg status -C $ hg status -C
M a/a M a/a
A b.rename/b A b.rename/b
b/b b/b
A c.copy A c.copy
c c
R b/b R b/b
R d
ensure old shelve backups are being deleted automatically ensure old shelve backups are being deleted automatically
$ ls .hg/shelve-backup/ $ ls .hg/shelve-backup/
default-01.hg default-01.hg
default-01.patch default-01.patch
default-01.shelve default-01.shelve
wibble.hg wibble.hg
warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [1]
$ hg status -v $ hg status -v
M a/a M a/a
M b.rename/b M b.rename/b
M c.copy M c.copy
R b/b R b/b
R d
? a/a.orig ? a/a.orig
# The repository is in an unfinished *unshelve* state. # The repository is in an unfinished *unshelve* state.
# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# a/a # a/a
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
# To continue: hg unshelve --continue # To continue: hg unshelve --continue
# To abort: hg unshelve --abort # To abort: hg unshelve --abort
ensure that we have a merge with unresolved conflicts ensure that we have a merge with unresolved conflicts
#if phasebased #if phasebased
$ hg heads -q --template '{rev}\n' $ hg heads -q --template '{rev}\n'
8 8
5 6
$ hg parents -q --template '{rev}\n' $ hg parents -q --template '{rev}\n'
8 8
5 6
#endif #endif
#if stripbased #if stripbased
$ hg heads -q --template '{rev}\n' $ hg heads -q --template '{rev}\n'
5 5
4 4
$ hg parents -q --template '{rev}\n' $ hg parents -q --template '{rev}\n'
4 4
5 5
#endif #endif
$ hg status $ hg status
M a/a M a/a
M b.rename/b M b.rename/b
M c.copy M c.copy
R b/b R b/b
R d
? a/a.orig ? a/a.orig
$ hg diff $ hg diff
diff --git a/a/a b/a/a diff --git a/a/a b/a/a
--- a/a/a --- a/a/a
+++ b/a/a +++ b/a/a
@@ -1,2 +1,6 @@ @@ -1,2 +1,6 @@
a a
+<<<<<<< shelve: 2377350b6337 - shelve: pending changes temporary commit +<<<<<<< shelve: 2377350b6337 - shelve: pending changes temporary commit
c c
+======= +=======
+a +a
+>>>>>>> working-copy: a68ec3400638 - shelve: changes to: [mq]: second.patch +>>>>>>> working-copy: 203c9f771d2b - shelve: changes to: [mq]: second.patch
diff --git a/b/b b/b.rename/b diff --git a/b/b b/b.rename/b
rename from b/b rename from b/b
rename to b.rename/b rename to b.rename/b
diff --git a/c b/c.copy diff --git a/c b/c.copy
copy from c copy from c
copy to c.copy copy to c.copy
diff --git a/d b/d
deleted file mode 100644
--- a/d
+++ /dev/null
@@ -1,1 +0,0 @@
-d
$ hg resolve -l $ hg resolve -l
U a/a U a/a
$ hg shelve $ hg shelve
abort: unshelve already in progress abort: unshelve already in progress
(use 'hg unshelve --continue' or 'hg unshelve --abort') (use 'hg unshelve --continue' or 'hg unshelve --abort')
[255] [255]
abort the unshelve and be happy abort the unshelve and be happy
$ hg status $ hg status
M a/a M a/a
M b.rename/b M b.rename/b
M c.copy M c.copy
R b/b R b/b
R d
? a/a.orig ? a/a.orig
$ hg unshelve -a $ hg unshelve -a
unshelve of 'default' aborted unshelve of 'default' aborted
$ hg heads -q $ hg heads -q
[37]:2e69b451d1ea (re) [37]:2e69b451d1ea (re)
$ hg parents $ hg parents
changeset: [37]:2e69b451d1ea (re) changeset: [37]:2e69b451d1ea (re)
tag: tip tag: tip
$ hg status -C $ hg status -C
A b.rename/b A b.rename/b
b/b b/b
A c.copy A c.copy
c c
A foo/foo A foo/foo
R b/b R b/b
R d
? a/a.orig ? a/a.orig
there should be no shelves left there should be no shelves left
$ hg shelve -l $ hg shelve -l
#if execbit #if execbit