0s autopkgtest [07:19:45]: starting date and time: 2026-02-10 07:19:45+0000 0s autopkgtest [07:19:45]: git checkout: 4b346b80 nova: make wait_reboot return success even when a no-op 0s autopkgtest [07:19:45]: host juju-7f2275-prod-proposed-migration-environment-20; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.ucrs10rt/out --timeout-copy=6000 --needs-internet=try --setup-commands /home/ubuntu/autopkgtest-cloud/worker-config-production/setup-canonical.sh --apt-pocket=proposed=src:mercurial,src:cmake,src:composer --apt-upgrade hg-git --timeout-short=300 --timeout-copy=20000 --timeout-build=20000 '--env=ADT_TEST_TRIGGERS=mercurial/7.2-2 cmake/4.2.3-1ubuntu1 composer/2.9.5-1' -- ssh -s /home/ubuntu/autopkgtest/ssh-setup/nova -- --flavor autopkgtest-cpu2-ram4-disk20-amd64 --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-20@sto01-26.secgroup --name adt-resolute-amd64-hg-git-20260210-065558-juju-7f2275-prod-proposed-migration-environment-20-a600b04f-bb3a-4a6c-bb17-bdf941c70cec --image adt/ubuntu-resolute-amd64-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-20 --net-id=net_prod-autopkgtest-workers-amd64 -e TERM=linux --mirror=http://ftpmaster.internal/ubuntu/ 4s Creating nova instance adt-resolute-amd64-hg-git-20260210-065558-juju-7f2275-prod-proposed-migration-environment-20-a600b04f-bb3a-4a6c-bb17-bdf941c70cec from image adt/ubuntu-resolute-amd64-server-20260204.img (UUID fedf54b4-458b-493e-8072-6425c19717b4)... 115s autopkgtest [07:21:40]: testbed dpkg architecture: amd64 115s autopkgtest [07:21:40]: testbed apt version: 3.1.14 116s autopkgtest [07:21:41]: @@@@@@@@@@@@@@@@@@@@ test bed setup 116s autopkgtest [07:21:41]: testbed release detected to be: None 117s autopkgtest [07:21:42]: updating testbed package index (apt update) 117s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 117s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 117s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 117s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 117s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1727 kB] 119s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [31.1 kB] 119s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [178 kB] 119s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/main i386 Packages [219 kB] 119s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 Packages [266 kB] 120s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 c-n-f Metadata [6184 B] 120s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/restricted amd64 c-n-f Metadata [120 B] 120s Get:12 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 Packages [1787 kB] 122s Get:13 http://ftpmaster.internal/ubuntu resolute-proposed/universe i386 Packages [792 kB] 123s Get:14 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 c-n-f Metadata [32.5 kB] 124s Get:15 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse amd64 Packages [26.4 kB] 124s Get:16 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse i386 Packages [5020 B] 124s Get:17 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse amd64 c-n-f Metadata [996 B] 124s Fetched 5197 kB in 7s (741 kB/s) 125s Reading package lists... 125s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 125s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 125s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 125s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 126s Reading package lists... 126s Reading package lists... 126s Building dependency tree... 126s Reading state information... 126s Calculating upgrade... 126s The following package was automatically installed and is no longer required: 126s libpython3.13 126s Use 'sudo apt autoremove' to remove it. 126s The following NEW packages will be installed: 126s gcc-16-base libpython3.14 libpython3.14-minimal libpython3.14-stdlib 126s linux-headers-6.19.0-3 linux-headers-6.19.0-3-generic 126s linux-image-6.19.0-3-generic linux-modules-6.19.0-3-generic 126s linux-tools-6.19.0-3 linux-tools-6.19.0-3-generic 126s The following packages will be upgraded: 126s 3cpio amd64-microcode apt bpftool busybox-initramfs busybox-static 126s cryptsetup-bin dash dbus dbus-bin dbus-daemon dbus-session-bus-common 126s dbus-system-bus-common dbus-user-session debianutils dmsetup dracut-install 126s ethtool findutils gir1.2-girepository-3.0 gir1.2-glib-2.0 hwdata iproute2 126s iptables less libapt-pkg7.0 libatomic1 libattr1 libbpf1 libbrotli1 libbsd0 126s libcryptsetup12 libdbus-1-3 libdevmapper1.02.1 libdrm-amdgpu1 libdrm-common 126s libdrm2 libevent-core-2.1-7t64 libgcc-s1 libgdbm-compat4t64 libgdbm6t64 126s libgirepository-2.0-0 libglib2.0-0t64 libglib2.0-data libgpm2 libgudev-1.0-0 126s libidn2-0 libip4tc2 libip6tc2 libjansson4 libkeyutils1 liblsof0 126s libmaxminddb0 libnetfilter-conntrack3 libnpth0t64 libonig5 libpcap0.8t64 126s libpci3 libsensors-config libsensors5 libstdc++6 libusb-1.0-0 libwrap0 126s libxau6 libxkbcommon0 libxtables12 linux-generic linux-headers-generic 126s linux-headers-virtual linux-image-generic linux-image-virtual linux-perf 126s linux-tools-common linux-virtual lsof man-db mawk patch pciutils pnp.ids 126s pollinate python3-linkify-it python3-markdown-it python3-referencing sed 126s shared-mime-info tar tcpdump ubuntu-kernel-accessories ubuntu-standard wget 126s 91 upgraded, 10 newly installed, 0 to remove and 0 not upgraded. 126s Need to get 237 MB of archives. 126s After this operation, 339 MB of additional disk space will be used. 126s Get:1 http://ftpmaster.internal/ubuntu resolute/main amd64 debianutils amd64 5.23.2build1 [93.3 kB] 126s Get:2 http://ftpmaster.internal/ubuntu resolute/main amd64 dash amd64 0.5.12-12ubuntu3 [96.0 kB] 126s Get:3 http://ftpmaster.internal/ubuntu resolute/main amd64 findutils amd64 4.10.0-3build2 [307 kB] 126s Get:4 http://ftpmaster.internal/ubuntu resolute/main amd64 sed amd64 4.9-2build3 [195 kB] 126s Get:5 http://ftpmaster.internal/ubuntu resolute/main amd64 tar amd64 1.35+dfsg-3.1build2 [257 kB] 126s Get:6 http://ftpmaster.internal/ubuntu resolute/main amd64 libattr1 amd64 1:2.5.2-3build2 [11.4 kB] 126s Get:7 http://ftpmaster.internal/ubuntu resolute/main amd64 gcc-16-base amd64 16-20260208-1ubuntu1 [59.7 kB] 126s Get:8 http://ftpmaster.internal/ubuntu resolute/main amd64 libgcc-s1 amd64 16-20260208-1ubuntu1 [80.3 kB] 126s Get:9 http://ftpmaster.internal/ubuntu resolute/main amd64 libbsd0 amd64 0.12.2-2build2 [42.3 kB] 126s Get:10 http://ftpmaster.internal/ubuntu resolute/main amd64 mawk amd64 1.3.4.20260129-1 [133 kB] 126s Get:11 http://ftpmaster.internal/ubuntu resolute/main amd64 libstdc++6 amd64 16-20260208-1ubuntu1 [844 kB] 127s Get:12 http://ftpmaster.internal/ubuntu resolute/main amd64 libapt-pkg7.0 amd64 3.1.15 [1151 kB] 129s Get:13 http://ftpmaster.internal/ubuntu resolute/main amd64 apt amd64 3.1.15 [1479 kB] 130s Get:14 http://ftpmaster.internal/ubuntu resolute/main amd64 dbus-system-bus-common all 1.16.2-2ubuntu3 [55.8 kB] 130s Get:15 http://ftpmaster.internal/ubuntu resolute/main amd64 dbus-session-bus-common all 1.16.2-2ubuntu3 [54.4 kB] 130s Get:16 http://ftpmaster.internal/ubuntu resolute/main amd64 dbus-user-session amd64 1.16.2-2ubuntu3 [9696 B] 130s Get:17 http://ftpmaster.internal/ubuntu resolute/main amd64 dbus-daemon amd64 1.16.2-2ubuntu3 [119 kB] 130s Get:18 http://ftpmaster.internal/ubuntu resolute/main amd64 dbus-bin amd64 1.16.2-2ubuntu3 [40.1 kB] 130s Get:19 http://ftpmaster.internal/ubuntu resolute/main amd64 dbus amd64 1.16.2-2ubuntu3 [24.2 kB] 130s Get:20 http://ftpmaster.internal/ubuntu resolute/main amd64 libdbus-1-3 amd64 1.16.2-2ubuntu3 [185 kB] 130s Get:21 http://ftpmaster.internal/ubuntu resolute/main amd64 libdevmapper1.02.1 amd64 2:1.02.205-2ubuntu3 [142 kB] 130s Get:22 http://ftpmaster.internal/ubuntu resolute/main amd64 dmsetup amd64 2:1.02.205-2ubuntu3 [79.4 kB] 130s Get:23 http://ftpmaster.internal/ubuntu resolute/main amd64 ethtool amd64 1:6.15-3build1 [318 kB] 130s Get:24 http://ftpmaster.internal/ubuntu resolute/main amd64 gir1.2-girepository-3.0 amd64 2.87.2-2 [25.2 kB] 130s Get:25 http://ftpmaster.internal/ubuntu resolute/main amd64 libgirepository-2.0-0 amd64 2.87.2-2 [76.1 kB] 130s Get:26 http://ftpmaster.internal/ubuntu resolute/main amd64 libatomic1 amd64 16-20260208-1ubuntu1 [11.4 kB] 130s Get:27 http://ftpmaster.internal/ubuntu resolute/main amd64 gir1.2-glib-2.0 amd64 2.87.2-2 [182 kB] 130s Get:28 http://ftpmaster.internal/ubuntu resolute/main amd64 libglib2.0-0t64 amd64 2.87.2-2 [1613 kB] 132s Get:29 http://ftpmaster.internal/ubuntu resolute/main amd64 libbpf1 amd64 1:1.6.2-1build1 [184 kB] 132s Get:30 http://ftpmaster.internal/ubuntu resolute/main amd64 iptables amd64 1.8.11-2ubuntu3 [381 kB] 132s Get:31 http://ftpmaster.internal/ubuntu resolute/main amd64 libip4tc2 amd64 1.8.11-2ubuntu3 [24.2 kB] 132s Get:32 http://ftpmaster.internal/ubuntu resolute/main amd64 libip6tc2 amd64 1.8.11-2ubuntu3 [24.4 kB] 132s Get:33 http://ftpmaster.internal/ubuntu resolute/main amd64 libnetfilter-conntrack3 amd64 1.1.1-1 [47.5 kB] 132s Get:34 http://ftpmaster.internal/ubuntu resolute/main amd64 libxtables12 amd64 1.8.11-2ubuntu3 [36.6 kB] 132s Get:35 http://ftpmaster.internal/ubuntu resolute/main amd64 iproute2 amd64 6.18.0-1ubuntu1 [1178 kB] 133s Get:36 http://ftpmaster.internal/ubuntu resolute/main amd64 less amd64 668-1build1 [172 kB] 133s Get:37 http://ftpmaster.internal/ubuntu resolute/main amd64 libcryptsetup12 amd64 2:2.8.0-1ubuntu3 [283 kB] 133s Get:38 http://ftpmaster.internal/ubuntu resolute/main amd64 libglib2.0-data all 2.87.2-2 [58.2 kB] 133s Get:39 http://ftpmaster.internal/ubuntu resolute/main amd64 libidn2-0 amd64 2.3.8-4build1 [67.6 kB] 133s Get:40 http://ftpmaster.internal/ubuntu resolute/main amd64 libkeyutils1 amd64 1.6.3-6ubuntu3 [10.6 kB] 133s Get:41 http://ftpmaster.internal/ubuntu resolute/main amd64 python3-linkify-it all 2.0.3-1ubuntu3 [19.4 kB] 133s Get:42 http://ftpmaster.internal/ubuntu resolute/main amd64 python3-markdown-it all 3.0.0-3build1 [54.4 kB] 133s Get:43 http://ftpmaster.internal/ubuntu resolute/main amd64 shared-mime-info amd64 2.4-5build3 [476 kB] 133s Get:44 http://ftpmaster.internal/ubuntu resolute/main amd64 busybox-static amd64 1:1.37.0-7ubuntu1 [1034 kB] 134s Get:45 http://ftpmaster.internal/ubuntu resolute/main amd64 libdrm-common all 2.4.131-1 [9774 B] 134s Get:46 http://ftpmaster.internal/ubuntu resolute/main amd64 libdrm2 amd64 2.4.131-1 [42.3 kB] 134s Get:47 http://ftpmaster.internal/ubuntu resolute/main amd64 libgdbm6t64 amd64 1.26-1build1 [36.5 kB] 134s Get:48 http://ftpmaster.internal/ubuntu resolute/main amd64 libgpm2 amd64 1.20.7-12build1 [14.4 kB] 134s Get:49 http://ftpmaster.internal/ubuntu resolute/main amd64 libjansson4 amd64 2.14-2build4 [33.2 kB] 134s Get:50 http://ftpmaster.internal/ubuntu resolute/main amd64 lsof amd64 4.99.4+dfsg-2build2 [239 kB] 134s Get:51 http://ftpmaster.internal/ubuntu resolute/main amd64 liblsof0 amd64 4.99.4+dfsg-2build2 [56.5 kB] 134s Get:52 http://ftpmaster.internal/ubuntu resolute/main amd64 libmaxminddb0 amd64 1.12.2-1build2 [18.9 kB] 134s Get:53 http://ftpmaster.internal/ubuntu resolute/main amd64 libpcap0.8t64 amd64 1.10.5-2ubuntu3 [154 kB] 134s Get:54 http://ftpmaster.internal/ubuntu resolute/main amd64 pciutils amd64 1:3.14.0-1build2 [95.5 kB] 134s Get:55 http://ftpmaster.internal/ubuntu resolute/main amd64 libpci3 amd64 1:3.14.0-1build2 [38.1 kB] 134s Get:56 http://ftpmaster.internal/ubuntu resolute/main amd64 libsensors-config all 1:3.6.2-2build1 [6862 B] 134s Get:57 http://ftpmaster.internal/ubuntu resolute/main amd64 libsensors5 amd64 1:3.6.2-2build1 [28.9 kB] 134s Get:58 http://ftpmaster.internal/ubuntu resolute/main amd64 libusb-1.0-0 amd64 2:1.0.29-2build1 [56.9 kB] 134s Get:59 http://ftpmaster.internal/ubuntu resolute/main amd64 libxau6 amd64 1:1.0.11-1build2 [7502 B] 134s Get:60 http://ftpmaster.internal/ubuntu resolute/main amd64 libxkbcommon0 amd64 1.13.1-1 [159 kB] 134s Get:61 http://ftpmaster.internal/ubuntu resolute/main amd64 man-db amd64 2.13.1-1build1 [1392 kB] 134s Get:62 http://ftpmaster.internal/ubuntu resolute/main amd64 tcpdump amd64 4.99.5-2ubuntu3 [477 kB] 134s Get:63 http://ftpmaster.internal/ubuntu resolute/main amd64 wget amd64 1.25.0-2ubuntu4 [353 kB] 134s Get:64 http://ftpmaster.internal/ubuntu resolute/main amd64 ubuntu-standard amd64 1.564 [13.3 kB] 134s Get:65 http://ftpmaster.internal/ubuntu resolute/main amd64 3cpio amd64 0.14.0-1ubuntu1 [285 kB] 134s Get:66 http://ftpmaster.internal/ubuntu resolute/main amd64 bpftool amd64 7.7.0+6.19.0-3.3 [1229 kB] 135s Get:67 http://ftpmaster.internal/ubuntu resolute/main amd64 busybox-initramfs amd64 1:1.37.0-7ubuntu1 [191 kB] 135s Get:68 http://ftpmaster.internal/ubuntu resolute/main amd64 cryptsetup-bin amd64 2:2.8.0-1ubuntu3 [228 kB] 135s Get:69 http://ftpmaster.internal/ubuntu resolute/main amd64 dracut-install amd64 109-11ubuntu1 [45.8 kB] 135s Get:70 http://ftpmaster.internal/ubuntu resolute/main amd64 hwdata all 0.394-1build1 [1566 B] 135s Get:71 http://ftpmaster.internal/ubuntu resolute/main amd64 pnp.ids all 0.394-1build1 [29.6 kB] 135s Get:72 http://ftpmaster.internal/ubuntu resolute/main amd64 libbrotli1 amd64 1.2.0-3 [343 kB] 135s Get:73 http://ftpmaster.internal/ubuntu resolute/main amd64 libdrm-amdgpu1 amd64 2.4.131-1 [23.2 kB] 135s Get:74 http://ftpmaster.internal/ubuntu resolute/main amd64 libevent-core-2.1-7t64 amd64 2.1.12-stable-10build2 [93.1 kB] 135s Get:75 http://ftpmaster.internal/ubuntu resolute/main amd64 libgdbm-compat4t64 amd64 1.26-1build1 [6796 B] 135s Get:76 http://ftpmaster.internal/ubuntu resolute/main amd64 libgudev-1.0-0 amd64 1:238-7build1 [15.9 kB] 135s Get:77 http://ftpmaster.internal/ubuntu resolute/main amd64 libnpth0t64 amd64 1.8-3build1 [9302 B] 135s Get:78 http://ftpmaster.internal/ubuntu resolute/main amd64 libonig5 amd64 6.9.10-1build1 [174 kB] 135s Get:79 http://ftpmaster.internal/ubuntu resolute/main amd64 libpython3.14-minimal amd64 3.14.2-1 [920 kB] 135s Get:80 http://ftpmaster.internal/ubuntu resolute/main amd64 libpython3.14-stdlib amd64 3.14.2-1 [2398 kB] 136s Get:81 http://ftpmaster.internal/ubuntu resolute/main amd64 libpython3.14 amd64 3.14.2-1 [2568 kB] 137s Get:82 http://ftpmaster.internal/ubuntu resolute/main amd64 libwrap0 amd64 7.6.q-36build2 [48.5 kB] 137s Get:83 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-modules-6.19.0-3-generic amd64 6.19.0-3.3 [171 MB] 188s Get:84 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-image-6.19.0-3-generic amd64 6.19.0-3.3+1 [16.8 MB] 191s Get:85 http://ftpmaster.internal/ubuntu resolute/main amd64 amd64-microcode amd64 3.20251202.1ubuntu1 [459 kB] 191s Get:86 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-generic amd64 6.19.0-3.3 [1698 B] 191s Get:87 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-image-generic amd64 6.19.0-3.3 [12.2 kB] 191s Get:88 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-virtual amd64 6.19.0-3.3 [1700 B] 191s Get:89 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-image-virtual amd64 6.19.0-3.3 [12.1 kB] 191s Get:90 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-headers-virtual amd64 6.19.0-3.3 [1646 B] 191s Get:91 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-headers-6.19.0-3 all 6.19.0-3.3 [14.9 MB] 193s Get:92 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-headers-6.19.0-3-generic amd64 6.19.0-3.3 [4330 kB] 194s Get:93 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-headers-generic amd64 6.19.0-3.3 [12.0 kB] 194s Get:94 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-perf amd64 6.19.0-3.3 [4480 kB] 195s Get:95 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-tools-common all 6.19.0-3.3 [345 kB] 195s Get:96 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-tools-6.19.0-3 amd64 6.19.0-3.3 [1455 kB] 195s Get:97 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-tools-6.19.0-3-generic amd64 6.19.0-3.3 [1612 B] 195s Get:98 http://ftpmaster.internal/ubuntu resolute/main amd64 patch amd64 2.8-2build1 [95.7 kB] 195s Get:99 http://ftpmaster.internal/ubuntu resolute/main amd64 pollinate all 4.33-4ubuntu5 [14.0 kB] 195s Get:100 http://ftpmaster.internal/ubuntu resolute/main amd64 python3-referencing all 0.36.2-1ubuntu2 [22.2 kB] 195s Get:101 http://ftpmaster.internal/ubuntu resolute/main amd64 ubuntu-kernel-accessories amd64 1.564 [13.1 kB] 195s dpkg-preconfigure: unable to re-open stdin: No such file or directory 195s Fetched 237 MB in 1min 8s (3469 kB/s) 195s (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 ... 83957 files and directories currently installed.) 195s Preparing to unpack .../debianutils_5.23.2build1_amd64.deb ... 195s Unpacking debianutils (5.23.2build1) over (5.23.2) ... 195s Setting up debianutils (5.23.2build1) ... 195s (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 ... 83957 files and directories currently installed.) 195s Preparing to unpack .../dash_0.5.12-12ubuntu3_amd64.deb ... 195s Unpacking dash (0.5.12-12ubuntu3) over (0.5.12-12ubuntu2) ... 195s Setting up dash (0.5.12-12ubuntu3) ... 195s (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 ... 83957 files and directories currently installed.) 195s Preparing to unpack .../findutils_4.10.0-3build2_amd64.deb ... 195s Unpacking findutils (4.10.0-3build2) over (4.10.0-3build1) ... 196s Setting up findutils (4.10.0-3build2) ... 196s (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 ... 83957 files and directories currently installed.) 196s Preparing to unpack .../sed_4.9-2build3_amd64.deb ... 196s Unpacking sed (4.9-2build3) over (4.9-2build2) ... 196s Setting up sed (4.9-2build3) ... 196s (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 ... 83957 files and directories currently installed.) 196s Preparing to unpack .../tar_1.35+dfsg-3.1build2_amd64.deb ... 196s Unpacking tar (1.35+dfsg-3.1build2) over (1.35+dfsg-3.1build1) ... 196s Setting up tar (1.35+dfsg-3.1build2) ... 196s (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 ... 83957 files and directories currently installed.) 196s Preparing to unpack .../libattr1_1%3a2.5.2-3build2_amd64.deb ... 196s Unpacking libattr1:amd64 (1:2.5.2-3build2) over (1:2.5.2-3build1) ... 196s Setting up libattr1:amd64 (1:2.5.2-3build2) ... 196s Selecting previously unselected package gcc-16-base:amd64. 196s (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 ... 83957 files and directories currently installed.) 196s Preparing to unpack .../gcc-16-base_16-20260208-1ubuntu1_amd64.deb ... 196s Unpacking gcc-16-base:amd64 (16-20260208-1ubuntu1) ... 196s Setting up gcc-16-base:amd64 (16-20260208-1ubuntu1) ... 196s (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 ... 83962 files and directories currently installed.) 196s Preparing to unpack .../libgcc-s1_16-20260208-1ubuntu1_amd64.deb ... 196s Unpacking libgcc-s1:amd64 (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 196s Setting up libgcc-s1:amd64 (16-20260208-1ubuntu1) ... 196s (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 ... 83962 files and directories currently installed.) 196s Preparing to unpack .../00-libbsd0_0.12.2-2build2_amd64.deb ... 196s Unpacking libbsd0:amd64 (0.12.2-2build2) over (0.12.2-2build1) ... 196s Preparing to unpack .../01-mawk_1.3.4.20260129-1_amd64.deb ... 196s Unpacking mawk (1.3.4.20260129-1) over (1.3.4.20250131-2) ... 196s Preparing to unpack .../02-libstdc++6_16-20260208-1ubuntu1_amd64.deb ... 196s Unpacking libstdc++6:amd64 (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 196s Preparing to unpack .../03-libapt-pkg7.0_3.1.15_amd64.deb ... 196s Unpacking libapt-pkg7.0:amd64 (3.1.15) over (3.1.14) ... 196s Preparing to unpack .../04-apt_3.1.15_amd64.deb ... 196s Unpacking apt (3.1.15) over (3.1.14) ... 196s Preparing to unpack .../05-dbus-system-bus-common_1.16.2-2ubuntu3_all.deb ... 196s Unpacking dbus-system-bus-common (1.16.2-2ubuntu3) over (1.16.2-2ubuntu2) ... 196s Preparing to unpack .../06-dbus-session-bus-common_1.16.2-2ubuntu3_all.deb ... 196s Unpacking dbus-session-bus-common (1.16.2-2ubuntu3) over (1.16.2-2ubuntu2) ... 196s Preparing to unpack .../07-dbus-user-session_1.16.2-2ubuntu3_amd64.deb ... 196s Unpacking dbus-user-session (1.16.2-2ubuntu3) over (1.16.2-2ubuntu2) ... 196s Preparing to unpack .../08-dbus-daemon_1.16.2-2ubuntu3_amd64.deb ... 196s Unpacking dbus-daemon (1.16.2-2ubuntu3) over (1.16.2-2ubuntu2) ... 196s Preparing to unpack .../09-dbus-bin_1.16.2-2ubuntu3_amd64.deb ... 196s Unpacking dbus-bin (1.16.2-2ubuntu3) over (1.16.2-2ubuntu2) ... 196s Preparing to unpack .../10-dbus_1.16.2-2ubuntu3_amd64.deb ... 196s Unpacking dbus (1.16.2-2ubuntu3) over (1.16.2-2ubuntu2) ... 196s Preparing to unpack .../11-libdbus-1-3_1.16.2-2ubuntu3_amd64.deb ... 196s Unpacking libdbus-1-3:amd64 (1.16.2-2ubuntu3) over (1.16.2-2ubuntu2) ... 196s Preparing to unpack .../12-libdevmapper1.02.1_2%3a1.02.205-2ubuntu3_amd64.deb ... 196s Unpacking libdevmapper1.02.1:amd64 (2:1.02.205-2ubuntu3) over (2:1.02.205-2ubuntu2) ... 197s Preparing to unpack .../13-dmsetup_2%3a1.02.205-2ubuntu3_amd64.deb ... 197s Unpacking dmsetup (2:1.02.205-2ubuntu3) over (2:1.02.205-2ubuntu2) ... 197s Preparing to unpack .../14-ethtool_1%3a6.15-3build1_amd64.deb ... 197s Unpacking ethtool (1:6.15-3build1) over (1:6.15-3) ... 197s Preparing to unpack .../15-gir1.2-girepository-3.0_2.87.2-2_amd64.deb ... 197s Unpacking gir1.2-girepository-3.0:amd64 (2.87.2-2) over (2.86.3-4) ... 197s Preparing to unpack .../16-libgirepository-2.0-0_2.87.2-2_amd64.deb ... 197s Unpacking libgirepository-2.0-0:amd64 (2.87.2-2) over (2.86.3-4) ... 197s Preparing to unpack .../17-libatomic1_16-20260208-1ubuntu1_amd64.deb ... 197s Unpacking libatomic1:amd64 (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 197s Preparing to unpack .../18-gir1.2-glib-2.0_2.87.2-2_amd64.deb ... 197s Unpacking gir1.2-glib-2.0:amd64 (2.87.2-2) over (2.86.3-4) ... 197s Preparing to unpack .../19-libglib2.0-0t64_2.87.2-2_amd64.deb ... 197s Unpacking libglib2.0-0t64:amd64 (2.87.2-2) over (2.86.3-4) ... 197s Preparing to unpack .../20-libbpf1_1%3a1.6.2-1build1_amd64.deb ... 197s Unpacking libbpf1:amd64 (1:1.6.2-1build1) over (1:1.6.2-1) ... 197s Preparing to unpack .../21-iptables_1.8.11-2ubuntu3_amd64.deb ... 197s Unpacking iptables (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 197s Preparing to unpack .../22-libip4tc2_1.8.11-2ubuntu3_amd64.deb ... 197s Unpacking libip4tc2:amd64 (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 197s Preparing to unpack .../23-libip6tc2_1.8.11-2ubuntu3_amd64.deb ... 197s Unpacking libip6tc2:amd64 (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 197s Preparing to unpack .../24-libnetfilter-conntrack3_1.1.1-1_amd64.deb ... 197s Unpacking libnetfilter-conntrack3:amd64 (1.1.1-1) over (1.1.0-1build1) ... 197s Preparing to unpack .../25-libxtables12_1.8.11-2ubuntu3_amd64.deb ... 197s Unpacking libxtables12:amd64 (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 197s Preparing to unpack .../26-iproute2_6.18.0-1ubuntu1_amd64.deb ... 197s Unpacking iproute2 (6.18.0-1ubuntu1) over (6.16.0-1ubuntu3) ... 197s Preparing to unpack .../27-less_668-1build1_amd64.deb ... 197s Unpacking less (668-1build1) over (668-1) ... 197s Preparing to unpack .../28-libcryptsetup12_2%3a2.8.0-1ubuntu3_amd64.deb ... 197s Unpacking libcryptsetup12:amd64 (2:2.8.0-1ubuntu3) over (2:2.8.0-1ubuntu2) ... 197s Preparing to unpack .../29-libglib2.0-data_2.87.2-2_all.deb ... 197s Unpacking libglib2.0-data (2.87.2-2) over (2.86.3-4) ... 197s Preparing to unpack .../30-libidn2-0_2.3.8-4build1_amd64.deb ... 197s Unpacking libidn2-0:amd64 (2.3.8-4build1) over (2.3.8-4) ... 197s Preparing to unpack .../31-libkeyutils1_1.6.3-6ubuntu3_amd64.deb ... 197s Unpacking libkeyutils1:amd64 (1.6.3-6ubuntu3) over (1.6.3-6ubuntu2) ... 197s Preparing to unpack .../32-python3-linkify-it_2.0.3-1ubuntu3_all.deb ... 197s Unpacking python3-linkify-it (2.0.3-1ubuntu3) over (2.0.3-1ubuntu2) ... 197s Preparing to unpack .../33-python3-markdown-it_3.0.0-3build1_all.deb ... 197s Unpacking python3-markdown-it (3.0.0-3build1) over (3.0.0-3) ... 197s Preparing to unpack .../34-shared-mime-info_2.4-5build3_amd64.deb ... 198s Unpacking shared-mime-info (2.4-5build3) over (2.4-5build2) ... 198s Preparing to unpack .../35-busybox-static_1%3a1.37.0-7ubuntu1_amd64.deb ... 198s Unpacking busybox-static (1:1.37.0-7ubuntu1) over (1:1.37.0-4ubuntu1) ... 198s Preparing to unpack .../36-libdrm-common_2.4.131-1_all.deb ... 198s Unpacking libdrm-common (2.4.131-1) over (2.4.129-1) ... 198s Preparing to unpack .../37-libdrm2_2.4.131-1_amd64.deb ... 198s Unpacking libdrm2:amd64 (2.4.131-1) over (2.4.129-1) ... 198s Preparing to unpack .../38-libgdbm6t64_1.26-1build1_amd64.deb ... 198s Unpacking libgdbm6t64:amd64 (1.26-1build1) over (1.26-1) ... 198s Preparing to unpack .../39-libgpm2_1.20.7-12build1_amd64.deb ... 198s Unpacking libgpm2:amd64 (1.20.7-12build1) over (1.20.7-12) ... 198s Preparing to unpack .../40-libjansson4_2.14-2build4_amd64.deb ... 198s Unpacking libjansson4:amd64 (2.14-2build4) over (2.14-2build3) ... 198s Preparing to unpack .../41-lsof_4.99.4+dfsg-2build2_amd64.deb ... 198s Unpacking lsof (4.99.4+dfsg-2build2) over (4.99.4+dfsg-2build1) ... 198s Preparing to unpack .../42-liblsof0_4.99.4+dfsg-2build2_amd64.deb ... 198s Unpacking liblsof0 (4.99.4+dfsg-2build2) over (4.99.4+dfsg-2build1) ... 198s Preparing to unpack .../43-libmaxminddb0_1.12.2-1build2_amd64.deb ... 198s Unpacking libmaxminddb0:amd64 (1.12.2-1build2) over (1.12.2-1build1) ... 198s Preparing to unpack .../44-libpcap0.8t64_1.10.5-2ubuntu3_amd64.deb ... 198s Unpacking libpcap0.8t64:amd64 (1.10.5-2ubuntu3) over (1.10.5-2ubuntu2) ... 198s Preparing to unpack .../45-pciutils_1%3a3.14.0-1build2_amd64.deb ... 198s Unpacking pciutils (1:3.14.0-1build2) over (1:3.14.0-1build1) ... 198s Preparing to unpack .../46-libpci3_1%3a3.14.0-1build2_amd64.deb ... 198s Unpacking libpci3:amd64 (1:3.14.0-1build2) over (1:3.14.0-1build1) ... 198s Preparing to unpack .../47-libsensors-config_1%3a3.6.2-2build1_all.deb ... 198s Unpacking libsensors-config (1:3.6.2-2build1) over (1:3.6.2-2) ... 198s Preparing to unpack .../48-libsensors5_1%3a3.6.2-2build1_amd64.deb ... 198s Unpacking libsensors5:amd64 (1:3.6.2-2build1) over (1:3.6.2-2) ... 198s Preparing to unpack .../49-libusb-1.0-0_2%3a1.0.29-2build1_amd64.deb ... 198s Unpacking libusb-1.0-0:amd64 (2:1.0.29-2build1) over (2:1.0.29-2) ... 198s Preparing to unpack .../50-libxau6_1%3a1.0.11-1build2_amd64.deb ... 198s Unpacking libxau6:amd64 (1:1.0.11-1build2) over (1:1.0.11-1build1) ... 198s Preparing to unpack .../51-libxkbcommon0_1.13.1-1_amd64.deb ... 198s Unpacking libxkbcommon0:amd64 (1.13.1-1) over (1.12.3-1) ... 198s Preparing to unpack .../52-man-db_2.13.1-1build1_amd64.deb ... 198s Unpacking man-db (2.13.1-1build1) over (2.13.1-1) ... 198s Preparing to unpack .../53-tcpdump_4.99.5-2ubuntu3_amd64.deb ... 198s Unpacking tcpdump (4.99.5-2ubuntu3) over (4.99.5-2ubuntu2) ... 198s Preparing to unpack .../54-wget_1.25.0-2ubuntu4_amd64.deb ... 198s Unpacking wget (1.25.0-2ubuntu4) over (1.25.0-2ubuntu3) ... 198s Preparing to unpack .../55-ubuntu-standard_1.564_amd64.deb ... 198s Unpacking ubuntu-standard (1.564) over (1.563) ... 198s Preparing to unpack .../56-3cpio_0.14.0-1ubuntu1_amd64.deb ... 198s Unpacking 3cpio (0.14.0-1ubuntu1) over (0.13.1-1ubuntu1) ... 198s Preparing to unpack .../57-bpftool_7.7.0+6.19.0-3.3_amd64.deb ... 198s Unpacking bpftool (7.7.0+6.19.0-3.3) over (7.7.0+6.18.0-9.9) ... 198s Preparing to unpack .../58-busybox-initramfs_1%3a1.37.0-7ubuntu1_amd64.deb ... 198s Unpacking busybox-initramfs (1:1.37.0-7ubuntu1) over (1:1.37.0-4ubuntu1) ... 198s Preparing to unpack .../59-cryptsetup-bin_2%3a2.8.0-1ubuntu3_amd64.deb ... 198s Unpacking cryptsetup-bin (2:2.8.0-1ubuntu3) over (2:2.8.0-1ubuntu2) ... 199s Preparing to unpack .../60-dracut-install_109-11ubuntu1_amd64.deb ... 199s Unpacking dracut-install (109-11ubuntu1) over (109-9ubuntu1) ... 199s Preparing to unpack .../61-hwdata_0.394-1build1_all.deb ... 199s Unpacking hwdata (0.394-1build1) over (0.394-1) ... 199s Preparing to unpack .../62-pnp.ids_0.394-1build1_all.deb ... 199s Unpacking pnp.ids (0.394-1build1) over (0.394-1) ... 199s Preparing to unpack .../63-libbrotli1_1.2.0-3_amd64.deb ... 199s Unpacking libbrotli1:amd64 (1.2.0-3) over (1.1.0-2build6) ... 199s Preparing to unpack .../64-libdrm-amdgpu1_2.4.131-1_amd64.deb ... 199s Unpacking libdrm-amdgpu1:amd64 (2.4.131-1) over (2.4.129-1) ... 199s Preparing to unpack .../65-libevent-core-2.1-7t64_2.1.12-stable-10build2_amd64.deb ... 199s Unpacking libevent-core-2.1-7t64:amd64 (2.1.12-stable-10build2) over (2.1.12-stable-10build1) ... 199s Preparing to unpack .../66-libgdbm-compat4t64_1.26-1build1_amd64.deb ... 199s Unpacking libgdbm-compat4t64:amd64 (1.26-1build1) over (1.26-1) ... 199s Preparing to unpack .../67-libgudev-1.0-0_1%3a238-7build1_amd64.deb ... 199s Unpacking libgudev-1.0-0:amd64 (1:238-7build1) over (1:238-7) ... 199s Preparing to unpack .../68-libnpth0t64_1.8-3build1_amd64.deb ... 199s Unpacking libnpth0t64:amd64 (1.8-3build1) over (1.8-3) ... 199s Preparing to unpack .../69-libonig5_6.9.10-1build1_amd64.deb ... 199s Unpacking libonig5:amd64 (6.9.10-1build1) over (6.9.10-1) ... 199s Selecting previously unselected package libpython3.14-minimal:amd64. 199s Preparing to unpack .../70-libpython3.14-minimal_3.14.2-1_amd64.deb ... 199s Unpacking libpython3.14-minimal:amd64 (3.14.2-1) ... 199s Selecting previously unselected package libpython3.14-stdlib:amd64. 199s Preparing to unpack .../71-libpython3.14-stdlib_3.14.2-1_amd64.deb ... 199s Unpacking libpython3.14-stdlib:amd64 (3.14.2-1) ... 199s Selecting previously unselected package libpython3.14:amd64. 199s Preparing to unpack .../72-libpython3.14_3.14.2-1_amd64.deb ... 199s Unpacking libpython3.14:amd64 (3.14.2-1) ... 199s Preparing to unpack .../73-libwrap0_7.6.q-36build2_amd64.deb ... 199s Unpacking libwrap0:amd64 (7.6.q-36build2) over (7.6.q-36build1) ... 199s Selecting previously unselected package linux-modules-6.19.0-3-generic. 199s Preparing to unpack .../74-linux-modules-6.19.0-3-generic_6.19.0-3.3_amd64.deb ... 199s Unpacking linux-modules-6.19.0-3-generic (6.19.0-3.3) ... 200s Selecting previously unselected package linux-image-6.19.0-3-generic. 200s Preparing to unpack .../75-linux-image-6.19.0-3-generic_6.19.0-3.3+1_amd64.deb ... 200s Unpacking linux-image-6.19.0-3-generic (6.19.0-3.3+1) ... 200s Preparing to unpack .../76-amd64-microcode_3.20251202.1ubuntu1_amd64.deb ... 200s Unpacking amd64-microcode (3.20251202.1ubuntu1) over (3.20250708.1ubuntu1) ... 200s Preparing to unpack .../77-linux-generic_6.19.0-3.3_amd64.deb ... 200s Unpacking linux-generic (6.19.0-3.3) over (6.18.0-9.9+1) ... 200s Preparing to unpack .../78-linux-image-generic_6.19.0-3.3_amd64.deb ... 200s Unpacking linux-image-generic (6.19.0-3.3) over (6.18.0-9.9+1) ... 200s Preparing to unpack .../79-linux-virtual_6.19.0-3.3_amd64.deb ... 200s Unpacking linux-virtual (6.19.0-3.3) over (6.18.0-9.9+1) ... 200s Preparing to unpack .../80-linux-image-virtual_6.19.0-3.3_amd64.deb ... 200s Unpacking linux-image-virtual (6.19.0-3.3) over (6.18.0-9.9+1) ... 200s Preparing to unpack .../81-linux-headers-virtual_6.19.0-3.3_amd64.deb ... 200s Unpacking linux-headers-virtual (6.19.0-3.3) over (6.18.0-9.9+1) ... 200s Selecting previously unselected package linux-headers-6.19.0-3. 200s Preparing to unpack .../82-linux-headers-6.19.0-3_6.19.0-3.3_all.deb ... 200s Unpacking linux-headers-6.19.0-3 (6.19.0-3.3) ... 202s Selecting previously unselected package linux-headers-6.19.0-3-generic. 202s Preparing to unpack .../83-linux-headers-6.19.0-3-generic_6.19.0-3.3_amd64.deb ... 202s Unpacking linux-headers-6.19.0-3-generic (6.19.0-3.3) ... 202s Preparing to unpack .../84-linux-headers-generic_6.19.0-3.3_amd64.deb ... 202s Unpacking linux-headers-generic (6.19.0-3.3) over (6.18.0-9.9+1) ... 202s Preparing to unpack .../85-linux-perf_6.19.0-3.3_amd64.deb ... 202s Unpacking linux-perf (6.19.0-3.3) over (6.18.0-9.9) ... 202s Preparing to unpack .../86-linux-tools-common_6.19.0-3.3_all.deb ... 202s Unpacking linux-tools-common (6.19.0-3.3) over (6.18.0-9.9) ... 202s Selecting previously unselected package linux-tools-6.19.0-3. 202s Preparing to unpack .../87-linux-tools-6.19.0-3_6.19.0-3.3_amd64.deb ... 202s Unpacking linux-tools-6.19.0-3 (6.19.0-3.3) ... 202s Selecting previously unselected package linux-tools-6.19.0-3-generic. 202s Preparing to unpack .../88-linux-tools-6.19.0-3-generic_6.19.0-3.3_amd64.deb ... 202s Unpacking linux-tools-6.19.0-3-generic (6.19.0-3.3) ... 202s Preparing to unpack .../89-patch_2.8-2build1_amd64.deb ... 202s Unpacking patch (2.8-2build1) over (2.8-2) ... 202s Preparing to unpack .../90-pollinate_4.33-4ubuntu5_all.deb ... 202s Unpacking pollinate (4.33-4ubuntu5) over (4.33-4ubuntu4) ... 202s Preparing to unpack .../91-python3-referencing_0.36.2-1ubuntu2_all.deb ... 202s Unpacking python3-referencing (0.36.2-1ubuntu2) over (0.36.2-1ubuntu1) ... 202s Preparing to unpack .../92-ubuntu-kernel-accessories_1.564_amd64.deb ... 202s Unpacking ubuntu-kernel-accessories (1.564) over (1.563) ... 202s Setting up libip4tc2:amd64 (1.8.11-2ubuntu3) ... 202s Setting up 3cpio (0.14.0-1ubuntu1) ... 202s Setting up libxau6:amd64 (1:1.0.11-1build2) ... 202s Setting up libnpth0t64:amd64 (1.8-3build1) ... 202s Setting up libkeyutils1:amd64 (1.6.3-6ubuntu3) ... 202s Setting up ubuntu-kernel-accessories (1.564) ... 202s Setting up libgpm2:amd64 (1.20.7-12build1) ... 202s Setting up libgdbm6t64:amd64 (1.26-1build1) ... 202s Setting up linux-modules-6.19.0-3-generic (6.19.0-3.3) ... 204s Setting up libgdbm-compat4t64:amd64 (1.26-1build1) ... 204s Setting up bpftool (7.7.0+6.19.0-3.3) ... 204s Setting up libip6tc2:amd64 (1.8.11-2ubuntu3) ... 204s Setting up liblsof0 (4.99.4+dfsg-2build2) ... 204s Setting up libmaxminddb0:amd64 (1.12.2-1build2) ... 204s Setting up libbrotli1:amd64 (1.2.0-3) ... 204s Setting up libpython3.14-minimal:amd64 (3.14.2-1) ... 204s Setting up libsensors-config (1:3.6.2-2build1) ... 204s Setting up less (668-1build1) ... 204s Setting up linux-headers-6.19.0-3 (6.19.0-3.3) ... 204s Setting up libidn2-0:amd64 (2.3.8-4build1) ... 204s Setting up amd64-microcode (3.20251202.1ubuntu1) ... 204s amd64-microcode: microcode will be updated at next boot 204s Setting up man-db (2.13.1-1build1) ... 204s Updating database of manual pages ... 205s man-db.service is a disabled or a static unit not running, not starting it. 206s Setting up libjansson4:amd64 (2.14-2build4) ... 206s Setting up libglib2.0-data (2.87.2-2) ... 206s Setting up pollinate (4.33-4ubuntu5) ... 216s Setting up busybox-static (1:1.37.0-7ubuntu1) ... 216s Setting up libwrap0:amd64 (7.6.q-36build2) ... 216s Setting up linux-image-6.19.0-3-generic (6.19.0-3.3+1) ... 217s I: /boot/vmlinuz is now a symlink to vmlinuz-6.19.0-3-generic 217s I: /boot/initrd.img is now a symlink to initrd.img-6.19.0-3-generic 217s Setting up libdbus-1-3:amd64 (1.16.2-2ubuntu3) ... 217s Setting up libatomic1:amd64 (16-20260208-1ubuntu1) ... 217s Setting up patch (2.8-2build1) ... 217s Setting up libsensors5:amd64 (1:3.6.2-2build1) ... 217s Setting up busybox-initramfs (1:1.37.0-7ubuntu1) ... 217s Setting up libxtables12:amd64 (1.8.11-2ubuntu3) ... 217s Setting up lsof (4.99.4+dfsg-2build2) ... 217s Setting up libpci3:amd64 (1:3.14.0-1build2) ... 217s Setting up libdevmapper1.02.1:amd64 (2:1.02.205-2ubuntu3) ... 217s Setting up dracut-install (109-11ubuntu1) ... 217s Setting up dmsetup (2:1.02.205-2ubuntu3) ... 217s Setting up libnetfilter-conntrack3:amd64 (1.1.1-1) ... 217s Setting up pnp.ids (0.394-1build1) ... 217s Setting up dbus-session-bus-common (1.16.2-2ubuntu3) ... 217s Setting up python3-linkify-it (2.0.3-1ubuntu3) ... 217s Setting up libpcap0.8t64:amd64 (1.10.5-2ubuntu3) ... 217s Setting up libcryptsetup12:amd64 (2:2.8.0-1ubuntu3) ... 217s Setting up mawk (1.3.4.20260129-1) ... 217s Setting up libevent-core-2.1-7t64:amd64 (2.1.12-stable-10build2) ... 217s Setting up libusb-1.0-0:amd64 (2:1.0.29-2build1) ... 217s Setting up linux-image-virtual (6.19.0-3.3) ... 217s Setting up dbus-system-bus-common (1.16.2-2ubuntu3) ... 217s Setting up libbsd0:amd64 (0.12.2-2build2) ... 217s Setting up libdrm-common (2.4.131-1) ... 217s Setting up libstdc++6:amd64 (16-20260208-1ubuntu1) ... 217s Setting up dbus-bin (1.16.2-2ubuntu3) ... 217s Setting up libonig5:amd64 (6.9.10-1build1) ... 217s Setting up libbpf1:amd64 (1:1.6.2-1build1) ... 217s Setting up ethtool (1:6.15-3build1) ... 217s Setting up python3-referencing (0.36.2-1ubuntu2) ... 217s Setting up libxkbcommon0:amd64 (1.13.1-1) ... 217s Setting up cryptsetup-bin (2:2.8.0-1ubuntu3) ... 217s Setting up linux-headers-6.19.0-3-generic (6.19.0-3.3) ... 217s Setting up tcpdump (4.99.5-2ubuntu3) ... 218s Setting up linux-image-generic (6.19.0-3.3) ... 218s Setting up wget (1.25.0-2ubuntu4) ... 218s Setting up libpython3.14-stdlib:amd64 (3.14.2-1) ... 218s Setting up iptables (1.8.11-2ubuntu3) ... 218s Setting up iproute2 (6.18.0-1ubuntu1) ... 218s Setting up linux-headers-generic (6.19.0-3.3) ... 218s Setting up dbus-daemon (1.16.2-2ubuntu3) ... 218s Setting up hwdata (0.394-1build1) ... 218s Setting up dbus-user-session (1.16.2-2ubuntu3) ... 218s Setting up libglib2.0-0t64:amd64 (2.87.2-2) ... 218s No schema files found: doing nothing. 218s Setting up dbus (1.16.2-2ubuntu3) ... 218s A reboot is required to replace the running dbus-daemon. 218s Please reboot the system when convenient. 218s Setting up shared-mime-info (2.4-5build3) ... 219s Setting up gir1.2-glib-2.0:amd64 (2.87.2-2) ... 219s Setting up pciutils (1:3.14.0-1build2) ... 219s Setting up python3-markdown-it (3.0.0-3build1) ... 219s Setting up libdrm2:amd64 (2.4.131-1) ... 219s Setting up libpython3.14:amd64 (3.14.2-1) ... 219s Setting up libapt-pkg7.0:amd64 (3.1.15) ... 219s Setting up linux-tools-common (6.19.0-3.3) ... 219s Setting up libgudev-1.0-0:amd64 (1:238-7build1) ... 219s Setting up libdrm-amdgpu1:amd64 (2.4.131-1) ... 219s Setting up apt (3.1.15) ... 219s Setting up linux-headers-virtual (6.19.0-3.3) ... 219s Setting up linux-generic (6.19.0-3.3) ... 219s Setting up libgirepository-2.0-0:amd64 (2.87.2-2) ... 219s Setting up linux-tools-6.19.0-3 (6.19.0-3.3) ... 219s Setting up ubuntu-standard (1.564) ... 219s Setting up gir1.2-girepository-3.0:amd64 (2.87.2-2) ... 219s Setting up linux-virtual (6.19.0-3.3) ... 219s Setting up linux-perf (6.19.0-3.3) ... 219s Setting up linux-tools-6.19.0-3-generic (6.19.0-3.3) ... 219s Processing triggers for debianutils (5.23.2build1) ... 219s Processing triggers for install-info (7.2-5) ... 219s Processing triggers for initramfs-tools (0.150ubuntu7) ... 219s update-initramfs: Generating /boot/initrd.img-6.18.0-9-generic 224s Processing triggers for libc-bin (2.42-2ubuntu4) ... 224s Processing triggers for linux-image-6.19.0-3-generic (6.19.0-3.3+1) ... 224s /etc/kernel/postinst.d/initramfs-tools: 224s update-initramfs: Generating /boot/initrd.img-6.19.0-3-generic 229s /etc/kernel/postinst.d/zz-update-grub: 229s Sourcing file `/etc/default/grub' 229s Sourcing file `/etc/default/grub.d/50-cloudimg-settings.cfg' 229s Sourcing file `/etc/default/grub.d/90-autopkgtest.cfg' 229s Generating grub configuration file ... 229s Found linux image: /boot/vmlinuz-6.19.0-3-generic 229s Found initrd image: /boot/initrd.img-6.19.0-3-generic 229s Found linux image: /boot/vmlinuz-6.18.0-9-generic 229s Found initrd image: /boot/initrd.img-6.18.0-9-generic 229s Warning: os-prober will not be executed to detect other bootable partitions. 229s Systems on them will not be added to the GRUB boot configuration. 229s Check GRUB_DISABLE_OS_PROBER documentation entry. 229s Adding boot menu entry for UEFI Firmware Settings ... 229s done 229s autopkgtest [07:23:34]: upgrading testbed (apt dist-upgrade and autopurge) 230s Reading package lists... 230s Building dependency tree... 230s Reading state information... 230s Calculating upgrade... 231s The following package was automatically installed and is no longer required: 231s libpython3.13 231s Use 'sudo apt autoremove' to remove it. 231s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 231s Reading package lists... 231s Building dependency tree... 231s Reading state information... 231s Solving dependencies... 231s The following packages will be REMOVED: 231s libpython3.13* 231s 0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded. 231s After this operation, 7599 kB disk space will be freed. 231s (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 ... 125273 files and directories currently installed.) 231s Removing libpython3.13:amd64 (3.13.11-1) ... 231s Processing triggers for libc-bin (2.42-2ubuntu4) ... 231s autopkgtest [07:23:36]: rebooting testbed after setup commands that affected boot 261s autopkgtest [07:24:06]: testbed running kernel: Linux 6.19.0-3-generic #3-Ubuntu SMP PREEMPT_DYNAMIC Fri Jan 23 20:01:24 UTC 2026 265s autopkgtest [07:24:10]: @@@@@@@@@@@@@@@@@@@@ apt-source hg-git 266s Get:1 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (dsc) [2142 B] 266s Get:2 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (tar) [222 kB] 266s Get:3 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (diff) [6816 B] 266s gpgv: Signature made Sun Feb 16 14:22:41 2025 UTC 266s gpgv: using RSA key 8F6DE104377F3B11E741748731F3144544A1741A 266s gpgv: issuer "tchet@debian.org" 266s gpgv: Can't check signature: No public key 266s dpkg-source: warning: cannot verify inline signature for ./hg-git_1.2.0-1.dsc: no acceptable signature found 266s autopkgtest [07:24:11]: testing package hg-git version 1.2.0-1 267s autopkgtest [07:24:12]: build not needed 267s autopkgtest [07:24:12]: test testsuite: preparing testbed 267s Reading package lists... 267s Building dependency tree... 267s Reading state information... 267s Solving dependencies... 267s The following NEW packages will be installed: 267s git git-man liberror-perl mercurial mercurial-common mercurial-git 267s python3-dulwich unzip 267s 0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded. 267s Need to get 9355 kB of archives. 267s After this operation, 49.0 MB of additional disk space will be used. 267s Get:1 http://ftpmaster.internal/ubuntu resolute/main amd64 liberror-perl all 0.17030-1 [23.5 kB] 268s Get:2 http://ftpmaster.internal/ubuntu resolute/main amd64 git-man all 1:2.51.0-1ubuntu1 [1179 kB] 268s Get:3 http://ftpmaster.internal/ubuntu resolute/main amd64 git amd64 1:2.51.0-1ubuntu1 [4414 kB] 269s Get:4 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 mercurial-common all 7.2-2 [2853 kB] 269s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 mercurial amd64 7.2-2 [461 kB] 269s Get:6 http://ftpmaster.internal/ubuntu resolute/universe amd64 python3-dulwich amd64 0.22.7-1 [183 kB] 269s Get:7 http://ftpmaster.internal/ubuntu resolute/universe amd64 mercurial-git all 1.2.0-1 [60.9 kB] 269s Get:8 http://ftpmaster.internal/ubuntu resolute/main amd64 unzip amd64 6.0-29ubuntu1 [180 kB] 269s Fetched 9355 kB in 1s (6261 kB/s) 269s Selecting previously unselected package liberror-perl. 269s (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 ... 125269 files and directories currently installed.) 269s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 269s Unpacking liberror-perl (0.17030-1) ... 269s Selecting previously unselected package git-man. 269s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 269s Unpacking git-man (1:2.51.0-1ubuntu1) ... 269s Selecting previously unselected package git. 269s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_amd64.deb ... 269s Unpacking git (1:2.51.0-1ubuntu1) ... 269s Selecting previously unselected package mercurial-common. 269s Preparing to unpack .../3-mercurial-common_7.2-2_all.deb ... 269s Unpacking mercurial-common (7.2-2) ... 270s Selecting previously unselected package mercurial. 270s Preparing to unpack .../4-mercurial_7.2-2_amd64.deb ... 270s Unpacking mercurial (7.2-2) ... 270s Selecting previously unselected package python3-dulwich. 270s Preparing to unpack .../5-python3-dulwich_0.22.7-1_amd64.deb ... 270s Unpacking python3-dulwich (0.22.7-1) ... 270s Selecting previously unselected package mercurial-git. 270s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 270s Unpacking mercurial-git (1.2.0-1) ... 270s Selecting previously unselected package unzip. 270s Preparing to unpack .../7-unzip_6.0-29ubuntu1_amd64.deb ... 270s Unpacking unzip (6.0-29ubuntu1) ... 270s Setting up mercurial-common (7.2-2) ... 271s Setting up unzip (6.0-29ubuntu1) ... 271s Setting up liberror-perl (0.17030-1) ... 271s Setting up python3-dulwich (0.22.7-1) ... 271s Setting up git-man (1:2.51.0-1ubuntu1) ... 271s Setting up mercurial (7.2-2) ... 271s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 271s Setting up mercurial-git (1.2.0-1) ... 271s mercurial-git extension is disabled by default. 271s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 271s Setting up git (1:2.51.0-1ubuntu1) ... 271s Processing triggers for man-db (2.13.1-1build1) ... 272s autopkgtest [07:24:17]: test testsuite: [----------------------- 273s no username found, using 'ubuntu@autopkgtest.local' instead 273s cd tests && /usr/bin/python3 run-tests.py --with-hg=/usr/bin/hg --blacklist=/tmp/autopkgtest.g7ErZt/build.JF2/src/debian/hg-git.test_blacklist 273s running 82 tests using 2 parallel processes 279s ssssss 279s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-pull.t 279s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-pull.t#draft.err 279s @@ -35,153 +35,132 @@ 279s 279s pull without a name 279s $ hg init hgrepo 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s $ cd hgrepo 279s $ hg pull ../gitrepo 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s pulling from ../gitrepo 279s - importing 3 git commits 279s - adding bookmark beta 279s - adding bookmark delta 279s - adding bookmark master 279s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 279s - (run 'hg heads' to see heads, 'hg merge' to merge) 279s + abort: repository ../gitrepo not found 279s + [255] 279s $ git --git-dir .hg/git for-each-ref 279s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 279s + fatal: not a git repository: '.hg/git' 279s + [128] 279s $ hg log -Tp 279s - 2|draft|delta|tip 279s - 1|draft|beta| 279s - 0|draft|master|t_alpha 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s $ cd .. 279s $ rm -rf hgrepo 279s 279s pull with an implied name 279s $ hg init hgrepo 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s $ cd hgrepo 279s $ echo "[paths]" >> .hg/hgrc 279s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 279s $ hg pull ../gitrepo 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s pulling from ../gitrepo 279s - importing 3 git commits 279s - adding bookmark beta 279s - adding bookmark delta 279s - adding bookmark master 279s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 279s - (run 'hg heads' to see heads, 'hg merge' to merge) 279s + abort: repository ../gitrepo not found 279s + [255] 279s $ git --git-dir .hg/git for-each-ref 279s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 279s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 279s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 279s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 279s + fatal: not a git repository: '.hg/git' 279s + [128] 279s $ hg log -Tp 279s - 2|draft|delta|default/delta tip 279s - 1|draft|beta|default/beta 279s - 0|draft|master|default/master t_alpha 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s $ cd .. 279s $ rm -rf hgrepo 279s 279s pull with an explicit name 279s $ hg init hgrepo 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s $ cd hgrepo 279s $ echo "[paths]" >> .hg/hgrc 279s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 279s $ hg pull 279s - pulling from $TESTTMP/gitrepo 279s - importing 3 git commits 279s - adding bookmark beta 279s - adding bookmark delta 279s - adding bookmark master 279s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 279s - (run 'hg heads' to see heads, 'hg merge' to merge) 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ git --git-dir .hg/git for-each-ref 279s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 279s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 279s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 279s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 279s + fatal: not a git repository: '.hg/git' 279s + [128] 279s $ hg log -Tp 279s - 2|draft|delta|default/delta tip 279s - 1|draft|beta|default/beta 279s - 0|draft|master|default/master t_alpha 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s $ cd .. 279s $ rm -rf hgrepo 279s 279s pull a tag 279s $ hg init hgrepo 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s $ echo "[paths]" >> hgrepo/.hg/hgrc 279s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 279s $ hg -R hgrepo pull -r t_alpha 279s - pulling from $TESTTMP/gitrepo 279s - importing 1 git commits 279s - adding bookmark master 279s - new changesets ff7a2f2d8d70 (1 drafts) 279s - (run 'hg update' to get a working copy) 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo update t_alpha 279s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + abort: unknown revision 't_alpha' 279s + [10] 279s $ hg log -Tp -R hgrepo 279s - 0|draft|master|default/master t_alpha tip 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s 279s no-op pull 279s $ hg -R hgrepo pull -r t_alpha 279s - pulling from $TESTTMP/gitrepo 279s - no changes found 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s 279s no-op pull with added bookmark 279s $ cd gitrepo 279s $ git checkout -qb epsilon t_alpha 279s $ cd .. 279s $ hg -R hgrepo pull -r epsilon 279s - pulling from $TESTTMP/gitrepo 279s - no changes found 279s - adding bookmark epsilon 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s 279s pull something that doesn't exist 279s $ hg -R hgrepo pull -r kaflaflibob 279s - pulling from $TESTTMP/gitrepo 279s - abort: unknown revision 'kaflaflibob'!? (re) 279s - [10] 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s 279s pull an ambiguous reference 279s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 279s $ hg -R hgrepo pull -r t_alpha 279s - pulling from $TESTTMP/gitrepo 279s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 279s - [10] 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 279s 279s pull a branch 279s $ hg -R hgrepo pull -r beta 279s - pulling from $TESTTMP/gitrepo 279s - importing 1 git commits 279s - adding bookmark beta 279s - new changesets 7fe02317c63d (1 drafts) 279s - (run 'hg update' to get a working copy) 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo log --graph --template=phases 279s - o changeset: 1:7fe02317c63d 279s - | bookmark: beta 279s - | tag: default/beta 279s - | tag: tip 279s - | phase: draft 279s - | user: test 279s - | date: Mon Jan 01 00:00:11 2007 +0000 279s - | summary: add beta 279s - | 279s - @ changeset: 0:ff7a2f2d8d70 279s - bookmark: epsilon 279s - bookmark: master 279s - tag: default/epsilon 279s - tag: default/master 279s - tag: t_alpha 279s - phase: draft 279s - user: test 279s - date: Mon Jan 01 00:00:10 2007 +0000 279s - summary: add alpha 279s - 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s 279s no-op pull should affect phases 279s $ hg -R hgrepo phase -fs beta 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + abort: unknown revision 'beta' 279s + [10] 279s $ hg -R hgrepo pull -r beta 279s - pulling from $TESTTMP/gitrepo 279s - no changes found 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo phase beta 279s - 1: draft 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + abort: unknown revision 'beta' 279s + [10] 279s 279s 279s add another commit and tag to the git repo 279s @@ -196,50 +175,12 @@ 279s 279s pull everything else 279s $ hg -R hgrepo pull 279s - pulling from $TESTTMP/gitrepo 279s - importing 2 git commits 279s - adding bookmark delta 279s - updating bookmark master 279s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 279s - (run 'hg heads' to see heads, 'hg merge' to merge) 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo log --graph --template=phases 279s - o changeset: 3:6f898ad1f3e1 279s - | bookmark: master 279s - | tag: default/master 279s - | tag: tip 279s - | phase: draft 279s - | parent: 0:ff7a2f2d8d70 279s - | user: test 279s - | date: Mon Jan 01 00:00:13 2007 +0000 279s - | summary: add gamma 279s - | 279s - | o changeset: 2:678ebee93e38 279s - |/ bookmark: delta 279s - | tag: default/delta 279s - | phase: draft 279s - | parent: 0:ff7a2f2d8d70 279s - | user: test 279s - | date: Mon Jan 01 00:00:12 2007 +0000 279s - | summary: add delta 279s - | 279s - | o changeset: 1:7fe02317c63d 279s - |/ bookmark: beta 279s - | tag: default/beta 279s - | tag: t_beta 279s - | phase: draft 279s - | user: test 279s - | date: Mon Jan 01 00:00:11 2007 +0000 279s - | summary: add beta 279s - | 279s - @ changeset: 0:ff7a2f2d8d70 279s - bookmark: epsilon 279s - tag: default/epsilon 279s - tag: t_alpha 279s - phase: draft 279s - user: test 279s - date: Mon Jan 01 00:00:10 2007 +0000 279s - summary: add alpha 279s - 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s add a merge to the git repo, and delete the branch 279s $ cd gitrepo 279s $ git merge -q -m "Merge branch 'beta'" beta 279s @@ -252,60 +193,26 @@ 279s 279s pull the merge 279s $ hg -R hgrepo tags | grep default/beta 279s - default/beta 1:7fe02317c63d 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + [1] 279s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 279s - pulling from $TESTTMP/gitrepo 279s - importing 1 git commits 279s - updating bookmark master 279s - deleting bookmark beta 279s - new changesets a02330f767a4 (1 drafts) 279s - (run 'hg update' to get a working copy) 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo tags | grep default/beta 279s - default/beta 1:7fe02317c63d 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + [1] 279s $ hg -R hgrepo pull 279s - pulling from $TESTTMP/gitrepo 279s - no changes found 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo tags | grep default/beta 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s [1] 279s $ hg -R hgrepo log --graph 279s - o changeset: 4:a02330f767a4 279s - |\ bookmark: master 279s - | | tag: default/master 279s - | | tag: tip 279s - | | parent: 3:6f898ad1f3e1 279s - | | parent: 1:7fe02317c63d 279s - | | user: test 279s - | | date: Mon Jan 01 00:00:13 2007 +0000 279s - | | summary: Merge branch 'beta' 279s - | | 279s - | o changeset: 3:6f898ad1f3e1 279s - | | parent: 0:ff7a2f2d8d70 279s - | | user: test 279s - | | date: Mon Jan 01 00:00:13 2007 +0000 279s - | | summary: add gamma 279s - | | 279s - | | o changeset: 2:678ebee93e38 279s - | |/ bookmark: delta 279s - | | tag: default/delta 279s - | | parent: 0:ff7a2f2d8d70 279s - | | user: test 279s - | | date: Mon Jan 01 00:00:12 2007 +0000 279s - | | summary: add delta 279s - | | 279s - o | changeset: 1:7fe02317c63d 279s - |/ tag: t_beta 279s - | user: test 279s - | date: Mon Jan 01 00:00:11 2007 +0000 279s - | summary: add beta 279s - | 279s - @ changeset: 0:ff7a2f2d8d70 279s - bookmark: epsilon 279s - tag: default/epsilon 279s - tag: t_alpha 279s - user: test 279s - date: Mon Jan 01 00:00:10 2007 +0000 279s - summary: add alpha 279s - 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s pull with wildcards 279s $ cd gitrepo 279s $ git checkout -qb releases/v1 master 279s @@ -324,66 +231,12 @@ 279s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 279s $ cd .. 279s $ hg -R hgrepo pull -r 'releases/*' 279s - pulling from $TESTTMP/gitrepo 279s - importing 2 git commits 279s - adding bookmark releases/v1 279s - adding bookmark releases/v2 279s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 279s - (run 'hg heads .' to see heads, 'hg merge' to merge) 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo log --graph 279s - o changeset: 6:a3f95e150b0a 279s - | bookmark: releases/v2 279s - | tag: default/releases/v2 279s - | tag: tip 279s - | parent: 4:a02330f767a4 279s - | user: test 279s - | date: Mon Jan 01 00:00:15 2007 +0000 279s - | summary: add eta 279s - | 279s - | o changeset: 5:218b2d0660d3 279s - |/ bookmark: releases/v1 279s - | tag: default/releases/v1 279s - | user: test 279s - | date: Mon Jan 01 00:00:14 2007 +0000 279s - | summary: add zeta 279s - | 279s - o changeset: 4:a02330f767a4 279s - |\ bookmark: master 279s - | | tag: default/master 279s - | | parent: 3:6f898ad1f3e1 279s - | | parent: 1:7fe02317c63d 279s - | | user: test 279s - | | date: Mon Jan 01 00:00:13 2007 +0000 279s - | | summary: Merge branch 'beta' 279s - | | 279s - | o changeset: 3:6f898ad1f3e1 279s - | | parent: 0:ff7a2f2d8d70 279s - | | user: test 279s - | | date: Mon Jan 01 00:00:13 2007 +0000 279s - | | summary: add gamma 279s - | | 279s - | | o changeset: 2:678ebee93e38 279s - | |/ bookmark: delta 279s - | | tag: default/delta 279s - | | parent: 0:ff7a2f2d8d70 279s - | | user: test 279s - | | date: Mon Jan 01 00:00:12 2007 +0000 279s - | | summary: add delta 279s - | | 279s - o | changeset: 1:7fe02317c63d 279s - |/ tag: t_beta 279s - | user: test 279s - | date: Mon Jan 01 00:00:11 2007 +0000 279s - | summary: add beta 279s - | 279s - @ changeset: 0:ff7a2f2d8d70 279s - bookmark: epsilon 279s - tag: default/epsilon 279s - tag: t_alpha 279s - user: test 279s - date: Mon Jan 01 00:00:10 2007 +0000 279s - summary: add alpha 279s - 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s 279s add old and new commits to the git repo -- make sure we're using the commit date 279s and not the author date 279s @@ -412,21 +265,19 @@ 279s Master is now filtered, so it's just stays there: 279s 279s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 279s - pulling from $TESTTMP/gitrepo 279s - no changes found 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo pull 279s - pulling from $TESTTMP/gitrepo 279s - no changes found 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo log -r master 279s - changeset: 4:a02330f767a4 279s - bookmark: master 279s - tag: default/master 279s - parent: 3:6f898ad1f3e1 279s - parent: 1:7fe02317c63d 279s - user: test 279s - date: Mon Jan 01 00:00:13 2007 +0000 279s - summary: Merge branch 'beta' 279s - 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + abort: unknown revision 'master' 279s + [10] 279s 279s $ cd gitrepo 279s $ git checkout -q master 279s @@ -440,51 +291,13 @@ 279s > git tag -a -m 'tagging newtag' newtag 279s $ cd .. 279s $ hg -R hgrepo pull 279s - pulling from $TESTTMP/gitrepo 279s - importing 3 git commits 279s - updating bookmark master 279s - new changesets 49713da8f665:e103a73f33be (3 drafts) 279s - (run 'hg heads .' to see heads, 'hg merge' to merge) 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo heads 279s - changeset: 9:e103a73f33be 279s - bookmark: master 279s - tag: default/master 279s - tag: tip 279s - user: test 279s - date: Wed Jan 01 00:00:00 2014 +0000 279s - summary: newcommit 279s - 279s - changeset: 7:49713da8f665 279s - tag: newtag 279s - tag: oldtag 279s - parent: 4:a02330f767a4 279s - user: test 279s - date: Sat Mar 01 00:00:00 2014 +0000 279s - summary: oldtag 279s - 279s - changeset: 6:a3f95e150b0a 279s - bookmark: releases/v2 279s - tag: default/releases/v2 279s - parent: 4:a02330f767a4 279s - user: test 279s - date: Mon Jan 01 00:00:15 2007 +0000 279s - summary: add eta 279s - 279s - changeset: 5:218b2d0660d3 279s - bookmark: releases/v1 279s - tag: default/releases/v1 279s - user: test 279s - date: Mon Jan 01 00:00:14 2007 +0000 279s - summary: add zeta 279s - 279s - changeset: 2:678ebee93e38 279s - bookmark: delta 279s - tag: default/delta 279s - parent: 0:ff7a2f2d8d70 279s - user: test 279s - date: Mon Jan 01 00:00:12 2007 +0000 279s - summary: add delta 279s - 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + [1] 279s 279s test for ssh vulnerability 279s 279s @@ -494,18 +307,21 @@ 279s > EOF 279s 279s $ hg init a 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s $ cd a 279s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 279s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 279s [255] 279s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 279s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 279s [255] 279s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 279s - ssh: * fakehost%7?shellcommand* (glob) 279s - abort: git remote error: The remote server unexpectedly closed the connection. 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 279s [255] 279s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 279s - ssh: * fakehost%7?shellcommand* (glob) 279s - abort: git remote error: The remote server unexpectedly closed the connection. 279s - [255] 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 279s + [255] 279s 279s ERROR: test-pull.t#draft output changed 279s ! 279s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-pull.t 279s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-pull.t#secret.err 279s @@ -35,153 +35,132 @@ 279s 279s pull without a name 279s $ hg init hgrepo 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s $ cd hgrepo 279s $ hg pull ../gitrepo 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s pulling from ../gitrepo 279s - importing 3 git commits 279s - adding bookmark beta 279s - adding bookmark delta 279s - adding bookmark master 279s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 279s - (run 'hg heads' to see heads, 'hg merge' to merge) 279s + abort: repository ../gitrepo not found 279s + [255] 279s $ git --git-dir .hg/git for-each-ref 279s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 279s + fatal: not a git repository: '.hg/git' 279s + [128] 279s $ hg log -Tp 279s - 2|draft|delta|tip 279s - 1|draft|beta| 279s - 0|draft|master|t_alpha 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s $ cd .. 279s $ rm -rf hgrepo 279s 279s pull with an implied name 279s $ hg init hgrepo 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s $ cd hgrepo 279s $ echo "[paths]" >> .hg/hgrc 279s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 279s $ hg pull ../gitrepo 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s pulling from ../gitrepo 279s - importing 3 git commits 279s - adding bookmark beta 279s - adding bookmark delta 279s - adding bookmark master 279s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 279s - (run 'hg heads' to see heads, 'hg merge' to merge) 279s + abort: repository ../gitrepo not found 279s + [255] 279s $ git --git-dir .hg/git for-each-ref 279s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 279s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 279s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 279s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 279s + fatal: not a git repository: '.hg/git' 279s + [128] 279s $ hg log -Tp 279s - 2|draft|delta|default/delta tip 279s - 1|draft|beta|default/beta 279s - 0|draft|master|default/master t_alpha 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s $ cd .. 279s $ rm -rf hgrepo 279s 279s pull with an explicit name 279s $ hg init hgrepo 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s $ cd hgrepo 279s $ echo "[paths]" >> .hg/hgrc 279s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 279s $ hg pull 279s - pulling from $TESTTMP/gitrepo 279s - importing 3 git commits 279s - adding bookmark beta 279s - adding bookmark delta 279s - adding bookmark master 279s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 279s - (run 'hg heads' to see heads, 'hg merge' to merge) 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ git --git-dir .hg/git for-each-ref 279s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 279s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 279s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 279s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 279s + fatal: not a git repository: '.hg/git' 279s + [128] 279s $ hg log -Tp 279s - 2|draft|delta|default/delta tip 279s - 1|draft|beta|default/beta 279s - 0|draft|master|default/master t_alpha 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s $ cd .. 279s $ rm -rf hgrepo 279s 279s pull a tag 279s $ hg init hgrepo 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s $ echo "[paths]" >> hgrepo/.hg/hgrc 279s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 279s $ hg -R hgrepo pull -r t_alpha 279s - pulling from $TESTTMP/gitrepo 279s - importing 1 git commits 279s - adding bookmark master 279s - new changesets ff7a2f2d8d70 (1 drafts) 279s - (run 'hg update' to get a working copy) 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo update t_alpha 279s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + abort: unknown revision 't_alpha' 279s + [10] 279s $ hg log -Tp -R hgrepo 279s - 0|draft|master|default/master t_alpha tip 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s 279s no-op pull 279s $ hg -R hgrepo pull -r t_alpha 279s - pulling from $TESTTMP/gitrepo 279s - no changes found 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s 279s no-op pull with added bookmark 279s $ cd gitrepo 279s $ git checkout -qb epsilon t_alpha 279s $ cd .. 279s $ hg -R hgrepo pull -r epsilon 279s - pulling from $TESTTMP/gitrepo 279s - no changes found 279s - adding bookmark epsilon 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s 279s pull something that doesn't exist 279s $ hg -R hgrepo pull -r kaflaflibob 279s - pulling from $TESTTMP/gitrepo 279s - abort: unknown revision 'kaflaflibob'!? (re) 279s - [10] 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s 279s pull an ambiguous reference 279s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 279s $ hg -R hgrepo pull -r t_alpha 279s - pulling from $TESTTMP/gitrepo 279s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 279s - [10] 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 279s 279s pull a branch 279s $ hg -R hgrepo pull -r beta 279s - pulling from $TESTTMP/gitrepo 279s - importing 1 git commits 279s - adding bookmark beta 279s - new changesets 7fe02317c63d (1 drafts) 279s - (run 'hg update' to get a working copy) 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo log --graph --template=phases 279s - o changeset: 1:7fe02317c63d 279s - | bookmark: beta 279s - | tag: default/beta 279s - | tag: tip 279s - | phase: draft 279s - | user: test 279s - | date: Mon Jan 01 00:00:11 2007 +0000 279s - | summary: add beta 279s - | 279s - @ changeset: 0:ff7a2f2d8d70 279s - bookmark: epsilon 279s - bookmark: master 279s - tag: default/epsilon 279s - tag: default/master 279s - tag: t_alpha 279s - phase: draft 279s - user: test 279s - date: Mon Jan 01 00:00:10 2007 +0000 279s - summary: add alpha 279s - 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s 279s no-op pull should affect phases 279s $ hg -R hgrepo phase -fs beta 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + abort: unknown revision 'beta' 279s + [10] 279s $ hg -R hgrepo pull -r beta 279s - pulling from $TESTTMP/gitrepo 279s - no changes found 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo phase beta 279s - 1: draft 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + abort: unknown revision 'beta' 279s + [10] 279s 279s 279s add another commit and tag to the git repo 279s @@ -196,50 +175,12 @@ 279s 279s pull everything else 279s $ hg -R hgrepo pull 279s - pulling from $TESTTMP/gitrepo 279s - importing 2 git commits 279s - adding bookmark delta 279s - updating bookmark master 279s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 279s - (run 'hg heads' to see heads, 'hg merge' to merge) 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo log --graph --template=phases 279s - o changeset: 3:6f898ad1f3e1 279s - | bookmark: master 279s - | tag: default/master 279s - | tag: tip 279s - | phase: draft 279s - | parent: 0:ff7a2f2d8d70 279s - | user: test 279s - | date: Mon Jan 01 00:00:13 2007 +0000 279s - | summary: add gamma 279s - | 279s - | o changeset: 2:678ebee93e38 279s - |/ bookmark: delta 279s - | tag: default/delta 279s - | phase: draft 279s - | parent: 0:ff7a2f2d8d70 279s - | user: test 279s - | date: Mon Jan 01 00:00:12 2007 +0000 279s - | summary: add delta 279s - | 279s - | o changeset: 1:7fe02317c63d 279s - |/ bookmark: beta 279s - | tag: default/beta 279s - | tag: t_beta 279s - | phase: draft 279s - | user: test 279s - | date: Mon Jan 01 00:00:11 2007 +0000 279s - | summary: add beta 279s - | 279s - @ changeset: 0:ff7a2f2d8d70 279s - bookmark: epsilon 279s - tag: default/epsilon 279s - tag: t_alpha 279s - phase: draft 279s - user: test 279s - date: Mon Jan 01 00:00:10 2007 +0000 279s - summary: add alpha 279s - 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s add a merge to the git repo, and delete the branch 279s $ cd gitrepo 279s $ git merge -q -m "Merge branch 'beta'" beta 279s @@ -252,60 +193,26 @@ 279s 279s pull the merge 279s $ hg -R hgrepo tags | grep default/beta 279s - default/beta 1:7fe02317c63d 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + [1] 279s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 279s - pulling from $TESTTMP/gitrepo 279s - importing 1 git commits 279s - updating bookmark master 279s - deleting bookmark beta 279s - new changesets a02330f767a4 (1 drafts) 279s - (run 'hg update' to get a working copy) 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo tags | grep default/beta 279s - default/beta 1:7fe02317c63d 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + [1] 279s $ hg -R hgrepo pull 279s - pulling from $TESTTMP/gitrepo 279s - no changes found 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo tags | grep default/beta 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s [1] 279s $ hg -R hgrepo log --graph 279s - o changeset: 4:a02330f767a4 279s - |\ bookmark: master 279s - | | tag: default/master 279s - | | tag: tip 279s - | | parent: 3:6f898ad1f3e1 279s - | | parent: 1:7fe02317c63d 279s - | | user: test 279s - | | date: Mon Jan 01 00:00:13 2007 +0000 279s - | | summary: Merge branch 'beta' 279s - | | 279s - | o changeset: 3:6f898ad1f3e1 279s - | | parent: 0:ff7a2f2d8d70 279s - | | user: test 279s - | | date: Mon Jan 01 00:00:13 2007 +0000 279s - | | summary: add gamma 279s - | | 279s - | | o changeset: 2:678ebee93e38 279s - | |/ bookmark: delta 279s - | | tag: default/delta 279s - | | parent: 0:ff7a2f2d8d70 279s - | | user: test 279s - | | date: Mon Jan 01 00:00:12 2007 +0000 279s - | | summary: add delta 279s - | | 279s - o | changeset: 1:7fe02317c63d 279s - |/ tag: t_beta 279s - | user: test 279s - | date: Mon Jan 01 00:00:11 2007 +0000 279s - | summary: add beta 279s - | 279s - @ changeset: 0:ff7a2f2d8d70 279s - bookmark: epsilon 279s - tag: default/epsilon 279s - tag: t_alpha 279s - user: test 279s - date: Mon Jan 01 00:00:10 2007 +0000 279s - summary: add alpha 279s - 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s pull with wildcards 279s $ cd gitrepo 279s $ git checkout -qb releases/v1 master 279s @@ -324,66 +231,12 @@ 279s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 279s $ cd .. 279s $ hg -R hgrepo pull -r 'releases/*' 279s - pulling from $TESTTMP/gitrepo 279s - importing 2 git commits 279s - adding bookmark releases/v1 279s - adding bookmark releases/v2 279s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 279s - (run 'hg heads .' to see heads, 'hg merge' to merge) 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo log --graph 279s - o changeset: 6:a3f95e150b0a 279s - | bookmark: releases/v2 279s - | tag: default/releases/v2 279s - | tag: tip 279s - | parent: 4:a02330f767a4 279s - | user: test 279s - | date: Mon Jan 01 00:00:15 2007 +0000 279s - | summary: add eta 279s - | 279s - | o changeset: 5:218b2d0660d3 279s - |/ bookmark: releases/v1 279s - | tag: default/releases/v1 279s - | user: test 279s - | date: Mon Jan 01 00:00:14 2007 +0000 279s - | summary: add zeta 279s - | 279s - o changeset: 4:a02330f767a4 279s - |\ bookmark: master 279s - | | tag: default/master 279s - | | parent: 3:6f898ad1f3e1 279s - | | parent: 1:7fe02317c63d 279s - | | user: test 279s - | | date: Mon Jan 01 00:00:13 2007 +0000 279s - | | summary: Merge branch 'beta' 279s - | | 279s - | o changeset: 3:6f898ad1f3e1 279s - | | parent: 0:ff7a2f2d8d70 279s - | | user: test 279s - | | date: Mon Jan 01 00:00:13 2007 +0000 279s - | | summary: add gamma 279s - | | 279s - | | o changeset: 2:678ebee93e38 279s - | |/ bookmark: delta 279s - | | tag: default/delta 279s - | | parent: 0:ff7a2f2d8d70 279s - | | user: test 279s - | | date: Mon Jan 01 00:00:12 2007 +0000 279s - | | summary: add delta 279s - | | 279s - o | changeset: 1:7fe02317c63d 279s - |/ tag: t_beta 279s - | user: test 279s - | date: Mon Jan 01 00:00:11 2007 +0000 279s - | summary: add beta 279s - | 279s - @ changeset: 0:ff7a2f2d8d70 279s - bookmark: epsilon 279s - tag: default/epsilon 279s - tag: t_alpha 279s - user: test 279s - date: Mon Jan 01 00:00:10 2007 +0000 279s - summary: add alpha 279s - 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s 279s add old and new commits to the git repo -- make sure we're using the commit date 279s and not the author date 279s @@ -412,21 +265,19 @@ 279s Master is now filtered, so it's just stays there: 279s 279s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 279s - pulling from $TESTTMP/gitrepo 279s - no changes found 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo pull 279s - pulling from $TESTTMP/gitrepo 279s - no changes found 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo log -r master 279s - changeset: 4:a02330f767a4 279s - bookmark: master 279s - tag: default/master 279s - parent: 3:6f898ad1f3e1 279s - parent: 1:7fe02317c63d 279s - user: test 279s - date: Mon Jan 01 00:00:13 2007 +0000 279s - summary: Merge branch 'beta' 279s - 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + abort: unknown revision 'master' 279s + [10] 279s 279s $ cd gitrepo 279s $ git checkout -q master 279s @@ -440,51 +291,13 @@ 279s > git tag -a -m 'tagging newtag' newtag 279s $ cd .. 279s $ hg -R hgrepo pull 279s - pulling from $TESTTMP/gitrepo 279s - importing 3 git commits 279s - updating bookmark master 279s - new changesets 49713da8f665:e103a73f33be (3 drafts) 279s - (run 'hg heads .' to see heads, 'hg merge' to merge) 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + pulling from $TESTTMP/gitrepo 279s + abort: repository $TESTTMP/gitrepo not found 279s + [255] 279s $ hg -R hgrepo heads 279s - changeset: 9:e103a73f33be 279s - bookmark: master 279s - tag: default/master 279s - tag: tip 279s - user: test 279s - date: Wed Jan 01 00:00:00 2014 +0000 279s - summary: newcommit 279s - 279s - changeset: 7:49713da8f665 279s - tag: newtag 279s - tag: oldtag 279s - parent: 4:a02330f767a4 279s - user: test 279s - date: Sat Mar 01 00:00:00 2014 +0000 279s - summary: oldtag 279s - 279s - changeset: 6:a3f95e150b0a 279s - bookmark: releases/v2 279s - tag: default/releases/v2 279s - parent: 4:a02330f767a4 279s - user: test 279s - date: Mon Jan 01 00:00:15 2007 +0000 279s - summary: add eta 279s - 279s - changeset: 5:218b2d0660d3 279s - bookmark: releases/v1 279s - tag: default/releases/v1 279s - user: test 279s - date: Mon Jan 01 00:00:14 2007 +0000 279s - summary: add zeta 279s - 279s - changeset: 2:678ebee93e38 279s - bookmark: delta 279s - tag: default/delta 279s - parent: 0:ff7a2f2d8d70 279s - user: test 279s - date: Mon Jan 01 00:00:12 2007 +0000 279s - summary: add delta 279s - 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + [1] 279s 279s test for ssh vulnerability 279s 279s @@ -494,18 +307,21 @@ 279s > EOF 279s 279s $ hg init a 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s $ cd a 279s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 279s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 279s [255] 279s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 279s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 279s [255] 279s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 279s - ssh: * fakehost%7?shellcommand* (glob) 279s - abort: git remote error: The remote server unexpectedly closed the connection. 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 279s [255] 279s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 279s - ssh: * fakehost%7?shellcommand* (glob) 279s - abort: git remote error: The remote server unexpectedly closed the connection. 279s - [255] 279s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 279s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 279s + [255] 279s 279s ERROR: test-pull.t#secret output changed 280s ! 280s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-git-submodules.t 280s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-git-submodules.t.err 280s @@ -188,261 +188,9 @@ 280s $ cd .. 280s 280s $ hg clone gitrepo2 hgrepo 280s - importing 10 git commits 280s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 280s - updating to bookmark master 280s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 280s + abort: repository gitrepo2 not found 280s + [255] 280s $ cd hgrepo 280s + $TESTTMP.sh: 133: cd: can't cd to hgrepo 280s $ hg log --graph 280s - @ changeset: 9:0ad944b2c4d8 280s - | bookmark: master 280s - | tag: default/master 280s - | tag: tip 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: remove all subrepos 280s - | 280s - o changeset: 8:33da452ef22f 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: replace subrepo with symlink 280s - | 280s - o changeset: 7:acebec53c0fc 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: replace symlink with subrepo 280s - | 280s - o changeset: 6:78c2ea52db4b 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: add symlink 280s - | 280s - o changeset: 5:c0d52ffc59b8 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: replace file with subrepo 280s - | 280s - o changeset: 4:73e078a178a0 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: replace subrepo with file 280s - | 280s - o changeset: 3:29e236ba4c06 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: add another subrepo 280s - | 280s - o changeset: 2:a6075a162f62 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: change subrepo commit 280s - | 280s - o changeset: 1:a4036e758995 280s - | user: test 280s - | date: Mon Jan 01 00:00:11 2007 +0000 280s - | summary: add subrepo 280s - | 280s - o changeset: 0:ff7a2f2d8d70 280s - user: test 280s - date: Mon Jan 01 00:00:10 2007 +0000 280s - summary: add alpha 280s - 280s - $ hg book 280s - * master 9:0ad944b2c4d8 280s - 280s -(add subrepo) 280s - $ hg cat -r 1 .hgsubstate 280s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo 280s - $ hg cat -r 1 .hgsub 280s - subrepo = [git]../gitsubrepo 280s - $ hg gverify -r 1 280s - verifying rev a4036e758995 against git commit e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 280s - 280s -(change subrepo commit) 280s - $ hg cat -r 2 .hgsubstate 280s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 280s - $ hg cat -r 2 .hgsub 280s - subrepo = [git]../gitsubrepo 280s - $ hg gverify -r 2 280s - verifying rev a6075a162f62 against git commit a000567ceefbd9a2ce364e0dea6e298010b02b6d 280s - 280s -(add another subrepo) 280s - $ hg cat -r 3 .hgsubstate 280s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 280s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 280s - $ hg cat -r 3 .hgsub 280s - subrepo = [git]../gitsubrepo 280s - subrepo2 = [git]../gitsubrepo 280s - $ hg gverify -r 3 280s - verifying rev 29e236ba4c06 against git commit 6e219527869fa40eb6ffbdd013cd86d576b26b01 280s - 280s -(replace subrepo with file) 280s - $ hg cat -r 4 .hgsubstate 280s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 280s - $ hg cat -r 4 .hgsub 280s - subrepo2 = [git]../gitsubrepo 280s - $ hg manifest -r 4 280s - .hgsub 280s - .hgsubstate 280s - alpha 280s - subrepo 280s - $ hg gverify -r 4 280s - verifying rev 73e078a178a0 against git commit f6436a472da00f581d8d257e9bbaf3c358a5e88c 280s - 280s -(replace file with subrepo) 280s - $ hg cat -r 5 .hgsubstate 280s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 280s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 280s - $ hg cat -r 5 .hgsub 280s - subrepo2 = [git]../gitsubrepo 280s - alpha = [git]../gitsubrepo 280s - $ hg manifest -r 5 280s - .hgsub 280s - .hgsubstate 280s - subrepo 280s - $ hg gverify -r 5 280s - verifying rev c0d52ffc59b8 against git commit 88171163bf4795b5570924e51d5f8ede33f8bc28 280s - 280s -(replace symlink with subrepo) 280s - $ hg cat -r 7 .hgsub 280s - subrepo2 = [git]../gitsubrepo 280s - alpha = [git]../gitsubrepo 280s - foolink = [git]../gitsubrepo 280s - $ hg cat -r 7 .hgsubstate 280s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 280s - 6e4ad8da50204560c00fa25e4987eb2e239029ba foolink 280s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 280s - $ hg gverify -r 7 280s - verifying rev acebec53c0fc against git commit e3288fa737d429a60637b3b6782cb25b8298bc00 280s - 280s -(replace subrepo with symlink) 280s - $ hg cat -r 8 .hgsub .hgsubstate 280s - subrepo2 = [git]../gitsubrepo 280s - alpha = [git]../gitsubrepo 280s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 280s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 280s - 280s - $ hg gverify -r 8 280s - verifying rev 33da452ef22f against git commit d28364013fe1a0fde56c0e1921e49ecdeee8571d 280s - 280s -(remove all subrepos) 280s - $ hg cat -r 9 .hgsub .hgsubstate 280s - .hgsub: no such file in rev 0ad944b2c4d8 280s - .hgsubstate: no such file in rev 0ad944b2c4d8 280s - [1] 280s - $ hg gverify -r 9 280s - verifying rev 0ad944b2c4d8 against git commit 15ba94929481c654814178aac1dbca06ae688718 280s - 280s - $ hg debug-remove-hggit-state 280s - clearing out the git cache data 280s - $ hg gexport 280s - $ cd .hg/git 280s - $ git log --pretty=oneline 280s - 73c15b74fb81fa0cc60e9c59c73787a9f26c778b remove all subrepos 280s - d28364013fe1a0fde56c0e1921e49ecdeee8571d replace subrepo with symlink 280s - e3288fa737d429a60637b3b6782cb25b8298bc00 replace symlink with subrepo 280s - 2d1c135447d11df4dfe96dd5d4f37926dc5c821d add symlink 280s - 88171163bf4795b5570924e51d5f8ede33f8bc28 replace file with subrepo 280s - f6436a472da00f581d8d257e9bbaf3c358a5e88c replace subrepo with file 280s - 6e219527869fa40eb6ffbdd013cd86d576b26b01 add another subrepo 280s - a000567ceefbd9a2ce364e0dea6e298010b02b6d change subrepo commit 280s - e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 add subrepo 280s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 add alpha 280s - 280s -test with rename detection enabled -- simply checking that the Mercurial hashes 280s -are the same is enough 280s - $ cd ../../.. 280s - $ hg --config git.similarity=100 clone gitrepo2 hgreporenames 280s - importing 10 git commits 280s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 280s - updating to bookmark master 280s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 280s - $ cd hgreporenames 280s - $ hg log --graph 280s - @ changeset: 9:0ad944b2c4d8 280s - | bookmark: master 280s - | tag: default/master 280s - | tag: tip 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: remove all subrepos 280s - | 280s - o changeset: 8:33da452ef22f 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: replace subrepo with symlink 280s - | 280s - o changeset: 7:acebec53c0fc 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: replace symlink with subrepo 280s - | 280s - o changeset: 6:78c2ea52db4b 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: add symlink 280s - | 280s - o changeset: 5:c0d52ffc59b8 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: replace file with subrepo 280s - | 280s - o changeset: 4:73e078a178a0 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: replace subrepo with file 280s - | 280s - o changeset: 3:29e236ba4c06 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: add another subrepo 280s - | 280s - o changeset: 2:a6075a162f62 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: change subrepo commit 280s - | 280s - o changeset: 1:a4036e758995 280s - | user: test 280s - | date: Mon Jan 01 00:00:11 2007 +0000 280s - | summary: add subrepo 280s - | 280s - o changeset: 0:ff7a2f2d8d70 280s - user: test 280s - date: Mon Jan 01 00:00:10 2007 +0000 280s - summary: add alpha 280s - 280s - $ cd .. 280s - 280s -test handling of an invalid .gitmodules file (#380) 280s - 280s - $ git init --quiet gitrepo-issue380 280s - $ cd gitrepo-issue380 280s - $ git submodule add ../gitsubrepo 280s - Cloning into '$TESTTMP/gitrepo-issue380/gitsubrepo'... 280s - done. 280s - $ fn_git_commit -m 'add a submodule' 280s - $ cat >> .gitmodules < <<<<<<< HEAD 280s - > EOF 280s - $ fn_git_commit -a -m 'b0rken .gitmodules' 280s - $ git status 280s - fatal: bad config line 4 in file $TESTTMP/gitrepo-issue380/.gitmodules 280s - [128] 280s - $ sed -i.orig /HEAD/d .gitmodules 280s - $ fn_git_commit -a -m 'fix .gitmodules' 280s - $ git status 280s - On branch master 280s - Untracked files: 280s - (use "git add ..." to include in what will be committed) 280s - .gitmodules.orig 280s - 280s - nothing added to commit but untracked files present (use "git add" to track) 280s - $ cd .. 280s - $ git clone gitrepo-issue380 gitrepo-issue380~ 280s - Cloning into 'gitrepo-issue380~'... 280s - done. 280s - $ hg clone -U gitrepo-issue380 hgrepo-issue380 280s - importing 3 git commits 280s - warning: failed to parse .gitmodules in 2e4ec4293822 280s - new changesets ed60e5fbc192:9dfc0cdf1787 (3 drafts) 280s 280s ERROR: test-git-submodules.t output changed 280s ! 280s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-renames.t 280s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-renames.t.err 280s @@ -95,494 +95,9 @@ 280s 280s $ cd .. 280s $ hg clone -q repo.git hgrepo 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 280s + abort: repository repo.git not found 280s + [255] 280s $ cd hgrepo 280s + $TESTTMP.sh: 115: cd: can't cd to hgrepo 280s $ hg book master -q 280s - $ hg log -p --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 280s - @ 8 497105ddbe119aa40af691eb2b1a029c29bf5247 remove submodule and rename back 280s - | branch=default hg-git-rename-source=git 280s - | 280s - | diff --git a/.hgsub b/.hgsub 280s - | --- a/.hgsub 280s - | +++ b/.hgsub 280s - | @@ -1,2 +1,1 @@ 280s - | gitsubmodule2 = [git]../gitsubmodule 280s - | -gamma = [git]../gitsubmodule 280s - | diff --git a/.hgsubstate b/.hgsubstate 280s - | --- a/.hgsubstate 280s - | +++ b/.hgsubstate 280s - | @@ -1,2 +1,1 @@ 280s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 280s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 280s - | diff --git a/gamma-new b/gamma 280s - | rename from gamma-new 280s - | rename to gamma 280s - | 280s - o 7 adfc1ce8461d3174dcf8425e112e2fa848de3913 rename and add submodule 280s - | branch=default hg-git-rename-source=git 280s - | 280s - | diff --git a/.hgsub b/.hgsub 280s - | --- a/.hgsub 280s - | +++ b/.hgsub 280s - | @@ -1,1 +1,2 @@ 280s - | gitsubmodule2 = [git]../gitsubmodule 280s - | +gamma = [git]../gitsubmodule 280s - | diff --git a/.hgsubstate b/.hgsubstate 280s - | --- a/.hgsubstate 280s - | +++ b/.hgsubstate 280s - | @@ -1,1 +1,2 @@ 280s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 280s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 280s - | diff --git a/gamma b/gamma-new 280s - | rename from gamma 280s - | rename to gamma-new 280s - | 280s - o 6 62c1a4b07240b53a71be1b1a46e94e99132c5391 beta renamed back 280s - | branch=default hg-git-rename-source=git 280s - | 280s - | diff --git a/beta b/beta 280s - | old mode 120000 280s - | new mode 100644 280s - | --- a/beta 280s - | +++ b/beta 280s - | @@ -1,1 +1,12 @@ 280s - | -beta-new 280s - | \ No newline at end of file 280s - | +1 280s - | +2 280s - | +3 280s - | +4 280s - | +5 280s - | +6 280s - | +7 280s - | +8 280s - | +9 280s - | +10 280s - | +11 280s - | +12 280s - | diff --git a/beta-new b/beta-new 280s - | deleted file mode 100644 280s - | --- a/beta-new 280s - | +++ /dev/null 280s - | @@ -1,12 +0,0 @@ 280s - | -1 280s - | -2 280s - | -3 280s - | -4 280s - | -5 280s - | -6 280s - | -7 280s - | -8 280s - | -9 280s - | -10 280s - | -11 280s - | -12 280s - | 280s - o 5 f93fefed957cff2220d3f0d11182398350b5fa9a beta renamed 280s - | branch=default hg-git-rename-source=git 280s - | 280s - | diff --git a/beta b/beta 280s - | old mode 100644 280s - | new mode 120000 280s - | --- a/beta 280s - | +++ b/beta 280s - | @@ -1,12 +1,1 @@ 280s - | -1 280s - | -2 280s - | -3 280s - | -4 280s - | -5 280s - | -6 280s - | -7 280s - | -8 280s - | -9 280s - | -10 280s - | -11 280s - | -12 280s - | +beta-new 280s - | \ No newline at end of file 280s - | diff --git a/beta b/beta-new 280s - | copy from beta 280s - | copy to beta-new 280s - | 280s - o 4 b9e63d96abc2783afc59246e798a6936cf05a35e move submodule 280s - | branch=default hg-git-rename-source=git 280s - | 280s - | diff --git a/.hgsub b/.hgsub 280s - | --- a/.hgsub 280s - | +++ b/.hgsub 280s - | @@ -1,1 +1,1 @@ 280s - | -gitsubmodule = [git]../gitsubmodule 280s - | +gitsubmodule2 = [git]../gitsubmodule 280s - | diff --git a/.hgsubstate b/.hgsubstate 280s - | --- a/.hgsubstate 280s - | +++ b/.hgsubstate 280s - | @@ -1,1 +1,1 @@ 280s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 280s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 280s - | 280s - o 3 55537ea256c28be1b5637f4f93a601fdde8a9a7f add submodule 280s - | branch=default hg-git-rename-source=git 280s - | 280s - | diff --git a/.hgsub b/.hgsub 280s - | new file mode 100644 280s - | --- /dev/null 280s - | +++ b/.hgsub 280s - | @@ -0,0 +1,1 @@ 280s - | +gitsubmodule = [git]../gitsubmodule 280s - | diff --git a/.hgsubstate b/.hgsubstate 280s - | new file mode 100644 280s - | --- /dev/null 280s - | +++ b/.hgsubstate 280s - | @@ -0,0 +1,1 @@ 280s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 280s - | 280s - o 2 20f9e56b6d006d0403f853245e483d0892b8ac48 gamma 280s - | branch=default hg-git-rename-source=git 280s - | 280s - | diff --git a/beta b/beta 280s - | --- a/beta 280s - | +++ b/beta 280s - | @@ -9,3 +9,4 @@ 280s - | 9 280s - | 10 280s - | 11 280s - | +12 280s - | diff --git a/beta b/gamma 280s - | copy from beta 280s - | copy to gamma 280s - | --- a/beta 280s - | +++ b/gamma 280s - | @@ -9,3 +9,4 @@ 280s - | 9 280s - | 10 280s - | 11 280s - | +13 280s - | 280s - o 1 9f7744e68def81da3b394f11352f602ca9c8ab68 beta 280s - | branch=default hg-git-rename-source=git 280s - | 280s - | diff --git a/alpha b/beta 280s - | rename from alpha 280s - | rename to beta 280s - | --- a/alpha 280s - | +++ b/beta 280s - | @@ -8,3 +8,4 @@ 280s - | 8 280s - | 9 280s - | 10 280s - | +11 280s - | 280s - o 0 7bc844166f76e49562f81eacd54ea954d01a9e42 alpha 280s - branch=default hg-git-rename-source=git 280s - 280s - diff --git a/alpha b/alpha 280s - new file mode 100644 280s - --- /dev/null 280s - +++ b/alpha 280s - @@ -0,0 +1,10 @@ 280s - +1 280s - +2 280s - +3 280s - +4 280s - +5 280s - +6 280s - +7 280s - +8 280s - +9 280s - +10 280s - 280s - 280s -Make a new ordinary commit in Mercurial (no extra metadata) 280s - $ echo 14 >> gamma 280s - $ hg ci -m "gamma2" 280s - 280s -Make a new commit with a copy and a rename in Mercurial 280s - $ hg cp gamma delta 280s - $ echo 15 >> delta 280s - $ hg mv beta epsilon 280s - $ echo 16 >> epsilon 280s - $ hg ci -m "delta/epsilon" 280s - $ hg export . 280s - # HG changeset patch 280s - # User test 280s - # Date 0 0 280s - # Thu Jan 01 00:00:00 1970 +0000 280s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 280s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 280s - delta/epsilon 280s - 280s - diff --git a/gamma b/delta 280s - copy from gamma 280s - copy to delta 280s - --- a/gamma 280s - +++ b/delta 280s - @@ -11,3 +11,4 @@ 280s - 11 280s - 13 280s - 14 280s - +15 280s - diff --git a/beta b/epsilon 280s - rename from beta 280s - rename to epsilon 280s - --- a/beta 280s - +++ b/epsilon 280s - @@ -10,3 +10,4 @@ 280s - 10 280s - 11 280s - 12 280s - +16 280s - $ hg push 280s - pushing to $TESTTMP/repo.git 280s - searching for changes 280s - adding objects 280s - remote: found 0 deltas to reuse 280s - added 2 commits with 2 trees and 3 blobs 280s - updating reference refs/heads/master 280s - 280s - $ cd ../repo.git 280s - $ git log master --pretty=oneline 280s - 5f2948d029693346043f320620af99a615930dc4 delta/epsilon 280s - bbd2ec050f7fbc64f772009844f7d58a556ec036 gamma2 280s - 50d116676a308b7c22935137d944e725d2296f2a remove submodule and rename back 280s - 59fb8e82ea18f79eab99196f588e8948089c134f rename and add submodule 280s - f95497455dfa891b4cd9b524007eb9514c3ab654 beta renamed back 280s - 055f482277da6cd3dd37c7093d06983bad68f782 beta renamed 280s - d7f31298f27df8a9226eddb1e4feb96922c46fa5 move submodule 280s - c610256cb6959852d9e70d01902a06726317affc add submodule 280s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 280s - cc83241f39927232f690d370894960b0d1943a0e beta 280s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 280s - 280s -Make sure the right metadata is stored 280s - $ git cat-file commit master^ 280s - tree 0adbde18545845f3b42ad1a18939ed60a9dec7a8 280s - parent 50d116676a308b7c22935137d944e725d2296f2a 280s - author test 0 +0000 280s - committer test 0 +0000 280s - HG:rename-source hg 280s - 280s - gamma2 280s - $ git cat-file commit master 280s - tree f8f32f4e20b56a5a74582c6a5952c175bf9ec155 280s - parent bbd2ec050f7fbc64f772009844f7d58a556ec036 280s - author test 0 +0000 280s - committer test 0 +0000 280s - HG:rename gamma:delta 280s - HG:rename beta:epsilon 280s - 280s - delta/epsilon 280s - 280s -Now make another clone and compare the hashes 280s - 280s - $ cd .. 280s - $ hg clone -q repo.git hgrepo2 280s - $ cd hgrepo2 280s - $ hg book master -qf 280s - $ hg export master 280s - # HG changeset patch 280s - # User test 280s - # Date 0 0 280s - # Thu Jan 01 00:00:00 1970 +0000 280s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 280s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 280s - delta/epsilon 280s - 280s - diff --git a/gamma b/delta 280s - copy from gamma 280s - copy to delta 280s - --- a/gamma 280s - +++ b/delta 280s - @@ -11,3 +11,4 @@ 280s - 11 280s - 13 280s - 14 280s - +15 280s - diff --git a/beta b/epsilon 280s - rename from beta 280s - rename to epsilon 280s - --- a/beta 280s - +++ b/epsilon 280s - @@ -10,3 +10,4 @@ 280s - 10 280s - 11 280s - 12 280s - +16 280s - 280s -Regenerate the Git metadata and compare the hashes 280s - $ hg debug-remove-hggit-state 280s - clearing out the git cache data 280s - $ hg gexport 280s - $ cd .hg/git 280s - $ git log master --pretty=oneline 280s - f3f6592447685566af9447c03ae262aa5432511d delta/epsilon (dulwich-rust !) 280s - c51ce14ec367c5ea72bf428dee3f8576f2fe1bb0 gamma2 (dulwich-rust !) 280s - df749cae534e3c7a0ad664cd0f214dd36e0ac259 remove submodule and rename back (dulwich-rust !) 280s - 8f9ec605ad0cc2532202f73cef8e35d3241797ee rename and add submodule (dulwich-rust !) 280s - 8a00d0fb75377c51c9a46e92ff154c919007f0e2 delta/epsilon (no-dulwich-rust !) 280s - dd7d4f1adb942a8d349dce585019f6949184bc64 gamma2 (no-dulwich-rust !) 280s - 3f1cdaf8b603816fcda02bd29e75198ae4cb13db remove submodule and rename back (no-dulwich-rust !) 280s - 2a4abf1178a999e2054158ceb0c7768079665d03 rename and add submodule (no-dulwich-rust !) 280s - 88c416e8d5e0e9dd1187d45ebafaa46111764196 beta renamed back 280s - 027d2a6e050705bf6f7e226e7e97f02ce5ae3200 beta renamed 280s - dc70e620634887e70ac5dd108bcc7ebd99c60ec3 move submodule 280s - c610256cb6959852d9e70d01902a06726317affc add submodule 280s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 280s - cc83241f39927232f690d370894960b0d1943a0e beta 280s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 280s - 280s -Test findcopiesharder 280s - 280s - $ cd $TESTTMP 280s - $ git init -q gitcopyharder 280s - $ cd gitcopyharder 280s - $ cat >> file0 << EOF 280s - > 1 280s - > 2 280s - > 3 280s - > 4 280s - > 5 280s - > EOF 280s - $ git add file0 280s - $ fn_git_commit -m file0 280s - $ cp file0 file1 280s - $ git add file1 280s - $ fn_git_commit -m file1 280s - $ cp file0 file2 280s - $ echo 6 >> file2 280s - $ git add file2 280s - $ fn_git_commit -m file2 280s - 280s - $ cd .. 280s - 280s -Clone without findcopiesharder does not find copies from unmodified files 280s - 280s - $ hg clone gitcopyharder hgnocopyharder 280s - importing 3 git commits 280s - new changesets b45d023c6842:ec77ccdbefe0 (3 drafts) 280s - updating to bookmark master 280s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 280s - $ hg -R hgnocopyharder export 1::2 280s - # HG changeset patch 280s - # User test 280s - # Date 1167609621 0 280s - # Mon Jan 01 00:00:21 2007 +0000 280s - # Node ID 555831c93e2a250e5ba42efad45bf7ba71da13e4 280s - # Parent b45d023c6842337ffe694663a44aa672d311081c 280s - file1 280s - 280s - diff --git a/file1 b/file1 280s - new file mode 100644 280s - --- /dev/null 280s - +++ b/file1 280s - @@ -0,0 +1,5 @@ 280s - +1 280s - +2 280s - +3 280s - +4 280s - +5 280s - # HG changeset patch 280s - # User test 280s - # Date 1167609622 0 280s - # Mon Jan 01 00:00:22 2007 +0000 280s - # Node ID ec77ccdbefe023eb9898b0399f84f670c8c0f5fc 280s - # Parent 555831c93e2a250e5ba42efad45bf7ba71da13e4 280s - file2 280s - 280s - diff --git a/file2 b/file2 280s - new file mode 100644 280s - --- /dev/null 280s - +++ b/file2 280s - @@ -0,0 +1,6 @@ 280s - +1 280s - +2 280s - +3 280s - +4 280s - +5 280s - +6 280s - 280s -findcopiesharder finds copies from unmodified files if similarity is met 280s - 280s - $ hg --config git.findcopiesharder=true clone gitcopyharder hgcopyharder0 280s - importing 3 git commits 280s - new changesets b45d023c6842:9b3099834272 (3 drafts) 280s - updating to bookmark master 280s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 280s - $ hg -R hgcopyharder0 export 1::2 280s - # HG changeset patch 280s - # User test 280s - # Date 1167609621 0 280s - # Mon Jan 01 00:00:21 2007 +0000 280s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 280s - # Parent b45d023c6842337ffe694663a44aa672d311081c 280s - file1 280s - 280s - diff --git a/file0 b/file1 280s - copy from file0 280s - copy to file1 280s - # HG changeset patch 280s - # User test 280s - # Date 1167609622 0 280s - # Mon Jan 01 00:00:22 2007 +0000 280s - # Node ID 9b30998342729c7357d418bebed7399986cfe643 280s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 280s - file2 280s - 280s - diff --git a/file0 b/file2 280s - copy from file0 280s - copy to file2 280s - --- a/file0 280s - +++ b/file2 280s - @@ -3,3 +3,4 @@ 280s - 3 280s - 4 280s - 5 280s - +6 280s - 280s - $ hg --config git.findcopiesharder=true --config git.similarity=95 clone gitcopyharder hgcopyharder1 280s - importing 3 git commits 280s - new changesets b45d023c6842:d9d2e8cbf050 (3 drafts) 280s - updating to bookmark master 280s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 280s - $ hg -R hgcopyharder1 export 1::2 280s - # HG changeset patch 280s - # User test 280s - # Date 1167609621 0 280s - # Mon Jan 01 00:00:21 2007 +0000 280s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 280s - # Parent b45d023c6842337ffe694663a44aa672d311081c 280s - file1 280s - 280s - diff --git a/file0 b/file1 280s - copy from file0 280s - copy to file1 280s - # HG changeset patch 280s - # User test 280s - # Date 1167609622 0 280s - # Mon Jan 01 00:00:22 2007 +0000 280s - # Node ID d9d2e8cbf050772be31dccf78851f71dc547d139 280s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 280s - file2 280s - 280s - diff --git a/file2 b/file2 280s - new file mode 100644 280s - --- /dev/null 280s - +++ b/file2 280s - @@ -0,0 +1,6 @@ 280s - +1 280s - +2 280s - +3 280s - +4 280s - +5 280s - +6 280s - 280s -Config values out of range 280s - $ hg --config git.similarity=999 clone gitcopyharder hgcopyharder2 280s - importing 3 git commits 280s - abort: git.similarity must be between 0 and 100 280s - [255] 280s -Left-over on Windows with some pack files 280s - $ rm -rf hgcopyharder2 280s - $ hg --config git.renamelimit=-5 clone gitcopyharder hgcopyharder2 280s - importing 3 git commits 280s - abort: git.renamelimit must be non-negative 280s - [255] 280s 280s ERROR: test-renames.t output changed 280s !s 280s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-git-tags.t 280s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-git-tags.t#draft.err 280s @@ -41,337 +41,13 @@ 280s Clone it: 280s 280s $ hg clone repo.git hgrepo 280s - importing 2 git commits 280s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 280s - updating to bookmark master 280s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 280s + abort: repository repo.git not found 280s + [255] 280s 280s $ cd hgrepo 280s + $TESTTMP.sh: 39: cd: can't cd to hgrepo 280s 280s Verify that annotated tags are unaffected by reexports: 280s 280s $ GIT_DIR=.hg/git git tag -ln 280s - beta added tag beta 280s - $ hg gexport 280s - $ GIT_DIR=.hg/git git tag -ln 280s - beta added tag beta 280s - 280s -Error checking on tag creation 280s - 280s - $ hg tag --git beta --remove 280s - abort: cannot remove git tags 280s - (the git documentation heavily discourages editing tags) 280s - [255] 280s - $ hg tag --git beta -r null 280s - abort: cannot remove git tags 280s - (the git documentation heavily discourages editing tags) 280s - [255] 280s - $ hg tag --git beta --remove -r 0 280s - abort: cannot specify both --rev and --remove 280s - [10] 280s - $ hg tag --git alpha 280s - abort: git tags require an explicit revision 280s - (please specify -r/--rev) 280s - [255] 280s - $ hg tag --git alpha alpha -r 0 280s - abort: tag names must be unique 280s - [255] 280s - $ hg tag --git alpha -r 0 -e 280s - abort: cannot specify both --git and --edit 280s - [10] 280s - $ hg tag --git alpha -r 0 -m 42 280s - abort: cannot specify both --git and --message 280s - [10] 280s - $ hg tag --git alpha -r 0 -d 42 280s - abort: cannot specify both --git and --date 280s - [10] 280s - $ hg tag --git alpha -r 0 -u user@example.com 280s - abort: cannot specify both --git and --user 280s - [10] 280s - $ hg tag --git 'with space' -r 0 280s - abort: the name 'with space' is not a valid git tag 280s - [255] 280s - $ hg tag --git ' beta' -r 0 280s - abort: the name 'beta' already exists 280s - [255] 280s - $ hg tag --git master -r 0 280s - abort: the name 'master' already exists 280s - [255] 280s - $ hg tag --git tip -r 0 280s - abort: the name 'tip' is reserved 280s - [10] 280s - 280s -Create a git tag from hg 280s - 280s - $ hg tag --git alpha --debug -r 0 280s - finding unexported changesets 280s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 280s - adding git tag alpha 280s - $ hg log --graph 280s - @ changeset: 1:7fe02317c63d 280s - | bookmark: master 280s - | tag: beta 280s - | tag: default/master 280s - | tag: tip 280s - | user: test 280s - | date: Mon Jan 01 00:00:11 2007 +0000 280s - | summary: add beta 280s - | 280s - o changeset: 0:ff7a2f2d8d70 280s - tag: alpha 280s - user: test 280s - date: Mon Jan 01 00:00:10 2007 +0000 280s - summary: add alpha 280s - 280s - $ echo beta-fix >> beta 280s - $ fn_hg_commit -m 'fix for beta' 280s -#if secret 280s - $ hg phase -d 280s -#endif 280s - $ hg push 280s - pushing to $TESTTMP/repo.git 280s - searching for changes 280s - adding objects 280s - remote: found 0 deltas to reuse 280s - added 1 commits with 1 trees and 1 blobs 280s - updating reference refs/heads/master 280s - adding reference refs/tags/alpha 280s - 280s -Verify that amending commits known to remotes doesn't break anything 280s - 280s - $ cat >> $HGRCPATH << EOF 280s - > [experimental] 280s - > evolution = createmarkers 280s - > evolution.createmarkers = yes 280s - > EOF 280s - $ hg tags 280s - tip 2:61175962e488 280s - default/master 2:61175962e488 280s - beta 1:7fe02317c63d 280s - alpha 0:ff7a2f2d8d70 280s - $ echo beta-fix-again >> beta 280s - $ fn_hg_commit --amend 280s - $ hg log -T shorttags 280s - 3:3094b9e8da41 draft tip 280s - 2:61175962e488 draft default/master X 280s - 1:7fe02317c63d draft beta 280s - 0:ff7a2f2d8d70 draft alpha 280s - $ hg tags 280s - tip 3:3094b9e8da41 280s - default/master 2:61175962e488 280s - beta 1:7fe02317c63d 280s - alpha 0:ff7a2f2d8d70 280s - $ hg push 280s - pushing to $TESTTMP/repo.git 280s - searching for changes 280s - abort: pushing refs/heads/master overwrites 3094b9e8da41 280s - [255] 280s - $ hg push -f 280s - pushing to $TESTTMP/repo.git 280s - searching for changes 280s - adding objects 280s - remote: found 0 deltas to reuse 280s - added 1 commits with 1 trees and 1 blobs 280s - updating reference refs/heads/master 280s - 280s -Now create a tag for the old, obsolete master 280s - 280s - $ cd ../repo.git 280s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 280s - $ git tag 280s - alpha 280s - beta 280s - detached 280s - $ cd ../hgrepo 280s - $ hg pull 280s - pulling from $TESTTMP/repo.git 280s - no changes found 280s - $ hg log -T shorttags 280s - 3:3094b9e8da41 draft default/master tip 280s - 2:61175962e488 draft detached X 280s - 1:7fe02317c63d draft beta 280s - 0:ff7a2f2d8d70 draft alpha 280s - $ hg tags 280s - tip 3:3094b9e8da41 280s - default/master 3:3094b9e8da41 280s - detached 2:61175962e488 280s - beta 1:7fe02317c63d 280s - alpha 0:ff7a2f2d8d70 280s - $ hg push 280s - pushing to $TESTTMP/repo.git 280s - searching for changes 280s - no changes found 280s - [1] 280s - 280s - $ cd .. 280s - 280s -Verify that revsets can point out git tags; for that we need an 280s -untagged commit. 280s - 280s - $ cd hgrepo 280s - $ touch gamma 280s - $ fn_hg_commit -A -m 'add gamma' 280s -#if secret 280s - $ hg phase -d 280s -#endif 280s - $ hg log -T shorttags -r 'gittag()' 280s - 0:ff7a2f2d8d70 draft alpha 280s - 1:7fe02317c63d draft beta 280s - 2:61175962e488 draft detached X 280s - $ hg log -T shorttags -r 'gittag(detached)' 280s - 2:61175962e488 draft detached X 280s - $ hg log -T shorttags -r 'gittag("re:a$")' 280s - 0:ff7a2f2d8d70 draft alpha 280s - 1:7fe02317c63d draft beta 280s - 280s -Create a git tag from hg, but pointing to a new commit: 280s - 280s - $ hg tag --git gamma --debug -r tip 280s - invalid branch cache (visible): tip differs (?) 280s - finding unexported changesets 280s - exporting 1 changesets 280s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 280s - packing 3 loose objects... 280s - packed 3 loose objects! 280s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 280s - adding git tag gamma 280s - $ hg push 280s - pushing to $TESTTMP/repo.git 280s - searching for changes 280s - adding objects 280s - remote: found 0 deltas to reuse 280s - added 1 commits with 1 trees and 1 blobs 280s - updating reference refs/heads/master 280s - adding reference refs/tags/gamma 280s - $ cd ../gitrepo 280s - $ git fetch --quiet --tags 280s - $ git tag 280s - alpha 280s - beta 280s - detached 280s - gamma 280s - $ cd .. 280s - 280s -Try to overwrite an annotated tag: 280s - 280s - $ cd hgrepo 280s - $ hg tags -v 280s - tip 4:0eb1ab0073a8 280s - gamma 4:0eb1ab0073a8 git 280s - default/master 4:0eb1ab0073a8 git-remote 280s - detached 2:61175962e488 git 280s - beta 1:7fe02317c63d git 280s - alpha 0:ff7a2f2d8d70 git 280s - $ hg book not-master 280s - $ hg tag beta 280s - abort: tag 'beta' already exists (use -f to force) 280s - [10] 280s - $ hg tag -f beta 280s -#if secret 280s - $ hg phase -d 280s -#endif 280s - $ hg push 280s - pushing to $TESTTMP/repo.git 280s - warning: not overwriting annotated tag 'beta' 280s - searching for changes 280s - adding objects 280s - remote: found 0 deltas to reuse 280s - added 1 commits with 1 trees and 1 blobs 280s - adding reference refs/heads/not-master 280s - $ hg tags 280s - tip 5:c49682c7cba4 280s - default/not-master 5:c49682c7cba4 280s - gamma 4:0eb1ab0073a8 280s - default/master 4:0eb1ab0073a8 280s - beta 4:0eb1ab0073a8 280s - detached 2:61175962e488 280s - alpha 0:ff7a2f2d8d70 280s - $ cd .. 280s - 280s -Check whether `gimport` handles tags 280s - 280s - $ cd hgrepo 280s - $ rm .hg/git-tags .hg/git-mapfile 280s - $ hg gimport 280s - importing 6 git commits 280s - $ hg tags -q 280s - tip 280s - default/not-master 280s - gamma 280s - default/master 280s - beta 280s - detached 280s - alpha 280s - $ cd .. 280s - 280s -Test how pulling an explicit branch with an annotated tag: 280s - 280s - $ hg clone -r master repo.git hgrepo-2 280s - importing 4 git commits 280s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 280s - updating to branch default 280s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 280s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 280s - 0:ff7a2f2d8d70 draft alpha 280s - 1:7fe02317c63d draft beta 280s - 3:0eb1ab0073a8 draft default/master gamma tip 280s - $ hg tags -v -R hgrepo-2 280s - tip 3:0eb1ab0073a8 280s - gamma 3:0eb1ab0073a8 git 280s - default/master 3:0eb1ab0073a8 git-remote 280s - beta 1:7fe02317c63d git 280s - alpha 0:ff7a2f2d8d70 git 280s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 280s - $ rm -rf hgrepo-2 280s - 280s - $ hg clone -r master repo.git hgrepo-2 280s - importing 4 git commits 280s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 280s - updating to branch default 280s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 280s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 280s - 0:ff7a2f2d8d70 draft alpha 280s - 1:7fe02317c63d draft beta 280s - 3:0eb1ab0073a8 draft default/master gamma tip 280s -This used to die: 280s - $ hg -R hgrepo-2 gexport 280s -This used to fail, since we didn't actually pull the annotated tag: 280s - $ hg -R hgrepo-2 push 280s - pushing to $TESTTMP/repo.git 280s - searching for changes 280s - no changes found 280s - [1] 280s - $ rm -rf hgrepo-2 280s - 280s -Check that pulling will update phases only: 280s - 280s - $ cd hgrepo 280s - $ hg phase -fs gamma detached 280s - $ hg pull 280s - pulling from $TESTTMP/repo.git 280s - no changes found 280s - $ hg log -T shorttags -r gamma -r detached 280s - 4:0eb1ab0073a8 draft beta default/master gamma 280s - 2:61175962e488 draft detached X 280s - $ cd .. 280s - 280s -Check that we pull new tags to existing commits: 280s - $ cd gitrepo 280s - $ git tag 280s - alpha 280s - beta 280s - detached 280s - gamma 280s - $ fn_git_tag extra-simple-tag 280s - $ fn_git_tag -m annotated extra-annotated-tag 280s - $ git push --tags 280s - To $TESTTMP/repo.git 280s - * [new tag] extra-annotated-tag -> extra-annotated-tag 280s - * [new tag] extra-simple-tag -> extra-simple-tag 280s - $ cd ../hgrepo 280s - $ hg pull -r master 280s - pulling from $TESTTMP/repo.git 280s - no changes found 280s - $ hg tags -v | grep extra 280s - extra-simple-tag 1:7fe02317c63d git 280s - extra-annotated-tag 1:7fe02317c63d git 280s 280s ERROR: test-git-tags.t#draft output changed 280s ! 280s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-help.t 280s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-help.t.err 280s @@ -5,250 +5,14 @@ 280s 280s $ hg help | grep 'git' | sed 's/ */ /g' 280s git-cleanup clean up Git commit map after history editing (?) 280s - git-verify verify that a Mercurial rev matches the corresponding Git rev 280s - hggit push and pull from a Git server 280s - hggit-config Configuring hg-git 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 280s 280s $ hg help hggit-config 280s - Configuring hg-git 280s - """""""""""""""""" 280s - 280s - "git" 280s - ----- 280s - 280s - Control how the Hg-Git extension interacts with Git. 280s - 280s - "authors" 280s - Git uses a strict convention for "author names" when representing 280s - changesets, using the form "[realname] [email address]". Mercurial 280s - encourages this convention as well but is not as strict, so it's not 280s - uncommon for a Mercurial repository to have authors listed as, for 280s - example, simple usernames. hg-git by default will attempt to translate 280s - Mercurial usernames using the following rules: 280s - 280s - - If the Mercurial username fits the pattern "NAME ", the Git 280s - name will be set to NAME and the email to EMAIL. 280s - - If the Mercurial username looks like an email (if it contains an 280s - "@"), the Git name and email will both be set to that email. 280s - - If the Mercurial username consists of only a name, the email will be 280s - set to "none@none". 280s - - Illegal characters (stray "<"\ s or ">"\ s) will be stripped out, and 280s - for "NAME " usernames, any content after the right-bracket (for 280s - example, a second ">") will be turned into a url-encoded sigil like 280s - "ext:(%3E)" in the Git author name. 280s - 280s - Since these default behaviors may not be what you want ("none@none", for 280s - example, shows up unpleasantly on GitHub as "illegal email address"), 280s - the "git.authors" option provides for an "authors translation file" that 280s - will be used during outgoing transfers from Mercurial to Git only, by 280s - modifying "hgrc" as such: 280s - 280s - [git] 280s - authors = authors.txt 280s - 280s - Where "authors.txt" is the name of a text file containing author name 280s - translations, one per each line, using the following format: 280s - 280s - johnny = John Smith 280s - dougie = Doug Johnson 280s - 280s - Empty lines and lines starting with a "#" are ignored. 280s - 280s - It should be noted that this translation is in *the Mercurial to Git 280s - direction only*. Changesets coming from Git back to Mercurial will not 280s - translate back into Mercurial usernames, so it's best that the same 280s - username/email combination be used on both the Mercurial and Git sides; 280s - the author file is mostly useful for translating legacy changesets. 280s - 280s - "branch_bookmark_suffix" 280s - Hg-Git does not convert between Mercurial named branches and git 280s - branches as the two are conceptually different; instead, it uses 280s - Mercurial bookmarks to represent the concept of a Git branch. Therefore, 280s - when translating a Mercurial repository over to Git, you typically need 280s - to create bookmarks to mirror all the named branches that you'd like to 280s - see transferred over to Git. The major caveat with this is that you 280s - can't use the same name for your bookmark as that of the named branch, 280s - and furthermore there's no feasible way to rename a branch in Mercurial. 280s - For the use case where one would like to transfer a Mercurial repository 280s - over to Git, and maintain the same named branches as are present on the 280s - hg side, the "branch_bookmark_suffix" might be all that's needed. This 280s - presents a string "suffix" that will be recognized on each bookmark 280s - name, and stripped off as the bookmark is translated to a Git branch: 280s - 280s - [git] 280s - branch_bookmark_suffix=_bookmark 280s - 280s - Above, if a Mercurial repository had a named branch called 280s - "release_6_maintenance", you could then link it to a bookmark called 280s - "release_6_maintenance_bookmark". hg-git will then strip off the 280s - "_bookmark" suffix from this bookmark name, and create a Git branch 280s - called "release_6_maintenance". When pulling back from Git to hg, the 280s - "_bookmark" suffix is then applied back, if and only if a Mercurial 280s - named branch of that name exists. E.g., when changes to the 280s - "release_6_maintenance" branch are checked into Git, these will be 280s - placed into the "release_6_maintenance_bookmark" bookmark on hg. But if 280s - a new branch called "release_7_maintenance" were pulled over to hg, and 280s - there was not a "release_7_maintenance" named branch already, the 280s - bookmark will be named "release_7_maintenance" with no usage of the 280s - suffix. 280s - 280s - The "branch_bookmark_suffix" option is, like the "authors" option, 280s - intended for migrating legacy hg named branches. Going forward, a 280s - Mercurial repository that is to be linked with a Git repository should 280s - only use bookmarks for named branching. 280s - 280s - "findcopiesharder" 280s - Whether to consider unmodified files as copy sources. This is a very 280s - expensive operation for large projects, so use it with caution. Similar 280s - to "git diff"'s --find-copies-harder option. 280s - 280s - "intree" 280s - Hg-Git keeps a Git repository clone for reading and updating. By 280s - default, the Git clone is the subdirectory "git" in your local Mercurial 280s - repository. If you would like this Git clone to be at the same level of 280s - your Mercurial repository instead (named ".git"), add the following to 280s - your "hgrc": 280s - 280s - [git] 280s - intree = True 280s - 280s - Please note that changing this setting in an existing repository doesn't 280s - move the local Git repository. You will either have to do so yourself, 280s - or issue an 'hg pull' after the fact to repopulate the new location. 280s - 280s - "mindate" 280s - If set, branches where the latest commit's commit time is older than 280s - this will not be imported. Accepts any date formats that Mercurial does 280s - -- see 'hg help dates' for more. 280s - 280s - "public" 280s - A list of Git branches that should be considered "published", and 280s - therefore converted to Mercurial in the 'public' phase. This is only 280s - used if "hggit.usephases" is set. 280s - 280s - "pull-prune-remote-branches" 280s - Before fetching, remove any remote-tracking references, or pseudo-tags, 280s - that no longer exist on the remote. This is equivalent to the "--prune" 280s - option to "git fetch", and means that pseudo-tags for remotes -- such as 280s - "default/master" -- always actually reflect what's on the remote. 280s - 280s - This option is enabled by default. 280s - 281s - "pull-prune-bookmarks" 281s - On pull, delete any unchanged bookmarks removed on the remote. In other 281s - words, if e.g. the "thebranch" bookmark remains at "default/thebranch", 281s - and the branch is deleted in Git, pulling deletes the bookmark. 281s - 281s - This option is enabled by default. 281s - 281s - "renamelimit" 281s - The number of files to consider when performing the copy/rename 281s - detection. Detection is disabled if the number of files modified in a 281s - commit is above the limit. Detection is O(N^2) in the number of files 281s - modified, so be sure not to set the limit too high. Similar to Git's 281s - "diff.renameLimit" config. The default is "400", the same as Git. 281s - 281s - "similarity" 281s - Specify how similar files modified in a Git commit must be to be 281s - imported as Mercurial renames or copies, as a percentage between "0" 281s - (disabled) and "100" (files must be identical). For example, "90" means 281s - that a delete/add pair will be imported as a rename if more than 90% of 281s - the file has stayed the same. The default is "0" (disabled). 281s - 281s - "blame.ignoreRevsFile" 281s - Specify a file that lists Git commits to ignore when invoking 'hg 281s - annotate'. 281s - 281s - "hggit" 281s - ------- 281s - 281s - Control behavior of the Hg-Git extension. 281s - 281s - "mapsavefrequency" 281s - By default, hg-git only saves the results of a conversion at the end. 281s - Use this option to enable resuming long-running pulls and pushes. Set 281s - this to a number greater than 0 to allow resuming after converting that 281s - many commits. This can help when the conversion encounters an error 281s - partway through a large batch of changes. Otherwise, an error or 281s - interruption will roll back the transaction, similar to regular 281s - Mercurial. 281s - 281s - Defaults to 1000. 281s - 281s - Please note that this is disregarded for an initial clone, as any error 281s - or interruption will delete the destination. So instead of cloning a 281s - large Git repository, you might want to pull instead: 281s - 281s - $ hg init linux 281s - $ cd linux 281s - $ echo "[paths]\ndefault = https://github.com/torvalds/linux" > .hg/hgrc 281s - $ hg pull 281s - 281s - ...and be extremely patient. Please note that converting very large 281s - repositories may take *days* rather than mere *hours*, and may run into 281s - issues with available memory for very long running clones. Even any 281s - small, undiscovered leak will build up when processing hundreds of 281s - thousands of files and commits. Cloning the Linux kernel is likely a 281s - pathological case, but other storied repositories such as CPython do 281s - work well, even if the initial clone requires a some patience. 281s - 281s - "threads" 281s - 281s - During a push to Git, hg-git will pack loose objects at regular 281s - intervals whenever it saves its map. As this is a rather expensive 281s - operation, it's done in separate threads. 281s - 281s - Defaults to the system CPU count or 4, whichever is lower. 281s - 281s - "usephases" 281s - When converting Git revisions to Mercurial, place them in the 'public' 281s - phase as appropriate. Namely, revisions that are reachable from the 281s - remote Git repository's default branch, or "HEAD", will be marked 281s - *public*. For most repositories, this means the remote "master" branch 281s - will be converted as public. The same applies to any commits tagged in 281s - the remote. 281s - 281s - To restrict publishing to specific branches or tags, use the 281s - "git.public" option. 281s - 281s - Publishing commits prevents their modification, and speeds up many local 281s - Mercurial operations, such as 'hg shelve'. 281s - 281s - "fetchbuffer" 281s - Data fetched from Git is buffered in memory, unless it exceeds the given 281s - limit, in megabytes. By default, flush the buffer to disk when it 281s - exceeds 100MB. 281s - 281s - "retries" 281s - Interacting with a remote Git repository may require authentication. 281s - Normally, this will trigger a prompt and a retry, and this option 281s - restricts the amount of retries. Defaults to 3. 281s - 281s - "invalidpaths" 281s - Both Mercurial and Git consider paths as just bytestrings internally, 281s - and allow almost anything. The difference, however, is in the _almost_ 281s - part. For example, many Git servers will reject a push for security 281s - reasons if it contains a nested Git repository. Similarly, Mercurial 281s - cannot checkout commits with a nested repository, and it cannot even 281s - store paths containing an embedded newline or carrage return character. 281s - 281s - The default is to issue a warning and skip these paths. You can change 281s - this by setting "hggit.invalidpaths" in ".hgrc": 281s - 281s - [hggit] 281s - invalidpaths = keep 281s - 281s - Possible values are "keep", "skip" or "abort". Prior to 1.0, the default 281s - was "abort". 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 281s + abort: no such help topic: hggit-config 281s + (try 'hg help --keyword hggit-config') 281s + [10] 281s 281s $ hg help config.hggit | head -10 281s - "hggit" 281s - ------- 281s - 281s - Control behavior of the Hg-Git extension. 281s - 281s - "mapsavefrequency" 281s - By default, hg-git only saves the results of a conversion at the end. 281s - Use this option to enable resuming long-running pulls and pushes. Set 281s - this to a number greater than 0 to allow resuming after converting that 281s - many commits. This can help when the conversion encounters an error 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 281s + abort: help section not found: config.hggit 281s 281s ERROR: test-help.t output changed 281s ! 281s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-git-tags.t 281s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-git-tags.t#secret.err 281s @@ -41,337 +41,13 @@ 281s Clone it: 281s 281s $ hg clone repo.git hgrepo 281s - importing 2 git commits 281s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 281s - updating to bookmark master 281s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 281s + abort: repository repo.git not found 281s + [255] 281s 281s $ cd hgrepo 281s + $TESTTMP.sh: 44: cd: can't cd to hgrepo 281s 281s Verify that annotated tags are unaffected by reexports: 281s 281s $ GIT_DIR=.hg/git git tag -ln 281s - beta added tag beta 281s - $ hg gexport 281s - $ GIT_DIR=.hg/git git tag -ln 281s - beta added tag beta 281s - 281s -Error checking on tag creation 281s - 281s - $ hg tag --git beta --remove 281s - abort: cannot remove git tags 281s - (the git documentation heavily discourages editing tags) 281s - [255] 281s - $ hg tag --git beta -r null 281s - abort: cannot remove git tags 281s - (the git documentation heavily discourages editing tags) 281s - [255] 281s - $ hg tag --git beta --remove -r 0 281s - abort: cannot specify both --rev and --remove 281s - [10] 281s - $ hg tag --git alpha 281s - abort: git tags require an explicit revision 281s - (please specify -r/--rev) 281s - [255] 281s - $ hg tag --git alpha alpha -r 0 281s - abort: tag names must be unique 281s - [255] 281s - $ hg tag --git alpha -r 0 -e 281s - abort: cannot specify both --git and --edit 281s - [10] 281s - $ hg tag --git alpha -r 0 -m 42 281s - abort: cannot specify both --git and --message 281s - [10] 281s - $ hg tag --git alpha -r 0 -d 42 281s - abort: cannot specify both --git and --date 281s - [10] 281s - $ hg tag --git alpha -r 0 -u user@example.com 281s - abort: cannot specify both --git and --user 281s - [10] 281s - $ hg tag --git 'with space' -r 0 281s - abort: the name 'with space' is not a valid git tag 281s - [255] 281s - $ hg tag --git ' beta' -r 0 281s - abort: the name 'beta' already exists 281s - [255] 281s - $ hg tag --git master -r 0 281s - abort: the name 'master' already exists 281s - [255] 281s - $ hg tag --git tip -r 0 281s - abort: the name 'tip' is reserved 281s - [10] 281s - 281s -Create a git tag from hg 281s - 281s - $ hg tag --git alpha --debug -r 0 281s - finding unexported changesets 281s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 281s - adding git tag alpha 281s - $ hg log --graph 281s - @ changeset: 1:7fe02317c63d 281s - | bookmark: master 281s - | tag: beta 281s - | tag: default/master 281s - | tag: tip 281s - | user: test 281s - | date: Mon Jan 01 00:00:11 2007 +0000 281s - | summary: add beta 281s - | 281s - o changeset: 0:ff7a2f2d8d70 281s - tag: alpha 281s - user: test 281s - date: Mon Jan 01 00:00:10 2007 +0000 281s - summary: add alpha 281s - 281s - $ echo beta-fix >> beta 281s - $ fn_hg_commit -m 'fix for beta' 281s -#if secret 281s - $ hg phase -d 281s -#endif 281s - $ hg push 281s - pushing to $TESTTMP/repo.git 281s - searching for changes 281s - adding objects 281s - remote: found 0 deltas to reuse 281s - added 1 commits with 1 trees and 1 blobs 281s - updating reference refs/heads/master 281s - adding reference refs/tags/alpha 281s - 281s -Verify that amending commits known to remotes doesn't break anything 281s - 281s - $ cat >> $HGRCPATH << EOF 281s - > [experimental] 281s - > evolution = createmarkers 281s - > evolution.createmarkers = yes 281s - > EOF 281s - $ hg tags 281s - tip 2:61175962e488 281s - default/master 2:61175962e488 281s - beta 1:7fe02317c63d 281s - alpha 0:ff7a2f2d8d70 281s - $ echo beta-fix-again >> beta 281s - $ fn_hg_commit --amend 281s - $ hg log -T shorttags 281s - 3:3094b9e8da41 draft tip 281s - 2:61175962e488 draft default/master X 281s - 1:7fe02317c63d draft beta 281s - 0:ff7a2f2d8d70 draft alpha 281s - $ hg tags 281s - tip 3:3094b9e8da41 281s - default/master 2:61175962e488 281s - beta 1:7fe02317c63d 281s - alpha 0:ff7a2f2d8d70 281s - $ hg push 281s - pushing to $TESTTMP/repo.git 281s - searching for changes 281s - abort: pushing refs/heads/master overwrites 3094b9e8da41 281s - [255] 281s - $ hg push -f 281s - pushing to $TESTTMP/repo.git 281s - searching for changes 281s - adding objects 281s - remote: found 0 deltas to reuse 281s - added 1 commits with 1 trees and 1 blobs 281s - updating reference refs/heads/master 281s - 281s -Now create a tag for the old, obsolete master 281s - 281s - $ cd ../repo.git 281s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 281s - $ git tag 281s - alpha 281s - beta 281s - detached 281s - $ cd ../hgrepo 281s - $ hg pull 281s - pulling from $TESTTMP/repo.git 281s - no changes found 281s - $ hg log -T shorttags 281s - 3:3094b9e8da41 draft default/master tip 281s - 2:61175962e488 draft detached X 281s - 1:7fe02317c63d draft beta 281s - 0:ff7a2f2d8d70 draft alpha 281s - $ hg tags 281s - tip 3:3094b9e8da41 281s - default/master 3:3094b9e8da41 281s - detached 2:61175962e488 281s - beta 1:7fe02317c63d 281s - alpha 0:ff7a2f2d8d70 281s - $ hg push 281s - pushing to $TESTTMP/repo.git 281s - searching for changes 281s - no changes found 281s - [1] 281s - 281s - $ cd .. 281s - 281s -Verify that revsets can point out git tags; for that we need an 281s -untagged commit. 281s - 281s - $ cd hgrepo 281s - $ touch gamma 281s - $ fn_hg_commit -A -m 'add gamma' 281s -#if secret 281s - $ hg phase -d 281s -#endif 281s - $ hg log -T shorttags -r 'gittag()' 281s - 0:ff7a2f2d8d70 draft alpha 281s - 1:7fe02317c63d draft beta 281s - 2:61175962e488 draft detached X 281s - $ hg log -T shorttags -r 'gittag(detached)' 281s - 2:61175962e488 draft detached X 281s - $ hg log -T shorttags -r 'gittag("re:a$")' 281s - 0:ff7a2f2d8d70 draft alpha 281s - 1:7fe02317c63d draft beta 281s - 281s -Create a git tag from hg, but pointing to a new commit: 281s - 281s - $ hg tag --git gamma --debug -r tip 281s - invalid branch cache (visible): tip differs (?) 281s - finding unexported changesets 281s - exporting 1 changesets 281s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 281s - packing 3 loose objects... 281s - packed 3 loose objects! 281s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 281s - adding git tag gamma 281s - $ hg push 281s - pushing to $TESTTMP/repo.git 281s - searching for changes 281s - adding objects 281s - remote: found 0 deltas to reuse 281s - added 1 commits with 1 trees and 1 blobs 281s - updating reference refs/heads/master 281s - adding reference refs/tags/gamma 281s - $ cd ../gitrepo 281s - $ git fetch --quiet --tags 281s - $ git tag 281s - alpha 281s - beta 281s - detached 281s - gamma 281s - $ cd .. 281s - 281s -Try to overwrite an annotated tag: 281s - 281s - $ cd hgrepo 281s - $ hg tags -v 281s - tip 4:0eb1ab0073a8 281s - gamma 4:0eb1ab0073a8 git 281s - default/master 4:0eb1ab0073a8 git-remote 281s - detached 2:61175962e488 git 281s - beta 1:7fe02317c63d git 281s - alpha 0:ff7a2f2d8d70 git 281s - $ hg book not-master 281s - $ hg tag beta 281s - abort: tag 'beta' already exists (use -f to force) 281s - [10] 281s - $ hg tag -f beta 281s -#if secret 281s - $ hg phase -d 281s -#endif 281s - $ hg push 281s - pushing to $TESTTMP/repo.git 281s - warning: not overwriting annotated tag 'beta' 281s - searching for changes 281s - adding objects 281s - remote: found 0 deltas to reuse 281s - added 1 commits with 1 trees and 1 blobs 281s - adding reference refs/heads/not-master 281s - $ hg tags 281s - tip 5:c49682c7cba4 281s - default/not-master 5:c49682c7cba4 281s - gamma 4:0eb1ab0073a8 281s - default/master 4:0eb1ab0073a8 281s - beta 4:0eb1ab0073a8 281s - detached 2:61175962e488 281s - alpha 0:ff7a2f2d8d70 281s - $ cd .. 281s - 281s -Check whether `gimport` handles tags 281s - 281s - $ cd hgrepo 281s - $ rm .hg/git-tags .hg/git-mapfile 281s - $ hg gimport 281s - importing 6 git commits 281s - $ hg tags -q 281s - tip 281s - default/not-master 281s - gamma 281s - default/master 281s - beta 281s - detached 281s - alpha 281s - $ cd .. 281s - 281s -Test how pulling an explicit branch with an annotated tag: 281s - 281s - $ hg clone -r master repo.git hgrepo-2 281s - importing 4 git commits 281s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 281s - updating to branch default 281s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 281s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 281s - 0:ff7a2f2d8d70 draft alpha 281s - 1:7fe02317c63d draft beta 281s - 3:0eb1ab0073a8 draft default/master gamma tip 281s - $ hg tags -v -R hgrepo-2 281s - tip 3:0eb1ab0073a8 281s - gamma 3:0eb1ab0073a8 git 281s - default/master 3:0eb1ab0073a8 git-remote 281s - beta 1:7fe02317c63d git 281s - alpha 0:ff7a2f2d8d70 git 281s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 281s - $ rm -rf hgrepo-2 281s - 281s - $ hg clone -r master repo.git hgrepo-2 281s - importing 4 git commits 281s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 281s - updating to branch default 281s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 281s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 281s - 0:ff7a2f2d8d70 draft alpha 281s - 1:7fe02317c63d draft beta 281s - 3:0eb1ab0073a8 draft default/master gamma tip 281s -This used to die: 281s - $ hg -R hgrepo-2 gexport 281s -This used to fail, since we didn't actually pull the annotated tag: 281s - $ hg -R hgrepo-2 push 281s - pushing to $TESTTMP/repo.git 281s - searching for changes 281s - no changes found 281s - [1] 281s - $ rm -rf hgrepo-2 281s - 281s -Check that pulling will update phases only: 281s - 281s - $ cd hgrepo 281s - $ hg phase -fs gamma detached 281s - $ hg pull 281s - pulling from $TESTTMP/repo.git 281s - no changes found 281s - $ hg log -T shorttags -r gamma -r detached 281s - 4:0eb1ab0073a8 draft beta default/master gamma 281s - 2:61175962e488 draft detached X 281s - $ cd .. 281s - 281s -Check that we pull new tags to existing commits: 281s - $ cd gitrepo 281s - $ git tag 281s - alpha 281s - beta 281s - detached 281s - gamma 281s - $ fn_git_tag extra-simple-tag 281s - $ fn_git_tag -m annotated extra-annotated-tag 281s - $ git push --tags 281s - To $TESTTMP/repo.git 281s - * [new tag] extra-annotated-tag -> extra-annotated-tag 281s - * [new tag] extra-simple-tag -> extra-simple-tag 281s - $ cd ../hgrepo 281s - $ hg pull -r master 281s - pulling from $TESTTMP/repo.git 281s - no changes found 281s - $ hg tags -v | grep extra 281s - extra-simple-tag 1:7fe02317c63d git 281s - extra-annotated-tag 1:7fe02317c63d git 281s 281s ERROR: test-git-tags.t#secret output changed 281s ! 281s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-pull-after-rebase.t 281s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-pull-after-rebase.t.err 281s @@ -38,275 +38,9 @@ 281s Clone it and rebase the branch 281s 281s $ hg clone -U repo.git hgrepo 281s - importing 3 git commits 281s - new changesets ff7a2f2d8d70:205a004356ef (3 drafts) 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 281s + abort: repository repo.git not found 281s + [255] 281s $ cd hgrepo 281s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 281s $ hg state 281s - o branch default/branch tip 2:205a004356ef32b8da782afb89d9179d12ca31e9 281s - | add gamma 281s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 281s - |/ add beta 281s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 281s - add alpha 281s - $ hg up branch 281s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 281s - (activating bookmark branch) 281s - $ hg rebase --quiet -d master 281s - $ hg state 281s - @ branch tip 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 281s - | add gamma 281s - | x default/branch 2:205a004356ef32b8da782afb89d9179d12ca31e9 281s - | | add gamma 281s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 281s - |/ add beta 281s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 281s - add alpha 281s - 281s - $ hg push -fr tip 281s - pushing to $TESTTMP/repo.git 281s - searching for changes 281s - adding objects 281s - remote: found 0 deltas to reuse 281s - added 1 commits with 1 trees and 1 blobs 281s - updating reference refs/heads/branch 281s - $ cd .. 281s - 281s -Now switch back to git and create a new commit based on what we just rebased 281s - 281s - $ cd gitrepo 281s - $ git checkout --quiet -b otherbranch branch 281s - $ git log --oneline --graph --all --decorate 281s - * e5023f9 (HEAD -> otherbranch, origin/branch, branch) add gamma 281s - | * 9497a4e (origin/master, master) add beta 281s - |/ 281s - * 7eeab2e add alpha 281s - $ echo delta > delta 281s - $ git add delta 281s - $ fn_git_commit -m 'add delta' 281s - $ git push --quiet --set-upstream origin otherbranch 281s - Branch 'otherbranch' set up to track remote branch 'otherbranch' from 'origin'. (?) 281s - $ git log --oneline --graph --all --decorate 281s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 281s - * e5023f9 (origin/branch, branch) add gamma 281s - | * 9497a4e (origin/master, master) add beta 281s - |/ 281s - * 7eeab2e add alpha 281s - $ cd .. 281s - 281s -Pull that 281s - 281s - $ cd hgrepo 281s - $ hg pull 281s - pulling from $TESTTMP/repo.git 281s - importing 1 git commits 281s - adding bookmark otherbranch 281s - 1 new orphan changesets 281s - new changesets 075302705298 (1 drafts) 281s - (run 'hg heads' to see heads, 'hg merge' to merge) 281s - $ hg state 281s - * otherbranch default/otherbranch tip 4:0753027052980aef9c9c37adb7d76d5719e8d818 281s - | add delta 281s - | @ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 281s - | | add gamma 281s - x | 2:205a004356ef32b8da782afb89d9179d12ca31e9 281s - | | add gamma 281s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 281s - |/ add beta 281s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 281s - add alpha 281s - 281s - $ cd .. 281s - 281s -To reproduce bug #386, do like github and save the old commit in a 281s -ref, and create a clone containing just the converted git commits: 281s - 281s - $ cd repo.git 281s - $ git update-ref refs/pr/1 otherbranch 281s - $ cd .. 281s - $ hg clone -U repo.git hgrepo-issue386 281s - importing 5 git commits 281s - new changesets ff7a2f2d8d70:075302705298 (5 drafts) 281s - 281s -Now try rebasing that branch, from the Git side of things 281s - 281s - $ cd gitrepo 281s - $ git checkout -q otherbranch 281s - $ git log --oneline --graph --all --decorate 281s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 281s - * e5023f9 (origin/branch, branch) add gamma 281s - | * 9497a4e (origin/master, master) add beta 281s - |/ 281s - * 7eeab2e add alpha 281s - $ fn_git_rebase --onto master branch otherbranch 281s - $ git log --oneline --graph --all --decorate 281s - * 9c58139 (HEAD -> otherbranch) add delta 281s - * 9497a4e (origin/master, master) add beta 281s - | * bba0011 (origin/otherbranch) add delta 281s - | * e5023f9 (origin/branch, branch) add gamma 281s - |/ 281s - * 7eeab2e add alpha 281s - $ git push -f 281s - To $TESTTMP/repo.git 281s - + bba0011...9c58139 otherbranch -> otherbranch (forced update) 281s - $ git log --oneline --graph --all --decorate 281s - * 9c58139 (HEAD -> otherbranch, origin/otherbranch) add delta 281s - * 9497a4e (origin/master, master) add beta 281s - | * e5023f9 (origin/branch, branch) add gamma 281s - |/ 281s - * 7eeab2e add alpha 281s - $ cd .. 281s - 281s -Now strip the old commit 281s - 281s - $ cd hgrepo-issue386 281s - $ hg up null 281s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 281s - $ hg id -qr otherbranch 281s - 075302705298 281s - $ hg pull 281s - pulling from $TESTTMP/repo.git 281s - importing 1 git commits 281s - not updating diverged bookmark otherbranch 281s - new changesets d64bf0521af6 (1 drafts) 281s - (run 'hg heads .' to see heads, 'hg merge' to merge) 281s - $ hg debugstrip --hidden --no-backup otherbranch 281s - $ hg book -d otherbranch 281s - $ hg git-cleanup 281s - git commit map cleaned 281s - $ hg pull 281s - pulling from $TESTTMP/repo.git 281s - no changes found 281s - adding bookmark otherbranch 281s - $ cd .. 281s - 281s -And check that pulling something else doesn't delete that branch. 281s - 281s - $ cd hgrepo 281s - $ hg pull -r master 281s - pulling from $TESTTMP/repo.git 281s - no changes found 281s - $ cd .. 281s - 281s -A special case, is that we can pull into a repository, where a commit 281s -corresponding to the new branch exists, but that commit is obsolete. 281s -In order to avoid “pinning” the obsolete commit, and thereby making it 281s -visible, we first pull from Git as an unnamed remote. 281s - 281s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 281s - updating to branch default 281s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 281s - $ cd hgrepo-clone 281s - $ hg pull ../repo.git 281s - pulling from ../repo.git 281s - importing 4 git commits 281s - not updating diverged bookmark otherbranch 281s - new changesets d64bf0521af6 (1 drafts) 281s - (run 'hg heads .' to see heads, 'hg merge' to merge) 281s - $ hg debugobsolete d64bf0521af68fe2160791a1b4ab9baf282a3879 281s - 1 new obsolescence markers 281s - obsoleted 1 changesets 281s - $ cp ../hgrepo/.hg/hgrc .hg 281s - $ hg pull 281s - pulling from $TESTTMP/repo.git 281s - no changes found 281s - not updating diverged bookmark otherbranch 281s - $ cd .. 281s - $ rm -rf hgrepo-clone 281s - 281s -Another special case, is that we should update commits over obsolete boundaries: 281s - 281s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 281s - updating to branch default 281s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 281s - $ cd hgrepo-clone 281s - $ hg pull ../repo.git 281s - pulling from ../repo.git 281s - importing 4 git commits 281s - not updating diverged bookmark otherbranch 281s - new changesets d64bf0521af6 (1 drafts) 281s - (run 'hg heads .' to see heads, 'hg merge' to merge) 281s - $ hg debugobsolete 0753027052980aef9c9c37adb7d76d5719e8d818 d64bf0521af68fe2160791a1b4ab9baf282a3879 281s - 1 new obsolescence markers 281s - obsoleted 1 changesets 281s - $ hg book -r 075302705298 otherbranch 281s - $ cp ../hgrepo/.hg/hgrc .hg 281s - $ hg pull 281s - pulling from $TESTTMP/repo.git 281s - no changes found 281s - updating bookmark otherbranch 281s - $ cd .. 281s - $ rm -rf hgrepo-clone 281s - 281s -Now just pull it: 281s - 281s - $ cd hgrepo 281s - $ hg pull 281s - pulling from $TESTTMP/repo.git 281s - importing 1 git commits 281s - not updating diverged bookmark otherbranch 281s - new changesets d64bf0521af6 (1 drafts) 281s - (run 'hg heads .' to see heads, 'hg merge' to merge) 281s - $ hg state 281s - o default/otherbranch tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 281s - | add delta 281s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 281s - | | add delta 281s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 281s - | | add gamma 281s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 281s - | | add gamma 281s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 281s - |/ add beta 281s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 281s - add alpha 281s - $ cd .. 281s - 281s -And finally, delete it: 281s - 281s - $ cd gitrepo 281s - $ git push origin :otherbranch 281s - To $TESTTMP/repo.git 281s - - [deleted] otherbranch 281s - $ cd .. 281s - 281s -And pull that: 281s - 281s - $ cd hgrepo 281s - $ hg pull 281s - pulling from $TESTTMP/repo.git 281s - no changes found 281s - not deleting diverged bookmark otherbranch 281s - $ hg state 281s - o tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 281s - | add delta 281s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 281s - | | add delta 281s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 281s - | | add gamma 281s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 281s - | | add gamma 281s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 281s - |/ add beta 281s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 281s - add alpha 281s - $ cd .. 281s - 281s -We only get that message once: 281s - 281s - $ hg -R hgrepo pull 281s - pulling from $TESTTMP/repo.git 281s - no changes found 281s - 281s -Now try deleting one already gone locally, which shouldn't output 281s -anything: 281s - 281s - $ cd gitrepo 281s - $ git push origin :branch 281s - To $TESTTMP/repo.git 281s - - [deleted] branch 281s - $ cd ../hgrepo 281s - $ hg book -d branch 281s - $ hg pull 281s - pulling from $TESTTMP/repo.git 281s - no changes found 281s - $ cd .. 281s 281s ERROR: test-pull-after-rebase.t output changed 281s ! 281s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-push.t 281s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-push.t.err 281s @@ -12,287 +12,10 @@ 281s 281s $ cd .. 281s $ hg clone -u tip gitrepo hgrepo 281s - importing 1 git commits 281s - new changesets ff7a2f2d8d70 (1 drafts) 281s - updating to branch default 281s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 281s + abort: repository gitrepo not found 281s + [255] 281s 281s $ cd hgrepo 281s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 281s $ hg bookmark -q master 281s - $ echo beta > beta 281s - $ hg add beta 281s - $ fn_hg_commit -m 'add beta' 281s - 281s - 281s - $ echo gamma > gamma 281s - $ hg add gamma 281s - $ fn_hg_commit -m 'add gamma' 281s - 281s - $ hg book -r 1 beta 281s - $ hg push -r beta 281s - pushing to $TESTTMP/gitrepo 281s - searching for changes 281s - adding objects 281s - remote: found 0 deltas to reuse 281s - added 1 commits with 1 trees and 1 blobs 281s - adding reference refs/heads/beta 281s - 281s - $ cd .. 281s - 281s -should have two different branches 281s - $ cd gitrepo 281s - $ git branch -v 281s - beta 0f378ab add beta 281s - master 7eeab2e add alpha 281s - * not-master 7eeab2e add alpha 281s - 281s -some more work on master from git 281s - $ git checkout master 2>&1 | sed s/\'/\"/g 281s - Switched to branch "master" 281s - $ echo delta > delta 281s - $ git add delta 281s - $ fn_git_commit -m "add delta" 281s - $ git checkout not-master 2>&1 | sed s/\'/\"/g 281s - Switched to branch "not-master" 281s - 281s - $ cd .. 281s - 281s - $ cd hgrepo 281s -this should fail 281s - $ hg push -r master 281s - pushing to $TESTTMP/gitrepo 281s - searching for changes 281s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 281s - [255] 281s - 281s -... even with -f 281s - $ hg push -fr master 281s - pushing to $TESTTMP/gitrepo 281s - searching for changes 281s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 281s - [255] 281s - 281s - $ hg pull 2>&1 | grep -v 'divergent bookmark' 281s - pulling from $TESTTMP/gitrepo 281s - importing 1 git commits 281s - not updating diverged bookmark master 281s - new changesets 25eed24f5e8f (1 drafts) 281s - (run 'hg heads' to see heads, 'hg merge' to merge) 281s -TODO shouldn't need to do this since we're (in theory) pushing master explicitly, 281s -which should not implicitly also push the not-master ref. 281s - $ hg book not-master -r default/not-master --force 281s -master and default/master should be diferent 281s - $ hg log -r master 281s - changeset: 2:953796e1cfd8 281s - bookmark: master 281s - user: test 281s - date: Mon Jan 01 00:00:12 2007 +0000 281s - summary: add gamma 281s - 281s - $ hg log -r default/master 281s - changeset: 3:25eed24f5e8f 281s - tag: default/master 281s - tag: tip 281s - parent: 0:ff7a2f2d8d70 281s - user: test 281s - date: Mon Jan 01 00:00:13 2007 +0000 281s - summary: add delta 281s - 281s - 281s -this should also fail 281s - $ hg push -r master 281s - pushing to $TESTTMP/gitrepo 281s - searching for changes 281s - abort: pushing refs/heads/master overwrites 953796e1cfd8 281s - [255] 281s - 281s -... but succeed with -f 281s - $ hg push -fr master 281s - pushing to $TESTTMP/gitrepo 281s - searching for changes 281s - adding objects 281s - remote: found 0 deltas to reuse 281s - added 1 commits with 1 trees and 1 blobs 281s - updating reference refs/heads/master 281s - 281s -this should fail, no changes to push 281s - $ hg push -r master 281s - pushing to $TESTTMP/gitrepo 281s - searching for changes 281s - no changes found 281s - [1] 281s - 281s -hg-git issue103 -- directories can lose information at hg-git export time 281s - 281s - $ hg up master 281s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 281s - $ mkdir dir1 281s - $ echo alpha > dir1/alpha 281s - $ hg add dir1/alpha 281s - $ fn_hg_commit -m 'add dir1/alpha' 281s - $ hg push -r master 281s - pushing to $TESTTMP/gitrepo 281s - searching for changes 281s - adding objects 281s - remote: found 0 deltas to reuse 281s - added 1 commits with 2 trees and 0 blobs 281s - updating reference refs/heads/master 281s - 281s - $ echo beta > dir1/beta 281s - $ hg add dir1/beta 281s - $ fn_hg_commit -m 'add dir1/beta' 281s - $ hg push -r master 281s - pushing to $TESTTMP/gitrepo 281s - searching for changes 281s - adding objects 281s - remote: found 0 deltas to reuse 281s - added 1 commits with 2 trees and 0 blobs 281s - updating reference refs/heads/master 281s - $ hg log -r master 281s - changeset: 5:ba0476ff1899 281s - bookmark: master 281s - tag: default/master 281s - tag: tip 281s - user: test 281s - date: Mon Jan 01 00:00:15 2007 +0000 281s - summary: add dir1/beta 281s - 281s - 281s - $ cat >> .hg/hgrc << EOF 281s - > [paths] 281s - > default:pushurl = file:///$TESTTMP/gitrepo 281s - > EOF 281s -NB: the triple slashes are intentional, due to windows 281s - $ hg push -r master 281s - pushing to file:///$TESTTMP/gitrepo 281s - searching for changes 281s - no changes found 281s - [1] 281s - 281s - $ cd .. 281s - 281s - $ hg clone -u tip gitrepo hgrepo-test 281s - importing 5 git commits 281s - new changesets ff7a2f2d8d70:ba0476ff1899 (5 drafts) 281s - updating to branch default 281s - 5 files updated, 0 files merged, 0 files removed, 0 files unresolved 281s - $ hg -R hgrepo-test log -r master 281s - changeset: 4:ba0476ff1899 281s - bookmark: master 281s - tag: default/master 281s - tag: tip 281s - user: test 281s - date: Mon Jan 01 00:00:15 2007 +0000 281s - summary: add dir1/beta 281s - 281s - $ hg tags -R hgrepo-test | grep ^default/ 281s - default/master 4:ba0476ff1899 281s - default/beta 1:47580592d3d6 281s - default/not-master 0:ff7a2f2d8d70 281s - 281s -Push a fast-forward to a currently checked out branch, which sometimes 281s -fails: 281s - 281s - $ cd hgrepo 281s - $ hg book -r master not-master 281s - moving bookmark 'not-master' forward from ff7a2f2d8d70 281s - $ hg push 281s - pushing to file:///$TESTTMP/gitrepo 281s - searching for changes 281s - warning: failed to update HEAD; unable to set b'HEAD' to b'7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03' (?) 281s - updating reference refs/heads/not-master 281s -That should have updated the tag: 281s - $ hg tags | grep ^default/ 281s - default/not-master 5:ba0476ff1899 281s - default/master 5:ba0476ff1899 281s - default/beta 1:47580592d3d6 281s - $ cd .. 281s - 281s -We can push only one of two bookmarks on the same revision: 281s - 281s - $ cd hgrepo 281s - $ hg book -r 0 also-not-master really-not-master 281s - $ hg push -B also-not-master 281s - pushing to file:///$TESTTMP/gitrepo 281s - searching for changes 281s - adding reference refs/heads/also-not-master 281s - 281s -We can also push another bookmark to a path with another revision 281s -specified: 281s - 281s - $ hg book -r 3 also-not-master 281s - moving bookmark 'also-not-master' forward from ff7a2f2d8d70 281s - $ hg push -B also-not-master "file:///$TESTTMP/gitrepo#master" 281s - pushing to file:///$TESTTMP/gitrepo 281s - searching for changes 281s - adding objects 281s - remote: found 0 deltas to reuse 281s - added 1 commits with 1 trees and 1 blobs 281s - updating reference refs/heads/also-not-master 281s - 281s -And we can delete them again afterwards: 281s - 281s - $ hg book -d also-not-master really-not-master 281s - $ hg push -B also-not-master -B really-not-master 281s - pushing to file:///$TESTTMP/gitrepo 281s - searching for changes 281s - warning: unable to delete 'refs/heads/really-not-master' as it does not exist on the remote repository 281s - deleting reference refs/heads/also-not-master 281s - 281s -Push empty Hg repo to empty Git repo (issue #58) 281s - $ hg init hgrepo2 281s - $ git init -q --bare repo.git 281s - $ hg -R hgrepo2 push repo.git 281s - pushing to repo.git 281s - searching for changes 281s - abort: no bookmarks or tags to push to git 281s - (see "hg help bookmarks" for details on creating them) 281s - [255] 281s - 281s -The remote repo is empty and the local one doesn't have any bookmarks/tags 281s - $ cd hgrepo2 281s - $ echo init >> test.txt 281s - $ hg addremove 281s - adding test.txt 281s - $ fn_hg_commit -m init 281s - $ hg update null 281s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 281s - $ hg push ../repo.git 281s - pushing to ../repo.git 281s - searching for changes 281s - abort: no bookmarks or tags to push to git 281s - (see "hg help bookmarks" for details on creating them) 281s - [255] 281s - $ hg summary 281s - parent: -1:000000000000 (no revision checked out) 281s - branch: default 281s - commit: (clean) 281s - update: 1 new changesets (update) 281s - phases: 1 draft 281s -That should not create any bookmarks 281s - $ hg bookmarks 281s - no bookmarks set 281s -And no tags for the remotes either: 281s - $ hg tags 281s - tip 0:8aded40be5af 281s - 281s -test for ssh vulnerability 281s - 281s - $ cat >> $HGRCPATH << EOF 281s - > [ui] 281s - > ssh = ssh -o ConnectTimeout=1 281s - > EOF 281s - $ hg push -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 281s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 281s - [255] 281s - $ hg push -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 281s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 281s - [255] 281s - $ hg push -q 'git+ssh://fakehost|rm%20nonexistent/path' 281s - ssh: * fakehost%7?rm%20nonexistent* (glob) 281s - abort: git remote error: The remote server unexpectedly closed the connection. 281s - [255] 281s - $ hg push -q 'git+ssh://fakehost%7Crm%20nonexistent/path' 281s - ssh: * fakehost%7?rm%20nonexistent* (glob) 281s - abort: git remote error: The remote server unexpectedly closed the connection. 281s - [255] 281s 281s ERROR: test-push.t output changed 285s ! 285s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-clone.t 285s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-clone.t#draft.err 285s @@ -38,60 +38,42 @@ 285s clone a tag 285s 285s $ hg clone -r alpha gitrepo hgrepo-a 285s - importing 1 git commits 285s - new changesets ff7a2f2d8d70 (1 drafts) 285s - updating to branch default 285s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository gitrepo not found 285s + [255] 285s $ hg -R hgrepo-a bookmarks 285s - master 0:ff7a2f2d8d70 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-a not found 285s + [255] 285s $ hg -R hgrepo-a log --graph --template=phases 285s - @ changeset: 0:ff7a2f2d8d70 285s - bookmark: master 285s - tag: alpha 285s - tag: default/master 285s - tag: tip 285s - phase: draft 285s - user: test 285s - date: Mon Jan 01 00:00:10 2007 +0000 285s - summary: add alpha 285s - 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-a not found 285s + [255] 285s $ git --git-dir hgrepo-a/.hg/git for-each-ref 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 285s + fatal: not a git repository: 'hgrepo-a/.hg/git' 285s + [128] 285s Make sure this is still draft since we didn't pull remote's HEAD 285s $ hg -R hgrepo-a phase -r alpha 285s - 0: draft 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-a not found 285s + [255] 285s 285s clone a branch 285s $ hg clone -r beta gitrepo hgrepo-b 285s - importing 2 git commits 285s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 285s - updating to branch default 285s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository gitrepo not found 285s + [255] 285s $ hg -R hgrepo-b bookmarks 285s - * beta 1:7fe02317c63d 285s - master 0:ff7a2f2d8d70 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-b not found 285s + [255] 285s $ hg -R hgrepo-b log --graph 285s - @ changeset: 1:7fe02317c63d 285s - | bookmark: beta 285s - | tag: default/beta 285s - | tag: tip 285s - | user: test 285s - | date: Mon Jan 01 00:00:11 2007 +0000 285s - | summary: add beta 285s - | 285s - o changeset: 0:ff7a2f2d8d70 285s - bookmark: master 285s - tag: alpha 285s - tag: default/master 285s - user: test 285s - date: Mon Jan 01 00:00:10 2007 +0000 285s - summary: add alpha 285s - 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-b not found 285s + [255] 285s $ git --git-dir hgrepo-b/.hg/git for-each-ref 285s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 285s + fatal: not a git repository: 'hgrepo-b/.hg/git' 285s + [128] 285s 285s Make sure that a deleted .hgsubstate does not confuse hg-git 285s 285s @@ -104,48 +86,50 @@ 285s $ cd .. 285s 285s $ hg clone -r beta gitrepo hgrepo-c 285s - importing 4 git commits 285s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 285s - updating to branch default 285s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository gitrepo not found 285s + [255] 285s $ hg -R hgrepo-c bookmarks 285s - * beta 3:47d12948785d 285s - master 0:ff7a2f2d8d70 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-c not found 285s + [255] 285s $ hg --cwd hgrepo-c status 285s + abort: No such file or directory: 'hgrepo-c' 285s + [255] 285s $ git --git-dir hgrepo-c/.hg/git for-each-ref 285s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 285s + fatal: not a git repository: 'hgrepo-c/.hg/git' 285s + [128] 285s 285s test shared repositories 285s 285s $ hg clone gitrepo hgrepo-base 285s - importing 5 git commits 285s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 285s - updating to bookmark beta 285s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository gitrepo not found 285s + [255] 285s $ hg -R hgrepo-base bookmarks 285s - * beta 4:47d12948785d 285s - gamma 2:ca33a262eb46 285s - master 0:ff7a2f2d8d70 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-base not found 285s + [255] 285s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 285s - updating working directory 285s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-base not found 285s + [255] 285s $ hg -R hgrepo-shared pull gitrepo 285s - pulling from gitrepo 285s - no changes found 285s - adding bookmark beta 285s - adding bookmark gamma 285s - adding bookmark master 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-shared not found 285s + [255] 285s $ hg -R hgrepo-shared push gitrepo 285s - pushing to gitrepo 285s - searching for changes 285s - no changes found 285s - [1] 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-shared not found 285s + [255] 285s $ ls hgrepo-shared/.hg | grep git 285s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 285s [1] 285s $ hg -R hgrepo-shared git-cleanup 285s - git commit map cleaned 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + hg: unknown command 'git-cleanup' 285s + (did you mean clean?) 285s + [10] 285s $ rm -rf hgrepo-base hgrepo-shared 285s 285s test cloning HEAD 285s @@ -154,23 +138,21 @@ 285s $ git checkout -q master 285s $ cd .. 285s $ hg clone gitrepo hgrepo-2 285s - importing 5 git commits 285s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 285s - updating to bookmark master 285s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository gitrepo not found 285s + [255] 285s $ git --git-dir hgrepo-2/.hg/git for-each-ref 285s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 285s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 285s + fatal: not a git repository: 'hgrepo-2/.hg/git' 285s + [128] 285s $ rm -rf hgrepo-2 285s 285s clone empty repo 285s $ git init empty 285s Initialized empty Git repository in $TESTTMP/empty/.git/ 285s $ hg clone empty emptyhg 285s - updating to branch default 285s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository empty not found 285s + [255] 285s $ rm -rf empty emptyhg 285s 285s test cloning detached HEAD, but pointing to a branch; we detect this 285s @@ -180,25 +162,20 @@ 285s $ git checkout -q -d master 285s $ cd .. 285s $ hg clone gitrepo hgrepo-2 285s - importing 5 git commits 285s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 285s - updating to bookmark master 285s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository gitrepo not found 285s + [255] 285s $ hg -R hgrepo-2 book 285s - beta 4:47d12948785d 285s - gamma 2:ca33a262eb46 285s - * master 0:ff7a2f2d8d70 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-2 not found 285s + [255] 285s $ hg -R hgrepo-2 tags -v 285s - tip 4:47d12948785d 285s - default/beta 4:47d12948785d git-remote 285s - default/gamma 2:ca33a262eb46 git-remote 285s - default/master 0:ff7a2f2d8d70 git-remote 285s - alpha 0:ff7a2f2d8d70 git 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-2 not found 285s + [255] 285s $ git --git-dir hgrepo-2/.hg/git for-each-ref 285s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 285s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 285s + fatal: not a git repository: 'hgrepo-2/.hg/git' 285s + [128] 285s $ rm -rf hgrepo-2 285s 285s test cloning fully detached HEAD; we don't convert the 285s @@ -212,44 +189,45 @@ 285s $ fn_git_commit -m 'add delta' 285s $ cd .. 285s $ hg clone gitrepo hgrepo-2 285s - importing 5 git commits 285s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 285s - warning: the git source repository has a detached head 285s - (you may want to update to a bookmark) 285s - updating to branch default 285s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository gitrepo not found 285s + [255] 285s $ hg -R hgrepo-2 book 285s - beta 4:47d12948785d 285s - gamma 2:ca33a262eb46 285s - master 0:ff7a2f2d8d70 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-2 not found 285s + [255] 285s $ hg -R hgrepo-2 id --tags 285s - default/beta tip 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-2 not found 285s + [255] 285s $ git --git-dir hgrepo-2/.hg/git for-each-ref 285s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 285s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 285s + fatal: not a git repository: 'hgrepo-2/.hg/git' 285s + [128] 285s $ rm -rf hgrepo-2 285s 285s test that cloning a regular mercurial repository does not introduce 285s git state 285s 285s $ hg init hgrepo-base 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s $ cd hgrepo-base 285s $ touch flaf 285s $ fn_hg_commit -A -m flaf 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s $ cd .. 285s $ hg clone -U hgrepo-base hgrepo-copy 285s requesting all changes (secret !) 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s $ ls hgrepo-copy/.hg | grep git 285s [1] 285s $ hg clone -U --pull hgrepo-base hgrepo-pull 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s requesting all changes 285s - adding changesets (draft !) 285s - adding manifests (draft !) 285s - adding file changes (draft !) 285s - added 1 changesets with 1 changes to 1 files (draft !) 285s - new changesets 76c919376257 (draft !) 285s + adding changesets 285s + adding manifests 285s + adding file changes 285s + added 1 changesets with 1 changes to 1 files 285s + new changesets 76c919376257 285s $ ls hgrepo-pull | grep git 285s [1] 285s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 285s 285s ERROR: test-clone.t#draft output changed 285s ! 285s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-clone.t 285s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-clone.t#secret.err 285s @@ -38,60 +38,42 @@ 285s clone a tag 285s 285s $ hg clone -r alpha gitrepo hgrepo-a 285s - importing 1 git commits 285s - new changesets ff7a2f2d8d70 (1 drafts) 285s - updating to branch default 285s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository gitrepo not found 285s + [255] 285s $ hg -R hgrepo-a bookmarks 285s - master 0:ff7a2f2d8d70 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-a not found 285s + [255] 285s $ hg -R hgrepo-a log --graph --template=phases 285s - @ changeset: 0:ff7a2f2d8d70 285s - bookmark: master 285s - tag: alpha 285s - tag: default/master 285s - tag: tip 285s - phase: draft 285s - user: test 285s - date: Mon Jan 01 00:00:10 2007 +0000 285s - summary: add alpha 285s - 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-a not found 285s + [255] 285s $ git --git-dir hgrepo-a/.hg/git for-each-ref 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 285s + fatal: not a git repository: 'hgrepo-a/.hg/git' 285s + [128] 285s Make sure this is still draft since we didn't pull remote's HEAD 285s $ hg -R hgrepo-a phase -r alpha 285s - 0: draft 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-a not found 285s + [255] 285s 285s clone a branch 285s $ hg clone -r beta gitrepo hgrepo-b 285s - importing 2 git commits 285s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 285s - updating to branch default 285s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository gitrepo not found 285s + [255] 285s $ hg -R hgrepo-b bookmarks 285s - * beta 1:7fe02317c63d 285s - master 0:ff7a2f2d8d70 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-b not found 285s + [255] 285s $ hg -R hgrepo-b log --graph 285s - @ changeset: 1:7fe02317c63d 285s - | bookmark: beta 285s - | tag: default/beta 285s - | tag: tip 285s - | user: test 285s - | date: Mon Jan 01 00:00:11 2007 +0000 285s - | summary: add beta 285s - | 285s - o changeset: 0:ff7a2f2d8d70 285s - bookmark: master 285s - tag: alpha 285s - tag: default/master 285s - user: test 285s - date: Mon Jan 01 00:00:10 2007 +0000 285s - summary: add alpha 285s - 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-b not found 285s + [255] 285s $ git --git-dir hgrepo-b/.hg/git for-each-ref 285s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 285s + fatal: not a git repository: 'hgrepo-b/.hg/git' 285s + [128] 285s 285s Make sure that a deleted .hgsubstate does not confuse hg-git 285s 285s @@ -104,48 +86,50 @@ 285s $ cd .. 285s 285s $ hg clone -r beta gitrepo hgrepo-c 285s - importing 4 git commits 285s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 285s - updating to branch default 285s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository gitrepo not found 285s + [255] 285s $ hg -R hgrepo-c bookmarks 285s - * beta 3:47d12948785d 285s - master 0:ff7a2f2d8d70 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-c not found 285s + [255] 285s $ hg --cwd hgrepo-c status 285s + abort: No such file or directory: 'hgrepo-c' 285s + [255] 285s $ git --git-dir hgrepo-c/.hg/git for-each-ref 285s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 285s + fatal: not a git repository: 'hgrepo-c/.hg/git' 285s + [128] 285s 285s test shared repositories 285s 285s $ hg clone gitrepo hgrepo-base 285s - importing 5 git commits 285s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 285s - updating to bookmark beta 285s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository gitrepo not found 285s + [255] 285s $ hg -R hgrepo-base bookmarks 285s - * beta 4:47d12948785d 285s - gamma 2:ca33a262eb46 285s - master 0:ff7a2f2d8d70 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-base not found 285s + [255] 285s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 285s - updating working directory 285s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-base not found 285s + [255] 285s $ hg -R hgrepo-shared pull gitrepo 285s - pulling from gitrepo 285s - no changes found 285s - adding bookmark beta 285s - adding bookmark gamma 285s - adding bookmark master 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-shared not found 285s + [255] 285s $ hg -R hgrepo-shared push gitrepo 285s - pushing to gitrepo 285s - searching for changes 285s - no changes found 285s - [1] 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-shared not found 285s + [255] 285s $ ls hgrepo-shared/.hg | grep git 285s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 285s [1] 285s $ hg -R hgrepo-shared git-cleanup 285s - git commit map cleaned 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + hg: unknown command 'git-cleanup' 285s + (did you mean clean?) 285s + [10] 285s $ rm -rf hgrepo-base hgrepo-shared 285s 285s test cloning HEAD 285s @@ -154,23 +138,21 @@ 285s $ git checkout -q master 285s $ cd .. 285s $ hg clone gitrepo hgrepo-2 285s - importing 5 git commits 285s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 285s - updating to bookmark master 285s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository gitrepo not found 285s + [255] 285s $ git --git-dir hgrepo-2/.hg/git for-each-ref 285s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 285s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 285s + fatal: not a git repository: 'hgrepo-2/.hg/git' 285s + [128] 285s $ rm -rf hgrepo-2 285s 285s clone empty repo 285s $ git init empty 285s Initialized empty Git repository in $TESTTMP/empty/.git/ 285s $ hg clone empty emptyhg 285s - updating to branch default 285s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository empty not found 285s + [255] 285s $ rm -rf empty emptyhg 285s 285s test cloning detached HEAD, but pointing to a branch; we detect this 285s @@ -180,25 +162,20 @@ 285s $ git checkout -q -d master 285s $ cd .. 285s $ hg clone gitrepo hgrepo-2 285s - importing 5 git commits 285s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 285s - updating to bookmark master 285s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository gitrepo not found 285s + [255] 285s $ hg -R hgrepo-2 book 285s - beta 4:47d12948785d 285s - gamma 2:ca33a262eb46 285s - * master 0:ff7a2f2d8d70 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-2 not found 285s + [255] 285s $ hg -R hgrepo-2 tags -v 285s - tip 4:47d12948785d 285s - default/beta 4:47d12948785d git-remote 285s - default/gamma 2:ca33a262eb46 git-remote 285s - default/master 0:ff7a2f2d8d70 git-remote 285s - alpha 0:ff7a2f2d8d70 git 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-2 not found 285s + [255] 285s $ git --git-dir hgrepo-2/.hg/git for-each-ref 285s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 285s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 285s + fatal: not a git repository: 'hgrepo-2/.hg/git' 285s + [128] 285s $ rm -rf hgrepo-2 285s 285s test cloning fully detached HEAD; we don't convert the 285s @@ -212,44 +189,45 @@ 285s $ fn_git_commit -m 'add delta' 285s $ cd .. 285s $ hg clone gitrepo hgrepo-2 285s - importing 5 git commits 285s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 285s - warning: the git source repository has a detached head 285s - (you may want to update to a bookmark) 285s - updating to branch default 285s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository gitrepo not found 285s + [255] 285s $ hg -R hgrepo-2 book 285s - beta 4:47d12948785d 285s - gamma 2:ca33a262eb46 285s - master 0:ff7a2f2d8d70 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-2 not found 285s + [255] 285s $ hg -R hgrepo-2 id --tags 285s - default/beta tip 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository hgrepo-2 not found 285s + [255] 285s $ git --git-dir hgrepo-2/.hg/git for-each-ref 285s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 285s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 285s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 285s + fatal: not a git repository: 'hgrepo-2/.hg/git' 285s + [128] 285s $ rm -rf hgrepo-2 285s 285s test that cloning a regular mercurial repository does not introduce 285s git state 285s 285s $ hg init hgrepo-base 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s $ cd hgrepo-base 285s $ touch flaf 285s $ fn_hg_commit -A -m flaf 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s $ cd .. 285s $ hg clone -U hgrepo-base hgrepo-copy 285s - requesting all changes (secret !) 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + requesting all changes 285s $ ls hgrepo-copy/.hg | grep git 285s [1] 285s $ hg clone -U --pull hgrepo-base hgrepo-pull 285s - requesting all changes 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s adding changesets (draft !) 285s adding manifests (draft !) 285s adding file changes (draft !) 285s added 1 changesets with 1 changes to 1 files (draft !) 285s new changesets 76c919376257 (draft !) 285s + requesting all changes 285s $ ls hgrepo-pull | grep git 285s [1] 285s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 285s 285s ERROR: test-clone.t#secret output changed 285s ! 285s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-branch-bookmark-suffix.t 285s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-branch-bookmark-suffix.t#with-path.err 285s @@ -9,287 +9,12 @@ 285s $ git init -q --bare repo.git 285s 285s $ hg clone repo.git hgrepo 285s - updating to branch default 285s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository repo.git not found 285s + [255] 285s $ cd hgrepo 285s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 285s #if without-path 285s $ rm .hg/hgrc 285s #endif 285s $ hg branch -q branch1 285s - $ hg bookmark branch1_bookmark 285s - $ echo f1 > f1 285s - $ hg add f1 285s - $ fn_hg_commit -m "add f1" 285s - $ hg branch -q branch2 285s - $ hg bookmark branch2_bookmark 285s - $ echo f2 > f2 285s - $ hg add f2 285s - $ fn_hg_commit -m "add f2" 285s - $ hg log --graph 285s - @ changeset: 1:600de9b6d498 285s - | branch: branch2 285s - | bookmark: branch2_bookmark 285s - | tag: tip 285s - | user: test 285s - | date: Mon Jan 01 00:00:11 2007 +0000 285s - | summary: add f2 285s - | 285s - o changeset: 0:40a840c1f8ae 285s - branch: branch1 285s - bookmark: branch1_bookmark 285s - user: test 285s - date: Mon Jan 01 00:00:10 2007 +0000 285s - summary: add f1 285s - 285s - 285s - $ hg push -B asdasd ../repo.git 285s - pushing to ../repo.git 285s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 285s - [255] 285s - 285s - $ hg push ../repo.git 285s - pushing to ../repo.git 285s - searching for changes 285s - adding objects 285s - remote: found 0 deltas to reuse 285s - added 2 commits with 2 trees and 2 blobs 285s - adding reference refs/heads/branch1 285s - adding reference refs/heads/branch2 285s - 285s - $ cd .. 285s - 285s - $ cd repo.git 285s - $ git symbolic-ref HEAD refs/heads/branch1 285s - $ git branch 285s - * branch1 285s - branch2 285s - $ cd .. 285s - 285s - $ git clone repo.git gitrepo 285s - Cloning into 'gitrepo'... 285s - done. 285s - $ cd gitrepo 285s - $ git checkout -q branch1 285s - $ echo g1 >> f1 285s - $ git add f1 285s - $ fn_git_commit -m "append f1" 285s - $ git checkout -q branch2 285s - $ echo g2 >> f2 285s - $ git add f2 285s - $ fn_git_commit -m "append f2" 285s - $ git checkout -b branch3 285s - Switched to a new branch 'branch3' 285s - $ echo g3 >> f3 285s - $ git add f3 285s - $ fn_git_commit -m "append f3" 285s - $ git push origin branch1 branch2 branch3 285s - To $TESTTMP/repo.git 285s - bbfe79a..d8aef79 branch1 -> branch1 285s - 288e92b..f8f8de5 branch2 -> branch2 285s - * [new branch] branch3 -> branch3 285s -make sure the commit doesn't have an HG:rename-source annotation 285s - $ git cat-file commit d8aef79 285s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 285s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 285s - author test 1167609612 +0000 285s - committer test 1167609612 +0000 285s - 285s - append f1 285s - $ cd .. 285s - 285s - $ cd hgrepo 285s - $ hg paths 285s - default = $TESTTMP/repo.git (with-path !) 285s - $ hg pull ../repo.git 285s - pulling from ../repo.git 285s - importing 3 git commits 285s - updating bookmark branch1_bookmark 285s - updating bookmark branch2_bookmark 285s - adding bookmark branch3_bookmark 285s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 285s - (run 'hg heads' to see heads) 285s - $ hg log --graph 285s - o changeset: 4:faf44fc3a4e8 285s - | bookmark: branch3_bookmark 285s - | tag: default/branch3 (with-path !) 285s - | tag: tip 285s - | user: test 285s - | date: Mon Jan 01 00:00:14 2007 +0000 285s - | summary: append f3 285s - | 285s - o changeset: 3:ae8eb55f7090 285s - | bookmark: branch2_bookmark 285s - | tag: default/branch2 (with-path !) 285s - | parent: 1:600de9b6d498 285s - | user: test 285s - | date: Mon Jan 01 00:00:13 2007 +0000 285s - | summary: append f2 285s - | 285s - | o changeset: 2:8211cade99e4 285s - | | bookmark: branch1_bookmark 285s - | | tag: default/branch1 (with-path !) 285s - | | parent: 0:40a840c1f8ae 285s - | | user: test 285s - | | date: Mon Jan 01 00:00:12 2007 +0000 285s - | | summary: append f1 285s - | | 285s - @ | changeset: 1:600de9b6d498 285s - |/ branch: branch2 285s - | user: test 285s - | date: Mon Jan 01 00:00:11 2007 +0000 285s - | summary: add f2 285s - | 285s - o changeset: 0:40a840c1f8ae 285s - branch: branch1 285s - user: test 285s - date: Mon Jan 01 00:00:10 2007 +0000 285s - summary: add f1 285s - 285s - $ cd .. 285s - 285s -Try cloning a bookmark, and make sure it gets checked out: 285s - 285s - $ rm -r hgrepo 285s - $ hg clone -r branch3 repo.git hgrepo 285s - importing 4 git commits 285s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 285s - updating to bookmark branch3_bookmark 285s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s - $ cd hgrepo 285s - $ hg bookmarks 285s - branch2_bookmark 2:ae8eb55f7090 285s - * branch3_bookmark 3:faf44fc3a4e8 285s - $ hg log --graph 285s - @ changeset: 3:faf44fc3a4e8 285s - | bookmark: branch3_bookmark 285s - | tag: default/branch3 285s - | tag: tip 285s - | user: test 285s - | date: Mon Jan 01 00:00:14 2007 +0000 285s - | summary: append f3 285s - | 285s - o changeset: 2:ae8eb55f7090 285s - | bookmark: branch2_bookmark 285s - | tag: default/branch2 285s - | user: test 285s - | date: Mon Jan 01 00:00:13 2007 +0000 285s - | summary: append f2 285s - | 285s - o changeset: 1:600de9b6d498 285s - | branch: branch2 285s - | user: test 285s - | date: Mon Jan 01 00:00:11 2007 +0000 285s - | summary: add f2 285s - | 285s - o changeset: 0:40a840c1f8ae 285s - branch: branch1 285s - user: test 285s - date: Mon Jan 01 00:00:10 2007 +0000 285s - summary: add f1 285s - 285s - $ cd .. 285s - 285s -Try cloning something that's both a bookmark and a branch, and see the 285s -results. They're a bit suprising as the bookmark does get activated, 285s -but the branch get checked out. Although this does seem a bit odd, so 285s -does the scenario. 285s - 285s - $ rm -r hgrepo 285s - $ hg clone -r branch1 repo.git hgrepo 285s - importing 2 git commits 285s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 285s - updating to branch branch1 285s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s - $ cd hgrepo 285s - $ hg bookmarks 285s - * branch1_bookmark 1:8211cade99e4 285s - $ hg log --graph 285s - o changeset: 1:8211cade99e4 285s - | bookmark: branch1_bookmark 285s - | tag: default/branch1 285s - | tag: tip 285s - | user: test 285s - | date: Mon Jan 01 00:00:12 2007 +0000 285s - | summary: append f1 285s - | 285s - @ changeset: 0:40a840c1f8ae 285s - branch: branch1 285s - user: test 285s - date: Mon Jan 01 00:00:10 2007 +0000 285s - summary: add f1 285s - 285s - 285s - $ cd .. 285s - 285s -Now try pulling a diverged bookmark: 285s - 285s - $ rm -r hgrepo 285s -#if with-path 285s - $ hg clone -U repo.git hgrepo 285s - importing 5 git commits 285s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 285s -#else 285s - $ hg init hgrepo 285s - $ hg -R hgrepo pull repo.git 285s - pulling from repo.git 285s - importing 5 git commits 285s - adding bookmark branch1_bookmark 285s - adding bookmark branch2_bookmark 285s - adding bookmark branch3_bookmark 285s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 285s - (run 'hg heads' to see heads, 'hg merge' to merge) 285s -#endif 285s - $ cd gitrepo 285s - $ git checkout -q branch1 285s - $ fn_git_rebase branch3 285s - $ git push -f 285s - To $TESTTMP/repo.git 285s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 285s - $ cd ../hgrepo 285s - $ hg pull ../repo.git 285s - pulling from ../repo.git 285s - importing 1 git commits 285s - not updating diverged bookmark branch1_bookmark 285s - new changesets 895d0307f8b7 (1 drafts) 285s - (run 'hg update' to get a working copy) 285s - $ hg log --graph 285s - o changeset: 5:895d0307f8b7 285s - | tag: default/branch1 (with-path !) 285s - | tag: tip 285s - | user: test 285s - | date: Mon Jan 01 00:00:12 2007 +0000 285s - | summary: append f1 285s - | 285s - o changeset: 4:faf44fc3a4e8 285s - | bookmark: branch3_bookmark 285s - | tag: default/branch3 (with-path !) 285s - | user: test 285s - | date: Mon Jan 01 00:00:14 2007 +0000 285s - | summary: append f3 285s - | 285s - o changeset: 3:ae8eb55f7090 285s - | bookmark: branch2_bookmark 285s - | tag: default/branch2 (with-path !) 285s - | user: test 285s - | date: Mon Jan 01 00:00:13 2007 +0000 285s - | summary: append f2 285s - | 285s - o changeset: 2:600de9b6d498 285s - | branch: branch2 285s - | parent: 0:40a840c1f8ae 285s - | user: test 285s - | date: Mon Jan 01 00:00:11 2007 +0000 285s - | summary: add f2 285s - | 285s - | o changeset: 1:8211cade99e4 285s - |/ bookmark: branch1_bookmark 285s - | user: test 285s - | date: Mon Jan 01 00:00:12 2007 +0000 285s - | summary: append f1 285s - | 285s - o changeset: 0:40a840c1f8ae 285s - branch: branch1 285s - user: test 285s - date: Mon Jan 01 00:00:10 2007 +0000 285s - summary: add f1 285s - 285s 285s ERROR: test-branch-bookmark-suffix.t#with-path output changed 285s ! 285s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-branch-bookmark-suffix.t 285s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-branch-bookmark-suffix.t#without-path.err 285s @@ -9,287 +9,10 @@ 285s $ git init -q --bare repo.git 285s 285s $ hg clone repo.git hgrepo 285s - updating to branch default 285s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 285s + abort: repository repo.git not found 285s + [255] 285s $ cd hgrepo 285s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 285s #if without-path 285s $ rm .hg/hgrc 285s -#endif 285s - $ hg branch -q branch1 285s - $ hg bookmark branch1_bookmark 285s - $ echo f1 > f1 285s - $ hg add f1 285s - $ fn_hg_commit -m "add f1" 285s - $ hg branch -q branch2 285s - $ hg bookmark branch2_bookmark 285s - $ echo f2 > f2 285s - $ hg add f2 285s - $ fn_hg_commit -m "add f2" 285s - $ hg log --graph 285s - @ changeset: 1:600de9b6d498 285s - | branch: branch2 285s - | bookmark: branch2_bookmark 285s - | tag: tip 285s - | user: test 285s - | date: Mon Jan 01 00:00:11 2007 +0000 285s - | summary: add f2 285s - | 285s - o changeset: 0:40a840c1f8ae 285s - branch: branch1 285s - bookmark: branch1_bookmark 285s - user: test 285s - date: Mon Jan 01 00:00:10 2007 +0000 285s - summary: add f1 285s - 285s - 285s - $ hg push -B asdasd ../repo.git 285s - pushing to ../repo.git 285s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 285s - [255] 285s - 285s - $ hg push ../repo.git 285s - pushing to ../repo.git 285s - searching for changes 285s - adding objects 285s - remote: found 0 deltas to reuse 285s - added 2 commits with 2 trees and 2 blobs 285s - adding reference refs/heads/branch1 285s - adding reference refs/heads/branch2 285s - 285s - $ cd .. 285s - 285s - $ cd repo.git 285s - $ git symbolic-ref HEAD refs/heads/branch1 285s - $ git branch 285s - * branch1 285s - branch2 285s - $ cd .. 285s - 285s - $ git clone repo.git gitrepo 285s - Cloning into 'gitrepo'... 285s - done. 285s - $ cd gitrepo 285s - $ git checkout -q branch1 285s - $ echo g1 >> f1 285s - $ git add f1 285s - $ fn_git_commit -m "append f1" 285s - $ git checkout -q branch2 285s - $ echo g2 >> f2 285s - $ git add f2 285s - $ fn_git_commit -m "append f2" 285s - $ git checkout -b branch3 285s - Switched to a new branch 'branch3' 285s - $ echo g3 >> f3 285s - $ git add f3 285s - $ fn_git_commit -m "append f3" 285s - $ git push origin branch1 branch2 branch3 285s - To $TESTTMP/repo.git 285s - bbfe79a..d8aef79 branch1 -> branch1 285s - 288e92b..f8f8de5 branch2 -> branch2 285s - * [new branch] branch3 -> branch3 285s -make sure the commit doesn't have an HG:rename-source annotation 285s - $ git cat-file commit d8aef79 285s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 285s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 285s - author test 1167609612 +0000 285s - committer test 1167609612 +0000 285s - 285s - append f1 285s - $ cd .. 285s - 285s - $ cd hgrepo 285s - $ hg paths 285s - default = $TESTTMP/repo.git (with-path !) 285s - $ hg pull ../repo.git 285s - pulling from ../repo.git 285s - importing 3 git commits 285s - updating bookmark branch1_bookmark 285s - updating bookmark branch2_bookmark 285s - adding bookmark branch3_bookmark 285s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 285s - (run 'hg heads' to see heads) 285s - $ hg log --graph 285s - o changeset: 4:faf44fc3a4e8 285s - | bookmark: branch3_bookmark 285s - | tag: default/branch3 (with-path !) 285s - | tag: tip 285s - | user: test 285s - | date: Mon Jan 01 00:00:14 2007 +0000 285s - | summary: append f3 285s - | 285s - o changeset: 3:ae8eb55f7090 285s - | bookmark: branch2_bookmark 285s - | tag: default/branch2 (with-path !) 285s - | parent: 1:600de9b6d498 285s - | user: test 285s - | date: Mon Jan 01 00:00:13 2007 +0000 285s - | summary: append f2 285s - | 285s - | o changeset: 2:8211cade99e4 285s - | | bookmark: branch1_bookmark 285s - | | tag: default/branch1 (with-path !) 285s - | | parent: 0:40a840c1f8ae 285s - | | user: test 285s - | | date: Mon Jan 01 00:00:12 2007 +0000 285s - | | summary: append f1 285s - | | 285s - @ | changeset: 1:600de9b6d498 285s - |/ branch: branch2 285s - | user: test 285s - | date: Mon Jan 01 00:00:11 2007 +0000 285s - | summary: add f2 285s - | 285s - o changeset: 0:40a840c1f8ae 285s - branch: branch1 285s - user: test 285s - date: Mon Jan 01 00:00:10 2007 +0000 285s - summary: add f1 285s - 285s - $ cd .. 285s - 285s -Try cloning a bookmark, and make sure it gets checked out: 285s - 285s - $ rm -r hgrepo 285s - $ hg clone -r branch3 repo.git hgrepo 285s - importing 4 git commits 285s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 285s - updating to bookmark branch3_bookmark 285s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s - $ cd hgrepo 285s - $ hg bookmarks 285s - branch2_bookmark 2:ae8eb55f7090 285s - * branch3_bookmark 3:faf44fc3a4e8 285s - $ hg log --graph 285s - @ changeset: 3:faf44fc3a4e8 285s - | bookmark: branch3_bookmark 285s - | tag: default/branch3 285s - | tag: tip 285s - | user: test 285s - | date: Mon Jan 01 00:00:14 2007 +0000 285s - | summary: append f3 285s - | 285s - o changeset: 2:ae8eb55f7090 285s - | bookmark: branch2_bookmark 285s - | tag: default/branch2 285s - | user: test 285s - | date: Mon Jan 01 00:00:13 2007 +0000 285s - | summary: append f2 285s - | 285s - o changeset: 1:600de9b6d498 285s - | branch: branch2 285s - | user: test 285s - | date: Mon Jan 01 00:00:11 2007 +0000 285s - | summary: add f2 285s - | 285s - o changeset: 0:40a840c1f8ae 285s - branch: branch1 285s - user: test 285s - date: Mon Jan 01 00:00:10 2007 +0000 285s - summary: add f1 285s - 285s - $ cd .. 285s - 285s -Try cloning something that's both a bookmark and a branch, and see the 285s -results. They're a bit suprising as the bookmark does get activated, 285s -but the branch get checked out. Although this does seem a bit odd, so 285s -does the scenario. 285s - 285s - $ rm -r hgrepo 285s - $ hg clone -r branch1 repo.git hgrepo 285s - importing 2 git commits 285s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 285s - updating to branch branch1 285s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s - $ cd hgrepo 285s - $ hg bookmarks 285s - * branch1_bookmark 1:8211cade99e4 285s - $ hg log --graph 285s - o changeset: 1:8211cade99e4 285s - | bookmark: branch1_bookmark 285s - | tag: default/branch1 285s - | tag: tip 285s - | user: test 285s - | date: Mon Jan 01 00:00:12 2007 +0000 285s - | summary: append f1 285s - | 285s - @ changeset: 0:40a840c1f8ae 285s - branch: branch1 285s - user: test 285s - date: Mon Jan 01 00:00:10 2007 +0000 285s - summary: add f1 285s - 285s - 285s - $ cd .. 285s - 285s -Now try pulling a diverged bookmark: 285s - 285s - $ rm -r hgrepo 285s -#if with-path 285s - $ hg clone -U repo.git hgrepo 285s - importing 5 git commits 285s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 285s -#else 285s - $ hg init hgrepo 285s - $ hg -R hgrepo pull repo.git 285s - pulling from repo.git 285s - importing 5 git commits 285s - adding bookmark branch1_bookmark 285s - adding bookmark branch2_bookmark 285s - adding bookmark branch3_bookmark 285s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 285s - (run 'hg heads' to see heads, 'hg merge' to merge) 285s -#endif 285s - $ cd gitrepo 285s - $ git checkout -q branch1 285s - $ fn_git_rebase branch3 285s - $ git push -f 285s - To $TESTTMP/repo.git 285s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 285s - $ cd ../hgrepo 285s - $ hg pull ../repo.git 285s - pulling from ../repo.git 285s - importing 1 git commits 285s - not updating diverged bookmark branch1_bookmark 285s - new changesets 895d0307f8b7 (1 drafts) 285s - (run 'hg update' to get a working copy) 285s - $ hg log --graph 285s - o changeset: 5:895d0307f8b7 285s - | tag: default/branch1 (with-path !) 285s - | tag: tip 285s - | user: test 285s - | date: Mon Jan 01 00:00:12 2007 +0000 285s - | summary: append f1 285s - | 285s - o changeset: 4:faf44fc3a4e8 285s - | bookmark: branch3_bookmark 285s - | tag: default/branch3 (with-path !) 285s - | user: test 285s - | date: Mon Jan 01 00:00:14 2007 +0000 285s - | summary: append f3 285s - | 285s - o changeset: 3:ae8eb55f7090 285s - | bookmark: branch2_bookmark 285s - | tag: default/branch2 (with-path !) 285s - | user: test 285s - | date: Mon Jan 01 00:00:13 2007 +0000 285s - | summary: append f2 285s - | 285s - o changeset: 2:600de9b6d498 285s - | branch: branch2 285s - | parent: 0:40a840c1f8ae 285s - | user: test 285s - | date: Mon Jan 01 00:00:11 2007 +0000 285s - | summary: add f2 285s - | 285s - | o changeset: 1:8211cade99e4 285s - |/ bookmark: branch1_bookmark 285s - | user: test 285s - | date: Mon Jan 01 00:00:12 2007 +0000 285s - | summary: append f1 285s - | 285s - o changeset: 0:40a840c1f8ae 285s - branch: branch1 285s - user: test 285s - date: Mon Jan 01 00:00:10 2007 +0000 285s - summary: add f1 285s - 285s 285s ERROR: test-branch-bookmark-suffix.t#without-path output changed 286s ! 286s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-bundle.t 286s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-bundle.t.err 286s @@ -36,247 +36,12 @@ 286s Clone it! 286s 286s $ hg clone gitrepo hgrepo 286s - importing 3 git commits 286s - new changesets ff7a2f2d8d70:ca33a262eb46 (3 drafts) 286s - updating to bookmark master 286s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 286s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 286s + abort: repository gitrepo not found 286s + [255] 286s $ cd hgrepo 286s + $TESTTMP.sh: 45: cd: can't cd to hgrepo 286s 286s Create a bundle with our metadata, and inspect it: 286s 286s $ hg bundle --all ../bundle-w-git.hg 286s - 3 changesets found 286s - $ hg debugbundle --all ../bundle-w-git.hg | grep hg-git 286s - exp-hg-git-map -- {} (mandatory: False) 286s - exp-hg-git-tags -- {} (mandatory: False) 286s - $ hg debugbundle --all ../bundle-w-git.hg > bundle-w-git.out 286s - 286s -Create a bundle without our metadata, and inspect it: 286s - 286s - $ hg bundle --all ../bundle-wo-git.hg --config experimental.hg-git-bundle=no 286s - 3 changesets found 286s - $ hg debugbundle --all ../bundle-wo-git.hg | grep hg-git 286s - [1] 286s - 286s -Verify that those are different: 286s - 286s - $ hg debugbundle --all ../bundle-wo-git.hg > bundle-wo-git.out 286s - $ cmp -s bundle-w-git.out bundle-wo-git.out 286s - [1] 286s - 286s -Now create a bundle without hg-git enabled at all, which should be 286s -exactly similar to what you get when you disable metadata embedding; 286s -this verifies we don't accidentally pollute bundles. 286s - 286s - $ hg bundle --all --config extensions.hggit=! ../bundle-wo-hggit.hg 286s - 3 changesets found 286s - $ hg debugbundle --all ../bundle-wo-hggit.hg > bundle-wo-hggit.out 286s - $ cmp -s bundle-wo-git.hg bundle-wo-hggit.hg 286s - [2] 286s - $ cmp -s bundle-wo-git.out bundle-wo-hggit.out 286s - $ cd .. 286s - $ rm -r hgrepo 286s - 286s -Does unbundling transfer state? 286s - 286s - $ hg init hgrepo 286s - $ hg -R hgrepo unbundle bundle-w-git.hg 286s - adding changesets 286s - adding manifests 286s - adding file changes 286s - added 3 changesets with 3 changes to 3 files 286s - new changesets * (glob) 286s - (run 'hg update' to get a working copy) 286s - $ hg -R hgrepo log -T git 286s - 2:ca33a262eb46 | d338971a96e2 | tip | 286s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 286s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 286s - $ hg -R hgrepo pull gitrepo 286s - pulling from gitrepo 286s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 286s - no changes found 286s - adding bookmark master 286s - $ rm -r hgrepo 286s - 286s -Can we unbundle something without git state? 286s - 286s - $ hg init hgrepo 286s - $ hg -R hgrepo unbundle bundle-wo-git.hg 286s - adding changesets 286s - adding manifests 286s - adding file changes 286s - added 3 changesets with 3 changes to 3 files 286s - new changesets * (glob) 286s - (run 'hg update' to get a working copy) 286s - $ hg -R hgrepo log -T git 286s - 2:ca33a262eb46 | | tip | 286s - 1:7fe02317c63d | | | 286s - 0:ff7a2f2d8d70 | | | 286s - $ hg -R hgrepo pull gitrepo 286s - pulling from gitrepo 286s - importing 3 git commits 286s - adding bookmark master 286s - (run 'hg update' to get a working copy) 286s - $ rm -r hgrepo 286s - 286s -Regular mercurial shouldn't choke on our bundle 286s - 286s - $ hg init hgrepo 286s - $ cat >> hgrepo/.hg/hgrc < [extensions] 286s - > hggit = ! 286s - > EOF 286s - $ hg -R hgrepo unbundle bundle-wo-git.hg 286s - adding changesets 286s - adding manifests 286s - adding file changes 286s - added 3 changesets with 3 changes to 3 files 286s - new changesets * (glob) 286s - (run 'hg update' to get a working copy) 286s - $ hg -R hgrepo log -T git 286s - 2:ca33a262eb46 | | tip | 286s - 1:7fe02317c63d | | | 286s - 0:ff7a2f2d8d70 | | | 286s - $ hg -R hgrepo pull gitrepo 286s - pulling from gitrepo 286s - abort: repository gitrepo not found!? (re) 286s - [255] 286s - $ rm -r hgrepo 286s - 286s - 286s -What happens if we unbundle twice? 286s - 286s - $ hg init hgrepo 286s - $ hg -R hgrepo unbundle bundle-w-git.hg 286s - adding changesets 286s - adding manifests 286s - adding file changes 286s - added 3 changesets with 3 changes to 3 files 286s - new changesets * (glob) 286s - (run 'hg update' to get a working copy) 286s - $ hg -R hgrepo unbundle bundle-w-git.hg 286s - adding changesets 286s - adding manifests 286s - adding file changes 286s - added 0 changesets with 0 changes to 3 files 286s - (run 'hg update' to get a working copy) 286s - $ hg -R hgrepo log -T git 286s - 2:ca33a262eb46 | d338971a96e2 | tip | 286s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 286s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 286s - $ hg -R hgrepo pull gitrepo 286s - pulling from gitrepo 286s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 286s - no changes found 286s - adding bookmark master 286s - $ rm -r hgrepo 286s - 286s -Alas, cloning a bundle doesn't work yet: 286s - 286s -(Mercurial is apparently quite dumb here, so we won't try to fix this 286s -for now, but this test mostly exists so that we notice if ever starts 286s -working, or breaks entirely.) 286s - 286s - $ hg clone bundle-w-git.hg hgrepo 286s - requesting all changes 286s - adding changesets 286s - adding manifests 286s - adding file changes 286s - added 3 changesets with 3 changes to 3 files 286s - new changesets * (glob) 286s - updating to branch default 286s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 286s - $ hg -R hgrepo log -T git 286s - 2:ca33a262eb46 | | tip | 286s - 1:7fe02317c63d | | | 286s - 0:ff7a2f2d8d70 | | | 286s - $ rm -r hgrepo 286s - 286s -Now, lets try to be a bit evil. How does pulling partial state work? 286s - 286s -First, more git happenings: 286s - 286s - $ cd gitrepo 286s - $ git checkout -b otherbranch thetag 286s - Switched to a new branch 'otherbranch' 286s - $ echo 42 > baz 286s - $ git add baz 286s - $ fn_git_commit -m 3 286s - $ cd .. 286s - 286s -Pull, 'em, and create a partial bundle: 286s - 286s - $ hg clone gitrepo hgrepo 286s - importing 4 git commits 286s - new changesets ff7a2f2d8d70:d87bf3ef6a53 (4 drafts) 286s - updating to bookmark otherbranch 286s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 286s - $ hg -R hgrepo bundle --base 'p1(tip)' -r tip bundle-w-git-2.hg 286s - 1 changesets found 286s - $ rm -r hgrepo 286s - 286s -Now, load only that bundle into a repository without any git state 286s - 286s - $ hg clone -r 1 bundle-w-git.hg hgrepo --config extensions.hggit=! 286s - adding changesets 286s - adding manifests 286s - adding file changes 286s - added 2 changesets with 2 changes to 2 files 286s - new changesets * (glob) 286s - updating to branch default 286s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 286s - $ cd hgrepo 286s - $ hg unbundle ../bundle-w-git-2.hg 286s - adding changesets 286s - adding manifests 286s - adding file changes 286s - added 1 changesets with 1 changes to 1 files (+1 heads) 286s - new changesets * (glob) 286s - (run 'hg heads' to see heads, 'hg merge' to merge) 286s - $ hg pull ../gitrepo 286s - pulling from ../gitrepo 286s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 286s - importing 3 git commits 286s - adding bookmark master 286s - adding bookmark otherbranch 286s - new changesets ca33a262eb46 (1 drafts) 286s - (run 'hg update' to get a working copy) 286s - $ cd .. 286s - $ rm -r hgrepo 286s - 286s -Now, try pushing with only the metadata: 286s - 286s - $ hg init hgrepo 286s - $ cd hgrepo 286s - $ hg unbundle -u ../bundle-w-git.hg 286s - adding changesets 286s - adding manifests 286s - adding file changes 286s - added 3 changesets with 3 changes to 3 files 286s - new changesets * (glob) 286s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 286s - $ echo kaflaflibob > bajizmo 286s - $ fn_hg_commit -A -m 4 286s - $ hg book -r tip master 286s - $ hg push ../gitrepo 286s - pushing to ../gitrepo 286s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 286s - abort: cannot push git commit d338971a96e2 as it is not present locally 286s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 286s - [255] 286s - 286s -Try to repopulate the git state from a bundle 286s - 286s - $ hg debug-remove-hggit-state 286s - clearing out the git cache data 286s - $ hg log -qr 'fromgit()' 286s - $ hg unbundle -u ../bundle-w-git.hg 286s - adding changesets 286s - adding manifests 286s - adding file changes 286s - added 0 changesets with 0 changes to 3 files 286s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 286s - $ hg log -qr 'fromgit()' 286s - 0:ff7a2f2d8d70 286s - 1:7fe02317c63d 286s - 2:ca33a262eb46 286s 286s ERROR: test-bundle.t output changed 286s ! 286s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-file-removal.t 286s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-file-removal.t.err 286s @@ -98,192 +98,9 @@ 286s $ git init -q --bare repo.git 286s 286s $ hg clone gitrepo hgrepo 286s - importing 9 git commits 286s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 286s - updating to bookmark master 286s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 286s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 286s + abort: repository gitrepo not found 286s + [255] 286s $ cd hgrepo 286s + $TESTTMP.sh: 72: cd: can't cd to hgrepo 286s $ hg log --graph 286s - @ changeset: 8:0995b8a0a943 286s - | bookmark: master 286s - | tag: default/master 286s - | tag: tip 286s - | user: test 286s - | date: Mon Jan 01 00:00:18 2007 +0000 286s - | summary: remove betalink 286s - | 286s - o changeset: 7:a316d3a96c89 286s - | user: test 286s - | date: Mon Jan 01 00:00:17 2007 +0000 286s - | summary: replace file with symlink 286s - | 286s - o changeset: 6:1804acb71f3e 286s - | user: test 286s - | date: Mon Jan 01 00:00:16 2007 +0000 286s - | summary: replace symlink with file 286s - | 286s - o changeset: 5:e19c85becc87 286s - | user: test 286s - | date: Mon Jan 01 00:00:15 2007 +0000 286s - | summary: add symlink to beta 286s - | 286s - o changeset: 4:0d3086c3f8c3 286s - | user: test 286s - | date: Mon Jan 01 00:00:14 2007 +0000 286s - | summary: remove foo/bar 286s - | 286s - o changeset: 3:b2406125ef5c 286s - | user: test 286s - | date: Mon Jan 01 00:00:13 2007 +0000 286s - | summary: remove alpha 286s - | 286s - o changeset: 2:8b3b2f4b4158 286s - | user: test 286s - | date: Mon Jan 01 00:00:12 2007 +0000 286s - | summary: add foo 286s - | 286s - o changeset: 1:7fe02317c63d 286s - | user: test 286s - | date: Mon Jan 01 00:00:11 2007 +0000 286s - | summary: add beta 286s - | 286s - o changeset: 0:ff7a2f2d8d70 286s - user: test 286s - date: Mon Jan 01 00:00:10 2007 +0000 286s - summary: add alpha 286s - 286s - 286s -make sure alpha is not in this manifest 286s - $ hg manifest -r 3 286s - beta 286s - foo/bar 286s - 286s -make sure that only beta is in the manifest 286s - $ hg manifest 286s - beta 286s - 286s - $ hg debug-remove-hggit-state 286s - clearing out the git cache data 286s - $ ls .hg | grep git 286s - [1] 286s - $ hg push ../repo.git 286s - pushing to ../repo.git 286s - searching for changes 286s - adding objects 286s - remote: found 0 deltas to reuse 286s - added 9 commits with 8 trees and 5 blobs 286s - adding reference refs/heads/master 286s - 286s - $ cd .. 286s - $ git --git-dir=repo.git log --pretty=medium 286s - commit 5ee11eeae239d6a99df5a99901ec00ffafbcc46b 286s - Author: test 286s - Date: Mon Jan 1 00:00:18 2007 +0000 286s - 286s - remove betalink 286s - 286s - commit 2c7b324faeccb1acf89c35b7ad38e7956f5705fa 286s - Author: test 286s - Date: Mon Jan 1 00:00:17 2007 +0000 286s - 286s - replace file with symlink 286s - 286s - commit ff0478d2ecc2571d01eb6d406ac29e4e63e5d3d5 286s - Author: test 286s - Date: Mon Jan 1 00:00:16 2007 +0000 286s - 286s - replace symlink with file 286s - 286s - commit 5492e6e410e42df527956be945286cd1ae45acb8 286s - Author: test 286s - Date: Mon Jan 1 00:00:15 2007 +0000 286s - 286s - add symlink to beta 286s - 286s - commit b991de8952c482a7cd51162674ffff8474862218 286s - Author: test 286s - Date: Mon Jan 1 00:00:14 2007 +0000 286s - 286s - remove foo/bar 286s - 286s - commit b0edaf0adac19392cf2867498b983bc5192b41dd 286s - Author: test 286s - Date: Mon Jan 1 00:00:13 2007 +0000 286s - 286s - remove alpha 286s - 286s - commit f2d0d5bfa905e12dee728b509b96cf265bb6ee43 286s - Author: test 286s - Date: Mon Jan 1 00:00:12 2007 +0000 286s - 286s - add foo 286s - 286s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 286s - Author: test 286s - Date: Mon Jan 1 00:00:11 2007 +0000 286s - 286s - add beta 286s - 286s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 286s - Author: test 286s - Date: Mon Jan 1 00:00:10 2007 +0000 286s - 286s - add alpha 286s - 286s -test with rename detection enabled 286s - $ hg --config git.similarity=100 clone gitrepo hgreporenames 286s - importing 9 git commits 286s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 286s - updating to bookmark master 286s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 286s - 286s - $ cd hgreporenames 286s - $ hg log --graph 286s - @ changeset: 8:0995b8a0a943 286s - | bookmark: master 286s - | tag: default/master 286s - | tag: tip 286s - | user: test 286s - | date: Mon Jan 01 00:00:18 2007 +0000 286s - | summary: remove betalink 286s - | 286s - o changeset: 7:a316d3a96c89 286s - | user: test 286s - | date: Mon Jan 01 00:00:17 2007 +0000 286s - | summary: replace file with symlink 286s - | 286s - o changeset: 6:1804acb71f3e 286s - | user: test 286s - | date: Mon Jan 01 00:00:16 2007 +0000 286s - | summary: replace symlink with file 286s - | 286s - o changeset: 5:e19c85becc87 286s - | user: test 286s - | date: Mon Jan 01 00:00:15 2007 +0000 286s - | summary: add symlink to beta 286s - | 286s - o changeset: 4:0d3086c3f8c3 286s - | user: test 286s - | date: Mon Jan 01 00:00:14 2007 +0000 286s - | summary: remove foo/bar 286s - | 286s - o changeset: 3:b2406125ef5c 286s - | user: test 286s - | date: Mon Jan 01 00:00:13 2007 +0000 286s - | summary: remove alpha 286s - | 286s - o changeset: 2:8b3b2f4b4158 286s - | user: test 286s - | date: Mon Jan 01 00:00:12 2007 +0000 286s - | summary: add foo 286s - | 286s - o changeset: 1:7fe02317c63d 286s - | user: test 286s - | date: Mon Jan 01 00:00:11 2007 +0000 286s - | summary: add beta 286s - | 286s - o changeset: 0:ff7a2f2d8d70 286s - user: test 286s - date: Mon Jan 01 00:00:10 2007 +0000 286s - summary: add alpha 286s - 286s 286s ERROR: test-file-removal.t output changed 286s ! 286s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-hg-author.t 286s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-hg-author.t.err 286s @@ -16,256 +16,10 @@ 286s 286s $ cd .. 286s $ hg clone repo.git hgrepo 286s - importing 1 git commits 286s - new changesets ff7a2f2d8d70 (1 drafts) 286s - updating to bookmark master 286s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 286s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 286s + abort: repository repo.git not found 286s + [255] 286s 286s $ cd hgrepo 286s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 286s $ hg book master 286s - $ echo beta > beta 286s - $ hg add beta 286s - $ fn_hg_commit -u "test" -m 'add beta' 286s - $ hg push 286s - pushing to $TESTTMP/repo.git 286s - searching for changes 286s - adding objects 286s - remote: found 0 deltas to reuse 286s - added 1 commits with 1 trees and 1 blobs 286s - updating reference refs/heads/master 286s - 286s - $ echo gamma >> beta 286s - $ fn_hg_commit -u "test (comment)" -m 'modify beta' 286s - $ hg push 286s - pushing to $TESTTMP/repo.git 286s - searching for changes 286s - adding objects 286s - remote: found 0 deltas to reuse 286s - added 1 commits with 1 trees and 1 blobs 286s - updating reference refs/heads/master 286s - 286s - $ echo gamma > gamma 286s - $ hg add gamma 286s - $ fn_hg_commit -u "" -m 'add gamma' 286s - $ hg push 286s - pushing to $TESTTMP/repo.git 286s - searching for changes 286s - adding objects 286s - remote: found 0 deltas to reuse 286s - added 1 commits with 1 trees and 1 blobs 286s - updating reference refs/heads/master 286s - 286s - $ echo delta > delta 286s - $ hg add delta 286s - $ fn_hg_commit -u "name" -m 'add delta' 286s - $ hg push 286s - pushing to $TESTTMP/repo.git 286s - searching for changes 286s - adding objects 286s - remote: found 0 deltas to reuse 286s - added 1 commits with 1 trees and 1 blobs 286s - updating reference refs/heads/master 286s - 286s - $ echo epsilon > epsilon 286s - $ hg add epsilon 286s - $ fn_hg_commit -u "name zeta 286s - $ hg add zeta 286s - $ fn_hg_commit -u " test " -m 'add zeta' 286s - $ hg push 286s - pushing to $TESTTMP/repo.git 286s - searching for changes 286s - adding objects 286s - remote: found 0 deltas to reuse 286s - added 1 commits with 1 trees and 1 blobs 286s - updating reference refs/heads/master 286s - 286s - $ echo eta > eta 286s - $ hg add eta 286s - $ fn_hg_commit -u "test < test@example.com >" -m 'add eta' 286s - $ hg push 286s - pushing to $TESTTMP/repo.git 286s - searching for changes 286s - adding objects 286s - remote: found 0 deltas to reuse 286s - added 1 commits with 1 trees and 1 blobs 286s - updating reference refs/heads/master 286s - 286s - $ echo theta > theta 286s - $ hg add theta 286s - $ fn_hg_commit -u "test >test@example.com>" -m 'add theta' 286s - $ hg push 286s - pushing to $TESTTMP/repo.git 286s - searching for changes 286s - adding objects 286s - remote: found 0 deltas to reuse 286s - added 1 commits with 1 trees and 1 blobs 286s - updating reference refs/heads/master 286s - 286s - $ hg log --graph 286s - @ changeset: 8:c5d1976ab12c 286s - | bookmark: master 286s - | tag: default/master 286s - | tag: tip 286s - | user: test >test@example.com> 286s - | date: Mon Jan 01 00:00:18 2007 +0000 286s - | summary: add theta 286s - | 286s - o changeset: 7:0e2fb4d21667 286s - | user: test < test@example.com > 286s - | date: Mon Jan 01 00:00:17 2007 +0000 286s - | summary: add eta 286s - | 286s - o changeset: 6:faa3aae96199 286s - | user: test 286s - | date: Mon Jan 01 00:00:16 2007 +0000 286s - | summary: add zeta 286s - | 286s - o changeset: 5:2cf6ad5a1afc 286s - | user: name 286s - | date: Mon Jan 01 00:00:14 2007 +0000 286s - | summary: add delta 286s - | 286s - o changeset: 3:6b854d65d0d6 286s - | user: 286s - | date: Mon Jan 01 00:00:13 2007 +0000 286s - | summary: add gamma 286s - | 286s - o changeset: 2:46303c652e79 286s - | user: test (comment) 286s - | date: Mon Jan 01 00:00:12 2007 +0000 286s - | summary: modify beta 286s - | 286s - o changeset: 1:47580592d3d6 286s - | user: test 286s - | date: Mon Jan 01 00:00:11 2007 +0000 286s - | summary: add beta 286s - | 286s - o changeset: 0:ff7a2f2d8d70 286s - user: test 286s - date: Mon Jan 01 00:00:10 2007 +0000 286s - summary: add alpha 286s - 286s - 286s - $ cd .. 286s - $ hg clone repo.git hgrepo2 286s - importing 9 git commits 286s - new changesets ff7a2f2d8d70:1fbf3aa91221 (9 drafts) 286s - updating to bookmark master 286s - 8 files updated, 0 files merged, 0 files removed, 0 files unresolved 286s - $ hg -R hgrepo2 log --graph 286s - @ changeset: 8:1fbf3aa91221 286s - | bookmark: master 286s - | tag: default/master 286s - | tag: tip 286s - | user: test ?test@example.com 286s - | date: Mon Jan 01 00:00:18 2007 +0000 286s - | summary: add theta 286s - | 286s - o changeset: 7:20310508f06d 286s - | user: test 286s - | date: Mon Jan 01 00:00:17 2007 +0000 286s - | summary: add eta 286s - | 286s - o changeset: 6:e3d81af8a8c1 286s - | user: test 286s - | date: Mon Jan 01 00:00:16 2007 +0000 286s - | summary: add zeta 286s - | 286s - o changeset: 5:78f609fd208f 286s - | user: name 286s - | date: Mon Jan 01 00:00:15 2007 +0000 286s - | summary: add epsilon 286s - | 286s - o changeset: 4:42fa61d57718 286s - | user: name 286s - | date: Mon Jan 01 00:00:14 2007 +0000 286s - | summary: add delta 286s - | 286s - o changeset: 3:6b854d65d0d6 286s - | user: 286s - | date: Mon Jan 01 00:00:13 2007 +0000 286s - | summary: add gamma 286s - | 286s - o changeset: 2:46303c652e79 286s - | user: test (comment) 286s - | date: Mon Jan 01 00:00:12 2007 +0000 286s - | summary: modify beta 286s - | 286s - o changeset: 1:47580592d3d6 286s - | user: test 286s - | date: Mon Jan 01 00:00:11 2007 +0000 286s - | summary: add beta 286s - | 286s - o changeset: 0:ff7a2f2d8d70 286s - user: test 286s - date: Mon Jan 01 00:00:10 2007 +0000 286s - summary: add alpha 286s - 286s - $ git --git-dir=repo.git log --pretty=medium master 286s - commit 2fe60ba69727981e6ede78be70354c3a9e30e21d 286s - Author: test ?test@example.com 286s - Date: Mon Jan 1 00:00:18 2007 +0000 286s - 286s - add theta 286s - 286s - commit 9f2f7cafdbf2e467928db98de8275141001d3081 286s - Author: test 286s - Date: Mon Jan 1 00:00:17 2007 +0000 286s - 286s - add eta 286s - 286s - commit 172a6f8d8064d73dff7013e395a9fe3cfc3ff807 286s - Author: test 286s - Date: Mon Jan 1 00:00:16 2007 +0000 286s - 286s - add zeta 286s - 286s - commit 71badb8e343a7da391a9b5d98909fbd2ca7d78f2 286s - Author: name 286s - Date: Mon Jan 1 00:00:15 2007 +0000 286s - 286s - add epsilon 286s - 286s - commit 9a9ae7b7f310d4a1a3e732a747ca26f06934f8d8 286s - Author: name 286s - Date: Mon Jan 1 00:00:14 2007 +0000 286s - 286s - add delta 286s - 286s - commit e4149a32e81e380193f59aa8773349201b8ed7f7 286s - Author: 286s - Date: Mon Jan 1 00:00:13 2007 +0000 286s - 286s - add gamma 286s - 286s - commit fae95aef5889a80103c2fbd5d14ff6eb8c9daf93 286s - Author: test ext:(%20%28comment%29) 286s - Date: Mon Jan 1 00:00:12 2007 +0000 286s - 286s - modify beta 286s - 286s - commit 0f378ab6c2c6b5514bd873d3faf8ac4b8095b001 286s - Author: test 286s - Date: Mon Jan 1 00:00:11 2007 +0000 286s - 286s - add beta 286s - 286s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 286s - Author: test 286s - Date: Mon Jan 1 00:00:10 2007 +0000 286s - 286s - add alpha 286s 286s ERROR: test-hg-author.t output changed 287s ! 287s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-subrepos.t 287s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-subrepos.t.err 287s @@ -34,165 +34,8 @@ 287s $ cd .. 287s Ensure gitlinks are transformed to .hgsubstate on hg pull from git 287s $ hg clone -u tip repo.git hgrepo 2>&1 | grep -E -v '^(Cloning into|done)' 287s - importing 3 git commits 287s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 287s - updating to branch default 287s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 287s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 287s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 287s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 287s + abort: repository repo.git not found 287s $ cd hgrepo 287s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 287s $ hg bookmarks -f -r default master 287s -1. Ensure gitlinks are transformed to .hgsubstate on hg <- git pull 287s -.hgsub shall list two [git] subrepos 287s - $ cat .hgsub 287s - subrepo1 = [git]../gitsubrepo 287s - xyz/subrepo2 = [git]../gitsubrepo 287s -.hgsubstate shall list two idenitcal revisions 287s - $ cat .hgsubstate 287s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 287s - 56f0304c5250308f14cfbafdc27bd12d40154d17 xyz/subrepo2 287s -hg status shall NOT report .hgsub and .hgsubstate as untracked - either ignored or unmodified 287s - $ hg status --unknown .hgsub .hgsubstate 287s - $ hg status --modified .hgsub .hgsubstate 287s - $ cd .. 287s - 287s -2. Check gitmodules are preserved during hg -> git push 287s - $ cd gitsubrepo 287s - $ echo gamma > gamma 287s - $ git add gamma 287s - $ fn_git_commit -m 'add gamma' 287s - $ cd .. 287s - $ cd hgrepo 287s - $ cd xyz/subrepo2 287s - $ git pull --ff-only | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| */| /' 287s - From $TESTTMP/gitsubrepo 287s - 56f0304..aabf7cd master -> origin/master 287s - Updating 56f0304..aabf7cd 287s - Fast-forward 287s - gamma | 1 + 287s - 1 file changed, 1 insertion(+) 287s - create mode 100644 gamma 287s - $ cd ../.. 287s - $ echo xxx >> alpha 287s - $ fn_hg_commit -m 'Update subrepo2 from hg' | grep -v "committing subrepository" || true 287s - $ hg push 287s - pushing to $TESTTMP/repo.git 287s - searching for changes 287s - adding objects 287s - remote: found 0 deltas to reuse 287s - added 1 commits with 2 trees and 1 blobs 287s - updating reference refs/heads/master 287s - $ cd .. 287s - $ cd gitrepo 287s - $ git pull --ff-only 287s - From $TESTTMP/repo 287s - 89c22d7..275b0a5 master -> origin/master 287s - Fetching submodule xyz/subrepo2 287s - From $TESTTMP/gitsubrepo 287s - 56f0304..aabf7cd master -> origin/master 287s - Updating 89c22d7..275b0a5 287s - Fast-forward 287s - alpha | 1 + 287s - xyz/subrepo2 | 2 +- 287s - 2 files changed, 2 insertions(+), 1 deletion(-) 287s -there shall be two gitlink entries, with values matching that in .hgsubstate 287s - $ git ls-tree -r HEAD^{tree} | grep 'commit' 287s - 160000 commit 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 287s - 160000 commit aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 287s -bring working copy to HEAD state (it's not bare repo) 287s - $ git reset --hard 287s - HEAD is now at 275b0a5 Update subrepo2 from hg 287s - $ cd .. 287s - 287s -3. Check .hgsub and .hgsubstate from git repository are merged, not overwritten 287s - $ hg init hgsub 287s - $ cd hgsub 287s - $ echo delta > delta 287s - $ hg add delta 287s - $ fn_hg_commit -m "add delta" 287s - $ hg tip --template '{node} hgsub\n' > ../gitrepo/.hgsubstate 287s - $ cat > ../gitrepo/.hgsub < hgsub = ../hgsub 287s - > EOF 287s - $ cd ../gitrepo 287s - $ git add .hgsubstate .hgsub 287s - $ fn_git_commit -m "Test3. Prepare .hgsub and .hgsubstate sources" 287s - $ git push 287s - To $TESTTMP/repo.git 287s - 275b0a5..e31d576 master -> master 287s - 287s - $ cd ../hgrepo 287s - $ hg pull 287s - pulling from $TESTTMP/repo.git 287s - importing 1 git commits 287s - updating bookmark master 287s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 287s - (run 'hg update' to get a working copy) 287s - $ hg checkout -C 287s - updating to active bookmark master 287s - cloning subrepo hgsub from $TESTTMP/hgsub 287s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 287s - $ cd .. 287s -pull shall bring .hgsub entry which was added to the git repo 287s - $ cat hgrepo/.hgsub 287s - hgsub = ../hgsub 287s - subrepo1 = [git]../gitsubrepo 287s - xyz/subrepo2 = [git]../gitsubrepo 287s -.hgsubstate shall list revision of the subrepo added through git repo 287s - $ cat hgrepo/.hgsubstate 287s - 481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub 287s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 287s - aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 287s - 287s -4. Try changing the subrepos from the Mercurial side 287s - 287s - $ cd hgrepo 287s - $ cat >> .hgsub < subrepo2 = [git]../gitsubrepo 287s - > EOF 287s - $ git clone ../gitsubrepo subrepo2 287s - Cloning into 'subrepo2'... 287s - done. 287s - $ fn_hg_commit -m 'some stuff' 287s - $ hg push 287s - pushing to $TESTTMP/repo.git 287s - no changes made to subrepo hgsub since last push to $TESTTMP/hgsub 287s - searching for changes 287s - adding objects 287s - remote: found 0 deltas to reuse 287s - added 1 commits with 1 trees and 1 blobs 287s - updating reference refs/heads/master 287s - $ cd .. 287s - 287s -5. But we actually do something quite weird in this case: If a 287s -.gitmodules file exists in the repository, it always wins! In this 287s -case, we break the bidirectional convention, and modify the repository 287s -data. That's odd, so show it: 287s - 287s - $ hg id hgrepo 287s - 42c46c7eef3a default/master/tip master 287s - $ hg clone -U repo.git hgrepo2 287s - importing 6 git commits 287s - new changesets e532b2bfda10:42c46c7eef3a (6 drafts) 287s - $ hg -R hgrepo2 up :master 287s - Cloning into '$TESTTMP/hgrepo2/subrepo1'... 287s - done. 287s - cloning subrepo hgsub from $TESTTMP/hgsub 287s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 287s - checking out detached HEAD in subrepository "subrepo1" 287s - check out a git branch if you intend to make changes 287s - Cloning into '$TESTTMP/hgrepo2/subrepo2'... 287s - done. 287s - Cloning into '$TESTTMP/hgrepo2/xyz/subrepo2'... 287s - done. 287s - cloning subrepo subrepo2 from $TESTTMP/gitsubrepo 287s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 287s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 287s - 287s -We retained bidirectionality! 287s - 287s - $ git diff --stat hgrepo/.hgsub hgrepo2/.hgsub 287s - $ hg id hgrepo 287s - 42c46c7eef3a default/master/tip master 287s - $ hg id hgrepo2 287s - 42c46c7eef3a default/master/tip master 287s 287s ERROR: test-subrepos.t output changed 287s ! 287s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-extra.t 287s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-extra.t.err 287s @@ -12,190 +12,9 @@ 287s 287s $ cd .. 287s $ hg clone gitrepo hgrepo 287s - importing 1 git commits 287s - new changesets aa9eb6424386 (1 drafts) 287s - updating to bookmark not-master 287s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 287s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 287s + abort: repository gitrepo not found 287s + [255] 287s $ cd hgrepo 287s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 287s $ hg mv a b 287s - $ fn_hg_commit -mb 287s - $ hg up 0 287s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 287s - (leaving bookmark not-master) 287s - $ touch c 287s - $ hg add c 287s - $ fn_hg_commit -mc 287s - 287s -Rebase will add a rebase_source 287s - 287s - $ hg --config extensions.rebase= rebase -s 1 -d 2 287s - rebasing 1:4c7da7adf18b * (glob) 287s - saved backup bundle to $TESTTMP/*.hg (glob) 287s - $ hg up 2 287s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 287s - 287s -Add a commit with multiple extra fields 287s - $ hg bookmark b1 287s - $ touch d 287s - $ hg add d 287s - $ fn_hg_commitextra --field zzzzzzz=datazzz --field aaaaaaa=dataaaa 287s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 287s - @ 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 287s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 287s - | 287s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 287s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 287s - | 287s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 287s - | branch=default 287s - | 287s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 287s - branch=default hg-git-rename-source=git 287s - 287s - 287s - $ hg push -r b1 287s - pushing to $TESTTMP/gitrepo 287s - searching for changes 287s - adding objects 287s - remote: found 0 deltas to reuse 287s - added 3 commits with 3 trees and 0 blobs 287s - adding reference refs/heads/b1 287s - 287s - $ hg bookmark b2 287s - $ hg mv c c2 287s - $ hg mv d d2 287s - $ fn_hg_commitextra --field yyyyyyy=datayyy --field bbbbbbb=databbb 287s - 287s -Test some nutty filenames 287s - $ hg book b3 287s -#if windows 287s - $ hg mv c2 'c2 => c3' 287s - abort: filename contains '>', which is reserved on Windows: "c2 => c3" 287s - [255] 287s - $ hg mv c2 c3 287s - $ fn_hg_commit -m 'dummy commit' 287s - $ hg mv c3 c4 287s - $ fn_hg_commit -m 'dummy commit' 287s -#else 287s - $ hg mv c2 'c2 => c3' 287s - warning: filename contains '>', which is reserved on Windows: 'c2 => c3' 287s - $ fn_hg_commit -m 'test filename with arrow' 287s - $ hg mv 'c2 => c3' 'c3 => c4' 287s - warning: filename contains '>', which is reserved on Windows: 'c3 => c4' 287s - $ fn_hg_commit -m 'test filename with arrow 2' 287s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" -l 3 --config "experimental.graphstyle.missing=|" 287s - @ 6 bca4ba69a6844c133b069e227dfa043d41e3c197 test filename with arrow 2 287s - | branch=default 287s - | 287s - o 5 864caad1f3493032f8d06f44a89dc9f1c039b09f test filename with arrow 287s - | branch=default 287s - | 287s - o 4 58f855ae26f4930ce857e648d3dd949901cce817 287s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 287s - | 287s -#endif 287s - $ hg push -r b2 -r b3 287s - pushing to $TESTTMP/gitrepo 287s - searching for changes 287s - adding objects 287s - remote: found 0 deltas to reuse 287s - added 3 commits with 3 trees and 0 blobs 287s - adding reference refs/heads/b2 287s - adding reference refs/heads/b3 287s - 287s - $ cd ../gitrepo 287s - $ git cat-file commit b1 287s - tree 1b773a2eb70f29397356f8069c285394835ff85a 287s - parent 54776dace5849bdf273fb26737a48ef64804909d 287s - author test 1167609613 +0000 287s - committer test 1167609613 +0000 287s - HG:extra aaaaaaa:dataaaa 287s - HG:extra zzzzzzz:datazzz 287s - 287s - 287s - 287s - $ git cat-file commit b2 287s - tree 34ad62c6d6ad9464bfe62db5b3d2fa16aaa9fa9e 287s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 287s - author test 1167609614 +0000 287s - committer test 1167609614 +0000 287s - HG:rename c:c2 287s - HG:rename d:d2 287s - HG:extra bbbbbbb:databbb 287s - HG:extra yyyyyyy:datayyy 287s - 287s - 287s - 287s -#if no-windows 287s - $ git cat-file commit b3 287s - tree e63df52695f9b06e54b37e7ef60d0c43994de620 287s - parent 5cafe2555a0666fcf661a3943277a9812a694a98 287s - author test 1167609616 +0000 287s - committer test 1167609616 +0000 287s - HG:rename c2%20%3D%3E%20c3:c3%20%3D%3E%20c4 287s - 287s - test filename with arrow 2 287s -#endif 287s - $ cd ../gitrepo 287s - $ git checkout b1 287s - Switched to branch 'b1' 287s - $ commit_sha=$(git rev-parse HEAD) 287s - $ tree_sha=$(git rev-parse HEAD^{tree}) 287s - 287s -There's no way to create a Git repo with extra metadata via the CLI. Dulwich 287s -lets you do that, though. 287s - 287s - >>> from dulwich.objects import Commit 287s - >>> from dulwich.porcelain import open_repo 287s - >>> repo = open_repo('.') 287s - >>> c = Commit() 287s - >>> c.author = b'test ' 287s - >>> c.author_time = 0 287s - >>> c.author_timezone = 0 287s - >>> c.committer = c.author 287s - >>> c.commit_time = 0 287s - >>> c.commit_timezone = 0 287s - >>> c.parents = [b'$commit_sha'] 287s - >>> c.tree = b'$tree_sha' 287s - >>> c.message = b'extra commit\n' 287s - >>> c.extra.extend([(b'zzz:zzz', b'data:zzz'), (b'aaa:aaa', b'data:aaa'), 287s - ... (b'HG:extra', b'hgaaa:dataaaa'), 287s - ... (b'HG:extra', b'hgzzz:datazzz')]) 287s - >>> repo.object_store.add_object(c) 287s - >>> repo.refs.set_if_equals(b'refs/heads/master', None, c.id) 287s - True 287s - 287s - $ git cat-file commit master 287s - tree 1b773a2eb70f29397356f8069c285394835ff85a 287s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 287s - author test 0 +0000 287s - committer test 0 +0000 287s - zzz:zzz data:zzz 287s - aaa:aaa data:aaa 287s - HG:extra hgaaa:dataaaa 287s - HG:extra hgzzz:datazzz 287s - 287s - extra commit 287s - 287s - $ cd .. 287s - $ hg clone -qU gitrepo hgrepo2 287s - $ cd hgrepo2 287s - $ hg log -G -r :5 -T "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 287s - o 5 58f855ae26f4930ce857e648d3dd949901cce817 287s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 287s - | 287s - | o 4 90acc8c23fcfaeb0930c03c849923a696fd9013c extra commit 287s - |/ GIT0-zzz%3Azzz=data%3Azzz GIT1-aaa%3Aaaa=data%3Aaaa branch=default hgaaa=dataaaa hgzzz=datazzz 287s - | 287s - o 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 287s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 287s - | 287s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 287s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 287s - | 287s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 287s - | branch=default 287s - | 287s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 287s - branch=default hg-git-rename-source=git 287s - 287s 287s ERROR: test-extra.t output changed 288s ! 288s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-bookmark-workflow.t 288s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-bookmark-workflow.t.err 288s @@ -42,13 +42,21 @@ 288s 288s Initialize remote hg and git repos with equivalent initial contents 288s $ hg init hgremoterepo 288s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 288s $ cd hgremoterepo 288s $ hg bookmark master 288s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 288s $ for f in alpha beta gamma delta; do 288s > echo $f > $f; hg add $f; hgcommit -m "add $f" 288s > done 288s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 288s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 288s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 288s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 288s $ hg bookmark -r 1 b1 288s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 288s $ hgstate 288s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 288s 3 fc2664cac217 "add delta" bookmarks: [master] 288s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 288s 1 7bcd915dc873 "add beta" bookmarks: [b1] 288s @@ -69,157 +77,19 @@ 288s 288s Cloning transfers all bookmarks from remote to local 288s $ hg clone -q hgremoterepo purehglocalrepo 288s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 288s $ cd purehglocalrepo 288s $ hgstate 288s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 288s 3 fc2664cac217 "add delta" bookmarks: [master] 288s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 288s 1 7bcd915dc873 "add beta" bookmarks: [b1] 288s 0 3442585be8a6 "add alpha" bookmarks: [] 288s $ cd .. 288s $ hg clone -q gitremoterepo hggitlocalrepo --config hggit.usephases=True 288s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 288s + abort: repository gitremoterepo not found 288s + [255] 288s $ cd hggitlocalrepo 288s + $TESTTMP.sh: 78: cd: can't cd to hggitlocalrepo 288s $ hggitstate 288s - 3 03769a650ded 55b133e1d558 "add delta" bookmarks: [master] 288s - 2 ca33a262eb46 d338971a96e2 "add gamma" bookmarks: [] 288s - 1 7fe02317c63d 9497a4ee62e1 "add beta" bookmarks: [b1] 288s - 0 ff7a2f2d8d70 7eeab2ea75ec "add alpha" bookmarks: [] 288s - 288s -Make sure that master is public 288s - $ hg phase -r master 288s - 3: public 288s - $ cd .. 288s - 288s -No changes 288s - $ cd purehglocalrepo 288s - $ hg incoming -B 288s - comparing with $TESTTMP/hgremoterepo 288s - searching for changed bookmarks 288s - no changed bookmarks found 288s - [1] 288s - $ hg outgoing 288s - comparing with $TESTTMP/hgremoterepo 288s - searching for changes 288s - no changes found 288s - [1] 288s - $ hg outgoing -B 288s - comparing with $TESTTMP/hgremoterepo 288s - searching for changed bookmarks 288s - no changed bookmarks found 288s - [1] 288s - $ hg push 288s - pushing to $TESTTMP/hgremoterepo 288s - searching for changes 288s - no changes found 288s - [1] 288s - $ cd .. 288s - $ cd hggitlocalrepo 288s - $ hg incoming -B 288s - comparing with $TESTTMP/gitremoterepo 288s - searching for changed bookmarks 288s - no changed bookmarks found 288s - [1] 288s - $ hg outgoing 288s - comparing with $TESTTMP/gitremoterepo 288s - searching for changes 288s - no changes found 288s - [1] 288s - $ hg outgoing -B 288s - comparing with $TESTTMP/gitremoterepo 288s - searching for changed bookmarks 288s - no changed bookmarks found 288s - [1] 288s - $ hg push 288s - pushing to $TESTTMP/gitremoterepo 288s - searching for changes 288s - no changes found 288s - [1] 288s - $ cd .. 288s - 288s -Bookmarks on existing revs: 288s -- change b1 on local repo 288s -- introduce b2 on local repo 288s -- introduce b3 on remote repo 288s -Bookmarks on new revs 288s -- introduce b4 on a new rev on the remote 288s - $ cd hgremoterepo 288s - $ hg bookmark -r master b3 288s - $ hg bookmark -r master b4 288s - $ hg update -q b4 288s - $ echo epsilon > epsilon; hg add epsilon; hgcommit -m 'add epsilon' 288s - $ hgstate 288s - 4 d979bb8e0fbb "add epsilon" bookmarks: [b4] 288s - 3 fc2664cac217 "add delta" bookmarks: [b3 master] 288s - 2 d85ced7ae9d6 "add gamma" bookmarks: [] 288s - 1 7bcd915dc873 "add beta" bookmarks: [b1] 288s - 0 3442585be8a6 "add alpha" bookmarks: [] 288s - $ cd .. 288s - $ cd purehglocalrepo 288s - $ hg bookmark -fr 2 b1 288s - $ hg bookmark -r 0 b2 288s - $ hgstate 288s - 3 fc2664cac217 "add delta" bookmarks: [master] 288s - 2 d85ced7ae9d6 "add gamma" bookmarks: [b1] 288s - 1 7bcd915dc873 "add beta" bookmarks: [] 288s - 0 3442585be8a6 "add alpha" bookmarks: [b2] 288s - $ hg incoming -B 288s - comparing with $TESTTMP/hgremoterepo 288s - searching for changed bookmarks 288s - b3 fc2664cac217 288s - b4 d979bb8e0fbb 288s - $ hg outgoing 288s - comparing with $TESTTMP/hgremoterepo 288s - searching for changes 288s - no changes found 288s - [1] 288s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 288s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 288s -This changed in 3.4 to start showing changed and deleted bookmarks again. 288s - $ hg outgoing -B | grep -v -E -w 'b1|b3|b4' 288s - comparing with $TESTTMP/hgremoterepo 288s - searching for changed bookmarks 288s - b2 3442585be8a6 288s - $ cd .. 288s - 288s - $ cd gitremoterepo 288s - $ git branch b3 master 288s - $ git checkout -b b4 master 288s - Switched to a new branch 'b4' 288s - $ echo epsilon > epsilon 288s - $ git add epsilon 288s - $ gitcommit -m 'add epsilon' 288s - $ gitstate 288s - fcfd2c0 "add epsilon" refs: (*b4) (glob) 288s - 55b133e "add delta" refs: (master, b3) 288s - d338971 "add gamma" refs: 288s - 9497a4e "add beta" refs: (b1) 288s - 7eeab2e "add alpha" refs: 288s - $ cd .. 288s - $ cd hggitlocalrepo 288s - $ hg bookmark -fr 2 b1 288s - $ hg bookmark -r 0 b2 288s - $ hgstate 288s - 3 03769a650ded "add delta" bookmarks: [master] 288s - 2 ca33a262eb46 "add gamma" bookmarks: [b1] 288s - 1 7fe02317c63d "add beta" bookmarks: [] 288s - 0 ff7a2f2d8d70 "add alpha" bookmarks: [b2] 288s - $ hg incoming -B 288s - comparing with $TESTTMP/gitremoterepo 288s - searching for changed bookmarks 288s - b3 03769a650ded 288s - b4 fcfd2c0262db 288s - $ hg outgoing 288s - comparing with $TESTTMP/gitremoterepo 288s - searching for changes 288s - no changes found 288s - [1] 288s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 288s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 288s -This changed in 3.4 to start showing changed and deleted bookmarks again. 288s - $ hg outgoing -B 288s - comparing with $TESTTMP/gitremoterepo 288s - searching for changed bookmarks 288s - b1 ca33a262eb46 288s - b2 ff7a2f2d8d70 288s - b3 288s - b4 288s - $ cd .. 288s 288s ERROR: test-bookmark-workflow.t output changed 293s ! 293s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-illegal-contents.t 293s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-illegal-contents.t.err 293s @@ -5,6 +5,7 @@ 293s $ . "$TESTDIR/testutil" 293s 293s $ hg init hg 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s $ cd hg 293s $ mkdir -p .git/hooks 293s $ cat > .git/hooks/post-update < EOF 293s $ fn_touch_escaped foo/git~100/wat bar/.gi\\u200ct/wut this/is/safe 293s $ hg addremove 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s adding .git/hooks/post-update 293s adding bar/.gi\xe2\x80\x8ct/wut (esc) 293s adding foo/git~100/wat 293s adding this/is/safe 293s $ hg ci -m "we should refuse to export this" 293s - $ hg book master 293s - $ hg gexport 293s - warning: skipping invalid path '.git/hooks/post-update' 293s - warning: skipping invalid path 'bar/.gi\xe2\x80\x8ct/wut' 293s - warning: skipping invalid path 'foo/git~100/wat' 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + $ hg book master 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + $ hg gexport 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + hg: unknown command 'gexport' 293s + (did you mean one of export, import?) 293s + [10] 293s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 293s - this/is/safe 293s + fatal: not a git repository: '.hg/git' 293s + [128] 293s $ hg debug-remove-hggit-state 293s - clearing out the git cache data 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + hg: unknown command 'debug-remove-hggit-state' 293s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 293s + [10] 293s $ hg gexport --config hggit.invalidpaths=keep 293s - warning: path '.git/hooks/post-update' contains an invalid path component 293s - warning: path 'bar/.gi\xe2\x80\x8ct/wut' contains an invalid path component 293s - warning: path 'foo/git~100/wat' contains an invalid path component 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + hg: unknown command 'gexport' 293s + (did you mean one of export, import?) 293s + [10] 293s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 293s - .git/hooks/post-update 293s - "bar/.gi\342\200\214t/wut" 293s - foo/git~100/wat 293s - this/is/safe 293s - $ cd .. 293s - 293s - $ rm -rf hg 293s - $ hg init hg 293s + fatal: not a git repository: '.hg/git' 293s + [128] 293s + $ cd .. 293s + 293s + $ rm -rf hg 293s + $ hg init hg 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s $ cd hg 293s $ mkdir -p nested/.git/hooks/ 293s $ cat > nested/.git/hooks/post-update < EOF 293s $ chmod +x nested/.git/hooks/post-update 293s $ hg addremove 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s adding nested/.git/hooks/post-update 293s $ hg ci -m "also refuse to export this" 293s - $ hg book master 293s - $ hg gexport 293s - warning: skipping invalid path 'nested/.git/hooks/post-update' 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + $ hg book master 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + $ hg gexport 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + hg: unknown command 'gexport' 293s + (did you mean one of export, import?) 293s + [10] 293s $ git clone .hg/git git 293s - Cloning into 'git'... 293s - done. 293s + fatal: repository '.hg/git' does not exist 293s + [128] 293s $ rm -rf git 293s 293s We can trigger an error: 293s 293s $ hg -q debug-remove-hggit-state 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + hg: unknown command 'debug-remove-hggit-state' 293s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 293s + [10] 293s $ hg --config hggit.invalidpaths=abort gexport 293s - abort: invalid path 'nested/.git/hooks/post-update' rejected by configuration 293s - (see 'hg help config.hggit.invalidpaths for details) 293s - [255] 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + hg: unknown command 'gexport' 293s + (did you mean one of export, import?) 293s + [10] 293s 293s We can override if needed: 293s 293s $ hg --config hggit.invalidpaths=keep gexport 293s - warning: path 'nested/.git/hooks/post-update' contains an invalid path component 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + hg: unknown command 'gexport' 293s + (did you mean one of export, import?) 293s + [10] 293s $ cd .. 293s $ # different git versions give different return codes 293s $ git clone hg/.hg/git git || true 293s - Cloning into 'git'... 293s - done. 293s - error: [Ii]nvalid path 'nested/\.git/hooks/post-update' (re) 293s + fatal: repository 'hg/.hg/git' does not exist 293s fatal: unable to checkout working tree (?) 293s warning: Clone succeeded, but checkout failed. (?) 293s You can inspect what was checked out with 'git status' (?) 293s @@ -88,6 +109,7 @@ 293s $ cd .. 293s $ rm -rf hg 293s $ hg init hg 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s $ cd hg 293s $ mkdir -p .GIT/hooks/ 293s $ cat > .GIT/hooks/post-checkout < EOF 293s $ chmod +x .GIT/hooks/post-checkout 293s $ hg addremove 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s adding .GIT/hooks/post-checkout 293s $ hg ci -m "also refuse to export this" 293s - $ hg book master 293s - $ hg gexport 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + $ hg book master 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + $ hg gexport 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + hg: unknown command 'gexport' 293s + (did you mean one of export, import?) 293s + [10] 293s $ cd .. 293s 293s And the NTFS case: 293s $ cd .. 293s $ rm -rf hg 293s $ hg init hg 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s $ cd hg 293s $ mkdir -p GIT~1/hooks/ 293s $ cat > GIT~1/hooks/post-checkout < EOF 293s $ chmod +x GIT~1/hooks/post-checkout 293s $ hg addremove 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s adding GIT~1/hooks/post-checkout 293s $ hg ci -m "also refuse to export this" 293s - $ hg book master 293s - $ hg gexport 293s - warning: skipping invalid path 'GIT~1/hooks/post-checkout' 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + $ hg book master 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + $ hg gexport 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + hg: unknown command 'gexport' 293s + (did you mean one of export, import?) 293s + [10] 293s $ cd .. 293s 293s Now check a Git repository containing a Mercurial repository, which 293s @@ -127,36 +163,29 @@ 293s $ rm -rf hg git nested 293s $ git init -q git 293s $ hg init nested 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s $ mv nested git 293s $ cd git 293s $ git add nested 293s $ fn_git_commit -m 'add a Mercurial repository' 293s $ cd .. 293s $ hg clone --config hggit.invalidpaths=abort git hg 293s - importing 1 git commits 293s - abort: invalid path 'nested/.hg/00changelog.i' rejected by configuration 293s - (see 'hg help config.hggit.invalidpaths for details) 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + abort: repository git not found 293s [255] 293s $ rm -rf hg 293s $ hg clone --config hggit.invalidpaths=keep git hg 293s - importing 1 git commits 293s - warning: path 'nested/.hg/00changelog.i' contains an invalid path component 293s - warning: path 'nested/.hg/requires' contains an invalid path component 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + abort: repository git not found 293s warning: path 'nested/.hg/store/requires' contains an invalid path component (?) 293s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 293s warning: path 'nested/.hg/store/requires' is within a nested repository, which Mercurial cannot check out. (?) 293s - updating to bookmark master 293s - abort: path 'nested/.hg/00changelog.i' is inside nested repo 'nested' 293s - [10] 293s + [255] 293s $ rm -rf hg 293s $ hg clone git hg 293s - importing 1 git commits 293s - warning: skipping invalid path 'nested/.hg/00changelog.i' 293s - warning: skipping invalid path 'nested/.hg/requires' 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + abort: repository git not found 293s warning: skipping invalid path 'nested/.hg/store/requires' (?) 293s - new changesets 3ea18a67c0e6 (1 drafts) 293s - updating to bookmark master 293s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 293s + [255] 293s $ cd .. 293s 293s Now check a Git repository containing paths with carriage return and 293s @@ -171,23 +200,16 @@ 293s $ fn_git_commit -m 'add files disallowed by mercurial' 293s $ cd .. 293s $ hg clone --config hggit.invalidpaths=abort git hg 293s - importing 1 git commits 293s - abort: invalid path 'Icon\r' rejected by configuration 293s - (see 'hg help config.hggit.invalidpaths for details) 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + abort: repository git not found 293s [255] 293s $ hg clone --config hggit.invalidpaths=keep git hg 293s - importing 1 git commits 293s - warning: skipping invalid path 'Icon\r' 293s - warning: skipping invalid path 'the\nfile' 293s - new changesets 8354c06a5842 (1 drafts) 293s - updating to bookmark master 293s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + abort: repository git not found 293s + [255] 293s $ rm -rf hg 293s $ hg clone git hg 293s - importing 1 git commits 293s - warning: skipping invalid path 'Icon\r' 293s - warning: skipping invalid path 'the\nfile' 293s - new changesets 8354c06a5842 (1 drafts) 293s - updating to bookmark master 293s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 293s - 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + abort: repository git not found 293s + [255] 293s + 293s 293s ERROR: test-illegal-contents.t output changed 293s ! 293s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-phases-remote.t 293s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-phases-remote.t.err 293s @@ -26,193 +26,10 @@ 293s $ cd .. 293s 293s $ hg clone --config hggit.usephases=True -U gitrepo hgrepo 293s - importing 4 git commits 293s - new changesets ff7a2f2d8d70:25eed24f5e8f (1 drafts) 293s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 293s + abort: repository gitrepo not found 293s + [255] 293s 293s $ cd hgrepo 293s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 293s $ hg log -G -T '{rev}|{phase}|{bookmarks}|{tags}\n' 293s - o 3|public||thetag tip 293s - | 293s - | o 2|draft|not-master|default/not-master 293s - |/ 293s - | o 1|public|master|default/master 293s - |/ 293s - o 0|public|| 293s - 293s - $ hg phase -r 'all()' | tee $TESTTMP/after-clone 293s - 0: public 293s - 1: public 293s - 2: draft 293s - 3: public 293s - $ cat >> .hg/hgrc < [paths] 293s - > other = $TESTTMP/gitrepo/.git 293s - > other:hg-git.publish = no 293s - > EOF 293s - $ cd .. 293s - 293s -that disables publishing from that remote 293s - 293s - $ cd hgrepo 293s - $ hg phase -fd 'all()' 293s - $ hg pull other 293s - pulling from $TESTTMP/gitrepo/.git 293s - no changes found 293s - $ hg log -qr 'public()' 293s - $ hg pull -v --config hggit.usephases=True other 293s - pulling from $TESTTMP/gitrepo/.git 293s - no changes found 293s - processing commits in batches of 1000 293s - bookmark master is up-to-date 293s - bookmark not-master is up-to-date 293s - $ hg log -qr 'public()' 293s - $ cd .. 293s - 293s -but not default when enable by the global setting 293s - 293s - $ cd hgrepo 293s - $ hg phase -fd 'all()' 293s - no phases changed 293s - $ hg pull -v --config hggit.usephases=True 293s - pulling from $TESTTMP/gitrepo 293s - publishing remote HEAD 293s - publishing tag thetag 293s - no changes found 293s - processing commits in batches of 1000 293s - bookmark master is up-to-date 293s - bookmark not-master is up-to-date 293s - publishing remote HEAD 293s - publishing tag thetag 293s - 3 local changesets published 293s - $ hg phase -r 'all()' > $TESTTMP/after-pull 293s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 293s - $ cd .. 293s - 293s -or the path option 293s - 293s - $ cd hgrepo 293s - $ hg phase -fd 'all()' 293s - $ hg pull -v --config paths.default:hg-git.publish=yes 293s - pulling from $TESTTMP/gitrepo 293s - publishing remote HEAD 293s - publishing tag thetag 293s - no changes found 293s - processing commits in batches of 1000 293s - bookmark master is up-to-date 293s - bookmark not-master is up-to-date 293s - publishing remote HEAD 293s - publishing tag thetag 293s - 3 local changesets published 293s - $ hg phase -r 'all()' > $TESTTMP/after-pull 293s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 293s - $ cd .. 293s - 293s -but we can specify individual branches 293s - 293s - $ cd hgrepo 293s - $ hg phase -fd 'all()' 293s - $ hg pull -v --config paths.default:hg-git.publish=not-master 293s - pulling from $TESTTMP/gitrepo 293s - publishing branch not-master 293s - no changes found 293s - processing commits in batches of 1000 293s - bookmark master is up-to-date 293s - bookmark not-master is up-to-date 293s - publishing branch not-master 293s - 2 local changesets published 293s - $ hg phase -r master -r not-master -r thetag 293s - 1: draft 293s - 2: public 293s - 3: draft 293s - $ cd .. 293s - 293s -and we can also specify the tag 293s - 293s - $ cd hgrepo 293s - $ hg phase -fd 'all()' 293s - $ hg pull -v --config paths.default:hg-git.publish=thetag 293s - pulling from $TESTTMP/gitrepo 293s - publishing tag thetag 293s - no changes found 293s - processing commits in batches of 1000 293s - bookmark master is up-to-date 293s - bookmark not-master is up-to-date 293s - publishing tag thetag 293s - 2 local changesets published 293s - $ hg phase -r master -r not-master -r thetag 293s - 1: draft 293s - 2: draft 293s - 3: public 293s - $ cd .. 293s - 293s - 293s -Check multiple paths behavior 293s -============================= 293s - 293s - 293s - $ cd hgrepo 293s - $ cat >> .hg/hgrc < [paths] 293s - > multi:multi-urls = yes 293s - > multi = path://other, path://default 293s - > recursive:multi-urls = yes 293s - > recursive = path://multi, default 293s - > EOF 293s - 293s -Using multiple path works fine: 293s - 293s - 293s - $ hg pull multi --config paths.default:hg-git.publish=yes 293s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 293s - [255] 293s - 293s -Recursive multiple path are tricker, but Mercurial don't work with them either. 293s -This test exist to make sure we bail out on our own. 293s - 293s - 293s -`yes` should abort (until we implement it) 293s - 293s - $ hg pull multi --config paths.default:hg-git.publish=yes 293s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 293s - [255] 293s - 293s -`some-value` should abort (until we implement it) 293s - 293s - $ hg pull multi --config paths.default:hg-git.publish=thetag 293s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 293s - [255] 293s - 293s -`no` is fine 293s - 293s - $ hg pull multi --config paths.default:hg-git.publish=no 293s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 293s - [255] 293s - 293s - $ cd .. 293s - 293s -Check conflicting paths behavior 293s -================================ 293s - 293s - $ cd hgrepo 293s - $ cat > .hg/hgrc < [paths] 293s - > default = $TESTTMP/gitrepo 293s - > default:hg-git.publish = yes 293s - > also-default = $TESTTMP/gitrepo 293s - > EOF 293s - $ hg pull also-default 293s - pulling from $TESTTMP/gitrepo 293s - abort: different publishing configurations for the same remote location 293s - (conflicting paths: also-default, default) 293s - [255] 293s - $ hg pull --config paths.also-default:hg-git.publish=no 293s - pulling from $TESTTMP/gitrepo 293s - abort: different publishing configurations for the same remote location 293s - (conflicting paths: also-default, default) 293s - [255] 293s - $ hg pull --config paths.also-default:hg-git.publish=true 293s - pulling from $TESTTMP/gitrepo 293s - no changes found 293s - 1 local changesets published 293s - $ cd .. 293s - 293s 293s ERROR: test-phases-remote.t output changed 295s ! 295s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-serve-hg-static.t 295s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-serve-hg-static.t.err 295s @@ -6,6 +6,7 @@ 295s $ . "$TESTDIR/testutil" 295s 295s $ hg clone http://localhost:$HGPORT/ copy 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s abort: * (glob) 295s [100] 295s $ test -d copy 295s @@ -18,14 +19,18 @@ 295s > --logfile server.log 295s $ cat dumb.pid >> $DAEMON_PIDS 295s $ hg init remote 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s $ cd remote 295s $ echo foo > bar 295s $ echo c2 > '.dotfile with spaces' 295s $ hg add 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s adding .dotfile with spaces 295s adding bar 295s $ hg commit -m"test" 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s $ hg tip 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s changeset: 0:02770d679fb8 295s tag: tip 295s user: test 295s @@ -34,6 +39,7 @@ 295s 295s $ cd .. 295s $ hg clone static-http://localhost:$HGPORT/remote local 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s requesting all changes 295s adding changesets 295s adding manifests 295s @@ -44,17 +50,20 @@ 295s 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 295s $ cd local 295s $ hg verify 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s checking changesets 295s checking manifests 295s crosschecking files in changesets and manifests 295s + checking dirstate (?) 295s checking files 295s - checking dirstate (?) 295s + checking dirstate 295s checked 1 changesets with 2 changes to 2 files 295s $ cat bar 295s foo 295s $ cd ../remote 295s $ echo baz > quux 295s $ hg commit -A -mtest2 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s adding quux 295s 295s check for HTTP opener failures when cachefile does not exist 295s @@ -62,6 +71,7 @@ 295s $ rm .hg/cache/* 295s $ cd ../local 295s $ hg pull 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s pulling from static-http://localhost:$HGPORT/remote 295s searching for changes 295s adding changesets 295s @@ -74,10 +84,13 @@ 295s trying to push 295s 295s $ hg update 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 295s $ echo more foo >> bar 295s $ hg commit -m"test" 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s $ hg push 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s pushing to static-http://localhost:$HGPORT/remote 295s abort: destination does not support push 295s [255] 295s @@ -86,9 +99,11 @@ 295s 295s $ cd .. 295s $ hg clone -r doesnotexist static-http://localhost:$HGPORT/remote local0 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s abort: unknown revision 'doesnotexist'!? (re) 295s [10] 295s $ hg clone -r 0 static-http://localhost:$HGPORT/remote local0 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s adding changesets 295s adding manifests 295s adding file changes 295s @@ -100,16 +115,23 @@ 295s test with "/" URI (issue747) and subrepo 295s 295s $ hg init 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s $ hg init sub 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s $ touch sub/test 295s $ hg -R sub commit -A -m "test" 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s adding test 295s $ hg -R sub tag not-empty 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s $ echo sub=sub > .hgsub 295s $ echo a > a 295s $ hg add a .hgsub 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s $ hg -q ci -ma 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s $ hg clone static-http://localhost:$HGPORT/ local2 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s requesting all changes 295s adding changesets 295s adding manifests 295s @@ -127,58 +149,75 @@ 295s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 295s $ cd local2 295s $ hg verify 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s checking changesets 295s checking manifests 295s crosschecking files in changesets and manifests 295s + checking dirstate (?) 295s checking files 295s - checking dirstate (?) 295s + checking dirstate 295s checked 1 changesets with 3 changes to 3 files 295s checking subrepo links 295s $ cat a 295s a 295s $ hg paths 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s default = static-http://localhost:$HGPORT/ 295s 295s test with empty repo (issue965) 295s 295s $ cd .. 295s $ hg init remotempty 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s $ hg clone static-http://localhost:$HGPORT/remotempty local3 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s no changes found 295s updating to branch default 295s 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 295s $ cd local3 295s $ hg verify 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s checking changesets 295s checking manifests 295s crosschecking files in changesets and manifests 295s + checking dirstate (?) 295s checking files 295s - checking dirstate (?) 295s + checking dirstate 295s checked 0 changesets with 0 changes to 0 files 295s $ hg paths 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s default = static-http://localhost:$HGPORT/remotempty 295s $ cd .. 295s 295s Clone with tags and branches works 295s 295s $ hg init remote-with-names 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s $ cd remote-with-names 295s $ echo 0 > foo 295s $ hg -q commit -A -m initial 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s $ echo 1 > foo 295s $ hg commit -m 'commit 1' 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s $ hg -q up 0 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s $ hg branch mybranch 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s marked working directory as branch mybranch 295s (branches are permanent and global, did you want a bookmark?) 295s $ echo 2 > foo 295s $ hg commit -m 'commit 2 (mybranch)' 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s $ hg tag -r 1 'default-tag' 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s $ hg tag -r 2 'branch-tag' 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s 295s $ cd .. 295s 295s $ hg clone static-http://localhost:$HGPORT/remote-with-names local-with-names 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s requesting all changes 295s adding changesets 295s adding manifests 295s @@ -191,6 +230,7 @@ 295s Clone a specific branch works 295s 295s $ hg clone -r mybranch static-http://localhost:$HGPORT/remote-with-names local-with-names-branch 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s adding changesets 295s adding manifests 295s adding file changes 295s @@ -202,6 +242,7 @@ 295s Clone a specific tag works 295s 295s $ hg clone -r default-tag static-http://localhost:$HGPORT/remote-with-names local-with-names-tag 295s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 295s adding changesets 295s adding manifests 295s adding file changes 295s 295s ERROR: test-serve-hg-static.t output changed 296s ! 296s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-octopus.t 296s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-octopus.t.err 296s @@ -62,111 +62,9 @@ 296s $ git init -q --bare repo.git 296s 296s $ hg clone gitrepo hgrepo 296s - importing 8 git commits 296s - new changesets ff7a2f2d8d70:307506d6ae8a (10 drafts) 296s - updating to bookmark master 296s - 6 files updated, 0 files merged, 0 files removed, 0 files unresolved 296s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 296s + abort: repository gitrepo not found 296s + [255] 296s $ cd hgrepo 296s + $TESTTMP.sh: 64: cd: can't cd to hgrepo 296s $ hg log --graph --style compact | sed 's/\[.*\]//g' 296s - @ 9:7,8 307506d6ae8a 2007-01-01 00:00 +0000 test 296s - |\ Merge branches 'branch3' and 'branch4' 296s - | | 296s - | o 8:3,4 2b07220e422e 2007-01-01 00:00 +0000 test 296s - | |\ Merge branches 'branch3' and 'branch4' 296s - | | | 296s - o | | 7:5,6 ccf2d65d982c 2007-01-01 00:00 +0000 test 296s - |\ \ \ Merge branches 'branch1' and 'branch2' 296s - | | | | 296s - | o | | 6:1,2 690b40256117 2007-01-01 00:00 +0000 test 296s - | |\ \ \ Merge branches 'branch1' and 'branch2' 296s - | | | | | 296s - o | | | | 5:0 e459c0629ca4 2007-01-01 00:00 +0000 test 296s - | | | | | add delta 296s - | | | | | 296s - +-------o 4:0 e857c9a04474 2007-01-01 00:00 +0000 test 296s - | | | | add zeta 296s - | | | | 296s - +-----o 3:0 0071dec0de0e 2007-01-01 00:00 +0000 test 296s - | | | add epsilon 296s - | | | 296s - +---o 2:0 205a004356ef 2007-01-01 00:00 +0000 test 296s - | | add gamma 296s - | | 296s - | o 1 7fe02317c63d 2007-01-01 00:00 +0000 test 296s - |/ add beta 296s - | 296s - o 0 ff7a2f2d8d70 2007-01-01 00:00 +0000 test 296s - add alpha 296s - 296s - $ hg gverify -r 9 296s - verifying rev 307506d6ae8a against git commit b32ff845df61df998206b630e4370a44f9b36845 296s - $ hg gverify -r 8 296s - abort: no git commit found for rev 2b07220e422e 296s - (if this is an octopus merge, verify against the last rev) 296s - [255] 296s - 296s - $ hg debug-remove-hggit-state 296s - clearing out the git cache data 296s - $ hg push ../repo.git 296s - pushing to ../repo.git 296s - searching for changes 296s - adding objects 296s - remote: found 0 deltas to reuse 296s - added 8 commits with 8 trees and 6 blobs 296s - adding reference refs/heads/branch1 296s - adding reference refs/heads/branch2 296s - adding reference refs/heads/branch3 296s - adding reference refs/heads/branch4 296s - adding reference refs/heads/master 296s - $ cd .. 296s - 296s - $ git --git-dir=repo.git log --pretty=medium | sed s/\\.\\.\\.//g 296s - commit b32ff845df61df998206b630e4370a44f9b36845 296s - Merge: 9ac68f9 7e9cd9f e695849 296s - Author: test 296s - Date: Mon Jan 1 00:00:15 2007 +0000 296s - 296s - Merge branches 'branch3' and 'branch4' 296s - 296s - commit 9ac68f982ae7426d9597ff16c74afb4e6053c582 296s - Merge: d40f375 9497a4e e5023f9 296s - Author: test 296s - Date: Mon Jan 1 00:00:15 2007 +0000 296s - 296s - Merge branches 'branch1' and 'branch2' 296s - 296s - commit d40f375a81b7d033e92cbad89487115fe2dd472f 296s - Author: test 296s - Date: Mon Jan 1 00:00:15 2007 +0000 296s - 296s - add delta 296s - 296s - commit e695849087f6c320c1a447620492b29a82ca41b1 296s - Author: test 296s - Date: Mon Jan 1 00:00:14 2007 +0000 296s - 296s - add zeta 296s - 296s - commit 7e9cd9f90b6d2c60579375eb796ce706d2d8bbe6 296s - Author: test 296s - Date: Mon Jan 1 00:00:13 2007 +0000 296s - 296s - add epsilon 296s - 296s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 296s - Author: test 296s - Date: Mon Jan 1 00:00:12 2007 +0000 296s - 296s - add gamma 296s - 296s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 296s - Author: test 296s - Date: Mon Jan 1 00:00:11 2007 +0000 296s - 296s - add beta 296s - 296s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 296s - Author: test 296s - Date: Mon Jan 1 00:00:10 2007 +0000 296s - 296s - add alpha 296s 296s ERROR: test-octopus.t output changed 297s ! 297s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-hook.t 297s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-hook.t.err 297s @@ -10,6 +10,7 @@ 297s > fn_${1}_commit -m $2 297s > } 297s $ hg init hgrepo 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s $ cd hgrepo 297s $ cat > .hg/hgrc < [hooks] 297s @@ -22,7 +23,10 @@ 297s > incoming = python:testlib.hooks.showargs 297s > EOF 297s $ fn_commit hg a 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s $ hg book master 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s 297s $ git init -q --bare ../repo.git 297s $ cat >> .hg/hgrc < master 297s + * [new branch] master -> master 297s $ cd ../hgrepo 297s 297s Hooks on pull? 297s 297s $ hg pull -u 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s pulling from $TESTTMP/repo.git 297s - | gitimport.source=pull 297s - | gitimport.git=True 297s - | gitimport.names=[b'default'] 297s - | gitimport.refs={b'HEAD': b'1dab31e7bc9691ba42a2fe7b14680694770bc527', b'refs/heads/master': b'1dab31e7bc9691ba42a2fe7b14680694770bc527'} 297s - | gitimport.heads=None 297s - importing 2 git commits 297s - : pretxncommit 297s - | incoming.git=True 297s - | incoming.source=pull 297s - | incoming.node=382ad5fa1d7727210384d40fa1539af52ca632c5 297s - | incoming.git_node=92150d1529ccaea34a6b36fe4144993193080499 297s - : pretxncommit 297s - | incoming.git=True 297s - | incoming.source=pull 297s - | incoming.node=892115eea5c32152e09ae4013c9a119d7b534049 297s - | incoming.git_node=1dab31e7bc9691ba42a2fe7b14680694770bc527 297s - updating bookmark master 297s - | changegroup.source=push 297s - | changegroup.git=True 297s - | changegroup.node=382ad5fa1d7727210384d40fa1539af52ca632c5 297s - | changegroup.node_last=892115eea5c32152e09ae4013c9a119d7b534049 297s - new changesets 382ad5fa1d77:892115eea5c3 (2 drafts) 297s - updating to active bookmark master 297s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 297s + abort: repository $TESTTMP/repo.git not found 297s + [255] 297s 297s Hooks on push? 297s 297s $ fn_commit hg d 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s $ fn_commit hg e 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s $ hg push 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s pushing to $TESTTMP/repo.git 297s - | preoutgoing.git=True 297s - | preoutgoing.source=push 297s - | preoutgoing.url=$TESTTMP/repo.git 297s - | gitexport.nodes=[b'cc6164a17449d58d7811ff3918f33f89c2c83fa5', b'46737f6a4c9d8307b681cbb2e9e2e5419cc87f82'] 297s - | gitexport.git=True 297s - searching for changes 297s - | prechangegroup.source=push 297s - | prechangegroup.git=True 297s - | prechangegroup.url=$TESTTMP/repo.git 297s - adding objects 297s - remote: found 0 deltas to reuse 297s - added 2 commits with 2 trees and 2 blobs 297s - updating reference refs/heads/master 297s + abort: repository $TESTTMP/repo.git not found 297s + [255] 297s 297s 297s And what does Mercurial do? 297s @@ -124,7 +87,9 @@ 297s On push: 297s 297s $ hg init ../hgrepo-copy 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s $ hg push ../hgrepo-copy 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s pushing to ../hgrepo-copy 297s searching for changes 297s | preoutgoing.source=push 297s @@ -133,19 +98,29 @@ 297s adding changesets 297s adding manifests 297s adding file changes 297s - added 5 changesets with 5 changes to 5 files 297s + added 3 changesets with 3 changes to 3 files 297s 297s With more than one head: 297s 297s $ rm -r ../hgrepo-copy 297s $ hg init ../hgrepo-copy 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s $ hg book -i 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s $ hg branch -q abranch 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s $ fn_commit hg x 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s $ hg up -q default 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s $ hg branch -q alsoabranch 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s $ fn_commit hg y 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s $ hg push ../hgrepo-copy 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s pushing to ../hgrepo-copy 297s searching for changes 297s | preoutgoing.source=push 297s @@ -154,13 +129,15 @@ 297s adding changesets 297s adding manifests 297s adding file changes 297s - added 7 changesets with 7 changes to 7 files (+1 heads) 297s + added 5 changesets with 5 changes to 5 files (+1 heads) 297s 297s On pull: 297s 297s $ hg debugstrip --no-backup tip 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 297s $ hg pull ../hgrepo-copy 297s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 297s pulling from ../hgrepo-copy 297s searching for changes 297s | prechangegroup.txnname=pull 297s @@ -171,16 +148,16 @@ 297s adding manifests 297s adding file changes 297s added 1 changesets with 1 changes to 1 files (+1 heads) 297s - new changesets d4097d98a390 297s + new changesets 11a693974ec5 297s | changegroup.txnname=pull 297s file://$TESTTMP/hgrepo-copy 297s | changegroup.source=pull 297s | changegroup.url=file:$TESTTMP/hgrepo-copy 297s - | changegroup.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 297s - | changegroup.node_last=d4097d98a3905be88e8a566039b1fdcca06e0d2e 297s + | changegroup.node=11a693974ec530e32672629628dde90793335199 297s + | changegroup.node_last=11a693974ec530e32672629628dde90793335199 297s | incoming.txnname=pull 297s file://$TESTTMP/hgrepo-copy 297s | incoming.source=pull 297s | incoming.url=file:$TESTTMP/hgrepo-copy 297s - | incoming.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 297s + | incoming.node=11a693974ec530e32672629628dde90793335199 297s (run 'hg heads' to see heads) 297s 297s ERROR: test-hook.t output changed 300s ! 300s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-transactions.t 300s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-transactions.t.err 300s @@ -42,19 +42,29 @@ 300s 300s $ hg clone gitrepo hgrepo --config hggit.mapsavefrequency=10 --debug \ 300s > | grep -c saving 300s - 1 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s + abort: repository gitrepo not found 300s + 0 300s + [1] 300s $ rm -rf hgrepo 300s 300s pull with mapsavefreq set 300s 300s $ hg init hgrepo 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s $ cat >> hgrepo/.hg/hgrc < [paths] 300s > default = $TESTTMP/gitrepo 300s > EOF 300s $ hg -R hgrepo --config hggit.mapsavefrequency=10 pull --debug \ 300s > | grep -c saving 300s - 10 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s + abort: repository $TESTTMP/gitrepo not found 300s + 0 300s + [1] 300s $ rm -rf hgrepo 300s 300s The user experience 300s @@ -66,6 +76,8 @@ 300s First, create a repository, set up to pull from git, and where we can interrupt the conversion. 300s 300s $ hg init hgrepo 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s $ cat >> hgrepo/.hg/hgrc < [paths] 300s > default = $TESTTMP/gitrepo 300s @@ -75,39 +87,45 @@ 300s A low save interval causes a lot of reports: 300s 300s $ hg --config hggit.mapsavefrequency=25 pull 300s - pulling from $TESTTMP/gitrepo 300s - importing 100 git commits 300s - new changesets 1c8407413fa3:abc468b9e51b (25 drafts) 300s - new changesets 217c308baf47:d5d14eeedd08 (25 drafts) 300s - new changesets d9807ef6abcb:4678067bd500 (25 drafts) 300s - adding bookmark master 300s - new changesets c31a154888bb:eda59117ba04 (25 drafts) 300s - (run 'hg update' to get a working copy) 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s + pulling from $TESTTMP/gitrepo 300s + abort: repository $TESTTMP/gitrepo not found 300s + [255] 300s 300s Reset the repository 300s 300s $ hg debugstrip --no-backup 'all()' 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s $ hg debug-remove-hggit-state 300s - clearing out the git cache data 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s + hg: unknown command 'debug-remove-hggit-state' 300s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 300s + [10] 300s 300s And with phases? No mention of draft changesets, as we publish changes 300s during the conversion: 300s 300s $ hg --config hggit.mapsavefrequency=25 --config hggit.usephases=yes pull 300s - pulling from $TESTTMP/gitrepo 300s - importing 100 git commits 300s - new changesets 1c8407413fa3:abc468b9e51b 300s - new changesets 217c308baf47:d5d14eeedd08 300s - new changesets d9807ef6abcb:4678067bd500 300s - updating bookmark master 300s - new changesets c31a154888bb:eda59117ba04 300s - (run 'hg update' to get a working copy) 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s + pulling from $TESTTMP/gitrepo 300s + abort: repository $TESTTMP/gitrepo not found 300s + [255] 300s 300s Reset the repository 300s 300s $ hg debugstrip --no-backup 'all()' 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s $ hg debug-remove-hggit-state 300s - clearing out the git cache data 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s + hg: unknown command 'debug-remove-hggit-state' 300s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 300s + [10] 300s 300s Interruptions 300s ------------- 300s @@ -121,54 +139,51 @@ 300s Test an error in a pull: 300s 300s $ ABORT_AFTER=99 hg pull 300s - pulling from $TESTTMP/gitrepo 300s - importing 100 git commits 300s - transaction abort! 300s - rollback completed 300s - abort: aborted after 99 commits! 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s + pulling from $TESTTMP/gitrepo 300s + abort: repository $TESTTMP/gitrepo not found 300s [255] 300s $ hg log -l 10 -T '{rev} {gitnode}\n' 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s 300s Test the user exiting in the first transaction: 300s 300s $ EXIT_AFTER=5 hg --config hggit.mapsavefrequency=10 pull 300s - pulling from $TESTTMP/gitrepo 300s - importing 100 git commits 300s - transaction abort! 300s - rollback completed 300s - interrupted! 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s + pulling from $TESTTMP/gitrepo 300s + abort: repository $TESTTMP/gitrepo not found 300s [255] 300s $ hg log -l 10 -T '{rev} {gitnode}\n' 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s 300s Check that we have no state, but clear it just in case 300s 300s $ ls -d .hg/git* 300s - .hg/git 300s + ls: cannot access '.hg/git*': No such file or directory 300s + [2] 300s $ hg debug-remove-hggit-state 300s - clearing out the git cache data 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s + hg: unknown command 'debug-remove-hggit-state' 300s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 300s + [10] 300s 300s Test the user exiting in the middle of a conversion, after the first 300s transaction: 300s 300s $ EXIT_AFTER=15 hg --config hggit.mapsavefrequency=10 pull 300s - pulling from $TESTTMP/gitrepo 300s - importing 100 git commits 300s - new changesets 1c8407413fa3:7c8c534a5fbe (10 drafts) 300s - transaction abort! 300s - rollback completed 300s - interrupted! 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s + pulling from $TESTTMP/gitrepo 300s + abort: repository $TESTTMP/gitrepo not found 300s [255] 300s $ hg log -l 10 -T '{rev} {gitnode}\n' 300s - 9 7cbb16ec981b308e1e2b181f8e1f22c8f409f44e 300s - 8 42da70ed92bbecf9f348ba59c93646be723d0bf2 300s - 7 17e841146e5744b81af9959634d82c20a5d7df52 300s - 6 c31065bf97bf014815e37cdfbdef2c32c687f314 300s - 5 fcf21b8e0520ec1cced1d7593d13f9ee54721269 300s - 4 46acd02d0352e4b92bd6a099bb0490305d847a18 300s - 3 61eeda444b37b8aa3892d5f04c66c5441d21dd66 300s - 2 e55db11bb0472791c7af3fc636772174cdea4a36 300s - 1 17a2672b3c24c02d568f99d8d55ccae2bf362d5c 300s - 0 4e195b4c6e77604b70a8ad3b01306adbb9b1c7e7 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s $ cd .. 300s $ rm -rf hgrepo 300s 300s @@ -183,12 +198,10 @@ 300s > hg --config hggit.mapsavefrequency=10 --config git.intree=yes \ 300s > --cwd hgrepo \ 300s > clone -U $TESTTMP/gitrepo . 300s - importing 100 git commits 300s - transaction abort! 300s - rollback completed 300s - interrupted! 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + *** failed to import extension "breakage" from /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/testlib/ext-break-git-import.py: b'hggit' 300s + abort: repository $TESTTMP/gitrepo not found 300s [255] 300s the leftover below appeared in Mercurial 5.9+; it is unintentional 300s $ ls -A hgrepo 300s - .git 300s - $ rm -rf hgrepo 300s + $ rm -rf hgrepo 300s 300s ERROR: test-transactions.t output changed 300s ! 300s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-outgoing.t 300s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-outgoing.t.err 300s @@ -14,166 +14,10 @@ 300s 300s $ cd .. 300s $ hg clone gitrepo hgrepo 300s - importing 1 git commits 300s - new changesets ff7a2f2d8d70 (1 drafts) 300s - updating to bookmark master 300s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 300s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 300s + abort: repository gitrepo not found 300s + [255] 300s 300s $ cd hgrepo 300s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 300s $ hg book 300s - alpha 0:ff7a2f2d8d70 300s - * master 0:ff7a2f2d8d70 300s - $ hg update -q master 300s - $ echo beta > beta 300s - $ hg add beta 300s - $ fn_hg_commit -m 'add beta' 300s - 300s - 300s - $ echo gamma > gamma 300s - $ hg add gamma 300s - $ fn_hg_commit -m 'add gamma' 300s - 300s - $ hg book -r 1 beta 300s - 300s - $ hg outgoing | grep -v 'searching for changes' 300s - comparing with $TESTTMP/gitrepo 300s - changeset: 1:47580592d3d6 300s - bookmark: beta 300s - user: test 300s - date: Mon Jan 01 00:00:11 2007 +0000 300s - summary: add beta 300s - 300s - changeset: 2:953796e1cfd8 300s - bookmark: master 300s - tag: tip 300s - user: test 300s - date: Mon Jan 01 00:00:12 2007 +0000 300s - summary: add gamma 300s - 300s - $ hg outgoing -r beta 300s - comparing with $TESTTMP/gitrepo 300s - searching for changes 300s - changeset: 1:47580592d3d6 300s - bookmark: beta 300s - user: test 300s - date: Mon Jan 01 00:00:11 2007 +0000 300s - summary: add beta 300s - 300s - $ hg outgoing -r master 300s - comparing with $TESTTMP/gitrepo 300s - searching for changes 300s - changeset: 1:47580592d3d6 300s - bookmark: beta 300s - user: test 300s - date: Mon Jan 01 00:00:11 2007 +0000 300s - summary: add beta 300s - 300s - changeset: 2:953796e1cfd8 300s - bookmark: master 300s - tag: tip 300s - user: test 300s - date: Mon Jan 01 00:00:12 2007 +0000 300s - summary: add gamma 300s - 300s - 300s - $ cd .. 300s - 300s -some more work on master from git 300s - $ cd gitrepo 300s - 300s -Check state of refs after outgoing 300s - $ git show-ref 300s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/alpha 300s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/master 300s - 300s - $ git checkout master 2>&1 | sed s/\'/\"/g 300s - Already on "master" 300s - $ echo delta > delta 300s - $ git add delta 300s - $ fn_git_commit -m "add delta" 300s - 300s - $ cd .. 300s - 300s - $ cd hgrepo 300s -this will fail # maybe we should try to make it work 300s - $ hg outgoing 300s - comparing with $TESTTMP/gitrepo 300s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 300s - [255] 300s -let's pull and try again 300s - $ hg pull 300s - pulling from */gitrepo (glob) 300s - importing 1 git commits 300s - not updating diverged bookmark master 300s - new changesets 25eed24f5e8f (1 drafts) 300s - (run 'hg heads' to see heads, 'hg merge' to merge) 300s - $ hg log --graph 300s - o changeset: 3:25eed24f5e8f 300s - | tag: default/master 300s - | tag: tip 300s - | parent: 0:ff7a2f2d8d70 300s - | user: test 300s - | date: Mon Jan 01 00:00:13 2007 +0000 300s - | summary: add delta 300s - | 300s - | @ changeset: 2:953796e1cfd8 300s - | | bookmark: master 300s - | | user: test 300s - | | date: Mon Jan 01 00:00:12 2007 +0000 300s - | | summary: add gamma 300s - | | 300s - | o changeset: 1:47580592d3d6 300s - |/ bookmark: beta 300s - | user: test 300s - | date: Mon Jan 01 00:00:11 2007 +0000 300s - | summary: add beta 300s - | 300s - o changeset: 0:ff7a2f2d8d70 300s - bookmark: alpha 300s - tag: default/alpha 300s - user: test 300s - date: Mon Jan 01 00:00:10 2007 +0000 300s - summary: add alpha 300s - 300s - $ hg outgoing 300s - comparing with $TESTTMP/gitrepo 300s - searching for changes 300s - changeset: 1:47580592d3d6 300s - bookmark: beta 300s - user: test 300s - date: Mon Jan 01 00:00:11 2007 +0000 300s - summary: add beta 300s - 300s - changeset: 2:953796e1cfd8 300s - bookmark: master 300s - user: test 300s - date: Mon Jan 01 00:00:12 2007 +0000 300s - summary: add gamma 300s - 300s - $ hg outgoing -r beta 300s - comparing with $TESTTMP/gitrepo 300s - searching for changes 300s - changeset: 1:47580592d3d6 300s - bookmark: beta 300s - user: test 300s - date: Mon Jan 01 00:00:11 2007 +0000 300s - summary: add beta 300s - 300s - $ hg outgoing -r master 300s - comparing with $TESTTMP/gitrepo 300s - searching for changes 300s - changeset: 1:47580592d3d6 300s - bookmark: beta 300s - user: test 300s - date: Mon Jan 01 00:00:11 2007 +0000 300s - summary: add beta 300s - 300s - changeset: 2:953796e1cfd8 300s - bookmark: master 300s - user: test 300s - date: Mon Jan 01 00:00:12 2007 +0000 300s - summary: add gamma 300s - 300s - 300s - 300s - $ cd .. 300s 300s ERROR: test-outgoing.t output changed 301s ! 301s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-gc.t 301s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-gc.t.err 301s @@ -25,188 +25,9 @@ 301s > done 301s $ cd .. 301s $ hg clone -U gitrepo hgrepo 301s - importing 100 git commits 301s - new changesets 1c8407413fa3:eda59117ba04 (100 drafts) 301s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 301s + abort: repository gitrepo not found 301s + [255] 301s $ cd hgrepo 301s + $TESTTMP.sh: 24: cd: can't cd to hgrepo 301s $ hg debug-remove-hggit-state 301s - clearing out the git cache data 301s - 301s ------------ 301s - 301s -Test garbage collection of loose objects into packs. We first test 301s -this with two threads, which is closest to the expected usage 301s -scenario, as almost all computers have at least two cores these days. 301s -The main downside is that this makes the output order unreliable, so 301s -we just sort it. 301s - 301s - $ hg gexport --config hggit.mapsavefrequency=33 --config hggit.threads=2 --debug | grep pack | sort 301s - packed 3 loose objects! 301s - packed 75 loose objects! 301s - packed 78 loose objects! 301s - packed 86 loose objects! 301s - packing 3 loose objects... 301s - packing 75 loose objects... 301s - packing 78 loose objects... 301s - packing 86 loose objects... 301s - $ hg debug-remove-hggit-state 301s - clearing out the git cache data 301s - 301s -Test the actual order of operations -- this uses a single thread, 301s -which means that the packing happens synchronously in the main thread, 301s -giving us a reliable output order. 301s - 301s -In addition, the transaction size is set up such that we happen to do 301s -nothing in the final, synchronous packing that happens on every pull. 301s -Lots of other tests have a map save frequency higher than the total 301s -amount of commits pulled, but let's just trigger that other odd 301s -occurence here. 301s - 301s - $ hg gexport --debug \ 301s - > --config hggit.mapsavefrequency=10 --config hggit.threads=1 | \ 301s - > sed 's/^converting revision.*/./' 301s - finding unexported changesets 301s - exporting 100 changesets 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 301s - packing 30 loose objects... 301s - packed 30 loose objects! 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 301s - packing 25 loose objects... 301s - packed 25 loose objects! 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 301s - packing 25 loose objects... 301s - packed 25 loose objects! 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 301s - packing 24 loose objects... 301s - packed 24 loose objects! 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 301s - packing 24 loose objects... 301s - packed 24 loose objects! 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 301s - packing 24 loose objects... 301s - packed 24 loose objects! 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 301s - packing 24 loose objects... 301s - packed 24 loose objects! 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 301s - packing 23 loose objects... 301s - packed 23 loose objects! 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 301s - packing 22 loose objects... 301s - packed 22 loose objects! 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - . 301s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 301s - packing 21 loose objects... 301s - packed 21 loose objects! 301s - packing 0 loose objects... 301s - packed 0 loose objects! 301s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 301s - $ find .hg/git/objects -type f | grep -Fv .idx | sort 301s - .hg/git/objects/pack/pack-33903607b479000b976a29a349fe0f4dffb0aaac.pack 301s - .hg/git/objects/pack/pack-40d9440e392d9eab62fa38a2ed66cc763d77aca3.pack 301s - .hg/git/objects/pack/pack-4ab2dac268f94e407788d52d6ba087b626c41651.pack 301s - .hg/git/objects/pack/pack-543e3b37bd36218a4dc6611a96d7c218afb78429.pack 301s - .hg/git/objects/pack/pack-5fc80292253ee10d1b86b5c4d9c51b29d2b4ba47.pack 301s - .hg/git/objects/pack/pack-9c636f5f16302fc5fadf0cc4ed42aeb67fc51f6a.pack 301s - .hg/git/objects/pack/pack-ae74b1f0197dfb45cfb13889453860a40103969a.pack 301s - .hg/git/objects/pack/pack-b432e2f477cb765fc0aeaa850d56e04b10392e6c.pack 301s - .hg/git/objects/pack/pack-cf7023660ce10ede2896d1be117f6ba93a261ff9.pack 301s - .hg/git/objects/pack/pack-e601b2af6a91a9cf6817d71f4eb660d2218d4094.pack 301s 301s ERROR: test-gc.t output changed 302s ! 302s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-phases-public.t 302s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-phases-public.t#publish-defaults.err 302s @@ -24,149 +24,10 @@ 302s 302s cloning with hggit.usephases publishes cloned HEAD 302s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 302s - importing 1 git commits 302s - new changesets ff7a2f2d8d70 302s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 302s + abort: repository gitrepo not found 302s + [255] 302s 302s $ cd hgrepo 302s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 302s $ hg phase -r master 302s - 0: public 302s - $ cd .. 302s - 302s -pulled changesets are public 302s - $ cd gitrepo 302s - $ git checkout -q master 302s - $ echo beta > beta 302s - $ git add beta 302s - $ fn_git_commit -m 'add beta' 302s - $ git checkout -b not-master 302s - Switched to a new branch 'not-master' 302s - $ echo gamma > gamma 302s - $ git add gamma 302s - $ fn_git_commit -m 'add gamma' 302s - $ git tag thetag 302s - $ echo delta > delta 302s - $ git add delta 302s - $ fn_git_commit -m 'add delta' 302s - $ git checkout master 302s - Switched to branch 'master' 302s - $ cd .. 302s - 302s - $ cd hgrepo 302s - $ cat >>$HGRCPATH < [paths] 302s - > other = $TESTTMP/gitrepo/.git 302s - > [hggit] 302s - > usephases = True 302s - > EOF 302s - 302s - $ hg phase -fd 'all()' 302s - 302s -we can restrict publishing to the remote HEAD and that tag, which 302s -happens to be the same thing here 302s - 302s -#if publish-specific 302s - $ cat >>$HGRCPATH < [git] 302s - > public = default/master, thetag 302s - > EOF 302s -#endif 302s - 302s -pulling publishes the branch 302s - 302s - $ hg phase -r master 302s - 0: draft 302s -#if publish-defaults 302s - $ hg pull -r master other 302s - pulling from $TESTTMP/gitrepo/.git 302s - importing 1 git commits 302s - updating bookmark master 302s - new changesets 7fe02317c63d 302s - 1 local changesets published 302s - (run 'hg update' to get a working copy) 302s -#else 302s - $ hg pull -r master other 302s - pulling from $TESTTMP/gitrepo/.git 302s - importing 1 git commits 302s - updating bookmark master 302s - new changesets 7fe02317c63d (1 drafts) 302s - (run 'hg update' to get a working copy) 302s -#endif 302s - $ hg phase -r master 302s - 1: draft (publish-specific !) 302s - 1: public (publish-defaults !) 302s -#if publish-defaults 302s - $ hg phase -fd master 302s - $ hg pull 302s - pulling from $TESTTMP/gitrepo 302s - importing 2 git commits 302s - adding bookmark not-master 302s - new changesets ca33a262eb46:03769a650ded (1 drafts) 302s - 1 local changesets published 302s - (run 'hg update' to get a working copy) 302s -#else 302s - $ hg pull 302s - pulling from $TESTTMP/gitrepo 302s - importing 2 git commits 302s - adding bookmark not-master 302s - new changesets ca33a262eb46:03769a650ded (1 drafts) 302s - 2 local changesets published 302s - (run 'hg update' to get a working copy) 302s -#endif 302s - $ hg phase -r master -r not-master -r thetag 302s - 1: public 302s - 3: draft 302s - 2: public 302s - 302s -public bookmark not pushed is not published after pull 302s - 302s - $ hg update 0 302s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 302s - $ echo delta > delta 302s - $ hg bookmark not-pushed 302s - $ hg add delta 302s - $ hg commit -m 'add delta' 302s - created new head 302s - $ hg phase -r 'all()' > $TESTTMP/before 302s - $ hg pull --config git.public=master,not-pushed 302s - pulling from $TESTTMP/gitrepo 302s - no changes found 302s - $ hg phase -r 'all()' > $TESTTMP/after 302s - $ cmp -s $TESTTMP/before $TESTTMP/after 302s - $ hg phase -r not-pushed 302s - 4: draft 302s - $ rm $TESTTMP/before $TESTTMP/after 302s - 302s -pushing public bookmark publishes local changesets, but only those 302s -actually pushed 302s - 302s - $ hg update master 302s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 302s - (activating bookmark master) 302s - $ echo epsilon > epsilon 302s - $ hg add epsilon 302s - $ hg commit -m 'add epsilon' 302s - created new head 302s - $ hg phase -r 'all() - master' > $TESTTMP/before 302s - $ hg push -B not-pushed 302s - pushing to $TESTTMP/gitrepo 302s - searching for changes 302s - adding objects 302s - remote: found 0 deltas to reuse 302s - added 1 commits with 1 trees and 1 blobs 302s - adding reference refs/heads/not-pushed 302s - $ hg phase -r 'all() - master' > $TESTTMP/after 302s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 302s - $ hg phase -r not-pushed -r master 302s - 4: draft 302s - 5: draft 302s - $ hg push -B master 302s - pushing to $TESTTMP/gitrepo 302s - searching for changes 302s - adding objects 302s - remote: found 0 deltas to reuse 302s - added 1 commits with 1 trees and 1 blobs 302s - updating reference refs/heads/master 302s - $ hg phase -r 'all() - master' > $TESTTMP/after 302s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 302s - $ hg phase -r master 302s - 5: public 302s 302s ERROR: test-phases-public.t#publish-defaults output changed 302s ! 302s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-phases-public.t 302s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-phases-public.t#publish-specific.err 302s @@ -24,149 +24,10 @@ 302s 302s cloning with hggit.usephases publishes cloned HEAD 302s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 302s - importing 1 git commits 302s - new changesets ff7a2f2d8d70 302s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 302s + abort: repository gitrepo not found 302s + [255] 302s 302s $ cd hgrepo 302s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 302s $ hg phase -r master 302s - 0: public 302s - $ cd .. 302s - 302s -pulled changesets are public 302s - $ cd gitrepo 302s - $ git checkout -q master 302s - $ echo beta > beta 302s - $ git add beta 302s - $ fn_git_commit -m 'add beta' 302s - $ git checkout -b not-master 302s - Switched to a new branch 'not-master' 302s - $ echo gamma > gamma 302s - $ git add gamma 302s - $ fn_git_commit -m 'add gamma' 302s - $ git tag thetag 302s - $ echo delta > delta 302s - $ git add delta 302s - $ fn_git_commit -m 'add delta' 302s - $ git checkout master 302s - Switched to branch 'master' 302s - $ cd .. 302s - 302s - $ cd hgrepo 302s - $ cat >>$HGRCPATH < [paths] 302s - > other = $TESTTMP/gitrepo/.git 302s - > [hggit] 302s - > usephases = True 302s - > EOF 302s - 302s - $ hg phase -fd 'all()' 302s - 302s -we can restrict publishing to the remote HEAD and that tag, which 302s -happens to be the same thing here 302s - 302s -#if publish-specific 302s - $ cat >>$HGRCPATH < [git] 302s - > public = default/master, thetag 302s - > EOF 302s -#endif 302s - 302s -pulling publishes the branch 302s - 302s - $ hg phase -r master 302s - 0: draft 302s -#if publish-defaults 302s - $ hg pull -r master other 302s - pulling from $TESTTMP/gitrepo/.git 302s - importing 1 git commits 302s - updating bookmark master 302s - new changesets 7fe02317c63d 302s - 1 local changesets published 302s - (run 'hg update' to get a working copy) 302s -#else 302s - $ hg pull -r master other 302s - pulling from $TESTTMP/gitrepo/.git 302s - importing 1 git commits 302s - updating bookmark master 302s - new changesets 7fe02317c63d (1 drafts) 302s - (run 'hg update' to get a working copy) 302s -#endif 302s - $ hg phase -r master 302s - 1: draft (publish-specific !) 302s - 1: public (publish-defaults !) 302s -#if publish-defaults 302s - $ hg phase -fd master 302s - $ hg pull 302s - pulling from $TESTTMP/gitrepo 302s - importing 2 git commits 302s - adding bookmark not-master 302s - new changesets ca33a262eb46:03769a650ded (1 drafts) 302s - 1 local changesets published 302s - (run 'hg update' to get a working copy) 302s -#else 302s - $ hg pull 302s - pulling from $TESTTMP/gitrepo 302s - importing 2 git commits 302s - adding bookmark not-master 302s - new changesets ca33a262eb46:03769a650ded (1 drafts) 302s - 2 local changesets published 302s - (run 'hg update' to get a working copy) 302s -#endif 302s - $ hg phase -r master -r not-master -r thetag 302s - 1: public 302s - 3: draft 302s - 2: public 302s - 302s -public bookmark not pushed is not published after pull 302s - 302s - $ hg update 0 302s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 302s - $ echo delta > delta 302s - $ hg bookmark not-pushed 302s - $ hg add delta 302s - $ hg commit -m 'add delta' 302s - created new head 302s - $ hg phase -r 'all()' > $TESTTMP/before 302s - $ hg pull --config git.public=master,not-pushed 302s - pulling from $TESTTMP/gitrepo 302s - no changes found 302s - $ hg phase -r 'all()' > $TESTTMP/after 302s - $ cmp -s $TESTTMP/before $TESTTMP/after 302s - $ hg phase -r not-pushed 302s - 4: draft 302s - $ rm $TESTTMP/before $TESTTMP/after 302s - 302s -pushing public bookmark publishes local changesets, but only those 302s -actually pushed 302s - 302s - $ hg update master 302s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 302s - (activating bookmark master) 302s - $ echo epsilon > epsilon 302s - $ hg add epsilon 302s - $ hg commit -m 'add epsilon' 302s - created new head 302s - $ hg phase -r 'all() - master' > $TESTTMP/before 302s - $ hg push -B not-pushed 302s - pushing to $TESTTMP/gitrepo 302s - searching for changes 302s - adding objects 302s - remote: found 0 deltas to reuse 302s - added 1 commits with 1 trees and 1 blobs 302s - adding reference refs/heads/not-pushed 302s - $ hg phase -r 'all() - master' > $TESTTMP/after 302s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 302s - $ hg phase -r not-pushed -r master 302s - 4: draft 302s - 5: draft 302s - $ hg push -B master 302s - pushing to $TESTTMP/gitrepo 302s - searching for changes 302s - adding objects 302s - remote: found 0 deltas to reuse 302s - added 1 commits with 1 trees and 1 blobs 302s - updating reference refs/heads/master 302s - $ hg phase -r 'all() - master' > $TESTTMP/after 302s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 302s - $ hg phase -r master 302s - 5: public 302s 302s ERROR: test-phases-public.t#publish-specific output changed 304s ! 304s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-push-r.t 304s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-push-r.t.err 304s @@ -2,34 +2,43 @@ 304s $ . "$TESTDIR/testutil" 304s 304s $ hg init test 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s $ cd test 304s $ cat >>afile < 0 304s > EOF 304s $ hg add afile 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s $ fn_hg_commit -m "0.0" 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s $ cat >>afile < 1 304s > EOF 304s $ fn_hg_commit -m "0.1" 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s $ cat >>afile < 2 304s > EOF 304s $ fn_hg_commit -m "0.2" 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s $ cat >>afile < 3 304s > EOF 304s $ fn_hg_commit -m "0.3" 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s $ hg update -C 0 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 304s $ cat >>afile < 1 304s > EOF 304s $ fn_hg_commit -m "1.1" 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s $ cat >>afile < 2 304s > EOF 304s $ fn_hg_commit -m "1.2" 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s $ cat >fred < a line 304s > EOF 304s @@ -37,13 +46,20 @@ 304s > 3 304s > EOF 304s $ hg add fred 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s $ fn_hg_commit -m "1.3" 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s $ hg mv afile adifferentfile 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s $ fn_hg_commit -m "1.3m" 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s $ hg update -C 3 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 304s $ hg mv afile anotherfile 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s $ fn_hg_commit -m "0.3m" 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s $ cd .. 304s $ for i in 0 1 2 3 4 5 6 7 8; do 304s > mkdir test-"$i" 304s @@ -53,128 +69,166 @@ 304s > hg verify 304s > cd .. 304s > done 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s pushing to test-0 304s searching for changes 304s adding changesets 304s adding manifests 304s adding file changes 304s added 1 changesets with 1 changes to 1 files 304s - checking changesets 304s - checking manifests 304s - crosschecking files in changesets and manifests 304s - checking files 304s - checking dirstate (?) 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + checking changesets 304s + checking dirstate (?) 304s + checking manifests 304s + crosschecking files in changesets and manifests 304s + checking files 304s + checking dirstate 304s checked 1 changesets with 1 changes to 1 files 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s pushing to test-1 304s searching for changes 304s adding changesets 304s adding manifests 304s + checking dirstate (?) 304s adding file changes 304s added 2 changesets with 2 changes to 1 files 304s - checking changesets 304s - checking manifests 304s - crosschecking files in changesets and manifests 304s - checking files 304s - checking dirstate (?) 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + checking changesets 304s + checking manifests 304s + crosschecking files in changesets and manifests 304s + checking files 304s + checking dirstate 304s checked 2 changesets with 2 changes to 1 files 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + checking dirstate (?) 304s pushing to test-2 304s searching for changes 304s adding changesets 304s adding manifests 304s adding file changes 304s added 3 changesets with 3 changes to 1 files 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s checking changesets 304s checking manifests 304s crosschecking files in changesets and manifests 304s checking files 304s checking dirstate (?) 304s checked 3 changesets with 3 changes to 1 files 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s pushing to test-3 304s searching for changes 304s adding changesets 304s adding manifests 304s adding file changes 304s added 4 changesets with 4 changes to 1 files 304s - checking changesets 304s - checking manifests 304s - crosschecking files in changesets and manifests 304s - checking files 304s - checking dirstate (?) 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + checking changesets 304s + checking dirstate (?) 304s + checking manifests 304s + crosschecking files in changesets and manifests 304s + checking files 304s + checking dirstate 304s checked 4 changesets with 4 changes to 1 files 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s pushing to test-4 304s searching for changes 304s adding changesets 304s adding manifests 304s + checking dirstate (?) 304s adding file changes 304s added 2 changesets with 2 changes to 1 files 304s - checking changesets 304s - checking manifests 304s - crosschecking files in changesets and manifests 304s - checking files 304s - checking dirstate (?) 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + checking changesets 304s + checking manifests 304s + crosschecking files in changesets and manifests 304s + checking files 304s + checking dirstate 304s checked 2 changesets with 2 changes to 1 files 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + checking dirstate (?) 304s pushing to test-5 304s searching for changes 304s adding changesets 304s adding manifests 304s adding file changes 304s added 3 changesets with 3 changes to 1 files 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s checking changesets 304s checking manifests 304s crosschecking files in changesets and manifests 304s checking files 304s checking dirstate (?) 304s checked 3 changesets with 3 changes to 1 files 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s pushing to test-6 304s searching for changes 304s adding changesets 304s adding manifests 304s adding file changes 304s added 4 changesets with 5 changes to 2 files 304s - checking changesets 304s - checking manifests 304s - crosschecking files in changesets and manifests 304s - checking files 304s - checking dirstate (?) 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + checking changesets 304s + checking dirstate (?) 304s + checking manifests 304s + crosschecking files in changesets and manifests 304s + checking files 304s + checking dirstate 304s checked 4 changesets with 5 changes to 2 files 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s pushing to test-7 304s searching for changes 304s adding changesets 304s adding manifests 304s adding file changes 304s added 5 changesets with 6 changes to 3 files 304s - checking changesets 304s - checking manifests 304s - crosschecking files in changesets and manifests 304s - checking files 304s - checking dirstate (?) 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + checking changesets 304s + checking manifests 304s + crosschecking files in changesets and manifests 304s + checking files 304s + checking dirstate 304s checked 5 changesets with 6 changes to 3 files 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s pushing to test-8 304s searching for changes 304s adding changesets 304s adding manifests 304s adding file changes 304s added 5 changesets with 5 changes to 2 files 304s - checking changesets 304s - checking manifests 304s - crosschecking files in changesets and manifests 304s - checking files 304s - checking dirstate (?) 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + checking changesets 304s + checking manifests 304s + crosschecking files in changesets and manifests 304s + checking files 304s + checking dirstate 304s checked 5 changesets with 5 changes to 2 files 304s $ cd test-8 304s $ hg pull ../test-7 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s pulling from ../test-7 304s searching for changes 304s adding changesets 304s adding manifests 304s adding file changes 304s + new changesets c29287bce33f:e70c8671c3d4 (?) 304s added 4 changesets with 2 changes to 3 files (+1 heads) 304s - new changesets c29287bce33f:e70c8671c3d4 (?) 304s + new changesets c29287bce33f:e70c8671c3d4 304s (run 'hg heads' to see heads, 'hg merge' to merge) 304s $ hg verify 304s - checking changesets 304s - checking manifests 304s - crosschecking files in changesets and manifests 304s - checking files 304s - checking dirstate (?) 304s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 304s + checking changesets 304s + checking manifests 304s + crosschecking files in changesets and manifests 304s + checking dirstate (?) 304s + checking files 304s + checking dirstate 304s checked 9 changesets with 7 changes to 4 files 304s 304s ERROR: test-push-r.t output changed 305s !s 305s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-invalid-refs.t 305s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-invalid-refs.t.err 305s @@ -12,115 +12,10 @@ 305s 305s $ cd .. 305s $ hg clone -U gitrepo hgrepo 305s - importing 1 git commits 305s - new changesets ff7a2f2d8d70 (1 drafts) 305s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 305s + abort: repository gitrepo not found 305s + [255] 305s 305s $ cd hgrepo 305s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 305s $ hg up master 305s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 305s - (activating bookmark master) 305s - $ fn_hg_tag alph#a 305s - $ fn_hg_tag bet*a 305s - $ fn_hg_tag 'gamm a' 305s - $ hg book -r . delt#a 305s - $ hg book -r . epsil*on 305s - 305s - $ hg gexport 305s - warning: not exporting tag 'bet*a' due to invalid name 305s - warning: not exporting bookmark 'epsil*on' due to invalid name 305s - 305s - $ hg push 305s - pushing to $TESTTMP/gitrepo 305s - warning: not exporting tag 'bet*a' due to invalid name 305s - warning: not exporting bookmark 'epsil*on' due to invalid name 305s - searching for changes 305s - adding objects 305s - remote: found 0 deltas to reuse 305s - added 3 commits with 3 trees and 3 blobs 305s - adding reference refs/heads/delt#a 305s - updating reference refs/heads/master 305s - adding reference refs/tags/alph#a 305s - adding reference refs/tags/gamm_a 305s - 305s - $ hg log --graph 305s - @ changeset: 3:0950ab44ea23 305s - | bookmark: delt#a 305s - | bookmark: epsil*on 305s - | bookmark: master 305s - | tag: default/delt#a 305s - | tag: default/master 305s - | tag: tip 305s - | user: test 305s - | date: Mon Jan 01 00:00:13 2007 +0000 305s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 305s - | 305s - o changeset: 2:0b27ab2b3df6 305s - | tag: gamm a 305s - | user: test 305s - | date: Mon Jan 01 00:00:12 2007 +0000 305s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 305s - | 305s - o changeset: 1:491ceeb1b0f1 305s - | tag: bet*a 305s - | user: test 305s - | date: Mon Jan 01 00:00:11 2007 +0000 305s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 305s - | 305s - o changeset: 0:ff7a2f2d8d70 305s - bookmark: not-master 305s - tag: alph#a 305s - tag: default/not-master 305s - user: test 305s - date: Mon Jan 01 00:00:10 2007 +0000 305s - summary: add alpha 305s - 305s - 305s - $ cd .. 305s - $ cd gitrepo 305s -git should have only the valid tag alph#a but have full commit log including the missing invalid bet*a tag commit 305s - $ git tag -l 305s - alph#a 305s - gamm_a 305s - 305s - $ cd .. 305s - $ hg clone -U gitrepo hgrepo2 305s - importing 4 git commits 305s - new changesets ff7a2f2d8d70:0950ab44ea23 (4 drafts) 305s - $ hg -R hgrepo2 log --graph 305s - o changeset: 3:0950ab44ea23 305s - | bookmark: delt#a 305s - | bookmark: master 305s - | tag: default/delt#a 305s - | tag: default/master 305s - | tag: tip 305s - | user: test 305s - | date: Mon Jan 01 00:00:13 2007 +0000 305s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 305s - | 305s - o changeset: 2:0b27ab2b3df6 305s - | tag: gamm a 305s - | tag: gamm_a 305s - | user: test 305s - | date: Mon Jan 01 00:00:12 2007 +0000 305s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 305s - | 305s - o changeset: 1:491ceeb1b0f1 305s - | tag: bet*a 305s - | user: test 305s - | date: Mon Jan 01 00:00:11 2007 +0000 305s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 305s - | 305s - o changeset: 0:ff7a2f2d8d70 305s - bookmark: not-master 305s - tag: alph#a 305s - tag: default/not-master 305s - user: test 305s - date: Mon Jan 01 00:00:10 2007 +0000 305s - summary: add alpha 305s - 305s - 305s -the tag should be in .hgtags 305s - $ hg cat -r master hgrepo2/.hgtags 305s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alph#a 305s - 491ceeb1b0f10d65d956dfcdd3470ac2bc2c96a8 bet*a 305s - 0b27ab2b3df69c6f7defd7040b93e539136db5be gamm a 305s 305s ERROR: test-invalid-refs.t output changed 306s ! 306s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-serve-hg.t 306s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-serve-hg.t#with-hggit.err 306s @@ -31,11 +31,11 @@ 306s $ cd .. 306s 306s $ hg clone gitrepo hgrepo 306s - importing 2 git commits 306s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 306s - updating to bookmark master 306s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s + abort: repository gitrepo not found 306s + [255] 306s $ cd hgrepo 306s + $TESTTMP.sh: 41: cd: can't cd to hgrepo 306s $ cat >> .hg/hgrc < [push] 306s > pushvars.server = true 306s @@ -45,81 +45,3 @@ 306s > [hooks] 306s > pretxnchangegroup = env | grep HG_USERVAR_ || true 306s > EOF 306s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 306s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 306s - 306s -Test server address cannot be reused 306s - 306s -#if windows 306s - $ hg serve -p $HGPORT1 2>&1 306s - abort: cannot start server at '*:$HGPORT1': * (glob) 306s - [255] 306s -#else 306s - $ hg serve -p $HGPORT1 2>&1 306s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 306s - [255] 306s -#endif 306s - $ cd .. 306s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 306s - 306s -Make sure that clone regular mercurial repos over http doesn't break, 306s -and that we can transfer the hg-git metadata 306s - 306s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 306s - requesting all changes 306s - adding changesets 306s - adding manifests 306s - adding file changes 306s - added 2 changesets with 4 changes to 4 files 306s - new changesets f488b65fa424:c61c38c3d614 (?) 306s - updating to branch default 306s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 306s - 306s -And it shouldn't create a Git repository needlessly: 306s - $ test -e copy/git 306s - [1] 306s - $ cd copy 306s - 306s -#if without-hggit 306s - $ hg tags 306s - tip 1:c61c38c3d614 306s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 306s - 1:c61c38c3d614 | master | | 306s - 0:f488b65fa424 | | | 306s - $ hg pull -u ../gitrepo 306s - pulling from ../gitrepo 306s - importing 2 git commits 306s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 306s -#else 306s - $ hg tags 306s - tip 1:c61c38c3d614 306s - thetag 0:f488b65fa424 306s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 306s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 306s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 306s - $ hg pull -u ../gitrepo 306s - pulling from ../gitrepo 306s - warning: created new git repository at $TESTTMP/copy/.hg/git 306s - no changes found 306s -#endif 306s - 306s - $ hg tags 306s - tip 1:c61c38c3d614 306s - thetag 0:f488b65fa424 306s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 306s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 306s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 306s - 306s -Furthermore, make sure that we pass all arguments when pushing: 306s - 306s - $ echo baz > baz 306s - $ fn_hg_commit -A -m baz 306s - $ hg push --pushvars FOO=BAR 306s - pushing to http://localhost:$HGPORT/ 306s - searching for changes 306s - remote: adding changesets 306s - remote: adding manifests 306s - remote: adding file changes 306s - remote: HG_USERVAR_FOO=BAR 306s - remote: added 1 changesets with 1 changes to 1 files 306s - $ cd .. 306s 306s ERROR: test-serve-hg.t#with-hggit output changed 306s ! 306s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-git-workflow.t 306s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-git-workflow.t.err 306s @@ -2,13 +2,20 @@ 306s $ . "$TESTDIR/testutil" 306s 306s $ hg init hgrepo 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s $ cd hgrepo 306s $ hg debuggitdir 306s - $TESTTMP/hgrepo/.hg/git 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s + hg: unknown command 'debuggitdir' 306s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 306s + [10] 306s $ echo alpha > alpha 306s $ hg add alpha 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s $ fn_hg_commit -m "add alpha" 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s $ hg log --graph --debug | grep -v phase: 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s @ changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 306s tag: tip 306s parent: -1:0000000000000000000000000000000000000000 306s @@ -27,49 +34,54 @@ 306s 306s configure for use from git 306s $ hg clone hgrepo gitrepo 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s updating to branch default 306s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 306s $ cd gitrepo 306s $ hg book master 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s $ hg up null 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 306s (leaving bookmark master) 306s $ echo "[git]" >> .hg/hgrc 306s $ echo "intree = True" >> .hg/hgrc 306s $ hg debuggitdir 306s - $TESTTMP/gitrepo/.git 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s + hg: unknown command 'debuggitdir' 306s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 306s + [10] 306s $ hg gexport 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s + hg: unknown command 'gexport' 306s + (did you mean one of export, import?) 306s + [10] 306s 306s do some work 306s $ git config core.bare false 306s + fatal: not in a git directory 306s + [128] 306s $ git checkout master 2>&1 | sed s/\'/\"/g 306s - Already on "master" 306s + fatal: not a git repository (or any of the parent directories): .git 306s $ echo beta > beta 306s $ git add beta 306s + fatal: not a git repository (or any of the parent directories): .git 306s + [128] 306s $ fn_git_commit -m 'add beta' 306s + fatal: not a git repository (or any of the parent directories): .git 306s + git commit error 306s 306s get things back to hg 306s $ hg gimport 306s - importing 1 git commits 306s - updating bookmark master 306s - new changesets 9f124f3c1fc2 (1 drafts) 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s + hg: unknown command 'gimport' 306s + (did you mean one of export, import?) 306s + [10] 306s $ hg log --graph --debug | grep -v phase: 306s - o changeset: 1:9f124f3c1fc29a14f5eb027c24811b0ac9d5ff10 306s - | bookmark: master 306s - | tag: tip 306s - | parent: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 306s - | parent: -1:0000000000000000000000000000000000000000 306s - | manifest: 1:f0bd6fbafbaebe4bb59c35108428f6fce152431d 306s - | user: test 306s - | date: Mon Jan 01 00:00:11 2007 +0000 306s - | files+: beta 306s - | extra: branch=default 306s - | extra: hg-git-rename-source=git 306s - | description: 306s - | add beta 306s - | 306s - | 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s o changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 306s + bookmark: master 306s + tag: tip 306s parent: -1:0000000000000000000000000000000000000000 306s parent: -1:0000000000000000000000000000000000000000 306s manifest: 0:8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0 306s @@ -83,7 +95,8 @@ 306s 306s gimport should have updated the bookmarks as well 306s $ hg bookmarks 306s - master 1:9f124f3c1fc2 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s + master 0:0221c246a567 306s 306s gimport support for git.mindate 306s $ cat >> .hg/hgrc << EOF 306s @@ -92,20 +105,23 @@ 306s > EOF 306s $ echo oldcommit > oldcommit 306s $ git add oldcommit 306s + fatal: not a git repository (or any of the parent directories): .git 306s + [128] 306s $ GIT_AUTHOR_DATE="2014-03-01 00:00:00 +0000" \ 306s > GIT_COMMITTER_DATE="2009-01-01 00:00:00 +0000" \ 306s > git commit -m oldcommit > /dev/null || echo "git commit error" 306s + fatal: not a git repository (or any of the parent directories): .git 306s + git commit error 306s $ hg gimport 306s - no changes found 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s + hg: unknown command 'gimport' 306s + (did you mean one of export, import?) 306s + [10] 306s $ hg log --graph 306s - o changeset: 1:9f124f3c1fc2 306s - | bookmark: master 306s - | tag: tip 306s - | user: test 306s - | date: Mon Jan 01 00:00:11 2007 +0000 306s - | summary: add beta 306s - | 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s o changeset: 0:0221c246a567 306s + bookmark: master 306s + tag: tip 306s user: test 306s date: Mon Jan 01 00:00:10 2007 +0000 306s summary: add alpha 306s @@ -113,32 +129,23 @@ 306s 306s $ echo newcommit > newcommit 306s $ git add newcommit 306s + fatal: not a git repository (or any of the parent directories): .git 306s + [128] 306s $ GIT_AUTHOR_DATE="2014-01-01 00:00:00 +0000" \ 306s > GIT_COMMITTER_DATE="2014-01-02 00:00:00 +0000" \ 306s > git commit -m newcommit > /dev/null || echo "git commit error" 306s + fatal: not a git repository (or any of the parent directories): .git 306s + git commit error 306s $ hg gimport 306s - importing 2 git commits 306s - updating bookmark master 306s - new changesets befdecd14df5:3d10b7289d79 (2 drafts) 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s + hg: unknown command 'gimport' 306s + (did you mean one of export, import?) 306s + [10] 306s $ hg log --graph 306s - o changeset: 3:3d10b7289d79 306s - | bookmark: master 306s - | tag: tip 306s - | user: test 306s - | date: Wed Jan 01 00:00:00 2014 +0000 306s - | summary: newcommit 306s - | 306s - o changeset: 2:befdecd14df5 306s - | user: test 306s - | date: Sat Mar 01 00:00:00 2014 +0000 306s - | summary: oldcommit 306s - | 306s - o changeset: 1:9f124f3c1fc2 306s - | user: test 306s - | date: Mon Jan 01 00:00:11 2007 +0000 306s - | summary: add beta 306s - | 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s o changeset: 0:0221c246a567 306s + bookmark: master 306s + tag: tip 306s user: test 306s date: Mon Jan 01 00:00:10 2007 +0000 306s summary: add alpha 306s 306s ERROR: test-git-workflow.t output changed 306s ! 306s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-serve-hg.t 306s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-serve-hg.t#without-hggit.err 306s @@ -31,11 +31,11 @@ 306s $ cd .. 306s 306s $ hg clone gitrepo hgrepo 306s - importing 2 git commits 306s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 306s - updating to bookmark master 306s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 306s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 306s + abort: repository gitrepo not found 306s + [255] 306s $ cd hgrepo 306s + $TESTTMP.sh: 36: cd: can't cd to hgrepo 306s $ cat >> .hg/hgrc < [push] 306s > pushvars.server = true 306s @@ -45,81 +45,3 @@ 306s > [hooks] 306s > pretxnchangegroup = env | grep HG_USERVAR_ || true 306s > EOF 306s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 306s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 306s - 306s -Test server address cannot be reused 306s - 306s -#if windows 306s - $ hg serve -p $HGPORT1 2>&1 306s - abort: cannot start server at '*:$HGPORT1': * (glob) 306s - [255] 306s -#else 306s - $ hg serve -p $HGPORT1 2>&1 306s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 306s - [255] 306s -#endif 306s - $ cd .. 306s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 306s - 306s -Make sure that clone regular mercurial repos over http doesn't break, 306s -and that we can transfer the hg-git metadata 306s - 306s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 306s - requesting all changes 306s - adding changesets 306s - adding manifests 306s - adding file changes 306s - added 2 changesets with 4 changes to 4 files 306s - new changesets f488b65fa424:c61c38c3d614 (?) 306s - updating to branch default 306s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 306s - 306s -And it shouldn't create a Git repository needlessly: 306s - $ test -e copy/git 306s - [1] 306s - $ cd copy 306s - 306s -#if without-hggit 306s - $ hg tags 306s - tip 1:c61c38c3d614 306s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 306s - 1:c61c38c3d614 | master | | 306s - 0:f488b65fa424 | | | 306s - $ hg pull -u ../gitrepo 306s - pulling from ../gitrepo 306s - importing 2 git commits 306s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 306s -#else 306s - $ hg tags 306s - tip 1:c61c38c3d614 306s - thetag 0:f488b65fa424 306s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 306s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 306s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 306s - $ hg pull -u ../gitrepo 306s - pulling from ../gitrepo 306s - warning: created new git repository at $TESTTMP/copy/.hg/git 306s - no changes found 306s -#endif 306s - 306s - $ hg tags 306s - tip 1:c61c38c3d614 306s - thetag 0:f488b65fa424 306s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 306s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 306s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 306s - 306s -Furthermore, make sure that we pass all arguments when pushing: 306s - 306s - $ echo baz > baz 306s - $ fn_hg_commit -A -m baz 306s - $ hg push --pushvars FOO=BAR 306s - pushing to http://localhost:$HGPORT/ 306s - searching for changes 306s - remote: adding changesets 306s - remote: adding manifests 306s - remote: adding file changes 306s - remote: HG_USERVAR_FOO=BAR 306s - remote: added 1 changesets with 1 changes to 1 files 306s - $ cd .. 306s 306s ERROR: test-serve-hg.t#without-hggit output changed 307s ! 307s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-push-authors.t 307s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-push-authors.t.err 307s @@ -8,127 +8,9 @@ 307s Create a Mercurial repository 307s 307s $ hg clone repo.git hgrepo 307s - updating to branch default 307s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 307s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 307s + abort: repository repo.git not found 307s + [255] 307s $ cd hgrepo 307s + $TESTTMP.sh: 8: cd: can't cd to hgrepo 307s $ hg book master 307s - 307s -Configure an author map 307s - 307s - $ touch authors.txt 307s - $ cat >> $HGRCPATH < [git] 307s - > authors = $TESTTMP/authors.txt 307s - > EOF 307s - 307s -Create a commit user that maps to a fully valid user 307s - 307s - $ cat >> $TESTTMP/authors.txt < user1 = User no. 1 307s - > EOF 307s - $ touch alpha 307s - $ hg add alpha 307s - $ fn_hg_commit -m alpha -u user1 307s - 307s -And one that maps to an email address 307s - 307s - $ cat >> $TESTTMP/authors.txt < user2@example.com = user2 307s - > EOF 307s - $ touch beta 307s - $ hg add beta 307s - $ fn_hg_commit -m beta -u user2@example.com 307s - 307s -And one that maps to a "simple" user 307s - 307s - $ cat >> $TESTTMP/authors.txt < User #3 = user3@example.com 307s - > EOF 307s - $ touch gamma 307s - $ hg add gamma 307s - $ fn_hg_commit -m gamma -u "User #3 " 307s - 307s -And one that maps to nothing 307s - 307s - $ cat >> $TESTTMP/authors.txt < user4 = 307s - > EOF 307s - $ touch delta 307s - $ hg add delta 307s - $ fn_hg_commit -m delta -u user4 307s - 307s -And one that doesn't map 307s - 307s - $ touch epsilon 307s - $ hg add epsilon 307s - $ fn_hg_commit -m epsilon -u "User #5 " 307s - 307s -Check the test default 307s - 307s - $ touch zeta 307s - $ hg add zeta 307s - $ fn_hg_commit -m zeta 307s - 307s -Push it! 307s - 307s - $ hg push 307s - pushing to $TESTTMP/repo.git 307s - searching for changes 307s - adding objects 307s - remote: found 0 deltas to reuse 307s - added 6 commits with 6 trees and 1 blobs 307s - adding reference refs/heads/master 307s - 307s -Check the results: 307s - 307s - $ hg log --template='Commit: {gitnode}\nAuthor: {author}\n---\n' 307s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 307s - Author: test 307s - --- 307s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 307s - Author: User #5 307s - --- 307s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 307s - Author: user4 307s - --- 307s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 307s - Author: User #3 307s - --- 307s - Commit: eba936dd13172a2f17936785e3604845aed9170d 307s - Author: user2@example.com 307s - --- 307s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 307s - Author: user1 307s - --- 307s - $ cd ../repo.git 307s - $ cat $TESTTMP/authors.txt 307s - user1 = User no. 1 307s - user2@example.com = user2 307s - User #3 = user3@example.com 307s - user4 = 307s - $ git log --pretty='tformat:Commit: %H%nAuthor: %an <%ae>%nCommitter: %cn <%ce>%n---' 307s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 307s - Author: test 307s - Committer: test 307s - --- 307s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 307s - Author: User #5 307s - Committer: User #5 307s - --- 307s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 307s - Author: 307s - Committer: 307s - --- 307s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 307s - Author: user3@example.com 307s - Committer: user3@example.com 307s - --- 307s - Commit: eba936dd13172a2f17936785e3604845aed9170d 307s - Author: user2 307s - Committer: user2 307s - --- 307s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 307s - Author: User no. 1 307s - Committer: User no. 1 307s - --- 307s - $ cd .. 307s 307s ERROR: test-push-authors.t output changed 307s ! 307s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-push-to-head.t 307s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-push-to-head.t.err 307s @@ -14,65 +14,9 @@ 307s Clone it, and push back to master: 307s 307s $ hg clone gitrepo hgrepo 307s - importing 1 git commits 307s - new changesets ff7a2f2d8d70 (1 drafts) 307s - updating to bookmark master 307s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 307s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 307s + abort: repository gitrepo not found 307s + [255] 307s $ cd hgrepo 307s + $TESTTMP.sh: 18: cd: can't cd to hgrepo 307s $ echo beta > beta 307s - $ fn_hg_commit -A -m "add beta" 307s - 307s -The output is confusing, and this even more-so: 307s - 307s - $ hg push 307s - pushing to $TESTTMP/gitrepo 307s - searching for changes 307s - adding objects 307s - remote: found 0 deltas to reuse 307s - remote: error: refusing to update checked out branch: refs/heads/master 307s - remote: error: By default, updating the current branch in a non-bare repository 307s - remote: is denied, because it will make the index and work tree inconsistent 307s - remote: with what you pushed, and will require 'git reset --hard' to match 307s - remote: the work tree to HEAD. 307s - remote: 307s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 307s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 307s - remote: its current branch; however, this is not recommended unless you 307s - remote: arranged to update its work tree to match what you pushed in some 307s - remote: other way. 307s - remote: 307s - remote: To squelch this message and still keep the default behaviour, set 307s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 307s - added 1 commits with 1 trees and 1 blobs 307s - warning: failed to update refs/heads/master; branch is currently checked out 307s - 307s - $ hg push 307s - pushing to $TESTTMP/gitrepo 307s - searching for changes 307s - adding objects 307s - remote: found 0 deltas to reuse 307s - remote: error: refusing to update checked out branch: refs/heads/master 307s - remote: error: By default, updating the current branch in a non-bare repository 307s - remote: is denied, because it will make the index and work tree inconsistent 307s - remote: with what you pushed, and will require 'git reset --hard' to match 307s - remote: the work tree to HEAD. 307s - remote: 307s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 307s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 307s - remote: its current branch; however, this is not recommended unless you 307s - remote: arranged to update its work tree to match what you pushed in some 307s - remote: other way. 307s - remote: 307s - remote: To squelch this message and still keep the default behaviour, set 307s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 307s - added 1 commits with 1 trees and 1 blobs 307s - warning: failed to update refs/heads/master; branch is currently checked out 307s - 307s -Show that it really didn't get pushed: 307s - 307s - $ hg tags 307s - tip 1:47580592d3d6 307s - default/master 0:ff7a2f2d8d70 307s - $ cd ../gitrepo 307s - $ git log --all --oneline --decorate 307s - 7eeab2e (HEAD -> master) add alpha 307s 307s ERROR: test-push-to-head.t output changed 308s ! 308s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-orphan-tags.t 308s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-orphan-tags.t.err 308s @@ -61,17 +61,17 @@ 308s Create a Mercurial clone 308s 308s $ hg clone -U repo.git hgrepo 308s - importing 4 git commits 308s - new changesets b8e77484829b:387d03400596 (4 drafts) 308s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 308s + abort: repository repo.git not found 308s + [255] 308s $ hg outgoing -R hgrepo 308s - comparing with $TESTTMP/repo.git 308s - searching for changes 308s - no changes found 308s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 308s + abort: repository hgrepo not found 308s + [255] 308s + $ hg push --debug -R hgrepo | grep -e reference -e found 308s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 308s + abort: repository hgrepo not found 308s [1] 308s - $ hg push --debug -R hgrepo | grep -e reference -e found 308s - unchanged reference default::refs/heads/master => GIT:996e5084 308s - unchanged reference default::refs/tags/the_tag => GIT:e4338156 308s - no changes found 308s 308s Verify that we can push this tag, and that outgoing doesn't report 308s them (#358) 308s @@ -83,33 +83,5 @@ 308s To $TESTTMP/repo.git 308s - [deleted] the_tag 308s $ cd ../hgrepo 308s + $TESTTMP.sh: 72: cd: can't cd to ../hgrepo 308s $ hg outgoing 308s - comparing with $TESTTMP/repo.git 308s - searching for changes 308s - changeset: 2:7b35eb0afb3f 308s - tag: the_tag 308s - user: test 308s - date: Mon Jan 01 00:00:12 2007 +0000 308s - summary: add foo3 308s - 308s - $ hg push --debug 308s - pushing to $TESTTMP/repo.git 308s - finding unexported changesets 308s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 308s - searching for changes 308s - remote: counting objects: 5, done. 308s - 1 commits found 308s - list of commits: 308s - e12852326ef72772e9696b008ad6546b5266ff13 308s - adding objects 308s - remote: counting objects: 5, done. 308s - remote: found 0 deltas to reuse 308s - added 1 commits with 1 trees and 0 blobs 308s - unchanged reference default::refs/heads/master => GIT:996e5084 308s - adding reference default::refs/tags/the_tag => GIT:e4338156 308s - $ cd ../gitrepo 308s - $ git fetch 308s - From $TESTTMP/repo 308s - * [new tag] the_tag -> the_tag 308s - $ git tag -ln 308s - the_tag Tag message 308s 308s ERROR: test-orphan-tags.t output changed 310s ! 310s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-verify-fail.t 310s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-verify-fail.t.err 310s @@ -25,6 +25,7 @@ 310s $ cd .. 310s 310s $ hg init hgrepo 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s $ cd hgrepo 310s $ echo normalf > normalf 310s $ echo differentf2 > differentf 310s @@ -32,63 +33,93 @@ 310s $ echo exef > exef 310s $ ln -s foo linkf 310s $ hg add normalf differentf unexpectedf exef linkf 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s $ fn_hg_commit -m 'add files' 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s $ git clone --mirror ../gitrepo .hg/git 310s Cloning into bare repository '.hg/git'... 310s done. 310s $ echo "$(cd ../gitrepo && git rev-parse HEAD) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s $ hg gverify 310s - verifying rev 3f1601c3cf54 against git commit 039c1cd9fdda382c9d1e8ec85de6b5b59518ca80 310s - difference in: differentf 310s - file has different flags: exef (hg '', git 'x') 310s - file has different flags: linkf (hg 'l', git '') 310s - file found in git but not hg: missingf 310s - file found in hg but not git: unexpectedf 310s - [1] 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s + hg: unknown command 'gverify' 310s + (did you mean verify?) 310s + [10] 310s 310s $ echo newf > newf 310s $ hg add newf 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s $ fn_hg_commit -m 'new hg commit' 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s $ hg gverify 310s - abort: no git commit found for rev 4e582b4eb862 310s - (if this is an octopus merge, verify against the last rev) 310s - [255] 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s + hg: unknown command 'gverify' 310s + (did you mean verify?) 310s + [10] 310s 310s invalid git SHA 310s $ echo "ffffffffffffffffffffffffffffffffffffffff $(hg log -r . --template '{node}')" >> .hg/git-mapfile 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s $ hg gverify 310s - abort: git equivalent ffffffffffffffffffffffffffffffffffffffff for rev 4e582b4eb862 not found! 310s - [255] 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s + hg: unknown command 'gverify' 310s + (did you mean verify?) 310s + [10] 310s 310s git SHA is not a commit 310s $ echo new2 >> newf 310s $ fn_hg_commit -m 'new hg commit 2' 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s this gets the tree pointed to by the commit at HEAD 310s $ echo "$(cd ../gitrepo && git show --format=%T HEAD | head -n 1) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s $ hg gverify 310s - abort: git equivalent f477b00e4a9907617f346a529cc0fe9ba5d6f6d3 for rev 5c2eb98af3e2 is not a commit! 310s - [255] 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s + hg: unknown command 'gverify' 310s + (did you mean verify?) 310s + [10] 310s 310s corrupt git repository 310s 310s $ hg debug-remove-hggit-state 310s - clearing out the git cache data 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s + hg: unknown command 'debug-remove-hggit-state' 310s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 310s + [10] 310s $ hg gexport 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s + hg: unknown command 'gexport' 310s + (did you mean one of export, import?) 310s + [10] 310s $ mv .hg/git/objects/pack $TESTTMP/pack-old 310s $ for packfile in $TESTTMP/pack-old/*.pack 310s > do 310s > git --git-dir .hg/git unpack-objects < $packfile 310s > done 310s + $TESTTMP.sh: 78: cannot open $TESTTMP/pack-old/*.pack: No such file 310s + [2] 310s $ mv -f .hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 310s + mv: cannot stat '.hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e': No such file or directory 310s + [1] 310s $ hg gverify --fsck 310s - abort: git repository is corrupt! 310s - [255] 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s + hg: unknown command 'gverify' 310s + (did you mean verify?) 310s + [10] 310s $ hg gverify 310s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is not a commit! 310s - [255] 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s + hg: unknown command 'gverify' 310s + (did you mean verify?) 310s + [10] 310s $ chmod +w .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 310s + chmod: cannot access '.hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74': No such file or directory 310s + [1] 310s $ echo 42 > .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 310s + $TESTTMP.sh: 89: cannot create .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74: Directory nonexistent 310s + [2] 310s $ hg gverify 310s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is corrupt! 310s - (re-run with --traceback for details) 310s - [255] 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s + hg: unknown command 'gverify' 310s + (did you mean verify?) 310s + [10] 310s 310s ERROR: test-verify-fail.t output changed 310s ! 310s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-push-missing-commit.t 310s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-push-missing-commit.t.err 310s @@ -22,75 +22,9 @@ 310s clone it and create a commit building on the git history 310s 310s $ hg clone -U repo.git hgrepo 310s - importing 1 git commits 310s - new changesets fb68c5a534ce (1 drafts) 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s + abort: repository repo.git not found 310s + [255] 310s $ cd hgrepo 310s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 310s $ hg up -q master 310s - $ echo other > thefile 310s - $ fn_hg_commit -m 'change thefile' 310s - $ cd .. 310s - 310s -now remove the git commit from the cache repository used internally by 310s -hg-git — actually, changing `git.intree` is equivalent to this, and how 310s -a user noticed it in #376. 310s - 310s - $ rm -rf hgrepo/.hg/git 310s - 310s -what happens when we push it? 310s - 310s - $ hg -R hgrepo push 310s - pushing to $TESTTMP/repo.git 310s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 310s - abort: cannot push git commit 533d4e670a8b as it is not present locally 310s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 310s - [255] 310s - 310s -try to follow the hint: 310s - 310s -(and just to see that the warning is useful, try re-resetting first) 310s - 310s - $ rm -rf hgrepo/.hg/git hgrepo/.git 310s - $ hg -R hgrepo pull 310s - pulling from $TESTTMP/repo.git 310s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 310s - no changes found 310s - not updating diverged bookmark master 310s - $ hg -R hgrepo push 310s - pushing to $TESTTMP/repo.git 310s - searching for changes 310s - adding objects 310s - remote: found 0 deltas to reuse 310s - added 1 commits with 1 trees and 1 blobs 310s - updating reference refs/heads/master 310s - 310s -and as an extra test, what if we want to push a commit that's 310s -converted, but gone? 310s - 310s -simply pushing doesn't suffice: 310s - 310s - $ cd hgrepo 310s - $ rm -rf .hg/git 310s - $ hg push 310s - pushing to $TESTTMP/repo.git 310s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 310s - searching for changes 310s - no changes found 310s - [1] 310s - $ cd .. 310s - 310s -but we can't create another commit building on the git history, export 310s -it, and push: 310s - 310s - $ cd hgrepo 310s - $ echo not that > thefile 310s - $ fn_hg_commit -m 'change thefile again' 310s - $ hg gexport 310s - $ rm -rf .hg/git 310s - $ hg push 310s - pushing to $TESTTMP/repo.git 310s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 310s - searching for changes 310s - abort: cannot push git commit 61619410916a as it is not present locally 310s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 310s - [255] 310s - $ cd .. 310s 310s ERROR: test-push-missing-commit.t output changed 310s ! 310s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-hg-branch.t 310s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-hg-branch.t.err 310s @@ -12,82 +12,10 @@ 310s 310s $ cd .. 310s $ hg clone gitrepo hgrepo 310s - importing 1 git commits 310s - new changesets ff7a2f2d8d70 (1 drafts) 310s - updating to bookmark not-master 310s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 310s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 310s + abort: repository gitrepo not found 310s + [255] 310s 310s $ cd hgrepo 310s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 310s $ hg co master 310s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 310s - (activating bookmark master) 310s - $ hg mv alpha beta 310s - $ fn_hg_commit -m 'rename alpha to beta' 310s - $ hg push 310s - pushing to $TESTTMP/gitrepo 310s - searching for changes 310s - adding objects 310s - remote: found 0 deltas to reuse 310s - added 1 commits with 1 trees and 0 blobs 310s - updating reference refs/heads/master 310s - 310s - $ hg branch gamma | grep -v 'permanent and global' 310s - marked working directory as branch gamma 310s - $ fn_hg_commit -m 'started branch gamma' 310s - $ hg push 310s - pushing to $TESTTMP/gitrepo 310s - searching for changes 310s - adding objects 310s - remote: found 0 deltas to reuse 310s - added 1 commits with 1 trees and 0 blobs 310s - updating reference refs/heads/master 310s - 310s - $ hg log --graph 310s - @ changeset: 2:400db38f4f64 310s - | branch: gamma 310s - | bookmark: master 310s - | tag: default/master 310s - | tag: tip 310s - | user: test 310s - | date: Mon Jan 01 00:00:12 2007 +0000 310s - | summary: started branch gamma 310s - | 310s - o changeset: 1:3baa67317a4d 310s - | user: test 310s - | date: Mon Jan 01 00:00:11 2007 +0000 310s - | summary: rename alpha to beta 310s - | 310s - o changeset: 0:ff7a2f2d8d70 310s - bookmark: not-master 310s - tag: default/not-master 310s - user: test 310s - date: Mon Jan 01 00:00:10 2007 +0000 310s - summary: add alpha 310s - 310s - 310s - $ cd .. 310s - $ hg clone -U gitrepo hgrepo2 310s - importing 3 git commits 310s - new changesets ff7a2f2d8d70:400db38f4f64 (3 drafts) 310s - $ hg -R hgrepo2 log --graph 310s - o changeset: 2:400db38f4f64 310s - | branch: gamma 310s - | bookmark: master 310s - | tag: default/master 310s - | tag: tip 310s - | user: test 310s - | date: Mon Jan 01 00:00:12 2007 +0000 310s - | summary: started branch gamma 310s - | 310s - o changeset: 1:3baa67317a4d 310s - | user: test 310s - | date: Mon Jan 01 00:00:11 2007 +0000 310s - | summary: rename alpha to beta 310s - | 310s - o changeset: 0:ff7a2f2d8d70 310s - bookmark: not-master 310s - tag: default/not-master 310s - user: test 310s - date: Mon Jan 01 00:00:10 2007 +0000 310s - summary: add alpha 310s - 310s 310s ERROR: test-hg-branch.t output changed 311s ! 311s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-pull-after-strip.t 311s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-pull-after-strip.t.err 311s @@ -15,82 +15,9 @@ 311s 311s $ cd .. 311s $ hg clone -U gitrepo hgrepo 311s - importing 2 git commits 311s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s + abort: repository gitrepo not found 311s + [255] 311s $ cd hgrepo 311s + $TESTTMP.sh: 26: cd: can't cd to hgrepo 311s $ hg up master 311s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 311s - (activating bookmark master) 311s - $ hg log --graph 311s - @ changeset: 1:7fe02317c63d 311s - | bookmark: master 311s - | tag: default/master 311s - | tag: thetag 311s - | tag: tip 311s - | user: test 311s - | date: Mon Jan 01 00:00:11 2007 +0000 311s - | summary: add beta 311s - | 311s - o changeset: 0:ff7a2f2d8d70 311s - user: test 311s - date: Mon Jan 01 00:00:10 2007 +0000 311s - summary: add alpha 311s - 311s - $ cd ../gitrepo 311s - $ echo beta line 2 >> beta 311s - $ git add beta 311s - $ fn_git_commit -m 'add to beta' 311s - 311s - $ cd .. 311s - $ cd hgrepo 311s - $ hg debugstrip --no-backup tip 311s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 311s - $ hg pull 311s - pulling from $TESTTMP/gitrepo 311s - importing 1 git commits 311s - abort: you appear to have run strip - please run hg git-cleanup 311s - [255] 311s - $ hg tags 311s - tip 0:ff7a2f2d8d70 311s - $ hg git-cleanup 311s - git commit map cleaned 311s - 311s -pull works after 'hg git-cleanup' 311s - 311s - $ hg pull 311s - pulling from $TESTTMP/gitrepo 311s - importing 2 git commits 311s - updating bookmark master 311s - new changesets 7fe02317c63d:cc1e605d90db (2 drafts) 311s - (run 'hg update' to get a working copy) 311s - $ hg log --graph 311s - o changeset: 2:cc1e605d90db 311s - | bookmark: master 311s - | tag: default/master 311s - | tag: tip 311s - | user: test 311s - | date: Mon Jan 01 00:00:12 2007 +0000 311s - | summary: add to beta 311s - | 311s - o changeset: 1:7fe02317c63d 311s - | tag: thetag 311s - | user: test 311s - | date: Mon Jan 01 00:00:11 2007 +0000 311s - | summary: add beta 311s - | 311s - @ changeset: 0:ff7a2f2d8d70 311s - user: test 311s - date: Mon Jan 01 00:00:10 2007 +0000 311s - summary: add alpha 311s - 311s - 311s - $ cd .. 311s - 311s -Check that we also remove bad refs: 311s - 311s - $ cd hgrepo 311s - $ echo e93b671cb24bff41779187edff99178e2597c2 > .hg/git/refs/tags/bad-tag 311s - $ hg git-cleanup 311s - git commit map cleaned 311s - $ test -e .hg/git/refs/tags/bad-tag 311s - [1] 311s 311s ERROR: test-pull-after-strip.t output changed 311s ! 311s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-subrepos-syntax.t 311s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-subrepos-syntax.t.err 311s @@ -38,54 +38,9 @@ 311s $ cd .. 311s 311s $ hg clone -U repo.git hgrepo 311s - importing 3 git commits 311s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s + abort: repository repo.git not found 311s + [255] 311s $ cd hgrepo 311s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 311s $ hg up master 311s - Cloning into '$TESTTMP/hgrepo/subrepo1'... 311s - done. 311s - Cloning into '$TESTTMP/hgrepo/xyz/subrepo2'... 311s - done. 311s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 311s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 311s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 311s - (activating bookmark master) 311s - $ cat >> .hgsub < # this is a comment 311s - > [subpaths] 311s - > flaf = blyf 311s - > EOF 311s - $ fn_hg_commit -m 'add comment & subsection' 311s - $ hg push 311s - pushing to $TESTTMP/repo.git 311s - searching for changes 311s - adding objects 311s - remote: found 0 deltas to reuse 311s - added 1 commits with 1 trees and 0 blobs 311s - updating reference refs/heads/master 311s - $ cd .. 311s - 311s - $ cd gitrepo 311s - $ git pull --ff-only 311s - From $TESTTMP/repo 311s - 89c22d7..106b34e master -> origin/master 311s - Updating 89c22d7..106b34e 311s - Fast-forward 311s - $ cat .gitmodules 311s - [submodule "subrepo1"] 311s - path = subrepo1 311s - url = ../gitsubrepo 311s - [submodule "xyz/subrepo2"] 311s - path = xyz/subrepo2 311s - url = ../gitsubrepo 311s - $ cd .. 311s - 311s -We broke bidirectionality: 311s - 311s - $ hg clone -U repo.git hgrepo2 311s - importing 4 git commits 311s - new changesets e532b2bfda10:cbf584fe001b (4 drafts) 311s - $ hg id -r tip hgrepo 311s - c58a542b18bc default/master/tip master 311s - $ hg id -r tip hgrepo2 311s - cbf584fe001b default/master/tip master 311s 311s ERROR: test-subrepos-syntax.t output changed 311s ! 311s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-gitignore.t 311s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-gitignore.t.err 311s @@ -2,12 +2,14 @@ 311s $ . "$TESTDIR/testutil" 311s 311s $ hg init repo 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s $ cd repo 311s 311s Create a commit that we can export later on 311s 311s $ touch thefile 311s $ hg commit -A -m "initial commit" 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s adding thefile 311s 311s We should only read .gitignore files in a hg-git repo (i.e. one with .hg/git 311s @@ -18,6 +20,7 @@ 311s $ touch bar 311s $ echo 'foo*' > .gitignore 311s $ hg status 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s ? .gitignore 311s ? bar 311s ? foo 311s @@ -27,103 +30,140 @@ 311s it's gone: 311s 311s $ hg gexport 311s - $ hg status 311s - ? .gitignore 311s - ? bar 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s + hg: unknown command 'gexport' 311s + (did you mean one of export, import?) 311s + [10] 311s + $ hg status 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s + ? .gitignore 311s + ? bar 311s + ? foo 311s + ? foobar 311s 311s $ echo '*bar' > .gitignore 311s $ hg status 311s - ? .gitignore 311s - ? foo 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s + ? .gitignore 311s + ? bar 311s + ? foo 311s + ? foobar 311s 311s $ mkdir dir 311s $ touch dir/foo 311s $ echo 'foo' > .gitignore 311s $ hg status 311s - ? .gitignore 311s - ? bar 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s + ? .gitignore 311s + ? bar 311s + ? dir/foo 311s + ? foo 311s ? foobar 311s 311s $ echo '/foo' > .gitignore 311s $ hg status 311s - ? .gitignore 311s - ? bar 311s - ? dir/foo 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s + ? .gitignore 311s + ? bar 311s + ? dir/foo 311s + ? foo 311s ? foobar 311s 311s $ rm .gitignore 311s $ echo 'foo' > dir/.gitignore 311s $ hg status 311s - ? bar 311s - ? dir/.gitignore 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s + ? bar 311s + ? dir/.gitignore 311s + ? dir/foo 311s ? foo 311s ? foobar 311s 311s $ touch dir/bar 311s $ echo 'bar' > .gitignore 311s $ hg status 311s - ? .gitignore 311s - ? dir/.gitignore 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s + ? .gitignore 311s + ? bar 311s + ? dir/.gitignore 311s + ? dir/bar 311s + ? dir/foo 311s ? foo 311s ? foobar 311s 311s $ echo '/bar' > .gitignore 311s $ hg status 311s - ? .gitignore 311s - ? dir/.gitignore 311s - ? dir/bar 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s + ? .gitignore 311s + ? bar 311s + ? dir/.gitignore 311s + ? dir/bar 311s + ? dir/foo 311s ? foo 311s ? foobar 311s 311s $ echo 'foo*' > .gitignore 311s $ echo '!*bar' >> .gitignore 311s $ hg status 311s - .gitignore: unsupported ignore pattern '!*bar' 311s - ? .gitignore 311s - ? bar 311s - ? dir/.gitignore 311s - ? dir/bar 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s + ? .gitignore 311s + ? bar 311s + ? dir/.gitignore 311s + ? dir/bar 311s + ? dir/foo 311s + ? foo 311s + ? foobar 311s 311s $ echo '.hg/' > .gitignore 311s $ hg status 311s - ? .gitignore 311s - ? bar 311s - ? dir/.gitignore 311s - ? dir/bar 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s + ? .gitignore 311s + ? bar 311s + ? dir/.gitignore 311s + ? dir/bar 311s + ? dir/foo 311s ? foo 311s ? foobar 311s 311s $ echo 'dir/.hg/' > .gitignore 311s $ hg status 311s - ? .gitignore 311s - ? bar 311s - ? dir/.gitignore 311s - ? dir/bar 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s + ? .gitignore 311s + ? bar 311s + ? dir/.gitignore 311s + ? dir/bar 311s + ? dir/foo 311s ? foo 311s ? foobar 311s 311s $ echo '.hg/foo' > .gitignore 311s $ hg status 311s - ? .gitignore 311s - ? bar 311s - ? dir/.gitignore 311s - ? dir/bar 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s + ? .gitignore 311s + ? bar 311s + ? dir/.gitignore 311s + ? dir/bar 311s + ? dir/foo 311s ? foo 311s ? foobar 311s 311s $ touch foo.hg 311s $ echo 'foo.hg' > .gitignore 311s $ hg status 311s - ? .gitignore 311s - ? bar 311s - ? dir/.gitignore 311s - ? dir/bar 311s - ? foo 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s + ? .gitignore 311s + ? bar 311s + ? dir/.gitignore 311s + ? dir/bar 311s + ? dir/foo 311s + ? foo 311s + ? foo.hg 311s ? foobar 311s $ rm foo.hg 311s 311s $ touch .hgignore 311s $ hg status 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s ? .gitignore 311s ? .hgignore 311s ? bar 311s @@ -137,6 +177,7 @@ 311s $ echo 'foo.*$(?> .hgignore 311s $ echo 'dir/foo' >> .hgignore 311s $ hg status 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s ? .gitignore 311s ? .hgignore 311s ? bar 311s @@ -145,14 +186,18 @@ 311s ? foobar 311s 311s $ hg add .gitignore 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s $ hg commit -m "add and commit .gitignore" 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s $ rm .gitignore 311s $ rm .hgignore 311s $ hg status 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s ! .gitignore 311s ? bar 311s ? dir/.gitignore 311s ? dir/bar 311s + ? dir/foo 311s ? foo 311s ? foobar 311s 311s @@ -164,6 +209,7 @@ 311s > foo( 311s > EOF 311s $ hg status --config ui.ignore=$TESTTMP/invalidhgignore 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s abort: $TESTTMP/invalidhgignore: invalid pattern (relre): foo( 311s [255] 311s 311s @@ -172,5 +218,6 @@ 311s > foo( 311s > EOF 311s $ hg status 311s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 311s abort: $TESTTMP/repo/.hgignore: invalid pattern (relre): foo( 311s [255] 311s 311s ERROR: test-gitignore.t output changed 312s ! 312s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-merge.t 312s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-merge.t.err 312s @@ -30,60 +30,11 @@ 312s $ git init -q --bare repo.git 312s 312s $ hg clone gitrepo hgrepo 312s - importing 4 git commits 312s - new changesets ff7a2f2d8d70:89ca4a68d6b9 (4 drafts) 312s - updating to bookmark master 312s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 312s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 312s + abort: repository gitrepo not found 312s + [255] 312s $ cd hgrepo 312s + $TESTTMP.sh: 40: cd: can't cd to hgrepo 312s 312s clear the cache to be sure it is regenerated correctly 312s $ hg debug-remove-hggit-state 312s - clearing out the git cache data 312s - $ hg push ../repo.git 312s - pushing to ../repo.git 312s - searching for changes 312s - adding objects 312s - remote: found 0 deltas to reuse 312s - added 4 commits with 4 trees and 3 blobs 312s - adding reference refs/heads/beta 312s - adding reference refs/heads/master 312s - 312s - $ cd .. 312s -git log in repo pushed from hg 312s - $ git --git-dir=repo.git log --pretty=medium master | sed 's/\.\.\.//g' 312s - commit 5806851511aaf3bfe813ae3a86c5027165fa9b96 312s - Merge: e5023f9 9497a4e 312s - Author: test 312s - Date: Mon Jan 1 00:00:12 2007 +0000 312s - 312s - Merge branch 'beta' 312s - 312s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 312s - Author: test 312s - Date: Mon Jan 1 00:00:12 2007 +0000 312s - 312s - add gamma 312s - 312s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 312s - Author: test 312s - Date: Mon Jan 1 00:00:11 2007 +0000 312s - 312s - add beta 312s - 312s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 312s - Author: test 312s - Date: Mon Jan 1 00:00:10 2007 +0000 312s - 312s - add alpha 312s - $ git --git-dir=repo.git log --pretty=medium beta | sed 's/\.\.\.//g' 312s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 312s - Author: test 312s - Date: Mon Jan 1 00:00:11 2007 +0000 312s - 312s - add beta 312s - 312s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 312s - Author: test 312s - Date: Mon Jan 1 00:00:10 2007 +0000 312s - 312s - add alpha 312s 312s ERROR: test-merge.t output changed 312s ! 312s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-hg-tags.t 312s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-hg-tags.t.err 312s @@ -16,69 +16,10 @@ 312s 312s $ cd .. 312s $ hg clone -U repo.git hgrepo 312s - importing 1 git commits 312s - new changesets ff7a2f2d8d70 (1 drafts) 312s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 312s + abort: repository repo.git not found 312s + [255] 312s 312s $ cd hgrepo 312s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 312s $ hg co master 312s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 312s - (activating bookmark master) 312s - $ fn_hg_tag alpha 312s - $ hg push 312s - pushing to $TESTTMP/repo.git 312s - searching for changes 312s - adding objects 312s - remote: found 0 deltas to reuse 312s - added 1 commits with 1 trees and 1 blobs 312s - updating reference refs/heads/master 312s - adding reference refs/tags/alpha 312s - 312s - $ hg log --graph 312s - @ changeset: 1:e8b150f84560 312s - | bookmark: master 312s - | tag: default/master 312s - | tag: tip 312s - | user: test 312s - | date: Mon Jan 01 00:00:11 2007 +0000 312s - | summary: Added tag alpha for changeset ff7a2f2d8d70 312s - | 312s - o changeset: 0:ff7a2f2d8d70 312s - tag: alpha 312s - user: test 312s - date: Mon Jan 01 00:00:10 2007 +0000 312s - summary: add alpha 312s - 312s - 312s - $ cd .. 312s - $ cd gitrepo 312s -git should have the tag alpha 312s - $ git fetch origin 312s - From $TESTTMP/repo 312s - 7eeab2e..bbae830 master -> origin/master 312s - * [new tag] alpha -> alpha 312s - $ cd .. 312s - 312s - $ hg clone repo.git hgrepo2 312s - importing 2 git commits 312s - new changesets ff7a2f2d8d70:e8b150f84560 (2 drafts) 312s - updating to bookmark master 312s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 312s - $ hg -R hgrepo2 log --graph 312s - @ changeset: 1:e8b150f84560 312s - | bookmark: master 312s - | tag: default/master 312s - | tag: tip 312s - | user: test 312s - | date: Mon Jan 01 00:00:11 2007 +0000 312s - | summary: Added tag alpha for changeset ff7a2f2d8d70 312s - | 312s - o changeset: 0:ff7a2f2d8d70 312s - tag: alpha 312s - user: test 312s - date: Mon Jan 01 00:00:10 2007 +0000 312s - summary: add alpha 312s - 312s - 312s -the tag should be in .hgtags 312s - $ cat hgrepo2/.hgtags 312s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alpha 312s 312s ERROR: test-hg-tags.t output changed 312s ! 312s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-multiple-remotes.t 312s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-multiple-remotes.t.err 312s @@ -14,6 +14,7 @@ 312s $ git clone --bare --quiet gitrepo repo.git 312s 312s $ hg init hgrepo 312s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 312s $ cd hgrepo 312s $ cat > .hg/hgrc < [paths] 312s @@ -26,52 +27,28 @@ 312s > EOF 312s 312s $ hg pull 312s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 312s pulling from $TESTTMP/gitrepo 312s - importing 1 git commits 312s - adding bookmark master 312s - adding bookmark not-master 312s - new changesets ff7a2f2d8d70 (1 drafts) 312s - (run 'hg update' to get a working copy) 312s - pulling from $TESTTMP/repo.git 312s - no changes found 312s + abort: repository $TESTTMP/gitrepo not found 312s + [255] 312s $ hg tags 312s - tip 0:ff7a2f2d8d70 312s - git/not-master 0:ff7a2f2d8d70 312s - git/master 0:ff7a2f2d8d70 312s - bare/not-master 0:ff7a2f2d8d70 312s - bare/master 0:ff7a2f2d8d70 312s - also-git/not-master 0:ff7a2f2d8d70 312s - also-git/master 0:ff7a2f2d8d70 312s - also-bare/not-master 0:ff7a2f2d8d70 312s - also-bare/master 0:ff7a2f2d8d70 312s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 312s + tip -1:000000000000 312s 312s $ hg up master 312s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 312s - (activating bookmark master) 312s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 312s + abort: unknown revision 'master' 312s + [10] 312s $ echo beta > beta 312s $ fn_hg_commit -A -m "add beta" 312s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 312s $ hg push 312s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 312s pushing to $TESTTMP/gitrepo 312s - searching for changes 312s - adding objects 312s - remote: found 0 deltas to reuse 312s - added 1 commits with 1 trees and 1 blobs 312s - updating reference refs/heads/master 312s - pushing to $TESTTMP/repo.git 312s - searching for changes 312s - adding objects 312s - remote: found 0 deltas to reuse 312s - added 1 commits with 1 trees and 1 blobs 312s - updating reference refs/heads/master 312s + abort: repository $TESTTMP/gitrepo not found 312s + [255] 312s 312s $ hg tags 312s - tip 1:47580592d3d6 312s - git/master 1:47580592d3d6 312s - bare/master 1:47580592d3d6 312s - also-git/master 1:47580592d3d6 312s - also-bare/master 1:47580592d3d6 312s - git/not-master 0:ff7a2f2d8d70 312s - bare/not-master 0:ff7a2f2d8d70 312s - also-git/not-master 0:ff7a2f2d8d70 312s - also-bare/not-master 0:ff7a2f2d8d70 312s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 312s + tip 0:59e1f63242de 312s 312s 312s ERROR: test-multiple-remotes.t output changed 313s ! 313s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-hg-clone.t 313s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-hg-clone.t.err 313s @@ -11,88 +11,17 @@ 313s $ cd .. 313s 313s $ hg clone -U gitrepo hgrepo 313s - importing 1 git commits 313s - new changesets ff7a2f2d8d70 (1 drafts) 313s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 313s + abort: repository gitrepo not found 313s + [255] 313s 313s By default, the Git state isn't preserved across a copying/linking 313s clone 313s 313s $ hg clone -U hgrepo otherhgrepo 313s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 313s + abort: repository hgrepo not found 313s + [255] 313s $ cd otherhgrepo 313s + $TESTTMP.sh: 22: cd: can't cd to otherhgrepo 313s $ find .hg -name 'git*' | sort 313s - $ hg tags -v 313s - tip 0:ff7a2f2d8d70 313s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 313s - $ cd .. 313s - $ rm -r otherhgrepo 313s - 313s -Nor using a pull clone 313s - 313s - $ hg clone -U --pull hgrepo otherhgrepo 313s - requesting all changes 313s - adding changesets 313s - adding manifests 313s - adding file changes 313s - added 1 changesets with 1 changes to 1 files 313s - new changesets ff7a2f2d8d70 313s - $ cd otherhgrepo 313s - $ find .hg -name 'git*' | sort 313s - $ hg tags -v 313s - tip 0:ff7a2f2d8d70 313s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 313s - $ cd .. 313s - $ rm -r otherhgrepo 313s - 313s -But we can enable it! 313s - 313s - $ cat >> $HGRCPATH < [experimental] 313s - > hg-git-serve = yes 313s - > EOF 313s - 313s -Check transferring between Mercurial repositories using a 313s -copying/linking clone 313s - 313s - $ hg clone -U hgrepo otherhgrepo 313s - $ cd otherhgrepo 313s - $ find .hg -name 'git*' | sort 313s - $ hg tags -q 313s - tip 313s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 313s - $ cd .. 313s - 313s -Checking using a pull clone 313s - 313s - $ rm -rf otherhgrepo 313s - $ hg clone -U --pull hgrepo otherhgrepo 313s - requesting all changes 313s - adding changesets 313s - adding manifests 313s - adding file changes 313s - added 1 changesets with 1 changes to 1 files 313s - new changesets ff7a2f2d8d70 313s - $ cd otherhgrepo 313s - $ hg tags -q 313s - tip 313s - alpha 313s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 313s - 0:ff7a2f2d8d70 7eeab2ea75ec 313s - $ cd .. 313s - 313s -Can we repopulate the state from a Mercurial repository? 313s - 313s - $ cd otherhgrepo 313s - $ hg debug-remove-hggit-state 313s - clearing out the git cache data 313s - $ hg log -qr 'fromgit()' 313s - $ hg tags 313s - tip 0:ff7a2f2d8d70 313s - $ hg pull 313s - pulling from $TESTTMP/hgrepo 313s - searching for changes 313s - no changes found 313s - $ hg log -qr 'fromgit()' 313s - $ hg tags 313s - tip 0:ff7a2f2d8d70 313s - 313s -Sadly, no. 313s 313s ERROR: test-hg-clone.t output changed 313s ! 313s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-push-detached.t 313s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-push-detached.t.err 313s @@ -40,37 +40,9 @@ 313s in this case continues to work. 313s 313s $ hg clone gitrepo hgrepo 313s - importing 1 git commits 313s - new changesets ff7a2f2d8d70 (1 drafts) 313s - updating to bookmark master 313s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 313s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 313s + abort: repository gitrepo not found 313s + [255] 313s $ cd hgrepo 313s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 313s $ echo beta > beta 313s - $ hg add beta 313s - $ fn_hg_commit -m "add beta" 313s - 313s -Pushing that changeset, with phases, publishes the detached HEAD. 313s -Whether this should happen is debatable, but it's a side effect from 313s -the fact that pushing to the remote HEAD, with HEAD being the usual 313s -symref, should publish it. 313s - 313s - $ hg push -v --config hggit.usephases=yes 313s - pushing to $TESTTMP/gitrepo 313s - finding unexported changesets 313s - exporting 1 changesets 313s - converting revision 47580592d3d6492421a1e6cebc5c2d701a2e858b 313s - packing 3 loose objects... 313s - searching for changes 313s - remote: counting objects: 5, done. 313s - 1 commits found 313s - adding objects 313s - remote: counting objects: 5, done. 313s - remote: found 0 deltas to reuse 313s - added 1 commits with 1 trees and 1 blobs 313s - updating reference default::refs/heads/master => GIT:0f378ab6 313s - publishing remote HEAD 313s - $ hg phase 'all()' 313s - 0: public 313s - 1: draft 313s - $ cd .. 313s - 313s 313s ERROR: test-push-detached.t output changed 313s ! 313s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-serve-git.t 313s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-serve-git.t.err 313s @@ -33,28 +33,14 @@ 313s Make sure that clone over the old git protocol doesn't break 313s 313s $ hg clone -U git://localhost:$HGPORT/test copy 2>&1 313s - \r (no-eol) (esc) 313s - Counting objects 1/6 [=====> ]\r (no-eol) (esc) 313s - Counting objects 2/6 [===========> ]\r (no-eol) (esc) 313s - Counting objects 3/6 [=================> ]\r (no-eol) (esc) 313s - Counting objects 4/6 [=======================> ]\r (no-eol) (esc) 313s - Counting objects 5/6 [=============================> ]\r (no-eol) (esc) 313s - Counting objects 6/6 [===================================>]\r (no-eol) (esc) 313s - \r (no-eol) (esc) 313s - \r (no-eol) (esc) 313s - Compressing objects 1/3 [==========> ]\r (no-eol) (esc) 313s - Compressing objects 2/3 [=====================> ]\r (no-eol) (esc) 313s - Compressing objects 3/3 [================================>]\r (no-eol) (esc) 313s - \r (no-eol) (esc) 313s - \r (no-eol) (esc) 313s - importing commits 1/2 b23744d34f97 [======> ]\r (no-eol) (esc) 313s - importing commits 2/2 3af9773036a9 [=============>]\r (no-eol) (esc) 313s - \r (no-eol) (esc) 313s - importing 2 git commits 313s - new changesets c4d188f6e13d:221dd250e933 313s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 313s + abort: repository git://localhost:$HGPORT/test not found 313s + [255] 313s $ hg log -T 'HG:{node|short} GIT:{gitnode|short}\n' -R copy 313s - HG:221dd250e933 GIT:3af9773036a9 313s - HG:c4d188f6e13d GIT:b23744d34f97 313s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 313s + abort: repository copy not found 313s + [255] 313s $ hg tags -v -R copy 313s - tip 1:221dd250e933 313s - default/master 1:221dd250e933 git-remote 313s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 313s + abort: repository copy not found 313s + [255] 313s 313s ERROR: test-serve-git.t output changed 315s ! 315s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-convergedmerge.t 315s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-convergedmerge.t.err 315s @@ -2,29 +2,39 @@ 315s $ . "$TESTDIR/testutil" 315s 315s $ hg init hgrepo1 315s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 315s $ cd hgrepo1 315s $ echo A > afile 315s $ hg add afile 315s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 315s $ hg ci -m "origin" 315s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 315s 315s $ echo B > afile 315s $ hg ci -m "A->B" 315s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 315s 315s $ echo C > afile 315s $ hg ci -m "B->C" 315s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 315s 315s $ hg up -r0 315s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 315s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 315s $ echo C > afile 315s $ hg ci -m "A->C" 315s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 315s created new head 315s 315s $ hg merge -r2 315s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 315s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 315s (branch merge, don't forget to commit) 315s $ hg ci -m "merge" 315s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 315s 315s $ hg log --graph --style compact | sed 's/\[.*\]//g' 315s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 315s @ 4:3,2 eaa21d002113 1970-01-01 00:00 +0000 test 315s |\ merge 315s | | 315s @@ -47,36 +57,23 @@ 315s 315s $ cd hgrepo1 315s $ hg bookmark -r4 master 315s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 315s $ hg push -r master ../repo.git 315s - pushing to ../repo.git 315s - searching for changes 315s - adding objects 315s - remote: found 0 deltas to reuse 315s - added 5 commits with 3 trees and 3 blobs 315s - adding reference refs/heads/master 315s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 315s + abort: repository ../repo.git does not exist 315s + [255] 315s $ cd .. 315s 315s $ hg clone repo.git hgrepo2 315s - importing 5 git commits 315s - new changesets 5d1a6b64f9d0:eaa21d002113 (5 drafts) 315s - updating to bookmark master 315s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 315s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 315s + abort: repository repo.git not found 315s + [255] 315s expect the same revision ids as above 315s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 315s - @ 4:1,3 eaa21d002113 1970-01-01 00:00 +0000 test 315s - |\ merge 315s - | | 315s - | o 3 0dbe4ac1a758 1970-01-01 00:00 +0000 test 315s - | | B->C 315s - | | 315s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 315s - | | A->B 315s - | | 315s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 315s - |/ A->C 315s - | 315s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 315s - origin 315s - 315s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 315s + abort: repository hgrepo2 not found 315s $ hg -R hgrepo2 gverify 315s - verifying rev eaa21d002113 against git commit fb8c9e2afe5418cfff337eeed79fad5dd58826f0 315s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 315s + hg: unknown command 'gverify' 315s + (did you mean verify?) 315s + [10] 315s 315s ERROR: test-convergedmerge.t output changed 316s ! 316s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-conflict-2.t 316s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-conflict-2.t.err 316s @@ -2,30 +2,40 @@ 316s $ . "$TESTDIR/testutil" 316s 316s $ hg init hgrepo1 316s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 316s $ cd hgrepo1 316s $ echo A > afile 316s $ hg add afile 316s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 316s $ hg ci -m "origin" 316s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 316s 316s $ echo B > afile 316s $ hg ci -m "A->B" 316s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 316s 316s $ hg up -r0 316s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 316s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 316s $ echo C > afile 316s $ hg ci -m "A->C" 316s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 316s created new head 316s 316s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 316s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 316s warning: conflicts.* (re) 316s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 316s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 316s resolve using second parent 316s $ echo B > afile 316s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 316s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 316s $ hg ci -m "merge to B" 316s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 316s 316s $ hg log --graph --style compact | sed 's/\[.*\]//g' 316s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 316s @ 3:2,1 120385945d08 1970-01-01 00:00 +0000 test 316s |\ merge to B 316s | | 316s @@ -45,31 +55,18 @@ 316s 316s $ cd hgrepo1 316s $ hg bookmark -r tip master 316s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 316s $ hg push -r master ../repo.git 316s - pushing to ../repo.git 316s - searching for changes 316s - adding objects 316s - remote: found 0 deltas to reuse 316s - added 4 commits with 3 trees and 3 blobs 316s - adding reference refs/heads/master 316s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 316s + abort: repository ../repo.git does not exist 316s + [255] 316s $ cd .. 316s 316s $ hg clone repo.git hgrepo2 316s - importing 4 git commits 316s - new changesets 5d1a6b64f9d0:120385945d08 (4 drafts) 316s - updating to bookmark master 316s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 316s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 316s + abort: repository repo.git not found 316s + [255] 316s expect the same revision ids as above 316s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 316s - @ 3:1,2 120385945d08 1970-01-01 00:00 +0000 test 316s - |\ merge to B 316s - | | 316s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 316s - | | A->B 316s - | | 316s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 316s - |/ A->C 316s - | 316s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 316s - origin 316s - 316s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 316s + abort: repository hgrepo2 not found 316s 316s ERROR: test-conflict-2.t output changed 316s ! 316s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-phases-draft.t 316s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-phases-draft.t.err 316s @@ -12,73 +12,10 @@ 316s cloning without hggit.usephases does not publish local changesets 316s $ cd .. 316s $ hg clone gitrepo hgrepo | grep -v '^updating' 316s - importing 1 git commits 316s - new changesets ff7a2f2d8d70 (1 drafts) 316s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 316s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 316s + abort: repository gitrepo not found 316s + [1] 316s 316s $ cd hgrepo 316s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 316s $ hg phase -r master 316s - 0: draft 316s - 316s -pulling advances the draft phase, though 316s - 316s - $ hg phase -fs 0 316s - $ hg pull 316s - pulling from $TESTTMP/gitrepo 316s - no changes found 316s - $ hg phase tip 316s - 0: draft 316s - 316s -even if we don't have a name? 316s - 316s - $ hg phase -fs 0 316s - $ mv .hg/hgrc .hg/hgrc.bak 316s - $ hg pull ../gitrepo 316s - pulling from ../gitrepo 316s - no changes found 316s - $ hg phase tip 316s - 0: draft 316s - $ mv .hg/hgrc.bak .hg/hgrc 316s - $ cd .. 316s - 316s - 316s -pulling without hggit.usephases does not publish local changesets 316s - $ cd gitrepo 316s - $ git checkout -q master 316s - $ echo beta > beta 316s - $ git add beta 316s - $ fn_git_commit -m 'add beta' 316s - $ cd .. 316s - 316s - $ cd hgrepo 316s - $ hg pull 316s - pulling from $TESTTMP/gitrepo 316s - importing 1 git commits 316s - updating bookmark master 316s - new changesets 7fe02317c63d (1 drafts) 316s - (run 'hg update' to get a working copy) 316s - $ hg phase -r master 316s - 1: draft 316s - 316s -pulling with git.public does not publish local changesets 316s - $ hg --config git.public=master pull 316s - pulling from $TESTTMP/gitrepo 316s - no changes found 316s - $ hg phase -r master 316s - 1: draft 316s - 316s -pushing without hggit.usephases does not publish local changesets 316s - $ hg update master 316s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 316s - $ echo gamma > gamma 316s - $ hg add gamma 316s - $ hg commit -m 'gamma' 316s - $ hg push 316s - pushing to $TESTTMP/gitrepo 316s - searching for changes 316s - adding objects 316s - remote: found 0 deltas to reuse 316s - added 1 commits with 1 trees and 1 blobs 316s - updating reference refs/heads/master 316s - $ hg phase -r master 316s - 2: draft 316s 316s ERROR: test-phases-draft.t output changed 317s ! 317s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-subrepos-push.t 317s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-subrepos-push.t.err 317s @@ -5,10 +5,13 @@ 317s Initialized empty Git repository in $TESTTMP/repo.git/ 317s 317s $ hg init hgsubrepo 317s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 317s $ cd hgsubrepo 317s $ echo thefile > thefile 317s $ hg add thefile 317s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 317s $ fn_hg_commit -m 'add thefile' 317s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 317s $ cd .. 317s 317s $ git init gitsubrepo 317s @@ -20,59 +23,9 @@ 317s $ cd .. 317s 317s $ hg clone repo.git hgrepo 317s - updating to branch default 317s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 317s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 317s + abort: repository repo.git not found 317s + [255] 317s $ cd hgrepo 317s + $TESTTMP.sh: 32: cd: can't cd to hgrepo 317s $ hg book master 317s - $ echo alpha > alpha 317s - $ hg add alpha 317s - $ fn_hg_commit -m 'add alpha' 317s - $ touch .hgsub 317s - $ hg add .hgsub 317s - $ fn_hg_commit -m "add .hgsub" 317s - $ hg clone -q ../hgsubrepo hg 317s - $ echo "hg = ../hgsubrepo" >> .hgsub 317s - $ fn_hg_commit -m 'add hg subrepo' 317s - $ git clone --quiet ../gitsubrepo git 317s - $ echo "git = [git]../gitsubrepo" >> .hgsub 317s - $ fn_hg_commit -m 'add git subrepo' 317s - $ hg push 317s - pushing to $TESTTMP/repo.git 317s - pushing subrepo hg to $TESTTMP/hgsubrepo 317s - searching for changes 317s - no changes found 317s - searching for changes 317s - adding objects 317s - remote: found 0 deltas to reuse 317s - added 4 commits with 2 trees and 2 blobs 317s - adding reference refs/heads/master 317s - $ cat .hgsub 317s - hg = ../hgsubrepo 317s - git = [git]../gitsubrepo 317s - $ cat .hgsubstate 317s - aaae5224095dca7403147c0e20cbac1f450b0e95 git 317s - df643c539c7541d48eacc76745581e00cbaf3d45 hg 317s - $ cd .. 317s - 317s -Now clone it. Note that no Mercurial state persists: 317s - 317s - $ git clone --recurse-submodules repo.git gitrepo 317s - Cloning into 'gitrepo'... 317s - done. 317s - Submodule 'git' ($TESTTMP/gitsubrepo) registered for path 'git' 317s - Cloning into '$TESTTMP/gitrepo/git'... 317s - done. 317s - Submodule path 'git': checked out 'aaae5224095dca7403147c0e20cbac1f450b0e95' 317s - $ cd gitrepo 317s - $ ls -A 317s - .git 317s - .gitmodules 317s - alpha 317s - git 317s - $ cat .gitmodules 317s - [submodule "git"] 317s - path = git 317s - url = ../gitsubrepo 317s - $ ls -A git 317s - .git 317s - thefile 317s 317s ERROR: test-subrepos-push.t output changed 318s ! 318s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-conflict-1.t 318s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-conflict-1.t.err 318s @@ -2,30 +2,40 @@ 318s $ . "$TESTDIR/testutil" 318s 318s $ hg init hgrepo1 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s $ cd hgrepo1 318s $ echo A > afile 318s $ hg add afile 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s $ hg ci -m "origin" 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s 318s $ echo B > afile 318s $ hg ci -m "A->B" 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s 318s $ hg up -r0 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 318s $ echo C > afile 318s $ hg ci -m "A->C" 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s created new head 318s 318s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s warning: conflicts.* (re) 318s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 318s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 318s resolve using first parent 318s $ echo C > afile 318s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s $ hg ci -m "merge to C" 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s 318s $ hg log --graph --style compact | sed 's/\[.*\]//g' 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s @ 3:2,1 6c53bc0f062f 1970-01-01 00:00 +0000 test 318s |\ merge to C 318s | | 318s @@ -45,31 +55,18 @@ 318s 318s $ cd hgrepo1 318s $ hg bookmark -r tip master 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s $ hg push -r master ../repo.git 318s - pushing to ../repo.git 318s - searching for changes 318s - adding objects 318s - remote: found 0 deltas to reuse 318s - added 4 commits with 3 trees and 3 blobs 318s - adding reference refs/heads/master 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s + abort: repository ../repo.git does not exist 318s + [255] 318s $ cd .. 318s 318s $ hg clone repo.git hgrepo2 318s - importing 4 git commits 318s - new changesets 5d1a6b64f9d0:6c53bc0f062f (4 drafts) 318s - updating to bookmark master 318s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s + abort: repository repo.git not found 318s + [255] 318s expect the same revision ids as above 318s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 318s - @ 3:1,2 6c53bc0f062f 1970-01-01 00:00 +0000 test 318s - |\ merge to C 318s - | | 318s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 318s - | | A->B 318s - | | 318s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 318s - |/ A->C 318s - | 318s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 318s - origin 318s - 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s + abort: repository hgrepo2 not found 318s 318s ERROR: test-conflict-1.t output changed 318s ! 318s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-pull-after-obsolete.t 318s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-pull-after-obsolete.t.err 318s @@ -20,52 +20,9 @@ 318s 318s $ cd .. 318s $ hg clone -U gitrepo hgrepo 318s - importing 2 git commits 318s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s + abort: repository gitrepo not found 318s + [255] 318s $ cd hgrepo 318s + $TESTTMP.sh: 31: cd: can't cd to hgrepo 318s $ hg up master 318s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 318s - (activating bookmark master) 318s - $ hg log --graph 318s - @ changeset: 1:7fe02317c63d 318s - | bookmark: master 318s - | tag: default/master 318s - | tag: thetag 318s - | tag: tip 318s - | user: test 318s - | date: Mon Jan 01 00:00:11 2007 +0000 318s - | summary: add beta 318s - | 318s - o changeset: 0:ff7a2f2d8d70 318s - user: test 318s - date: Mon Jan 01 00:00:10 2007 +0000 318s - summary: add alpha 318s - 318s - $ cd ../gitrepo 318s - $ echo beta line 2 >> beta 318s - $ git add beta 318s - $ fn_git_commit -m 'add to beta' 318s - 318s -Create a commit, obsolete it, and pull, to ensure that we can pull if 318s -the tipmost commit is hidden. 318s - 318s - $ cd ../hgrepo 318s - $ hg bookmark --inactive 318s - $ echo gamma > gamma 318s - $ hg add gamma 318s - $ fn_hg_commit -m 'add gamma' 318s - $ hg up master 318s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 318s - (activating bookmark master) 318s - $ hg log -T '{rev}:{node} {desc}\n' -r tip 318s - 2:4090a1266584bc1a47ce562e9349b1e0f1b44611 add gamma 318s - $ hg debugobsolete 4090a1266584bc1a47ce562e9349b1e0f1b44611 318s - 1 new obsolescence markers 318s - obsoleted 1 changesets 318s - 318s - $ hg pull 318s - pulling from $TESTTMP/gitrepo 318s - importing 1 git commits 318s - updating bookmark master 318s - new changesets cc1e605d90db (1 drafts) 318s - (run 'hg update' to get a working copy) 318s 318s ERROR: test-pull-after-obsolete.t output changed 318s ! 318s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-git-clone.t 318s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-git-clone.t.err 318s @@ -14,30 +14,24 @@ 318s $ cd .. 318s 318s $ hg clone gitrepo hgrepo 318s - importing 2 git commits 318s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 318s - updating to bookmark master 318s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s + abort: repository gitrepo not found 318s + [255] 318s $ hg -R hgrepo log --graph 318s - @ changeset: 1:7fe02317c63d 318s - | bookmark: master 318s - | tag: default/master 318s - | tag: tip 318s - | user: test 318s - | date: Mon Jan 01 00:00:11 2007 +0000 318s - | summary: add beta 318s - | 318s - o changeset: 0:ff7a2f2d8d70 318s - user: test 318s - date: Mon Jan 01 00:00:10 2007 +0000 318s - summary: add alpha 318s - 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s + abort: repository hgrepo not found 318s + [255] 318s 318s we should have some bookmarks 318s $ hg -R hgrepo book 318s - * master 1:7fe02317c63d 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s + abort: repository hgrepo not found 318s + [255] 318s $ hg -R hgrepo gverify 318s - verifying rev 7fe02317c63d against git commit 9497a4ee62e16ee641860d7677cdb2589ea15554 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s + hg: unknown command 'gverify' 318s + (did you mean verify?) 318s + [10] 318s 318s test for ssh vulnerability 318s 318s @@ -47,16 +41,18 @@ 318s > EOF 318s 318s $ hg clone -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 318s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 318s [255] 318s $ hg clone -q 'git+ssh://%2DoProxyCommand=rm${IFS}nonexistent/path' 318s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 318s [255] 318s $ hg clone -q 'git+ssh://fakehost|rm${IFS}nonexistent/path' 318s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 318s - abort: git remote error: The remote server unexpectedly closed the connection. 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 318s [255] 318s $ hg clone -q 'git+ssh://fakehost%7Crm${IFS}nonexistent/path' 318s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 318s - abort: git remote error: The remote server unexpectedly closed the connection. 318s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 318s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 318s [255] 318s 318s ERROR: test-git-clone.t output changed 319s ! 319s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-git-gpg.t 319s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-git-gpg.t.err 319s @@ -55,23 +55,10 @@ 319s Hg clone it 319s 319s $ hg clone gitrepo hgrepo 319s - importing 2 git commits 319s - new changesets ab60c5e55bd6:[0-9a-f]{12,12} \(2 drafts\) (re) 319s - updating to bookmark signed 319s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 319s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 319s + abort: repository gitrepo not found 319s + [255] 319s 319s $ cd hgrepo 319s + $TESTTMP.sh: 46: cd: can't cd to hgrepo 319s $ hg push ../gitrepo2 -B signed 319s - pushing to ../gitrepo2 319s - searching for changes 319s - adding objects 319s - remote: found 0 deltas to reuse 319s - added 1 commits with 1 trees and 0 blobs 319s - adding reference refs/heads/signed 319s - $ cd .. 319s - 319s -Verify the commit 319s - 319s - $ cd gitrepo2 319s - $ git show --show-signature signed | grep "Good signature from" 319s - gpg: Good signature from "hgtest" [ultimate] 319s 319s ERROR: test-git-gpg.t output changed 320s ! 320s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-push-phases.t 320s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-push-phases.t.err 320s @@ -9,68 +9,13 @@ 320s $ git init -q --bare repo.git 320s 320s $ hg clone repo.git hgrepo 320s - updating to branch default 320s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 320s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 320s + abort: repository repo.git not found 320s + [255] 320s 320s $ cd hgrepo 320s + $TESTTMP.sh: 13: cd: can't cd to hgrepo 320s 320s Create two commits, one secret: 320s 320s $ touch alpha 320s - $ hg add alpha 320s - $ fn_hg_commit -m alpha 320s - $ hg book -r . master 320s - $ touch beta 320s - $ hg add beta 320s - $ fn_hg_commit --secret -m beta 320s - $ hg book -r . secret 320s - $ hg push 320s - pushing to $TESTTMP/repo.git 320s - warning: not exporting secret bookmark 'secret' 320s - searching for changes 320s - adding objects 320s - remote: found 0 deltas to reuse 320s - added 1 commits with 1 trees and 1 blobs 320s - adding reference refs/heads/master 320s - $ cd .. 320s - $ hg -R hgrepo log --graph --template phases 320s - @ changeset: 1:62966756ea96 320s - | bookmark: secret 320s - | tag: tip 320s - | phase: secret 320s - | user: test 320s - | date: Mon Jan 01 00:00:11 2007 +0000 320s - | summary: beta 320s - | 320s - o changeset: 0:d4b83afc35d1 320s - bookmark: master 320s - tag: default/master 320s - phase: public 320s - user: test 320s - date: Mon Jan 01 00:00:10 2007 +0000 320s - summary: alpha 320s - 320s - 320s -What happens when we push the secret? 320s - 320s - $ hg -R hgrepo push -B secret 320s - pushing to $TESTTMP/repo.git 320s - warning: not exporting secret bookmark 'secret' 320s - searching for changes 320s - abort: revision 62966756ea96 cannot be pushed since it doesn't have a bookmark 320s - [255] 320s - 320s -Only one changeset was pushed: 320s - 320s - $ GIT_DIR=repo.git git log --graph --all --decorate=short 320s - * commit 2cc4e3d19551e459a0dd606f4cf890de571c7d33 (HEAD -> master) 320s - Author: test 320s - Date: Mon Jan 1 00:00:10 2007 +0000 320s - 320s - alpha 320s - 320s -And this published the remote head: 320s - 320s - $ hg -R hgrepo phase 'all()' 320s - 0: public 320s - 1: secret 320s 320s ERROR: test-push-phases.t output changed 320s ! 320s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-keywords.t 320s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-keywords.t.err 320s @@ -21,29 +21,9 @@ 320s $ cd .. 320s 320s $ hg clone gitrepo hgrepo 320s - importing 3 git commits 320s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 320s - updating to bookmark master 320s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 320s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 320s + abort: repository gitrepo not found 320s + [255] 320s $ cd hgrepo 320s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 320s $ echo gamma > gamma 320s - $ hg add gamma 320s - $ hg commit -m 'add gamma' 320s - 320s - $ hg log --template "{rev} {node} {node|short} {gitnode} {gitnode|short}\n" 320s - 3 965bf7d08d3ac847dd8eb9e72ee0bf547d1a65d9 965bf7d08d3a 320s - 2 8e3f0ecc9aefd4ea2fdf8e2d5299cac548762a1c 8e3f0ecc9aef 7e2a5465ff4e3b992c429bb87a392620a0ac97b7 7e2a5465ff4e 320s - 1 7fe02317c63d9ee324d4b5df7c9296085162da1b 7fe02317c63d 9497a4ee62e16ee641860d7677cdb2589ea15554 9497a4ee62e1 320s - 0 ff7a2f2d8d7099694ae1e8b03838d40575bebb63 ff7a2f2d8d70 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 7eeab2ea75ec 320s - $ hg log --template "fromgit {rev}\n" --rev "fromgit()" 320s - fromgit 0 320s - fromgit 1 320s - fromgit 2 320s - $ hg log --template "gitnode_existsA {rev}\n" --rev "gitnode(9497a4ee62e16ee641860d7677cdb2589ea15554)" 320s - gitnode_existsA 1 320s - $ hg log --template "gitnode_existsB {rev}\n" --rev "gitnode(7eeab)" 320s - gitnode_existsB 0 320s - $ hg log --rev "gitnode(7e)" 320s - abort: git-mapfile@7e: ambiguous identifier!? (re) 320s - [50] 320s - $ hg log --template "gitnode_notexists {rev}\n" --rev "gitnode(1234567890ab)" 320s 320s ERROR: test-keywords.t output changed 321s ! 321s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-subrepos-delete.t 321s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-subrepos-delete.t.err 321s @@ -52,22 +52,9 @@ 321s And there should be nothing in Mercurial either: 321s 321s $ hg clone -U repo.git hgrepo 321s - importing 3 git commits 321s - new changesets e532b2bfda10:cc611d35fb62 (3 drafts) 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s + abort: repository repo.git not found 321s + [255] 321s $ cd hgrepo 321s + $TESTTMP.sh: 50: cd: can't cd to hgrepo 321s $ hg log --graph --template info 321s - o 321s - | commit: 2:cc611d35fb62 delete subrepo 321s - | added: 321s - | removed: .hgsub .hgsubstate 321s - o 321s - | commit: 1:8d549bcc5179 add subrepo 321s - | added: .hgsub .hgsubstate 321s - | removed: 321s - o 321s - commit: 0:e532b2bfda10 add alpha 321s - added: alpha 321s - removed: 321s - $ hg manifest -r tip 321s - alpha 321s - $ cd .. 321s 321s ERROR: test-subrepos-delete.t output changed 321s ! 321s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-tree-decomposition.t 321s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-tree-decomposition.t.err 321s @@ -24,45 +24,9 @@ 321s $ git init -q --bare repo.git 321s 321s $ hg clone gitrepo hgrepo 321s - importing 3 git commits 321s - new changesets d4d3d2417141:541f27994b81 (3 drafts) 321s - updating to bookmark master 321s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s + abort: repository gitrepo not found 321s + [255] 321s $ cd hgrepo 321s + $TESTTMP.sh: 38: cd: can't cd to hgrepo 321s $ hg log --template 'adds: {file_adds}\ndels: {file_dels}\n' 321s - adds: d1 321s - dels: d1/f1 321s - adds: d2/f2 321s - dels: d1/f2 321s - adds: d1/f1 d1/f2 321s - dels: 321s - 321s - $ hg debug-remove-hggit-state 321s - clearing out the git cache data 321s - $ hg push ../repo.git 321s - pushing to ../repo.git 321s - searching for changes 321s - adding objects 321s - remote: found 0 deltas to reuse 321s - added 3 commits with 6 trees and 3 blobs 321s - adding reference refs/heads/master 321s - $ cd .. 321s - 321s - $ git --git-dir=repo.git log --pretty=medium 321s - commit 6e0dbd8cd92ed4823c69cb48d8a2b81f904e6e69 321s - Author: test 321s - Date: Mon Jan 1 00:00:12 2007 +0000 321s - 321s - replace a dir with a file 321s - 321s - commit a1874d5cd0b1549ed729e36f0da4a93ed36259ee 321s - Author: test 321s - Date: Mon Jan 1 00:00:11 2007 +0000 321s - 321s - rename 321s - 321s - commit 102c17a5deda49db3f10ec5573f9378867098b7c 321s - Author: test 321s - Date: Mon Jan 1 00:00:10 2007 +0000 321s - 321s - initial 321s 321s ERROR: test-tree-decomposition.t output changed 321s ! 321s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-annotate.t 321s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-annotate.t.err 321s @@ -10,6 +10,7 @@ 321s init 321s 321s $ hg init repo 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s $ cd repo 321s 321s commit 321s @@ -19,37 +20,48 @@ 321s > a 321s > EOF 321s $ hg add a 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s $ fn_hg_commit -m 1 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s $ cat < a 321s > a 321s > a 321s > a 321s > EOF 321s $ fn_hg_commit -m 2 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s $ cat < a 321s > a 321s > b 321s > a 321s > EOF 321s $ fn_hg_commit -m 3 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s 321s annotate multiple files 321s 321s $ hg annotate a 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s 0: a 321s 2: b 321s 1: a 321s 321s $ hg annotate --skip 1 a 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s 0: a 321s 2: b 321s 0* a 321s 321s $ hg gexport 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s + hg: unknown command 'gexport' 321s + (did you mean one of export, import?) 321s + [10] 321s $ hg log -T '{rev}:{node} {gitnode}\n' 321s - 2:beb139b96eec386addc02d48db524b7646ef1605 19388575d02e71e917e7013aa854d4a21c509819 321s - 1:a9a255d66663f9216bdcf8dda69211d7280f7278 debec50a14cc4830584dd4fa1507c51cce1c098f 321s - 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 88f28c06a1ede9a70852ab1bf9818150fabaaaa9 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s + 2:beb139b96eec386addc02d48db524b7646ef1605 321s + 1:a9a255d66663f9216bdcf8dda69211d7280f7278 321s + 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 321s 321s $ cat < .git-blame-ignore-revs 321s > # this is a comment, and the next line should be ignored 321s @@ -59,39 +71,43 @@ 321s > EOF 321s 321s $ hg annotate a 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s 0: a 321s 2: b 321s 1: a 321s $ hg annotate a \ 321s > --debug \ 321s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 321s - skipping debec50a14cc -> a9a255d66663 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s 0: a 321s 2: b 321s - 0* a 321s + 1: a 321s $ hg add .git-blame-ignore-revs 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s $ hg annotate a \ 321s > --debug \ 321s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 321s - skipping debec50a14cc -> a9a255d66663 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s 0: a 321s 2: b 321s - 0* a 321s + 1: a 321s $ hg annotate a \ 321s > --config git.blame.ignoreRevsFile=badfile 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s 0: a 321s 2: b 321s 1: a 321s $ hg annotate -T'{lines % "{rev}:{node|short} {gitnode|short}: {line}"}' a 321s - 0:8d4731bd0f4a 88f28c06a1ed: a 321s - 2:beb139b96eec 19388575d02e: b 321s - 1:a9a255d66663 debec50a14cc: a 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s + 0:8d4731bd0f4a : a 321s + 2:beb139b96eec : b 321s + 1:a9a255d66663 : a 321s 321s $ cd .. 321s $ hg -R repo annotate repo/a \ 321s > --debug \ 321s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 321s - skipping debec50a14cc -> a9a255d66663 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s 0: a 321s 2: b 321s - 0* a 321s + 1: a 321s 321s ERROR: test-annotate.t output changed 321s ! 321s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-subrepos-drop.t 321s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-subrepos-drop.t.err 321s @@ -17,52 +17,9 @@ 321s Create a Mercurial repository with a .gitmodules file: 321s 321s $ hg clone repo.git hgrepo 321s - updating to branch default 321s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s + abort: repository repo.git not found 321s + [255] 321s $ cd hgrepo 321s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 321s $ hg book master 321s - $ touch this 321s - $ fn_hg_commit -A -m 'add this' 321s - $ cat > .gitmodules < [submodule "subrepo"] 321s - > path = subrepo 321s - > url = ../gitsubrepo 321s - > EOF 321s - $ hg add .gitmodules 321s - $ fn_hg_commit -m "add .gitmodules file" 321s - $ cd .. 321s - 321s -What happens if we push that to Git? 321s - 321s - $ hg -R hgrepo push 321s - pushing to $TESTTMP/repo.git 321s - warning: ignoring modifications to '.gitmodules' file; please use '.hgsub' instead 321s - searching for changes 321s - adding objects 321s - remote: found 0 deltas to reuse 321s - added 2 commits with 1 trees and 1 blobs 321s - adding reference refs/heads/master 321s - 321s -But we don't get a warning if we don't touch .gitmodules: 321s - 321s - $ cd hgrepo 321s - $ touch that 321s - $ fn_hg_commit -A -m 'add that' 321s - $ hg push 321s - pushing to $TESTTMP/repo.git 321s - searching for changes 321s - adding objects 321s - remote: found 0 deltas to reuse 321s - added 1 commits with 1 trees and 0 blobs 321s - updating reference refs/heads/master 321s - $ cd .. 321s - 321s -Check that it didn't silenty come through, or something: 321s - 321s - $ git clone repo.git gitrepo 321s - Cloning into 'gitrepo'... 321s - done. 321s - $ ls -A gitrepo 321s - .git 321s - that 321s - this 321s 321s ERROR: test-subrepos-drop.t output changed 321s ! 321s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-push-anonymous.t 321s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-push-anonymous.t.err 321s @@ -25,28 +25,9 @@ 321s Clone it, deactivate the bookmark, add a commit, and push! 321s 321s $ hg clone -U gitrepo hgrepo 321s - importing 1 git commits 321s - new changesets ff7a2f2d8d70 (1 drafts) 321s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 321s + abort: repository gitrepo not found 321s + [255] 321s $ cd hgrepo 321s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 321s $ hg up tip 321s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 321s - $ echo beta > beta 321s - $ hg add beta 321s - $ fn_hg_commit -m "add beta" 321s - 321s -Pushing that changeset should print a helpful message: 321s - 321s - $ hg push 321s - pushing to $TESTTMP/gitrepo 321s - searching for changes 321s - no changes found (ignoring 1 changesets without bookmarks or tags) 321s - [1] 321s - 321s -But what about untagged, but secret changesets? 321s - 321s - $ hg phase -fs tip 321s - $ hg push 321s - pushing to $TESTTMP/gitrepo 321s - searching for changes 321s - no changes found 321s - [1] 321s 321s ERROR: test-push-anonymous.t output changed 322s ! 322s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-empty-working-tree.t 322s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-empty-working-tree.t.err 322s @@ -10,29 +10,9 @@ 322s $ git init -q --bare repo.git 322s 322s $ hg clone gitrepo hgrepo 322s - importing 1 git commits 322s - new changesets 01708ca54a8f (1 drafts) 322s - updating to bookmark master 322s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 322s + abort: repository gitrepo not found 322s + [255] 322s $ cd hgrepo 322s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 322s $ hg log -r tip --template 'files: {files}\n' 322s - files: 322s - $ hg gverify 322s - verifying rev 01708ca54a8f against git commit 678256865a8c85ae925bf834369264193c88f8de 322s - 322s - $ hg debug-remove-hggit-state 322s - clearing out the git cache data 322s - $ hg push ../repo.git 322s - pushing to ../repo.git 322s - searching for changes 322s - adding objects 322s - remote: found 0 deltas to reuse 322s - added 1 commits with 1 trees and 0 blobs 322s - adding reference refs/heads/master 322s - $ cd .. 322s - $ git --git-dir=repo.git log --pretty=medium 322s - commit 678256865a8c85ae925bf834369264193c88f8de 322s - Author: test 322s - Date: Mon Jan 1 00:00:00 2007 +0000 322s - 322s - empty 322s 322s ERROR: test-empty-working-tree.t output changed 323s ! 323s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-gitignore-permissions.t 323s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-gitignore-permissions.t.err 323s @@ -4,6 +4,7 @@ 323s $ . "$TESTDIR/testutil" 323s 323s $ hg init repo 323s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 323s $ cd repo 323s 323s $ if test `whoami` = root 323s @@ -16,8 +17,14 @@ 323s 323s $ touch thefile 323s $ hg add thefile 323s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 323s $ hg ci -A -m commit 323s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 323s $ hg gexport 323s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 323s + hg: unknown command 'gexport' 323s + (did you mean one of export, import?) 323s + [10] 323s 323s Create a file that we can ignore 323s 323s @@ -33,9 +40,10 @@ 323s 323s $ echo nothingtoseehere > .gitignore 323s $ hg status 323s - not_readable: Permission denied 323s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 323s not_readable: Permission denied 323s ? .gitignore 323s + ? nothingtoseehere 323s 323s And notice that we really did ignore it! 323s 323s 323s ERROR: test-gitignore-permissions.t output changed 323s ! 323s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-ambiguousprefix.t 323s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-ambiguousprefix.t.err 323s @@ -21,13 +21,11 @@ 323s $ cd .. 323s 323s $ hg clone gitrepo hgrepo 323s - importing 3 git commits 323s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 323s - updating to bookmark master 323s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 323s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 323s + abort: repository gitrepo not found 323s + [255] 323s 323s $ cd hgrepo 323s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 323s 323s $ hg log -r 'gitnode(7e)' 323s - abort: git-mapfile@7e: ambiguous identifier!? (re) 323s - [50] 323s 323s ERROR: test-ambiguousprefix.t output changed 323s ! 323s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-gitignore-share.t 323s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-gitignore-share.t.err 323s @@ -9,6 +9,7 @@ 323s $ git init --quiet --bare repo.git 323s 323s $ hg init hgrepo 323s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 323s $ cd hgrepo 323s $ cat > .hg/hgrc < [paths] 323s @@ -16,26 +17,31 @@ 323s > EOF 323s $ echo ignored > .gitignore 323s $ hg add .gitignore 323s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 323s $ hg ci -m ignore 323s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 323s $ hg book master 323s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 323s $ hg push 323s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 323s pushing to $TESTTMP/repo.git 323s - searching for changes 323s - adding objects 323s - remote: found 0 deltas to reuse 323s - added 1 commits with 1 trees and 1 blobs 323s - adding reference refs/heads/master 323s + abort: repository $TESTTMP/repo.git not found 323s + [255] 323s $ cd .. 323s 323s We should also ignore the file in a shared repository: 323s 323s $ hg share hgrepo sharerepo 323s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 323s updating working directory 323s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 323s $ cd sharerepo 323s $ hg paths 323s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 323s default = $TESTTMP/repo.git 323s $ cat .gitignore 323s ignored 323s $ touch ignored 323s $ hg status 323s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 323s + ? ignored 323s 323s ERROR: test-gitignore-share.t output changed 324s ! 324s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-timezone.t 324s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-timezone.t.err 324s @@ -8,10 +8,13 @@ 324s $ . "$TESTDIR/testutil" 324s 324s $ hg init hgrepo 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 324s $ cd hgrepo 324s $ touch beta 324s $ hg add beta 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 324s $ fn_hg_commit -m "test commit" 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 324s $ cat >patch2 < # HG changeset patch 324s > # User J. User 324s @@ -28,5 +31,10 @@ 324s > +alpha 324s > EOF 324s $ hg import patch2 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 324s applying patch2 324s $ hg gexport 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 324s + hg: unknown command 'gexport' 324s + (did you mean one of export, import?) 324s + [10] 324s 324s ERROR: test-timezone.t output changed 325s ! 325s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-transplant.t 325s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-transplant.t.err 325s @@ -11,12 +11,20 @@ 325s > EOF 325s 325s $ hg init baserepo 325s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 325s $ cd baserepo 325s $ for c in A B C 325s > do 325s > echo $c > $c && hg add $c && fn_hg_commit -m $c 325s > done 325s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 325s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 325s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 325s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 325s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 325s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 325s $ hg clone -r 2 . ../otherrepo 325s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 325s adding changesets 325s adding manifests 325s adding file changes 325s @@ -26,6 +34,8 @@ 325s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 325s $ cd ../otherrepo 325s $ hg up 1 325s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 325s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 325s $ hg transplant -s ../baserepo tip 325s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 325s no changes found 325s 325s ERROR: test-transplant.t output changed 325s !s 325s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-url-parsing.py.out 325s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-url-parsing.py.err 325s @@ -1,46 +1,11 @@ 325s -% expect '/webjam/webjam.git' 325s -/webjam/webjam.git 325s -% expect 'github.com' 325s -github.com 325s -% expect '/webjam/webjam.git' 325s -/webjam/webjam.git 325s -% expect 'github.com' 325s -github.com 325s -% expect '19418' 325s -19418 325s -% expect 'webjam.git' 325s -webjam.git 325s -% expect 'git@heroku.com' 325s -git@heroku.com 325s -% expect '999' 325s -999 325s -% expect 'webjam/webjam.git' 325s -webjam/webjam.git 325s -% expect 'git@github.com' 325s -git@github.com 325s -% expect '42qu/vps.git' 325s -42qu/vps.git 325s -% expect 'git@github.com' 325s -git@github.com 325s -% expect '/webjam/webjam.git' 325s -/webjam/webjam.git 325s -% expect 'git@github.com' 325s -git@github.com 325s -% expect '/webjam/webjam.git' 325s -/webjam/webjam.git 325s -% expect 'git@github.com' 325s -git@github.com 325s -% expect '10022' 325s -10022 325s -% expect 'webjam.git' 325s -webjam.git 325s -% expect 'git@heroku.com' 325s -git@heroku.com 325s -% expect 'webjam.git' 325s -webjam.git 325s -% expect 'git@compatible.com' 325s -git@compatible.com 325s -% expect 'webjam.git' 325s -webjam.git 325s -% expect 'git@heroku.com' 325s -git@heroku.com 325s +Traceback (most recent call last): 325s + File "/tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-url-parsing.py", line 14, in 325s + from hggit.git_handler import GitHandler 325s + File "/usr/lib/python3/dist-packages/hggit/__init__.py", line 163, in 325s + from . import gitdirstate 325s + File "/usr/lib/python3/dist-packages/hggit/gitdirstate.py", line 19, in 325s + from . import gitrepo 325s + File "/usr/lib/python3/dist-packages/hggit/gitrepo.py", line 20, in 325s + class gitrepo(repository.peer): 325s + ^^^^^^^^^^^^^^^ 325s +AttributeError: module 'mercurial.interfaces.repository' has no attribute 'peer'. Did you mean: 'IPeer'? 325s 325s ERROR: test-url-parsing.py output changed 326s !. 326s --- /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-addbranchrevs.t 326s +++ /tmp/autopkgtest.g7ErZt/build.JF2/src/tests/test-addbranchrevs.t.err 326s @@ -7,14 +7,23 @@ 326s caused the pull to not update to the passed revision. 326s 326s $ hg init orig 326s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 326s $ cd orig 326s $ echo a > a; hg add a; hg ci -m a 326s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 326s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 326s $ hg branch foo -q 326s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 326s $ echo b > b; hg add b; hg ci -m b 326s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 326s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 326s 326s $ cd .. 326s $ hg clone orig clone -r 0 -q 326s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 326s $ cd clone 326s $ hg pull -u -r 1 -q 326s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 326s $ hg id -n 326s + *** failed to import extension "hggit" from /tmp/autopkgtest.g7ErZt/build.JF2/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 326s 1 326s 326s ERROR: test-addbranchrevs.t output changed 326s ! 326s Skipped test-check-black.t: missing feature: the black formatter for python (>= 22.3) 326s Skipped test-check-commit.t: missing feature: running tests from repository 326s Skipped test-check-pyflakes.t: missing feature: Pyflakes python linter 326s Skipped test-check-pylint.t: missing feature: Pylint python linter 326s Skipped test-encoding.t: blacklisted 326s Skipped test-gitignore-windows.t: missing feature: Windows 326s Skipped test-incoming.t: blacklisted 326s Skipped test-serve-ci.t: skipped 326s Skipped test-serve-dulwich.t: blacklisted 326s Failed test-addbranchrevs.t: output changed 326s Failed test-ambiguousprefix.t: output changed and returned error code 1 326s Failed test-annotate.t: output changed 326s Failed test-bookmark-workflow.t: output changed and returned error code 1 326s Failed test-branch-bookmark-suffix.t#with-path: output changed and returned error code 1 326s Failed test-branch-bookmark-suffix.t#without-path: output changed and returned error code 1 326s Failed test-bundle.t: output changed and returned error code 1 326s Failed test-clone.t#draft: output changed 326s Failed test-clone.t#secret: output changed 326s Failed test-conflict-1.t: output changed 326s Failed test-conflict-2.t: output changed 326s Failed test-convergedmerge.t: output changed 326s Failed test-empty-working-tree.t: output changed and returned error code 1 326s Failed test-extra.t: output changed and returned error code 1 326s Failed test-file-removal.t: output changed and returned error code 1 326s Failed test-gc.t: output changed and returned error code 1 326s Failed test-git-clone.t: output changed 326s Failed test-git-gpg.t: output changed and returned error code 1 326s Failed test-git-submodules.t: output changed and returned error code 1 326s Failed test-git-tags.t#draft: output changed and returned error code 1 326s Failed test-git-tags.t#secret: output changed and returned error code 1 326s Failed test-git-workflow.t: output changed 326s Failed test-gitignore-permissions.t: output changed 326s Failed test-gitignore-share.t: output changed 326s Failed test-gitignore.t: output changed 326s Failed test-help.t: output changed 326s Failed test-hg-author.t: output changed and returned error code 1 326s Failed test-hg-branch.t: output changed and returned error code 1 326s Failed test-hg-clone.t: output changed and returned error code 1 326s Failed test-hg-tags.t: output changed and returned error code 1 326s Failed test-hook.t: output changed 326s Failed test-illegal-contents.t: output changed 326s Failed test-invalid-refs.t: output changed and returned error code 1 326s Failed test-keywords.t: output changed and returned error code 1 326s Failed test-merge.t: output changed and returned error code 1 326s Failed test-multiple-remotes.t: output changed 326s Failed test-octopus.t: output changed and returned error code 1 326s Failed test-orphan-tags.t: output changed and returned error code 1 326s Failed test-outgoing.t: output changed and returned error code 1 326s Failed test-phases-draft.t: output changed and returned error code 1 326s Failed test-phases-public.t#publish-defaults: output changed and returned error code 1 326s Failed test-phases-public.t#publish-specific: output changed and returned error code 1 326s Failed test-phases-remote.t: output changed and returned error code 1 326s Failed test-pull-after-obsolete.t: output changed and returned error code 1 326s Failed test-pull-after-rebase.t: output changed and returned error code 1 326s Failed test-pull-after-strip.t: output changed and returned error code 1 326s Failed test-pull.t#draft: output changed 326s Failed test-pull.t#secret: output changed 326s Failed test-push-anonymous.t: output changed and returned error code 1 326s Failed test-push-authors.t: output changed and returned error code 1 326s Failed test-push-detached.t: output changed and returned error code 1 326s Failed test-push-missing-commit.t: output changed and returned error code 1 326s Failed test-push-phases.t: output changed and returned error code 1 326s Failed test-push-r.t: output changed 326s Failed test-push-to-head.t: output changed and returned error code 1 326s Failed test-push.t: output changed and returned error code 1 326s Failed test-renames.t: output changed and returned error code 1 326s Failed test-serve-git.t: output changed 326s Failed test-serve-hg-static.t: output changed 326s Failed test-serve-hg.t#with-hggit: output changed and returned error code 1 326s Failed test-serve-hg.t#without-hggit: output changed and returned error code 1 326s Failed test-subrepos-delete.t: output changed and returned error code 1 326s Failed test-subrepos-drop.t: output changed and returned error code 1 326s Failed test-subrepos-push.t: output changed and returned error code 1 326s Failed test-subrepos-syntax.t: output changed and returned error code 1 326s Failed test-subrepos.t: output changed and returned error code 1 326s Failed test-timezone.t: output changed 326s Failed test-transactions.t: output changed 326s Failed test-transplant.t: output changed 326s Failed test-tree-decomposition.t: output changed and returned error code 1 326s Failed test-url-parsing.py: output changed and returned error code 1 326s Failed test-verify-fail.t: output changed 326s # Ran 73 tests, 9 skipped, 72 failed. 326s python hash seed: 2138443994 326s make: *** [Makefile:15: tests] Error 1 326s autopkgtest [07:25:11]: test testsuite: -----------------------] 327s autopkgtest [07:25:12]: test testsuite: - - - - - - - - - - results - - - - - - - - - - 327s testsuite FAIL non-zero exit status 2 327s autopkgtest [07:25:12]: test mercurial-git: preparing testbed 349s Creating nova instance adt-resolute-amd64-hg-git-20260210-065558-juju-7f2275-prod-proposed-migration-environment-20-a600b04f-bb3a-4a6c-bb17-bdf941c70cec from image adt/ubuntu-resolute-amd64-server-20260204.img (UUID fedf54b4-458b-493e-8072-6425c19717b4)... 437s autopkgtest [07:27:02]: testbed dpkg architecture: amd64 437s autopkgtest [07:27:02]: testbed apt version: 3.1.14 438s autopkgtest [07:27:03]: @@@@@@@@@@@@@@@@@@@@ test bed setup 438s autopkgtest [07:27:03]: testbed release detected to be: resolute 439s autopkgtest [07:27:04]: updating testbed package index (apt update) 439s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 439s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 439s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 439s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 439s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [178 kB] 439s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [31.1 kB] 439s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1727 kB] 439s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/main i386 Packages [219 kB] 439s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 Packages [266 kB] 439s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 c-n-f Metadata [6184 B] 439s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/restricted amd64 c-n-f Metadata [120 B] 439s Get:12 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 Packages [1787 kB] 439s Get:13 http://ftpmaster.internal/ubuntu resolute-proposed/universe i386 Packages [792 kB] 439s Get:14 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 c-n-f Metadata [32.5 kB] 439s Get:15 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse amd64 Packages [26.4 kB] 439s Get:16 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse i386 Packages [5020 B] 440s Get:17 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse amd64 c-n-f Metadata [996 B] 441s Fetched 5197 kB in 1s (5704 kB/s) 442s Reading package lists... 443s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 443s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 443s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 443s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 444s Reading package lists... 444s Reading package lists... 444s Building dependency tree... 444s Reading state information... 445s Calculating upgrade... 445s The following package was automatically installed and is no longer required: 445s libpython3.13 445s Use 'sudo apt autoremove' to remove it. 445s The following NEW packages will be installed: 445s gcc-16-base libpython3.14 libpython3.14-minimal libpython3.14-stdlib 445s linux-headers-6.19.0-3 linux-headers-6.19.0-3-generic 445s linux-image-6.19.0-3-generic linux-modules-6.19.0-3-generic 445s linux-tools-6.19.0-3 linux-tools-6.19.0-3-generic 445s The following packages will be upgraded: 445s 3cpio amd64-microcode apt bpftool busybox-initramfs busybox-static 445s cryptsetup-bin dash dbus dbus-bin dbus-daemon dbus-session-bus-common 445s dbus-system-bus-common dbus-user-session debianutils dmsetup dracut-install 445s ethtool findutils gir1.2-girepository-3.0 gir1.2-glib-2.0 hwdata iproute2 445s iptables less libapt-pkg7.0 libatomic1 libattr1 libbpf1 libbrotli1 libbsd0 445s libcryptsetup12 libdbus-1-3 libdevmapper1.02.1 libdrm-amdgpu1 libdrm-common 445s libdrm2 libevent-core-2.1-7t64 libgcc-s1 libgdbm-compat4t64 libgdbm6t64 445s libgirepository-2.0-0 libglib2.0-0t64 libglib2.0-data libgpm2 libgudev-1.0-0 445s libidn2-0 libip4tc2 libip6tc2 libjansson4 libkeyutils1 liblsof0 445s libmaxminddb0 libnetfilter-conntrack3 libnpth0t64 libonig5 libpcap0.8t64 445s libpci3 libsensors-config libsensors5 libstdc++6 libusb-1.0-0 libwrap0 445s libxau6 libxkbcommon0 libxtables12 linux-generic linux-headers-generic 445s linux-headers-virtual linux-image-generic linux-image-virtual linux-perf 445s linux-tools-common linux-virtual lsof man-db mawk patch pciutils pnp.ids 445s pollinate python3-linkify-it python3-markdown-it python3-referencing sed 445s shared-mime-info tar tcpdump ubuntu-kernel-accessories ubuntu-standard wget 445s 91 upgraded, 10 newly installed, 0 to remove and 0 not upgraded. 445s Need to get 237 MB of archives. 445s After this operation, 339 MB of additional disk space will be used. 445s Get:1 http://ftpmaster.internal/ubuntu resolute/main amd64 debianutils amd64 5.23.2build1 [93.3 kB] 445s Get:2 http://ftpmaster.internal/ubuntu resolute/main amd64 dash amd64 0.5.12-12ubuntu3 [96.0 kB] 445s Get:3 http://ftpmaster.internal/ubuntu resolute/main amd64 findutils amd64 4.10.0-3build2 [307 kB] 445s Get:4 http://ftpmaster.internal/ubuntu resolute/main amd64 sed amd64 4.9-2build3 [195 kB] 445s Get:5 http://ftpmaster.internal/ubuntu resolute/main amd64 tar amd64 1.35+dfsg-3.1build2 [257 kB] 445s Get:6 http://ftpmaster.internal/ubuntu resolute/main amd64 libattr1 amd64 1:2.5.2-3build2 [11.4 kB] 445s Get:7 http://ftpmaster.internal/ubuntu resolute/main amd64 gcc-16-base amd64 16-20260208-1ubuntu1 [59.7 kB] 445s Get:8 http://ftpmaster.internal/ubuntu resolute/main amd64 libgcc-s1 amd64 16-20260208-1ubuntu1 [80.3 kB] 445s Get:9 http://ftpmaster.internal/ubuntu resolute/main amd64 libbsd0 amd64 0.12.2-2build2 [42.3 kB] 445s Get:10 http://ftpmaster.internal/ubuntu resolute/main amd64 mawk amd64 1.3.4.20260129-1 [133 kB] 445s Get:11 http://ftpmaster.internal/ubuntu resolute/main amd64 libstdc++6 amd64 16-20260208-1ubuntu1 [844 kB] 445s Get:12 http://ftpmaster.internal/ubuntu resolute/main amd64 libapt-pkg7.0 amd64 3.1.15 [1151 kB] 446s Get:13 http://ftpmaster.internal/ubuntu resolute/main amd64 apt amd64 3.1.15 [1479 kB] 446s Get:14 http://ftpmaster.internal/ubuntu resolute/main amd64 dbus-system-bus-common all 1.16.2-2ubuntu3 [55.8 kB] 446s Get:15 http://ftpmaster.internal/ubuntu resolute/main amd64 dbus-session-bus-common all 1.16.2-2ubuntu3 [54.4 kB] 446s Get:16 http://ftpmaster.internal/ubuntu resolute/main amd64 dbus-user-session amd64 1.16.2-2ubuntu3 [9696 B] 446s Get:17 http://ftpmaster.internal/ubuntu resolute/main amd64 dbus-daemon amd64 1.16.2-2ubuntu3 [119 kB] 446s Get:18 http://ftpmaster.internal/ubuntu resolute/main amd64 dbus-bin amd64 1.16.2-2ubuntu3 [40.1 kB] 446s Get:19 http://ftpmaster.internal/ubuntu resolute/main amd64 dbus amd64 1.16.2-2ubuntu3 [24.2 kB] 446s Get:20 http://ftpmaster.internal/ubuntu resolute/main amd64 libdbus-1-3 amd64 1.16.2-2ubuntu3 [185 kB] 446s Get:21 http://ftpmaster.internal/ubuntu resolute/main amd64 libdevmapper1.02.1 amd64 2:1.02.205-2ubuntu3 [142 kB] 446s Get:22 http://ftpmaster.internal/ubuntu resolute/main amd64 dmsetup amd64 2:1.02.205-2ubuntu3 [79.4 kB] 446s Get:23 http://ftpmaster.internal/ubuntu resolute/main amd64 ethtool amd64 1:6.15-3build1 [318 kB] 446s Get:24 http://ftpmaster.internal/ubuntu resolute/main amd64 gir1.2-girepository-3.0 amd64 2.87.2-2 [25.2 kB] 446s Get:25 http://ftpmaster.internal/ubuntu resolute/main amd64 libgirepository-2.0-0 amd64 2.87.2-2 [76.1 kB] 446s Get:26 http://ftpmaster.internal/ubuntu resolute/main amd64 libatomic1 amd64 16-20260208-1ubuntu1 [11.4 kB] 446s Get:27 http://ftpmaster.internal/ubuntu resolute/main amd64 gir1.2-glib-2.0 amd64 2.87.2-2 [182 kB] 446s Get:28 http://ftpmaster.internal/ubuntu resolute/main amd64 libglib2.0-0t64 amd64 2.87.2-2 [1613 kB] 446s Get:29 http://ftpmaster.internal/ubuntu resolute/main amd64 libbpf1 amd64 1:1.6.2-1build1 [184 kB] 446s Get:30 http://ftpmaster.internal/ubuntu resolute/main amd64 iptables amd64 1.8.11-2ubuntu3 [381 kB] 446s Get:31 http://ftpmaster.internal/ubuntu resolute/main amd64 libip4tc2 amd64 1.8.11-2ubuntu3 [24.2 kB] 446s Get:32 http://ftpmaster.internal/ubuntu resolute/main amd64 libip6tc2 amd64 1.8.11-2ubuntu3 [24.4 kB] 446s Get:33 http://ftpmaster.internal/ubuntu resolute/main amd64 libnetfilter-conntrack3 amd64 1.1.1-1 [47.5 kB] 446s Get:34 http://ftpmaster.internal/ubuntu resolute/main amd64 libxtables12 amd64 1.8.11-2ubuntu3 [36.6 kB] 446s Get:35 http://ftpmaster.internal/ubuntu resolute/main amd64 iproute2 amd64 6.18.0-1ubuntu1 [1178 kB] 446s Get:36 http://ftpmaster.internal/ubuntu resolute/main amd64 less amd64 668-1build1 [172 kB] 446s Get:37 http://ftpmaster.internal/ubuntu resolute/main amd64 libcryptsetup12 amd64 2:2.8.0-1ubuntu3 [283 kB] 446s Get:38 http://ftpmaster.internal/ubuntu resolute/main amd64 libglib2.0-data all 2.87.2-2 [58.2 kB] 446s Get:39 http://ftpmaster.internal/ubuntu resolute/main amd64 libidn2-0 amd64 2.3.8-4build1 [67.6 kB] 446s Get:40 http://ftpmaster.internal/ubuntu resolute/main amd64 libkeyutils1 amd64 1.6.3-6ubuntu3 [10.6 kB] 446s Get:41 http://ftpmaster.internal/ubuntu resolute/main amd64 python3-linkify-it all 2.0.3-1ubuntu3 [19.4 kB] 446s Get:42 http://ftpmaster.internal/ubuntu resolute/main amd64 python3-markdown-it all 3.0.0-3build1 [54.4 kB] 446s Get:43 http://ftpmaster.internal/ubuntu resolute/main amd64 shared-mime-info amd64 2.4-5build3 [476 kB] 446s Get:44 http://ftpmaster.internal/ubuntu resolute/main amd64 busybox-static amd64 1:1.37.0-7ubuntu1 [1034 kB] 446s Get:45 http://ftpmaster.internal/ubuntu resolute/main amd64 libdrm-common all 2.4.131-1 [9774 B] 446s Get:46 http://ftpmaster.internal/ubuntu resolute/main amd64 libdrm2 amd64 2.4.131-1 [42.3 kB] 446s Get:47 http://ftpmaster.internal/ubuntu resolute/main amd64 libgdbm6t64 amd64 1.26-1build1 [36.5 kB] 446s Get:48 http://ftpmaster.internal/ubuntu resolute/main amd64 libgpm2 amd64 1.20.7-12build1 [14.4 kB] 446s Get:49 http://ftpmaster.internal/ubuntu resolute/main amd64 libjansson4 amd64 2.14-2build4 [33.2 kB] 446s Get:50 http://ftpmaster.internal/ubuntu resolute/main amd64 lsof amd64 4.99.4+dfsg-2build2 [239 kB] 446s Get:51 http://ftpmaster.internal/ubuntu resolute/main amd64 liblsof0 amd64 4.99.4+dfsg-2build2 [56.5 kB] 446s Get:52 http://ftpmaster.internal/ubuntu resolute/main amd64 libmaxminddb0 amd64 1.12.2-1build2 [18.9 kB] 446s Get:53 http://ftpmaster.internal/ubuntu resolute/main amd64 libpcap0.8t64 amd64 1.10.5-2ubuntu3 [154 kB] 446s Get:54 http://ftpmaster.internal/ubuntu resolute/main amd64 pciutils amd64 1:3.14.0-1build2 [95.5 kB] 446s Get:55 http://ftpmaster.internal/ubuntu resolute/main amd64 libpci3 amd64 1:3.14.0-1build2 [38.1 kB] 446s Get:56 http://ftpmaster.internal/ubuntu resolute/main amd64 libsensors-config all 1:3.6.2-2build1 [6862 B] 446s Get:57 http://ftpmaster.internal/ubuntu resolute/main amd64 libsensors5 amd64 1:3.6.2-2build1 [28.9 kB] 446s Get:58 http://ftpmaster.internal/ubuntu resolute/main amd64 libusb-1.0-0 amd64 2:1.0.29-2build1 [56.9 kB] 446s Get:59 http://ftpmaster.internal/ubuntu resolute/main amd64 libxau6 amd64 1:1.0.11-1build2 [7502 B] 446s Get:60 http://ftpmaster.internal/ubuntu resolute/main amd64 libxkbcommon0 amd64 1.13.1-1 [159 kB] 446s Get:61 http://ftpmaster.internal/ubuntu resolute/main amd64 man-db amd64 2.13.1-1build1 [1392 kB] 446s Get:62 http://ftpmaster.internal/ubuntu resolute/main amd64 tcpdump amd64 4.99.5-2ubuntu3 [477 kB] 446s Get:63 http://ftpmaster.internal/ubuntu resolute/main amd64 wget amd64 1.25.0-2ubuntu4 [353 kB] 446s Get:64 http://ftpmaster.internal/ubuntu resolute/main amd64 ubuntu-standard amd64 1.564 [13.3 kB] 446s Get:65 http://ftpmaster.internal/ubuntu resolute/main amd64 3cpio amd64 0.14.0-1ubuntu1 [285 kB] 446s Get:66 http://ftpmaster.internal/ubuntu resolute/main amd64 bpftool amd64 7.7.0+6.19.0-3.3 [1229 kB] 446s Get:67 http://ftpmaster.internal/ubuntu resolute/main amd64 busybox-initramfs amd64 1:1.37.0-7ubuntu1 [191 kB] 446s Get:68 http://ftpmaster.internal/ubuntu resolute/main amd64 cryptsetup-bin amd64 2:2.8.0-1ubuntu3 [228 kB] 446s Get:69 http://ftpmaster.internal/ubuntu resolute/main amd64 dracut-install amd64 109-11ubuntu1 [45.8 kB] 446s Get:70 http://ftpmaster.internal/ubuntu resolute/main amd64 hwdata all 0.394-1build1 [1566 B] 446s Get:71 http://ftpmaster.internal/ubuntu resolute/main amd64 pnp.ids all 0.394-1build1 [29.6 kB] 446s Get:72 http://ftpmaster.internal/ubuntu resolute/main amd64 libbrotli1 amd64 1.2.0-3 [343 kB] 446s Get:73 http://ftpmaster.internal/ubuntu resolute/main amd64 libdrm-amdgpu1 amd64 2.4.131-1 [23.2 kB] 446s Get:74 http://ftpmaster.internal/ubuntu resolute/main amd64 libevent-core-2.1-7t64 amd64 2.1.12-stable-10build2 [93.1 kB] 446s Get:75 http://ftpmaster.internal/ubuntu resolute/main amd64 libgdbm-compat4t64 amd64 1.26-1build1 [6796 B] 446s Get:76 http://ftpmaster.internal/ubuntu resolute/main amd64 libgudev-1.0-0 amd64 1:238-7build1 [15.9 kB] 446s Get:77 http://ftpmaster.internal/ubuntu resolute/main amd64 libnpth0t64 amd64 1.8-3build1 [9302 B] 446s Get:78 http://ftpmaster.internal/ubuntu resolute/main amd64 libonig5 amd64 6.9.10-1build1 [174 kB] 446s Get:79 http://ftpmaster.internal/ubuntu resolute/main amd64 libpython3.14-minimal amd64 3.14.2-1 [920 kB] 446s Get:80 http://ftpmaster.internal/ubuntu resolute/main amd64 libpython3.14-stdlib amd64 3.14.2-1 [2398 kB] 446s Get:81 http://ftpmaster.internal/ubuntu resolute/main amd64 libpython3.14 amd64 3.14.2-1 [2568 kB] 446s Get:82 http://ftpmaster.internal/ubuntu resolute/main amd64 libwrap0 amd64 7.6.q-36build2 [48.5 kB] 446s Get:83 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-modules-6.19.0-3-generic amd64 6.19.0-3.3 [171 MB] 451s Get:84 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-image-6.19.0-3-generic amd64 6.19.0-3.3+1 [16.8 MB] 452s Get:85 http://ftpmaster.internal/ubuntu resolute/main amd64 amd64-microcode amd64 3.20251202.1ubuntu1 [459 kB] 452s Get:86 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-generic amd64 6.19.0-3.3 [1698 B] 452s Get:87 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-image-generic amd64 6.19.0-3.3 [12.2 kB] 452s Get:88 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-virtual amd64 6.19.0-3.3 [1700 B] 452s Get:89 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-image-virtual amd64 6.19.0-3.3 [12.1 kB] 452s Get:90 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-headers-virtual amd64 6.19.0-3.3 [1646 B] 452s Get:91 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-headers-6.19.0-3 all 6.19.0-3.3 [14.9 MB] 452s Get:92 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-headers-6.19.0-3-generic amd64 6.19.0-3.3 [4330 kB] 452s Get:93 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-headers-generic amd64 6.19.0-3.3 [12.0 kB] 452s Get:94 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-perf amd64 6.19.0-3.3 [4480 kB] 452s Get:95 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-tools-common all 6.19.0-3.3 [345 kB] 452s Get:96 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-tools-6.19.0-3 amd64 6.19.0-3.3 [1455 kB] 452s Get:97 http://ftpmaster.internal/ubuntu resolute/main amd64 linux-tools-6.19.0-3-generic amd64 6.19.0-3.3 [1612 B] 452s Get:98 http://ftpmaster.internal/ubuntu resolute/main amd64 patch amd64 2.8-2build1 [95.7 kB] 452s Get:99 http://ftpmaster.internal/ubuntu resolute/main amd64 pollinate all 4.33-4ubuntu5 [14.0 kB] 452s Get:100 http://ftpmaster.internal/ubuntu resolute/main amd64 python3-referencing all 0.36.2-1ubuntu2 [22.2 kB] 452s Get:101 http://ftpmaster.internal/ubuntu resolute/main amd64 ubuntu-kernel-accessories amd64 1.564 [13.1 kB] 454s dpkg-preconfigure: unable to re-open stdin: No such file or directory 454s Fetched 237 MB in 7s (33.4 MB/s) 454s (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 ... 83957 files and directories currently installed.) 454s Preparing to unpack .../debianutils_5.23.2build1_amd64.deb ... 454s Unpacking debianutils (5.23.2build1) over (5.23.2) ... 454s Setting up debianutils (5.23.2build1) ... 454s (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 ... 83957 files and directories currently installed.) 454s Preparing to unpack .../dash_0.5.12-12ubuntu3_amd64.deb ... 454s Unpacking dash (0.5.12-12ubuntu3) over (0.5.12-12ubuntu2) ... 454s Setting up dash (0.5.12-12ubuntu3) ... 454s (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 ... 83957 files and directories currently installed.) 454s Preparing to unpack .../findutils_4.10.0-3build2_amd64.deb ... 454s Unpacking findutils (4.10.0-3build2) over (4.10.0-3build1) ... 454s Setting up findutils (4.10.0-3build2) ... 454s (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 ... 83957 files and directories currently installed.) 454s Preparing to unpack .../sed_4.9-2build3_amd64.deb ... 454s Unpacking sed (4.9-2build3) over (4.9-2build2) ... 454s Setting up sed (4.9-2build3) ... 454s (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 ... 83957 files and directories currently installed.) 454s Preparing to unpack .../tar_1.35+dfsg-3.1build2_amd64.deb ... 454s Unpacking tar (1.35+dfsg-3.1build2) over (1.35+dfsg-3.1build1) ... 454s Setting up tar (1.35+dfsg-3.1build2) ... 454s (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 ... 83957 files and directories currently installed.) 454s Preparing to unpack .../libattr1_1%3a2.5.2-3build2_amd64.deb ... 454s Unpacking libattr1:amd64 (1:2.5.2-3build2) over (1:2.5.2-3build1) ... 454s Setting up libattr1:amd64 (1:2.5.2-3build2) ... 454s Selecting previously unselected package gcc-16-base:amd64. 454s (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 ... 83957 files and directories currently installed.) 454s Preparing to unpack .../gcc-16-base_16-20260208-1ubuntu1_amd64.deb ... 454s Unpacking gcc-16-base:amd64 (16-20260208-1ubuntu1) ... 454s Setting up gcc-16-base:amd64 (16-20260208-1ubuntu1) ... 455s (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 ... 83962 files and directories currently installed.) 455s Preparing to unpack .../libgcc-s1_16-20260208-1ubuntu1_amd64.deb ... 455s Unpacking libgcc-s1:amd64 (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 455s Setting up libgcc-s1:amd64 (16-20260208-1ubuntu1) ... 455s (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 ... 83962 files and directories currently installed.) 455s Preparing to unpack .../00-libbsd0_0.12.2-2build2_amd64.deb ... 455s Unpacking libbsd0:amd64 (0.12.2-2build2) over (0.12.2-2build1) ... 455s Preparing to unpack .../01-mawk_1.3.4.20260129-1_amd64.deb ... 455s Unpacking mawk (1.3.4.20260129-1) over (1.3.4.20250131-2) ... 455s Preparing to unpack .../02-libstdc++6_16-20260208-1ubuntu1_amd64.deb ... 455s Unpacking libstdc++6:amd64 (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 455s Preparing to unpack .../03-libapt-pkg7.0_3.1.15_amd64.deb ... 455s Unpacking libapt-pkg7.0:amd64 (3.1.15) over (3.1.14) ... 455s Preparing to unpack .../04-apt_3.1.15_amd64.deb ... 455s Unpacking apt (3.1.15) over (3.1.14) ... 455s Preparing to unpack .../05-dbus-system-bus-common_1.16.2-2ubuntu3_all.deb ... 455s Unpacking dbus-system-bus-common (1.16.2-2ubuntu3) over (1.16.2-2ubuntu2) ... 455s Preparing to unpack .../06-dbus-session-bus-common_1.16.2-2ubuntu3_all.deb ... 455s Unpacking dbus-session-bus-common (1.16.2-2ubuntu3) over (1.16.2-2ubuntu2) ... 456s Preparing to unpack .../07-dbus-user-session_1.16.2-2ubuntu3_amd64.deb ... 456s Unpacking dbus-user-session (1.16.2-2ubuntu3) over (1.16.2-2ubuntu2) ... 456s Preparing to unpack .../08-dbus-daemon_1.16.2-2ubuntu3_amd64.deb ... 456s Unpacking dbus-daemon (1.16.2-2ubuntu3) over (1.16.2-2ubuntu2) ... 456s Preparing to unpack .../09-dbus-bin_1.16.2-2ubuntu3_amd64.deb ... 456s Unpacking dbus-bin (1.16.2-2ubuntu3) over (1.16.2-2ubuntu2) ... 456s Preparing to unpack .../10-dbus_1.16.2-2ubuntu3_amd64.deb ... 456s Unpacking dbus (1.16.2-2ubuntu3) over (1.16.2-2ubuntu2) ... 456s Preparing to unpack .../11-libdbus-1-3_1.16.2-2ubuntu3_amd64.deb ... 456s Unpacking libdbus-1-3:amd64 (1.16.2-2ubuntu3) over (1.16.2-2ubuntu2) ... 456s Preparing to unpack .../12-libdevmapper1.02.1_2%3a1.02.205-2ubuntu3_amd64.deb ... 456s Unpacking libdevmapper1.02.1:amd64 (2:1.02.205-2ubuntu3) over (2:1.02.205-2ubuntu2) ... 456s Preparing to unpack .../13-dmsetup_2%3a1.02.205-2ubuntu3_amd64.deb ... 456s Unpacking dmsetup (2:1.02.205-2ubuntu3) over (2:1.02.205-2ubuntu2) ... 456s Preparing to unpack .../14-ethtool_1%3a6.15-3build1_amd64.deb ... 456s Unpacking ethtool (1:6.15-3build1) over (1:6.15-3) ... 456s Preparing to unpack .../15-gir1.2-girepository-3.0_2.87.2-2_amd64.deb ... 456s Unpacking gir1.2-girepository-3.0:amd64 (2.87.2-2) over (2.86.3-4) ... 456s Preparing to unpack .../16-libgirepository-2.0-0_2.87.2-2_amd64.deb ... 456s Unpacking libgirepository-2.0-0:amd64 (2.87.2-2) over (2.86.3-4) ... 456s Preparing to unpack .../17-libatomic1_16-20260208-1ubuntu1_amd64.deb ... 456s Unpacking libatomic1:amd64 (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 456s Preparing to unpack .../18-gir1.2-glib-2.0_2.87.2-2_amd64.deb ... 456s Unpacking gir1.2-glib-2.0:amd64 (2.87.2-2) over (2.86.3-4) ... 456s Preparing to unpack .../19-libglib2.0-0t64_2.87.2-2_amd64.deb ... 456s Unpacking libglib2.0-0t64:amd64 (2.87.2-2) over (2.86.3-4) ... 457s Preparing to unpack .../20-libbpf1_1%3a1.6.2-1build1_amd64.deb ... 457s Unpacking libbpf1:amd64 (1:1.6.2-1build1) over (1:1.6.2-1) ... 457s Preparing to unpack .../21-iptables_1.8.11-2ubuntu3_amd64.deb ... 457s Unpacking iptables (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 457s Preparing to unpack .../22-libip4tc2_1.8.11-2ubuntu3_amd64.deb ... 457s Unpacking libip4tc2:amd64 (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 457s Preparing to unpack .../23-libip6tc2_1.8.11-2ubuntu3_amd64.deb ... 457s Unpacking libip6tc2:amd64 (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 457s Preparing to unpack .../24-libnetfilter-conntrack3_1.1.1-1_amd64.deb ... 457s Unpacking libnetfilter-conntrack3:amd64 (1.1.1-1) over (1.1.0-1build1) ... 457s Preparing to unpack .../25-libxtables12_1.8.11-2ubuntu3_amd64.deb ... 457s Unpacking libxtables12:amd64 (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 457s Preparing to unpack .../26-iproute2_6.18.0-1ubuntu1_amd64.deb ... 457s Unpacking iproute2 (6.18.0-1ubuntu1) over (6.16.0-1ubuntu3) ... 457s Preparing to unpack .../27-less_668-1build1_amd64.deb ... 457s Unpacking less (668-1build1) over (668-1) ... 457s Preparing to unpack .../28-libcryptsetup12_2%3a2.8.0-1ubuntu3_amd64.deb ... 457s Unpacking libcryptsetup12:amd64 (2:2.8.0-1ubuntu3) over (2:2.8.0-1ubuntu2) ... 458s Preparing to unpack .../29-libglib2.0-data_2.87.2-2_all.deb ... 458s Unpacking libglib2.0-data (2.87.2-2) over (2.86.3-4) ... 458s Preparing to unpack .../30-libidn2-0_2.3.8-4build1_amd64.deb ... 458s Unpacking libidn2-0:amd64 (2.3.8-4build1) over (2.3.8-4) ... 458s Preparing to unpack .../31-libkeyutils1_1.6.3-6ubuntu3_amd64.deb ... 458s Unpacking libkeyutils1:amd64 (1.6.3-6ubuntu3) over (1.6.3-6ubuntu2) ... 458s Preparing to unpack .../32-python3-linkify-it_2.0.3-1ubuntu3_all.deb ... 458s Unpacking python3-linkify-it (2.0.3-1ubuntu3) over (2.0.3-1ubuntu2) ... 458s Preparing to unpack .../33-python3-markdown-it_3.0.0-3build1_all.deb ... 458s Unpacking python3-markdown-it (3.0.0-3build1) over (3.0.0-3) ... 458s Preparing to unpack .../34-shared-mime-info_2.4-5build3_amd64.deb ... 458s Unpacking shared-mime-info (2.4-5build3) over (2.4-5build2) ... 458s Preparing to unpack .../35-busybox-static_1%3a1.37.0-7ubuntu1_amd64.deb ... 458s Unpacking busybox-static (1:1.37.0-7ubuntu1) over (1:1.37.0-4ubuntu1) ... 458s Preparing to unpack .../36-libdrm-common_2.4.131-1_all.deb ... 458s Unpacking libdrm-common (2.4.131-1) over (2.4.129-1) ... 458s Preparing to unpack .../37-libdrm2_2.4.131-1_amd64.deb ... 458s Unpacking libdrm2:amd64 (2.4.131-1) over (2.4.129-1) ... 458s Preparing to unpack .../38-libgdbm6t64_1.26-1build1_amd64.deb ... 458s Unpacking libgdbm6t64:amd64 (1.26-1build1) over (1.26-1) ... 459s Preparing to unpack .../39-libgpm2_1.20.7-12build1_amd64.deb ... 459s Unpacking libgpm2:amd64 (1.20.7-12build1) over (1.20.7-12) ... 459s Preparing to unpack .../40-libjansson4_2.14-2build4_amd64.deb ... 459s Unpacking libjansson4:amd64 (2.14-2build4) over (2.14-2build3) ... 459s Preparing to unpack .../41-lsof_4.99.4+dfsg-2build2_amd64.deb ... 459s Unpacking lsof (4.99.4+dfsg-2build2) over (4.99.4+dfsg-2build1) ... 459s Preparing to unpack .../42-liblsof0_4.99.4+dfsg-2build2_amd64.deb ... 459s Unpacking liblsof0 (4.99.4+dfsg-2build2) over (4.99.4+dfsg-2build1) ... 459s Preparing to unpack .../43-libmaxminddb0_1.12.2-1build2_amd64.deb ... 459s Unpacking libmaxminddb0:amd64 (1.12.2-1build2) over (1.12.2-1build1) ... 459s Preparing to unpack .../44-libpcap0.8t64_1.10.5-2ubuntu3_amd64.deb ... 459s Unpacking libpcap0.8t64:amd64 (1.10.5-2ubuntu3) over (1.10.5-2ubuntu2) ... 459s Preparing to unpack .../45-pciutils_1%3a3.14.0-1build2_amd64.deb ... 459s Unpacking pciutils (1:3.14.0-1build2) over (1:3.14.0-1build1) ... 459s Preparing to unpack .../46-libpci3_1%3a3.14.0-1build2_amd64.deb ... 459s Unpacking libpci3:amd64 (1:3.14.0-1build2) over (1:3.14.0-1build1) ... 459s Preparing to unpack .../47-libsensors-config_1%3a3.6.2-2build1_all.deb ... 459s Unpacking libsensors-config (1:3.6.2-2build1) over (1:3.6.2-2) ... 459s Preparing to unpack .../48-libsensors5_1%3a3.6.2-2build1_amd64.deb ... 459s Unpacking libsensors5:amd64 (1:3.6.2-2build1) over (1:3.6.2-2) ... 459s Preparing to unpack .../49-libusb-1.0-0_2%3a1.0.29-2build1_amd64.deb ... 459s Unpacking libusb-1.0-0:amd64 (2:1.0.29-2build1) over (2:1.0.29-2) ... 459s Preparing to unpack .../50-libxau6_1%3a1.0.11-1build2_amd64.deb ... 459s Unpacking libxau6:amd64 (1:1.0.11-1build2) over (1:1.0.11-1build1) ... 459s Preparing to unpack .../51-libxkbcommon0_1.13.1-1_amd64.deb ... 460s Unpacking libxkbcommon0:amd64 (1.13.1-1) over (1.12.3-1) ... 460s Preparing to unpack .../52-man-db_2.13.1-1build1_amd64.deb ... 460s Unpacking man-db (2.13.1-1build1) over (2.13.1-1) ... 460s Preparing to unpack .../53-tcpdump_4.99.5-2ubuntu3_amd64.deb ... 460s Unpacking tcpdump (4.99.5-2ubuntu3) over (4.99.5-2ubuntu2) ... 460s Preparing to unpack .../54-wget_1.25.0-2ubuntu4_amd64.deb ... 460s Unpacking wget (1.25.0-2ubuntu4) over (1.25.0-2ubuntu3) ... 460s Preparing to unpack .../55-ubuntu-standard_1.564_amd64.deb ... 460s Unpacking ubuntu-standard (1.564) over (1.563) ... 460s Preparing to unpack .../56-3cpio_0.14.0-1ubuntu1_amd64.deb ... 460s Unpacking 3cpio (0.14.0-1ubuntu1) over (0.13.1-1ubuntu1) ... 460s Preparing to unpack .../57-bpftool_7.7.0+6.19.0-3.3_amd64.deb ... 460s Unpacking bpftool (7.7.0+6.19.0-3.3) over (7.7.0+6.18.0-9.9) ... 460s Preparing to unpack .../58-busybox-initramfs_1%3a1.37.0-7ubuntu1_amd64.deb ... 460s Unpacking busybox-initramfs (1:1.37.0-7ubuntu1) over (1:1.37.0-4ubuntu1) ... 460s Preparing to unpack .../59-cryptsetup-bin_2%3a2.8.0-1ubuntu3_amd64.deb ... 460s Unpacking cryptsetup-bin (2:2.8.0-1ubuntu3) over (2:2.8.0-1ubuntu2) ... 460s Preparing to unpack .../60-dracut-install_109-11ubuntu1_amd64.deb ... 460s Unpacking dracut-install (109-11ubuntu1) over (109-9ubuntu1) ... 460s Preparing to unpack .../61-hwdata_0.394-1build1_all.deb ... 460s Unpacking hwdata (0.394-1build1) over (0.394-1) ... 460s Preparing to unpack .../62-pnp.ids_0.394-1build1_all.deb ... 460s Unpacking pnp.ids (0.394-1build1) over (0.394-1) ... 460s Preparing to unpack .../63-libbrotli1_1.2.0-3_amd64.deb ... 460s Unpacking libbrotli1:amd64 (1.2.0-3) over (1.1.0-2build6) ... 460s Preparing to unpack .../64-libdrm-amdgpu1_2.4.131-1_amd64.deb ... 460s Unpacking libdrm-amdgpu1:amd64 (2.4.131-1) over (2.4.129-1) ... 461s Preparing to unpack .../65-libevent-core-2.1-7t64_2.1.12-stable-10build2_amd64.deb ... 461s Unpacking libevent-core-2.1-7t64:amd64 (2.1.12-stable-10build2) over (2.1.12-stable-10build1) ... 461s Preparing to unpack .../66-libgdbm-compat4t64_1.26-1build1_amd64.deb ... 461s Unpacking libgdbm-compat4t64:amd64 (1.26-1build1) over (1.26-1) ... 461s Preparing to unpack .../67-libgudev-1.0-0_1%3a238-7build1_amd64.deb ... 461s Unpacking libgudev-1.0-0:amd64 (1:238-7build1) over (1:238-7) ... 461s Preparing to unpack .../68-libnpth0t64_1.8-3build1_amd64.deb ... 461s Unpacking libnpth0t64:amd64 (1.8-3build1) over (1.8-3) ... 461s Preparing to unpack .../69-libonig5_6.9.10-1build1_amd64.deb ... 461s Unpacking libonig5:amd64 (6.9.10-1build1) over (6.9.10-1) ... 461s Selecting previously unselected package libpython3.14-minimal:amd64. 461s Preparing to unpack .../70-libpython3.14-minimal_3.14.2-1_amd64.deb ... 461s Unpacking libpython3.14-minimal:amd64 (3.14.2-1) ... 461s Selecting previously unselected package libpython3.14-stdlib:amd64. 461s Preparing to unpack .../71-libpython3.14-stdlib_3.14.2-1_amd64.deb ... 461s Unpacking libpython3.14-stdlib:amd64 (3.14.2-1) ... 461s Selecting previously unselected package libpython3.14:amd64. 461s Preparing to unpack .../72-libpython3.14_3.14.2-1_amd64.deb ... 461s Unpacking libpython3.14:amd64 (3.14.2-1) ... 461s Preparing to unpack .../73-libwrap0_7.6.q-36build2_amd64.deb ... 461s Unpacking libwrap0:amd64 (7.6.q-36build2) over (7.6.q-36build1) ... 461s Selecting previously unselected package linux-modules-6.19.0-3-generic. 461s Preparing to unpack .../74-linux-modules-6.19.0-3-generic_6.19.0-3.3_amd64.deb ... 461s Unpacking linux-modules-6.19.0-3-generic (6.19.0-3.3) ... 463s Selecting previously unselected package linux-image-6.19.0-3-generic. 463s Preparing to unpack .../75-linux-image-6.19.0-3-generic_6.19.0-3.3+1_amd64.deb ... 463s Unpacking linux-image-6.19.0-3-generic (6.19.0-3.3+1) ... 463s Preparing to unpack .../76-amd64-microcode_3.20251202.1ubuntu1_amd64.deb ... 463s Unpacking amd64-microcode (3.20251202.1ubuntu1) over (3.20250708.1ubuntu1) ... 463s Preparing to unpack .../77-linux-generic_6.19.0-3.3_amd64.deb ... 463s Unpacking linux-generic (6.19.0-3.3) over (6.18.0-9.9+1) ... 463s Preparing to unpack .../78-linux-image-generic_6.19.0-3.3_amd64.deb ... 463s Unpacking linux-image-generic (6.19.0-3.3) over (6.18.0-9.9+1) ... 463s Preparing to unpack .../79-linux-virtual_6.19.0-3.3_amd64.deb ... 463s Unpacking linux-virtual (6.19.0-3.3) over (6.18.0-9.9+1) ... 463s Preparing to unpack .../80-linux-image-virtual_6.19.0-3.3_amd64.deb ... 463s Unpacking linux-image-virtual (6.19.0-3.3) over (6.18.0-9.9+1) ... 463s Preparing to unpack .../81-linux-headers-virtual_6.19.0-3.3_amd64.deb ... 463s Unpacking linux-headers-virtual (6.19.0-3.3) over (6.18.0-9.9+1) ... 463s Selecting previously unselected package linux-headers-6.19.0-3. 463s Preparing to unpack .../82-linux-headers-6.19.0-3_6.19.0-3.3_all.deb ... 463s Unpacking linux-headers-6.19.0-3 (6.19.0-3.3) ... 466s Selecting previously unselected package linux-headers-6.19.0-3-generic. 466s Preparing to unpack .../83-linux-headers-6.19.0-3-generic_6.19.0-3.3_amd64.deb ... 466s Unpacking linux-headers-6.19.0-3-generic (6.19.0-3.3) ... 467s Preparing to unpack .../84-linux-headers-generic_6.19.0-3.3_amd64.deb ... 467s Unpacking linux-headers-generic (6.19.0-3.3) over (6.18.0-9.9+1) ... 467s Preparing to unpack .../85-linux-perf_6.19.0-3.3_amd64.deb ... 467s Unpacking linux-perf (6.19.0-3.3) over (6.18.0-9.9) ... 467s Preparing to unpack .../86-linux-tools-common_6.19.0-3.3_all.deb ... 467s Unpacking linux-tools-common (6.19.0-3.3) over (6.18.0-9.9) ... 468s Selecting previously unselected package linux-tools-6.19.0-3. 468s Preparing to unpack .../87-linux-tools-6.19.0-3_6.19.0-3.3_amd64.deb ... 468s Unpacking linux-tools-6.19.0-3 (6.19.0-3.3) ... 468s Selecting previously unselected package linux-tools-6.19.0-3-generic. 468s Preparing to unpack .../88-linux-tools-6.19.0-3-generic_6.19.0-3.3_amd64.deb ... 468s Unpacking linux-tools-6.19.0-3-generic (6.19.0-3.3) ... 468s Preparing to unpack .../89-patch_2.8-2build1_amd64.deb ... 468s Unpacking patch (2.8-2build1) over (2.8-2) ... 468s Preparing to unpack .../90-pollinate_4.33-4ubuntu5_all.deb ... 468s Unpacking pollinate (4.33-4ubuntu5) over (4.33-4ubuntu4) ... 468s Preparing to unpack .../91-python3-referencing_0.36.2-1ubuntu2_all.deb ... 468s Unpacking python3-referencing (0.36.2-1ubuntu2) over (0.36.2-1ubuntu1) ... 468s Preparing to unpack .../92-ubuntu-kernel-accessories_1.564_amd64.deb ... 468s Unpacking ubuntu-kernel-accessories (1.564) over (1.563) ... 468s Setting up libip4tc2:amd64 (1.8.11-2ubuntu3) ... 468s Setting up 3cpio (0.14.0-1ubuntu1) ... 468s Setting up libxau6:amd64 (1:1.0.11-1build2) ... 468s Setting up libnpth0t64:amd64 (1.8-3build1) ... 468s Setting up libkeyutils1:amd64 (1.6.3-6ubuntu3) ... 468s Setting up ubuntu-kernel-accessories (1.564) ... 468s Setting up libgpm2:amd64 (1.20.7-12build1) ... 468s Setting up libgdbm6t64:amd64 (1.26-1build1) ... 468s Setting up linux-modules-6.19.0-3-generic (6.19.0-3.3) ... 471s Setting up libgdbm-compat4t64:amd64 (1.26-1build1) ... 471s Setting up bpftool (7.7.0+6.19.0-3.3) ... 471s Setting up libip6tc2:amd64 (1.8.11-2ubuntu3) ... 471s Setting up liblsof0 (4.99.4+dfsg-2build2) ... 471s Setting up libmaxminddb0:amd64 (1.12.2-1build2) ... 471s Setting up libbrotli1:amd64 (1.2.0-3) ... 471s Setting up libpython3.14-minimal:amd64 (3.14.2-1) ... 471s Setting up libsensors-config (1:3.6.2-2build1) ... 471s Setting up less (668-1build1) ... 471s Setting up linux-headers-6.19.0-3 (6.19.0-3.3) ... 471s Setting up libidn2-0:amd64 (2.3.8-4build1) ... 471s Setting up amd64-microcode (3.20251202.1ubuntu1) ... 471s amd64-microcode: microcode will be updated at next boot 471s Setting up man-db (2.13.1-1build1) ... 471s Updating database of manual pages ... 474s man-db.service is a disabled or a static unit not running, not starting it. 474s Setting up libjansson4:amd64 (2.14-2build4) ... 474s Setting up libglib2.0-data (2.87.2-2) ... 474s Setting up pollinate (4.33-4ubuntu5) ... 485s Setting up busybox-static (1:1.37.0-7ubuntu1) ... 485s Setting up libwrap0:amd64 (7.6.q-36build2) ... 485s Setting up linux-image-6.19.0-3-generic (6.19.0-3.3+1) ... 488s I: /boot/vmlinuz is now a symlink to vmlinuz-6.19.0-3-generic 488s I: /boot/initrd.img is now a symlink to initrd.img-6.19.0-3-generic 488s Setting up libdbus-1-3:amd64 (1.16.2-2ubuntu3) ... 488s Setting up libatomic1:amd64 (16-20260208-1ubuntu1) ... 488s Setting up patch (2.8-2build1) ... 488s Setting up libsensors5:amd64 (1:3.6.2-2build1) ... 488s Setting up busybox-initramfs (1:1.37.0-7ubuntu1) ... 488s Setting up libxtables12:amd64 (1.8.11-2ubuntu3) ... 488s Setting up lsof (4.99.4+dfsg-2build2) ... 488s Setting up libpci3:amd64 (1:3.14.0-1build2) ... 488s Setting up libdevmapper1.02.1:amd64 (2:1.02.205-2ubuntu3) ... 488s Setting up dracut-install (109-11ubuntu1) ... 488s Setting up dmsetup (2:1.02.205-2ubuntu3) ... 488s Setting up libnetfilter-conntrack3:amd64 (1.1.1-1) ... 488s Setting up pnp.ids (0.394-1build1) ... 488s Setting up dbus-session-bus-common (1.16.2-2ubuntu3) ... 488s Setting up python3-linkify-it (2.0.3-1ubuntu3) ... 488s Setting up libpcap0.8t64:amd64 (1.10.5-2ubuntu3) ... 488s Setting up libcryptsetup12:amd64 (2:2.8.0-1ubuntu3) ... 488s Setting up mawk (1.3.4.20260129-1) ... 488s Setting up libevent-core-2.1-7t64:amd64 (2.1.12-stable-10build2) ... 488s Setting up libusb-1.0-0:amd64 (2:1.0.29-2build1) ... 488s Setting up linux-image-virtual (6.19.0-3.3) ... 488s Setting up dbus-system-bus-common (1.16.2-2ubuntu3) ... 488s Setting up libbsd0:amd64 (0.12.2-2build2) ... 488s Setting up libdrm-common (2.4.131-1) ... 488s Setting up libstdc++6:amd64 (16-20260208-1ubuntu1) ... 488s Setting up dbus-bin (1.16.2-2ubuntu3) ... 488s Setting up libonig5:amd64 (6.9.10-1build1) ... 488s Setting up libbpf1:amd64 (1:1.6.2-1build1) ... 488s Setting up ethtool (1:6.15-3build1) ... 488s Setting up python3-referencing (0.36.2-1ubuntu2) ... 488s Setting up libxkbcommon0:amd64 (1.13.1-1) ... 488s Setting up cryptsetup-bin (2:2.8.0-1ubuntu3) ... 488s Setting up linux-headers-6.19.0-3-generic (6.19.0-3.3) ... 488s Setting up tcpdump (4.99.5-2ubuntu3) ... 488s Setting up linux-image-generic (6.19.0-3.3) ... 488s Setting up wget (1.25.0-2ubuntu4) ... 488s Setting up libpython3.14-stdlib:amd64 (3.14.2-1) ... 489s Setting up iptables (1.8.11-2ubuntu3) ... 489s Setting up iproute2 (6.18.0-1ubuntu1) ... 489s Setting up linux-headers-generic (6.19.0-3.3) ... 489s Setting up dbus-daemon (1.16.2-2ubuntu3) ... 489s Setting up hwdata (0.394-1build1) ... 489s Setting up dbus-user-session (1.16.2-2ubuntu3) ... 489s Setting up libglib2.0-0t64:amd64 (2.87.2-2) ... 489s No schema files found: doing nothing. 489s Setting up dbus (1.16.2-2ubuntu3) ... 489s A reboot is required to replace the running dbus-daemon. 489s Please reboot the system when convenient. 489s Setting up shared-mime-info (2.4-5build3) ... 491s Setting up gir1.2-glib-2.0:amd64 (2.87.2-2) ... 491s Setting up pciutils (1:3.14.0-1build2) ... 491s Setting up python3-markdown-it (3.0.0-3build1) ... 492s Setting up libdrm2:amd64 (2.4.131-1) ... 492s Setting up libpython3.14:amd64 (3.14.2-1) ... 492s Setting up libapt-pkg7.0:amd64 (3.1.15) ... 492s Setting up linux-tools-common (6.19.0-3.3) ... 492s Setting up libgudev-1.0-0:amd64 (1:238-7build1) ... 492s Setting up libdrm-amdgpu1:amd64 (2.4.131-1) ... 492s Setting up apt (3.1.15) ... 492s Setting up linux-headers-virtual (6.19.0-3.3) ... 492s Setting up linux-generic (6.19.0-3.3) ... 492s Setting up libgirepository-2.0-0:amd64 (2.87.2-2) ... 492s Setting up linux-tools-6.19.0-3 (6.19.0-3.3) ... 492s Setting up ubuntu-standard (1.564) ... 492s Setting up gir1.2-girepository-3.0:amd64 (2.87.2-2) ... 492s Setting up linux-virtual (6.19.0-3.3) ... 492s Setting up linux-perf (6.19.0-3.3) ... 492s Setting up linux-tools-6.19.0-3-generic (6.19.0-3.3) ... 492s Processing triggers for debianutils (5.23.2build1) ... 493s Processing triggers for install-info (7.2-5) ... 493s Processing triggers for initramfs-tools (0.150ubuntu7) ... 493s update-initramfs: Generating /boot/initrd.img-6.18.0-9-generic 502s Processing triggers for libc-bin (2.42-2ubuntu4) ... 502s Processing triggers for linux-image-6.19.0-3-generic (6.19.0-3.3+1) ... 502s /etc/kernel/postinst.d/initramfs-tools: 502s update-initramfs: Generating /boot/initrd.img-6.19.0-3-generic 511s /etc/kernel/postinst.d/zz-update-grub: 511s Sourcing file `/etc/default/grub' 511s Sourcing file `/etc/default/grub.d/50-cloudimg-settings.cfg' 511s Sourcing file `/etc/default/grub.d/90-autopkgtest.cfg' 511s Generating grub configuration file ... 511s Found linux image: /boot/vmlinuz-6.19.0-3-generic 511s Found initrd image: /boot/initrd.img-6.19.0-3-generic 511s Found linux image: /boot/vmlinuz-6.18.0-9-generic 511s Found initrd image: /boot/initrd.img-6.18.0-9-generic 511s Warning: os-prober will not be executed to detect other bootable partitions. 511s Systems on them will not be added to the GRUB boot configuration. 511s Check GRUB_DISABLE_OS_PROBER documentation entry. 511s Adding boot menu entry for UEFI Firmware Settings ... 511s done 512s autopkgtest [07:28:17]: upgrading testbed (apt dist-upgrade and autopurge) 513s Reading package lists... 513s Building dependency tree... 513s Reading state information... 514s Calculating upgrade... 514s The following package was automatically installed and is no longer required: 514s libpython3.13 514s Use 'sudo apt autoremove' to remove it. 514s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 514s Reading package lists... 514s Building dependency tree... 514s Reading state information... 514s Solving dependencies... 514s The following packages will be REMOVED: 514s libpython3.13* 515s 0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded. 515s After this operation, 7599 kB disk space will be freed. 515s (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 ... 125273 files and directories currently installed.) 515s Removing libpython3.13:amd64 (3.13.11-1) ... 515s Processing triggers for libc-bin (2.42-2ubuntu4) ... 515s autopkgtest [07:28:20]: rebooting testbed after setup commands that affected boot 556s Reading package lists... 557s Building dependency tree... 557s Reading state information... 557s Solving dependencies... 557s The following NEW packages will be installed: 557s git git-man liberror-perl mercurial mercurial-common mercurial-git 557s python3-dulwich 558s 0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded. 558s Need to get 9175 kB of archives. 558s After this operation, 48.5 MB of additional disk space will be used. 558s Get:1 http://ftpmaster.internal/ubuntu resolute/main amd64 liberror-perl all 0.17030-1 [23.5 kB] 558s Get:2 http://ftpmaster.internal/ubuntu resolute/main amd64 git-man all 1:2.51.0-1ubuntu1 [1179 kB] 558s Get:3 http://ftpmaster.internal/ubuntu resolute/main amd64 git amd64 1:2.51.0-1ubuntu1 [4414 kB] 558s Get:4 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 mercurial-common all 7.2-2 [2853 kB] 558s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 mercurial amd64 7.2-2 [461 kB] 558s Get:6 http://ftpmaster.internal/ubuntu resolute/universe amd64 python3-dulwich amd64 0.22.7-1 [183 kB] 558s Get:7 http://ftpmaster.internal/ubuntu resolute/universe amd64 mercurial-git all 1.2.0-1 [60.9 kB] 559s Fetched 9175 kB in 1s (8682 kB/s) 559s Selecting previously unselected package liberror-perl. 559s (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 ... 125269 files and directories currently installed.) 559s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 559s Unpacking liberror-perl (0.17030-1) ... 559s Selecting previously unselected package git-man. 559s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 559s Unpacking git-man (1:2.51.0-1ubuntu1) ... 559s Selecting previously unselected package git. 559s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_amd64.deb ... 559s Unpacking git (1:2.51.0-1ubuntu1) ... 559s Selecting previously unselected package mercurial-common. 559s Preparing to unpack .../3-mercurial-common_7.2-2_all.deb ... 559s Unpacking mercurial-common (7.2-2) ... 559s Selecting previously unselected package mercurial. 559s Preparing to unpack .../4-mercurial_7.2-2_amd64.deb ... 559s Unpacking mercurial (7.2-2) ... 559s Selecting previously unselected package python3-dulwich. 559s Preparing to unpack .../5-python3-dulwich_0.22.7-1_amd64.deb ... 559s Unpacking python3-dulwich (0.22.7-1) ... 559s Selecting previously unselected package mercurial-git. 559s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 559s Unpacking mercurial-git (1.2.0-1) ... 559s Setting up mercurial-common (7.2-2) ... 561s Setting up liberror-perl (0.17030-1) ... 561s Setting up python3-dulwich (0.22.7-1) ... 562s Setting up git-man (1:2.51.0-1ubuntu1) ... 562s Setting up mercurial (7.2-2) ... 562s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 562s Setting up mercurial-git (1.2.0-1) ... 562s mercurial-git extension is disabled by default. 562s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 562s Setting up git (1:2.51.0-1ubuntu1) ... 562s Processing triggers for man-db (2.13.1-1build1) ... 565s autopkgtest [07:29:10]: test mercurial-git: [----------------------- 565s Initialized empty Git repository in /tmp/autopkgtest.g7ErZt/build.JF2/src/git_server/ 565s Cloning into 'git_clone'... 565s warning: You appear to have cloned an empty repository. 565s done. 565s [master (root-commit) 47a7366] a 565s 1 file changed, 1 insertion(+) 565s create mode 100644 a 565s To /tmp/autopkgtest.g7ErZt/build.JF2/src/git_server 565s * [new branch] master -> master 566s Traceback (most recent call last): 566s File "/usr/lib/python3/dist-packages/mercurial/extensions.py", line 291, in _runextsetup 566s extsetup(ui) 566s ~~~~~~~~^^^^ 566s File "/usr/lib/python3/dist-packages/mercurial/exthelper.py", line 227, in finalextsetup 566s c(ui) 566s ~^^^^ 566s File "/usr/lib/python3/dist-packages/hggit/bundle.py", line 76, in install_server_support 566s @bundle2.parthandler(BUNDLEPART_MAP) 566s ^^^^^^^^^^^^^^^^^^^ 566s AttributeError: module 'mercurial.bundle2' has no attribute 'parthandler' 566s *** failed to set up extension hggit: module 'mercurial.bundle2' has no attribute 'parthandler' 566s abort: repository git_server not found 566s autopkgtest [07:29:11]: test mercurial-git: -----------------------] 567s autopkgtest [07:29:12]: test mercurial-git: - - - - - - - - - - results - - - - - - - - - - 567s mercurial-git FAIL non-zero exit status 253 567s autopkgtest [07:29:12]: test mercurial-git: - - - - - - - - - - stderr - - - - - - - - - - 567s Traceback (most recent call last): 567s File "/usr/lib/python3/dist-packages/mercurial/extensions.py", line 291, in _runextsetup 567s extsetup(ui) 567s ~~~~~~~~^^^^ 567s File "/usr/lib/python3/dist-packages/mercurial/exthelper.py", line 227, in finalextsetup 567s c(ui) 567s ~^^^^ 567s File "/usr/lib/python3/dist-packages/hggit/bundle.py", line 76, in install_server_support 567s @bundle2.parthandler(BUNDLEPART_MAP) 567s ^^^^^^^^^^^^^^^^^^^ 567s AttributeError: module 'mercurial.bundle2' has no attribute 'parthandler' 567s *** failed to set up extension hggit: module 'mercurial.bundle2' has no attribute 'parthandler' 567s abort: repository git_server not found 567s autopkgtest [07:29:12]: @@@@@@@@@@@@@@@@@@@@ summary 567s testsuite FAIL non-zero exit status 2 567s mercurial-git FAIL non-zero exit status 253