# HG changeset patch # User Pierre-Yves David # Date 1421448864 28800 # Node ID 13268fde4c4d518e08a9d0fdf7ecb606e731a865 # Parent 5eb3541f907efe47dcb1bf03bc1437316942a5cf 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. diff -r 5eb3541f907e -r 13268fde4c4d mercurial/transaction.py --- a/mercurial/transaction.py Mon Jan 05 12:44:15 2015 -0800 +++ b/mercurial/transaction.py Fri Jan 16 14:54:24 2015 -0800 @@ -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)