Mercurial > hg > gitweb

changeset 25:daa724b27300

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix corruption from manifest.listcache optimization Put the remove edit text in the right place
author mpm@selenic.com
date Wed, 04 May 2005 22:47:25 -0800
parents 57a1eef79415
children 9cf83bf9ad38
files mercurial/hg.py
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Wed May 04 22:45:52 2005 -0800
+++ b/mercurial/hg.py	Wed May 04 22:47:25 2005 -0800
@@ -80,8 +80,8 @@
             return self.mapcache[1]
         text = self.revision(node)
         map = {}
-        self.listcache = text.splitlines(1)
-        for l in self.listcache:
+        self.listcache = (text, text.splitlines(1))
+        for l in self.listcache[1]:
             (f, n) = l.split('\0')
             map[f] = bin(n[:40])
         self.mapcache = (node, map)
@@ -89,8 +89,8 @@
 
     def diff(self, a, b):
         # this is sneaky, as we're not actually using a and b
-        if self.listcache:
-            return mdiff.diff(self.listcache, self.addlist, 1)
+        if self.listcache and len(self.listcache[0]) == len(a):
+            return mdiff.diff(self.listcache[1], self.addlist, 1)
         else:
             return mdiff.diff(a, b)
 
@@ -103,7 +103,7 @@
 
         n = self.addrevision(text, transaction, link, p1, p2)
         self.mapcache = (n, map)
-        self.listcache = self.addlist
+        self.listcache = (text, self.addlist)
 
         return n
 
@@ -403,7 +403,6 @@
         if co == cn: cn = -1
 
         edittext = "\n"+"".join(["HG: changed %s\n" % f for f in new])
-        edittext += "".join(["HG: removed %s\n" % f for f in remove])
         edittext = self.ui.edit(edittext)
         n = self.changelog.add(node, new, edittext, tr, co, cn)
 
@@ -446,6 +445,7 @@
         new.sort()
 
         edittext = text + "\n"+"".join(["HG: changed %s\n" % f for f in new])
+        edittext += "".join(["HG: removed %s\n" % f for f in remove])
         edittext = self.ui.edit(edittext)
 
         n = self.changelog.add(mnode, new, edittext, tr)