Submitter | Augie Fackler |
---|---|
Date | Feb. 3, 2017, 9:03 p.m. |
Message ID | <88a67501322af7987075.1486155787@arthedain.pit.corp.google.com> |
Download | mbox | patch |
Permalink | /patch/18322/ |
State | Accepted |
Headers | show |
Comments
Augie Fackler <raf@durin42.com> writes: > # HG changeset patch > # User Augie Fackler <augie@google.com> > # Date 1486155679 18000 > # Fri Feb 03 16:01:19 2017 -0500 > # Node ID 88a67501322af79870758125007ecd1a71c6fc89 > # Parent 1791be8a95c5d59cb8dd96b1479e24ad4470a9b6 > cmdutil: remove forwarding methods per deprecation policy Looks good to me.
On Fri, 03 Feb 2017 16:03:07 -0500, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler <augie@google.com> > # Date 1486155679 18000 > # Fri Feb 03 16:01:19 2017 -0500 > # Node ID 88a67501322af79870758125007ecd1a71c6fc89 > # Parent 1791be8a95c5d59cb8dd96b1479e24ad4470a9b6 > cmdutil: remove forwarding methods per deprecation policy Queued this, thanks.
Patch
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -3366,11 +3366,6 @@ def command(table): return cmd -def checkunresolved(ms): - ms._repo.ui.deprecwarn('checkunresolved moved from cmdutil to mergeutil', - '4.1') - return mergeutil.checkunresolved(ms) - # a list of (ui, repo, otherpeer, opts, missing) functions called by # commands.outgoing. "missing" is "missing" of the result of # "findcommonoutgoing()" @@ -3477,10 +3472,3 @@ def wrongtooltocontinue(repo, task): if after[1]: hint = after[0] raise error.Abort(_('no %s in progress') % task, hint=hint) - -class dirstateguard(dirstateguardmod.dirstateguard): - def __init__(self, repo, name): - dirstateguardmod.dirstateguard.__init__(self, repo, name) - repo.ui.deprecwarn( - 'dirstateguard has moved from cmdutil to dirstateguard', - '4.1')