# HG changeset patch # User Thomas Arendsen Hein # Date 1164232948 -3600 # Node ID 67f44b8257842ef920b68483f46f8b62451cf95a # Parent 0d810798acb125f2f24f7eff27643087337d014a Removed unused ui parameter from revpair/revrange and fix its users. diff --git a/hgext/extdiff.py b/hgext/extdiff.py --- a/hgext/extdiff.py +++ b/hgext/extdiff.py @@ -99,7 +99,7 @@ def dodiff(ui, repo, diffcmd, diffopts, fp.write(chunk) return dirname - node1, node2 = cmdutil.revpair(ui, repo, opts['rev']) + node1, node2 = cmdutil.revpair(repo, opts['rev']) files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) modified, added, removed, deleted, unknown = repo.status( node1, node2, files, match=matchfn)[:5] diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -33,7 +33,7 @@ from mercurial.demandload import * from mercurial.i18n import gettext as _ from mercurial import commands demandload(globals(), "os sys re struct traceback errno bz2") -demandload(globals(), "mercurial:cmdutil,hg,patch,revlog,ui,util") +demandload(globals(), "mercurial:cmdutil,hg,patch,revlog,util") commands.norepo += " qclone qversion" @@ -502,7 +502,7 @@ class queue: if opts.get('rev'): if not self.applied: raise util.Abort(_('no patches applied')) - revs = cmdutil.revrange(ui, repo, opts['rev']) + revs = cmdutil.revrange(repo, opts['rev']) if len(revs) > 1 and revs[0] > revs[1]: revs.reverse() for rev in revs: @@ -1315,7 +1315,7 @@ class queue: if files: raise util.Abort(_('option "-r" not valid when importing ' 'files')) - rev = cmdutil.revrange(self.ui, repo, rev) + rev = cmdutil.revrange(repo, rev) rev.sort(lambda x, y: cmp(y, x)) if (len(files) > 1 or len(rev) > 1) and patchname: raise util.Abort(_('option "-n" not valid when importing multiple ' diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -13,7 +13,7 @@ demandload(globals(), 'mdiff util templa revrangesep = ':' -def revpair(ui, repo, revs): +def revpair(repo, revs): '''return pair of nodes, given list of revisions. second item can be None, meaning use working dir.''' @@ -41,7 +41,7 @@ def revpair(ui, repo, revs): raise util.Abort(_('too many revisions specified')) return start, end -def revrange(ui, repo, revs): +def revrange(repo, revs): """Yield revision as strings from a list of revision specifications.""" def revfix(repo, val, defval): @@ -641,7 +641,7 @@ def walkchangerevs(ui, repo, pats, chang defrange = '%s:0' % repo.changectx().rev() else: defrange = 'tip:0' - revs = revrange(ui, repo, opts['rev'] or [defrange]) + revs = revrange(repo, opts['rev'] or [defrange]) wanted = {} slowpath = anypats or opts.get('removed') fncache = {} diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -835,7 +835,7 @@ def diff(ui, repo, *pats, **opts): it detects as binary. With -a, diff will generate a diff anyway, probably with undesirable results. """ - node1, node2 = cmdutil.revpair(ui, repo, opts['rev']) + node1, node2 = cmdutil.revpair(repo, opts['rev']) fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) @@ -871,7 +871,7 @@ def export(ui, repo, *changesets, **opts """ if not changesets: raise util.Abort(_("export requires at least one changeset")) - revs = cmdutil.revrange(ui, repo, changesets) + revs = cmdutil.revrange(repo, changesets) if len(revs) > 1: ui.note(_('exporting patches:\n')) else: @@ -1436,7 +1436,7 @@ def log(ui, repo, *pats, **opts): count = 0 if opts['copies'] and opts['rev']: - endrev = max(cmdutil.revrange(ui, repo, opts['rev'])) + 1 + endrev = max(cmdutil.revrange(repo, opts['rev'])) + 1 else: endrev = repo.changelog.count() rcache = {} @@ -2120,7 +2120,7 @@ def status(ui, repo, *pats, **opts): """ all = opts['all'] - node1, node2 = cmdutil.revpair(ui, repo, opts.get('rev')) + node1, node2 = cmdutil.revpair(repo, opts.get('rev')) files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) cwd = (pats and repo.getcwd()) or ''