[PATCH 1 of 2 V2] subrepos: support adding files in git subrepos

Mathias De Maré mathias.demare at gmail.com
Fri Feb 27 13:01:44 CST 2015


On Fri, Feb 27, 2015 at 2:42 AM, Matt Harbison <mharbison72 at gmail.com>
wrote:

> On Thu, 26 Feb 2015 13:50:21 -0500, Mathias De Maré <
> mathias.demare at gmail.com> wrote:
>
>  # HG changeset patch
>> # User Mathias De Maré <mathias.demare at gmail.com>
>> # Date 1424764162 -3600
>> #      Tue Feb 24 08:49:22 2015 +0100
>> # Node ID ad021801d5dcef705a942c638430cf1a83ef2e4d
>> # Parent  ff5caa8dfd993680d9602ca6ebb14da9de10d5f4
>> subrepos: support adding files in git subrepos
>>
>> This support includes correct matching, so includes,
>> excludes and patterns are all supported.
>> <snip>
>>
> Good catches on the status messages and handling dry runs.  I missed that
> the first time.
>
> Here is a patch to fix up the globs in the test, and another to make
> bypassing .hgignore work in more (all?) cases, with a more robust test.
> Feel free to fold in and modify as you see fit, or I can follow up with the
> .hgignore patch later- whatever is easiest.
>
Oh, good point. I totally forgot about Windows, oops :-) I'll fold in the
glob changes, since those are needed to make the tests pass on Windows.
I prefer if you follow up with the .hgignore patch, if that's ok.

>
> Always returning [] means 'hg add' won't return 1 if adds in the subrepo
> fails, but since _gitcommand() seems to throw away the exit code, I don't
> see how to fix that.  This is still a nice step forward even without that.
>
I guess I could make a patch for that in the future, not sure if it's worth
the effort.

Greetings and thanks,
Mathias
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20150227/2312dbf6/attachment.html>


More information about the Mercurial-devel mailing list