##// END OF EJS Templates
shelve: don't crash on file with unexpected extension in .hg/shelved/...
Martin von Zweigbergk -
r46915:5456fef1 default draft
parent child Browse files
Show More
@@ -625,7 +625,7 b' def listshelves(repo):'
625 info = []
625 info = []
626 seen = set()
626 seen = set()
627 for (filename, _type) in names:
627 for (filename, _type) in names:
628 name, ext = filename.rsplit(b'.', 1)
628 name = filename.rsplit(b'.', 1)[0]
629 if name in seen:
629 if name in seen:
630 continue
630 continue
631 seen.add(name)
631 seen.add(name)
@@ -779,10 +779,10 b' Test corrupt shelves (in .hg/shelved/, n'
779
779
780 # A file with an unexpected extension
780 # A file with an unexpected extension
781 $ touch .hg/shelved/junk3
781 $ touch .hg/shelved/junk3
782 $ hg shelve -l 2>&1 | grep ValueError
782 $ hg shelve -l
783 ValueError: not enough values to unpack (expected 2, got 1)
783 $ hg unshelve
784 $ hg unshelve 2>&1 | grep ValueError
784 abort: no shelved changes to apply!
785 ValueError: not enough values to unpack (expected 2, got 1)
785 [20]
786 $ hg shelve -d junk3
786 $ hg shelve -d junk3
787 abort: shelved change 'junk3' not found
787 abort: shelved change 'junk3' not found
788 [10]
788 [10]
General Comments 0
You need to be logged in to leave comments. Login now