This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5474

obsutil: fix the issue5686
ClosedPublic

Authored by khanchi97 on Dec 22 2018, 4:28 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG191fac9ff9d3: obsutil: fix the issue5686
Summary

While traversing the obsolescence graph to find the successors sets
of csets:

In its 4th case (read comments of obsutil.successorssets to see
all 4 cases) where we know successors sets of all direct successors
of CURRENT, we were just missing a condition to filter out the case
when a cset is pruned.
And without this condition (that this patch added) it was making a whole
successor set to [] just because of one pruned marker.

For e.g:if following is the successors set of a cset A:

   A -> [a, b, c]

if we prune c, we expect A's successors set to be [a, b] but
you would get:
   A -> []

So this patch make sure that we calculate the right successorsset of csets
considering the pruned cset (in split case).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

khanchi97 created this revision.Dec 22 2018, 4:28 PM
khanchi97 added a comment.Dec 22 2018, 4:39 PM

Please take a look at tests changes, as I accepted these changes using --interactive flag thinking it as a expected change.
I think I can't add tests which will reflect the expected bahivour for this issue here in mercurial, so I will send a test patch in evolve.

av6 added a subscriber: av6.Dec 23 2018, 1:43 AM
av6 added inline comments.
tests/test-obsmarker-template.t
2511

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?

tests/test-obsolete.t
938

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

1099–1120

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.

khanchi97 added a comment.Dec 23 2018, 7:13 AM

@av6 Thanks for the review. I will update it.

tests/test-obsmarker-template.t
2511

wdir parent is not making a difference here. If we pass --hidden here without updating the wdir parent, it will show the same result as block below. Maybe, this changed output is correct as it including those revision only which are visible to user.
So when we pass --hidden that hidden cset is visible and it outputs that it was a split operation.

khanchi97 added a comment.Dec 25 2018, 11:28 AM

Ready for review.

Closed by commit rHG191fac9ff9d3: obsutil: fix the issue5686 (authored by khanchi97). · Explain WhyJan 9 2019, 3:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 13105

mercurial/obsutil.py

newss = prefix.copy() newss = prefix.copy()
newss.markers.update(suffix.markers) newss.markers.update(suffix.markers)
for part in suffix: for part in suffix:
# do not duplicated entry in successors set # do not duplicated entry in successors set
# first entry wins. # first entry wins.
if part not in newss: if part not in newss:
newss.append(part) newss.append(part)
productresult.append(newss) productresult.append(newss)
if productresult:
markss = productresult markss = productresult
succssets.extend(markss) succssets.extend(markss)
# remove duplicated and subset # remove duplicated and subset
seen = [] seen = []
final = [] final = []
candidates = sorted((s for s in succssets if s), candidates = sorted((s for s in succssets if s),
key=len, reverse=True) key=len, reverse=True)
for cand in candidates: for cand in candidates:
for seensuccs in seen: for seensuccs in seen:

tests/test-obsmarker-template.t

summary: ROOT summary: ROOT
Check templates Check templates
--------------- ---------------
$ hg up 'desc("A0")' --hidden $ hg up 'desc("A0")' --hidden
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 471597cad322 updated to hidden changeset 471597cad322
(hidden revision '471597cad322' is pruned) (hidden revision '471597cad322' was rewritten as: 617adc3a144c)
# todo: the obsfate output is not ideal # todo: the obsfate output is not ideal
$ hg fatelog $ hg fatelog
o 617adc3a144c o 617adc3a144c
| |
| @ 471597cad322 | @ 471597cad322
|/ Obsfate: pruned; |/ Obsfate: rewritten as 2:617adc3a144c by test (at 1970-01-01 00:00 +0000);
av6Unsubmitted
Not Done

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?

av6: The new output looks somewhat more correct, but not quite. This changeset definitely wasn't…
khanchi97AuthorUnsubmitted
Not Done

wdir parent is not making a difference here. If we pass --hidden here without updating the wdir parent, it will show the same result as block below. Maybe, this changed output is correct as it including those revision only which are visible to user.
So when we pass --hidden that hidden cset is visible and it outputs that it was a split operation.

khanchi97: wdir parent is not making a difference here. If we pass `--hidden` here without updating the…
o ea207398892e o ea207398892e
$ hg up -r 'desc("A2")' --hidden $ hg up -r 'desc("A2")' --hidden
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 0d0ef4bdf70e updated to hidden changeset 0d0ef4bdf70e
(hidden revision '0d0ef4bdf70e' is pruned) (hidden revision '0d0ef4bdf70e' is pruned)
$ hg fatelog --hidden $ hg fatelog --hidden

