Mercurial > hg
comparison mercurial/revlog.py @ 11550:14e90cc3a296
merge with stable
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Tue, 13 Jul 2010 22:56:01 +0900 |
parents | f5a8d85df06a a463e3c50212 |
children | 1b3b843e1100 |
comparison
equal
deleted
inserted
replaced
11549:935c83ce9172 | 11550:14e90cc3a296 |
---|---|
941 return n | 941 return n |
942 | 942 |
943 raise LookupError(id, self.indexfile, _('no match found')) | 943 raise LookupError(id, self.indexfile, _('no match found')) |
944 | 944 |
945 def cmp(self, node, text): | 945 def cmp(self, node, text): |
946 """compare text with a given file revision""" | 946 """compare text with a given file revision |
947 | |
948 returns True if text is different than what is stored. | |
949 """ | |
947 p1, p2 = self.parents(node) | 950 p1, p2 = self.parents(node) |
948 return hash(text, p1, p2) != node | 951 return hash(text, p1, p2) != node |
949 | 952 |
950 def _addchunk(self, offset, data): | 953 def _addchunk(self, offset, data): |
951 o, d = self._chunkcache | 954 o, d = self._chunkcache |