bug#22032: 24.3; VC doesn't handle hg hidden revisions

[Glenn Hutchings <zondo42@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 797 bytes --]

On 12/18/15 05:02, Dmitry Gutov wrote:
> On 12/16/2015 05:02 AM, Andy Moreton wrote:
>
>>> If there's a direct counterpart to 'git rev-parse 59951^', it would 
>>> be handy
>>> here.
>>
>> You mean like the "hg id" line in the example above ?
>
> Um, yes. Thanks for the explanation, I've pushed the new definition of 
> vc-hg-previous-revision that uses 'hg id -n -r 123^' to emacs-25.
>
> It seems to work fine, if a little surprising for merge commits when 
> vc-hg-log-graph is nil (which it is by default). Also, calling Hg is 
> not free, and adds ~120 ms on my machine.
>
> Glenn, could you if it solves the hidden revision problem as well?

Yes, it does.  I've created a test script which recreates the problem 
(and solution) quite nicely.  Attached is the script, and its output.

Glenn

[-- Attachment #2: script.sh --]
[-- Type: application/x-shellscript, Size: 1178 bytes --]

[-- Attachment #3: script.txt --]
[-- Type: text/plain, Size: 1621 bytes --]

+ repo=repo
+ file=repo/readme.txt
+ hg=hg -R repo
+ rm -rf repo
+ hg init repo
+ cat
+ cat
+ hg -R repo add repo/readme.txt
+ hg -R repo ci -m Birth.
+ cat
+ hg -R repo ci -m Life.
+ cat
+ hg -R repo ci -m Death. --amend
+ hg -R repo glog
@  changeset:   3:6beb1647b809
|  tag:         tip
|  parent:      0:9134909c2dbf
|  user:        Glenn Hutchings <zondo42@gmail.com>
|  date:        Tue Dec 22 20:11:10 2015 +0000
|  summary:     Death.
|
o  changeset:   0:9134909c2dbf
   user:        Glenn Hutchings <zondo42@gmail.com>
   date:        Tue Dec 22 20:11:10 2015 +0000
   summary:     Birth.

+ hg -R repo --hidden glog
@  changeset:   3:6beb1647b809
|  tag:         tip
|  parent:      0:9134909c2dbf
|  user:        Glenn Hutchings <zondo42@gmail.com>
|  date:        Tue Dec 22 20:11:10 2015 +0000
|  summary:     Death.
|
| x  changeset:   2:9964f5fac22b
| |  user:        Glenn Hutchings <zondo42@gmail.com>
| |  date:        Tue Dec 22 20:11:10 2015 +0000
| |  summary:     temporary amend commit for 16e951eccb81
| |
| x  changeset:   1:16e951eccb81
|/   user:        Glenn Hutchings <zondo42@gmail.com>
|    date:        Tue Dec 22 20:11:10 2015 +0000
|    summary:     Life.
|
o  changeset:   0:9134909c2dbf
   user:        Glenn Hutchings <zondo42@gmail.com>
   date:        Tue Dec 22 20:11:10 2015 +0000
   summary:     Birth.

+ hg -R repo id -n -r tip
+ tip=3
+ expr 3 - 1
+ hg -R repo id -n -r 2
abort: hidden revision '2'!
(use --hidden to access hidden revisions)
+ hg -R repo id -n -r 3^
0
+ hg -R repo --config extensions.evolve=! id -n -r 3^
obsolete feature not enabled but 2 markers found!
0