[PATCH] branch: add missing repo argument to checknewlabel

Augie Fackler raf at durin42.com
Thu Nov 29 12:00:47 CST 2012


Pushed, thanks (mua fail on my first reply?)

On Nov 29, 2012, at 10:52 AM, Tim Henigan <tim.henigan at gmail.com> wrote:

> # HG changeset patch
> # User Tim Henigan <tim.henigan at gmail.com>
> # Date 1354196961 18000
> # Node ID 703754a20be60bfa683973d9d890d04851ba584d
> # Parent  1683bca3175285d482633c4c7ed2231b338f6738
> branch: add missing repo argument to checknewlabel
> 
> scmutil.checknewlabel takes a repo object as its first argument.
> When the call to this function was added in e689b0d91546, the
> first argument was mistakenly set to 'None'.
> 
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -928,7 +928,7 @@
>                                        ' exists'),
>                                      # i18n: "it" refers to an existing branch
>                                      hint=_("use 'hg update' to switch to it"))
> -            scmutil.checknewlabel(None, label, 'branch')
> +            scmutil.checknewlabel(repo, label, 'branch')
>             repo.dirstate.setbranch(label)
>             ui.status(_('marked working directory as branch %s\n') % label)
>             ui.status(_('(branches are permanent and global, '
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel



More information about the Mercurial-devel mailing list