Show More
@@ -789,11 +789,11 b' def _pushobsolete(pushop):' | |||||
789 | """utility function to push obsolete markers to a remote""" |
|
789 | """utility function to push obsolete markers to a remote""" | |
790 | if 'obsmarkers' in pushop.stepsdone: |
|
790 | if 'obsmarkers' in pushop.stepsdone: | |
791 | return |
|
791 | return | |
792 | pushop.ui.debug('try to push obsolete markers to remote\n') |
|
|||
793 | repo = pushop.repo |
|
792 | repo = pushop.repo | |
794 | remote = pushop.remote |
|
793 | remote = pushop.remote | |
795 | pushop.stepsdone.add('obsmarkers') |
|
794 | pushop.stepsdone.add('obsmarkers') | |
796 | if pushop.outobsmarkers: |
|
795 | if pushop.outobsmarkers: | |
|
796 | pushop.ui.debug('try to push obsolete markers to remote\n') | |||
797 | rslts = [] |
|
797 | rslts = [] | |
798 | remotedata = obsolete._pushkeyescape(sorted(pushop.outobsmarkers)) |
|
798 | remotedata = obsolete._pushkeyescape(sorted(pushop.outobsmarkers)) | |
799 | for key in sorted(remotedata, reverse=True): |
|
799 | for key in sorted(remotedata, reverse=True): |
@@ -132,7 +132,6 b' Extension disabled for lack of a hook' | |||||
132 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported |
|
132 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | |
133 | bundle2-input-bundle: 1 parts total |
|
133 | bundle2-input-bundle: 1 parts total | |
134 | listing keys for "phases" |
|
134 | listing keys for "phases" | |
135 | try to push obsolete markers to remote |
|
|||
136 | repository tip rolled back to revision 0 (undo push) |
|
135 | repository tip rolled back to revision 0 (undo push) | |
137 | 0:6675d58eff77 |
|
136 | 0:6675d58eff77 | |
138 |
|
137 | |||
@@ -198,7 +197,6 b' Extension disabled for lack of acl.sourc' | |||||
198 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported |
|
197 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | |
199 | bundle2-input-bundle: 1 parts total |
|
198 | bundle2-input-bundle: 1 parts total | |
200 | listing keys for "phases" |
|
199 | listing keys for "phases" | |
201 | try to push obsolete markers to remote |
|
|||
202 | repository tip rolled back to revision 0 (undo push) |
|
200 | repository tip rolled back to revision 0 (undo push) | |
203 | 0:6675d58eff77 |
|
201 | 0:6675d58eff77 | |
204 |
|
202 | |||
@@ -275,7 +273,6 b' No [acl.allow]/[acl.deny]' | |||||
275 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported |
|
273 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | |
276 | bundle2-input-bundle: 1 parts total |
|
274 | bundle2-input-bundle: 1 parts total | |
277 | listing keys for "phases" |
|
275 | listing keys for "phases" | |
278 | try to push obsolete markers to remote |
|
|||
279 | repository tip rolled back to revision 0 (undo push) |
|
276 | repository tip rolled back to revision 0 (undo push) | |
280 | 0:6675d58eff77 |
|
277 | 0:6675d58eff77 | |
281 |
|
278 | |||
@@ -766,7 +763,6 b' barney is allowed everywhere' | |||||
766 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported |
|
763 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | |
767 | bundle2-input-bundle: 1 parts total |
|
764 | bundle2-input-bundle: 1 parts total | |
768 | listing keys for "phases" |
|
765 | listing keys for "phases" | |
769 | try to push obsolete markers to remote |
|
|||
770 | repository tip rolled back to revision 0 (undo push) |
|
766 | repository tip rolled back to revision 0 (undo push) | |
771 | 0:6675d58eff77 |
|
767 | 0:6675d58eff77 | |
772 |
|
768 | |||
@@ -1085,7 +1081,6 b' acl.config can set only [acl.allow]/[acl' | |||||
1085 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported |
|
1081 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | |
1086 | bundle2-input-bundle: 1 parts total |
|
1082 | bundle2-input-bundle: 1 parts total | |
1087 | listing keys for "phases" |
|
1083 | listing keys for "phases" | |
1088 | try to push obsolete markers to remote |
|
|||
1089 | repository tip rolled back to revision 0 (undo push) |
|
1084 | repository tip rolled back to revision 0 (undo push) | |
1090 | 0:6675d58eff77 |
|
1085 | 0:6675d58eff77 | |
1091 |
|
1086 | |||
@@ -1172,7 +1167,6 b' fred is always allowed' | |||||
1172 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported |
|
1167 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | |
1173 | bundle2-input-bundle: 1 parts total |
|
1168 | bundle2-input-bundle: 1 parts total | |
1174 | listing keys for "phases" |
|
1169 | listing keys for "phases" | |
1175 | try to push obsolete markers to remote |
|
|||
1176 | repository tip rolled back to revision 0 (undo push) |
|
1170 | repository tip rolled back to revision 0 (undo push) | |
1177 | 0:6675d58eff77 |
|
1171 | 0:6675d58eff77 | |
1178 |
|
1172 | |||
@@ -1332,7 +1326,6 b' OS-level groups' | |||||
1332 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported |
|
1326 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | |
1333 | bundle2-input-bundle: 1 parts total |
|
1327 | bundle2-input-bundle: 1 parts total | |
1334 | listing keys for "phases" |
|
1328 | listing keys for "phases" | |
1335 | try to push obsolete markers to remote |
|
|||
1336 | repository tip rolled back to revision 0 (undo push) |
|
1329 | repository tip rolled back to revision 0 (undo push) | |
1337 | 0:6675d58eff77 |
|
1330 | 0:6675d58eff77 | |
1338 |
|
1331 | |||
@@ -1539,7 +1532,6 b' No branch acls specified' | |||||
1539 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported |
|
1532 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | |
1540 | bundle2-input-bundle: 2 parts total |
|
1533 | bundle2-input-bundle: 2 parts total | |
1541 | listing keys for "phases" |
|
1534 | listing keys for "phases" | |
1542 | try to push obsolete markers to remote |
|
|||
1543 | repository tip rolled back to revision 2 (undo push) |
|
1535 | repository tip rolled back to revision 2 (undo push) | |
1544 | 2:fb35475503ef |
|
1536 | 2:fb35475503ef | |
1545 |
|
1537 | |||
@@ -1836,7 +1828,6 b' Branch acl allow other' | |||||
1836 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported |
|
1828 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | |
1837 | bundle2-input-bundle: 2 parts total |
|
1829 | bundle2-input-bundle: 2 parts total | |
1838 | listing keys for "phases" |
|
1830 | listing keys for "phases" | |
1839 | try to push obsolete markers to remote |
|
|||
1840 | repository tip rolled back to revision 2 (undo push) |
|
1831 | repository tip rolled back to revision 2 (undo push) | |
1841 | 2:fb35475503ef |
|
1832 | 2:fb35475503ef | |
1842 |
|
1833 | |||
@@ -1930,7 +1921,6 b' push foobar into the remote' | |||||
1930 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported |
|
1921 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | |
1931 | bundle2-input-bundle: 2 parts total |
|
1922 | bundle2-input-bundle: 2 parts total | |
1932 | listing keys for "phases" |
|
1923 | listing keys for "phases" | |
1933 | try to push obsolete markers to remote |
|
|||
1934 | repository tip rolled back to revision 2 (undo push) |
|
1924 | repository tip rolled back to revision 2 (undo push) | |
1935 | 2:fb35475503ef |
|
1925 | 2:fb35475503ef | |
1936 |
|
1926 | |||
@@ -2092,7 +2082,6 b" User 'astro' must not be denied" | |||||
2092 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported |
|
2082 | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | |
2093 | bundle2-input-bundle: 2 parts total |
|
2083 | bundle2-input-bundle: 2 parts total | |
2094 | listing keys for "phases" |
|
2084 | listing keys for "phases" | |
2095 | try to push obsolete markers to remote |
|
|||
2096 | repository tip rolled back to revision 2 (undo push) |
|
2085 | repository tip rolled back to revision 2 (undo push) | |
2097 | 2:fb35475503ef |
|
2086 | 2:fb35475503ef | |
2098 |
|
2087 |
General Comments 0
You need to be logged in to leave comments.
Login now