[PATCH 1 of 2 rfc] subrepo: make update -C for svn and git subrepos clean the working directory

[Erik Zielke]

On 25-01-2011 11:28, Mads Kiilerich wrote:
> On 01/25/2011 09:51 AM, Erik Zielke wrote:
>> # HG changeset patch
>> # User Erik Zielke<ez at aragost.com>
>> # Date 1295943603 -3600
>> # Node ID 29633b15e5841f444bce6f6b33822d24e91d134f
>> # Parent  82d01ca87863e74dbf3ff1adc8c065620703a54a
>> subrepo: make update -C for svn and git subrepos clean the working 
>> directory
>>
>> Makes the clean parameter work for svn and git sub repositories.
>
> ...
>> diff -r 82d01ca87863 -r 29633b15e584 mercurial/subrepo.py
>> --- a/mercurial/subrepo.py    Tue Jan 25 09:19:59 2011 +0100
>> +++ b/mercurial/subrepo.py    Tue Jan 25 09:20:03 2011 +0100
> ...
>> @@ -759,16 +762,26 @@
>>                   self._gitcommand(['reset', '--hard', 'HEAD'])
>>                   return
>>           elif self._gitstate() == revision:
>> +            if overwrite:
>> +#                self._gitcommand(['reset', 'HEAD', '.'])
>> +#                self._gitcommand(['reset', '--hard', 'HEAD'])
>>               return
>
> ???
>
>>           branch2rev, rev2branch = self._gitbranchmap()
>>
>> +        def checkout(args):
>> +            cmd = ['checkout']
>> +            if overwrite:
>> + #               self._gitcommand(['reset', 'HEAD', '.'])
>> +  #              cmd.append('-f')
>> +            self._gitcommand(cmd + args)
>
> ???
>
> /Mads

Argh, the lines should of course not have been commented out.

-- 
Erik Zielke

aragost Trifork ag
Professional Mercurial Support
http://www.aragost.com