equal
deleted
inserted
replaced
1175 or self.ui.configbool('devel', 'check-locks')): |
1175 or self.ui.configbool('devel', 'check-locks')): |
1176 if self._currentlock(self._lockref) is None: |
1176 if self._currentlock(self._lockref) is None: |
1177 raise error.ProgrammingError('transaction requires locking') |
1177 raise error.ProgrammingError('transaction requires locking') |
1178 tr = self.currenttransaction() |
1178 tr = self.currenttransaction() |
1179 if tr is not None: |
1179 if tr is not None: |
1180 return tr.nest() |
1180 return tr.nest(name=desc) |
1181 |
1181 |
1182 # abort here if the journal already exists |
1182 # abort here if the journal already exists |
1183 if self.svfs.exists("journal"): |
1183 if self.svfs.exists("journal"): |
1184 raise error.RepoError( |
1184 raise error.RepoError( |
1185 _("abandoned transaction found"), |
1185 _("abandoned transaction found"), |
1314 "undo", |
1314 "undo", |
1315 aftertrans(renames), |
1315 aftertrans(renames), |
1316 self.store.createmode, |
1316 self.store.createmode, |
1317 validator=validate, |
1317 validator=validate, |
1318 releasefn=releasefn, |
1318 releasefn=releasefn, |
1319 checkambigfiles=_cachedfiles) |
1319 checkambigfiles=_cachedfiles, |
|
1320 name=desc) |
1320 tr.changes['revs'] = xrange(0, 0) |
1321 tr.changes['revs'] = xrange(0, 0) |
1321 tr.changes['obsmarkers'] = set() |
1322 tr.changes['obsmarkers'] = set() |
1322 tr.changes['phases'] = {} |
1323 tr.changes['phases'] = {} |
1323 tr.changes['bookmarks'] = {} |
1324 tr.changes['bookmarks'] = {} |
1324 |
1325 |