[PATCH STABLE] transaction: really fix _addbackupentry key usage (issue4684)

Pierre-Yves David pierre-yves.david at ens-lyon.org
Tue May 26 15:58:49 CDT 2015

# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at fb.com>
# Date 1432670548 25200
#      Tue May 26 13:02:28 2015 -0700
# Branch stable
# Node ID 6747e6f6bfa5c202af0d04699e8a78cd6b8f2c44
# Parent  a973b050621d7489287856a125d1a706924447a1
transaction: really fix _addbackupentry  key usage (issue4684)

The fix in fd905b2bea59 is actually wrong. We now use the filename to match what
'_addentry'. This whole untested code is quite suspicious. This seems to point
that no one is ever running 'tr.find' for a backup file.

diff --git a/mercurial/transaction.py b/mercurial/transaction.py
--- a/mercurial/transaction.py
+++ b/mercurial/transaction.py
@@ -220,11 +220,11 @@ class transaction(object):
         self._addbackupentry((location, file, backupfile, False))
     def _addbackupentry(self, entry):
         """register a new backup entry and write it to disk"""
-        self._backupmap[entry] = len(self._backupentries) - 1
+        self._backupmap[entry[1]] = len(self._backupentries) - 1
         self._backupsfile.write("%s\0%s\0%s\0%d\n" % entry)
     def registertmp(self, tmpfile, location=''):

More information about the Mercurial-devel mailing list