Mercurial > hg > mercurial-source

changeset 23913:13268fde4c4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transaction: clarify the name of 'journal' argument for transaction The argument is a string containing the journal name (used as prefix for all other transaction file). This is not the transaction file itself. So we clarify this.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 16 Jan 2015 14:54:24 -0800
parents 5eb3541f907e
children bfa52f4ecf54
files mercurial/transaction.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/transaction.py
+++ b/mercurial/transaction.py
@@ -82,7 +82,7 @@
         pass
 
 class transaction(object):
-    def __init__(self, report, opener, vfsmap, journal, after=None,
+    def __init__(self, report, opener, vfsmap, journalname, after=None,
                  createmode=None):
         """Begin a new transaction
 
@@ -104,7 +104,7 @@
         self.after = after
         self.entries = []
         self.map = {}
-        self.journal = journal
+        self.journal = journalname
         self._queue = []
         # a dict of arguments to be passed to hooks
         self.hookargs = {}
@@ -118,7 +118,7 @@
         # (cache is currently unused)
         self._backupentries = []
         self._backupmap = {}
-        self._backupjournal = "%s.backupfiles" % journal
+        self._backupjournal = "%s.backupfiles" % self.journal
         self._backupsfile = opener.open(self._backupjournal, 'w')
         self._backupsfile.write('%d\n' % version)