equal
deleted
inserted
replaced
698 # taking precedence |
698 # taking precedence |
699 fl = self.file(".hgtags") |
699 fl = self.file(".hgtags") |
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) |
707 except KeyError: |
707 except KeyError: |
708 pass |
708 pass |
1020 match = util.always): |
1020 match = util.always): |
1021 mf2, u = None, [] |
1021 mf2, u = None, [] |
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): |
1029 mf = dict(self.manifest.read(node)) |
1029 mf = dict(self.manifest.read(node)) |
1030 for fn in mf.keys(): |
1030 for fn in mf.keys(): |
1657 s = 0 |
1657 s = 0 |
1658 |
1658 |
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 |
1666 |
1666 |
1667 # are files different? |
1667 # are files different? |
1832 |
1832 |
1833 def temp(prefix, node): |
1833 def temp(prefix, node): |
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 |
1841 fl = self.file(fn) |
1841 fl = self.file(fn) |
1842 base = fl.ancestor(my, other) |
1842 base = fl.ancestor(my, other) |