Mercurial > hg
comparison mercurial/hg.py @ 44:e825a68d7227
Fix occassional diff bug with manifests
author | mpm@selenic.com |
---|---|
date | Tue, 10 May 2005 00:33:48 -0800 |
parents | 5f87633e1ea2 |
children | 93e868fa0db8 |
comparison
equal
deleted
inserted
replaced
43:42177b56b949 | 44:e825a68d7227 |
---|---|
87 def diff(self, a, b): | 87 def diff(self, a, b): |
88 # this is sneaky, as we're not actually using a and b | 88 # this is sneaky, as we're not actually using a and b |
89 if self.listcache and len(self.listcache[0]) == len(a): | 89 if self.listcache and len(self.listcache[0]) == len(a): |
90 return mdiff.diff(self.listcache[1], self.addlist, 1) | 90 return mdiff.diff(self.listcache[1], self.addlist, 1) |
91 else: | 91 else: |
92 return mdiff.diff(a, b) | 92 return mdiff.textdiff(a, b) |
93 | 93 |
94 def add(self, map, transaction, link, p1=None, p2=None): | 94 def add(self, map, transaction, link, p1=None, p2=None): |
95 files = map.keys() | 95 files = map.keys() |
96 files.sort() | 96 files.sort() |
97 | 97 |