Mercurial > public > mercurial-scm > hg
diff contrib/simplemerge @ 30559:d83ca854fa21
ui: factor out ui.load() to create a ui without loading configs (API)
This allows us to write doctests depending on a ui object, but not on global
configs.
ui.load() is a class method so we can do wsgiui.load(). All ui() calls but
for doctests are replaced with ui.load(). Some of them could be changed to
not load configs later.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 22 Oct 2016 14:35:10 +0900 |
| parents | 863075fd4cd0 |
| children | 541949a10a68 |
line wrap: on
line diff
--- a/contrib/simplemerge Wed Nov 30 19:23:04 2016 +0000 +++ b/contrib/simplemerge Sat Oct 22 14:35:10 2016 +0900 @@ -54,7 +54,7 @@ sys.exit(0) if len(args) != 3: raise ParseError(_('wrong number of arguments')) - sys.exit(simplemerge.simplemerge(ui.ui(), *args, **opts)) + sys.exit(simplemerge.simplemerge(ui.ui.load(), *args, **opts)) except ParseError as e: sys.stdout.write("%s: %s\n" % (sys.argv[0], e)) showhelp()