tests/test-obsolete.t

$ echo '[experimental]' >> $HGRCPATH $ echo '[experimental]' >> $HGRCPATH
$ echo "evolution.exchange=True" >> $HGRCPATH $ echo "evolution.exchange=True" >> $HGRCPATH
$ echo "evolution.createmarkers=True" >> $HGRCPATH $ echo "evolution.createmarkers=True" >> $HGRCPATH
$ rm access.log errors.log $ rm access.log errors.log
#endif #endif
Several troubles on the same changeset (create an unstable and bumped changeset) Several troubles on the same changeset (create an unstable and bumped and content-divergent changeset)
av6Unsubmitted
Not Done

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

av6: This title looks like it needs to mention content-divergence after this patch, and to use the…
$ hg debugobsolete `getid obsolete_e` $ hg debugobsolete `getid obsolete_e`
obsoleted 1 changesets obsoleted 1 changesets
2 new orphan changesets 2 new orphan changesets
$ hg debugobsolete `getid original_c` `getid babar` $ hg debugobsolete `getid original_c` `getid babar`
1 new phase-divergent changesets 1 new phase-divergent changesets
$ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()' 2 new content-divergent changesets
$ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan() and contentdivergent()'
changeset: 7:50c51b361e60 changeset: 7:50c51b361e60
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
instability: orphan, phase-divergent instability: orphan, phase-divergent, content-divergent
summary: add babar summary: add babar
test the "obsolete" templatekw test the "obsolete" templatekw
$ hg log -r 'obsolete()' $ hg log -r 'obsolete()'
6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e [pruned] 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e [pruned]
test the "troubles" templatekw test the "troubles" templatekw
$ hg log -r 'phasedivergent() and orphan()' $ hg log -r 'phasedivergent() and orphan()'
7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar 7:50c51b361e60 (draft orphan phase-divergent content-divergent) [ ] add babar
test the default cmdline template test the default cmdline template
$ hg log -T default -r 'phasedivergent()' $ hg log -T default -r 'phasedivergent()'
changeset: 7:50c51b361e60 changeset: 7:50c51b361e60
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
instability: orphan, phase-divergent instability: orphan, phase-divergent, content-divergent
summary: add babar summary: add babar
$ hg log -T default -r 'obsolete()' $ hg log -T default -r 'obsolete()'
changeset: 6:3de5eca88c00 changeset: 6:3de5eca88c00
parent: 3:6f9641995072 parent: 3:6f9641995072
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
obsolete: pruned obsolete: pruned
summary: add obsolete_e summary: add obsolete_e
test the obsolete labels test the obsolete labels
$ hg log --config ui.logtemplate= --color=debug -r 'phasedivergent()' $ hg log --config ui.logtemplate= --color=debug -r 'phasedivergent()'
[log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60] [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent instability.content-divergent|changeset: 7:50c51b361e60]
[log.user|user: test] [log.user|user: test]
[log.date|date: Thu Jan 01 00:00:00 1970 +0000] [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
[log.instability|instability: orphan, phase-divergent] [log.instability|instability: orphan, phase-divergent, content-divergent]
[log.summary|summary: add babar] [log.summary|summary: add babar]
$ hg log -T default -r 'phasedivergent()' --color=debug $ hg log -T default -r 'phasedivergent()' --color=debug
[log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60] [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent instability.content-divergent|changeset: 7:50c51b361e60]
[log.user|user: test] [log.user|user: test]
[log.date|date: Thu Jan 01 00:00:00 1970 +0000] [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
[log.instability|instability: orphan, phase-divergent] [log.instability|instability: orphan, phase-divergent, content-divergent]
[log.summary|summary: add babar] [log.summary|summary: add babar]
$ hg log --config ui.logtemplate= --color=debug -r "obsolete()" $ hg log --config ui.logtemplate= --color=debug -r "obsolete()"
[log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00] [log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00]
[log.parent changeset.draft|parent: 3:6f9641995072] [log.parent changeset.draft|parent: 3:6f9641995072]
[log.user|user: test] [log.user|user: test]
[log.date|date: Thu Jan 01 00:00:00 1970 +0000] [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
[log.summary|summary: add obsolete_e] [log.summary|summary: add obsolete_e]
test summary output test summary output
$ hg up -r 'phasedivergent() and orphan()' $ hg up -r 'phasedivergent() and orphan()'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg summary $ hg summary
parent: 7:50c51b361e60 (orphan, phase-divergent) parent: 7:50c51b361e60 (orphan, phase-divergent, content-divergent)
add babar add babar
branch: default branch: default
commit: (clean) commit: (clean)
update: 2 new changesets (update) update: 2 new changesets (update)
phases: 4 draft phases: 4 draft
orphan: 2 changesets orphan: 2 changesets
content-divergent: 2 changesets
phase-divergent: 1 changesets phase-divergent: 1 changesets
$ hg up -r 'obsolete()' $ hg up -r 'obsolete()'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg summary $ hg summary
parent: 6:3de5eca88c00 (obsolete) parent: 6:3de5eca88c00 (obsolete)
add obsolete_e add obsolete_e
branch: default branch: default
commit: (clean) commit: (clean)
update: 3 new changesets (update) update: 3 new changesets (update)
phases: 4 draft phases: 4 draft
orphan: 2 changesets orphan: 2 changesets
content-divergent: 2 changesets
phase-divergent: 1 changesets phase-divergent: 1 changesets
test debugwhyunstable output test debugwhyunstable output
$ hg debugwhyunstable 50c51b361e60 $ hg debugwhyunstable 50c51b361e60
orphan: obsolete parent 3de5eca88c00aa039da7399a220f4a5221faa585 orphan: obsolete parent 3de5eca88c00aa039da7399a220f4a5221faa585
phase-divergent: immutable predecessor 245bde4270cd1072a27757984f9cda8ba26f08ca phase-divergent: immutable predecessor 245bde4270cd1072a27757984f9cda8ba26f08ca
content-divergent: 6f96419950729f3671185b847352890f074f7557 (draft) predecessor 245bde4270cd1072a27757984f9cda8ba26f08ca
test whyunstable template keyword test whyunstable template keyword
$ hg log -r 50c51b361e60 -T '{whyunstable}\n' $ hg log -r 50c51b361e60 -T '{whyunstable}\n'
orphan: obsolete parent 3de5eca88c00 orphan: obsolete parent 3de5eca88c00
phase-divergent: immutable predecessor 245bde4270cd phase-divergent: immutable predecessor 245bde4270cd
content-divergent: 3:6f9641995072 (draft) predecessor 245bde4270cd
$ hg log -r 50c51b361e60 -T '{whyunstable % "{instability}: {reason} {node|shortest}\n"}' $ hg log -r 50c51b361e60 -T '{whyunstable % "{instability}: {reason} {node|shortest}\n"}'
orphan: obsolete parent 3de5 orphan: obsolete parent 3de5
phase-divergent: immutable predecessor 245b phase-divergent: immutable predecessor 245b
content-divergent: predecessor 245b
#if serve #if serve
$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
check obsolete changeset check obsolete changeset
$ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=paper' | grep '<span class="obsolete">' $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=paper' | grep '<span class="obsolete">'
<span class="phase">draft</span> <span class="obsolete">obsolete</span> <span class="phase">draft</span> <span class="obsolete">obsolete</span>
$ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=coal' | grep '<span class="obsolete">' $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=coal' | grep '<span class="obsolete">'
<span class="phase">draft</span> <span class="obsolete">obsolete</span> <span class="phase">draft</span> <span class="obsolete">obsolete</span>
$ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=gitweb' | grep '<span class="logtags">' $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=gitweb' | grep '<span class="logtags">'
<span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span> <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span>
$ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=monoblue' | grep '<span class="logtags">' $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=monoblue' | grep '<span class="logtags">'
<span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span> <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span>
$ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=spartan' | grep 'class="obsolete"' $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=spartan' | grep 'class="obsolete"'
<th class="obsolete">obsolete:</th> <th class="obsolete">obsolete:</th>
<td class="obsolete">pruned by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> <td class="obsolete">pruned by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
check changeset with instabilities check changeset with instabilities
$ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=paper' | grep '<span class="instability">' $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=paper' | grep '<span class="instability">'
<span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span> <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span> <span class="instability">content-divergent</span>
$ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=coal' | grep '<span class="instability">' $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=coal' | grep '<span class="instability">'
<span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span> <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span> <span class="instability">content-divergent</span>
$ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=gitweb' | grep '<span class="logtags">' $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=gitweb' | grep '<span class="logtags">'
<span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> </span> <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> <span class="instabilitytag" title="content-divergent">content-divergent</span> </span>
$ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=monoblue' | grep '<span class="logtags">' $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=monoblue' | grep '<span class="logtags">'
<span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> </span> <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> <span class="instabilitytag" title="content-divergent">content-divergent</span> </span>
$ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=spartan' | grep 'class="unstable"' $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=spartan' | grep 'class="unstable"'
<th class="unstable">unstable:</th> <th class="unstable">unstable:</th>
<td class="unstable">orphan: obsolete parent <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a></td> <td class="unstable">orphan: obsolete parent <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a></td>
<th class="unstable">unstable:</th> <th class="unstable">unstable:</th>
<td class="unstable">phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td> <td class="unstable">phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
<th class="unstable">unstable:</th>
<td class="unstable">content-divergent: <a href="/rev/6f9641995072?style=spartan">6f9641995072</a> (draft) predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
check explanation for an orphan and phase-divergent changeset check explanation for an orphan, phase-divergent and content-divergent changeset
$ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=paper' | egrep '(orphan|phase-divergent):' $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=paper' | egrep '(orphan|phase-divergent|content-divergent):'
<td>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=paper">3de5eca88c00</a><br> <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):' content-divergent: <a href="/rev/6f9641995072?style=paper">6f9641995072</a> (draft) predecessor <a href="/rev/245bde4270cd?style=paper">245bde4270cd</a></td>
$ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=coal' | egrep '(orphan|phase-divergent|content-divergent):'
<td>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=coal">3de5eca88c00</a><br> <td>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=coal">3de5eca88c00</a><br>
phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=coal">245bde4270cd</a></td> phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=coal">245bde4270cd</a><br>
$ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=gitweb' | egrep '(orphan|phase-divergent):' content-divergent: <a href="/rev/6f9641995072?style=coal">6f9641995072</a> (draft) predecessor <a href="/rev/245bde4270cd?style=coal">245bde4270cd</a></td>
$ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=gitweb' | egrep '(orphan|phase-divergent|content-divergent):'
<td>orphan: obsolete parent <a class="list" href="/rev/3de5eca88c00?style=gitweb">3de5eca88c00</a></td> <td>orphan: obsolete parent <a class="list" href="/rev/3de5eca88c00?style=gitweb">3de5eca88c00</a></td>
<td>phase-divergent: immutable predecessor <a class="list" href="/rev/245bde4270cd?style=gitweb">245bde4270cd</a></td> <td>phase-divergent: immutable predecessor <a class="list" href="/rev/245bde4270cd?style=gitweb">245bde4270cd</a></td>
$ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=monoblue' | egrep '(orphan|phase-divergent):' <td>content-divergent: <a class="list" href="/rev/6f9641995072?style=gitweb">6f9641995072</a> (draft) predecessor <a class="list" href="/rev/245bde4270cd?style=gitweb">245bde4270cd</a></td>
$ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=monoblue' | egrep '(orphan|phase-divergent|content-divergent):'
<dd>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=monoblue">3de5eca88c00</a></dd> <dd>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=monoblue">3de5eca88c00</a></dd>
<dd>phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=monoblue">245bde4270cd</a></dd> <dd>phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=monoblue">245bde4270cd</a></dd>
$ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=spartan' | egrep '(orphan|phase-divergent):' <dd>content-divergent: <a href="/rev/6f9641995072?style=monoblue">6f9641995072</a> (draft) predecessor <a href="/rev/245bde4270cd?style=monoblue">245bde4270cd</a></dd>
$ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=spartan' | egrep '(orphan|phase-divergent|content-divergent):'
<td class="unstable">orphan: obsolete parent <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a></td> <td class="unstable">orphan: obsolete parent <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a></td>
<td class="unstable">phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td> <td class="unstable">phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
<td class="unstable">content-divergent: <a href="/rev/6f9641995072?style=spartan">6f9641995072</a> (draft) predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
av6Unsubmitted
Not Done

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.

av6: This block tests how instabilities are explained in hgweb, so it would be good to have the new…
$ killdaemons.py $ killdaemons.py
$ rm hg.pid access.log errors.log $ rm hg.pid access.log errors.log
#endif #endif
Test incoming/outcoming with changesets obsoleted remotely, known locally Test incoming/outcoming with changesets obsoleted remotely, known locally