transaction: drop the third item in `tr.backupentries`
authorPierre-Yves David <pierre-yves.david@fb.com>
Wed, 05 Nov 2014 01:33:16 +0000
changeset 23247 def27d46a9a8
parent 23244 18cc87e4375a
child 23248 e754b62373ad
transaction: drop the third item in `tr.backupentries` This third item is always None and never used.
mercurial/transaction.py
--- a/mercurial/transaction.py	Mon Nov 10 17:29:15 2014 -0600
+++ b/mercurial/transaction.py	Wed Nov 05 01:33:16 2014 +0000
@@ -43,7 +43,7 @@
                     raise
 
     backupfiles = []
-    for f, b, _ignore in backupentries:
+    for f, b in backupentries:
         filepath = opener.join(f)
         backuppath = opener.join(b)
         try:
@@ -129,7 +129,7 @@
         for f, o, _data in q[0]:
             offsets.append((f, o))
 
-        for f, b, _data in q[1]:
+        for f, b in q[1]:
             backups.append((f, b))
 
         d = ''.join(['%s\0%d\n' % (f, o) for f, o in offsets])
@@ -183,7 +183,7 @@
             self._queue[-1][1].append((file, backupfile))
             return
 
-        self.backupentries.append((file, backupfile, None))
+        self.backupentries.append((file, backupfile))
         self.backupmap[file] = len(self.backupentries) - 1
         self.backupsfile.write("%s\0%s\n" % (file, backupfile))
         self.backupsfile.flush()
@@ -331,7 +331,7 @@
             self.opener.unlink(self.journal)
         if self.opener.isfile(self.backupjournal):
             self.opener.unlink(self.backupjournal)
-            for _f, b, _ignore in self.backupentries:
+            for _f, b in self.backupentries:
                 self.opener.unlink(b)
         self.backupentries = []
         self.journal = None
@@ -413,7 +413,7 @@
                         # Shave off the trailing newline
                         line = line[:-1]
                         f, b = line.split('\0')
-                        backupentries.append((f, b, None))
+                        backupentries.append((f, b))
             else:
                 report(_("journal was created by a newer version of "
                          "Mercurial"))