Show More
@@ -818,18 +818,24 b' class cg2packer(cg1packer):' | |||||
818 |
|
818 | |||
819 | def deltaparent(self, revlog, rev, p1, p2, prev): |
|
819 | def deltaparent(self, revlog, rev, p1, p2, prev): | |
820 | dp = revlog.deltaparent(rev) |
|
820 | dp = revlog.deltaparent(rev) | |
821 | # Avoid sending full revisions when delta parent is null. Pick |
|
821 | if dp == nullrev and revlog.storedeltachains: | |
822 | # prev in that case. It's tempting to pick p1 in this case, as p1 |
|
822 | # Avoid sending full revisions when delta parent is null. Pick prev | |
823 | # will be smaller in the common case. However, computing a delta |
|
823 | # in that case. It's tempting to pick p1 in this case, as p1 will | |
824 | # against p1 may require resolving the raw text of p1, which could |
|
824 | # be smaller in the common case. However, computing a delta against | |
825 | # be expensive. The revlog caches should have prev cached, meaning |
|
825 | # p1 may require resolving the raw text of p1, which could be | |
826 | # less CPU for changegroup generation. There is likely room to add |
|
826 | # expensive. The revlog caches should have prev cached, meaning | |
827 | # a flag and/or config option to control this behavior. |
|
827 | # less CPU for changegroup generation. There is likely room to add | |
828 | # |
|
828 | # a flag and/or config option to control this behavior. | |
829 | # Pick prev when we can't be sure remote has the base revision. |
|
|||
830 | if dp == nullrev or (dp != p1 and dp != p2 and dp != prev): |
|
|||
831 | return prev |
|
829 | return prev | |
832 | return dp |
|
830 | elif dp == nullrev: | |
|
831 | # revlog is configured to use full snapshot for a reason, | |||
|
832 | # stick to full snapshot. | |||
|
833 | return nullrev | |||
|
834 | elif dp not in (p1, p2, prev): | |||
|
835 | # Pick prev when we can't be sure remote has the base revision. | |||
|
836 | return prev | |||
|
837 | else: | |||
|
838 | return dp | |||
833 |
|
839 | |||
834 | def builddeltaheader(self, node, p1n, p2n, basenode, linknode, flags): |
|
840 | def builddeltaheader(self, node, p1n, p2n, basenode, linknode, flags): | |
835 | # Do nothing with flags, it is implicitly 0 in cg1 and cg2 |
|
841 | # Do nothing with flags, it is implicitly 0 in cg1 and cg2 |
@@ -113,7 +113,7 b' Extension disabled for lack of a hook' | |||||
113 | adding quux/file.py revisions |
|
113 | adding quux/file.py revisions | |
114 | added 3 changesets with 3 changes to 3 files |
|
114 | added 3 changesets with 3 changes to 3 files | |
115 | updating the branch cache |
|
115 | updating the branch cache | |
116 |
bundle2-input-part: total payload size 1 |
|
116 | bundle2-input-part: total payload size 1553 | |
117 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
117 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
118 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
118 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
119 | bundle2-input-bundle: 3 parts total |
|
119 | bundle2-input-bundle: 3 parts total | |
@@ -178,7 +178,7 b' Extension disabled for lack of acl.sourc' | |||||
178 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
178 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
179 | acl: changes have source "push" - skipping |
|
179 | acl: changes have source "push" - skipping | |
180 | updating the branch cache |
|
180 | updating the branch cache | |
181 |
bundle2-input-part: total payload size 1 |
|
181 | bundle2-input-part: total payload size 1553 | |
182 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
182 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
183 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
183 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
184 | bundle2-input-bundle: 3 parts total |
|
184 | bundle2-input-bundle: 3 parts total | |
@@ -254,7 +254,7 b' No [acl.allow]/[acl.deny]' | |||||
254 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
254 | acl: branch access granted: "911600dab2ae" on branch "default" | |
255 | acl: path access granted: "911600dab2ae" |
|
255 | acl: path access granted: "911600dab2ae" | |
256 | updating the branch cache |
|
256 | updating the branch cache | |
257 |
bundle2-input-part: total payload size 1 |
|
257 | bundle2-input-part: total payload size 1553 | |
258 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
258 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
259 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
259 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
260 | bundle2-input-bundle: 3 parts total |
|
260 | bundle2-input-bundle: 3 parts total | |
@@ -325,7 +325,7 b' Empty [acl.allow]' | |||||
325 | acl: acl.deny not enabled |
|
325 | acl: acl.deny not enabled | |
326 | acl: branch access granted: "ef1ea85a6374" on branch "default" |
|
326 | acl: branch access granted: "ef1ea85a6374" on branch "default" | |
327 | error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") |
|
327 | error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") | |
328 |
bundle2-input-part: total payload size 1 |
|
328 | bundle2-input-part: total payload size 1553 | |
329 | bundle2-input-bundle: 3 parts total |
|
329 | bundle2-input-bundle: 3 parts total | |
330 | transaction abort! |
|
330 | transaction abort! | |
331 | rollback completed |
|
331 | rollback completed | |
@@ -394,7 +394,7 b' fred is allowed inside foo/' | |||||
394 | acl: path access granted: "f9cafe1212c8" |
|
394 | acl: path access granted: "f9cafe1212c8" | |
395 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
395 | acl: branch access granted: "911600dab2ae" on branch "default" | |
396 | error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae") |
|
396 | error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae") | |
397 |
bundle2-input-part: total payload size 1 |
|
397 | bundle2-input-part: total payload size 1553 | |
398 | bundle2-input-bundle: 3 parts total |
|
398 | bundle2-input-bundle: 3 parts total | |
399 | transaction abort! |
|
399 | transaction abort! | |
400 | rollback completed |
|
400 | rollback completed | |
@@ -460,7 +460,7 b' Empty [acl.deny]' | |||||
460 | acl: acl.deny enabled, 0 entries for user barney |
|
460 | acl: acl.deny enabled, 0 entries for user barney | |
461 | acl: branch access granted: "ef1ea85a6374" on branch "default" |
|
461 | acl: branch access granted: "ef1ea85a6374" on branch "default" | |
462 | error: pretxnchangegroup.acl hook failed: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") |
|
462 | error: pretxnchangegroup.acl hook failed: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") | |
463 |
bundle2-input-part: total payload size 1 |
|
463 | bundle2-input-part: total payload size 1553 | |
464 | bundle2-input-bundle: 3 parts total |
|
464 | bundle2-input-bundle: 3 parts total | |
465 | transaction abort! |
|
465 | transaction abort! | |
466 | rollback completed |
|
466 | rollback completed | |
@@ -531,7 +531,7 b' fred is allowed inside foo/, but not foo' | |||||
531 | acl: path access granted: "f9cafe1212c8" |
|
531 | acl: path access granted: "f9cafe1212c8" | |
532 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
532 | acl: branch access granted: "911600dab2ae" on branch "default" | |
533 | error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae") |
|
533 | error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "quux/file.py" (changeset "911600dab2ae") | |
534 |
bundle2-input-part: total payload size 1 |
|
534 | bundle2-input-part: total payload size 1553 | |
535 | bundle2-input-bundle: 3 parts total |
|
535 | bundle2-input-bundle: 3 parts total | |
536 | transaction abort! |
|
536 | transaction abort! | |
537 | rollback completed |
|
537 | rollback completed | |
@@ -601,7 +601,7 b' fred is allowed inside foo/, but not foo' | |||||
601 | acl: path access granted: "ef1ea85a6374" |
|
601 | acl: path access granted: "ef1ea85a6374" | |
602 | acl: branch access granted: "f9cafe1212c8" on branch "default" |
|
602 | acl: branch access granted: "f9cafe1212c8" on branch "default" | |
603 | error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") |
|
603 | error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") | |
604 |
bundle2-input-part: total payload size 1 |
|
604 | bundle2-input-part: total payload size 1553 | |
605 | bundle2-input-bundle: 3 parts total |
|
605 | bundle2-input-bundle: 3 parts total | |
606 | transaction abort! |
|
606 | transaction abort! | |
607 | rollback completed |
|
607 | rollback completed | |
@@ -668,7 +668,7 b' fred is allowed inside foo/, but not foo' | |||||
668 | acl: acl.deny enabled, 0 entries for user barney |
|
668 | acl: acl.deny enabled, 0 entries for user barney | |
669 | acl: branch access granted: "ef1ea85a6374" on branch "default" |
|
669 | acl: branch access granted: "ef1ea85a6374" on branch "default" | |
670 | error: pretxnchangegroup.acl hook failed: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") |
|
670 | error: pretxnchangegroup.acl hook failed: acl: user "barney" not allowed on "foo/file.txt" (changeset "ef1ea85a6374") | |
671 |
bundle2-input-part: total payload size 1 |
|
671 | bundle2-input-part: total payload size 1553 | |
672 | bundle2-input-bundle: 3 parts total |
|
672 | bundle2-input-bundle: 3 parts total | |
673 | transaction abort! |
|
673 | transaction abort! | |
674 | rollback completed |
|
674 | rollback completed | |
@@ -744,7 +744,7 b' barney is allowed everywhere' | |||||
744 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
744 | acl: branch access granted: "911600dab2ae" on branch "default" | |
745 | acl: path access granted: "911600dab2ae" |
|
745 | acl: path access granted: "911600dab2ae" | |
746 | updating the branch cache |
|
746 | updating the branch cache | |
747 |
bundle2-input-part: total payload size 1 |
|
747 | bundle2-input-part: total payload size 1553 | |
748 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
748 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
749 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
749 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
750 | bundle2-input-bundle: 3 parts total |
|
750 | bundle2-input-bundle: 3 parts total | |
@@ -826,7 +826,7 b' wilma can change files with a .txt exten' | |||||
826 | acl: path access granted: "f9cafe1212c8" |
|
826 | acl: path access granted: "f9cafe1212c8" | |
827 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
827 | acl: branch access granted: "911600dab2ae" on branch "default" | |
828 | error: pretxnchangegroup.acl hook failed: acl: user "wilma" not allowed on "quux/file.py" (changeset "911600dab2ae") |
|
828 | error: pretxnchangegroup.acl hook failed: acl: user "wilma" not allowed on "quux/file.py" (changeset "911600dab2ae") | |
829 |
bundle2-input-part: total payload size 1 |
|
829 | bundle2-input-part: total payload size 1553 | |
830 | bundle2-input-bundle: 3 parts total |
|
830 | bundle2-input-bundle: 3 parts total | |
831 | transaction abort! |
|
831 | transaction abort! | |
832 | rollback completed |
|
832 | rollback completed | |
@@ -895,7 +895,7 b' file specified by acl.config does not ex' | |||||
895 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
895 | calling hook pretxnchangegroup.acl: hgext.acl.hook | |
896 | acl: checking access for user "barney" |
|
896 | acl: checking access for user "barney" | |
897 | error: pretxnchangegroup.acl hook raised an exception: [Errno 2] No such file or directory: '../acl.config' |
|
897 | error: pretxnchangegroup.acl hook raised an exception: [Errno 2] No such file or directory: '../acl.config' | |
898 |
bundle2-input-part: total payload size 1 |
|
898 | bundle2-input-part: total payload size 1553 | |
899 | bundle2-input-bundle: 3 parts total |
|
899 | bundle2-input-bundle: 3 parts total | |
900 | transaction abort! |
|
900 | transaction abort! | |
901 | rollback completed |
|
901 | rollback completed | |
@@ -977,7 +977,7 b' betty is allowed inside foo/ by a acl.co' | |||||
977 | acl: path access granted: "f9cafe1212c8" |
|
977 | acl: path access granted: "f9cafe1212c8" | |
978 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
978 | acl: branch access granted: "911600dab2ae" on branch "default" | |
979 | error: pretxnchangegroup.acl hook failed: acl: user "betty" not allowed on "quux/file.py" (changeset "911600dab2ae") |
|
979 | error: pretxnchangegroup.acl hook failed: acl: user "betty" not allowed on "quux/file.py" (changeset "911600dab2ae") | |
980 |
bundle2-input-part: total payload size 1 |
|
980 | bundle2-input-part: total payload size 1553 | |
981 | bundle2-input-bundle: 3 parts total |
|
981 | bundle2-input-bundle: 3 parts total | |
982 | transaction abort! |
|
982 | transaction abort! | |
983 | rollback completed |
|
983 | rollback completed | |
@@ -1062,7 +1062,7 b' acl.config can set only [acl.allow]/[acl' | |||||
1062 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
1062 | acl: branch access granted: "911600dab2ae" on branch "default" | |
1063 | acl: path access granted: "911600dab2ae" |
|
1063 | acl: path access granted: "911600dab2ae" | |
1064 | updating the branch cache |
|
1064 | updating the branch cache | |
1065 |
bundle2-input-part: total payload size 1 |
|
1065 | bundle2-input-part: total payload size 1553 | |
1066 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1066 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
1067 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
1067 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
1068 | bundle2-input-bundle: 3 parts total |
|
1068 | bundle2-input-bundle: 3 parts total | |
@@ -1148,7 +1148,7 b' fred is always allowed' | |||||
1148 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
1148 | acl: branch access granted: "911600dab2ae" on branch "default" | |
1149 | acl: path access granted: "911600dab2ae" |
|
1149 | acl: path access granted: "911600dab2ae" | |
1150 | updating the branch cache |
|
1150 | updating the branch cache | |
1151 |
bundle2-input-part: total payload size 1 |
|
1151 | bundle2-input-part: total payload size 1553 | |
1152 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1152 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
1153 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
1153 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
1154 | bundle2-input-bundle: 3 parts total |
|
1154 | bundle2-input-bundle: 3 parts total | |
@@ -1227,7 +1227,7 b' no one is allowed inside foo/Bar/' | |||||
1227 | acl: path access granted: "ef1ea85a6374" |
|
1227 | acl: path access granted: "ef1ea85a6374" | |
1228 | acl: branch access granted: "f9cafe1212c8" on branch "default" |
|
1228 | acl: branch access granted: "f9cafe1212c8" on branch "default" | |
1229 | error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") |
|
1229 | error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") | |
1230 |
bundle2-input-part: total payload size 1 |
|
1230 | bundle2-input-part: total payload size 1553 | |
1231 | bundle2-input-bundle: 3 parts total |
|
1231 | bundle2-input-bundle: 3 parts total | |
1232 | transaction abort! |
|
1232 | transaction abort! | |
1233 | rollback completed |
|
1233 | rollback completed | |
@@ -1307,7 +1307,7 b' OS-level groups' | |||||
1307 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
1307 | acl: branch access granted: "911600dab2ae" on branch "default" | |
1308 | acl: path access granted: "911600dab2ae" |
|
1308 | acl: path access granted: "911600dab2ae" | |
1309 | updating the branch cache |
|
1309 | updating the branch cache | |
1310 |
bundle2-input-part: total payload size 1 |
|
1310 | bundle2-input-part: total payload size 1553 | |
1311 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1311 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
1312 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
1312 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
1313 | bundle2-input-bundle: 3 parts total |
|
1313 | bundle2-input-bundle: 3 parts total | |
@@ -1388,7 +1388,7 b' OS-level groups' | |||||
1388 | acl: path access granted: "ef1ea85a6374" |
|
1388 | acl: path access granted: "ef1ea85a6374" | |
1389 | acl: branch access granted: "f9cafe1212c8" on branch "default" |
|
1389 | acl: branch access granted: "f9cafe1212c8" on branch "default" | |
1390 | error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") |
|
1390 | error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8") | |
1391 |
bundle2-input-part: total payload size 1 |
|
1391 | bundle2-input-part: total payload size 1553 | |
1392 | bundle2-input-bundle: 3 parts total |
|
1392 | bundle2-input-bundle: 3 parts total | |
1393 | transaction abort! |
|
1393 | transaction abort! | |
1394 | rollback completed |
|
1394 | rollback completed | |
@@ -1509,7 +1509,7 b' No branch acls specified' | |||||
1509 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" |
|
1509 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" | |
1510 | acl: path access granted: "e8fc755d4d82" |
|
1510 | acl: path access granted: "e8fc755d4d82" | |
1511 | updating the branch cache |
|
1511 | updating the branch cache | |
1512 |
bundle2-input-part: total payload size 2 |
|
1512 | bundle2-input-part: total payload size 2068 | |
1513 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1513 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
1514 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
1514 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
1515 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1515 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
@@ -1595,7 +1595,7 b' Branch acl deny test' | |||||
1595 | acl: branch access granted: "911600dab2ae" on branch "default" |
|
1595 | acl: branch access granted: "911600dab2ae" on branch "default" | |
1596 | acl: path access granted: "911600dab2ae" |
|
1596 | acl: path access granted: "911600dab2ae" | |
1597 | error: pretxnchangegroup.acl hook failed: acl: user "astro" denied on branch "foobar" (changeset "e8fc755d4d82") |
|
1597 | error: pretxnchangegroup.acl hook failed: acl: user "astro" denied on branch "foobar" (changeset "e8fc755d4d82") | |
1598 |
bundle2-input-part: total payload size 2 |
|
1598 | bundle2-input-part: total payload size 2068 | |
1599 | bundle2-input-bundle: 4 parts total |
|
1599 | bundle2-input-bundle: 4 parts total | |
1600 | transaction abort! |
|
1600 | transaction abort! | |
1601 | rollback completed |
|
1601 | rollback completed | |
@@ -1663,7 +1663,7 b' Branch acl empty allow test' | |||||
1663 | acl: acl.allow not enabled |
|
1663 | acl: acl.allow not enabled | |
1664 | acl: acl.deny not enabled |
|
1664 | acl: acl.deny not enabled | |
1665 | error: pretxnchangegroup.acl hook failed: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374") |
|
1665 | error: pretxnchangegroup.acl hook failed: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374") | |
1666 |
bundle2-input-part: total payload size 2 |
|
1666 | bundle2-input-part: total payload size 2068 | |
1667 | bundle2-input-bundle: 4 parts total |
|
1667 | bundle2-input-bundle: 4 parts total | |
1668 | transaction abort! |
|
1668 | transaction abort! | |
1669 | rollback completed |
|
1669 | rollback completed | |
@@ -1733,7 +1733,7 b' Branch acl allow other' | |||||
1733 | acl: acl.allow not enabled |
|
1733 | acl: acl.allow not enabled | |
1734 | acl: acl.deny not enabled |
|
1734 | acl: acl.deny not enabled | |
1735 | error: pretxnchangegroup.acl hook failed: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374") |
|
1735 | error: pretxnchangegroup.acl hook failed: acl: user "astro" not allowed on branch "default" (changeset "ef1ea85a6374") | |
1736 |
bundle2-input-part: total payload size 2 |
|
1736 | bundle2-input-part: total payload size 2068 | |
1737 | bundle2-input-bundle: 4 parts total |
|
1737 | bundle2-input-bundle: 4 parts total | |
1738 | transaction abort! |
|
1738 | transaction abort! | |
1739 | rollback completed |
|
1739 | rollback completed | |
@@ -1805,7 +1805,7 b' Branch acl allow other' | |||||
1805 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" |
|
1805 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" | |
1806 | acl: path access granted: "e8fc755d4d82" |
|
1806 | acl: path access granted: "e8fc755d4d82" | |
1807 | updating the branch cache |
|
1807 | updating the branch cache | |
1808 |
bundle2-input-part: total payload size 2 |
|
1808 | bundle2-input-part: total payload size 2068 | |
1809 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1809 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
1810 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
1810 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
1811 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1811 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
@@ -1898,7 +1898,7 b' push foobar into the remote' | |||||
1898 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" |
|
1898 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" | |
1899 | acl: path access granted: "e8fc755d4d82" |
|
1899 | acl: path access granted: "e8fc755d4d82" | |
1900 | updating the branch cache |
|
1900 | updating the branch cache | |
1901 |
bundle2-input-part: total payload size 2 |
|
1901 | bundle2-input-part: total payload size 2068 | |
1902 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1902 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
1903 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
1903 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
1904 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
1904 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
@@ -1982,7 +1982,7 b' Branch acl conflicting deny' | |||||
1982 | acl: acl.allow not enabled |
|
1982 | acl: acl.allow not enabled | |
1983 | acl: acl.deny not enabled |
|
1983 | acl: acl.deny not enabled | |
1984 | error: pretxnchangegroup.acl hook failed: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374") |
|
1984 | error: pretxnchangegroup.acl hook failed: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374") | |
1985 |
bundle2-input-part: total payload size 2 |
|
1985 | bundle2-input-part: total payload size 2068 | |
1986 | bundle2-input-bundle: 4 parts total |
|
1986 | bundle2-input-bundle: 4 parts total | |
1987 | transaction abort! |
|
1987 | transaction abort! | |
1988 | rollback completed |
|
1988 | rollback completed | |
@@ -2059,7 +2059,7 b" User 'astro' must not be denied" | |||||
2059 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" |
|
2059 | acl: branch access granted: "e8fc755d4d82" on branch "foobar" | |
2060 | acl: path access granted: "e8fc755d4d82" |
|
2060 | acl: path access granted: "e8fc755d4d82" | |
2061 | updating the branch cache |
|
2061 | updating the branch cache | |
2062 |
bundle2-input-part: total payload size 2 |
|
2062 | bundle2-input-part: total payload size 2068 | |
2063 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
2063 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
2064 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" |
|
2064 | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | |
2065 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported |
|
2065 | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | |
@@ -2137,7 +2137,7 b' Non-astro users must be denied' | |||||
2137 | acl: acl.allow not enabled |
|
2137 | acl: acl.allow not enabled | |
2138 | acl: acl.deny not enabled |
|
2138 | acl: acl.deny not enabled | |
2139 | error: pretxnchangegroup.acl hook failed: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374") |
|
2139 | error: pretxnchangegroup.acl hook failed: acl: user "george" denied on branch "default" (changeset "ef1ea85a6374") | |
2140 |
bundle2-input-part: total payload size 2 |
|
2140 | bundle2-input-part: total payload size 2068 | |
2141 | bundle2-input-bundle: 4 parts total |
|
2141 | bundle2-input-bundle: 4 parts total | |
2142 | transaction abort! |
|
2142 | transaction abort! | |
2143 | rollback completed |
|
2143 | rollback completed |
@@ -156,34 +156,32 b' changes, clone bundles produced by new M' | |||||
156 | by old clients. |
|
156 | by old clients. | |
157 |
|
157 | |||
158 | $ f --size --hexdump full.hg |
|
158 | $ f --size --hexdump full.hg | |
159 |
full.hg: size= |
|
159 | full.hg: size=396 | |
160 | 0000: 48 47 32 30 00 00 00 0e 43 6f 6d 70 72 65 73 73 |HG20....Compress| |
|
160 | 0000: 48 47 32 30 00 00 00 0e 43 6f 6d 70 72 65 73 73 |HG20....Compress| | |
161 | 0010: 69 6f 6e 3d 47 5a 78 9c 63 60 60 d0 e4 76 f6 70 |ion=GZx.c``..v.p| |
|
161 | 0010: 69 6f 6e 3d 47 5a 78 9c 63 60 60 d0 e4 76 f6 70 |ion=GZx.c``..v.p| | |
162 | 0020: f4 73 77 75 0f f2 0f 0d 60 00 02 46 46 76 26 4e |.swu....`..FFv&N| |
|
162 | 0020: f4 73 77 75 0f f2 0f 0d 60 00 02 46 46 76 26 4e |.swu....`..FFv&N| | |
163 | 0030: c6 b2 d4 a2 e2 cc fc 3c 03 a3 bc a4 e4 8c c4 bc |.......<........| |
|
163 | 0030: c6 b2 d4 a2 e2 cc fc 3c 03 a3 bc a4 e4 8c c4 bc |.......<........| | |
164 |
0040: f4 d4 62 23 06 06 e6 |
|
164 | 0040: f4 d4 62 23 06 06 e6 19 40 f9 4d c1 2a 31 09 cf |..b#....@.M.*1..| | |
165 | 0050: 9a 3a 52 04 b7 fc db f0 95 e5 a4 f4 97 17 b2 c9 |.:R.............| |
|
165 | 0050: 9a 3a 52 04 b7 fc db f0 95 e5 a4 f4 97 17 b2 c9 |.:R.............| | |
166 | 0060: 0c 14 00 02 e6 d9 99 25 1a a7 a4 99 a4 a4 1a 5b |.......%.......[| |
|
166 | 0060: 0c 14 00 02 e6 d9 99 25 1a a7 a4 99 a4 a4 1a 5b |.......%.......[| | |
167 | 0070: 58 a4 19 27 9b a4 59 a4 1a 59 a4 99 a4 59 26 5a |X..'..Y..Y...Y&Z| |
|
167 | 0070: 58 a4 19 27 9b a4 59 a4 1a 59 a4 99 a4 59 26 5a |X..'..Y..Y...Y&Z| | |
168 | 0080: 18 9a 18 59 5a 26 1a 27 27 25 99 a6 99 1a 70 95 |...YZ&.''%....p.| |
|
168 | 0080: 18 9a 18 59 5a 26 1a 27 27 25 99 a6 99 1a 70 95 |...YZ&.''%....p.| | |
169 | 0090: a4 16 97 70 19 28 18 70 a5 e5 e7 73 71 25 a6 a4 |...p.(.p...sq%..| |
|
169 | 0090: a4 16 97 70 19 28 18 70 a5 e5 e7 73 71 25 a6 a4 |...p.(.p...sq%..| | |
170 |
00a0: 28 00 19 |
|
170 | 00a0: 28 00 19 20 17 af fa df ab ff 7b 3f fb 92 dc 8b |(.. ......{?....| | |
171 |
00b0: |
|
171 | 00b0: 1f 62 bb 9e b7 d7 d9 87 3d 5a 44 89 2f b0 99 87 |.b......=ZD./...| | |
172 | 00c0: c3 66 1e 54 b9 26 08 a7 1a 1b 1a a7 25 1b 9a 1b |.f.T.&......%...| |
|
172 | 00c0: ec e2 54 63 43 e3 b4 64 43 73 23 33 43 53 0b 63 |..TcC..dCs#3CS.c| | |
173 | 00d0: 99 19 9a 5a 18 9b a6 18 19 00 dd 67 61 61 98 06 |...Z.......gaa..| |
|
173 | 00d0: d3 14 23 03 a0 fb 2c 2c 0c d3 80 1e 30 49 49 b1 |..#...,,....0II.| | |
174 | 00e0: f4 80 49 4a 8a 65 52 92 41 9a 81 81 a5 11 17 50 |..IJ.eR.A......P| |
|
174 | 00e0: 4c 4a 32 48 33 30 b0 34 42 b8 38 29 b1 08 e2 62 |LJ2H30.4B.8)...b| | |
175 | 00f0: 31 30 58 19 cc 80 98 25 29 b1 08 c4 37 07 79 19 |10X....%)...7.y.| |
|
175 | 00f0: 20 03 6a ca c2 2c db 2f f7 2c fa 6d fc fb 34 be | .j..,./.,.m..4.| | |
176 | 0100: 88 d9 41 ee 07 8a 41 cd 5d 98 65 fb e5 9e 45 bf |..A...A.].e...E.| |
|
176 | 0100: fc 5c 21 a2 39 cb 66 77 7c 00 0d c3 59 17 14 58 |.\!.9.fw|...Y..X| | |
177 | 0110: 8d 7f 9f c6 97 9f 2b 44 34 67 d9 ec 8e 0f a0 61 |......+D4g.....a| |
|
177 | 0110: 49 16 06 29 a9 a6 29 86 c6 16 e6 a6 16 a6 26 86 |I..)..).......&.| | |
178 | 0120: a8 eb 82 82 2e c9 c2 20 25 d5 34 c5 d0 d8 c2 dc |....... %.4.....| |
|
178 | 0120: c9 a6 69 06 a6 46 66 a6 89 29 86 26 26 89 49 96 |..i..Ff..).&&.I.| | |
179 | 0130: d4 c2 d4 c4 30 d9 34 cd c0 d4 c8 cc 34 31 c5 d0 |....0.4.....41..| |
|
179 | 0130: 69 89 16 66 29 86 29 49 5c 20 07 3e 16 fe 23 ae |i..f).)I\ .>..#.| | |
180 | 0140: c4 24 31 c9 32 2d d1 c2 2c c5 30 25 09 e4 ee 85 |.$1.2-..,.0%....| |
|
180 | 0140: 26 da 1c ab 10 1f d1 f8 e3 b3 ef cd dd fc 0c 93 |&...............| | |
181 | 0150: 8f 85 ff 88 ab 89 36 c7 2a c4 47 34 fe f8 ec 7b |......6.*.G4...{| |
|
181 | 0150: 88 75 34 36 75 04 82 55 17 14 36 a4 38 10 04 d8 |.u46u..U..6.8...| | |
182 | 0160: 73 37 3f c3 24 62 1d 8d 4d 1d 9e 40 06 3b 10 14 |s7?.$b..M..@.;..| |
|
182 | 0160: 21 01 9a b1 83 f7 e9 45 8b d2 56 c7 a3 1f 82 52 |!......E..V....R| | |
183 | 0170: 36 a4 38 10 04 d8 21 01 9a b1 83 f7 e9 45 8b d2 |6.8...!......E..| |
|
183 | 0170: d7 8a 78 ed fc d5 76 f1 36 25 81 89 c7 ad ec 90 |..x...v.6%......| | |
184 | 0180: 56 c7 a3 1f 82 52 d7 8a 78 ed fc d5 76 f1 36 25 |V....R..x...v.6%| |
|
184 | 0180: 54 47 75 2b 89 49 b1 00 d2 8a eb 92 |TGu+.I......| | |
185 | 0190: 81 89 c7 ad ec 90 34 48 75 2b 89 49 bf 00 cf 72 |......4Hu+.I...r| |
|
|||
186 | 01a0: f4 7f |..| |
|
|||
187 |
|
185 | |||
188 | $ echo "http://localhost:$HGPORT1/full.hg" > server/.hg/clonebundles.manifest |
|
186 | $ echo "http://localhost:$HGPORT1/full.hg" > server/.hg/clonebundles.manifest | |
189 | $ hg clone -U http://localhost:$HGPORT full-bundle |
|
187 | $ hg clone -U http://localhost:$HGPORT full-bundle |
@@ -120,13 +120,13 b' No changes, just a different message:' | |||||
120 | stripping amended changeset 74609c7f506e |
|
120 | stripping amended changeset 74609c7f506e | |
121 | 1 changesets found |
|
121 | 1 changesets found | |
122 | uncompressed size of bundle content: |
|
122 | uncompressed size of bundle content: | |
123 |
2 |
|
123 | 254 (changelog) | |
124 | 163 (manifests) |
|
124 | 163 (manifests) | |
125 | 129 a |
|
125 | 129 a | |
126 | saved backup bundle to $TESTTMP/.hg/strip-backup/74609c7f506e-1bfde511-amend-backup.hg (glob) |
|
126 | saved backup bundle to $TESTTMP/.hg/strip-backup/74609c7f506e-1bfde511-amend-backup.hg (glob) | |
127 | 1 changesets found |
|
127 | 1 changesets found | |
128 | uncompressed size of bundle content: |
|
128 | uncompressed size of bundle content: | |
129 |
2 |
|
129 | 250 (changelog) | |
130 | 163 (manifests) |
|
130 | 163 (manifests) | |
131 | 129 a |
|
131 | 129 a | |
132 | adding branch |
|
132 | adding branch | |
@@ -264,13 +264,13 b' then, test editing custom commit message' | |||||
264 | stripping amended changeset 5f357c7560ab |
|
264 | stripping amended changeset 5f357c7560ab | |
265 | 1 changesets found |
|
265 | 1 changesets found | |
266 | uncompressed size of bundle content: |
|
266 | uncompressed size of bundle content: | |
267 |
2 |
|
267 | 249 (changelog) | |
268 | 163 (manifests) |
|
268 | 163 (manifests) | |
269 | 131 a |
|
269 | 131 a | |
270 | saved backup bundle to $TESTTMP/.hg/strip-backup/5f357c7560ab-e7c84ade-amend-backup.hg (glob) |
|
270 | saved backup bundle to $TESTTMP/.hg/strip-backup/5f357c7560ab-e7c84ade-amend-backup.hg (glob) | |
271 | 1 changesets found |
|
271 | 1 changesets found | |
272 | uncompressed size of bundle content: |
|
272 | uncompressed size of bundle content: | |
273 |
2 |
|
273 | 257 (changelog) | |
274 | 163 (manifests) |
|
274 | 163 (manifests) | |
275 | 131 a |
|
275 | 131 a | |
276 | adding branch |
|
276 | adding branch | |
@@ -307,13 +307,13 b' Same, but with changes in working dir (d' | |||||
307 | stripping amended changeset 7ab3bf440b54 |
|
307 | stripping amended changeset 7ab3bf440b54 | |
308 | 2 changesets found |
|
308 | 2 changesets found | |
309 | uncompressed size of bundle content: |
|
309 | uncompressed size of bundle content: | |
310 |
4 |
|
310 | 464 (changelog) | |
311 | 322 (manifests) |
|
311 | 322 (manifests) | |
312 | 249 a |
|
312 | 249 a | |
313 | saved backup bundle to $TESTTMP/.hg/strip-backup/7ab3bf440b54-8e3b5088-amend-backup.hg (glob) |
|
313 | saved backup bundle to $TESTTMP/.hg/strip-backup/7ab3bf440b54-8e3b5088-amend-backup.hg (glob) | |
314 | 1 changesets found |
|
314 | 1 changesets found | |
315 | uncompressed size of bundle content: |
|
315 | uncompressed size of bundle content: | |
316 |
2 |
|
316 | 257 (changelog) | |
317 | 163 (manifests) |
|
317 | 163 (manifests) | |
318 | 133 a |
|
318 | 133 a | |
319 | adding branch |
|
319 | adding branch |
@@ -16,7 +16,7 b' Create a test repository:' | |||||
16 | $ hg bundle --base 0 --rev tip bundle2.hg -v --type none-v2 |
|
16 | $ hg bundle --base 0 --rev tip bundle2.hg -v --type none-v2 | |
17 | 2 changesets found |
|
17 | 2 changesets found | |
18 | uncompressed size of bundle content: |
|
18 | uncompressed size of bundle content: | |
19 |
3 |
|
19 | 344 (changelog) | |
20 | 322 (manifests) |
|
20 | 322 (manifests) | |
21 | 113 b |
|
21 | 113 b | |
22 | 113 c |
|
22 | 113 c | |
@@ -60,8 +60,8 b' Verbose output:' | |||||
60 | format: id, p1, p2, cset, delta base, len(delta) |
|
60 | format: id, p1, p2, cset, delta base, len(delta) | |
61 |
|
61 | |||
62 | changelog |
|
62 | changelog | |
63 |
0e067c57feba1a5694ca4844f05588bb1bf82342 3903775176ed42b1458a6281db4a0ccf4d9f287a 0000000000000000000000000000000000000000 0e067c57feba1a5694ca4844f05588bb1bf82342 |
|
63 | 0e067c57feba1a5694ca4844f05588bb1bf82342 3903775176ed42b1458a6281db4a0ccf4d9f287a 0000000000000000000000000000000000000000 0e067c57feba1a5694ca4844f05588bb1bf82342 0000000000000000000000000000000000000000 66 | |
64 |
991a3460af53952d10ec8a295d3d2cc2e5fa9690 0e067c57feba1a5694ca4844f05588bb1bf82342 0000000000000000000000000000000000000000 991a3460af53952d10ec8a295d3d2cc2e5fa9690 0 |
|
64 | 991a3460af53952d10ec8a295d3d2cc2e5fa9690 0e067c57feba1a5694ca4844f05588bb1bf82342 0000000000000000000000000000000000000000 991a3460af53952d10ec8a295d3d2cc2e5fa9690 0000000000000000000000000000000000000000 66 | |
65 |
|
65 | |||
66 | manifest |
|
66 | manifest | |
67 | 686dbf0aeca417636fa26a9121c681eabbb15a20 8515d4bfda768e04af4c13a69a72e28c7effbea7 0000000000000000000000000000000000000000 0e067c57feba1a5694ca4844f05588bb1bf82342 8515d4bfda768e04af4c13a69a72e28c7effbea7 55 |
|
67 | 686dbf0aeca417636fa26a9121c681eabbb15a20 8515d4bfda768e04af4c13a69a72e28c7effbea7 0000000000000000000000000000000000000000 0e067c57feba1a5694ca4844f05588bb1bf82342 8515d4bfda768e04af4c13a69a72e28c7effbea7 55 |
@@ -1100,7 +1100,7 b' redo pull with --lfrev and check it pull' | |||||
1100 | all local heads known remotely |
|
1100 | all local heads known remotely | |
1101 | 6 changesets found |
|
1101 | 6 changesets found | |
1102 | uncompressed size of bundle content: |
|
1102 | uncompressed size of bundle content: | |
1103 |
13 |
|
1103 | 1389 (changelog) | |
1104 | 1599 (manifests) |
|
1104 | 1599 (manifests) | |
1105 | 254 .hglf/large1 |
|
1105 | 254 .hglf/large1 | |
1106 | 564 .hglf/large3 |
|
1106 | 564 .hglf/large3 |
@@ -145,7 +145,7 b' client only pulls down 1 changeset' | |||||
145 | adding foo revisions |
|
145 | adding foo revisions | |
146 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
146 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
147 | updating the branch cache |
|
147 | updating the branch cache | |
148 |
bundle2-input-part: total payload size 47 |
|
148 | bundle2-input-part: total payload size 476 | |
149 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
|
149 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported | |
150 | bundle2-input-part: total payload size 58 |
|
150 | bundle2-input-part: total payload size 58 | |
151 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
|
151 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
@@ -352,14 +352,14 b' test bundle and description:' | |||||
352 | Content-Disposition: attachment; filename="bundle.hg" |
|
352 | Content-Disposition: attachment; filename="bundle.hg" | |
353 | Content-Transfer-Encoding: base64 |
|
353 | Content-Transfer-Encoding: base64 | |
354 |
|
354 | |||
355 |
SEcyMAAAAA5Db21wcmVzc2lvbj1CWkJaaDkxQVkmU1 |
|
355 | SEcyMAAAAA5Db21wcmVzc2lvbj1CWkJaaDkxQVkmU1nYvy2xAAAJf//7vFYQXD1/4H7R09C/470I | |
356 | Ak0E4peoSIYIgQCgGUQOcLABGY2hqoTTCYaBqaYAAACaaMAATIwAA1MIYDaQaqn6p+jRop+oJkA2 |
|
356 | Ak0E4pe4SIIIgQSgGEQOcLAA5VBKqeppMxTI0YjQNBgQMQDI0GgMhtR6I0GI2p6I0yeSEVT9MiYn | |
357 | oNqD1PU0PUBoxqaMmjMUepoBoDT1GmQNBKmlTT1GTCNMEAYTQ0NNDI0BoMQHpAZAA8o2pkyNJHfX |
|
357 | qjCYQwCBtARptARgBNDEwAGiDCMA40NGjQaNA0AAAAADIAAAA0BkABktCk6qObVxZ2A/33KHibLr | |
358 | RRbXoyxKRUlAg41B3lpmMOnr77dEpFKAvEUGEkWuC4wioiMjC2Y2a84EXhsNCFIrbXUGId07PJnS |
|
358 | UQ4BwkgcPcmuCUAQZCztIWgR1SpBS6IqbIij4UFwhnnMkElcFTqoucIWbsBPK3l+6c+xYaVBWsJo | |
359 | ELAOIpL/gE8R8CUeXuw2NKMtkFoLPkcTSomXtgHSg1IKaCNlWwVU3CpmMYqh5gkFYJKOD4UhVVQ6 |
|
359 | aT0OV/YAOvLrziifDQMJOMIaaYce9agtI2EwQBAq089UiRU+evFHSLRBT7Wa/D/YBaUtU5ezvtr3 | |
360 | SiF1DpE8ghWvF1ih+fYgagfYHI96w/QsrRATpYiP7VRbINFrQy2c21mZ7M4pXXrPBypoXAIhtum7 |
|
360 | 6yrIS4Iyp9VWESdWPEi6VjRjdcEY4HvbmDIVEAEVJIUrHNIBx/MmnBBRkw8tSlCQ8ABZxf5ejgBI | |
361 | aKDJCpUqMDF5dfiDChMfgH9nQ4B60Uvgb4AK9dsbSYc+O3tEyNq9g9gZeA5Je2T82GzjC4DbY4F2 |
|
361 | pP5TSQPLVMYbq1qbBPmWN0LYVlAvRbP4X512kDQZ9y4TQbvoZmhe+54sRsEJ8GW3hMJjERh0NNlg | |
362 | 0kdrTBwslErFshCgDzeEBwICg13oQaQawQA1WWd3F3JFOFCQCKhOyg== |
|
362 | aB+3Cw/4u5IpwoSGxfltiA== | |
363 | --===============*==-- (glob) |
|
363 | --===============*==-- (glob) | |
364 |
|
364 | |||
365 | with a specific bundle type |
|
365 | with a specific bundle type |
@@ -765,7 +765,7 b' Bare push with next changeset and common' | |||||
765 | searching for changes |
|
765 | searching for changes | |
766 | 1 changesets found |
|
766 | 1 changesets found | |
767 | uncompressed size of bundle content: |
|
767 | uncompressed size of bundle content: | |
768 |
1 |
|
768 | 178 (changelog) | |
769 | 165 (manifests) |
|
769 | 165 (manifests) | |
770 | 131 a-H |
|
770 | 131 a-H | |
771 | adding changesets |
|
771 | adding changesets |
@@ -150,7 +150,7 b' Specifying a revset that evaluates to nu' | |||||
150 | searching for changes |
|
150 | searching for changes | |
151 | 2 changesets found |
|
151 | 2 changesets found | |
152 | uncompressed size of bundle content: |
|
152 | uncompressed size of bundle content: | |
153 |
3 |
|
153 | 352 (changelog) | |
154 | 326 (manifests) |
|
154 | 326 (manifests) | |
155 | 253 foo |
|
155 | 253 foo | |
156 | adding changesets |
|
156 | adding changesets |
@@ -303,7 +303,7 b' Check that the right ancestors is used w' | |||||
303 | adding file changes |
|
303 | adding file changes | |
304 | adding f1.txt revisions |
|
304 | adding f1.txt revisions | |
305 | added 2 changesets with 2 changes to 1 files |
|
305 | added 2 changesets with 2 changes to 1 files | |
306 |
bundle2-input-part: total payload size 1 |
|
306 | bundle2-input-part: total payload size 1686 | |
307 | bundle2-input-bundle: 0 parts total |
|
307 | bundle2-input-bundle: 0 parts total | |
308 | invalid branchheads cache (served): tip differs |
|
308 | invalid branchheads cache (served): tip differs | |
309 | history modification detected - truncating revision branch cache to revision 9 |
|
309 | history modification detected - truncating revision branch cache to revision 9 |
@@ -70,14 +70,14 b' already has one local mq patch' | |||||
70 | $TESTTMP/a/.hg/patches/p0.patch (glob) |
|
70 | $TESTTMP/a/.hg/patches/p0.patch (glob) | |
71 | 2 changesets found |
|
71 | 2 changesets found | |
72 | uncompressed size of bundle content: |
|
72 | uncompressed size of bundle content: | |
73 |
38 |
|
73 | 348 (changelog) | |
74 | 324 (manifests) |
|
74 | 324 (manifests) | |
75 | 129 p0 |
|
75 | 129 p0 | |
76 | 129 p1 |
|
76 | 129 p1 | |
77 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-5da6ecfb-backup.hg (glob) |
|
77 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-5da6ecfb-backup.hg (glob) | |
78 | 2 changesets found |
|
78 | 2 changesets found | |
79 | uncompressed size of bundle content: |
|
79 | uncompressed size of bundle content: | |
80 |
43 |
|
80 | 403 (changelog) | |
81 | 324 (manifests) |
|
81 | 324 (manifests) | |
82 | 129 p0 |
|
82 | 129 p0 | |
83 | 129 p1 |
|
83 | 129 p1 |
@@ -304,13 +304,13 b' rebase of merge of ancestors' | |||||
304 | rebase merging completed |
|
304 | rebase merging completed | |
305 | 1 changesets found |
|
305 | 1 changesets found | |
306 | uncompressed size of bundle content: |
|
306 | uncompressed size of bundle content: | |
307 |
|
|
307 | 199 (changelog) | |
308 | 216 (manifests) |
|
308 | 216 (manifests) | |
309 | 182 other |
|
309 | 182 other | |
310 | saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/4c5f12f25ebe-f46990e5-backup.hg (glob) |
|
310 | saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/4c5f12f25ebe-f46990e5-backup.hg (glob) | |
311 | 1 changesets found |
|
311 | 1 changesets found | |
312 | uncompressed size of bundle content: |
|
312 | uncompressed size of bundle content: | |
313 |
2 |
|
313 | 254 (changelog) | |
314 | 167 (manifests) |
|
314 | 167 (manifests) | |
315 | 182 other |
|
315 | 182 other | |
316 | adding branch |
|
316 | adding branch |
General Comments 0
You need to be logged in to leave comments.
Login now