Show More
@@ -270,7 +270,7 b' class cg1unpacker(object):' | |||||
270 | def revmap(x): |
|
270 | def revmap(x): | |
271 | return cl.rev(x) |
|
271 | return cl.rev(x) | |
272 |
|
272 | |||
273 |
changesets = |
|
273 | changesets = 0 | |
274 |
|
274 | |||
275 | try: |
|
275 | try: | |
276 | # The transaction may already carry source information. In this |
|
276 | # The transaction may already carry source information. In this | |
@@ -337,23 +337,38 b' class cg1unpacker(object):' | |||||
337 | repo.ui.status(_("adding file changes\n")) |
|
337 | repo.ui.status(_("adding file changes\n")) | |
338 | newrevs, newfiles = _addchangegroupfiles( |
|
338 | newrevs, newfiles = _addchangegroupfiles( | |
339 | repo, self, revmap, trp, efiles, needfiles) |
|
339 | repo, self, revmap, trp, efiles, needfiles) | |
340 | revisions += newrevs |
|
340 | ||
341 | files += newfiles |
|
341 | # making sure the value exists | |
|
342 | tr.changes.setdefault('changegroup-count-changesets', 0) | |||
|
343 | tr.changes.setdefault('changegroup-count-revisions', 0) | |||
|
344 | tr.changes.setdefault('changegroup-count-files', 0) | |||
|
345 | tr.changes.setdefault('changegroup-count-heads', 0) | |||
|
346 | ||||
|
347 | # some code use bundle operation for internal purpose. They usually | |||
|
348 | # set `ui.quiet` to do this outside of user sight. Size the report | |||
|
349 | # of such operation now happens at the end of the transaction, that | |||
|
350 | # ui.quiet has not direct effect on the output. | |||
|
351 | # | |||
|
352 | # To preserve this intend use an inelegant hack, we fail to report | |||
|
353 | # the change if `quiet` is set. We should probably move to | |||
|
354 | # something better, but this is a good first step to allow the "end | |||
|
355 | # of transaction report" to pass tests. | |||
|
356 | if not repo.ui.quiet: | |||
|
357 | tr.changes['changegroup-count-changesets'] += changesets | |||
|
358 | tr.changes['changegroup-count-revisions'] += newrevs | |||
|
359 | tr.changes['changegroup-count-files'] += newfiles | |||
342 |
|
360 | |||
343 | deltaheads = 0 |
|
361 | deltaheads = 0 | |
344 | if oldheads: |
|
362 | if oldheads: | |
345 | heads = cl.heads() |
|
363 | heads = cl.heads() | |
346 | deltaheads = len(heads) - len(oldheads) |
|
364 | deltaheads += len(heads) - len(oldheads) | |
347 | for h in heads: |
|
365 | for h in heads: | |
348 | if h not in oldheads and repo[h].closesbranch(): |
|
366 | if h not in oldheads and repo[h].closesbranch(): | |
349 | deltaheads -= 1 |
|
367 | deltaheads -= 1 | |
350 | htext = "" |
|
|||
351 | if deltaheads: |
|
|||
352 | htext = _(" (%+d heads)") % deltaheads |
|
|||
353 |
|
368 | |||
354 | repo.ui.status(_("added %d changesets" |
|
369 | # see previous comment about checking ui.quiet | |
355 | " with %d changes to %d files%s\n") |
|
370 | if not repo.ui.quiet: | |
356 | % (changesets, revisions, files, htext)) |
|
371 | tr.changes['changegroup-count-heads'] += deltaheads | |
357 | repo.invalidatevolatilesets() |
|
372 | repo.invalidatevolatilesets() | |
358 |
|
373 | |||
359 | if changesets > 0: |
|
374 | if changesets > 0: |
@@ -1762,6 +1762,20 b' def registersummarycallback(repo, otr, t' | |||||
1762 | categories.append(newcat) |
|
1762 | categories.append(newcat) | |
1763 | return wrapped |
|
1763 | return wrapped | |
1764 |
|
1764 | |||
|
1765 | ||||
|
1766 | @reportsummary | |||
|
1767 | def reportchangegroup(repo, tr): | |||
|
1768 | cgchangesets = tr.changes.get('changegroup-count-changesets', 0) | |||
|
1769 | cgrevisions = tr.changes.get('changegroup-count-revisions', 0) | |||
|
1770 | cgfiles = tr.changes.get('changegroup-count-files', 0) | |||
|
1771 | cgheads = tr.changes.get('changegroup-count-heads', 0) | |||
|
1772 | if cgchangesets or cgrevisions or cgfiles: | |||
|
1773 | htext = "" | |||
|
1774 | if cgheads: | |||
|
1775 | htext = _(" (%+d heads)") % cgheads | |||
|
1776 | msg = _("added %d changesets with %d changes to %d files%s\n") | |||
|
1777 | repo.ui.status(msg % (cgchangesets, cgrevisions, cgfiles, htext)) | |||
|
1778 | ||||
1765 | if txmatch(_reportobsoletedsource): |
|
1779 | if txmatch(_reportobsoletedsource): | |
1766 | @reportsummary |
|
1780 | @reportsummary | |
1767 | def reportobsoleted(repo, tr): |
|
1781 | def reportobsoleted(repo, tr): |
@@ -131,12 +131,12 b' Extension disabled for lack of a hook' | |||||
131 | adding foo/Bar/file.txt revisions |
|
131 | adding foo/Bar/file.txt revisions | |
132 | adding foo/file.txt revisions |
|
132 | adding foo/file.txt revisions | |
133 | adding quux/file.py revisions |
|
133 | adding quux/file.py revisions | |
134 | added 3 changesets with 3 changes to 3 files |
|
|||
135 | bundle2-input-part: total payload size 1553 |
|
134 | bundle2-input-part: total payload size 1553 | |
136 | bundle2-input-part: "phase-heads" supported |
|
135 | bundle2-input-part: "phase-heads" supported | |
137 | bundle2-input-part: total payload size 24 |
|
136 | bundle2-input-part: total payload size 24 | |
138 | bundle2-input-bundle: 4 parts total |
|
137 | bundle2-input-bundle: 4 parts total | |
139 | updating the branch cache |
|
138 | updating the branch cache | |
|
139 | added 3 changesets with 3 changes to 3 files | |||
140 | bundle2-output-bundle: "HG20", 1 parts total |
|
140 | bundle2-output-bundle: "HG20", 1 parts total | |
141 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
141 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
142 | bundle2-input-bundle: no-transaction |
|
142 | bundle2-input-bundle: no-transaction | |
@@ -196,7 +196,6 b' Extension disabled for lack of acl.sourc' | |||||
196 | adding foo/Bar/file.txt revisions |
|
196 | adding foo/Bar/file.txt revisions | |
197 | adding foo/file.txt revisions |
|
197 | adding foo/file.txt revisions | |
198 | adding quux/file.py revisions |
|
198 | adding quux/file.py revisions | |
199 | added 3 changesets with 3 changes to 3 files |
|
|||
200 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
199 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
201 | acl: changes have source "push" - skipping |
|
200 | acl: changes have source "push" - skipping | |
202 | bundle2-input-part: total payload size 1553 |
|
201 | bundle2-input-part: total payload size 1553 | |
@@ -204,6 +203,7 b' Extension disabled for lack of acl.sourc' | |||||
204 | bundle2-input-part: total payload size 24 |
|
203 | bundle2-input-part: total payload size 24 | |
205 | bundle2-input-bundle: 4 parts total |
|
204 | bundle2-input-bundle: 4 parts total | |
206 | updating the branch cache |
|
205 | updating the branch cache | |
|
206 | added 3 changesets with 3 changes to 3 files | |||
207 | bundle2-output-bundle: "HG20", 1 parts total |
|
207 | bundle2-output-bundle: "HG20", 1 parts total | |
208 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
208 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
209 | bundle2-input-bundle: no-transaction |
|
209 | bundle2-input-bundle: no-transaction | |
@@ -263,7 +263,6 b' No [acl.allow]/[acl.deny]' | |||||
263 | adding foo/Bar/file.txt revisions |
|
263 | adding foo/Bar/file.txt revisions | |
264 | adding foo/file.txt revisions |
|
264 | adding foo/file.txt revisions | |
265 | adding quux/file.py revisions |
|
265 | adding quux/file.py revisions | |
266 | added 3 changesets with 3 changes to 3 files |
|
|||
267 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
266 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
268 | acl: checking access for user "fred" |
|
267 | acl: checking access for user "fred" | |
269 | acl: acl.allow.branches not enabled |
|
268 | acl: acl.allow.branches not enabled | |
@@ -281,6 +280,7 b' No [acl.allow]/[acl.deny]' | |||||
281 | bundle2-input-part: total payload size 24 |
|
280 | bundle2-input-part: total payload size 24 | |
282 | bundle2-input-bundle: 4 parts total |
|
281 | bundle2-input-bundle: 4 parts total | |
283 | updating the branch cache |
|
282 | updating the branch cache | |
|
283 | added 3 changesets with 3 changes to 3 files | |||
284 | bundle2-output-bundle: "HG20", 1 parts total |
|
284 | bundle2-output-bundle: "HG20", 1 parts total | |
285 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
285 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
286 | bundle2-input-bundle: no-transaction |
|
286 | bundle2-input-bundle: no-transaction | |
@@ -340,7 +340,6 b' Empty [acl.allow]' | |||||
340 | adding foo/Bar/file.txt revisions |
|
340 | adding foo/Bar/file.txt revisions | |
341 | adding foo/file.txt revisions |
|
341 | adding foo/file.txt revisions | |
342 | adding quux/file.py revisions |
|
342 | adding quux/file.py revisions | |
343 | added 3 changesets with 3 changes to 3 files |
|
|||
344 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
343 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
345 | acl: checking access for user "fred" |
|
344 | acl: checking access for user "fred" | |
346 | acl: acl.allow.branches not enabled |
|
345 | acl: acl.allow.branches not enabled | |
@@ -409,7 +408,6 b' fred is allowed inside foo/' | |||||
409 | adding foo/Bar/file.txt revisions |
|
408 | adding foo/Bar/file.txt revisions | |
410 | adding foo/file.txt revisions |
|
409 | adding foo/file.txt revisions | |
411 | adding quux/file.py revisions |
|
410 | adding quux/file.py revisions | |
412 | added 3 changesets with 3 changes to 3 files |
|
|||
413 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
411 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
414 | acl: checking access for user "fred" |
|
412 | acl: checking access for user "fred" | |
415 | acl: acl.allow.branches not enabled |
|
413 | acl: acl.allow.branches not enabled | |
@@ -483,7 +481,6 b' Empty [acl.deny]' | |||||
483 | adding foo/Bar/file.txt revisions |
|
481 | adding foo/Bar/file.txt revisions | |
484 | adding foo/file.txt revisions |
|
482 | adding foo/file.txt revisions | |
485 | adding quux/file.py revisions |
|
483 | adding quux/file.py revisions | |
486 | added 3 changesets with 3 changes to 3 files |
|
|||
487 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
484 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
488 | acl: checking access for user "barney" |
|
485 | acl: checking access for user "barney" | |
489 | acl: acl.allow.branches not enabled |
|
486 | acl: acl.allow.branches not enabled | |
@@ -554,7 +551,6 b' fred is allowed inside foo/, but not foo' | |||||
554 | adding foo/Bar/file.txt revisions |
|
551 | adding foo/Bar/file.txt revisions | |
555 | adding foo/file.txt revisions |
|
552 | adding foo/file.txt revisions | |
556 | adding quux/file.py revisions |
|
553 | adding quux/file.py revisions | |
557 | added 3 changesets with 3 changes to 3 files |
|
|||
558 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
554 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
559 | acl: checking access for user "fred" |
|
555 | acl: checking access for user "fred" | |
560 | acl: acl.allow.branches not enabled |
|
556 | acl: acl.allow.branches not enabled | |
@@ -630,7 +626,6 b' fred is allowed inside foo/, but not foo' | |||||
630 | adding foo/Bar/file.txt revisions |
|
626 | adding foo/Bar/file.txt revisions | |
631 | adding foo/file.txt revisions |
|
627 | adding foo/file.txt revisions | |
632 | adding quux/file.py revisions |
|
628 | adding quux/file.py revisions | |
633 | added 3 changesets with 3 changes to 3 files |
|
|||
634 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
629 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
635 | acl: checking access for user "fred" |
|
630 | acl: checking access for user "fred" | |
636 | acl: acl.allow.branches not enabled |
|
631 | acl: acl.allow.branches not enabled | |
@@ -703,7 +698,6 b' fred is allowed inside foo/, but not foo' | |||||
703 | adding foo/Bar/file.txt revisions |
|
698 | adding foo/Bar/file.txt revisions | |
704 | adding foo/file.txt revisions |
|
699 | adding foo/file.txt revisions | |
705 | adding quux/file.py revisions |
|
700 | adding quux/file.py revisions | |
706 | added 3 changesets with 3 changes to 3 files |
|
|||
707 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
701 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
708 | acl: checking access for user "barney" |
|
702 | acl: checking access for user "barney" | |
709 | acl: acl.allow.branches not enabled |
|
703 | acl: acl.allow.branches not enabled | |
@@ -775,7 +769,6 b' fred is not blocked from moving bookmark' | |||||
775 | adding manifests |
|
769 | adding manifests | |
776 | adding file changes |
|
770 | adding file changes | |
777 | adding foo/file.txt revisions |
|
771 | adding foo/file.txt revisions | |
778 | added 1 changesets with 1 changes to 1 files |
|
|||
779 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
772 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
780 | acl: checking access for user "fred" |
|
773 | acl: checking access for user "fred" | |
781 | acl: acl.allow.branches not enabled |
|
774 | acl: acl.allow.branches not enabled | |
@@ -796,6 +789,7 b' fred is not blocked from moving bookmark' | |||||
796 | acl: bookmark access granted: "ef1ea85a6374b77d6da9dcda9541f498f2d17df7" on bookmark "moving-bookmark" |
|
789 | acl: bookmark access granted: "ef1ea85a6374b77d6da9dcda9541f498f2d17df7" on bookmark "moving-bookmark" | |
797 | bundle2-input-bundle: 6 parts total |
|
790 | bundle2-input-bundle: 6 parts total | |
798 | updating the branch cache |
|
791 | updating the branch cache | |
|
792 | added 1 changesets with 1 changes to 1 files | |||
799 | bundle2-output-bundle: "HG20", 1 parts total |
|
793 | bundle2-output-bundle: "HG20", 1 parts total | |
800 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
794 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
801 | bundle2-input-bundle: no-transaction |
|
795 | bundle2-input-bundle: no-transaction | |
@@ -861,7 +855,6 b' fred is not allowed to move bookmarks' | |||||
861 | adding manifests |
|
855 | adding manifests | |
862 | adding file changes |
|
856 | adding file changes | |
863 | adding foo/file.txt revisions |
|
857 | adding foo/file.txt revisions | |
864 | added 1 changesets with 1 changes to 1 files |
|
|||
865 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
858 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
866 | acl: checking access for user "fred" |
|
859 | acl: checking access for user "fred" | |
867 | acl: acl.allow.branches not enabled |
|
860 | acl: acl.allow.branches not enabled | |
@@ -950,7 +943,6 b' barney is allowed everywhere' | |||||
950 | adding foo/Bar/file.txt revisions |
|
943 | adding foo/Bar/file.txt revisions | |
951 | adding foo/file.txt revisions |
|
944 | adding foo/file.txt revisions | |
952 | adding quux/file.py revisions |
|
945 | adding quux/file.py revisions | |
953 | added 3 changesets with 3 changes to 3 files |
|
|||
954 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
946 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
955 | acl: checking access for user "barney" |
|
947 | acl: checking access for user "barney" | |
956 | acl: acl.allow.branches not enabled |
|
948 | acl: acl.allow.branches not enabled | |
@@ -968,6 +960,7 b' barney is allowed everywhere' | |||||
968 | bundle2-input-part: total payload size 24 |
|
960 | bundle2-input-part: total payload size 24 | |
969 | bundle2-input-bundle: 4 parts total |
|
961 | bundle2-input-bundle: 4 parts total | |
970 | updating the branch cache |
|
962 | updating the branch cache | |
|
963 | added 3 changesets with 3 changes to 3 files | |||
971 | bundle2-output-bundle: "HG20", 1 parts total |
|
964 | bundle2-output-bundle: "HG20", 1 parts total | |
972 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
965 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
973 | bundle2-input-bundle: no-transaction |
|
966 | bundle2-input-bundle: no-transaction | |
@@ -1034,7 +1027,6 b' wilma can change files with a .txt exten' | |||||
1034 | adding foo/Bar/file.txt revisions |
|
1027 | adding foo/Bar/file.txt revisions | |
1035 | adding foo/file.txt revisions |
|
1028 | adding foo/file.txt revisions | |
1036 | adding quux/file.py revisions |
|
1029 | adding quux/file.py revisions | |
1037 | added 3 changesets with 3 changes to 3 files |
|
|||
1038 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
1030 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
1039 | acl: checking access for user "wilma" |
|
1031 | acl: checking access for user "wilma" | |
1040 | acl: acl.allow.branches not enabled |
|
1032 | acl: acl.allow.branches not enabled | |
@@ -1116,7 +1108,6 b' file specified by acl.config does not ex' | |||||
1116 | adding foo/Bar/file.txt revisions |
|
1108 | adding foo/Bar/file.txt revisions | |
1117 | adding foo/file.txt revisions |
|
1109 | adding foo/file.txt revisions | |
1118 | adding quux/file.py revisions |
|
1110 | adding quux/file.py revisions | |
1119 | added 3 changesets with 3 changes to 3 files |
|
|||
1120 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
1111 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
1121 | acl: checking access for user "barney" |
|
1112 | acl: checking access for user "barney" | |
1122 | error: pretxnchangegroup.acl hook raised an exception: [Errno *] * (glob) |
|
1113 | error: pretxnchangegroup.acl hook raised an exception: [Errno *] * (glob) | |
@@ -1193,7 +1184,6 b' betty is allowed inside foo/ by a acl.co' | |||||
1193 | adding foo/Bar/file.txt revisions |
|
1184 | adding foo/Bar/file.txt revisions | |
1194 | adding foo/file.txt revisions |
|
1185 | adding foo/file.txt revisions | |
1195 | adding quux/file.py revisions |
|
1186 | adding quux/file.py revisions | |
1196 | added 3 changesets with 3 changes to 3 files |
|
|||
1197 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
1187 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
1198 | acl: checking access for user "betty" |
|
1188 | acl: checking access for user "betty" | |
1199 | acl: acl.allow.branches not enabled |
|
1189 | acl: acl.allow.branches not enabled | |
@@ -1281,7 +1271,6 b' acl.config can set only [acl.allow]/[acl' | |||||
1281 | adding foo/Bar/file.txt revisions |
|
1271 | adding foo/Bar/file.txt revisions | |
1282 | adding foo/file.txt revisions |
|
1272 | adding foo/file.txt revisions | |
1283 | adding quux/file.py revisions |
|
1273 | adding quux/file.py revisions | |
1284 | added 3 changesets with 3 changes to 3 files |
|
|||
1285 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
1274 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
1286 | acl: checking access for user "barney" |
|
1275 | acl: checking access for user "barney" | |
1287 | acl: acl.allow.branches not enabled |
|
1276 | acl: acl.allow.branches not enabled | |
@@ -1299,6 +1288,7 b' acl.config can set only [acl.allow]/[acl' | |||||
1299 | bundle2-input-part: total payload size 24 |
|
1288 | bundle2-input-part: total payload size 24 | |
1300 | bundle2-input-bundle: 4 parts total |
|
1289 | bundle2-input-bundle: 4 parts total | |
1301 | updating the branch cache |
|
1290 | updating the branch cache | |
|
1291 | added 3 changesets with 3 changes to 3 files | |||
1302 | bundle2-output-bundle: "HG20", 1 parts total |
|
1292 | bundle2-output-bundle: "HG20", 1 parts total | |
1303 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
1293 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
1304 | bundle2-input-bundle: no-transaction |
|
1294 | bundle2-input-bundle: no-transaction | |
@@ -1369,7 +1359,6 b' fred is always allowed' | |||||
1369 | adding foo/Bar/file.txt revisions |
|
1359 | adding foo/Bar/file.txt revisions | |
1370 | adding foo/file.txt revisions |
|
1360 | adding foo/file.txt revisions | |
1371 | adding quux/file.py revisions |
|
1361 | adding quux/file.py revisions | |
1372 | added 3 changesets with 3 changes to 3 files |
|
|||
1373 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
1362 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
1374 | acl: checking access for user "fred" |
|
1363 | acl: checking access for user "fred" | |
1375 | acl: acl.allow.branches not enabled |
|
1364 | acl: acl.allow.branches not enabled | |
@@ -1387,6 +1376,7 b' fred is always allowed' | |||||
1387 | bundle2-input-part: total payload size 24 |
|
1376 | bundle2-input-part: total payload size 24 | |
1388 | bundle2-input-bundle: 4 parts total |
|
1377 | bundle2-input-bundle: 4 parts total | |
1389 | updating the branch cache |
|
1378 | updating the branch cache | |
|
1379 | added 3 changesets with 3 changes to 3 files | |||
1390 | bundle2-output-bundle: "HG20", 1 parts total |
|
1380 | bundle2-output-bundle: "HG20", 1 parts total | |
1391 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
1381 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
1392 | bundle2-input-bundle: no-transaction |
|
1382 | bundle2-input-bundle: no-transaction | |
@@ -1453,7 +1443,6 b' no one is allowed inside foo/Bar/' | |||||
1453 | adding foo/Bar/file.txt revisions |
|
1443 | adding foo/Bar/file.txt revisions | |
1454 | adding foo/file.txt revisions |
|
1444 | adding foo/file.txt revisions | |
1455 | adding quux/file.py revisions |
|
1445 | adding quux/file.py revisions | |
1456 | added 3 changesets with 3 changes to 3 files |
|
|||
1457 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
1446 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
1458 | acl: checking access for user "fred" |
|
1447 | acl: checking access for user "fred" | |
1459 | acl: acl.allow.branches not enabled |
|
1448 | acl: acl.allow.branches not enabled | |
@@ -1534,7 +1523,6 b' OS-level groups' | |||||
1534 | adding foo/Bar/file.txt revisions |
|
1523 | adding foo/Bar/file.txt revisions | |
1535 | adding foo/file.txt revisions |
|
1524 | adding foo/file.txt revisions | |
1536 | adding quux/file.py revisions |
|
1525 | adding quux/file.py revisions | |
1537 | added 3 changesets with 3 changes to 3 files |
|
|||
1538 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
1526 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
1539 | acl: checking access for user "fred" |
|
1527 | acl: checking access for user "fred" | |
1540 | acl: acl.allow.branches not enabled |
|
1528 | acl: acl.allow.branches not enabled | |
@@ -1553,6 +1541,7 b' OS-level groups' | |||||
1553 | bundle2-input-part: total payload size 24 |
|
1541 | bundle2-input-part: total payload size 24 | |
1554 | bundle2-input-bundle: 4 parts total |
|
1542 | bundle2-input-bundle: 4 parts total | |
1555 | updating the branch cache |
|
1543 | updating the branch cache | |
|
1544 | added 3 changesets with 3 changes to 3 files | |||
1556 | bundle2-output-bundle: "HG20", 1 parts total |
|
1545 | bundle2-output-bundle: "HG20", 1 parts total | |
1557 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
1546 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
1558 | bundle2-input-bundle: no-transaction |
|
1547 | bundle2-input-bundle: no-transaction | |
@@ -1619,7 +1608,6 b' OS-level groups' | |||||
1619 | adding foo/Bar/file.txt revisions |
|
1608 | adding foo/Bar/file.txt revisions | |
1620 | adding foo/file.txt revisions |
|
1609 | adding foo/file.txt revisions | |
1621 | adding quux/file.py revisions |
|
1610 | adding quux/file.py revisions | |
1622 | added 3 changesets with 3 changes to 3 files |
|
|||
1623 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
1611 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
1624 | acl: checking access for user "fred" |
|
1612 | acl: checking access for user "fred" | |
1625 | acl: acl.allow.branches not enabled |
|
1613 | acl: acl.allow.branches not enabled | |
@@ -1743,7 +1731,6 b' No branch acls specified' | |||||
1743 | adding foo/Bar/file.txt revisions |
|
1731 | adding foo/Bar/file.txt revisions | |
1744 | adding foo/file.txt revisions |
|
1732 | adding foo/file.txt revisions | |
1745 | adding quux/file.py revisions |
|
1733 | adding quux/file.py revisions | |
1746 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
|||
1747 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
1734 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
1748 | acl: checking access for user "astro" |
|
1735 | acl: checking access for user "astro" | |
1749 | acl: acl.allow.branches not enabled |
|
1736 | acl: acl.allow.branches not enabled | |
@@ -1763,6 +1750,7 b' No branch acls specified' | |||||
1763 | bundle2-input-part: total payload size 48 |
|
1750 | bundle2-input-part: total payload size 48 | |
1764 | bundle2-input-bundle: 4 parts total |
|
1751 | bundle2-input-bundle: 4 parts total | |
1765 | updating the branch cache |
|
1752 | updating the branch cache | |
|
1753 | added 4 changesets with 4 changes to 4 files (+1 heads) | |||
1766 | bundle2-output-bundle: "HG20", 1 parts total |
|
1754 | bundle2-output-bundle: "HG20", 1 parts total | |
1767 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
1755 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
1768 | bundle2-input-bundle: no-transaction |
|
1756 | bundle2-input-bundle: no-transaction | |
@@ -1829,7 +1817,6 b' Branch acl deny test' | |||||
1829 | adding foo/Bar/file.txt revisions |
|
1817 | adding foo/Bar/file.txt revisions | |
1830 | adding foo/file.txt revisions |
|
1818 | adding foo/file.txt revisions | |
1831 | adding quux/file.py revisions |
|
1819 | adding quux/file.py revisions | |
1832 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
|||
1833 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
1820 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
1834 | acl: checking access for user "astro" |
|
1821 | acl: checking access for user "astro" | |
1835 | acl: acl.allow.branches not enabled |
|
1822 | acl: acl.allow.branches not enabled | |
@@ -1908,7 +1895,6 b' Branch acl empty allow test' | |||||
1908 | adding foo/Bar/file.txt revisions |
|
1895 | adding foo/Bar/file.txt revisions | |
1909 | adding foo/file.txt revisions |
|
1896 | adding foo/file.txt revisions | |
1910 | adding quux/file.py revisions |
|
1897 | adding quux/file.py revisions | |
1911 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
|||
1912 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
1898 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
1913 | acl: checking access for user "astro" |
|
1899 | acl: checking access for user "astro" | |
1914 | acl: acl.allow.branches enabled, 0 entries for user astro |
|
1900 | acl: acl.allow.branches enabled, 0 entries for user astro | |
@@ -1983,7 +1969,6 b' Branch acl allow other' | |||||
1983 | adding foo/Bar/file.txt revisions |
|
1969 | adding foo/Bar/file.txt revisions | |
1984 | adding foo/file.txt revisions |
|
1970 | adding foo/file.txt revisions | |
1985 | adding quux/file.py revisions |
|
1971 | adding quux/file.py revisions | |
1986 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
|||
1987 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
1972 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
1988 | acl: checking access for user "astro" |
|
1973 | acl: checking access for user "astro" | |
1989 | acl: acl.allow.branches enabled, 0 entries for user astro |
|
1974 | acl: acl.allow.branches enabled, 0 entries for user astro | |
@@ -2052,7 +2037,6 b' Branch acl allow other' | |||||
2052 | adding foo/Bar/file.txt revisions |
|
2037 | adding foo/Bar/file.txt revisions | |
2053 | adding foo/file.txt revisions |
|
2038 | adding foo/file.txt revisions | |
2054 | adding quux/file.py revisions |
|
2039 | adding quux/file.py revisions | |
2055 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
|||
2056 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
2040 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
2057 | acl: checking access for user "george" |
|
2041 | acl: checking access for user "george" | |
2058 | acl: acl.allow.branches enabled, 1 entries for user george |
|
2042 | acl: acl.allow.branches enabled, 1 entries for user george | |
@@ -2072,6 +2056,7 b' Branch acl allow other' | |||||
2072 | bundle2-input-part: total payload size 48 |
|
2056 | bundle2-input-part: total payload size 48 | |
2073 | bundle2-input-bundle: 4 parts total |
|
2057 | bundle2-input-bundle: 4 parts total | |
2074 | updating the branch cache |
|
2058 | updating the branch cache | |
|
2059 | added 4 changesets with 4 changes to 4 files (+1 heads) | |||
2075 | bundle2-output-bundle: "HG20", 1 parts total |
|
2060 | bundle2-output-bundle: "HG20", 1 parts total | |
2076 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
2061 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
2077 | bundle2-input-bundle: no-transaction |
|
2062 | bundle2-input-bundle: no-transaction | |
@@ -2143,7 +2128,6 b' push foobar into the remote' | |||||
2143 | adding foo/Bar/file.txt revisions |
|
2128 | adding foo/Bar/file.txt revisions | |
2144 | adding foo/file.txt revisions |
|
2129 | adding foo/file.txt revisions | |
2145 | adding quux/file.py revisions |
|
2130 | adding quux/file.py revisions | |
2146 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
|||
2147 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
2131 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
2148 | acl: checking access for user "george" |
|
2132 | acl: checking access for user "george" | |
2149 | acl: acl.allow.branches enabled, 1 entries for user george |
|
2133 | acl: acl.allow.branches enabled, 1 entries for user george | |
@@ -2163,6 +2147,7 b' push foobar into the remote' | |||||
2163 | bundle2-input-part: total payload size 48 |
|
2147 | bundle2-input-part: total payload size 48 | |
2164 | bundle2-input-bundle: 4 parts total |
|
2148 | bundle2-input-bundle: 4 parts total | |
2165 | updating the branch cache |
|
2149 | updating the branch cache | |
|
2150 | added 4 changesets with 4 changes to 4 files (+1 heads) | |||
2166 | bundle2-output-bundle: "HG20", 1 parts total |
|
2151 | bundle2-output-bundle: "HG20", 1 parts total | |
2167 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
2152 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
2168 | bundle2-input-bundle: no-transaction |
|
2153 | bundle2-input-bundle: no-transaction | |
@@ -2233,7 +2218,6 b' Branch acl conflicting deny' | |||||
2233 | adding foo/Bar/file.txt revisions |
|
2218 | adding foo/Bar/file.txt revisions | |
2234 | adding foo/file.txt revisions |
|
2219 | adding foo/file.txt revisions | |
2235 | adding quux/file.py revisions |
|
2220 | adding quux/file.py revisions | |
2236 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
|||
2237 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
2221 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
2238 | acl: checking access for user "george" |
|
2222 | acl: checking access for user "george" | |
2239 | acl: acl.allow.branches not enabled |
|
2223 | acl: acl.allow.branches not enabled | |
@@ -2307,7 +2291,6 b" User 'astro' must not be denied" | |||||
2307 | adding foo/Bar/file.txt revisions |
|
2291 | adding foo/Bar/file.txt revisions | |
2308 | adding foo/file.txt revisions |
|
2292 | adding foo/file.txt revisions | |
2309 | adding quux/file.py revisions |
|
2293 | adding quux/file.py revisions | |
2310 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
|||
2311 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
2294 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
2312 | acl: checking access for user "astro" |
|
2295 | acl: checking access for user "astro" | |
2313 | acl: acl.allow.branches not enabled |
|
2296 | acl: acl.allow.branches not enabled | |
@@ -2327,6 +2310,7 b" User 'astro' must not be denied" | |||||
2327 | bundle2-input-part: total payload size 48 |
|
2310 | bundle2-input-part: total payload size 48 | |
2328 | bundle2-input-bundle: 4 parts total |
|
2311 | bundle2-input-bundle: 4 parts total | |
2329 | updating the branch cache |
|
2312 | updating the branch cache | |
|
2313 | added 4 changesets with 4 changes to 4 files (+1 heads) | |||
2330 | bundle2-output-bundle: "HG20", 1 parts total |
|
2314 | bundle2-output-bundle: "HG20", 1 parts total | |
2331 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
2315 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
2332 | bundle2-input-bundle: no-transaction |
|
2316 | bundle2-input-bundle: no-transaction | |
@@ -2391,7 +2375,6 b' Non-astro users must be denied' | |||||
2391 | adding foo/Bar/file.txt revisions |
|
2375 | adding foo/Bar/file.txt revisions | |
2392 | adding foo/file.txt revisions |
|
2376 | adding foo/file.txt revisions | |
2393 | adding quux/file.py revisions |
|
2377 | adding quux/file.py revisions | |
2394 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
|||
2395 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
2378 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
2396 | acl: checking access for user "george" |
|
2379 | acl: checking access for user "george" | |
2397 | acl: acl.allow.branches not enabled |
|
2380 | acl: acl.allow.branches not enabled |
@@ -242,8 +242,8 b' make the bookmark move by updating it on' | |||||
242 | $ echo "more" >> test |
|
242 | $ echo "more" >> test | |
243 | $ hg pull -u 2>&1 | fgrep -v TESTTMP| fgrep -v "searching for changes" | fgrep -v adding |
|
243 | $ hg pull -u 2>&1 | fgrep -v TESTTMP| fgrep -v "searching for changes" | fgrep -v adding | |
244 | pulling from $TESTTMP/a |
|
244 | pulling from $TESTTMP/a | |
|
245 | updating bookmark X | |||
245 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
246 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
246 | updating bookmark X |
|
|||
247 | new changesets * (glob) |
|
247 | new changesets * (glob) | |
248 | updating to active bookmark X |
|
248 | updating to active bookmark X | |
249 | merging test |
|
249 | merging test |
@@ -51,10 +51,10 b' import bookmark by name' | |||||
51 | adding changesets |
|
51 | adding changesets | |
52 | adding manifests |
|
52 | adding manifests | |
53 | adding file changes |
|
53 | adding file changes | |
54 | added 1 changesets with 1 changes to 1 files |
|
|||
55 | adding remote bookmark X |
|
54 | adding remote bookmark X | |
56 | updating bookmark Y |
|
55 | updating bookmark Y | |
57 | adding remote bookmark Z |
|
56 | adding remote bookmark Z | |
|
57 | added 1 changesets with 1 changes to 1 files | |||
58 | new changesets 4e3505fd9583 (1 drafts) |
|
58 | new changesets 4e3505fd9583 (1 drafts) | |
59 | test-hook-bookmark: X: -> 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
|
59 | test-hook-bookmark: X: -> 4e3505fd95835d721066b76e75dbb8cc554d7f77 | |
60 | test-hook-bookmark: Y: 0000000000000000000000000000000000000000 -> 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
|
60 | test-hook-bookmark: Y: 0000000000000000000000000000000000000000 -> 4e3505fd95835d721066b76e75dbb8cc554d7f77 | |
@@ -414,10 +414,10 b' divergent bookmarks' | |||||
414 | adding changesets |
|
414 | adding changesets | |
415 | adding manifests |
|
415 | adding manifests | |
416 | adding file changes |
|
416 | adding file changes | |
417 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
|||
418 | divergent bookmark @ stored as @foo |
|
417 | divergent bookmark @ stored as @foo | |
419 | divergent bookmark X stored as X@foo |
|
418 | divergent bookmark X stored as X@foo | |
420 | updating bookmark Z |
|
419 | updating bookmark Z | |
|
420 | added 1 changesets with 1 changes to 1 files (+1 heads) | |||
421 | new changesets 0d2164f0ce0d (1 drafts) |
|
421 | new changesets 0d2164f0ce0d (1 drafts) | |
422 | test-hook-bookmark: @foo: -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c |
|
422 | test-hook-bookmark: @foo: -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c | |
423 | test-hook-bookmark: X@foo: -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c |
|
423 | test-hook-bookmark: X@foo: -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c | |
@@ -580,8 +580,8 b' race conditions' | |||||
580 | adding changesets |
|
580 | adding changesets | |
581 | adding manifests |
|
581 | adding manifests | |
582 | adding file changes |
|
582 | adding file changes | |
|
583 | updating bookmark Y | |||
583 | added 1 changesets with 1 changes to 1 files |
|
584 | added 1 changesets with 1 changes to 1 files | |
584 | updating bookmark Y |
|
|||
585 | new changesets b0a5eff05604 (1 drafts) |
|
585 | new changesets b0a5eff05604 (1 drafts) | |
586 | (run 'hg update' to get a working copy) |
|
586 | (run 'hg update' to get a working copy) | |
587 | $ hg book |
|
587 | $ hg book | |
@@ -629,8 +629,8 b' Update a bookmark right after the initia' | |||||
629 | adding changesets |
|
629 | adding changesets | |
630 | adding manifests |
|
630 | adding manifests | |
631 | adding file changes |
|
631 | adding file changes | |
|
632 | updating bookmark Y | |||
632 | added 1 changesets with 1 changes to 1 files |
|
633 | added 1 changesets with 1 changes to 1 files | |
633 | updating bookmark Y |
|
|||
634 | new changesets 35d1ef0a8d1b (1 drafts) |
|
634 | new changesets 35d1ef0a8d1b (1 drafts) | |
635 | (run 'hg update' to get a working copy) |
|
635 | (run 'hg update' to get a working copy) | |
636 | $ hg book |
|
636 | $ hg book | |
@@ -672,8 +672,8 b' Update a bookmark right after the initia' | |||||
672 | adding changesets |
|
672 | adding changesets | |
673 | adding manifests |
|
673 | adding manifests | |
674 | adding file changes |
|
674 | adding file changes | |
|
675 | updating bookmark Y | |||
675 | added 1 changesets with 1 changes to 1 files |
|
676 | added 1 changesets with 1 changes to 1 files | |
676 | updating bookmark Y |
|
|||
677 | new changesets 0d60821d2197 (1 drafts) |
|
677 | new changesets 0d60821d2197 (1 drafts) | |
678 | (run 'hg update' to get a working copy) |
|
678 | (run 'hg update' to get a working copy) | |
679 | $ hg book |
|
679 | $ hg book |
@@ -762,9 +762,9 b' pull --update works the same as pull && ' | |||||
762 | adding changesets |
|
762 | adding changesets | |
763 | adding manifests |
|
763 | adding manifests | |
764 | adding file changes |
|
764 | adding file changes | |
765 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
|||
766 | updating bookmark Y |
|
765 | updating bookmark Y | |
767 | updating bookmark Z |
|
766 | updating bookmark Z | |
|
767 | added 2 changesets with 2 changes to 2 files (+1 heads) | |||
768 | new changesets 125c9a1d6df6:9ba5f110a0b3 |
|
768 | new changesets 125c9a1d6df6:9ba5f110a0b3 | |
769 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
769 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
770 |
|
770 | |||
@@ -788,9 +788,9 b' pull --update works the same as pull && ' | |||||
788 | adding changesets |
|
788 | adding changesets | |
789 | adding manifests |
|
789 | adding manifests | |
790 | adding file changes |
|
790 | adding file changes | |
791 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
|||
792 | updating bookmark Y |
|
791 | updating bookmark Y | |
793 | updating bookmark Z |
|
792 | updating bookmark Z | |
|
793 | added 2 changesets with 2 changes to 2 files (+1 heads) | |||
794 | new changesets 125c9a1d6df6:9ba5f110a0b3 |
|
794 | new changesets 125c9a1d6df6:9ba5f110a0b3 | |
795 | updating to active bookmark Y |
|
795 | updating to active bookmark Y | |
796 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
796 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -813,9 +813,9 b' We warn about divergent during bare upda' | |||||
813 | adding changesets |
|
813 | adding changesets | |
814 | adding manifests |
|
814 | adding manifests | |
815 | adding file changes |
|
815 | adding file changes | |
816 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
|||
817 | updating bookmark Y |
|
816 | updating bookmark Y | |
818 | updating bookmark Z |
|
817 | updating bookmark Z | |
|
818 | added 2 changesets with 2 changes to 2 files (+1 heads) | |||
819 | new changesets 125c9a1d6df6:9ba5f110a0b3 |
|
819 | new changesets 125c9a1d6df6:9ba5f110a0b3 | |
820 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
820 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
821 | $ hg -R ../cloned-bookmarks-manual-update-with-divergence update |
|
821 | $ hg -R ../cloned-bookmarks-manual-update-with-divergence update | |
@@ -996,11 +996,11 b' case)' | |||||
996 | adding changesets |
|
996 | adding changesets | |
997 | adding manifests |
|
997 | adding manifests | |
998 | adding file changes |
|
998 | adding file changes | |
999 | added 1 changesets with 1 changes to 1 files |
|
|||
1000 | divergent bookmark Z stored as Z@default |
|
999 | divergent bookmark Z stored as Z@default | |
1001 | adding remote bookmark foo |
|
1000 | adding remote bookmark foo | |
1002 | adding remote bookmark four |
|
1001 | adding remote bookmark four | |
1003 | adding remote bookmark should-end-on-two |
|
1002 | adding remote bookmark should-end-on-two | |
|
1003 | added 1 changesets with 1 changes to 1 files | |||
1004 | new changesets 5fb12f0f2d51 |
|
1004 | new changesets 5fb12f0f2d51 | |
1005 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1005 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1006 | $ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n" |
|
1006 | $ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n" | |
@@ -1023,8 +1023,8 b' updates the working directory and curren' | |||||
1023 | adding changesets |
|
1023 | adding changesets | |
1024 | adding manifests |
|
1024 | adding manifests | |
1025 | adding file changes |
|
1025 | adding file changes | |
|
1026 | divergent bookmark Z stored as Z@default | |||
1026 | added 1 changesets with 1 changes to 1 files |
|
1027 | added 1 changesets with 1 changes to 1 files | |
1027 | divergent bookmark Z stored as Z@default |
|
|||
1028 | new changesets 81dcce76aa0b |
|
1028 | new changesets 81dcce76aa0b | |
1029 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1029 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1030 | updating bookmark Y |
|
1030 | updating bookmark Y |
@@ -58,8 +58,8 b' The extension requires a repo (currently' | |||||
58 | adding changesets |
|
58 | adding changesets | |
59 | adding manifests |
|
59 | adding manifests | |
60 | adding file changes |
|
60 | adding file changes | |
|
61 | pre-close-tip:02de42196ebe draft | |||
61 | added 8 changesets with 7 changes to 7 files (+3 heads) |
|
62 | added 8 changesets with 7 changes to 7 files (+3 heads) | |
62 | pre-close-tip:02de42196ebe draft |
|
|||
63 | new changesets cd010b8cd998:02de42196ebe (8 drafts) |
|
63 | new changesets cd010b8cd998:02de42196ebe (8 drafts) | |
64 | postclose-tip:02de42196ebe draft |
|
64 | postclose-tip:02de42196ebe draft | |
65 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=unbundle HG_TXNID=TXN:$ID$ HG_TXNNAME=unbundle |
|
65 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=unbundle HG_TXNID=TXN:$ID$ HG_TXNNAME=unbundle | |
@@ -94,8 +94,8 b' clone --pull' | |||||
94 | adding changesets |
|
94 | adding changesets | |
95 | adding manifests |
|
95 | adding manifests | |
96 | adding file changes |
|
96 | adding file changes | |
|
97 | pre-close-tip:9520eea781bc draft | |||
97 | added 2 changesets with 2 changes to 2 files |
|
98 | added 2 changesets with 2 changes to 2 files | |
98 | pre-close-tip:9520eea781bc draft |
|
|||
99 | 1 new obsolescence markers |
|
99 | 1 new obsolescence markers | |
100 | new changesets cd010b8cd998:9520eea781bc (1 drafts) |
|
100 | new changesets cd010b8cd998:9520eea781bc (1 drafts) | |
101 | postclose-tip:9520eea781bc draft |
|
101 | postclose-tip:9520eea781bc draft | |
@@ -123,8 +123,8 b' pull' | |||||
123 | adding changesets |
|
123 | adding changesets | |
124 | adding manifests |
|
124 | adding manifests | |
125 | adding file changes |
|
125 | adding file changes | |
|
126 | pre-close-tip:24b6387c8c8c draft | |||
126 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
127 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
127 | pre-close-tip:24b6387c8c8c draft |
|
|||
128 | 1 new obsolescence markers |
|
128 | 1 new obsolescence markers | |
129 | new changesets 24b6387c8c8c (1 drafts) |
|
129 | new changesets 24b6387c8c8c (1 drafts) | |
130 | postclose-tip:24b6387c8c8c draft |
|
130 | postclose-tip:24b6387c8c8c draft | |
@@ -268,8 +268,8 b' push' | |||||
268 | remote: adding changesets |
|
268 | remote: adding changesets | |
269 | remote: adding manifests |
|
269 | remote: adding manifests | |
270 | remote: adding file changes |
|
270 | remote: adding file changes | |
|
271 | remote: pre-close-tip:eea13746799a public book_eea1 | |||
271 | remote: added 1 changesets with 0 changes to 0 files (-1 heads) |
|
272 | remote: added 1 changesets with 0 changes to 0 files (-1 heads) | |
272 | remote: pre-close-tip:eea13746799a public book_eea1 |
|
|||
273 | remote: 1 new obsolescence markers |
|
273 | remote: 1 new obsolescence markers | |
274 | remote: pushkey: lock state after "bookmarks" |
|
274 | remote: pushkey: lock state after "bookmarks" | |
275 | remote: lock: free |
|
275 | remote: lock: free | |
@@ -303,9 +303,9 b' pull over ssh' | |||||
303 | adding changesets |
|
303 | adding changesets | |
304 | adding manifests |
|
304 | adding manifests | |
305 | adding file changes |
|
305 | adding file changes | |
306 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
|||
307 | updating bookmark book_02de |
|
306 | updating bookmark book_02de | |
308 | pre-close-tip:02de42196ebe draft book_02de |
|
307 | pre-close-tip:02de42196ebe draft book_02de | |
|
308 | added 1 changesets with 1 changes to 1 files (+1 heads) | |||
309 | 1 new obsolescence markers |
|
309 | 1 new obsolescence markers | |
310 | new changesets 02de42196ebe (1 drafts) |
|
310 | new changesets 02de42196ebe (1 drafts) | |
311 | postclose-tip:02de42196ebe draft book_02de |
|
311 | postclose-tip:02de42196ebe draft book_02de | |
@@ -329,9 +329,9 b' pull over http' | |||||
329 | adding changesets |
|
329 | adding changesets | |
330 | adding manifests |
|
330 | adding manifests | |
331 | adding file changes |
|
331 | adding file changes | |
332 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
|||
333 | updating bookmark book_42cc |
|
332 | updating bookmark book_42cc | |
334 | pre-close-tip:42ccdea3bb16 draft book_42cc |
|
333 | pre-close-tip:42ccdea3bb16 draft book_42cc | |
|
334 | added 1 changesets with 1 changes to 1 files (+1 heads) | |||
335 | 1 new obsolescence markers |
|
335 | 1 new obsolescence markers | |
336 | new changesets 42ccdea3bb16 (1 drafts) |
|
336 | new changesets 42ccdea3bb16 (1 drafts) | |
337 | postclose-tip:42ccdea3bb16 draft book_42cc |
|
337 | postclose-tip:42ccdea3bb16 draft book_42cc | |
@@ -354,8 +354,8 b' push over ssh' | |||||
354 | remote: adding changesets |
|
354 | remote: adding changesets | |
355 | remote: adding manifests |
|
355 | remote: adding manifests | |
356 | remote: adding file changes |
|
356 | remote: adding file changes | |
|
357 | remote: pre-close-tip:5fddd98957c8 draft book_5fdd | |||
357 | remote: added 1 changesets with 1 changes to 1 files |
|
358 | remote: added 1 changesets with 1 changes to 1 files | |
358 | remote: pre-close-tip:5fddd98957c8 draft book_5fdd |
|
|||
359 | remote: 1 new obsolescence markers |
|
359 | remote: 1 new obsolescence markers | |
360 | remote: pushkey: lock state after "bookmarks" |
|
360 | remote: pushkey: lock state after "bookmarks" | |
361 | remote: lock: free |
|
361 | remote: lock: free | |
@@ -405,8 +405,8 b' push over http' | |||||
405 | remote: adding changesets |
|
405 | remote: adding changesets | |
406 | remote: adding manifests |
|
406 | remote: adding manifests | |
407 | remote: adding file changes |
|
407 | remote: adding file changes | |
|
408 | remote: pre-close-tip:32af7686d403 public book_32af | |||
408 | remote: added 1 changesets with 1 changes to 1 files |
|
409 | remote: added 1 changesets with 1 changes to 1 files | |
409 | remote: pre-close-tip:32af7686d403 public book_32af |
|
|||
410 | remote: 1 new obsolescence markers |
|
410 | remote: 1 new obsolescence markers | |
411 | remote: pushkey: lock state after "bookmarks" |
|
411 | remote: pushkey: lock state after "bookmarks" | |
412 | remote: lock: free |
|
412 | remote: lock: free | |
@@ -631,7 +631,6 b' Doing the actual push: hook abort' | |||||
631 | remote: adding changesets |
|
631 | remote: adding changesets | |
632 | remote: adding manifests |
|
632 | remote: adding manifests | |
633 | remote: adding file changes |
|
633 | remote: adding file changes | |
634 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
635 | remote: pre-close-tip:e7ec4e813ba6 draft |
|
634 | remote: pre-close-tip:e7ec4e813ba6 draft | |
636 | remote: You shall not pass! |
|
635 | remote: You shall not pass! | |
637 | remote: transaction abort! |
|
636 | remote: transaction abort! | |
@@ -646,7 +645,6 b' Doing the actual push: hook abort' | |||||
646 | remote: adding changesets |
|
645 | remote: adding changesets | |
647 | remote: adding manifests |
|
646 | remote: adding manifests | |
648 | remote: adding file changes |
|
647 | remote: adding file changes | |
649 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
650 | remote: pre-close-tip:e7ec4e813ba6 draft |
|
648 | remote: pre-close-tip:e7ec4e813ba6 draft | |
651 | remote: You shall not pass! |
|
649 | remote: You shall not pass! | |
652 | remote: transaction abort! |
|
650 | remote: transaction abort! | |
@@ -662,7 +660,6 b' Doing the actual push: hook abort' | |||||
662 | remote: adding changesets |
|
660 | remote: adding changesets | |
663 | remote: adding manifests |
|
661 | remote: adding manifests | |
664 | remote: adding file changes |
|
662 | remote: adding file changes | |
665 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
666 | remote: pre-close-tip:e7ec4e813ba6 draft |
|
663 | remote: pre-close-tip:e7ec4e813ba6 draft | |
667 | remote: You shall not pass! |
|
664 | remote: You shall not pass! | |
668 | remote: transaction abort! |
|
665 | remote: transaction abort! | |
@@ -696,7 +693,6 b' Check error from hook during the unbundl' | |||||
696 | remote: adding changesets |
|
693 | remote: adding changesets | |
697 | remote: adding manifests |
|
694 | remote: adding manifests | |
698 | remote: adding file changes |
|
695 | remote: adding file changes | |
699 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
700 | remote: Fail early! |
|
696 | remote: Fail early! | |
701 | remote: transaction abort! |
|
697 | remote: transaction abort! | |
702 | remote: Cleaning up the mess... |
|
698 | remote: Cleaning up the mess... | |
@@ -709,7 +705,6 b' Check error from hook during the unbundl' | |||||
709 | remote: adding changesets |
|
705 | remote: adding changesets | |
710 | remote: adding manifests |
|
706 | remote: adding manifests | |
711 | remote: adding file changes |
|
707 | remote: adding file changes | |
712 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
713 | remote: Fail early! |
|
708 | remote: Fail early! | |
714 | remote: transaction abort! |
|
709 | remote: transaction abort! | |
715 | remote: Cleaning up the mess... |
|
710 | remote: Cleaning up the mess... | |
@@ -723,7 +718,6 b' Check error from hook during the unbundl' | |||||
723 | remote: adding changesets |
|
718 | remote: adding changesets | |
724 | remote: adding manifests |
|
719 | remote: adding manifests | |
725 | remote: adding file changes |
|
720 | remote: adding file changes | |
726 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
727 | remote: Fail early! |
|
721 | remote: Fail early! | |
728 | remote: transaction abort! |
|
722 | remote: transaction abort! | |
729 | remote: Cleaning up the mess... |
|
723 | remote: Cleaning up the mess... | |
@@ -747,7 +741,6 b' Check output capture control.' | |||||
747 | adding changesets |
|
741 | adding changesets | |
748 | adding manifests |
|
742 | adding manifests | |
749 | adding file changes |
|
743 | adding file changes | |
750 | added 1 changesets with 1 changes to 1 files |
|
|||
751 | Fail early! |
|
744 | Fail early! | |
752 | transaction abort! |
|
745 | transaction abort! | |
753 | Cleaning up the mess... |
|
746 | Cleaning up the mess... | |
@@ -760,7 +753,6 b' Check output capture control.' | |||||
760 | remote: adding changesets |
|
753 | remote: adding changesets | |
761 | remote: adding manifests |
|
754 | remote: adding manifests | |
762 | remote: adding file changes |
|
755 | remote: adding file changes | |
763 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
764 | remote: Fail early! |
|
756 | remote: Fail early! | |
765 | remote: transaction abort! |
|
757 | remote: transaction abort! | |
766 | remote: Cleaning up the mess... |
|
758 | remote: Cleaning up the mess... | |
@@ -774,7 +766,6 b' Check output capture control.' | |||||
774 | remote: adding changesets |
|
766 | remote: adding changesets | |
775 | remote: adding manifests |
|
767 | remote: adding manifests | |
776 | remote: adding file changes |
|
768 | remote: adding file changes | |
777 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
778 | remote: Fail early! |
|
769 | remote: Fail early! | |
779 | remote: transaction abort! |
|
770 | remote: transaction abort! | |
780 | remote: Cleaning up the mess... |
|
771 | remote: Cleaning up the mess... | |
@@ -822,7 +813,6 b' Check abort from mandatory pushkey' | |||||
822 | adding changesets |
|
813 | adding changesets | |
823 | adding manifests |
|
814 | adding manifests | |
824 | adding file changes |
|
815 | adding file changes | |
825 | added 1 changesets with 1 changes to 1 files |
|
|||
826 | do not push the key ! |
|
816 | do not push the key ! | |
827 | pushkey-abort: prepushkey.failpush hook exited with status 1 |
|
817 | pushkey-abort: prepushkey.failpush hook exited with status 1 | |
828 | transaction abort! |
|
818 | transaction abort! | |
@@ -836,7 +826,6 b' Check abort from mandatory pushkey' | |||||
836 | remote: adding changesets |
|
826 | remote: adding changesets | |
837 | remote: adding manifests |
|
827 | remote: adding manifests | |
838 | remote: adding file changes |
|
828 | remote: adding file changes | |
839 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
840 | remote: do not push the key ! |
|
829 | remote: do not push the key ! | |
841 | remote: pushkey-abort: prepushkey.failpush hook exited with status 1 |
|
830 | remote: pushkey-abort: prepushkey.failpush hook exited with status 1 | |
842 | remote: transaction abort! |
|
831 | remote: transaction abort! | |
@@ -850,7 +839,6 b' Check abort from mandatory pushkey' | |||||
850 | remote: adding changesets |
|
839 | remote: adding changesets | |
851 | remote: adding manifests |
|
840 | remote: adding manifests | |
852 | remote: adding file changes |
|
841 | remote: adding file changes | |
853 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
854 | remote: do not push the key ! |
|
842 | remote: do not push the key ! | |
855 | remote: pushkey-abort: prepushkey.failpush hook exited with status 1 |
|
843 | remote: pushkey-abort: prepushkey.failpush hook exited with status 1 | |
856 | remote: transaction abort! |
|
844 | remote: transaction abort! | |
@@ -892,7 +880,6 b' Check abort from mandatory pushkey' | |||||
892 | adding changesets |
|
880 | adding changesets | |
893 | adding manifests |
|
881 | adding manifests | |
894 | adding file changes |
|
882 | adding file changes | |
895 | added 1 changesets with 1 changes to 1 files |
|
|||
896 | transaction abort! |
|
883 | transaction abort! | |
897 | Cleaning up the mess... |
|
884 | Cleaning up the mess... | |
898 | rollback completed |
|
885 | rollback completed | |
@@ -907,7 +894,6 b' Check abort from mandatory pushkey' | |||||
907 | remote: adding changesets |
|
894 | remote: adding changesets | |
908 | remote: adding manifests |
|
895 | remote: adding manifests | |
909 | remote: adding file changes |
|
896 | remote: adding file changes | |
910 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
911 | remote: transaction abort! |
|
897 | remote: transaction abort! | |
912 | remote: Cleaning up the mess... |
|
898 | remote: Cleaning up the mess... | |
913 | remote: rollback completed |
|
899 | remote: rollback completed | |
@@ -922,7 +908,6 b' Check abort from mandatory pushkey' | |||||
922 | remote: adding changesets |
|
908 | remote: adding changesets | |
923 | remote: adding manifests |
|
909 | remote: adding manifests | |
924 | remote: adding file changes |
|
910 | remote: adding file changes | |
925 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
926 | remote: transaction abort! |
|
911 | remote: transaction abort! | |
927 | remote: Cleaning up the mess... |
|
912 | remote: Cleaning up the mess... | |
928 | remote: rollback completed |
|
913 | remote: rollback completed |
@@ -1010,6 +1010,7 b' with reply' | |||||
1010 |
|
1010 | |||
1011 | $ hg bundle2 --rev '8+7+5+4' --reply ../rev-rr.hg2 |
|
1011 | $ hg bundle2 --rev '8+7+5+4' --reply ../rev-rr.hg2 | |
1012 | $ hg unbundle2 ../rev-reply.hg2 < ../rev-rr.hg2 |
|
1012 | $ hg unbundle2 ../rev-reply.hg2 < ../rev-rr.hg2 | |
|
1013 | added 0 changesets with 0 changes to 3 files | |||
1013 | 0 unread bytes |
|
1014 | 0 unread bytes | |
1014 | addchangegroup return: 1 |
|
1015 | addchangegroup return: 1 | |
1015 |
|
1016 | |||
@@ -1021,13 +1022,11 b' with reply' | |||||
1021 | 0030: 2d 74 6f 31 72 65 74 75 72 6e 31 00 00 00 00 00 |-to1return1.....| |
|
1022 | 0030: 2d 74 6f 31 72 65 74 75 72 6e 31 00 00 00 00 00 |-to1return1.....| | |
1022 | 0040: 00 00 1b 06 6f 75 74 70 75 74 00 00 00 01 00 01 |....output......| |
|
1023 | 0040: 00 00 1b 06 6f 75 74 70 75 74 00 00 00 01 00 01 |....output......| | |
1023 | 0050: 0b 01 69 6e 2d 72 65 70 6c 79 2d 74 6f 31 00 00 |..in-reply-to1..| |
|
1024 | 0050: 0b 01 69 6e 2d 72 65 70 6c 79 2d 74 6f 31 00 00 |..in-reply-to1..| | |
1024 |
0060: 00 |
|
1025 | 0060: 00 37 61 64 64 69 6e 67 20 63 68 61 6e 67 65 73 |.7adding changes| | |
1025 | 0070: 65 74 73 0a 61 64 64 69 6e 67 20 6d 61 6e 69 66 |ets.adding manif| |
|
1026 | 0070: 65 74 73 0a 61 64 64 69 6e 67 20 6d 61 6e 69 66 |ets.adding manif| | |
1026 | 0080: 65 73 74 73 0a 61 64 64 69 6e 67 20 66 69 6c 65 |ests.adding file| |
|
1027 | 0080: 65 73 74 73 0a 61 64 64 69 6e 67 20 66 69 6c 65 |ests.adding file| | |
1027 |
0090: 20 63 68 61 6e 67 65 73 0a |
|
1028 | 0090: 20 63 68 61 6e 67 65 73 0a 00 00 00 00 00 00 00 | changes........| | |
1028 | 00a0: 20 63 68 61 6e 67 65 73 65 74 73 20 77 69 74 68 | changesets with| |
|
1029 | 00a0: 00 |.| | |
1029 | 00b0: 20 30 20 63 68 61 6e 67 65 73 20 74 6f 20 33 20 | 0 changes to 3 | |
|
|||
1030 | 00c0: 66 69 6c 65 73 0a 00 00 00 00 00 00 00 00 |files.........| |
|
|||
1031 |
|
1030 | |||
1032 | Check handling of exception during generation. |
|
1031 | Check handling of exception during generation. | |
1033 | ---------------------------------------------- |
|
1032 | ---------------------------------------------- |
@@ -80,7 +80,6 b' Pull the new commits in the clone' | |||||
80 | adding changesets |
|
80 | adding changesets | |
81 | adding manifests |
|
81 | adding manifests | |
82 | adding file changes |
|
82 | adding file changes | |
83 | added 1 changesets with 1 changes to 1 files |
|
|||
84 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup |
|
83 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup | |
85 | HG_HOOKTYPE=pretxnchangegroup |
|
84 | HG_HOOKTYPE=pretxnchangegroup | |
86 | HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 |
|
85 | HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 | |
@@ -96,7 +95,6 b' Pull the new commits in the clone' | |||||
96 | adding changesets |
|
95 | adding changesets | |
97 | adding manifests |
|
96 | adding manifests | |
98 | adding file changes |
|
97 | adding file changes | |
99 | added 1 changesets with 1 changes to 1 files |
|
|||
100 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup |
|
98 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup | |
101 | HG_HOOKTYPE=pretxnchangegroup |
|
99 | HG_HOOKTYPE=pretxnchangegroup | |
102 | HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 |
|
100 | HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 | |
@@ -109,6 +107,7 b' Pull the new commits in the clone' | |||||
109 | file:/*/$TESTTMP/repo (glob) |
|
107 | file:/*/$TESTTMP/repo (glob) | |
110 | HG_URL=file:$TESTTMP/repo |
|
108 | HG_URL=file:$TESTTMP/repo | |
111 |
|
109 | |||
|
110 | added 2 changesets with 2 changes to 2 files | |||
112 | new changesets 27547f69f254:f838bfaca5c7 |
|
111 | new changesets 27547f69f254:f838bfaca5c7 | |
113 | changegroup hook: HG_HOOKNAME=changegroup |
|
112 | changegroup hook: HG_HOOKNAME=changegroup | |
114 | HG_HOOKTYPE=changegroup |
|
113 | HG_HOOKTYPE=changegroup | |
@@ -208,7 +207,6 b' pullop.cgresult' | |||||
208 | adding changesets |
|
207 | adding changesets | |
209 | adding manifests |
|
208 | adding manifests | |
210 | adding file changes |
|
209 | adding file changes | |
211 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
|||
212 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup |
|
210 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup | |
213 | HG_HOOKTYPE=pretxnchangegroup |
|
211 | HG_HOOKTYPE=pretxnchangegroup | |
214 | HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e |
|
212 | HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e | |
@@ -224,7 +222,6 b' pullop.cgresult' | |||||
224 | adding changesets |
|
222 | adding changesets | |
225 | adding manifests |
|
223 | adding manifests | |
226 | adding file changes |
|
224 | adding file changes | |
227 | added 3 changesets with 3 changes to 3 files (+1 heads) |
|
|||
228 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup |
|
225 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup | |
229 | HG_HOOKTYPE=pretxnchangegroup |
|
226 | HG_HOOKTYPE=pretxnchangegroup | |
230 | HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 |
|
227 | HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 | |
@@ -237,6 +234,7 b' pullop.cgresult' | |||||
237 | file:/*/$TESTTMP/repo (glob) |
|
234 | file:/*/$TESTTMP/repo (glob) | |
238 | HG_URL=file:$TESTTMP/repo |
|
235 | HG_URL=file:$TESTTMP/repo | |
239 |
|
236 | |||
|
237 | added 5 changesets with 5 changes to 5 files (+2 heads) | |||
240 | new changesets b3325c91a4d9:5cd59d311f65 |
|
238 | new changesets b3325c91a4d9:5cd59d311f65 | |
241 | changegroup hook: HG_HOOKNAME=changegroup |
|
239 | changegroup hook: HG_HOOKNAME=changegroup | |
242 | HG_HOOKTYPE=changegroup |
|
240 | HG_HOOKTYPE=changegroup | |
@@ -365,7 +363,6 b' pullop.cgresult' | |||||
365 | adding changesets |
|
363 | adding changesets | |
366 | adding manifests |
|
364 | adding manifests | |
367 | adding file changes |
|
365 | adding file changes | |
368 | added 1 changesets with 0 changes to 0 files (-1 heads) |
|
|||
369 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup |
|
366 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup | |
370 | HG_HOOKTYPE=pretxnchangegroup |
|
367 | HG_HOOKTYPE=pretxnchangegroup | |
371 | HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 |
|
368 | HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 | |
@@ -381,7 +378,6 b' pullop.cgresult' | |||||
381 | adding changesets |
|
378 | adding changesets | |
382 | adding manifests |
|
379 | adding manifests | |
383 | adding file changes |
|
380 | adding file changes | |
384 | added 1 changesets with 1 changes to 1 files |
|
|||
385 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup |
|
381 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup | |
386 | HG_HOOKTYPE=pretxnchangegroup |
|
382 | HG_HOOKTYPE=pretxnchangegroup | |
387 | HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 |
|
383 | HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 | |
@@ -394,6 +390,7 b' pullop.cgresult' | |||||
394 | file:/*/$TESTTMP/repo (glob) |
|
390 | file:/*/$TESTTMP/repo (glob) | |
395 | HG_URL=file:$TESTTMP/repo |
|
391 | HG_URL=file:$TESTTMP/repo | |
396 |
|
392 | |||
|
393 | added 2 changesets with 1 changes to 1 files (-1 heads) | |||
397 | new changesets 71bd7b46de72:9d18e5bd9ab0 |
|
394 | new changesets 71bd7b46de72:9d18e5bd9ab0 | |
398 | changegroup hook: HG_HOOKNAME=changegroup |
|
395 | changegroup hook: HG_HOOKNAME=changegroup | |
399 | HG_HOOKTYPE=changegroup |
|
396 | HG_HOOKTYPE=changegroup |
@@ -202,12 +202,11 b' Test a pull with an remote-changegroup a' | |||||
202 | adding changesets |
|
202 | adding changesets | |
203 | adding manifests |
|
203 | adding manifests | |
204 | adding file changes |
|
204 | adding file changes | |
205 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
|||
206 | remote: changegroup |
|
205 | remote: changegroup | |
207 | adding changesets |
|
206 | adding changesets | |
208 | adding manifests |
|
207 | adding manifests | |
209 | adding file changes |
|
208 | adding file changes | |
210 |
added |
|
209 | added 5 changesets with 4 changes to 4 files (+2 heads) | |
211 | new changesets 32af7686d403:02de42196ebe |
|
210 | new changesets 32af7686d403:02de42196ebe | |
212 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
211 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
213 | $ hg -R clone log -G |
|
212 | $ hg -R clone log -G | |
@@ -252,12 +251,11 b' Test a pull with a changegroup followed ' | |||||
252 | adding changesets |
|
251 | adding changesets | |
253 | adding manifests |
|
252 | adding manifests | |
254 | adding file changes |
|
253 | adding file changes | |
255 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
|||
256 | remote: remote-changegroup |
|
254 | remote: remote-changegroup | |
257 | adding changesets |
|
255 | adding changesets | |
258 | adding manifests |
|
256 | adding manifests | |
259 | adding file changes |
|
257 | adding file changes | |
260 |
added |
|
258 | added 5 changesets with 4 changes to 4 files (+2 heads) | |
261 | new changesets 32af7686d403:02de42196ebe |
|
259 | new changesets 32af7686d403:02de42196ebe | |
262 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
260 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
263 | $ hg -R clone log -G |
|
261 | $ hg -R clone log -G | |
@@ -305,17 +303,15 b' Test a pull with two remote-changegroups' | |||||
305 | adding changesets |
|
303 | adding changesets | |
306 | adding manifests |
|
304 | adding manifests | |
307 | adding file changes |
|
305 | adding file changes | |
308 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
|||
309 | remote: remote-changegroup |
|
306 | remote: remote-changegroup | |
310 | adding changesets |
|
307 | adding changesets | |
311 | adding manifests |
|
308 | adding manifests | |
312 | adding file changes |
|
309 | adding file changes | |
313 | added 2 changesets with 1 changes to 1 files |
|
|||
314 | remote: changegroup |
|
310 | remote: changegroup | |
315 | adding changesets |
|
311 | adding changesets | |
316 | adding manifests |
|
312 | adding manifests | |
317 | adding file changes |
|
313 | adding file changes | |
318 |
added |
|
314 | added 5 changesets with 4 changes to 4 files (+2 heads) | |
319 | new changesets 32af7686d403:02de42196ebe |
|
315 | new changesets 32af7686d403:02de42196ebe | |
320 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
316 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
321 | $ hg -R clone log -G |
|
317 | $ hg -R clone log -G | |
@@ -383,7 +379,6 b' Hash digest mismatch throws an error' | |||||
383 | adding changesets |
|
379 | adding changesets | |
384 | adding manifests |
|
380 | adding manifests | |
385 | adding file changes |
|
381 | adding file changes | |
386 | added 8 changesets with 7 changes to 7 files (+2 heads) |
|
|||
387 | transaction abort! |
|
382 | transaction abort! | |
388 | rollback completed |
|
383 | rollback completed | |
389 | abort: bundle at http://localhost:$HGPORT/bundle6.hg is corrupted: |
|
384 | abort: bundle at http://localhost:$HGPORT/bundle6.hg is corrupted: | |
@@ -418,7 +413,6 b' If either of the multiple hash digests m' | |||||
418 | adding changesets |
|
413 | adding changesets | |
419 | adding manifests |
|
414 | adding manifests | |
420 | adding file changes |
|
415 | adding file changes | |
421 | added 8 changesets with 7 changes to 7 files (+2 heads) |
|
|||
422 | transaction abort! |
|
416 | transaction abort! | |
423 | rollback completed |
|
417 | rollback completed | |
424 | abort: bundle at http://localhost:$HGPORT/bundle6.hg is corrupted: |
|
418 | abort: bundle at http://localhost:$HGPORT/bundle6.hg is corrupted: | |
@@ -434,7 +428,6 b' If either of the multiple hash digests m' | |||||
434 | adding changesets |
|
428 | adding changesets | |
435 | adding manifests |
|
429 | adding manifests | |
436 | adding file changes |
|
430 | adding file changes | |
437 | added 8 changesets with 7 changes to 7 files (+2 heads) |
|
|||
438 | transaction abort! |
|
431 | transaction abort! | |
439 | rollback completed |
|
432 | rollback completed | |
440 | abort: bundle at http://localhost:$HGPORT/bundle6.hg is corrupted: |
|
433 | abort: bundle at http://localhost:$HGPORT/bundle6.hg is corrupted: | |
@@ -464,12 +457,10 b' Corruption tests' | |||||
464 | adding changesets |
|
457 | adding changesets | |
465 | adding manifests |
|
458 | adding manifests | |
466 | adding file changes |
|
459 | adding file changes | |
467 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
|||
468 | remote: remote-changegroup |
|
460 | remote: remote-changegroup | |
469 | adding changesets |
|
461 | adding changesets | |
470 | adding manifests |
|
462 | adding manifests | |
471 | adding file changes |
|
463 | adding file changes | |
472 | added 2 changesets with 1 changes to 1 files |
|
|||
473 | transaction abort! |
|
464 | transaction abort! | |
474 | rollback completed |
|
465 | rollback completed | |
475 | abort: bundle at http://localhost:$HGPORT/bundle5.hg is corrupted: |
|
466 | abort: bundle at http://localhost:$HGPORT/bundle5.hg is corrupted: | |
@@ -534,7 +525,6 b' Size mismatch' | |||||
534 | adding changesets |
|
525 | adding changesets | |
535 | adding manifests |
|
526 | adding manifests | |
536 | adding file changes |
|
527 | adding file changes | |
537 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
|||
538 | transaction abort! |
|
528 | transaction abort! | |
539 | rollback completed |
|
529 | rollback completed | |
540 | abort: bundle at http://localhost:$HGPORT/bundle4.hg is corrupted: |
|
530 | abort: bundle at http://localhost:$HGPORT/bundle4.hg is corrupted: |
@@ -868,9 +868,9 b' Clone with existing share dir should res' | |||||
868 | adding changesets |
|
868 | adding changesets | |
869 | adding manifests |
|
869 | adding manifests | |
870 | adding file changes |
|
870 | adding file changes | |
871 | added 4 changesets with 4 changes to 1 files (+4 heads) |
|
|||
872 | adding remote bookmark head1 |
|
871 | adding remote bookmark head1 | |
873 | adding remote bookmark head2 |
|
872 | adding remote bookmark head2 | |
|
873 | added 4 changesets with 4 changes to 1 files (+4 heads) | |||
874 | new changesets 4a8dc1ab4c13:6bacf4683960 |
|
874 | new changesets 4a8dc1ab4c13:6bacf4683960 | |
875 | updating working directory |
|
875 | updating working directory | |
876 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
876 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -996,9 +996,9 b' making another clone should only pull do' | |||||
996 | adding changesets |
|
996 | adding changesets | |
997 | adding manifests |
|
997 | adding manifests | |
998 | adding file changes |
|
998 | adding file changes | |
999 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
|||
1000 | adding remote bookmark head1 |
|
999 | adding remote bookmark head1 | |
1001 | adding remote bookmark head2 |
|
1000 | adding remote bookmark head2 | |
|
1001 | added 1 changesets with 1 changes to 1 files (+1 heads) | |||
1002 | new changesets 99f71071f117 |
|
1002 | new changesets 99f71071f117 | |
1003 | updating working directory |
|
1003 | updating working directory | |
1004 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1004 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -39,7 +39,6 b' Create repo' | |||||
39 | adding changesets |
|
39 | adding changesets | |
40 | adding manifests |
|
40 | adding manifests | |
41 | adding file changes |
|
41 | adding file changes | |
42 | added 1 changesets with 1 changes to 1 files |
|
|||
43 | error: pretxnchangegroup hook failed: end-of-line check failed: |
|
42 | error: pretxnchangegroup hook failed: end-of-line check failed: | |
44 | a.txt in a8ee6548cd86 should not have CRLF line endings |
|
43 | a.txt in a8ee6548cd86 should not have CRLF line endings | |
45 | transaction abort! |
|
44 | transaction abort! | |
@@ -67,7 +66,6 b' Create repo' | |||||
67 | adding changesets |
|
66 | adding changesets | |
68 | adding manifests |
|
67 | adding manifests | |
69 | adding file changes |
|
68 | adding file changes | |
70 | added 1 changesets with 1 changes to 1 files |
|
|||
71 | error: pretxnchangegroup hook failed: end-of-line check failed: |
|
69 | error: pretxnchangegroup hook failed: end-of-line check failed: | |
72 | crlf.txt in 004ba2132725 should not have LF line endings |
|
70 | crlf.txt in 004ba2132725 should not have LF line endings | |
73 | transaction abort! |
|
71 | transaction abort! | |
@@ -95,7 +93,6 b' Create repo' | |||||
95 | adding changesets |
|
93 | adding changesets | |
96 | adding manifests |
|
94 | adding manifests | |
97 | adding file changes |
|
95 | adding file changes | |
98 | added 1 changesets with 1 changes to 1 files |
|
|||
99 | error: pretxnchangegroup hook failed: end-of-line check failed: |
|
96 | error: pretxnchangegroup hook failed: end-of-line check failed: | |
100 | b.txt in fbcf9b1025f5 should not have CRLF line endings |
|
97 | b.txt in fbcf9b1025f5 should not have CRLF line endings | |
101 | transaction abort! |
|
98 | transaction abort! | |
@@ -116,7 +113,6 b' Create repo' | |||||
116 | adding changesets |
|
113 | adding changesets | |
117 | adding manifests |
|
114 | adding manifests | |
118 | adding file changes |
|
115 | adding file changes | |
119 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
|||
120 | error: pretxnchangegroup hook failed: end-of-line check failed: |
|
116 | error: pretxnchangegroup hook failed: end-of-line check failed: | |
121 | b.txt in fbcf9b1025f5 should not have CRLF line endings |
|
117 | b.txt in fbcf9b1025f5 should not have CRLF line endings | |
122 | transaction abort! |
|
118 | transaction abort! | |
@@ -137,7 +133,6 b' Test checkheadshook alias' | |||||
137 | adding changesets |
|
133 | adding changesets | |
138 | adding manifests |
|
134 | adding manifests | |
139 | adding file changes |
|
135 | adding file changes | |
140 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
|||
141 | error: pretxnchangegroup hook failed: end-of-line check failed: |
|
136 | error: pretxnchangegroup hook failed: end-of-line check failed: | |
142 | b.txt in fbcf9b1025f5 should not have CRLF line endings |
|
137 | b.txt in fbcf9b1025f5 should not have CRLF line endings | |
143 | transaction abort! |
|
138 | transaction abort! | |
@@ -174,7 +169,6 b' Test it still fails with checkallhook' | |||||
174 | adding changesets |
|
169 | adding changesets | |
175 | adding manifests |
|
170 | adding manifests | |
176 | adding file changes |
|
171 | adding file changes | |
177 | added 3 changesets with 3 changes to 2 files (+1 heads) |
|
|||
178 | error: pretxnchangegroup hook failed: end-of-line check failed: |
|
172 | error: pretxnchangegroup hook failed: end-of-line check failed: | |
179 | b.txt in fbcf9b1025f5 should not have CRLF line endings |
|
173 | b.txt in fbcf9b1025f5 should not have CRLF line endings | |
180 | transaction abort! |
|
174 | transaction abort! | |
@@ -204,7 +198,6 b' Test multiple files/revisions output' | |||||
204 | adding changesets |
|
198 | adding changesets | |
205 | adding manifests |
|
199 | adding manifests | |
206 | adding file changes |
|
200 | adding file changes | |
207 | added 3 changesets with 3 changes to 2 files (+1 heads) |
|
|||
208 | error: pretxnchangegroup hook failed: end-of-line check failed: |
|
201 | error: pretxnchangegroup hook failed: end-of-line check failed: | |
209 | b.txt in fbcf9b1025f5 should not have CRLF line endings |
|
202 | b.txt in fbcf9b1025f5 should not have CRLF line endings | |
210 | d.txt in a7040e68714f should not have CRLF line endings |
|
203 | d.txt in a7040e68714f should not have CRLF line endings |
@@ -720,7 +720,6 b' incoming changes no longer there after' | |||||
720 | adding changesets |
|
720 | adding changesets | |
721 | adding manifests |
|
721 | adding manifests | |
722 | adding file changes |
|
722 | adding file changes | |
723 | added 1 changesets with 1 changes to 1 files |
|
|||
724 | 4:539e4b31b6dc |
|
723 | 4:539e4b31b6dc | |
725 | pretxnchangegroup.forbid hook: HG_HOOKNAME=pretxnchangegroup.forbid1 |
|
724 | pretxnchangegroup.forbid hook: HG_HOOKNAME=pretxnchangegroup.forbid1 | |
726 | HG_HOOKTYPE=pretxnchangegroup |
|
725 | HG_HOOKTYPE=pretxnchangegroup | |
@@ -763,8 +762,8 b' outgoing hooks can see env vars' | |||||
763 | adding changesets |
|
762 | adding changesets | |
764 | adding manifests |
|
763 | adding manifests | |
765 | adding file changes |
|
764 | adding file changes | |
|
765 | adding remote bookmark quux | |||
766 | added 1 changesets with 1 changes to 1 files |
|
766 | added 1 changesets with 1 changes to 1 files | |
767 | adding remote bookmark quux |
|
|||
768 | new changesets 539e4b31b6dc |
|
767 | new changesets 539e4b31b6dc | |
769 | (run 'hg update' to get a working copy) |
|
768 | (run 'hg update' to get a working copy) | |
770 | $ hg rollback |
|
769 | $ hg rollback | |
@@ -995,8 +994,8 b' different between Python 2.6 and Python ' | |||||
995 | adding changesets |
|
994 | adding changesets | |
996 | adding manifests |
|
995 | adding manifests | |
997 | adding file changes |
|
996 | adding file changes | |
|
997 | adding remote bookmark quux | |||
998 | added 1 changesets with 1 changes to 1 files |
|
998 | added 1 changesets with 1 changes to 1 files | |
999 | adding remote bookmark quux |
|
|||
1000 | new changesets 539e4b31b6dc |
|
999 | new changesets 539e4b31b6dc | |
1001 | (run 'hg update' to get a working copy) |
|
1000 | (run 'hg update' to get a working copy) | |
1002 |
|
1001 | |||
@@ -1235,13 +1234,13 b' new commits must be visible in pretxncha' | |||||
1235 | adding changesets |
|
1234 | adding changesets | |
1236 | adding manifests |
|
1235 | adding manifests | |
1237 | adding file changes |
|
1236 | adding file changes | |
1238 | added 1 changesets with 1 changes to 1 files |
|
|||
1239 | changeset: 1:9836a07b9b9d |
|
1237 | changeset: 1:9836a07b9b9d | |
1240 | tag: tip |
|
1238 | tag: tip | |
1241 | user: test |
|
1239 | user: test | |
1242 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1240 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1243 | summary: b |
|
1241 | summary: b | |
1244 |
|
1242 | |||
|
1243 | added 1 changesets with 1 changes to 1 files | |||
1245 |
|
1244 | |||
1246 | pretxnclose hook failure should abort the transaction |
|
1245 | pretxnclose hook failure should abort the transaction | |
1247 |
|
1246 |
@@ -1092,7 +1092,6 b' Server stops sending after 0 length payl' | |||||
1092 | adding changesets |
|
1092 | adding changesets | |
1093 | adding manifests |
|
1093 | adding manifests | |
1094 | adding file changes |
|
1094 | adding file changes | |
1095 | added 1 changesets with 1 changes to 1 files |
|
|||
1096 | transaction abort! |
|
1095 | transaction abort! | |
1097 | rollback completed |
|
1096 | rollback completed | |
1098 | abort: HTTP request error (incomplete response) (py3 !) |
|
1097 | abort: HTTP request error (incomplete response) (py3 !) |
@@ -338,12 +338,13 b' test http authentication' | |||||
338 | bundle2-input-bundle: no-transaction |
|
338 | bundle2-input-bundle: no-transaction | |
339 | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported |
|
339 | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | |
340 | bundle2-input-part: "output" (advisory) (params: 0 advisory) supported |
|
340 | bundle2-input-part: "output" (advisory) (params: 0 advisory) supported | |
341 |
bundle2-input-part: total payload size |
|
341 | bundle2-input-part: total payload size 55 | |
342 | remote: adding changesets |
|
342 | remote: adding changesets | |
343 | remote: adding manifests |
|
343 | remote: adding manifests | |
344 | remote: adding file changes |
|
344 | remote: adding file changes | |
|
345 | bundle2-input-part: "output" (advisory) supported | |||
|
346 | bundle2-input-part: total payload size 45 | |||
345 | remote: added 1 changesets with 1 changes to 1 files |
|
347 | remote: added 1 changesets with 1 changes to 1 files | |
346 | bundle2-input-part: "output" (advisory) supported |
|
|||
347 | bundle2-input-bundle: 2 parts total |
|
348 | bundle2-input-bundle: 2 parts total | |
348 | preparing listkeys for "phases" |
|
349 | preparing listkeys for "phases" | |
349 | sending listkeys command |
|
350 | sending listkeys command |
@@ -168,8 +168,8 b' Pull scratch and non-scratch bookmark at' | |||||
168 | adding changesets |
|
168 | adding changesets | |
169 | adding manifests |
|
169 | adding manifests | |
170 | adding file changes |
|
170 | adding file changes | |
|
171 | adding remote bookmark newbook | |||
171 | added 1 changesets with 1 changes to 2 files |
|
172 | added 1 changesets with 1 changes to 2 files | |
172 | adding remote bookmark newbook |
|
|||
173 | new changesets 1de1d7d92f89 (1 drafts) |
|
173 | new changesets 1de1d7d92f89 (1 drafts) | |
174 | (run 'hg update' to get a working copy) |
|
174 | (run 'hg update' to get a working copy) | |
175 | $ hg log -G -T '{desc} {phase} {bookmarks}' |
|
175 | $ hg log -G -T '{desc} {phase} {bookmarks}' |
@@ -78,11 +78,10 b' Pull two bookmarks from the second clien' | |||||
78 | adding changesets |
|
78 | adding changesets | |
79 | adding manifests |
|
79 | adding manifests | |
80 | adding file changes |
|
80 | adding file changes | |
81 | added 1 changesets with 1 changes to 1 files |
|
|||
82 | adding changesets |
|
81 | adding changesets | |
83 | adding manifests |
|
82 | adding manifests | |
84 | adding file changes |
|
83 | adding file changes | |
85 |
added |
|
84 | added 2 changesets with 2 changes to 2 files (+1 heads) | |
86 | new changesets * (glob) |
|
85 | new changesets * (glob) | |
87 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
86 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
88 | $ hg log -r scratch/secondpart -T '{node}' |
|
87 | $ hg log -r scratch/secondpart -T '{node}' | |
@@ -158,11 +157,10 b' Make sure phase on the client is public.' | |||||
158 | adding changesets |
|
157 | adding changesets | |
159 | adding manifests |
|
158 | adding manifests | |
160 | adding file changes |
|
159 | adding file changes | |
161 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
|||
162 | adding changesets |
|
160 | adding changesets | |
163 | adding manifests |
|
161 | adding manifests | |
164 | adding file changes |
|
162 | adding file changes | |
165 |
added |
|
163 | added 2 changesets with 2 changes to 2 files (+1 heads) | |
166 | new changesets a79b6597f322:c70aee6da07d (1 drafts) |
|
164 | new changesets a79b6597f322:c70aee6da07d (1 drafts) | |
167 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
165 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
168 | $ hg log -r scratch/scratchontopofpublic -T '{phase}' |
|
166 | $ hg log -r scratch/scratchontopofpublic -T '{phase}' |
@@ -105,7 +105,6 b' Blob URIs are correct when --prefix is u' | |||||
105 | adding manifests |
|
105 | adding manifests | |
106 | adding file changes |
|
106 | adding file changes | |
107 | adding lfs.bin revisions |
|
107 | adding lfs.bin revisions | |
108 | added 1 changesets with 1 changes to 1 files |
|
|||
109 | bundle2-input-part: total payload size 648 |
|
108 | bundle2-input-part: total payload size 648 | |
110 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
|
109 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported | |
111 | bundle2-input-part: "phase-heads" supported |
|
110 | bundle2-input-part: "phase-heads" supported | |
@@ -115,6 +114,7 b' Blob URIs are correct when --prefix is u' | |||||
115 | bundle2-input-bundle: 3 parts total |
|
114 | bundle2-input-bundle: 3 parts total | |
116 | checking for updated bookmarks |
|
115 | checking for updated bookmarks | |
117 | updating the branch cache |
|
116 | updating the branch cache | |
|
117 | added 1 changesets with 1 changes to 1 files | |||
118 | new changesets 525251863cad |
|
118 | new changesets 525251863cad | |
119 | updating to branch default |
|
119 | updating to branch default | |
120 | resolving manifests |
|
120 | resolving manifests |
@@ -499,8 +499,8 b' lfs content, and the extension enabled.' | |||||
499 | adding changesets |
|
499 | adding changesets | |
500 | adding manifests |
|
500 | adding manifests | |
501 | adding file changes |
|
501 | adding file changes | |
|
502 | calling hook pretxnchangegroup.lfs: hgext.lfs.checkrequireslfs | |||
502 | added 6 changesets with 5 changes to 5 files (+1 heads) |
|
503 | added 6 changesets with 5 changes to 5 files (+1 heads) | |
503 | calling hook pretxnchangegroup.lfs: hgext.lfs.checkrequireslfs |
|
|||
504 | new changesets d437e1d24fbd:d3b84d50eacb |
|
504 | new changesets d437e1d24fbd:d3b84d50eacb | |
505 | resolving manifests |
|
505 | resolving manifests | |
506 | lfs: assuming remote store: http://localhost:$HGPORT/.git/info/lfs |
|
506 | lfs: assuming remote store: http://localhost:$HGPORT/.git/info/lfs |
@@ -135,13 +135,13 b' store.' | |||||
135 | adding manifests |
|
135 | adding manifests | |
136 | adding file changes |
|
136 | adding file changes | |
137 | adding a revisions |
|
137 | adding a revisions | |
138 | added 1 changesets with 1 changes to 1 files |
|
|||
139 | calling hook pretxnchangegroup.lfs: hgext.lfs.checkrequireslfs |
|
138 | calling hook pretxnchangegroup.lfs: hgext.lfs.checkrequireslfs | |
140 | bundle2-input-part: total payload size 617 |
|
139 | bundle2-input-part: total payload size 617 | |
141 | bundle2-input-part: "phase-heads" supported |
|
140 | bundle2-input-part: "phase-heads" supported | |
142 | bundle2-input-part: total payload size 24 |
|
141 | bundle2-input-part: total payload size 24 | |
143 | bundle2-input-bundle: 3 parts total |
|
142 | bundle2-input-bundle: 3 parts total | |
144 | updating the branch cache |
|
143 | updating the branch cache | |
|
144 | added 1 changesets with 1 changes to 1 files | |||
145 | bundle2-output-bundle: "HG20", 1 parts total |
|
145 | bundle2-output-bundle: "HG20", 1 parts total | |
146 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
146 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
147 | bundle2-input-bundle: no-transaction |
|
147 | bundle2-input-bundle: no-transaction | |
@@ -312,12 +312,12 b' actions property completely.' | |||||
312 | adding b revisions |
|
312 | adding b revisions | |
313 | adding c revisions |
|
313 | adding c revisions | |
314 | adding d revisions |
|
314 | adding d revisions | |
315 | added 1 changesets with 3 changes to 3 files |
|
|||
316 | bundle2-input-part: total payload size 1315 |
|
315 | bundle2-input-part: total payload size 1315 | |
317 | bundle2-input-part: "phase-heads" supported |
|
316 | bundle2-input-part: "phase-heads" supported | |
318 | bundle2-input-part: total payload size 24 |
|
317 | bundle2-input-part: total payload size 24 | |
319 | bundle2-input-bundle: 4 parts total |
|
318 | bundle2-input-bundle: 4 parts total | |
320 | updating the branch cache |
|
319 | updating the branch cache | |
|
320 | added 1 changesets with 3 changes to 3 files | |||
321 | bundle2-output-bundle: "HG20", 1 parts total |
|
321 | bundle2-output-bundle: "HG20", 1 parts total | |
322 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload |
|
322 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |
323 | bundle2-input-bundle: no-transaction |
|
323 | bundle2-input-bundle: no-transaction |
@@ -124,8 +124,8 b' lfs requirement' | |||||
124 | adding changesets |
|
124 | adding changesets | |
125 | adding manifests |
|
125 | adding manifests | |
126 | adding file changes |
|
126 | adding file changes | |
|
127 | calling hook pretxnchangegroup.lfs: hgext.lfs.checkrequireslfs | |||
127 | added 2 changesets with 3 changes to 3 files |
|
128 | added 2 changesets with 3 changes to 3 files | |
128 | calling hook pretxnchangegroup.lfs: hgext.lfs.checkrequireslfs |
|
|||
129 | $ grep lfs $TESTTMP/server/.hg/requires |
|
129 | $ grep lfs $TESTTMP/server/.hg/requires | |
130 | lfs |
|
130 | lfs | |
131 |
|
131 |
@@ -98,9 +98,9 b' Making a new server' | |||||
98 | adding changesets |
|
98 | adding changesets | |
99 | adding manifests |
|
99 | adding manifests | |
100 | adding file changes |
|
100 | adding file changes | |
101 | added 9 changesets with 9 changes to 9 files (+1 heads) |
|
|||
102 | adding remote bookmark bar |
|
101 | adding remote bookmark bar | |
103 | adding remote bookmark foo |
|
102 | adding remote bookmark foo | |
|
103 | added 9 changesets with 9 changes to 9 files (+1 heads) | |||
104 | new changesets 18d04c59bb5d:3e1487808078 |
|
104 | new changesets 18d04c59bb5d:3e1487808078 | |
105 | (run 'hg heads' to see heads) |
|
105 | (run 'hg heads' to see heads) | |
106 |
|
106 |
@@ -217,7 +217,7 b" TODO: lfs shouldn't abort like this" | |||||
217 | remote: adding changesets |
|
217 | remote: adding changesets | |
218 | remote: adding manifests |
|
218 | remote: adding manifests | |
219 | remote: adding file changes |
|
219 | remote: adding file changes | |
220 | remote: added 1 changesets with 0 changes to 0 files |
|
220 | remote: added 1 changesets with 0 changes to 0 files (no-lfs-on !) | |
221 | remote: error: pretxnchangegroup.lfs hook raised an exception: data/inside2/f.i@f59b4e021835: no match found (lfs-on !) |
|
221 | remote: error: pretxnchangegroup.lfs hook raised an exception: data/inside2/f.i@f59b4e021835: no match found (lfs-on !) | |
222 | remote: transaction abort! (lfs-on !) |
|
222 | remote: transaction abort! (lfs-on !) | |
223 | remote: rollback completed (lfs-on !) |
|
223 | remote: rollback completed (lfs-on !) |
@@ -125,9 +125,9 b' added upstream revisions.' | |||||
125 | adding widest/ revisions (tree !) |
|
125 | adding widest/ revisions (tree !) | |
126 | adding file changes |
|
126 | adding file changes | |
127 | adding widest/f revisions |
|
127 | adding widest/f revisions | |
128 | added 0 changesets with 1 changes to 1 files |
|
|||
129 | bundle2-input-part: total payload size * (glob) |
|
128 | bundle2-input-part: total payload size * (glob) | |
130 | bundle2-input-bundle: 0 parts total |
|
129 | bundle2-input-bundle: 0 parts total | |
|
130 | added 0 changesets with 1 changes to 1 files | |||
131 | widest/f: narrowspec updated -> g |
|
131 | widest/f: narrowspec updated -> g | |
132 | getting widest/f |
|
132 | getting widest/f | |
133 | $ hg tracked |
|
133 | $ hg tracked |
@@ -340,7 +340,6 b' Widening that fails can be recovered fro' | |||||
340 | adding changesets |
|
340 | adding changesets | |
341 | adding manifests |
|
341 | adding manifests | |
342 | adding file changes |
|
342 | adding file changes | |
343 | added 3 changesets with 2 changes to 2 files |
|
|||
344 | transaction abort! |
|
343 | transaction abort! | |
345 | rollback completed |
|
344 | rollback completed | |
346 | abort: pretxnchangegroup.bad hook exited with status 1 |
|
345 | abort: pretxnchangegroup.bad hook exited with status 1 |
@@ -170,7 +170,6 b' client only pulls down 1 changeset' | |||||
170 | adding manifests |
|
170 | adding manifests | |
171 | adding file changes |
|
171 | adding file changes | |
172 | adding foo revisions |
|
172 | adding foo revisions | |
173 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
|||
174 | bundle2-input-part: total payload size 476 |
|
173 | bundle2-input-part: total payload size 476 | |
175 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
|
174 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported | |
176 | bundle2-input-part: "phase-heads" supported |
|
175 | bundle2-input-part: "phase-heads" supported | |
@@ -180,5 +179,6 b' client only pulls down 1 changeset' | |||||
180 | bundle2-input-bundle: 3 parts total |
|
179 | bundle2-input-bundle: 3 parts total | |
181 | checking for updated bookmarks |
|
180 | checking for updated bookmarks | |
182 | updating the branch cache |
|
181 | updating the branch cache | |
|
182 | added 1 changesets with 1 changes to 1 files (+1 heads) | |||
183 | new changesets bec0734cd68e |
|
183 | new changesets bec0734cd68e | |
184 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
184 | (run 'hg heads' to see heads, 'hg merge' to merge) |
@@ -101,15 +101,13 b' Test pullbundle functionality for increm' | |||||
101 | adding changesets |
|
101 | adding changesets | |
102 | adding manifests |
|
102 | adding manifests | |
103 | adding file changes |
|
103 | adding file changes | |
104 | added 1 changesets with 1 changes to 1 files |
|
|||
105 | adding changesets |
|
104 | adding changesets | |
106 | adding manifests |
|
105 | adding manifests | |
107 | adding file changes |
|
106 | adding file changes | |
108 | added 1 changesets with 1 changes to 1 files |
|
|||
109 | adding changesets |
|
107 | adding changesets | |
110 | adding manifests |
|
108 | adding manifests | |
111 | adding file changes |
|
109 | adding file changes | |
112 |
added |
|
110 | added 3 changesets with 3 changes to 3 files (+1 heads) | |
113 | new changesets bbd179dfa0a7:ed1b79f46b9a (3 drafts) |
|
111 | new changesets bbd179dfa0a7:ed1b79f46b9a (3 drafts) | |
114 | updating to branch default |
|
112 | updating to branch default | |
115 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
113 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -108,8 +108,8 b' explicit destination of the update.' | |||||
108 | adding changesets |
|
108 | adding changesets | |
109 | adding manifests |
|
109 | adding manifests | |
110 | adding file changes |
|
110 | adding file changes | |
|
111 | adding remote bookmark active-after-pull | |||
111 | added 1 changesets with 1 changes to 1 files |
|
112 | added 1 changesets with 1 changes to 1 files | |
112 | adding remote bookmark active-after-pull |
|
|||
113 | new changesets f815b3da6163 |
|
113 | new changesets f815b3da6163 | |
114 | 1 local changesets published |
|
114 | 1 local changesets published | |
115 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
115 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -138,8 +138,8 b' explicit destination of the update.' | |||||
138 | adding changesets |
|
138 | adding changesets | |
139 | adding manifests |
|
139 | adding manifests | |
140 | adding file changes |
|
140 | adding file changes | |
|
141 | adding remote bookmark active-after-pull | |||
141 | added 1 changesets with 1 changes to 1 files |
|
142 | added 1 changesets with 1 changes to 1 files | |
142 | adding remote bookmark active-after-pull |
|
|||
143 | new changesets f815b3da6163 |
|
143 | new changesets f815b3da6163 | |
144 | 1 local changesets published |
|
144 | 1 local changesets published | |
145 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
145 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -88,8 +88,8 b' expect success' | |||||
88 | remote: adding manifests |
|
88 | remote: adding manifests | |
89 | remote: adding file changes |
|
89 | remote: adding file changes | |
90 | remote: adding a revisions |
|
90 | remote: adding a revisions | |
|
91 | remote: updating the branch cache | |||
91 | remote: added 1 changesets with 1 changes to 1 files |
|
92 | remote: added 1 changesets with 1 changes to 1 files | |
92 | remote: updating the branch cache |
|
|||
93 | remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh |
|
93 | remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh | |
94 | remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public |
|
94 | remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public | |
95 | remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh |
|
95 | remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh | |
@@ -117,8 +117,8 b' expect success' | |||||
117 | remote: adding manifests |
|
117 | remote: adding manifests | |
118 | remote: adding file changes |
|
118 | remote: adding file changes | |
119 | remote: adding a revisions |
|
119 | remote: adding a revisions | |
|
120 | remote: updating the branch cache | |||
120 | remote: added 1 changesets with 1 changes to 1 files |
|
121 | remote: added 1 changesets with 1 changes to 1 files | |
121 | remote: updating the branch cache |
|
|||
122 | remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh |
|
122 | remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh | |
123 | remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public |
|
123 | remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public | |
124 | remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh |
|
124 | remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh | |
@@ -309,7 +309,6 b' and fails the entire push.' | |||||
309 | remote: adding changesets |
|
309 | remote: adding changesets | |
310 | remote: adding manifests |
|
310 | remote: adding manifests | |
311 | remote: adding file changes |
|
311 | remote: adding file changes | |
312 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
313 | remote: prepushkey hook: HG_BUNDLE2=1 |
|
312 | remote: prepushkey hook: HG_BUNDLE2=1 | |
314 | remote: HG_HOOKNAME=prepushkey |
|
313 | remote: HG_HOOKNAME=prepushkey | |
315 | remote: HG_HOOKTYPE=prepushkey |
|
314 | remote: HG_HOOKTYPE=prepushkey | |
@@ -351,7 +350,6 b" We don't need to test bundle1 because it" | |||||
351 | remote: adding changesets |
|
350 | remote: adding changesets | |
352 | remote: adding manifests |
|
351 | remote: adding manifests | |
353 | remote: adding file changes |
|
352 | remote: adding file changes | |
354 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
355 | remote: prepushkey hook: HG_BUNDLE2=1 |
|
353 | remote: prepushkey hook: HG_BUNDLE2=1 | |
356 | remote: HG_HOOKNAME=prepushkey |
|
354 | remote: HG_HOOKNAME=prepushkey | |
357 | remote: HG_HOOKTYPE=prepushkey |
|
355 | remote: HG_HOOKTYPE=prepushkey | |
@@ -368,6 +366,7 b" We don't need to test bundle1 because it" | |||||
368 | remote: HG_TXNNAME=serve |
|
366 | remote: HG_TXNNAME=serve | |
369 | remote: HG_URL=remote:http:$LOCALIP: (glob) |
|
367 | remote: HG_URL=remote:http:$LOCALIP: (glob) | |
370 | remote: |
|
368 | remote: | |
|
369 | remote: added 1 changesets with 1 changes to 1 files | |||
371 | % serve errors |
|
370 | % serve errors | |
372 | #endif |
|
371 | #endif | |
373 |
|
372 | |||
@@ -410,7 +409,6 b' Now do a variant of the above, except on' | |||||
410 | remote: adding changesets |
|
409 | remote: adding changesets | |
411 | remote: adding manifests |
|
410 | remote: adding manifests | |
412 | remote: adding file changes |
|
411 | remote: adding file changes | |
413 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
414 | remote: prepushkey hook: HG_BUNDLE2=1 |
|
412 | remote: prepushkey hook: HG_BUNDLE2=1 | |
415 | remote: HG_HOOKNAME=prepushkey |
|
413 | remote: HG_HOOKNAME=prepushkey | |
416 | remote: HG_HOOKTYPE=prepushkey |
|
414 | remote: HG_HOOKTYPE=prepushkey | |
@@ -465,7 +463,6 b' Make phases updates work' | |||||
465 | remote: adding changesets |
|
463 | remote: adding changesets | |
466 | remote: adding manifests |
|
464 | remote: adding manifests | |
467 | remote: adding file changes |
|
465 | remote: adding file changes | |
468 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
469 | remote: prepushkey hook: HG_BUNDLE2=1 |
|
466 | remote: prepushkey hook: HG_BUNDLE2=1 | |
470 | remote: HG_HOOKNAME=prepushkey |
|
467 | remote: HG_HOOKNAME=prepushkey | |
471 | remote: HG_HOOKTYPE=prepushkey |
|
468 | remote: HG_HOOKTYPE=prepushkey | |
@@ -482,6 +479,7 b' Make phases updates work' | |||||
482 | remote: HG_TXNNAME=serve |
|
479 | remote: HG_TXNNAME=serve | |
483 | remote: HG_URL=remote:http:$LOCALIP: (glob) |
|
480 | remote: HG_URL=remote:http:$LOCALIP: (glob) | |
484 | remote: |
|
481 | remote: | |
|
482 | remote: added 1 changesets with 1 changes to 1 files | |||
485 |
|
|
483 | % serve errors | |
486 | #endif |
|
484 | #endif | |
487 |
|
485 |
@@ -287,9 +287,9 b' Test push hook locking' | |||||
287 | adding changesets |
|
287 | adding changesets | |
288 | adding manifests |
|
288 | adding manifests | |
289 | adding file changes |
|
289 | adding file changes | |
290 | added 1 changesets with 1 changes to 1 files |
|
|||
291 | lock: user *, process * (*s) (glob) |
|
290 | lock: user *, process * (*s) (glob) | |
292 | wlock: free |
|
291 | wlock: free | |
|
292 | added 1 changesets with 1 changes to 1 files | |||
293 |
|
293 | |||
294 | $ hg --cwd 1 --config extensions.strip= strip tip -q |
|
294 | $ hg --cwd 1 --config extensions.strip= strip tip -q | |
295 | $ hg --cwd 2 --config extensions.strip= strip tip -q |
|
295 | $ hg --cwd 2 --config extensions.strip= strip tip -q | |
@@ -299,9 +299,9 b' Test push hook locking' | |||||
299 | adding changesets |
|
299 | adding changesets | |
300 | adding manifests |
|
300 | adding manifests | |
301 | adding file changes |
|
301 | adding file changes | |
302 | added 1 changesets with 1 changes to 1 files |
|
|||
303 | lock: user *, process * (*s) (glob) |
|
302 | lock: user *, process * (*s) (glob) | |
304 | wlock: user *, process * (*s) (glob) |
|
303 | wlock: user *, process * (*s) (glob) | |
|
304 | added 1 changesets with 1 changes to 1 files | |||
305 |
|
305 | |||
306 | Test bare push with multiple race checking options |
|
306 | Test bare push with multiple race checking options | |
307 | -------------------------------------------------- |
|
307 | -------------------------------------------------- |
@@ -41,9 +41,9 b' Setting pushvars.sever = true and then p' | |||||
41 | adding changesets |
|
41 | adding changesets | |
42 | adding manifests |
|
42 | adding manifests | |
43 | adding file changes |
|
43 | adding file changes | |
44 | added 1 changesets with 1 changes to 1 files |
|
|||
45 | HG_USERVAR_BYPASS_REVIEW=true |
|
44 | HG_USERVAR_BYPASS_REVIEW=true | |
46 | HG_USERVAR_DEBUG=1 |
|
45 | HG_USERVAR_DEBUG=1 | |
|
46 | added 1 changesets with 1 changes to 1 files | |||
47 |
|
47 | |||
48 | Test pushing var with empty right-hand side |
|
48 | Test pushing var with empty right-hand side | |
49 |
|
49 | |||
@@ -55,8 +55,8 b' Test pushing var with empty right-hand s' | |||||
55 | adding changesets |
|
55 | adding changesets | |
56 | adding manifests |
|
56 | adding manifests | |
57 | adding file changes |
|
57 | adding file changes | |
|
58 | HG_USERVAR_DEBUG= | |||
58 | added 1 changesets with 1 changes to 1 files |
|
59 | added 1 changesets with 1 changes to 1 files | |
59 | HG_USERVAR_DEBUG= |
|
|||
60 |
|
60 | |||
61 | Test pushing bad vars |
|
61 | Test pushing bad vars | |
62 |
|
62 |
@@ -315,7 +315,6 b' Check that the right ancestors is used w' | |||||
315 | adding manifests |
|
315 | adding manifests | |
316 | adding file changes |
|
316 | adding file changes | |
317 | adding f1.txt revisions |
|
317 | adding f1.txt revisions | |
318 | added 2 changesets with 2 changes to 1 files |
|
|||
319 | bundle2-input-part: total payload size 1686 |
|
318 | bundle2-input-part: total payload size 1686 | |
320 | bundle2-input-part: "cache:rev-branch-cache" (advisory) supported |
|
319 | bundle2-input-part: "cache:rev-branch-cache" (advisory) supported | |
321 | bundle2-input-part: total payload size 74 |
|
320 | bundle2-input-part: total payload size 74 | |
@@ -323,6 +322,7 b' Check that the right ancestors is used w' | |||||
323 | bundle2-input-part: "phase-heads" supported |
|
322 | bundle2-input-part: "phase-heads" supported | |
324 | bundle2-input-part: total payload size 24 |
|
323 | bundle2-input-part: total payload size 24 | |
325 | bundle2-input-bundle: 2 parts total |
|
324 | bundle2-input-bundle: 2 parts total | |
|
325 | added 2 changesets with 2 changes to 1 files | |||
326 | updating the branch cache |
|
326 | updating the branch cache | |
327 | invalid branch cache (served): tip differs |
|
327 | invalid branch cache (served): tip differs | |
328 | invalid branch cache (served.hidden): tip differs |
|
328 | invalid branch cache (served.hidden): tip differs |
@@ -73,8 +73,8 b'' | |||||
73 | adding changesets |
|
73 | adding changesets | |
74 | adding manifests |
|
74 | adding manifests | |
75 | adding file changes |
|
75 | adding file changes | |
|
76 | updating bookmark foo | |||
76 | added 1 changesets with 0 changes to 0 files |
|
77 | added 1 changesets with 0 changes to 0 files | |
77 | updating bookmark foo |
|
|||
78 | new changesets 6b4b6f66ef8c |
|
78 | new changesets 6b4b6f66ef8c | |
79 | (run 'hg update' to get a working copy) |
|
79 | (run 'hg update' to get a working copy) | |
80 | prefetching file contents |
|
80 | prefetching file contents | |
@@ -102,8 +102,8 b'' | |||||
102 | adding changesets |
|
102 | adding changesets | |
103 | adding manifests |
|
103 | adding manifests | |
104 | adding file changes |
|
104 | adding file changes | |
|
105 | updating bookmark foo | |||
105 | added 1 changesets with 0 changes to 0 files |
|
106 | added 1 changesets with 0 changes to 0 files | |
106 | updating bookmark foo |
|
|||
107 | new changesets 6b4b6f66ef8c |
|
107 | new changesets 6b4b6f66ef8c | |
108 | (run 'hg update' to get a working copy) |
|
108 | (run 'hg update' to get a working copy) | |
109 | prefetching file contents |
|
109 | prefetching file contents |
@@ -94,8 +94,8 b'' | |||||
94 | adding changesets |
|
94 | adding changesets | |
95 | adding manifests |
|
95 | adding manifests | |
96 | adding file changes |
|
96 | adding file changes | |
|
97 | updating bookmark foo | |||
97 | added 1 changesets with 0 changes to 0 files |
|
98 | added 1 changesets with 0 changes to 0 files | |
98 | updating bookmark foo |
|
|||
99 | new changesets 109c3a557a73 |
|
99 | new changesets 109c3a557a73 | |
100 | (run 'hg update' to get a working copy) |
|
100 | (run 'hg update' to get a working copy) | |
101 | prefetching file contents |
|
101 | prefetching file contents | |
@@ -118,8 +118,8 b'' | |||||
118 | adding changesets |
|
118 | adding changesets | |
119 | adding manifests |
|
119 | adding manifests | |
120 | adding file changes |
|
120 | adding file changes | |
|
121 | updating bookmark foo | |||
121 | added 1 changesets with 0 changes to 0 files |
|
122 | added 1 changesets with 0 changes to 0 files | |
122 | updating bookmark foo |
|
|||
123 | new changesets 109c3a557a73 |
|
123 | new changesets 109c3a557a73 | |
124 | (run 'hg update' to get a working copy) |
|
124 | (run 'hg update' to get a working copy) | |
125 | prefetching file contents |
|
125 | prefetching file contents | |
@@ -149,8 +149,8 b'' | |||||
149 | adding changesets |
|
149 | adding changesets | |
150 | adding manifests |
|
150 | adding manifests | |
151 | adding file changes |
|
151 | adding file changes | |
|
152 | updating bookmark foo | |||
152 | added 1 changesets with 0 changes to 0 files |
|
153 | added 1 changesets with 0 changes to 0 files | |
153 | updating bookmark foo |
|
|||
154 | new changesets 109c3a557a73 |
|
154 | new changesets 109c3a557a73 | |
155 | 1 local changesets published (?) |
|
155 | 1 local changesets published (?) | |
156 | (run 'hg update' to get a working copy) |
|
156 | (run 'hg update' to get a working copy) |
@@ -58,8 +58,8 b'' | |||||
58 | adding changesets |
|
58 | adding changesets | |
59 | adding manifests |
|
59 | adding manifests | |
60 | adding file changes |
|
60 | adding file changes | |
|
61 | updating bookmark foo | |||
61 | added 1 changesets with 0 changes to 0 files |
|
62 | added 1 changesets with 0 changes to 0 files | |
62 | updating bookmark foo |
|
|||
63 | new changesets 876b1317060d |
|
63 | new changesets 876b1317060d | |
64 | (run 'hg update' to get a working copy) |
|
64 | (run 'hg update' to get a working copy) | |
65 | prefetching file contents |
|
65 | prefetching file contents |
@@ -71,7 +71,6 b' Create a new head on the default branch' | |||||
71 | adding changesets |
|
71 | adding changesets | |
72 | adding manifests |
|
72 | adding manifests | |
73 | adding file changes |
|
73 | adding file changes | |
74 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
|||
75 | transaction abort! |
|
74 | transaction abort! | |
76 | rollback completed |
|
75 | rollback completed | |
77 | abort: rejecting multiple heads on branch "default" |
|
76 | abort: rejecting multiple heads on branch "default" |
@@ -583,7 +583,6 b' remote hook failure is attributed to rem' | |||||
583 | remote: adding changesets |
|
583 | remote: adding changesets | |
584 | remote: adding manifests |
|
584 | remote: adding manifests | |
585 | remote: adding file changes |
|
585 | remote: adding file changes | |
586 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
587 | remote: hook failure! |
|
586 | remote: hook failure! | |
588 | remote: transaction abort! |
|
587 | remote: transaction abort! | |
589 | remote: rollback completed |
|
588 | remote: rollback completed |
@@ -272,11 +272,10 b' ui.write() in hook is redirected to stde' | |||||
272 | o> read(1) -> 1: 0 |
|
272 | o> read(1) -> 1: 0 | |
273 | result: 0 |
|
273 | result: 0 | |
274 | remote output: |
|
274 | remote output: | |
275 |
e> read(-1) -> 1 |
|
275 | e> read(-1) -> 151: | |
276 | e> adding changesets\n |
|
276 | e> adding changesets\n | |
277 | e> adding manifests\n |
|
277 | e> adding manifests\n | |
278 | e> adding file changes\n |
|
278 | e> adding file changes\n | |
279 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
280 | e> ui.write 1 line\n |
|
279 | e> ui.write 1 line\n | |
281 | e> transaction abort!\n |
|
280 | e> transaction abort!\n | |
282 | e> rollback completed\n |
|
281 | e> rollback completed\n | |
@@ -328,11 +327,10 b' ui.write() in hook is redirected to stde' | |||||
328 | o> read(1) -> 1: 0 |
|
327 | o> read(1) -> 1: 0 | |
329 | result: 0 |
|
328 | result: 0 | |
330 | remote output: |
|
329 | remote output: | |
331 |
e> read(-1) -> 1 |
|
330 | e> read(-1) -> 151: | |
332 | e> adding changesets\n |
|
331 | e> adding changesets\n | |
333 | e> adding manifests\n |
|
332 | e> adding manifests\n | |
334 | e> adding file changes\n |
|
333 | e> adding file changes\n | |
335 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
336 | e> ui.write 1 line\n |
|
334 | e> ui.write 1 line\n | |
337 | e> transaction abort!\n |
|
335 | e> transaction abort!\n | |
338 | e> rollback completed\n |
|
336 | e> rollback completed\n | |
@@ -398,11 +396,10 b' And a variation that writes multiple lin' | |||||
398 | o> read(1) -> 1: 0 |
|
396 | o> read(1) -> 1: 0 | |
399 | result: 0 |
|
397 | result: 0 | |
400 | remote output: |
|
398 | remote output: | |
401 |
e> read(-1) -> |
|
399 | e> read(-1) -> 173: | |
402 | e> adding changesets\n |
|
400 | e> adding changesets\n | |
403 | e> adding manifests\n |
|
401 | e> adding manifests\n | |
404 | e> adding file changes\n |
|
402 | e> adding file changes\n | |
405 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
406 | e> ui.write 2 lines 1\n |
|
403 | e> ui.write 2 lines 1\n | |
407 | e> ui.write 2 lines 2\n |
|
404 | e> ui.write 2 lines 2\n | |
408 | e> transaction abort!\n |
|
405 | e> transaction abort!\n | |
@@ -455,11 +452,10 b' And a variation that writes multiple lin' | |||||
455 | o> read(1) -> 1: 0 |
|
452 | o> read(1) -> 1: 0 | |
456 | result: 0 |
|
453 | result: 0 | |
457 | remote output: |
|
454 | remote output: | |
458 |
e> read(-1) -> |
|
455 | e> read(-1) -> 173: | |
459 | e> adding changesets\n |
|
456 | e> adding changesets\n | |
460 | e> adding manifests\n |
|
457 | e> adding manifests\n | |
461 | e> adding file changes\n |
|
458 | e> adding file changes\n | |
462 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
463 | e> ui.write 2 lines 1\n |
|
459 | e> ui.write 2 lines 1\n | |
464 | e> ui.write 2 lines 2\n |
|
460 | e> ui.write 2 lines 2\n | |
465 | e> transaction abort!\n |
|
461 | e> transaction abort!\n | |
@@ -526,11 +522,10 b' And a variation that does a ui.flush() a' | |||||
526 | o> read(1) -> 1: 0 |
|
522 | o> read(1) -> 1: 0 | |
527 | result: 0 |
|
523 | result: 0 | |
528 | remote output: |
|
524 | remote output: | |
529 |
e> read(-1) -> |
|
525 | e> read(-1) -> 157: | |
530 | e> adding changesets\n |
|
526 | e> adding changesets\n | |
531 | e> adding manifests\n |
|
527 | e> adding manifests\n | |
532 | e> adding file changes\n |
|
528 | e> adding file changes\n | |
533 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
534 | e> ui.write 1 line flush\n |
|
529 | e> ui.write 1 line flush\n | |
535 | e> transaction abort!\n |
|
530 | e> transaction abort!\n | |
536 | e> rollback completed\n |
|
531 | e> rollback completed\n | |
@@ -582,11 +577,10 b' And a variation that does a ui.flush() a' | |||||
582 | o> read(1) -> 1: 0 |
|
577 | o> read(1) -> 1: 0 | |
583 | result: 0 |
|
578 | result: 0 | |
584 | remote output: |
|
579 | remote output: | |
585 |
e> read(-1) -> |
|
580 | e> read(-1) -> 157: | |
586 | e> adding changesets\n |
|
581 | e> adding changesets\n | |
587 | e> adding manifests\n |
|
582 | e> adding manifests\n | |
588 | e> adding file changes\n |
|
583 | e> adding file changes\n | |
589 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
590 | e> ui.write 1 line flush\n |
|
584 | e> ui.write 1 line flush\n | |
591 | e> transaction abort!\n |
|
585 | e> transaction abort!\n | |
592 | e> rollback completed\n |
|
586 | e> rollback completed\n | |
@@ -652,11 +646,10 b' Multiple writes + flush' | |||||
652 | o> read(1) -> 1: 0 |
|
646 | o> read(1) -> 1: 0 | |
653 | result: 0 |
|
647 | result: 0 | |
654 | remote output: |
|
648 | remote output: | |
655 |
e> read(-1) -> |
|
649 | e> read(-1) -> 161: | |
656 | e> adding changesets\n |
|
650 | e> adding changesets\n | |
657 | e> adding manifests\n |
|
651 | e> adding manifests\n | |
658 | e> adding file changes\n |
|
652 | e> adding file changes\n | |
659 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
660 | e> ui.write 1st\n |
|
653 | e> ui.write 1st\n | |
661 | e> ui.write 2nd\n |
|
654 | e> ui.write 2nd\n | |
662 | e> transaction abort!\n |
|
655 | e> transaction abort!\n | |
@@ -709,11 +702,10 b' Multiple writes + flush' | |||||
709 | o> read(1) -> 1: 0 |
|
702 | o> read(1) -> 1: 0 | |
710 | result: 0 |
|
703 | result: 0 | |
711 | remote output: |
|
704 | remote output: | |
712 |
e> read(-1) -> |
|
705 | e> read(-1) -> 161: | |
713 | e> adding changesets\n |
|
706 | e> adding changesets\n | |
714 | e> adding manifests\n |
|
707 | e> adding manifests\n | |
715 | e> adding file changes\n |
|
708 | e> adding file changes\n | |
716 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
717 | e> ui.write 1st\n |
|
709 | e> ui.write 1st\n | |
718 | e> ui.write 2nd\n |
|
710 | e> ui.write 2nd\n | |
719 | e> transaction abort!\n |
|
711 | e> transaction abort!\n | |
@@ -780,11 +772,10 b' ui.write() + ui.write_err() output is ca' | |||||
780 | o> read(1) -> 1: 0 |
|
772 | o> read(1) -> 1: 0 | |
781 | result: 0 |
|
773 | result: 0 | |
782 | remote output: |
|
774 | remote output: | |
783 |
e> read(-1) -> |
|
775 | e> read(-1) -> 187: | |
784 | e> adding changesets\n |
|
776 | e> adding changesets\n | |
785 | e> adding manifests\n |
|
777 | e> adding manifests\n | |
786 | e> adding file changes\n |
|
778 | e> adding file changes\n | |
787 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
788 | e> ui.write 1\n |
|
779 | e> ui.write 1\n | |
789 | e> ui.write_err 1\n |
|
780 | e> ui.write_err 1\n | |
790 | e> ui.write 2\n |
|
781 | e> ui.write 2\n | |
@@ -839,11 +830,10 b' ui.write() + ui.write_err() output is ca' | |||||
839 | o> read(1) -> 1: 0 |
|
830 | o> read(1) -> 1: 0 | |
840 | result: 0 |
|
831 | result: 0 | |
841 | remote output: |
|
832 | remote output: | |
842 |
e> read(-1) -> |
|
833 | e> read(-1) -> 187: | |
843 | e> adding changesets\n |
|
834 | e> adding changesets\n | |
844 | e> adding manifests\n |
|
835 | e> adding manifests\n | |
845 | e> adding file changes\n |
|
836 | e> adding file changes\n | |
846 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
847 | e> ui.write 1\n |
|
837 | e> ui.write 1\n | |
848 | e> ui.write_err 1\n |
|
838 | e> ui.write_err 1\n | |
849 | e> ui.write 2\n |
|
839 | e> ui.write 2\n | |
@@ -912,11 +902,10 b' print() output is captured' | |||||
912 | o> read(1) -> 1: 0 |
|
902 | o> read(1) -> 1: 0 | |
913 | result: 0 |
|
903 | result: 0 | |
914 | remote output: |
|
904 | remote output: | |
915 |
e> read(-1) -> 1 |
|
905 | e> read(-1) -> 148: | |
916 | e> adding changesets\n |
|
906 | e> adding changesets\n | |
917 | e> adding manifests\n |
|
907 | e> adding manifests\n | |
918 | e> adding file changes\n |
|
908 | e> adding file changes\n | |
919 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
920 | e> printed line\n |
|
909 | e> printed line\n | |
921 | e> transaction abort!\n |
|
910 | e> transaction abort!\n | |
922 | e> rollback completed\n |
|
911 | e> rollback completed\n | |
@@ -968,11 +957,10 b' print() output is captured' | |||||
968 | o> read(1) -> 1: 0 |
|
957 | o> read(1) -> 1: 0 | |
969 | result: 0 |
|
958 | result: 0 | |
970 | remote output: |
|
959 | remote output: | |
971 |
e> read(-1) -> 1 |
|
960 | e> read(-1) -> 148: | |
972 | e> adding changesets\n |
|
961 | e> adding changesets\n | |
973 | e> adding manifests\n |
|
962 | e> adding manifests\n | |
974 | e> adding file changes\n |
|
963 | e> adding file changes\n | |
975 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
976 | e> printed line\n |
|
964 | e> printed line\n | |
977 | e> transaction abort!\n |
|
965 | e> transaction abort!\n | |
978 | e> rollback completed\n |
|
966 | e> rollback completed\n | |
@@ -1038,11 +1026,10 b' Mixed print() and ui.write() are both ca' | |||||
1038 | o> read(1) -> 1: 0 |
|
1026 | o> read(1) -> 1: 0 | |
1039 | result: 0 |
|
1027 | result: 0 | |
1040 | remote output: |
|
1028 | remote output: | |
1041 |
e> read(-1) -> |
|
1029 | e> read(-1) -> 173: | |
1042 | e> adding changesets\n |
|
1030 | e> adding changesets\n | |
1043 | e> adding manifests\n |
|
1031 | e> adding manifests\n | |
1044 | e> adding file changes\n |
|
1032 | e> adding file changes\n | |
1045 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
1046 | e> print 1\n |
|
1033 | e> print 1\n | |
1047 | e> ui.write 1\n |
|
1034 | e> ui.write 1\n | |
1048 | e> print 2\n |
|
1035 | e> print 2\n | |
@@ -1097,11 +1084,10 b' Mixed print() and ui.write() are both ca' | |||||
1097 | o> read(1) -> 1: 0 |
|
1084 | o> read(1) -> 1: 0 | |
1098 | result: 0 |
|
1085 | result: 0 | |
1099 | remote output: |
|
1086 | remote output: | |
1100 |
e> read(-1) -> |
|
1087 | e> read(-1) -> 173: | |
1101 | e> adding changesets\n |
|
1088 | e> adding changesets\n | |
1102 | e> adding manifests\n |
|
1089 | e> adding manifests\n | |
1103 | e> adding file changes\n |
|
1090 | e> adding file changes\n | |
1104 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
1105 | e> print 1\n |
|
1091 | e> print 1\n | |
1106 | e> ui.write 1\n |
|
1092 | e> ui.write 1\n | |
1107 | e> print 2\n |
|
1093 | e> print 2\n | |
@@ -1170,11 +1156,10 b' print() to stdout and stderr both get ca' | |||||
1170 | o> read(1) -> 1: 0 |
|
1156 | o> read(1) -> 1: 0 | |
1171 | result: 0 |
|
1157 | result: 0 | |
1172 | remote output: |
|
1158 | remote output: | |
1173 |
e> read(-1) -> |
|
1159 | e> read(-1) -> 171: | |
1174 | e> adding changesets\n |
|
1160 | e> adding changesets\n | |
1175 | e> adding manifests\n |
|
1161 | e> adding manifests\n | |
1176 | e> adding file changes\n |
|
1162 | e> adding file changes\n | |
1177 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
1178 | e> stdout 1\n |
|
1163 | e> stdout 1\n | |
1179 | e> stderr 1\n |
|
1164 | e> stderr 1\n | |
1180 | e> stdout 2\n |
|
1165 | e> stdout 2\n | |
@@ -1229,11 +1214,10 b' print() to stdout and stderr both get ca' | |||||
1229 | o> read(1) -> 1: 0 |
|
1214 | o> read(1) -> 1: 0 | |
1230 | result: 0 |
|
1215 | result: 0 | |
1231 | remote output: |
|
1216 | remote output: | |
1232 |
e> read(-1) -> |
|
1217 | e> read(-1) -> 171: | |
1233 | e> adding changesets\n |
|
1218 | e> adding changesets\n | |
1234 | e> adding manifests\n |
|
1219 | e> adding manifests\n | |
1235 | e> adding file changes\n |
|
1220 | e> adding file changes\n | |
1236 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
1237 | e> stdout 1\n |
|
1221 | e> stdout 1\n | |
1238 | e> stderr 1\n |
|
1222 | e> stderr 1\n | |
1239 | e> stdout 2\n |
|
1223 | e> stdout 2\n | |
@@ -1308,11 +1292,10 b' Shell hook writing to stdout has output ' | |||||
1308 | o> read(1) -> 1: 0 |
|
1292 | o> read(1) -> 1: 0 | |
1309 | result: 0 |
|
1293 | result: 0 | |
1310 | remote output: |
|
1294 | remote output: | |
1311 |
e> read(-1) -> |
|
1295 | e> read(-1) -> 167: | |
1312 | e> adding changesets\n |
|
1296 | e> adding changesets\n | |
1313 | e> adding manifests\n |
|
1297 | e> adding manifests\n | |
1314 | e> adding file changes\n |
|
1298 | e> adding file changes\n | |
1315 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
1316 | e> stdout 1\n |
|
1299 | e> stdout 1\n | |
1317 | e> stdout 2\n |
|
1300 | e> stdout 2\n | |
1318 | e> transaction abort!\n |
|
1301 | e> transaction abort!\n | |
@@ -1365,11 +1348,10 b' Shell hook writing to stdout has output ' | |||||
1365 | o> read(1) -> 1: 0 |
|
1348 | o> read(1) -> 1: 0 | |
1366 | result: 0 |
|
1349 | result: 0 | |
1367 | remote output: |
|
1350 | remote output: | |
1368 |
e> read(-1) -> |
|
1351 | e> read(-1) -> 167: | |
1369 | e> adding changesets\n |
|
1352 | e> adding changesets\n | |
1370 | e> adding manifests\n |
|
1353 | e> adding manifests\n | |
1371 | e> adding file changes\n |
|
1354 | e> adding file changes\n | |
1372 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
1373 | e> stdout 1\n |
|
1355 | e> stdout 1\n | |
1374 | e> stdout 2\n |
|
1356 | e> stdout 2\n | |
1375 | e> transaction abort!\n |
|
1357 | e> transaction abort!\n | |
@@ -1437,11 +1419,10 b' Shell hook writing to stderr has output ' | |||||
1437 | o> read(1) -> 1: 0 |
|
1419 | o> read(1) -> 1: 0 | |
1438 | result: 0 |
|
1420 | result: 0 | |
1439 | remote output: |
|
1421 | remote output: | |
1440 |
e> read(-1) -> |
|
1422 | e> read(-1) -> 167: | |
1441 | e> adding changesets\n |
|
1423 | e> adding changesets\n | |
1442 | e> adding manifests\n |
|
1424 | e> adding manifests\n | |
1443 | e> adding file changes\n |
|
1425 | e> adding file changes\n | |
1444 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
1445 | e> stderr 1\n |
|
1426 | e> stderr 1\n | |
1446 | e> stderr 2\n |
|
1427 | e> stderr 2\n | |
1447 | e> transaction abort!\n |
|
1428 | e> transaction abort!\n | |
@@ -1494,11 +1475,10 b' Shell hook writing to stderr has output ' | |||||
1494 | o> read(1) -> 1: 0 |
|
1475 | o> read(1) -> 1: 0 | |
1495 | result: 0 |
|
1476 | result: 0 | |
1496 | remote output: |
|
1477 | remote output: | |
1497 |
e> read(-1) -> |
|
1478 | e> read(-1) -> 167: | |
1498 | e> adding changesets\n |
|
1479 | e> adding changesets\n | |
1499 | e> adding manifests\n |
|
1480 | e> adding manifests\n | |
1500 | e> adding file changes\n |
|
1481 | e> adding file changes\n | |
1501 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
1502 | e> stderr 1\n |
|
1482 | e> stderr 1\n | |
1503 | e> stderr 2\n |
|
1483 | e> stderr 2\n | |
1504 | e> transaction abort!\n |
|
1484 | e> transaction abort!\n | |
@@ -1568,11 +1548,10 b' Shell hook writing to stdout and stderr ' | |||||
1568 | o> read(1) -> 1: 0 |
|
1548 | o> read(1) -> 1: 0 | |
1569 | result: 0 |
|
1549 | result: 0 | |
1570 | remote output: |
|
1550 | remote output: | |
1571 |
e> read(-1) -> |
|
1551 | e> read(-1) -> 185: | |
1572 | e> adding changesets\n |
|
1552 | e> adding changesets\n | |
1573 | e> adding manifests\n |
|
1553 | e> adding manifests\n | |
1574 | e> adding file changes\n |
|
1554 | e> adding file changes\n | |
1575 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
1576 | e> stdout 1\n |
|
1555 | e> stdout 1\n | |
1577 | e> stderr 1\n |
|
1556 | e> stderr 1\n | |
1578 | e> stdout 2\n |
|
1557 | e> stdout 2\n | |
@@ -1627,11 +1606,10 b' Shell hook writing to stdout and stderr ' | |||||
1627 | o> read(1) -> 1: 0 |
|
1606 | o> read(1) -> 1: 0 | |
1628 | result: 0 |
|
1607 | result: 0 | |
1629 | remote output: |
|
1608 | remote output: | |
1630 |
e> read(-1) -> |
|
1609 | e> read(-1) -> 185: | |
1631 | e> adding changesets\n |
|
1610 | e> adding changesets\n | |
1632 | e> adding manifests\n |
|
1611 | e> adding manifests\n | |
1633 | e> adding file changes\n |
|
1612 | e> adding file changes\n | |
1634 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
1635 | e> stdout 1\n |
|
1613 | e> stdout 1\n | |
1636 | e> stderr 1\n |
|
1614 | e> stderr 1\n | |
1637 | e> stdout 2\n |
|
1615 | e> stdout 2\n | |
@@ -1709,11 +1687,10 b' Shell and Python hooks writing to stdout' | |||||
1709 | o> read(1) -> 1: 0 |
|
1687 | o> read(1) -> 1: 0 | |
1710 | result: 0 |
|
1688 | result: 0 | |
1711 | remote output: |
|
1689 | remote output: | |
1712 |
e> read(-1) -> 2 |
|
1690 | e> read(-1) -> 228: | |
1713 | e> adding changesets\n |
|
1691 | e> adding changesets\n | |
1714 | e> adding manifests\n |
|
1692 | e> adding manifests\n | |
1715 | e> adding file changes\n |
|
1693 | e> adding file changes\n | |
1716 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
1717 | e> shell stdout 1\n |
|
1694 | e> shell stdout 1\n | |
1718 | e> shell stderr 1\n |
|
1695 | e> shell stderr 1\n | |
1719 | e> shell stdout 2\n |
|
1696 | e> shell stdout 2\n | |
@@ -1772,11 +1749,10 b' Shell and Python hooks writing to stdout' | |||||
1772 | o> read(1) -> 1: 0 |
|
1749 | o> read(1) -> 1: 0 | |
1773 | result: 0 |
|
1750 | result: 0 | |
1774 | remote output: |
|
1751 | remote output: | |
1775 |
e> read(-1) -> 2 |
|
1752 | e> read(-1) -> 228: | |
1776 | e> adding changesets\n |
|
1753 | e> adding changesets\n | |
1777 | e> adding manifests\n |
|
1754 | e> adding manifests\n | |
1778 | e> adding file changes\n |
|
1755 | e> adding file changes\n | |
1779 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
1780 | e> shell stdout 1\n |
|
1756 | e> shell stdout 1\n | |
1781 | e> shell stderr 1\n |
|
1757 | e> shell stderr 1\n | |
1782 | e> shell stdout 2\n |
|
1758 | e> shell stdout 2\n | |
@@ -1983,11 +1959,11 b' Pushing a bundle1 with ui.write() and ui' | |||||
1983 | e> adding changesets\n |
|
1959 | e> adding changesets\n | |
1984 | e> adding manifests\n |
|
1960 | e> adding manifests\n | |
1985 | e> adding file changes\n |
|
1961 | e> adding file changes\n | |
1986 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
1987 | e> ui.write 1\n |
|
1962 | e> ui.write 1\n | |
1988 | e> ui.write_err 1\n |
|
1963 | e> ui.write_err 1\n | |
1989 | e> ui.write 2\n |
|
1964 | e> ui.write 2\n | |
1990 | e> ui.write_err 2\n |
|
1965 | e> ui.write_err 2\n | |
|
1966 | e> added 1 changesets with 1 changes to 1 files\n | |||
1991 |
|
1967 | |||
1992 | testing ssh2 |
|
1968 | testing ssh2 | |
1993 | creating ssh peer from handshake results |
|
1969 | creating ssh peer from handshake results | |
@@ -2039,8 +2015,8 b' Pushing a bundle1 with ui.write() and ui' | |||||
2039 | e> adding changesets\n |
|
2015 | e> adding changesets\n | |
2040 | e> adding manifests\n |
|
2016 | e> adding manifests\n | |
2041 | e> adding file changes\n |
|
2017 | e> adding file changes\n | |
2042 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
2043 | e> ui.write 1\n |
|
2018 | e> ui.write 1\n | |
2044 | e> ui.write_err 1\n |
|
2019 | e> ui.write_err 1\n | |
2045 | e> ui.write 2\n |
|
2020 | e> ui.write 2\n | |
2046 | e> ui.write_err 2\n |
|
2021 | e> ui.write_err 2\n | |
|
2022 | e> added 1 changesets with 1 changes to 1 files\n |
@@ -644,7 +644,6 b' remote hook failure is attributed to rem' | |||||
644 | remote: adding changesets |
|
644 | remote: adding changesets | |
645 | remote: adding manifests |
|
645 | remote: adding manifests | |
646 | remote: adding file changes |
|
646 | remote: adding file changes | |
647 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
648 | remote: hook failure! |
|
647 | remote: hook failure! | |
649 | remote: transaction abort! |
|
648 | remote: transaction abort! | |
650 | remote: rollback completed |
|
649 | remote: rollback completed |
@@ -362,9 +362,9 b' remote transplant with pull' | |||||
362 | adding changesets |
|
362 | adding changesets | |
363 | adding manifests |
|
363 | adding manifests | |
364 | adding file changes |
|
364 | adding file changes | |
365 | added 1 changesets with 1 changes to 1 files |
|
|||
366 | applying a53251cdf717 |
|
365 | applying a53251cdf717 | |
367 | a53251cdf717 transplanted to 8d9279348abb |
|
366 | a53251cdf717 transplanted to 8d9279348abb | |
|
367 | added 1 changesets with 1 changes to 1 files | |||
368 | $ hg log --template '{rev} {parents} {desc}\n' |
|
368 | $ hg log --template '{rev} {parents} {desc}\n' | |
369 | 2 b3 |
|
369 | 2 b3 | |
370 | 1 b1 |
|
370 | 1 b1 | |
@@ -654,9 +654,9 b' test "--merge" causing pull from source ' | |||||
654 | adding changesets |
|
654 | adding changesets | |
655 | adding manifests |
|
655 | adding manifests | |
656 | adding file changes |
|
656 | adding file changes | |
657 | added 2 changesets with 2 changes to 2 files |
|
|||
658 | applying a53251cdf717 |
|
657 | applying a53251cdf717 | |
659 | 4:a53251cdf717 merged at 4831f4dc831a |
|
658 | 4:a53251cdf717 merged at 4831f4dc831a | |
|
659 | added 2 changesets with 2 changes to 2 files | |||
660 |
|
660 | |||
661 | test interactive transplant |
|
661 | test interactive transplant | |
662 |
|
662 |
@@ -56,7 +56,6 b' push should fail' | |||||
56 | adding changesets |
|
56 | adding changesets | |
57 | adding manifests |
|
57 | adding manifests | |
58 | adding file changes |
|
58 | adding file changes | |
59 | added 2 changesets with 2 changes to 2 files |
|
|||
60 | attempt to commit or push text file(s) using CRLF line endings |
|
59 | attempt to commit or push text file(s) using CRLF line endings | |
61 | in bc2d09796734: g |
|
60 | in bc2d09796734: g | |
62 | in b1aa5cde7ff4: f |
|
61 | in b1aa5cde7ff4: f | |
@@ -265,7 +264,6 b' and now for something completely differe' | |||||
265 | adding changesets |
|
264 | adding changesets | |
266 | adding manifests |
|
265 | adding manifests | |
267 | adding file changes |
|
266 | adding file changes | |
268 | added 3 changesets with 4 changes to 4 files |
|
|||
269 | attempt to commit or push text file(s) using CRLF line endings |
|
267 | attempt to commit or push text file(s) using CRLF line endings | |
270 | in 67ac5962ab43: d |
|
268 | in 67ac5962ab43: d | |
271 | in 68c127d1834e: b |
|
269 | in 68c127d1834e: b |
General Comments 0
You need to be logged in to leave comments.
Login now