comparison tests/test-acl.t @ 14073:72c84f24b420

discovery: drop findoutgoing and simplify findcommonincoming's api This is a long desired cleanup and paves the way for new discovery. To specify subsets for bundling changes, all code should use the heads of the desired subset ("heads") and the heads of the common subset ("common") to be excluded from the bundled set. These can be used revlog.findmissing instead of revlog.nodesbetween. This fixes an actual bug exposed by the change in test-bundle-r.t where we try to bundle a changeset while specifying that said changeset is to be assumed already present in the target. This used to still bundle the changeset. It no longer does. This is similar to the bugs fixed by the recent switch to heads/common for incoming/pull.
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date Sat, 30 Apr 2011 17:21:37 +0200
parents 3259a067c102
children 301725c3df9a
comparison
equal deleted inserted replaced
14072:2e4d79dcc0a0 14073:72c84f24b420
81 Pushing as user fred 81 Pushing as user fred
82 hgrc = """ 82 hgrc = """
83 """ 83 """
84 pushing to ../b 84 pushing to ../b
85 searching for changes 85 searching for changes
86 common changesets up to 6675d58eff77
87 3 changesets found 86 3 changesets found
88 list of changesets: 87 list of changesets:
89 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 88 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
90 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 89 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
91 911600dab2ae7a9baff75958b84fe606851ce955 90 911600dab2ae7a9baff75958b84fe606851ce955
135 [hooks] 134 [hooks]
136 pretxnchangegroup.acl = python:hgext.acl.hook 135 pretxnchangegroup.acl = python:hgext.acl.hook
137 """ 136 """
138 pushing to ../b 137 pushing to ../b
139 searching for changes 138 searching for changes
140 common changesets up to 6675d58eff77
141 invalidating branch cache (tip differs) 139 invalidating branch cache (tip differs)
142 3 changesets found 140 3 changesets found
143 list of changesets: 141 list of changesets:
144 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 142 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
145 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 143 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
193 [acl] 191 [acl]
194 sources = push 192 sources = push
195 """ 193 """
196 pushing to ../b 194 pushing to ../b
197 searching for changes 195 searching for changes
198 common changesets up to 6675d58eff77
199 invalidating branch cache (tip differs) 196 invalidating branch cache (tip differs)
200 3 changesets found 197 3 changesets found
201 list of changesets: 198 list of changesets:
202 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 199 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
203 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 200 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
260 sources = push 257 sources = push
261 [acl.allow] 258 [acl.allow]
262 """ 259 """
263 pushing to ../b 260 pushing to ../b
264 searching for changes 261 searching for changes
265 common changesets up to 6675d58eff77
266 invalidating branch cache (tip differs) 262 invalidating branch cache (tip differs)
267 3 changesets found 263 3 changesets found
268 list of changesets: 264 list of changesets:
269 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 265 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
270 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 266 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
325 [acl.allow] 321 [acl.allow]
326 foo/** = fred 322 foo/** = fred
327 """ 323 """
328 pushing to ../b 324 pushing to ../b
329 searching for changes 325 searching for changes
330 common changesets up to 6675d58eff77
331 3 changesets found 326 3 changesets found
332 list of changesets: 327 list of changesets:
333 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 328 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
334 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 329 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
335 911600dab2ae7a9baff75958b84fe606851ce955 330 911600dab2ae7a9baff75958b84fe606851ce955
394 foo/** = fred 389 foo/** = fred
395 [acl.deny] 390 [acl.deny]
396 """ 391 """
397 pushing to ../b 392 pushing to ../b
398 searching for changes 393 searching for changes
399 common changesets up to 6675d58eff77
400 3 changesets found 394 3 changesets found
401 list of changesets: 395 list of changesets:
402 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 396 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
403 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 397 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
404 911600dab2ae7a9baff75958b84fe606851ce955 398 911600dab2ae7a9baff75958b84fe606851ce955
460 [acl.deny] 454 [acl.deny]
461 foo/bar/** = fred 455 foo/bar/** = fred
462 """ 456 """
463 pushing to ../b 457 pushing to ../b
464 searching for changes 458 searching for changes
465 common changesets up to 6675d58eff77
466 3 changesets found 459 3 changesets found
467 list of changesets: 460 list of changesets:
468 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 461 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
469 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 462 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
470 911600dab2ae7a9baff75958b84fe606851ce955 463 911600dab2ae7a9baff75958b84fe606851ce955
531 foo/bar/** = fred 524 foo/bar/** = fred
532 foo/Bar/** = fred 525 foo/Bar/** = fred
533 """ 526 """
534 pushing to ../b 527 pushing to ../b
535 searching for changes 528 searching for changes
536 common changesets up to 6675d58eff77
537 3 changesets found 529 3 changesets found
538 list of changesets: 530 list of changesets:
539 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 531 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
540 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 532 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
541 911600dab2ae7a9baff75958b84fe606851ce955 533 911600dab2ae7a9baff75958b84fe606851ce955
599 foo/bar/** = fred 591 foo/bar/** = fred
600 foo/Bar/** = fred 592 foo/Bar/** = fred
601 """ 593 """
602 pushing to ../b 594 pushing to ../b
603 searching for changes 595 searching for changes
604 common changesets up to 6675d58eff77
605 3 changesets found 596 3 changesets found
606 list of changesets: 597 list of changesets:
607 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 598 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
608 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 599 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
609 911600dab2ae7a9baff75958b84fe606851ce955 600 911600dab2ae7a9baff75958b84fe606851ce955
669 [acl.allow] 660 [acl.allow]
670 ** = barney 661 ** = barney
671 """ 662 """
672 pushing to ../b 663 pushing to ../b
673 searching for changes 664 searching for changes
674 common changesets up to 6675d58eff77
675 3 changesets found 665 3 changesets found
676 list of changesets: 666 list of changesets:
677 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 667 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
678 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 668 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
679 911600dab2ae7a9baff75958b84fe606851ce955 669 911600dab2ae7a9baff75958b84fe606851ce955
742 ** = barney 732 ** = barney
743 **/*.txt = wilma 733 **/*.txt = wilma
744 """ 734 """
745 pushing to ../b 735 pushing to ../b
746 searching for changes 736 searching for changes
747 common changesets up to 6675d58eff77
748 invalidating branch cache (tip differs) 737 invalidating branch cache (tip differs)
749 3 changesets found 738 3 changesets found
750 list of changesets: 739 list of changesets:
751 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 740 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
752 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 741 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
820 [acl] 809 [acl]
821 config = ../acl.config 810 config = ../acl.config
822 """ 811 """
823 pushing to ../b 812 pushing to ../b
824 searching for changes 813 searching for changes
825 common changesets up to 6675d58eff77
826 3 changesets found 814 3 changesets found
827 list of changesets: 815 list of changesets:
828 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 816 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
829 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 817 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
830 911600dab2ae7a9baff75958b84fe606851ce955 818 911600dab2ae7a9baff75958b84fe606851ce955
891 [acl.allow] 879 [acl.allow]
892 foo/** = betty 880 foo/** = betty
893 """ 881 """
894 pushing to ../b 882 pushing to ../b
895 searching for changes 883 searching for changes
896 common changesets up to 6675d58eff77
897 3 changesets found 884 3 changesets found
898 list of changesets: 885 list of changesets:
899 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 886 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
900 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 887 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
901 911600dab2ae7a9baff75958b84fe606851ce955 888 911600dab2ae7a9baff75958b84fe606851ce955
974 [hooks] 961 [hooks]
975 changegroup.acl = false 962 changegroup.acl = false
976 """ 963 """
977 pushing to ../b 964 pushing to ../b
978 searching for changes 965 searching for changes
979 common changesets up to 6675d58eff77
980 3 changesets found 966 3 changesets found
981 list of changesets: 967 list of changesets:
982 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 968 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
983 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 969 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
984 911600dab2ae7a9baff75958b84fe606851ce955 970 911600dab2ae7a9baff75958b84fe606851ce955
1048 [acl.allow] 1034 [acl.allow]
1049 ** = fred 1035 ** = fred
1050 """ 1036 """
1051 pushing to ../b 1037 pushing to ../b
1052 searching for changes 1038 searching for changes
1053 common changesets up to 6675d58eff77
1054 invalidating branch cache (tip differs) 1039 invalidating branch cache (tip differs)
1055 3 changesets found 1040 3 changesets found
1056 list of changesets: 1041 list of changesets:
1057 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 1042 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
1058 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 1043 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
1119 [acl.deny] 1104 [acl.deny]
1120 foo/Bar/** = * 1105 foo/Bar/** = *
1121 """ 1106 """
1122 pushing to ../b 1107 pushing to ../b
1123 searching for changes 1108 searching for changes
1124 common changesets up to 6675d58eff77
1125 invalidating branch cache (tip differs) 1109 invalidating branch cache (tip differs)
1126 3 changesets found 1110 3 changesets found
1127 list of changesets: 1111 list of changesets:
1128 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 1112 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
1129 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 1113 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
1193 [acl.allow] 1177 [acl.allow]
1194 ** = @group1 1178 ** = @group1
1195 """ 1179 """
1196 pushing to ../b 1180 pushing to ../b
1197 searching for changes 1181 searching for changes
1198 common changesets up to 6675d58eff77
1199 3 changesets found 1182 3 changesets found
1200 list of changesets: 1183 list of changesets:
1201 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 1184 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
1202 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 1185 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
1203 911600dab2ae7a9baff75958b84fe606851ce955 1186 911600dab2ae7a9baff75958b84fe606851ce955
1264 [acl.deny] 1247 [acl.deny]
1265 foo/Bar/** = @group1 1248 foo/Bar/** = @group1
1266 """ 1249 """
1267 pushing to ../b 1250 pushing to ../b
1268 searching for changes 1251 searching for changes
1269 common changesets up to 6675d58eff77
1270 invalidating branch cache (tip differs) 1252 invalidating branch cache (tip differs)
1271 3 changesets found 1253 3 changesets found
1272 list of changesets: 1254 list of changesets:
1273 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 1255 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
1274 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 1256 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
1376 sources = push 1358 sources = push
1377 [extensions] 1359 [extensions]
1378 """ 1360 """
1379 pushing to ../b 1361 pushing to ../b
1380 searching for changes 1362 searching for changes
1381 common changesets up to 07e028174695
1382 4 changesets found 1363 4 changesets found
1383 list of changesets: 1364 list of changesets:
1384 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 1365 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
1385 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 1366 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
1386 911600dab2ae7a9baff75958b84fe606851ce955 1367 911600dab2ae7a9baff75958b84fe606851ce955
1454 [acl.deny.branches] 1435 [acl.deny.branches]
1455 foobar = * 1436 foobar = *
1456 """ 1437 """
1457 pushing to ../b 1438 pushing to ../b
1458 searching for changes 1439 searching for changes
1459 common changesets up to 07e028174695
1460 invalidating branch cache (tip differs) 1440 invalidating branch cache (tip differs)
1461 4 changesets found 1441 4 changesets found
1462 list of changesets: 1442 list of changesets:
1463 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 1443 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
1464 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 1444 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
1531 [extensions] 1511 [extensions]
1532 [acl.allow.branches] 1512 [acl.allow.branches]
1533 """ 1513 """
1534 pushing to ../b 1514 pushing to ../b
1535 searching for changes 1515 searching for changes
1536 common changesets up to 07e028174695
1537 4 changesets found 1516 4 changesets found
1538 list of changesets: 1517 list of changesets:
1539 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 1518 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
1540 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 1519 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
1541 911600dab2ae7a9baff75958b84fe606851ce955 1520 911600dab2ae7a9baff75958b84fe606851ce955
1603 [acl.allow.branches] 1582 [acl.allow.branches]
1604 * = george 1583 * = george
1605 """ 1584 """
1606 pushing to ../b 1585 pushing to ../b
1607 searching for changes 1586 searching for changes
1608 common changesets up to 07e028174695
1609 4 changesets found 1587 4 changesets found
1610 list of changesets: 1588 list of changesets:
1611 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 1589 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
1612 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 1590 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
1613 911600dab2ae7a9baff75958b84fe606851ce955 1591 911600dab2ae7a9baff75958b84fe606851ce955
1669 [acl.allow.branches] 1647 [acl.allow.branches]
1670 * = george 1648 * = george
1671 """ 1649 """
1672 pushing to ../b 1650 pushing to ../b
1673 searching for changes 1651 searching for changes
1674 common changesets up to 07e028174695
1675 4 changesets found 1652 4 changesets found
1676 list of changesets: 1653 list of changesets:
1677 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 1654 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
1678 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 1655 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
1679 911600dab2ae7a9baff75958b84fe606851ce955 1656 911600dab2ae7a9baff75958b84fe606851ce955
1752 foobar = astro 1729 foobar = astro
1753 * = george 1730 * = george
1754 """ 1731 """
1755 pushing to ../b 1732 pushing to ../b
1756 searching for changes 1733 searching for changes
1757 common changesets up to 07e028174695
1758 invalidating branch cache (tip differs) 1734 invalidating branch cache (tip differs)
1759 4 changesets found 1735 4 changesets found
1760 list of changesets: 1736 list of changesets:
1761 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 1737 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
1762 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 1738 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
1835 default = astro 1811 default = astro
1836 * = george 1812 * = george
1837 """ 1813 """
1838 pushing to ../b 1814 pushing to ../b
1839 searching for changes 1815 searching for changes
1840 common changesets up to 07e028174695
1841 invalidating branch cache (tip differs) 1816 invalidating branch cache (tip differs)
1842 4 changesets found 1817 4 changesets found
1843 list of changesets: 1818 list of changesets:
1844 ef1ea85a6374b77d6da9dcda9541f498f2d17df7 1819 ef1ea85a6374b77d6da9dcda9541f498f2d17df7
1845 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 1820 f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd