[PATCH 3 of 3] crecord: check for untracked arguments
Augie Fackler
raf at durin42.com
Wed Apr 6 21:09:21 EDT 2016
On Wed, Apr 06, 2016 at 01:24:33PM -0500, timeless wrote:
> # HG changeset patch
> # User timeless <timeless at mozdev.org>
> # Date 1459966776 0
> # Wed Apr 06 18:19:36 2016 +0000
> # Node ID 1c96ffe42ca6a2303a97df226d682db6a9e2c199
> # Parent c32a62f336f89877deb1753ac1c1eb104b656839
> crecord: check for untracked arguments
queued, thanks
>
> hg commit tracked untracked -- fails complaining about untracked
>
> prior to this commit,
> hg commit -i tracked untracked -- did not fail
>
> This is corrected by calling the refactored localrepo.checkcommitpatterns
>
> diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
> --- a/mercurial/cmdutil.py
> +++ b/mercurial/cmdutil.py
> @@ -135,12 +135,24 @@
> """
>
> checkunfinished(repo, commit=True)
> - merge = len(repo[None].parents()) > 1
> + wctx = repo[None]
> + merge = len(wctx.parents()) > 1
> if merge:
> raise error.Abort(_('cannot partially commit a merge '
> '(use "hg commit" instead)'))
>
> + def fail(f, msg):
> + raise error.Abort('%s: %s' % (f, msg))
> +
> + force = opts.get('force')
> + if not force:
> + vdirs = []
> + match.explicitdir = vdirs.append
> + match.bad = fail
> +
> status = repo.status(match=match)
> + if not force:
> + repo.checkcommitargs(wctx, vdirs, match, status, fail)
> diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True)
> diffopts.nodates = True
> diffopts.git = True
> diff --git a/tests/test-commit-interactive.t b/tests/test-commit-interactive.t
> --- a/tests/test-commit-interactive.t
> +++ b/tests/test-commit-interactive.t
> @@ -59,6 +59,14 @@
>
>
>
> +Abort for untracked
> +
> + $ touch untracked
> + $ hg commit -i -m should-fail empty-rw untracked
> + abort: untracked: file not tracked!
> + [255]
> + $ rm untracked
> +
> Record empty file
>
> $ hg commit -i -d '0 0' -m empty empty-rw<<EOF
> _______________________________________________
> 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