##// END OF EJS Templates
obsutil: fix the issue5686...
Sushil khanchi -
r41187:191fac9f default
parent child Browse files
Show More
@@ -711,7 +711,8 b' def successorssets(repo, initialnode, cl'
711 if part not in newss:
711 if part not in newss:
712 newss.append(part)
712 newss.append(part)
713 productresult.append(newss)
713 productresult.append(newss)
714 markss = productresult
714 if productresult:
715 markss = productresult
715 succssets.extend(markss)
716 succssets.extend(markss)
716 # remove duplicated and subset
717 # remove duplicated and subset
717 seen = []
718 seen = []
@@ -2501,14 +2501,14 b' Check templates'
2501 $ hg up 'desc("A0")' --hidden
2501 $ hg up 'desc("A0")' --hidden
2502 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2502 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2503 updated to hidden changeset 471597cad322
2503 updated to hidden changeset 471597cad322
2504 (hidden revision '471597cad322' is pruned)
2504 (hidden revision '471597cad322' was rewritten as: 617adc3a144c)
2505
2505
2506 # todo: the obsfate output is not ideal
2506 # todo: the obsfate output is not ideal
2507 $ hg fatelog
2507 $ hg fatelog
2508 o 617adc3a144c
2508 o 617adc3a144c
2509 |
2509 |
2510 | @ 471597cad322
2510 | @ 471597cad322
2511 |/ Obsfate: pruned;
2511 |/ Obsfate: rewritten as 2:617adc3a144c by test (at 1970-01-01 00:00 +0000);
2512 o ea207398892e
2512 o ea207398892e
2513
2513
2514 $ hg up -r 'desc("A2")' --hidden
2514 $ hg up -r 'desc("A2")' --hidden
@@ -935,21 +935,21 b' reenable for later test'
935 $ rm access.log errors.log
935 $ rm access.log errors.log
936 #endif
936 #endif
937
937
938 Several troubles on the same changeset (create an unstable and bumped changeset)
938 Several troubles on the same changeset (create an unstable and bumped and content-divergent changeset)
939
939
940 $ hg debugobsolete `getid obsolete_e`
940 $ hg debugobsolete `getid obsolete_e`
941 obsoleted 1 changesets
941 obsoleted 1 changesets
942 2 new orphan changesets
942 2 new orphan changesets
943 $ hg debugobsolete `getid original_c` `getid babar`
943 $ hg debugobsolete `getid original_c` `getid babar`
944 1 new phase-divergent changesets
944 1 new phase-divergent changesets
945 $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()'
945 2 new content-divergent changesets
946 $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan() and contentdivergent()'
946 changeset: 7:50c51b361e60
947 changeset: 7:50c51b361e60
947 user: test
948 user: test
948 date: Thu Jan 01 00:00:00 1970 +0000
949 date: Thu Jan 01 00:00:00 1970 +0000
949 instability: orphan, phase-divergent
950 instability: orphan, phase-divergent, content-divergent
950 summary: add babar
951 summary: add babar
951
952
952
953 test the "obsolete" templatekw
953 test the "obsolete" templatekw
954
954
955 $ hg log -r 'obsolete()'
955 $ hg log -r 'obsolete()'
@@ -958,7 +958,7 b' test the "obsolete" templatekw'
958 test the "troubles" templatekw
958 test the "troubles" templatekw
959
959
960 $ hg log -r 'phasedivergent() and orphan()'
960 $ hg log -r 'phasedivergent() and orphan()'
961 7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar
961 7:50c51b361e60 (draft orphan phase-divergent content-divergent) [ ] add babar
962
962
963 test the default cmdline template
963 test the default cmdline template
964
964
@@ -966,7 +966,7 b' test the default cmdline template'
966 changeset: 7:50c51b361e60
966 changeset: 7:50c51b361e60
967 user: test
967 user: test
968 date: Thu Jan 01 00:00:00 1970 +0000
968 date: Thu Jan 01 00:00:00 1970 +0000
969 instability: orphan, phase-divergent
969 instability: orphan, phase-divergent, content-divergent
970 summary: add babar
970 summary: add babar
971
971
972 $ hg log -T default -r 'obsolete()'
972 $ hg log -T default -r 'obsolete()'
@@ -981,18 +981,18 b' test the default cmdline template'
981 test the obsolete labels
981 test the obsolete labels
982
982
983 $ hg log --config ui.logtemplate= --color=debug -r 'phasedivergent()'
983 $ hg log --config ui.logtemplate= --color=debug -r 'phasedivergent()'
984 [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60]
984 [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent instability.content-divergent|changeset: 7:50c51b361e60]
985 [log.user|user: test]
985 [log.user|user: test]
986 [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
986 [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
987 [log.instability|instability: orphan, phase-divergent]
987 [log.instability|instability: orphan, phase-divergent, content-divergent]
988 [log.summary|summary: add babar]
988 [log.summary|summary: add babar]
989
989
990
990
991 $ hg log -T default -r 'phasedivergent()' --color=debug
991 $ hg log -T default -r 'phasedivergent()' --color=debug
992 [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60]
992 [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent instability.content-divergent|changeset: 7:50c51b361e60]
993 [log.user|user: test]
993 [log.user|user: test]
994 [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
994 [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
995 [log.instability|instability: orphan, phase-divergent]
995 [log.instability|instability: orphan, phase-divergent, content-divergent]
996 [log.summary|summary: add babar]
996 [log.summary|summary: add babar]
997
997
998
998
@@ -1019,13 +1019,14 b' test summary output'
1019 $ hg up -r 'phasedivergent() and orphan()'
1019 $ hg up -r 'phasedivergent() and orphan()'
1020 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1020 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1021 $ hg summary
1021 $ hg summary
1022 parent: 7:50c51b361e60 (orphan, phase-divergent)
1022 parent: 7:50c51b361e60 (orphan, phase-divergent, content-divergent)
1023 add babar
1023 add babar
1024 branch: default
1024 branch: default
1025 commit: (clean)
1025 commit: (clean)
1026 update: 2 new changesets (update)
1026 update: 2 new changesets (update)
1027 phases: 4 draft
1027 phases: 4 draft
1028 orphan: 2 changesets
1028 orphan: 2 changesets
1029 content-divergent: 2 changesets
1029 phase-divergent: 1 changesets
1030 phase-divergent: 1 changesets
1030 $ hg up -r 'obsolete()'
1031 $ hg up -r 'obsolete()'
1031 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1032 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -1037,6 +1038,7 b' test summary output'
1037 update: 3 new changesets (update)
1038 update: 3 new changesets (update)
1038 phases: 4 draft
1039 phases: 4 draft
1039 orphan: 2 changesets
1040 orphan: 2 changesets
1041 content-divergent: 2 changesets
1040 phase-divergent: 1 changesets
1042 phase-divergent: 1 changesets
1041
1043
1042 test debugwhyunstable output
1044 test debugwhyunstable output
@@ -1044,15 +1046,18 b' test debugwhyunstable output'
1044 $ hg debugwhyunstable 50c51b361e60
1046 $ hg debugwhyunstable 50c51b361e60
1045 orphan: obsolete parent 3de5eca88c00aa039da7399a220f4a5221faa585
1047 orphan: obsolete parent 3de5eca88c00aa039da7399a220f4a5221faa585
1046 phase-divergent: immutable predecessor 245bde4270cd1072a27757984f9cda8ba26f08ca
1048 phase-divergent: immutable predecessor 245bde4270cd1072a27757984f9cda8ba26f08ca
1049 content-divergent: 6f96419950729f3671185b847352890f074f7557 (draft) predecessor 245bde4270cd1072a27757984f9cda8ba26f08ca
1047
1050
1048 test whyunstable template keyword
1051 test whyunstable template keyword
1049
1052
1050 $ hg log -r 50c51b361e60 -T '{whyunstable}\n'
1053 $ hg log -r 50c51b361e60 -T '{whyunstable}\n'
1051 orphan: obsolete parent 3de5eca88c00
1054 orphan: obsolete parent 3de5eca88c00
1052 phase-divergent: immutable predecessor 245bde4270cd
1055 phase-divergent: immutable predecessor 245bde4270cd
1056 content-divergent: 3:6f9641995072 (draft) predecessor 245bde4270cd
1053 $ hg log -r 50c51b361e60 -T '{whyunstable % "{instability}: {reason} {node|shortest}\n"}'
1057 $ hg log -r 50c51b361e60 -T '{whyunstable % "{instability}: {reason} {node|shortest}\n"}'
1054 orphan: obsolete parent 3de5
1058 orphan: obsolete parent 3de5
1055 phase-divergent: immutable predecessor 245b
1059 phase-divergent: immutable predecessor 245b
1060 content-divergent: predecessor 245b
1056
1061
1057 #if serve
1062 #if serve
1058
1063
@@ -1076,36 +1081,43 b' check obsolete changeset'
1076 check changeset with instabilities
1081 check changeset with instabilities
1077
1082
1078 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=paper' | grep '<span class="instability">'
1083 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=paper' | grep '<span class="instability">'
1079 <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span>
1084 <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span> <span class="instability">content-divergent</span>
1080 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=coal' | grep '<span class="instability">'
1085 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=coal' | grep '<span class="instability">'
1081 <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span>
1086 <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span> <span class="instability">content-divergent</span>
1082 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=gitweb' | grep '<span class="logtags">'
1087 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=gitweb' | grep '<span class="logtags">'
1083 <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>
1088 <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>
1084 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=monoblue' | grep '<span class="logtags">'
1089 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=monoblue' | grep '<span class="logtags">'
1085 <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>
1090 <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>
1086 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=spartan' | grep 'class="unstable"'
1091 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=spartan' | grep 'class="unstable"'
1087 <th class="unstable">unstable:</th>
1092 <th class="unstable">unstable:</th>
1088 <td class="unstable">orphan: obsolete parent <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a></td>
1093 <td class="unstable">orphan: obsolete parent <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a></td>
1089 <th class="unstable">unstable:</th>
1094 <th class="unstable">unstable:</th>
1090 <td class="unstable">phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
1095 <td class="unstable">phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
1096 <th class="unstable">unstable:</th>
1097 <td class="unstable">content-divergent: <a href="/rev/6f9641995072?style=spartan">6f9641995072</a> (draft) predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
1091
1098
1092 check explanation for an orphan and phase-divergent changeset
1099 check explanation for an orphan, phase-divergent and content-divergent changeset
1093
1100
1094 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=paper' | egrep '(orphan|phase-divergent):'
1101 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=paper' | egrep '(orphan|phase-divergent|content-divergent):'
1095 <td>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=paper">3de5eca88c00</a><br>
1102 <td>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=paper">3de5eca88c00</a><br>
1096 phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=paper">245bde4270cd</a></td>
1103 phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=paper">245bde4270cd</a><br>
1097 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=coal' | egrep '(orphan|phase-divergent):'
1104 content-divergent: <a href="/rev/6f9641995072?style=paper">6f9641995072</a> (draft) predecessor <a href="/rev/245bde4270cd?style=paper">245bde4270cd</a></td>
1105 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=coal' | egrep '(orphan|phase-divergent|content-divergent):'
1098 <td>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=coal">3de5eca88c00</a><br>
1106 <td>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=coal">3de5eca88c00</a><br>
1099 phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=coal">245bde4270cd</a></td>
1107 phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=coal">245bde4270cd</a><br>
1100 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=gitweb' | egrep '(orphan|phase-divergent):'
1108 content-divergent: <a href="/rev/6f9641995072?style=coal">6f9641995072</a> (draft) predecessor <a href="/rev/245bde4270cd?style=coal">245bde4270cd</a></td>
1109 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=gitweb' | egrep '(orphan|phase-divergent|content-divergent):'
1101 <td>orphan: obsolete parent <a class="list" href="/rev/3de5eca88c00?style=gitweb">3de5eca88c00</a></td>
1110 <td>orphan: obsolete parent <a class="list" href="/rev/3de5eca88c00?style=gitweb">3de5eca88c00</a></td>
1102 <td>phase-divergent: immutable predecessor <a class="list" href="/rev/245bde4270cd?style=gitweb">245bde4270cd</a></td>
1111 <td>phase-divergent: immutable predecessor <a class="list" href="/rev/245bde4270cd?style=gitweb">245bde4270cd</a></td>
1103 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=monoblue' | egrep '(orphan|phase-divergent):'
1112 <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>
1113 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=monoblue' | egrep '(orphan|phase-divergent|content-divergent):'
1104 <dd>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=monoblue">3de5eca88c00</a></dd>
1114 <dd>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=monoblue">3de5eca88c00</a></dd>
1105 <dd>phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=monoblue">245bde4270cd</a></dd>
1115 <dd>phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=monoblue">245bde4270cd</a></dd>
1106 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=spartan' | egrep '(orphan|phase-divergent):'
1116 <dd>content-divergent: <a href="/rev/6f9641995072?style=monoblue">6f9641995072</a> (draft) predecessor <a href="/rev/245bde4270cd?style=monoblue">245bde4270cd</a></dd>
1117 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=spartan' | egrep '(orphan|phase-divergent|content-divergent):'
1107 <td class="unstable">orphan: obsolete parent <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a></td>
1118 <td class="unstable">orphan: obsolete parent <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a></td>
1108 <td class="unstable">phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
1119 <td class="unstable">phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
1120 <td class="unstable">content-divergent: <a href="/rev/6f9641995072?style=spartan">6f9641995072</a> (draft) predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
1109
1121
1110 $ killdaemons.py
1122 $ killdaemons.py
1111
1123
General Comments 0
You need to be logged in to leave comments. Login now