Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 11702:eb07fbc21e9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filectx: use cmp(self, fctx) instead of cmp(self, text) This allows more flexibility in implementation, and in particular, lets the context decide if revision text has to be loaded or not.
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Tue, 27 Jul 2010 23:40:46 +0900
parents d3c1eddfdbcf
children 8380ed691df8
comparison
equal deleted inserted replaced
11701:84fb29f5e0d2 11702:eb07fbc21e9c
133 try: 133 try:
134 return util.binary(ctx.data()) 134 return util.binary(ctx.data())
135 except IOError: 135 except IOError:
136 return False 136 return False
137 137
138 if not fco.cmp(fcd.data()): # files identical? 138 if not fco.cmp(fcd): # files identical?
139 return None 139 return None
140 140
141 if fca == fco: # backwards, use working dir parent as ancestor 141 if fca == fco: # backwards, use working dir parent as ancestor
142 fca = fcd.parents()[0] 142 fca = fcd.parents()[0]
143 143