Mercurial > hg-stable
changeset 39692:77c4e2ae9f07
transaction: make journal a private attribute
This attribute tracks the name of the journal file. It is an
implementation detail of the current transaction and therefore
shouldn't be exposed as part of the interface. Let's mark it as
private.
Differential Revision: https://phab.mercurial-scm.org/D4624
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Mon, 17 Sep 2018 15:55:57 -0700 |
| parents | da9ce63bfa9b |
| children | d27fde3e023e |
| files | mercurial/transaction.py |
| diffstat | 1 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/transaction.py Mon Sep 17 15:52:59 2018 -0700 +++ b/mercurial/transaction.py Mon Sep 17 15:55:57 2018 -0700 @@ -131,7 +131,7 @@ self.after = after self.entries = [] self.map = {} - self.journal = journalname + self._journal = journalname self._undoname = undoname self._queue = [] # A callback to validate transaction content before closing it. @@ -157,7 +157,7 @@ # a dict of arguments to be passed to hooks self.hookargs = {} - self.file = opener.open(self.journal, "w") + self.file = opener.open(self._journal, "w") # a list of ('location', 'path', 'backuppath', cache) entries. # - if 'backuppath' is empty, no file existed at backup time @@ -167,12 +167,12 @@ # (cache is currently unused) self._backupentries = [] self._backupmap = {} - self._backupjournal = "%s.backupfiles" % self.journal + self._backupjournal = "%s.backupfiles" % self._journal self._backupsfile = opener.open(self._backupjournal, 'w') self._backupsfile.write('%d\n' % version) if createmode is not None: - opener.chmod(self.journal, createmode & 0o666) + opener.chmod(self._journal, createmode & 0o666) opener.chmod(self._backupjournal, createmode & 0o666) # hold file generations to be performed on commit @@ -194,7 +194,7 @@ (name, self._count, self._usages)) def __del__(self): - if self.journal: + if self._journal: self._abort() @active @@ -255,7 +255,7 @@ return vfs = self._vfsmap[location] dirname, filename = vfs.split(file) - backupfilename = "%s.backup.%s" % (self.journal, filename) + backupfilename = "%s.backup.%s" % (self._journal, filename) backupfile = vfs.reljoin(dirname, backupfilename) if vfs.exists(file): filepath = vfs.join(file) @@ -493,8 +493,8 @@ self.after = None # Help prevent cycles. if self.opener.isfile(self._backupjournal): self.opener.unlink(self._backupjournal) - if self.opener.isfile(self.journal): - self.opener.unlink(self.journal) + if self.opener.isfile(self._journal): + self.opener.unlink(self._journal) for l, _f, b, c in self._backupentries: if l not in self._vfsmap and c: self.report("couldn't remove %s: unknown cache location" @@ -511,7 +511,7 @@ self.report("couldn't remove %s: %s\n" % (vfs.join(b), inst)) self._backupentries = [] - self.journal = None + self._journal = None self.releasefn(self, True) # notify success of closing transaction self.releasefn = None # Help prevent cycles. @@ -549,8 +549,8 @@ continue vfs = self._vfsmap[l] base, name = vfs.split(b) - assert name.startswith(self.journal), name - uname = name.replace(self.journal, self._undoname, 1) + assert name.startswith(self._journal), name + uname = name.replace(self._journal, self._undoname, 1) u = vfs.reljoin(base, uname) util.copyfile(vfs.join(b), vfs.join(u), hardlink=True) undobackupfile.write("%s\0%s\0%s\0%d\n" % (l, f, u, c)) @@ -567,8 +567,8 @@ if not self.entries and not self._backupentries: if self._backupjournal: self.opener.unlink(self._backupjournal) - if self.journal: - self.opener.unlink(self.journal) + if self._journal: + self.opener.unlink(self._journal) return self.report(_("transaction abort!\n")) @@ -578,14 +578,14 @@ self._abortcallback[cat](self) # Prevent double usage and help clear cycles. self._abortcallback = None - _playback(self.journal, self.report, self.opener, self._vfsmap, + _playback(self._journal, self.report, self.opener, self._vfsmap, self.entries, self._backupentries, False, checkambigfiles=self.checkambigfiles) self.report(_("rollback completed\n")) except BaseException: self.report(_("rollback failed - please run hg recover\n")) finally: - self.journal = None + self._journal = None self.releasefn(self, False) # notify failure of transaction self.releasefn = None # Help prevent cycles.