##// END OF EJS Templates
transaction: make checkambigfiles a private attribute...
Gregory Szorc -
r39716:264d5695 default
parent child Browse files
Show More
@@ -145,9 +145,9 class transaction(util.transactional):
145 releasefn = lambda tr, success: None
145 releasefn = lambda tr, success: None
146 self._releasefn = releasefn
146 self._releasefn = releasefn
147
147
148 self.checkambigfiles = set()
148 self._checkambigfiles = set()
149 if checkambigfiles:
149 if checkambigfiles:
150 self.checkambigfiles.update(checkambigfiles)
150 self._checkambigfiles.update(checkambigfiles)
151
151
152 self.names = [name]
152 self.names = [name]
153
153
@@ -340,7 +340,7 class transaction(util.transactional):
340 checkambig = False
340 checkambig = False
341 else:
341 else:
342 self.addbackup(name, location=location)
342 self.addbackup(name, location=location)
343 checkambig = (name, location) in self.checkambigfiles
343 checkambig = (name, location) in self._checkambigfiles
344 files.append(vfs(name, 'w', atomictemp=True,
344 files.append(vfs(name, 'w', atomictemp=True,
345 checkambig=checkambig))
345 checkambig=checkambig))
346 genfunc(*files)
346 genfunc(*files)
@@ -580,7 +580,7 class transaction(util.transactional):
580 self._abortcallback = None
580 self._abortcallback = None
581 _playback(self._journal, self.report, self.opener, self._vfsmap,
581 _playback(self._journal, self.report, self.opener, self._vfsmap,
582 self.entries, self._backupentries, False,
582 self.entries, self._backupentries, False,
583 checkambigfiles=self.checkambigfiles)
583 checkambigfiles=self._checkambigfiles)
584 self.report(_("rollback completed\n"))
584 self.report(_("rollback completed\n"))
585 except BaseException:
585 except BaseException:
586 self.report(_("rollback failed - please run hg recover\n"))
586 self.report(_("rollback failed - please run hg recover\n"))
General Comments 0
You need to be logged in to leave comments. Login now