equal
deleted
inserted
replaced
1096 "journal", |
1096 "journal", |
1097 "undo", |
1097 "undo", |
1098 aftertrans(renames), |
1098 aftertrans(renames), |
1099 self.store.createmode, |
1099 self.store.createmode, |
1100 validator=validate, |
1100 validator=validate, |
1101 releasefn=releasefn) |
1101 releasefn=releasefn, |
|
1102 checkambigfiles=_cachedfiles) |
1102 tr.changes['revs'] = set() |
1103 tr.changes['revs'] = set() |
1103 tr.changes['obsmarkers'] = set() |
1104 tr.changes['obsmarkers'] = set() |
1104 |
1105 |
1105 tr.hookargs['txnid'] = txnid |
1106 tr.hookargs['txnid'] = txnid |
1106 # note: writing the fncache only during finalize mean that the file is |
1107 # note: writing the fncache only during finalize mean that the file is |
1162 if self.svfs.exists("journal"): |
1163 if self.svfs.exists("journal"): |
1163 self.ui.status(_("rolling back interrupted transaction\n")) |
1164 self.ui.status(_("rolling back interrupted transaction\n")) |
1164 vfsmap = {'': self.svfs, |
1165 vfsmap = {'': self.svfs, |
1165 'plain': self.vfs,} |
1166 'plain': self.vfs,} |
1166 transaction.rollback(self.svfs, vfsmap, "journal", |
1167 transaction.rollback(self.svfs, vfsmap, "journal", |
1167 self.ui.warn) |
1168 self.ui.warn, |
|
1169 checkambigfiles=_cachedfiles) |
1168 self.invalidate() |
1170 self.invalidate() |
1169 return True |
1171 return True |
1170 else: |
1172 else: |
1171 self.ui.warn(_("no interrupted transaction available\n")) |
1173 self.ui.warn(_("no interrupted transaction available\n")) |
1172 return False |
1174 return False |
1218 return 0 |
1220 return 0 |
1219 |
1221 |
1220 parents = self.dirstate.parents() |
1222 parents = self.dirstate.parents() |
1221 self.destroying() |
1223 self.destroying() |
1222 vfsmap = {'plain': self.vfs, '': self.svfs} |
1224 vfsmap = {'plain': self.vfs, '': self.svfs} |
1223 transaction.rollback(self.svfs, vfsmap, 'undo', ui.warn) |
1225 transaction.rollback(self.svfs, vfsmap, 'undo', ui.warn, |
|
1226 checkambigfiles=_cachedfiles) |
1224 if self.vfs.exists('undo.bookmarks'): |
1227 if self.vfs.exists('undo.bookmarks'): |
1225 self.vfs.rename('undo.bookmarks', 'bookmarks', checkambig=True) |
1228 self.vfs.rename('undo.bookmarks', 'bookmarks', checkambig=True) |
1226 if self.svfs.exists('undo.phaseroots'): |
1229 if self.svfs.exists('undo.phaseroots'): |
1227 self.svfs.rename('undo.phaseroots', 'phaseroots', checkambig=True) |
1230 self.svfs.rename('undo.phaseroots', 'phaseroots', checkambig=True) |
1228 self.invalidate() |
1231 self.invalidate() |