##// END OF EJS Templates
localrepo: make "undofiles()" return list of tuples "(vfs, relative filename)"...
FUJIWARA Katsunori -
r20975:37cdf1fc default
parent child Browse files
Show More
@@ -862,7 +862,7 b' class localrepository(object):'
862 (self.svfs, 'journal.phaseroots'))
862 (self.svfs, 'journal.phaseroots'))
863
863
864 def undofiles(self):
864 def undofiles(self):
865 return [vfs.join(undoname(x)) for vfs, x in self._journalfiles()]
865 return [(vfs, undoname(x)) for vfs, x in self._journalfiles()]
866
866
867 def _writejournal(self, desc):
867 def _writejournal(self, desc):
868 self.opener.write("journal.dirstate",
868 self.opener.write("journal.dirstate",
@@ -157,12 +157,13 b' def strip(ui, repo, nodelist, backup="al'
157 os.unlink(chgrpfile)
157 os.unlink(chgrpfile)
158
158
159 # remove undo files
159 # remove undo files
160 for undofile in repo.undofiles():
160 for undovfs, undofile in repo.undofiles():
161 try:
161 try:
162 os.unlink(undofile)
162 undovfs.unlink(undofile)
163 except OSError, e:
163 except OSError, e:
164 if e.errno != errno.ENOENT:
164 if e.errno != errno.ENOENT:
165 ui.warn(_('error removing %s: %s\n') % (undofile, str(e)))
165 ui.warn(_('error removing %s: %s\n') %
166 (undovfs.join(undofile), str(e)))
166
167
167 for m in updatebm:
168 for m in updatebm:
168 bm[m] = repo[newbmtarget].node()
169 bm[m] = repo[newbmtarget].node()
General Comments 0
You need to be logged in to leave comments. Login now