Show More
@@ -117,12 +117,7 b' class shelvedfile(object):' | |||||
117 | return self.vfs.stat(self.fname) |
|
117 | return self.vfs.stat(self.fname) | |
118 |
|
118 | |||
119 | def opener(self, mode=b'rb'): |
|
119 | def opener(self, mode=b'rb'): | |
120 | try: |
|
|||
121 |
|
|
120 | return self.vfs(self.fname, mode) | |
122 | except IOError as err: |
|
|||
123 | if err.errno != errno.ENOENT: |
|
|||
124 | raise |
|
|||
125 | raise error.Abort(_(b"shelved change '%s' not found") % self.name) |
|
|||
126 |
|
121 | |||
127 | def applybundle(self, tr): |
|
122 | def applybundle(self, tr): | |
128 | fp = self.opener() |
|
123 | fp = self.opener() |
@@ -756,7 +756,7 b' Test corrupt shelves (in .hg/shelved/, n' | |||||
756 | junk1 (* ago) (glob) |
|
756 | junk1 (* ago) (glob) | |
757 | $ hg unshelve |
|
757 | $ hg unshelve | |
758 | unshelving change 'junk1' |
|
758 | unshelving change 'junk1' | |
759 | abort: shelved change 'junk1' not found |
|
759 | abort: $ENOENT$: '$TESTTMP/corrupt-shelves/.hg/shelved/junk1.hg' | |
760 | [255] |
|
760 | [255] | |
761 | $ hg shelve -d junk1 |
|
761 | $ hg shelve -d junk1 | |
762 | $ find .hg/shelve* | sort |
|
762 | $ find .hg/shelve* | sort |
General Comments 0
You need to be logged in to leave comments.
Login now