Fix callers to file.revision to use file.read
authormpm@selenic.com
Tue, 23 Aug 2005 12:46:43 -0700
changeset 994 88c15682d9b0
parent 993 6f274afc05c7
child 1005 42956a6cb257
Fix callers to file.revision to use file.read This was causing unchanged files to show up as modified.
mercurial/hg.py
--- a/mercurial/hg.py	Tue Aug 23 02:19:38 2005 -0700
+++ b/mercurial/hg.py	Tue Aug 23 12:46:43 2005 -0700
@@ -700,7 +700,7 @@
                 h = fl.heads()
                 h.reverse()
                 for r in h:
-                    for l in fl.revision(r).splitlines():
+                    for l in fl.read(r).splitlines():
                         if l:
                             n, k = l.split(" ", 1)
                             addtag(self, k, n)
@@ -1022,7 +1022,7 @@
 
         def fcmp(fn, mf):
             t1 = self.wfile(fn).read()
-            t2 = self.file(fn).revision(mf.get(fn, nullid))
+            t2 = self.file(fn).read(mf.get(fn, nullid))
             return cmp(t1, t2)
 
         def mfmatches(node):
@@ -1659,7 +1659,7 @@
                 # is the wfile new since m1, and match m2?
                 if f not in m1:
                     t1 = self.wfile(f).read()
-                    t2 = self.file(f).revision(m2[f])
+                    t2 = self.file(f).read(m2[f])
                     if cmp(t1, t2) == 0:
                         n = m2[f]
                     del t1, t2
@@ -1834,7 +1834,7 @@
             pre = "%s~%s." % (os.path.basename(fn), prefix)
             (fd, name) = tempfile.mkstemp("", pre)
             f = os.fdopen(fd, "wb")
-            f.write(fl.revision(node))
+            f.write(fl.read(node))
             f.close()
             return name