Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 8615:94ca38e63576
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 |
line wrap: on
line diff
--- a/mercurial/filemerge.py Sun May 24 16:38:29 2009 -0500 +++ b/mercurial/filemerge.py Sun May 24 22:37:20 2009 +0200 @@ -163,11 +163,11 @@ util.copyfile(a, back) if orig != fco.path(): - repo.ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd)) + ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd)) else: - repo.ui.status(_("merging %s\n") % fd) + ui.status(_("merging %s\n") % fd) - repo.ui.debug(_("my %s other %s ancestor %s\n") % (fcd, fco, fca)) + ui.debug(_("my %s other %s ancestor %s\n") % (fcd, fco, fca)) # do we attempt to simplemerge first? if _toolbool(ui, tool, "premerge", not (binary or symlink)): @@ -213,7 +213,7 @@ _matcheol(repo.wjoin(fd), back) if r: - repo.ui.warn(_("merging %s failed!\n") % fd) + ui.warn(_("merging %s failed!\n") % fd) else: os.unlink(back)