[PATCH] subrepo: add status support for ignored files in git subrepos

Matt Harbison matt_harbison at yahoo.com
Sat Nov 29 22:47:00 CST 2014


On Fri, 28 Nov 2014 20:57:45 +0100, Mathias De Maré wrote:

> # HG changeset patch
> # User Mathias De Maré <mathias.demare at gmail.com>
> # Date 1417202175 -3600
> #      Fre Nov 28 20:16:15 2014 +0100
> # Node ID 38f8516fa91a71df42bf2ca5a7e20e54b540f590
> # Parent  b913c394386f0a6ebbdcb7e321ff82816d7799fe
> subrepo: add status support for ignored files in git subrepos

Minor nit while this hasn't landed in the main repo- shouldn't this be
'untracked' instead of 'ignored' since the status is reported as '?'
and not 'I'?

> diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
> --- a/tests/test-subrepo-git.t
> +++ b/tests/test-subrepo-git.t
> @@ -114,17 +114,20 @@ clone root separately, make different lo
>  
>    $ cd ../t
>    $ hg clone . ../tb 2> /dev/null
>    updating to branch default
>    cloning subrepo s from $TESTTMP/gitroot
>    3 files updated, 0 files merged, 0 files removed, 0 files unresolved
>  
>    $ cd ../tb/s
> +  $ hg status --subrepos
>    $ echo f > f
> +  $ hg status --subrepos
> +  ? s/f
>    $ git add f
>    $ cd ..
>  
>    $ hg status --subrepos
>    A s/f
>    $ hg commit --subrepos -m f
>    committing subrepository s
>    $ hg debugsub



More information about the Mercurial-devel mailing list