[PATCH STABLE] graft: use opts.get() consistently
Augie Fackler
raf at durin42.com
Wed Jul 27 09:14:06 EDT 2016
On Mon, Jul 25, 2016 at 10:01:32AM -0500, Gábor Stefanik wrote:
> # HG changeset patch
> # User Gábor Stefanik <gabor.stefanik at nng.com>
> # Date 1469458842 -7200
> # Mon Jul 25 17:00:42 2016 +0200
> # Branch stable
> # Node ID 8c2595fa5ecd6d1274b742ab818c7bb3e82c50ed
> # Parent 9c2cc107547fd701a7604349632f2f590366f17c
> graft: use opts.get() consistently
I think this is borderline for stable, but I'll take it since it
probably helps extensions a ton.
>
> Make life easier for extension writers.
>
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -4089,12 +4089,12 @@
> return _dograft(ui, repo, *revs, **opts)
>
> def _dograft(ui, repo, *revs, **opts):
> - if revs and opts['rev']:
> + if revs and opts.get('rev'):
> ui.warn(_('warning: inconsistent use of --rev might give unexpected '
> 'revision ordering!\n'))
>
> revs = list(revs)
> - revs.extend(opts['rev'])
> + revs.extend(opts.get('rev'))
>
> if not opts.get('user') and opts.get('currentuser'):
> opts['user'] = ui.username()
> @@ -4104,7 +4104,7 @@
> editor = cmdutil.getcommiteditor(editform='graft', **opts)
>
> cont = False
> - if opts['continue']:
> + if opts.get('continue'):
> cont = True
> if revs:
> raise error.Abort(_("can't specify --continue and revisions"))
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
More information about the Mercurial-devel
mailing list