0s autopkgtest [00:46:14]: starting date and time: 2026-02-03 00:46:14+0000 0s autopkgtest [00:46:14]: git checkout: 4b346b80 nova: make wait_reboot return success even when a no-op 0s autopkgtest [00:46:14]: host juju-7f2275-prod-proposed-migration-environment-2; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.unkjn2fd/out --timeout-copy=6000 --needs-internet=try --setup-commands /home/ubuntu/autopkgtest-cloud/worker-config-production/setup-canonical.sh --apt-pocket=proposed=src:dulwich --apt-upgrade hg-git --timeout-short=300 --timeout-copy=20000 --timeout-build=20000 --env=ADT_TEST_TRIGGERS=dulwich/1.0.0-2 -- ssh -s /home/ubuntu/autopkgtest/ssh-setup/nova -- --flavor autopkgtest-cpu2-ram4-disk20-ppc64el --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-2@sto01-ppc64el-23.secgroup --name adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-proposed-migration-environment-2-39976451-9b75-4ac8-84c8-0ed1e63afaa6 --image adt/ubuntu-resolute-ppc64el-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-2 --net-id=net_prod-autopkgtest-workers-ppc64el -e TERM=linux --mirror=http://ftpmaster.internal/ubuntu/ 4s Creating nova instance adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-proposed-migration-environment-2-39976451-9b75-4ac8-84c8-0ed1e63afaa6 from image adt/ubuntu-resolute-ppc64el-server-20260202.img (UUID ca98045c-2f99-4634-a243-9d47350236de)... 10s nova [E] nova boot failed (attempt #0): 10s nova [E] DEBUG (extension:189) found extension EntryPoint.parse('v1password = swiftclient.authv1:PasswordLoader') 10s DEBUG (extension:189) found extension EntryPoint.parse('noauth = cinderclient.contrib.noauth:CinderNoAuthLoader') 10s DEBUG (extension:189) found extension EntryPoint.parse('admin_token = keystoneauth1.loading._plugins.admin_token:AdminToken') 10s DEBUG (extension:189) found extension EntryPoint.parse('none = keystoneauth1.loading._plugins.noauth:NoAuth') 10s DEBUG (extension:189) found extension EntryPoint.parse('password = keystoneauth1.loading._plugins.identity.generic:Password') 10s DEBUG (extension:189) found extension EntryPoint.parse('token = keystoneauth1.loading._plugins.identity.generic:Token') 10s DEBUG (extension:189) found extension EntryPoint.parse('v2password = keystoneauth1.loading._plugins.identity.v2:Password') 10s DEBUG (extension:189) found extension EntryPoint.parse('v2token = keystoneauth1.loading._plugins.identity.v2:Token') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3adfspassword = keystoneauth1.extras._saml2._loading:ADFSPassword') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3applicationcredential = keystoneauth1.loading._plugins.identity.v3:ApplicationCredential') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3fedkerb = keystoneauth1.extras.kerberos._loading:MappedKerberos') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3kerberos = keystoneauth1.extras.kerberos._loading:Kerberos') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3multifactor = keystoneauth1.loading._plugins.identity.v3:MultiFactor') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3oauth1 = keystoneauth1.extras.oauth1._loading:V3OAuth1') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcaccesstoken = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectAccessToken') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcauthcode = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectAuthorizationCode') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcclientcredentials = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectClientCredentials') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcpassword = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectPassword') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3password = keystoneauth1.loading._plugins.identity.v3:Password') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3samlpassword = keystoneauth1.extras._saml2._loading:Saml2Password') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3token = keystoneauth1.loading._plugins.identity.v3:Token') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3tokenlessauth = keystoneauth1.loading._plugins.identity.v3:TokenlessAuth') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3totp = keystoneauth1.loading._plugins.identity.v3:TOTP') 10s DEBUG (session:517) REQ: curl -g -i -X GET https://keystone.ps7.canonical.com:5000/v3 -H "Accept: application/json" -H "User-Agent: nova keystoneauth1/4.0.0 python-requests/2.22.0 CPython/3.8.10" 10s DEBUG (connectionpool:939) Starting new HTTPS connection (1): keystone.ps7.canonical.com:5000 10s DEBUG (connectionpool:429) https://keystone.ps7.canonical.com:5000 "GET /v3 HTTP/1.1" 200 267 10s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 267 Content-Type: application/json Date: Tue, 03 Feb 2026 00:46:22 GMT Keep-Alive: timeout=75, max=1000 Server: Apache/2.4.52 (Ubuntu) Vary: X-Auth-Token x-openstack-request-id: req-8f38203d-86e7-4db1-a19b-3ea7fe3f263f 10s DEBUG (session:580) RESP BODY: {"version": {"id": "v3.14", "status": "stable", "updated": "2020-04-07T00:00:00Z", "links": [{"rel": "self", "href": "https://keystone.ps7.canonical.com:5000/v3/"}], "media-types": [{"base": "application/json", "type": "application/vnd.openstack.identity-v3+json"}]}} 10s DEBUG (session:946) GET call to https://keystone.ps7.canonical.com:5000/v3 used request id req-8f38203d-86e7-4db1-a19b-3ea7fe3f263f 10s DEBUG (base:182) Making authentication request to https://keystone.ps7.canonical.com:5000/v3/auth/tokens 10s DEBUG (connectionpool:429) https://keystone.ps7.canonical.com:5000 "POST /v3/auth/tokens HTTP/1.1" 201 12966 10s DEBUG (base:187) {"token": {"methods": ["password"], "user": {"domain": {"id": "default", "name": "Default"}, "id": "20f4f30c2cfd4bfe806cd0db10c0e446", "name": "prod-autopkgtest-workers-ppc64el", "password_expires_at": null}, "audit_ids": ["0SM9sgAkRHiHzLSlSOVFXg"], "expires_at": "2026-02-04T00:46:22.000000Z", "issued_at": "2026-02-03T00:46:22.000000Z", "project": {"domain": {"id": "default", "name": "Default"}, "id": "9bf77f46fd6c4d3da81ee79a717acf43", "name": "prod-autopkgtest-workers-ppc64el_project"}, "is_domain": false, "roles": [{"id": "a31fb543f37543d3b12c7fcb6e29636f", "name": "load-balancer_member"}, {"id": "9531825e299647e9b8713fcf36566f08", "name": "member"}, {"id": "c4de4cd4a6e842c48c193225243b4507", "name": "reader"}], "is_admin_project": false, "catalog": [{"endpoints": [{"id": "09e03191c89d4421aebaa8dcff0e22e3", "interface": "admin", "region_id": "prodstack7", "url": "https://heat-admin.ps7.canonical.com:8004/v1/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "0b44af32db1b408da5b67a834350711b", "interface": "internal", "region_id": "prodstack7", "url": "https://heat-internal.ps7.canonical.com:8004/v1/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "325f3c044aa54591be49e39f7260483d", "interface": "public", "region_id": "prodstack7", "url": "https://heat.ps7.canonical.com:8004/v1/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}], "id": "07902f28d63c4792bef57723f11a597e", "type": "orchestration", "name": "heat"}, {"endpoints": [{"id": "296a5126b56949f8abc8663ba48d7c69", "interface": "admin", "region_id": "prodstack7", "url": "https://nova-admin.ps7.canonical.com:8774/v2.1", "region": "prodstack7"}, {"id": "4ed46fd286814be9ad5f53c713db2b21", "interface": "public", "region_id": "prodstack7", "url": "https://nova.ps7.canonical.com:8774/v2.1", "region": "prodstack7"}, {"id": "f920fb8274c74c72b50e57ac95f88f51", "interface": "internal", "region_id": "prodstack7", "url": "https://nova-internal.ps7.canonical.com:8774/v2.1", "region": "prodstack7"}], "id": "0f4ee03d0c134dceb7ed6b2fa51eb189", "type": "compute", "name": "nova"}, {"endpoints": [{"id": "074ea936d15d47e8ba1b8f1347fdaeec", "interface": "admin", "region_id": "prodstack7", "url": "https://neutron-admin.ps7.canonical.com:9696", "region": "prodstack7"}, {"id": "4d5667208af943eab425bb1952f67d2f", "interface": "public", "region_id": "prodstack7", "url": "https://neutron.ps7.canonical.com:9696", "region": "prodstack7"}, {"id": "ae71a7dd75fc495fa3dd207ac977346d", "interface": "internal", "region_id": "prodstack7", "url": "https://neutron-internal.ps7.canonical.com:9696", "region": "prodstack7"}], "id": "1fde991012bf4a91a97b5b02cd662e5d", "type": "network", "name": "neutron"}, {"endpoints": [{"id": "5f3171f69df346c9a40ff13f8a9f3feb", "interface": "public", "region_id": "prodstack7", "url": "https://heat.ps7.canonical.com:8000/v1", "region": "prodstack7"}, {"id": "951c2c04417d456eb29a4cbd2675f1bc", "interface": "internal", "region_id": "prodstack7", "url": "https://heat-internal.ps7.canonical.com:8000/v1", "region": "prodstack7"}, {"id": "e4062e144ad243cbb53c8ce87aefee44", "interface": "admin", "region_id": "prodstack7", "url": "https://heat-admin.ps7.canonical.com:8000/v1", "region": "prodstack7"}], "id": "2c59c0123c304ef3824d75e9779ac5a3", "type": "cloudformation", "name": "heat-cfn"}, {"endpoints": [{"id": "4a95fbf112804721b96a3578858faf45", "interface": "internal", "region_id": "prodstack7", "url": "https://octavia-internal.ps7.canonical.com:9876", "region": "prodstack7"}, {"id": "56bed7c3efd54a57bae11cc93844edc5", "interface": "public", "region_id": "prodstack7", "url": "https://octavia.ps7.canonical.com:9876", "region": "prodstack7"}, {"id": "e9c2ec6bc0e94e1e8ca6b15aa24b9294", "interface": "admin", "region_id": "prodstack7", "url": "https://octavia-admin.ps7.canonical.com:9876", "region": "prodstack7"}], "id": "4e42217a7f46428b87e7458a8a73942c", "type": "load-balancer", "name": "octavia"}, {"endpoints": [{"id": "29929a56ac7944d8867150f9d9a51ffe", "interface": "public", "region_id": "prodstack7", "url": "https://gnocchi.ps7.canonical.com:8041", "region": "prodstack7"}, {"id": "d1146fdec43e4c339f3c0766fda1923d", "interface": "internal", "region_id": "prodstack7", "url": "https://gnocchi-internal.ps7.canonical.com:8041", "region": "prodstack7"}, {"id": "ff5d256a28064e13b52758d6206687eb", "interface": "admin", "region_id": "prodstack7", "url": "https://gnocchi-admin.ps7.canonical.com:8041", "region": "prodstack7"}], "id": "50872dac84974216b104c7eef043dfe6", "type": "metric", "name": "gnocchi"}, {"endpoints": [{"id": "3901a2889b584fe5baf1325da2d5571c", "interface": "internal", "region_id": "prodstack7", "url": "https://aodh-internal.ps7.canonical.com:8042", "region": "prodstack7"}, {"id": "94f9e723537a4d0ab35ab53fe1af6f01", "interface": "public", "region_id": "prodstack7", "url": "https://aodh.ps7.canonical.com:8042", "region": "prodstack7"}, {"id": "f3fc8781a98149c680bd7f34c6893410", "interface": "admin", "region_id": "prodstack7", "url": "https://aodh-admin.ps7.canonical.com:8042", "region": "prodstack7"}], "id": "6f7af5495c2447c9bf258f72605a99b1", "type": "alarming", "name": "aodh"}, {"endpoints": [{"id": "0592d4bf15d54ba8aac00dfc34292295", "interface": "admin", "region_id": "prodstack7", "url": "https://keystone-admin.ps7.canonical.com:35357/v3", "region": "prodstack7"}, {"id": "1f5df236ded54026af4f5e947a599b2f", "interface": "internal", "region_id": "prodstack7", "url": "https://keystone-internal.ps7.canonical.com:5000/v3", "region": "prodstack7"}, {"id": "cd17fef7e3d246b3974b2ffe55b7889c", "interface": "public", "region_id": "prodstack7", "url": "https://keystone.ps7.canonical.com:5000/v3", "region": "prodstack7"}], "id": "7ad024307b634ea989f1e03d73d7737b", "type": "identity", "name": "keystone"}, {"endpoints": [{"id": "001dac935b6c44b1ad62c90175538578", "interface": "admin", "region_id": "prodstack7", "url": "https://cinder-admin.ps7.canonical.com:8776/v3/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "90abac2983a34488bb6ada4e5004bb99", "interface": "public", "region_id": "prodstack7", "url": "https://cinder.ps7.canonical.com:8776/v3/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "e49add7152684a8e9e1e3ea9502b5dc6", "interface": "internal", "region_id": "prodstack7", "url": "https://cinder-internal.ps7.canonical.com:8776/v3/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}], "id": "7bea8b97c0304a62afd8325515928cc0", "type": "volumev3", "name": "cinderv3"}, {"endpoints": [{"id": "2450babeee5e4fe49947cbe7bcc0f3c3", "interface": "public", "region_id": "prodstack7", "url": "https://designate.ps7.canonical.com:9001", "region": "prodstack7"}, {"id": "c2e77ece29cd4dc7bf518bb51c619cce", "interface": "internal", "region_id": "prodstack7", "url": "https://designate-internal.ps7.canonical.com:9001", "region": "prodstack7"}, {"id": "fc292615aa2d43ff943da365870944ce", "interface": "admin", "region_id": "prodstack7", "url": "https://designate-admin.ps7.canonical.com:9001", "region": "prodstack7"}], "id": "8d13654c658644c4a375ce8428638f3d", "type": "dns", "name": "designate"}, {"endpoints": [{"id": "604f1f7088c54ec4a558d1747b0e7396", "interface": "public", "region_id": "prodstack7", "url": "https://barbican.ps7.canonical.com:9311", "region": "prodstack7"}, {"id": "81268c6bd3524a4d85af3d6faa426863", "interface": "admin", "region_id": "prodstack7", "url": "https://barbican-admin.ps7.canonical.com:9312", "region": "prodstack7"}, {"id": "becc73f676f34e66ab1daf0fbcb42366", "interface": "internal", "region_id": "prodstack7", "url": "https://barbican-internal.ps7.canonical.com:9311", "region": "prodstack7"}], "id": "8df4ed7c02d44fe28ec72b1e19e3f66f", "type": "key-manager", "name": "barbican"}, {"endpoints": [{"id": "38557e1243014f1abaa578a61bb0a387", "interface": "public", "region_id": "prodstack7", "url": "https://manila.ps7.canonical.com:8786/v1/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "b12d5a4329f94a1fa6dbd2cd38ebcd52", "interface": "internal", "region_id": "prodstack7", "url": "https://manila-internal.ps7.canonical.com:8786/v1/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "bc081c0d5d954446b7ee77886f5d68a3", "interface": "admin", "region_id": "prodstack7", "url": "https://manila-admin.ps7.canonical.com:8786/v1/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}], "id": "8e7967c2620d49448787e035e8f21af0", "type": "share", "name": "manila"}, {"endpoints": [{"id": "03802d072c514ae484a2d26be0c906af", "interface": "public", "region_id": "prodstack7", "url": "https://radosgw.ps7.canonical.com:443/", "region": "prodstack7"}, {"id": "c07a315e261f430d94542a872596d654", "interface": "admin", "region_id": "prodstack7", "url": "https://radosgw-admin.ps7.canonical.com:443/", "region": "prodstack7"}, {"id": "d62fcd20c1e34d64930fbec97503a40a", "interface": "internal", "region_id": "prodstack7", "url": "https://radosgw-internal.ps7.canonical.com:443/", "region": "prodstack7"}], "id": "9569f1b0b4714254a3d116760dc3968d", "type": "s3", "name": "s3"}, {"endpoints": [{"id": "0e64627804e741e5948b4d35e1914624", "interface": "internal", "region_id": "RegionOne", "url": "http://10.150.13.75", "region": "RegionOne"}, {"id": "12d47bbd1cc64dbf8d4e442b821c64f2", "interface": "admin", "region_id": "prodstack7", "url": "https://radosgw-admin.ps7.canonical.com:443/swift/simplestreams/data", "region": "prodstack7"}, {"id": "35aba6c3a1fc4041b30963e8b6c7b929", "interface": "public", "region_id": "prodstack7", "url": "https://radosgw.ps7.canonical.com:443/swift/v1/AUTH_588a6b5285ea4ed38ae122d264c01490/simplestreams/data", "region": "prodstack7"}, {"id": "35bc5168fcc2414a9d89313cdef8bca9", "interface": "admin", "region_id": "RegionOne", "url": "http://10.150.13.75", "region": "RegionOne"}, {"id": "5f7980b3f8e746e6bbd66c9cef81714e", "interface": "public", "region_id": "RegionOne", "url": "http://10.150.13.75", "region": "RegionOne"}, {"id": "739ab5131dff4cdbb3151f6de36b36f6", "interface": "internal", "region_id": "prodstack7", "url": "https://radosgw-internal.ps7.canonical.com:443/swift/v1/AUTH_588a6b5285ea4ed38ae122d264c01490/simplestreams/data", "region": "prodstack7"}], "id": "b28a039721b147af8e77d77242d4297f", "type": "product-streams", "name": "image-stream"}, {"endpoints": [{"id": "9321fba4588641dbb1c9f89508f1bf23", "interface": "internal", "region_id": "prodstack7", "url": "https://placement-internal.ps7.canonical.com:8778", "region": "prodstack7"}, {"id": "9a75eebf33e7409d9b69dc7e650f756c", "interface": "admin", "region_id": "prodstack7", "url": "https://placement-admin.ps7.canonical.com:8778", "region": "prodstack7"}, {"id": "c03942ddacb94fe39c1529aa74bd31c1", "interface": "public", "region_id": "prodstack7", "url": "https://placement.ps7.canonical.com:8778", "region": "prodstack7"}], "id": "bc5c019477934e89bab2a097e8df84b6", "type": "placement", "name": "placement"}, {"endpoints": [{"id": "b8152f5e649d4603ac092897639d38c9", "interface": "admin", "region_id": "prodstack7", "url": "https://radosgw-admin.ps7.canonical.com:443/swift", "region": "prodstack7"}, {"id": "baa313d85b904c308b7a5c98505fc32c", "interface": "internal", "region_id": "prodstack7", "url": "https://radosgw-internal.ps7.canonical.com:443/swift/v1/AUTH_9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "c17c3db416224561b5e045562bbe76bf", "interface": "public", "region_id": "prodstack7", "url": "https://radosgw.ps7.canonical.com:443/swift/v1/AUTH_9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}], "id": "c6dd2bcf96bf44c2a99e39d1302563f1", "type": "object-store", "name": "swift"}, {"endpoints": [{"id": "526da263451648898c9187c65f441a1c", "interface": "public", "region_id": "prodstack7", "url": "https://glance.ps7.canonical.com:9292", "region": "prodstack7"}, {"id": "61b55755ca9e4e2ab04a144f92cb6e97", "interface": "admin", "region_id": "prodstack7", "url": "https://glance-admin.ps7.canonical.com:9292", "region": "prodstack7"}, {"id": "9080969b2cde4926b647f63b9591233c", "interface": "internal", "region_id": "prodstack7", "url": "https://glance-internal.ps7.canonical.com:9292", "region": "prodstack7"}], "id": "dd3a22e287464998be0514a67dafb7e4", "type": "image", "name": "glance"}, {"endpoints": [{"id": "2f4dcba2a4ce46b2a2e3cf103fd929f4", "interface": "admin", "region_id": "prodstack7", "url": "https://manila-admin.ps7.canonical.com:8786/v2/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "789faa303fb54473b9449fa2f52866b3", "interface": "internal", "region_id": "prodstack7", "url": "https://manila-internal.ps7.canonical.com:8786/v2/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "fa7fa08da5e147df8dbc9528f3d7135b", "interface": "public", "region_id": "prodstack7", "url": "https://manila.ps7.canonical.com:8786/v2/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}], "id": "f6880aea736446b8a4232e0cf3528a12", "type": "sharev2", "name": "manilav2"}]}} 10s REQ: curl -g -i -X GET https://nova.ps7.canonical.com:8774/v2.1 -H "Accept: application/json" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3202a25771abc04e11800226669353cf02d0ac5adb7436969d6ec631939dd63c" 10s DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps7.canonical.com:8774/v2.1 -H "Accept: application/json" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3202a25771abc04e11800226669353cf02d0ac5adb7436969d6ec631939dd63c" 10s DEBUG (connectionpool:939) Starting new HTTPS connection (1): nova.ps7.canonical.com:8774 10s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "GET /v2.1 HTTP/1.1" 302 0 10s RESP: [302] Connection: Keep-Alive Content-Length: 0 Content-Type: text/plain; charset=utf8 Date: Tue, 03 Feb 2026 00:46:22 GMT Keep-Alive: timeout=75, max=1000 Location: https://nova.ps7.canonical.com:8774/v2.1/ Server: Apache/2.4.52 (Ubuntu) x-compute-request-id: req-e1209a2c-8469-4cfb-9dab-7ed2fc3811ff x-openstack-request-id: req-e1209a2c-8469-4cfb-9dab-7ed2fc3811ff 10s DEBUG (session:548) RESP: [302] Connection: Keep-Alive Content-Length: 0 Content-Type: text/plain; charset=utf8 Date: Tue, 03 Feb 2026 00:46:22 GMT Keep-Alive: timeout=75, max=1000 Location: https://nova.ps7.canonical.com:8774/v2.1/ Server: Apache/2.4.52 (Ubuntu) x-compute-request-id: req-e1209a2c-8469-4cfb-9dab-7ed2fc3811ff x-openstack-request-id: req-e1209a2c-8469-4cfb-9dab-7ed2fc3811ff 10s RESP BODY: Omitted, Content-Type is set to text/plain; charset=utf8. Only application/json responses have their bodies logged. 10s DEBUG (session:580) RESP BODY: Omitted, Content-Type is set to text/plain; charset=utf8. Only application/json responses have their bodies logged. 10s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "GET /v2.1/ HTTP/1.1" 200 397 10s RESP: [200] Connection: Keep-Alive Content-Length: 397 Content-Type: application/json Date: Tue, 03 Feb 2026 00:46:22 GMT Keep-Alive: timeout=75, max=999 OpenStack-API-Version: compute 2.1 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.1 x-compute-request-id: req-f976760f-5db0-4f1f-be01-c4432698701e x-openstack-request-id: req-f976760f-5db0-4f1f-be01-c4432698701e 10s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 397 Content-Type: application/json Date: Tue, 03 Feb 2026 00:46:22 GMT Keep-Alive: timeout=75, max=999 OpenStack-API-Version: compute 2.1 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.1 x-compute-request-id: req-f976760f-5db0-4f1f-be01-c4432698701e x-openstack-request-id: req-f976760f-5db0-4f1f-be01-c4432698701e 10s RESP BODY: {"version": {"id": "v2.1", "status": "CURRENT", "version": "2.96", "min_version": "2.1", "updated": "2013-07-23T11:33:21Z", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/"}, {"rel": "describedby", "type": "text/html", "href": "http://docs.openstack.org/"}], "media-types": [{"base": "application/json", "type": "application/vnd.openstack.compute+json;version=2.1"}]}} 10s DEBUG (session:580) RESP BODY: {"version": {"id": "v2.1", "status": "CURRENT", "version": "2.96", "min_version": "2.1", "updated": "2013-07-23T11:33:21Z", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/"}, {"rel": "describedby", "type": "text/html", "href": "http://docs.openstack.org/"}], "media-types": [{"base": "application/json", "type": "application/vnd.openstack.compute+json;version=2.1"}]}} 10s GET call to compute for https://nova.ps7.canonical.com:8774/v2.1/ used request id req-f976760f-5db0-4f1f-be01-c4432698701e 10s DEBUG (session:936) GET call to compute for https://nova.ps7.canonical.com:8774/v2.1/ used request id req-f976760f-5db0-4f1f-be01-c4432698701e 10s DEBUG (extension:189) found extension EntryPoint.parse('v1password = swiftclient.authv1:PasswordLoader') 10s DEBUG (extension:189) found extension EntryPoint.parse('noauth = cinderclient.contrib.noauth:CinderNoAuthLoader') 10s DEBUG (extension:189) found extension EntryPoint.parse('admin_token = keystoneauth1.loading._plugins.admin_token:AdminToken') 10s DEBUG (extension:189) found extension EntryPoint.parse('none = keystoneauth1.loading._plugins.noauth:NoAuth') 10s DEBUG (extension:189) found extension EntryPoint.parse('password = keystoneauth1.loading._plugins.identity.generic:Password') 10s DEBUG (extension:189) found extension EntryPoint.parse('token = keystoneauth1.loading._plugins.identity.generic:Token') 10s DEBUG (extension:189) found extension EntryPoint.parse('v2password = keystoneauth1.loading._plugins.identity.v2:Password') 10s DEBUG (extension:189) found extension EntryPoint.parse('v2token = keystoneauth1.loading._plugins.identity.v2:Token') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3adfspassword = keystoneauth1.extras._saml2._loading:ADFSPassword') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3applicationcredential = keystoneauth1.loading._plugins.identity.v3:ApplicationCredential') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3fedkerb = keystoneauth1.extras.kerberos._loading:MappedKerberos') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3kerberos = keystoneauth1.extras.kerberos._loading:Kerberos') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3multifactor = keystoneauth1.loading._plugins.identity.v3:MultiFactor') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3oauth1 = keystoneauth1.extras.oauth1._loading:V3OAuth1') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcaccesstoken = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectAccessToken') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcauthcode = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectAuthorizationCode') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcclientcredentials = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectClientCredentials') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcpassword = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectPassword') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3password = keystoneauth1.loading._plugins.identity.v3:Password') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3samlpassword = keystoneauth1.extras._saml2._loading:Saml2Password') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3token = keystoneauth1.loading._plugins.identity.v3:Token') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3tokenlessauth = keystoneauth1.loading._plugins.identity.v3:TokenlessAuth') 10s DEBUG (extension:189) found extension EntryPoint.parse('v3totp = keystoneauth1.loading._plugins.identity.v3:TOTP') 10s DEBUG (session:517) REQ: curl -g -i -X GET https://glance.ps7.canonical.com:9292/v2/images/ca98045c-2f99-4634-a243-9d47350236de -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3202a25771abc04e11800226669353cf02d0ac5adb7436969d6ec631939dd63c" -H "X-OpenStack-Nova-API-Version: 2.87" 10s DEBUG (connectionpool:939) Starting new HTTPS connection (1): glance.ps7.canonical.com:9292 10s DEBUG (connectionpool:429) https://glance.ps7.canonical.com:9292 "GET /v2/images/ca98045c-2f99-4634-a243-9d47350236de HTTP/1.1" 200 2267 10s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 2267 Content-Type: application/json Date: Tue, 03 Feb 2026 00:46:23 GMT Keep-Alive: timeout=75, max=1000 Server: Apache/2.4.52 (Ubuntu) X-Openstack-Request-Id: req-18282c8d-0082-4c24-8934-dd4e7d36c960 10s DEBUG (session:580) RESP BODY: {"architecture": "ppc64le", "base_image_ref": "1817ca74-e109-4221-8791-3fc9207e3533", "boot_roles": "member,load-balancer_member,reader", "content_id": "auto.sync", "hw_cdrom_bus": "scsi", "hw_disk_bus": "virtio", "hw_machine_type": "pseries", "hw_video_model": "vga", "hw_vif_model": "virtio", "image_location": "snapshot", "image_state": "available", "image_type": "snapshot", "img_config_drive": "mandatory", "instance_uuid": "28a15a23-fb43-4067-a907-286858b50c0e", "item_name": "disk1.img", "os_distro": "ubuntu", "os_version": "26.04", "owner_id": "9bf77f46fd6c4d3da81ee79a717acf43", "owner_project_name": "prod-autopkgtest-workers-ppc64el_project", "owner_user_name": "prod-autopkgtest-workers-ppc64el", "product_name": "com.ubuntu.cloud.daily:server:26.04:ppc64el", "simplestreams_metadata": "{\"aliases\": \"26.04,r,resolute,devel\", \"arch\": \"ppc64el\", \"ftype\": \"disk1.img\", \"label\": \"daily\", \"os\": \"ubuntu\", \"pubname\": \"ubuntu-resolute-daily-ppc64el-server-20260127\", \"release\": \"resolute\", \"release_codename\": \"Resolute Raccoon\", \"release_title\": \"2", "source_content_id": "com.ubuntu.cloud:daily:download", "user_id": "20f4f30c2cfd4bfe806cd0db10c0e446", "version_name": "20260127", "name": "adt/ubuntu-resolute-ppc64el-server-20260202.img", "disk_format": "qcow2", "container_format": "bare", "visibility": "private", "size": 2865954816, "virtual_size": 21474836480, "status": "active", "checksum": "6ad93313de25c3518f40dea44f47e332", "protected": false, "min_ram": 0, "min_disk": 20, "owner": "9bf77f46fd6c4d3da81ee79a717acf43", "os_hidden": false, "os_hash_algo": "sha256", "os_hash_value": "31d17570a370d1150f702fd59f3f37a5350f6c7d1a1bebbb79e93f4749c1e42c", "id": "ca98045c-2f99-4634-a243-9d47350236de", "created_at": "2026-02-02T14:51:13Z", "updated_at": "2026-02-02T14:52:43Z", "locations": [{"url": "rbd://d8b83d88-b70a-11ef-be0b-2390f458e7bc/glance/ca98045c-2f99-4634-a243-9d47350236de/snap", "metadata": {"store": "ceph"}}], "direct_url": "rbd://d8b83d88-b70a-11ef-be0b-2390f458e7bc/glance/ca98045c-2f99-4634-a243-9d47350236de/snap", "tags": [], "self": "/v2/images/ca98045c-2f99-4634-a243-9d47350236de", "file": "/v2/images/ca98045c-2f99-4634-a243-9d47350236de/file", "schema": "/v2/schemas/image", "stores": "ceph"} 10s DEBUG (session:936) GET call to image for https://glance.ps7.canonical.com:9292/v2/images/ca98045c-2f99-4634-a243-9d47350236de used request id req-18282c8d-0082-4c24-8934-dd4e7d36c960 10s DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps7.canonical.com:8774/v2.1/flavors/autopkgtest-cpu2-ram4-disk20-ppc64el -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3202a25771abc04e11800226669353cf02d0ac5adb7436969d6ec631939dd63c" -H "X-OpenStack-Nova-API-Version: 2.87" 10s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "GET /v2.1/flavors/autopkgtest-cpu2-ram4-disk20-ppc64el HTTP/1.1" 404 109 10s DEBUG (session:548) RESP: [404] Connection: Keep-Alive Content-Length: 109 Content-Type: application/json; charset=UTF-8 Date: Tue, 03 Feb 2026 00:46:23 GMT Keep-Alive: timeout=75, max=998 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-ea41b69d-539a-4179-b850-7d1838cc4417 x-openstack-request-id: req-ea41b69d-539a-4179-b850-7d1838cc4417 10s DEBUG (session:580) RESP BODY: {"itemNotFound": {"code": 404, "message": "Flavor autopkgtest-cpu2-ram4-disk20-ppc64el could not be found."}} 10s DEBUG (session:936) GET call to compute for https://nova.ps7.canonical.com:8774/v2.1/flavors/autopkgtest-cpu2-ram4-disk20-ppc64el used request id req-ea41b69d-539a-4179-b850-7d1838cc4417 10s DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps7.canonical.com:8774/v2.1/flavors?is_public=None -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3202a25771abc04e11800226669353cf02d0ac5adb7436969d6ec631939dd63c" -H "X-OpenStack-Nova-API-Version: 2.87" 10s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "GET /v2.1/flavors?is_public=None HTTP/1.1" 200 2423 10s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 2423 Content-Type: application/json Date: Tue, 03 Feb 2026 00:46:23 GMT Keep-Alive: timeout=75, max=997 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-54ccbd5f-b561-4804-9ce4-5b58d5894034 x-openstack-request-id: req-54ccbd5f-b561-4804-9ce4-5b58d5894034 10s DEBUG (session:580) RESP BODY: {"flavors": [{"id": "53d845ba-20b6-47b0-8d36-14129b383b2c", "name": "shared.large.ppc64el", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/flavors/53d845ba-20b6-47b0-8d36-14129b383b2c"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/flavors/53d845ba-20b6-47b0-8d36-14129b383b2c"}], "description": null}, {"id": "6d15d6b4-4956-4aab-940e-fc2f21abb355", "name": "shared.xlarge.ppc64el", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/flavors/6d15d6b4-4956-4aab-940e-fc2f21abb355"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/flavors/6d15d6b4-4956-4aab-940e-fc2f21abb355"}], "description": null}, {"id": "84d9214c-6238-49ad-bcd4-68651b0fff84", "name": "shared.medium.ppc64el", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/flavors/84d9214c-6238-49ad-bcd4-68651b0fff84"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/flavors/84d9214c-6238-49ad-bcd4-68651b0fff84"}], "description": null}, {"id": "af3a4807-1a67-45b0-a4ec-851f7f915480", "name": "autopkgtest-cpu4-ram16-disk100-ppc64el", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/flavors/af3a4807-1a67-45b0-a4ec-851f7f915480"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/flavors/af3a4807-1a67-45b0-a4ec-851f7f915480"}], "description": null}, {"id": "cdd26b7a-512f-4e40-a56b-a8628e74c273", "name": "autopkgtest-cpu2-ram4-disk20-ppc64el", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/flavors/cdd26b7a-512f-4e40-a56b-a8628e74c273"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/flavors/cdd26b7a-512f-4e40-a56b-a8628e74c273"}], "description": null}, {"id": "d2b33018-ef27-42d3-9878-e3b4816cec50", "name": "shared.xsmall.ppc64el", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/flavors/d2b33018-ef27-42d3-9878-e3b4816cec50"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/flavors/d2b33018-ef27-42d3-9878-e3b4816cec50"}], "description": null}, {"id": "e9e0185b-b47d-42ce-bd30-0892a3bf026a", "name": "shared.small.ppc64el", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/flavors/e9e0185b-b47d-42ce-bd30-0892a3bf026a"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/flavors/e9e0185b-b47d-42ce-bd30-0892a3bf026a"}], "description": null}]} 10s DEBUG (session:936) GET call to compute for https://nova.ps7.canonical.com:8774/v2.1/flavors?is_public=None used request id req-54ccbd5f-b561-4804-9ce4-5b58d5894034 10s DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps7.canonical.com:8774/v2.1/flavors/cdd26b7a-512f-4e40-a56b-a8628e74c273 -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3202a25771abc04e11800226669353cf02d0ac5adb7436969d6ec631939dd63c" -H "X-OpenStack-Nova-API-Version: 2.87" 10s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "GET /v2.1/flavors/cdd26b7a-512f-4e40-a56b-a8628e74c273 HTTP/1.1" 200 706 10s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 706 Content-Type: application/json Date: Tue, 03 Feb 2026 00:46:23 GMT Keep-Alive: timeout=75, max=996 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-60531311-1a0a-4a82-8f8c-1dda0169b077 x-openstack-request-id: req-60531311-1a0a-4a82-8f8c-1dda0169b077 10s DEBUG (session:580) RESP BODY: {"flavor": {"id": "cdd26b7a-512f-4e40-a56b-a8628e74c273", "name": "autopkgtest-cpu2-ram4-disk20-ppc64el", "ram": 4096, "disk": 20, "swap": 0, "OS-FLV-EXT-DATA:ephemeral": 0, "OS-FLV-DISABLED:disabled": false, "vcpus": 2, "os-flavor-access:is_public": false, "rxtx_factor": 1.0, "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/flavors/cdd26b7a-512f-4e40-a56b-a8628e74c273"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/flavors/cdd26b7a-512f-4e40-a56b-a8628e74c273"}], "description": null, "extra_specs": {"aggregate_instance_extra_specs:commit": "ppc64el", "hw:cpu_policy": "shared", "hw:mem_page_size": "large", "hw:pci_numa_affinity_policy": "preferred"}}} 10s DEBUG (session:936) GET call to compute for https://nova.ps7.canonical.com:8774/v2.1/flavors/cdd26b7a-512f-4e40-a56b-a8628e74c273 used request id req-60531311-1a0a-4a82-8f8c-1dda0169b077 10s DEBUG (session:517) REQ: curl -g -i -X POST https://nova.ps7.canonical.com:8774/v2.1/servers -H "Accept: application/json" -H "Content-Type: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3202a25771abc04e11800226669353cf02d0ac5adb7436969d6ec631939dd63c" -H "X-OpenStack-Nova-API-Version: 2.87" -d '{"server": {"name": "adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-proposed-migration-environment-2-39976451-9b75-4ac8-84c8-0ed1e63afaa6", "imageRef": "ca98045c-2f99-4634-a243-9d47350236de", "flavorRef": "cdd26b7a-512f-4e40-a56b-a8628e74c273", "user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJyA+PiAvZXRjL2Vudmlyb25tZW50CiAtIHNlZCAtaSAtciAnL14xMjcuMC4xLjEvIHMvYXV0b3BrZ3Rlc3QtW14gXStcLi9hdXRvcGtndGVzdFwuLycgL2V0Yy9ob3N0cwo=", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-2", "min_count": 1, "max_count": 1, "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-2@sto01-ppc64el-23.secgroup"}], "networks": [{"uuid": "c4c76c34-f8c1-479e-a79a-8c9382a6ed25"}]}}' 10s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "POST /v2.1/servers HTTP/1.1" 202 478 10s DEBUG (session:548) RESP: [202] Connection: Keep-Alive Content-Length: 478 Content-Type: application/json Date: Tue, 03 Feb 2026 00:46:23 GMT Keep-Alive: timeout=75, max=995 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 location: https://nova.ps7.canonical.com:8774/v2.1/servers/f56b4e1c-2629-4aa5-b5ae-d21b9364f514 x-compute-request-id: req-f756ee9c-114f-43de-bb56-2bd7708264b0 x-openstack-request-id: req-f756ee9c-114f-43de-bb56-2bd7708264b0 10s DEBUG (session:580) RESP BODY: {"server": {"id": "f56b4e1c-2629-4aa5-b5ae-d21b9364f514", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/servers/f56b4e1c-2629-4aa5-b5ae-d21b9364f514"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/servers/f56b4e1c-2629-4aa5-b5ae-d21b9364f514"}], "OS-DCF:diskConfig": "MANUAL", "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-2@sto01-ppc64el-23.secgroup"}], "adminPass": "Lm2UVb9kpr2c"}} 10s DEBUG (session:936) POST call to compute for https://nova.ps7.canonical.com:8774/v2.1/servers used request id req-f756ee9c-114f-43de-bb56-2bd7708264b0 10s DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps7.canonical.com:8774/v2.1/servers/f56b4e1c-2629-4aa5-b5ae-d21b9364f514 -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3202a25771abc04e11800226669353cf02d0ac5adb7436969d6ec631939dd63c" -H "X-OpenStack-Nova-API-Version: 2.87" 10s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "GET /v2.1/servers/f56b4e1c-2629-4aa5-b5ae-d21b9364f514 HTTP/1.1" 200 2713 10s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 2713 Content-Type: application/json Date: Tue, 03 Feb 2026 00:46:23 GMT Keep-Alive: timeout=75, max=994 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-35997f3c-7f97-4c93-a9e7-8d80761dbb19 x-openstack-request-id: req-35997f3c-7f97-4c93-a9e7-8d80761dbb19 10s DEBUG (session:580) RESP BODY: {"server": {"id": "f56b4e1c-2629-4aa5-b5ae-d21b9364f514", "name": "adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-proposed-migration-environment-2-39976451-9b75-4ac8-84c8-0ed1e63afaa6", "status": "BUILD", "tenant_id": "9bf77f46fd6c4d3da81ee79a717acf43", "user_id": "20f4f30c2cfd4bfe806cd0db10c0e446", "metadata": {}, "hostId": "", "image": {"id": "ca98045c-2f99-4634-a243-9d47350236de", "links": [{"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/images/ca98045c-2f99-4634-a243-9d47350236de"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest-cpu2-ram4-disk20-ppc64el", "extra_specs": {"aggregate_instance_extra_specs:commit": "ppc64el", "hw:cpu_policy": "shared", "hw:mem_page_size": "large", "hw:pci_numa_affinity_policy": "preferred"}}, "created": "2026-02-03T00:46:24Z", "updated": "2026-02-03T00:46:23Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/servers/f56b4e1c-2629-4aa5-b5ae-d21b9364f514"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/servers/f56b4e1c-2629-4aa5-b5ae-d21b9364f514"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-2", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "OS-EXT-SRV-ATTR:host": null, "OS-EXT-SRV-ATTR:instance_name": "", "OS-EXT-SRV-ATTR:hypervisor_hostname": null, "OS-EXT-SRV-ATTR:reservation_id": "r-j1snqsm1", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-pr", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": null, "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJyA+PiAvZXRjL2Vudmlyb25tZW50CiAtIHNlZCAtaSAtciAnL14xMjcuMC4xLjEvIHMvYXV0b3BrZ3Rlc3QtW14gXStcLi9hdXRvcGtndGVzdFwuLycgL2V0Yy9ob3N0cwo=", "OS-EXT-STS:task_state": "scheduling", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 10s DEBUG (session:936) GET call to compute for https://nova.ps7.canonical.com:8774/v2.1/servers/f56b4e1c-2629-4aa5-b5ae-d21b9364f514 used request id req-35997f3c-7f97-4c93-a9e7-8d80761dbb19 10s DEBUG (session:517) REQ: curl -g -i -X GET https://glance.ps7.canonical.com:9292/v2/images/ca98045c-2f99-4634-a243-9d47350236de -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3202a25771abc04e11800226669353cf02d0ac5adb7436969d6ec631939dd63c" -H "X-OpenStack-Nova-API-Version: 2.87" 10s DEBUG (connectionpool:429) https://glance.ps7.canonical.com:9292 "GET /v2/images/ca98045c-2f99-4634-a243-9d47350236de HTTP/1.1" 200 2267 10s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 2267 Content-Type: application/json Date: Tue, 03 Feb 2026 00:46:23 GMT Keep-Alive: timeout=75, max=999 Server: Apache/2.4.52 (Ubuntu) X-Openstack-Request-Id: req-49aee83f-5164-4c56-aa1a-ae3b9df073b3 10s DEBUG (session:580) RESP BODY: {"architecture": "ppc64le", "base_image_ref": "1817ca74-e109-4221-8791-3fc9207e3533", "boot_roles": "member,load-balancer_member,reader", "content_id": "auto.sync", "hw_cdrom_bus": "scsi", "hw_disk_bus": "virtio", "hw_machine_type": "pseries", "hw_video_model": "vga", "hw_vif_model": "virtio", "image_location": "snapshot", "image_state": "available", "image_type": "snapshot", "img_config_drive": "mandatory", "instance_uuid": "28a15a23-fb43-4067-a907-286858b50c0e", "item_name": "disk1.img", "os_distro": "ubuntu", "os_version": "26.04", "owner_id": "9bf77f46fd6c4d3da81ee79a717acf43", "owner_project_name": "prod-autopkgtest-workers-ppc64el_project", "owner_user_name": "prod-autopkgtest-workers-ppc64el", "product_name": "com.ubuntu.cloud.daily:server:26.04:ppc64el", "simplestreams_metadata": "{\"aliases\": \"26.04,r,resolute,devel\", \"arch\": \"ppc64el\", \"ftype\": \"disk1.img\", \"label\": \"daily\", \"os\": \"ubuntu\", \"pubname\": \"ubuntu-resolute-daily-ppc64el-server-20260127\", \"release\": \"resolute\", \"release_codename\": \"Resolute Raccoon\", \"release_title\": \"2", "source_content_id": "com.ubuntu.cloud:daily:download", "user_id": "20f4f30c2cfd4bfe806cd0db10c0e446", "version_name": "20260127", "name": "adt/ubuntu-resolute-ppc64el-server-20260202.img", "disk_format": "qcow2", "container_format": "bare", "visibility": "private", "size": 2865954816, "virtual_size": 21474836480, "status": "active", "checksum": "6ad93313de25c3518f40dea44f47e332", "protected": false, "min_ram": 0, "min_disk": 20, "owner": "9bf77f46fd6c4d3da81ee79a717acf43", "os_hidden": false, "os_hash_algo": "sha256", "os_hash_value": "31d17570a370d1150f702fd59f3f37a5350f6c7d1a1bebbb79e93f4749c1e42c", "id": "ca98045c-2f99-4634-a243-9d47350236de", "created_at": "2026-02-02T14:51:13Z", "updated_at": "2026-02-02T14:52:43Z", "locations": [{"url": "rbd://d8b83d88-b70a-11ef-be0b-2390f458e7bc/glance/ca98045c-2f99-4634-a243-9d47350236de/snap", "metadata": {"store": "ceph"}}], "direct_url": "rbd://d8b83d88-b70a-11ef-be0b-2390f458e7bc/glance/ca98045c-2f99-4634-a243-9d47350236de/snap", "tags": [], "self": "/v2/images/ca98045c-2f99-4634-a243-9d47350236de", "file": "/v2/images/ca98045c-2f99-4634-a243-9d47350236de/file", "schema": "/v2/schemas/image", "stores": "ceph"} 10s DEBUG (session:936) GET call to image for https://glance.ps7.canonical.com:9292/v2/images/ca98045c-2f99-4634-a243-9d47350236de used request id req-49aee83f-5164-4c56-aa1a-ae3b9df073b3 10s +--------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------+ 10s | Property | Value | 10s +--------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------+ 10s | OS-DCF:diskConfig | MANUAL | 10s | OS-EXT-AZ:availability_zone | | 10s | OS-EXT-SRV-ATTR:host | - | 10s | OS-EXT-SRV-ATTR:hostname | adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-pr | 10s | OS-EXT-SRV-ATTR:hypervisor_hostname | - | 10s | OS-EXT-SRV-ATTR:instance_name | | 10s | OS-EXT-SRV-ATTR:kernel_id | | 10s | OS-EXT-SRV-ATTR:launch_index | 0 | 10s | OS-EXT-SRV-ATTR:ramdisk_id | | 10s | OS-EXT-SRV-ATTR:reservation_id | r-j1snqsm1 | 10s | OS-EXT-SRV-ATTR:root_device_name | - | 10s | OS-EXT-STS:power_state | 0 | 10s | OS-EXT-STS:task_state | scheduling | 10s | OS-EXT-STS:vm_state | building | 10s | OS-SRV-USG:launched_at | - | 10s | OS-SRV-USG:terminated_at | - | 10s | accessIPv4 | | 10s | accessIPv6 | | 10s | adminPass | Lm2UVb9kpr2c | 10s | config_drive | | 10s | created | 2026-02-03T00:46:24Z | 10s | description | - | 10s | flavor:disk | 20 | 10s | flavor:ephemeral | 0 | 10s | flavor:extra_specs | {"aggregate_instance_extra_specs:commit": "ppc64el", "hw:cpu_policy": "shared", "hw:mem_page_size": "large", "hw:pci_numa_affinity_policy": "preferred"} | 10s | flavor:original_name | autopkgtest-cpu2-ram4-disk20-ppc64el | 10s | flavor:ram | 4096 | 10s | flavor:swap | 0 | 10s | flavor:vcpus | 2 | 10s | hostId | | 10s | id | f56b4e1c-2629-4aa5-b5ae-d21b9364f514 | 10s | image | adt/ubuntu-resolute-ppc64el-server-20260202.img (ca98045c-2f99-4634-a243-9d47350236de) | 10s | key_name | testbed-juju-7f2275-prod-proposed-migration-environment-2 | 10s | locked | False | 10s | locked_reason | - | 10s | metadata | {} | 10s | name | adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-proposed-migration-environment-2-39976451-9b75-4ac8-84c8-0ed1e63afaa6 | 10s | os-extended-volumes:volumes_attached | [] | 10s | progress | 0 | 10s | security_groups | autopkgtest-juju-7f2275-prod-proposed-migration-environment-2@sto01-ppc64el-23.secgroup | 10s | server_groups | [] | 10s | status | BUILD | 10s | tags | [] | 10s | tenant_id | 9bf77f46fd6c4d3da81ee79a717acf43 | 10s | trusted_image_certificates | - | 10s | updated | 2026-02-03T00:46:23Z | 10s | user_id | 20f4f30c2cfd4bfe806cd0db10c0e446 | 10s +--------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------+DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps7.canonical.com:8774/v2.1/servers/f56b4e1c-2629-4aa5-b5ae-d21b9364f514 -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3202a25771abc04e11800226669353cf02d0ac5adb7436969d6ec631939dd63c" -H "X-OpenStack-Nova-API-Version: 2.87" 10s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "GET /v2.1/servers/f56b4e1c-2629-4aa5-b5ae-d21b9364f514 HTTP/1.1" 200 2840 10s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 2840 Content-Type: application/json Date: Tue, 03 Feb 2026 00:46:23 GMT Keep-Alive: timeout=75, max=993 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-6c562e08-2beb-43ee-aa29-3ae5dd169430 x-openstack-request-id: req-6c562e08-2beb-43ee-aa29-3ae5dd169430 10s DEBUG (session:580) RESP BODY: {"server": {"id": "f56b4e1c-2629-4aa5-b5ae-d21b9364f514", "name": "adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-proposed-migration-environment-2-39976451-9b75-4ac8-84c8-0ed1e63afaa6", "status": "ERROR", "tenant_id": "9bf77f46fd6c4d3da81ee79a717acf43", "user_id": "20f4f30c2cfd4bfe806cd0db10c0e446", "metadata": {}, "hostId": "", "image": {"id": "ca98045c-2f99-4634-a243-9d47350236de", "links": [{"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/images/ca98045c-2f99-4634-a243-9d47350236de"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest-cpu2-ram4-disk20-ppc64el", "extra_specs": {"aggregate_instance_extra_specs:commit": "ppc64el", "hw:cpu_policy": "shared", "hw:mem_page_size": "large", "hw:pci_numa_affinity_policy": "preferred"}}, "created": "2026-02-03T00:46:23Z", "updated": "2026-02-03T00:46:24Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/servers/f56b4e1c-2629-4aa5-b5ae-d21b9364f514"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/servers/f56b4e1c-2629-4aa5-b5ae-d21b9364f514"}], "OS-DCF:diskConfig": "MANUAL", "fault": {"code": 500, "created": "2026-02-03T00:46:24Z", "message": "No valid host was found. There are not enough hosts available."}, "OS-EXT-AZ:availability_zone": "", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-2", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "OS-EXT-SRV-ATTR:host": null, "OS-EXT-SRV-ATTR:instance_name": "instance-00023675", "OS-EXT-SRV-ATTR:hypervisor_hostname": null, "OS-EXT-SRV-ATTR:reservation_id": "r-j1snqsm1", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-pr", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": null, "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJyA+PiAvZXRjL2Vudmlyb25tZW50CiAtIHNlZCAtaSAtciAnL14xMjcuMC4xLjEvIHMvYXV0b3BrZ3Rlc3QtW14gXStcLi9hdXRvcGtndGVzdFwuLycgL2V0Yy9ob3N0cwo=", "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "error", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 10s DEBUG (session:936) GET call to compute for https://nova.ps7.canonical.com:8774/v2.1/servers/f56b4e1c-2629-4aa5-b5ae-d21b9364f514 used request id req-6c562e08-2beb-43ee-aa29-3ae5dd169430 10s DEBUG (shell:822) 10s Traceback (most recent call last): 10s File "/usr/lib/python3/dist-packages/novaclient/shell.py", line 820, in main 10s OpenStackComputeShell().main(argv) 10s File "/usr/lib/python3/dist-packages/novaclient/shell.py", line 742, in main 10s args.func(self.cs, args) 10s File "/usr/lib/python3/dist-packages/novaclient/v2/shell.py", line 980, in do_boot 10s _poll_for_status(cs.servers.get, server.id, 'building', ['active']) 10s File "/usr/lib/python3/dist-packages/novaclient/v2/shell.py", line 1019, in _poll_for_status 10s raise exceptions.ResourceInErrorState(obj) 10s novaclient.exceptions.ResourceInErrorState: 10s ERROR (ResourceInErrorState): 10s 10s 10s 10s Error building server 354s autopkgtest [00:52:08]: testbed dpkg architecture: ppc64el 354s autopkgtest [00:52:08]: testbed apt version: 3.1.14 355s autopkgtest [00:52:09]: @@@@@@@@@@@@@@@@@@@@ test bed setup 355s autopkgtest [00:52:09]: testbed release detected to be: None 356s autopkgtest [00:52:10]: updating testbed package index (apt update) 356s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 356s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 356s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 356s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 356s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [105 kB] 356s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/restricted Sources [5256 B] 356s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [28.4 kB] 356s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1278 kB] 356s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main ppc64el Packages [124 kB] 356s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/universe ppc64el Packages [1041 kB] 357s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse ppc64el Packages [18.0 kB] 357s Fetched 2724 kB in 1s (2893 kB/s) 357s Reading package lists... 358s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 358s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 358s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 358s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 359s Reading package lists... 359s Reading package lists... 360s Building dependency tree... 360s Reading state information... 360s Calculating upgrade... 360s The following packages will be upgraded: 360s libexpat1 liblocale-gettext-perl 360s 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 360s Need to get 122 kB of archives. 360s After this operation, 1024 B of additional disk space will be used. 360s Get:1 http://ftpmaster.internal/ubuntu resolute/main ppc64el libexpat1 ppc64el 2.7.4-1 [106 kB] 360s Get:2 http://ftpmaster.internal/ubuntu resolute/main ppc64el liblocale-gettext-perl ppc64el 1.07-8 [16.3 kB] 360s dpkg-preconfigure: unable to re-open stdin: No such file or directory 360s Fetched 122 kB in 0s (7695 kB/s) 361s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 82007 files and directories currently installed.) 361s Preparing to unpack .../libexpat1_2.7.4-1_ppc64el.deb ... 361s Unpacking libexpat1:ppc64el (2.7.4-1) over (2.7.3-1) ... 361s Preparing to unpack .../liblocale-gettext-perl_1.07-8_ppc64el.deb ... 361s Unpacking liblocale-gettext-perl (1.07-8) over (1.07-7build1) ... 361s Setting up libexpat1:ppc64el (2.7.4-1) ... 361s Setting up liblocale-gettext-perl (1.07-8) ... 361s Processing triggers for man-db (2.13.1-1) ... 362s Processing triggers for libc-bin (2.42-2ubuntu4) ... 362s autopkgtest [00:52:16]: upgrading testbed (apt dist-upgrade and autopurge) 362s Reading package lists... 362s Building dependency tree... 362s Reading state information... 362s Calculating upgrade... 362s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 363s Reading package lists... 363s Building dependency tree... 363s Reading state information... 363s Solving dependencies... 363s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 366s autopkgtest [00:52:20]: testbed running kernel: Linux 6.18.0-9-generic #9-Ubuntu SMP PREEMPT_DYNAMIC Mon Jan 12 16:45:54 UTC 2026 366s autopkgtest [00:52:20]: @@@@@@@@@@@@@@@@@@@@ apt-source hg-git 367s Get:1 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (dsc) [2142 B] 367s Get:2 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (tar) [222 kB] 367s Get:3 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (diff) [6816 B] 368s gpgv: Signature made Sun Feb 16 14:22:41 2025 UTC 368s gpgv: using RSA key 8F6DE104377F3B11E741748731F3144544A1741A 368s gpgv: issuer "tchet@debian.org" 368s gpgv: Can't check signature: No public key 368s dpkg-source: warning: cannot verify inline signature for ./hg-git_1.2.0-1.dsc: no acceptable signature found 368s autopkgtest [00:52:22]: testing package hg-git version 1.2.0-1 368s autopkgtest [00:52:22]: build not needed 368s autopkgtest [00:52:22]: test testsuite: preparing testbed 369s Reading package lists... 369s Building dependency tree... 369s Reading state information... 369s Solving dependencies... 369s The following NEW packages will be installed: 369s git git-man liberror-perl mercurial mercurial-common mercurial-git 369s python3-dulwich unzip 369s 0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded. 369s Need to get 13.4 MB of archives. 369s After this operation, 63.0 MB of additional disk space will be used. 369s Get:1 http://ftpmaster.internal/ubuntu resolute/main ppc64el liberror-perl all 0.17030-1 [23.5 kB] 369s Get:2 http://ftpmaster.internal/ubuntu resolute/main ppc64el git-man all 1:2.51.0-1ubuntu1 [1179 kB] 369s Get:3 http://ftpmaster.internal/ubuntu resolute/main ppc64el git ppc64el 1:2.51.0-1ubuntu1 [7646 kB] 369s Get:4 http://ftpmaster.internal/ubuntu resolute/universe ppc64el mercurial-common all 7.1.1-1ubuntu1 [2789 kB] 369s Get:5 http://ftpmaster.internal/ubuntu resolute/universe ppc64el mercurial ppc64el 7.1.1-1ubuntu1 [538 kB] 369s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/universe ppc64el python3-dulwich ppc64el 1.0.0-2 [949 kB] 369s Get:7 http://ftpmaster.internal/ubuntu resolute/universe ppc64el mercurial-git all 1.2.0-1 [60.9 kB] 369s Get:8 http://ftpmaster.internal/ubuntu resolute/main ppc64el unzip ppc64el 6.0-29ubuntu1 [200 kB] 370s Fetched 13.4 MB in 1s (21.0 MB/s) 370s Selecting previously unselected package liberror-perl. 370s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 82007 files and directories currently installed.) 370s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 370s Unpacking liberror-perl (0.17030-1) ... 370s Selecting previously unselected package git-man. 370s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 370s Unpacking git-man (1:2.51.0-1ubuntu1) ... 370s Selecting previously unselected package git. 370s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_ppc64el.deb ... 370s Unpacking git (1:2.51.0-1ubuntu1) ... 370s Selecting previously unselected package mercurial-common. 370s Preparing to unpack .../3-mercurial-common_7.1.1-1ubuntu1_all.deb ... 370s Unpacking mercurial-common (7.1.1-1ubuntu1) ... 370s Selecting previously unselected package mercurial. 370s Preparing to unpack .../4-mercurial_7.1.1-1ubuntu1_ppc64el.deb ... 370s Unpacking mercurial (7.1.1-1ubuntu1) ... 370s Selecting previously unselected package python3-dulwich. 370s Preparing to unpack .../5-python3-dulwich_1.0.0-2_ppc64el.deb ... 370s Unpacking python3-dulwich (1.0.0-2) ... 370s Selecting previously unselected package mercurial-git. 370s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 370s Unpacking mercurial-git (1.2.0-1) ... 370s Selecting previously unselected package unzip. 370s Preparing to unpack .../7-unzip_6.0-29ubuntu1_ppc64el.deb ... 370s Unpacking unzip (6.0-29ubuntu1) ... 370s Setting up mercurial-common (7.1.1-1ubuntu1) ... 372s Setting up unzip (6.0-29ubuntu1) ... 372s Setting up liberror-perl (0.17030-1) ... 372s Setting up python3-dulwich (1.0.0-2) ... 372s Setting up git-man (1:2.51.0-1ubuntu1) ... 372s Setting up mercurial (7.1.1-1ubuntu1) ... 373s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 373s Setting up mercurial-git (1.2.0-1) ... 373s mercurial-git extension is disabled by default. 373s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 373s Setting up git (1:2.51.0-1ubuntu1) ... 373s Processing triggers for man-db (2.13.1-1) ... 375s autopkgtest [00:52:29]: test testsuite: [----------------------- 376s no username found, using 'ubuntu@autopkgtest.local' instead 376s cd tests && /usr/bin/python3 run-tests.py --with-hg=/usr/bin/hg --blacklist=/tmp/autopkgtest.a0vdSk/build.ydR/src/debian/hg-git.test_blacklist 376s running 82 tests using 2 parallel processes 386s ssssss 386s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-pull.t 386s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-pull.t#draft.err 386s @@ -35,153 +35,132 @@ 386s 386s pull without a name 386s $ hg init hgrepo 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s $ cd hgrepo 386s $ hg pull ../gitrepo 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s pulling from ../gitrepo 386s - importing 3 git commits 386s - adding bookmark beta 386s - adding bookmark delta 386s - adding bookmark master 386s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 386s - (run 'hg heads' to see heads, 'hg merge' to merge) 386s + abort: repository ../gitrepo not found 386s + [255] 386s $ git --git-dir .hg/git for-each-ref 386s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 386s + fatal: not a git repository: '.hg/git' 386s + [128] 386s $ hg log -Tp 386s - 2|draft|delta|tip 386s - 1|draft|beta| 386s - 0|draft|master|t_alpha 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s $ cd .. 386s $ rm -rf hgrepo 386s 386s pull with an implied name 386s $ hg init hgrepo 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s $ cd hgrepo 386s $ echo "[paths]" >> .hg/hgrc 386s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 386s $ hg pull ../gitrepo 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s pulling from ../gitrepo 386s - importing 3 git commits 386s - adding bookmark beta 386s - adding bookmark delta 386s - adding bookmark master 386s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 386s - (run 'hg heads' to see heads, 'hg merge' to merge) 386s + abort: repository ../gitrepo not found 386s + [255] 386s $ git --git-dir .hg/git for-each-ref 386s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 386s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 386s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 386s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 386s + fatal: not a git repository: '.hg/git' 386s + [128] 386s $ hg log -Tp 386s - 2|draft|delta|default/delta tip 386s - 1|draft|beta|default/beta 386s - 0|draft|master|default/master t_alpha 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s $ cd .. 386s $ rm -rf hgrepo 386s 386s pull with an explicit name 386s $ hg init hgrepo 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s $ cd hgrepo 386s $ echo "[paths]" >> .hg/hgrc 386s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 386s $ hg pull 386s - pulling from $TESTTMP/gitrepo 386s - importing 3 git commits 386s - adding bookmark beta 386s - adding bookmark delta 386s - adding bookmark master 386s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 386s - (run 'hg heads' to see heads, 'hg merge' to merge) 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ git --git-dir .hg/git for-each-ref 386s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 386s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 386s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 386s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 386s + fatal: not a git repository: '.hg/git' 386s + [128] 386s $ hg log -Tp 386s - 2|draft|delta|default/delta tip 386s - 1|draft|beta|default/beta 386s - 0|draft|master|default/master t_alpha 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s $ cd .. 386s $ rm -rf hgrepo 386s 386s pull a tag 386s $ hg init hgrepo 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s $ echo "[paths]" >> hgrepo/.hg/hgrc 386s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 386s $ hg -R hgrepo pull -r t_alpha 386s - pulling from $TESTTMP/gitrepo 386s - importing 1 git commits 386s - adding bookmark master 386s - new changesets ff7a2f2d8d70 (1 drafts) 386s - (run 'hg update' to get a working copy) 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo update t_alpha 386s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + abort: unknown revision 't_alpha' 386s + [10] 386s $ hg log -Tp -R hgrepo 386s - 0|draft|master|default/master t_alpha tip 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s 386s no-op pull 386s $ hg -R hgrepo pull -r t_alpha 386s - pulling from $TESTTMP/gitrepo 386s - no changes found 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s 386s no-op pull with added bookmark 386s $ cd gitrepo 386s $ git checkout -qb epsilon t_alpha 386s $ cd .. 386s $ hg -R hgrepo pull -r epsilon 386s - pulling from $TESTTMP/gitrepo 386s - no changes found 386s - adding bookmark epsilon 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s 386s pull something that doesn't exist 386s $ hg -R hgrepo pull -r kaflaflibob 386s - pulling from $TESTTMP/gitrepo 386s - abort: unknown revision 'kaflaflibob'!? (re) 386s - [10] 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s 386s pull an ambiguous reference 386s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 386s $ hg -R hgrepo pull -r t_alpha 386s - pulling from $TESTTMP/gitrepo 386s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 386s - [10] 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 386s 386s pull a branch 386s $ hg -R hgrepo pull -r beta 386s - pulling from $TESTTMP/gitrepo 386s - importing 1 git commits 386s - adding bookmark beta 386s - new changesets 7fe02317c63d (1 drafts) 386s - (run 'hg update' to get a working copy) 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo log --graph --template=phases 386s - o changeset: 1:7fe02317c63d 386s - | bookmark: beta 386s - | tag: default/beta 386s - | tag: tip 386s - | phase: draft 386s - | user: test 386s - | date: Mon Jan 01 00:00:11 2007 +0000 386s - | summary: add beta 386s - | 386s - @ changeset: 0:ff7a2f2d8d70 386s - bookmark: epsilon 386s - bookmark: master 386s - tag: default/epsilon 386s - tag: default/master 386s - tag: t_alpha 386s - phase: draft 386s - user: test 386s - date: Mon Jan 01 00:00:10 2007 +0000 386s - summary: add alpha 386s - 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s 386s no-op pull should affect phases 386s $ hg -R hgrepo phase -fs beta 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + abort: unknown revision 'beta' 386s + [10] 386s $ hg -R hgrepo pull -r beta 386s - pulling from $TESTTMP/gitrepo 386s - no changes found 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo phase beta 386s - 1: draft 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + abort: unknown revision 'beta' 386s + [10] 386s 386s 386s add another commit and tag to the git repo 386s @@ -196,50 +175,12 @@ 386s 386s pull everything else 386s $ hg -R hgrepo pull 386s - pulling from $TESTTMP/gitrepo 386s - importing 2 git commits 386s - adding bookmark delta 386s - updating bookmark master 386s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 386s - (run 'hg heads' to see heads, 'hg merge' to merge) 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo log --graph --template=phases 386s - o changeset: 3:6f898ad1f3e1 386s - | bookmark: master 386s - | tag: default/master 386s - | tag: tip 386s - | phase: draft 386s - | parent: 0:ff7a2f2d8d70 386s - | user: test 386s - | date: Mon Jan 01 00:00:13 2007 +0000 386s - | summary: add gamma 386s - | 386s - | o changeset: 2:678ebee93e38 386s - |/ bookmark: delta 386s - | tag: default/delta 386s - | phase: draft 386s - | parent: 0:ff7a2f2d8d70 386s - | user: test 386s - | date: Mon Jan 01 00:00:12 2007 +0000 386s - | summary: add delta 386s - | 386s - | o changeset: 1:7fe02317c63d 386s - |/ bookmark: beta 386s - | tag: default/beta 386s - | tag: t_beta 386s - | phase: draft 386s - | user: test 386s - | date: Mon Jan 01 00:00:11 2007 +0000 386s - | summary: add beta 386s - | 386s - @ changeset: 0:ff7a2f2d8d70 386s - bookmark: epsilon 386s - tag: default/epsilon 386s - tag: t_alpha 386s - phase: draft 386s - user: test 386s - date: Mon Jan 01 00:00:10 2007 +0000 386s - summary: add alpha 386s - 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s add a merge to the git repo, and delete the branch 386s $ cd gitrepo 386s $ git merge -q -m "Merge branch 'beta'" beta 386s @@ -252,60 +193,26 @@ 386s 386s pull the merge 386s $ hg -R hgrepo tags | grep default/beta 386s - default/beta 1:7fe02317c63d 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + [1] 386s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 386s - pulling from $TESTTMP/gitrepo 386s - importing 1 git commits 386s - updating bookmark master 386s - deleting bookmark beta 386s - new changesets a02330f767a4 (1 drafts) 386s - (run 'hg update' to get a working copy) 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo tags | grep default/beta 386s - default/beta 1:7fe02317c63d 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + [1] 386s $ hg -R hgrepo pull 386s - pulling from $TESTTMP/gitrepo 386s - no changes found 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo tags | grep default/beta 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s [1] 386s $ hg -R hgrepo log --graph 386s - o changeset: 4:a02330f767a4 386s - |\ bookmark: master 386s - | | tag: default/master 386s - | | tag: tip 386s - | | parent: 3:6f898ad1f3e1 386s - | | parent: 1:7fe02317c63d 386s - | | user: test 386s - | | date: Mon Jan 01 00:00:13 2007 +0000 386s - | | summary: Merge branch 'beta' 386s - | | 386s - | o changeset: 3:6f898ad1f3e1 386s - | | parent: 0:ff7a2f2d8d70 386s - | | user: test 386s - | | date: Mon Jan 01 00:00:13 2007 +0000 386s - | | summary: add gamma 386s - | | 386s - | | o changeset: 2:678ebee93e38 386s - | |/ bookmark: delta 386s - | | tag: default/delta 386s - | | parent: 0:ff7a2f2d8d70 386s - | | user: test 386s - | | date: Mon Jan 01 00:00:12 2007 +0000 386s - | | summary: add delta 386s - | | 386s - o | changeset: 1:7fe02317c63d 386s - |/ tag: t_beta 386s - | user: test 386s - | date: Mon Jan 01 00:00:11 2007 +0000 386s - | summary: add beta 386s - | 386s - @ changeset: 0:ff7a2f2d8d70 386s - bookmark: epsilon 386s - tag: default/epsilon 386s - tag: t_alpha 386s - user: test 386s - date: Mon Jan 01 00:00:10 2007 +0000 386s - summary: add alpha 386s - 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s pull with wildcards 386s $ cd gitrepo 386s $ git checkout -qb releases/v1 master 386s @@ -324,66 +231,12 @@ 386s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 386s $ cd .. 386s $ hg -R hgrepo pull -r 'releases/*' 386s - pulling from $TESTTMP/gitrepo 386s - importing 2 git commits 386s - adding bookmark releases/v1 386s - adding bookmark releases/v2 386s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 386s - (run 'hg heads .' to see heads, 'hg merge' to merge) 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo log --graph 386s - o changeset: 6:a3f95e150b0a 386s - | bookmark: releases/v2 386s - | tag: default/releases/v2 386s - | tag: tip 386s - | parent: 4:a02330f767a4 386s - | user: test 386s - | date: Mon Jan 01 00:00:15 2007 +0000 386s - | summary: add eta 386s - | 386s - | o changeset: 5:218b2d0660d3 386s - |/ bookmark: releases/v1 386s - | tag: default/releases/v1 386s - | user: test 386s - | date: Mon Jan 01 00:00:14 2007 +0000 386s - | summary: add zeta 386s - | 386s - o changeset: 4:a02330f767a4 386s - |\ bookmark: master 386s - | | tag: default/master 386s - | | parent: 3:6f898ad1f3e1 386s - | | parent: 1:7fe02317c63d 386s - | | user: test 386s - | | date: Mon Jan 01 00:00:13 2007 +0000 386s - | | summary: Merge branch 'beta' 386s - | | 386s - | o changeset: 3:6f898ad1f3e1 386s - | | parent: 0:ff7a2f2d8d70 386s - | | user: test 386s - | | date: Mon Jan 01 00:00:13 2007 +0000 386s - | | summary: add gamma 386s - | | 386s - | | o changeset: 2:678ebee93e38 386s - | |/ bookmark: delta 386s - | | tag: default/delta 386s - | | parent: 0:ff7a2f2d8d70 386s - | | user: test 386s - | | date: Mon Jan 01 00:00:12 2007 +0000 386s - | | summary: add delta 386s - | | 386s - o | changeset: 1:7fe02317c63d 386s - |/ tag: t_beta 386s - | user: test 386s - | date: Mon Jan 01 00:00:11 2007 +0000 386s - | summary: add beta 386s - | 386s - @ changeset: 0:ff7a2f2d8d70 386s - bookmark: epsilon 386s - tag: default/epsilon 386s - tag: t_alpha 386s - user: test 386s - date: Mon Jan 01 00:00:10 2007 +0000 386s - summary: add alpha 386s - 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s 386s add old and new commits to the git repo -- make sure we're using the commit date 386s and not the author date 386s @@ -412,21 +265,19 @@ 386s Master is now filtered, so it's just stays there: 386s 386s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 386s - pulling from $TESTTMP/gitrepo 386s - no changes found 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo pull 386s - pulling from $TESTTMP/gitrepo 386s - no changes found 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo log -r master 386s - changeset: 4:a02330f767a4 386s - bookmark: master 386s - tag: default/master 386s - parent: 3:6f898ad1f3e1 386s - parent: 1:7fe02317c63d 386s - user: test 386s - date: Mon Jan 01 00:00:13 2007 +0000 386s - summary: Merge branch 'beta' 386s - 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + abort: unknown revision 'master' 386s + [10] 386s 386s $ cd gitrepo 386s $ git checkout -q master 386s @@ -440,51 +291,13 @@ 386s > git tag -a -m 'tagging newtag' newtag 386s $ cd .. 386s $ hg -R hgrepo pull 386s - pulling from $TESTTMP/gitrepo 386s - importing 3 git commits 386s - updating bookmark master 386s - new changesets 49713da8f665:e103a73f33be (3 drafts) 386s - (run 'hg heads .' to see heads, 'hg merge' to merge) 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo heads 386s - changeset: 9:e103a73f33be 386s - bookmark: master 386s - tag: default/master 386s - tag: tip 386s - user: test 386s - date: Wed Jan 01 00:00:00 2014 +0000 386s - summary: newcommit 386s - 386s - changeset: 7:49713da8f665 386s - tag: newtag 386s - tag: oldtag 386s - parent: 4:a02330f767a4 386s - user: test 386s - date: Sat Mar 01 00:00:00 2014 +0000 386s - summary: oldtag 386s - 386s - changeset: 6:a3f95e150b0a 386s - bookmark: releases/v2 386s - tag: default/releases/v2 386s - parent: 4:a02330f767a4 386s - user: test 386s - date: Mon Jan 01 00:00:15 2007 +0000 386s - summary: add eta 386s - 386s - changeset: 5:218b2d0660d3 386s - bookmark: releases/v1 386s - tag: default/releases/v1 386s - user: test 386s - date: Mon Jan 01 00:00:14 2007 +0000 386s - summary: add zeta 386s - 386s - changeset: 2:678ebee93e38 386s - bookmark: delta 386s - tag: default/delta 386s - parent: 0:ff7a2f2d8d70 386s - user: test 386s - date: Mon Jan 01 00:00:12 2007 +0000 386s - summary: add delta 386s - 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + [1] 386s 386s test for ssh vulnerability 386s 386s @@ -494,18 +307,21 @@ 386s > EOF 386s 386s $ hg init a 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s $ cd a 386s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 386s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 386s [255] 386s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 386s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 386s [255] 386s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 386s - ssh: * fakehost%7?shellcommand* (glob) 386s - abort: git remote error: The remote server unexpectedly closed the connection. 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 386s [255] 386s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 386s - ssh: * fakehost%7?shellcommand* (glob) 386s - abort: git remote error: The remote server unexpectedly closed the connection. 386s - [255] 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 386s + [255] 386s 386s ERROR: test-pull.t#draft output changed 386s ! 386s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-pull.t 386s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-pull.t#secret.err 386s @@ -35,153 +35,132 @@ 386s 386s pull without a name 386s $ hg init hgrepo 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s $ cd hgrepo 386s $ hg pull ../gitrepo 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s pulling from ../gitrepo 386s - importing 3 git commits 386s - adding bookmark beta 386s - adding bookmark delta 386s - adding bookmark master 386s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 386s - (run 'hg heads' to see heads, 'hg merge' to merge) 386s + abort: repository ../gitrepo not found 386s + [255] 386s $ git --git-dir .hg/git for-each-ref 386s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 386s + fatal: not a git repository: '.hg/git' 386s + [128] 386s $ hg log -Tp 386s - 2|draft|delta|tip 386s - 1|draft|beta| 386s - 0|draft|master|t_alpha 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s $ cd .. 386s $ rm -rf hgrepo 386s 386s pull with an implied name 386s $ hg init hgrepo 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s $ cd hgrepo 386s $ echo "[paths]" >> .hg/hgrc 386s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 386s $ hg pull ../gitrepo 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s pulling from ../gitrepo 386s - importing 3 git commits 386s - adding bookmark beta 386s - adding bookmark delta 386s - adding bookmark master 386s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 386s - (run 'hg heads' to see heads, 'hg merge' to merge) 386s + abort: repository ../gitrepo not found 386s + [255] 386s $ git --git-dir .hg/git for-each-ref 386s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 386s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 386s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 386s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 386s + fatal: not a git repository: '.hg/git' 386s + [128] 386s $ hg log -Tp 386s - 2|draft|delta|default/delta tip 386s - 1|draft|beta|default/beta 386s - 0|draft|master|default/master t_alpha 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s $ cd .. 386s $ rm -rf hgrepo 386s 386s pull with an explicit name 386s $ hg init hgrepo 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s $ cd hgrepo 386s $ echo "[paths]" >> .hg/hgrc 386s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 386s $ hg pull 386s - pulling from $TESTTMP/gitrepo 386s - importing 3 git commits 386s - adding bookmark beta 386s - adding bookmark delta 386s - adding bookmark master 386s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 386s - (run 'hg heads' to see heads, 'hg merge' to merge) 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ git --git-dir .hg/git for-each-ref 386s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 386s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 386s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 386s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 386s + fatal: not a git repository: '.hg/git' 386s + [128] 386s $ hg log -Tp 386s - 2|draft|delta|default/delta tip 386s - 1|draft|beta|default/beta 386s - 0|draft|master|default/master t_alpha 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s $ cd .. 386s $ rm -rf hgrepo 386s 386s pull a tag 386s $ hg init hgrepo 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s $ echo "[paths]" >> hgrepo/.hg/hgrc 386s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 386s $ hg -R hgrepo pull -r t_alpha 386s - pulling from $TESTTMP/gitrepo 386s - importing 1 git commits 386s - adding bookmark master 386s - new changesets ff7a2f2d8d70 (1 drafts) 386s - (run 'hg update' to get a working copy) 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo update t_alpha 386s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + abort: unknown revision 't_alpha' 386s + [10] 386s $ hg log -Tp -R hgrepo 386s - 0|draft|master|default/master t_alpha tip 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s 386s no-op pull 386s $ hg -R hgrepo pull -r t_alpha 386s - pulling from $TESTTMP/gitrepo 386s - no changes found 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s 386s no-op pull with added bookmark 386s $ cd gitrepo 386s $ git checkout -qb epsilon t_alpha 386s $ cd .. 386s $ hg -R hgrepo pull -r epsilon 386s - pulling from $TESTTMP/gitrepo 386s - no changes found 386s - adding bookmark epsilon 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s 386s pull something that doesn't exist 386s $ hg -R hgrepo pull -r kaflaflibob 386s - pulling from $TESTTMP/gitrepo 386s - abort: unknown revision 'kaflaflibob'!? (re) 386s - [10] 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s 386s pull an ambiguous reference 386s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 386s $ hg -R hgrepo pull -r t_alpha 386s - pulling from $TESTTMP/gitrepo 386s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 386s - [10] 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 386s 386s pull a branch 386s $ hg -R hgrepo pull -r beta 386s - pulling from $TESTTMP/gitrepo 386s - importing 1 git commits 386s - adding bookmark beta 386s - new changesets 7fe02317c63d (1 drafts) 386s - (run 'hg update' to get a working copy) 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo log --graph --template=phases 386s - o changeset: 1:7fe02317c63d 386s - | bookmark: beta 386s - | tag: default/beta 386s - | tag: tip 386s - | phase: draft 386s - | user: test 386s - | date: Mon Jan 01 00:00:11 2007 +0000 386s - | summary: add beta 386s - | 386s - @ changeset: 0:ff7a2f2d8d70 386s - bookmark: epsilon 386s - bookmark: master 386s - tag: default/epsilon 386s - tag: default/master 386s - tag: t_alpha 386s - phase: draft 386s - user: test 386s - date: Mon Jan 01 00:00:10 2007 +0000 386s - summary: add alpha 386s - 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s 386s no-op pull should affect phases 386s $ hg -R hgrepo phase -fs beta 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + abort: unknown revision 'beta' 386s + [10] 386s $ hg -R hgrepo pull -r beta 386s - pulling from $TESTTMP/gitrepo 386s - no changes found 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo phase beta 386s - 1: draft 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + abort: unknown revision 'beta' 386s + [10] 386s 386s 386s add another commit and tag to the git repo 386s @@ -196,50 +175,12 @@ 386s 386s pull everything else 386s $ hg -R hgrepo pull 386s - pulling from $TESTTMP/gitrepo 386s - importing 2 git commits 386s - adding bookmark delta 386s - updating bookmark master 386s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 386s - (run 'hg heads' to see heads, 'hg merge' to merge) 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo log --graph --template=phases 386s - o changeset: 3:6f898ad1f3e1 386s - | bookmark: master 386s - | tag: default/master 386s - | tag: tip 386s - | phase: draft 386s - | parent: 0:ff7a2f2d8d70 386s - | user: test 386s - | date: Mon Jan 01 00:00:13 2007 +0000 386s - | summary: add gamma 386s - | 386s - | o changeset: 2:678ebee93e38 386s - |/ bookmark: delta 386s - | tag: default/delta 386s - | phase: draft 386s - | parent: 0:ff7a2f2d8d70 386s - | user: test 386s - | date: Mon Jan 01 00:00:12 2007 +0000 386s - | summary: add delta 386s - | 386s - | o changeset: 1:7fe02317c63d 386s - |/ bookmark: beta 386s - | tag: default/beta 386s - | tag: t_beta 386s - | phase: draft 386s - | user: test 386s - | date: Mon Jan 01 00:00:11 2007 +0000 386s - | summary: add beta 386s - | 386s - @ changeset: 0:ff7a2f2d8d70 386s - bookmark: epsilon 386s - tag: default/epsilon 386s - tag: t_alpha 386s - phase: draft 386s - user: test 386s - date: Mon Jan 01 00:00:10 2007 +0000 386s - summary: add alpha 386s - 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s add a merge to the git repo, and delete the branch 386s $ cd gitrepo 386s $ git merge -q -m "Merge branch 'beta'" beta 386s @@ -252,60 +193,26 @@ 386s 386s pull the merge 386s $ hg -R hgrepo tags | grep default/beta 386s - default/beta 1:7fe02317c63d 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + [1] 386s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 386s - pulling from $TESTTMP/gitrepo 386s - importing 1 git commits 386s - updating bookmark master 386s - deleting bookmark beta 386s - new changesets a02330f767a4 (1 drafts) 386s - (run 'hg update' to get a working copy) 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo tags | grep default/beta 386s - default/beta 1:7fe02317c63d 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + [1] 386s $ hg -R hgrepo pull 386s - pulling from $TESTTMP/gitrepo 386s - no changes found 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo tags | grep default/beta 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s [1] 386s $ hg -R hgrepo log --graph 386s - o changeset: 4:a02330f767a4 386s - |\ bookmark: master 386s - | | tag: default/master 386s - | | tag: tip 386s - | | parent: 3:6f898ad1f3e1 386s - | | parent: 1:7fe02317c63d 386s - | | user: test 386s - | | date: Mon Jan 01 00:00:13 2007 +0000 386s - | | summary: Merge branch 'beta' 386s - | | 386s - | o changeset: 3:6f898ad1f3e1 386s - | | parent: 0:ff7a2f2d8d70 386s - | | user: test 386s - | | date: Mon Jan 01 00:00:13 2007 +0000 386s - | | summary: add gamma 386s - | | 386s - | | o changeset: 2:678ebee93e38 386s - | |/ bookmark: delta 386s - | | tag: default/delta 386s - | | parent: 0:ff7a2f2d8d70 386s - | | user: test 386s - | | date: Mon Jan 01 00:00:12 2007 +0000 386s - | | summary: add delta 386s - | | 386s - o | changeset: 1:7fe02317c63d 386s - |/ tag: t_beta 386s - | user: test 386s - | date: Mon Jan 01 00:00:11 2007 +0000 386s - | summary: add beta 386s - | 386s - @ changeset: 0:ff7a2f2d8d70 386s - bookmark: epsilon 386s - tag: default/epsilon 386s - tag: t_alpha 386s - user: test 386s - date: Mon Jan 01 00:00:10 2007 +0000 386s - summary: add alpha 386s - 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s pull with wildcards 386s $ cd gitrepo 386s $ git checkout -qb releases/v1 master 386s @@ -324,66 +231,12 @@ 386s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 386s $ cd .. 386s $ hg -R hgrepo pull -r 'releases/*' 386s - pulling from $TESTTMP/gitrepo 386s - importing 2 git commits 386s - adding bookmark releases/v1 386s - adding bookmark releases/v2 386s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 386s - (run 'hg heads .' to see heads, 'hg merge' to merge) 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo log --graph 386s - o changeset: 6:a3f95e150b0a 386s - | bookmark: releases/v2 386s - | tag: default/releases/v2 386s - | tag: tip 386s - | parent: 4:a02330f767a4 386s - | user: test 386s - | date: Mon Jan 01 00:00:15 2007 +0000 386s - | summary: add eta 386s - | 386s - | o changeset: 5:218b2d0660d3 386s - |/ bookmark: releases/v1 386s - | tag: default/releases/v1 386s - | user: test 386s - | date: Mon Jan 01 00:00:14 2007 +0000 386s - | summary: add zeta 386s - | 386s - o changeset: 4:a02330f767a4 386s - |\ bookmark: master 386s - | | tag: default/master 386s - | | parent: 3:6f898ad1f3e1 386s - | | parent: 1:7fe02317c63d 386s - | | user: test 386s - | | date: Mon Jan 01 00:00:13 2007 +0000 386s - | | summary: Merge branch 'beta' 386s - | | 386s - | o changeset: 3:6f898ad1f3e1 386s - | | parent: 0:ff7a2f2d8d70 386s - | | user: test 386s - | | date: Mon Jan 01 00:00:13 2007 +0000 386s - | | summary: add gamma 386s - | | 386s - | | o changeset: 2:678ebee93e38 386s - | |/ bookmark: delta 386s - | | tag: default/delta 386s - | | parent: 0:ff7a2f2d8d70 386s - | | user: test 386s - | | date: Mon Jan 01 00:00:12 2007 +0000 386s - | | summary: add delta 386s - | | 386s - o | changeset: 1:7fe02317c63d 386s - |/ tag: t_beta 386s - | user: test 386s - | date: Mon Jan 01 00:00:11 2007 +0000 386s - | summary: add beta 386s - | 386s - @ changeset: 0:ff7a2f2d8d70 386s - bookmark: epsilon 386s - tag: default/epsilon 386s - tag: t_alpha 386s - user: test 386s - date: Mon Jan 01 00:00:10 2007 +0000 386s - summary: add alpha 386s - 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s 386s add old and new commits to the git repo -- make sure we're using the commit date 386s and not the author date 386s @@ -412,21 +265,19 @@ 386s Master is now filtered, so it's just stays there: 386s 386s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 386s - pulling from $TESTTMP/gitrepo 386s - no changes found 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo pull 386s - pulling from $TESTTMP/gitrepo 386s - no changes found 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo log -r master 386s - changeset: 4:a02330f767a4 386s - bookmark: master 386s - tag: default/master 386s - parent: 3:6f898ad1f3e1 386s - parent: 1:7fe02317c63d 386s - user: test 386s - date: Mon Jan 01 00:00:13 2007 +0000 386s - summary: Merge branch 'beta' 386s - 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + abort: unknown revision 'master' 386s + [10] 386s 386s $ cd gitrepo 386s $ git checkout -q master 386s @@ -440,51 +291,13 @@ 386s > git tag -a -m 'tagging newtag' newtag 386s $ cd .. 386s $ hg -R hgrepo pull 386s - pulling from $TESTTMP/gitrepo 386s - importing 3 git commits 386s - updating bookmark master 386s - new changesets 49713da8f665:e103a73f33be (3 drafts) 386s - (run 'hg heads .' to see heads, 'hg merge' to merge) 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + pulling from $TESTTMP/gitrepo 386s + abort: repository $TESTTMP/gitrepo not found 386s + [255] 386s $ hg -R hgrepo heads 386s - changeset: 9:e103a73f33be 386s - bookmark: master 386s - tag: default/master 386s - tag: tip 386s - user: test 386s - date: Wed Jan 01 00:00:00 2014 +0000 386s - summary: newcommit 386s - 386s - changeset: 7:49713da8f665 386s - tag: newtag 386s - tag: oldtag 386s - parent: 4:a02330f767a4 386s - user: test 386s - date: Sat Mar 01 00:00:00 2014 +0000 386s - summary: oldtag 386s - 386s - changeset: 6:a3f95e150b0a 386s - bookmark: releases/v2 386s - tag: default/releases/v2 386s - parent: 4:a02330f767a4 386s - user: test 386s - date: Mon Jan 01 00:00:15 2007 +0000 386s - summary: add eta 386s - 386s - changeset: 5:218b2d0660d3 386s - bookmark: releases/v1 386s - tag: default/releases/v1 386s - user: test 386s - date: Mon Jan 01 00:00:14 2007 +0000 386s - summary: add zeta 386s - 386s - changeset: 2:678ebee93e38 386s - bookmark: delta 386s - tag: default/delta 386s - parent: 0:ff7a2f2d8d70 386s - user: test 386s - date: Mon Jan 01 00:00:12 2007 +0000 386s - summary: add delta 386s - 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + [1] 386s 386s test for ssh vulnerability 386s 386s @@ -494,18 +307,21 @@ 386s > EOF 386s 386s $ hg init a 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s $ cd a 386s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 386s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 386s [255] 386s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 386s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 386s [255] 386s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 386s - ssh: * fakehost%7?shellcommand* (glob) 386s - abort: git remote error: The remote server unexpectedly closed the connection. 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 386s [255] 386s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 386s - ssh: * fakehost%7?shellcommand* (glob) 386s - abort: git remote error: The remote server unexpectedly closed the connection. 386s - [255] 386s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 386s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 386s + [255] 386s 386s ERROR: test-pull.t#secret output changed 387s ! 387s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-git-submodules.t 387s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-git-submodules.t.err 387s @@ -188,261 +188,9 @@ 387s $ cd .. 387s 387s $ hg clone gitrepo2 hgrepo 387s - importing 10 git commits 387s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 387s - updating to bookmark master 387s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 387s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 387s + abort: repository gitrepo2 not found 387s + [255] 387s $ cd hgrepo 387s + $TESTTMP.sh: 133: cd: can't cd to hgrepo 387s $ hg log --graph 387s - @ changeset: 9:0ad944b2c4d8 387s - | bookmark: master 387s - | tag: default/master 387s - | tag: tip 387s - | user: test 387s - | date: Mon Jan 01 00:00:12 2007 +0000 387s - | summary: remove all subrepos 387s - | 387s - o changeset: 8:33da452ef22f 387s - | user: test 387s - | date: Mon Jan 01 00:00:12 2007 +0000 387s - | summary: replace subrepo with symlink 387s - | 387s - o changeset: 7:acebec53c0fc 387s - | user: test 387s - | date: Mon Jan 01 00:00:12 2007 +0000 387s - | summary: replace symlink with subrepo 387s - | 387s - o changeset: 6:78c2ea52db4b 387s - | user: test 387s - | date: Mon Jan 01 00:00:12 2007 +0000 387s - | summary: add symlink 387s - | 387s - o changeset: 5:c0d52ffc59b8 387s - | user: test 387s - | date: Mon Jan 01 00:00:12 2007 +0000 387s - | summary: replace file with subrepo 387s - | 387s - o changeset: 4:73e078a178a0 387s - | user: test 387s - | date: Mon Jan 01 00:00:12 2007 +0000 387s - | summary: replace subrepo with file 387s - | 387s - o changeset: 3:29e236ba4c06 387s - | user: test 387s - | date: Mon Jan 01 00:00:12 2007 +0000 387s - | summary: add another subrepo 387s - | 387s - o changeset: 2:a6075a162f62 387s - | user: test 387s - | date: Mon Jan 01 00:00:12 2007 +0000 387s - | summary: change subrepo commit 387s - | 387s - o changeset: 1:a4036e758995 387s - | user: test 387s - | date: Mon Jan 01 00:00:11 2007 +0000 387s - | summary: add subrepo 387s - | 387s - o changeset: 0:ff7a2f2d8d70 387s - user: test 387s - date: Mon Jan 01 00:00:10 2007 +0000 387s - summary: add alpha 387s - 387s - $ hg book 387s - * master 9:0ad944b2c4d8 387s - 387s -(add subrepo) 387s - $ hg cat -r 1 .hgsubstate 387s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo 387s - $ hg cat -r 1 .hgsub 387s - subrepo = [git]../gitsubrepo 387s - $ hg gverify -r 1 387s - verifying rev a4036e758995 against git commit e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 387s - 387s -(change subrepo commit) 387s - $ hg cat -r 2 .hgsubstate 387s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 387s - $ hg cat -r 2 .hgsub 387s - subrepo = [git]../gitsubrepo 387s - $ hg gverify -r 2 387s - verifying rev a6075a162f62 against git commit a000567ceefbd9a2ce364e0dea6e298010b02b6d 387s - 387s -(add another subrepo) 387s - $ hg cat -r 3 .hgsubstate 387s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 387s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 387s - $ hg cat -r 3 .hgsub 387s - subrepo = [git]../gitsubrepo 387s - subrepo2 = [git]../gitsubrepo 387s - $ hg gverify -r 3 387s - verifying rev 29e236ba4c06 against git commit 6e219527869fa40eb6ffbdd013cd86d576b26b01 387s - 387s -(replace subrepo with file) 387s - $ hg cat -r 4 .hgsubstate 387s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 387s - $ hg cat -r 4 .hgsub 387s - subrepo2 = [git]../gitsubrepo 387s - $ hg manifest -r 4 387s - .hgsub 387s - .hgsubstate 387s - alpha 387s - subrepo 387s - $ hg gverify -r 4 387s - verifying rev 73e078a178a0 against git commit f6436a472da00f581d8d257e9bbaf3c358a5e88c 387s - 387s -(replace file with subrepo) 387s - $ hg cat -r 5 .hgsubstate 387s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 387s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 387s - $ hg cat -r 5 .hgsub 387s - subrepo2 = [git]../gitsubrepo 387s - alpha = [git]../gitsubrepo 387s - $ hg manifest -r 5 387s - .hgsub 387s - .hgsubstate 387s - subrepo 387s - $ hg gverify -r 5 387s - verifying rev c0d52ffc59b8 against git commit 88171163bf4795b5570924e51d5f8ede33f8bc28 387s - 387s -(replace symlink with subrepo) 387s - $ hg cat -r 7 .hgsub 387s - subrepo2 = [git]../gitsubrepo 387s - alpha = [git]../gitsubrepo 387s - foolink = [git]../gitsubrepo 387s - $ hg cat -r 7 .hgsubstate 387s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 387s - 6e4ad8da50204560c00fa25e4987eb2e239029ba foolink 387s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 387s - $ hg gverify -r 7 387s - verifying rev acebec53c0fc against git commit e3288fa737d429a60637b3b6782cb25b8298bc00 387s - 387s -(replace subrepo with symlink) 387s - $ hg cat -r 8 .hgsub .hgsubstate 387s - subrepo2 = [git]../gitsubrepo 387s - alpha = [git]../gitsubrepo 387s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 387s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 387s - 387s - $ hg gverify -r 8 387s - verifying rev 33da452ef22f against git commit d28364013fe1a0fde56c0e1921e49ecdeee8571d 387s - 387s -(remove all subrepos) 387s - $ hg cat -r 9 .hgsub .hgsubstate 387s - .hgsub: no such file in rev 0ad944b2c4d8 387s - .hgsubstate: no such file in rev 0ad944b2c4d8 387s - [1] 387s - $ hg gverify -r 9 387s - verifying rev 0ad944b2c4d8 against git commit 15ba94929481c654814178aac1dbca06ae688718 387s - 387s - $ hg debug-remove-hggit-state 387s - clearing out the git cache data 387s - $ hg gexport 387s - $ cd .hg/git 387s - $ git log --pretty=oneline 387s - 73c15b74fb81fa0cc60e9c59c73787a9f26c778b remove all subrepos 387s - d28364013fe1a0fde56c0e1921e49ecdeee8571d replace subrepo with symlink 387s - e3288fa737d429a60637b3b6782cb25b8298bc00 replace symlink with subrepo 387s - 2d1c135447d11df4dfe96dd5d4f37926dc5c821d add symlink 387s - 88171163bf4795b5570924e51d5f8ede33f8bc28 replace file with subrepo 387s - f6436a472da00f581d8d257e9bbaf3c358a5e88c replace subrepo with file 387s - 6e219527869fa40eb6ffbdd013cd86d576b26b01 add another subrepo 387s - a000567ceefbd9a2ce364e0dea6e298010b02b6d change subrepo commit 387s - e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 add subrepo 387s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 add alpha 387s - 387s -test with rename detection enabled -- simply checking that the Mercurial hashes 387s -are the same is enough 387s - $ cd ../../.. 387s - $ hg --config git.similarity=100 clone gitrepo2 hgreporenames 387s - importing 10 git commits 387s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 387s - updating to bookmark master 387s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 387s - $ cd hgreporenames 387s - $ hg log --graph 387s - @ changeset: 9:0ad944b2c4d8 387s - | bookmark: master 387s - | tag: default/master 387s - | tag: tip 387s - | user: test 387s - | date: Mon Jan 01 00:00:12 2007 +0000 387s - | summary: remove all subrepos 387s - | 387s - o changeset: 8:33da452ef22f 387s - | user: test 387s - | date: Mon Jan 01 00:00:12 2007 +0000 387s - | summary: replace subrepo with symlink 387s - | 387s - o changeset: 7:acebec53c0fc 387s - | user: test 387s - | date: Mon Jan 01 00:00:12 2007 +0000 387s - | summary: replace symlink with subrepo 387s - | 387s - o changeset: 6:78c2ea52db4b 387s - | user: test 387s - | date: Mon Jan 01 00:00:12 2007 +0000 387s - | summary: add symlink 387s - | 387s - o changeset: 5:c0d52ffc59b8 387s - | user: test 387s - | date: Mon Jan 01 00:00:12 2007 +0000 387s - | summary: replace file with subrepo 387s - | 387s - o changeset: 4:73e078a178a0 387s - | user: test 387s - | date: Mon Jan 01 00:00:12 2007 +0000 387s - | summary: replace subrepo with file 387s - | 387s - o changeset: 3:29e236ba4c06 387s - | user: test 387s - | date: Mon Jan 01 00:00:12 2007 +0000 387s - | summary: add another subrepo 387s - | 387s - o changeset: 2:a6075a162f62 387s - | user: test 387s - | date: Mon Jan 01 00:00:12 2007 +0000 387s - | summary: change subrepo commit 387s - | 387s - o changeset: 1:a4036e758995 387s - | user: test 387s - | date: Mon Jan 01 00:00:11 2007 +0000 387s - | summary: add subrepo 387s - | 387s - o changeset: 0:ff7a2f2d8d70 387s - user: test 387s - date: Mon Jan 01 00:00:10 2007 +0000 387s - summary: add alpha 387s - 387s - $ cd .. 387s - 387s -test handling of an invalid .gitmodules file (#380) 387s - 387s - $ git init --quiet gitrepo-issue380 387s - $ cd gitrepo-issue380 387s - $ git submodule add ../gitsubrepo 387s - Cloning into '$TESTTMP/gitrepo-issue380/gitsubrepo'... 387s - done. 387s - $ fn_git_commit -m 'add a submodule' 387s - $ cat >> .gitmodules < <<<<<<< HEAD 387s - > EOF 387s - $ fn_git_commit -a -m 'b0rken .gitmodules' 387s - $ git status 387s - fatal: bad config line 4 in file $TESTTMP/gitrepo-issue380/.gitmodules 387s - [128] 387s - $ sed -i.orig /HEAD/d .gitmodules 387s - $ fn_git_commit -a -m 'fix .gitmodules' 387s - $ git status 387s - On branch master 387s - Untracked files: 387s - (use "git add ..." to include in what will be committed) 387s - .gitmodules.orig 387s - 387s - nothing added to commit but untracked files present (use "git add" to track) 387s - $ cd .. 387s - $ git clone gitrepo-issue380 gitrepo-issue380~ 387s - Cloning into 'gitrepo-issue380~'... 387s - done. 387s - $ hg clone -U gitrepo-issue380 hgrepo-issue380 387s - importing 3 git commits 387s - warning: failed to parse .gitmodules in 2e4ec4293822 387s - new changesets ed60e5fbc192:9dfc0cdf1787 (3 drafts) 387s 387s ERROR: test-git-submodules.t output changed 387s ! 387s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-renames.t 387s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-renames.t.err 387s @@ -95,494 +95,9 @@ 387s 387s $ cd .. 387s $ hg clone -q repo.git hgrepo 387s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 387s + abort: repository repo.git not found 387s + [255] 387s $ cd hgrepo 387s + $TESTTMP.sh: 115: cd: can't cd to hgrepo 387s $ hg book master -q 387s - $ hg log -p --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 387s - @ 8 497105ddbe119aa40af691eb2b1a029c29bf5247 remove submodule and rename back 387s - | branch=default hg-git-rename-source=git 387s - | 387s - | diff --git a/.hgsub b/.hgsub 387s - | --- a/.hgsub 387s - | +++ b/.hgsub 387s - | @@ -1,2 +1,1 @@ 387s - | gitsubmodule2 = [git]../gitsubmodule 387s - | -gamma = [git]../gitsubmodule 387s - | diff --git a/.hgsubstate b/.hgsubstate 387s - | --- a/.hgsubstate 387s - | +++ b/.hgsubstate 387s - | @@ -1,2 +1,1 @@ 387s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 387s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 387s - | diff --git a/gamma-new b/gamma 387s - | rename from gamma-new 387s - | rename to gamma 387s - | 387s - o 7 adfc1ce8461d3174dcf8425e112e2fa848de3913 rename and add submodule 387s - | branch=default hg-git-rename-source=git 387s - | 387s - | diff --git a/.hgsub b/.hgsub 387s - | --- a/.hgsub 387s - | +++ b/.hgsub 387s - | @@ -1,1 +1,2 @@ 387s - | gitsubmodule2 = [git]../gitsubmodule 387s - | +gamma = [git]../gitsubmodule 387s - | diff --git a/.hgsubstate b/.hgsubstate 387s - | --- a/.hgsubstate 387s - | +++ b/.hgsubstate 387s - | @@ -1,1 +1,2 @@ 387s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 387s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 387s - | diff --git a/gamma b/gamma-new 387s - | rename from gamma 387s - | rename to gamma-new 387s - | 387s - o 6 62c1a4b07240b53a71be1b1a46e94e99132c5391 beta renamed back 387s - | branch=default hg-git-rename-source=git 387s - | 387s - | diff --git a/beta b/beta 387s - | old mode 120000 387s - | new mode 100644 387s - | --- a/beta 387s - | +++ b/beta 387s - | @@ -1,1 +1,12 @@ 387s - | -beta-new 387s - | \ No newline at end of file 387s - | +1 387s - | +2 387s - | +3 387s - | +4 387s - | +5 387s - | +6 387s - | +7 387s - | +8 387s - | +9 387s - | +10 387s - | +11 387s - | +12 387s - | diff --git a/beta-new b/beta-new 387s - | deleted file mode 100644 387s - | --- a/beta-new 387s - | +++ /dev/null 387s - | @@ -1,12 +0,0 @@ 387s - | -1 387s - | -2 387s - | -3 387s - | -4 387s - | -5 387s - | -6 387s - | -7 387s - | -8 387s - | -9 387s - | -10 387s - | -11 387s - | -12 387s - | 387s - o 5 f93fefed957cff2220d3f0d11182398350b5fa9a beta renamed 387s - | branch=default hg-git-rename-source=git 387s - | 387s - | diff --git a/beta b/beta 387s - | old mode 100644 387s - | new mode 120000 387s - | --- a/beta 387s - | +++ b/beta 387s - | @@ -1,12 +1,1 @@ 387s - | -1 387s - | -2 387s - | -3 387s - | -4 387s - | -5 387s - | -6 387s - | -7 387s - | -8 387s - | -9 387s - | -10 387s - | -11 387s - | -12 387s - | +beta-new 387s - | \ No newline at end of file 387s - | diff --git a/beta b/beta-new 387s - | copy from beta 387s - | copy to beta-new 387s - | 387s - o 4 b9e63d96abc2783afc59246e798a6936cf05a35e move submodule 387s - | branch=default hg-git-rename-source=git 387s - | 387s - | diff --git a/.hgsub b/.hgsub 387s - | --- a/.hgsub 387s - | +++ b/.hgsub 387s - | @@ -1,1 +1,1 @@ 387s - | -gitsubmodule = [git]../gitsubmodule 387s - | +gitsubmodule2 = [git]../gitsubmodule 387s - | diff --git a/.hgsubstate b/.hgsubstate 387s - | --- a/.hgsubstate 387s - | +++ b/.hgsubstate 387s - | @@ -1,1 +1,1 @@ 387s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 387s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 387s - | 387s - o 3 55537ea256c28be1b5637f4f93a601fdde8a9a7f add submodule 387s - | branch=default hg-git-rename-source=git 387s - | 387s - | diff --git a/.hgsub b/.hgsub 387s - | new file mode 100644 387s - | --- /dev/null 387s - | +++ b/.hgsub 387s - | @@ -0,0 +1,1 @@ 387s - | +gitsubmodule = [git]../gitsubmodule 387s - | diff --git a/.hgsubstate b/.hgsubstate 387s - | new file mode 100644 387s - | --- /dev/null 387s - | +++ b/.hgsubstate 387s - | @@ -0,0 +1,1 @@ 387s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 387s - | 387s - o 2 20f9e56b6d006d0403f853245e483d0892b8ac48 gamma 387s - | branch=default hg-git-rename-source=git 387s - | 387s - | diff --git a/beta b/beta 387s - | --- a/beta 387s - | +++ b/beta 387s - | @@ -9,3 +9,4 @@ 387s - | 9 387s - | 10 387s - | 11 387s - | +12 387s - | diff --git a/beta b/gamma 387s - | copy from beta 387s - | copy to gamma 387s - | --- a/beta 387s - | +++ b/gamma 387s - | @@ -9,3 +9,4 @@ 387s - | 9 387s - | 10 387s - | 11 387s - | +13 387s - | 387s - o 1 9f7744e68def81da3b394f11352f602ca9c8ab68 beta 387s - | branch=default hg-git-rename-source=git 387s - | 387s - | diff --git a/alpha b/beta 387s - | rename from alpha 387s - | rename to beta 387s - | --- a/alpha 387s - | +++ b/beta 387s - | @@ -8,3 +8,4 @@ 387s - | 8 387s - | 9 387s - | 10 387s - | +11 387s - | 387s - o 0 7bc844166f76e49562f81eacd54ea954d01a9e42 alpha 387s - branch=default hg-git-rename-source=git 387s - 387s - diff --git a/alpha b/alpha 387s - new file mode 100644 387s - --- /dev/null 387s - +++ b/alpha 387s - @@ -0,0 +1,10 @@ 387s - +1 387s - +2 387s - +3 387s - +4 387s - +5 387s - +6 387s - +7 387s - +8 387s - +9 387s - +10 387s - 387s - 387s -Make a new ordinary commit in Mercurial (no extra metadata) 387s - $ echo 14 >> gamma 387s - $ hg ci -m "gamma2" 387s - 387s -Make a new commit with a copy and a rename in Mercurial 387s - $ hg cp gamma delta 387s - $ echo 15 >> delta 387s - $ hg mv beta epsilon 387s - $ echo 16 >> epsilon 387s - $ hg ci -m "delta/epsilon" 387s - $ hg export . 387s - # HG changeset patch 387s - # User test 387s - # Date 0 0 387s - # Thu Jan 01 00:00:00 1970 +0000 387s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 387s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 387s - delta/epsilon 387s - 387s - diff --git a/gamma b/delta 387s - copy from gamma 387s - copy to delta 387s - --- a/gamma 387s - +++ b/delta 387s - @@ -11,3 +11,4 @@ 387s - 11 387s - 13 387s - 14 387s - +15 387s - diff --git a/beta b/epsilon 387s - rename from beta 387s - rename to epsilon 387s - --- a/beta 387s - +++ b/epsilon 387s - @@ -10,3 +10,4 @@ 387s - 10 387s - 11 387s - 12 387s - +16 387s - $ hg push 387s - pushing to $TESTTMP/repo.git 387s - searching for changes 387s - adding objects 387s - remote: found 0 deltas to reuse 387s - added 2 commits with 2 trees and 3 blobs 387s - updating reference refs/heads/master 387s - 387s - $ cd ../repo.git 387s - $ git log master --pretty=oneline 387s - 5f2948d029693346043f320620af99a615930dc4 delta/epsilon 387s - bbd2ec050f7fbc64f772009844f7d58a556ec036 gamma2 387s - 50d116676a308b7c22935137d944e725d2296f2a remove submodule and rename back 387s - 59fb8e82ea18f79eab99196f588e8948089c134f rename and add submodule 387s - f95497455dfa891b4cd9b524007eb9514c3ab654 beta renamed back 387s - 055f482277da6cd3dd37c7093d06983bad68f782 beta renamed 387s - d7f31298f27df8a9226eddb1e4feb96922c46fa5 move submodule 387s - c610256cb6959852d9e70d01902a06726317affc add submodule 387s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 387s - cc83241f39927232f690d370894960b0d1943a0e beta 387s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 387s - 387s -Make sure the right metadata is stored 387s - $ git cat-file commit master^ 387s - tree 0adbde18545845f3b42ad1a18939ed60a9dec7a8 387s - parent 50d116676a308b7c22935137d944e725d2296f2a 387s - author test 0 +0000 387s - committer test 0 +0000 387s - HG:rename-source hg 387s - 387s - gamma2 387s - $ git cat-file commit master 387s - tree f8f32f4e20b56a5a74582c6a5952c175bf9ec155 387s - parent bbd2ec050f7fbc64f772009844f7d58a556ec036 387s - author test 0 +0000 387s - committer test 0 +0000 387s - HG:rename gamma:delta 387s - HG:rename beta:epsilon 387s - 387s - delta/epsilon 387s - 387s -Now make another clone and compare the hashes 387s - 387s - $ cd .. 387s - $ hg clone -q repo.git hgrepo2 387s - $ cd hgrepo2 387s - $ hg book master -qf 387s - $ hg export master 387s - # HG changeset patch 387s - # User test 387s - # Date 0 0 387s - # Thu Jan 01 00:00:00 1970 +0000 387s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 387s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 387s - delta/epsilon 387s - 387s - diff --git a/gamma b/delta 387s - copy from gamma 387s - copy to delta 387s - --- a/gamma 387s - +++ b/delta 387s - @@ -11,3 +11,4 @@ 387s - 11 387s - 13 387s - 14 387s - +15 387s - diff --git a/beta b/epsilon 387s - rename from beta 387s - rename to epsilon 387s - --- a/beta 387s - +++ b/epsilon 387s - @@ -10,3 +10,4 @@ 387s - 10 387s - 11 387s - 12 387s - +16 387s - 387s -Regenerate the Git metadata and compare the hashes 387s - $ hg debug-remove-hggit-state 387s - clearing out the git cache data 387s - $ hg gexport 387s - $ cd .hg/git 387s - $ git log master --pretty=oneline 387s - f3f6592447685566af9447c03ae262aa5432511d delta/epsilon (dulwich-rust !) 387s - c51ce14ec367c5ea72bf428dee3f8576f2fe1bb0 gamma2 (dulwich-rust !) 387s - df749cae534e3c7a0ad664cd0f214dd36e0ac259 remove submodule and rename back (dulwich-rust !) 387s - 8f9ec605ad0cc2532202f73cef8e35d3241797ee rename and add submodule (dulwich-rust !) 387s - 8a00d0fb75377c51c9a46e92ff154c919007f0e2 delta/epsilon (no-dulwich-rust !) 387s - dd7d4f1adb942a8d349dce585019f6949184bc64 gamma2 (no-dulwich-rust !) 387s - 3f1cdaf8b603816fcda02bd29e75198ae4cb13db remove submodule and rename back (no-dulwich-rust !) 387s - 2a4abf1178a999e2054158ceb0c7768079665d03 rename and add submodule (no-dulwich-rust !) 387s - 88c416e8d5e0e9dd1187d45ebafaa46111764196 beta renamed back 387s - 027d2a6e050705bf6f7e226e7e97f02ce5ae3200 beta renamed 387s - dc70e620634887e70ac5dd108bcc7ebd99c60ec3 move submodule 387s - c610256cb6959852d9e70d01902a06726317affc add submodule 387s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 387s - cc83241f39927232f690d370894960b0d1943a0e beta 387s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 387s - 387s -Test findcopiesharder 387s - 387s - $ cd $TESTTMP 387s - $ git init -q gitcopyharder 387s - $ cd gitcopyharder 387s - $ cat >> file0 << EOF 387s - > 1 387s - > 2 387s - > 3 387s - > 4 387s - > 5 387s - > EOF 387s - $ git add file0 387s - $ fn_git_commit -m file0 387s - $ cp file0 file1 387s - $ git add file1 387s - $ fn_git_commit -m file1 387s - $ cp file0 file2 387s - $ echo 6 >> file2 387s - $ git add file2 387s - $ fn_git_commit -m file2 387s - 387s - $ cd .. 387s - 387s -Clone without findcopiesharder does not find copies from unmodified files 387s - 387s - $ hg clone gitcopyharder hgnocopyharder 387s - importing 3 git commits 387s - new changesets b45d023c6842:ec77ccdbefe0 (3 drafts) 387s - updating to bookmark master 387s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 387s - $ hg -R hgnocopyharder export 1::2 387s - # HG changeset patch 387s - # User test 387s - # Date 1167609621 0 387s - # Mon Jan 01 00:00:21 2007 +0000 387s - # Node ID 555831c93e2a250e5ba42efad45bf7ba71da13e4 387s - # Parent b45d023c6842337ffe694663a44aa672d311081c 387s - file1 387s - 387s - diff --git a/file1 b/file1 387s - new file mode 100644 387s - --- /dev/null 387s - +++ b/file1 387s - @@ -0,0 +1,5 @@ 387s - +1 387s - +2 387s - +3 387s - +4 387s - +5 387s - # HG changeset patch 387s - # User test 387s - # Date 1167609622 0 387s - # Mon Jan 01 00:00:22 2007 +0000 387s - # Node ID ec77ccdbefe023eb9898b0399f84f670c8c0f5fc 387s - # Parent 555831c93e2a250e5ba42efad45bf7ba71da13e4 387s - file2 387s - 387s - diff --git a/file2 b/file2 387s - new file mode 100644 387s - --- /dev/null 387s - +++ b/file2 387s - @@ -0,0 +1,6 @@ 387s - +1 387s - +2 387s - +3 387s - +4 387s - +5 387s - +6 387s - 387s -findcopiesharder finds copies from unmodified files if similarity is met 387s - 387s - $ hg --config git.findcopiesharder=true clone gitcopyharder hgcopyharder0 387s - importing 3 git commits 387s - new changesets b45d023c6842:9b3099834272 (3 drafts) 387s - updating to bookmark master 387s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 387s - $ hg -R hgcopyharder0 export 1::2 387s - # HG changeset patch 387s - # User test 387s - # Date 1167609621 0 387s - # Mon Jan 01 00:00:21 2007 +0000 387s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 387s - # Parent b45d023c6842337ffe694663a44aa672d311081c 387s - file1 387s - 387s - diff --git a/file0 b/file1 387s - copy from file0 387s - copy to file1 387s - # HG changeset patch 387s - # User test 387s - # Date 1167609622 0 387s - # Mon Jan 01 00:00:22 2007 +0000 387s - # Node ID 9b30998342729c7357d418bebed7399986cfe643 387s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 387s - file2 387s - 387s - diff --git a/file0 b/file2 387s - copy from file0 387s - copy to file2 387s - --- a/file0 387s - +++ b/file2 387s - @@ -3,3 +3,4 @@ 387s - 3 387s - 4 387s - 5 387s - +6 387s - 387s - $ hg --config git.findcopiesharder=true --config git.similarity=95 clone gitcopyharder hgcopyharder1 387s - importing 3 git commits 387s - new changesets b45d023c6842:d9d2e8cbf050 (3 drafts) 387s - updating to bookmark master 387s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 387s - $ hg -R hgcopyharder1 export 1::2 387s - # HG changeset patch 387s - # User test 387s - # Date 1167609621 0 387s - # Mon Jan 01 00:00:21 2007 +0000 387s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 387s - # Parent b45d023c6842337ffe694663a44aa672d311081c 387s - file1 387s - 387s - diff --git a/file0 b/file1 387s - copy from file0 387s - copy to file1 387s - # HG changeset patch 387s - # User test 387s - # Date 1167609622 0 387s - # Mon Jan 01 00:00:22 2007 +0000 387s - # Node ID d9d2e8cbf050772be31dccf78851f71dc547d139 387s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 387s - file2 387s - 387s - diff --git a/file2 b/file2 387s - new file mode 100644 387s - --- /dev/null 387s - +++ b/file2 387s - @@ -0,0 +1,6 @@ 387s - +1 387s - +2 387s - +3 387s - +4 387s - +5 387s - +6 387s - 387s -Config values out of range 387s - $ hg --config git.similarity=999 clone gitcopyharder hgcopyharder2 387s - importing 3 git commits 387s - abort: git.similarity must be between 0 and 100 387s - [255] 387s -Left-over on Windows with some pack files 387s - $ rm -rf hgcopyharder2 387s - $ hg --config git.renamelimit=-5 clone gitcopyharder hgcopyharder2 387s - importing 3 git commits 387s - abort: git.renamelimit must be non-negative 387s - [255] 387s 387s ERROR: test-renames.t output changed 388s !s 388s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-git-tags.t 388s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-git-tags.t#draft.err 388s @@ -41,337 +41,13 @@ 388s Clone it: 388s 388s $ hg clone repo.git hgrepo 388s - importing 2 git commits 388s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 388s - updating to bookmark master 388s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 388s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 388s + abort: repository repo.git not found 388s + [255] 388s 388s $ cd hgrepo 388s + $TESTTMP.sh: 39: cd: can't cd to hgrepo 388s 388s Verify that annotated tags are unaffected by reexports: 388s 388s $ GIT_DIR=.hg/git git tag -ln 388s - beta added tag beta 388s - $ hg gexport 388s - $ GIT_DIR=.hg/git git tag -ln 388s - beta added tag beta 388s - 388s -Error checking on tag creation 388s - 388s - $ hg tag --git beta --remove 388s - abort: cannot remove git tags 388s - (the git documentation heavily discourages editing tags) 388s - [255] 388s - $ hg tag --git beta -r null 388s - abort: cannot remove git tags 388s - (the git documentation heavily discourages editing tags) 388s - [255] 388s - $ hg tag --git beta --remove -r 0 388s - abort: cannot specify both --rev and --remove 388s - [10] 388s - $ hg tag --git alpha 388s - abort: git tags require an explicit revision 388s - (please specify -r/--rev) 388s - [255] 388s - $ hg tag --git alpha alpha -r 0 388s - abort: tag names must be unique 388s - [255] 388s - $ hg tag --git alpha -r 0 -e 388s - abort: cannot specify both --git and --edit 388s - [10] 388s - $ hg tag --git alpha -r 0 -m 42 388s - abort: cannot specify both --git and --message 388s - [10] 388s - $ hg tag --git alpha -r 0 -d 42 388s - abort: cannot specify both --git and --date 388s - [10] 388s - $ hg tag --git alpha -r 0 -u user@example.com 388s - abort: cannot specify both --git and --user 388s - [10] 388s - $ hg tag --git 'with space' -r 0 388s - abort: the name 'with space' is not a valid git tag 388s - [255] 388s - $ hg tag --git ' beta' -r 0 388s - abort: the name 'beta' already exists 388s - [255] 388s - $ hg tag --git master -r 0 388s - abort: the name 'master' already exists 388s - [255] 388s - $ hg tag --git tip -r 0 388s - abort: the name 'tip' is reserved 388s - [10] 388s - 388s -Create a git tag from hg 388s - 388s - $ hg tag --git alpha --debug -r 0 388s - finding unexported changesets 388s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 388s - adding git tag alpha 388s - $ hg log --graph 388s - @ changeset: 1:7fe02317c63d 388s - | bookmark: master 388s - | tag: beta 388s - | tag: default/master 388s - | tag: tip 388s - | user: test 388s - | date: Mon Jan 01 00:00:11 2007 +0000 388s - | summary: add beta 388s - | 388s - o changeset: 0:ff7a2f2d8d70 388s - tag: alpha 388s - user: test 388s - date: Mon Jan 01 00:00:10 2007 +0000 388s - summary: add alpha 388s - 388s - $ echo beta-fix >> beta 388s - $ fn_hg_commit -m 'fix for beta' 388s -#if secret 388s - $ hg phase -d 388s -#endif 388s - $ hg push 388s - pushing to $TESTTMP/repo.git 388s - searching for changes 388s - adding objects 388s - remote: found 0 deltas to reuse 388s - added 1 commits with 1 trees and 1 blobs 388s - updating reference refs/heads/master 388s - adding reference refs/tags/alpha 388s - 388s -Verify that amending commits known to remotes doesn't break anything 388s - 388s - $ cat >> $HGRCPATH << EOF 388s - > [experimental] 388s - > evolution = createmarkers 388s - > evolution.createmarkers = yes 388s - > EOF 388s - $ hg tags 388s - tip 2:61175962e488 388s - default/master 2:61175962e488 388s - beta 1:7fe02317c63d 388s - alpha 0:ff7a2f2d8d70 388s - $ echo beta-fix-again >> beta 388s - $ fn_hg_commit --amend 388s - $ hg log -T shorttags 388s - 3:3094b9e8da41 draft tip 388s - 2:61175962e488 draft default/master X 388s - 1:7fe02317c63d draft beta 388s - 0:ff7a2f2d8d70 draft alpha 388s - $ hg tags 388s - tip 3:3094b9e8da41 388s - default/master 2:61175962e488 388s - beta 1:7fe02317c63d 388s - alpha 0:ff7a2f2d8d70 388s - $ hg push 388s - pushing to $TESTTMP/repo.git 388s - searching for changes 388s - abort: pushing refs/heads/master overwrites 3094b9e8da41 388s - [255] 388s - $ hg push -f 388s - pushing to $TESTTMP/repo.git 388s - searching for changes 388s - adding objects 388s - remote: found 0 deltas to reuse 388s - added 1 commits with 1 trees and 1 blobs 388s - updating reference refs/heads/master 388s - 388s -Now create a tag for the old, obsolete master 388s - 388s - $ cd ../repo.git 388s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 388s - $ git tag 388s - alpha 388s - beta 388s - detached 388s - $ cd ../hgrepo 388s - $ hg pull 388s - pulling from $TESTTMP/repo.git 388s - no changes found 388s - $ hg log -T shorttags 388s - 3:3094b9e8da41 draft default/master tip 388s - 2:61175962e488 draft detached X 388s - 1:7fe02317c63d draft beta 388s - 0:ff7a2f2d8d70 draft alpha 388s - $ hg tags 388s - tip 3:3094b9e8da41 388s - default/master 3:3094b9e8da41 388s - detached 2:61175962e488 388s - beta 1:7fe02317c63d 388s - alpha 0:ff7a2f2d8d70 388s - $ hg push 388s - pushing to $TESTTMP/repo.git 388s - searching for changes 388s - no changes found 388s - [1] 388s - 388s - $ cd .. 388s - 388s -Verify that revsets can point out git tags; for that we need an 388s -untagged commit. 388s - 388s - $ cd hgrepo 388s - $ touch gamma 388s - $ fn_hg_commit -A -m 'add gamma' 388s -#if secret 388s - $ hg phase -d 388s -#endif 388s - $ hg log -T shorttags -r 'gittag()' 388s - 0:ff7a2f2d8d70 draft alpha 388s - 1:7fe02317c63d draft beta 388s - 2:61175962e488 draft detached X 388s - $ hg log -T shorttags -r 'gittag(detached)' 388s - 2:61175962e488 draft detached X 388s - $ hg log -T shorttags -r 'gittag("re:a$")' 388s - 0:ff7a2f2d8d70 draft alpha 388s - 1:7fe02317c63d draft beta 388s - 388s -Create a git tag from hg, but pointing to a new commit: 388s - 388s - $ hg tag --git gamma --debug -r tip 388s - invalid branch cache (visible): tip differs (?) 388s - finding unexported changesets 388s - exporting 1 changesets 388s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 388s - packing 3 loose objects... 388s - packed 3 loose objects! 388s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 388s - adding git tag gamma 388s - $ hg push 388s - pushing to $TESTTMP/repo.git 388s - searching for changes 388s - adding objects 388s - remote: found 0 deltas to reuse 388s - added 1 commits with 1 trees and 1 blobs 388s - updating reference refs/heads/master 388s - adding reference refs/tags/gamma 388s - $ cd ../gitrepo 388s - $ git fetch --quiet --tags 388s - $ git tag 388s - alpha 388s - beta 388s - detached 388s - gamma 388s - $ cd .. 388s - 388s -Try to overwrite an annotated tag: 388s - 388s - $ cd hgrepo 388s - $ hg tags -v 388s - tip 4:0eb1ab0073a8 388s - gamma 4:0eb1ab0073a8 git 388s - default/master 4:0eb1ab0073a8 git-remote 388s - detached 2:61175962e488 git 388s - beta 1:7fe02317c63d git 388s - alpha 0:ff7a2f2d8d70 git 388s - $ hg book not-master 388s - $ hg tag beta 388s - abort: tag 'beta' already exists (use -f to force) 388s - [10] 388s - $ hg tag -f beta 388s -#if secret 388s - $ hg phase -d 388s -#endif 388s - $ hg push 388s - pushing to $TESTTMP/repo.git 388s - warning: not overwriting annotated tag 'beta' 388s - searching for changes 388s - adding objects 388s - remote: found 0 deltas to reuse 388s - added 1 commits with 1 trees and 1 blobs 388s - adding reference refs/heads/not-master 388s - $ hg tags 388s - tip 5:c49682c7cba4 388s - default/not-master 5:c49682c7cba4 388s - gamma 4:0eb1ab0073a8 388s - default/master 4:0eb1ab0073a8 388s - beta 4:0eb1ab0073a8 388s - detached 2:61175962e488 388s - alpha 0:ff7a2f2d8d70 388s - $ cd .. 388s - 388s -Check whether `gimport` handles tags 388s - 388s - $ cd hgrepo 388s - $ rm .hg/git-tags .hg/git-mapfile 388s - $ hg gimport 388s - importing 6 git commits 388s - $ hg tags -q 388s - tip 388s - default/not-master 388s - gamma 388s - default/master 388s - beta 388s - detached 388s - alpha 388s - $ cd .. 388s - 388s -Test how pulling an explicit branch with an annotated tag: 388s - 388s - $ hg clone -r master repo.git hgrepo-2 388s - importing 4 git commits 388s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 388s - updating to branch default 388s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 388s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 388s - 0:ff7a2f2d8d70 draft alpha 388s - 1:7fe02317c63d draft beta 388s - 3:0eb1ab0073a8 draft default/master gamma tip 388s - $ hg tags -v -R hgrepo-2 388s - tip 3:0eb1ab0073a8 388s - gamma 3:0eb1ab0073a8 git 388s - default/master 3:0eb1ab0073a8 git-remote 388s - beta 1:7fe02317c63d git 388s - alpha 0:ff7a2f2d8d70 git 388s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 388s - $ rm -rf hgrepo-2 388s - 388s - $ hg clone -r master repo.git hgrepo-2 388s - importing 4 git commits 388s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 388s - updating to branch default 388s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 388s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 388s - 0:ff7a2f2d8d70 draft alpha 388s - 1:7fe02317c63d draft beta 388s - 3:0eb1ab0073a8 draft default/master gamma tip 388s -This used to die: 388s - $ hg -R hgrepo-2 gexport 388s -This used to fail, since we didn't actually pull the annotated tag: 388s - $ hg -R hgrepo-2 push 388s - pushing to $TESTTMP/repo.git 388s - searching for changes 388s - no changes found 388s - [1] 388s - $ rm -rf hgrepo-2 388s - 388s -Check that pulling will update phases only: 388s - 388s - $ cd hgrepo 388s - $ hg phase -fs gamma detached 388s - $ hg pull 388s - pulling from $TESTTMP/repo.git 388s - no changes found 388s - $ hg log -T shorttags -r gamma -r detached 388s - 4:0eb1ab0073a8 draft beta default/master gamma 388s - 2:61175962e488 draft detached X 388s - $ cd .. 388s - 388s -Check that we pull new tags to existing commits: 388s - $ cd gitrepo 388s - $ git tag 388s - alpha 388s - beta 388s - detached 388s - gamma 388s - $ fn_git_tag extra-simple-tag 388s - $ fn_git_tag -m annotated extra-annotated-tag 388s - $ git push --tags 388s - To $TESTTMP/repo.git 388s - * [new tag] extra-annotated-tag -> extra-annotated-tag 388s - * [new tag] extra-simple-tag -> extra-simple-tag 388s - $ cd ../hgrepo 388s - $ hg pull -r master 388s - pulling from $TESTTMP/repo.git 388s - no changes found 388s - $ hg tags -v | grep extra 388s - extra-simple-tag 1:7fe02317c63d git 388s - extra-annotated-tag 1:7fe02317c63d git 388s 388s ERROR: test-git-tags.t#draft output changed 388s ! 388s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-help.t 388s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-help.t.err 388s @@ -5,250 +5,14 @@ 388s 388s $ hg help | grep 'git' | sed 's/ */ /g' 388s git-cleanup clean up Git commit map after history editing (?) 388s - git-verify verify that a Mercurial rev matches the corresponding Git rev 388s - hggit push and pull from a Git server 388s - hggit-config Configuring hg-git 388s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 388s 388s $ hg help hggit-config 388s - Configuring hg-git 388s - """""""""""""""""" 388s - 388s - "git" 388s - ----- 388s - 388s - Control how the Hg-Git extension interacts with Git. 388s - 388s - "authors" 388s - Git uses a strict convention for "author names" when representing 388s - changesets, using the form "[realname] [email address]". Mercurial 388s - encourages this convention as well but is not as strict, so it's not 388s - uncommon for a Mercurial repository to have authors listed as, for 388s - example, simple usernames. hg-git by default will attempt to translate 388s - Mercurial usernames using the following rules: 388s - 388s - - If the Mercurial username fits the pattern "NAME ", the Git 388s - name will be set to NAME and the email to EMAIL. 388s - - If the Mercurial username looks like an email (if it contains an 388s - "@"), the Git name and email will both be set to that email. 388s - - If the Mercurial username consists of only a name, the email will be 388s - set to "none@none". 388s - - Illegal characters (stray "<"\ s or ">"\ s) will be stripped out, and 388s - for "NAME " usernames, any content after the right-bracket (for 388s - example, a second ">") will be turned into a url-encoded sigil like 388s - "ext:(%3E)" in the Git author name. 388s - 388s - Since these default behaviors may not be what you want ("none@none", for 388s - example, shows up unpleasantly on GitHub as "illegal email address"), 388s - the "git.authors" option provides for an "authors translation file" that 388s - will be used during outgoing transfers from Mercurial to Git only, by 388s - modifying "hgrc" as such: 388s - 388s - [git] 388s - authors = authors.txt 388s - 388s - Where "authors.txt" is the name of a text file containing author name 388s - translations, one per each line, using the following format: 388s - 388s - johnny = John Smith 388s - dougie = Doug Johnson 388s - 388s - Empty lines and lines starting with a "#" are ignored. 388s - 388s - It should be noted that this translation is in *the Mercurial to Git 388s - direction only*. Changesets coming from Git back to Mercurial will not 388s - translate back into Mercurial usernames, so it's best that the same 388s - username/email combination be used on both the Mercurial and Git sides; 388s - the author file is mostly useful for translating legacy changesets. 388s - 388s - "branch_bookmark_suffix" 388s - Hg-Git does not convert between Mercurial named branches and git 388s - branches as the two are conceptually different; instead, it uses 388s - Mercurial bookmarks to represent the concept of a Git branch. Therefore, 388s - when translating a Mercurial repository over to Git, you typically need 388s - to create bookmarks to mirror all the named branches that you'd like to 388s - see transferred over to Git. The major caveat with this is that you 388s - can't use the same name for your bookmark as that of the named branch, 388s - and furthermore there's no feasible way to rename a branch in Mercurial. 388s - For the use case where one would like to transfer a Mercurial repository 388s - over to Git, and maintain the same named branches as are present on the 388s - hg side, the "branch_bookmark_suffix" might be all that's needed. This 388s - presents a string "suffix" that will be recognized on each bookmark 388s - name, and stripped off as the bookmark is translated to a Git branch: 388s - 388s - [git] 388s - branch_bookmark_suffix=_bookmark 388s - 388s - Above, if a Mercurial repository had a named branch called 388s - "release_6_maintenance", you could then link it to a bookmark called 388s - "release_6_maintenance_bookmark". hg-git will then strip off the 388s - "_bookmark" suffix from this bookmark name, and create a Git branch 388s - called "release_6_maintenance". When pulling back from Git to hg, the 388s - "_bookmark" suffix is then applied back, if and only if a Mercurial 388s - named branch of that name exists. E.g., when changes to the 388s - "release_6_maintenance" branch are checked into Git, these will be 388s - placed into the "release_6_maintenance_bookmark" bookmark on hg. But if 388s - a new branch called "release_7_maintenance" were pulled over to hg, and 388s - there was not a "release_7_maintenance" named branch already, the 388s - bookmark will be named "release_7_maintenance" with no usage of the 388s - suffix. 388s - 388s - The "branch_bookmark_suffix" option is, like the "authors" option, 388s - intended for migrating legacy hg named branches. Going forward, a 388s - Mercurial repository that is to be linked with a Git repository should 388s - only use bookmarks for named branching. 388s - 388s - "findcopiesharder" 388s - Whether to consider unmodified files as copy sources. This is a very 388s - expensive operation for large projects, so use it with caution. Similar 388s - to "git diff"'s --find-copies-harder option. 388s - 388s - "intree" 388s - Hg-Git keeps a Git repository clone for reading and updating. By 388s - default, the Git clone is the subdirectory "git" in your local Mercurial 388s - repository. If you would like this Git clone to be at the same level of 388s - your Mercurial repository instead (named ".git"), add the following to 388s - your "hgrc": 388s - 388s - [git] 388s - intree = True 388s - 388s - Please note that changing this setting in an existing repository doesn't 388s - move the local Git repository. You will either have to do so yourself, 388s - or issue an 'hg pull' after the fact to repopulate the new location. 388s - 388s - "mindate" 388s - If set, branches where the latest commit's commit time is older than 388s - this will not be imported. Accepts any date formats that Mercurial does 388s - -- see 'hg help dates' for more. 388s - 388s - "public" 388s - A list of Git branches that should be considered "published", and 388s - therefore converted to Mercurial in the 'public' phase. This is only 388s - used if "hggit.usephases" is set. 388s - 388s - "pull-prune-remote-branches" 388s - Before fetching, remove any remote-tracking references, or pseudo-tags, 388s - that no longer exist on the remote. This is equivalent to the "--prune" 388s - option to "git fetch", and means that pseudo-tags for remotes -- such as 388s - "default/master" -- always actually reflect what's on the remote. 388s - 388s - This option is enabled by default. 388s - 388s - "pull-prune-bookmarks" 388s - On pull, delete any unchanged bookmarks removed on the remote. In other 388s - words, if e.g. the "thebranch" bookmark remains at "default/thebranch", 388s - and the branch is deleted in Git, pulling deletes the bookmark. 388s - 388s - This option is enabled by default. 388s - 388s - "renamelimit" 388s - The number of files to consider when performing the copy/rename 388s - detection. Detection is disabled if the number of files modified in a 388s - commit is above the limit. Detection is O(N^2) in the number of files 388s - modified, so be sure not to set the limit too high. Similar to Git's 388s - "diff.renameLimit" config. The default is "400", the same as Git. 388s - 388s - "similarity" 388s - Specify how similar files modified in a Git commit must be to be 388s - imported as Mercurial renames or copies, as a percentage between "0" 388s - (disabled) and "100" (files must be identical). For example, "90" means 388s - that a delete/add pair will be imported as a rename if more than 90% of 388s - the file has stayed the same. The default is "0" (disabled). 388s - 388s - "blame.ignoreRevsFile" 388s - Specify a file that lists Git commits to ignore when invoking 'hg 388s - annotate'. 388s - 388s - "hggit" 388s - ------- 388s - 388s - Control behavior of the Hg-Git extension. 388s - 388s - "mapsavefrequency" 388s - By default, hg-git only saves the results of a conversion at the end. 388s - Use this option to enable resuming long-running pulls and pushes. Set 388s - this to a number greater than 0 to allow resuming after converting that 388s - many commits. This can help when the conversion encounters an error 388s - partway through a large batch of changes. Otherwise, an error or 388s - interruption will roll back the transaction, similar to regular 388s - Mercurial. 388s - 388s - Defaults to 1000. 388s - 388s - Please note that this is disregarded for an initial clone, as any error 388s - or interruption will delete the destination. So instead of cloning a 388s - large Git repository, you might want to pull instead: 388s - 388s - $ hg init linux 388s - $ cd linux 388s - $ echo "[paths]\ndefault = https://github.com/torvalds/linux" > .hg/hgrc 388s - $ hg pull 388s - 388s - ...and be extremely patient. Please note that converting very large 388s - repositories may take *days* rather than mere *hours*, and may run into 388s - issues with available memory for very long running clones. Even any 388s - small, undiscovered leak will build up when processing hundreds of 388s - thousands of files and commits. Cloning the Linux kernel is likely a 388s - pathological case, but other storied repositories such as CPython do 388s - work well, even if the initial clone requires a some patience. 388s - 388s - "threads" 388s - 388s - During a push to Git, hg-git will pack loose objects at regular 388s - intervals whenever it saves its map. As this is a rather expensive 388s - operation, it's done in separate threads. 388s - 388s - Defaults to the system CPU count or 4, whichever is lower. 388s - 388s - "usephases" 388s - When converting Git revisions to Mercurial, place them in the 'public' 388s - phase as appropriate. Namely, revisions that are reachable from the 388s - remote Git repository's default branch, or "HEAD", will be marked 388s - *public*. For most repositories, this means the remote "master" branch 388s - will be converted as public. The same applies to any commits tagged in 388s - the remote. 388s - 388s - To restrict publishing to specific branches or tags, use the 388s - "git.public" option. 388s - 388s - Publishing commits prevents their modification, and speeds up many local 388s - Mercurial operations, such as 'hg shelve'. 388s - 388s - "fetchbuffer" 388s - Data fetched from Git is buffered in memory, unless it exceeds the given 388s - limit, in megabytes. By default, flush the buffer to disk when it 388s - exceeds 100MB. 388s - 388s - "retries" 388s - Interacting with a remote Git repository may require authentication. 388s - Normally, this will trigger a prompt and a retry, and this option 388s - restricts the amount of retries. Defaults to 3. 388s - 388s - "invalidpaths" 388s - Both Mercurial and Git consider paths as just bytestrings internally, 388s - and allow almost anything. The difference, however, is in the _almost_ 388s - part. For example, many Git servers will reject a push for security 388s - reasons if it contains a nested Git repository. Similarly, Mercurial 388s - cannot checkout commits with a nested repository, and it cannot even 388s - store paths containing an embedded newline or carrage return character. 388s - 388s - The default is to issue a warning and skip these paths. You can change 388s - this by setting "hggit.invalidpaths" in ".hgrc": 388s - 388s - [hggit] 388s - invalidpaths = keep 388s - 388s - Possible values are "keep", "skip" or "abort". Prior to 1.0, the default 388s - was "abort". 388s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 388s + abort: no such help topic: hggit-config 388s + (try 'hg help --keyword hggit-config') 388s + [10] 388s 388s $ hg help config.hggit | head -10 388s - "hggit" 388s - ------- 388s - 388s - Control behavior of the Hg-Git extension. 388s - 388s - "mapsavefrequency" 388s - By default, hg-git only saves the results of a conversion at the end. 388s - Use this option to enable resuming long-running pulls and pushes. Set 388s - this to a number greater than 0 to allow resuming after converting that 388s - many commits. This can help when the conversion encounters an error 388s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 388s + abort: help section not found: config.hggit 388s 388s ERROR: test-help.t output changed 388s ! 388s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-git-tags.t 388s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-git-tags.t#secret.err 388s @@ -41,337 +41,13 @@ 388s Clone it: 388s 388s $ hg clone repo.git hgrepo 388s - importing 2 git commits 388s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 388s - updating to bookmark master 388s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 388s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 388s + abort: repository repo.git not found 388s + [255] 388s 388s $ cd hgrepo 388s + $TESTTMP.sh: 44: cd: can't cd to hgrepo 388s 388s Verify that annotated tags are unaffected by reexports: 388s 388s $ GIT_DIR=.hg/git git tag -ln 388s - beta added tag beta 388s - $ hg gexport 388s - $ GIT_DIR=.hg/git git tag -ln 388s - beta added tag beta 388s - 388s -Error checking on tag creation 388s - 388s - $ hg tag --git beta --remove 388s - abort: cannot remove git tags 388s - (the git documentation heavily discourages editing tags) 388s - [255] 388s - $ hg tag --git beta -r null 388s - abort: cannot remove git tags 388s - (the git documentation heavily discourages editing tags) 388s - [255] 388s - $ hg tag --git beta --remove -r 0 388s - abort: cannot specify both --rev and --remove 388s - [10] 388s - $ hg tag --git alpha 388s - abort: git tags require an explicit revision 388s - (please specify -r/--rev) 388s - [255] 388s - $ hg tag --git alpha alpha -r 0 388s - abort: tag names must be unique 388s - [255] 388s - $ hg tag --git alpha -r 0 -e 388s - abort: cannot specify both --git and --edit 388s - [10] 388s - $ hg tag --git alpha -r 0 -m 42 388s - abort: cannot specify both --git and --message 388s - [10] 388s - $ hg tag --git alpha -r 0 -d 42 388s - abort: cannot specify both --git and --date 388s - [10] 388s - $ hg tag --git alpha -r 0 -u user@example.com 388s - abort: cannot specify both --git and --user 388s - [10] 388s - $ hg tag --git 'with space' -r 0 388s - abort: the name 'with space' is not a valid git tag 388s - [255] 388s - $ hg tag --git ' beta' -r 0 388s - abort: the name 'beta' already exists 388s - [255] 388s - $ hg tag --git master -r 0 388s - abort: the name 'master' already exists 388s - [255] 388s - $ hg tag --git tip -r 0 388s - abort: the name 'tip' is reserved 388s - [10] 388s - 388s -Create a git tag from hg 388s - 388s - $ hg tag --git alpha --debug -r 0 388s - finding unexported changesets 388s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 388s - adding git tag alpha 388s - $ hg log --graph 388s - @ changeset: 1:7fe02317c63d 388s - | bookmark: master 388s - | tag: beta 388s - | tag: default/master 388s - | tag: tip 388s - | user: test 388s - | date: Mon Jan 01 00:00:11 2007 +0000 388s - | summary: add beta 388s - | 388s - o changeset: 0:ff7a2f2d8d70 388s - tag: alpha 388s - user: test 388s - date: Mon Jan 01 00:00:10 2007 +0000 388s - summary: add alpha 388s - 388s - $ echo beta-fix >> beta 388s - $ fn_hg_commit -m 'fix for beta' 388s -#if secret 388s - $ hg phase -d 388s -#endif 388s - $ hg push 388s - pushing to $TESTTMP/repo.git 388s - searching for changes 388s - adding objects 388s - remote: found 0 deltas to reuse 388s - added 1 commits with 1 trees and 1 blobs 388s - updating reference refs/heads/master 388s - adding reference refs/tags/alpha 388s - 388s -Verify that amending commits known to remotes doesn't break anything 388s - 388s - $ cat >> $HGRCPATH << EOF 388s - > [experimental] 388s - > evolution = createmarkers 388s - > evolution.createmarkers = yes 388s - > EOF 388s - $ hg tags 388s - tip 2:61175962e488 388s - default/master 2:61175962e488 388s - beta 1:7fe02317c63d 388s - alpha 0:ff7a2f2d8d70 388s - $ echo beta-fix-again >> beta 388s - $ fn_hg_commit --amend 388s - $ hg log -T shorttags 388s - 3:3094b9e8da41 draft tip 388s - 2:61175962e488 draft default/master X 388s - 1:7fe02317c63d draft beta 388s - 0:ff7a2f2d8d70 draft alpha 388s - $ hg tags 388s - tip 3:3094b9e8da41 388s - default/master 2:61175962e488 388s - beta 1:7fe02317c63d 388s - alpha 0:ff7a2f2d8d70 388s - $ hg push 388s - pushing to $TESTTMP/repo.git 388s - searching for changes 388s - abort: pushing refs/heads/master overwrites 3094b9e8da41 388s - [255] 388s - $ hg push -f 388s - pushing to $TESTTMP/repo.git 388s - searching for changes 388s - adding objects 388s - remote: found 0 deltas to reuse 388s - added 1 commits with 1 trees and 1 blobs 388s - updating reference refs/heads/master 388s - 388s -Now create a tag for the old, obsolete master 388s - 388s - $ cd ../repo.git 388s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 388s - $ git tag 388s - alpha 388s - beta 388s - detached 388s - $ cd ../hgrepo 388s - $ hg pull 388s - pulling from $TESTTMP/repo.git 388s - no changes found 388s - $ hg log -T shorttags 388s - 3:3094b9e8da41 draft default/master tip 388s - 2:61175962e488 draft detached X 388s - 1:7fe02317c63d draft beta 388s - 0:ff7a2f2d8d70 draft alpha 388s - $ hg tags 388s - tip 3:3094b9e8da41 388s - default/master 3:3094b9e8da41 388s - detached 2:61175962e488 388s - beta 1:7fe02317c63d 388s - alpha 0:ff7a2f2d8d70 388s - $ hg push 388s - pushing to $TESTTMP/repo.git 388s - searching for changes 388s - no changes found 388s - [1] 388s - 388s - $ cd .. 388s - 388s -Verify that revsets can point out git tags; for that we need an 388s -untagged commit. 388s - 388s - $ cd hgrepo 388s - $ touch gamma 388s - $ fn_hg_commit -A -m 'add gamma' 388s -#if secret 388s - $ hg phase -d 388s -#endif 388s - $ hg log -T shorttags -r 'gittag()' 388s - 0:ff7a2f2d8d70 draft alpha 388s - 1:7fe02317c63d draft beta 388s - 2:61175962e488 draft detached X 388s - $ hg log -T shorttags -r 'gittag(detached)' 388s - 2:61175962e488 draft detached X 388s - $ hg log -T shorttags -r 'gittag("re:a$")' 388s - 0:ff7a2f2d8d70 draft alpha 388s - 1:7fe02317c63d draft beta 388s - 388s -Create a git tag from hg, but pointing to a new commit: 388s - 388s - $ hg tag --git gamma --debug -r tip 388s - invalid branch cache (visible): tip differs (?) 388s - finding unexported changesets 388s - exporting 1 changesets 388s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 388s - packing 3 loose objects... 388s - packed 3 loose objects! 388s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 388s - adding git tag gamma 388s - $ hg push 388s - pushing to $TESTTMP/repo.git 388s - searching for changes 388s - adding objects 388s - remote: found 0 deltas to reuse 388s - added 1 commits with 1 trees and 1 blobs 388s - updating reference refs/heads/master 388s - adding reference refs/tags/gamma 388s - $ cd ../gitrepo 388s - $ git fetch --quiet --tags 388s - $ git tag 388s - alpha 388s - beta 388s - detached 388s - gamma 388s - $ cd .. 388s - 388s -Try to overwrite an annotated tag: 388s - 388s - $ cd hgrepo 388s - $ hg tags -v 388s - tip 4:0eb1ab0073a8 388s - gamma 4:0eb1ab0073a8 git 388s - default/master 4:0eb1ab0073a8 git-remote 388s - detached 2:61175962e488 git 388s - beta 1:7fe02317c63d git 388s - alpha 0:ff7a2f2d8d70 git 388s - $ hg book not-master 388s - $ hg tag beta 388s - abort: tag 'beta' already exists (use -f to force) 388s - [10] 388s - $ hg tag -f beta 388s -#if secret 388s - $ hg phase -d 388s -#endif 388s - $ hg push 388s - pushing to $TESTTMP/repo.git 388s - warning: not overwriting annotated tag 'beta' 388s - searching for changes 388s - adding objects 388s - remote: found 0 deltas to reuse 388s - added 1 commits with 1 trees and 1 blobs 388s - adding reference refs/heads/not-master 388s - $ hg tags 388s - tip 5:c49682c7cba4 388s - default/not-master 5:c49682c7cba4 388s - gamma 4:0eb1ab0073a8 388s - default/master 4:0eb1ab0073a8 388s - beta 4:0eb1ab0073a8 388s - detached 2:61175962e488 388s - alpha 0:ff7a2f2d8d70 388s - $ cd .. 388s - 388s -Check whether `gimport` handles tags 388s - 388s - $ cd hgrepo 388s - $ rm .hg/git-tags .hg/git-mapfile 388s - $ hg gimport 388s - importing 6 git commits 388s - $ hg tags -q 388s - tip 388s - default/not-master 388s - gamma 388s - default/master 388s - beta 388s - detached 388s - alpha 388s - $ cd .. 388s - 388s -Test how pulling an explicit branch with an annotated tag: 388s - 388s - $ hg clone -r master repo.git hgrepo-2 388s - importing 4 git commits 388s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 388s - updating to branch default 388s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 388s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 388s - 0:ff7a2f2d8d70 draft alpha 388s - 1:7fe02317c63d draft beta 388s - 3:0eb1ab0073a8 draft default/master gamma tip 388s - $ hg tags -v -R hgrepo-2 388s - tip 3:0eb1ab0073a8 388s - gamma 3:0eb1ab0073a8 git 388s - default/master 3:0eb1ab0073a8 git-remote 388s - beta 1:7fe02317c63d git 388s - alpha 0:ff7a2f2d8d70 git 388s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 388s - $ rm -rf hgrepo-2 388s - 388s - $ hg clone -r master repo.git hgrepo-2 388s - importing 4 git commits 388s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 388s - updating to branch default 388s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 388s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 388s - 0:ff7a2f2d8d70 draft alpha 388s - 1:7fe02317c63d draft beta 388s - 3:0eb1ab0073a8 draft default/master gamma tip 388s -This used to die: 388s - $ hg -R hgrepo-2 gexport 388s -This used to fail, since we didn't actually pull the annotated tag: 388s - $ hg -R hgrepo-2 push 388s - pushing to $TESTTMP/repo.git 388s - searching for changes 388s - no changes found 388s - [1] 388s - $ rm -rf hgrepo-2 388s - 388s -Check that pulling will update phases only: 388s - 388s - $ cd hgrepo 388s - $ hg phase -fs gamma detached 388s - $ hg pull 388s - pulling from $TESTTMP/repo.git 388s - no changes found 388s - $ hg log -T shorttags -r gamma -r detached 388s - 4:0eb1ab0073a8 draft beta default/master gamma 388s - 2:61175962e488 draft detached X 388s - $ cd .. 388s - 388s -Check that we pull new tags to existing commits: 388s - $ cd gitrepo 388s - $ git tag 388s - alpha 388s - beta 388s - detached 388s - gamma 388s - $ fn_git_tag extra-simple-tag 388s - $ fn_git_tag -m annotated extra-annotated-tag 388s - $ git push --tags 388s - To $TESTTMP/repo.git 388s - * [new tag] extra-annotated-tag -> extra-annotated-tag 388s - * [new tag] extra-simple-tag -> extra-simple-tag 388s - $ cd ../hgrepo 388s - $ hg pull -r master 388s - pulling from $TESTTMP/repo.git 388s - no changes found 388s - $ hg tags -v | grep extra 388s - extra-simple-tag 1:7fe02317c63d git 388s - extra-annotated-tag 1:7fe02317c63d git 388s 388s ERROR: test-git-tags.t#secret output changed 389s ! 389s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-pull-after-rebase.t 389s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-pull-after-rebase.t.err 389s @@ -38,275 +38,9 @@ 389s Clone it and rebase the branch 389s 389s $ hg clone -U repo.git hgrepo 389s - importing 3 git commits 389s - new changesets ff7a2f2d8d70:205a004356ef (3 drafts) 389s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 389s + abort: repository repo.git not found 389s + [255] 389s $ cd hgrepo 389s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 389s $ hg state 389s - o branch default/branch tip 2:205a004356ef32b8da782afb89d9179d12ca31e9 389s - | add gamma 389s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 389s - |/ add beta 389s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 389s - add alpha 389s - $ hg up branch 389s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 389s - (activating bookmark branch) 389s - $ hg rebase --quiet -d master 389s - $ hg state 389s - @ branch tip 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 389s - | add gamma 389s - | x default/branch 2:205a004356ef32b8da782afb89d9179d12ca31e9 389s - | | add gamma 389s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 389s - |/ add beta 389s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 389s - add alpha 389s - 389s - $ hg push -fr tip 389s - pushing to $TESTTMP/repo.git 389s - searching for changes 389s - adding objects 389s - remote: found 0 deltas to reuse 389s - added 1 commits with 1 trees and 1 blobs 389s - updating reference refs/heads/branch 389s - $ cd .. 389s - 389s -Now switch back to git and create a new commit based on what we just rebased 389s - 389s - $ cd gitrepo 389s - $ git checkout --quiet -b otherbranch branch 389s - $ git log --oneline --graph --all --decorate 389s - * e5023f9 (HEAD -> otherbranch, origin/branch, branch) add gamma 389s - | * 9497a4e (origin/master, master) add beta 389s - |/ 389s - * 7eeab2e add alpha 389s - $ echo delta > delta 389s - $ git add delta 389s - $ fn_git_commit -m 'add delta' 389s - $ git push --quiet --set-upstream origin otherbranch 389s - Branch 'otherbranch' set up to track remote branch 'otherbranch' from 'origin'. (?) 389s - $ git log --oneline --graph --all --decorate 389s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 389s - * e5023f9 (origin/branch, branch) add gamma 389s - | * 9497a4e (origin/master, master) add beta 389s - |/ 389s - * 7eeab2e add alpha 389s - $ cd .. 389s - 389s -Pull that 389s - 389s - $ cd hgrepo 389s - $ hg pull 389s - pulling from $TESTTMP/repo.git 389s - importing 1 git commits 389s - adding bookmark otherbranch 389s - 1 new orphan changesets 389s - new changesets 075302705298 (1 drafts) 389s - (run 'hg heads' to see heads, 'hg merge' to merge) 389s - $ hg state 389s - * otherbranch default/otherbranch tip 4:0753027052980aef9c9c37adb7d76d5719e8d818 389s - | add delta 389s - | @ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 389s - | | add gamma 389s - x | 2:205a004356ef32b8da782afb89d9179d12ca31e9 389s - | | add gamma 389s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 389s - |/ add beta 389s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 389s - add alpha 389s - 389s - $ cd .. 389s - 389s -To reproduce bug #386, do like github and save the old commit in a 389s -ref, and create a clone containing just the converted git commits: 389s - 389s - $ cd repo.git 389s - $ git update-ref refs/pr/1 otherbranch 389s - $ cd .. 389s - $ hg clone -U repo.git hgrepo-issue386 389s - importing 5 git commits 389s - new changesets ff7a2f2d8d70:075302705298 (5 drafts) 389s - 389s -Now try rebasing that branch, from the Git side of things 389s - 389s - $ cd gitrepo 389s - $ git checkout -q otherbranch 389s - $ git log --oneline --graph --all --decorate 389s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 389s - * e5023f9 (origin/branch, branch) add gamma 389s - | * 9497a4e (origin/master, master) add beta 389s - |/ 389s - * 7eeab2e add alpha 389s - $ fn_git_rebase --onto master branch otherbranch 389s - $ git log --oneline --graph --all --decorate 389s - * 9c58139 (HEAD -> otherbranch) add delta 389s - * 9497a4e (origin/master, master) add beta 389s - | * bba0011 (origin/otherbranch) add delta 389s - | * e5023f9 (origin/branch, branch) add gamma 389s - |/ 389s - * 7eeab2e add alpha 389s - $ git push -f 389s - To $TESTTMP/repo.git 389s - + bba0011...9c58139 otherbranch -> otherbranch (forced update) 389s - $ git log --oneline --graph --all --decorate 389s - * 9c58139 (HEAD -> otherbranch, origin/otherbranch) add delta 389s - * 9497a4e (origin/master, master) add beta 389s - | * e5023f9 (origin/branch, branch) add gamma 389s - |/ 389s - * 7eeab2e add alpha 389s - $ cd .. 389s - 389s -Now strip the old commit 389s - 389s - $ cd hgrepo-issue386 389s - $ hg up null 389s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 389s - $ hg id -qr otherbranch 389s - 075302705298 389s - $ hg pull 389s - pulling from $TESTTMP/repo.git 389s - importing 1 git commits 389s - not updating diverged bookmark otherbranch 389s - new changesets d64bf0521af6 (1 drafts) 389s - (run 'hg heads .' to see heads, 'hg merge' to merge) 389s - $ hg debugstrip --hidden --no-backup otherbranch 389s - $ hg book -d otherbranch 389s - $ hg git-cleanup 389s - git commit map cleaned 389s - $ hg pull 389s - pulling from $TESTTMP/repo.git 389s - no changes found 389s - adding bookmark otherbranch 389s - $ cd .. 389s - 389s -And check that pulling something else doesn't delete that branch. 389s - 389s - $ cd hgrepo 389s - $ hg pull -r master 389s - pulling from $TESTTMP/repo.git 389s - no changes found 389s - $ cd .. 389s - 389s -A special case, is that we can pull into a repository, where a commit 389s -corresponding to the new branch exists, but that commit is obsolete. 389s -In order to avoid “pinning” the obsolete commit, and thereby making it 389s -visible, we first pull from Git as an unnamed remote. 389s - 389s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 389s - updating to branch default 389s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 389s - $ cd hgrepo-clone 389s - $ hg pull ../repo.git 389s - pulling from ../repo.git 389s - importing 4 git commits 389s - not updating diverged bookmark otherbranch 389s - new changesets d64bf0521af6 (1 drafts) 389s - (run 'hg heads .' to see heads, 'hg merge' to merge) 389s - $ hg debugobsolete d64bf0521af68fe2160791a1b4ab9baf282a3879 389s - 1 new obsolescence markers 389s - obsoleted 1 changesets 389s - $ cp ../hgrepo/.hg/hgrc .hg 389s - $ hg pull 389s - pulling from $TESTTMP/repo.git 389s - no changes found 389s - not updating diverged bookmark otherbranch 389s - $ cd .. 389s - $ rm -rf hgrepo-clone 389s - 389s -Another special case, is that we should update commits over obsolete boundaries: 389s - 389s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 389s - updating to branch default 389s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 389s - $ cd hgrepo-clone 389s - $ hg pull ../repo.git 389s - pulling from ../repo.git 389s - importing 4 git commits 389s - not updating diverged bookmark otherbranch 389s - new changesets d64bf0521af6 (1 drafts) 389s - (run 'hg heads .' to see heads, 'hg merge' to merge) 389s - $ hg debugobsolete 0753027052980aef9c9c37adb7d76d5719e8d818 d64bf0521af68fe2160791a1b4ab9baf282a3879 389s - 1 new obsolescence markers 389s - obsoleted 1 changesets 389s - $ hg book -r 075302705298 otherbranch 389s - $ cp ../hgrepo/.hg/hgrc .hg 389s - $ hg pull 389s - pulling from $TESTTMP/repo.git 389s - no changes found 389s - updating bookmark otherbranch 389s - $ cd .. 389s - $ rm -rf hgrepo-clone 389s - 389s -Now just pull it: 389s - 389s - $ cd hgrepo 389s - $ hg pull 389s - pulling from $TESTTMP/repo.git 389s - importing 1 git commits 389s - not updating diverged bookmark otherbranch 389s - new changesets d64bf0521af6 (1 drafts) 389s - (run 'hg heads .' to see heads, 'hg merge' to merge) 389s - $ hg state 389s - o default/otherbranch tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 389s - | add delta 389s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 389s - | | add delta 389s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 389s - | | add gamma 389s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 389s - | | add gamma 389s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 389s - |/ add beta 389s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 389s - add alpha 389s - $ cd .. 389s - 389s -And finally, delete it: 389s - 389s - $ cd gitrepo 389s - $ git push origin :otherbranch 389s - To $TESTTMP/repo.git 389s - - [deleted] otherbranch 389s - $ cd .. 389s - 389s -And pull that: 389s - 389s - $ cd hgrepo 389s - $ hg pull 389s - pulling from $TESTTMP/repo.git 389s - no changes found 389s - not deleting diverged bookmark otherbranch 389s - $ hg state 389s - o tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 389s - | add delta 389s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 389s - | | add delta 389s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 389s - | | add gamma 389s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 389s - | | add gamma 389s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 389s - |/ add beta 389s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 389s - add alpha 389s - $ cd .. 389s - 389s -We only get that message once: 389s - 389s - $ hg -R hgrepo pull 389s - pulling from $TESTTMP/repo.git 389s - no changes found 389s - 389s -Now try deleting one already gone locally, which shouldn't output 389s -anything: 389s - 389s - $ cd gitrepo 389s - $ git push origin :branch 389s - To $TESTTMP/repo.git 389s - - [deleted] branch 389s - $ cd ../hgrepo 389s - $ hg book -d branch 389s - $ hg pull 389s - pulling from $TESTTMP/repo.git 389s - no changes found 389s - $ cd .. 389s 389s ERROR: test-pull-after-rebase.t output changed 389s ! 389s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-push.t 389s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-push.t.err 389s @@ -12,287 +12,10 @@ 389s 389s $ cd .. 389s $ hg clone -u tip gitrepo hgrepo 389s - importing 1 git commits 389s - new changesets ff7a2f2d8d70 (1 drafts) 389s - updating to branch default 389s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 389s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 389s + abort: repository gitrepo not found 389s + [255] 389s 389s $ cd hgrepo 389s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 389s $ hg bookmark -q master 389s - $ echo beta > beta 389s - $ hg add beta 389s - $ fn_hg_commit -m 'add beta' 389s - 389s - 389s - $ echo gamma > gamma 389s - $ hg add gamma 389s - $ fn_hg_commit -m 'add gamma' 389s - 389s - $ hg book -r 1 beta 389s - $ hg push -r beta 389s - pushing to $TESTTMP/gitrepo 389s - searching for changes 389s - adding objects 389s - remote: found 0 deltas to reuse 389s - added 1 commits with 1 trees and 1 blobs 389s - adding reference refs/heads/beta 389s - 389s - $ cd .. 389s - 389s -should have two different branches 389s - $ cd gitrepo 389s - $ git branch -v 389s - beta 0f378ab add beta 389s - master 7eeab2e add alpha 389s - * not-master 7eeab2e add alpha 389s - 389s -some more work on master from git 389s - $ git checkout master 2>&1 | sed s/\'/\"/g 389s - Switched to branch "master" 389s - $ echo delta > delta 389s - $ git add delta 389s - $ fn_git_commit -m "add delta" 389s - $ git checkout not-master 2>&1 | sed s/\'/\"/g 389s - Switched to branch "not-master" 389s - 389s - $ cd .. 389s - 389s - $ cd hgrepo 389s -this should fail 389s - $ hg push -r master 389s - pushing to $TESTTMP/gitrepo 389s - searching for changes 389s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 389s - [255] 389s - 389s -... even with -f 389s - $ hg push -fr master 389s - pushing to $TESTTMP/gitrepo 389s - searching for changes 389s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 389s - [255] 389s - 389s - $ hg pull 2>&1 | grep -v 'divergent bookmark' 389s - pulling from $TESTTMP/gitrepo 389s - importing 1 git commits 389s - not updating diverged bookmark master 389s - new changesets 25eed24f5e8f (1 drafts) 389s - (run 'hg heads' to see heads, 'hg merge' to merge) 389s -TODO shouldn't need to do this since we're (in theory) pushing master explicitly, 389s -which should not implicitly also push the not-master ref. 389s - $ hg book not-master -r default/not-master --force 389s -master and default/master should be diferent 389s - $ hg log -r master 389s - changeset: 2:953796e1cfd8 389s - bookmark: master 389s - user: test 389s - date: Mon Jan 01 00:00:12 2007 +0000 389s - summary: add gamma 389s - 389s - $ hg log -r default/master 389s - changeset: 3:25eed24f5e8f 389s - tag: default/master 389s - tag: tip 389s - parent: 0:ff7a2f2d8d70 389s - user: test 389s - date: Mon Jan 01 00:00:13 2007 +0000 389s - summary: add delta 389s - 389s - 389s -this should also fail 389s - $ hg push -r master 389s - pushing to $TESTTMP/gitrepo 389s - searching for changes 389s - abort: pushing refs/heads/master overwrites 953796e1cfd8 389s - [255] 389s - 389s -... but succeed with -f 389s - $ hg push -fr master 389s - pushing to $TESTTMP/gitrepo 389s - searching for changes 389s - adding objects 389s - remote: found 0 deltas to reuse 389s - added 1 commits with 1 trees and 1 blobs 389s - updating reference refs/heads/master 389s - 389s -this should fail, no changes to push 389s - $ hg push -r master 389s - pushing to $TESTTMP/gitrepo 389s - searching for changes 389s - no changes found 389s - [1] 389s - 389s -hg-git issue103 -- directories can lose information at hg-git export time 389s - 389s - $ hg up master 389s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 389s - $ mkdir dir1 389s - $ echo alpha > dir1/alpha 389s - $ hg add dir1/alpha 389s - $ fn_hg_commit -m 'add dir1/alpha' 389s - $ hg push -r master 389s - pushing to $TESTTMP/gitrepo 389s - searching for changes 389s - adding objects 389s - remote: found 0 deltas to reuse 389s - added 1 commits with 2 trees and 0 blobs 389s - updating reference refs/heads/master 389s - 389s - $ echo beta > dir1/beta 389s - $ hg add dir1/beta 389s - $ fn_hg_commit -m 'add dir1/beta' 389s - $ hg push -r master 389s - pushing to $TESTTMP/gitrepo 389s - searching for changes 389s - adding objects 389s - remote: found 0 deltas to reuse 389s - added 1 commits with 2 trees and 0 blobs 389s - updating reference refs/heads/master 389s - $ hg log -r master 389s - changeset: 5:ba0476ff1899 389s - bookmark: master 389s - tag: default/master 389s - tag: tip 389s - user: test 389s - date: Mon Jan 01 00:00:15 2007 +0000 389s - summary: add dir1/beta 389s - 389s - 389s - $ cat >> .hg/hgrc << EOF 389s - > [paths] 389s - > default:pushurl = file:///$TESTTMP/gitrepo 389s - > EOF 389s -NB: the triple slashes are intentional, due to windows 389s - $ hg push -r master 389s - pushing to file:///$TESTTMP/gitrepo 389s - searching for changes 389s - no changes found 389s - [1] 389s - 389s - $ cd .. 389s - 389s - $ hg clone -u tip gitrepo hgrepo-test 389s - importing 5 git commits 389s - new changesets ff7a2f2d8d70:ba0476ff1899 (5 drafts) 389s - updating to branch default 389s - 5 files updated, 0 files merged, 0 files removed, 0 files unresolved 389s - $ hg -R hgrepo-test log -r master 389s - changeset: 4:ba0476ff1899 389s - bookmark: master 389s - tag: default/master 389s - tag: tip 389s - user: test 389s - date: Mon Jan 01 00:00:15 2007 +0000 389s - summary: add dir1/beta 389s - 389s - $ hg tags -R hgrepo-test | grep ^default/ 389s - default/master 4:ba0476ff1899 389s - default/beta 1:47580592d3d6 389s - default/not-master 0:ff7a2f2d8d70 389s - 389s -Push a fast-forward to a currently checked out branch, which sometimes 389s -fails: 389s - 389s - $ cd hgrepo 389s - $ hg book -r master not-master 389s - moving bookmark 'not-master' forward from ff7a2f2d8d70 389s - $ hg push 389s - pushing to file:///$TESTTMP/gitrepo 389s - searching for changes 389s - warning: failed to update HEAD; unable to set b'HEAD' to b'7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03' (?) 389s - updating reference refs/heads/not-master 389s -That should have updated the tag: 389s - $ hg tags | grep ^default/ 389s - default/not-master 5:ba0476ff1899 389s - default/master 5:ba0476ff1899 389s - default/beta 1:47580592d3d6 389s - $ cd .. 389s - 389s -We can push only one of two bookmarks on the same revision: 389s - 389s - $ cd hgrepo 389s - $ hg book -r 0 also-not-master really-not-master 389s - $ hg push -B also-not-master 389s - pushing to file:///$TESTTMP/gitrepo 389s - searching for changes 389s - adding reference refs/heads/also-not-master 389s - 389s -We can also push another bookmark to a path with another revision 389s -specified: 389s - 389s - $ hg book -r 3 also-not-master 389s - moving bookmark 'also-not-master' forward from ff7a2f2d8d70 389s - $ hg push -B also-not-master "file:///$TESTTMP/gitrepo#master" 389s - pushing to file:///$TESTTMP/gitrepo 389s - searching for changes 389s - adding objects 389s - remote: found 0 deltas to reuse 389s - added 1 commits with 1 trees and 1 blobs 389s - updating reference refs/heads/also-not-master 389s - 389s -And we can delete them again afterwards: 389s - 389s - $ hg book -d also-not-master really-not-master 389s - $ hg push -B also-not-master -B really-not-master 389s - pushing to file:///$TESTTMP/gitrepo 389s - searching for changes 389s - warning: unable to delete 'refs/heads/really-not-master' as it does not exist on the remote repository 389s - deleting reference refs/heads/also-not-master 389s - 389s -Push empty Hg repo to empty Git repo (issue #58) 389s - $ hg init hgrepo2 389s - $ git init -q --bare repo.git 389s - $ hg -R hgrepo2 push repo.git 389s - pushing to repo.git 389s - searching for changes 389s - abort: no bookmarks or tags to push to git 389s - (see "hg help bookmarks" for details on creating them) 389s - [255] 389s - 389s -The remote repo is empty and the local one doesn't have any bookmarks/tags 389s - $ cd hgrepo2 389s - $ echo init >> test.txt 389s - $ hg addremove 389s - adding test.txt 389s - $ fn_hg_commit -m init 389s - $ hg update null 389s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 389s - $ hg push ../repo.git 389s - pushing to ../repo.git 389s - searching for changes 389s - abort: no bookmarks or tags to push to git 389s - (see "hg help bookmarks" for details on creating them) 389s - [255] 389s - $ hg summary 389s - parent: -1:000000000000 (no revision checked out) 389s - branch: default 389s - commit: (clean) 389s - update: 1 new changesets (update) 389s - phases: 1 draft 389s -That should not create any bookmarks 389s - $ hg bookmarks 389s - no bookmarks set 389s -And no tags for the remotes either: 389s - $ hg tags 389s - tip 0:8aded40be5af 389s - 389s -test for ssh vulnerability 389s - 389s - $ cat >> $HGRCPATH << EOF 389s - > [ui] 389s - > ssh = ssh -o ConnectTimeout=1 389s - > EOF 389s - $ hg push -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 389s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 389s - [255] 389s - $ hg push -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 389s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 389s - [255] 389s - $ hg push -q 'git+ssh://fakehost|rm%20nonexistent/path' 389s - ssh: * fakehost%7?rm%20nonexistent* (glob) 389s - abort: git remote error: The remote server unexpectedly closed the connection. 389s - [255] 389s - $ hg push -q 'git+ssh://fakehost%7Crm%20nonexistent/path' 389s - ssh: * fakehost%7?rm%20nonexistent* (glob) 389s - abort: git remote error: The remote server unexpectedly closed the connection. 389s - [255] 389s 389s ERROR: test-push.t output changed 395s ! 395s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-clone.t 395s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-clone.t#draft.err 395s @@ -38,60 +38,42 @@ 395s clone a tag 395s 395s $ hg clone -r alpha gitrepo hgrepo-a 395s - importing 1 git commits 395s - new changesets ff7a2f2d8d70 (1 drafts) 395s - updating to branch default 395s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository gitrepo not found 395s + [255] 395s $ hg -R hgrepo-a bookmarks 395s - master 0:ff7a2f2d8d70 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-a not found 395s + [255] 395s $ hg -R hgrepo-a log --graph --template=phases 395s - @ changeset: 0:ff7a2f2d8d70 395s - bookmark: master 395s - tag: alpha 395s - tag: default/master 395s - tag: tip 395s - phase: draft 395s - user: test 395s - date: Mon Jan 01 00:00:10 2007 +0000 395s - summary: add alpha 395s - 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-a not found 395s + [255] 395s $ git --git-dir hgrepo-a/.hg/git for-each-ref 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 395s + fatal: not a git repository: 'hgrepo-a/.hg/git' 395s + [128] 395s Make sure this is still draft since we didn't pull remote's HEAD 395s $ hg -R hgrepo-a phase -r alpha 395s - 0: draft 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-a not found 395s + [255] 395s 395s clone a branch 395s $ hg clone -r beta gitrepo hgrepo-b 395s - importing 2 git commits 395s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 395s - updating to branch default 395s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository gitrepo not found 395s + [255] 395s $ hg -R hgrepo-b bookmarks 395s - * beta 1:7fe02317c63d 395s - master 0:ff7a2f2d8d70 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-b not found 395s + [255] 395s $ hg -R hgrepo-b log --graph 395s - @ changeset: 1:7fe02317c63d 395s - | bookmark: beta 395s - | tag: default/beta 395s - | tag: tip 395s - | user: test 395s - | date: Mon Jan 01 00:00:11 2007 +0000 395s - | summary: add beta 395s - | 395s - o changeset: 0:ff7a2f2d8d70 395s - bookmark: master 395s - tag: alpha 395s - tag: default/master 395s - user: test 395s - date: Mon Jan 01 00:00:10 2007 +0000 395s - summary: add alpha 395s - 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-b not found 395s + [255] 395s $ git --git-dir hgrepo-b/.hg/git for-each-ref 395s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 395s + fatal: not a git repository: 'hgrepo-b/.hg/git' 395s + [128] 395s 395s Make sure that a deleted .hgsubstate does not confuse hg-git 395s 395s @@ -104,48 +86,50 @@ 395s $ cd .. 395s 395s $ hg clone -r beta gitrepo hgrepo-c 395s - importing 4 git commits 395s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 395s - updating to branch default 395s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository gitrepo not found 395s + [255] 395s $ hg -R hgrepo-c bookmarks 395s - * beta 3:47d12948785d 395s - master 0:ff7a2f2d8d70 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-c not found 395s + [255] 395s $ hg --cwd hgrepo-c status 395s + abort: No such file or directory: 'hgrepo-c' 395s + [255] 395s $ git --git-dir hgrepo-c/.hg/git for-each-ref 395s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 395s + fatal: not a git repository: 'hgrepo-c/.hg/git' 395s + [128] 395s 395s test shared repositories 395s 395s $ hg clone gitrepo hgrepo-base 395s - importing 5 git commits 395s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 395s - updating to bookmark beta 395s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository gitrepo not found 395s + [255] 395s $ hg -R hgrepo-base bookmarks 395s - * beta 4:47d12948785d 395s - gamma 2:ca33a262eb46 395s - master 0:ff7a2f2d8d70 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-base not found 395s + [255] 395s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 395s - updating working directory 395s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-base not found 395s + [255] 395s $ hg -R hgrepo-shared pull gitrepo 395s - pulling from gitrepo 395s - no changes found 395s - adding bookmark beta 395s - adding bookmark gamma 395s - adding bookmark master 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-shared not found 395s + [255] 395s $ hg -R hgrepo-shared push gitrepo 395s - pushing to gitrepo 395s - searching for changes 395s - no changes found 395s - [1] 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-shared not found 395s + [255] 395s $ ls hgrepo-shared/.hg | grep git 395s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 395s [1] 395s $ hg -R hgrepo-shared git-cleanup 395s - git commit map cleaned 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + hg: unknown command 'git-cleanup' 395s + (did you mean clean?) 395s + [10] 395s $ rm -rf hgrepo-base hgrepo-shared 395s 395s test cloning HEAD 395s @@ -154,23 +138,21 @@ 395s $ git checkout -q master 395s $ cd .. 395s $ hg clone gitrepo hgrepo-2 395s - importing 5 git commits 395s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 395s - updating to bookmark master 395s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository gitrepo not found 395s + [255] 395s $ git --git-dir hgrepo-2/.hg/git for-each-ref 395s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 395s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 395s + fatal: not a git repository: 'hgrepo-2/.hg/git' 395s + [128] 395s $ rm -rf hgrepo-2 395s 395s clone empty repo 395s $ git init empty 395s Initialized empty Git repository in $TESTTMP/empty/.git/ 395s $ hg clone empty emptyhg 395s - updating to branch default 395s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository empty not found 395s + [255] 395s $ rm -rf empty emptyhg 395s 395s test cloning detached HEAD, but pointing to a branch; we detect this 395s @@ -180,25 +162,20 @@ 395s $ git checkout -q -d master 395s $ cd .. 395s $ hg clone gitrepo hgrepo-2 395s - importing 5 git commits 395s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 395s - updating to bookmark master 395s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository gitrepo not found 395s + [255] 395s $ hg -R hgrepo-2 book 395s - beta 4:47d12948785d 395s - gamma 2:ca33a262eb46 395s - * master 0:ff7a2f2d8d70 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-2 not found 395s + [255] 395s $ hg -R hgrepo-2 tags -v 395s - tip 4:47d12948785d 395s - default/beta 4:47d12948785d git-remote 395s - default/gamma 2:ca33a262eb46 git-remote 395s - default/master 0:ff7a2f2d8d70 git-remote 395s - alpha 0:ff7a2f2d8d70 git 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-2 not found 395s + [255] 395s $ git --git-dir hgrepo-2/.hg/git for-each-ref 395s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 395s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 395s + fatal: not a git repository: 'hgrepo-2/.hg/git' 395s + [128] 395s $ rm -rf hgrepo-2 395s 395s test cloning fully detached HEAD; we don't convert the 395s @@ -212,44 +189,45 @@ 395s $ fn_git_commit -m 'add delta' 395s $ cd .. 395s $ hg clone gitrepo hgrepo-2 395s - importing 5 git commits 395s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 395s - warning: the git source repository has a detached head 395s - (you may want to update to a bookmark) 395s - updating to branch default 395s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository gitrepo not found 395s + [255] 395s $ hg -R hgrepo-2 book 395s - beta 4:47d12948785d 395s - gamma 2:ca33a262eb46 395s - master 0:ff7a2f2d8d70 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-2 not found 395s + [255] 395s $ hg -R hgrepo-2 id --tags 395s - default/beta tip 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-2 not found 395s + [255] 395s $ git --git-dir hgrepo-2/.hg/git for-each-ref 395s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 395s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 395s + fatal: not a git repository: 'hgrepo-2/.hg/git' 395s + [128] 395s $ rm -rf hgrepo-2 395s 395s test that cloning a regular mercurial repository does not introduce 395s git state 395s 395s $ hg init hgrepo-base 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s $ cd hgrepo-base 395s $ touch flaf 395s $ fn_hg_commit -A -m flaf 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s $ cd .. 395s $ hg clone -U hgrepo-base hgrepo-copy 395s requesting all changes (secret !) 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s $ ls hgrepo-copy/.hg | grep git 395s [1] 395s $ hg clone -U --pull hgrepo-base hgrepo-pull 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s requesting all changes 395s - adding changesets (draft !) 395s - adding manifests (draft !) 395s - adding file changes (draft !) 395s - added 1 changesets with 1 changes to 1 files (draft !) 395s - new changesets 76c919376257 (draft !) 395s + adding changesets 395s + adding manifests 395s + adding file changes 395s + added 1 changesets with 1 changes to 1 files 395s + new changesets 76c919376257 395s $ ls hgrepo-pull | grep git 395s [1] 395s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 395s 395s ERROR: test-clone.t#draft output changed 395s ! 395s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-clone.t 395s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-clone.t#secret.err 395s @@ -38,60 +38,42 @@ 395s clone a tag 395s 395s $ hg clone -r alpha gitrepo hgrepo-a 395s - importing 1 git commits 395s - new changesets ff7a2f2d8d70 (1 drafts) 395s - updating to branch default 395s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository gitrepo not found 395s + [255] 395s $ hg -R hgrepo-a bookmarks 395s - master 0:ff7a2f2d8d70 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-a not found 395s + [255] 395s $ hg -R hgrepo-a log --graph --template=phases 395s - @ changeset: 0:ff7a2f2d8d70 395s - bookmark: master 395s - tag: alpha 395s - tag: default/master 395s - tag: tip 395s - phase: draft 395s - user: test 395s - date: Mon Jan 01 00:00:10 2007 +0000 395s - summary: add alpha 395s - 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-a not found 395s + [255] 395s $ git --git-dir hgrepo-a/.hg/git for-each-ref 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 395s + fatal: not a git repository: 'hgrepo-a/.hg/git' 395s + [128] 395s Make sure this is still draft since we didn't pull remote's HEAD 395s $ hg -R hgrepo-a phase -r alpha 395s - 0: draft 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-a not found 395s + [255] 395s 395s clone a branch 395s $ hg clone -r beta gitrepo hgrepo-b 395s - importing 2 git commits 395s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 395s - updating to branch default 395s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository gitrepo not found 395s + [255] 395s $ hg -R hgrepo-b bookmarks 395s - * beta 1:7fe02317c63d 395s - master 0:ff7a2f2d8d70 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-b not found 395s + [255] 395s $ hg -R hgrepo-b log --graph 395s - @ changeset: 1:7fe02317c63d 395s - | bookmark: beta 395s - | tag: default/beta 395s - | tag: tip 395s - | user: test 395s - | date: Mon Jan 01 00:00:11 2007 +0000 395s - | summary: add beta 395s - | 395s - o changeset: 0:ff7a2f2d8d70 395s - bookmark: master 395s - tag: alpha 395s - tag: default/master 395s - user: test 395s - date: Mon Jan 01 00:00:10 2007 +0000 395s - summary: add alpha 395s - 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-b not found 395s + [255] 395s $ git --git-dir hgrepo-b/.hg/git for-each-ref 395s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 395s + fatal: not a git repository: 'hgrepo-b/.hg/git' 395s + [128] 395s 395s Make sure that a deleted .hgsubstate does not confuse hg-git 395s 395s @@ -104,48 +86,50 @@ 395s $ cd .. 395s 395s $ hg clone -r beta gitrepo hgrepo-c 395s - importing 4 git commits 395s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 395s - updating to branch default 395s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository gitrepo not found 395s + [255] 395s $ hg -R hgrepo-c bookmarks 395s - * beta 3:47d12948785d 395s - master 0:ff7a2f2d8d70 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-c not found 395s + [255] 395s $ hg --cwd hgrepo-c status 395s + abort: No such file or directory: 'hgrepo-c' 395s + [255] 395s $ git --git-dir hgrepo-c/.hg/git for-each-ref 395s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 395s + fatal: not a git repository: 'hgrepo-c/.hg/git' 395s + [128] 395s 395s test shared repositories 395s 395s $ hg clone gitrepo hgrepo-base 395s - importing 5 git commits 395s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 395s - updating to bookmark beta 395s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository gitrepo not found 395s + [255] 395s $ hg -R hgrepo-base bookmarks 395s - * beta 4:47d12948785d 395s - gamma 2:ca33a262eb46 395s - master 0:ff7a2f2d8d70 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-base not found 395s + [255] 395s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 395s - updating working directory 395s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-base not found 395s + [255] 395s $ hg -R hgrepo-shared pull gitrepo 395s - pulling from gitrepo 395s - no changes found 395s - adding bookmark beta 395s - adding bookmark gamma 395s - adding bookmark master 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-shared not found 395s + [255] 395s $ hg -R hgrepo-shared push gitrepo 395s - pushing to gitrepo 395s - searching for changes 395s - no changes found 395s - [1] 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-shared not found 395s + [255] 395s $ ls hgrepo-shared/.hg | grep git 395s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 395s [1] 395s $ hg -R hgrepo-shared git-cleanup 395s - git commit map cleaned 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + hg: unknown command 'git-cleanup' 395s + (did you mean clean?) 395s + [10] 395s $ rm -rf hgrepo-base hgrepo-shared 395s 395s test cloning HEAD 395s @@ -154,23 +138,21 @@ 395s $ git checkout -q master 395s $ cd .. 395s $ hg clone gitrepo hgrepo-2 395s - importing 5 git commits 395s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 395s - updating to bookmark master 395s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository gitrepo not found 395s + [255] 395s $ git --git-dir hgrepo-2/.hg/git for-each-ref 395s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 395s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 395s + fatal: not a git repository: 'hgrepo-2/.hg/git' 395s + [128] 395s $ rm -rf hgrepo-2 395s 395s clone empty repo 395s $ git init empty 395s Initialized empty Git repository in $TESTTMP/empty/.git/ 395s $ hg clone empty emptyhg 395s - updating to branch default 395s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository empty not found 395s + [255] 395s $ rm -rf empty emptyhg 395s 395s test cloning detached HEAD, but pointing to a branch; we detect this 395s @@ -180,25 +162,20 @@ 395s $ git checkout -q -d master 395s $ cd .. 395s $ hg clone gitrepo hgrepo-2 395s - importing 5 git commits 395s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 395s - updating to bookmark master 395s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository gitrepo not found 395s + [255] 395s $ hg -R hgrepo-2 book 395s - beta 4:47d12948785d 395s - gamma 2:ca33a262eb46 395s - * master 0:ff7a2f2d8d70 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-2 not found 395s + [255] 395s $ hg -R hgrepo-2 tags -v 395s - tip 4:47d12948785d 395s - default/beta 4:47d12948785d git-remote 395s - default/gamma 2:ca33a262eb46 git-remote 395s - default/master 0:ff7a2f2d8d70 git-remote 395s - alpha 0:ff7a2f2d8d70 git 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-2 not found 395s + [255] 395s $ git --git-dir hgrepo-2/.hg/git for-each-ref 395s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 395s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 395s + fatal: not a git repository: 'hgrepo-2/.hg/git' 395s + [128] 395s $ rm -rf hgrepo-2 395s 395s test cloning fully detached HEAD; we don't convert the 395s @@ -212,44 +189,45 @@ 395s $ fn_git_commit -m 'add delta' 395s $ cd .. 395s $ hg clone gitrepo hgrepo-2 395s - importing 5 git commits 395s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 395s - warning: the git source repository has a detached head 395s - (you may want to update to a bookmark) 395s - updating to branch default 395s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository gitrepo not found 395s + [255] 395s $ hg -R hgrepo-2 book 395s - beta 4:47d12948785d 395s - gamma 2:ca33a262eb46 395s - master 0:ff7a2f2d8d70 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-2 not found 395s + [255] 395s $ hg -R hgrepo-2 id --tags 395s - default/beta tip 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + abort: repository hgrepo-2 not found 395s + [255] 395s $ git --git-dir hgrepo-2/.hg/git for-each-ref 395s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 395s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 395s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 395s + fatal: not a git repository: 'hgrepo-2/.hg/git' 395s + [128] 395s $ rm -rf hgrepo-2 395s 395s test that cloning a regular mercurial repository does not introduce 395s git state 395s 395s $ hg init hgrepo-base 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s $ cd hgrepo-base 395s $ touch flaf 395s $ fn_hg_commit -A -m flaf 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s $ cd .. 395s $ hg clone -U hgrepo-base hgrepo-copy 395s - requesting all changes (secret !) 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s + requesting all changes 395s $ ls hgrepo-copy/.hg | grep git 395s [1] 395s $ hg clone -U --pull hgrepo-base hgrepo-pull 395s - requesting all changes 395s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 395s adding changesets (draft !) 395s adding manifests (draft !) 395s adding file changes (draft !) 395s added 1 changesets with 1 changes to 1 files (draft !) 395s new changesets 76c919376257 (draft !) 395s + requesting all changes 395s $ ls hgrepo-pull | grep git 395s [1] 395s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 395s 395s ERROR: test-clone.t#secret output changed 396s ! 396s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-branch-bookmark-suffix.t 396s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-branch-bookmark-suffix.t#with-path.err 396s @@ -9,287 +9,12 @@ 396s $ git init -q --bare repo.git 396s 396s $ hg clone repo.git hgrepo 396s - updating to branch default 396s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 396s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 396s + abort: repository repo.git not found 396s + [255] 396s $ cd hgrepo 396s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 396s #if without-path 396s $ rm .hg/hgrc 396s #endif 396s $ hg branch -q branch1 396s - $ hg bookmark branch1_bookmark 396s - $ echo f1 > f1 396s - $ hg add f1 396s - $ fn_hg_commit -m "add f1" 396s - $ hg branch -q branch2 396s - $ hg bookmark branch2_bookmark 396s - $ echo f2 > f2 396s - $ hg add f2 396s - $ fn_hg_commit -m "add f2" 396s - $ hg log --graph 396s - @ changeset: 1:600de9b6d498 396s - | branch: branch2 396s - | bookmark: branch2_bookmark 396s - | tag: tip 396s - | user: test 396s - | date: Mon Jan 01 00:00:11 2007 +0000 396s - | summary: add f2 396s - | 396s - o changeset: 0:40a840c1f8ae 396s - branch: branch1 396s - bookmark: branch1_bookmark 396s - user: test 396s - date: Mon Jan 01 00:00:10 2007 +0000 396s - summary: add f1 396s - 396s - 396s - $ hg push -B asdasd ../repo.git 396s - pushing to ../repo.git 396s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 396s - [255] 396s - 396s - $ hg push ../repo.git 396s - pushing to ../repo.git 396s - searching for changes 396s - adding objects 396s - remote: found 0 deltas to reuse 396s - added 2 commits with 2 trees and 2 blobs 396s - adding reference refs/heads/branch1 396s - adding reference refs/heads/branch2 396s - 396s - $ cd .. 396s - 396s - $ cd repo.git 396s - $ git symbolic-ref HEAD refs/heads/branch1 396s - $ git branch 396s - * branch1 396s - branch2 396s - $ cd .. 396s - 396s - $ git clone repo.git gitrepo 396s - Cloning into 'gitrepo'... 396s - done. 396s - $ cd gitrepo 396s - $ git checkout -q branch1 396s - $ echo g1 >> f1 396s - $ git add f1 396s - $ fn_git_commit -m "append f1" 396s - $ git checkout -q branch2 396s - $ echo g2 >> f2 396s - $ git add f2 396s - $ fn_git_commit -m "append f2" 396s - $ git checkout -b branch3 396s - Switched to a new branch 'branch3' 396s - $ echo g3 >> f3 396s - $ git add f3 396s - $ fn_git_commit -m "append f3" 396s - $ git push origin branch1 branch2 branch3 396s - To $TESTTMP/repo.git 396s - bbfe79a..d8aef79 branch1 -> branch1 396s - 288e92b..f8f8de5 branch2 -> branch2 396s - * [new branch] branch3 -> branch3 396s -make sure the commit doesn't have an HG:rename-source annotation 396s - $ git cat-file commit d8aef79 396s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 396s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 396s - author test 1167609612 +0000 396s - committer test 1167609612 +0000 396s - 396s - append f1 396s - $ cd .. 396s - 396s - $ cd hgrepo 396s - $ hg paths 396s - default = $TESTTMP/repo.git (with-path !) 396s - $ hg pull ../repo.git 396s - pulling from ../repo.git 396s - importing 3 git commits 396s - updating bookmark branch1_bookmark 396s - updating bookmark branch2_bookmark 396s - adding bookmark branch3_bookmark 396s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 396s - (run 'hg heads' to see heads) 396s - $ hg log --graph 396s - o changeset: 4:faf44fc3a4e8 396s - | bookmark: branch3_bookmark 396s - | tag: default/branch3 (with-path !) 396s - | tag: tip 396s - | user: test 396s - | date: Mon Jan 01 00:00:14 2007 +0000 396s - | summary: append f3 396s - | 396s - o changeset: 3:ae8eb55f7090 396s - | bookmark: branch2_bookmark 396s - | tag: default/branch2 (with-path !) 396s - | parent: 1:600de9b6d498 396s - | user: test 396s - | date: Mon Jan 01 00:00:13 2007 +0000 396s - | summary: append f2 396s - | 396s - | o changeset: 2:8211cade99e4 396s - | | bookmark: branch1_bookmark 396s - | | tag: default/branch1 (with-path !) 396s - | | parent: 0:40a840c1f8ae 396s - | | user: test 396s - | | date: Mon Jan 01 00:00:12 2007 +0000 396s - | | summary: append f1 396s - | | 396s - @ | changeset: 1:600de9b6d498 396s - |/ branch: branch2 396s - | user: test 396s - | date: Mon Jan 01 00:00:11 2007 +0000 396s - | summary: add f2 396s - | 396s - o changeset: 0:40a840c1f8ae 396s - branch: branch1 396s - user: test 396s - date: Mon Jan 01 00:00:10 2007 +0000 396s - summary: add f1 396s - 396s - $ cd .. 396s - 396s -Try cloning a bookmark, and make sure it gets checked out: 396s - 396s - $ rm -r hgrepo 396s - $ hg clone -r branch3 repo.git hgrepo 396s - importing 4 git commits 396s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 396s - updating to bookmark branch3_bookmark 396s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 396s - $ cd hgrepo 396s - $ hg bookmarks 396s - branch2_bookmark 2:ae8eb55f7090 396s - * branch3_bookmark 3:faf44fc3a4e8 396s - $ hg log --graph 396s - @ changeset: 3:faf44fc3a4e8 396s - | bookmark: branch3_bookmark 396s - | tag: default/branch3 396s - | tag: tip 396s - | user: test 396s - | date: Mon Jan 01 00:00:14 2007 +0000 396s - | summary: append f3 396s - | 396s - o changeset: 2:ae8eb55f7090 396s - | bookmark: branch2_bookmark 396s - | tag: default/branch2 396s - | user: test 396s - | date: Mon Jan 01 00:00:13 2007 +0000 396s - | summary: append f2 396s - | 396s - o changeset: 1:600de9b6d498 396s - | branch: branch2 396s - | user: test 396s - | date: Mon Jan 01 00:00:11 2007 +0000 396s - | summary: add f2 396s - | 396s - o changeset: 0:40a840c1f8ae 396s - branch: branch1 396s - user: test 396s - date: Mon Jan 01 00:00:10 2007 +0000 396s - summary: add f1 396s - 396s - $ cd .. 396s - 396s -Try cloning something that's both a bookmark and a branch, and see the 396s -results. They're a bit suprising as the bookmark does get activated, 396s -but the branch get checked out. Although this does seem a bit odd, so 396s -does the scenario. 396s - 396s - $ rm -r hgrepo 396s - $ hg clone -r branch1 repo.git hgrepo 396s - importing 2 git commits 396s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 396s - updating to branch branch1 396s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 396s - $ cd hgrepo 396s - $ hg bookmarks 396s - * branch1_bookmark 1:8211cade99e4 396s - $ hg log --graph 396s - o changeset: 1:8211cade99e4 396s - | bookmark: branch1_bookmark 396s - | tag: default/branch1 396s - | tag: tip 396s - | user: test 396s - | date: Mon Jan 01 00:00:12 2007 +0000 396s - | summary: append f1 396s - | 396s - @ changeset: 0:40a840c1f8ae 396s - branch: branch1 396s - user: test 396s - date: Mon Jan 01 00:00:10 2007 +0000 396s - summary: add f1 396s - 396s - 396s - $ cd .. 396s - 396s -Now try pulling a diverged bookmark: 396s - 396s - $ rm -r hgrepo 396s -#if with-path 396s - $ hg clone -U repo.git hgrepo 396s - importing 5 git commits 396s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 396s -#else 396s - $ hg init hgrepo 396s - $ hg -R hgrepo pull repo.git 396s - pulling from repo.git 396s - importing 5 git commits 396s - adding bookmark branch1_bookmark 396s - adding bookmark branch2_bookmark 396s - adding bookmark branch3_bookmark 396s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 396s - (run 'hg heads' to see heads, 'hg merge' to merge) 396s -#endif 396s - $ cd gitrepo 396s - $ git checkout -q branch1 396s - $ fn_git_rebase branch3 396s - $ git push -f 396s - To $TESTTMP/repo.git 396s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 396s - $ cd ../hgrepo 396s - $ hg pull ../repo.git 396s - pulling from ../repo.git 396s - importing 1 git commits 396s - not updating diverged bookmark branch1_bookmark 396s - new changesets 895d0307f8b7 (1 drafts) 396s - (run 'hg update' to get a working copy) 396s - $ hg log --graph 396s - o changeset: 5:895d0307f8b7 396s - | tag: default/branch1 (with-path !) 396s - | tag: tip 396s - | user: test 396s - | date: Mon Jan 01 00:00:12 2007 +0000 396s - | summary: append f1 396s - | 396s - o changeset: 4:faf44fc3a4e8 396s - | bookmark: branch3_bookmark 396s - | tag: default/branch3 (with-path !) 396s - | user: test 396s - | date: Mon Jan 01 00:00:14 2007 +0000 396s - | summary: append f3 396s - | 396s - o changeset: 3:ae8eb55f7090 396s - | bookmark: branch2_bookmark 396s - | tag: default/branch2 (with-path !) 396s - | user: test 396s - | date: Mon Jan 01 00:00:13 2007 +0000 396s - | summary: append f2 396s - | 396s - o changeset: 2:600de9b6d498 396s - | branch: branch2 396s - | parent: 0:40a840c1f8ae 396s - | user: test 396s - | date: Mon Jan 01 00:00:11 2007 +0000 396s - | summary: add f2 396s - | 396s - | o changeset: 1:8211cade99e4 396s - |/ bookmark: branch1_bookmark 396s - | user: test 396s - | date: Mon Jan 01 00:00:12 2007 +0000 396s - | summary: append f1 396s - | 396s - o changeset: 0:40a840c1f8ae 396s - branch: branch1 396s - user: test 396s - date: Mon Jan 01 00:00:10 2007 +0000 396s - summary: add f1 396s - 396s 396s ERROR: test-branch-bookmark-suffix.t#with-path output changed 396s ! 396s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-branch-bookmark-suffix.t 396s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-branch-bookmark-suffix.t#without-path.err 396s @@ -9,287 +9,10 @@ 396s $ git init -q --bare repo.git 396s 396s $ hg clone repo.git hgrepo 396s - updating to branch default 396s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 396s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 396s + abort: repository repo.git not found 396s + [255] 396s $ cd hgrepo 396s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 396s #if without-path 396s $ rm .hg/hgrc 396s -#endif 396s - $ hg branch -q branch1 396s - $ hg bookmark branch1_bookmark 396s - $ echo f1 > f1 396s - $ hg add f1 396s - $ fn_hg_commit -m "add f1" 396s - $ hg branch -q branch2 396s - $ hg bookmark branch2_bookmark 396s - $ echo f2 > f2 396s - $ hg add f2 396s - $ fn_hg_commit -m "add f2" 396s - $ hg log --graph 396s - @ changeset: 1:600de9b6d498 396s - | branch: branch2 396s - | bookmark: branch2_bookmark 396s - | tag: tip 396s - | user: test 396s - | date: Mon Jan 01 00:00:11 2007 +0000 396s - | summary: add f2 396s - | 396s - o changeset: 0:40a840c1f8ae 396s - branch: branch1 396s - bookmark: branch1_bookmark 396s - user: test 396s - date: Mon Jan 01 00:00:10 2007 +0000 396s - summary: add f1 396s - 396s - 396s - $ hg push -B asdasd ../repo.git 396s - pushing to ../repo.git 396s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 396s - [255] 396s - 396s - $ hg push ../repo.git 396s - pushing to ../repo.git 396s - searching for changes 396s - adding objects 396s - remote: found 0 deltas to reuse 396s - added 2 commits with 2 trees and 2 blobs 396s - adding reference refs/heads/branch1 396s - adding reference refs/heads/branch2 396s - 396s - $ cd .. 396s - 396s - $ cd repo.git 396s - $ git symbolic-ref HEAD refs/heads/branch1 396s - $ git branch 396s - * branch1 396s - branch2 396s - $ cd .. 396s - 396s - $ git clone repo.git gitrepo 396s - Cloning into 'gitrepo'... 396s - done. 396s - $ cd gitrepo 396s - $ git checkout -q branch1 396s - $ echo g1 >> f1 396s - $ git add f1 396s - $ fn_git_commit -m "append f1" 396s - $ git checkout -q branch2 396s - $ echo g2 >> f2 396s - $ git add f2 396s - $ fn_git_commit -m "append f2" 396s - $ git checkout -b branch3 396s - Switched to a new branch 'branch3' 396s - $ echo g3 >> f3 396s - $ git add f3 396s - $ fn_git_commit -m "append f3" 396s - $ git push origin branch1 branch2 branch3 396s - To $TESTTMP/repo.git 396s - bbfe79a..d8aef79 branch1 -> branch1 396s - 288e92b..f8f8de5 branch2 -> branch2 396s - * [new branch] branch3 -> branch3 396s -make sure the commit doesn't have an HG:rename-source annotation 396s - $ git cat-file commit d8aef79 396s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 396s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 396s - author test 1167609612 +0000 396s - committer test 1167609612 +0000 396s - 396s - append f1 396s - $ cd .. 396s - 396s - $ cd hgrepo 396s - $ hg paths 396s - default = $TESTTMP/repo.git (with-path !) 396s - $ hg pull ../repo.git 396s - pulling from ../repo.git 396s - importing 3 git commits 396s - updating bookmark branch1_bookmark 396s - updating bookmark branch2_bookmark 396s - adding bookmark branch3_bookmark 396s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 396s - (run 'hg heads' to see heads) 396s - $ hg log --graph 396s - o changeset: 4:faf44fc3a4e8 396s - | bookmark: branch3_bookmark 396s - | tag: default/branch3 (with-path !) 396s - | tag: tip 396s - | user: test 396s - | date: Mon Jan 01 00:00:14 2007 +0000 396s - | summary: append f3 396s - | 396s - o changeset: 3:ae8eb55f7090 396s - | bookmark: branch2_bookmark 396s - | tag: default/branch2 (with-path !) 396s - | parent: 1:600de9b6d498 396s - | user: test 396s - | date: Mon Jan 01 00:00:13 2007 +0000 396s - | summary: append f2 396s - | 396s - | o changeset: 2:8211cade99e4 396s - | | bookmark: branch1_bookmark 396s - | | tag: default/branch1 (with-path !) 396s - | | parent: 0:40a840c1f8ae 396s - | | user: test 396s - | | date: Mon Jan 01 00:00:12 2007 +0000 396s - | | summary: append f1 396s - | | 396s - @ | changeset: 1:600de9b6d498 396s - |/ branch: branch2 396s - | user: test 396s - | date: Mon Jan 01 00:00:11 2007 +0000 396s - | summary: add f2 396s - | 396s - o changeset: 0:40a840c1f8ae 396s - branch: branch1 396s - user: test 396s - date: Mon Jan 01 00:00:10 2007 +0000 396s - summary: add f1 396s - 396s - $ cd .. 396s - 396s -Try cloning a bookmark, and make sure it gets checked out: 396s - 396s - $ rm -r hgrepo 396s - $ hg clone -r branch3 repo.git hgrepo 396s - importing 4 git commits 396s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 396s - updating to bookmark branch3_bookmark 396s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 396s - $ cd hgrepo 396s - $ hg bookmarks 396s - branch2_bookmark 2:ae8eb55f7090 396s - * branch3_bookmark 3:faf44fc3a4e8 396s - $ hg log --graph 396s - @ changeset: 3:faf44fc3a4e8 396s - | bookmark: branch3_bookmark 396s - | tag: default/branch3 396s - | tag: tip 396s - | user: test 396s - | date: Mon Jan 01 00:00:14 2007 +0000 396s - | summary: append f3 396s - | 396s - o changeset: 2:ae8eb55f7090 396s - | bookmark: branch2_bookmark 396s - | tag: default/branch2 396s - | user: test 396s - | date: Mon Jan 01 00:00:13 2007 +0000 396s - | summary: append f2 396s - | 396s - o changeset: 1:600de9b6d498 396s - | branch: branch2 396s - | user: test 396s - | date: Mon Jan 01 00:00:11 2007 +0000 396s - | summary: add f2 396s - | 396s - o changeset: 0:40a840c1f8ae 396s - branch: branch1 396s - user: test 396s - date: Mon Jan 01 00:00:10 2007 +0000 396s - summary: add f1 396s - 396s - $ cd .. 396s - 396s -Try cloning something that's both a bookmark and a branch, and see the 396s -results. They're a bit suprising as the bookmark does get activated, 396s -but the branch get checked out. Although this does seem a bit odd, so 396s -does the scenario. 396s - 396s - $ rm -r hgrepo 396s - $ hg clone -r branch1 repo.git hgrepo 396s - importing 2 git commits 396s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 396s - updating to branch branch1 396s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 396s - $ cd hgrepo 396s - $ hg bookmarks 396s - * branch1_bookmark 1:8211cade99e4 396s - $ hg log --graph 396s - o changeset: 1:8211cade99e4 396s - | bookmark: branch1_bookmark 396s - | tag: default/branch1 396s - | tag: tip 396s - | user: test 396s - | date: Mon Jan 01 00:00:12 2007 +0000 396s - | summary: append f1 396s - | 396s - @ changeset: 0:40a840c1f8ae 396s - branch: branch1 396s - user: test 396s - date: Mon Jan 01 00:00:10 2007 +0000 396s - summary: add f1 396s - 396s - 396s - $ cd .. 396s - 396s -Now try pulling a diverged bookmark: 396s - 396s - $ rm -r hgrepo 396s -#if with-path 396s - $ hg clone -U repo.git hgrepo 396s - importing 5 git commits 396s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 396s -#else 396s - $ hg init hgrepo 396s - $ hg -R hgrepo pull repo.git 396s - pulling from repo.git 396s - importing 5 git commits 396s - adding bookmark branch1_bookmark 396s - adding bookmark branch2_bookmark 396s - adding bookmark branch3_bookmark 396s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 396s - (run 'hg heads' to see heads, 'hg merge' to merge) 396s -#endif 396s - $ cd gitrepo 396s - $ git checkout -q branch1 396s - $ fn_git_rebase branch3 396s - $ git push -f 396s - To $TESTTMP/repo.git 396s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 396s - $ cd ../hgrepo 396s - $ hg pull ../repo.git 396s - pulling from ../repo.git 396s - importing 1 git commits 396s - not updating diverged bookmark branch1_bookmark 396s - new changesets 895d0307f8b7 (1 drafts) 396s - (run 'hg update' to get a working copy) 396s - $ hg log --graph 396s - o changeset: 5:895d0307f8b7 396s - | tag: default/branch1 (with-path !) 396s - | tag: tip 396s - | user: test 396s - | date: Mon Jan 01 00:00:12 2007 +0000 396s - | summary: append f1 396s - | 396s - o changeset: 4:faf44fc3a4e8 396s - | bookmark: branch3_bookmark 396s - | tag: default/branch3 (with-path !) 396s - | user: test 396s - | date: Mon Jan 01 00:00:14 2007 +0000 396s - | summary: append f3 396s - | 396s - o changeset: 3:ae8eb55f7090 396s - | bookmark: branch2_bookmark 396s - | tag: default/branch2 (with-path !) 396s - | user: test 396s - | date: Mon Jan 01 00:00:13 2007 +0000 396s - | summary: append f2 396s - | 396s - o changeset: 2:600de9b6d498 396s - | branch: branch2 396s - | parent: 0:40a840c1f8ae 396s - | user: test 396s - | date: Mon Jan 01 00:00:11 2007 +0000 396s - | summary: add f2 396s - | 396s - | o changeset: 1:8211cade99e4 396s - |/ bookmark: branch1_bookmark 396s - | user: test 396s - | date: Mon Jan 01 00:00:12 2007 +0000 396s - | summary: append f1 396s - | 396s - o changeset: 0:40a840c1f8ae 396s - branch: branch1 396s - user: test 396s - date: Mon Jan 01 00:00:10 2007 +0000 396s - summary: add f1 396s - 396s 396s ERROR: test-branch-bookmark-suffix.t#without-path output changed 396s ! 396s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-bundle.t 396s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-bundle.t.err 396s @@ -36,247 +36,12 @@ 396s Clone it! 396s 396s $ hg clone gitrepo hgrepo 396s - importing 3 git commits 396s - new changesets ff7a2f2d8d70:ca33a262eb46 (3 drafts) 396s - updating to bookmark master 396s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 396s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 396s + abort: repository gitrepo not found 396s + [255] 396s $ cd hgrepo 396s + $TESTTMP.sh: 45: cd: can't cd to hgrepo 396s 396s Create a bundle with our metadata, and inspect it: 396s 396s $ hg bundle --all ../bundle-w-git.hg 396s - 3 changesets found 396s - $ hg debugbundle --all ../bundle-w-git.hg | grep hg-git 396s - exp-hg-git-map -- {} (mandatory: False) 396s - exp-hg-git-tags -- {} (mandatory: False) 396s - $ hg debugbundle --all ../bundle-w-git.hg > bundle-w-git.out 396s - 396s -Create a bundle without our metadata, and inspect it: 396s - 396s - $ hg bundle --all ../bundle-wo-git.hg --config experimental.hg-git-bundle=no 396s - 3 changesets found 396s - $ hg debugbundle --all ../bundle-wo-git.hg | grep hg-git 396s - [1] 396s - 396s -Verify that those are different: 396s - 396s - $ hg debugbundle --all ../bundle-wo-git.hg > bundle-wo-git.out 396s - $ cmp -s bundle-w-git.out bundle-wo-git.out 396s - [1] 396s - 396s -Now create a bundle without hg-git enabled at all, which should be 396s -exactly similar to what you get when you disable metadata embedding; 396s -this verifies we don't accidentally pollute bundles. 396s - 396s - $ hg bundle --all --config extensions.hggit=! ../bundle-wo-hggit.hg 396s - 3 changesets found 396s - $ hg debugbundle --all ../bundle-wo-hggit.hg > bundle-wo-hggit.out 396s - $ cmp -s bundle-wo-git.hg bundle-wo-hggit.hg 396s - [2] 396s - $ cmp -s bundle-wo-git.out bundle-wo-hggit.out 396s - $ cd .. 396s - $ rm -r hgrepo 396s - 396s -Does unbundling transfer state? 396s - 396s - $ hg init hgrepo 396s - $ hg -R hgrepo unbundle bundle-w-git.hg 396s - adding changesets 396s - adding manifests 396s - adding file changes 396s - added 3 changesets with 3 changes to 3 files 396s - new changesets * (glob) 396s - (run 'hg update' to get a working copy) 396s - $ hg -R hgrepo log -T git 396s - 2:ca33a262eb46 | d338971a96e2 | tip | 396s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 396s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 396s - $ hg -R hgrepo pull gitrepo 396s - pulling from gitrepo 396s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 396s - no changes found 396s - adding bookmark master 396s - $ rm -r hgrepo 396s - 396s -Can we unbundle something without git state? 396s - 396s - $ hg init hgrepo 396s - $ hg -R hgrepo unbundle bundle-wo-git.hg 396s - adding changesets 396s - adding manifests 396s - adding file changes 396s - added 3 changesets with 3 changes to 3 files 396s - new changesets * (glob) 396s - (run 'hg update' to get a working copy) 396s - $ hg -R hgrepo log -T git 396s - 2:ca33a262eb46 | | tip | 396s - 1:7fe02317c63d | | | 396s - 0:ff7a2f2d8d70 | | | 396s - $ hg -R hgrepo pull gitrepo 396s - pulling from gitrepo 396s - importing 3 git commits 396s - adding bookmark master 396s - (run 'hg update' to get a working copy) 396s - $ rm -r hgrepo 396s - 396s -Regular mercurial shouldn't choke on our bundle 396s - 396s - $ hg init hgrepo 396s - $ cat >> hgrepo/.hg/hgrc < [extensions] 396s - > hggit = ! 396s - > EOF 396s - $ hg -R hgrepo unbundle bundle-wo-git.hg 396s - adding changesets 396s - adding manifests 396s - adding file changes 396s - added 3 changesets with 3 changes to 3 files 396s - new changesets * (glob) 396s - (run 'hg update' to get a working copy) 396s - $ hg -R hgrepo log -T git 396s - 2:ca33a262eb46 | | tip | 396s - 1:7fe02317c63d | | | 396s - 0:ff7a2f2d8d70 | | | 396s - $ hg -R hgrepo pull gitrepo 396s - pulling from gitrepo 396s - abort: repository gitrepo not found!? (re) 396s - [255] 396s - $ rm -r hgrepo 396s - 396s - 396s -What happens if we unbundle twice? 396s - 396s - $ hg init hgrepo 396s - $ hg -R hgrepo unbundle bundle-w-git.hg 396s - adding changesets 396s - adding manifests 396s - adding file changes 396s - added 3 changesets with 3 changes to 3 files 396s - new changesets * (glob) 396s - (run 'hg update' to get a working copy) 396s - $ hg -R hgrepo unbundle bundle-w-git.hg 396s - adding changesets 396s - adding manifests 396s - adding file changes 396s - added 0 changesets with 0 changes to 3 files 396s - (run 'hg update' to get a working copy) 396s - $ hg -R hgrepo log -T git 396s - 2:ca33a262eb46 | d338971a96e2 | tip | 396s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 396s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 396s - $ hg -R hgrepo pull gitrepo 396s - pulling from gitrepo 396s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 396s - no changes found 396s - adding bookmark master 396s - $ rm -r hgrepo 396s - 396s -Alas, cloning a bundle doesn't work yet: 396s - 396s -(Mercurial is apparently quite dumb here, so we won't try to fix this 396s -for now, but this test mostly exists so that we notice if ever starts 396s -working, or breaks entirely.) 396s - 396s - $ hg clone bundle-w-git.hg hgrepo 396s - requesting all changes 396s - adding changesets 396s - adding manifests 396s - adding file changes 396s - added 3 changesets with 3 changes to 3 files 396s - new changesets * (glob) 396s - updating to branch default 396s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 396s - $ hg -R hgrepo log -T git 396s - 2:ca33a262eb46 | | tip | 396s - 1:7fe02317c63d | | | 396s - 0:ff7a2f2d8d70 | | | 396s - $ rm -r hgrepo 396s - 396s -Now, lets try to be a bit evil. How does pulling partial state work? 396s - 396s -First, more git happenings: 396s - 396s - $ cd gitrepo 396s - $ git checkout -b otherbranch thetag 396s - Switched to a new branch 'otherbranch' 396s - $ echo 42 > baz 396s - $ git add baz 396s - $ fn_git_commit -m 3 396s - $ cd .. 396s - 396s -Pull, 'em, and create a partial bundle: 396s - 396s - $ hg clone gitrepo hgrepo 396s - importing 4 git commits 396s - new changesets ff7a2f2d8d70:d87bf3ef6a53 (4 drafts) 396s - updating to bookmark otherbranch 396s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 396s - $ hg -R hgrepo bundle --base 'p1(tip)' -r tip bundle-w-git-2.hg 396s - 1 changesets found 396s - $ rm -r hgrepo 396s - 396s -Now, load only that bundle into a repository without any git state 396s - 396s - $ hg clone -r 1 bundle-w-git.hg hgrepo --config extensions.hggit=! 396s - adding changesets 396s - adding manifests 396s - adding file changes 396s - added 2 changesets with 2 changes to 2 files 396s - new changesets * (glob) 396s - updating to branch default 396s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 396s - $ cd hgrepo 396s - $ hg unbundle ../bundle-w-git-2.hg 396s - adding changesets 396s - adding manifests 396s - adding file changes 396s - added 1 changesets with 1 changes to 1 files (+1 heads) 396s - new changesets * (glob) 396s - (run 'hg heads' to see heads, 'hg merge' to merge) 396s - $ hg pull ../gitrepo 396s - pulling from ../gitrepo 396s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 396s - importing 3 git commits 396s - adding bookmark master 396s - adding bookmark otherbranch 396s - new changesets ca33a262eb46 (1 drafts) 396s - (run 'hg update' to get a working copy) 396s - $ cd .. 396s - $ rm -r hgrepo 396s - 396s -Now, try pushing with only the metadata: 396s - 396s - $ hg init hgrepo 396s - $ cd hgrepo 396s - $ hg unbundle -u ../bundle-w-git.hg 396s - adding changesets 396s - adding manifests 396s - adding file changes 396s - added 3 changesets with 3 changes to 3 files 396s - new changesets * (glob) 396s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 396s - $ echo kaflaflibob > bajizmo 396s - $ fn_hg_commit -A -m 4 396s - $ hg book -r tip master 396s - $ hg push ../gitrepo 396s - pushing to ../gitrepo 396s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 396s - abort: cannot push git commit d338971a96e2 as it is not present locally 396s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 396s - [255] 396s - 396s -Try to repopulate the git state from a bundle 396s - 396s - $ hg debug-remove-hggit-state 396s - clearing out the git cache data 396s - $ hg log -qr 'fromgit()' 396s - $ hg unbundle -u ../bundle-w-git.hg 396s - adding changesets 396s - adding manifests 396s - adding file changes 396s - added 0 changesets with 0 changes to 3 files 396s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 396s - $ hg log -qr 'fromgit()' 396s - 0:ff7a2f2d8d70 396s - 1:7fe02317c63d 396s - 2:ca33a262eb46 396s 396s ERROR: test-bundle.t output changed 396s ! 396s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-file-removal.t 396s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-file-removal.t.err 396s @@ -98,192 +98,9 @@ 396s $ git init -q --bare repo.git 396s 396s $ hg clone gitrepo hgrepo 396s - importing 9 git commits 396s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 396s - updating to bookmark master 396s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 396s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 396s + abort: repository gitrepo not found 396s + [255] 396s $ cd hgrepo 396s + $TESTTMP.sh: 72: cd: can't cd to hgrepo 396s $ hg log --graph 396s - @ changeset: 8:0995b8a0a943 396s - | bookmark: master 396s - | tag: default/master 396s - | tag: tip 396s - | user: test 396s - | date: Mon Jan 01 00:00:18 2007 +0000 396s - | summary: remove betalink 396s - | 396s - o changeset: 7:a316d3a96c89 396s - | user: test 396s - | date: Mon Jan 01 00:00:17 2007 +0000 396s - | summary: replace file with symlink 396s - | 396s - o changeset: 6:1804acb71f3e 396s - | user: test 396s - | date: Mon Jan 01 00:00:16 2007 +0000 396s - | summary: replace symlink with file 396s - | 396s - o changeset: 5:e19c85becc87 396s - | user: test 396s - | date: Mon Jan 01 00:00:15 2007 +0000 396s - | summary: add symlink to beta 396s - | 396s - o changeset: 4:0d3086c3f8c3 396s - | user: test 396s - | date: Mon Jan 01 00:00:14 2007 +0000 396s - | summary: remove foo/bar 396s - | 396s - o changeset: 3:b2406125ef5c 396s - | user: test 396s - | date: Mon Jan 01 00:00:13 2007 +0000 396s - | summary: remove alpha 396s - | 396s - o changeset: 2:8b3b2f4b4158 396s - | user: test 396s - | date: Mon Jan 01 00:00:12 2007 +0000 396s - | summary: add foo 396s - | 396s - o changeset: 1:7fe02317c63d 396s - | user: test 396s - | date: Mon Jan 01 00:00:11 2007 +0000 396s - | summary: add beta 396s - | 396s - o changeset: 0:ff7a2f2d8d70 396s - user: test 396s - date: Mon Jan 01 00:00:10 2007 +0000 396s - summary: add alpha 396s - 396s - 396s -make sure alpha is not in this manifest 396s - $ hg manifest -r 3 396s - beta 396s - foo/bar 396s - 396s -make sure that only beta is in the manifest 396s - $ hg manifest 396s - beta 396s - 396s - $ hg debug-remove-hggit-state 396s - clearing out the git cache data 396s - $ ls .hg | grep git 396s - [1] 396s - $ hg push ../repo.git 396s - pushing to ../repo.git 396s - searching for changes 396s - adding objects 396s - remote: found 0 deltas to reuse 396s - added 9 commits with 8 trees and 5 blobs 396s - adding reference refs/heads/master 396s - 396s - $ cd .. 396s - $ git --git-dir=repo.git log --pretty=medium 396s - commit 5ee11eeae239d6a99df5a99901ec00ffafbcc46b 396s - Author: test 396s - Date: Mon Jan 1 00:00:18 2007 +0000 396s - 396s - remove betalink 396s - 396s - commit 2c7b324faeccb1acf89c35b7ad38e7956f5705fa 396s - Author: test 396s - Date: Mon Jan 1 00:00:17 2007 +0000 396s - 396s - replace file with symlink 396s - 396s - commit ff0478d2ecc2571d01eb6d406ac29e4e63e5d3d5 396s - Author: test 396s - Date: Mon Jan 1 00:00:16 2007 +0000 396s - 396s - replace symlink with file 396s - 396s - commit 5492e6e410e42df527956be945286cd1ae45acb8 396s - Author: test 396s - Date: Mon Jan 1 00:00:15 2007 +0000 396s - 396s - add symlink to beta 396s - 396s - commit b991de8952c482a7cd51162674ffff8474862218 396s - Author: test 396s - Date: Mon Jan 1 00:00:14 2007 +0000 396s - 396s - remove foo/bar 396s - 396s - commit b0edaf0adac19392cf2867498b983bc5192b41dd 396s - Author: test 396s - Date: Mon Jan 1 00:00:13 2007 +0000 396s - 396s - remove alpha 396s - 396s - commit f2d0d5bfa905e12dee728b509b96cf265bb6ee43 396s - Author: test 396s - Date: Mon Jan 1 00:00:12 2007 +0000 396s - 396s - add foo 396s - 396s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 396s - Author: test 396s - Date: Mon Jan 1 00:00:11 2007 +0000 396s - 396s - add beta 396s - 396s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 396s - Author: test 396s - Date: Mon Jan 1 00:00:10 2007 +0000 396s - 396s - add alpha 396s - 396s -test with rename detection enabled 396s - $ hg --config git.similarity=100 clone gitrepo hgreporenames 396s - importing 9 git commits 396s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 396s - updating to bookmark master 396s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 396s - 396s - $ cd hgreporenames 396s - $ hg log --graph 396s - @ changeset: 8:0995b8a0a943 396s - | bookmark: master 396s - | tag: default/master 396s - | tag: tip 396s - | user: test 396s - | date: Mon Jan 01 00:00:18 2007 +0000 396s - | summary: remove betalink 396s - | 396s - o changeset: 7:a316d3a96c89 396s - | user: test 396s - | date: Mon Jan 01 00:00:17 2007 +0000 396s - | summary: replace file with symlink 396s - | 396s - o changeset: 6:1804acb71f3e 396s - | user: test 396s - | date: Mon Jan 01 00:00:16 2007 +0000 396s - | summary: replace symlink with file 396s - | 396s - o changeset: 5:e19c85becc87 396s - | user: test 396s - | date: Mon Jan 01 00:00:15 2007 +0000 396s - | summary: add symlink to beta 396s - | 396s - o changeset: 4:0d3086c3f8c3 396s - | user: test 396s - | date: Mon Jan 01 00:00:14 2007 +0000 396s - | summary: remove foo/bar 396s - | 396s - o changeset: 3:b2406125ef5c 396s - | user: test 396s - | date: Mon Jan 01 00:00:13 2007 +0000 396s - | summary: remove alpha 396s - | 396s - o changeset: 2:8b3b2f4b4158 396s - | user: test 396s - | date: Mon Jan 01 00:00:12 2007 +0000 396s - | summary: add foo 396s - | 396s - o changeset: 1:7fe02317c63d 396s - | user: test 396s - | date: Mon Jan 01 00:00:11 2007 +0000 396s - | summary: add beta 396s - | 396s - o changeset: 0:ff7a2f2d8d70 396s - user: test 396s - date: Mon Jan 01 00:00:10 2007 +0000 396s - summary: add alpha 396s - 396s 396s ERROR: test-file-removal.t output changed 397s ! 397s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-hg-author.t 397s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-hg-author.t.err 397s @@ -16,256 +16,10 @@ 397s 397s $ cd .. 397s $ hg clone repo.git hgrepo 397s - importing 1 git commits 397s - new changesets ff7a2f2d8d70 (1 drafts) 397s - updating to bookmark master 397s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 397s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 397s + abort: repository repo.git not found 397s + [255] 397s 397s $ cd hgrepo 397s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 397s $ hg book master 397s - $ echo beta > beta 397s - $ hg add beta 397s - $ fn_hg_commit -u "test" -m 'add beta' 397s - $ hg push 397s - pushing to $TESTTMP/repo.git 397s - searching for changes 397s - adding objects 397s - remote: found 0 deltas to reuse 397s - added 1 commits with 1 trees and 1 blobs 397s - updating reference refs/heads/master 397s - 397s - $ echo gamma >> beta 397s - $ fn_hg_commit -u "test (comment)" -m 'modify beta' 397s - $ hg push 397s - pushing to $TESTTMP/repo.git 397s - searching for changes 397s - adding objects 397s - remote: found 0 deltas to reuse 397s - added 1 commits with 1 trees and 1 blobs 397s - updating reference refs/heads/master 397s - 397s - $ echo gamma > gamma 397s - $ hg add gamma 397s - $ fn_hg_commit -u "" -m 'add gamma' 397s - $ hg push 397s - pushing to $TESTTMP/repo.git 397s - searching for changes 397s - adding objects 397s - remote: found 0 deltas to reuse 397s - added 1 commits with 1 trees and 1 blobs 397s - updating reference refs/heads/master 397s - 397s - $ echo delta > delta 397s - $ hg add delta 397s - $ fn_hg_commit -u "name" -m 'add delta' 397s - $ hg push 397s - pushing to $TESTTMP/repo.git 397s - searching for changes 397s - adding objects 397s - remote: found 0 deltas to reuse 397s - added 1 commits with 1 trees and 1 blobs 397s - updating reference refs/heads/master 397s - 397s - $ echo epsilon > epsilon 397s - $ hg add epsilon 397s - $ fn_hg_commit -u "name zeta 397s - $ hg add zeta 397s - $ fn_hg_commit -u " test " -m 'add zeta' 397s - $ hg push 397s - pushing to $TESTTMP/repo.git 397s - searching for changes 397s - adding objects 397s - remote: found 0 deltas to reuse 397s - added 1 commits with 1 trees and 1 blobs 397s - updating reference refs/heads/master 397s - 397s - $ echo eta > eta 397s - $ hg add eta 397s - $ fn_hg_commit -u "test < test@example.com >" -m 'add eta' 397s - $ hg push 397s - pushing to $TESTTMP/repo.git 397s - searching for changes 397s - adding objects 397s - remote: found 0 deltas to reuse 397s - added 1 commits with 1 trees and 1 blobs 397s - updating reference refs/heads/master 397s - 397s - $ echo theta > theta 397s - $ hg add theta 397s - $ fn_hg_commit -u "test >test@example.com>" -m 'add theta' 397s - $ hg push 397s - pushing to $TESTTMP/repo.git 397s - searching for changes 397s - adding objects 397s - remote: found 0 deltas to reuse 397s - added 1 commits with 1 trees and 1 blobs 397s - updating reference refs/heads/master 397s - 397s - $ hg log --graph 397s - @ changeset: 8:c5d1976ab12c 397s - | bookmark: master 397s - | tag: default/master 397s - | tag: tip 397s - | user: test >test@example.com> 397s - | date: Mon Jan 01 00:00:18 2007 +0000 397s - | summary: add theta 397s - | 397s - o changeset: 7:0e2fb4d21667 397s - | user: test < test@example.com > 397s - | date: Mon Jan 01 00:00:17 2007 +0000 397s - | summary: add eta 397s - | 397s - o changeset: 6:faa3aae96199 397s - | user: test 397s - | date: Mon Jan 01 00:00:16 2007 +0000 397s - | summary: add zeta 397s - | 397s - o changeset: 5:2cf6ad5a1afc 397s - | user: name 397s - | date: Mon Jan 01 00:00:14 2007 +0000 397s - | summary: add delta 397s - | 397s - o changeset: 3:6b854d65d0d6 397s - | user: 397s - | date: Mon Jan 01 00:00:13 2007 +0000 397s - | summary: add gamma 397s - | 397s - o changeset: 2:46303c652e79 397s - | user: test (comment) 397s - | date: Mon Jan 01 00:00:12 2007 +0000 397s - | summary: modify beta 397s - | 397s - o changeset: 1:47580592d3d6 397s - | user: test 397s - | date: Mon Jan 01 00:00:11 2007 +0000 397s - | summary: add beta 397s - | 397s - o changeset: 0:ff7a2f2d8d70 397s - user: test 397s - date: Mon Jan 01 00:00:10 2007 +0000 397s - summary: add alpha 397s - 397s - 397s - $ cd .. 397s - $ hg clone repo.git hgrepo2 397s - importing 9 git commits 397s - new changesets ff7a2f2d8d70:1fbf3aa91221 (9 drafts) 397s - updating to bookmark master 397s - 8 files updated, 0 files merged, 0 files removed, 0 files unresolved 397s - $ hg -R hgrepo2 log --graph 397s - @ changeset: 8:1fbf3aa91221 397s - | bookmark: master 397s - | tag: default/master 397s - | tag: tip 397s - | user: test ?test@example.com 397s - | date: Mon Jan 01 00:00:18 2007 +0000 397s - | summary: add theta 397s - | 397s - o changeset: 7:20310508f06d 397s - | user: test 397s - | date: Mon Jan 01 00:00:17 2007 +0000 397s - | summary: add eta 397s - | 397s - o changeset: 6:e3d81af8a8c1 397s - | user: test 397s - | date: Mon Jan 01 00:00:16 2007 +0000 397s - | summary: add zeta 397s - | 397s - o changeset: 5:78f609fd208f 397s - | user: name 397s - | date: Mon Jan 01 00:00:15 2007 +0000 397s - | summary: add epsilon 397s - | 397s - o changeset: 4:42fa61d57718 397s - | user: name 397s - | date: Mon Jan 01 00:00:14 2007 +0000 397s - | summary: add delta 397s - | 397s - o changeset: 3:6b854d65d0d6 397s - | user: 397s - | date: Mon Jan 01 00:00:13 2007 +0000 397s - | summary: add gamma 397s - | 397s - o changeset: 2:46303c652e79 397s - | user: test (comment) 397s - | date: Mon Jan 01 00:00:12 2007 +0000 397s - | summary: modify beta 397s - | 397s - o changeset: 1:47580592d3d6 397s - | user: test 397s - | date: Mon Jan 01 00:00:11 2007 +0000 397s - | summary: add beta 397s - | 397s - o changeset: 0:ff7a2f2d8d70 397s - user: test 397s - date: Mon Jan 01 00:00:10 2007 +0000 397s - summary: add alpha 397s - 397s - $ git --git-dir=repo.git log --pretty=medium master 397s - commit 2fe60ba69727981e6ede78be70354c3a9e30e21d 397s - Author: test ?test@example.com 397s - Date: Mon Jan 1 00:00:18 2007 +0000 397s - 397s - add theta 397s - 397s - commit 9f2f7cafdbf2e467928db98de8275141001d3081 397s - Author: test 397s - Date: Mon Jan 1 00:00:17 2007 +0000 397s - 397s - add eta 397s - 397s - commit 172a6f8d8064d73dff7013e395a9fe3cfc3ff807 397s - Author: test 397s - Date: Mon Jan 1 00:00:16 2007 +0000 397s - 397s - add zeta 397s - 397s - commit 71badb8e343a7da391a9b5d98909fbd2ca7d78f2 397s - Author: name 397s - Date: Mon Jan 1 00:00:15 2007 +0000 397s - 397s - add epsilon 397s - 397s - commit 9a9ae7b7f310d4a1a3e732a747ca26f06934f8d8 397s - Author: name 397s - Date: Mon Jan 1 00:00:14 2007 +0000 397s - 397s - add delta 397s - 397s - commit e4149a32e81e380193f59aa8773349201b8ed7f7 397s - Author: 397s - Date: Mon Jan 1 00:00:13 2007 +0000 397s - 397s - add gamma 397s - 397s - commit fae95aef5889a80103c2fbd5d14ff6eb8c9daf93 397s - Author: test ext:(%20%28comment%29) 397s - Date: Mon Jan 1 00:00:12 2007 +0000 397s - 397s - modify beta 397s - 397s - commit 0f378ab6c2c6b5514bd873d3faf8ac4b8095b001 397s - Author: test 397s - Date: Mon Jan 1 00:00:11 2007 +0000 397s - 397s - add beta 397s - 397s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 397s - Author: test 397s - Date: Mon Jan 1 00:00:10 2007 +0000 397s - 397s - add alpha 397s 397s ERROR: test-hg-author.t output changed 397s ! 397s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-subrepos.t 397s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-subrepos.t.err 397s @@ -34,165 +34,8 @@ 397s $ cd .. 397s Ensure gitlinks are transformed to .hgsubstate on hg pull from git 397s $ hg clone -u tip repo.git hgrepo 2>&1 | grep -E -v '^(Cloning into|done)' 397s - importing 3 git commits 397s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 397s - updating to branch default 397s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 397s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 397s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 397s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 397s + abort: repository repo.git not found 397s $ cd hgrepo 397s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 397s $ hg bookmarks -f -r default master 397s -1. Ensure gitlinks are transformed to .hgsubstate on hg <- git pull 397s -.hgsub shall list two [git] subrepos 397s - $ cat .hgsub 397s - subrepo1 = [git]../gitsubrepo 397s - xyz/subrepo2 = [git]../gitsubrepo 397s -.hgsubstate shall list two idenitcal revisions 397s - $ cat .hgsubstate 397s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 397s - 56f0304c5250308f14cfbafdc27bd12d40154d17 xyz/subrepo2 397s -hg status shall NOT report .hgsub and .hgsubstate as untracked - either ignored or unmodified 397s - $ hg status --unknown .hgsub .hgsubstate 397s - $ hg status --modified .hgsub .hgsubstate 397s - $ cd .. 397s - 397s -2. Check gitmodules are preserved during hg -> git push 397s - $ cd gitsubrepo 397s - $ echo gamma > gamma 397s - $ git add gamma 397s - $ fn_git_commit -m 'add gamma' 397s - $ cd .. 397s - $ cd hgrepo 397s - $ cd xyz/subrepo2 397s - $ git pull --ff-only | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| */| /' 397s - From $TESTTMP/gitsubrepo 397s - 56f0304..aabf7cd master -> origin/master 397s - Updating 56f0304..aabf7cd 397s - Fast-forward 397s - gamma | 1 + 397s - 1 file changed, 1 insertion(+) 397s - create mode 100644 gamma 397s - $ cd ../.. 397s - $ echo xxx >> alpha 397s - $ fn_hg_commit -m 'Update subrepo2 from hg' | grep -v "committing subrepository" || true 397s - $ hg push 397s - pushing to $TESTTMP/repo.git 397s - searching for changes 397s - adding objects 397s - remote: found 0 deltas to reuse 397s - added 1 commits with 2 trees and 1 blobs 397s - updating reference refs/heads/master 397s - $ cd .. 397s - $ cd gitrepo 397s - $ git pull --ff-only 397s - From $TESTTMP/repo 397s - 89c22d7..275b0a5 master -> origin/master 397s - Fetching submodule xyz/subrepo2 397s - From $TESTTMP/gitsubrepo 397s - 56f0304..aabf7cd master -> origin/master 397s - Updating 89c22d7..275b0a5 397s - Fast-forward 397s - alpha | 1 + 397s - xyz/subrepo2 | 2 +- 397s - 2 files changed, 2 insertions(+), 1 deletion(-) 397s -there shall be two gitlink entries, with values matching that in .hgsubstate 397s - $ git ls-tree -r HEAD^{tree} | grep 'commit' 397s - 160000 commit 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 397s - 160000 commit aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 397s -bring working copy to HEAD state (it's not bare repo) 397s - $ git reset --hard 397s - HEAD is now at 275b0a5 Update subrepo2 from hg 397s - $ cd .. 397s - 397s -3. Check .hgsub and .hgsubstate from git repository are merged, not overwritten 397s - $ hg init hgsub 397s - $ cd hgsub 397s - $ echo delta > delta 397s - $ hg add delta 397s - $ fn_hg_commit -m "add delta" 397s - $ hg tip --template '{node} hgsub\n' > ../gitrepo/.hgsubstate 397s - $ cat > ../gitrepo/.hgsub < hgsub = ../hgsub 397s - > EOF 397s - $ cd ../gitrepo 397s - $ git add .hgsubstate .hgsub 397s - $ fn_git_commit -m "Test3. Prepare .hgsub and .hgsubstate sources" 397s - $ git push 397s - To $TESTTMP/repo.git 397s - 275b0a5..e31d576 master -> master 397s - 397s - $ cd ../hgrepo 397s - $ hg pull 397s - pulling from $TESTTMP/repo.git 397s - importing 1 git commits 397s - updating bookmark master 397s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 397s - (run 'hg update' to get a working copy) 397s - $ hg checkout -C 397s - updating to active bookmark master 397s - cloning subrepo hgsub from $TESTTMP/hgsub 397s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 397s - $ cd .. 397s -pull shall bring .hgsub entry which was added to the git repo 397s - $ cat hgrepo/.hgsub 397s - hgsub = ../hgsub 397s - subrepo1 = [git]../gitsubrepo 397s - xyz/subrepo2 = [git]../gitsubrepo 397s -.hgsubstate shall list revision of the subrepo added through git repo 397s - $ cat hgrepo/.hgsubstate 397s - 481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub 397s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 397s - aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 397s - 397s -4. Try changing the subrepos from the Mercurial side 397s - 397s - $ cd hgrepo 397s - $ cat >> .hgsub < subrepo2 = [git]../gitsubrepo 397s - > EOF 397s - $ git clone ../gitsubrepo subrepo2 397s - Cloning into 'subrepo2'... 397s - done. 397s - $ fn_hg_commit -m 'some stuff' 397s - $ hg push 397s - pushing to $TESTTMP/repo.git 397s - no changes made to subrepo hgsub since last push to $TESTTMP/hgsub 397s - searching for changes 397s - adding objects 397s - remote: found 0 deltas to reuse 397s - added 1 commits with 1 trees and 1 blobs 397s - updating reference refs/heads/master 397s - $ cd .. 397s - 397s -5. But we actually do something quite weird in this case: If a 397s -.gitmodules file exists in the repository, it always wins! In this 397s -case, we break the bidirectional convention, and modify the repository 397s -data. That's odd, so show it: 397s - 397s - $ hg id hgrepo 397s - 42c46c7eef3a default/master/tip master 397s - $ hg clone -U repo.git hgrepo2 397s - importing 6 git commits 397s - new changesets e532b2bfda10:42c46c7eef3a (6 drafts) 397s - $ hg -R hgrepo2 up :master 397s - Cloning into '$TESTTMP/hgrepo2/subrepo1'... 397s - done. 397s - cloning subrepo hgsub from $TESTTMP/hgsub 397s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 397s - checking out detached HEAD in subrepository "subrepo1" 397s - check out a git branch if you intend to make changes 397s - Cloning into '$TESTTMP/hgrepo2/subrepo2'... 397s - done. 397s - Cloning into '$TESTTMP/hgrepo2/xyz/subrepo2'... 397s - done. 397s - cloning subrepo subrepo2 from $TESTTMP/gitsubrepo 397s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 397s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 397s - 397s -We retained bidirectionality! 397s - 397s - $ git diff --stat hgrepo/.hgsub hgrepo2/.hgsub 397s - $ hg id hgrepo 397s - 42c46c7eef3a default/master/tip master 397s - $ hg id hgrepo2 397s - 42c46c7eef3a default/master/tip master 397s 397s ERROR: test-subrepos.t output changed 398s ! 398s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-extra.t 398s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-extra.t.err 398s @@ -12,190 +12,9 @@ 398s 398s $ cd .. 398s $ hg clone gitrepo hgrepo 398s - importing 1 git commits 398s - new changesets aa9eb6424386 (1 drafts) 398s - updating to bookmark not-master 398s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 398s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 398s + abort: repository gitrepo not found 398s + [255] 398s $ cd hgrepo 398s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 398s $ hg mv a b 398s - $ fn_hg_commit -mb 398s - $ hg up 0 398s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 398s - (leaving bookmark not-master) 398s - $ touch c 398s - $ hg add c 398s - $ fn_hg_commit -mc 398s - 398s -Rebase will add a rebase_source 398s - 398s - $ hg --config extensions.rebase= rebase -s 1 -d 2 398s - rebasing 1:4c7da7adf18b * (glob) 398s - saved backup bundle to $TESTTMP/*.hg (glob) 398s - $ hg up 2 398s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 398s - 398s -Add a commit with multiple extra fields 398s - $ hg bookmark b1 398s - $ touch d 398s - $ hg add d 398s - $ fn_hg_commitextra --field zzzzzzz=datazzz --field aaaaaaa=dataaaa 398s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 398s - @ 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 398s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 398s - | 398s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 398s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 398s - | 398s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 398s - | branch=default 398s - | 398s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 398s - branch=default hg-git-rename-source=git 398s - 398s - 398s - $ hg push -r b1 398s - pushing to $TESTTMP/gitrepo 398s - searching for changes 398s - adding objects 398s - remote: found 0 deltas to reuse 398s - added 3 commits with 3 trees and 0 blobs 398s - adding reference refs/heads/b1 398s - 398s - $ hg bookmark b2 398s - $ hg mv c c2 398s - $ hg mv d d2 398s - $ fn_hg_commitextra --field yyyyyyy=datayyy --field bbbbbbb=databbb 398s - 398s -Test some nutty filenames 398s - $ hg book b3 398s -#if windows 398s - $ hg mv c2 'c2 => c3' 398s - abort: filename contains '>', which is reserved on Windows: "c2 => c3" 398s - [255] 398s - $ hg mv c2 c3 398s - $ fn_hg_commit -m 'dummy commit' 398s - $ hg mv c3 c4 398s - $ fn_hg_commit -m 'dummy commit' 398s -#else 398s - $ hg mv c2 'c2 => c3' 398s - warning: filename contains '>', which is reserved on Windows: 'c2 => c3' 398s - $ fn_hg_commit -m 'test filename with arrow' 398s - $ hg mv 'c2 => c3' 'c3 => c4' 398s - warning: filename contains '>', which is reserved on Windows: 'c3 => c4' 398s - $ fn_hg_commit -m 'test filename with arrow 2' 398s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" -l 3 --config "experimental.graphstyle.missing=|" 398s - @ 6 bca4ba69a6844c133b069e227dfa043d41e3c197 test filename with arrow 2 398s - | branch=default 398s - | 398s - o 5 864caad1f3493032f8d06f44a89dc9f1c039b09f test filename with arrow 398s - | branch=default 398s - | 398s - o 4 58f855ae26f4930ce857e648d3dd949901cce817 398s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 398s - | 398s -#endif 398s - $ hg push -r b2 -r b3 398s - pushing to $TESTTMP/gitrepo 398s - searching for changes 398s - adding objects 398s - remote: found 0 deltas to reuse 398s - added 3 commits with 3 trees and 0 blobs 398s - adding reference refs/heads/b2 398s - adding reference refs/heads/b3 398s - 398s - $ cd ../gitrepo 398s - $ git cat-file commit b1 398s - tree 1b773a2eb70f29397356f8069c285394835ff85a 398s - parent 54776dace5849bdf273fb26737a48ef64804909d 398s - author test 1167609613 +0000 398s - committer test 1167609613 +0000 398s - HG:extra aaaaaaa:dataaaa 398s - HG:extra zzzzzzz:datazzz 398s - 398s - 398s - 398s - $ git cat-file commit b2 398s - tree 34ad62c6d6ad9464bfe62db5b3d2fa16aaa9fa9e 398s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 398s - author test 1167609614 +0000 398s - committer test 1167609614 +0000 398s - HG:rename c:c2 398s - HG:rename d:d2 398s - HG:extra bbbbbbb:databbb 398s - HG:extra yyyyyyy:datayyy 398s - 398s - 398s - 398s -#if no-windows 398s - $ git cat-file commit b3 398s - tree e63df52695f9b06e54b37e7ef60d0c43994de620 398s - parent 5cafe2555a0666fcf661a3943277a9812a694a98 398s - author test 1167609616 +0000 398s - committer test 1167609616 +0000 398s - HG:rename c2%20%3D%3E%20c3:c3%20%3D%3E%20c4 398s - 398s - test filename with arrow 2 398s -#endif 398s - $ cd ../gitrepo 398s - $ git checkout b1 398s - Switched to branch 'b1' 398s - $ commit_sha=$(git rev-parse HEAD) 398s - $ tree_sha=$(git rev-parse HEAD^{tree}) 398s - 398s -There's no way to create a Git repo with extra metadata via the CLI. Dulwich 398s -lets you do that, though. 398s - 398s - >>> from dulwich.objects import Commit 398s - >>> from dulwich.porcelain import open_repo 398s - >>> repo = open_repo('.') 398s - >>> c = Commit() 398s - >>> c.author = b'test ' 398s - >>> c.author_time = 0 398s - >>> c.author_timezone = 0 398s - >>> c.committer = c.author 398s - >>> c.commit_time = 0 398s - >>> c.commit_timezone = 0 398s - >>> c.parents = [b'$commit_sha'] 398s - >>> c.tree = b'$tree_sha' 398s - >>> c.message = b'extra commit\n' 398s - >>> c.extra.extend([(b'zzz:zzz', b'data:zzz'), (b'aaa:aaa', b'data:aaa'), 398s - ... (b'HG:extra', b'hgaaa:dataaaa'), 398s - ... (b'HG:extra', b'hgzzz:datazzz')]) 398s - >>> repo.object_store.add_object(c) 398s - >>> repo.refs.set_if_equals(b'refs/heads/master', None, c.id) 398s - True 398s - 398s - $ git cat-file commit master 398s - tree 1b773a2eb70f29397356f8069c285394835ff85a 398s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 398s - author test 0 +0000 398s - committer test 0 +0000 398s - zzz:zzz data:zzz 398s - aaa:aaa data:aaa 398s - HG:extra hgaaa:dataaaa 398s - HG:extra hgzzz:datazzz 398s - 398s - extra commit 398s - 398s - $ cd .. 398s - $ hg clone -qU gitrepo hgrepo2 398s - $ cd hgrepo2 398s - $ hg log -G -r :5 -T "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 398s - o 5 58f855ae26f4930ce857e648d3dd949901cce817 398s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 398s - | 398s - | o 4 90acc8c23fcfaeb0930c03c849923a696fd9013c extra commit 398s - |/ GIT0-zzz%3Azzz=data%3Azzz GIT1-aaa%3Aaaa=data%3Aaaa branch=default hgaaa=dataaaa hgzzz=datazzz 398s - | 398s - o 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 398s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 398s - | 398s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 398s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 398s - | 398s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 398s - | branch=default 398s - | 398s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 398s - branch=default hg-git-rename-source=git 398s - 398s 398s ERROR: test-extra.t output changed 400s ! 400s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-bookmark-workflow.t 400s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-bookmark-workflow.t.err 400s @@ -42,13 +42,21 @@ 400s 400s Initialize remote hg and git repos with equivalent initial contents 400s $ hg init hgremoterepo 400s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 400s $ cd hgremoterepo 400s $ hg bookmark master 400s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 400s $ for f in alpha beta gamma delta; do 400s > echo $f > $f; hg add $f; hgcommit -m "add $f" 400s > done 400s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 400s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 400s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 400s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 400s $ hg bookmark -r 1 b1 400s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 400s $ hgstate 400s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 400s 3 fc2664cac217 "add delta" bookmarks: [master] 400s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 400s 1 7bcd915dc873 "add beta" bookmarks: [b1] 400s @@ -69,157 +77,19 @@ 400s 400s Cloning transfers all bookmarks from remote to local 400s $ hg clone -q hgremoterepo purehglocalrepo 400s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 400s $ cd purehglocalrepo 400s $ hgstate 400s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 400s 3 fc2664cac217 "add delta" bookmarks: [master] 400s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 400s 1 7bcd915dc873 "add beta" bookmarks: [b1] 400s 0 3442585be8a6 "add alpha" bookmarks: [] 400s $ cd .. 400s $ hg clone -q gitremoterepo hggitlocalrepo --config hggit.usephases=True 400s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 400s + abort: repository gitremoterepo not found 400s + [255] 400s $ cd hggitlocalrepo 400s + $TESTTMP.sh: 78: cd: can't cd to hggitlocalrepo 400s $ hggitstate 400s - 3 03769a650ded 55b133e1d558 "add delta" bookmarks: [master] 400s - 2 ca33a262eb46 d338971a96e2 "add gamma" bookmarks: [] 400s - 1 7fe02317c63d 9497a4ee62e1 "add beta" bookmarks: [b1] 400s - 0 ff7a2f2d8d70 7eeab2ea75ec "add alpha" bookmarks: [] 400s - 400s -Make sure that master is public 400s - $ hg phase -r master 400s - 3: public 400s - $ cd .. 400s - 400s -No changes 400s - $ cd purehglocalrepo 400s - $ hg incoming -B 400s - comparing with $TESTTMP/hgremoterepo 400s - searching for changed bookmarks 400s - no changed bookmarks found 400s - [1] 400s - $ hg outgoing 400s - comparing with $TESTTMP/hgremoterepo 400s - searching for changes 400s - no changes found 400s - [1] 400s - $ hg outgoing -B 400s - comparing with $TESTTMP/hgremoterepo 400s - searching for changed bookmarks 400s - no changed bookmarks found 400s - [1] 400s - $ hg push 400s - pushing to $TESTTMP/hgremoterepo 400s - searching for changes 400s - no changes found 400s - [1] 400s - $ cd .. 400s - $ cd hggitlocalrepo 400s - $ hg incoming -B 400s - comparing with $TESTTMP/gitremoterepo 400s - searching for changed bookmarks 400s - no changed bookmarks found 400s - [1] 400s - $ hg outgoing 400s - comparing with $TESTTMP/gitremoterepo 400s - searching for changes 400s - no changes found 400s - [1] 400s - $ hg outgoing -B 400s - comparing with $TESTTMP/gitremoterepo 400s - searching for changed bookmarks 400s - no changed bookmarks found 400s - [1] 400s - $ hg push 400s - pushing to $TESTTMP/gitremoterepo 400s - searching for changes 400s - no changes found 400s - [1] 400s - $ cd .. 400s - 400s -Bookmarks on existing revs: 400s -- change b1 on local repo 400s -- introduce b2 on local repo 400s -- introduce b3 on remote repo 400s -Bookmarks on new revs 400s -- introduce b4 on a new rev on the remote 400s - $ cd hgremoterepo 400s - $ hg bookmark -r master b3 400s - $ hg bookmark -r master b4 400s - $ hg update -q b4 400s - $ echo epsilon > epsilon; hg add epsilon; hgcommit -m 'add epsilon' 400s - $ hgstate 400s - 4 d979bb8e0fbb "add epsilon" bookmarks: [b4] 400s - 3 fc2664cac217 "add delta" bookmarks: [b3 master] 400s - 2 d85ced7ae9d6 "add gamma" bookmarks: [] 400s - 1 7bcd915dc873 "add beta" bookmarks: [b1] 400s - 0 3442585be8a6 "add alpha" bookmarks: [] 400s - $ cd .. 400s - $ cd purehglocalrepo 400s - $ hg bookmark -fr 2 b1 400s - $ hg bookmark -r 0 b2 400s - $ hgstate 400s - 3 fc2664cac217 "add delta" bookmarks: [master] 400s - 2 d85ced7ae9d6 "add gamma" bookmarks: [b1] 400s - 1 7bcd915dc873 "add beta" bookmarks: [] 400s - 0 3442585be8a6 "add alpha" bookmarks: [b2] 400s - $ hg incoming -B 400s - comparing with $TESTTMP/hgremoterepo 400s - searching for changed bookmarks 400s - b3 fc2664cac217 400s - b4 d979bb8e0fbb 400s - $ hg outgoing 400s - comparing with $TESTTMP/hgremoterepo 400s - searching for changes 400s - no changes found 400s - [1] 400s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 400s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 400s -This changed in 3.4 to start showing changed and deleted bookmarks again. 400s - $ hg outgoing -B | grep -v -E -w 'b1|b3|b4' 400s - comparing with $TESTTMP/hgremoterepo 400s - searching for changed bookmarks 400s - b2 3442585be8a6 400s - $ cd .. 400s - 400s - $ cd gitremoterepo 400s - $ git branch b3 master 400s - $ git checkout -b b4 master 400s - Switched to a new branch 'b4' 400s - $ echo epsilon > epsilon 400s - $ git add epsilon 400s - $ gitcommit -m 'add epsilon' 400s - $ gitstate 400s - fcfd2c0 "add epsilon" refs: (*b4) (glob) 400s - 55b133e "add delta" refs: (master, b3) 400s - d338971 "add gamma" refs: 400s - 9497a4e "add beta" refs: (b1) 400s - 7eeab2e "add alpha" refs: 400s - $ cd .. 400s - $ cd hggitlocalrepo 400s - $ hg bookmark -fr 2 b1 400s - $ hg bookmark -r 0 b2 400s - $ hgstate 400s - 3 03769a650ded "add delta" bookmarks: [master] 400s - 2 ca33a262eb46 "add gamma" bookmarks: [b1] 400s - 1 7fe02317c63d "add beta" bookmarks: [] 400s - 0 ff7a2f2d8d70 "add alpha" bookmarks: [b2] 400s - $ hg incoming -B 400s - comparing with $TESTTMP/gitremoterepo 400s - searching for changed bookmarks 400s - b3 03769a650ded 400s - b4 fcfd2c0262db 400s - $ hg outgoing 400s - comparing with $TESTTMP/gitremoterepo 400s - searching for changes 400s - no changes found 400s - [1] 400s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 400s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 400s -This changed in 3.4 to start showing changed and deleted bookmarks again. 400s - $ hg outgoing -B 400s - comparing with $TESTTMP/gitremoterepo 400s - searching for changed bookmarks 400s - b1 ca33a262eb46 400s - b2 ff7a2f2d8d70 400s - b3 400s - b4 400s - $ cd .. 400s 400s ERROR: test-bookmark-workflow.t output changed 407s ! 407s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-illegal-contents.t 407s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-illegal-contents.t.err 407s @@ -5,6 +5,7 @@ 407s $ . "$TESTDIR/testutil" 407s 407s $ hg init hg 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s $ cd hg 407s $ mkdir -p .git/hooks 407s $ cat > .git/hooks/post-update < EOF 407s $ fn_touch_escaped foo/git~100/wat bar/.gi\\u200ct/wut this/is/safe 407s $ hg addremove 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s adding .git/hooks/post-update 407s adding bar/.gi\xe2\x80\x8ct/wut (esc) 407s adding foo/git~100/wat 407s adding this/is/safe 407s $ hg ci -m "we should refuse to export this" 407s - $ hg book master 407s - $ hg gexport 407s - warning: skipping invalid path '.git/hooks/post-update' 407s - warning: skipping invalid path 'bar/.gi\xe2\x80\x8ct/wut' 407s - warning: skipping invalid path 'foo/git~100/wat' 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + $ hg book master 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + $ hg gexport 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + hg: unknown command 'gexport' 407s + (did you mean one of export, import?) 407s + [10] 407s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 407s - this/is/safe 407s + fatal: not a git repository: '.hg/git' 407s + [128] 407s $ hg debug-remove-hggit-state 407s - clearing out the git cache data 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + hg: unknown command 'debug-remove-hggit-state' 407s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 407s + [10] 407s $ hg gexport --config hggit.invalidpaths=keep 407s - warning: path '.git/hooks/post-update' contains an invalid path component 407s - warning: path 'bar/.gi\xe2\x80\x8ct/wut' contains an invalid path component 407s - warning: path 'foo/git~100/wat' contains an invalid path component 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + hg: unknown command 'gexport' 407s + (did you mean one of export, import?) 407s + [10] 407s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 407s - .git/hooks/post-update 407s - "bar/.gi\342\200\214t/wut" 407s - foo/git~100/wat 407s - this/is/safe 407s - $ cd .. 407s - 407s - $ rm -rf hg 407s - $ hg init hg 407s + fatal: not a git repository: '.hg/git' 407s + [128] 407s + $ cd .. 407s + 407s + $ rm -rf hg 407s + $ hg init hg 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s $ cd hg 407s $ mkdir -p nested/.git/hooks/ 407s $ cat > nested/.git/hooks/post-update < EOF 407s $ chmod +x nested/.git/hooks/post-update 407s $ hg addremove 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s adding nested/.git/hooks/post-update 407s $ hg ci -m "also refuse to export this" 407s - $ hg book master 407s - $ hg gexport 407s - warning: skipping invalid path 'nested/.git/hooks/post-update' 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + $ hg book master 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + $ hg gexport 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + hg: unknown command 'gexport' 407s + (did you mean one of export, import?) 407s + [10] 407s $ git clone .hg/git git 407s - Cloning into 'git'... 407s - done. 407s + fatal: repository '.hg/git' does not exist 407s + [128] 407s $ rm -rf git 407s 407s We can trigger an error: 407s 407s $ hg -q debug-remove-hggit-state 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + hg: unknown command 'debug-remove-hggit-state' 407s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 407s + [10] 407s $ hg --config hggit.invalidpaths=abort gexport 407s - abort: invalid path 'nested/.git/hooks/post-update' rejected by configuration 407s - (see 'hg help config.hggit.invalidpaths for details) 407s - [255] 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + hg: unknown command 'gexport' 407s + (did you mean one of export, import?) 407s + [10] 407s 407s We can override if needed: 407s 407s $ hg --config hggit.invalidpaths=keep gexport 407s - warning: path 'nested/.git/hooks/post-update' contains an invalid path component 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + hg: unknown command 'gexport' 407s + (did you mean one of export, import?) 407s + [10] 407s $ cd .. 407s $ # different git versions give different return codes 407s $ git clone hg/.hg/git git || true 407s - Cloning into 'git'... 407s - done. 407s - error: [Ii]nvalid path 'nested/\.git/hooks/post-update' (re) 407s + fatal: repository 'hg/.hg/git' does not exist 407s fatal: unable to checkout working tree (?) 407s warning: Clone succeeded, but checkout failed. (?) 407s You can inspect what was checked out with 'git status' (?) 407s @@ -88,6 +109,7 @@ 407s $ cd .. 407s $ rm -rf hg 407s $ hg init hg 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s $ cd hg 407s $ mkdir -p .GIT/hooks/ 407s $ cat > .GIT/hooks/post-checkout < EOF 407s $ chmod +x .GIT/hooks/post-checkout 407s $ hg addremove 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s adding .GIT/hooks/post-checkout 407s $ hg ci -m "also refuse to export this" 407s - $ hg book master 407s - $ hg gexport 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + $ hg book master 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + $ hg gexport 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + hg: unknown command 'gexport' 407s + (did you mean one of export, import?) 407s + [10] 407s $ cd .. 407s 407s And the NTFS case: 407s $ cd .. 407s $ rm -rf hg 407s $ hg init hg 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s $ cd hg 407s $ mkdir -p GIT~1/hooks/ 407s $ cat > GIT~1/hooks/post-checkout < EOF 407s $ chmod +x GIT~1/hooks/post-checkout 407s $ hg addremove 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s adding GIT~1/hooks/post-checkout 407s $ hg ci -m "also refuse to export this" 407s - $ hg book master 407s - $ hg gexport 407s - warning: skipping invalid path 'GIT~1/hooks/post-checkout' 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + $ hg book master 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + $ hg gexport 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + hg: unknown command 'gexport' 407s + (did you mean one of export, import?) 407s + [10] 407s $ cd .. 407s 407s Now check a Git repository containing a Mercurial repository, which 407s @@ -127,36 +163,29 @@ 407s $ rm -rf hg git nested 407s $ git init -q git 407s $ hg init nested 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s $ mv nested git 407s $ cd git 407s $ git add nested 407s $ fn_git_commit -m 'add a Mercurial repository' 407s $ cd .. 407s $ hg clone --config hggit.invalidpaths=abort git hg 407s - importing 1 git commits 407s - abort: invalid path 'nested/.hg/00changelog.i' rejected by configuration 407s - (see 'hg help config.hggit.invalidpaths for details) 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + abort: repository git not found 407s [255] 407s $ rm -rf hg 407s $ hg clone --config hggit.invalidpaths=keep git hg 407s - importing 1 git commits 407s - warning: path 'nested/.hg/00changelog.i' contains an invalid path component 407s - warning: path 'nested/.hg/requires' contains an invalid path component 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + abort: repository git not found 407s warning: path 'nested/.hg/store/requires' contains an invalid path component (?) 407s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 407s warning: path 'nested/.hg/store/requires' is within a nested repository, which Mercurial cannot check out. (?) 407s - updating to bookmark master 407s - abort: path 'nested/.hg/00changelog.i' is inside nested repo 'nested' 407s - [10] 407s + [255] 407s $ rm -rf hg 407s $ hg clone git hg 407s - importing 1 git commits 407s - warning: skipping invalid path 'nested/.hg/00changelog.i' 407s - warning: skipping invalid path 'nested/.hg/requires' 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + abort: repository git not found 407s warning: skipping invalid path 'nested/.hg/store/requires' (?) 407s - new changesets 3ea18a67c0e6 (1 drafts) 407s - updating to bookmark master 407s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 407s + [255] 407s $ cd .. 407s 407s Now check a Git repository containing paths with carriage return and 407s @@ -171,23 +200,16 @@ 407s $ fn_git_commit -m 'add files disallowed by mercurial' 407s $ cd .. 407s $ hg clone --config hggit.invalidpaths=abort git hg 407s - importing 1 git commits 407s - abort: invalid path 'Icon\r' rejected by configuration 407s - (see 'hg help config.hggit.invalidpaths for details) 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + abort: repository git not found 407s [255] 407s $ hg clone --config hggit.invalidpaths=keep git hg 407s - importing 1 git commits 407s - warning: skipping invalid path 'Icon\r' 407s - warning: skipping invalid path 'the\nfile' 407s - new changesets 8354c06a5842 (1 drafts) 407s - updating to bookmark master 407s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + abort: repository git not found 407s + [255] 407s $ rm -rf hg 407s $ hg clone git hg 407s - importing 1 git commits 407s - warning: skipping invalid path 'Icon\r' 407s - warning: skipping invalid path 'the\nfile' 407s - new changesets 8354c06a5842 (1 drafts) 407s - updating to bookmark master 407s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 407s - 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + abort: repository git not found 407s + [255] 407s + 407s 407s ERROR: test-illegal-contents.t output changed 407s ! 407s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-phases-remote.t 407s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-phases-remote.t.err 407s @@ -26,193 +26,10 @@ 407s $ cd .. 407s 407s $ hg clone --config hggit.usephases=True -U gitrepo hgrepo 407s - importing 4 git commits 407s - new changesets ff7a2f2d8d70:25eed24f5e8f (1 drafts) 407s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 407s + abort: repository gitrepo not found 407s + [255] 407s 407s $ cd hgrepo 407s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 407s $ hg log -G -T '{rev}|{phase}|{bookmarks}|{tags}\n' 407s - o 3|public||thetag tip 407s - | 407s - | o 2|draft|not-master|default/not-master 407s - |/ 407s - | o 1|public|master|default/master 407s - |/ 407s - o 0|public|| 407s - 407s - $ hg phase -r 'all()' | tee $TESTTMP/after-clone 407s - 0: public 407s - 1: public 407s - 2: draft 407s - 3: public 407s - $ cat >> .hg/hgrc < [paths] 407s - > other = $TESTTMP/gitrepo/.git 407s - > other:hg-git.publish = no 407s - > EOF 407s - $ cd .. 407s - 407s -that disables publishing from that remote 407s - 407s - $ cd hgrepo 407s - $ hg phase -fd 'all()' 407s - $ hg pull other 407s - pulling from $TESTTMP/gitrepo/.git 407s - no changes found 407s - $ hg log -qr 'public()' 407s - $ hg pull -v --config hggit.usephases=True other 407s - pulling from $TESTTMP/gitrepo/.git 407s - no changes found 407s - processing commits in batches of 1000 407s - bookmark master is up-to-date 407s - bookmark not-master is up-to-date 407s - $ hg log -qr 'public()' 407s - $ cd .. 407s - 407s -but not default when enable by the global setting 407s - 407s - $ cd hgrepo 407s - $ hg phase -fd 'all()' 407s - no phases changed 407s - $ hg pull -v --config hggit.usephases=True 407s - pulling from $TESTTMP/gitrepo 407s - publishing remote HEAD 407s - publishing tag thetag 407s - no changes found 407s - processing commits in batches of 1000 407s - bookmark master is up-to-date 407s - bookmark not-master is up-to-date 407s - publishing remote HEAD 407s - publishing tag thetag 407s - 3 local changesets published 407s - $ hg phase -r 'all()' > $TESTTMP/after-pull 407s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 407s - $ cd .. 407s - 407s -or the path option 407s - 407s - $ cd hgrepo 407s - $ hg phase -fd 'all()' 407s - $ hg pull -v --config paths.default:hg-git.publish=yes 407s - pulling from $TESTTMP/gitrepo 407s - publishing remote HEAD 407s - publishing tag thetag 407s - no changes found 407s - processing commits in batches of 1000 407s - bookmark master is up-to-date 407s - bookmark not-master is up-to-date 407s - publishing remote HEAD 407s - publishing tag thetag 407s - 3 local changesets published 407s - $ hg phase -r 'all()' > $TESTTMP/after-pull 407s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 407s - $ cd .. 407s - 407s -but we can specify individual branches 407s - 407s - $ cd hgrepo 407s - $ hg phase -fd 'all()' 407s - $ hg pull -v --config paths.default:hg-git.publish=not-master 407s - pulling from $TESTTMP/gitrepo 407s - publishing branch not-master 407s - no changes found 407s - processing commits in batches of 1000 407s - bookmark master is up-to-date 407s - bookmark not-master is up-to-date 407s - publishing branch not-master 407s - 2 local changesets published 407s - $ hg phase -r master -r not-master -r thetag 407s - 1: draft 407s - 2: public 407s - 3: draft 407s - $ cd .. 407s - 407s -and we can also specify the tag 407s - 407s - $ cd hgrepo 407s - $ hg phase -fd 'all()' 407s - $ hg pull -v --config paths.default:hg-git.publish=thetag 407s - pulling from $TESTTMP/gitrepo 407s - publishing tag thetag 407s - no changes found 407s - processing commits in batches of 1000 407s - bookmark master is up-to-date 407s - bookmark not-master is up-to-date 407s - publishing tag thetag 407s - 2 local changesets published 407s - $ hg phase -r master -r not-master -r thetag 407s - 1: draft 407s - 2: draft 407s - 3: public 407s - $ cd .. 407s - 407s - 407s -Check multiple paths behavior 407s -============================= 407s - 407s - 407s - $ cd hgrepo 407s - $ cat >> .hg/hgrc < [paths] 407s - > multi:multi-urls = yes 407s - > multi = path://other, path://default 407s - > recursive:multi-urls = yes 407s - > recursive = path://multi, default 407s - > EOF 407s - 407s -Using multiple path works fine: 407s - 407s - 407s - $ hg pull multi --config paths.default:hg-git.publish=yes 407s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 407s - [255] 407s - 407s -Recursive multiple path are tricker, but Mercurial don't work with them either. 407s -This test exist to make sure we bail out on our own. 407s - 407s - 407s -`yes` should abort (until we implement it) 407s - 407s - $ hg pull multi --config paths.default:hg-git.publish=yes 407s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 407s - [255] 407s - 407s -`some-value` should abort (until we implement it) 407s - 407s - $ hg pull multi --config paths.default:hg-git.publish=thetag 407s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 407s - [255] 407s - 407s -`no` is fine 407s - 407s - $ hg pull multi --config paths.default:hg-git.publish=no 407s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 407s - [255] 407s - 407s - $ cd .. 407s - 407s -Check conflicting paths behavior 407s -================================ 407s - 407s - $ cd hgrepo 407s - $ cat > .hg/hgrc < [paths] 407s - > default = $TESTTMP/gitrepo 407s - > default:hg-git.publish = yes 407s - > also-default = $TESTTMP/gitrepo 407s - > EOF 407s - $ hg pull also-default 407s - pulling from $TESTTMP/gitrepo 407s - abort: different publishing configurations for the same remote location 407s - (conflicting paths: also-default, default) 407s - [255] 407s - $ hg pull --config paths.also-default:hg-git.publish=no 407s - pulling from $TESTTMP/gitrepo 407s - abort: different publishing configurations for the same remote location 407s - (conflicting paths: also-default, default) 407s - [255] 407s - $ hg pull --config paths.also-default:hg-git.publish=true 407s - pulling from $TESTTMP/gitrepo 407s - no changes found 407s - 1 local changesets published 407s - $ cd .. 407s - 407s 407s ERROR: test-phases-remote.t output changed 411s ! 411s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-serve-hg-static.t 411s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-serve-hg-static.t.err 411s @@ -6,6 +6,7 @@ 411s $ . "$TESTDIR/testutil" 411s 411s $ hg clone http://localhost:$HGPORT/ copy 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s abort: * (glob) 411s [100] 411s $ test -d copy 411s @@ -18,14 +19,18 @@ 411s > --logfile server.log 411s $ cat dumb.pid >> $DAEMON_PIDS 411s $ hg init remote 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s $ cd remote 411s $ echo foo > bar 411s $ echo c2 > '.dotfile with spaces' 411s $ hg add 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s adding .dotfile with spaces 411s adding bar 411s $ hg commit -m"test" 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s $ hg tip 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s changeset: 0:02770d679fb8 411s tag: tip 411s user: test 411s @@ -34,6 +39,7 @@ 411s 411s $ cd .. 411s $ hg clone static-http://localhost:$HGPORT/remote local 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s requesting all changes 411s adding changesets 411s adding manifests 411s @@ -44,17 +50,20 @@ 411s 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 411s $ cd local 411s $ hg verify 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s checking changesets 411s checking manifests 411s crosschecking files in changesets and manifests 411s + checking dirstate (?) 411s checking files 411s - checking dirstate (?) 411s + checking dirstate 411s checked 1 changesets with 2 changes to 2 files 411s $ cat bar 411s foo 411s $ cd ../remote 411s $ echo baz > quux 411s $ hg commit -A -mtest2 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s adding quux 411s 411s check for HTTP opener failures when cachefile does not exist 411s @@ -62,6 +71,7 @@ 411s $ rm .hg/cache/* 411s $ cd ../local 411s $ hg pull 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s pulling from static-http://localhost:$HGPORT/remote 411s searching for changes 411s adding changesets 411s @@ -74,10 +84,13 @@ 411s trying to push 411s 411s $ hg update 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 411s $ echo more foo >> bar 411s $ hg commit -m"test" 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s $ hg push 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s pushing to static-http://localhost:$HGPORT/remote 411s abort: destination does not support push 411s [255] 411s @@ -86,9 +99,11 @@ 411s 411s $ cd .. 411s $ hg clone -r doesnotexist static-http://localhost:$HGPORT/remote local0 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s abort: unknown revision 'doesnotexist'!? (re) 411s [10] 411s $ hg clone -r 0 static-http://localhost:$HGPORT/remote local0 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s adding changesets 411s adding manifests 411s adding file changes 411s @@ -100,16 +115,23 @@ 411s test with "/" URI (issue747) and subrepo 411s 411s $ hg init 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s $ hg init sub 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s $ touch sub/test 411s $ hg -R sub commit -A -m "test" 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s adding test 411s $ hg -R sub tag not-empty 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s $ echo sub=sub > .hgsub 411s $ echo a > a 411s $ hg add a .hgsub 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s $ hg -q ci -ma 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s $ hg clone static-http://localhost:$HGPORT/ local2 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s requesting all changes 411s adding changesets 411s adding manifests 411s @@ -127,58 +149,75 @@ 411s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 411s $ cd local2 411s $ hg verify 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s checking changesets 411s checking manifests 411s crosschecking files in changesets and manifests 411s + checking dirstate (?) 411s checking files 411s - checking dirstate (?) 411s + checking dirstate 411s checked 1 changesets with 3 changes to 3 files 411s checking subrepo links 411s $ cat a 411s a 411s $ hg paths 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s default = static-http://localhost:$HGPORT/ 411s 411s test with empty repo (issue965) 411s 411s $ cd .. 411s $ hg init remotempty 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s $ hg clone static-http://localhost:$HGPORT/remotempty local3 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s no changes found 411s updating to branch default 411s 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 411s $ cd local3 411s $ hg verify 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s checking changesets 411s checking manifests 411s crosschecking files in changesets and manifests 411s + checking dirstate (?) 411s checking files 411s - checking dirstate (?) 411s + checking dirstate 411s checked 0 changesets with 0 changes to 0 files 411s $ hg paths 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s default = static-http://localhost:$HGPORT/remotempty 411s $ cd .. 411s 411s Clone with tags and branches works 411s 411s $ hg init remote-with-names 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s $ cd remote-with-names 411s $ echo 0 > foo 411s $ hg -q commit -A -m initial 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s $ echo 1 > foo 411s $ hg commit -m 'commit 1' 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s $ hg -q up 0 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s $ hg branch mybranch 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s marked working directory as branch mybranch 411s (branches are permanent and global, did you want a bookmark?) 411s $ echo 2 > foo 411s $ hg commit -m 'commit 2 (mybranch)' 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s $ hg tag -r 1 'default-tag' 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s $ hg tag -r 2 'branch-tag' 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s 411s $ cd .. 411s 411s $ hg clone static-http://localhost:$HGPORT/remote-with-names local-with-names 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s requesting all changes 411s adding changesets 411s adding manifests 411s @@ -191,6 +230,7 @@ 411s Clone a specific branch works 411s 411s $ hg clone -r mybranch static-http://localhost:$HGPORT/remote-with-names local-with-names-branch 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s adding changesets 411s adding manifests 411s adding file changes 411s @@ -202,6 +242,7 @@ 411s Clone a specific tag works 411s 411s $ hg clone -r default-tag static-http://localhost:$HGPORT/remote-with-names local-with-names-tag 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s adding changesets 411s adding manifests 411s adding file changes 411s 411s ERROR: test-serve-hg-static.t output changed 411s ! 411s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-octopus.t 411s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-octopus.t.err 411s @@ -62,111 +62,9 @@ 411s $ git init -q --bare repo.git 411s 411s $ hg clone gitrepo hgrepo 411s - importing 8 git commits 411s - new changesets ff7a2f2d8d70:307506d6ae8a (10 drafts) 411s - updating to bookmark master 411s - 6 files updated, 0 files merged, 0 files removed, 0 files unresolved 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s + abort: repository gitrepo not found 411s + [255] 411s $ cd hgrepo 411s + $TESTTMP.sh: 64: cd: can't cd to hgrepo 411s $ hg log --graph --style compact | sed 's/\[.*\]//g' 411s - @ 9:7,8 307506d6ae8a 2007-01-01 00:00 +0000 test 411s - |\ Merge branches 'branch3' and 'branch4' 411s - | | 411s - | o 8:3,4 2b07220e422e 2007-01-01 00:00 +0000 test 411s - | |\ Merge branches 'branch3' and 'branch4' 411s - | | | 411s - o | | 7:5,6 ccf2d65d982c 2007-01-01 00:00 +0000 test 411s - |\ \ \ Merge branches 'branch1' and 'branch2' 411s - | | | | 411s - | o | | 6:1,2 690b40256117 2007-01-01 00:00 +0000 test 411s - | |\ \ \ Merge branches 'branch1' and 'branch2' 411s - | | | | | 411s - o | | | | 5:0 e459c0629ca4 2007-01-01 00:00 +0000 test 411s - | | | | | add delta 411s - | | | | | 411s - +-------o 4:0 e857c9a04474 2007-01-01 00:00 +0000 test 411s - | | | | add zeta 411s - | | | | 411s - +-----o 3:0 0071dec0de0e 2007-01-01 00:00 +0000 test 411s - | | | add epsilon 411s - | | | 411s - +---o 2:0 205a004356ef 2007-01-01 00:00 +0000 test 411s - | | add gamma 411s - | | 411s - | o 1 7fe02317c63d 2007-01-01 00:00 +0000 test 411s - |/ add beta 411s - | 411s - o 0 ff7a2f2d8d70 2007-01-01 00:00 +0000 test 411s - add alpha 411s - 411s - $ hg gverify -r 9 411s - verifying rev 307506d6ae8a against git commit b32ff845df61df998206b630e4370a44f9b36845 411s - $ hg gverify -r 8 411s - abort: no git commit found for rev 2b07220e422e 411s - (if this is an octopus merge, verify against the last rev) 411s - [255] 411s - 411s - $ hg debug-remove-hggit-state 411s - clearing out the git cache data 411s - $ hg push ../repo.git 411s - pushing to ../repo.git 411s - searching for changes 411s - adding objects 411s - remote: found 0 deltas to reuse 411s - added 8 commits with 8 trees and 6 blobs 411s - adding reference refs/heads/branch1 411s - adding reference refs/heads/branch2 411s - adding reference refs/heads/branch3 411s - adding reference refs/heads/branch4 411s - adding reference refs/heads/master 411s - $ cd .. 411s - 411s - $ git --git-dir=repo.git log --pretty=medium | sed s/\\.\\.\\.//g 411s - commit b32ff845df61df998206b630e4370a44f9b36845 411s - Merge: 9ac68f9 7e9cd9f e695849 411s - Author: test 411s - Date: Mon Jan 1 00:00:15 2007 +0000 411s - 411s - Merge branches 'branch3' and 'branch4' 411s - 411s - commit 9ac68f982ae7426d9597ff16c74afb4e6053c582 411s - Merge: d40f375 9497a4e e5023f9 411s - Author: test 411s - Date: Mon Jan 1 00:00:15 2007 +0000 411s - 411s - Merge branches 'branch1' and 'branch2' 411s - 411s - commit d40f375a81b7d033e92cbad89487115fe2dd472f 411s - Author: test 411s - Date: Mon Jan 1 00:00:15 2007 +0000 411s - 411s - add delta 411s - 411s - commit e695849087f6c320c1a447620492b29a82ca41b1 411s - Author: test 411s - Date: Mon Jan 1 00:00:14 2007 +0000 411s - 411s - add zeta 411s - 411s - commit 7e9cd9f90b6d2c60579375eb796ce706d2d8bbe6 411s - Author: test 411s - Date: Mon Jan 1 00:00:13 2007 +0000 411s - 411s - add epsilon 411s - 411s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 411s - Author: test 411s - Date: Mon Jan 1 00:00:12 2007 +0000 411s - 411s - add gamma 411s - 411s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 411s - Author: test 411s - Date: Mon Jan 1 00:00:11 2007 +0000 411s - 411s - add beta 411s - 411s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 411s - Author: test 411s - Date: Mon Jan 1 00:00:10 2007 +0000 411s - 411s - add alpha 411s 411s ERROR: test-octopus.t output changed 413s ! 413s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-hook.t 413s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-hook.t.err 413s @@ -10,6 +10,7 @@ 413s > fn_${1}_commit -m $2 413s > } 413s $ hg init hgrepo 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s $ cd hgrepo 413s $ cat > .hg/hgrc < [hooks] 413s @@ -22,7 +23,10 @@ 413s > incoming = python:testlib.hooks.showargs 413s > EOF 413s $ fn_commit hg a 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s $ hg book master 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s 413s $ git init -q --bare ../repo.git 413s $ cat >> .hg/hgrc < master 413s + * [new branch] master -> master 413s $ cd ../hgrepo 413s 413s Hooks on pull? 413s 413s $ hg pull -u 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s pulling from $TESTTMP/repo.git 413s - | gitimport.source=pull 413s - | gitimport.git=True 413s - | gitimport.names=[b'default'] 413s - | gitimport.refs={b'HEAD': b'1dab31e7bc9691ba42a2fe7b14680694770bc527', b'refs/heads/master': b'1dab31e7bc9691ba42a2fe7b14680694770bc527'} 413s - | gitimport.heads=None 413s - importing 2 git commits 413s - : pretxncommit 413s - | incoming.git=True 413s - | incoming.source=pull 413s - | incoming.node=382ad5fa1d7727210384d40fa1539af52ca632c5 413s - | incoming.git_node=92150d1529ccaea34a6b36fe4144993193080499 413s - : pretxncommit 413s - | incoming.git=True 413s - | incoming.source=pull 413s - | incoming.node=892115eea5c32152e09ae4013c9a119d7b534049 413s - | incoming.git_node=1dab31e7bc9691ba42a2fe7b14680694770bc527 413s - updating bookmark master 413s - | changegroup.source=push 413s - | changegroup.git=True 413s - | changegroup.node=382ad5fa1d7727210384d40fa1539af52ca632c5 413s - | changegroup.node_last=892115eea5c32152e09ae4013c9a119d7b534049 413s - new changesets 382ad5fa1d77:892115eea5c3 (2 drafts) 413s - updating to active bookmark master 413s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 413s + abort: repository $TESTTMP/repo.git not found 413s + [255] 413s 413s Hooks on push? 413s 413s $ fn_commit hg d 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s $ fn_commit hg e 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s $ hg push 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s pushing to $TESTTMP/repo.git 413s - | preoutgoing.git=True 413s - | preoutgoing.source=push 413s - | preoutgoing.url=$TESTTMP/repo.git 413s - | gitexport.nodes=[b'cc6164a17449d58d7811ff3918f33f89c2c83fa5', b'46737f6a4c9d8307b681cbb2e9e2e5419cc87f82'] 413s - | gitexport.git=True 413s - searching for changes 413s - | prechangegroup.source=push 413s - | prechangegroup.git=True 413s - | prechangegroup.url=$TESTTMP/repo.git 413s - adding objects 413s - remote: found 0 deltas to reuse 413s - added 2 commits with 2 trees and 2 blobs 413s - updating reference refs/heads/master 413s + abort: repository $TESTTMP/repo.git not found 413s + [255] 413s 413s 413s And what does Mercurial do? 413s @@ -124,7 +87,9 @@ 413s On push: 413s 413s $ hg init ../hgrepo-copy 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s $ hg push ../hgrepo-copy 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s pushing to ../hgrepo-copy 413s searching for changes 413s | preoutgoing.source=push 413s @@ -133,19 +98,29 @@ 413s adding changesets 413s adding manifests 413s adding file changes 413s - added 5 changesets with 5 changes to 5 files 413s + added 3 changesets with 3 changes to 3 files 413s 413s With more than one head: 413s 413s $ rm -r ../hgrepo-copy 413s $ hg init ../hgrepo-copy 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s $ hg book -i 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s $ hg branch -q abranch 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s $ fn_commit hg x 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s $ hg up -q default 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s $ hg branch -q alsoabranch 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s $ fn_commit hg y 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s $ hg push ../hgrepo-copy 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s pushing to ../hgrepo-copy 413s searching for changes 413s | preoutgoing.source=push 413s @@ -154,13 +129,15 @@ 413s adding changesets 413s adding manifests 413s adding file changes 413s - added 7 changesets with 7 changes to 7 files (+1 heads) 413s + added 5 changesets with 5 changes to 5 files (+1 heads) 413s 413s On pull: 413s 413s $ hg debugstrip --no-backup tip 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 413s $ hg pull ../hgrepo-copy 413s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 413s pulling from ../hgrepo-copy 413s searching for changes 413s | prechangegroup.txnname=pull 413s @@ -171,16 +148,16 @@ 413s adding manifests 413s adding file changes 413s added 1 changesets with 1 changes to 1 files (+1 heads) 413s - new changesets d4097d98a390 413s + new changesets 11a693974ec5 413s | changegroup.txnname=pull 413s file://$TESTTMP/hgrepo-copy 413s | changegroup.source=pull 413s | changegroup.url=file:$TESTTMP/hgrepo-copy 413s - | changegroup.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 413s - | changegroup.node_last=d4097d98a3905be88e8a566039b1fdcca06e0d2e 413s + | changegroup.node=11a693974ec530e32672629628dde90793335199 413s + | changegroup.node_last=11a693974ec530e32672629628dde90793335199 413s | incoming.txnname=pull 413s file://$TESTTMP/hgrepo-copy 413s | incoming.source=pull 413s | incoming.url=file:$TESTTMP/hgrepo-copy 413s - | incoming.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 413s + | incoming.node=11a693974ec530e32672629628dde90793335199 413s (run 'hg heads' to see heads) 413s 413s ERROR: test-hook.t output changed 417s ! 417s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-transactions.t 417s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-transactions.t.err 417s @@ -42,19 +42,29 @@ 417s 417s $ hg clone gitrepo hgrepo --config hggit.mapsavefrequency=10 --debug \ 417s > | grep -c saving 417s - 1 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s + abort: repository gitrepo not found 417s + 0 417s + [1] 417s $ rm -rf hgrepo 417s 417s pull with mapsavefreq set 417s 417s $ hg init hgrepo 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s $ cat >> hgrepo/.hg/hgrc < [paths] 417s > default = $TESTTMP/gitrepo 417s > EOF 417s $ hg -R hgrepo --config hggit.mapsavefrequency=10 pull --debug \ 417s > | grep -c saving 417s - 10 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s + abort: repository $TESTTMP/gitrepo not found 417s + 0 417s + [1] 417s $ rm -rf hgrepo 417s 417s The user experience 417s @@ -66,6 +76,8 @@ 417s First, create a repository, set up to pull from git, and where we can interrupt the conversion. 417s 417s $ hg init hgrepo 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s $ cat >> hgrepo/.hg/hgrc < [paths] 417s > default = $TESTTMP/gitrepo 417s @@ -75,39 +87,49 @@ 417s A low save interval causes a lot of reports: 417s 417s $ hg --config hggit.mapsavefrequency=25 pull 417s - pulling from $TESTTMP/gitrepo 417s - importing 100 git commits 417s - new changesets 1c8407413fa3:abc468b9e51b (25 drafts) 417s - new changesets 217c308baf47:d5d14eeedd08 (25 drafts) 417s - new changesets d9807ef6abcb:4678067bd500 (25 drafts) 417s - adding bookmark master 417s - new changesets c31a154888bb:eda59117ba04 (25 drafts) 417s - (run 'hg update' to get a working copy) 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s + pulling from $TESTTMP/gitrepo 417s + abort: repository $TESTTMP/gitrepo not found 417s + [255] 417s 417s Reset the repository 417s 417s $ hg debugstrip --no-backup 'all()' 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s + abort: empty revision set 417s + [255] 417s $ hg debug-remove-hggit-state 417s - clearing out the git cache data 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s + hg: unknown command 'debug-remove-hggit-state' 417s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 417s + [10] 417s 417s And with phases? No mention of draft changesets, as we publish changes 417s during the conversion: 417s 417s $ hg --config hggit.mapsavefrequency=25 --config hggit.usephases=yes pull 417s - pulling from $TESTTMP/gitrepo 417s - importing 100 git commits 417s - new changesets 1c8407413fa3:abc468b9e51b 417s - new changesets 217c308baf47:d5d14eeedd08 417s - new changesets d9807ef6abcb:4678067bd500 417s - updating bookmark master 417s - new changesets c31a154888bb:eda59117ba04 417s - (run 'hg update' to get a working copy) 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s + pulling from $TESTTMP/gitrepo 417s + abort: repository $TESTTMP/gitrepo not found 417s + [255] 417s 417s Reset the repository 417s 417s $ hg debugstrip --no-backup 'all()' 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s + abort: empty revision set 417s + [255] 417s $ hg debug-remove-hggit-state 417s - clearing out the git cache data 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s + hg: unknown command 'debug-remove-hggit-state' 417s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 417s + [10] 417s 417s Interruptions 417s ------------- 417s @@ -121,54 +143,51 @@ 417s Test an error in a pull: 417s 417s $ ABORT_AFTER=99 hg pull 417s - pulling from $TESTTMP/gitrepo 417s - importing 100 git commits 417s - transaction abort! 417s - rollback completed 417s - abort: aborted after 99 commits! 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s + pulling from $TESTTMP/gitrepo 417s + abort: repository $TESTTMP/gitrepo not found 417s [255] 417s $ hg log -l 10 -T '{rev} {gitnode}\n' 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s 417s Test the user exiting in the first transaction: 417s 417s $ EXIT_AFTER=5 hg --config hggit.mapsavefrequency=10 pull 417s - pulling from $TESTTMP/gitrepo 417s - importing 100 git commits 417s - transaction abort! 417s - rollback completed 417s - interrupted! 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s + pulling from $TESTTMP/gitrepo 417s + abort: repository $TESTTMP/gitrepo not found 417s [255] 417s $ hg log -l 10 -T '{rev} {gitnode}\n' 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s 417s Check that we have no state, but clear it just in case 417s 417s $ ls -d .hg/git* 417s - .hg/git 417s + ls: cannot access '.hg/git*': No such file or directory 417s + [2] 417s $ hg debug-remove-hggit-state 417s - clearing out the git cache data 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s + hg: unknown command 'debug-remove-hggit-state' 417s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 417s + [10] 417s 417s Test the user exiting in the middle of a conversion, after the first 417s transaction: 417s 417s $ EXIT_AFTER=15 hg --config hggit.mapsavefrequency=10 pull 417s - pulling from $TESTTMP/gitrepo 417s - importing 100 git commits 417s - new changesets 1c8407413fa3:7c8c534a5fbe (10 drafts) 417s - transaction abort! 417s - rollback completed 417s - interrupted! 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s + pulling from $TESTTMP/gitrepo 417s + abort: repository $TESTTMP/gitrepo not found 417s [255] 417s $ hg log -l 10 -T '{rev} {gitnode}\n' 417s - 9 7cbb16ec981b308e1e2b181f8e1f22c8f409f44e 417s - 8 42da70ed92bbecf9f348ba59c93646be723d0bf2 417s - 7 17e841146e5744b81af9959634d82c20a5d7df52 417s - 6 c31065bf97bf014815e37cdfbdef2c32c687f314 417s - 5 fcf21b8e0520ec1cced1d7593d13f9ee54721269 417s - 4 46acd02d0352e4b92bd6a099bb0490305d847a18 417s - 3 61eeda444b37b8aa3892d5f04c66c5441d21dd66 417s - 2 e55db11bb0472791c7af3fc636772174cdea4a36 417s - 1 17a2672b3c24c02d568f99d8d55ccae2bf362d5c 417s - 0 4e195b4c6e77604b70a8ad3b01306adbb9b1c7e7 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s $ cd .. 417s $ rm -rf hgrepo 417s 417s @@ -183,12 +202,10 @@ 417s > hg --config hggit.mapsavefrequency=10 --config git.intree=yes \ 417s > --cwd hgrepo \ 417s > clone -U $TESTTMP/gitrepo . 417s - importing 100 git commits 417s - transaction abort! 417s - rollback completed 417s - interrupted! 417s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 417s + *** failed to import extension "breakage" from /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/testlib/ext-break-git-import.py: b'hggit' 417s + abort: repository $TESTTMP/gitrepo not found 417s [255] 417s the leftover below appeared in Mercurial 5.9+; it is unintentional 417s $ ls -A hgrepo 417s - .git 417s - $ rm -rf hgrepo 417s + $ rm -rf hgrepo 417s 417s ERROR: test-transactions.t output changed 418s ! 418s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-outgoing.t 418s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-outgoing.t.err 418s @@ -14,166 +14,10 @@ 418s 418s $ cd .. 418s $ hg clone gitrepo hgrepo 418s - importing 1 git commits 418s - new changesets ff7a2f2d8d70 (1 drafts) 418s - updating to bookmark master 418s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 418s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 418s + abort: repository gitrepo not found 418s + [255] 418s 418s $ cd hgrepo 418s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 418s $ hg book 418s - alpha 0:ff7a2f2d8d70 418s - * master 0:ff7a2f2d8d70 418s - $ hg update -q master 418s - $ echo beta > beta 418s - $ hg add beta 418s - $ fn_hg_commit -m 'add beta' 418s - 418s - 418s - $ echo gamma > gamma 418s - $ hg add gamma 418s - $ fn_hg_commit -m 'add gamma' 418s - 418s - $ hg book -r 1 beta 418s - 418s - $ hg outgoing | grep -v 'searching for changes' 418s - comparing with $TESTTMP/gitrepo 418s - changeset: 1:47580592d3d6 418s - bookmark: beta 418s - user: test 418s - date: Mon Jan 01 00:00:11 2007 +0000 418s - summary: add beta 418s - 418s - changeset: 2:953796e1cfd8 418s - bookmark: master 418s - tag: tip 418s - user: test 418s - date: Mon Jan 01 00:00:12 2007 +0000 418s - summary: add gamma 418s - 418s - $ hg outgoing -r beta 418s - comparing with $TESTTMP/gitrepo 418s - searching for changes 418s - changeset: 1:47580592d3d6 418s - bookmark: beta 418s - user: test 418s - date: Mon Jan 01 00:00:11 2007 +0000 418s - summary: add beta 418s - 418s - $ hg outgoing -r master 418s - comparing with $TESTTMP/gitrepo 418s - searching for changes 418s - changeset: 1:47580592d3d6 418s - bookmark: beta 418s - user: test 418s - date: Mon Jan 01 00:00:11 2007 +0000 418s - summary: add beta 418s - 418s - changeset: 2:953796e1cfd8 418s - bookmark: master 418s - tag: tip 418s - user: test 418s - date: Mon Jan 01 00:00:12 2007 +0000 418s - summary: add gamma 418s - 418s - 418s - $ cd .. 418s - 418s -some more work on master from git 418s - $ cd gitrepo 418s - 418s -Check state of refs after outgoing 418s - $ git show-ref 418s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/alpha 418s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/master 418s - 418s - $ git checkout master 2>&1 | sed s/\'/\"/g 418s - Already on "master" 418s - $ echo delta > delta 418s - $ git add delta 418s - $ fn_git_commit -m "add delta" 418s - 418s - $ cd .. 418s - 418s - $ cd hgrepo 418s -this will fail # maybe we should try to make it work 418s - $ hg outgoing 418s - comparing with $TESTTMP/gitrepo 418s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 418s - [255] 418s -let's pull and try again 418s - $ hg pull 418s - pulling from */gitrepo (glob) 418s - importing 1 git commits 418s - not updating diverged bookmark master 418s - new changesets 25eed24f5e8f (1 drafts) 418s - (run 'hg heads' to see heads, 'hg merge' to merge) 418s - $ hg log --graph 418s - o changeset: 3:25eed24f5e8f 418s - | tag: default/master 418s - | tag: tip 418s - | parent: 0:ff7a2f2d8d70 418s - | user: test 418s - | date: Mon Jan 01 00:00:13 2007 +0000 418s - | summary: add delta 418s - | 418s - | @ changeset: 2:953796e1cfd8 418s - | | bookmark: master 418s - | | user: test 418s - | | date: Mon Jan 01 00:00:12 2007 +0000 418s - | | summary: add gamma 418s - | | 418s - | o changeset: 1:47580592d3d6 418s - |/ bookmark: beta 418s - | user: test 418s - | date: Mon Jan 01 00:00:11 2007 +0000 418s - | summary: add beta 418s - | 418s - o changeset: 0:ff7a2f2d8d70 418s - bookmark: alpha 418s - tag: default/alpha 418s - user: test 418s - date: Mon Jan 01 00:00:10 2007 +0000 418s - summary: add alpha 418s - 418s - $ hg outgoing 418s - comparing with $TESTTMP/gitrepo 418s - searching for changes 418s - changeset: 1:47580592d3d6 418s - bookmark: beta 418s - user: test 418s - date: Mon Jan 01 00:00:11 2007 +0000 418s - summary: add beta 418s - 418s - changeset: 2:953796e1cfd8 418s - bookmark: master 418s - user: test 418s - date: Mon Jan 01 00:00:12 2007 +0000 418s - summary: add gamma 418s - 418s - $ hg outgoing -r beta 418s - comparing with $TESTTMP/gitrepo 418s - searching for changes 418s - changeset: 1:47580592d3d6 418s - bookmark: beta 418s - user: test 418s - date: Mon Jan 01 00:00:11 2007 +0000 418s - summary: add beta 418s - 418s - $ hg outgoing -r master 418s - comparing with $TESTTMP/gitrepo 418s - searching for changes 418s - changeset: 1:47580592d3d6 418s - bookmark: beta 418s - user: test 418s - date: Mon Jan 01 00:00:11 2007 +0000 418s - summary: add beta 418s - 418s - changeset: 2:953796e1cfd8 418s - bookmark: master 418s - user: test 418s - date: Mon Jan 01 00:00:12 2007 +0000 418s - summary: add gamma 418s - 418s - 418s - 418s - $ cd .. 418s 418s ERROR: test-outgoing.t output changed 419s ! 419s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-gc.t 419s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-gc.t.err 419s @@ -25,188 +25,9 @@ 419s > done 419s $ cd .. 419s $ hg clone -U gitrepo hgrepo 419s - importing 100 git commits 419s - new changesets 1c8407413fa3:eda59117ba04 (100 drafts) 419s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 419s + abort: repository gitrepo not found 419s + [255] 419s $ cd hgrepo 419s + $TESTTMP.sh: 24: cd: can't cd to hgrepo 419s $ hg debug-remove-hggit-state 419s - clearing out the git cache data 419s - 419s ------------ 419s - 419s -Test garbage collection of loose objects into packs. We first test 419s -this with two threads, which is closest to the expected usage 419s -scenario, as almost all computers have at least two cores these days. 419s -The main downside is that this makes the output order unreliable, so 419s -we just sort it. 419s - 419s - $ hg gexport --config hggit.mapsavefrequency=33 --config hggit.threads=2 --debug | grep pack | sort 419s - packed 3 loose objects! 419s - packed 75 loose objects! 419s - packed 78 loose objects! 419s - packed 86 loose objects! 419s - packing 3 loose objects... 419s - packing 75 loose objects... 419s - packing 78 loose objects... 419s - packing 86 loose objects... 419s - $ hg debug-remove-hggit-state 419s - clearing out the git cache data 419s - 419s -Test the actual order of operations -- this uses a single thread, 419s -which means that the packing happens synchronously in the main thread, 419s -giving us a reliable output order. 419s - 419s -In addition, the transaction size is set up such that we happen to do 419s -nothing in the final, synchronous packing that happens on every pull. 419s -Lots of other tests have a map save frequency higher than the total 419s -amount of commits pulled, but let's just trigger that other odd 419s -occurence here. 419s - 419s - $ hg gexport --debug \ 419s - > --config hggit.mapsavefrequency=10 --config hggit.threads=1 | \ 419s - > sed 's/^converting revision.*/./' 419s - finding unexported changesets 419s - exporting 100 changesets 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 419s - packing 30 loose objects... 419s - packed 30 loose objects! 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 419s - packing 25 loose objects... 419s - packed 25 loose objects! 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 419s - packing 25 loose objects... 419s - packed 25 loose objects! 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 419s - packing 24 loose objects... 419s - packed 24 loose objects! 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 419s - packing 24 loose objects... 419s - packed 24 loose objects! 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 419s - packing 24 loose objects... 419s - packed 24 loose objects! 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 419s - packing 24 loose objects... 419s - packed 24 loose objects! 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 419s - packing 23 loose objects... 419s - packed 23 loose objects! 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 419s - packing 22 loose objects... 419s - packed 22 loose objects! 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - . 419s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 419s - packing 21 loose objects... 419s - packed 21 loose objects! 419s - packing 0 loose objects... 419s - packed 0 loose objects! 419s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 419s - $ find .hg/git/objects -type f | grep -Fv .idx | sort 419s - .hg/git/objects/pack/pack-33903607b479000b976a29a349fe0f4dffb0aaac.pack 419s - .hg/git/objects/pack/pack-40d9440e392d9eab62fa38a2ed66cc763d77aca3.pack 419s - .hg/git/objects/pack/pack-4ab2dac268f94e407788d52d6ba087b626c41651.pack 419s - .hg/git/objects/pack/pack-543e3b37bd36218a4dc6611a96d7c218afb78429.pack 419s - .hg/git/objects/pack/pack-5fc80292253ee10d1b86b5c4d9c51b29d2b4ba47.pack 419s - .hg/git/objects/pack/pack-9c636f5f16302fc5fadf0cc4ed42aeb67fc51f6a.pack 419s - .hg/git/objects/pack/pack-ae74b1f0197dfb45cfb13889453860a40103969a.pack 419s - .hg/git/objects/pack/pack-b432e2f477cb765fc0aeaa850d56e04b10392e6c.pack 419s - .hg/git/objects/pack/pack-cf7023660ce10ede2896d1be117f6ba93a261ff9.pack 419s - .hg/git/objects/pack/pack-e601b2af6a91a9cf6817d71f4eb660d2218d4094.pack 419s 419s ERROR: test-gc.t output changed 420s ! 420s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-phases-public.t 420s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-phases-public.t#publish-defaults.err 420s @@ -24,149 +24,10 @@ 420s 420s cloning with hggit.usephases publishes cloned HEAD 420s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 420s - importing 1 git commits 420s - new changesets ff7a2f2d8d70 420s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 420s + abort: repository gitrepo not found 420s + [255] 420s 420s $ cd hgrepo 420s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 420s $ hg phase -r master 420s - 0: public 420s - $ cd .. 420s - 420s -pulled changesets are public 420s - $ cd gitrepo 420s - $ git checkout -q master 420s - $ echo beta > beta 420s - $ git add beta 420s - $ fn_git_commit -m 'add beta' 420s - $ git checkout -b not-master 420s - Switched to a new branch 'not-master' 420s - $ echo gamma > gamma 420s - $ git add gamma 420s - $ fn_git_commit -m 'add gamma' 420s - $ git tag thetag 420s - $ echo delta > delta 420s - $ git add delta 420s - $ fn_git_commit -m 'add delta' 420s - $ git checkout master 420s - Switched to branch 'master' 420s - $ cd .. 420s - 420s - $ cd hgrepo 420s - $ cat >>$HGRCPATH < [paths] 420s - > other = $TESTTMP/gitrepo/.git 420s - > [hggit] 420s - > usephases = True 420s - > EOF 420s - 420s - $ hg phase -fd 'all()' 420s - 420s -we can restrict publishing to the remote HEAD and that tag, which 420s -happens to be the same thing here 420s - 420s -#if publish-specific 420s - $ cat >>$HGRCPATH < [git] 420s - > public = default/master, thetag 420s - > EOF 420s -#endif 420s - 420s -pulling publishes the branch 420s - 420s - $ hg phase -r master 420s - 0: draft 420s -#if publish-defaults 420s - $ hg pull -r master other 420s - pulling from $TESTTMP/gitrepo/.git 420s - importing 1 git commits 420s - updating bookmark master 420s - new changesets 7fe02317c63d 420s - 1 local changesets published 420s - (run 'hg update' to get a working copy) 420s -#else 420s - $ hg pull -r master other 420s - pulling from $TESTTMP/gitrepo/.git 420s - importing 1 git commits 420s - updating bookmark master 420s - new changesets 7fe02317c63d (1 drafts) 420s - (run 'hg update' to get a working copy) 420s -#endif 420s - $ hg phase -r master 420s - 1: draft (publish-specific !) 420s - 1: public (publish-defaults !) 420s -#if publish-defaults 420s - $ hg phase -fd master 420s - $ hg pull 420s - pulling from $TESTTMP/gitrepo 420s - importing 2 git commits 420s - adding bookmark not-master 420s - new changesets ca33a262eb46:03769a650ded (1 drafts) 420s - 1 local changesets published 420s - (run 'hg update' to get a working copy) 420s -#else 420s - $ hg pull 420s - pulling from $TESTTMP/gitrepo 420s - importing 2 git commits 420s - adding bookmark not-master 420s - new changesets ca33a262eb46:03769a650ded (1 drafts) 420s - 2 local changesets published 420s - (run 'hg update' to get a working copy) 420s -#endif 420s - $ hg phase -r master -r not-master -r thetag 420s - 1: public 420s - 3: draft 420s - 2: public 420s - 420s -public bookmark not pushed is not published after pull 420s - 420s - $ hg update 0 420s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 420s - $ echo delta > delta 420s - $ hg bookmark not-pushed 420s - $ hg add delta 420s - $ hg commit -m 'add delta' 420s - created new head 420s - $ hg phase -r 'all()' > $TESTTMP/before 420s - $ hg pull --config git.public=master,not-pushed 420s - pulling from $TESTTMP/gitrepo 420s - no changes found 420s - $ hg phase -r 'all()' > $TESTTMP/after 420s - $ cmp -s $TESTTMP/before $TESTTMP/after 420s - $ hg phase -r not-pushed 420s - 4: draft 420s - $ rm $TESTTMP/before $TESTTMP/after 420s - 420s -pushing public bookmark publishes local changesets, but only those 420s -actually pushed 420s - 420s - $ hg update master 420s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 420s - (activating bookmark master) 420s - $ echo epsilon > epsilon 420s - $ hg add epsilon 420s - $ hg commit -m 'add epsilon' 420s - created new head 420s - $ hg phase -r 'all() - master' > $TESTTMP/before 420s - $ hg push -B not-pushed 420s - pushing to $TESTTMP/gitrepo 420s - searching for changes 420s - adding objects 420s - remote: found 0 deltas to reuse 420s - added 1 commits with 1 trees and 1 blobs 420s - adding reference refs/heads/not-pushed 420s - $ hg phase -r 'all() - master' > $TESTTMP/after 420s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 420s - $ hg phase -r not-pushed -r master 420s - 4: draft 420s - 5: draft 420s - $ hg push -B master 420s - pushing to $TESTTMP/gitrepo 420s - searching for changes 420s - adding objects 420s - remote: found 0 deltas to reuse 420s - added 1 commits with 1 trees and 1 blobs 420s - updating reference refs/heads/master 420s - $ hg phase -r 'all() - master' > $TESTTMP/after 420s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 420s - $ hg phase -r master 420s - 5: public 420s 420s ERROR: test-phases-public.t#publish-defaults output changed 421s ! 421s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-phases-public.t 421s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-phases-public.t#publish-specific.err 421s @@ -24,149 +24,10 @@ 421s 421s cloning with hggit.usephases publishes cloned HEAD 421s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 421s - importing 1 git commits 421s - new changesets ff7a2f2d8d70 421s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 421s + abort: repository gitrepo not found 421s + [255] 421s 421s $ cd hgrepo 421s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 421s $ hg phase -r master 421s - 0: public 421s - $ cd .. 421s - 421s -pulled changesets are public 421s - $ cd gitrepo 421s - $ git checkout -q master 421s - $ echo beta > beta 421s - $ git add beta 421s - $ fn_git_commit -m 'add beta' 421s - $ git checkout -b not-master 421s - Switched to a new branch 'not-master' 421s - $ echo gamma > gamma 421s - $ git add gamma 421s - $ fn_git_commit -m 'add gamma' 421s - $ git tag thetag 421s - $ echo delta > delta 421s - $ git add delta 421s - $ fn_git_commit -m 'add delta' 421s - $ git checkout master 421s - Switched to branch 'master' 421s - $ cd .. 421s - 421s - $ cd hgrepo 421s - $ cat >>$HGRCPATH < [paths] 421s - > other = $TESTTMP/gitrepo/.git 421s - > [hggit] 421s - > usephases = True 421s - > EOF 421s - 421s - $ hg phase -fd 'all()' 421s - 421s -we can restrict publishing to the remote HEAD and that tag, which 421s -happens to be the same thing here 421s - 421s -#if publish-specific 421s - $ cat >>$HGRCPATH < [git] 421s - > public = default/master, thetag 421s - > EOF 421s -#endif 421s - 421s -pulling publishes the branch 421s - 421s - $ hg phase -r master 421s - 0: draft 421s -#if publish-defaults 421s - $ hg pull -r master other 421s - pulling from $TESTTMP/gitrepo/.git 421s - importing 1 git commits 421s - updating bookmark master 421s - new changesets 7fe02317c63d 421s - 1 local changesets published 421s - (run 'hg update' to get a working copy) 421s -#else 421s - $ hg pull -r master other 421s - pulling from $TESTTMP/gitrepo/.git 421s - importing 1 git commits 421s - updating bookmark master 421s - new changesets 7fe02317c63d (1 drafts) 421s - (run 'hg update' to get a working copy) 421s -#endif 421s - $ hg phase -r master 421s - 1: draft (publish-specific !) 421s - 1: public (publish-defaults !) 421s -#if publish-defaults 421s - $ hg phase -fd master 421s - $ hg pull 421s - pulling from $TESTTMP/gitrepo 421s - importing 2 git commits 421s - adding bookmark not-master 421s - new changesets ca33a262eb46:03769a650ded (1 drafts) 421s - 1 local changesets published 421s - (run 'hg update' to get a working copy) 421s -#else 421s - $ hg pull 421s - pulling from $TESTTMP/gitrepo 421s - importing 2 git commits 421s - adding bookmark not-master 421s - new changesets ca33a262eb46:03769a650ded (1 drafts) 421s - 2 local changesets published 421s - (run 'hg update' to get a working copy) 421s -#endif 421s - $ hg phase -r master -r not-master -r thetag 421s - 1: public 421s - 3: draft 421s - 2: public 421s - 421s -public bookmark not pushed is not published after pull 421s - 421s - $ hg update 0 421s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 421s - $ echo delta > delta 421s - $ hg bookmark not-pushed 421s - $ hg add delta 421s - $ hg commit -m 'add delta' 421s - created new head 421s - $ hg phase -r 'all()' > $TESTTMP/before 421s - $ hg pull --config git.public=master,not-pushed 421s - pulling from $TESTTMP/gitrepo 421s - no changes found 421s - $ hg phase -r 'all()' > $TESTTMP/after 421s - $ cmp -s $TESTTMP/before $TESTTMP/after 421s - $ hg phase -r not-pushed 421s - 4: draft 421s - $ rm $TESTTMP/before $TESTTMP/after 421s - 421s -pushing public bookmark publishes local changesets, but only those 421s -actually pushed 421s - 421s - $ hg update master 421s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 421s - (activating bookmark master) 421s - $ echo epsilon > epsilon 421s - $ hg add epsilon 421s - $ hg commit -m 'add epsilon' 421s - created new head 421s - $ hg phase -r 'all() - master' > $TESTTMP/before 421s - $ hg push -B not-pushed 421s - pushing to $TESTTMP/gitrepo 421s - searching for changes 421s - adding objects 421s - remote: found 0 deltas to reuse 421s - added 1 commits with 1 trees and 1 blobs 421s - adding reference refs/heads/not-pushed 421s - $ hg phase -r 'all() - master' > $TESTTMP/after 421s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 421s - $ hg phase -r not-pushed -r master 421s - 4: draft 421s - 5: draft 421s - $ hg push -B master 421s - pushing to $TESTTMP/gitrepo 421s - searching for changes 421s - adding objects 421s - remote: found 0 deltas to reuse 421s - added 1 commits with 1 trees and 1 blobs 421s - updating reference refs/heads/master 421s - $ hg phase -r 'all() - master' > $TESTTMP/after 421s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 421s - $ hg phase -r master 421s - 5: public 421s 421s ERROR: test-phases-public.t#publish-specific output changed 424s ! 424s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-push-r.t 424s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-push-r.t.err 424s @@ -2,34 +2,43 @@ 424s $ . "$TESTDIR/testutil" 424s 424s $ hg init test 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ cd test 424s $ cat >>afile < 0 424s > EOF 424s $ hg add afile 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ fn_hg_commit -m "0.0" 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ cat >>afile < 1 424s > EOF 424s $ fn_hg_commit -m "0.1" 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ cat >>afile < 2 424s > EOF 424s $ fn_hg_commit -m "0.2" 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ cat >>afile < 3 424s > EOF 424s $ fn_hg_commit -m "0.3" 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ hg update -C 0 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 424s $ cat >>afile < 1 424s > EOF 424s $ fn_hg_commit -m "1.1" 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ cat >>afile < 2 424s > EOF 424s $ fn_hg_commit -m "1.2" 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ cat >fred < a line 424s > EOF 424s @@ -37,13 +46,20 @@ 424s > 3 424s > EOF 424s $ hg add fred 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ fn_hg_commit -m "1.3" 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ hg mv afile adifferentfile 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ fn_hg_commit -m "1.3m" 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ hg update -C 3 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 424s $ hg mv afile anotherfile 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ fn_hg_commit -m "0.3m" 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ cd .. 424s $ for i in 0 1 2 3 4 5 6 7 8; do 424s > mkdir test-"$i" 424s @@ -53,128 +69,166 @@ 424s > hg verify 424s > cd .. 424s > done 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s pushing to test-0 424s searching for changes 424s adding changesets 424s adding manifests 424s adding file changes 424s added 1 changesets with 1 changes to 1 files 424s - checking changesets 424s - checking manifests 424s - crosschecking files in changesets and manifests 424s - checking files 424s - checking dirstate (?) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + checking changesets 424s + checking dirstate (?) 424s + checking manifests 424s + crosschecking files in changesets and manifests 424s + checking files 424s + checking dirstate 424s checked 1 changesets with 1 changes to 1 files 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s pushing to test-1 424s searching for changes 424s adding changesets 424s adding manifests 424s + checking dirstate (?) 424s adding file changes 424s added 2 changesets with 2 changes to 1 files 424s - checking changesets 424s - checking manifests 424s - crosschecking files in changesets and manifests 424s - checking files 424s - checking dirstate (?) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + checking changesets 424s + checking manifests 424s + crosschecking files in changesets and manifests 424s + checking files 424s + checking dirstate 424s checked 2 changesets with 2 changes to 1 files 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + checking dirstate (?) 424s pushing to test-2 424s searching for changes 424s adding changesets 424s adding manifests 424s adding file changes 424s added 3 changesets with 3 changes to 1 files 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s checking changesets 424s checking manifests 424s crosschecking files in changesets and manifests 424s checking files 424s checking dirstate (?) 424s checked 3 changesets with 3 changes to 1 files 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s pushing to test-3 424s searching for changes 424s adding changesets 424s adding manifests 424s adding file changes 424s added 4 changesets with 4 changes to 1 files 424s - checking changesets 424s - checking manifests 424s - crosschecking files in changesets and manifests 424s - checking files 424s - checking dirstate (?) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + checking changesets 424s + checking dirstate (?) 424s + checking manifests 424s + crosschecking files in changesets and manifests 424s + checking files 424s + checking dirstate 424s checked 4 changesets with 4 changes to 1 files 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s pushing to test-4 424s searching for changes 424s adding changesets 424s adding manifests 424s + checking dirstate (?) 424s adding file changes 424s added 2 changesets with 2 changes to 1 files 424s - checking changesets 424s - checking manifests 424s - crosschecking files in changesets and manifests 424s - checking files 424s - checking dirstate (?) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + checking changesets 424s + checking manifests 424s + crosschecking files in changesets and manifests 424s + checking files 424s + checking dirstate 424s checked 2 changesets with 2 changes to 1 files 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + checking dirstate (?) 424s pushing to test-5 424s searching for changes 424s adding changesets 424s adding manifests 424s adding file changes 424s added 3 changesets with 3 changes to 1 files 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s checking changesets 424s checking manifests 424s crosschecking files in changesets and manifests 424s checking files 424s checking dirstate (?) 424s checked 3 changesets with 3 changes to 1 files 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s pushing to test-6 424s searching for changes 424s adding changesets 424s adding manifests 424s adding file changes 424s added 4 changesets with 5 changes to 2 files 424s - checking changesets 424s - checking manifests 424s - crosschecking files in changesets and manifests 424s - checking files 424s - checking dirstate (?) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + checking changesets 424s + checking dirstate (?) 424s + checking manifests 424s + crosschecking files in changesets and manifests 424s + checking files 424s + checking dirstate 424s checked 4 changesets with 5 changes to 2 files 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s pushing to test-7 424s searching for changes 424s adding changesets 424s adding manifests 424s adding file changes 424s added 5 changesets with 6 changes to 3 files 424s - checking changesets 424s - checking manifests 424s - crosschecking files in changesets and manifests 424s - checking files 424s - checking dirstate (?) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + checking changesets 424s + checking manifests 424s + crosschecking files in changesets and manifests 424s + checking files 424s + checking dirstate 424s checked 5 changesets with 6 changes to 3 files 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s pushing to test-8 424s searching for changes 424s adding changesets 424s adding manifests 424s adding file changes 424s added 5 changesets with 5 changes to 2 files 424s - checking changesets 424s - checking manifests 424s - crosschecking files in changesets and manifests 424s - checking files 424s - checking dirstate (?) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + checking changesets 424s + checking manifests 424s + crosschecking files in changesets and manifests 424s + checking files 424s + checking dirstate 424s checked 5 changesets with 5 changes to 2 files 424s $ cd test-8 424s $ hg pull ../test-7 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s pulling from ../test-7 424s searching for changes 424s adding changesets 424s adding manifests 424s adding file changes 424s + new changesets c29287bce33f:e70c8671c3d4 (?) 424s added 4 changesets with 2 changes to 3 files (+1 heads) 424s - new changesets c29287bce33f:e70c8671c3d4 (?) 424s + new changesets c29287bce33f:e70c8671c3d4 424s (run 'hg heads' to see heads, 'hg merge' to merge) 424s $ hg verify 424s - checking changesets 424s - checking manifests 424s - crosschecking files in changesets and manifests 424s - checking files 424s - checking dirstate (?) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + checking changesets 424s + checking manifests 424s + crosschecking files in changesets and manifests 424s + checking dirstate (?) 424s + checking files 424s + checking dirstate 424s checked 9 changesets with 7 changes to 4 files 424s 424s ERROR: test-push-r.t output changed 425s !s 425s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-invalid-refs.t 425s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-invalid-refs.t.err 425s @@ -12,115 +12,10 @@ 425s 425s $ cd .. 425s $ hg clone -U gitrepo hgrepo 425s - importing 1 git commits 425s - new changesets ff7a2f2d8d70 (1 drafts) 425s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 425s + abort: repository gitrepo not found 425s + [255] 425s 425s $ cd hgrepo 425s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 425s $ hg up master 425s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 425s - (activating bookmark master) 425s - $ fn_hg_tag alph#a 425s - $ fn_hg_tag bet*a 425s - $ fn_hg_tag 'gamm a' 425s - $ hg book -r . delt#a 425s - $ hg book -r . epsil*on 425s - 425s - $ hg gexport 425s - warning: not exporting tag 'bet*a' due to invalid name 425s - warning: not exporting bookmark 'epsil*on' due to invalid name 425s - 425s - $ hg push 425s - pushing to $TESTTMP/gitrepo 425s - warning: not exporting tag 'bet*a' due to invalid name 425s - warning: not exporting bookmark 'epsil*on' due to invalid name 425s - searching for changes 425s - adding objects 425s - remote: found 0 deltas to reuse 425s - added 3 commits with 3 trees and 3 blobs 425s - adding reference refs/heads/delt#a 425s - updating reference refs/heads/master 425s - adding reference refs/tags/alph#a 425s - adding reference refs/tags/gamm_a 425s - 425s - $ hg log --graph 425s - @ changeset: 3:0950ab44ea23 425s - | bookmark: delt#a 425s - | bookmark: epsil*on 425s - | bookmark: master 425s - | tag: default/delt#a 425s - | tag: default/master 425s - | tag: tip 425s - | user: test 425s - | date: Mon Jan 01 00:00:13 2007 +0000 425s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 425s - | 425s - o changeset: 2:0b27ab2b3df6 425s - | tag: gamm a 425s - | user: test 425s - | date: Mon Jan 01 00:00:12 2007 +0000 425s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 425s - | 425s - o changeset: 1:491ceeb1b0f1 425s - | tag: bet*a 425s - | user: test 425s - | date: Mon Jan 01 00:00:11 2007 +0000 425s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 425s - | 425s - o changeset: 0:ff7a2f2d8d70 425s - bookmark: not-master 425s - tag: alph#a 425s - tag: default/not-master 425s - user: test 425s - date: Mon Jan 01 00:00:10 2007 +0000 425s - summary: add alpha 425s - 425s - 425s - $ cd .. 425s - $ cd gitrepo 425s -git should have only the valid tag alph#a but have full commit log including the missing invalid bet*a tag commit 425s - $ git tag -l 425s - alph#a 425s - gamm_a 425s - 425s - $ cd .. 425s - $ hg clone -U gitrepo hgrepo2 425s - importing 4 git commits 425s - new changesets ff7a2f2d8d70:0950ab44ea23 (4 drafts) 425s - $ hg -R hgrepo2 log --graph 425s - o changeset: 3:0950ab44ea23 425s - | bookmark: delt#a 425s - | bookmark: master 425s - | tag: default/delt#a 425s - | tag: default/master 425s - | tag: tip 425s - | user: test 425s - | date: Mon Jan 01 00:00:13 2007 +0000 425s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 425s - | 425s - o changeset: 2:0b27ab2b3df6 425s - | tag: gamm a 425s - | tag: gamm_a 425s - | user: test 425s - | date: Mon Jan 01 00:00:12 2007 +0000 425s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 425s - | 425s - o changeset: 1:491ceeb1b0f1 425s - | tag: bet*a 425s - | user: test 425s - | date: Mon Jan 01 00:00:11 2007 +0000 425s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 425s - | 425s - o changeset: 0:ff7a2f2d8d70 425s - bookmark: not-master 425s - tag: alph#a 425s - tag: default/not-master 425s - user: test 425s - date: Mon Jan 01 00:00:10 2007 +0000 425s - summary: add alpha 425s - 425s - 425s -the tag should be in .hgtags 425s - $ hg cat -r master hgrepo2/.hgtags 425s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alph#a 425s - 491ceeb1b0f10d65d956dfcdd3470ac2bc2c96a8 bet*a 425s - 0b27ab2b3df69c6f7defd7040b93e539136db5be gamm a 425s 425s ERROR: test-invalid-refs.t output changed 426s ! 426s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-git-workflow.t 426s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-git-workflow.t.err 426s @@ -2,13 +2,20 @@ 426s $ . "$TESTDIR/testutil" 426s 426s $ hg init hgrepo 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s $ cd hgrepo 426s $ hg debuggitdir 426s - $TESTTMP/hgrepo/.hg/git 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s + hg: unknown command 'debuggitdir' 426s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 426s + [10] 426s $ echo alpha > alpha 426s $ hg add alpha 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s $ fn_hg_commit -m "add alpha" 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s $ hg log --graph --debug | grep -v phase: 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s @ changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 426s tag: tip 426s parent: -1:0000000000000000000000000000000000000000 426s @@ -27,49 +34,54 @@ 426s 426s configure for use from git 426s $ hg clone hgrepo gitrepo 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s updating to branch default 426s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 426s $ cd gitrepo 426s $ hg book master 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s $ hg up null 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 426s (leaving bookmark master) 426s $ echo "[git]" >> .hg/hgrc 426s $ echo "intree = True" >> .hg/hgrc 426s $ hg debuggitdir 426s - $TESTTMP/gitrepo/.git 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s + hg: unknown command 'debuggitdir' 426s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 426s + [10] 426s $ hg gexport 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s + hg: unknown command 'gexport' 426s + (did you mean one of export, import?) 426s + [10] 426s 426s do some work 426s $ git config core.bare false 426s + fatal: not in a git directory 426s + [128] 426s $ git checkout master 2>&1 | sed s/\'/\"/g 426s - Already on "master" 426s + fatal: not a git repository (or any of the parent directories): .git 426s $ echo beta > beta 426s $ git add beta 426s + fatal: not a git repository (or any of the parent directories): .git 426s + [128] 426s $ fn_git_commit -m 'add beta' 426s + fatal: not a git repository (or any of the parent directories): .git 426s + git commit error 426s 426s get things back to hg 426s $ hg gimport 426s - importing 1 git commits 426s - updating bookmark master 426s - new changesets 9f124f3c1fc2 (1 drafts) 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s + hg: unknown command 'gimport' 426s + (did you mean one of export, import?) 426s + [10] 426s $ hg log --graph --debug | grep -v phase: 426s - o changeset: 1:9f124f3c1fc29a14f5eb027c24811b0ac9d5ff10 426s - | bookmark: master 426s - | tag: tip 426s - | parent: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 426s - | parent: -1:0000000000000000000000000000000000000000 426s - | manifest: 1:f0bd6fbafbaebe4bb59c35108428f6fce152431d 426s - | user: test 426s - | date: Mon Jan 01 00:00:11 2007 +0000 426s - | files+: beta 426s - | extra: branch=default 426s - | extra: hg-git-rename-source=git 426s - | description: 426s - | add beta 426s - | 426s - | 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s o changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 426s + bookmark: master 426s + tag: tip 426s parent: -1:0000000000000000000000000000000000000000 426s parent: -1:0000000000000000000000000000000000000000 426s manifest: 0:8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0 426s @@ -83,7 +95,8 @@ 426s 426s gimport should have updated the bookmarks as well 426s $ hg bookmarks 426s - master 1:9f124f3c1fc2 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s + master 0:0221c246a567 426s 426s gimport support for git.mindate 426s $ cat >> .hg/hgrc << EOF 426s @@ -92,20 +105,23 @@ 426s > EOF 426s $ echo oldcommit > oldcommit 426s $ git add oldcommit 426s + fatal: not a git repository (or any of the parent directories): .git 426s + [128] 426s $ GIT_AUTHOR_DATE="2014-03-01 00:00:00 +0000" \ 426s > GIT_COMMITTER_DATE="2009-01-01 00:00:00 +0000" \ 426s > git commit -m oldcommit > /dev/null || echo "git commit error" 426s + fatal: not a git repository (or any of the parent directories): .git 426s + git commit error 426s $ hg gimport 426s - no changes found 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s + hg: unknown command 'gimport' 426s + (did you mean one of export, import?) 426s + [10] 426s $ hg log --graph 426s - o changeset: 1:9f124f3c1fc2 426s - | bookmark: master 426s - | tag: tip 426s - | user: test 426s - | date: Mon Jan 01 00:00:11 2007 +0000 426s - | summary: add beta 426s - | 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s o changeset: 0:0221c246a567 426s + bookmark: master 426s + tag: tip 426s user: test 426s date: Mon Jan 01 00:00:10 2007 +0000 426s summary: add alpha 426s @@ -113,32 +129,23 @@ 426s 426s $ echo newcommit > newcommit 426s $ git add newcommit 426s + fatal: not a git repository (or any of the parent directories): .git 426s + [128] 426s $ GIT_AUTHOR_DATE="2014-01-01 00:00:00 +0000" \ 426s > GIT_COMMITTER_DATE="2014-01-02 00:00:00 +0000" \ 426s > git commit -m newcommit > /dev/null || echo "git commit error" 426s + fatal: not a git repository (or any of the parent directories): .git 426s + git commit error 426s $ hg gimport 426s - importing 2 git commits 426s - updating bookmark master 426s - new changesets befdecd14df5:3d10b7289d79 (2 drafts) 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s + hg: unknown command 'gimport' 426s + (did you mean one of export, import?) 426s + [10] 426s $ hg log --graph 426s - o changeset: 3:3d10b7289d79 426s - | bookmark: master 426s - | tag: tip 426s - | user: test 426s - | date: Wed Jan 01 00:00:00 2014 +0000 426s - | summary: newcommit 426s - | 426s - o changeset: 2:befdecd14df5 426s - | user: test 426s - | date: Sat Mar 01 00:00:00 2014 +0000 426s - | summary: oldcommit 426s - | 426s - o changeset: 1:9f124f3c1fc2 426s - | user: test 426s - | date: Mon Jan 01 00:00:11 2007 +0000 426s - | summary: add beta 426s - | 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s o changeset: 0:0221c246a567 426s + bookmark: master 426s + tag: tip 426s user: test 426s date: Mon Jan 01 00:00:10 2007 +0000 426s summary: add alpha 426s 426s ERROR: test-git-workflow.t output changed 426s ! 426s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-serve-hg.t 426s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-serve-hg.t#with-hggit.err 426s @@ -31,11 +31,11 @@ 426s $ cd .. 426s 426s $ hg clone gitrepo hgrepo 426s - importing 2 git commits 426s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 426s - updating to bookmark master 426s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 426s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 426s + abort: repository gitrepo not found 426s + [255] 426s $ cd hgrepo 426s + $TESTTMP.sh: 41: cd: can't cd to hgrepo 426s $ cat >> .hg/hgrc < [push] 426s > pushvars.server = true 426s @@ -45,81 +45,3 @@ 426s > [hooks] 426s > pretxnchangegroup = env | grep HG_USERVAR_ || true 426s > EOF 426s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 426s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 426s - 426s -Test server address cannot be reused 426s - 426s -#if windows 426s - $ hg serve -p $HGPORT1 2>&1 426s - abort: cannot start server at '*:$HGPORT1': * (glob) 426s - [255] 426s -#else 426s - $ hg serve -p $HGPORT1 2>&1 426s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 426s - [255] 426s -#endif 426s - $ cd .. 426s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 426s - 426s -Make sure that clone regular mercurial repos over http doesn't break, 426s -and that we can transfer the hg-git metadata 426s - 426s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 426s - requesting all changes 426s - adding changesets 426s - adding manifests 426s - adding file changes 426s - added 2 changesets with 4 changes to 4 files 426s - new changesets f488b65fa424:c61c38c3d614 (?) 426s - updating to branch default 426s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 426s - 426s -And it shouldn't create a Git repository needlessly: 426s - $ test -e copy/git 426s - [1] 426s - $ cd copy 426s - 426s -#if without-hggit 426s - $ hg tags 426s - tip 1:c61c38c3d614 426s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 426s - 1:c61c38c3d614 | master | | 426s - 0:f488b65fa424 | | | 426s - $ hg pull -u ../gitrepo 426s - pulling from ../gitrepo 426s - importing 2 git commits 426s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 426s -#else 426s - $ hg tags 426s - tip 1:c61c38c3d614 426s - thetag 0:f488b65fa424 426s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 426s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 426s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 426s - $ hg pull -u ../gitrepo 426s - pulling from ../gitrepo 426s - warning: created new git repository at $TESTTMP/copy/.hg/git 426s - no changes found 426s -#endif 426s - 426s - $ hg tags 426s - tip 1:c61c38c3d614 426s - thetag 0:f488b65fa424 426s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 426s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 426s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 426s - 426s -Furthermore, make sure that we pass all arguments when pushing: 426s - 426s - $ echo baz > baz 426s - $ fn_hg_commit -A -m baz 426s - $ hg push --pushvars FOO=BAR 426s - pushing to http://localhost:$HGPORT/ 426s - searching for changes 426s - remote: adding changesets 426s - remote: adding manifests 426s - remote: adding file changes 426s - remote: HG_USERVAR_FOO=BAR 426s - remote: added 1 changesets with 1 changes to 1 files 426s - $ cd .. 426s 426s ERROR: test-serve-hg.t#with-hggit output changed 427s ! 427s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-serve-hg.t 427s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-serve-hg.t#without-hggit.err 427s @@ -31,11 +31,11 @@ 427s $ cd .. 427s 427s $ hg clone gitrepo hgrepo 427s - importing 2 git commits 427s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 427s - updating to bookmark master 427s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 427s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 427s + abort: repository gitrepo not found 427s + [255] 427s $ cd hgrepo 427s + $TESTTMP.sh: 36: cd: can't cd to hgrepo 427s $ cat >> .hg/hgrc < [push] 427s > pushvars.server = true 427s @@ -45,81 +45,3 @@ 427s > [hooks] 427s > pretxnchangegroup = env | grep HG_USERVAR_ || true 427s > EOF 427s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 427s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 427s - 427s -Test server address cannot be reused 427s - 427s -#if windows 427s - $ hg serve -p $HGPORT1 2>&1 427s - abort: cannot start server at '*:$HGPORT1': * (glob) 427s - [255] 427s -#else 427s - $ hg serve -p $HGPORT1 2>&1 427s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 427s - [255] 427s -#endif 427s - $ cd .. 427s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 427s - 427s -Make sure that clone regular mercurial repos over http doesn't break, 427s -and that we can transfer the hg-git metadata 427s - 427s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 427s - requesting all changes 427s - adding changesets 427s - adding manifests 427s - adding file changes 427s - added 2 changesets with 4 changes to 4 files 427s - new changesets f488b65fa424:c61c38c3d614 (?) 427s - updating to branch default 427s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 427s - 427s -And it shouldn't create a Git repository needlessly: 427s - $ test -e copy/git 427s - [1] 427s - $ cd copy 427s - 427s -#if without-hggit 427s - $ hg tags 427s - tip 1:c61c38c3d614 427s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 427s - 1:c61c38c3d614 | master | | 427s - 0:f488b65fa424 | | | 427s - $ hg pull -u ../gitrepo 427s - pulling from ../gitrepo 427s - importing 2 git commits 427s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 427s -#else 427s - $ hg tags 427s - tip 1:c61c38c3d614 427s - thetag 0:f488b65fa424 427s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 427s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 427s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 427s - $ hg pull -u ../gitrepo 427s - pulling from ../gitrepo 427s - warning: created new git repository at $TESTTMP/copy/.hg/git 427s - no changes found 427s -#endif 427s - 427s - $ hg tags 427s - tip 1:c61c38c3d614 427s - thetag 0:f488b65fa424 427s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 427s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 427s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 427s - 427s -Furthermore, make sure that we pass all arguments when pushing: 427s - 427s - $ echo baz > baz 427s - $ fn_hg_commit -A -m baz 427s - $ hg push --pushvars FOO=BAR 427s - pushing to http://localhost:$HGPORT/ 427s - searching for changes 427s - remote: adding changesets 427s - remote: adding manifests 427s - remote: adding file changes 427s - remote: HG_USERVAR_FOO=BAR 427s - remote: added 1 changesets with 1 changes to 1 files 427s - $ cd .. 427s 427s ERROR: test-serve-hg.t#without-hggit output changed 428s ! 428s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-push-authors.t 428s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-push-authors.t.err 428s @@ -8,127 +8,9 @@ 428s Create a Mercurial repository 428s 428s $ hg clone repo.git hgrepo 428s - updating to branch default 428s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 428s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 428s + abort: repository repo.git not found 428s + [255] 428s $ cd hgrepo 428s + $TESTTMP.sh: 8: cd: can't cd to hgrepo 428s $ hg book master 428s - 428s -Configure an author map 428s - 428s - $ touch authors.txt 428s - $ cat >> $HGRCPATH < [git] 428s - > authors = $TESTTMP/authors.txt 428s - > EOF 428s - 428s -Create a commit user that maps to a fully valid user 428s - 428s - $ cat >> $TESTTMP/authors.txt < user1 = User no. 1 428s - > EOF 428s - $ touch alpha 428s - $ hg add alpha 428s - $ fn_hg_commit -m alpha -u user1 428s - 428s -And one that maps to an email address 428s - 428s - $ cat >> $TESTTMP/authors.txt < user2@example.com = user2 428s - > EOF 428s - $ touch beta 428s - $ hg add beta 428s - $ fn_hg_commit -m beta -u user2@example.com 428s - 428s -And one that maps to a "simple" user 428s - 428s - $ cat >> $TESTTMP/authors.txt < User #3 = user3@example.com 428s - > EOF 428s - $ touch gamma 428s - $ hg add gamma 428s - $ fn_hg_commit -m gamma -u "User #3 " 428s - 428s -And one that maps to nothing 428s - 428s - $ cat >> $TESTTMP/authors.txt < user4 = 428s - > EOF 428s - $ touch delta 428s - $ hg add delta 428s - $ fn_hg_commit -m delta -u user4 428s - 428s -And one that doesn't map 428s - 428s - $ touch epsilon 428s - $ hg add epsilon 428s - $ fn_hg_commit -m epsilon -u "User #5 " 428s - 428s -Check the test default 428s - 428s - $ touch zeta 428s - $ hg add zeta 428s - $ fn_hg_commit -m zeta 428s - 428s -Push it! 428s - 428s - $ hg push 428s - pushing to $TESTTMP/repo.git 428s - searching for changes 428s - adding objects 428s - remote: found 0 deltas to reuse 428s - added 6 commits with 6 trees and 1 blobs 428s - adding reference refs/heads/master 428s - 428s -Check the results: 428s - 428s - $ hg log --template='Commit: {gitnode}\nAuthor: {author}\n---\n' 428s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 428s - Author: test 428s - --- 428s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 428s - Author: User #5 428s - --- 428s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 428s - Author: user4 428s - --- 428s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 428s - Author: User #3 428s - --- 428s - Commit: eba936dd13172a2f17936785e3604845aed9170d 428s - Author: user2@example.com 428s - --- 428s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 428s - Author: user1 428s - --- 428s - $ cd ../repo.git 428s - $ cat $TESTTMP/authors.txt 428s - user1 = User no. 1 428s - user2@example.com = user2 428s - User #3 = user3@example.com 428s - user4 = 428s - $ git log --pretty='tformat:Commit: %H%nAuthor: %an <%ae>%nCommitter: %cn <%ce>%n---' 428s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 428s - Author: test 428s - Committer: test 428s - --- 428s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 428s - Author: User #5 428s - Committer: User #5 428s - --- 428s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 428s - Author: 428s - Committer: 428s - --- 428s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 428s - Author: user3@example.com 428s - Committer: user3@example.com 428s - --- 428s - Commit: eba936dd13172a2f17936785e3604845aed9170d 428s - Author: user2 428s - Committer: user2 428s - --- 428s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 428s - Author: User no. 1 428s - Committer: User no. 1 428s - --- 428s - $ cd .. 428s 428s ERROR: test-push-authors.t output changed 428s ! 428s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-push-to-head.t 428s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-push-to-head.t.err 428s @@ -14,65 +14,9 @@ 428s Clone it, and push back to master: 428s 428s $ hg clone gitrepo hgrepo 428s - importing 1 git commits 428s - new changesets ff7a2f2d8d70 (1 drafts) 428s - updating to bookmark master 428s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 428s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 428s + abort: repository gitrepo not found 428s + [255] 428s $ cd hgrepo 428s + $TESTTMP.sh: 18: cd: can't cd to hgrepo 428s $ echo beta > beta 428s - $ fn_hg_commit -A -m "add beta" 428s - 428s -The output is confusing, and this even more-so: 428s - 428s - $ hg push 428s - pushing to $TESTTMP/gitrepo 428s - searching for changes 428s - adding objects 428s - remote: found 0 deltas to reuse 428s - remote: error: refusing to update checked out branch: refs/heads/master 428s - remote: error: By default, updating the current branch in a non-bare repository 428s - remote: is denied, because it will make the index and work tree inconsistent 428s - remote: with what you pushed, and will require 'git reset --hard' to match 428s - remote: the work tree to HEAD. 428s - remote: 428s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 428s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 428s - remote: its current branch; however, this is not recommended unless you 428s - remote: arranged to update its work tree to match what you pushed in some 428s - remote: other way. 428s - remote: 428s - remote: To squelch this message and still keep the default behaviour, set 428s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 428s - added 1 commits with 1 trees and 1 blobs 428s - warning: failed to update refs/heads/master; branch is currently checked out 428s - 428s - $ hg push 428s - pushing to $TESTTMP/gitrepo 428s - searching for changes 428s - adding objects 428s - remote: found 0 deltas to reuse 428s - remote: error: refusing to update checked out branch: refs/heads/master 428s - remote: error: By default, updating the current branch in a non-bare repository 428s - remote: is denied, because it will make the index and work tree inconsistent 428s - remote: with what you pushed, and will require 'git reset --hard' to match 428s - remote: the work tree to HEAD. 428s - remote: 428s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 428s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 428s - remote: its current branch; however, this is not recommended unless you 428s - remote: arranged to update its work tree to match what you pushed in some 428s - remote: other way. 428s - remote: 428s - remote: To squelch this message and still keep the default behaviour, set 428s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 428s - added 1 commits with 1 trees and 1 blobs 428s - warning: failed to update refs/heads/master; branch is currently checked out 428s - 428s -Show that it really didn't get pushed: 428s - 428s - $ hg tags 428s - tip 1:47580592d3d6 428s - default/master 0:ff7a2f2d8d70 428s - $ cd ../gitrepo 428s - $ git log --all --oneline --decorate 428s - 7eeab2e (HEAD -> master) add alpha 428s 428s ERROR: test-push-to-head.t output changed 429s ! 429s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-orphan-tags.t 429s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-orphan-tags.t.err 429s @@ -61,17 +61,17 @@ 429s Create a Mercurial clone 429s 429s $ hg clone -U repo.git hgrepo 429s - importing 4 git commits 429s - new changesets b8e77484829b:387d03400596 (4 drafts) 429s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 429s + abort: repository repo.git not found 429s + [255] 429s $ hg outgoing -R hgrepo 429s - comparing with $TESTTMP/repo.git 429s - searching for changes 429s - no changes found 429s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 429s + abort: repository hgrepo not found 429s + [255] 429s + $ hg push --debug -R hgrepo | grep -e reference -e found 429s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 429s + abort: repository hgrepo not found 429s [1] 429s - $ hg push --debug -R hgrepo | grep -e reference -e found 429s - unchanged reference default::refs/heads/master => GIT:996e5084 429s - unchanged reference default::refs/tags/the_tag => GIT:e4338156 429s - no changes found 429s 429s Verify that we can push this tag, and that outgoing doesn't report 429s them (#358) 429s @@ -83,33 +83,5 @@ 429s To $TESTTMP/repo.git 429s - [deleted] the_tag 429s $ cd ../hgrepo 429s + $TESTTMP.sh: 72: cd: can't cd to ../hgrepo 429s $ hg outgoing 429s - comparing with $TESTTMP/repo.git 429s - searching for changes 429s - changeset: 2:7b35eb0afb3f 429s - tag: the_tag 429s - user: test 429s - date: Mon Jan 01 00:00:12 2007 +0000 429s - summary: add foo3 429s - 429s - $ hg push --debug 429s - pushing to $TESTTMP/repo.git 429s - finding unexported changesets 429s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 429s - searching for changes 429s - remote: counting objects: 5, done. 429s - 1 commits found 429s - list of commits: 429s - e12852326ef72772e9696b008ad6546b5266ff13 429s - adding objects 429s - remote: counting objects: 5, done. 429s - remote: found 0 deltas to reuse 429s - added 1 commits with 1 trees and 0 blobs 429s - unchanged reference default::refs/heads/master => GIT:996e5084 429s - adding reference default::refs/tags/the_tag => GIT:e4338156 429s - $ cd ../gitrepo 429s - $ git fetch 429s - From $TESTTMP/repo 429s - * [new tag] the_tag -> the_tag 429s - $ git tag -ln 429s - the_tag Tag message 429s 429s ERROR: test-orphan-tags.t output changed 432s ! 432s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-verify-fail.t 432s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-verify-fail.t.err 432s @@ -25,6 +25,7 @@ 432s $ cd .. 432s 432s $ hg init hgrepo 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s $ cd hgrepo 432s $ echo normalf > normalf 432s $ echo differentf2 > differentf 432s @@ -32,63 +33,93 @@ 432s $ echo exef > exef 432s $ ln -s foo linkf 432s $ hg add normalf differentf unexpectedf exef linkf 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s $ fn_hg_commit -m 'add files' 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s $ git clone --mirror ../gitrepo .hg/git 432s Cloning into bare repository '.hg/git'... 432s done. 432s $ echo "$(cd ../gitrepo && git rev-parse HEAD) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s $ hg gverify 432s - verifying rev 3f1601c3cf54 against git commit 039c1cd9fdda382c9d1e8ec85de6b5b59518ca80 432s - difference in: differentf 432s - file has different flags: exef (hg '', git 'x') 432s - file has different flags: linkf (hg 'l', git '') 432s - file found in git but not hg: missingf 432s - file found in hg but not git: unexpectedf 432s - [1] 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s + hg: unknown command 'gverify' 432s + (did you mean verify?) 432s + [10] 432s 432s $ echo newf > newf 432s $ hg add newf 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s $ fn_hg_commit -m 'new hg commit' 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s $ hg gverify 432s - abort: no git commit found for rev 4e582b4eb862 432s - (if this is an octopus merge, verify against the last rev) 432s - [255] 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s + hg: unknown command 'gverify' 432s + (did you mean verify?) 432s + [10] 432s 432s invalid git SHA 432s $ echo "ffffffffffffffffffffffffffffffffffffffff $(hg log -r . --template '{node}')" >> .hg/git-mapfile 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s $ hg gverify 432s - abort: git equivalent ffffffffffffffffffffffffffffffffffffffff for rev 4e582b4eb862 not found! 432s - [255] 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s + hg: unknown command 'gverify' 432s + (did you mean verify?) 432s + [10] 432s 432s git SHA is not a commit 432s $ echo new2 >> newf 432s $ fn_hg_commit -m 'new hg commit 2' 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s this gets the tree pointed to by the commit at HEAD 432s $ echo "$(cd ../gitrepo && git show --format=%T HEAD | head -n 1) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s $ hg gverify 432s - abort: git equivalent f477b00e4a9907617f346a529cc0fe9ba5d6f6d3 for rev 5c2eb98af3e2 is not a commit! 432s - [255] 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s + hg: unknown command 'gverify' 432s + (did you mean verify?) 432s + [10] 432s 432s corrupt git repository 432s 432s $ hg debug-remove-hggit-state 432s - clearing out the git cache data 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s + hg: unknown command 'debug-remove-hggit-state' 432s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 432s + [10] 432s $ hg gexport 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s + hg: unknown command 'gexport' 432s + (did you mean one of export, import?) 432s + [10] 432s $ mv .hg/git/objects/pack $TESTTMP/pack-old 432s $ for packfile in $TESTTMP/pack-old/*.pack 432s > do 432s > git --git-dir .hg/git unpack-objects < $packfile 432s > done 432s + $TESTTMP.sh: 78: cannot open $TESTTMP/pack-old/*.pack: No such file 432s + [2] 432s $ mv -f .hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 432s + mv: cannot stat '.hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e': No such file or directory 432s + [1] 432s $ hg gverify --fsck 432s - abort: git repository is corrupt! 432s - [255] 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s + hg: unknown command 'gverify' 432s + (did you mean verify?) 432s + [10] 432s $ hg gverify 432s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is not a commit! 432s - [255] 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s + hg: unknown command 'gverify' 432s + (did you mean verify?) 432s + [10] 432s $ chmod +w .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 432s + chmod: cannot access '.hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74': No such file or directory 432s + [1] 432s $ echo 42 > .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 432s + $TESTTMP.sh: 89: cannot create .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74: Directory nonexistent 432s + [2] 432s $ hg gverify 432s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is corrupt! 432s - (re-run with --traceback for details) 432s - [255] 432s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 432s + hg: unknown command 'gverify' 432s + (did you mean verify?) 432s + [10] 432s 432s ERROR: test-verify-fail.t output changed 433s ! 433s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-push-missing-commit.t 433s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-push-missing-commit.t.err 433s @@ -22,75 +22,9 @@ 433s clone it and create a commit building on the git history 433s 433s $ hg clone -U repo.git hgrepo 433s - importing 1 git commits 433s - new changesets fb68c5a534ce (1 drafts) 433s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 433s + abort: repository repo.git not found 433s + [255] 433s $ cd hgrepo 433s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 433s $ hg up -q master 433s - $ echo other > thefile 433s - $ fn_hg_commit -m 'change thefile' 433s - $ cd .. 433s - 433s -now remove the git commit from the cache repository used internally by 433s -hg-git — actually, changing `git.intree` is equivalent to this, and how 433s -a user noticed it in #376. 433s - 433s - $ rm -rf hgrepo/.hg/git 433s - 433s -what happens when we push it? 433s - 433s - $ hg -R hgrepo push 433s - pushing to $TESTTMP/repo.git 433s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 433s - abort: cannot push git commit 533d4e670a8b as it is not present locally 433s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 433s - [255] 433s - 433s -try to follow the hint: 433s - 433s -(and just to see that the warning is useful, try re-resetting first) 433s - 433s - $ rm -rf hgrepo/.hg/git hgrepo/.git 433s - $ hg -R hgrepo pull 433s - pulling from $TESTTMP/repo.git 433s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 433s - no changes found 433s - not updating diverged bookmark master 433s - $ hg -R hgrepo push 433s - pushing to $TESTTMP/repo.git 433s - searching for changes 433s - adding objects 433s - remote: found 0 deltas to reuse 433s - added 1 commits with 1 trees and 1 blobs 433s - updating reference refs/heads/master 433s - 433s -and as an extra test, what if we want to push a commit that's 433s -converted, but gone? 433s - 433s -simply pushing doesn't suffice: 433s - 433s - $ cd hgrepo 433s - $ rm -rf .hg/git 433s - $ hg push 433s - pushing to $TESTTMP/repo.git 433s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 433s - searching for changes 433s - no changes found 433s - [1] 433s - $ cd .. 433s - 433s -but we can't create another commit building on the git history, export 433s -it, and push: 433s - 433s - $ cd hgrepo 433s - $ echo not that > thefile 433s - $ fn_hg_commit -m 'change thefile again' 433s - $ hg gexport 433s - $ rm -rf .hg/git 433s - $ hg push 433s - pushing to $TESTTMP/repo.git 433s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 433s - searching for changes 433s - abort: cannot push git commit 61619410916a as it is not present locally 433s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 433s - [255] 433s - $ cd .. 433s 433s ERROR: test-push-missing-commit.t output changed 433s ! 433s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-hg-branch.t 433s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-hg-branch.t.err 433s @@ -12,82 +12,10 @@ 433s 433s $ cd .. 433s $ hg clone gitrepo hgrepo 433s - importing 1 git commits 433s - new changesets ff7a2f2d8d70 (1 drafts) 433s - updating to bookmark not-master 433s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 433s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 433s + abort: repository gitrepo not found 433s + [255] 433s 433s $ cd hgrepo 433s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 433s $ hg co master 433s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 433s - (activating bookmark master) 433s - $ hg mv alpha beta 433s - $ fn_hg_commit -m 'rename alpha to beta' 433s - $ hg push 433s - pushing to $TESTTMP/gitrepo 433s - searching for changes 433s - adding objects 433s - remote: found 0 deltas to reuse 433s - added 1 commits with 1 trees and 0 blobs 433s - updating reference refs/heads/master 433s - 433s - $ hg branch gamma | grep -v 'permanent and global' 433s - marked working directory as branch gamma 433s - $ fn_hg_commit -m 'started branch gamma' 433s - $ hg push 433s - pushing to $TESTTMP/gitrepo 433s - searching for changes 433s - adding objects 433s - remote: found 0 deltas to reuse 433s - added 1 commits with 1 trees and 0 blobs 433s - updating reference refs/heads/master 433s - 433s - $ hg log --graph 433s - @ changeset: 2:400db38f4f64 433s - | branch: gamma 433s - | bookmark: master 433s - | tag: default/master 433s - | tag: tip 433s - | user: test 433s - | date: Mon Jan 01 00:00:12 2007 +0000 433s - | summary: started branch gamma 433s - | 433s - o changeset: 1:3baa67317a4d 433s - | user: test 433s - | date: Mon Jan 01 00:00:11 2007 +0000 433s - | summary: rename alpha to beta 433s - | 433s - o changeset: 0:ff7a2f2d8d70 433s - bookmark: not-master 433s - tag: default/not-master 433s - user: test 433s - date: Mon Jan 01 00:00:10 2007 +0000 433s - summary: add alpha 433s - 433s - 433s - $ cd .. 433s - $ hg clone -U gitrepo hgrepo2 433s - importing 3 git commits 433s - new changesets ff7a2f2d8d70:400db38f4f64 (3 drafts) 433s - $ hg -R hgrepo2 log --graph 433s - o changeset: 2:400db38f4f64 433s - | branch: gamma 433s - | bookmark: master 433s - | tag: default/master 433s - | tag: tip 433s - | user: test 433s - | date: Mon Jan 01 00:00:12 2007 +0000 433s - | summary: started branch gamma 433s - | 433s - o changeset: 1:3baa67317a4d 433s - | user: test 433s - | date: Mon Jan 01 00:00:11 2007 +0000 433s - | summary: rename alpha to beta 433s - | 433s - o changeset: 0:ff7a2f2d8d70 433s - bookmark: not-master 433s - tag: default/not-master 433s - user: test 433s - date: Mon Jan 01 00:00:10 2007 +0000 433s - summary: add alpha 433s - 433s 433s ERROR: test-hg-branch.t output changed 434s ! 434s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-pull-after-strip.t 434s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-pull-after-strip.t.err 434s @@ -15,82 +15,9 @@ 434s 434s $ cd .. 434s $ hg clone -U gitrepo hgrepo 434s - importing 2 git commits 434s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 434s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 434s + abort: repository gitrepo not found 434s + [255] 434s $ cd hgrepo 434s + $TESTTMP.sh: 26: cd: can't cd to hgrepo 434s $ hg up master 434s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 434s - (activating bookmark master) 434s - $ hg log --graph 434s - @ changeset: 1:7fe02317c63d 434s - | bookmark: master 434s - | tag: default/master 434s - | tag: thetag 434s - | tag: tip 434s - | user: test 434s - | date: Mon Jan 01 00:00:11 2007 +0000 434s - | summary: add beta 434s - | 434s - o changeset: 0:ff7a2f2d8d70 434s - user: test 434s - date: Mon Jan 01 00:00:10 2007 +0000 434s - summary: add alpha 434s - 434s - $ cd ../gitrepo 434s - $ echo beta line 2 >> beta 434s - $ git add beta 434s - $ fn_git_commit -m 'add to beta' 434s - 434s - $ cd .. 434s - $ cd hgrepo 434s - $ hg debugstrip --no-backup tip 434s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 434s - $ hg pull 434s - pulling from $TESTTMP/gitrepo 434s - importing 1 git commits 434s - abort: you appear to have run strip - please run hg git-cleanup 434s - [255] 434s - $ hg tags 434s - tip 0:ff7a2f2d8d70 434s - $ hg git-cleanup 434s - git commit map cleaned 434s - 434s -pull works after 'hg git-cleanup' 434s - 434s - $ hg pull 434s - pulling from $TESTTMP/gitrepo 434s - importing 2 git commits 434s - updating bookmark master 434s - new changesets 7fe02317c63d:cc1e605d90db (2 drafts) 434s - (run 'hg update' to get a working copy) 434s - $ hg log --graph 434s - o changeset: 2:cc1e605d90db 434s - | bookmark: master 434s - | tag: default/master 434s - | tag: tip 434s - | user: test 434s - | date: Mon Jan 01 00:00:12 2007 +0000 434s - | summary: add to beta 434s - | 434s - o changeset: 1:7fe02317c63d 434s - | tag: thetag 434s - | user: test 434s - | date: Mon Jan 01 00:00:11 2007 +0000 434s - | summary: add beta 434s - | 434s - @ changeset: 0:ff7a2f2d8d70 434s - user: test 434s - date: Mon Jan 01 00:00:10 2007 +0000 434s - summary: add alpha 434s - 434s - 434s - $ cd .. 434s - 434s -Check that we also remove bad refs: 434s - 434s - $ cd hgrepo 434s - $ echo e93b671cb24bff41779187edff99178e2597c2 > .hg/git/refs/tags/bad-tag 434s - $ hg git-cleanup 434s - git commit map cleaned 434s - $ test -e .hg/git/refs/tags/bad-tag 434s - [1] 434s 434s ERROR: test-pull-after-strip.t output changed 434s ! 434s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-subrepos-syntax.t 434s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-subrepos-syntax.t.err 434s @@ -38,54 +38,9 @@ 434s $ cd .. 434s 434s $ hg clone -U repo.git hgrepo 434s - importing 3 git commits 434s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 434s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 434s + abort: repository repo.git not found 434s + [255] 434s $ cd hgrepo 434s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 434s $ hg up master 434s - Cloning into '$TESTTMP/hgrepo/subrepo1'... 434s - done. 434s - Cloning into '$TESTTMP/hgrepo/xyz/subrepo2'... 434s - done. 434s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 434s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 434s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 434s - (activating bookmark master) 434s - $ cat >> .hgsub < # this is a comment 434s - > [subpaths] 434s - > flaf = blyf 434s - > EOF 434s - $ fn_hg_commit -m 'add comment & subsection' 434s - $ hg push 434s - pushing to $TESTTMP/repo.git 434s - searching for changes 434s - adding objects 434s - remote: found 0 deltas to reuse 434s - added 1 commits with 1 trees and 0 blobs 434s - updating reference refs/heads/master 434s - $ cd .. 434s - 434s - $ cd gitrepo 434s - $ git pull --ff-only 434s - From $TESTTMP/repo 434s - 89c22d7..106b34e master -> origin/master 434s - Updating 89c22d7..106b34e 434s - Fast-forward 434s - $ cat .gitmodules 434s - [submodule "subrepo1"] 434s - path = subrepo1 434s - url = ../gitsubrepo 434s - [submodule "xyz/subrepo2"] 434s - path = xyz/subrepo2 434s - url = ../gitsubrepo 434s - $ cd .. 434s - 434s -We broke bidirectionality: 434s - 434s - $ hg clone -U repo.git hgrepo2 434s - importing 4 git commits 434s - new changesets e532b2bfda10:cbf584fe001b (4 drafts) 434s - $ hg id -r tip hgrepo 434s - c58a542b18bc default/master/tip master 434s - $ hg id -r tip hgrepo2 434s - cbf584fe001b default/master/tip master 434s 434s ERROR: test-subrepos-syntax.t output changed 435s ! 435s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-gitignore.t 435s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-gitignore.t.err 435s @@ -2,12 +2,14 @@ 435s $ . "$TESTDIR/testutil" 435s 435s $ hg init repo 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s $ cd repo 435s 435s Create a commit that we can export later on 435s 435s $ touch thefile 435s $ hg commit -A -m "initial commit" 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s adding thefile 435s 435s We should only read .gitignore files in a hg-git repo (i.e. one with .hg/git 435s @@ -18,6 +20,7 @@ 435s $ touch bar 435s $ echo 'foo*' > .gitignore 435s $ hg status 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s ? .gitignore 435s ? bar 435s ? foo 435s @@ -27,103 +30,140 @@ 435s it's gone: 435s 435s $ hg gexport 435s - $ hg status 435s - ? .gitignore 435s - ? bar 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s + hg: unknown command 'gexport' 435s + (did you mean one of export, import?) 435s + [10] 435s + $ hg status 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s + ? .gitignore 435s + ? bar 435s + ? foo 435s + ? foobar 435s 435s $ echo '*bar' > .gitignore 435s $ hg status 435s - ? .gitignore 435s - ? foo 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s + ? .gitignore 435s + ? bar 435s + ? foo 435s + ? foobar 435s 435s $ mkdir dir 435s $ touch dir/foo 435s $ echo 'foo' > .gitignore 435s $ hg status 435s - ? .gitignore 435s - ? bar 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s + ? .gitignore 435s + ? bar 435s + ? dir/foo 435s + ? foo 435s ? foobar 435s 435s $ echo '/foo' > .gitignore 435s $ hg status 435s - ? .gitignore 435s - ? bar 435s - ? dir/foo 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s + ? .gitignore 435s + ? bar 435s + ? dir/foo 435s + ? foo 435s ? foobar 435s 435s $ rm .gitignore 435s $ echo 'foo' > dir/.gitignore 435s $ hg status 435s - ? bar 435s - ? dir/.gitignore 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s + ? bar 435s + ? dir/.gitignore 435s + ? dir/foo 435s ? foo 435s ? foobar 435s 435s $ touch dir/bar 435s $ echo 'bar' > .gitignore 435s $ hg status 435s - ? .gitignore 435s - ? dir/.gitignore 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s + ? .gitignore 435s + ? bar 435s + ? dir/.gitignore 435s + ? dir/bar 435s + ? dir/foo 435s ? foo 435s ? foobar 435s 435s $ echo '/bar' > .gitignore 435s $ hg status 435s - ? .gitignore 435s - ? dir/.gitignore 435s - ? dir/bar 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s + ? .gitignore 435s + ? bar 435s + ? dir/.gitignore 435s + ? dir/bar 435s + ? dir/foo 435s ? foo 435s ? foobar 435s 435s $ echo 'foo*' > .gitignore 435s $ echo '!*bar' >> .gitignore 435s $ hg status 435s - .gitignore: unsupported ignore pattern '!*bar' 435s - ? .gitignore 435s - ? bar 435s - ? dir/.gitignore 435s - ? dir/bar 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s + ? .gitignore 435s + ? bar 435s + ? dir/.gitignore 435s + ? dir/bar 435s + ? dir/foo 435s + ? foo 435s + ? foobar 435s 435s $ echo '.hg/' > .gitignore 435s $ hg status 435s - ? .gitignore 435s - ? bar 435s - ? dir/.gitignore 435s - ? dir/bar 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s + ? .gitignore 435s + ? bar 435s + ? dir/.gitignore 435s + ? dir/bar 435s + ? dir/foo 435s ? foo 435s ? foobar 435s 435s $ echo 'dir/.hg/' > .gitignore 435s $ hg status 435s - ? .gitignore 435s - ? bar 435s - ? dir/.gitignore 435s - ? dir/bar 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s + ? .gitignore 435s + ? bar 435s + ? dir/.gitignore 435s + ? dir/bar 435s + ? dir/foo 435s ? foo 435s ? foobar 435s 435s $ echo '.hg/foo' > .gitignore 435s $ hg status 435s - ? .gitignore 435s - ? bar 435s - ? dir/.gitignore 435s - ? dir/bar 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s + ? .gitignore 435s + ? bar 435s + ? dir/.gitignore 435s + ? dir/bar 435s + ? dir/foo 435s ? foo 435s ? foobar 435s 435s $ touch foo.hg 435s $ echo 'foo.hg' > .gitignore 435s $ hg status 435s - ? .gitignore 435s - ? bar 435s - ? dir/.gitignore 435s - ? dir/bar 435s - ? foo 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s + ? .gitignore 435s + ? bar 435s + ? dir/.gitignore 435s + ? dir/bar 435s + ? dir/foo 435s + ? foo 435s + ? foo.hg 435s ? foobar 435s $ rm foo.hg 435s 435s $ touch .hgignore 435s $ hg status 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s ? .gitignore 435s ? .hgignore 435s ? bar 435s @@ -137,6 +177,7 @@ 435s $ echo 'foo.*$(?> .hgignore 435s $ echo 'dir/foo' >> .hgignore 435s $ hg status 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s ? .gitignore 435s ? .hgignore 435s ? bar 435s @@ -145,14 +186,18 @@ 435s ? foobar 435s 435s $ hg add .gitignore 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s $ hg commit -m "add and commit .gitignore" 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s $ rm .gitignore 435s $ rm .hgignore 435s $ hg status 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s ! .gitignore 435s ? bar 435s ? dir/.gitignore 435s ? dir/bar 435s + ? dir/foo 435s ? foo 435s ? foobar 435s 435s @@ -164,6 +209,7 @@ 435s > foo( 435s > EOF 435s $ hg status --config ui.ignore=$TESTTMP/invalidhgignore 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s abort: $TESTTMP/invalidhgignore: invalid pattern (relre): foo( 435s [255] 435s 435s @@ -172,5 +218,6 @@ 435s > foo( 435s > EOF 435s $ hg status 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s abort: $TESTTMP/repo/.hgignore: invalid pattern (relre): foo( 435s [255] 435s 435s ERROR: test-gitignore.t output changed 435s ! 435s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-merge.t 435s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-merge.t.err 435s @@ -30,60 +30,11 @@ 435s $ git init -q --bare repo.git 435s 435s $ hg clone gitrepo hgrepo 435s - importing 4 git commits 435s - new changesets ff7a2f2d8d70:89ca4a68d6b9 (4 drafts) 435s - updating to bookmark master 435s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 435s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 435s + abort: repository gitrepo not found 435s + [255] 435s $ cd hgrepo 435s + $TESTTMP.sh: 40: cd: can't cd to hgrepo 435s 435s clear the cache to be sure it is regenerated correctly 435s $ hg debug-remove-hggit-state 435s - clearing out the git cache data 435s - $ hg push ../repo.git 435s - pushing to ../repo.git 435s - searching for changes 435s - adding objects 435s - remote: found 0 deltas to reuse 435s - added 4 commits with 4 trees and 3 blobs 435s - adding reference refs/heads/beta 435s - adding reference refs/heads/master 435s - 435s - $ cd .. 435s -git log in repo pushed from hg 435s - $ git --git-dir=repo.git log --pretty=medium master | sed 's/\.\.\.//g' 435s - commit 5806851511aaf3bfe813ae3a86c5027165fa9b96 435s - Merge: e5023f9 9497a4e 435s - Author: test 435s - Date: Mon Jan 1 00:00:12 2007 +0000 435s - 435s - Merge branch 'beta' 435s - 435s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 435s - Author: test 435s - Date: Mon Jan 1 00:00:12 2007 +0000 435s - 435s - add gamma 435s - 435s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 435s - Author: test 435s - Date: Mon Jan 1 00:00:11 2007 +0000 435s - 435s - add beta 435s - 435s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 435s - Author: test 435s - Date: Mon Jan 1 00:00:10 2007 +0000 435s - 435s - add alpha 435s - $ git --git-dir=repo.git log --pretty=medium beta | sed 's/\.\.\.//g' 435s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 435s - Author: test 435s - Date: Mon Jan 1 00:00:11 2007 +0000 435s - 435s - add beta 435s - 435s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 435s - Author: test 435s - Date: Mon Jan 1 00:00:10 2007 +0000 435s - 435s - add alpha 435s 435s ERROR: test-merge.t output changed 436s ! 436s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-hg-tags.t 436s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-hg-tags.t.err 436s @@ -16,69 +16,10 @@ 436s 436s $ cd .. 436s $ hg clone -U repo.git hgrepo 436s - importing 1 git commits 436s - new changesets ff7a2f2d8d70 (1 drafts) 436s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 436s + abort: repository repo.git not found 436s + [255] 436s 436s $ cd hgrepo 436s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 436s $ hg co master 436s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 436s - (activating bookmark master) 436s - $ fn_hg_tag alpha 436s - $ hg push 436s - pushing to $TESTTMP/repo.git 436s - searching for changes 436s - adding objects 436s - remote: found 0 deltas to reuse 436s - added 1 commits with 1 trees and 1 blobs 436s - updating reference refs/heads/master 436s - adding reference refs/tags/alpha 436s - 436s - $ hg log --graph 436s - @ changeset: 1:e8b150f84560 436s - | bookmark: master 436s - | tag: default/master 436s - | tag: tip 436s - | user: test 436s - | date: Mon Jan 01 00:00:11 2007 +0000 436s - | summary: Added tag alpha for changeset ff7a2f2d8d70 436s - | 436s - o changeset: 0:ff7a2f2d8d70 436s - tag: alpha 436s - user: test 436s - date: Mon Jan 01 00:00:10 2007 +0000 436s - summary: add alpha 436s - 436s - 436s - $ cd .. 436s - $ cd gitrepo 436s -git should have the tag alpha 436s - $ git fetch origin 436s - From $TESTTMP/repo 436s - 7eeab2e..bbae830 master -> origin/master 436s - * [new tag] alpha -> alpha 436s - $ cd .. 436s - 436s - $ hg clone repo.git hgrepo2 436s - importing 2 git commits 436s - new changesets ff7a2f2d8d70:e8b150f84560 (2 drafts) 436s - updating to bookmark master 436s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 436s - $ hg -R hgrepo2 log --graph 436s - @ changeset: 1:e8b150f84560 436s - | bookmark: master 436s - | tag: default/master 436s - | tag: tip 436s - | user: test 436s - | date: Mon Jan 01 00:00:11 2007 +0000 436s - | summary: Added tag alpha for changeset ff7a2f2d8d70 436s - | 436s - o changeset: 0:ff7a2f2d8d70 436s - tag: alpha 436s - user: test 436s - date: Mon Jan 01 00:00:10 2007 +0000 436s - summary: add alpha 436s - 436s - 436s -the tag should be in .hgtags 436s - $ cat hgrepo2/.hgtags 436s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alpha 436s 436s ERROR: test-hg-tags.t output changed 436s ! 436s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-multiple-remotes.t 436s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-multiple-remotes.t.err 436s @@ -14,6 +14,7 @@ 436s $ git clone --bare --quiet gitrepo repo.git 436s 436s $ hg init hgrepo 436s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 436s $ cd hgrepo 436s $ cat > .hg/hgrc < [paths] 436s @@ -26,52 +27,28 @@ 436s > EOF 436s 436s $ hg pull 436s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 436s pulling from $TESTTMP/gitrepo 436s - importing 1 git commits 436s - adding bookmark master 436s - adding bookmark not-master 436s - new changesets ff7a2f2d8d70 (1 drafts) 436s - (run 'hg update' to get a working copy) 436s - pulling from $TESTTMP/repo.git 436s - no changes found 436s + abort: repository $TESTTMP/gitrepo not found 436s + [255] 436s $ hg tags 436s - tip 0:ff7a2f2d8d70 436s - git/not-master 0:ff7a2f2d8d70 436s - git/master 0:ff7a2f2d8d70 436s - bare/not-master 0:ff7a2f2d8d70 436s - bare/master 0:ff7a2f2d8d70 436s - also-git/not-master 0:ff7a2f2d8d70 436s - also-git/master 0:ff7a2f2d8d70 436s - also-bare/not-master 0:ff7a2f2d8d70 436s - also-bare/master 0:ff7a2f2d8d70 436s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 436s + tip -1:000000000000 436s 436s $ hg up master 436s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 436s - (activating bookmark master) 436s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 436s + abort: unknown revision 'master' 436s + [10] 436s $ echo beta > beta 436s $ fn_hg_commit -A -m "add beta" 436s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 436s $ hg push 436s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 436s pushing to $TESTTMP/gitrepo 436s - searching for changes 436s - adding objects 436s - remote: found 0 deltas to reuse 436s - added 1 commits with 1 trees and 1 blobs 436s - updating reference refs/heads/master 436s - pushing to $TESTTMP/repo.git 436s - searching for changes 436s - adding objects 436s - remote: found 0 deltas to reuse 436s - added 1 commits with 1 trees and 1 blobs 436s - updating reference refs/heads/master 436s + abort: repository $TESTTMP/gitrepo not found 436s + [255] 436s 436s $ hg tags 436s - tip 1:47580592d3d6 436s - git/master 1:47580592d3d6 436s - bare/master 1:47580592d3d6 436s - also-git/master 1:47580592d3d6 436s - also-bare/master 1:47580592d3d6 436s - git/not-master 0:ff7a2f2d8d70 436s - bare/not-master 0:ff7a2f2d8d70 436s - also-git/not-master 0:ff7a2f2d8d70 436s - also-bare/not-master 0:ff7a2f2d8d70 436s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 436s + tip 0:59e1f63242de 436s 436s 436s ERROR: test-multiple-remotes.t output changed 436s ! 436s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-hg-clone.t 436s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-hg-clone.t.err 436s @@ -11,88 +11,17 @@ 436s $ cd .. 436s 436s $ hg clone -U gitrepo hgrepo 436s - importing 1 git commits 436s - new changesets ff7a2f2d8d70 (1 drafts) 436s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 436s + abort: repository gitrepo not found 436s + [255] 436s 436s By default, the Git state isn't preserved across a copying/linking 436s clone 436s 436s $ hg clone -U hgrepo otherhgrepo 436s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 436s + abort: repository hgrepo not found 436s + [255] 436s $ cd otherhgrepo 436s + $TESTTMP.sh: 22: cd: can't cd to otherhgrepo 436s $ find .hg -name 'git*' | sort 436s - $ hg tags -v 436s - tip 0:ff7a2f2d8d70 436s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 436s - $ cd .. 436s - $ rm -r otherhgrepo 436s - 436s -Nor using a pull clone 436s - 436s - $ hg clone -U --pull hgrepo otherhgrepo 436s - requesting all changes 436s - adding changesets 436s - adding manifests 436s - adding file changes 436s - added 1 changesets with 1 changes to 1 files 436s - new changesets ff7a2f2d8d70 436s - $ cd otherhgrepo 436s - $ find .hg -name 'git*' | sort 436s - $ hg tags -v 436s - tip 0:ff7a2f2d8d70 436s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 436s - $ cd .. 436s - $ rm -r otherhgrepo 436s - 436s -But we can enable it! 436s - 436s - $ cat >> $HGRCPATH < [experimental] 436s - > hg-git-serve = yes 436s - > EOF 436s - 436s -Check transferring between Mercurial repositories using a 436s -copying/linking clone 436s - 436s - $ hg clone -U hgrepo otherhgrepo 436s - $ cd otherhgrepo 436s - $ find .hg -name 'git*' | sort 436s - $ hg tags -q 436s - tip 436s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 436s - $ cd .. 436s - 436s -Checking using a pull clone 436s - 436s - $ rm -rf otherhgrepo 436s - $ hg clone -U --pull hgrepo otherhgrepo 436s - requesting all changes 436s - adding changesets 436s - adding manifests 436s - adding file changes 436s - added 1 changesets with 1 changes to 1 files 436s - new changesets ff7a2f2d8d70 436s - $ cd otherhgrepo 436s - $ hg tags -q 436s - tip 436s - alpha 436s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 436s - 0:ff7a2f2d8d70 7eeab2ea75ec 436s - $ cd .. 436s - 436s -Can we repopulate the state from a Mercurial repository? 436s - 436s - $ cd otherhgrepo 436s - $ hg debug-remove-hggit-state 436s - clearing out the git cache data 436s - $ hg log -qr 'fromgit()' 436s - $ hg tags 436s - tip 0:ff7a2f2d8d70 436s - $ hg pull 436s - pulling from $TESTTMP/hgrepo 436s - searching for changes 436s - no changes found 436s - $ hg log -qr 'fromgit()' 436s - $ hg tags 436s - tip 0:ff7a2f2d8d70 436s - 436s -Sadly, no. 436s 436s ERROR: test-hg-clone.t output changed 437s ! 437s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-push-detached.t 437s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-push-detached.t.err 437s @@ -40,37 +40,9 @@ 437s in this case continues to work. 437s 437s $ hg clone gitrepo hgrepo 437s - importing 1 git commits 437s - new changesets ff7a2f2d8d70 (1 drafts) 437s - updating to bookmark master 437s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 437s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 437s + abort: repository gitrepo not found 437s + [255] 437s $ cd hgrepo 437s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 437s $ echo beta > beta 437s - $ hg add beta 437s - $ fn_hg_commit -m "add beta" 437s - 437s -Pushing that changeset, with phases, publishes the detached HEAD. 437s -Whether this should happen is debatable, but it's a side effect from 437s -the fact that pushing to the remote HEAD, with HEAD being the usual 437s -symref, should publish it. 437s - 437s - $ hg push -v --config hggit.usephases=yes 437s - pushing to $TESTTMP/gitrepo 437s - finding unexported changesets 437s - exporting 1 changesets 437s - converting revision 47580592d3d6492421a1e6cebc5c2d701a2e858b 437s - packing 3 loose objects... 437s - searching for changes 437s - remote: counting objects: 5, done. 437s - 1 commits found 437s - adding objects 437s - remote: counting objects: 5, done. 437s - remote: found 0 deltas to reuse 437s - added 1 commits with 1 trees and 1 blobs 437s - updating reference default::refs/heads/master => GIT:0f378ab6 437s - publishing remote HEAD 437s - $ hg phase 'all()' 437s - 0: public 437s - 1: draft 437s - $ cd .. 437s - 437s 437s ERROR: test-push-detached.t output changed 437s ! 437s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-serve-git.t 437s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-serve-git.t.err 437s @@ -33,28 +33,14 @@ 437s Make sure that clone over the old git protocol doesn't break 437s 437s $ hg clone -U git://localhost:$HGPORT/test copy 2>&1 437s - \r (no-eol) (esc) 437s - Counting objects 1/6 [=====> ]\r (no-eol) (esc) 437s - Counting objects 2/6 [===========> ]\r (no-eol) (esc) 437s - Counting objects 3/6 [=================> ]\r (no-eol) (esc) 437s - Counting objects 4/6 [=======================> ]\r (no-eol) (esc) 437s - Counting objects 5/6 [=============================> ]\r (no-eol) (esc) 437s - Counting objects 6/6 [===================================>]\r (no-eol) (esc) 437s - \r (no-eol) (esc) 437s - \r (no-eol) (esc) 437s - Compressing objects 1/3 [==========> ]\r (no-eol) (esc) 437s - Compressing objects 2/3 [=====================> ]\r (no-eol) (esc) 437s - Compressing objects 3/3 [================================>]\r (no-eol) (esc) 437s - \r (no-eol) (esc) 437s - \r (no-eol) (esc) 437s - importing commits 1/2 b23744d34f97 [======> ]\r (no-eol) (esc) 437s - importing commits 2/2 3af9773036a9 [=============>]\r (no-eol) (esc) 437s - \r (no-eol) (esc) 437s - importing 2 git commits 437s - new changesets c4d188f6e13d:221dd250e933 437s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 437s + abort: repository git://localhost:$HGPORT/test not found 437s + [255] 437s $ hg log -T 'HG:{node|short} GIT:{gitnode|short}\n' -R copy 437s - HG:221dd250e933 GIT:3af9773036a9 437s - HG:c4d188f6e13d GIT:b23744d34f97 437s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 437s + abort: repository copy not found 437s + [255] 437s $ hg tags -v -R copy 437s - tip 1:221dd250e933 437s - default/master 1:221dd250e933 git-remote 437s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 437s + abort: repository copy not found 437s + [255] 437s 437s ERROR: test-serve-git.t output changed 440s ! 440s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-convergedmerge.t 440s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-convergedmerge.t.err 440s @@ -2,29 +2,39 @@ 440s $ . "$TESTDIR/testutil" 440s 440s $ hg init hgrepo1 440s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 440s $ cd hgrepo1 440s $ echo A > afile 440s $ hg add afile 440s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 440s $ hg ci -m "origin" 440s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 440s 440s $ echo B > afile 440s $ hg ci -m "A->B" 440s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 440s 440s $ echo C > afile 440s $ hg ci -m "B->C" 440s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 440s 440s $ hg up -r0 440s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 440s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 440s $ echo C > afile 440s $ hg ci -m "A->C" 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s created new head 441s 441s $ hg merge -r2 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 441s (branch merge, don't forget to commit) 441s $ hg ci -m "merge" 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s 441s $ hg log --graph --style compact | sed 's/\[.*\]//g' 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s @ 4:3,2 eaa21d002113 1970-01-01 00:00 +0000 test 441s |\ merge 441s | | 441s @@ -47,36 +57,23 @@ 441s 441s $ cd hgrepo1 441s $ hg bookmark -r4 master 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s $ hg push -r master ../repo.git 441s - pushing to ../repo.git 441s - searching for changes 441s - adding objects 441s - remote: found 0 deltas to reuse 441s - added 5 commits with 3 trees and 3 blobs 441s - adding reference refs/heads/master 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s + abort: repository ../repo.git does not exist 441s + [255] 441s $ cd .. 441s 441s $ hg clone repo.git hgrepo2 441s - importing 5 git commits 441s - new changesets 5d1a6b64f9d0:eaa21d002113 (5 drafts) 441s - updating to bookmark master 441s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s + abort: repository repo.git not found 441s + [255] 441s expect the same revision ids as above 441s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 441s - @ 4:1,3 eaa21d002113 1970-01-01 00:00 +0000 test 441s - |\ merge 441s - | | 441s - | o 3 0dbe4ac1a758 1970-01-01 00:00 +0000 test 441s - | | B->C 441s - | | 441s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 441s - | | A->B 441s - | | 441s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 441s - |/ A->C 441s - | 441s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 441s - origin 441s - 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s + abort: repository hgrepo2 not found 441s $ hg -R hgrepo2 gverify 441s - verifying rev eaa21d002113 against git commit fb8c9e2afe5418cfff337eeed79fad5dd58826f0 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s + hg: unknown command 'gverify' 441s + (did you mean verify?) 441s + [10] 441s 441s ERROR: test-convergedmerge.t output changed 441s ! 441s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-conflict-2.t 441s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-conflict-2.t.err 441s @@ -2,30 +2,40 @@ 441s $ . "$TESTDIR/testutil" 441s 441s $ hg init hgrepo1 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s $ cd hgrepo1 441s $ echo A > afile 441s $ hg add afile 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s $ hg ci -m "origin" 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s 441s $ echo B > afile 441s $ hg ci -m "A->B" 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s 441s $ hg up -r0 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 441s $ echo C > afile 441s $ hg ci -m "A->C" 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s created new head 441s 441s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s warning: conflicts.* (re) 441s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 441s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 441s resolve using second parent 441s $ echo B > afile 441s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s $ hg ci -m "merge to B" 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s 441s $ hg log --graph --style compact | sed 's/\[.*\]//g' 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s @ 3:2,1 120385945d08 1970-01-01 00:00 +0000 test 441s |\ merge to B 441s | | 441s @@ -45,31 +55,18 @@ 441s 441s $ cd hgrepo1 441s $ hg bookmark -r tip master 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s $ hg push -r master ../repo.git 441s - pushing to ../repo.git 441s - searching for changes 441s - adding objects 441s - remote: found 0 deltas to reuse 441s - added 4 commits with 3 trees and 3 blobs 441s - adding reference refs/heads/master 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s + abort: repository ../repo.git does not exist 441s + [255] 441s $ cd .. 441s 441s $ hg clone repo.git hgrepo2 441s - importing 4 git commits 441s - new changesets 5d1a6b64f9d0:120385945d08 (4 drafts) 441s - updating to bookmark master 441s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s + abort: repository repo.git not found 441s + [255] 441s expect the same revision ids as above 441s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 441s - @ 3:1,2 120385945d08 1970-01-01 00:00 +0000 test 441s - |\ merge to B 441s - | | 441s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 441s - | | A->B 441s - | | 441s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 441s - |/ A->C 441s - | 441s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 441s - origin 441s - 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s + abort: repository hgrepo2 not found 441s 441s ERROR: test-conflict-2.t output changed 441s ! 441s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-phases-draft.t 441s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-phases-draft.t.err 441s @@ -12,73 +12,10 @@ 441s cloning without hggit.usephases does not publish local changesets 441s $ cd .. 441s $ hg clone gitrepo hgrepo | grep -v '^updating' 441s - importing 1 git commits 441s - new changesets ff7a2f2d8d70 (1 drafts) 441s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 441s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 441s + abort: repository gitrepo not found 441s + [1] 441s 441s $ cd hgrepo 441s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 441s $ hg phase -r master 441s - 0: draft 441s - 441s -pulling advances the draft phase, though 441s - 441s - $ hg phase -fs 0 441s - $ hg pull 441s - pulling from $TESTTMP/gitrepo 441s - no changes found 441s - $ hg phase tip 441s - 0: draft 441s - 441s -even if we don't have a name? 441s - 441s - $ hg phase -fs 0 441s - $ mv .hg/hgrc .hg/hgrc.bak 441s - $ hg pull ../gitrepo 441s - pulling from ../gitrepo 441s - no changes found 441s - $ hg phase tip 441s - 0: draft 441s - $ mv .hg/hgrc.bak .hg/hgrc 441s - $ cd .. 441s - 441s - 441s -pulling without hggit.usephases does not publish local changesets 441s - $ cd gitrepo 441s - $ git checkout -q master 441s - $ echo beta > beta 441s - $ git add beta 441s - $ fn_git_commit -m 'add beta' 441s - $ cd .. 441s - 441s - $ cd hgrepo 441s - $ hg pull 441s - pulling from $TESTTMP/gitrepo 441s - importing 1 git commits 441s - updating bookmark master 441s - new changesets 7fe02317c63d (1 drafts) 441s - (run 'hg update' to get a working copy) 441s - $ hg phase -r master 441s - 1: draft 441s - 441s -pulling with git.public does not publish local changesets 441s - $ hg --config git.public=master pull 441s - pulling from $TESTTMP/gitrepo 441s - no changes found 441s - $ hg phase -r master 441s - 1: draft 441s - 441s -pushing without hggit.usephases does not publish local changesets 441s - $ hg update master 441s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 441s - $ echo gamma > gamma 441s - $ hg add gamma 441s - $ hg commit -m 'gamma' 441s - $ hg push 441s - pushing to $TESTTMP/gitrepo 441s - searching for changes 441s - adding objects 441s - remote: found 0 deltas to reuse 441s - added 1 commits with 1 trees and 1 blobs 441s - updating reference refs/heads/master 441s - $ hg phase -r master 441s - 2: draft 441s 441s ERROR: test-phases-draft.t output changed 443s ! 443s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-subrepos-push.t 443s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-subrepos-push.t.err 443s @@ -5,10 +5,13 @@ 443s Initialized empty Git repository in $TESTTMP/repo.git/ 443s 443s $ hg init hgsubrepo 443s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 443s $ cd hgsubrepo 443s $ echo thefile > thefile 443s $ hg add thefile 443s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 443s $ fn_hg_commit -m 'add thefile' 443s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 443s $ cd .. 443s 443s $ git init gitsubrepo 443s @@ -20,59 +23,9 @@ 443s $ cd .. 443s 443s $ hg clone repo.git hgrepo 443s - updating to branch default 443s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 443s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 443s + abort: repository repo.git not found 443s + [255] 443s $ cd hgrepo 443s + $TESTTMP.sh: 32: cd: can't cd to hgrepo 443s $ hg book master 443s - $ echo alpha > alpha 443s - $ hg add alpha 443s - $ fn_hg_commit -m 'add alpha' 443s - $ touch .hgsub 443s - $ hg add .hgsub 443s - $ fn_hg_commit -m "add .hgsub" 443s - $ hg clone -q ../hgsubrepo hg 443s - $ echo "hg = ../hgsubrepo" >> .hgsub 443s - $ fn_hg_commit -m 'add hg subrepo' 443s - $ git clone --quiet ../gitsubrepo git 443s - $ echo "git = [git]../gitsubrepo" >> .hgsub 443s - $ fn_hg_commit -m 'add git subrepo' 443s - $ hg push 443s - pushing to $TESTTMP/repo.git 443s - pushing subrepo hg to $TESTTMP/hgsubrepo 443s - searching for changes 443s - no changes found 443s - searching for changes 443s - adding objects 443s - remote: found 0 deltas to reuse 443s - added 4 commits with 2 trees and 2 blobs 443s - adding reference refs/heads/master 443s - $ cat .hgsub 443s - hg = ../hgsubrepo 443s - git = [git]../gitsubrepo 443s - $ cat .hgsubstate 443s - aaae5224095dca7403147c0e20cbac1f450b0e95 git 443s - df643c539c7541d48eacc76745581e00cbaf3d45 hg 443s - $ cd .. 443s - 443s -Now clone it. Note that no Mercurial state persists: 443s - 443s - $ git clone --recurse-submodules repo.git gitrepo 443s - Cloning into 'gitrepo'... 443s - done. 443s - Submodule 'git' ($TESTTMP/gitsubrepo) registered for path 'git' 443s - Cloning into '$TESTTMP/gitrepo/git'... 443s - done. 443s - Submodule path 'git': checked out 'aaae5224095dca7403147c0e20cbac1f450b0e95' 443s - $ cd gitrepo 443s - $ ls -A 443s - .git 443s - .gitmodules 443s - alpha 443s - git 443s - $ cat .gitmodules 443s - [submodule "git"] 443s - path = git 443s - url = ../gitsubrepo 443s - $ ls -A git 443s - .git 443s - thefile 443s 443s ERROR: test-subrepos-push.t output changed 444s ! 444s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-conflict-1.t 444s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-conflict-1.t.err 444s @@ -2,30 +2,40 @@ 444s $ . "$TESTDIR/testutil" 444s 444s $ hg init hgrepo1 444s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 444s $ cd hgrepo1 444s $ echo A > afile 444s $ hg add afile 444s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 444s $ hg ci -m "origin" 444s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 444s 444s $ echo B > afile 444s $ hg ci -m "A->B" 444s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 444s 444s $ hg up -r0 444s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 444s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 444s $ echo C > afile 444s $ hg ci -m "A->C" 444s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 444s created new head 444s 444s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 444s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 444s warning: conflicts.* (re) 444s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 444s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 444s resolve using first parent 444s $ echo C > afile 444s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 444s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 444s $ hg ci -m "merge to C" 444s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 444s 444s $ hg log --graph --style compact | sed 's/\[.*\]//g' 444s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 444s @ 3:2,1 6c53bc0f062f 1970-01-01 00:00 +0000 test 444s |\ merge to C 444s | | 444s @@ -45,31 +55,18 @@ 444s 444s $ cd hgrepo1 444s $ hg bookmark -r tip master 444s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 444s $ hg push -r master ../repo.git 444s - pushing to ../repo.git 444s - searching for changes 444s - adding objects 444s - remote: found 0 deltas to reuse 444s - added 4 commits with 3 trees and 3 blobs 444s - adding reference refs/heads/master 444s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 444s + abort: repository ../repo.git does not exist 444s + [255] 444s $ cd .. 444s 444s $ hg clone repo.git hgrepo2 444s - importing 4 git commits 444s - new changesets 5d1a6b64f9d0:6c53bc0f062f (4 drafts) 444s - updating to bookmark master 444s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 444s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 444s + abort: repository repo.git not found 444s + [255] 444s expect the same revision ids as above 444s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 444s - @ 3:1,2 6c53bc0f062f 1970-01-01 00:00 +0000 test 444s - |\ merge to C 444s - | | 444s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 444s - | | A->B 444s - | | 444s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 444s - |/ A->C 444s - | 444s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 444s - origin 444s - 444s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 444s + abort: repository hgrepo2 not found 444s 444s ERROR: test-conflict-1.t output changed 444s ! 444s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-pull-after-obsolete.t 444s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-pull-after-obsolete.t.err 444s @@ -20,52 +20,9 @@ 444s 444s $ cd .. 444s $ hg clone -U gitrepo hgrepo 444s - importing 2 git commits 444s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 444s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 444s + abort: repository gitrepo not found 444s + [255] 444s $ cd hgrepo 444s + $TESTTMP.sh: 31: cd: can't cd to hgrepo 444s $ hg up master 444s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 444s - (activating bookmark master) 444s - $ hg log --graph 444s - @ changeset: 1:7fe02317c63d 444s - | bookmark: master 444s - | tag: default/master 444s - | tag: thetag 444s - | tag: tip 444s - | user: test 444s - | date: Mon Jan 01 00:00:11 2007 +0000 444s - | summary: add beta 444s - | 444s - o changeset: 0:ff7a2f2d8d70 444s - user: test 444s - date: Mon Jan 01 00:00:10 2007 +0000 444s - summary: add alpha 444s - 444s - $ cd ../gitrepo 444s - $ echo beta line 2 >> beta 444s - $ git add beta 444s - $ fn_git_commit -m 'add to beta' 444s - 444s -Create a commit, obsolete it, and pull, to ensure that we can pull if 444s -the tipmost commit is hidden. 444s - 444s - $ cd ../hgrepo 444s - $ hg bookmark --inactive 444s - $ echo gamma > gamma 444s - $ hg add gamma 444s - $ fn_hg_commit -m 'add gamma' 444s - $ hg up master 444s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 444s - (activating bookmark master) 444s - $ hg log -T '{rev}:{node} {desc}\n' -r tip 444s - 2:4090a1266584bc1a47ce562e9349b1e0f1b44611 add gamma 444s - $ hg debugobsolete 4090a1266584bc1a47ce562e9349b1e0f1b44611 444s - 1 new obsolescence markers 444s - obsoleted 1 changesets 444s - 444s - $ hg pull 444s - pulling from $TESTTMP/gitrepo 444s - importing 1 git commits 444s - updating bookmark master 444s - new changesets cc1e605d90db (1 drafts) 444s - (run 'hg update' to get a working copy) 444s 444s ERROR: test-pull-after-obsolete.t output changed 445s ! 445s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-git-clone.t 445s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-git-clone.t.err 445s @@ -14,30 +14,24 @@ 445s $ cd .. 445s 445s $ hg clone gitrepo hgrepo 445s - importing 2 git commits 445s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 445s - updating to bookmark master 445s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 445s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 445s + abort: repository gitrepo not found 445s + [255] 445s $ hg -R hgrepo log --graph 445s - @ changeset: 1:7fe02317c63d 445s - | bookmark: master 445s - | tag: default/master 445s - | tag: tip 445s - | user: test 445s - | date: Mon Jan 01 00:00:11 2007 +0000 445s - | summary: add beta 445s - | 445s - o changeset: 0:ff7a2f2d8d70 445s - user: test 445s - date: Mon Jan 01 00:00:10 2007 +0000 445s - summary: add alpha 445s - 445s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 445s + abort: repository hgrepo not found 445s + [255] 445s 445s we should have some bookmarks 445s $ hg -R hgrepo book 445s - * master 1:7fe02317c63d 445s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 445s + abort: repository hgrepo not found 445s + [255] 445s $ hg -R hgrepo gverify 445s - verifying rev 7fe02317c63d against git commit 9497a4ee62e16ee641860d7677cdb2589ea15554 445s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 445s + hg: unknown command 'gverify' 445s + (did you mean verify?) 445s + [10] 445s 445s test for ssh vulnerability 445s 445s @@ -47,16 +41,18 @@ 445s > EOF 445s 445s $ hg clone -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 445s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 445s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 445s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 445s [255] 445s $ hg clone -q 'git+ssh://%2DoProxyCommand=rm${IFS}nonexistent/path' 445s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 445s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 445s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 445s [255] 445s $ hg clone -q 'git+ssh://fakehost|rm${IFS}nonexistent/path' 445s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 445s - abort: git remote error: The remote server unexpectedly closed the connection. 445s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 445s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 445s [255] 445s $ hg clone -q 'git+ssh://fakehost%7Crm${IFS}nonexistent/path' 445s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 445s - abort: git remote error: The remote server unexpectedly closed the connection. 445s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 445s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 445s [255] 445s 445s ERROR: test-git-clone.t output changed 446s ! 446s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-git-gpg.t 446s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-git-gpg.t.err 446s @@ -55,23 +55,10 @@ 446s Hg clone it 446s 446s $ hg clone gitrepo hgrepo 446s - importing 2 git commits 446s - new changesets ab60c5e55bd6:[0-9a-f]{12,12} \(2 drafts\) (re) 446s - updating to bookmark signed 446s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 446s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 446s + abort: repository gitrepo not found 446s + [255] 446s 446s $ cd hgrepo 446s + $TESTTMP.sh: 46: cd: can't cd to hgrepo 446s $ hg push ../gitrepo2 -B signed 446s - pushing to ../gitrepo2 446s - searching for changes 446s - adding objects 446s - remote: found 0 deltas to reuse 446s - added 1 commits with 1 trees and 0 blobs 446s - adding reference refs/heads/signed 446s - $ cd .. 446s - 446s -Verify the commit 446s - 446s - $ cd gitrepo2 446s - $ git show --show-signature signed | grep "Good signature from" 446s - gpg: Good signature from "hgtest" [ultimate] 446s 446s ERROR: test-git-gpg.t output changed 446s ! 446s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-push-phases.t 446s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-push-phases.t.err 446s @@ -9,68 +9,13 @@ 446s $ git init -q --bare repo.git 446s 446s $ hg clone repo.git hgrepo 446s - updating to branch default 446s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 446s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 446s + abort: repository repo.git not found 446s + [255] 446s 446s $ cd hgrepo 446s + $TESTTMP.sh: 13: cd: can't cd to hgrepo 446s 446s Create two commits, one secret: 446s 446s $ touch alpha 446s - $ hg add alpha 446s - $ fn_hg_commit -m alpha 446s - $ hg book -r . master 446s - $ touch beta 446s - $ hg add beta 446s - $ fn_hg_commit --secret -m beta 446s - $ hg book -r . secret 446s - $ hg push 446s - pushing to $TESTTMP/repo.git 446s - warning: not exporting secret bookmark 'secret' 446s - searching for changes 446s - adding objects 446s - remote: found 0 deltas to reuse 446s - added 1 commits with 1 trees and 1 blobs 446s - adding reference refs/heads/master 446s - $ cd .. 446s - $ hg -R hgrepo log --graph --template phases 446s - @ changeset: 1:62966756ea96 446s - | bookmark: secret 446s - | tag: tip 446s - | phase: secret 446s - | user: test 446s - | date: Mon Jan 01 00:00:11 2007 +0000 446s - | summary: beta 446s - | 446s - o changeset: 0:d4b83afc35d1 446s - bookmark: master 446s - tag: default/master 446s - phase: public 446s - user: test 446s - date: Mon Jan 01 00:00:10 2007 +0000 446s - summary: alpha 446s - 446s - 446s -What happens when we push the secret? 446s - 446s - $ hg -R hgrepo push -B secret 446s - pushing to $TESTTMP/repo.git 446s - warning: not exporting secret bookmark 'secret' 446s - searching for changes 446s - abort: revision 62966756ea96 cannot be pushed since it doesn't have a bookmark 446s - [255] 446s - 446s -Only one changeset was pushed: 446s - 446s - $ GIT_DIR=repo.git git log --graph --all --decorate=short 446s - * commit 2cc4e3d19551e459a0dd606f4cf890de571c7d33 (HEAD -> master) 446s - Author: test 446s - Date: Mon Jan 1 00:00:10 2007 +0000 446s - 446s - alpha 446s - 446s -And this published the remote head: 446s - 446s - $ hg -R hgrepo phase 'all()' 446s - 0: public 446s - 1: secret 446s 446s ERROR: test-push-phases.t output changed 447s ! 447s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-keywords.t 447s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-keywords.t.err 447s @@ -21,29 +21,9 @@ 447s $ cd .. 447s 447s $ hg clone gitrepo hgrepo 447s - importing 3 git commits 447s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 447s - updating to bookmark master 447s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 447s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 447s + abort: repository gitrepo not found 447s + [255] 447s $ cd hgrepo 447s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 447s $ echo gamma > gamma 447s - $ hg add gamma 447s - $ hg commit -m 'add gamma' 447s - 447s - $ hg log --template "{rev} {node} {node|short} {gitnode} {gitnode|short}\n" 447s - 3 965bf7d08d3ac847dd8eb9e72ee0bf547d1a65d9 965bf7d08d3a 447s - 2 8e3f0ecc9aefd4ea2fdf8e2d5299cac548762a1c 8e3f0ecc9aef 7e2a5465ff4e3b992c429bb87a392620a0ac97b7 7e2a5465ff4e 447s - 1 7fe02317c63d9ee324d4b5df7c9296085162da1b 7fe02317c63d 9497a4ee62e16ee641860d7677cdb2589ea15554 9497a4ee62e1 447s - 0 ff7a2f2d8d7099694ae1e8b03838d40575bebb63 ff7a2f2d8d70 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 7eeab2ea75ec 447s - $ hg log --template "fromgit {rev}\n" --rev "fromgit()" 447s - fromgit 0 447s - fromgit 1 447s - fromgit 2 447s - $ hg log --template "gitnode_existsA {rev}\n" --rev "gitnode(9497a4ee62e16ee641860d7677cdb2589ea15554)" 447s - gitnode_existsA 1 447s - $ hg log --template "gitnode_existsB {rev}\n" --rev "gitnode(7eeab)" 447s - gitnode_existsB 0 447s - $ hg log --rev "gitnode(7e)" 447s - abort: git-mapfile@7e: ambiguous identifier!? (re) 447s - [50] 447s - $ hg log --template "gitnode_notexists {rev}\n" --rev "gitnode(1234567890ab)" 447s 447s ERROR: test-keywords.t output changed 447s ! 447s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-subrepos-delete.t 447s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-subrepos-delete.t.err 447s @@ -52,22 +52,9 @@ 447s And there should be nothing in Mercurial either: 447s 447s $ hg clone -U repo.git hgrepo 447s - importing 3 git commits 447s - new changesets e532b2bfda10:cc611d35fb62 (3 drafts) 447s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 447s + abort: repository repo.git not found 447s + [255] 447s $ cd hgrepo 447s + $TESTTMP.sh: 50: cd: can't cd to hgrepo 447s $ hg log --graph --template info 447s - o 447s - | commit: 2:cc611d35fb62 delete subrepo 447s - | added: 447s - | removed: .hgsub .hgsubstate 447s - o 447s - | commit: 1:8d549bcc5179 add subrepo 447s - | added: .hgsub .hgsubstate 447s - | removed: 447s - o 447s - commit: 0:e532b2bfda10 add alpha 447s - added: alpha 447s - removed: 447s - $ hg manifest -r tip 447s - alpha 447s - $ cd .. 447s 447s ERROR: test-subrepos-delete.t output changed 448s ! 448s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-tree-decomposition.t 448s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-tree-decomposition.t.err 448s @@ -24,45 +24,9 @@ 448s $ git init -q --bare repo.git 448s 448s $ hg clone gitrepo hgrepo 448s - importing 3 git commits 448s - new changesets d4d3d2417141:541f27994b81 (3 drafts) 448s - updating to bookmark master 448s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 448s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 448s + abort: repository gitrepo not found 448s + [255] 448s $ cd hgrepo 448s + $TESTTMP.sh: 38: cd: can't cd to hgrepo 448s $ hg log --template 'adds: {file_adds}\ndels: {file_dels}\n' 448s - adds: d1 448s - dels: d1/f1 448s - adds: d2/f2 448s - dels: d1/f2 448s - adds: d1/f1 d1/f2 448s - dels: 448s - 448s - $ hg debug-remove-hggit-state 448s - clearing out the git cache data 448s - $ hg push ../repo.git 448s - pushing to ../repo.git 448s - searching for changes 448s - adding objects 448s - remote: found 0 deltas to reuse 448s - added 3 commits with 6 trees and 3 blobs 448s - adding reference refs/heads/master 448s - $ cd .. 448s - 448s - $ git --git-dir=repo.git log --pretty=medium 448s - commit 6e0dbd8cd92ed4823c69cb48d8a2b81f904e6e69 448s - Author: test 448s - Date: Mon Jan 1 00:00:12 2007 +0000 448s - 448s - replace a dir with a file 448s - 448s - commit a1874d5cd0b1549ed729e36f0da4a93ed36259ee 448s - Author: test 448s - Date: Mon Jan 1 00:00:11 2007 +0000 448s - 448s - rename 448s - 448s - commit 102c17a5deda49db3f10ec5573f9378867098b7c 448s - Author: test 448s - Date: Mon Jan 1 00:00:10 2007 +0000 448s - 448s - initial 448s 448s ERROR: test-tree-decomposition.t output changed 448s ! 448s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-subrepos-drop.t 448s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-subrepos-drop.t.err 448s @@ -17,52 +17,9 @@ 448s Create a Mercurial repository with a .gitmodules file: 448s 448s $ hg clone repo.git hgrepo 448s - updating to branch default 448s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 448s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 448s + abort: repository repo.git not found 448s + [255] 448s $ cd hgrepo 448s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 448s $ hg book master 448s - $ touch this 448s - $ fn_hg_commit -A -m 'add this' 448s - $ cat > .gitmodules < [submodule "subrepo"] 448s - > path = subrepo 448s - > url = ../gitsubrepo 448s - > EOF 448s - $ hg add .gitmodules 448s - $ fn_hg_commit -m "add .gitmodules file" 448s - $ cd .. 448s - 448s -What happens if we push that to Git? 448s - 448s - $ hg -R hgrepo push 448s - pushing to $TESTTMP/repo.git 448s - warning: ignoring modifications to '.gitmodules' file; please use '.hgsub' instead 448s - searching for changes 448s - adding objects 448s - remote: found 0 deltas to reuse 448s - added 2 commits with 1 trees and 1 blobs 448s - adding reference refs/heads/master 448s - 448s -But we don't get a warning if we don't touch .gitmodules: 448s - 448s - $ cd hgrepo 448s - $ touch that 448s - $ fn_hg_commit -A -m 'add that' 448s - $ hg push 448s - pushing to $TESTTMP/repo.git 448s - searching for changes 448s - adding objects 448s - remote: found 0 deltas to reuse 448s - added 1 commits with 1 trees and 0 blobs 448s - updating reference refs/heads/master 448s - $ cd .. 448s - 448s -Check that it didn't silenty come through, or something: 448s - 448s - $ git clone repo.git gitrepo 448s - Cloning into 'gitrepo'... 448s - done. 448s - $ ls -A gitrepo 448s - .git 448s - that 448s - this 448s 448s ERROR: test-subrepos-drop.t output changed 449s ! 449s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-annotate.t 449s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-annotate.t.err 449s @@ -10,6 +10,7 @@ 449s init 449s 449s $ hg init repo 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s $ cd repo 449s 449s commit 449s @@ -19,37 +20,48 @@ 449s > a 449s > EOF 449s $ hg add a 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s $ fn_hg_commit -m 1 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s $ cat < a 449s > a 449s > a 449s > a 449s > EOF 449s $ fn_hg_commit -m 2 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s $ cat < a 449s > a 449s > b 449s > a 449s > EOF 449s $ fn_hg_commit -m 3 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s 449s annotate multiple files 449s 449s $ hg annotate a 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s 0: a 449s 2: b 449s 1: a 449s 449s $ hg annotate --skip 1 a 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s 0: a 449s 2: b 449s 0* a 449s 449s $ hg gexport 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s + hg: unknown command 'gexport' 449s + (did you mean one of export, import?) 449s + [10] 449s $ hg log -T '{rev}:{node} {gitnode}\n' 449s - 2:beb139b96eec386addc02d48db524b7646ef1605 19388575d02e71e917e7013aa854d4a21c509819 449s - 1:a9a255d66663f9216bdcf8dda69211d7280f7278 debec50a14cc4830584dd4fa1507c51cce1c098f 449s - 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 88f28c06a1ede9a70852ab1bf9818150fabaaaa9 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s + 2:beb139b96eec386addc02d48db524b7646ef1605 449s + 1:a9a255d66663f9216bdcf8dda69211d7280f7278 449s + 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 449s 449s $ cat < .git-blame-ignore-revs 449s > # this is a comment, and the next line should be ignored 449s @@ -59,39 +71,43 @@ 449s > EOF 449s 449s $ hg annotate a 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s 0: a 449s 2: b 449s 1: a 449s $ hg annotate a \ 449s > --debug \ 449s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 449s - skipping debec50a14cc -> a9a255d66663 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s 0: a 449s 2: b 449s - 0* a 449s + 1: a 449s $ hg add .git-blame-ignore-revs 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s $ hg annotate a \ 449s > --debug \ 449s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 449s - skipping debec50a14cc -> a9a255d66663 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s 0: a 449s 2: b 449s - 0* a 449s + 1: a 449s $ hg annotate a \ 449s > --config git.blame.ignoreRevsFile=badfile 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s 0: a 449s 2: b 449s 1: a 449s $ hg annotate -T'{lines % "{rev}:{node|short} {gitnode|short}: {line}"}' a 449s - 0:8d4731bd0f4a 88f28c06a1ed: a 449s - 2:beb139b96eec 19388575d02e: b 449s - 1:a9a255d66663 debec50a14cc: a 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s + 0:8d4731bd0f4a : a 449s + 2:beb139b96eec : b 449s + 1:a9a255d66663 : a 449s 449s $ cd .. 449s $ hg -R repo annotate repo/a \ 449s > --debug \ 449s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 449s - skipping debec50a14cc -> a9a255d66663 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s 0: a 449s 2: b 449s - 0* a 449s + 1: a 449s 449s ERROR: test-annotate.t output changed 449s ! 449s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-push-anonymous.t 449s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-push-anonymous.t.err 449s @@ -25,28 +25,9 @@ 449s Clone it, deactivate the bookmark, add a commit, and push! 449s 449s $ hg clone -U gitrepo hgrepo 449s - importing 1 git commits 449s - new changesets ff7a2f2d8d70 (1 drafts) 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s + abort: repository gitrepo not found 449s + [255] 449s $ cd hgrepo 449s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 449s $ hg up tip 449s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 449s - $ echo beta > beta 449s - $ hg add beta 449s - $ fn_hg_commit -m "add beta" 449s - 449s -Pushing that changeset should print a helpful message: 449s - 449s - $ hg push 449s - pushing to $TESTTMP/gitrepo 449s - searching for changes 449s - no changes found (ignoring 1 changesets without bookmarks or tags) 449s - [1] 449s - 449s -But what about untagged, but secret changesets? 449s - 449s - $ hg phase -fs tip 449s - $ hg push 449s - pushing to $TESTTMP/gitrepo 449s - searching for changes 449s - no changes found 449s - [1] 449s 449s ERROR: test-push-anonymous.t output changed 449s ! 449s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-empty-working-tree.t 449s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-empty-working-tree.t.err 449s @@ -10,29 +10,9 @@ 449s $ git init -q --bare repo.git 449s 449s $ hg clone gitrepo hgrepo 449s - importing 1 git commits 449s - new changesets 01708ca54a8f (1 drafts) 449s - updating to bookmark master 449s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 449s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 449s + abort: repository gitrepo not found 449s + [255] 449s $ cd hgrepo 449s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 449s $ hg log -r tip --template 'files: {files}\n' 449s - files: 449s - $ hg gverify 449s - verifying rev 01708ca54a8f against git commit 678256865a8c85ae925bf834369264193c88f8de 449s - 449s - $ hg debug-remove-hggit-state 449s - clearing out the git cache data 449s - $ hg push ../repo.git 449s - pushing to ../repo.git 449s - searching for changes 449s - adding objects 449s - remote: found 0 deltas to reuse 449s - added 1 commits with 1 trees and 0 blobs 449s - adding reference refs/heads/master 449s - $ cd .. 449s - $ git --git-dir=repo.git log --pretty=medium 449s - commit 678256865a8c85ae925bf834369264193c88f8de 449s - Author: test 449s - Date: Mon Jan 1 00:00:00 2007 +0000 449s - 449s - empty 449s 449s ERROR: test-empty-working-tree.t output changed 451s ! 451s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-gitignore-permissions.t 451s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-gitignore-permissions.t.err 451s @@ -4,6 +4,7 @@ 451s $ . "$TESTDIR/testutil" 451s 451s $ hg init repo 451s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 451s $ cd repo 451s 451s $ if test `whoami` = root 451s @@ -16,8 +17,14 @@ 451s 451s $ touch thefile 451s $ hg add thefile 451s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 451s $ hg ci -A -m commit 451s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 451s $ hg gexport 451s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 451s + hg: unknown command 'gexport' 451s + (did you mean one of export, import?) 451s + [10] 451s 451s Create a file that we can ignore 451s 451s @@ -33,9 +40,10 @@ 451s 451s $ echo nothingtoseehere > .gitignore 451s $ hg status 451s - not_readable: Permission denied 451s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 451s not_readable: Permission denied 451s ? .gitignore 451s + ? nothingtoseehere 451s 451s And notice that we really did ignore it! 451s 451s 451s ERROR: test-gitignore-permissions.t output changed 451s ! 451s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-gitignore-share.t 451s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-gitignore-share.t.err 451s @@ -9,6 +9,7 @@ 451s $ git init --quiet --bare repo.git 451s 451s $ hg init hgrepo 451s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 451s $ cd hgrepo 451s $ cat > .hg/hgrc < [paths] 451s @@ -16,26 +17,31 @@ 451s > EOF 451s $ echo ignored > .gitignore 451s $ hg add .gitignore 451s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 451s $ hg ci -m ignore 451s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 451s $ hg book master 451s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 451s $ hg push 451s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 451s pushing to $TESTTMP/repo.git 451s - searching for changes 451s - adding objects 451s - remote: found 0 deltas to reuse 451s - added 1 commits with 1 trees and 1 blobs 451s - adding reference refs/heads/master 451s + abort: repository $TESTTMP/repo.git not found 451s + [255] 451s $ cd .. 451s 451s We should also ignore the file in a shared repository: 451s 451s $ hg share hgrepo sharerepo 451s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 451s updating working directory 451s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 451s $ cd sharerepo 451s $ hg paths 451s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 451s default = $TESTTMP/repo.git 451s $ cat .gitignore 451s ignored 451s $ touch ignored 451s $ hg status 451s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 451s + ? ignored 451s 451s ERROR: test-gitignore-share.t output changed 451s ! 451s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-ambiguousprefix.t 451s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-ambiguousprefix.t.err 451s @@ -21,13 +21,11 @@ 451s $ cd .. 451s 451s $ hg clone gitrepo hgrepo 451s - importing 3 git commits 451s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 451s - updating to bookmark master 451s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 451s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 451s + abort: repository gitrepo not found 451s + [255] 451s 451s $ cd hgrepo 451s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 451s 451s $ hg log -r 'gitnode(7e)' 451s - abort: git-mapfile@7e: ambiguous identifier!? (re) 451s - [50] 451s 451s ERROR: test-ambiguousprefix.t output changed 453s ! 453s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-timezone.t 453s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-timezone.t.err 453s @@ -8,10 +8,13 @@ 453s $ . "$TESTDIR/testutil" 453s 453s $ hg init hgrepo 453s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 453s $ cd hgrepo 453s $ touch beta 453s $ hg add beta 453s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 453s $ fn_hg_commit -m "test commit" 453s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 453s $ cat >patch2 < # HG changeset patch 453s > # User J. User 453s @@ -28,5 +31,10 @@ 453s > +alpha 453s > EOF 453s $ hg import patch2 453s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 453s applying patch2 453s $ hg gexport 453s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 453s + hg: unknown command 'gexport' 453s + (did you mean one of export, import?) 453s + [10] 453s 453s ERROR: test-timezone.t output changed 454s ! 454s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-transplant.t 454s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-transplant.t.err 454s @@ -11,12 +11,20 @@ 454s > EOF 454s 454s $ hg init baserepo 454s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 454s $ cd baserepo 454s $ for c in A B C 454s > do 454s > echo $c > $c && hg add $c && fn_hg_commit -m $c 454s > done 454s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 454s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 454s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 454s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 454s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 454s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 454s $ hg clone -r 2 . ../otherrepo 454s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 454s adding changesets 454s adding manifests 454s adding file changes 454s @@ -26,6 +34,8 @@ 454s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 454s $ cd ../otherrepo 454s $ hg up 1 454s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 454s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 454s $ hg transplant -s ../baserepo tip 454s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 454s no changes found 454s 454s ERROR: test-transplant.t output changed 455s !s 455s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-url-parsing.py.out 455s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-url-parsing.py.err 455s @@ -1,46 +1,14 @@ 455s -% expect '/webjam/webjam.git' 455s -/webjam/webjam.git 455s -% expect 'github.com' 455s -github.com 455s -% expect '/webjam/webjam.git' 455s -/webjam/webjam.git 455s -% expect 'github.com' 455s -github.com 455s -% expect '19418' 455s -19418 455s -% expect 'webjam.git' 455s -webjam.git 455s -% expect 'git@heroku.com' 455s -git@heroku.com 455s -% expect '999' 455s -999 455s -% expect 'webjam/webjam.git' 455s -webjam/webjam.git 455s -% expect 'git@github.com' 455s -git@github.com 455s -% expect '42qu/vps.git' 455s -42qu/vps.git 455s -% expect 'git@github.com' 455s -git@github.com 455s -% expect '/webjam/webjam.git' 455s -/webjam/webjam.git 455s -% expect 'git@github.com' 455s -git@github.com 455s -% expect '/webjam/webjam.git' 455s -/webjam/webjam.git 455s -% expect 'git@github.com' 455s -git@github.com 455s -% expect '10022' 455s -10022 455s -% expect 'webjam.git' 455s -webjam.git 455s -% expect 'git@heroku.com' 455s -git@heroku.com 455s -% expect 'webjam.git' 455s -webjam.git 455s -% expect 'git@compatible.com' 455s -git@compatible.com 455s -% expect 'webjam.git' 455s -webjam.git 455s -% expect 'git@heroku.com' 455s -git@heroku.com 455s +Traceback (most recent call last): 455s + File "/tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-url-parsing.py", line 14, in 455s + from hggit.git_handler import GitHandler 455s + File "/usr/lib/python3/dist-packages/hggit/__init__.py", line 160, in 455s + from . import commands 455s + File "/usr/lib/python3/dist-packages/hggit/commands.py", line 26, in 455s + from . import verify 455s + File "/usr/lib/python3/dist-packages/hggit/verify.py", line 16, in 455s + from . import git2hg 455s + File "/usr/lib/python3/dist-packages/hggit/git2hg.py", line 8, in 455s + from dulwich.refs import ( 455s + ...<3 lines>... 455s + ) 455s +ImportError: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 455s 455s ERROR: test-url-parsing.py output changed 455s !. 455s --- /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-addbranchrevs.t 455s +++ /tmp/autopkgtest.a0vdSk/build.ydR/src/tests/test-addbranchrevs.t.err 455s @@ -7,14 +7,23 @@ 455s caused the pull to not update to the passed revision. 455s 455s $ hg init orig 455s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 455s $ cd orig 455s $ echo a > a; hg add a; hg ci -m a 455s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 455s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 455s $ hg branch foo -q 455s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 455s $ echo b > b; hg add b; hg ci -m b 455s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 455s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 455s 455s $ cd .. 455s $ hg clone orig clone -r 0 -q 455s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 455s $ cd clone 455s $ hg pull -u -r 1 -q 455s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 455s $ hg id -n 455s + *** failed to import extension "hggit" from /tmp/autopkgtest.a0vdSk/build.ydR/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 455s 1 455s 455s ERROR: test-addbranchrevs.t output changed 455s ! 455s Skipped test-check-black.t: missing feature: the black formatter for python (>= 22.3) 455s Skipped test-check-commit.t: missing feature: running tests from repository 455s Skipped test-check-pyflakes.t: missing feature: Pyflakes python linter 455s Skipped test-check-pylint.t: missing feature: Pylint python linter 455s Skipped test-encoding.t: blacklisted 455s Skipped test-gitignore-windows.t: missing feature: Windows 455s Skipped test-incoming.t: blacklisted 455s Skipped test-serve-ci.t: skipped 455s Skipped test-serve-dulwich.t: blacklisted 455s Failed test-addbranchrevs.t: output changed 455s Failed test-ambiguousprefix.t: output changed and returned error code 1 455s Failed test-annotate.t: output changed 455s Failed test-bookmark-workflow.t: output changed and returned error code 1 455s Failed test-branch-bookmark-suffix.t#with-path: output changed and returned error code 1 455s Failed test-branch-bookmark-suffix.t#without-path: output changed and returned error code 1 455s Failed test-bundle.t: output changed and returned error code 1 455s Failed test-clone.t#draft: output changed 455s Failed test-clone.t#secret: output changed 455s Failed test-conflict-1.t: output changed 455s Failed test-conflict-2.t: output changed 455s Failed test-convergedmerge.t: output changed 455s Failed test-empty-working-tree.t: output changed and returned error code 1 455s Failed test-extra.t: output changed and returned error code 1 455s Failed test-file-removal.t: output changed and returned error code 1 455s Failed test-gc.t: output changed and returned error code 1 455s Failed test-git-clone.t: output changed 455s Failed test-git-gpg.t: output changed and returned error code 1 455s Failed test-git-submodules.t: output changed and returned error code 1 455s Failed test-git-tags.t#draft: output changed and returned error code 1 455s Failed test-git-tags.t#secret: output changed and returned error code 1 455s Failed test-git-workflow.t: output changed 455s Failed test-gitignore-permissions.t: output changed 455s Failed test-gitignore-share.t: output changed 455s Failed test-gitignore.t: output changed 455s Failed test-help.t: output changed 455s Failed test-hg-author.t: output changed and returned error code 1 455s Failed test-hg-branch.t: output changed and returned error code 1 455s Failed test-hg-clone.t: output changed and returned error code 1 455s Failed test-hg-tags.t: output changed and returned error code 1 455s Failed test-hook.t: output changed 455s Failed test-illegal-contents.t: output changed 455s Failed test-invalid-refs.t: output changed and returned error code 1 455s Failed test-keywords.t: output changed and returned error code 1 455s Failed test-merge.t: output changed and returned error code 1 455s Failed test-multiple-remotes.t: output changed 455s Failed test-octopus.t: output changed and returned error code 1 455s Failed test-orphan-tags.t: output changed and returned error code 1 455s Failed test-outgoing.t: output changed and returned error code 1 455s Failed test-phases-draft.t: output changed and returned error code 1 455s Failed test-phases-public.t#publish-defaults: output changed and returned error code 1 455s Failed test-phases-public.t#publish-specific: output changed and returned error code 1 455s Failed test-phases-remote.t: output changed and returned error code 1 455s Failed test-pull-after-obsolete.t: output changed and returned error code 1 455s Failed test-pull-after-rebase.t: output changed and returned error code 1 455s Failed test-pull-after-strip.t: output changed and returned error code 1 455s Failed test-pull.t#draft: output changed 455s Failed test-pull.t#secret: output changed 455s Failed test-push-anonymous.t: output changed and returned error code 1 455s Failed test-push-authors.t: output changed and returned error code 1 455s Failed test-push-detached.t: output changed and returned error code 1 455s Failed test-push-missing-commit.t: output changed and returned error code 1 455s Failed test-push-phases.t: output changed and returned error code 1 455s Failed test-push-r.t: output changed 455s Failed test-push-to-head.t: output changed and returned error code 1 455s Failed test-push.t: output changed and returned error code 1 455s Failed test-renames.t: output changed and returned error code 1 455s Failed test-serve-git.t: output changed 455s Failed test-serve-hg-static.t: output changed 455s Failed test-serve-hg.t#with-hggit: output changed and returned error code 1 455s Failed test-serve-hg.t#without-hggit: output changed and returned error code 1 455s Failed test-subrepos-delete.t: output changed and returned error code 1 455s Failed test-subrepos-drop.t: output changed and returned error code 1 455s Failed test-subrepos-push.t: output changed and returned error code 1 455s Failed test-subrepos-syntax.t: output changed and returned error code 1 455s Failed test-subrepos.t: output changed and returned error code 1 455s Failed test-timezone.t: output changed 455s Failed test-transactions.t: output changed 455s Failed test-transplant.t: output changed 455s Failed test-tree-decomposition.t: output changed and returned error code 1 455s Failed test-url-parsing.py: output changed and returned error code 1 455s Failed test-verify-fail.t: output changed 455s # Ran 73 tests, 9 skipped, 72 failed. 455s python hash seed: 1522791969 455s make: *** [Makefile:15: tests] Error 1 456s autopkgtest [00:53:50]: test testsuite: -----------------------] 456s autopkgtest [00:53:50]: test testsuite: - - - - - - - - - - results - - - - - - - - - - 456s testsuite FAIL non-zero exit status 2 457s autopkgtest [00:53:51]: test mercurial-git: preparing testbed 476s Creating nova instance adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-proposed-migration-environment-2-39976451-9b75-4ac8-84c8-0ed1e63afaa6 from image adt/ubuntu-resolute-ppc64el-server-20260202.img (UUID ca98045c-2f99-4634-a243-9d47350236de)... 486s nova [E] nova boot failed (attempt #0): 486s nova [E] DEBUG (extension:189) found extension EntryPoint.parse('v1password = swiftclient.authv1:PasswordLoader') 486s DEBUG (extension:189) found extension EntryPoint.parse('noauth = cinderclient.contrib.noauth:CinderNoAuthLoader') 486s DEBUG (extension:189) found extension EntryPoint.parse('admin_token = keystoneauth1.loading._plugins.admin_token:AdminToken') 486s DEBUG (extension:189) found extension EntryPoint.parse('none = keystoneauth1.loading._plugins.noauth:NoAuth') 486s DEBUG (extension:189) found extension EntryPoint.parse('password = keystoneauth1.loading._plugins.identity.generic:Password') 486s DEBUG (extension:189) found extension EntryPoint.parse('token = keystoneauth1.loading._plugins.identity.generic:Token') 486s DEBUG (extension:189) found extension EntryPoint.parse('v2password = keystoneauth1.loading._plugins.identity.v2:Password') 486s DEBUG (extension:189) found extension EntryPoint.parse('v2token = keystoneauth1.loading._plugins.identity.v2:Token') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3adfspassword = keystoneauth1.extras._saml2._loading:ADFSPassword') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3applicationcredential = keystoneauth1.loading._plugins.identity.v3:ApplicationCredential') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3fedkerb = keystoneauth1.extras.kerberos._loading:MappedKerberos') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3kerberos = keystoneauth1.extras.kerberos._loading:Kerberos') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3multifactor = keystoneauth1.loading._plugins.identity.v3:MultiFactor') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3oauth1 = keystoneauth1.extras.oauth1._loading:V3OAuth1') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcaccesstoken = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectAccessToken') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcauthcode = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectAuthorizationCode') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcclientcredentials = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectClientCredentials') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcpassword = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectPassword') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3password = keystoneauth1.loading._plugins.identity.v3:Password') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3samlpassword = keystoneauth1.extras._saml2._loading:Saml2Password') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3token = keystoneauth1.loading._plugins.identity.v3:Token') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3tokenlessauth = keystoneauth1.loading._plugins.identity.v3:TokenlessAuth') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3totp = keystoneauth1.loading._plugins.identity.v3:TOTP') 486s DEBUG (session:517) REQ: curl -g -i -X GET https://keystone.ps7.canonical.com:5000/v3 -H "Accept: application/json" -H "User-Agent: nova keystoneauth1/4.0.0 python-requests/2.22.0 CPython/3.8.10" 486s DEBUG (connectionpool:939) Starting new HTTPS connection (1): keystone.ps7.canonical.com:5000 486s DEBUG (connectionpool:429) https://keystone.ps7.canonical.com:5000 "GET /v3 HTTP/1.1" 200 267 486s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 267 Content-Type: application/json Date: Tue, 03 Feb 2026 00:54:13 GMT Keep-Alive: timeout=75, max=1000 Server: Apache/2.4.52 (Ubuntu) Vary: X-Auth-Token x-openstack-request-id: req-e3cf1b30-e847-49d3-92a1-2dffc015d91f 486s DEBUG (session:580) RESP BODY: {"version": {"id": "v3.14", "status": "stable", "updated": "2020-04-07T00:00:00Z", "links": [{"rel": "self", "href": "https://keystone.ps7.canonical.com:5000/v3/"}], "media-types": [{"base": "application/json", "type": "application/vnd.openstack.identity-v3+json"}]}} 486s DEBUG (session:946) GET call to https://keystone.ps7.canonical.com:5000/v3 used request id req-e3cf1b30-e847-49d3-92a1-2dffc015d91f 486s DEBUG (base:182) Making authentication request to https://keystone.ps7.canonical.com:5000/v3/auth/tokens 486s DEBUG (connectionpool:429) https://keystone.ps7.canonical.com:5000 "POST /v3/auth/tokens HTTP/1.1" 201 12966 486s DEBUG (base:187) {"token": {"methods": ["password"], "user": {"domain": {"id": "default", "name": "Default"}, "id": "20f4f30c2cfd4bfe806cd0db10c0e446", "name": "prod-autopkgtest-workers-ppc64el", "password_expires_at": null}, "audit_ids": ["e4TvqDkZSAWTOW7DAuR1_A"], "expires_at": "2026-02-04T00:54:14.000000Z", "issued_at": "2026-02-03T00:54:14.000000Z", "project": {"domain": {"id": "default", "name": "Default"}, "id": "9bf77f46fd6c4d3da81ee79a717acf43", "name": "prod-autopkgtest-workers-ppc64el_project"}, "is_domain": false, "roles": [{"id": "9531825e299647e9b8713fcf36566f08", "name": "member"}, {"id": "a31fb543f37543d3b12c7fcb6e29636f", "name": "load-balancer_member"}, {"id": "c4de4cd4a6e842c48c193225243b4507", "name": "reader"}], "is_admin_project": false, "catalog": [{"endpoints": [{"id": "09e03191c89d4421aebaa8dcff0e22e3", "interface": "admin", "region_id": "prodstack7", "url": "https://heat-admin.ps7.canonical.com:8004/v1/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "0b44af32db1b408da5b67a834350711b", "interface": "internal", "region_id": "prodstack7", "url": "https://heat-internal.ps7.canonical.com:8004/v1/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "325f3c044aa54591be49e39f7260483d", "interface": "public", "region_id": "prodstack7", "url": "https://heat.ps7.canonical.com:8004/v1/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}], "id": "07902f28d63c4792bef57723f11a597e", "type": "orchestration", "name": "heat"}, {"endpoints": [{"id": "296a5126b56949f8abc8663ba48d7c69", "interface": "admin", "region_id": "prodstack7", "url": "https://nova-admin.ps7.canonical.com:8774/v2.1", "region": "prodstack7"}, {"id": "4ed46fd286814be9ad5f53c713db2b21", "interface": "public", "region_id": "prodstack7", "url": "https://nova.ps7.canonical.com:8774/v2.1", "region": "prodstack7"}, {"id": "f920fb8274c74c72b50e57ac95f88f51", "interface": "internal", "region_id": "prodstack7", "url": "https://nova-internal.ps7.canonical.com:8774/v2.1", "region": "prodstack7"}], "id": "0f4ee03d0c134dceb7ed6b2fa51eb189", "type": "compute", "name": "nova"}, {"endpoints": [{"id": "074ea936d15d47e8ba1b8f1347fdaeec", "interface": "admin", "region_id": "prodstack7", "url": "https://neutron-admin.ps7.canonical.com:9696", "region": "prodstack7"}, {"id": "4d5667208af943eab425bb1952f67d2f", "interface": "public", "region_id": "prodstack7", "url": "https://neutron.ps7.canonical.com:9696", "region": "prodstack7"}, {"id": "ae71a7dd75fc495fa3dd207ac977346d", "interface": "internal", "region_id": "prodstack7", "url": "https://neutron-internal.ps7.canonical.com:9696", "region": "prodstack7"}], "id": "1fde991012bf4a91a97b5b02cd662e5d", "type": "network", "name": "neutron"}, {"endpoints": [{"id": "5f3171f69df346c9a40ff13f8a9f3feb", "interface": "public", "region_id": "prodstack7", "url": "https://heat.ps7.canonical.com:8000/v1", "region": "prodstack7"}, {"id": "951c2c04417d456eb29a4cbd2675f1bc", "interface": "internal", "region_id": "prodstack7", "url": "https://heat-internal.ps7.canonical.com:8000/v1", "region": "prodstack7"}, {"id": "e4062e144ad243cbb53c8ce87aefee44", "interface": "admin", "region_id": "prodstack7", "url": "https://heat-admin.ps7.canonical.com:8000/v1", "region": "prodstack7"}], "id": "2c59c0123c304ef3824d75e9779ac5a3", "type": "cloudformation", "name": "heat-cfn"}, {"endpoints": [{"id": "4a95fbf112804721b96a3578858faf45", "interface": "internal", "region_id": "prodstack7", "url": "https://octavia-internal.ps7.canonical.com:9876", "region": "prodstack7"}, {"id": "56bed7c3efd54a57bae11cc93844edc5", "interface": "public", "region_id": "prodstack7", "url": "https://octavia.ps7.canonical.com:9876", "region": "prodstack7"}, {"id": "e9c2ec6bc0e94e1e8ca6b15aa24b9294", "interface": "admin", "region_id": "prodstack7", "url": "https://octavia-admin.ps7.canonical.com:9876", "region": "prodstack7"}], "id": "4e42217a7f46428b87e7458a8a73942c", "type": "load-balancer", "name": "octavia"}, {"endpoints": [{"id": "29929a56ac7944d8867150f9d9a51ffe", "interface": "public", "region_id": "prodstack7", "url": "https://gnocchi.ps7.canonical.com:8041", "region": "prodstack7"}, {"id": "d1146fdec43e4c339f3c0766fda1923d", "interface": "internal", "region_id": "prodstack7", "url": "https://gnocchi-internal.ps7.canonical.com:8041", "region": "prodstack7"}, {"id": "ff5d256a28064e13b52758d6206687eb", "interface": "admin", "region_id": "prodstack7", "url": "https://gnocchi-admin.ps7.canonical.com:8041", "region": "prodstack7"}], "id": "50872dac84974216b104c7eef043dfe6", "type": "metric", "name": "gnocchi"}, {"endpoints": [{"id": "3901a2889b584fe5baf1325da2d5571c", "interface": "internal", "region_id": "prodstack7", "url": "https://aodh-internal.ps7.canonical.com:8042", "region": "prodstack7"}, {"id": "94f9e723537a4d0ab35ab53fe1af6f01", "interface": "public", "region_id": "prodstack7", "url": "https://aodh.ps7.canonical.com:8042", "region": "prodstack7"}, {"id": "f3fc8781a98149c680bd7f34c6893410", "interface": "admin", "region_id": "prodstack7", "url": "https://aodh-admin.ps7.canonical.com:8042", "region": "prodstack7"}], "id": "6f7af5495c2447c9bf258f72605a99b1", "type": "alarming", "name": "aodh"}, {"endpoints": [{"id": "0592d4bf15d54ba8aac00dfc34292295", "interface": "admin", "region_id": "prodstack7", "url": "https://keystone-admin.ps7.canonical.com:35357/v3", "region": "prodstack7"}, {"id": "1f5df236ded54026af4f5e947a599b2f", "interface": "internal", "region_id": "prodstack7", "url": "https://keystone-internal.ps7.canonical.com:5000/v3", "region": "prodstack7"}, {"id": "cd17fef7e3d246b3974b2ffe55b7889c", "interface": "public", "region_id": "prodstack7", "url": "https://keystone.ps7.canonical.com:5000/v3", "region": "prodstack7"}], "id": "7ad024307b634ea989f1e03d73d7737b", "type": "identity", "name": "keystone"}, {"endpoints": [{"id": "001dac935b6c44b1ad62c90175538578", "interface": "admin", "region_id": "prodstack7", "url": "https://cinder-admin.ps7.canonical.com:8776/v3/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "90abac2983a34488bb6ada4e5004bb99", "interface": "public", "region_id": "prodstack7", "url": "https://cinder.ps7.canonical.com:8776/v3/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "e49add7152684a8e9e1e3ea9502b5dc6", "interface": "internal", "region_id": "prodstack7", "url": "https://cinder-internal.ps7.canonical.com:8776/v3/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}], "id": "7bea8b97c0304a62afd8325515928cc0", "type": "volumev3", "name": "cinderv3"}, {"endpoints": [{"id": "2450babeee5e4fe49947cbe7bcc0f3c3", "interface": "public", "region_id": "prodstack7", "url": "https://designate.ps7.canonical.com:9001", "region": "prodstack7"}, {"id": "c2e77ece29cd4dc7bf518bb51c619cce", "interface": "internal", "region_id": "prodstack7", "url": "https://designate-internal.ps7.canonical.com:9001", "region": "prodstack7"}, {"id": "fc292615aa2d43ff943da365870944ce", "interface": "admin", "region_id": "prodstack7", "url": "https://designate-admin.ps7.canonical.com:9001", "region": "prodstack7"}], "id": "8d13654c658644c4a375ce8428638f3d", "type": "dns", "name": "designate"}, {"endpoints": [{"id": "604f1f7088c54ec4a558d1747b0e7396", "interface": "public", "region_id": "prodstack7", "url": "https://barbican.ps7.canonical.com:9311", "region": "prodstack7"}, {"id": "81268c6bd3524a4d85af3d6faa426863", "interface": "admin", "region_id": "prodstack7", "url": "https://barbican-admin.ps7.canonical.com:9312", "region": "prodstack7"}, {"id": "becc73f676f34e66ab1daf0fbcb42366", "interface": "internal", "region_id": "prodstack7", "url": "https://barbican-internal.ps7.canonical.com:9311", "region": "prodstack7"}], "id": "8df4ed7c02d44fe28ec72b1e19e3f66f", "type": "key-manager", "name": "barbican"}, {"endpoints": [{"id": "38557e1243014f1abaa578a61bb0a387", "interface": "public", "region_id": "prodstack7", "url": "https://manila.ps7.canonical.com:8786/v1/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "b12d5a4329f94a1fa6dbd2cd38ebcd52", "interface": "internal", "region_id": "prodstack7", "url": "https://manila-internal.ps7.canonical.com:8786/v1/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "bc081c0d5d954446b7ee77886f5d68a3", "interface": "admin", "region_id": "prodstack7", "url": "https://manila-admin.ps7.canonical.com:8786/v1/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}], "id": "8e7967c2620d49448787e035e8f21af0", "type": "share", "name": "manila"}, {"endpoints": [{"id": "03802d072c514ae484a2d26be0c906af", "interface": "public", "region_id": "prodstack7", "url": "https://radosgw.ps7.canonical.com:443/", "region": "prodstack7"}, {"id": "c07a315e261f430d94542a872596d654", "interface": "admin", "region_id": "prodstack7", "url": "https://radosgw-admin.ps7.canonical.com:443/", "region": "prodstack7"}, {"id": "d62fcd20c1e34d64930fbec97503a40a", "interface": "internal", "region_id": "prodstack7", "url": "https://radosgw-internal.ps7.canonical.com:443/", "region": "prodstack7"}], "id": "9569f1b0b4714254a3d116760dc3968d", "type": "s3", "name": "s3"}, {"endpoints": [{"id": "0e64627804e741e5948b4d35e1914624", "interface": "internal", "region_id": "RegionOne", "url": "http://10.150.13.75", "region": "RegionOne"}, {"id": "12d47bbd1cc64dbf8d4e442b821c64f2", "interface": "admin", "region_id": "prodstack7", "url": "https://radosgw-admin.ps7.canonical.com:443/swift/simplestreams/data", "region": "prodstack7"}, {"id": "35aba6c3a1fc4041b30963e8b6c7b929", "interface": "public", "region_id": "prodstack7", "url": "https://radosgw.ps7.canonical.com:443/swift/v1/AUTH_588a6b5285ea4ed38ae122d264c01490/simplestreams/data", "region": "prodstack7"}, {"id": "35bc5168fcc2414a9d89313cdef8bca9", "interface": "admin", "region_id": "RegionOne", "url": "http://10.150.13.75", "region": "RegionOne"}, {"id": "5f7980b3f8e746e6bbd66c9cef81714e", "interface": "public", "region_id": "RegionOne", "url": "http://10.150.13.75", "region": "RegionOne"}, {"id": "739ab5131dff4cdbb3151f6de36b36f6", "interface": "internal", "region_id": "prodstack7", "url": "https://radosgw-internal.ps7.canonical.com:443/swift/v1/AUTH_588a6b5285ea4ed38ae122d264c01490/simplestreams/data", "region": "prodstack7"}], "id": "b28a039721b147af8e77d77242d4297f", "type": "product-streams", "name": "image-stream"}, {"endpoints": [{"id": "9321fba4588641dbb1c9f89508f1bf23", "interface": "internal", "region_id": "prodstack7", "url": "https://placement-internal.ps7.canonical.com:8778", "region": "prodstack7"}, {"id": "9a75eebf33e7409d9b69dc7e650f756c", "interface": "admin", "region_id": "prodstack7", "url": "https://placement-admin.ps7.canonical.com:8778", "region": "prodstack7"}, {"id": "c03942ddacb94fe39c1529aa74bd31c1", "interface": "public", "region_id": "prodstack7", "url": "https://placement.ps7.canonical.com:8778", "region": "prodstack7"}], "id": "bc5c019477934e89bab2a097e8df84b6", "type": "placement", "name": "placement"}, {"endpoints": [{"id": "b8152f5e649d4603ac092897639d38c9", "interface": "admin", "region_id": "prodstack7", "url": "https://radosgw-admin.ps7.canonical.com:443/swift", "region": "prodstack7"}, {"id": "baa313d85b904c308b7a5c98505fc32c", "interface": "internal", "region_id": "prodstack7", "url": "https://radosgw-internal.ps7.canonical.com:443/swift/v1/AUTH_9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "c17c3db416224561b5e045562bbe76bf", "interface": "public", "region_id": "prodstack7", "url": "https://radosgw.ps7.canonical.com:443/swift/v1/AUTH_9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}], "id": "c6dd2bcf96bf44c2a99e39d1302563f1", "type": "object-store", "name": "swift"}, {"endpoints": [{"id": "526da263451648898c9187c65f441a1c", "interface": "public", "region_id": "prodstack7", "url": "https://glance.ps7.canonical.com:9292", "region": "prodstack7"}, {"id": "61b55755ca9e4e2ab04a144f92cb6e97", "interface": "admin", "region_id": "prodstack7", "url": "https://glance-admin.ps7.canonical.com:9292", "region": "prodstack7"}, {"id": "9080969b2cde4926b647f63b9591233c", "interface": "internal", "region_id": "prodstack7", "url": "https://glance-internal.ps7.canonical.com:9292", "region": "prodstack7"}], "id": "dd3a22e287464998be0514a67dafb7e4", "type": "image", "name": "glance"}, {"endpoints": [{"id": "2f4dcba2a4ce46b2a2e3cf103fd929f4", "interface": "admin", "region_id": "prodstack7", "url": "https://manila-admin.ps7.canonical.com:8786/v2/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "789faa303fb54473b9449fa2f52866b3", "interface": "internal", "region_id": "prodstack7", "url": "https://manila-internal.ps7.canonical.com:8786/v2/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}, {"id": "fa7fa08da5e147df8dbc9528f3d7135b", "interface": "public", "region_id": "prodstack7", "url": "https://manila.ps7.canonical.com:8786/v2/9bf77f46fd6c4d3da81ee79a717acf43", "region": "prodstack7"}], "id": "f6880aea736446b8a4232e0cf3528a12", "type": "sharev2", "name": "manilav2"}]}} 486s REQ: curl -g -i -X GET https://nova.ps7.canonical.com:8774/v2.1 -H "Accept: application/json" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}7b706bb4539d5b05c7eaf6b070bf943d309f7da599ad15129af7a349c253ca9b" 486s DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps7.canonical.com:8774/v2.1 -H "Accept: application/json" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}7b706bb4539d5b05c7eaf6b070bf943d309f7da599ad15129af7a349c253ca9b" 486s DEBUG (connectionpool:939) Starting new HTTPS connection (1): nova.ps7.canonical.com:8774 486s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "GET /v2.1 HTTP/1.1" 302 0 486s RESP: [302] Connection: Keep-Alive Content-Length: 0 Content-Type: text/plain; charset=utf8 Date: Tue, 03 Feb 2026 00:54:14 GMT Keep-Alive: timeout=75, max=1000 Location: https://nova.ps7.canonical.com:8774/v2.1/ Server: Apache/2.4.52 (Ubuntu) x-compute-request-id: req-55a3cda8-0be3-4746-8d98-c61f0f0bba2d x-openstack-request-id: req-55a3cda8-0be3-4746-8d98-c61f0f0bba2d 486s DEBUG (session:548) RESP: [302] Connection: Keep-Alive Content-Length: 0 Content-Type: text/plain; charset=utf8 Date: Tue, 03 Feb 2026 00:54:14 GMT Keep-Alive: timeout=75, max=1000 Location: https://nova.ps7.canonical.com:8774/v2.1/ Server: Apache/2.4.52 (Ubuntu) x-compute-request-id: req-55a3cda8-0be3-4746-8d98-c61f0f0bba2d x-openstack-request-id: req-55a3cda8-0be3-4746-8d98-c61f0f0bba2d 486s RESP BODY: Omitted, Content-Type is set to text/plain; charset=utf8. Only application/json responses have their bodies logged. 486s DEBUG (session:580) RESP BODY: Omitted, Content-Type is set to text/plain; charset=utf8. Only application/json responses have their bodies logged. 486s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "GET /v2.1/ HTTP/1.1" 200 397 486s RESP: [200] Connection: Keep-Alive Content-Length: 397 Content-Type: application/json Date: Tue, 03 Feb 2026 00:54:14 GMT Keep-Alive: timeout=75, max=999 OpenStack-API-Version: compute 2.1 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.1 x-compute-request-id: req-4a8f0734-4bb7-4d52-ace6-bcf62061cfba x-openstack-request-id: req-4a8f0734-4bb7-4d52-ace6-bcf62061cfba 486s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 397 Content-Type: application/json Date: Tue, 03 Feb 2026 00:54:14 GMT Keep-Alive: timeout=75, max=999 OpenStack-API-Version: compute 2.1 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.1 x-compute-request-id: req-4a8f0734-4bb7-4d52-ace6-bcf62061cfba x-openstack-request-id: req-4a8f0734-4bb7-4d52-ace6-bcf62061cfba 486s RESP BODY: {"version": {"id": "v2.1", "status": "CURRENT", "version": "2.96", "min_version": "2.1", "updated": "2013-07-23T11:33:21Z", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/"}, {"rel": "describedby", "type": "text/html", "href": "http://docs.openstack.org/"}], "media-types": [{"base": "application/json", "type": "application/vnd.openstack.compute+json;version=2.1"}]}} 486s DEBUG (session:580) RESP BODY: {"version": {"id": "v2.1", "status": "CURRENT", "version": "2.96", "min_version": "2.1", "updated": "2013-07-23T11:33:21Z", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/"}, {"rel": "describedby", "type": "text/html", "href": "http://docs.openstack.org/"}], "media-types": [{"base": "application/json", "type": "application/vnd.openstack.compute+json;version=2.1"}]}} 486s GET call to compute for https://nova.ps7.canonical.com:8774/v2.1/ used request id req-4a8f0734-4bb7-4d52-ace6-bcf62061cfba 486s DEBUG (session:936) GET call to compute for https://nova.ps7.canonical.com:8774/v2.1/ used request id req-4a8f0734-4bb7-4d52-ace6-bcf62061cfba 486s DEBUG (extension:189) found extension EntryPoint.parse('v1password = swiftclient.authv1:PasswordLoader') 486s DEBUG (extension:189) found extension EntryPoint.parse('noauth = cinderclient.contrib.noauth:CinderNoAuthLoader') 486s DEBUG (extension:189) found extension EntryPoint.parse('admin_token = keystoneauth1.loading._plugins.admin_token:AdminToken') 486s DEBUG (extension:189) found extension EntryPoint.parse('none = keystoneauth1.loading._plugins.noauth:NoAuth') 486s DEBUG (extension:189) found extension EntryPoint.parse('password = keystoneauth1.loading._plugins.identity.generic:Password') 486s DEBUG (extension:189) found extension EntryPoint.parse('token = keystoneauth1.loading._plugins.identity.generic:Token') 486s DEBUG (extension:189) found extension EntryPoint.parse('v2password = keystoneauth1.loading._plugins.identity.v2:Password') 486s DEBUG (extension:189) found extension EntryPoint.parse('v2token = keystoneauth1.loading._plugins.identity.v2:Token') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3adfspassword = keystoneauth1.extras._saml2._loading:ADFSPassword') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3applicationcredential = keystoneauth1.loading._plugins.identity.v3:ApplicationCredential') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3fedkerb = keystoneauth1.extras.kerberos._loading:MappedKerberos') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3kerberos = keystoneauth1.extras.kerberos._loading:Kerberos') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3multifactor = keystoneauth1.loading._plugins.identity.v3:MultiFactor') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3oauth1 = keystoneauth1.extras.oauth1._loading:V3OAuth1') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcaccesstoken = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectAccessToken') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcauthcode = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectAuthorizationCode') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcclientcredentials = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectClientCredentials') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcpassword = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectPassword') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3password = keystoneauth1.loading._plugins.identity.v3:Password') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3samlpassword = keystoneauth1.extras._saml2._loading:Saml2Password') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3token = keystoneauth1.loading._plugins.identity.v3:Token') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3tokenlessauth = keystoneauth1.loading._plugins.identity.v3:TokenlessAuth') 486s DEBUG (extension:189) found extension EntryPoint.parse('v3totp = keystoneauth1.loading._plugins.identity.v3:TOTP') 486s DEBUG (session:517) REQ: curl -g -i -X GET https://glance.ps7.canonical.com:9292/v2/images/ca98045c-2f99-4634-a243-9d47350236de -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}7b706bb4539d5b05c7eaf6b070bf943d309f7da599ad15129af7a349c253ca9b" -H "X-OpenStack-Nova-API-Version: 2.87" 486s DEBUG (connectionpool:939) Starting new HTTPS connection (1): glance.ps7.canonical.com:9292 486s DEBUG (connectionpool:429) https://glance.ps7.canonical.com:9292 "GET /v2/images/ca98045c-2f99-4634-a243-9d47350236de HTTP/1.1" 200 2267 486s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 2267 Content-Type: application/json Date: Tue, 03 Feb 2026 00:54:14 GMT Keep-Alive: timeout=75, max=1000 Server: Apache/2.4.52 (Ubuntu) X-Openstack-Request-Id: req-9756f63c-01d4-4f86-b346-3d4ed6f6def8 486s DEBUG (session:580) RESP BODY: {"architecture": "ppc64le", "base_image_ref": "1817ca74-e109-4221-8791-3fc9207e3533", "boot_roles": "member,load-balancer_member,reader", "content_id": "auto.sync", "hw_cdrom_bus": "scsi", "hw_disk_bus": "virtio", "hw_machine_type": "pseries", "hw_video_model": "vga", "hw_vif_model": "virtio", "image_location": "snapshot", "image_state": "available", "image_type": "snapshot", "img_config_drive": "mandatory", "instance_uuid": "28a15a23-fb43-4067-a907-286858b50c0e", "item_name": "disk1.img", "os_distro": "ubuntu", "os_version": "26.04", "owner_id": "9bf77f46fd6c4d3da81ee79a717acf43", "owner_project_name": "prod-autopkgtest-workers-ppc64el_project", "owner_user_name": "prod-autopkgtest-workers-ppc64el", "product_name": "com.ubuntu.cloud.daily:server:26.04:ppc64el", "simplestreams_metadata": "{\"aliases\": \"26.04,r,resolute,devel\", \"arch\": \"ppc64el\", \"ftype\": \"disk1.img\", \"label\": \"daily\", \"os\": \"ubuntu\", \"pubname\": \"ubuntu-resolute-daily-ppc64el-server-20260127\", \"release\": \"resolute\", \"release_codename\": \"Resolute Raccoon\", \"release_title\": \"2", "source_content_id": "com.ubuntu.cloud:daily:download", "user_id": "20f4f30c2cfd4bfe806cd0db10c0e446", "version_name": "20260127", "name": "adt/ubuntu-resolute-ppc64el-server-20260202.img", "disk_format": "qcow2", "container_format": "bare", "visibility": "private", "size": 2865954816, "virtual_size": 21474836480, "status": "active", "checksum": "6ad93313de25c3518f40dea44f47e332", "protected": false, "min_ram": 0, "min_disk": 20, "owner": "9bf77f46fd6c4d3da81ee79a717acf43", "os_hidden": false, "os_hash_algo": "sha256", "os_hash_value": "31d17570a370d1150f702fd59f3f37a5350f6c7d1a1bebbb79e93f4749c1e42c", "id": "ca98045c-2f99-4634-a243-9d47350236de", "created_at": "2026-02-02T14:51:13Z", "updated_at": "2026-02-02T14:52:43Z", "locations": [{"url": "rbd://d8b83d88-b70a-11ef-be0b-2390f458e7bc/glance/ca98045c-2f99-4634-a243-9d47350236de/snap", "metadata": {"store": "ceph"}}], "direct_url": "rbd://d8b83d88-b70a-11ef-be0b-2390f458e7bc/glance/ca98045c-2f99-4634-a243-9d47350236de/snap", "tags": [], "self": "/v2/images/ca98045c-2f99-4634-a243-9d47350236de", "file": "/v2/images/ca98045c-2f99-4634-a243-9d47350236de/file", "schema": "/v2/schemas/image", "stores": "ceph"} 486s DEBUG (session:936) GET call to image for https://glance.ps7.canonical.com:9292/v2/images/ca98045c-2f99-4634-a243-9d47350236de used request id req-9756f63c-01d4-4f86-b346-3d4ed6f6def8 486s DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps7.canonical.com:8774/v2.1/flavors/autopkgtest-cpu2-ram4-disk20-ppc64el -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}7b706bb4539d5b05c7eaf6b070bf943d309f7da599ad15129af7a349c253ca9b" -H "X-OpenStack-Nova-API-Version: 2.87" 486s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "GET /v2.1/flavors/autopkgtest-cpu2-ram4-disk20-ppc64el HTTP/1.1" 404 109 486s DEBUG (session:548) RESP: [404] Connection: Keep-Alive Content-Length: 109 Content-Type: application/json; charset=UTF-8 Date: Tue, 03 Feb 2026 00:54:14 GMT Keep-Alive: timeout=75, max=998 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-91cbcbdd-a2b0-4364-bdd5-6822db22ffd7 x-openstack-request-id: req-91cbcbdd-a2b0-4364-bdd5-6822db22ffd7 486s DEBUG (session:580) RESP BODY: {"itemNotFound": {"code": 404, "message": "Flavor autopkgtest-cpu2-ram4-disk20-ppc64el could not be found."}} 486s DEBUG (session:936) GET call to compute for https://nova.ps7.canonical.com:8774/v2.1/flavors/autopkgtest-cpu2-ram4-disk20-ppc64el used request id req-91cbcbdd-a2b0-4364-bdd5-6822db22ffd7 486s DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps7.canonical.com:8774/v2.1/flavors?is_public=None -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}7b706bb4539d5b05c7eaf6b070bf943d309f7da599ad15129af7a349c253ca9b" -H "X-OpenStack-Nova-API-Version: 2.87" 486s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "GET /v2.1/flavors?is_public=None HTTP/1.1" 200 2423 486s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 2423 Content-Type: application/json Date: Tue, 03 Feb 2026 00:54:14 GMT Keep-Alive: timeout=75, max=997 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-bfe95504-f354-4465-9448-678155a9be31 x-openstack-request-id: req-bfe95504-f354-4465-9448-678155a9be31 486s DEBUG (session:580) RESP BODY: {"flavors": [{"id": "53d845ba-20b6-47b0-8d36-14129b383b2c", "name": "shared.large.ppc64el", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/flavors/53d845ba-20b6-47b0-8d36-14129b383b2c"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/flavors/53d845ba-20b6-47b0-8d36-14129b383b2c"}], "description": null}, {"id": "6d15d6b4-4956-4aab-940e-fc2f21abb355", "name": "shared.xlarge.ppc64el", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/flavors/6d15d6b4-4956-4aab-940e-fc2f21abb355"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/flavors/6d15d6b4-4956-4aab-940e-fc2f21abb355"}], "description": null}, {"id": "84d9214c-6238-49ad-bcd4-68651b0fff84", "name": "shared.medium.ppc64el", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/flavors/84d9214c-6238-49ad-bcd4-68651b0fff84"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/flavors/84d9214c-6238-49ad-bcd4-68651b0fff84"}], "description": null}, {"id": "af3a4807-1a67-45b0-a4ec-851f7f915480", "name": "autopkgtest-cpu4-ram16-disk100-ppc64el", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/flavors/af3a4807-1a67-45b0-a4ec-851f7f915480"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/flavors/af3a4807-1a67-45b0-a4ec-851f7f915480"}], "description": null}, {"id": "cdd26b7a-512f-4e40-a56b-a8628e74c273", "name": "autopkgtest-cpu2-ram4-disk20-ppc64el", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/flavors/cdd26b7a-512f-4e40-a56b-a8628e74c273"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/flavors/cdd26b7a-512f-4e40-a56b-a8628e74c273"}], "description": null}, {"id": "d2b33018-ef27-42d3-9878-e3b4816cec50", "name": "shared.xsmall.ppc64el", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/flavors/d2b33018-ef27-42d3-9878-e3b4816cec50"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/flavors/d2b33018-ef27-42d3-9878-e3b4816cec50"}], "description": null}, {"id": "e9e0185b-b47d-42ce-bd30-0892a3bf026a", "name": "shared.small.ppc64el", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/flavors/e9e0185b-b47d-42ce-bd30-0892a3bf026a"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/flavors/e9e0185b-b47d-42ce-bd30-0892a3bf026a"}], "description": null}]} 486s DEBUG (session:936) GET call to compute for https://nova.ps7.canonical.com:8774/v2.1/flavors?is_public=None used request id req-bfe95504-f354-4465-9448-678155a9be31 486s DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps7.canonical.com:8774/v2.1/flavors/cdd26b7a-512f-4e40-a56b-a8628e74c273 -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}7b706bb4539d5b05c7eaf6b070bf943d309f7da599ad15129af7a349c253ca9b" -H "X-OpenStack-Nova-API-Version: 2.87" 486s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "GET /v2.1/flavors/cdd26b7a-512f-4e40-a56b-a8628e74c273 HTTP/1.1" 200 706 486s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 706 Content-Type: application/json Date: Tue, 03 Feb 2026 00:54:14 GMT Keep-Alive: timeout=75, max=996 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-ee65bb65-1811-4983-b97c-1e2b8f01091d x-openstack-request-id: req-ee65bb65-1811-4983-b97c-1e2b8f01091d 486s DEBUG (session:580) RESP BODY: {"flavor": {"id": "cdd26b7a-512f-4e40-a56b-a8628e74c273", "name": "autopkgtest-cpu2-ram4-disk20-ppc64el", "ram": 4096, "disk": 20, "swap": 0, "OS-FLV-EXT-DATA:ephemeral": 0, "OS-FLV-DISABLED:disabled": false, "vcpus": 2, "os-flavor-access:is_public": false, "rxtx_factor": 1.0, "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/flavors/cdd26b7a-512f-4e40-a56b-a8628e74c273"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/flavors/cdd26b7a-512f-4e40-a56b-a8628e74c273"}], "description": null, "extra_specs": {"aggregate_instance_extra_specs:commit": "ppc64el", "hw:cpu_policy": "shared", "hw:mem_page_size": "large", "hw:pci_numa_affinity_policy": "preferred"}}} 486s DEBUG (session:936) GET call to compute for https://nova.ps7.canonical.com:8774/v2.1/flavors/cdd26b7a-512f-4e40-a56b-a8628e74c273 used request id req-ee65bb65-1811-4983-b97c-1e2b8f01091d 486s DEBUG (session:517) REQ: curl -g -i -X POST https://nova.ps7.canonical.com:8774/v2.1/servers -H "Accept: application/json" -H "Content-Type: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}7b706bb4539d5b05c7eaf6b070bf943d309f7da599ad15129af7a349c253ca9b" -H "X-OpenStack-Nova-API-Version: 2.87" -d '{"server": {"name": "adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-proposed-migration-environment-2-39976451-9b75-4ac8-84c8-0ed1e63afaa6", "imageRef": "ca98045c-2f99-4634-a243-9d47350236de", "flavorRef": "cdd26b7a-512f-4e40-a56b-a8628e74c273", "user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJyA+PiAvZXRjL2Vudmlyb25tZW50CiAtIHNlZCAtaSAtciAnL14xMjcuMC4xLjEvIHMvYXV0b3BrZ3Rlc3QtW14gXStcLi9hdXRvcGtndGVzdFwuLycgL2V0Yy9ob3N0cwo=", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-2", "min_count": 1, "max_count": 1, "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-2@sto01-ppc64el-23.secgroup"}], "networks": [{"uuid": "c4c76c34-f8c1-479e-a79a-8c9382a6ed25"}]}}' 486s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "POST /v2.1/servers HTTP/1.1" 202 478 486s DEBUG (session:548) RESP: [202] Connection: Keep-Alive Content-Length: 478 Content-Type: application/json Date: Tue, 03 Feb 2026 00:54:14 GMT Keep-Alive: timeout=75, max=995 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 location: https://nova.ps7.canonical.com:8774/v2.1/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4 x-compute-request-id: req-ffd65d14-4950-4f79-828e-9c43eeb0cc76 x-openstack-request-id: req-ffd65d14-4950-4f79-828e-9c43eeb0cc76 486s DEBUG (session:580) RESP BODY: {"server": {"id": "f78ef560-ee39-4fd6-91d6-73101f04f1b4", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4"}], "OS-DCF:diskConfig": "MANUAL", "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-2@sto01-ppc64el-23.secgroup"}], "adminPass": "9c2mEHb9bovG"}} 486s DEBUG (session:936) POST call to compute for https://nova.ps7.canonical.com:8774/v2.1/servers used request id req-ffd65d14-4950-4f79-828e-9c43eeb0cc76 486s DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps7.canonical.com:8774/v2.1/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4 -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}7b706bb4539d5b05c7eaf6b070bf943d309f7da599ad15129af7a349c253ca9b" -H "X-OpenStack-Nova-API-Version: 2.87" 486s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "GET /v2.1/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4 HTTP/1.1" 200 2713 486s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 2713 Content-Type: application/json Date: Tue, 03 Feb 2026 00:54:15 GMT Keep-Alive: timeout=75, max=994 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-117c354e-41be-4978-b5a2-7a823d6207d8 x-openstack-request-id: req-117c354e-41be-4978-b5a2-7a823d6207d8 486s DEBUG (session:580) RESP BODY: {"server": {"id": "f78ef560-ee39-4fd6-91d6-73101f04f1b4", "name": "adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-proposed-migration-environment-2-39976451-9b75-4ac8-84c8-0ed1e63afaa6", "status": "BUILD", "tenant_id": "9bf77f46fd6c4d3da81ee79a717acf43", "user_id": "20f4f30c2cfd4bfe806cd0db10c0e446", "metadata": {}, "hostId": "", "image": {"id": "ca98045c-2f99-4634-a243-9d47350236de", "links": [{"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/images/ca98045c-2f99-4634-a243-9d47350236de"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest-cpu2-ram4-disk20-ppc64el", "extra_specs": {"aggregate_instance_extra_specs:commit": "ppc64el", "hw:cpu_policy": "shared", "hw:mem_page_size": "large", "hw:pci_numa_affinity_policy": "preferred"}}, "created": "2026-02-03T00:54:15Z", "updated": "2026-02-03T00:54:15Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-2", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "OS-EXT-SRV-ATTR:host": null, "OS-EXT-SRV-ATTR:instance_name": "", "OS-EXT-SRV-ATTR:hypervisor_hostname": null, "OS-EXT-SRV-ATTR:reservation_id": "r-qr0e6tog", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-pr", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": null, "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJyA+PiAvZXRjL2Vudmlyb25tZW50CiAtIHNlZCAtaSAtciAnL14xMjcuMC4xLjEvIHMvYXV0b3BrZ3Rlc3QtW14gXStcLi9hdXRvcGtndGVzdFwuLycgL2V0Yy9ob3N0cwo=", "OS-EXT-STS:task_state": "scheduling", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 486s DEBUG (session:936) GET call to compute for https://nova.ps7.canonical.com:8774/v2.1/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4 used request id req-117c354e-41be-4978-b5a2-7a823d6207d8 486s DEBUG (session:517) REQ: curl -g -i -X GET https://glance.ps7.canonical.com:9292/v2/images/ca98045c-2f99-4634-a243-9d47350236de -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}7b706bb4539d5b05c7eaf6b070bf943d309f7da599ad15129af7a349c253ca9b" -H "X-OpenStack-Nova-API-Version: 2.87" 486s DEBUG (connectionpool:429) https://glance.ps7.canonical.com:9292 "GET /v2/images/ca98045c-2f99-4634-a243-9d47350236de HTTP/1.1" 200 2267 486s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 2267 Content-Type: application/json Date: Tue, 03 Feb 2026 00:54:15 GMT Keep-Alive: timeout=75, max=999 Server: Apache/2.4.52 (Ubuntu) X-Openstack-Request-Id: req-d8809add-0c00-4a89-bf79-6d15ee50077b 486s DEBUG (session:580) RESP BODY: {"architecture": "ppc64le", "base_image_ref": "1817ca74-e109-4221-8791-3fc9207e3533", "boot_roles": "member,load-balancer_member,reader", "content_id": "auto.sync", "hw_cdrom_bus": "scsi", "hw_disk_bus": "virtio", "hw_machine_type": "pseries", "hw_video_model": "vga", "hw_vif_model": "virtio", "image_location": "snapshot", "image_state": "available", "image_type": "snapshot", "img_config_drive": "mandatory", "instance_uuid": "28a15a23-fb43-4067-a907-286858b50c0e", "item_name": "disk1.img", "os_distro": "ubuntu", "os_version": "26.04", "owner_id": "9bf77f46fd6c4d3da81ee79a717acf43", "owner_project_name": "prod-autopkgtest-workers-ppc64el_project", "owner_user_name": "prod-autopkgtest-workers-ppc64el", "product_name": "com.ubuntu.cloud.daily:server:26.04:ppc64el", "simplestreams_metadata": "{\"aliases\": \"26.04,r,resolute,devel\", \"arch\": \"ppc64el\", \"ftype\": \"disk1.img\", \"label\": \"daily\", \"os\": \"ubuntu\", \"pubname\": \"ubuntu-resolute-daily-ppc64el-server-20260127\", \"release\": \"resolute\", \"release_codename\": \"Resolute Raccoon\", \"release_title\": \"2", "source_content_id": "com.ubuntu.cloud:daily:download", "user_id": "20f4f30c2cfd4bfe806cd0db10c0e446", "version_name": "20260127", "name": "adt/ubuntu-resolute-ppc64el-server-20260202.img", "disk_format": "qcow2", "container_format": "bare", "visibility": "private", "size": 2865954816, "virtual_size": 21474836480, "status": "active", "checksum": "6ad93313de25c3518f40dea44f47e332", "protected": false, "min_ram": 0, "min_disk": 20, "owner": "9bf77f46fd6c4d3da81ee79a717acf43", "os_hidden": false, "os_hash_algo": "sha256", "os_hash_value": "31d17570a370d1150f702fd59f3f37a5350f6c7d1a1bebbb79e93f4749c1e42c", "id": "ca98045c-2f99-4634-a243-9d47350236de", "created_at": "2026-02-02T14:51:13Z", "updated_at": "2026-02-02T14:52:43Z", "locations": [{"url": "rbd://d8b83d88-b70a-11ef-be0b-2390f458e7bc/glance/ca98045c-2f99-4634-a243-9d47350236de/snap", "metadata": {"store": "ceph"}}], "direct_url": "rbd://d8b83d88-b70a-11ef-be0b-2390f458e7bc/glance/ca98045c-2f99-4634-a243-9d47350236de/snap", "tags": [], "self": "/v2/images/ca98045c-2f99-4634-a243-9d47350236de", "file": "/v2/images/ca98045c-2f99-4634-a243-9d47350236de/file", "schema": "/v2/schemas/image", "stores": "ceph"} 486s DEBUG (session:936) GET call to image for https://glance.ps7.canonical.com:9292/v2/images/ca98045c-2f99-4634-a243-9d47350236de used request id req-d8809add-0c00-4a89-bf79-6d15ee50077b 486s +--------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------+ 486s | Property | Value | 486s +--------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------+ 486s | OS-DCF:diskConfig | MANUAL | 486s | OS-EXT-AZ:availability_zone | | 486s | OS-EXT-SRV-ATTR:host | - | 486s | OS-EXT-SRV-ATTR:hostname | adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-pr | 486s | OS-EXT-SRV-ATTR:hypervisor_hostname | - | 486s | OS-EXT-SRV-ATTR:instance_name | | 486s | OS-EXT-SRV-ATTR:kernel_id | | 486s | OS-EXT-SRV-ATTR:launch_index | 0 | 486s | OS-EXT-SRV-ATTR:ramdisk_id | | 486s | OS-EXT-SRV-ATTR:reservation_id | r-qr0e6tog | 486s | OS-EXT-SRV-ATTR:root_device_name | - | 486s | OS-EXT-STS:power_state | 0 | 486s | OS-EXT-STS:task_state | scheduling | 486s | OS-EXT-STS:vm_state | building | 486s | OS-SRV-USG:launched_at | - | 486s | OS-SRV-USG:terminated_at | - | 486s | accessIPv4 | | 486s | accessIPv6 | | 486s | adminPass | 9c2mEHb9bovG | 486s | config_drive | | 486s | created | 2026-02-03T00:54:15Z | 486s | description | - | 486s | flavor:disk | 20 | 486s | flavor:ephemeral | 0 | 486s | flavor:extra_specs | {"aggregate_instance_extra_specs:commit": "ppc64el", "hw:cpu_policy": "shared", "hw:mem_page_size": "large", "hw:pci_numa_affinity_policy": "preferred"} | 486s | flavor:original_name | autopkgtest-cpu2-ram4-disk20-ppc64el | 486s | flavor:ram | 4096 | 486s | flavor:swap | 0 | 486s | flavor:vcpus | 2 | 486s | hostId | | 486s | id | f78ef560-ee39-4fd6-91d6-73101f04f1b4 | 486s | image | adt/ubuntu-resolute-ppc64el-server-20260202.img (ca98045c-2f99-4634-a243-9d47350236de) | 486s | key_name | testbed-juju-7f2275-prod-proposed-migration-environment-2 | 486s | locked | False | 486s | locked_reason | - | 486s | metadata | {} | 486s | name | adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-proposed-migration-environment-2-39976451-9b75-4ac8-84c8-0ed1e63afaa6 | 486s | os-extended-volumes:volumes_attached | [] | 486s | progress | 0 | 486s | security_groups | autopkgtest-juju-7f2275-prod-proposed-migration-environment-2@sto01-ppc64el-23.secgroup | 486s | server_groups | [] | 486s | status | BUILD | 486s | tags | [] | 486s | tenant_id | 9bf77f46fd6c4d3da81ee79a717acf43 | 486s | trusted_image_certificates | - | 486s | updated | 2026-02-03T00:54:15Z | 486s | user_id | 20f4f30c2cfd4bfe806cd0db10c0e446 | 486s +--------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------+DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps7.canonical.com:8774/v2.1/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4 -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}7b706bb4539d5b05c7eaf6b070bf943d309f7da599ad15129af7a349c253ca9b" -H "X-OpenStack-Nova-API-Version: 2.87" 486s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "GET /v2.1/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4 HTTP/1.1" 200 2713 486s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 2713 Content-Type: application/json Date: Tue, 03 Feb 2026 00:54:15 GMT Keep-Alive: timeout=75, max=993 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-7d115a88-c305-4f13-8759-ff3ac3c0cbea x-openstack-request-id: req-7d115a88-c305-4f13-8759-ff3ac3c0cbea 486s DEBUG (session:580) RESP BODY: {"server": {"id": "f78ef560-ee39-4fd6-91d6-73101f04f1b4", "name": "adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-proposed-migration-environment-2-39976451-9b75-4ac8-84c8-0ed1e63afaa6", "status": "BUILD", "tenant_id": "9bf77f46fd6c4d3da81ee79a717acf43", "user_id": "20f4f30c2cfd4bfe806cd0db10c0e446", "metadata": {}, "hostId": "", "image": {"id": "ca98045c-2f99-4634-a243-9d47350236de", "links": [{"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/images/ca98045c-2f99-4634-a243-9d47350236de"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest-cpu2-ram4-disk20-ppc64el", "extra_specs": {"aggregate_instance_extra_specs:commit": "ppc64el", "hw:cpu_policy": "shared", "hw:mem_page_size": "large", "hw:pci_numa_affinity_policy": "preferred"}}, "created": "2026-02-03T00:54:15Z", "updated": "2026-02-03T00:54:15Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-2", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "OS-EXT-SRV-ATTR:host": null, "OS-EXT-SRV-ATTR:instance_name": "", "OS-EXT-SRV-ATTR:hypervisor_hostname": null, "OS-EXT-SRV-ATTR:reservation_id": "r-qr0e6tog", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-pr", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": null, "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJyA+PiAvZXRjL2Vudmlyb25tZW50CiAtIHNlZCAtaSAtciAnL14xMjcuMC4xLjEvIHMvYXV0b3BrZ3Rlc3QtW14gXStcLi9hdXRvcGtndGVzdFwuLycgL2V0Yy9ob3N0cwo=", "OS-EXT-STS:task_state": "scheduling", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 486s DEBUG (session:936) GET call to compute for https://nova.ps7.canonical.com:8774/v2.1/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4 used request id req-7d115a88-c305-4f13-8759-ff3ac3c0cbea 486s 486s 486s Server building... 0% completeDEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps7.canonical.com:8774/v2.1/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4 -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}7b706bb4539d5b05c7eaf6b070bf943d309f7da599ad15129af7a349c253ca9b" -H "X-OpenStack-Nova-API-Version: 2.87" 486s DEBUG (connectionpool:429) https://nova.ps7.canonical.com:8774 "GET /v2.1/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4 HTTP/1.1" 200 2840 486s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 2840 Content-Type: application/json Date: Tue, 03 Feb 2026 00:54:20 GMT Keep-Alive: timeout=75, max=992 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.52 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-39276f43-8531-471f-b9b0-0b6c23100a8c x-openstack-request-id: req-39276f43-8531-471f-b9b0-0b6c23100a8c 486s DEBUG (session:580) RESP BODY: {"server": {"id": "f78ef560-ee39-4fd6-91d6-73101f04f1b4", "name": "adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-proposed-migration-environment-2-39976451-9b75-4ac8-84c8-0ed1e63afaa6", "status": "ERROR", "tenant_id": "9bf77f46fd6c4d3da81ee79a717acf43", "user_id": "20f4f30c2cfd4bfe806cd0db10c0e446", "metadata": {}, "hostId": "", "image": {"id": "ca98045c-2f99-4634-a243-9d47350236de", "links": [{"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/images/ca98045c-2f99-4634-a243-9d47350236de"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest-cpu2-ram4-disk20-ppc64el", "extra_specs": {"aggregate_instance_extra_specs:commit": "ppc64el", "hw:cpu_policy": "shared", "hw:mem_page_size": "large", "hw:pci_numa_affinity_policy": "preferred"}}, "created": "2026-02-03T00:54:15Z", "updated": "2026-02-03T00:54:15Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps7.canonical.com:8774/v2.1/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4"}, {"rel": "bookmark", "href": "https://nova.ps7.canonical.com:8774/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4"}], "OS-DCF:diskConfig": "MANUAL", "fault": {"code": 500, "created": "2026-02-03T00:54:15Z", "message": "No valid host was found. There are not enough hosts available."}, "OS-EXT-AZ:availability_zone": "", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-2", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "OS-EXT-SRV-ATTR:host": null, "OS-EXT-SRV-ATTR:instance_name": "instance-000236a1", "OS-EXT-SRV-ATTR:hypervisor_hostname": null, "OS-EXT-SRV-ATTR:reservation_id": "r-qr0e6tog", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-resolute-ppc64el-hg-git-20260203-001111-juju-7f2275-prod-pr", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": null, "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJyA+PiAvZXRjL2Vudmlyb25tZW50CiAtIHNlZCAtaSAtciAnL14xMjcuMC4xLjEvIHMvYXV0b3BrZ3Rlc3QtW14gXStcLi9hdXRvcGtndGVzdFwuLycgL2V0Yy9ob3N0cwo=", "OS-EXT-STS:task_state": null, "OS-EXT-STS:vm_state": "error", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 486s DEBUG (session:936) GET call to compute for https://nova.ps7.canonical.com:8774/v2.1/servers/f78ef560-ee39-4fd6-91d6-73101f04f1b4 used request id req-39276f43-8531-471f-b9b0-0b6c23100a8c 486s DEBUG (shell:822) 486s Traceback (most recent call last): 486s File "/usr/lib/python3/dist-packages/novaclient/shell.py", line 820, in main 486s OpenStackComputeShell().main(argv) 486s File "/usr/lib/python3/dist-packages/novaclient/shell.py", line 742, in main 486s args.func(self.cs, args) 486s File "/usr/lib/python3/dist-packages/novaclient/v2/shell.py", line 980, in do_boot 486s _poll_for_status(cs.servers.get, server.id, 'building', ['active']) 486s File "/usr/lib/python3/dist-packages/novaclient/v2/shell.py", line 1019, in _poll_for_status 486s raise exceptions.ResourceInErrorState(obj) 486s novaclient.exceptions.ResourceInErrorState: 486s ERROR (ResourceInErrorState): 486s 486s Error building server 833s autopkgtest [01:00:07]: testbed dpkg architecture: ppc64el 833s autopkgtest [01:00:07]: testbed apt version: 3.1.14 833s autopkgtest [01:00:07]: @@@@@@@@@@@@@@@@@@@@ test bed setup 833s autopkgtest [01:00:07]: testbed release detected to be: resolute 834s autopkgtest [01:00:08]: updating testbed package index (apt update) 834s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 835s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 835s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 835s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 835s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [105 kB] 835s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/restricted Sources [5256 B] 835s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [28.4 kB] 835s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1278 kB] 835s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main ppc64el Packages [124 kB] 835s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/universe ppc64el Packages [1041 kB] 835s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse ppc64el Packages [18.0 kB] 835s Fetched 2724 kB in 1s (3056 kB/s) 836s Reading package lists... 837s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 837s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 837s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 837s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 838s Reading package lists... 838s Reading package lists... 838s Building dependency tree... 838s Reading state information... 838s Calculating upgrade... 838s The following packages will be upgraded: 838s libexpat1 liblocale-gettext-perl 838s 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 838s Need to get 122 kB of archives. 838s After this operation, 1024 B of additional disk space will be used. 838s Get:1 http://ftpmaster.internal/ubuntu resolute/main ppc64el libexpat1 ppc64el 2.7.4-1 [106 kB] 838s Get:2 http://ftpmaster.internal/ubuntu resolute/main ppc64el liblocale-gettext-perl ppc64el 1.07-8 [16.3 kB] 838s dpkg-preconfigure: unable to re-open stdin: No such file or directory 838s Fetched 122 kB in 0s (3520 kB/s) 839s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 82007 files and directories currently installed.) 839s Preparing to unpack .../libexpat1_2.7.4-1_ppc64el.deb ... 839s Unpacking libexpat1:ppc64el (2.7.4-1) over (2.7.3-1) ... 839s Preparing to unpack .../liblocale-gettext-perl_1.07-8_ppc64el.deb ... 839s Unpacking liblocale-gettext-perl (1.07-8) over (1.07-7build1) ... 839s Setting up libexpat1:ppc64el (2.7.4-1) ... 839s Setting up liblocale-gettext-perl (1.07-8) ... 839s Processing triggers for man-db (2.13.1-1) ... 839s Processing triggers for libc-bin (2.42-2ubuntu4) ... 840s autopkgtest [01:00:14]: upgrading testbed (apt dist-upgrade and autopurge) 840s Reading package lists... 840s Building dependency tree... 840s Reading state information... 840s Calculating upgrade... 840s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 840s Reading package lists... 840s Building dependency tree... 840s Reading state information... 840s Solving dependencies... 841s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 843s Reading package lists... 844s Building dependency tree... 844s Reading state information... 844s Solving dependencies... 844s The following NEW packages will be installed: 844s git git-man liberror-perl mercurial mercurial-common mercurial-git 844s python3-dulwich 844s 0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded. 844s Need to get 13.2 MB of archives. 844s After this operation, 62.4 MB of additional disk space will be used. 844s Get:1 http://ftpmaster.internal/ubuntu resolute/main ppc64el liberror-perl all 0.17030-1 [23.5 kB] 844s Get:2 http://ftpmaster.internal/ubuntu resolute/main ppc64el git-man all 1:2.51.0-1ubuntu1 [1179 kB] 844s Get:3 http://ftpmaster.internal/ubuntu resolute/main ppc64el git ppc64el 1:2.51.0-1ubuntu1 [7646 kB] 844s Get:4 http://ftpmaster.internal/ubuntu resolute/universe ppc64el mercurial-common all 7.1.1-1ubuntu1 [2789 kB] 845s Get:5 http://ftpmaster.internal/ubuntu resolute/universe ppc64el mercurial ppc64el 7.1.1-1ubuntu1 [538 kB] 845s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/universe ppc64el python3-dulwich ppc64el 1.0.0-2 [949 kB] 845s Get:7 http://ftpmaster.internal/ubuntu resolute/universe ppc64el mercurial-git all 1.2.0-1 [60.9 kB] 845s Fetched 13.2 MB in 1s (14.1 MB/s) 845s Selecting previously unselected package liberror-perl. 845s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 82007 files and directories currently installed.) 845s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 845s Unpacking liberror-perl (0.17030-1) ... 845s Selecting previously unselected package git-man. 845s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 845s Unpacking git-man (1:2.51.0-1ubuntu1) ... 845s Selecting previously unselected package git. 845s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_ppc64el.deb ... 845s Unpacking git (1:2.51.0-1ubuntu1) ... 845s Selecting previously unselected package mercurial-common. 845s Preparing to unpack .../3-mercurial-common_7.1.1-1ubuntu1_all.deb ... 845s Unpacking mercurial-common (7.1.1-1ubuntu1) ... 846s Selecting previously unselected package mercurial. 846s Preparing to unpack .../4-mercurial_7.1.1-1ubuntu1_ppc64el.deb ... 846s Unpacking mercurial (7.1.1-1ubuntu1) ... 846s Selecting previously unselected package python3-dulwich. 846s Preparing to unpack .../5-python3-dulwich_1.0.0-2_ppc64el.deb ... 846s Unpacking python3-dulwich (1.0.0-2) ... 846s Selecting previously unselected package mercurial-git. 846s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 846s Unpacking mercurial-git (1.2.0-1) ... 846s Setting up mercurial-common (7.1.1-1ubuntu1) ... 847s Setting up liberror-perl (0.17030-1) ... 847s Setting up python3-dulwich (1.0.0-2) ... 848s Setting up git-man (1:2.51.0-1ubuntu1) ... 848s Setting up mercurial (7.1.1-1ubuntu1) ... 848s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 848s Setting up mercurial-git (1.2.0-1) ... 848s mercurial-git extension is disabled by default. 848s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 848s Setting up git (1:2.51.0-1ubuntu1) ... 848s Processing triggers for man-db (2.13.1-1) ... 851s autopkgtest [01:00:25]: test mercurial-git: [----------------------- 851s Initialized empty Git repository in /tmp/autopkgtest.a0vdSk/build.ydR/src/git_server/ 851s Cloning into 'git_clone'... 851s warning: You appear to have cloned an empty repository. 851s done. 851s [master (root-commit) 5c71d5b] a 851s 1 file changed, 1 insertion(+) 851s create mode 100644 a 851s To /tmp/autopkgtest.a0vdSk/build.ydR/src/git_server 851s * [new branch] master -> master 851s *** failed to import extension "hggit": cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 851s abort: repository git_server not found 852s autopkgtest [01:00:26]: test mercurial-git: -----------------------] 852s mercurial-git FAIL non-zero exit status 253 852s autopkgtest [01:00:26]: test mercurial-git: - - - - - - - - - - results - - - - - - - - - - 852s autopkgtest [01:00:26]: test mercurial-git: - - - - - - - - - - stderr - - - - - - - - - - 852s *** failed to import extension "hggit": cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 852s abort: repository git_server not found 853s autopkgtest [01:00:27]: @@@@@@@@@@@@@@@@@@@@ summary 853s testsuite FAIL non-zero exit status 2 853s mercurial-git FAIL non-zero exit status 253