comparison tests/test-acl.t @ 25559:521c1a3139c9

push: only say we are trying to push obsmarkers when we actually try The message was issued unconditionally. Move it inside the `if` that actually tries to push obsmarkers.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 11 Jun 2015 13:02:21 -0700
parents bd41c19383db
children 77d25b913f80
comparison
equal deleted inserted replaced
25558:daf9f7ee2a5c 25559:521c1a3139c9
130 bundle2-input-bundle: with-transaction 130 bundle2-input-bundle: with-transaction
131 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported 131 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
132 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported 132 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
133 bundle2-input-bundle: 1 parts total 133 bundle2-input-bundle: 1 parts total
134 listing keys for "phases" 134 listing keys for "phases"
135 try to push obsolete markers to remote
136 repository tip rolled back to revision 0 (undo push) 135 repository tip rolled back to revision 0 (undo push)
137 0:6675d58eff77 136 0:6675d58eff77
138 137
139 138
140 $ echo '[hooks]' >> $config 139 $ echo '[hooks]' >> $config
196 bundle2-input-bundle: with-transaction 195 bundle2-input-bundle: with-transaction
197 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported 196 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
198 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported 197 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
199 bundle2-input-bundle: 1 parts total 198 bundle2-input-bundle: 1 parts total
200 listing keys for "phases" 199 listing keys for "phases"
201 try to push obsolete markers to remote
202 repository tip rolled back to revision 0 (undo push) 200 repository tip rolled back to revision 0 (undo push)
203 0:6675d58eff77 201 0:6675d58eff77
204 202
205 203
206 No [acl.allow]/[acl.deny] 204 No [acl.allow]/[acl.deny]
273 bundle2-input-bundle: with-transaction 271 bundle2-input-bundle: with-transaction
274 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported 272 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
275 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported 273 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
276 bundle2-input-bundle: 1 parts total 274 bundle2-input-bundle: 1 parts total
277 listing keys for "phases" 275 listing keys for "phases"
278 try to push obsolete markers to remote
279 repository tip rolled back to revision 0 (undo push) 276 repository tip rolled back to revision 0 (undo push)
280 0:6675d58eff77 277 0:6675d58eff77
281 278
282 279
283 Empty [acl.allow] 280 Empty [acl.allow]
764 bundle2-input-bundle: with-transaction 761 bundle2-input-bundle: with-transaction
765 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported 762 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
766 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported 763 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
767 bundle2-input-bundle: 1 parts total 764 bundle2-input-bundle: 1 parts total
768 listing keys for "phases" 765 listing keys for "phases"
769 try to push obsolete markers to remote
770 repository tip rolled back to revision 0 (undo push) 766 repository tip rolled back to revision 0 (undo push)
771 0:6675d58eff77 767 0:6675d58eff77
772 768
773 769
774 wilma can change files with a .txt extension 770 wilma can change files with a .txt extension
1083 bundle2-input-bundle: with-transaction 1079 bundle2-input-bundle: with-transaction
1084 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported 1080 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
1085 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported 1081 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
1086 bundle2-input-bundle: 1 parts total 1082 bundle2-input-bundle: 1 parts total
1087 listing keys for "phases" 1083 listing keys for "phases"
1088 try to push obsolete markers to remote
1089 repository tip rolled back to revision 0 (undo push) 1084 repository tip rolled back to revision 0 (undo push)
1090 0:6675d58eff77 1085 0:6675d58eff77
1091 1086
1092 1087
1093 asterisk 1088 asterisk
1170 bundle2-input-bundle: with-transaction 1165 bundle2-input-bundle: with-transaction
1171 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported 1166 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
1172 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported 1167 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
1173 bundle2-input-bundle: 1 parts total 1168 bundle2-input-bundle: 1 parts total
1174 listing keys for "phases" 1169 listing keys for "phases"
1175 try to push obsolete markers to remote
1176 repository tip rolled back to revision 0 (undo push) 1170 repository tip rolled back to revision 0 (undo push)
1177 0:6675d58eff77 1171 0:6675d58eff77
1178 1172
1179 1173
1180 $ echo '[acl.deny]' >> $config 1174 $ echo '[acl.deny]' >> $config
1330 bundle2-input-bundle: with-transaction 1324 bundle2-input-bundle: with-transaction
1331 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported 1325 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
1332 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported 1326 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
1333 bundle2-input-bundle: 1 parts total 1327 bundle2-input-bundle: 1 parts total
1334 listing keys for "phases" 1328 listing keys for "phases"
1335 try to push obsolete markers to remote
1336 repository tip rolled back to revision 0 (undo push) 1329 repository tip rolled back to revision 0 (undo push)
1337 0:6675d58eff77 1330 0:6675d58eff77
1338 1331
1339 1332
1340 $ echo '[acl.deny]' >> $config 1333 $ echo '[acl.deny]' >> $config
1537 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported 1530 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
1538 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported 1531 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
1539 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported 1532 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
1540 bundle2-input-bundle: 2 parts total 1533 bundle2-input-bundle: 2 parts total
1541 listing keys for "phases" 1534 listing keys for "phases"
1542 try to push obsolete markers to remote
1543 repository tip rolled back to revision 2 (undo push) 1535 repository tip rolled back to revision 2 (undo push)
1544 2:fb35475503ef 1536 2:fb35475503ef
1545 1537
1546 1538
1547 Branch acl deny test 1539 Branch acl deny test
1834 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported 1826 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
1835 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported 1827 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
1836 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported 1828 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
1837 bundle2-input-bundle: 2 parts total 1829 bundle2-input-bundle: 2 parts total
1838 listing keys for "phases" 1830 listing keys for "phases"
1839 try to push obsolete markers to remote
1840 repository tip rolled back to revision 2 (undo push) 1831 repository tip rolled back to revision 2 (undo push)
1841 2:fb35475503ef 1832 2:fb35475503ef
1842 1833
1843 1834
1844 Branch acl conflicting allow 1835 Branch acl conflicting allow
1928 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported 1919 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
1929 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported 1920 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
1930 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported 1921 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
1931 bundle2-input-bundle: 2 parts total 1922 bundle2-input-bundle: 2 parts total
1932 listing keys for "phases" 1923 listing keys for "phases"
1933 try to push obsolete markers to remote
1934 repository tip rolled back to revision 2 (undo push) 1924 repository tip rolled back to revision 2 (undo push)
1935 2:fb35475503ef 1925 2:fb35475503ef
1936 1926
1937 Branch acl conflicting deny 1927 Branch acl conflicting deny
1938 1928
2090 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported 2080 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
2091 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported 2081 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
2092 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported 2082 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
2093 bundle2-input-bundle: 2 parts total 2083 bundle2-input-bundle: 2 parts total
2094 listing keys for "phases" 2084 listing keys for "phases"
2095 try to push obsolete markers to remote
2096 repository tip rolled back to revision 2 (undo push) 2085 repository tip rolled back to revision 2 (undo push)
2097 2:fb35475503ef 2086 2:fb35475503ef
2098 2087
2099 2088
2100 Non-astro users must be denied 2089 Non-astro users must be denied