Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 12010:ce818cf215dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 21 Aug 2010 10:48:49 -0500
parents 8380ed691df8 fad5ed0ff997
children 1e8c7999af86
comparison
equal deleted inserted replaced
12007:652f71b235bf 12010:ce818cf215dc
136 return False 136 return False
137 137
138 if not fco.cmp(fcd): # 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
142 fca = fcd.parents()[0]
143
144 ui = repo.ui 141 ui = repo.ui
145 fd = fcd.path() 142 fd = fcd.path()
146 binary = isbin(fcd) or isbin(fco) or isbin(fca) 143 binary = isbin(fcd) or isbin(fco) or isbin(fca)
147 symlink = 'l' in fcd.flags() + fco.flags() 144 symlink = 'l' in fcd.flags() + fco.flags()
148 tool, toolpath = _picktool(repo, ui, fd, binary, symlink) 145 tool, toolpath = _picktool(repo, ui, fd, binary, symlink)