Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 8615:94ca38e63576

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use ui instead of repo.ui when the former is in scope
author Martin Geisler <mg@lazybytes.net>
date Sun, 24 May 2009 22:37:20 +0200
parents fea40a677d43
children a9850eda2973
comparison
equal deleted inserted replaced
8614:573734e7e6d0 8615:94ca38e63576
161 out = "" 161 out = ""
162 back = a + ".orig" 162 back = a + ".orig"
163 util.copyfile(a, back) 163 util.copyfile(a, back)
164 164
165 if orig != fco.path(): 165 if orig != fco.path():
166 repo.ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd)) 166 ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd))
167 else: 167 else:
168 repo.ui.status(_("merging %s\n") % fd) 168 ui.status(_("merging %s\n") % fd)
169 169
170 repo.ui.debug(_("my %s other %s ancestor %s\n") % (fcd, fco, fca)) 170 ui.debug(_("my %s other %s ancestor %s\n") % (fcd, fco, fca))
171 171
172 # do we attempt to simplemerge first? 172 # do we attempt to simplemerge first?
173 if _toolbool(ui, tool, "premerge", not (binary or symlink)): 173 if _toolbool(ui, tool, "premerge", not (binary or symlink)):
174 r = simplemerge.simplemerge(ui, a, b, c, quiet=True) 174 r = simplemerge.simplemerge(ui, a, b, c, quiet=True)
175 if not r: 175 if not r:
211 211
212 if _toolbool(ui, tool, "fixeol"): 212 if _toolbool(ui, tool, "fixeol"):
213 _matcheol(repo.wjoin(fd), back) 213 _matcheol(repo.wjoin(fd), back)
214 214
215 if r: 215 if r:
216 repo.ui.warn(_("merging %s failed!\n") % fd) 216 ui.warn(_("merging %s failed!\n") % fd)
217 else: 217 else:
218 os.unlink(back) 218 os.unlink(back)
219 219
220 os.unlink(b) 220 os.unlink(b)
221 os.unlink(c) 221 os.unlink(c)