mercurial/manifest.py
changeset 3140 1eb50c9d2649
parent 2858 345bac2bc4ec
child 3148 adb246ce6736
equal deleted inserted replaced
3129:f01efb4bc258 3140:1eb50c9d2649
    53         for l in lines:
    53         for l in lines:
    54             (f, n) = l.split('\0')
    54             (f, n) = l.split('\0')
    55             mapping.rawset(f, n)
    55             mapping.rawset(f, n)
    56         self.mapcache = (node, mapping)
    56         self.mapcache = (node, mapping)
    57         return mapping
    57         return mapping
    58 
       
    59     def diff(self, a, b):
       
    60         return mdiff.textdiff(str(a), str(b))
       
    61 
    58 
    62     def _search(self, m, s, lo=0, hi=None):
    59     def _search(self, m, s, lo=0, hi=None):
    63         '''return a tuple (start, end) that says where to find s within m.
    60         '''return a tuple (start, end) that says where to find s within m.
    64 
    61 
    65         If the string is found m[start:end] are the line containing
    62         If the string is found m[start:end] are the line containing