Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 8269:bb9f13974d8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: use ui.warn() for warnings
author Steve Borho <steve@borho.org>
date Thu, 30 Apr 2009 23:57:36 -0500
parents 98acfd1d2b08
children b87a50b7125c
comparison
equal deleted inserted replaced
8265:52c5be55af82 8269:bb9f13974d8e
168 168
169 repo.ui.debug(_("my %s other %s ancestor %s\n") % (fcd, fco, fca)) 169 repo.ui.debug(_("my %s other %s ancestor %s\n") % (fcd, fco, fca))
170 170
171 # do we attempt to simplemerge first? 171 # do we attempt to simplemerge first?
172 if _toolbool(ui, tool, "premerge", not (binary or symlink)): 172 if _toolbool(ui, tool, "premerge", not (binary or symlink)):
173 r = simplemerge.simplemerge(a, b, c, quiet=True) 173 r = simplemerge.simplemerge(ui, a, b, c, quiet=True)
174 if not r: 174 if not r:
175 ui.debug(_(" premerge successful\n")) 175 ui.debug(_(" premerge successful\n"))
176 os.unlink(back) 176 os.unlink(back)
177 os.unlink(b) 177 os.unlink(b)
178 os.unlink(c) 178 os.unlink(c)
185 HG_MY_ISLINK='l' in fcd.flags(), 185 HG_MY_ISLINK='l' in fcd.flags(),
186 HG_OTHER_ISLINK='l' in fco.flags(), 186 HG_OTHER_ISLINK='l' in fco.flags(),
187 HG_BASE_ISLINK='l' in fca.flags()) 187 HG_BASE_ISLINK='l' in fca.flags())
188 188
189 if tool == "internal:merge": 189 if tool == "internal:merge":
190 r = simplemerge.simplemerge(a, b, c, label=['local', 'other']) 190 r = simplemerge.simplemerge(ui, a, b, c, label=['local', 'other'])
191 else: 191 else:
192 args = _toolstr(ui, tool, "args", '$local $base $other') 192 args = _toolstr(ui, tool, "args", '$local $base $other')
193 if "$output" in args: 193 if "$output" in args:
194 out, a = a, back # read input from backup, write to original 194 out, a = a, back # read input from backup, write to original
195 replace = dict(local=a, base=b, other=c, output=out) 195 replace = dict(local=a, base=b, other=c, output=out)