D5474: obsutil: fix the issue5686

[av6 (Anton Shestakov)]

av6 added inline comments.

INLINE COMMENTS

> test-obsmarker-template.t:2511
>    | @  471597cad322
> -  |/     Obsfate: pruned;
> +  |/     Obsfate: rewritten as 2:617adc3a144c by test (at 1970-01-01 00:00 +0000);
>    o  ea207398892e

The new output looks somewhat more correct, but not quite. This changeset definitely wasn't just pruned, but it also wasn't rewritten either: it was split, and you can see correct `hg fatelog` output in the block below this one. The difference between them is wdir parent is different and the fatelog below has --hidden flag.

So is it expected that this patch doesn't fully fix this particular issue?

> test-obsolete.t:938
>  
>  Several troubles on the same changeset (create an unstable and bumped changeset)
>  

This title looks like it needs to mention content-divergence after this patch, and to use the new lingo.

> test-obsolete.t:1100-1116
>  check explanation for an orphan and phase-divergent changeset
>  
>    $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=paper' | egrep '(orphan|phase-divergent):'
>     <td>orphan:  obsolete parent <a href="/rev/3de5eca88c00?style=paper">3de5eca88c00</a><br>
> -  phase-divergent:  immutable predecessor <a href="/rev/245bde4270cd?style=paper">245bde4270cd</a></td>
> +  phase-divergent:  immutable predecessor <a href="/rev/245bde4270cd?style=paper">245bde4270cd</a><br>
>    $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=coal' | egrep '(orphan|phase-divergent):'
>     <td>orphan:  obsolete parent <a href="/rev/3de5eca88c00?style=coal">3de5eca88c00</a><br>

This block tests how instabilities are explained in hgweb, so it would be good to have the new instability to show up: `egrep '(orphan|-divergent)'`. And the block's title needs to be updated too.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5474

To: khanchi97, #hg-reviewers
Cc: av6, mercurial-devel