diff mercurial/hg.py @ 33:98633e60067c

Support for 0, 1, or 2 diff revs
author mpm@selenic.com
date Sat, 07 May 2005 09:27:52 -0800
parents 6a4d8718bee0
children a8811676c85a
line wrap: on
line diff
--- a/mercurial/hg.py	Fri May 06 09:09:35 2005 -0800
+++ b/mercurial/hg.py	Sat May 07 09:27:52 2005 -0800
@@ -517,7 +517,7 @@
                     if not c:
                         if fcmp(fn):
                             changed.append(fn)
-                    if c[1] != s.st_size:
+                    elif c[1] != s.st_size:
                         changed.append(fn)
                     elif c[0] != s.st_mode or c[2] != s.st_mtime:
                         if fcmp(fn):
@@ -532,11 +532,11 @@
         return (changed, added, deleted)
 
     def diffrevs(self, node1, node2):
-        changed, added = [], [], []
+        changed, added = [], []
 
         change = self.changelog.read(node1)
         mf1 = self.manifest.read(change[0])
-        change = self.changelog.read(revs[1])
+        change = self.changelog.read(node2)
         mf2 = self.manifest.read(change[0])
 
         for fn in mf2: