[PATCH 1 of 4] subrepo: add shortid() method to subrepo classes

[Martin Geisler]

Pierre-Yves David <pierre-yves.david at ens-lyon.org> writes:

> On 05/07/2014 03:54 PM, Angel Ezquerra wrote:
>> # HG changeset patch
>> # User Angel Ezquerra <angel.ezquerra at gmail.com>
>> # Date 1399414100 -7200
>> #      Wed May 07 00:08:20 2014 +0200
>> # Node ID 99337cb12ccffe7283daaa1f117efb5d42211670
>> # Parent  0768cda8b5799dc803dc0ee27a832cd64e05f28a
>> subrepo: add shortid() method to subrepo classes
>>
>> This method takes an "id" (e.g. a revision id) and returns a "short" version
>> (e.g. a short revision id).
>>
>> This will be used on the next revision to fix a small bug in the way that the
>> text on the promptchoice shown when a subrepo diverges is generated.
>>
>> diff -r 0768cda8b579 -r 99337cb12ccf mercurial/subrepo.py
>> --- a/mercurial/subrepo.py	Tue Apr 29 12:54:01 2014 +0900
>> +++ b/mercurial/subrepo.py	Wed May 07 00:08:20 2014 +0200
>> @@ -501,6 +501,9 @@
>>               % (substate[0], substate[2]))
>>           return []
>>
>> +    def shortid(self, revid):
>> +        return revid
>> +
>>   class hgsubrepo(abstractsubrepo):
>>       def __init__(self, ctx, path, state):
>>           self._path = path
>> @@ -866,6 +869,9 @@
>>               pats = []
>>           cmdutil.revert(ui, self._repo, ctx, parents, *pats, **opts)
>>
>> +    def shortid(self, revid):
>> +        return revid[:12]
>> +
>>   class svnsubrepo(abstractsubrepo):
>>       def __init__(self, ctx, path, state):
>>           self._path = path
>> @@ -1561,6 +1567,9 @@
>>           deleted = unknown = ignored = clean = []
>>           return modified, added, removed, deleted, unknown, ignored, clean
>>
>> +    def shortid(self, revid):
>> +        return revid[:12]
>
> Consider adding diff.showfunc=true to your mercurial config (that adds
> comment in the patch to see what context your are patching)
>
> Also. I suspect git have a 8 char long short version id. Can you
> double check that?

Git normally only shows 7 characters. It has become configurable in
recent versions via the core.abbrev setting.

-- 
Martin Geisler

https://plus.google.com/+MartinGeisler/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20140508/487a9caf/attachment.pgp>