##// END OF EJS Templates
localrepo: add total to changeset progress in bundle/push
Sune Foldager -
r14520:9d8d2fec default
parent child Browse files
Show More
@@ -1521,7 +1521,8 b' class localrepository(repo.repository):'
1521 1521 changedfiles.update(c[3])
1522 1522 mfs.setdefault(c[0], x)
1523 1523 count[0] += 1
1524 self.ui.progress(_('bundling'), count[0], unit=_('changesets'))
1524 self.ui.progress(_('bundling'), count[0],
1525 unit=_('changesets'), total=len(csets))
1525 1526 return x
1526 1527 elif revlog == mf:
1527 1528 clnode = mfs[x]
@@ -1627,7 +1628,8 b' class localrepository(repo.repository):'
1627 1628 changedfiles.update(c[3])
1628 1629 mfs.setdefault(c[0], x)
1629 1630 count[0] += 1
1630 self.ui.progress(_('bundling'), count[0], unit=_('changesets'))
1631 self.ui.progress(_('bundling'), count[0],
1632 unit=_('changesets'), total=len(nodes))
1631 1633 return x
1632 1634 elif revlog == mf:
1633 1635 count[0] += 1
@@ -91,9 +91,9 b' Extension disabled for lack of a hook'
91 91 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
92 92 911600dab2ae7a9baff75958b84fe606851ce955
93 93 adding changesets
94 bundling: 1 changesets
95 bundling: 2 changesets
96 bundling: 3 changesets
94 bundling: 1/3 changesets (33.33%)
95 bundling: 2/3 changesets (66.67%)
96 bundling: 3/3 changesets (100.00%)
97 97 bundling: 1/3 manifests (33.33%)
98 98 bundling: 2/3 manifests (66.67%)
99 99 bundling: 3/3 manifests (100.00%)
@@ -147,9 +147,9 b' Extension disabled for lack of acl.sourc'
147 147 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
148 148 911600dab2ae7a9baff75958b84fe606851ce955
149 149 adding changesets
150 bundling: 1 changesets
151 bundling: 2 changesets
152 bundling: 3 changesets
150 bundling: 1/3 changesets (33.33%)
151 bundling: 2/3 changesets (66.67%)
152 bundling: 3/3 changesets (100.00%)
153 153 bundling: 1/3 manifests (33.33%)
154 154 bundling: 2/3 manifests (66.67%)
155 155 bundling: 3/3 manifests (100.00%)
@@ -206,9 +206,9 b' No [acl.allow]/[acl.deny]'
206 206 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
207 207 911600dab2ae7a9baff75958b84fe606851ce955
208 208 adding changesets
209 bundling: 1 changesets
210 bundling: 2 changesets
211 bundling: 3 changesets
209 bundling: 1/3 changesets (33.33%)
210 bundling: 2/3 changesets (66.67%)
211 bundling: 3/3 changesets (100.00%)
212 212 bundling: 1/3 manifests (33.33%)
213 213 bundling: 2/3 manifests (66.67%)
214 214 bundling: 3/3 manifests (100.00%)
@@ -274,9 +274,9 b' Empty [acl.allow]'
274 274 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
275 275 911600dab2ae7a9baff75958b84fe606851ce955
276 276 adding changesets
277 bundling: 1 changesets
278 bundling: 2 changesets
279 bundling: 3 changesets
277 bundling: 1/3 changesets (33.33%)
278 bundling: 2/3 changesets (66.67%)
279 bundling: 3/3 changesets (100.00%)
280 280 bundling: 1/3 manifests (33.33%)
281 281 bundling: 2/3 manifests (66.67%)
282 282 bundling: 3/3 manifests (100.00%)
@@ -339,9 +339,9 b' fred is allowed inside foo/'
339 339 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
340 340 911600dab2ae7a9baff75958b84fe606851ce955
341 341 adding changesets
342 bundling: 1 changesets
343 bundling: 2 changesets
344 bundling: 3 changesets
342 bundling: 1/3 changesets (33.33%)
343 bundling: 2/3 changesets (66.67%)
344 bundling: 3/3 changesets (100.00%)
345 345 bundling: 1/3 manifests (33.33%)
346 346 bundling: 2/3 manifests (66.67%)
347 347 bundling: 3/3 manifests (100.00%)
@@ -409,9 +409,9 b' Empty [acl.deny]'
409 409 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
410 410 911600dab2ae7a9baff75958b84fe606851ce955
411 411 adding changesets
412 bundling: 1 changesets
413 bundling: 2 changesets
414 bundling: 3 changesets
412 bundling: 1/3 changesets (33.33%)
413 bundling: 2/3 changesets (66.67%)
414 bundling: 3/3 changesets (100.00%)
415 415 bundling: 1/3 manifests (33.33%)
416 416 bundling: 2/3 manifests (66.67%)
417 417 bundling: 3/3 manifests (100.00%)
@@ -476,9 +476,9 b' fred is allowed inside foo/, but not foo'
476 476 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
477 477 911600dab2ae7a9baff75958b84fe606851ce955
478 478 adding changesets
479 bundling: 1 changesets
480 bundling: 2 changesets
481 bundling: 3 changesets
479 bundling: 1/3 changesets (33.33%)
480 bundling: 2/3 changesets (66.67%)
481 bundling: 3/3 changesets (100.00%)
482 482 bundling: 1/3 manifests (33.33%)
483 483 bundling: 2/3 manifests (66.67%)
484 484 bundling: 3/3 manifests (100.00%)
@@ -548,9 +548,9 b' fred is allowed inside foo/, but not foo'
548 548 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
549 549 911600dab2ae7a9baff75958b84fe606851ce955
550 550 adding changesets
551 bundling: 1 changesets
552 bundling: 2 changesets
553 bundling: 3 changesets
551 bundling: 1/3 changesets (33.33%)
552 bundling: 2/3 changesets (66.67%)
553 bundling: 3/3 changesets (100.00%)
554 554 bundling: 1/3 manifests (33.33%)
555 555 bundling: 2/3 manifests (66.67%)
556 556 bundling: 3/3 manifests (100.00%)
@@ -617,9 +617,9 b' fred is allowed inside foo/, but not foo'
617 617 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
618 618 911600dab2ae7a9baff75958b84fe606851ce955
619 619 adding changesets
620 bundling: 1 changesets
621 bundling: 2 changesets
622 bundling: 3 changesets
620 bundling: 1/3 changesets (33.33%)
621 bundling: 2/3 changesets (66.67%)
622 bundling: 3/3 changesets (100.00%)
623 623 bundling: 1/3 manifests (33.33%)
624 624 bundling: 2/3 manifests (66.67%)
625 625 bundling: 3/3 manifests (100.00%)
@@ -688,9 +688,9 b' barney is allowed everywhere'
688 688 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
689 689 911600dab2ae7a9baff75958b84fe606851ce955
690 690 adding changesets
691 bundling: 1 changesets
692 bundling: 2 changesets
693 bundling: 3 changesets
691 bundling: 1/3 changesets (33.33%)
692 bundling: 2/3 changesets (66.67%)
693 bundling: 3/3 changesets (100.00%)
694 694 bundling: 1/3 manifests (33.33%)
695 695 bundling: 2/3 manifests (66.67%)
696 696 bundling: 3/3 manifests (100.00%)
@@ -763,9 +763,9 b' wilma can change files with a .txt exten'
763 763 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
764 764 911600dab2ae7a9baff75958b84fe606851ce955
765 765 adding changesets
766 bundling: 1 changesets
767 bundling: 2 changesets
768 bundling: 3 changesets
766 bundling: 1/3 changesets (33.33%)
767 bundling: 2/3 changesets (66.67%)
768 bundling: 3/3 changesets (100.00%)
769 769 bundling: 1/3 manifests (33.33%)
770 770 bundling: 2/3 manifests (66.67%)
771 771 bundling: 3/3 manifests (100.00%)
@@ -841,9 +841,9 b' file specified by acl.config does not ex'
841 841 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
842 842 911600dab2ae7a9baff75958b84fe606851ce955
843 843 adding changesets
844 bundling: 1 changesets
845 bundling: 2 changesets
846 bundling: 3 changesets
844 bundling: 1/3 changesets (33.33%)
845 bundling: 2/3 changesets (66.67%)
846 bundling: 3/3 changesets (100.00%)
847 847 bundling: 1/3 manifests (33.33%)
848 848 bundling: 2/3 manifests (66.67%)
849 849 bundling: 3/3 manifests (100.00%)
@@ -913,9 +913,9 b' betty is allowed inside foo/ by a acl.co'
913 913 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
914 914 911600dab2ae7a9baff75958b84fe606851ce955
915 915 adding changesets
916 bundling: 1 changesets
917 bundling: 2 changesets
918 bundling: 3 changesets
916 bundling: 1/3 changesets (33.33%)
917 bundling: 2/3 changesets (66.67%)
918 bundling: 3/3 changesets (100.00%)
919 919 bundling: 1/3 manifests (33.33%)
920 920 bundling: 2/3 manifests (66.67%)
921 921 bundling: 3/3 manifests (100.00%)
@@ -997,9 +997,9 b' acl.config can set only [acl.allow]/[acl'
997 997 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
998 998 911600dab2ae7a9baff75958b84fe606851ce955
999 999 adding changesets
1000 bundling: 1 changesets
1001 bundling: 2 changesets
1002 bundling: 3 changesets
1000 bundling: 1/3 changesets (33.33%)
1001 bundling: 2/3 changesets (66.67%)
1002 bundling: 3/3 changesets (100.00%)
1003 1003 bundling: 1/3 manifests (33.33%)
1004 1004 bundling: 2/3 manifests (66.67%)
1005 1005 bundling: 3/3 manifests (100.00%)
@@ -1073,9 +1073,9 b' fred is always allowed'
1073 1073 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
1074 1074 911600dab2ae7a9baff75958b84fe606851ce955
1075 1075 adding changesets
1076 bundling: 1 changesets
1077 bundling: 2 changesets
1078 bundling: 3 changesets
1076 bundling: 1/3 changesets (33.33%)
1077 bundling: 2/3 changesets (66.67%)
1078 bundling: 3/3 changesets (100.00%)
1079 1079 bundling: 1/3 manifests (33.33%)
1080 1080 bundling: 2/3 manifests (66.67%)
1081 1081 bundling: 3/3 manifests (100.00%)
@@ -1145,9 +1145,9 b' no one is allowed inside foo/Bar/'
1145 1145 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
1146 1146 911600dab2ae7a9baff75958b84fe606851ce955
1147 1147 adding changesets
1148 bundling: 1 changesets
1149 bundling: 2 changesets
1150 bundling: 3 changesets
1148 bundling: 1/3 changesets (33.33%)
1149 bundling: 2/3 changesets (66.67%)
1150 bundling: 3/3 changesets (100.00%)
1151 1151 bundling: 1/3 manifests (33.33%)
1152 1152 bundling: 2/3 manifests (66.67%)
1153 1153 bundling: 3/3 manifests (100.00%)
@@ -1219,9 +1219,9 b' OS-level groups'
1219 1219 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
1220 1220 911600dab2ae7a9baff75958b84fe606851ce955
1221 1221 adding changesets
1222 bundling: 1 changesets
1223 bundling: 2 changesets
1224 bundling: 3 changesets
1222 bundling: 1/3 changesets (33.33%)
1223 bundling: 2/3 changesets (66.67%)
1224 bundling: 3/3 changesets (100.00%)
1225 1225 bundling: 1/3 manifests (33.33%)
1226 1226 bundling: 2/3 manifests (66.67%)
1227 1227 bundling: 3/3 manifests (100.00%)
@@ -1292,9 +1292,9 b' OS-level groups'
1292 1292 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
1293 1293 911600dab2ae7a9baff75958b84fe606851ce955
1294 1294 adding changesets
1295 bundling: 1 changesets
1296 bundling: 2 changesets
1297 bundling: 3 changesets
1295 bundling: 1/3 changesets (33.33%)
1296 bundling: 2/3 changesets (66.67%)
1297 bundling: 3/3 changesets (100.00%)
1298 1298 bundling: 1/3 manifests (33.33%)
1299 1299 bundling: 2/3 manifests (66.67%)
1300 1300 bundling: 3/3 manifests (100.00%)
@@ -1405,10 +1405,10 b' No branch acls specified'
1405 1405 911600dab2ae7a9baff75958b84fe606851ce955
1406 1406 e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
1407 1407 adding changesets
1408 bundling: 1 changesets
1409 bundling: 2 changesets
1410 bundling: 3 changesets
1411 bundling: 4 changesets
1408 bundling: 1/4 changesets (25.00%)
1409 bundling: 2/4 changesets (50.00%)
1410 bundling: 3/4 changesets (75.00%)
1411 bundling: 4/4 changesets (100.00%)
1412 1412 bundling: 1/4 manifests (25.00%)
1413 1413 bundling: 2/4 manifests (50.00%)
1414 1414 bundling: 3/4 manifests (75.00%)
@@ -1485,10 +1485,10 b' Branch acl deny test'
1485 1485 911600dab2ae7a9baff75958b84fe606851ce955
1486 1486 e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
1487 1487 adding changesets
1488 bundling: 1 changesets
1489 bundling: 2 changesets
1490 bundling: 3 changesets
1491 bundling: 4 changesets
1488 bundling: 1/4 changesets (25.00%)
1489 bundling: 2/4 changesets (50.00%)
1490 bundling: 3/4 changesets (75.00%)
1491 bundling: 4/4 changesets (100.00%)
1492 1492 bundling: 1/4 manifests (25.00%)
1493 1493 bundling: 2/4 manifests (50.00%)
1494 1494 bundling: 3/4 manifests (75.00%)
@@ -1562,10 +1562,10 b' Branch acl empty allow test'
1562 1562 911600dab2ae7a9baff75958b84fe606851ce955
1563 1563 e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
1564 1564 adding changesets
1565 bundling: 1 changesets
1566 bundling: 2 changesets
1567 bundling: 3 changesets
1568 bundling: 4 changesets
1565 bundling: 1/4 changesets (25.00%)
1566 bundling: 2/4 changesets (50.00%)
1567 bundling: 3/4 changesets (75.00%)
1568 bundling: 4/4 changesets (100.00%)
1569 1569 bundling: 1/4 manifests (25.00%)
1570 1570 bundling: 2/4 manifests (50.00%)
1571 1571 bundling: 3/4 manifests (75.00%)
@@ -1635,10 +1635,10 b' Branch acl allow other'
1635 1635 911600dab2ae7a9baff75958b84fe606851ce955
1636 1636 e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
1637 1637 adding changesets
1638 bundling: 1 changesets
1639 bundling: 2 changesets
1640 bundling: 3 changesets
1641 bundling: 4 changesets
1638 bundling: 1/4 changesets (25.00%)
1639 bundling: 2/4 changesets (50.00%)
1640 bundling: 3/4 changesets (75.00%)
1641 bundling: 4/4 changesets (100.00%)
1642 1642 bundling: 1/4 manifests (25.00%)
1643 1643 bundling: 2/4 manifests (50.00%)
1644 1644 bundling: 3/4 manifests (75.00%)
@@ -1702,10 +1702,10 b' Branch acl allow other'
1702 1702 911600dab2ae7a9baff75958b84fe606851ce955
1703 1703 e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
1704 1704 adding changesets
1705 bundling: 1 changesets
1706 bundling: 2 changesets
1707 bundling: 3 changesets
1708 bundling: 4 changesets
1705 bundling: 1/4 changesets (25.00%)
1706 bundling: 2/4 changesets (50.00%)
1707 bundling: 3/4 changesets (75.00%)
1708 bundling: 4/4 changesets (100.00%)
1709 1709 bundling: 1/4 manifests (25.00%)
1710 1710 bundling: 2/4 manifests (50.00%)
1711 1711 bundling: 3/4 manifests (75.00%)
@@ -1787,10 +1787,10 b' push foobar into the remote'
1787 1787 911600dab2ae7a9baff75958b84fe606851ce955
1788 1788 e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
1789 1789 adding changesets
1790 bundling: 1 changesets
1791 bundling: 2 changesets
1792 bundling: 3 changesets
1793 bundling: 4 changesets
1790 bundling: 1/4 changesets (25.00%)
1791 bundling: 2/4 changesets (50.00%)
1792 bundling: 3/4 changesets (75.00%)
1793 bundling: 4/4 changesets (100.00%)
1794 1794 bundling: 1/4 manifests (25.00%)
1795 1795 bundling: 2/4 manifests (50.00%)
1796 1796 bundling: 3/4 manifests (75.00%)
@@ -1871,10 +1871,10 b' Branch acl conflicting deny'
1871 1871 911600dab2ae7a9baff75958b84fe606851ce955
1872 1872 e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
1873 1873 adding changesets
1874 bundling: 1 changesets
1875 bundling: 2 changesets
1876 bundling: 3 changesets
1877 bundling: 4 changesets
1874 bundling: 1/4 changesets (25.00%)
1875 bundling: 2/4 changesets (50.00%)
1876 bundling: 3/4 changesets (75.00%)
1877 bundling: 4/4 changesets (100.00%)
1878 1878 bundling: 1/4 manifests (25.00%)
1879 1879 bundling: 2/4 manifests (50.00%)
1880 1880 bundling: 3/4 manifests (75.00%)
@@ -568,8 +568,8 b' bundle single branch'
568 568 list of changesets:
569 569 d2ae7f538514cd87c17547b0de4cea71fe1af9fb
570 570 5ece8e77363e2b5269e27c66828b72da29e4341a
571 bundling: 1 changesets
572 bundling: 2 changesets
571 bundling: 1/2 changesets (50.00%)
572 bundling: 2/2 changesets (100.00%)
573 573 bundling: 1/2 manifests (50.00%)
574 574 bundling: 2/2 manifests (100.00%)
575 575 bundling: b 0/2 files (0.00%)
General Comments 0
You need to be logged in to leave comments. Login now