##// END OF EJS Templates
Fix callers to file.revision to use file.read...
mpm@selenic.com -
r994:88c15682 default
parent child Browse files
Show More
@@ -700,7 +700,7 b' class localrepository:'
700 h = fl.heads()
700 h = fl.heads()
701 h.reverse()
701 h.reverse()
702 for r in h:
702 for r in h:
703 for l in fl.revision(r).splitlines():
703 for l in fl.read(r).splitlines():
704 if l:
704 if l:
705 n, k = l.split(" ", 1)
705 n, k = l.split(" ", 1)
706 addtag(self, k, n)
706 addtag(self, k, n)
@@ -1022,7 +1022,7 b' class localrepository:'
1022
1022
1023 def fcmp(fn, mf):
1023 def fcmp(fn, mf):
1024 t1 = self.wfile(fn).read()
1024 t1 = self.wfile(fn).read()
1025 t2 = self.file(fn).revision(mf.get(fn, nullid))
1025 t2 = self.file(fn).read(mf.get(fn, nullid))
1026 return cmp(t1, t2)
1026 return cmp(t1, t2)
1027
1027
1028 def mfmatches(node):
1028 def mfmatches(node):
@@ -1659,7 +1659,7 b' class localrepository:'
1659 # is the wfile new since m1, and match m2?
1659 # is the wfile new since m1, and match m2?
1660 if f not in m1:
1660 if f not in m1:
1661 t1 = self.wfile(f).read()
1661 t1 = self.wfile(f).read()
1662 t2 = self.file(f).revision(m2[f])
1662 t2 = self.file(f).read(m2[f])
1663 if cmp(t1, t2) == 0:
1663 if cmp(t1, t2) == 0:
1664 n = m2[f]
1664 n = m2[f]
1665 del t1, t2
1665 del t1, t2
@@ -1834,7 +1834,7 b' class localrepository:'
1834 pre = "%s~%s." % (os.path.basename(fn), prefix)
1834 pre = "%s~%s." % (os.path.basename(fn), prefix)
1835 (fd, name) = tempfile.mkstemp("", pre)
1835 (fd, name) = tempfile.mkstemp("", pre)
1836 f = os.fdopen(fd, "wb")
1836 f = os.fdopen(fd, "wb")
1837 f.write(fl.revision(node))
1837 f.write(fl.read(node))
1838 f.close()
1838 f.close()
1839 return name
1839 return name
1840
1840
General Comments 0
You need to be logged in to leave comments. Login now