Mercurial > public > mercurial-scm > hg

comparison mercurial/bundlerepo.py @ 2257:8dafccbcede9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
indent: fix alignment
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 11 May 2006 11:24:28 +0200
parents 4b71f37cbdb7
children f116ddea537f
comparison
equal deleted inserted replaced
2256:4b71f37cbdb7 2257:8dafccbcede9
122 text = self.patches(text, [delta]) 122 text = self.patches(text, [delta])
123 123
124 p1, p2 = self.parents(node) 124 p1, p2 = self.parents(node)
125 if node != revlog.hash(text, p1, p2): 125 if node != revlog.hash(text, p1, p2):
126 raise revlog.RevlogError(_("integrity check failed on %s:%d") 126 raise revlog.RevlogError(_("integrity check failed on %s:%d")
127 % (self.datafile, self.rev(node))) 127 % (self.datafile, self.rev(node)))
128 128
129 self.cache = (node, self.rev(node), text) 129 self.cache = (node, self.rev(node), text)
130 return text 130 return text
131 131
132 def addrevision(self, text, transaction, link, p1=None, p2=None, d=None): 132 def addrevision(self, text, transaction, link, p1=None, p2=None, d=None):