[PATCH] subrepo: don't commit in subrepo if it's clean

Kevin Bullock kbullock+mercurial at ringworld.org
Wed Jul 20 09:39:04 CDT 2011


On Jul 19, 2011, at 5:28 PM, Matt Mackall wrote:

> On Tue, 2011-07-19 at 13:44 -0500, Kevin Bullock wrote:
>> # HG changeset patch
>> # User Kevin Bullock <kbullock at ringworld.org>
>> # Date 1311101033 18000
>> # Branch stable
>> # Node ID e0eecff0ced05767a72ff36418396147aaf1ee73
>> # Parent  c0ccd70df52cbc361aef372514d61a2fd91f057e
>> subrepo: don't commit in subrepo if it's clean
>> 
>> If a subrepo has changed relative to the outer repo's substate, but the
>> subrepo itself is clean, we don't need to commit in the subrepo.
>> 
>> diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
>> --- a/mercurial/subrepo.py
>> +++ b/mercurial/subrepo.py
>> @@ -421,6 +421,10 @@
>> 
>>     def commit(self, text, user, date):
>>         self._repo.ui.debug("committing subrepo %s\n" % subrelpath(self))
> 
> Looks like this debug statement should be moved after the test. I've
> fixed that and queued this for stable, thanks.

Oh, I guess I was confusing that with the normal message that comes up, "committing subrepository foo". Didn't catch that this was a debug message. Thanks.

pacem in terris / mir / shanti / salaam / heiwa
Kevin R. Bullock



More information about the Mercurial-devel mailing list