0s autopkgtest [07:15:17]: starting date and time: 2026-02-10 07:15:17+0000 0s autopkgtest [07:15:17]: git checkout: 4b346b80 nova: make wait_reboot return success even when a no-op 0s autopkgtest [07:15:17]: host juju-7f2275-prod-proposed-migration-environment-20; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.iyhyz_hs/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-arm64 --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-20@sto01-arm64-14.secgroup --name adt-resolute-arm64-hg-git-20260210-065559-juju-7f2275-prod-proposed-migration-environment-20-34afd494-19e4-4f79-8645-a231d15a6900 --image adt/ubuntu-resolute-arm64-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-20 --net-id=net_prod-autopkgtest-workers-arm64 -e TERM=linux --mirror=http://ftpmaster.internal/ubuntu/ 3s Creating nova instance adt-resolute-arm64-hg-git-20260210-065559-juju-7f2275-prod-proposed-migration-environment-20-34afd494-19e4-4f79-8645-a231d15a6900 from image adt/ubuntu-resolute-arm64-server-20260209.img (UUID 793037ca-75af-461b-82de-f8081300b2e3)... 95s autopkgtest [07:16:52]: testbed dpkg architecture: arm64 95s autopkgtest [07:16:52]: testbed apt version: 3.1.15 95s autopkgtest [07:16:52]: @@@@@@@@@@@@@@@@@@@@ test bed setup 96s autopkgtest [07:16:53]: testbed release detected to be: None 96s autopkgtest [07:16:53]: updating testbed package index (apt update) 97s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 97s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 97s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 97s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 97s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [178 kB] 97s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1727 kB] 99s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [31.1 kB] 99s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/main arm64 Packages [263 kB] 99s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main arm64 c-n-f Metadata [6288 B] 99s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/restricted arm64 c-n-f Metadata [120 B] 99s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/universe arm64 Packages [1769 kB] 100s Get:12 http://ftpmaster.internal/ubuntu resolute-proposed/universe arm64 c-n-f Metadata [31.3 kB] 100s Get:13 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse arm64 Packages [23.0 kB] 100s Get:14 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse arm64 c-n-f Metadata [688 B] 102s Fetched 4153 kB in 4s (1069 kB/s) 103s Reading package lists... 103s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 103s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 104s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 104s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 104s Reading package lists... 104s Reading package lists... 105s Building dependency tree... 105s Reading state information... 105s Calculating upgrade... 105s The following NEW packages will be installed: 105s gcc-16-base 105s The following packages will be upgraded: 105s cryptsetup-bin dracut-install iproute2 iptables libatomic1 libbrotli1 105s libcryptsetup12 libgcc-s1 libip4tc2 libip6tc2 libstdc++6 libxtables12 wget 105s 13 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. 105s Need to get 3779 kB of archives. 105s After this operation, 218 kB of additional disk space will be used. 105s Get:1 http://ftpmaster.internal/ubuntu resolute/main arm64 gcc-16-base arm64 16-20260208-1ubuntu1 [59.7 kB] 105s Get:2 http://ftpmaster.internal/ubuntu resolute/main arm64 libgcc-s1 arm64 16-20260208-1ubuntu1 [60.9 kB] 105s Get:3 http://ftpmaster.internal/ubuntu resolute/main arm64 iptables arm64 1.8.11-2ubuntu3 [386 kB] 105s Get:4 http://ftpmaster.internal/ubuntu resolute/main arm64 libip4tc2 arm64 1.8.11-2ubuntu3 [24.3 kB] 105s Get:5 http://ftpmaster.internal/ubuntu resolute/main arm64 libip6tc2 arm64 1.8.11-2ubuntu3 [24.7 kB] 105s Get:6 http://ftpmaster.internal/ubuntu resolute/main arm64 libxtables12 arm64 1.8.11-2ubuntu3 [36.7 kB] 105s Get:7 http://ftpmaster.internal/ubuntu resolute/main arm64 iproute2 arm64 6.18.0-1ubuntu1 [1171 kB] 107s Get:8 http://ftpmaster.internal/ubuntu resolute/main arm64 libatomic1 arm64 16-20260208-1ubuntu1 [11.1 kB] 107s Get:9 http://ftpmaster.internal/ubuntu resolute/main arm64 libcryptsetup12 arm64 2:2.8.0-1ubuntu3 [274 kB] 107s Get:10 http://ftpmaster.internal/ubuntu resolute/main arm64 libstdc++6 arm64 16-20260208-1ubuntu1 [768 kB] 107s Get:11 http://ftpmaster.internal/ubuntu resolute/main arm64 wget arm64 1.25.0-2ubuntu4 [344 kB] 107s Get:12 http://ftpmaster.internal/ubuntu resolute/main arm64 cryptsetup-bin arm64 2:2.8.0-1ubuntu3 [227 kB] 107s Get:13 http://ftpmaster.internal/ubuntu resolute/main arm64 dracut-install arm64 109-11ubuntu1 [45.3 kB] 107s Get:14 http://ftpmaster.internal/ubuntu resolute/main arm64 libbrotli1 arm64 1.2.0-3 [346 kB] 108s dpkg-preconfigure: unable to re-open stdin: No such file or directory 108s Fetched 3779 kB in 2s (1799 kB/s) 108s Selecting previously unselected package gcc-16-base:arm64. 108s (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 ... 136597 files and directories currently installed.) 108s Preparing to unpack .../gcc-16-base_16-20260208-1ubuntu1_arm64.deb ... 108s Unpacking gcc-16-base:arm64 (16-20260208-1ubuntu1) ... 108s Setting up gcc-16-base:arm64 (16-20260208-1ubuntu1) ... 108s (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 ... 136602 files and directories currently installed.) 108s Preparing to unpack .../libgcc-s1_16-20260208-1ubuntu1_arm64.deb ... 108s Unpacking libgcc-s1:arm64 (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 108s Setting up libgcc-s1:arm64 (16-20260208-1ubuntu1) ... 108s (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 ... 136602 files and directories currently installed.) 108s Preparing to unpack .../00-iptables_1.8.11-2ubuntu3_arm64.deb ... 108s Unpacking iptables (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 109s Preparing to unpack .../01-libip4tc2_1.8.11-2ubuntu3_arm64.deb ... 109s Unpacking libip4tc2:arm64 (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 109s Preparing to unpack .../02-libip6tc2_1.8.11-2ubuntu3_arm64.deb ... 109s Unpacking libip6tc2:arm64 (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 109s Preparing to unpack .../03-libxtables12_1.8.11-2ubuntu3_arm64.deb ... 109s Unpacking libxtables12:arm64 (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 109s Preparing to unpack .../04-iproute2_6.18.0-1ubuntu1_arm64.deb ... 109s Unpacking iproute2 (6.18.0-1ubuntu1) over (6.16.0-1ubuntu3) ... 109s Preparing to unpack .../05-libatomic1_16-20260208-1ubuntu1_arm64.deb ... 109s Unpacking libatomic1:arm64 (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 109s Preparing to unpack .../06-libcryptsetup12_2%3a2.8.0-1ubuntu3_arm64.deb ... 109s Unpacking libcryptsetup12:arm64 (2:2.8.0-1ubuntu3) over (2:2.8.0-1ubuntu2) ... 109s Preparing to unpack .../07-libstdc++6_16-20260208-1ubuntu1_arm64.deb ... 109s Unpacking libstdc++6:arm64 (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 109s Preparing to unpack .../08-wget_1.25.0-2ubuntu4_arm64.deb ... 109s Unpacking wget (1.25.0-2ubuntu4) over (1.25.0-2ubuntu3) ... 110s Preparing to unpack .../09-cryptsetup-bin_2%3a2.8.0-1ubuntu3_arm64.deb ... 110s Unpacking cryptsetup-bin (2:2.8.0-1ubuntu3) over (2:2.8.0-1ubuntu2) ... 110s Preparing to unpack .../10-dracut-install_109-11ubuntu1_arm64.deb ... 110s Unpacking dracut-install (109-11ubuntu1) over (109-9ubuntu1) ... 110s Preparing to unpack .../11-libbrotli1_1.2.0-3_arm64.deb ... 110s Unpacking libbrotli1:arm64 (1.2.0-3) over (1.1.0-2build6) ... 110s Setting up libip4tc2:arm64 (1.8.11-2ubuntu3) ... 110s Setting up wget (1.25.0-2ubuntu4) ... 110s Setting up libip6tc2:arm64 (1.8.11-2ubuntu3) ... 110s Setting up libbrotli1:arm64 (1.2.0-3) ... 110s Setting up libatomic1:arm64 (16-20260208-1ubuntu1) ... 110s Setting up libxtables12:arm64 (1.8.11-2ubuntu3) ... 110s Setting up dracut-install (109-11ubuntu1) ... 110s Setting up libcryptsetup12:arm64 (2:2.8.0-1ubuntu3) ... 110s Setting up libstdc++6:arm64 (16-20260208-1ubuntu1) ... 110s Setting up cryptsetup-bin (2:2.8.0-1ubuntu3) ... 110s Setting up iptables (1.8.11-2ubuntu3) ... 110s Setting up iproute2 (6.18.0-1ubuntu1) ... 110s Processing triggers for man-db (2.13.1-1build1) ... 111s Processing triggers for install-info (7.2-5) ... 111s Processing triggers for libc-bin (2.42-2ubuntu4) ... 111s autopkgtest [07:17:08]: upgrading testbed (apt dist-upgrade and autopurge) 112s Reading package lists... 112s Building dependency tree... 112s Reading state information... 112s Calculating upgrade... 112s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 113s Reading package lists... 113s Building dependency tree... 113s Reading state information... 113s Solving dependencies... 113s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 116s autopkgtest [07:17:13]: testbed running kernel: Linux 6.19.0-3-generic #3-Ubuntu SMP PREEMPT_DYNAMIC Fri Jan 23 19:46:27 UTC 2026 116s autopkgtest [07:17:13]: @@@@@@@@@@@@@@@@@@@@ apt-source hg-git 118s Get:1 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (dsc) [2142 B] 118s Get:2 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (tar) [222 kB] 118s Get:3 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (diff) [6816 B] 118s gpgv: Signature made Sun Feb 16 14:22:41 2025 UTC 118s gpgv: using RSA key 8F6DE104377F3B11E741748731F3144544A1741A 118s gpgv: issuer "tchet@debian.org" 118s gpgv: Can't check signature: No public key 118s dpkg-source: warning: cannot verify inline signature for ./hg-git_1.2.0-1.dsc: no acceptable signature found 118s autopkgtest [07:17:15]: testing package hg-git version 1.2.0-1 118s autopkgtest [07:17:15]: build not needed 118s autopkgtest [07:17:15]: test testsuite: preparing testbed 118s Reading package lists... 119s Building dependency tree... 119s Reading state information... 119s Solving dependencies... 119s The following NEW packages will be installed: 119s git git-man liberror-perl mercurial mercurial-common mercurial-git 119s python3-dulwich unzip 119s 0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded. 119s Need to get 9331 kB of archives. 119s After this operation, 49.1 MB of additional disk space will be used. 119s Get:1 http://ftpmaster.internal/ubuntu resolute/main arm64 liberror-perl all 0.17030-1 [23.5 kB] 119s Get:2 http://ftpmaster.internal/ubuntu resolute/main arm64 git-man all 1:2.51.0-1ubuntu1 [1179 kB] 121s Get:3 http://ftpmaster.internal/ubuntu resolute/main arm64 git arm64 1:2.51.0-1ubuntu1 [4431 kB] 126s Get:4 http://ftpmaster.internal/ubuntu resolute-proposed/universe arm64 mercurial-common all 7.2-2 [2853 kB] 130s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe arm64 mercurial arm64 7.2-2 [425 kB] 130s Get:6 http://ftpmaster.internal/ubuntu resolute/universe arm64 python3-dulwich arm64 0.22.7-1 [183 kB] 130s Get:7 http://ftpmaster.internal/ubuntu resolute/universe arm64 mercurial-git all 1.2.0-1 [60.9 kB] 130s Get:8 http://ftpmaster.internal/ubuntu resolute/main arm64 unzip arm64 6.0-29ubuntu1 [176 kB] 130s Fetched 9331 kB in 11s (886 kB/s) 130s Selecting previously unselected package liberror-perl. 130s (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 ... 136605 files and directories currently installed.) 130s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 130s Unpacking liberror-perl (0.17030-1) ... 130s Selecting previously unselected package git-man. 130s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 130s Unpacking git-man (1:2.51.0-1ubuntu1) ... 130s Selecting previously unselected package git. 130s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_arm64.deb ... 130s Unpacking git (1:2.51.0-1ubuntu1) ... 130s Selecting previously unselected package mercurial-common. 130s Preparing to unpack .../3-mercurial-common_7.2-2_all.deb ... 130s Unpacking mercurial-common (7.2-2) ... 131s Selecting previously unselected package mercurial. 131s Preparing to unpack .../4-mercurial_7.2-2_arm64.deb ... 131s Unpacking mercurial (7.2-2) ... 131s Selecting previously unselected package python3-dulwich. 131s Preparing to unpack .../5-python3-dulwich_0.22.7-1_arm64.deb ... 131s Unpacking python3-dulwich (0.22.7-1) ... 131s Selecting previously unselected package mercurial-git. 131s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 131s Unpacking mercurial-git (1.2.0-1) ... 131s Selecting previously unselected package unzip. 131s Preparing to unpack .../7-unzip_6.0-29ubuntu1_arm64.deb ... 131s Unpacking unzip (6.0-29ubuntu1) ... 131s Setting up mercurial-common (7.2-2) ... 132s Setting up unzip (6.0-29ubuntu1) ... 132s Setting up liberror-perl (0.17030-1) ... 132s Setting up python3-dulwich (0.22.7-1) ... 133s Setting up git-man (1:2.51.0-1ubuntu1) ... 133s Setting up mercurial (7.2-2) ... 133s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 133s Setting up mercurial-git (1.2.0-1) ... 133s mercurial-git extension is disabled by default. 133s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 133s Setting up git (1:2.51.0-1ubuntu1) ... 133s Processing triggers for man-db (2.13.1-1build1) ... 135s autopkgtest [07:17:32]: test testsuite: [----------------------- 136s no username found, using 'ubuntu@autopkgtest.local' instead 136s cd tests && /usr/bin/python3 run-tests.py --with-hg=/usr/bin/hg --blacklist=/tmp/autopkgtest.tZFTgP/build.RJz/src/debian/hg-git.test_blacklist 136s running 82 tests using 2 parallel processes 148s ssssss 148s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-pull.t 148s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-pull.t#draft.err 148s @@ -35,153 +35,132 @@ 148s 148s pull without a name 148s $ hg init hgrepo 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ cd hgrepo 148s $ hg pull ../gitrepo 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s pulling from ../gitrepo 148s - importing 3 git commits 148s - adding bookmark beta 148s - adding bookmark delta 148s - adding bookmark master 148s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 148s - (run 'hg heads' to see heads, 'hg merge' to merge) 148s + abort: repository ../gitrepo not found 148s + [255] 148s $ git --git-dir .hg/git for-each-ref 148s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 148s + fatal: not a git repository: '.hg/git' 148s + [128] 148s $ hg log -Tp 148s - 2|draft|delta|tip 148s - 1|draft|beta| 148s - 0|draft|master|t_alpha 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ cd .. 148s $ rm -rf hgrepo 148s 148s pull with an implied name 148s $ hg init hgrepo 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ cd hgrepo 148s $ echo "[paths]" >> .hg/hgrc 148s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 148s $ hg pull ../gitrepo 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s pulling from ../gitrepo 148s - importing 3 git commits 148s - adding bookmark beta 148s - adding bookmark delta 148s - adding bookmark master 148s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 148s - (run 'hg heads' to see heads, 'hg merge' to merge) 148s + abort: repository ../gitrepo not found 148s + [255] 148s $ git --git-dir .hg/git for-each-ref 148s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 148s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 148s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 148s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 148s + fatal: not a git repository: '.hg/git' 148s + [128] 148s $ hg log -Tp 148s - 2|draft|delta|default/delta tip 148s - 1|draft|beta|default/beta 148s - 0|draft|master|default/master t_alpha 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ cd .. 148s $ rm -rf hgrepo 148s 148s pull with an explicit name 148s $ hg init hgrepo 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ cd hgrepo 148s $ echo "[paths]" >> .hg/hgrc 148s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 148s $ hg pull 148s - pulling from $TESTTMP/gitrepo 148s - importing 3 git commits 148s - adding bookmark beta 148s - adding bookmark delta 148s - adding bookmark master 148s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 148s - (run 'hg heads' to see heads, 'hg merge' to merge) 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ git --git-dir .hg/git for-each-ref 148s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 148s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 148s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 148s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 148s + fatal: not a git repository: '.hg/git' 148s + [128] 148s $ hg log -Tp 148s - 2|draft|delta|default/delta tip 148s - 1|draft|beta|default/beta 148s - 0|draft|master|default/master t_alpha 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ cd .. 148s $ rm -rf hgrepo 148s 148s pull a tag 148s $ hg init hgrepo 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ echo "[paths]" >> hgrepo/.hg/hgrc 148s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 148s $ hg -R hgrepo pull -r t_alpha 148s - pulling from $TESTTMP/gitrepo 148s - importing 1 git commits 148s - adding bookmark master 148s - new changesets ff7a2f2d8d70 (1 drafts) 148s - (run 'hg update' to get a working copy) 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo update t_alpha 148s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: unknown revision 't_alpha' 148s + [10] 148s $ hg log -Tp -R hgrepo 148s - 0|draft|master|default/master t_alpha tip 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s 148s no-op pull 148s $ hg -R hgrepo pull -r t_alpha 148s - pulling from $TESTTMP/gitrepo 148s - no changes found 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s 148s no-op pull with added bookmark 148s $ cd gitrepo 148s $ git checkout -qb epsilon t_alpha 148s $ cd .. 148s $ hg -R hgrepo pull -r epsilon 148s - pulling from $TESTTMP/gitrepo 148s - no changes found 148s - adding bookmark epsilon 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s 148s pull something that doesn't exist 148s $ hg -R hgrepo pull -r kaflaflibob 148s - pulling from $TESTTMP/gitrepo 148s - abort: unknown revision 'kaflaflibob'!? (re) 148s - [10] 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s 148s pull an ambiguous reference 148s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 148s $ hg -R hgrepo pull -r t_alpha 148s - pulling from $TESTTMP/gitrepo 148s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 148s - [10] 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 148s 148s pull a branch 148s $ hg -R hgrepo pull -r beta 148s - pulling from $TESTTMP/gitrepo 148s - importing 1 git commits 148s - adding bookmark beta 148s - new changesets 7fe02317c63d (1 drafts) 148s - (run 'hg update' to get a working copy) 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo log --graph --template=phases 148s - o changeset: 1:7fe02317c63d 148s - | bookmark: beta 148s - | tag: default/beta 148s - | tag: tip 148s - | phase: draft 148s - | user: test 148s - | date: Mon Jan 01 00:00:11 2007 +0000 148s - | summary: add beta 148s - | 148s - @ changeset: 0:ff7a2f2d8d70 148s - bookmark: epsilon 148s - bookmark: master 148s - tag: default/epsilon 148s - tag: default/master 148s - tag: t_alpha 148s - phase: draft 148s - user: test 148s - date: Mon Jan 01 00:00:10 2007 +0000 148s - summary: add alpha 148s - 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s 148s no-op pull should affect phases 148s $ hg -R hgrepo phase -fs beta 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: unknown revision 'beta' 148s + [10] 148s $ hg -R hgrepo pull -r beta 148s - pulling from $TESTTMP/gitrepo 148s - no changes found 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo phase beta 148s - 1: draft 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: unknown revision 'beta' 148s + [10] 148s 148s 148s add another commit and tag to the git repo 148s @@ -196,50 +175,12 @@ 148s 148s pull everything else 148s $ hg -R hgrepo pull 148s - pulling from $TESTTMP/gitrepo 148s - importing 2 git commits 148s - adding bookmark delta 148s - updating bookmark master 148s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 148s - (run 'hg heads' to see heads, 'hg merge' to merge) 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo log --graph --template=phases 148s - o changeset: 3:6f898ad1f3e1 148s - | bookmark: master 148s - | tag: default/master 148s - | tag: tip 148s - | phase: draft 148s - | parent: 0:ff7a2f2d8d70 148s - | user: test 148s - | date: Mon Jan 01 00:00:13 2007 +0000 148s - | summary: add gamma 148s - | 148s - | o changeset: 2:678ebee93e38 148s - |/ bookmark: delta 148s - | tag: default/delta 148s - | phase: draft 148s - | parent: 0:ff7a2f2d8d70 148s - | user: test 148s - | date: Mon Jan 01 00:00:12 2007 +0000 148s - | summary: add delta 148s - | 148s - | o changeset: 1:7fe02317c63d 148s - |/ bookmark: beta 148s - | tag: default/beta 148s - | tag: t_beta 148s - | phase: draft 148s - | user: test 148s - | date: Mon Jan 01 00:00:11 2007 +0000 148s - | summary: add beta 148s - | 148s - @ changeset: 0:ff7a2f2d8d70 148s - bookmark: epsilon 148s - tag: default/epsilon 148s - tag: t_alpha 148s - phase: draft 148s - user: test 148s - date: Mon Jan 01 00:00:10 2007 +0000 148s - summary: add alpha 148s - 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s add a merge to the git repo, and delete the branch 148s $ cd gitrepo 148s $ git merge -q -m "Merge branch 'beta'" beta 148s @@ -252,60 +193,26 @@ 148s 148s pull the merge 148s $ hg -R hgrepo tags | grep default/beta 148s - default/beta 1:7fe02317c63d 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + [1] 148s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 148s - pulling from $TESTTMP/gitrepo 148s - importing 1 git commits 148s - updating bookmark master 148s - deleting bookmark beta 148s - new changesets a02330f767a4 (1 drafts) 148s - (run 'hg update' to get a working copy) 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo tags | grep default/beta 148s - default/beta 1:7fe02317c63d 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + [1] 148s $ hg -R hgrepo pull 148s - pulling from $TESTTMP/gitrepo 148s - no changes found 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo tags | grep default/beta 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s [1] 148s $ hg -R hgrepo log --graph 148s - o changeset: 4:a02330f767a4 148s - |\ bookmark: master 148s - | | tag: default/master 148s - | | tag: tip 148s - | | parent: 3:6f898ad1f3e1 148s - | | parent: 1:7fe02317c63d 148s - | | user: test 148s - | | date: Mon Jan 01 00:00:13 2007 +0000 148s - | | summary: Merge branch 'beta' 148s - | | 148s - | o changeset: 3:6f898ad1f3e1 148s - | | parent: 0:ff7a2f2d8d70 148s - | | user: test 148s - | | date: Mon Jan 01 00:00:13 2007 +0000 148s - | | summary: add gamma 148s - | | 148s - | | o changeset: 2:678ebee93e38 148s - | |/ bookmark: delta 148s - | | tag: default/delta 148s - | | parent: 0:ff7a2f2d8d70 148s - | | user: test 148s - | | date: Mon Jan 01 00:00:12 2007 +0000 148s - | | summary: add delta 148s - | | 148s - o | changeset: 1:7fe02317c63d 148s - |/ tag: t_beta 148s - | user: test 148s - | date: Mon Jan 01 00:00:11 2007 +0000 148s - | summary: add beta 148s - | 148s - @ changeset: 0:ff7a2f2d8d70 148s - bookmark: epsilon 148s - tag: default/epsilon 148s - tag: t_alpha 148s - user: test 148s - date: Mon Jan 01 00:00:10 2007 +0000 148s - summary: add alpha 148s - 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s pull with wildcards 148s $ cd gitrepo 148s $ git checkout -qb releases/v1 master 148s @@ -324,66 +231,12 @@ 148s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 148s $ cd .. 148s $ hg -R hgrepo pull -r 'releases/*' 148s - pulling from $TESTTMP/gitrepo 148s - importing 2 git commits 148s - adding bookmark releases/v1 148s - adding bookmark releases/v2 148s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 148s - (run 'hg heads .' to see heads, 'hg merge' to merge) 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo log --graph 148s - o changeset: 6:a3f95e150b0a 148s - | bookmark: releases/v2 148s - | tag: default/releases/v2 148s - | tag: tip 148s - | parent: 4:a02330f767a4 148s - | user: test 148s - | date: Mon Jan 01 00:00:15 2007 +0000 148s - | summary: add eta 148s - | 148s - | o changeset: 5:218b2d0660d3 148s - |/ bookmark: releases/v1 148s - | tag: default/releases/v1 148s - | user: test 148s - | date: Mon Jan 01 00:00:14 2007 +0000 148s - | summary: add zeta 148s - | 148s - o changeset: 4:a02330f767a4 148s - |\ bookmark: master 148s - | | tag: default/master 148s - | | parent: 3:6f898ad1f3e1 148s - | | parent: 1:7fe02317c63d 148s - | | user: test 148s - | | date: Mon Jan 01 00:00:13 2007 +0000 148s - | | summary: Merge branch 'beta' 148s - | | 148s - | o changeset: 3:6f898ad1f3e1 148s - | | parent: 0:ff7a2f2d8d70 148s - | | user: test 148s - | | date: Mon Jan 01 00:00:13 2007 +0000 148s - | | summary: add gamma 148s - | | 148s - | | o changeset: 2:678ebee93e38 148s - | |/ bookmark: delta 148s - | | tag: default/delta 148s - | | parent: 0:ff7a2f2d8d70 148s - | | user: test 148s - | | date: Mon Jan 01 00:00:12 2007 +0000 148s - | | summary: add delta 148s - | | 148s - o | changeset: 1:7fe02317c63d 148s - |/ tag: t_beta 148s - | user: test 148s - | date: Mon Jan 01 00:00:11 2007 +0000 148s - | summary: add beta 148s - | 148s - @ changeset: 0:ff7a2f2d8d70 148s - bookmark: epsilon 148s - tag: default/epsilon 148s - tag: t_alpha 148s - user: test 148s - date: Mon Jan 01 00:00:10 2007 +0000 148s - summary: add alpha 148s - 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s 148s add old and new commits to the git repo -- make sure we're using the commit date 148s and not the author date 148s @@ -412,21 +265,19 @@ 148s Master is now filtered, so it's just stays there: 148s 148s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 148s - pulling from $TESTTMP/gitrepo 148s - no changes found 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo pull 148s - pulling from $TESTTMP/gitrepo 148s - no changes found 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo log -r master 148s - changeset: 4:a02330f767a4 148s - bookmark: master 148s - tag: default/master 148s - parent: 3:6f898ad1f3e1 148s - parent: 1:7fe02317c63d 148s - user: test 148s - date: Mon Jan 01 00:00:13 2007 +0000 148s - summary: Merge branch 'beta' 148s - 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: unknown revision 'master' 148s + [10] 148s 148s $ cd gitrepo 148s $ git checkout -q master 148s @@ -440,51 +291,13 @@ 148s > git tag -a -m 'tagging newtag' newtag 148s $ cd .. 148s $ hg -R hgrepo pull 148s - pulling from $TESTTMP/gitrepo 148s - importing 3 git commits 148s - updating bookmark master 148s - new changesets 49713da8f665:e103a73f33be (3 drafts) 148s - (run 'hg heads .' to see heads, 'hg merge' to merge) 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo heads 148s - changeset: 9:e103a73f33be 148s - bookmark: master 148s - tag: default/master 148s - tag: tip 148s - user: test 148s - date: Wed Jan 01 00:00:00 2014 +0000 148s - summary: newcommit 148s - 148s - changeset: 7:49713da8f665 148s - tag: newtag 148s - tag: oldtag 148s - parent: 4:a02330f767a4 148s - user: test 148s - date: Sat Mar 01 00:00:00 2014 +0000 148s - summary: oldtag 148s - 148s - changeset: 6:a3f95e150b0a 148s - bookmark: releases/v2 148s - tag: default/releases/v2 148s - parent: 4:a02330f767a4 148s - user: test 148s - date: Mon Jan 01 00:00:15 2007 +0000 148s - summary: add eta 148s - 148s - changeset: 5:218b2d0660d3 148s - bookmark: releases/v1 148s - tag: default/releases/v1 148s - user: test 148s - date: Mon Jan 01 00:00:14 2007 +0000 148s - summary: add zeta 148s - 148s - changeset: 2:678ebee93e38 148s - bookmark: delta 148s - tag: default/delta 148s - parent: 0:ff7a2f2d8d70 148s - user: test 148s - date: Mon Jan 01 00:00:12 2007 +0000 148s - summary: add delta 148s - 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + [1] 148s 148s test for ssh vulnerability 148s 148s @@ -494,18 +307,21 @@ 148s > EOF 148s 148s $ hg init a 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ cd a 148s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 148s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 148s [255] 148s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 148s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 148s [255] 148s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 148s - ssh: * fakehost%7?shellcommand* (glob) 148s - abort: git remote error: The remote server unexpectedly closed the connection. 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 148s [255] 148s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 148s - ssh: * fakehost%7?shellcommand* (glob) 148s - abort: git remote error: The remote server unexpectedly closed the connection. 148s - [255] 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 148s + [255] 148s 148s ERROR: test-pull.t#draft output changed 148s ! 148s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-pull.t 148s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-pull.t#secret.err 148s @@ -35,153 +35,132 @@ 148s 148s pull without a name 148s $ hg init hgrepo 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ cd hgrepo 148s $ hg pull ../gitrepo 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s pulling from ../gitrepo 148s - importing 3 git commits 148s - adding bookmark beta 148s - adding bookmark delta 148s - adding bookmark master 148s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 148s - (run 'hg heads' to see heads, 'hg merge' to merge) 148s + abort: repository ../gitrepo not found 148s + [255] 148s $ git --git-dir .hg/git for-each-ref 148s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 148s + fatal: not a git repository: '.hg/git' 148s + [128] 148s $ hg log -Tp 148s - 2|draft|delta|tip 148s - 1|draft|beta| 148s - 0|draft|master|t_alpha 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ cd .. 148s $ rm -rf hgrepo 148s 148s pull with an implied name 148s $ hg init hgrepo 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ cd hgrepo 148s $ echo "[paths]" >> .hg/hgrc 148s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 148s $ hg pull ../gitrepo 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s pulling from ../gitrepo 148s - importing 3 git commits 148s - adding bookmark beta 148s - adding bookmark delta 148s - adding bookmark master 148s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 148s - (run 'hg heads' to see heads, 'hg merge' to merge) 148s + abort: repository ../gitrepo not found 148s + [255] 148s $ git --git-dir .hg/git for-each-ref 148s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 148s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 148s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 148s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 148s + fatal: not a git repository: '.hg/git' 148s + [128] 148s $ hg log -Tp 148s - 2|draft|delta|default/delta tip 148s - 1|draft|beta|default/beta 148s - 0|draft|master|default/master t_alpha 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ cd .. 148s $ rm -rf hgrepo 148s 148s pull with an explicit name 148s $ hg init hgrepo 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ cd hgrepo 148s $ echo "[paths]" >> .hg/hgrc 148s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 148s $ hg pull 148s - pulling from $TESTTMP/gitrepo 148s - importing 3 git commits 148s - adding bookmark beta 148s - adding bookmark delta 148s - adding bookmark master 148s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 148s - (run 'hg heads' to see heads, 'hg merge' to merge) 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ git --git-dir .hg/git for-each-ref 148s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 148s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 148s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 148s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 148s + fatal: not a git repository: '.hg/git' 148s + [128] 148s $ hg log -Tp 148s - 2|draft|delta|default/delta tip 148s - 1|draft|beta|default/beta 148s - 0|draft|master|default/master t_alpha 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ cd .. 148s $ rm -rf hgrepo 148s 148s pull a tag 148s $ hg init hgrepo 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ echo "[paths]" >> hgrepo/.hg/hgrc 148s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 148s $ hg -R hgrepo pull -r t_alpha 148s - pulling from $TESTTMP/gitrepo 148s - importing 1 git commits 148s - adding bookmark master 148s - new changesets ff7a2f2d8d70 (1 drafts) 148s - (run 'hg update' to get a working copy) 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo update t_alpha 148s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: unknown revision 't_alpha' 148s + [10] 148s $ hg log -Tp -R hgrepo 148s - 0|draft|master|default/master t_alpha tip 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s 148s no-op pull 148s $ hg -R hgrepo pull -r t_alpha 148s - pulling from $TESTTMP/gitrepo 148s - no changes found 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s 148s no-op pull with added bookmark 148s $ cd gitrepo 148s $ git checkout -qb epsilon t_alpha 148s $ cd .. 148s $ hg -R hgrepo pull -r epsilon 148s - pulling from $TESTTMP/gitrepo 148s - no changes found 148s - adding bookmark epsilon 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s 148s pull something that doesn't exist 148s $ hg -R hgrepo pull -r kaflaflibob 148s - pulling from $TESTTMP/gitrepo 148s - abort: unknown revision 'kaflaflibob'!? (re) 148s - [10] 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s 148s pull an ambiguous reference 148s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 148s $ hg -R hgrepo pull -r t_alpha 148s - pulling from $TESTTMP/gitrepo 148s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 148s - [10] 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 148s 148s pull a branch 148s $ hg -R hgrepo pull -r beta 148s - pulling from $TESTTMP/gitrepo 148s - importing 1 git commits 148s - adding bookmark beta 148s - new changesets 7fe02317c63d (1 drafts) 148s - (run 'hg update' to get a working copy) 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo log --graph --template=phases 148s - o changeset: 1:7fe02317c63d 148s - | bookmark: beta 148s - | tag: default/beta 148s - | tag: tip 148s - | phase: draft 148s - | user: test 148s - | date: Mon Jan 01 00:00:11 2007 +0000 148s - | summary: add beta 148s - | 148s - @ changeset: 0:ff7a2f2d8d70 148s - bookmark: epsilon 148s - bookmark: master 148s - tag: default/epsilon 148s - tag: default/master 148s - tag: t_alpha 148s - phase: draft 148s - user: test 148s - date: Mon Jan 01 00:00:10 2007 +0000 148s - summary: add alpha 148s - 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s 148s no-op pull should affect phases 148s $ hg -R hgrepo phase -fs beta 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: unknown revision 'beta' 148s + [10] 148s $ hg -R hgrepo pull -r beta 148s - pulling from $TESTTMP/gitrepo 148s - no changes found 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo phase beta 148s - 1: draft 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: unknown revision 'beta' 148s + [10] 148s 148s 148s add another commit and tag to the git repo 148s @@ -196,50 +175,12 @@ 148s 148s pull everything else 148s $ hg -R hgrepo pull 148s - pulling from $TESTTMP/gitrepo 148s - importing 2 git commits 148s - adding bookmark delta 148s - updating bookmark master 148s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 148s - (run 'hg heads' to see heads, 'hg merge' to merge) 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo log --graph --template=phases 148s - o changeset: 3:6f898ad1f3e1 148s - | bookmark: master 148s - | tag: default/master 148s - | tag: tip 148s - | phase: draft 148s - | parent: 0:ff7a2f2d8d70 148s - | user: test 148s - | date: Mon Jan 01 00:00:13 2007 +0000 148s - | summary: add gamma 148s - | 148s - | o changeset: 2:678ebee93e38 148s - |/ bookmark: delta 148s - | tag: default/delta 148s - | phase: draft 148s - | parent: 0:ff7a2f2d8d70 148s - | user: test 148s - | date: Mon Jan 01 00:00:12 2007 +0000 148s - | summary: add delta 148s - | 148s - | o changeset: 1:7fe02317c63d 148s - |/ bookmark: beta 148s - | tag: default/beta 148s - | tag: t_beta 148s - | phase: draft 148s - | user: test 148s - | date: Mon Jan 01 00:00:11 2007 +0000 148s - | summary: add beta 148s - | 148s - @ changeset: 0:ff7a2f2d8d70 148s - bookmark: epsilon 148s - tag: default/epsilon 148s - tag: t_alpha 148s - phase: draft 148s - user: test 148s - date: Mon Jan 01 00:00:10 2007 +0000 148s - summary: add alpha 148s - 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s add a merge to the git repo, and delete the branch 148s $ cd gitrepo 148s $ git merge -q -m "Merge branch 'beta'" beta 148s @@ -252,60 +193,26 @@ 148s 148s pull the merge 148s $ hg -R hgrepo tags | grep default/beta 148s - default/beta 1:7fe02317c63d 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + [1] 148s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 148s - pulling from $TESTTMP/gitrepo 148s - importing 1 git commits 148s - updating bookmark master 148s - deleting bookmark beta 148s - new changesets a02330f767a4 (1 drafts) 148s - (run 'hg update' to get a working copy) 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo tags | grep default/beta 148s - default/beta 1:7fe02317c63d 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + [1] 148s $ hg -R hgrepo pull 148s - pulling from $TESTTMP/gitrepo 148s - no changes found 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo tags | grep default/beta 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s [1] 148s $ hg -R hgrepo log --graph 148s - o changeset: 4:a02330f767a4 148s - |\ bookmark: master 148s - | | tag: default/master 148s - | | tag: tip 148s - | | parent: 3:6f898ad1f3e1 148s - | | parent: 1:7fe02317c63d 148s - | | user: test 148s - | | date: Mon Jan 01 00:00:13 2007 +0000 148s - | | summary: Merge branch 'beta' 148s - | | 148s - | o changeset: 3:6f898ad1f3e1 148s - | | parent: 0:ff7a2f2d8d70 148s - | | user: test 148s - | | date: Mon Jan 01 00:00:13 2007 +0000 148s - | | summary: add gamma 148s - | | 148s - | | o changeset: 2:678ebee93e38 148s - | |/ bookmark: delta 148s - | | tag: default/delta 148s - | | parent: 0:ff7a2f2d8d70 148s - | | user: test 148s - | | date: Mon Jan 01 00:00:12 2007 +0000 148s - | | summary: add delta 148s - | | 148s - o | changeset: 1:7fe02317c63d 148s - |/ tag: t_beta 148s - | user: test 148s - | date: Mon Jan 01 00:00:11 2007 +0000 148s - | summary: add beta 148s - | 148s - @ changeset: 0:ff7a2f2d8d70 148s - bookmark: epsilon 148s - tag: default/epsilon 148s - tag: t_alpha 148s - user: test 148s - date: Mon Jan 01 00:00:10 2007 +0000 148s - summary: add alpha 148s - 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s pull with wildcards 148s $ cd gitrepo 148s $ git checkout -qb releases/v1 master 148s @@ -324,66 +231,12 @@ 148s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 148s $ cd .. 148s $ hg -R hgrepo pull -r 'releases/*' 148s - pulling from $TESTTMP/gitrepo 148s - importing 2 git commits 148s - adding bookmark releases/v1 148s - adding bookmark releases/v2 148s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 148s - (run 'hg heads .' to see heads, 'hg merge' to merge) 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo log --graph 148s - o changeset: 6:a3f95e150b0a 148s - | bookmark: releases/v2 148s - | tag: default/releases/v2 148s - | tag: tip 148s - | parent: 4:a02330f767a4 148s - | user: test 148s - | date: Mon Jan 01 00:00:15 2007 +0000 148s - | summary: add eta 148s - | 148s - | o changeset: 5:218b2d0660d3 148s - |/ bookmark: releases/v1 148s - | tag: default/releases/v1 148s - | user: test 148s - | date: Mon Jan 01 00:00:14 2007 +0000 148s - | summary: add zeta 148s - | 148s - o changeset: 4:a02330f767a4 148s - |\ bookmark: master 148s - | | tag: default/master 148s - | | parent: 3:6f898ad1f3e1 148s - | | parent: 1:7fe02317c63d 148s - | | user: test 148s - | | date: Mon Jan 01 00:00:13 2007 +0000 148s - | | summary: Merge branch 'beta' 148s - | | 148s - | o changeset: 3:6f898ad1f3e1 148s - | | parent: 0:ff7a2f2d8d70 148s - | | user: test 148s - | | date: Mon Jan 01 00:00:13 2007 +0000 148s - | | summary: add gamma 148s - | | 148s - | | o changeset: 2:678ebee93e38 148s - | |/ bookmark: delta 148s - | | tag: default/delta 148s - | | parent: 0:ff7a2f2d8d70 148s - | | user: test 148s - | | date: Mon Jan 01 00:00:12 2007 +0000 148s - | | summary: add delta 148s - | | 148s - o | changeset: 1:7fe02317c63d 148s - |/ tag: t_beta 148s - | user: test 148s - | date: Mon Jan 01 00:00:11 2007 +0000 148s - | summary: add beta 148s - | 148s - @ changeset: 0:ff7a2f2d8d70 148s - bookmark: epsilon 148s - tag: default/epsilon 148s - tag: t_alpha 148s - user: test 148s - date: Mon Jan 01 00:00:10 2007 +0000 148s - summary: add alpha 148s - 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s 148s add old and new commits to the git repo -- make sure we're using the commit date 148s and not the author date 148s @@ -412,21 +265,19 @@ 148s Master is now filtered, so it's just stays there: 148s 148s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 148s - pulling from $TESTTMP/gitrepo 148s - no changes found 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo pull 148s - pulling from $TESTTMP/gitrepo 148s - no changes found 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo log -r master 148s - changeset: 4:a02330f767a4 148s - bookmark: master 148s - tag: default/master 148s - parent: 3:6f898ad1f3e1 148s - parent: 1:7fe02317c63d 148s - user: test 148s - date: Mon Jan 01 00:00:13 2007 +0000 148s - summary: Merge branch 'beta' 148s - 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: unknown revision 'master' 148s + [10] 148s 148s $ cd gitrepo 148s $ git checkout -q master 148s @@ -440,51 +291,13 @@ 148s > git tag -a -m 'tagging newtag' newtag 148s $ cd .. 148s $ hg -R hgrepo pull 148s - pulling from $TESTTMP/gitrepo 148s - importing 3 git commits 148s - updating bookmark master 148s - new changesets 49713da8f665:e103a73f33be (3 drafts) 148s - (run 'hg heads .' to see heads, 'hg merge' to merge) 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + pulling from $TESTTMP/gitrepo 148s + abort: repository $TESTTMP/gitrepo not found 148s + [255] 148s $ hg -R hgrepo heads 148s - changeset: 9:e103a73f33be 148s - bookmark: master 148s - tag: default/master 148s - tag: tip 148s - user: test 148s - date: Wed Jan 01 00:00:00 2014 +0000 148s - summary: newcommit 148s - 148s - changeset: 7:49713da8f665 148s - tag: newtag 148s - tag: oldtag 148s - parent: 4:a02330f767a4 148s - user: test 148s - date: Sat Mar 01 00:00:00 2014 +0000 148s - summary: oldtag 148s - 148s - changeset: 6:a3f95e150b0a 148s - bookmark: releases/v2 148s - tag: default/releases/v2 148s - parent: 4:a02330f767a4 148s - user: test 148s - date: Mon Jan 01 00:00:15 2007 +0000 148s - summary: add eta 148s - 148s - changeset: 5:218b2d0660d3 148s - bookmark: releases/v1 148s - tag: default/releases/v1 148s - user: test 148s - date: Mon Jan 01 00:00:14 2007 +0000 148s - summary: add zeta 148s - 148s - changeset: 2:678ebee93e38 148s - bookmark: delta 148s - tag: default/delta 148s - parent: 0:ff7a2f2d8d70 148s - user: test 148s - date: Mon Jan 01 00:00:12 2007 +0000 148s - summary: add delta 148s - 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + [1] 148s 148s test for ssh vulnerability 148s 148s @@ -494,18 +307,21 @@ 148s > EOF 148s 148s $ hg init a 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ cd a 148s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 148s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 148s [255] 148s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 148s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 148s [255] 148s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 148s - ssh: * fakehost%7?shellcommand* (glob) 148s - abort: git remote error: The remote server unexpectedly closed the connection. 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 148s [255] 148s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 148s - ssh: * fakehost%7?shellcommand* (glob) 148s - abort: git remote error: The remote server unexpectedly closed the connection. 148s - [255] 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 148s + [255] 148s 148s ERROR: test-pull.t#secret output changed 149s ! 149s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-git-submodules.t 149s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-git-submodules.t.err 149s @@ -188,261 +188,9 @@ 149s $ cd .. 149s 149s $ hg clone gitrepo2 hgrepo 149s - importing 10 git commits 149s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 149s - updating to bookmark master 149s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 149s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 149s + abort: repository gitrepo2 not found 149s + [255] 149s $ cd hgrepo 149s + $TESTTMP.sh: 133: cd: can't cd to hgrepo 149s $ hg log --graph 149s - @ changeset: 9:0ad944b2c4d8 149s - | bookmark: master 149s - | tag: default/master 149s - | tag: tip 149s - | user: test 149s - | date: Mon Jan 01 00:00:12 2007 +0000 149s - | summary: remove all subrepos 149s - | 149s - o changeset: 8:33da452ef22f 149s - | user: test 149s - | date: Mon Jan 01 00:00:12 2007 +0000 149s - | summary: replace subrepo with symlink 149s - | 149s - o changeset: 7:acebec53c0fc 149s - | user: test 149s - | date: Mon Jan 01 00:00:12 2007 +0000 149s - | summary: replace symlink with subrepo 149s - | 149s - o changeset: 6:78c2ea52db4b 149s - | user: test 149s - | date: Mon Jan 01 00:00:12 2007 +0000 149s - | summary: add symlink 149s - | 149s - o changeset: 5:c0d52ffc59b8 149s - | user: test 149s - | date: Mon Jan 01 00:00:12 2007 +0000 149s - | summary: replace file with subrepo 149s - | 149s - o changeset: 4:73e078a178a0 149s - | user: test 149s - | date: Mon Jan 01 00:00:12 2007 +0000 149s - | summary: replace subrepo with file 149s - | 149s - o changeset: 3:29e236ba4c06 149s - | user: test 149s - | date: Mon Jan 01 00:00:12 2007 +0000 149s - | summary: add another subrepo 149s - | 149s - o changeset: 2:a6075a162f62 149s - | user: test 149s - | date: Mon Jan 01 00:00:12 2007 +0000 149s - | summary: change subrepo commit 149s - | 149s - o changeset: 1:a4036e758995 149s - | user: test 149s - | date: Mon Jan 01 00:00:11 2007 +0000 149s - | summary: add subrepo 149s - | 149s - o changeset: 0:ff7a2f2d8d70 149s - user: test 149s - date: Mon Jan 01 00:00:10 2007 +0000 149s - summary: add alpha 149s - 149s - $ hg book 149s - * master 9:0ad944b2c4d8 149s - 149s -(add subrepo) 149s - $ hg cat -r 1 .hgsubstate 149s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo 149s - $ hg cat -r 1 .hgsub 149s - subrepo = [git]../gitsubrepo 149s - $ hg gverify -r 1 149s - verifying rev a4036e758995 against git commit e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 149s - 149s -(change subrepo commit) 149s - $ hg cat -r 2 .hgsubstate 149s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 149s - $ hg cat -r 2 .hgsub 149s - subrepo = [git]../gitsubrepo 149s - $ hg gverify -r 2 149s - verifying rev a6075a162f62 against git commit a000567ceefbd9a2ce364e0dea6e298010b02b6d 149s - 149s -(add another subrepo) 149s - $ hg cat -r 3 .hgsubstate 149s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 149s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 149s - $ hg cat -r 3 .hgsub 149s - subrepo = [git]../gitsubrepo 149s - subrepo2 = [git]../gitsubrepo 149s - $ hg gverify -r 3 149s - verifying rev 29e236ba4c06 against git commit 6e219527869fa40eb6ffbdd013cd86d576b26b01 149s - 149s -(replace subrepo with file) 149s - $ hg cat -r 4 .hgsubstate 149s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 149s - $ hg cat -r 4 .hgsub 149s - subrepo2 = [git]../gitsubrepo 149s - $ hg manifest -r 4 149s - .hgsub 149s - .hgsubstate 149s - alpha 149s - subrepo 149s - $ hg gverify -r 4 149s - verifying rev 73e078a178a0 against git commit f6436a472da00f581d8d257e9bbaf3c358a5e88c 149s - 149s -(replace file with subrepo) 149s - $ hg cat -r 5 .hgsubstate 149s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 149s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 149s - $ hg cat -r 5 .hgsub 149s - subrepo2 = [git]../gitsubrepo 149s - alpha = [git]../gitsubrepo 149s - $ hg manifest -r 5 149s - .hgsub 149s - .hgsubstate 149s - subrepo 149s - $ hg gverify -r 5 149s - verifying rev c0d52ffc59b8 against git commit 88171163bf4795b5570924e51d5f8ede33f8bc28 149s - 149s -(replace symlink with subrepo) 149s - $ hg cat -r 7 .hgsub 149s - subrepo2 = [git]../gitsubrepo 149s - alpha = [git]../gitsubrepo 149s - foolink = [git]../gitsubrepo 149s - $ hg cat -r 7 .hgsubstate 149s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 149s - 6e4ad8da50204560c00fa25e4987eb2e239029ba foolink 149s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 149s - $ hg gverify -r 7 149s - verifying rev acebec53c0fc against git commit e3288fa737d429a60637b3b6782cb25b8298bc00 149s - 149s -(replace subrepo with symlink) 149s - $ hg cat -r 8 .hgsub .hgsubstate 149s - subrepo2 = [git]../gitsubrepo 149s - alpha = [git]../gitsubrepo 149s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 149s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 149s - 149s - $ hg gverify -r 8 149s - verifying rev 33da452ef22f against git commit d28364013fe1a0fde56c0e1921e49ecdeee8571d 149s - 149s -(remove all subrepos) 149s - $ hg cat -r 9 .hgsub .hgsubstate 149s - .hgsub: no such file in rev 0ad944b2c4d8 149s - .hgsubstate: no such file in rev 0ad944b2c4d8 149s - [1] 149s - $ hg gverify -r 9 149s - verifying rev 0ad944b2c4d8 against git commit 15ba94929481c654814178aac1dbca06ae688718 149s - 149s - $ hg debug-remove-hggit-state 149s - clearing out the git cache data 149s - $ hg gexport 149s - $ cd .hg/git 149s - $ git log --pretty=oneline 149s - 73c15b74fb81fa0cc60e9c59c73787a9f26c778b remove all subrepos 149s - d28364013fe1a0fde56c0e1921e49ecdeee8571d replace subrepo with symlink 149s - e3288fa737d429a60637b3b6782cb25b8298bc00 replace symlink with subrepo 149s - 2d1c135447d11df4dfe96dd5d4f37926dc5c821d add symlink 149s - 88171163bf4795b5570924e51d5f8ede33f8bc28 replace file with subrepo 149s - f6436a472da00f581d8d257e9bbaf3c358a5e88c replace subrepo with file 149s - 6e219527869fa40eb6ffbdd013cd86d576b26b01 add another subrepo 149s - a000567ceefbd9a2ce364e0dea6e298010b02b6d change subrepo commit 149s - e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 add subrepo 149s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 add alpha 149s - 149s -test with rename detection enabled -- simply checking that the Mercurial hashes 149s -are the same is enough 149s - $ cd ../../.. 149s - $ hg --config git.similarity=100 clone gitrepo2 hgreporenames 149s - importing 10 git commits 149s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 149s - updating to bookmark master 149s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 149s - $ cd hgreporenames 149s - $ hg log --graph 149s - @ changeset: 9:0ad944b2c4d8 149s - | bookmark: master 149s - | tag: default/master 149s - | tag: tip 149s - | user: test 149s - | date: Mon Jan 01 00:00:12 2007 +0000 149s - | summary: remove all subrepos 149s - | 149s - o changeset: 8:33da452ef22f 149s - | user: test 149s - | date: Mon Jan 01 00:00:12 2007 +0000 149s - | summary: replace subrepo with symlink 149s - | 149s - o changeset: 7:acebec53c0fc 149s - | user: test 149s - | date: Mon Jan 01 00:00:12 2007 +0000 149s - | summary: replace symlink with subrepo 149s - | 149s - o changeset: 6:78c2ea52db4b 149s - | user: test 149s - | date: Mon Jan 01 00:00:12 2007 +0000 149s - | summary: add symlink 149s - | 149s - o changeset: 5:c0d52ffc59b8 149s - | user: test 149s - | date: Mon Jan 01 00:00:12 2007 +0000 149s - | summary: replace file with subrepo 149s - | 149s - o changeset: 4:73e078a178a0 149s - | user: test 149s - | date: Mon Jan 01 00:00:12 2007 +0000 149s - | summary: replace subrepo with file 149s - | 149s - o changeset: 3:29e236ba4c06 149s - | user: test 149s - | date: Mon Jan 01 00:00:12 2007 +0000 149s - | summary: add another subrepo 149s - | 149s - o changeset: 2:a6075a162f62 149s - | user: test 149s - | date: Mon Jan 01 00:00:12 2007 +0000 149s - | summary: change subrepo commit 149s - | 149s - o changeset: 1:a4036e758995 149s - | user: test 149s - | date: Mon Jan 01 00:00:11 2007 +0000 149s - | summary: add subrepo 149s - | 149s - o changeset: 0:ff7a2f2d8d70 149s - user: test 149s - date: Mon Jan 01 00:00:10 2007 +0000 149s - summary: add alpha 149s - 149s - $ cd .. 149s - 149s -test handling of an invalid .gitmodules file (#380) 149s - 149s - $ git init --quiet gitrepo-issue380 149s - $ cd gitrepo-issue380 149s - $ git submodule add ../gitsubrepo 149s - Cloning into '$TESTTMP/gitrepo-issue380/gitsubrepo'... 149s - done. 149s - $ fn_git_commit -m 'add a submodule' 149s - $ cat >> .gitmodules < <<<<<<< HEAD 149s - > EOF 149s - $ fn_git_commit -a -m 'b0rken .gitmodules' 149s - $ git status 149s - fatal: bad config line 4 in file $TESTTMP/gitrepo-issue380/.gitmodules 149s - [128] 149s - $ sed -i.orig /HEAD/d .gitmodules 149s - $ fn_git_commit -a -m 'fix .gitmodules' 149s - $ git status 149s - On branch master 149s - Untracked files: 149s - (use "git add ..." to include in what will be committed) 149s - .gitmodules.orig 149s - 149s - nothing added to commit but untracked files present (use "git add" to track) 149s - $ cd .. 149s - $ git clone gitrepo-issue380 gitrepo-issue380~ 149s - Cloning into 'gitrepo-issue380~'... 149s - done. 149s - $ hg clone -U gitrepo-issue380 hgrepo-issue380 149s - importing 3 git commits 149s - warning: failed to parse .gitmodules in 2e4ec4293822 149s - new changesets ed60e5fbc192:9dfc0cdf1787 (3 drafts) 149s 149s ERROR: test-git-submodules.t output changed 149s !s 149s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-renames.t 149s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-renames.t.err 149s @@ -95,494 +95,9 @@ 149s 149s $ cd .. 149s $ hg clone -q repo.git hgrepo 149s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 149s + abort: repository repo.git not found 149s + [255] 149s $ cd hgrepo 149s + $TESTTMP.sh: 115: cd: can't cd to hgrepo 149s $ hg book master -q 149s - $ hg log -p --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 149s - @ 8 497105ddbe119aa40af691eb2b1a029c29bf5247 remove submodule and rename back 149s - | branch=default hg-git-rename-source=git 149s - | 149s - | diff --git a/.hgsub b/.hgsub 149s - | --- a/.hgsub 149s - | +++ b/.hgsub 149s - | @@ -1,2 +1,1 @@ 149s - | gitsubmodule2 = [git]../gitsubmodule 149s - | -gamma = [git]../gitsubmodule 149s - | diff --git a/.hgsubstate b/.hgsubstate 149s - | --- a/.hgsubstate 149s - | +++ b/.hgsubstate 149s - | @@ -1,2 +1,1 @@ 149s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 149s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 149s - | diff --git a/gamma-new b/gamma 149s - | rename from gamma-new 149s - | rename to gamma 149s - | 149s - o 7 adfc1ce8461d3174dcf8425e112e2fa848de3913 rename and add submodule 149s - | branch=default hg-git-rename-source=git 149s - | 149s - | diff --git a/.hgsub b/.hgsub 149s - | --- a/.hgsub 149s - | +++ b/.hgsub 149s - | @@ -1,1 +1,2 @@ 149s - | gitsubmodule2 = [git]../gitsubmodule 149s - | +gamma = [git]../gitsubmodule 149s - | diff --git a/.hgsubstate b/.hgsubstate 149s - | --- a/.hgsubstate 149s - | +++ b/.hgsubstate 149s - | @@ -1,1 +1,2 @@ 149s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 149s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 149s - | diff --git a/gamma b/gamma-new 149s - | rename from gamma 149s - | rename to gamma-new 149s - | 149s - o 6 62c1a4b07240b53a71be1b1a46e94e99132c5391 beta renamed back 149s - | branch=default hg-git-rename-source=git 149s - | 149s - | diff --git a/beta b/beta 149s - | old mode 120000 149s - | new mode 100644 149s - | --- a/beta 149s - | +++ b/beta 149s - | @@ -1,1 +1,12 @@ 149s - | -beta-new 149s - | \ No newline at end of file 149s - | +1 149s - | +2 149s - | +3 149s - | +4 149s - | +5 149s - | +6 149s - | +7 149s - | +8 149s - | +9 149s - | +10 149s - | +11 149s - | +12 149s - | diff --git a/beta-new b/beta-new 149s - | deleted file mode 100644 149s - | --- a/beta-new 149s - | +++ /dev/null 149s - | @@ -1,12 +0,0 @@ 149s - | -1 149s - | -2 149s - | -3 149s - | -4 149s - | -5 149s - | -6 149s - | -7 149s - | -8 149s - | -9 149s - | -10 149s - | -11 149s - | -12 149s - | 149s - o 5 f93fefed957cff2220d3f0d11182398350b5fa9a beta renamed 149s - | branch=default hg-git-rename-source=git 149s - | 149s - | diff --git a/beta b/beta 149s - | old mode 100644 149s - | new mode 120000 149s - | --- a/beta 149s - | +++ b/beta 149s - | @@ -1,12 +1,1 @@ 149s - | -1 149s - | -2 149s - | -3 149s - | -4 149s - | -5 149s - | -6 149s - | -7 149s - | -8 149s - | -9 149s - | -10 149s - | -11 149s - | -12 149s - | +beta-new 149s - | \ No newline at end of file 149s - | diff --git a/beta b/beta-new 149s - | copy from beta 149s - | copy to beta-new 149s - | 149s - o 4 b9e63d96abc2783afc59246e798a6936cf05a35e move submodule 149s - | branch=default hg-git-rename-source=git 149s - | 149s - | diff --git a/.hgsub b/.hgsub 149s - | --- a/.hgsub 149s - | +++ b/.hgsub 149s - | @@ -1,1 +1,1 @@ 149s - | -gitsubmodule = [git]../gitsubmodule 149s - | +gitsubmodule2 = [git]../gitsubmodule 149s - | diff --git a/.hgsubstate b/.hgsubstate 149s - | --- a/.hgsubstate 149s - | +++ b/.hgsubstate 149s - | @@ -1,1 +1,1 @@ 149s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 149s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 149s - | 149s - o 3 55537ea256c28be1b5637f4f93a601fdde8a9a7f add submodule 149s - | branch=default hg-git-rename-source=git 149s - | 149s - | diff --git a/.hgsub b/.hgsub 149s - | new file mode 100644 149s - | --- /dev/null 149s - | +++ b/.hgsub 149s - | @@ -0,0 +1,1 @@ 149s - | +gitsubmodule = [git]../gitsubmodule 149s - | diff --git a/.hgsubstate b/.hgsubstate 149s - | new file mode 100644 149s - | --- /dev/null 149s - | +++ b/.hgsubstate 149s - | @@ -0,0 +1,1 @@ 149s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 149s - | 149s - o 2 20f9e56b6d006d0403f853245e483d0892b8ac48 gamma 149s - | branch=default hg-git-rename-source=git 149s - | 149s - | diff --git a/beta b/beta 149s - | --- a/beta 149s - | +++ b/beta 149s - | @@ -9,3 +9,4 @@ 149s - | 9 149s - | 10 149s - | 11 149s - | +12 149s - | diff --git a/beta b/gamma 149s - | copy from beta 149s - | copy to gamma 149s - | --- a/beta 149s - | +++ b/gamma 149s - | @@ -9,3 +9,4 @@ 149s - | 9 149s - | 10 149s - | 11 149s - | +13 149s - | 149s - o 1 9f7744e68def81da3b394f11352f602ca9c8ab68 beta 149s - | branch=default hg-git-rename-source=git 149s - | 149s - | diff --git a/alpha b/beta 149s - | rename from alpha 149s - | rename to beta 149s - | --- a/alpha 149s - | +++ b/beta 149s - | @@ -8,3 +8,4 @@ 149s - | 8 149s - | 9 149s - | 10 149s - | +11 149s - | 149s - o 0 7bc844166f76e49562f81eacd54ea954d01a9e42 alpha 149s - branch=default hg-git-rename-source=git 149s - 149s - diff --git a/alpha b/alpha 149s - new file mode 100644 149s - --- /dev/null 149s - +++ b/alpha 149s - @@ -0,0 +1,10 @@ 149s - +1 149s - +2 149s - +3 149s - +4 149s - +5 149s - +6 149s - +7 149s - +8 149s - +9 149s - +10 149s - 149s - 149s -Make a new ordinary commit in Mercurial (no extra metadata) 149s - $ echo 14 >> gamma 149s - $ hg ci -m "gamma2" 149s - 149s -Make a new commit with a copy and a rename in Mercurial 149s - $ hg cp gamma delta 149s - $ echo 15 >> delta 149s - $ hg mv beta epsilon 149s - $ echo 16 >> epsilon 149s - $ hg ci -m "delta/epsilon" 149s - $ hg export . 149s - # HG changeset patch 149s - # User test 149s - # Date 0 0 149s - # Thu Jan 01 00:00:00 1970 +0000 149s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 149s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 149s - delta/epsilon 149s - 149s - diff --git a/gamma b/delta 149s - copy from gamma 149s - copy to delta 149s - --- a/gamma 149s - +++ b/delta 149s - @@ -11,3 +11,4 @@ 149s - 11 149s - 13 149s - 14 149s - +15 149s - diff --git a/beta b/epsilon 149s - rename from beta 149s - rename to epsilon 149s - --- a/beta 149s - +++ b/epsilon 149s - @@ -10,3 +10,4 @@ 149s - 10 149s - 11 149s - 12 149s - +16 149s - $ hg push 149s - pushing to $TESTTMP/repo.git 149s - searching for changes 149s - adding objects 149s - remote: found 0 deltas to reuse 149s - added 2 commits with 2 trees and 3 blobs 149s - updating reference refs/heads/master 149s - 149s - $ cd ../repo.git 149s - $ git log master --pretty=oneline 149s - 5f2948d029693346043f320620af99a615930dc4 delta/epsilon 149s - bbd2ec050f7fbc64f772009844f7d58a556ec036 gamma2 149s - 50d116676a308b7c22935137d944e725d2296f2a remove submodule and rename back 149s - 59fb8e82ea18f79eab99196f588e8948089c134f rename and add submodule 149s - f95497455dfa891b4cd9b524007eb9514c3ab654 beta renamed back 149s - 055f482277da6cd3dd37c7093d06983bad68f782 beta renamed 149s - d7f31298f27df8a9226eddb1e4feb96922c46fa5 move submodule 149s - c610256cb6959852d9e70d01902a06726317affc add submodule 149s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 149s - cc83241f39927232f690d370894960b0d1943a0e beta 149s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 149s - 149s -Make sure the right metadata is stored 149s - $ git cat-file commit master^ 149s - tree 0adbde18545845f3b42ad1a18939ed60a9dec7a8 149s - parent 50d116676a308b7c22935137d944e725d2296f2a 149s - author test 0 +0000 149s - committer test 0 +0000 149s - HG:rename-source hg 149s - 149s - gamma2 149s - $ git cat-file commit master 149s - tree f8f32f4e20b56a5a74582c6a5952c175bf9ec155 149s - parent bbd2ec050f7fbc64f772009844f7d58a556ec036 149s - author test 0 +0000 149s - committer test 0 +0000 149s - HG:rename gamma:delta 149s - HG:rename beta:epsilon 149s - 149s - delta/epsilon 149s - 149s -Now make another clone and compare the hashes 149s - 149s - $ cd .. 149s - $ hg clone -q repo.git hgrepo2 149s - $ cd hgrepo2 149s - $ hg book master -qf 149s - $ hg export master 149s - # HG changeset patch 149s - # User test 149s - # Date 0 0 149s - # Thu Jan 01 00:00:00 1970 +0000 149s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 149s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 149s - delta/epsilon 149s - 149s - diff --git a/gamma b/delta 149s - copy from gamma 149s - copy to delta 149s - --- a/gamma 149s - +++ b/delta 149s - @@ -11,3 +11,4 @@ 149s - 11 149s - 13 149s - 14 149s - +15 149s - diff --git a/beta b/epsilon 149s - rename from beta 149s - rename to epsilon 149s - --- a/beta 149s - +++ b/epsilon 149s - @@ -10,3 +10,4 @@ 149s - 10 149s - 11 149s - 12 149s - +16 149s - 149s -Regenerate the Git metadata and compare the hashes 149s - $ hg debug-remove-hggit-state 149s - clearing out the git cache data 149s - $ hg gexport 149s - $ cd .hg/git 149s - $ git log master --pretty=oneline 149s - f3f6592447685566af9447c03ae262aa5432511d delta/epsilon (dulwich-rust !) 149s - c51ce14ec367c5ea72bf428dee3f8576f2fe1bb0 gamma2 (dulwich-rust !) 149s - df749cae534e3c7a0ad664cd0f214dd36e0ac259 remove submodule and rename back (dulwich-rust !) 149s - 8f9ec605ad0cc2532202f73cef8e35d3241797ee rename and add submodule (dulwich-rust !) 149s - 8a00d0fb75377c51c9a46e92ff154c919007f0e2 delta/epsilon (no-dulwich-rust !) 149s - dd7d4f1adb942a8d349dce585019f6949184bc64 gamma2 (no-dulwich-rust !) 149s - 3f1cdaf8b603816fcda02bd29e75198ae4cb13db remove submodule and rename back (no-dulwich-rust !) 149s - 2a4abf1178a999e2054158ceb0c7768079665d03 rename and add submodule (no-dulwich-rust !) 149s - 88c416e8d5e0e9dd1187d45ebafaa46111764196 beta renamed back 149s - 027d2a6e050705bf6f7e226e7e97f02ce5ae3200 beta renamed 149s - dc70e620634887e70ac5dd108bcc7ebd99c60ec3 move submodule 149s - c610256cb6959852d9e70d01902a06726317affc add submodule 149s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 149s - cc83241f39927232f690d370894960b0d1943a0e beta 149s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 149s - 149s -Test findcopiesharder 149s - 149s - $ cd $TESTTMP 149s - $ git init -q gitcopyharder 149s - $ cd gitcopyharder 149s - $ cat >> file0 << EOF 149s - > 1 149s - > 2 149s - > 3 149s - > 4 149s - > 5 149s - > EOF 149s - $ git add file0 149s - $ fn_git_commit -m file0 149s - $ cp file0 file1 149s - $ git add file1 149s - $ fn_git_commit -m file1 149s - $ cp file0 file2 149s - $ echo 6 >> file2 149s - $ git add file2 149s - $ fn_git_commit -m file2 149s - 149s - $ cd .. 149s - 149s -Clone without findcopiesharder does not find copies from unmodified files 149s - 149s - $ hg clone gitcopyharder hgnocopyharder 149s - importing 3 git commits 149s - new changesets b45d023c6842:ec77ccdbefe0 (3 drafts) 149s - updating to bookmark master 149s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 149s - $ hg -R hgnocopyharder export 1::2 149s - # HG changeset patch 149s - # User test 149s - # Date 1167609621 0 149s - # Mon Jan 01 00:00:21 2007 +0000 149s - # Node ID 555831c93e2a250e5ba42efad45bf7ba71da13e4 149s - # Parent b45d023c6842337ffe694663a44aa672d311081c 149s - file1 149s - 149s - diff --git a/file1 b/file1 149s - new file mode 100644 149s - --- /dev/null 149s - +++ b/file1 149s - @@ -0,0 +1,5 @@ 149s - +1 149s - +2 149s - +3 149s - +4 149s - +5 149s - # HG changeset patch 149s - # User test 149s - # Date 1167609622 0 149s - # Mon Jan 01 00:00:22 2007 +0000 149s - # Node ID ec77ccdbefe023eb9898b0399f84f670c8c0f5fc 149s - # Parent 555831c93e2a250e5ba42efad45bf7ba71da13e4 149s - file2 149s - 149s - diff --git a/file2 b/file2 149s - new file mode 100644 149s - --- /dev/null 149s - +++ b/file2 149s - @@ -0,0 +1,6 @@ 149s - +1 149s - +2 149s - +3 149s - +4 149s - +5 149s - +6 149s - 149s -findcopiesharder finds copies from unmodified files if similarity is met 149s - 149s - $ hg --config git.findcopiesharder=true clone gitcopyharder hgcopyharder0 149s - importing 3 git commits 149s - new changesets b45d023c6842:9b3099834272 (3 drafts) 149s - updating to bookmark master 149s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 149s - $ hg -R hgcopyharder0 export 1::2 149s - # HG changeset patch 149s - # User test 149s - # Date 1167609621 0 149s - # Mon Jan 01 00:00:21 2007 +0000 149s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 149s - # Parent b45d023c6842337ffe694663a44aa672d311081c 149s - file1 149s - 149s - diff --git a/file0 b/file1 149s - copy from file0 149s - copy to file1 149s - # HG changeset patch 149s - # User test 149s - # Date 1167609622 0 149s - # Mon Jan 01 00:00:22 2007 +0000 149s - # Node ID 9b30998342729c7357d418bebed7399986cfe643 149s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 149s - file2 149s - 149s - diff --git a/file0 b/file2 149s - copy from file0 149s - copy to file2 149s - --- a/file0 149s - +++ b/file2 149s - @@ -3,3 +3,4 @@ 149s - 3 149s - 4 149s - 5 149s - +6 149s - 149s - $ hg --config git.findcopiesharder=true --config git.similarity=95 clone gitcopyharder hgcopyharder1 149s - importing 3 git commits 149s - new changesets b45d023c6842:d9d2e8cbf050 (3 drafts) 149s - updating to bookmark master 149s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 149s - $ hg -R hgcopyharder1 export 1::2 149s - # HG changeset patch 149s - # User test 149s - # Date 1167609621 0 149s - # Mon Jan 01 00:00:21 2007 +0000 149s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 149s - # Parent b45d023c6842337ffe694663a44aa672d311081c 149s - file1 149s - 149s - diff --git a/file0 b/file1 149s - copy from file0 149s - copy to file1 149s - # HG changeset patch 149s - # User test 149s - # Date 1167609622 0 149s - # Mon Jan 01 00:00:22 2007 +0000 149s - # Node ID d9d2e8cbf050772be31dccf78851f71dc547d139 149s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 149s - file2 149s - 149s - diff --git a/file2 b/file2 149s - new file mode 100644 149s - --- /dev/null 149s - +++ b/file2 149s - @@ -0,0 +1,6 @@ 149s - +1 149s - +2 149s - +3 149s - +4 149s - +5 149s - +6 149s - 149s -Config values out of range 149s - $ hg --config git.similarity=999 clone gitcopyharder hgcopyharder2 149s - importing 3 git commits 149s - abort: git.similarity must be between 0 and 100 149s - [255] 149s -Left-over on Windows with some pack files 149s - $ rm -rf hgcopyharder2 149s - $ hg --config git.renamelimit=-5 clone gitcopyharder hgcopyharder2 149s - importing 3 git commits 149s - abort: git.renamelimit must be non-negative 149s - [255] 149s 149s ERROR: test-renames.t output changed 150s ! 150s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-git-tags.t 150s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-git-tags.t#draft.err 150s @@ -41,337 +41,13 @@ 150s Clone it: 150s 150s $ hg clone repo.git hgrepo 150s - importing 2 git commits 150s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 150s - updating to bookmark master 150s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 150s + abort: repository repo.git not found 150s + [255] 150s 150s $ cd hgrepo 150s + $TESTTMP.sh: 39: cd: can't cd to hgrepo 150s 150s Verify that annotated tags are unaffected by reexports: 150s 150s $ GIT_DIR=.hg/git git tag -ln 150s - beta added tag beta 150s - $ hg gexport 150s - $ GIT_DIR=.hg/git git tag -ln 150s - beta added tag beta 150s - 150s -Error checking on tag creation 150s - 150s - $ hg tag --git beta --remove 150s - abort: cannot remove git tags 150s - (the git documentation heavily discourages editing tags) 150s - [255] 150s - $ hg tag --git beta -r null 150s - abort: cannot remove git tags 150s - (the git documentation heavily discourages editing tags) 150s - [255] 150s - $ hg tag --git beta --remove -r 0 150s - abort: cannot specify both --rev and --remove 150s - [10] 150s - $ hg tag --git alpha 150s - abort: git tags require an explicit revision 150s - (please specify -r/--rev) 150s - [255] 150s - $ hg tag --git alpha alpha -r 0 150s - abort: tag names must be unique 150s - [255] 150s - $ hg tag --git alpha -r 0 -e 150s - abort: cannot specify both --git and --edit 150s - [10] 150s - $ hg tag --git alpha -r 0 -m 42 150s - abort: cannot specify both --git and --message 150s - [10] 150s - $ hg tag --git alpha -r 0 -d 42 150s - abort: cannot specify both --git and --date 150s - [10] 150s - $ hg tag --git alpha -r 0 -u user@example.com 150s - abort: cannot specify both --git and --user 150s - [10] 150s - $ hg tag --git 'with space' -r 0 150s - abort: the name 'with space' is not a valid git tag 150s - [255] 150s - $ hg tag --git ' beta' -r 0 150s - abort: the name 'beta' already exists 150s - [255] 150s - $ hg tag --git master -r 0 150s - abort: the name 'master' already exists 150s - [255] 150s - $ hg tag --git tip -r 0 150s - abort: the name 'tip' is reserved 150s - [10] 150s - 150s -Create a git tag from hg 150s - 150s - $ hg tag --git alpha --debug -r 0 150s - finding unexported changesets 150s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 150s - adding git tag alpha 150s - $ hg log --graph 150s - @ changeset: 1:7fe02317c63d 150s - | bookmark: master 150s - | tag: beta 150s - | tag: default/master 150s - | tag: tip 150s - | user: test 150s - | date: Mon Jan 01 00:00:11 2007 +0000 150s - | summary: add beta 150s - | 150s - o changeset: 0:ff7a2f2d8d70 150s - tag: alpha 150s - user: test 150s - date: Mon Jan 01 00:00:10 2007 +0000 150s - summary: add alpha 150s - 150s - $ echo beta-fix >> beta 150s - $ fn_hg_commit -m 'fix for beta' 150s -#if secret 150s - $ hg phase -d 150s -#endif 150s - $ hg push 150s - pushing to $TESTTMP/repo.git 150s - searching for changes 150s - adding objects 150s - remote: found 0 deltas to reuse 150s - added 1 commits with 1 trees and 1 blobs 150s - updating reference refs/heads/master 150s - adding reference refs/tags/alpha 150s - 150s -Verify that amending commits known to remotes doesn't break anything 150s - 150s - $ cat >> $HGRCPATH << EOF 150s - > [experimental] 150s - > evolution = createmarkers 150s - > evolution.createmarkers = yes 150s - > EOF 150s - $ hg tags 150s - tip 2:61175962e488 150s - default/master 2:61175962e488 150s - beta 1:7fe02317c63d 150s - alpha 0:ff7a2f2d8d70 150s - $ echo beta-fix-again >> beta 150s - $ fn_hg_commit --amend 150s - $ hg log -T shorttags 150s - 3:3094b9e8da41 draft tip 150s - 2:61175962e488 draft default/master X 150s - 1:7fe02317c63d draft beta 150s - 0:ff7a2f2d8d70 draft alpha 150s - $ hg tags 150s - tip 3:3094b9e8da41 150s - default/master 2:61175962e488 150s - beta 1:7fe02317c63d 150s - alpha 0:ff7a2f2d8d70 150s - $ hg push 150s - pushing to $TESTTMP/repo.git 150s - searching for changes 150s - abort: pushing refs/heads/master overwrites 3094b9e8da41 150s - [255] 150s - $ hg push -f 150s - pushing to $TESTTMP/repo.git 150s - searching for changes 150s - adding objects 150s - remote: found 0 deltas to reuse 150s - added 1 commits with 1 trees and 1 blobs 150s - updating reference refs/heads/master 150s - 150s -Now create a tag for the old, obsolete master 150s - 150s - $ cd ../repo.git 150s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 150s - $ git tag 150s - alpha 150s - beta 150s - detached 150s - $ cd ../hgrepo 150s - $ hg pull 150s - pulling from $TESTTMP/repo.git 150s - no changes found 150s - $ hg log -T shorttags 150s - 3:3094b9e8da41 draft default/master tip 150s - 2:61175962e488 draft detached X 150s - 1:7fe02317c63d draft beta 150s - 0:ff7a2f2d8d70 draft alpha 150s - $ hg tags 150s - tip 3:3094b9e8da41 150s - default/master 3:3094b9e8da41 150s - detached 2:61175962e488 150s - beta 1:7fe02317c63d 150s - alpha 0:ff7a2f2d8d70 150s - $ hg push 150s - pushing to $TESTTMP/repo.git 150s - searching for changes 150s - no changes found 150s - [1] 150s - 150s - $ cd .. 150s - 150s -Verify that revsets can point out git tags; for that we need an 150s -untagged commit. 150s - 150s - $ cd hgrepo 150s - $ touch gamma 150s - $ fn_hg_commit -A -m 'add gamma' 150s -#if secret 150s - $ hg phase -d 150s -#endif 150s - $ hg log -T shorttags -r 'gittag()' 150s - 0:ff7a2f2d8d70 draft alpha 150s - 1:7fe02317c63d draft beta 150s - 2:61175962e488 draft detached X 150s - $ hg log -T shorttags -r 'gittag(detached)' 150s - 2:61175962e488 draft detached X 150s - $ hg log -T shorttags -r 'gittag("re:a$")' 150s - 0:ff7a2f2d8d70 draft alpha 150s - 1:7fe02317c63d draft beta 150s - 150s -Create a git tag from hg, but pointing to a new commit: 150s - 150s - $ hg tag --git gamma --debug -r tip 150s - invalid branch cache (visible): tip differs (?) 150s - finding unexported changesets 150s - exporting 1 changesets 150s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 150s - packing 3 loose objects... 150s - packed 3 loose objects! 150s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 150s - adding git tag gamma 150s - $ hg push 150s - pushing to $TESTTMP/repo.git 150s - searching for changes 150s - adding objects 150s - remote: found 0 deltas to reuse 150s - added 1 commits with 1 trees and 1 blobs 150s - updating reference refs/heads/master 150s - adding reference refs/tags/gamma 150s - $ cd ../gitrepo 150s - $ git fetch --quiet --tags 150s - $ git tag 150s - alpha 150s - beta 150s - detached 150s - gamma 150s - $ cd .. 150s - 150s -Try to overwrite an annotated tag: 150s - 150s - $ cd hgrepo 150s - $ hg tags -v 150s - tip 4:0eb1ab0073a8 150s - gamma 4:0eb1ab0073a8 git 150s - default/master 4:0eb1ab0073a8 git-remote 150s - detached 2:61175962e488 git 150s - beta 1:7fe02317c63d git 150s - alpha 0:ff7a2f2d8d70 git 150s - $ hg book not-master 150s - $ hg tag beta 150s - abort: tag 'beta' already exists (use -f to force) 150s - [10] 150s - $ hg tag -f beta 150s -#if secret 150s - $ hg phase -d 150s -#endif 150s - $ hg push 150s - pushing to $TESTTMP/repo.git 150s - warning: not overwriting annotated tag 'beta' 150s - searching for changes 150s - adding objects 150s - remote: found 0 deltas to reuse 150s - added 1 commits with 1 trees and 1 blobs 150s - adding reference refs/heads/not-master 150s - $ hg tags 150s - tip 5:c49682c7cba4 150s - default/not-master 5:c49682c7cba4 150s - gamma 4:0eb1ab0073a8 150s - default/master 4:0eb1ab0073a8 150s - beta 4:0eb1ab0073a8 150s - detached 2:61175962e488 150s - alpha 0:ff7a2f2d8d70 150s - $ cd .. 150s - 150s -Check whether `gimport` handles tags 150s - 150s - $ cd hgrepo 150s - $ rm .hg/git-tags .hg/git-mapfile 150s - $ hg gimport 150s - importing 6 git commits 150s - $ hg tags -q 150s - tip 150s - default/not-master 150s - gamma 150s - default/master 150s - beta 150s - detached 150s - alpha 150s - $ cd .. 150s - 150s -Test how pulling an explicit branch with an annotated tag: 150s - 150s - $ hg clone -r master repo.git hgrepo-2 150s - importing 4 git commits 150s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 150s - updating to branch default 150s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 150s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 150s - 0:ff7a2f2d8d70 draft alpha 150s - 1:7fe02317c63d draft beta 150s - 3:0eb1ab0073a8 draft default/master gamma tip 150s - $ hg tags -v -R hgrepo-2 150s - tip 3:0eb1ab0073a8 150s - gamma 3:0eb1ab0073a8 git 150s - default/master 3:0eb1ab0073a8 git-remote 150s - beta 1:7fe02317c63d git 150s - alpha 0:ff7a2f2d8d70 git 150s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 150s - $ rm -rf hgrepo-2 150s - 150s - $ hg clone -r master repo.git hgrepo-2 150s - importing 4 git commits 150s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 150s - updating to branch default 150s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 150s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 150s - 0:ff7a2f2d8d70 draft alpha 150s - 1:7fe02317c63d draft beta 150s - 3:0eb1ab0073a8 draft default/master gamma tip 150s -This used to die: 150s - $ hg -R hgrepo-2 gexport 150s -This used to fail, since we didn't actually pull the annotated tag: 150s - $ hg -R hgrepo-2 push 150s - pushing to $TESTTMP/repo.git 150s - searching for changes 150s - no changes found 150s - [1] 150s - $ rm -rf hgrepo-2 150s - 150s -Check that pulling will update phases only: 150s - 150s - $ cd hgrepo 150s - $ hg phase -fs gamma detached 150s - $ hg pull 150s - pulling from $TESTTMP/repo.git 150s - no changes found 150s - $ hg log -T shorttags -r gamma -r detached 150s - 4:0eb1ab0073a8 draft beta default/master gamma 150s - 2:61175962e488 draft detached X 150s - $ cd .. 150s - 150s -Check that we pull new tags to existing commits: 150s - $ cd gitrepo 150s - $ git tag 150s - alpha 150s - beta 150s - detached 150s - gamma 150s - $ fn_git_tag extra-simple-tag 150s - $ fn_git_tag -m annotated extra-annotated-tag 150s - $ git push --tags 150s - To $TESTTMP/repo.git 150s - * [new tag] extra-annotated-tag -> extra-annotated-tag 150s - * [new tag] extra-simple-tag -> extra-simple-tag 150s - $ cd ../hgrepo 150s - $ hg pull -r master 150s - pulling from $TESTTMP/repo.git 150s - no changes found 150s - $ hg tags -v | grep extra 150s - extra-simple-tag 1:7fe02317c63d git 150s - extra-annotated-tag 1:7fe02317c63d git 150s 150s ERROR: test-git-tags.t#draft output changed 150s ! 150s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-help.t 150s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-help.t.err 150s @@ -5,250 +5,14 @@ 150s 150s $ hg help | grep 'git' | sed 's/ */ /g' 150s git-cleanup clean up Git commit map after history editing (?) 150s - git-verify verify that a Mercurial rev matches the corresponding Git rev 150s - hggit push and pull from a Git server 150s - hggit-config Configuring hg-git 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 150s 150s $ hg help hggit-config 150s - Configuring hg-git 150s - """""""""""""""""" 150s - 150s - "git" 150s - ----- 150s - 150s - Control how the Hg-Git extension interacts with Git. 150s - 150s - "authors" 150s - Git uses a strict convention for "author names" when representing 150s - changesets, using the form "[realname] [email address]". Mercurial 150s - encourages this convention as well but is not as strict, so it's not 150s - uncommon for a Mercurial repository to have authors listed as, for 150s - example, simple usernames. hg-git by default will attempt to translate 150s - Mercurial usernames using the following rules: 150s - 150s - - If the Mercurial username fits the pattern "NAME ", the Git 150s - name will be set to NAME and the email to EMAIL. 150s - - If the Mercurial username looks like an email (if it contains an 150s - "@"), the Git name and email will both be set to that email. 150s - - If the Mercurial username consists of only a name, the email will be 150s - set to "none@none". 150s - - Illegal characters (stray "<"\ s or ">"\ s) will be stripped out, and 150s - for "NAME " usernames, any content after the right-bracket (for 150s - example, a second ">") will be turned into a url-encoded sigil like 150s - "ext:(%3E)" in the Git author name. 150s - 150s - Since these default behaviors may not be what you want ("none@none", for 150s - example, shows up unpleasantly on GitHub as "illegal email address"), 150s - the "git.authors" option provides for an "authors translation file" that 151s - will be used during outgoing transfers from Mercurial to Git only, by 151s - modifying "hgrc" as such: 151s - 151s - [git] 151s - authors = authors.txt 151s - 151s - Where "authors.txt" is the name of a text file containing author name 151s - translations, one per each line, using the following format: 151s - 151s - johnny = John Smith 151s - dougie = Doug Johnson 151s - 151s - Empty lines and lines starting with a "#" are ignored. 151s - 151s - It should be noted that this translation is in *the Mercurial to Git 151s - direction only*. Changesets coming from Git back to Mercurial will not 151s - translate back into Mercurial usernames, so it's best that the same 151s - username/email combination be used on both the Mercurial and Git sides; 151s - the author file is mostly useful for translating legacy changesets. 151s - 151s - "branch_bookmark_suffix" 151s - Hg-Git does not convert between Mercurial named branches and git 151s - branches as the two are conceptually different; instead, it uses 151s - Mercurial bookmarks to represent the concept of a Git branch. Therefore, 151s - when translating a Mercurial repository over to Git, you typically need 151s - to create bookmarks to mirror all the named branches that you'd like to 151s - see transferred over to Git. The major caveat with this is that you 151s - can't use the same name for your bookmark as that of the named branch, 151s - and furthermore there's no feasible way to rename a branch in Mercurial. 151s - For the use case where one would like to transfer a Mercurial repository 151s - over to Git, and maintain the same named branches as are present on the 151s - hg side, the "branch_bookmark_suffix" might be all that's needed. This 151s - presents a string "suffix" that will be recognized on each bookmark 151s - name, and stripped off as the bookmark is translated to a Git branch: 151s - 151s - [git] 151s - branch_bookmark_suffix=_bookmark 151s - 151s - Above, if a Mercurial repository had a named branch called 151s - "release_6_maintenance", you could then link it to a bookmark called 151s - "release_6_maintenance_bookmark". hg-git will then strip off the 151s - "_bookmark" suffix from this bookmark name, and create a Git branch 151s - called "release_6_maintenance". When pulling back from Git to hg, the 151s - "_bookmark" suffix is then applied back, if and only if a Mercurial 151s - named branch of that name exists. E.g., when changes to the 151s - "release_6_maintenance" branch are checked into Git, these will be 151s - placed into the "release_6_maintenance_bookmark" bookmark on hg. But if 151s - a new branch called "release_7_maintenance" were pulled over to hg, and 151s - there was not a "release_7_maintenance" named branch already, the 151s - bookmark will be named "release_7_maintenance" with no usage of the 151s - suffix. 151s - 151s - The "branch_bookmark_suffix" option is, like the "authors" option, 151s - intended for migrating legacy hg named branches. Going forward, a 151s - Mercurial repository that is to be linked with a Git repository should 151s - only use bookmarks for named branching. 151s - 151s - "findcopiesharder" 151s - Whether to consider unmodified files as copy sources. This is a very 151s - expensive operation for large projects, so use it with caution. Similar 151s - to "git diff"'s --find-copies-harder option. 151s - 151s - "intree" 151s - Hg-Git keeps a Git repository clone for reading and updating. By 151s - default, the Git clone is the subdirectory "git" in your local Mercurial 151s - repository. If you would like this Git clone to be at the same level of 151s - your Mercurial repository instead (named ".git"), add the following to 151s - your "hgrc": 151s - 151s - [git] 151s - intree = True 151s - 151s - Please note that changing this setting in an existing repository doesn't 151s - move the local Git repository. You will either have to do so yourself, 151s - or issue an 'hg pull' after the fact to repopulate the new location. 151s - 151s - "mindate" 151s - If set, branches where the latest commit's commit time is older than 151s - this will not be imported. Accepts any date formats that Mercurial does 151s - -- see 'hg help dates' for more. 151s - 151s - "public" 151s - A list of Git branches that should be considered "published", and 151s - therefore converted to Mercurial in the 'public' phase. This is only 151s - used if "hggit.usephases" is set. 151s - 151s - "pull-prune-remote-branches" 151s - Before fetching, remove any remote-tracking references, or pseudo-tags, 151s - that no longer exist on the remote. This is equivalent to the "--prune" 151s - option to "git fetch", and means that pseudo-tags for remotes -- such as 151s - "default/master" -- always actually reflect what's on the remote. 151s - 151s - This option is enabled by default. 151s - 151s - "pull-prune-bookmarks" 151s - On pull, delete any unchanged bookmarks removed on the remote. In other 151s - words, if e.g. the "thebranch" bookmark remains at "default/thebranch", 151s - and the branch is deleted in Git, pulling deletes the bookmark. 151s - 151s - This option is enabled by default. 151s - 151s - "renamelimit" 151s - The number of files to consider when performing the copy/rename 151s - detection. Detection is disabled if the number of files modified in a 151s - commit is above the limit. Detection is O(N^2) in the number of files 151s - modified, so be sure not to set the limit too high. Similar to Git's 151s - "diff.renameLimit" config. The default is "400", the same as Git. 151s - 151s - "similarity" 151s - Specify how similar files modified in a Git commit must be to be 151s - imported as Mercurial renames or copies, as a percentage between "0" 151s - (disabled) and "100" (files must be identical). For example, "90" means 151s - that a delete/add pair will be imported as a rename if more than 90% of 151s - the file has stayed the same. The default is "0" (disabled). 151s - 151s - "blame.ignoreRevsFile" 151s - Specify a file that lists Git commits to ignore when invoking 'hg 151s - annotate'. 151s - 151s - "hggit" 151s - ------- 151s - 151s - Control behavior of the Hg-Git extension. 151s - 151s - "mapsavefrequency" 151s - By default, hg-git only saves the results of a conversion at the end. 151s - Use this option to enable resuming long-running pulls and pushes. Set 151s - this to a number greater than 0 to allow resuming after converting that 151s - many commits. This can help when the conversion encounters an error 151s - partway through a large batch of changes. Otherwise, an error or 151s - interruption will roll back the transaction, similar to regular 151s - Mercurial. 151s - 151s - Defaults to 1000. 151s - 151s - Please note that this is disregarded for an initial clone, as any error 151s - or interruption will delete the destination. So instead of cloning a 151s - large Git repository, you might want to pull instead: 151s - 151s - $ hg init linux 151s - $ cd linux 151s - $ echo "[paths]\ndefault = https://github.com/torvalds/linux" > .hg/hgrc 151s - $ hg pull 151s - 151s - ...and be extremely patient. Please note that converting very large 151s - repositories may take *days* rather than mere *hours*, and may run into 151s - issues with available memory for very long running clones. Even any 151s - small, undiscovered leak will build up when processing hundreds of 151s - thousands of files and commits. Cloning the Linux kernel is likely a 151s - pathological case, but other storied repositories such as CPython do 151s - work well, even if the initial clone requires a some patience. 151s - 151s - "threads" 151s - 151s - During a push to Git, hg-git will pack loose objects at regular 151s - intervals whenever it saves its map. As this is a rather expensive 151s - operation, it's done in separate threads. 151s - 151s - Defaults to the system CPU count or 4, whichever is lower. 151s - 151s - "usephases" 151s - When converting Git revisions to Mercurial, place them in the 'public' 151s - phase as appropriate. Namely, revisions that are reachable from the 151s - remote Git repository's default branch, or "HEAD", will be marked 151s - *public*. For most repositories, this means the remote "master" branch 151s - will be converted as public. The same applies to any commits tagged in 151s - the remote. 151s - 151s - To restrict publishing to specific branches or tags, use the 151s - "git.public" option. 151s - 151s - Publishing commits prevents their modification, and speeds up many local 151s - Mercurial operations, such as 'hg shelve'. 151s - 151s - "fetchbuffer" 151s - Data fetched from Git is buffered in memory, unless it exceeds the given 151s - limit, in megabytes. By default, flush the buffer to disk when it 151s - exceeds 100MB. 151s - 151s - "retries" 151s - Interacting with a remote Git repository may require authentication. 151s - Normally, this will trigger a prompt and a retry, and this option 151s - restricts the amount of retries. Defaults to 3. 151s - 151s - "invalidpaths" 151s - Both Mercurial and Git consider paths as just bytestrings internally, 151s - and allow almost anything. The difference, however, is in the _almost_ 151s - part. For example, many Git servers will reject a push for security 151s - reasons if it contains a nested Git repository. Similarly, Mercurial 151s - cannot checkout commits with a nested repository, and it cannot even 151s - store paths containing an embedded newline or carrage return character. 151s - 151s - The default is to issue a warning and skip these paths. You can change 151s - this by setting "hggit.invalidpaths" in ".hgrc": 151s - 151s - [hggit] 151s - invalidpaths = keep 151s - 151s - Possible values are "keep", "skip" or "abort". Prior to 1.0, the default 151s - was "abort". 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 151s + abort: no such help topic: hggit-config 151s + (try 'hg help --keyword hggit-config') 151s + [10] 151s 151s $ hg help config.hggit | head -10 151s - "hggit" 151s - ------- 151s - 151s - Control behavior of the Hg-Git extension. 151s - 151s - "mapsavefrequency" 151s - By default, hg-git only saves the results of a conversion at the end. 151s - Use this option to enable resuming long-running pulls and pushes. Set 151s - this to a number greater than 0 to allow resuming after converting that 151s - many commits. This can help when the conversion encounters an error 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 151s + abort: help section not found: config.hggit 151s 151s ERROR: test-help.t output changed 151s ! 151s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-git-tags.t 151s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-git-tags.t#secret.err 151s @@ -41,337 +41,13 @@ 151s Clone it: 151s 151s $ hg clone repo.git hgrepo 151s - importing 2 git commits 151s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 151s - updating to bookmark master 151s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 151s + abort: repository repo.git not found 151s + [255] 151s 151s $ cd hgrepo 151s + $TESTTMP.sh: 44: cd: can't cd to hgrepo 151s 151s Verify that annotated tags are unaffected by reexports: 151s 151s $ GIT_DIR=.hg/git git tag -ln 151s - beta added tag beta 151s - $ hg gexport 151s - $ GIT_DIR=.hg/git git tag -ln 151s - beta added tag beta 151s - 151s -Error checking on tag creation 151s - 151s - $ hg tag --git beta --remove 151s - abort: cannot remove git tags 151s - (the git documentation heavily discourages editing tags) 151s - [255] 151s - $ hg tag --git beta -r null 151s - abort: cannot remove git tags 151s - (the git documentation heavily discourages editing tags) 151s - [255] 151s - $ hg tag --git beta --remove -r 0 151s - abort: cannot specify both --rev and --remove 151s - [10] 151s - $ hg tag --git alpha 151s - abort: git tags require an explicit revision 151s - (please specify -r/--rev) 151s - [255] 151s - $ hg tag --git alpha alpha -r 0 151s - abort: tag names must be unique 151s - [255] 151s - $ hg tag --git alpha -r 0 -e 151s - abort: cannot specify both --git and --edit 151s - [10] 151s - $ hg tag --git alpha -r 0 -m 42 151s - abort: cannot specify both --git and --message 151s - [10] 151s - $ hg tag --git alpha -r 0 -d 42 151s - abort: cannot specify both --git and --date 151s - [10] 151s - $ hg tag --git alpha -r 0 -u user@example.com 151s - abort: cannot specify both --git and --user 151s - [10] 151s - $ hg tag --git 'with space' -r 0 151s - abort: the name 'with space' is not a valid git tag 151s - [255] 151s - $ hg tag --git ' beta' -r 0 151s - abort: the name 'beta' already exists 151s - [255] 151s - $ hg tag --git master -r 0 151s - abort: the name 'master' already exists 151s - [255] 151s - $ hg tag --git tip -r 0 151s - abort: the name 'tip' is reserved 151s - [10] 151s - 151s -Create a git tag from hg 151s - 151s - $ hg tag --git alpha --debug -r 0 151s - finding unexported changesets 151s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 151s - adding git tag alpha 151s - $ hg log --graph 151s - @ changeset: 1:7fe02317c63d 151s - | bookmark: master 151s - | tag: beta 151s - | tag: default/master 151s - | tag: tip 151s - | user: test 151s - | date: Mon Jan 01 00:00:11 2007 +0000 151s - | summary: add beta 151s - | 151s - o changeset: 0:ff7a2f2d8d70 151s - tag: alpha 151s - user: test 151s - date: Mon Jan 01 00:00:10 2007 +0000 151s - summary: add alpha 151s - 151s - $ echo beta-fix >> beta 151s - $ fn_hg_commit -m 'fix for beta' 151s -#if secret 151s - $ hg phase -d 151s -#endif 151s - $ hg push 151s - pushing to $TESTTMP/repo.git 151s - searching for changes 151s - adding objects 151s - remote: found 0 deltas to reuse 151s - added 1 commits with 1 trees and 1 blobs 151s - updating reference refs/heads/master 151s - adding reference refs/tags/alpha 151s - 151s -Verify that amending commits known to remotes doesn't break anything 151s - 151s - $ cat >> $HGRCPATH << EOF 151s - > [experimental] 151s - > evolution = createmarkers 151s - > evolution.createmarkers = yes 151s - > EOF 151s - $ hg tags 151s - tip 2:61175962e488 151s - default/master 2:61175962e488 151s - beta 1:7fe02317c63d 151s - alpha 0:ff7a2f2d8d70 151s - $ echo beta-fix-again >> beta 151s - $ fn_hg_commit --amend 151s - $ hg log -T shorttags 151s - 3:3094b9e8da41 draft tip 151s - 2:61175962e488 draft default/master X 151s - 1:7fe02317c63d draft beta 151s - 0:ff7a2f2d8d70 draft alpha 151s - $ hg tags 151s - tip 3:3094b9e8da41 151s - default/master 2:61175962e488 151s - beta 1:7fe02317c63d 151s - alpha 0:ff7a2f2d8d70 151s - $ hg push 151s - pushing to $TESTTMP/repo.git 151s - searching for changes 151s - abort: pushing refs/heads/master overwrites 3094b9e8da41 151s - [255] 151s - $ hg push -f 151s - pushing to $TESTTMP/repo.git 151s - searching for changes 151s - adding objects 151s - remote: found 0 deltas to reuse 151s - added 1 commits with 1 trees and 1 blobs 151s - updating reference refs/heads/master 151s - 151s -Now create a tag for the old, obsolete master 151s - 151s - $ cd ../repo.git 151s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 151s - $ git tag 151s - alpha 151s - beta 151s - detached 151s - $ cd ../hgrepo 151s - $ hg pull 151s - pulling from $TESTTMP/repo.git 151s - no changes found 151s - $ hg log -T shorttags 151s - 3:3094b9e8da41 draft default/master tip 151s - 2:61175962e488 draft detached X 151s - 1:7fe02317c63d draft beta 151s - 0:ff7a2f2d8d70 draft alpha 151s - $ hg tags 151s - tip 3:3094b9e8da41 151s - default/master 3:3094b9e8da41 151s - detached 2:61175962e488 151s - beta 1:7fe02317c63d 151s - alpha 0:ff7a2f2d8d70 151s - $ hg push 151s - pushing to $TESTTMP/repo.git 151s - searching for changes 151s - no changes found 151s - [1] 151s - 151s - $ cd .. 151s - 151s -Verify that revsets can point out git tags; for that we need an 151s -untagged commit. 151s - 151s - $ cd hgrepo 151s - $ touch gamma 151s - $ fn_hg_commit -A -m 'add gamma' 151s -#if secret 151s - $ hg phase -d 151s -#endif 151s - $ hg log -T shorttags -r 'gittag()' 151s - 0:ff7a2f2d8d70 draft alpha 151s - 1:7fe02317c63d draft beta 151s - 2:61175962e488 draft detached X 151s - $ hg log -T shorttags -r 'gittag(detached)' 151s - 2:61175962e488 draft detached X 151s - $ hg log -T shorttags -r 'gittag("re:a$")' 151s - 0:ff7a2f2d8d70 draft alpha 151s - 1:7fe02317c63d draft beta 151s - 151s -Create a git tag from hg, but pointing to a new commit: 151s - 151s - $ hg tag --git gamma --debug -r tip 151s - invalid branch cache (visible): tip differs (?) 151s - finding unexported changesets 151s - exporting 1 changesets 151s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 151s - packing 3 loose objects... 151s - packed 3 loose objects! 151s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 151s - adding git tag gamma 151s - $ hg push 151s - pushing to $TESTTMP/repo.git 151s - searching for changes 151s - adding objects 151s - remote: found 0 deltas to reuse 151s - added 1 commits with 1 trees and 1 blobs 151s - updating reference refs/heads/master 151s - adding reference refs/tags/gamma 151s - $ cd ../gitrepo 151s - $ git fetch --quiet --tags 151s - $ git tag 151s - alpha 151s - beta 151s - detached 151s - gamma 151s - $ cd .. 151s - 151s -Try to overwrite an annotated tag: 151s - 151s - $ cd hgrepo 151s - $ hg tags -v 151s - tip 4:0eb1ab0073a8 151s - gamma 4:0eb1ab0073a8 git 151s - default/master 4:0eb1ab0073a8 git-remote 151s - detached 2:61175962e488 git 151s - beta 1:7fe02317c63d git 151s - alpha 0:ff7a2f2d8d70 git 151s - $ hg book not-master 151s - $ hg tag beta 151s - abort: tag 'beta' already exists (use -f to force) 151s - [10] 151s - $ hg tag -f beta 151s -#if secret 151s - $ hg phase -d 151s -#endif 151s - $ hg push 151s - pushing to $TESTTMP/repo.git 151s - warning: not overwriting annotated tag 'beta' 151s - searching for changes 151s - adding objects 151s - remote: found 0 deltas to reuse 151s - added 1 commits with 1 trees and 1 blobs 151s - adding reference refs/heads/not-master 151s - $ hg tags 151s - tip 5:c49682c7cba4 151s - default/not-master 5:c49682c7cba4 151s - gamma 4:0eb1ab0073a8 151s - default/master 4:0eb1ab0073a8 151s - beta 4:0eb1ab0073a8 151s - detached 2:61175962e488 151s - alpha 0:ff7a2f2d8d70 151s - $ cd .. 151s - 151s -Check whether `gimport` handles tags 151s - 151s - $ cd hgrepo 151s - $ rm .hg/git-tags .hg/git-mapfile 151s - $ hg gimport 151s - importing 6 git commits 151s - $ hg tags -q 151s - tip 151s - default/not-master 151s - gamma 151s - default/master 151s - beta 151s - detached 151s - alpha 151s - $ cd .. 151s - 151s -Test how pulling an explicit branch with an annotated tag: 151s - 151s - $ hg clone -r master repo.git hgrepo-2 151s - importing 4 git commits 151s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 151s - updating to branch default 151s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 151s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 151s - 0:ff7a2f2d8d70 draft alpha 151s - 1:7fe02317c63d draft beta 151s - 3:0eb1ab0073a8 draft default/master gamma tip 151s - $ hg tags -v -R hgrepo-2 151s - tip 3:0eb1ab0073a8 151s - gamma 3:0eb1ab0073a8 git 151s - default/master 3:0eb1ab0073a8 git-remote 151s - beta 1:7fe02317c63d git 151s - alpha 0:ff7a2f2d8d70 git 151s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 151s - $ rm -rf hgrepo-2 151s - 151s - $ hg clone -r master repo.git hgrepo-2 151s - importing 4 git commits 151s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 151s - updating to branch default 151s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 151s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 151s - 0:ff7a2f2d8d70 draft alpha 151s - 1:7fe02317c63d draft beta 151s - 3:0eb1ab0073a8 draft default/master gamma tip 151s -This used to die: 151s - $ hg -R hgrepo-2 gexport 151s -This used to fail, since we didn't actually pull the annotated tag: 151s - $ hg -R hgrepo-2 push 151s - pushing to $TESTTMP/repo.git 151s - searching for changes 151s - no changes found 151s - [1] 151s - $ rm -rf hgrepo-2 151s - 151s -Check that pulling will update phases only: 151s - 151s - $ cd hgrepo 151s - $ hg phase -fs gamma detached 151s - $ hg pull 151s - pulling from $TESTTMP/repo.git 151s - no changes found 151s - $ hg log -T shorttags -r gamma -r detached 151s - 4:0eb1ab0073a8 draft beta default/master gamma 151s - 2:61175962e488 draft detached X 151s - $ cd .. 151s - 151s -Check that we pull new tags to existing commits: 151s - $ cd gitrepo 151s - $ git tag 151s - alpha 151s - beta 151s - detached 151s - gamma 151s - $ fn_git_tag extra-simple-tag 151s - $ fn_git_tag -m annotated extra-annotated-tag 151s - $ git push --tags 151s - To $TESTTMP/repo.git 151s - * [new tag] extra-annotated-tag -> extra-annotated-tag 151s - * [new tag] extra-simple-tag -> extra-simple-tag 151s - $ cd ../hgrepo 151s - $ hg pull -r master 151s - pulling from $TESTTMP/repo.git 151s - no changes found 151s - $ hg tags -v | grep extra 151s - extra-simple-tag 1:7fe02317c63d git 151s - extra-annotated-tag 1:7fe02317c63d git 151s 151s ERROR: test-git-tags.t#secret output changed 151s ! 151s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-pull-after-rebase.t 151s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-pull-after-rebase.t.err 151s @@ -38,275 +38,9 @@ 151s Clone it and rebase the branch 151s 151s $ hg clone -U repo.git hgrepo 151s - importing 3 git commits 151s - new changesets ff7a2f2d8d70:205a004356ef (3 drafts) 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 151s + abort: repository repo.git not found 151s + [255] 151s $ cd hgrepo 151s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 151s $ hg state 151s - o branch default/branch tip 2:205a004356ef32b8da782afb89d9179d12ca31e9 151s - | add gamma 151s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 151s - |/ add beta 151s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 151s - add alpha 151s - $ hg up branch 151s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 151s - (activating bookmark branch) 151s - $ hg rebase --quiet -d master 151s - $ hg state 151s - @ branch tip 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 151s - | add gamma 151s - | x default/branch 2:205a004356ef32b8da782afb89d9179d12ca31e9 151s - | | add gamma 151s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 151s - |/ add beta 151s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 151s - add alpha 151s - 151s - $ hg push -fr tip 151s - pushing to $TESTTMP/repo.git 151s - searching for changes 151s - adding objects 151s - remote: found 0 deltas to reuse 151s - added 1 commits with 1 trees and 1 blobs 151s - updating reference refs/heads/branch 151s - $ cd .. 151s - 151s -Now switch back to git and create a new commit based on what we just rebased 151s - 151s - $ cd gitrepo 151s - $ git checkout --quiet -b otherbranch branch 151s - $ git log --oneline --graph --all --decorate 151s - * e5023f9 (HEAD -> otherbranch, origin/branch, branch) add gamma 151s - | * 9497a4e (origin/master, master) add beta 151s - |/ 151s - * 7eeab2e add alpha 151s - $ echo delta > delta 151s - $ git add delta 151s - $ fn_git_commit -m 'add delta' 151s - $ git push --quiet --set-upstream origin otherbranch 151s - Branch 'otherbranch' set up to track remote branch 'otherbranch' from 'origin'. (?) 151s - $ git log --oneline --graph --all --decorate 151s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 151s - * e5023f9 (origin/branch, branch) add gamma 151s - | * 9497a4e (origin/master, master) add beta 151s - |/ 151s - * 7eeab2e add alpha 151s - $ cd .. 151s - 151s -Pull that 151s - 151s - $ cd hgrepo 151s - $ hg pull 151s - pulling from $TESTTMP/repo.git 151s - importing 1 git commits 151s - adding bookmark otherbranch 151s - 1 new orphan changesets 151s - new changesets 075302705298 (1 drafts) 151s - (run 'hg heads' to see heads, 'hg merge' to merge) 151s - $ hg state 151s - * otherbranch default/otherbranch tip 4:0753027052980aef9c9c37adb7d76d5719e8d818 151s - | add delta 151s - | @ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 151s - | | add gamma 151s - x | 2:205a004356ef32b8da782afb89d9179d12ca31e9 151s - | | add gamma 151s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 151s - |/ add beta 151s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 151s - add alpha 151s - 151s - $ cd .. 151s - 151s -To reproduce bug #386, do like github and save the old commit in a 151s -ref, and create a clone containing just the converted git commits: 151s - 151s - $ cd repo.git 151s - $ git update-ref refs/pr/1 otherbranch 151s - $ cd .. 151s - $ hg clone -U repo.git hgrepo-issue386 151s - importing 5 git commits 151s - new changesets ff7a2f2d8d70:075302705298 (5 drafts) 151s - 151s -Now try rebasing that branch, from the Git side of things 151s - 151s - $ cd gitrepo 151s - $ git checkout -q otherbranch 151s - $ git log --oneline --graph --all --decorate 151s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 151s - * e5023f9 (origin/branch, branch) add gamma 151s - | * 9497a4e (origin/master, master) add beta 151s - |/ 151s - * 7eeab2e add alpha 151s - $ fn_git_rebase --onto master branch otherbranch 151s - $ git log --oneline --graph --all --decorate 151s - * 9c58139 (HEAD -> otherbranch) add delta 151s - * 9497a4e (origin/master, master) add beta 151s - | * bba0011 (origin/otherbranch) add delta 151s - | * e5023f9 (origin/branch, branch) add gamma 151s - |/ 151s - * 7eeab2e add alpha 151s - $ git push -f 151s - To $TESTTMP/repo.git 151s - + bba0011...9c58139 otherbranch -> otherbranch (forced update) 151s - $ git log --oneline --graph --all --decorate 151s - * 9c58139 (HEAD -> otherbranch, origin/otherbranch) add delta 151s - * 9497a4e (origin/master, master) add beta 151s - | * e5023f9 (origin/branch, branch) add gamma 151s - |/ 151s - * 7eeab2e add alpha 151s - $ cd .. 151s - 151s -Now strip the old commit 151s - 151s - $ cd hgrepo-issue386 151s - $ hg up null 151s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 151s - $ hg id -qr otherbranch 151s - 075302705298 151s - $ hg pull 151s - pulling from $TESTTMP/repo.git 151s - importing 1 git commits 151s - not updating diverged bookmark otherbranch 151s - new changesets d64bf0521af6 (1 drafts) 151s - (run 'hg heads .' to see heads, 'hg merge' to merge) 151s - $ hg debugstrip --hidden --no-backup otherbranch 151s - $ hg book -d otherbranch 151s - $ hg git-cleanup 151s - git commit map cleaned 151s - $ hg pull 151s - pulling from $TESTTMP/repo.git 151s - no changes found 151s - adding bookmark otherbranch 151s - $ cd .. 151s - 151s -And check that pulling something else doesn't delete that branch. 151s - 151s - $ cd hgrepo 151s - $ hg pull -r master 151s - pulling from $TESTTMP/repo.git 151s - no changes found 151s - $ cd .. 151s - 151s -A special case, is that we can pull into a repository, where a commit 151s -corresponding to the new branch exists, but that commit is obsolete. 151s -In order to avoid “pinning” the obsolete commit, and thereby making it 151s -visible, we first pull from Git as an unnamed remote. 151s - 151s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 151s - updating to branch default 151s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 151s - $ cd hgrepo-clone 151s - $ hg pull ../repo.git 151s - pulling from ../repo.git 151s - importing 4 git commits 151s - not updating diverged bookmark otherbranch 151s - new changesets d64bf0521af6 (1 drafts) 151s - (run 'hg heads .' to see heads, 'hg merge' to merge) 151s - $ hg debugobsolete d64bf0521af68fe2160791a1b4ab9baf282a3879 151s - 1 new obsolescence markers 151s - obsoleted 1 changesets 151s - $ cp ../hgrepo/.hg/hgrc .hg 151s - $ hg pull 151s - pulling from $TESTTMP/repo.git 151s - no changes found 151s - not updating diverged bookmark otherbranch 151s - $ cd .. 151s - $ rm -rf hgrepo-clone 151s - 151s -Another special case, is that we should update commits over obsolete boundaries: 151s - 151s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 151s - updating to branch default 151s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 151s - $ cd hgrepo-clone 151s - $ hg pull ../repo.git 151s - pulling from ../repo.git 151s - importing 4 git commits 151s - not updating diverged bookmark otherbranch 151s - new changesets d64bf0521af6 (1 drafts) 151s - (run 'hg heads .' to see heads, 'hg merge' to merge) 151s - $ hg debugobsolete 0753027052980aef9c9c37adb7d76d5719e8d818 d64bf0521af68fe2160791a1b4ab9baf282a3879 151s - 1 new obsolescence markers 151s - obsoleted 1 changesets 151s - $ hg book -r 075302705298 otherbranch 151s - $ cp ../hgrepo/.hg/hgrc .hg 151s - $ hg pull 151s - pulling from $TESTTMP/repo.git 151s - no changes found 151s - updating bookmark otherbranch 151s - $ cd .. 151s - $ rm -rf hgrepo-clone 151s - 151s -Now just pull it: 151s - 151s - $ cd hgrepo 151s - $ hg pull 151s - pulling from $TESTTMP/repo.git 151s - importing 1 git commits 151s - not updating diverged bookmark otherbranch 151s - new changesets d64bf0521af6 (1 drafts) 151s - (run 'hg heads .' to see heads, 'hg merge' to merge) 151s - $ hg state 151s - o default/otherbranch tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 151s - | add delta 151s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 151s - | | add delta 151s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 151s - | | add gamma 151s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 151s - | | add gamma 151s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 151s - |/ add beta 151s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 151s - add alpha 151s - $ cd .. 151s - 151s -And finally, delete it: 151s - 151s - $ cd gitrepo 151s - $ git push origin :otherbranch 151s - To $TESTTMP/repo.git 151s - - [deleted] otherbranch 151s - $ cd .. 151s - 151s -And pull that: 151s - 151s - $ cd hgrepo 151s - $ hg pull 151s - pulling from $TESTTMP/repo.git 151s - no changes found 151s - not deleting diverged bookmark otherbranch 151s - $ hg state 151s - o tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 151s - | add delta 151s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 151s - | | add delta 151s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 151s - | | add gamma 151s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 151s - | | add gamma 151s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 151s - |/ add beta 151s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 151s - add alpha 151s - $ cd .. 151s - 151s -We only get that message once: 151s - 151s - $ hg -R hgrepo pull 151s - pulling from $TESTTMP/repo.git 151s - no changes found 151s - 151s -Now try deleting one already gone locally, which shouldn't output 151s -anything: 151s - 151s - $ cd gitrepo 151s - $ git push origin :branch 151s - To $TESTTMP/repo.git 151s - - [deleted] branch 151s - $ cd ../hgrepo 151s - $ hg book -d branch 151s - $ hg pull 151s - pulling from $TESTTMP/repo.git 151s - no changes found 151s - $ cd .. 151s 151s ERROR: test-pull-after-rebase.t output changed 151s ! 151s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-push.t 151s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-push.t.err 151s @@ -12,287 +12,10 @@ 151s 151s $ cd .. 151s $ hg clone -u tip gitrepo hgrepo 151s - importing 1 git commits 151s - new changesets ff7a2f2d8d70 (1 drafts) 151s - updating to branch default 151s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 151s + abort: repository gitrepo not found 151s + [255] 151s 151s $ cd hgrepo 151s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 151s $ hg bookmark -q master 151s - $ echo beta > beta 151s - $ hg add beta 151s - $ fn_hg_commit -m 'add beta' 151s - 151s - 151s - $ echo gamma > gamma 151s - $ hg add gamma 151s - $ fn_hg_commit -m 'add gamma' 151s - 151s - $ hg book -r 1 beta 151s - $ hg push -r beta 151s - pushing to $TESTTMP/gitrepo 151s - searching for changes 151s - adding objects 151s - remote: found 0 deltas to reuse 151s - added 1 commits with 1 trees and 1 blobs 151s - adding reference refs/heads/beta 151s - 151s - $ cd .. 151s - 151s -should have two different branches 151s - $ cd gitrepo 151s - $ git branch -v 151s - beta 0f378ab add beta 151s - master 7eeab2e add alpha 151s - * not-master 7eeab2e add alpha 151s - 151s -some more work on master from git 151s - $ git checkout master 2>&1 | sed s/\'/\"/g 151s - Switched to branch "master" 151s - $ echo delta > delta 151s - $ git add delta 151s - $ fn_git_commit -m "add delta" 151s - $ git checkout not-master 2>&1 | sed s/\'/\"/g 151s - Switched to branch "not-master" 151s - 151s - $ cd .. 151s - 151s - $ cd hgrepo 151s -this should fail 151s - $ hg push -r master 151s - pushing to $TESTTMP/gitrepo 151s - searching for changes 151s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 151s - [255] 151s - 151s -... even with -f 151s - $ hg push -fr master 151s - pushing to $TESTTMP/gitrepo 151s - searching for changes 151s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 151s - [255] 151s - 151s - $ hg pull 2>&1 | grep -v 'divergent bookmark' 151s - pulling from $TESTTMP/gitrepo 151s - importing 1 git commits 151s - not updating diverged bookmark master 151s - new changesets 25eed24f5e8f (1 drafts) 151s - (run 'hg heads' to see heads, 'hg merge' to merge) 151s -TODO shouldn't need to do this since we're (in theory) pushing master explicitly, 151s -which should not implicitly also push the not-master ref. 151s - $ hg book not-master -r default/not-master --force 151s -master and default/master should be diferent 151s - $ hg log -r master 151s - changeset: 2:953796e1cfd8 151s - bookmark: master 151s - user: test 151s - date: Mon Jan 01 00:00:12 2007 +0000 151s - summary: add gamma 151s - 151s - $ hg log -r default/master 151s - changeset: 3:25eed24f5e8f 151s - tag: default/master 151s - tag: tip 151s - parent: 0:ff7a2f2d8d70 151s - user: test 151s - date: Mon Jan 01 00:00:13 2007 +0000 151s - summary: add delta 151s - 151s - 151s -this should also fail 151s - $ hg push -r master 151s - pushing to $TESTTMP/gitrepo 151s - searching for changes 151s - abort: pushing refs/heads/master overwrites 953796e1cfd8 151s - [255] 151s - 151s -... but succeed with -f 151s - $ hg push -fr master 151s - pushing to $TESTTMP/gitrepo 151s - searching for changes 151s - adding objects 151s - remote: found 0 deltas to reuse 151s - added 1 commits with 1 trees and 1 blobs 151s - updating reference refs/heads/master 151s - 151s -this should fail, no changes to push 151s - $ hg push -r master 151s - pushing to $TESTTMP/gitrepo 151s - searching for changes 151s - no changes found 151s - [1] 151s - 151s -hg-git issue103 -- directories can lose information at hg-git export time 151s - 151s - $ hg up master 151s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 151s - $ mkdir dir1 151s - $ echo alpha > dir1/alpha 151s - $ hg add dir1/alpha 151s - $ fn_hg_commit -m 'add dir1/alpha' 151s - $ hg push -r master 151s - pushing to $TESTTMP/gitrepo 151s - searching for changes 151s - adding objects 151s - remote: found 0 deltas to reuse 151s - added 1 commits with 2 trees and 0 blobs 151s - updating reference refs/heads/master 151s - 151s - $ echo beta > dir1/beta 151s - $ hg add dir1/beta 151s - $ fn_hg_commit -m 'add dir1/beta' 151s - $ hg push -r master 151s - pushing to $TESTTMP/gitrepo 151s - searching for changes 151s - adding objects 151s - remote: found 0 deltas to reuse 151s - added 1 commits with 2 trees and 0 blobs 151s - updating reference refs/heads/master 151s - $ hg log -r master 151s - changeset: 5:ba0476ff1899 151s - bookmark: master 151s - tag: default/master 151s - tag: tip 151s - user: test 151s - date: Mon Jan 01 00:00:15 2007 +0000 151s - summary: add dir1/beta 151s - 151s - 151s - $ cat >> .hg/hgrc << EOF 151s - > [paths] 151s - > default:pushurl = file:///$TESTTMP/gitrepo 151s - > EOF 151s -NB: the triple slashes are intentional, due to windows 151s - $ hg push -r master 151s - pushing to file:///$TESTTMP/gitrepo 151s - searching for changes 151s - no changes found 151s - [1] 151s - 151s - $ cd .. 151s - 151s - $ hg clone -u tip gitrepo hgrepo-test 151s - importing 5 git commits 151s - new changesets ff7a2f2d8d70:ba0476ff1899 (5 drafts) 151s - updating to branch default 151s - 5 files updated, 0 files merged, 0 files removed, 0 files unresolved 151s - $ hg -R hgrepo-test log -r master 151s - changeset: 4:ba0476ff1899 151s - bookmark: master 151s - tag: default/master 151s - tag: tip 151s - user: test 151s - date: Mon Jan 01 00:00:15 2007 +0000 151s - summary: add dir1/beta 151s - 151s - $ hg tags -R hgrepo-test | grep ^default/ 151s - default/master 4:ba0476ff1899 151s - default/beta 1:47580592d3d6 151s - default/not-master 0:ff7a2f2d8d70 151s - 151s -Push a fast-forward to a currently checked out branch, which sometimes 151s -fails: 151s - 151s - $ cd hgrepo 151s - $ hg book -r master not-master 151s - moving bookmark 'not-master' forward from ff7a2f2d8d70 151s - $ hg push 151s - pushing to file:///$TESTTMP/gitrepo 151s - searching for changes 151s - warning: failed to update HEAD; unable to set b'HEAD' to b'7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03' (?) 151s - updating reference refs/heads/not-master 151s -That should have updated the tag: 151s - $ hg tags | grep ^default/ 151s - default/not-master 5:ba0476ff1899 151s - default/master 5:ba0476ff1899 151s - default/beta 1:47580592d3d6 151s - $ cd .. 151s - 151s -We can push only one of two bookmarks on the same revision: 151s - 151s - $ cd hgrepo 151s - $ hg book -r 0 also-not-master really-not-master 151s - $ hg push -B also-not-master 151s - pushing to file:///$TESTTMP/gitrepo 151s - searching for changes 151s - adding reference refs/heads/also-not-master 151s - 151s -We can also push another bookmark to a path with another revision 151s -specified: 151s - 151s - $ hg book -r 3 also-not-master 151s - moving bookmark 'also-not-master' forward from ff7a2f2d8d70 151s - $ hg push -B also-not-master "file:///$TESTTMP/gitrepo#master" 151s - pushing to file:///$TESTTMP/gitrepo 151s - searching for changes 151s - adding objects 151s - remote: found 0 deltas to reuse 151s - added 1 commits with 1 trees and 1 blobs 151s - updating reference refs/heads/also-not-master 151s - 151s -And we can delete them again afterwards: 151s - 151s - $ hg book -d also-not-master really-not-master 151s - $ hg push -B also-not-master -B really-not-master 151s - pushing to file:///$TESTTMP/gitrepo 151s - searching for changes 151s - warning: unable to delete 'refs/heads/really-not-master' as it does not exist on the remote repository 151s - deleting reference refs/heads/also-not-master 151s - 151s -Push empty Hg repo to empty Git repo (issue #58) 151s - $ hg init hgrepo2 151s - $ git init -q --bare repo.git 151s - $ hg -R hgrepo2 push repo.git 151s - pushing to repo.git 151s - searching for changes 151s - abort: no bookmarks or tags to push to git 151s - (see "hg help bookmarks" for details on creating them) 151s - [255] 151s - 151s -The remote repo is empty and the local one doesn't have any bookmarks/tags 151s - $ cd hgrepo2 151s - $ echo init >> test.txt 151s - $ hg addremove 151s - adding test.txt 151s - $ fn_hg_commit -m init 151s - $ hg update null 151s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 151s - $ hg push ../repo.git 151s - pushing to ../repo.git 151s - searching for changes 151s - abort: no bookmarks or tags to push to git 151s - (see "hg help bookmarks" for details on creating them) 151s - [255] 151s - $ hg summary 151s - parent: -1:000000000000 (no revision checked out) 151s - branch: default 151s - commit: (clean) 151s - update: 1 new changesets (update) 151s - phases: 1 draft 151s -That should not create any bookmarks 151s - $ hg bookmarks 151s - no bookmarks set 151s -And no tags for the remotes either: 151s - $ hg tags 151s - tip 0:8aded40be5af 151s - 151s -test for ssh vulnerability 151s - 151s - $ cat >> $HGRCPATH << EOF 151s - > [ui] 151s - > ssh = ssh -o ConnectTimeout=1 151s - > EOF 151s - $ hg push -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 151s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 151s - [255] 151s - $ hg push -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 151s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 151s - [255] 151s - $ hg push -q 'git+ssh://fakehost|rm%20nonexistent/path' 151s - ssh: * fakehost%7?rm%20nonexistent* (glob) 151s - abort: git remote error: The remote server unexpectedly closed the connection. 151s - [255] 151s - $ hg push -q 'git+ssh://fakehost%7Crm%20nonexistent/path' 151s - ssh: * fakehost%7?rm%20nonexistent* (glob) 151s - abort: git remote error: The remote server unexpectedly closed the connection. 151s - [255] 151s 151s ERROR: test-push.t output changed 160s ! 160s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-clone.t 160s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-clone.t#draft.err 160s @@ -38,60 +38,42 @@ 160s clone a tag 160s 160s $ hg clone -r alpha gitrepo hgrepo-a 160s - importing 1 git commits 160s - new changesets ff7a2f2d8d70 (1 drafts) 160s - updating to branch default 160s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository gitrepo not found 160s + [255] 160s $ hg -R hgrepo-a bookmarks 160s - master 0:ff7a2f2d8d70 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-a not found 160s + [255] 160s $ hg -R hgrepo-a log --graph --template=phases 160s - @ changeset: 0:ff7a2f2d8d70 160s - bookmark: master 160s - tag: alpha 160s - tag: default/master 160s - tag: tip 160s - phase: draft 160s - user: test 160s - date: Mon Jan 01 00:00:10 2007 +0000 160s - summary: add alpha 160s - 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-a not found 160s + [255] 160s $ git --git-dir hgrepo-a/.hg/git for-each-ref 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 160s + fatal: not a git repository: 'hgrepo-a/.hg/git' 160s + [128] 160s Make sure this is still draft since we didn't pull remote's HEAD 160s $ hg -R hgrepo-a phase -r alpha 160s - 0: draft 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-a not found 160s + [255] 160s 160s clone a branch 160s $ hg clone -r beta gitrepo hgrepo-b 160s - importing 2 git commits 160s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 160s - updating to branch default 160s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository gitrepo not found 160s + [255] 160s $ hg -R hgrepo-b bookmarks 160s - * beta 1:7fe02317c63d 160s - master 0:ff7a2f2d8d70 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-b not found 160s + [255] 160s $ hg -R hgrepo-b log --graph 160s - @ changeset: 1:7fe02317c63d 160s - | bookmark: beta 160s - | tag: default/beta 160s - | tag: tip 160s - | user: test 160s - | date: Mon Jan 01 00:00:11 2007 +0000 160s - | summary: add beta 160s - | 160s - o changeset: 0:ff7a2f2d8d70 160s - bookmark: master 160s - tag: alpha 160s - tag: default/master 160s - user: test 160s - date: Mon Jan 01 00:00:10 2007 +0000 160s - summary: add alpha 160s - 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-b not found 160s + [255] 160s $ git --git-dir hgrepo-b/.hg/git for-each-ref 160s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 160s + fatal: not a git repository: 'hgrepo-b/.hg/git' 160s + [128] 160s 160s Make sure that a deleted .hgsubstate does not confuse hg-git 160s 160s @@ -104,48 +86,50 @@ 160s $ cd .. 160s 160s $ hg clone -r beta gitrepo hgrepo-c 160s - importing 4 git commits 160s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 160s - updating to branch default 160s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository gitrepo not found 160s + [255] 160s $ hg -R hgrepo-c bookmarks 160s - * beta 3:47d12948785d 160s - master 0:ff7a2f2d8d70 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-c not found 160s + [255] 160s $ hg --cwd hgrepo-c status 160s + abort: No such file or directory: 'hgrepo-c' 160s + [255] 160s $ git --git-dir hgrepo-c/.hg/git for-each-ref 160s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 160s + fatal: not a git repository: 'hgrepo-c/.hg/git' 160s + [128] 160s 160s test shared repositories 160s 160s $ hg clone gitrepo hgrepo-base 160s - importing 5 git commits 160s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 160s - updating to bookmark beta 160s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository gitrepo not found 160s + [255] 160s $ hg -R hgrepo-base bookmarks 160s - * beta 4:47d12948785d 160s - gamma 2:ca33a262eb46 160s - master 0:ff7a2f2d8d70 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-base not found 160s + [255] 160s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 160s - updating working directory 160s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-base not found 160s + [255] 160s $ hg -R hgrepo-shared pull gitrepo 160s - pulling from gitrepo 160s - no changes found 160s - adding bookmark beta 160s - adding bookmark gamma 160s - adding bookmark master 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-shared not found 160s + [255] 160s $ hg -R hgrepo-shared push gitrepo 160s - pushing to gitrepo 160s - searching for changes 160s - no changes found 160s - [1] 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-shared not found 160s + [255] 160s $ ls hgrepo-shared/.hg | grep git 160s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 160s [1] 160s $ hg -R hgrepo-shared git-cleanup 160s - git commit map cleaned 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + hg: unknown command 'git-cleanup' 160s + (did you mean clean?) 160s + [10] 160s $ rm -rf hgrepo-base hgrepo-shared 160s 160s test cloning HEAD 160s @@ -154,23 +138,21 @@ 160s $ git checkout -q master 160s $ cd .. 160s $ hg clone gitrepo hgrepo-2 160s - importing 5 git commits 160s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 160s - updating to bookmark master 160s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository gitrepo not found 160s + [255] 160s $ git --git-dir hgrepo-2/.hg/git for-each-ref 160s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 160s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 160s + fatal: not a git repository: 'hgrepo-2/.hg/git' 160s + [128] 160s $ rm -rf hgrepo-2 160s 160s clone empty repo 160s $ git init empty 160s Initialized empty Git repository in $TESTTMP/empty/.git/ 160s $ hg clone empty emptyhg 160s - updating to branch default 160s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository empty not found 160s + [255] 160s $ rm -rf empty emptyhg 160s 160s test cloning detached HEAD, but pointing to a branch; we detect this 160s @@ -180,25 +162,20 @@ 160s $ git checkout -q -d master 160s $ cd .. 160s $ hg clone gitrepo hgrepo-2 160s - importing 5 git commits 160s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 160s - updating to bookmark master 160s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository gitrepo not found 160s + [255] 160s $ hg -R hgrepo-2 book 160s - beta 4:47d12948785d 160s - gamma 2:ca33a262eb46 160s - * master 0:ff7a2f2d8d70 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-2 not found 160s + [255] 160s $ hg -R hgrepo-2 tags -v 160s - tip 4:47d12948785d 160s - default/beta 4:47d12948785d git-remote 160s - default/gamma 2:ca33a262eb46 git-remote 160s - default/master 0:ff7a2f2d8d70 git-remote 160s - alpha 0:ff7a2f2d8d70 git 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-2 not found 160s + [255] 160s $ git --git-dir hgrepo-2/.hg/git for-each-ref 160s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 160s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 160s + fatal: not a git repository: 'hgrepo-2/.hg/git' 160s + [128] 160s $ rm -rf hgrepo-2 160s 160s test cloning fully detached HEAD; we don't convert the 160s @@ -212,44 +189,45 @@ 160s $ fn_git_commit -m 'add delta' 160s $ cd .. 160s $ hg clone gitrepo hgrepo-2 160s - importing 5 git commits 160s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 160s - warning: the git source repository has a detached head 160s - (you may want to update to a bookmark) 160s - updating to branch default 160s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository gitrepo not found 160s + [255] 160s $ hg -R hgrepo-2 book 160s - beta 4:47d12948785d 160s - gamma 2:ca33a262eb46 160s - master 0:ff7a2f2d8d70 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-2 not found 160s + [255] 160s $ hg -R hgrepo-2 id --tags 160s - default/beta tip 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-2 not found 160s + [255] 160s $ git --git-dir hgrepo-2/.hg/git for-each-ref 160s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 160s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 160s + fatal: not a git repository: 'hgrepo-2/.hg/git' 160s + [128] 160s $ rm -rf hgrepo-2 160s 160s test that cloning a regular mercurial repository does not introduce 160s git state 160s 160s $ hg init hgrepo-base 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s $ cd hgrepo-base 160s $ touch flaf 160s $ fn_hg_commit -A -m flaf 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s $ cd .. 160s $ hg clone -U hgrepo-base hgrepo-copy 160s requesting all changes (secret !) 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s $ ls hgrepo-copy/.hg | grep git 160s [1] 160s $ hg clone -U --pull hgrepo-base hgrepo-pull 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s requesting all changes 160s - adding changesets (draft !) 160s - adding manifests (draft !) 160s - adding file changes (draft !) 160s - added 1 changesets with 1 changes to 1 files (draft !) 160s - new changesets 76c919376257 (draft !) 160s + adding changesets 160s + adding manifests 160s + adding file changes 160s + added 1 changesets with 1 changes to 1 files 160s + new changesets 76c919376257 160s $ ls hgrepo-pull | grep git 160s [1] 160s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 160s 160s ERROR: test-clone.t#draft output changed 160s ! 160s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-clone.t 160s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-clone.t#secret.err 160s @@ -38,60 +38,42 @@ 160s clone a tag 160s 160s $ hg clone -r alpha gitrepo hgrepo-a 160s - importing 1 git commits 160s - new changesets ff7a2f2d8d70 (1 drafts) 160s - updating to branch default 160s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository gitrepo not found 160s + [255] 160s $ hg -R hgrepo-a bookmarks 160s - master 0:ff7a2f2d8d70 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-a not found 160s + [255] 160s $ hg -R hgrepo-a log --graph --template=phases 160s - @ changeset: 0:ff7a2f2d8d70 160s - bookmark: master 160s - tag: alpha 160s - tag: default/master 160s - tag: tip 160s - phase: draft 160s - user: test 160s - date: Mon Jan 01 00:00:10 2007 +0000 160s - summary: add alpha 160s - 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-a not found 160s + [255] 160s $ git --git-dir hgrepo-a/.hg/git for-each-ref 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 160s + fatal: not a git repository: 'hgrepo-a/.hg/git' 160s + [128] 160s Make sure this is still draft since we didn't pull remote's HEAD 160s $ hg -R hgrepo-a phase -r alpha 160s - 0: draft 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-a not found 160s + [255] 160s 160s clone a branch 160s $ hg clone -r beta gitrepo hgrepo-b 160s - importing 2 git commits 160s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 160s - updating to branch default 160s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository gitrepo not found 160s + [255] 160s $ hg -R hgrepo-b bookmarks 160s - * beta 1:7fe02317c63d 160s - master 0:ff7a2f2d8d70 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-b not found 160s + [255] 160s $ hg -R hgrepo-b log --graph 160s - @ changeset: 1:7fe02317c63d 160s - | bookmark: beta 160s - | tag: default/beta 160s - | tag: tip 160s - | user: test 160s - | date: Mon Jan 01 00:00:11 2007 +0000 160s - | summary: add beta 160s - | 160s - o changeset: 0:ff7a2f2d8d70 160s - bookmark: master 160s - tag: alpha 160s - tag: default/master 160s - user: test 160s - date: Mon Jan 01 00:00:10 2007 +0000 160s - summary: add alpha 160s - 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-b not found 160s + [255] 160s $ git --git-dir hgrepo-b/.hg/git for-each-ref 160s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 160s + fatal: not a git repository: 'hgrepo-b/.hg/git' 160s + [128] 160s 160s Make sure that a deleted .hgsubstate does not confuse hg-git 160s 160s @@ -104,48 +86,50 @@ 160s $ cd .. 160s 160s $ hg clone -r beta gitrepo hgrepo-c 160s - importing 4 git commits 160s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 160s - updating to branch default 160s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository gitrepo not found 160s + [255] 160s $ hg -R hgrepo-c bookmarks 160s - * beta 3:47d12948785d 160s - master 0:ff7a2f2d8d70 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-c not found 160s + [255] 160s $ hg --cwd hgrepo-c status 160s + abort: No such file or directory: 'hgrepo-c' 160s + [255] 160s $ git --git-dir hgrepo-c/.hg/git for-each-ref 160s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 160s + fatal: not a git repository: 'hgrepo-c/.hg/git' 160s + [128] 160s 160s test shared repositories 160s 160s $ hg clone gitrepo hgrepo-base 160s - importing 5 git commits 160s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 160s - updating to bookmark beta 160s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository gitrepo not found 160s + [255] 160s $ hg -R hgrepo-base bookmarks 160s - * beta 4:47d12948785d 160s - gamma 2:ca33a262eb46 160s - master 0:ff7a2f2d8d70 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-base not found 160s + [255] 160s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 160s - updating working directory 160s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-base not found 160s + [255] 160s $ hg -R hgrepo-shared pull gitrepo 160s - pulling from gitrepo 160s - no changes found 160s - adding bookmark beta 160s - adding bookmark gamma 160s - adding bookmark master 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-shared not found 160s + [255] 160s $ hg -R hgrepo-shared push gitrepo 160s - pushing to gitrepo 160s - searching for changes 160s - no changes found 160s - [1] 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-shared not found 160s + [255] 160s $ ls hgrepo-shared/.hg | grep git 160s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 160s [1] 160s $ hg -R hgrepo-shared git-cleanup 160s - git commit map cleaned 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + hg: unknown command 'git-cleanup' 160s + (did you mean clean?) 160s + [10] 160s $ rm -rf hgrepo-base hgrepo-shared 160s 160s test cloning HEAD 160s @@ -154,23 +138,21 @@ 160s $ git checkout -q master 160s $ cd .. 160s $ hg clone gitrepo hgrepo-2 160s - importing 5 git commits 160s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 160s - updating to bookmark master 160s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository gitrepo not found 160s + [255] 160s $ git --git-dir hgrepo-2/.hg/git for-each-ref 160s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 160s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 160s + fatal: not a git repository: 'hgrepo-2/.hg/git' 160s + [128] 160s $ rm -rf hgrepo-2 160s 160s clone empty repo 160s $ git init empty 160s Initialized empty Git repository in $TESTTMP/empty/.git/ 160s $ hg clone empty emptyhg 160s - updating to branch default 160s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository empty not found 160s + [255] 160s $ rm -rf empty emptyhg 160s 160s test cloning detached HEAD, but pointing to a branch; we detect this 160s @@ -180,25 +162,20 @@ 160s $ git checkout -q -d master 160s $ cd .. 160s $ hg clone gitrepo hgrepo-2 160s - importing 5 git commits 160s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 160s - updating to bookmark master 160s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository gitrepo not found 160s + [255] 160s $ hg -R hgrepo-2 book 160s - beta 4:47d12948785d 160s - gamma 2:ca33a262eb46 160s - * master 0:ff7a2f2d8d70 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-2 not found 160s + [255] 160s $ hg -R hgrepo-2 tags -v 160s - tip 4:47d12948785d 160s - default/beta 4:47d12948785d git-remote 160s - default/gamma 2:ca33a262eb46 git-remote 160s - default/master 0:ff7a2f2d8d70 git-remote 160s - alpha 0:ff7a2f2d8d70 git 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-2 not found 160s + [255] 160s $ git --git-dir hgrepo-2/.hg/git for-each-ref 160s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 160s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 160s + fatal: not a git repository: 'hgrepo-2/.hg/git' 160s + [128] 160s $ rm -rf hgrepo-2 160s 160s test cloning fully detached HEAD; we don't convert the 160s @@ -212,44 +189,45 @@ 160s $ fn_git_commit -m 'add delta' 160s $ cd .. 160s $ hg clone gitrepo hgrepo-2 160s - importing 5 git commits 160s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 160s - warning: the git source repository has a detached head 160s - (you may want to update to a bookmark) 160s - updating to branch default 160s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository gitrepo not found 160s + [255] 160s $ hg -R hgrepo-2 book 160s - beta 4:47d12948785d 160s - gamma 2:ca33a262eb46 160s - master 0:ff7a2f2d8d70 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-2 not found 160s + [255] 160s $ hg -R hgrepo-2 id --tags 160s - default/beta tip 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository hgrepo-2 not found 160s + [255] 160s $ git --git-dir hgrepo-2/.hg/git for-each-ref 160s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 160s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 160s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 160s + fatal: not a git repository: 'hgrepo-2/.hg/git' 160s + [128] 160s $ rm -rf hgrepo-2 160s 160s test that cloning a regular mercurial repository does not introduce 160s git state 160s 160s $ hg init hgrepo-base 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s $ cd hgrepo-base 160s $ touch flaf 160s $ fn_hg_commit -A -m flaf 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s $ cd .. 160s $ hg clone -U hgrepo-base hgrepo-copy 160s - requesting all changes (secret !) 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + requesting all changes 160s $ ls hgrepo-copy/.hg | grep git 160s [1] 160s $ hg clone -U --pull hgrepo-base hgrepo-pull 160s - requesting all changes 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s adding changesets (draft !) 160s adding manifests (draft !) 160s adding file changes (draft !) 160s added 1 changesets with 1 changes to 1 files (draft !) 160s new changesets 76c919376257 (draft !) 160s + requesting all changes 160s $ ls hgrepo-pull | grep git 160s [1] 160s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 160s 160s ERROR: test-clone.t#secret output changed 160s ! 160s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-branch-bookmark-suffix.t 160s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-branch-bookmark-suffix.t#with-path.err 160s @@ -9,287 +9,12 @@ 160s $ git init -q --bare repo.git 160s 160s $ hg clone repo.git hgrepo 160s - updating to branch default 160s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository repo.git not found 160s + [255] 160s $ cd hgrepo 160s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 160s #if without-path 160s $ rm .hg/hgrc 160s #endif 160s $ hg branch -q branch1 160s - $ hg bookmark branch1_bookmark 160s - $ echo f1 > f1 160s - $ hg add f1 160s - $ fn_hg_commit -m "add f1" 160s - $ hg branch -q branch2 160s - $ hg bookmark branch2_bookmark 160s - $ echo f2 > f2 160s - $ hg add f2 160s - $ fn_hg_commit -m "add f2" 160s - $ hg log --graph 160s - @ changeset: 1:600de9b6d498 160s - | branch: branch2 160s - | bookmark: branch2_bookmark 160s - | tag: tip 160s - | user: test 160s - | date: Mon Jan 01 00:00:11 2007 +0000 160s - | summary: add f2 160s - | 160s - o changeset: 0:40a840c1f8ae 160s - branch: branch1 160s - bookmark: branch1_bookmark 160s - user: test 160s - date: Mon Jan 01 00:00:10 2007 +0000 160s - summary: add f1 160s - 160s - 160s - $ hg push -B asdasd ../repo.git 160s - pushing to ../repo.git 160s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 160s - [255] 160s - 160s - $ hg push ../repo.git 160s - pushing to ../repo.git 160s - searching for changes 160s - adding objects 160s - remote: found 0 deltas to reuse 160s - added 2 commits with 2 trees and 2 blobs 160s - adding reference refs/heads/branch1 160s - adding reference refs/heads/branch2 160s - 160s - $ cd .. 160s - 160s - $ cd repo.git 160s - $ git symbolic-ref HEAD refs/heads/branch1 160s - $ git branch 160s - * branch1 160s - branch2 160s - $ cd .. 160s - 160s - $ git clone repo.git gitrepo 160s - Cloning into 'gitrepo'... 160s - done. 160s - $ cd gitrepo 160s - $ git checkout -q branch1 160s - $ echo g1 >> f1 160s - $ git add f1 160s - $ fn_git_commit -m "append f1" 160s - $ git checkout -q branch2 160s - $ echo g2 >> f2 160s - $ git add f2 160s - $ fn_git_commit -m "append f2" 160s - $ git checkout -b branch3 160s - Switched to a new branch 'branch3' 160s - $ echo g3 >> f3 160s - $ git add f3 160s - $ fn_git_commit -m "append f3" 160s - $ git push origin branch1 branch2 branch3 160s - To $TESTTMP/repo.git 160s - bbfe79a..d8aef79 branch1 -> branch1 160s - 288e92b..f8f8de5 branch2 -> branch2 160s - * [new branch] branch3 -> branch3 160s -make sure the commit doesn't have an HG:rename-source annotation 160s - $ git cat-file commit d8aef79 160s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 160s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 160s - author test 1167609612 +0000 160s - committer test 1167609612 +0000 160s - 160s - append f1 160s - $ cd .. 160s - 160s - $ cd hgrepo 160s - $ hg paths 160s - default = $TESTTMP/repo.git (with-path !) 160s - $ hg pull ../repo.git 160s - pulling from ../repo.git 160s - importing 3 git commits 160s - updating bookmark branch1_bookmark 160s - updating bookmark branch2_bookmark 160s - adding bookmark branch3_bookmark 160s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 160s - (run 'hg heads' to see heads) 160s - $ hg log --graph 160s - o changeset: 4:faf44fc3a4e8 160s - | bookmark: branch3_bookmark 160s - | tag: default/branch3 (with-path !) 160s - | tag: tip 160s - | user: test 160s - | date: Mon Jan 01 00:00:14 2007 +0000 160s - | summary: append f3 160s - | 160s - o changeset: 3:ae8eb55f7090 160s - | bookmark: branch2_bookmark 160s - | tag: default/branch2 (with-path !) 160s - | parent: 1:600de9b6d498 160s - | user: test 160s - | date: Mon Jan 01 00:00:13 2007 +0000 160s - | summary: append f2 160s - | 160s - | o changeset: 2:8211cade99e4 160s - | | bookmark: branch1_bookmark 160s - | | tag: default/branch1 (with-path !) 160s - | | parent: 0:40a840c1f8ae 160s - | | user: test 160s - | | date: Mon Jan 01 00:00:12 2007 +0000 160s - | | summary: append f1 160s - | | 160s - @ | changeset: 1:600de9b6d498 160s - |/ branch: branch2 160s - | user: test 160s - | date: Mon Jan 01 00:00:11 2007 +0000 160s - | summary: add f2 160s - | 160s - o changeset: 0:40a840c1f8ae 160s - branch: branch1 160s - user: test 160s - date: Mon Jan 01 00:00:10 2007 +0000 160s - summary: add f1 160s - 160s - $ cd .. 160s - 160s -Try cloning a bookmark, and make sure it gets checked out: 160s - 160s - $ rm -r hgrepo 160s - $ hg clone -r branch3 repo.git hgrepo 160s - importing 4 git commits 160s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 160s - updating to bookmark branch3_bookmark 160s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s - $ cd hgrepo 160s - $ hg bookmarks 160s - branch2_bookmark 2:ae8eb55f7090 160s - * branch3_bookmark 3:faf44fc3a4e8 160s - $ hg log --graph 160s - @ changeset: 3:faf44fc3a4e8 160s - | bookmark: branch3_bookmark 160s - | tag: default/branch3 160s - | tag: tip 160s - | user: test 160s - | date: Mon Jan 01 00:00:14 2007 +0000 160s - | summary: append f3 160s - | 160s - o changeset: 2:ae8eb55f7090 160s - | bookmark: branch2_bookmark 160s - | tag: default/branch2 160s - | user: test 160s - | date: Mon Jan 01 00:00:13 2007 +0000 160s - | summary: append f2 160s - | 160s - o changeset: 1:600de9b6d498 160s - | branch: branch2 160s - | user: test 160s - | date: Mon Jan 01 00:00:11 2007 +0000 160s - | summary: add f2 160s - | 160s - o changeset: 0:40a840c1f8ae 160s - branch: branch1 160s - user: test 160s - date: Mon Jan 01 00:00:10 2007 +0000 160s - summary: add f1 160s - 160s - $ cd .. 160s - 160s -Try cloning something that's both a bookmark and a branch, and see the 160s -results. They're a bit suprising as the bookmark does get activated, 160s -but the branch get checked out. Although this does seem a bit odd, so 160s -does the scenario. 160s - 160s - $ rm -r hgrepo 160s - $ hg clone -r branch1 repo.git hgrepo 160s - importing 2 git commits 160s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 160s - updating to branch branch1 160s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s - $ cd hgrepo 160s - $ hg bookmarks 160s - * branch1_bookmark 1:8211cade99e4 160s - $ hg log --graph 160s - o changeset: 1:8211cade99e4 160s - | bookmark: branch1_bookmark 160s - | tag: default/branch1 160s - | tag: tip 160s - | user: test 160s - | date: Mon Jan 01 00:00:12 2007 +0000 160s - | summary: append f1 160s - | 160s - @ changeset: 0:40a840c1f8ae 160s - branch: branch1 160s - user: test 160s - date: Mon Jan 01 00:00:10 2007 +0000 160s - summary: add f1 160s - 160s - 160s - $ cd .. 160s - 160s -Now try pulling a diverged bookmark: 160s - 160s - $ rm -r hgrepo 160s -#if with-path 160s - $ hg clone -U repo.git hgrepo 160s - importing 5 git commits 160s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 160s -#else 160s - $ hg init hgrepo 160s - $ hg -R hgrepo pull repo.git 160s - pulling from repo.git 160s - importing 5 git commits 160s - adding bookmark branch1_bookmark 160s - adding bookmark branch2_bookmark 160s - adding bookmark branch3_bookmark 160s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 160s - (run 'hg heads' to see heads, 'hg merge' to merge) 160s -#endif 160s - $ cd gitrepo 160s - $ git checkout -q branch1 160s - $ fn_git_rebase branch3 160s - $ git push -f 160s - To $TESTTMP/repo.git 160s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 160s - $ cd ../hgrepo 160s - $ hg pull ../repo.git 160s - pulling from ../repo.git 160s - importing 1 git commits 160s - not updating diverged bookmark branch1_bookmark 160s - new changesets 895d0307f8b7 (1 drafts) 160s - (run 'hg update' to get a working copy) 160s - $ hg log --graph 160s - o changeset: 5:895d0307f8b7 160s - | tag: default/branch1 (with-path !) 160s - | tag: tip 160s - | user: test 160s - | date: Mon Jan 01 00:00:12 2007 +0000 160s - | summary: append f1 160s - | 160s - o changeset: 4:faf44fc3a4e8 160s - | bookmark: branch3_bookmark 160s - | tag: default/branch3 (with-path !) 160s - | user: test 160s - | date: Mon Jan 01 00:00:14 2007 +0000 160s - | summary: append f3 160s - | 160s - o changeset: 3:ae8eb55f7090 160s - | bookmark: branch2_bookmark 160s - | tag: default/branch2 (with-path !) 160s - | user: test 160s - | date: Mon Jan 01 00:00:13 2007 +0000 160s - | summary: append f2 160s - | 160s - o changeset: 2:600de9b6d498 160s - | branch: branch2 160s - | parent: 0:40a840c1f8ae 160s - | user: test 160s - | date: Mon Jan 01 00:00:11 2007 +0000 160s - | summary: add f2 160s - | 160s - | o changeset: 1:8211cade99e4 160s - |/ bookmark: branch1_bookmark 160s - | user: test 160s - | date: Mon Jan 01 00:00:12 2007 +0000 160s - | summary: append f1 160s - | 160s - o changeset: 0:40a840c1f8ae 160s - branch: branch1 160s - user: test 160s - date: Mon Jan 01 00:00:10 2007 +0000 160s - summary: add f1 160s - 160s 160s ERROR: test-branch-bookmark-suffix.t#with-path output changed 160s ! 160s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-branch-bookmark-suffix.t 160s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-branch-bookmark-suffix.t#without-path.err 160s @@ -9,287 +9,10 @@ 160s $ git init -q --bare repo.git 160s 160s $ hg clone repo.git hgrepo 160s - updating to branch default 160s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository repo.git not found 160s + [255] 160s $ cd hgrepo 160s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 160s #if without-path 160s $ rm .hg/hgrc 160s -#endif 160s - $ hg branch -q branch1 160s - $ hg bookmark branch1_bookmark 160s - $ echo f1 > f1 160s - $ hg add f1 160s - $ fn_hg_commit -m "add f1" 160s - $ hg branch -q branch2 160s - $ hg bookmark branch2_bookmark 160s - $ echo f2 > f2 160s - $ hg add f2 160s - $ fn_hg_commit -m "add f2" 160s - $ hg log --graph 160s - @ changeset: 1:600de9b6d498 160s - | branch: branch2 160s - | bookmark: branch2_bookmark 160s - | tag: tip 160s - | user: test 160s - | date: Mon Jan 01 00:00:11 2007 +0000 160s - | summary: add f2 160s - | 160s - o changeset: 0:40a840c1f8ae 160s - branch: branch1 160s - bookmark: branch1_bookmark 160s - user: test 160s - date: Mon Jan 01 00:00:10 2007 +0000 160s - summary: add f1 160s - 160s - 160s - $ hg push -B asdasd ../repo.git 160s - pushing to ../repo.git 160s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 160s - [255] 160s - 160s - $ hg push ../repo.git 160s - pushing to ../repo.git 160s - searching for changes 160s - adding objects 160s - remote: found 0 deltas to reuse 160s - added 2 commits with 2 trees and 2 blobs 160s - adding reference refs/heads/branch1 160s - adding reference refs/heads/branch2 160s - 160s - $ cd .. 160s - 160s - $ cd repo.git 160s - $ git symbolic-ref HEAD refs/heads/branch1 160s - $ git branch 160s - * branch1 160s - branch2 160s - $ cd .. 160s - 160s - $ git clone repo.git gitrepo 160s - Cloning into 'gitrepo'... 160s - done. 160s - $ cd gitrepo 160s - $ git checkout -q branch1 160s - $ echo g1 >> f1 160s - $ git add f1 160s - $ fn_git_commit -m "append f1" 160s - $ git checkout -q branch2 160s - $ echo g2 >> f2 160s - $ git add f2 160s - $ fn_git_commit -m "append f2" 160s - $ git checkout -b branch3 160s - Switched to a new branch 'branch3' 160s - $ echo g3 >> f3 160s - $ git add f3 160s - $ fn_git_commit -m "append f3" 160s - $ git push origin branch1 branch2 branch3 160s - To $TESTTMP/repo.git 160s - bbfe79a..d8aef79 branch1 -> branch1 160s - 288e92b..f8f8de5 branch2 -> branch2 160s - * [new branch] branch3 -> branch3 160s -make sure the commit doesn't have an HG:rename-source annotation 160s - $ git cat-file commit d8aef79 160s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 160s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 160s - author test 1167609612 +0000 160s - committer test 1167609612 +0000 160s - 160s - append f1 160s - $ cd .. 160s - 160s - $ cd hgrepo 160s - $ hg paths 160s - default = $TESTTMP/repo.git (with-path !) 160s - $ hg pull ../repo.git 160s - pulling from ../repo.git 160s - importing 3 git commits 160s - updating bookmark branch1_bookmark 160s - updating bookmark branch2_bookmark 160s - adding bookmark branch3_bookmark 160s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 160s - (run 'hg heads' to see heads) 160s - $ hg log --graph 160s - o changeset: 4:faf44fc3a4e8 160s - | bookmark: branch3_bookmark 160s - | tag: default/branch3 (with-path !) 160s - | tag: tip 160s - | user: test 160s - | date: Mon Jan 01 00:00:14 2007 +0000 160s - | summary: append f3 160s - | 160s - o changeset: 3:ae8eb55f7090 160s - | bookmark: branch2_bookmark 160s - | tag: default/branch2 (with-path !) 160s - | parent: 1:600de9b6d498 160s - | user: test 160s - | date: Mon Jan 01 00:00:13 2007 +0000 160s - | summary: append f2 160s - | 160s - | o changeset: 2:8211cade99e4 160s - | | bookmark: branch1_bookmark 160s - | | tag: default/branch1 (with-path !) 160s - | | parent: 0:40a840c1f8ae 160s - | | user: test 160s - | | date: Mon Jan 01 00:00:12 2007 +0000 160s - | | summary: append f1 160s - | | 160s - @ | changeset: 1:600de9b6d498 160s - |/ branch: branch2 160s - | user: test 160s - | date: Mon Jan 01 00:00:11 2007 +0000 160s - | summary: add f2 160s - | 160s - o changeset: 0:40a840c1f8ae 160s - branch: branch1 160s - user: test 160s - date: Mon Jan 01 00:00:10 2007 +0000 160s - summary: add f1 160s - 160s - $ cd .. 160s - 160s -Try cloning a bookmark, and make sure it gets checked out: 160s - 160s - $ rm -r hgrepo 160s - $ hg clone -r branch3 repo.git hgrepo 160s - importing 4 git commits 160s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 160s - updating to bookmark branch3_bookmark 160s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s - $ cd hgrepo 160s - $ hg bookmarks 160s - branch2_bookmark 2:ae8eb55f7090 160s - * branch3_bookmark 3:faf44fc3a4e8 160s - $ hg log --graph 160s - @ changeset: 3:faf44fc3a4e8 160s - | bookmark: branch3_bookmark 160s - | tag: default/branch3 160s - | tag: tip 160s - | user: test 160s - | date: Mon Jan 01 00:00:14 2007 +0000 160s - | summary: append f3 160s - | 160s - o changeset: 2:ae8eb55f7090 160s - | bookmark: branch2_bookmark 160s - | tag: default/branch2 160s - | user: test 160s - | date: Mon Jan 01 00:00:13 2007 +0000 160s - | summary: append f2 160s - | 160s - o changeset: 1:600de9b6d498 160s - | branch: branch2 160s - | user: test 160s - | date: Mon Jan 01 00:00:11 2007 +0000 160s - | summary: add f2 160s - | 160s - o changeset: 0:40a840c1f8ae 160s - branch: branch1 160s - user: test 160s - date: Mon Jan 01 00:00:10 2007 +0000 160s - summary: add f1 160s - 160s - $ cd .. 160s - 160s -Try cloning something that's both a bookmark and a branch, and see the 160s -results. They're a bit suprising as the bookmark does get activated, 160s -but the branch get checked out. Although this does seem a bit odd, so 160s -does the scenario. 160s - 160s - $ rm -r hgrepo 160s - $ hg clone -r branch1 repo.git hgrepo 160s - importing 2 git commits 160s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 160s - updating to branch branch1 160s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s - $ cd hgrepo 160s - $ hg bookmarks 160s - * branch1_bookmark 1:8211cade99e4 160s - $ hg log --graph 160s - o changeset: 1:8211cade99e4 160s - | bookmark: branch1_bookmark 160s - | tag: default/branch1 160s - | tag: tip 160s - | user: test 160s - | date: Mon Jan 01 00:00:12 2007 +0000 160s - | summary: append f1 160s - | 160s - @ changeset: 0:40a840c1f8ae 160s - branch: branch1 160s - user: test 160s - date: Mon Jan 01 00:00:10 2007 +0000 160s - summary: add f1 160s - 160s - 160s - $ cd .. 160s - 160s -Now try pulling a diverged bookmark: 160s - 160s - $ rm -r hgrepo 160s -#if with-path 160s - $ hg clone -U repo.git hgrepo 160s - importing 5 git commits 160s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 160s -#else 160s - $ hg init hgrepo 160s - $ hg -R hgrepo pull repo.git 160s - pulling from repo.git 160s - importing 5 git commits 160s - adding bookmark branch1_bookmark 160s - adding bookmark branch2_bookmark 160s - adding bookmark branch3_bookmark 160s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 160s - (run 'hg heads' to see heads, 'hg merge' to merge) 160s -#endif 160s - $ cd gitrepo 160s - $ git checkout -q branch1 160s - $ fn_git_rebase branch3 160s - $ git push -f 160s - To $TESTTMP/repo.git 160s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 160s - $ cd ../hgrepo 160s - $ hg pull ../repo.git 160s - pulling from ../repo.git 160s - importing 1 git commits 160s - not updating diverged bookmark branch1_bookmark 160s - new changesets 895d0307f8b7 (1 drafts) 160s - (run 'hg update' to get a working copy) 160s - $ hg log --graph 160s - o changeset: 5:895d0307f8b7 160s - | tag: default/branch1 (with-path !) 160s - | tag: tip 160s - | user: test 160s - | date: Mon Jan 01 00:00:12 2007 +0000 160s - | summary: append f1 160s - | 160s - o changeset: 4:faf44fc3a4e8 160s - | bookmark: branch3_bookmark 160s - | tag: default/branch3 (with-path !) 160s - | user: test 160s - | date: Mon Jan 01 00:00:14 2007 +0000 160s - | summary: append f3 160s - | 160s - o changeset: 3:ae8eb55f7090 160s - | bookmark: branch2_bookmark 160s - | tag: default/branch2 (with-path !) 160s - | user: test 160s - | date: Mon Jan 01 00:00:13 2007 +0000 160s - | summary: append f2 160s - | 160s - o changeset: 2:600de9b6d498 160s - | branch: branch2 160s - | parent: 0:40a840c1f8ae 160s - | user: test 160s - | date: Mon Jan 01 00:00:11 2007 +0000 160s - | summary: add f2 160s - | 160s - | o changeset: 1:8211cade99e4 160s - |/ bookmark: branch1_bookmark 160s - | user: test 160s - | date: Mon Jan 01 00:00:12 2007 +0000 160s - | summary: append f1 160s - | 160s - o changeset: 0:40a840c1f8ae 160s - branch: branch1 160s - user: test 160s - date: Mon Jan 01 00:00:10 2007 +0000 160s - summary: add f1 160s - 160s 160s ERROR: test-branch-bookmark-suffix.t#without-path output changed 160s ! 160s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-bundle.t 160s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-bundle.t.err 160s @@ -36,247 +36,12 @@ 160s Clone it! 160s 160s $ hg clone gitrepo hgrepo 160s - importing 3 git commits 160s - new changesets ff7a2f2d8d70:ca33a262eb46 (3 drafts) 160s - updating to bookmark master 160s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 160s + abort: repository gitrepo not found 160s + [255] 160s $ cd hgrepo 160s + $TESTTMP.sh: 45: cd: can't cd to hgrepo 160s 160s Create a bundle with our metadata, and inspect it: 160s 160s $ hg bundle --all ../bundle-w-git.hg 160s - 3 changesets found 160s - $ hg debugbundle --all ../bundle-w-git.hg | grep hg-git 160s - exp-hg-git-map -- {} (mandatory: False) 160s - exp-hg-git-tags -- {} (mandatory: False) 160s - $ hg debugbundle --all ../bundle-w-git.hg > bundle-w-git.out 160s - 160s -Create a bundle without our metadata, and inspect it: 160s - 160s - $ hg bundle --all ../bundle-wo-git.hg --config experimental.hg-git-bundle=no 160s - 3 changesets found 160s - $ hg debugbundle --all ../bundle-wo-git.hg | grep hg-git 160s - [1] 160s - 160s -Verify that those are different: 160s - 160s - $ hg debugbundle --all ../bundle-wo-git.hg > bundle-wo-git.out 160s - $ cmp -s bundle-w-git.out bundle-wo-git.out 160s - [1] 160s - 160s -Now create a bundle without hg-git enabled at all, which should be 160s -exactly similar to what you get when you disable metadata embedding; 160s -this verifies we don't accidentally pollute bundles. 160s - 160s - $ hg bundle --all --config extensions.hggit=! ../bundle-wo-hggit.hg 160s - 3 changesets found 160s - $ hg debugbundle --all ../bundle-wo-hggit.hg > bundle-wo-hggit.out 160s - $ cmp -s bundle-wo-git.hg bundle-wo-hggit.hg 160s - [2] 160s - $ cmp -s bundle-wo-git.out bundle-wo-hggit.out 160s - $ cd .. 160s - $ rm -r hgrepo 160s - 160s -Does unbundling transfer state? 160s - 160s - $ hg init hgrepo 160s - $ hg -R hgrepo unbundle bundle-w-git.hg 160s - adding changesets 160s - adding manifests 160s - adding file changes 160s - added 3 changesets with 3 changes to 3 files 160s - new changesets * (glob) 160s - (run 'hg update' to get a working copy) 160s - $ hg -R hgrepo log -T git 160s - 2:ca33a262eb46 | d338971a96e2 | tip | 160s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 160s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 160s - $ hg -R hgrepo pull gitrepo 160s - pulling from gitrepo 160s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 160s - no changes found 160s - adding bookmark master 160s - $ rm -r hgrepo 160s - 160s -Can we unbundle something without git state? 160s - 160s - $ hg init hgrepo 160s - $ hg -R hgrepo unbundle bundle-wo-git.hg 160s - adding changesets 160s - adding manifests 160s - adding file changes 160s - added 3 changesets with 3 changes to 3 files 160s - new changesets * (glob) 160s - (run 'hg update' to get a working copy) 160s - $ hg -R hgrepo log -T git 160s - 2:ca33a262eb46 | | tip | 160s - 1:7fe02317c63d | | | 160s - 0:ff7a2f2d8d70 | | | 160s - $ hg -R hgrepo pull gitrepo 160s - pulling from gitrepo 160s - importing 3 git commits 160s - adding bookmark master 160s - (run 'hg update' to get a working copy) 160s - $ rm -r hgrepo 160s - 160s -Regular mercurial shouldn't choke on our bundle 160s - 160s - $ hg init hgrepo 160s - $ cat >> hgrepo/.hg/hgrc < [extensions] 160s - > hggit = ! 160s - > EOF 160s - $ hg -R hgrepo unbundle bundle-wo-git.hg 160s - adding changesets 160s - adding manifests 160s - adding file changes 160s - added 3 changesets with 3 changes to 3 files 160s - new changesets * (glob) 160s - (run 'hg update' to get a working copy) 160s - $ hg -R hgrepo log -T git 160s - 2:ca33a262eb46 | | tip | 160s - 1:7fe02317c63d | | | 160s - 0:ff7a2f2d8d70 | | | 160s - $ hg -R hgrepo pull gitrepo 160s - pulling from gitrepo 160s - abort: repository gitrepo not found!? (re) 160s - [255] 160s - $ rm -r hgrepo 160s - 160s - 160s -What happens if we unbundle twice? 160s - 160s - $ hg init hgrepo 160s - $ hg -R hgrepo unbundle bundle-w-git.hg 160s - adding changesets 160s - adding manifests 160s - adding file changes 160s - added 3 changesets with 3 changes to 3 files 160s - new changesets * (glob) 160s - (run 'hg update' to get a working copy) 160s - $ hg -R hgrepo unbundle bundle-w-git.hg 160s - adding changesets 160s - adding manifests 160s - adding file changes 160s - added 0 changesets with 0 changes to 3 files 160s - (run 'hg update' to get a working copy) 160s - $ hg -R hgrepo log -T git 160s - 2:ca33a262eb46 | d338971a96e2 | tip | 160s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 160s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 160s - $ hg -R hgrepo pull gitrepo 160s - pulling from gitrepo 160s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 160s - no changes found 160s - adding bookmark master 160s - $ rm -r hgrepo 160s - 160s -Alas, cloning a bundle doesn't work yet: 160s - 160s -(Mercurial is apparently quite dumb here, so we won't try to fix this 160s -for now, but this test mostly exists so that we notice if ever starts 160s -working, or breaks entirely.) 160s - 160s - $ hg clone bundle-w-git.hg hgrepo 160s - requesting all changes 160s - adding changesets 160s - adding manifests 160s - adding file changes 160s - added 3 changesets with 3 changes to 3 files 160s - new changesets * (glob) 160s - updating to branch default 160s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s - $ hg -R hgrepo log -T git 160s - 2:ca33a262eb46 | | tip | 160s - 1:7fe02317c63d | | | 160s - 0:ff7a2f2d8d70 | | | 160s - $ rm -r hgrepo 160s - 160s -Now, lets try to be a bit evil. How does pulling partial state work? 160s - 160s -First, more git happenings: 160s - 160s - $ cd gitrepo 160s - $ git checkout -b otherbranch thetag 160s - Switched to a new branch 'otherbranch' 160s - $ echo 42 > baz 160s - $ git add baz 160s - $ fn_git_commit -m 3 160s - $ cd .. 160s - 160s -Pull, 'em, and create a partial bundle: 160s - 160s - $ hg clone gitrepo hgrepo 160s - importing 4 git commits 160s - new changesets ff7a2f2d8d70:d87bf3ef6a53 (4 drafts) 160s - updating to bookmark otherbranch 160s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s - $ hg -R hgrepo bundle --base 'p1(tip)' -r tip bundle-w-git-2.hg 160s - 1 changesets found 160s - $ rm -r hgrepo 160s - 160s -Now, load only that bundle into a repository without any git state 160s - 160s - $ hg clone -r 1 bundle-w-git.hg hgrepo --config extensions.hggit=! 160s - adding changesets 160s - adding manifests 160s - adding file changes 160s - added 2 changesets with 2 changes to 2 files 160s - new changesets * (glob) 160s - updating to branch default 160s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s - $ cd hgrepo 160s - $ hg unbundle ../bundle-w-git-2.hg 160s - adding changesets 160s - adding manifests 160s - adding file changes 160s - added 1 changesets with 1 changes to 1 files (+1 heads) 160s - new changesets * (glob) 160s - (run 'hg heads' to see heads, 'hg merge' to merge) 160s - $ hg pull ../gitrepo 160s - pulling from ../gitrepo 160s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 160s - importing 3 git commits 160s - adding bookmark master 160s - adding bookmark otherbranch 160s - new changesets ca33a262eb46 (1 drafts) 160s - (run 'hg update' to get a working copy) 160s - $ cd .. 160s - $ rm -r hgrepo 160s - 160s -Now, try pushing with only the metadata: 160s - 160s - $ hg init hgrepo 160s - $ cd hgrepo 160s - $ hg unbundle -u ../bundle-w-git.hg 160s - adding changesets 160s - adding manifests 160s - adding file changes 160s - added 3 changesets with 3 changes to 3 files 160s - new changesets * (glob) 160s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s - $ echo kaflaflibob > bajizmo 160s - $ fn_hg_commit -A -m 4 160s - $ hg book -r tip master 160s - $ hg push ../gitrepo 160s - pushing to ../gitrepo 160s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 160s - abort: cannot push git commit d338971a96e2 as it is not present locally 160s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 160s - [255] 160s - 160s -Try to repopulate the git state from a bundle 160s - 160s - $ hg debug-remove-hggit-state 160s - clearing out the git cache data 160s - $ hg log -qr 'fromgit()' 160s - $ hg unbundle -u ../bundle-w-git.hg 160s - adding changesets 160s - adding manifests 160s - adding file changes 160s - added 0 changesets with 0 changes to 3 files 160s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s - $ hg log -qr 'fromgit()' 160s - 0:ff7a2f2d8d70 160s - 1:7fe02317c63d 160s - 2:ca33a262eb46 160s 160s ERROR: test-bundle.t output changed 161s ! 161s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-file-removal.t 161s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-file-removal.t.err 161s @@ -98,192 +98,9 @@ 161s $ git init -q --bare repo.git 161s 161s $ hg clone gitrepo hgrepo 161s - importing 9 git commits 161s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 161s - updating to bookmark master 161s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 161s + abort: repository gitrepo not found 161s + [255] 161s $ cd hgrepo 161s + $TESTTMP.sh: 72: cd: can't cd to hgrepo 161s $ hg log --graph 161s - @ changeset: 8:0995b8a0a943 161s - | bookmark: master 161s - | tag: default/master 161s - | tag: tip 161s - | user: test 161s - | date: Mon Jan 01 00:00:18 2007 +0000 161s - | summary: remove betalink 161s - | 161s - o changeset: 7:a316d3a96c89 161s - | user: test 161s - | date: Mon Jan 01 00:00:17 2007 +0000 161s - | summary: replace file with symlink 161s - | 161s - o changeset: 6:1804acb71f3e 161s - | user: test 161s - | date: Mon Jan 01 00:00:16 2007 +0000 161s - | summary: replace symlink with file 161s - | 161s - o changeset: 5:e19c85becc87 161s - | user: test 161s - | date: Mon Jan 01 00:00:15 2007 +0000 161s - | summary: add symlink to beta 161s - | 161s - o changeset: 4:0d3086c3f8c3 161s - | user: test 161s - | date: Mon Jan 01 00:00:14 2007 +0000 161s - | summary: remove foo/bar 161s - | 161s - o changeset: 3:b2406125ef5c 161s - | user: test 161s - | date: Mon Jan 01 00:00:13 2007 +0000 161s - | summary: remove alpha 161s - | 161s - o changeset: 2:8b3b2f4b4158 161s - | user: test 161s - | date: Mon Jan 01 00:00:12 2007 +0000 161s - | summary: add foo 161s - | 161s - o changeset: 1:7fe02317c63d 161s - | user: test 161s - | date: Mon Jan 01 00:00:11 2007 +0000 161s - | summary: add beta 161s - | 161s - o changeset: 0:ff7a2f2d8d70 161s - user: test 161s - date: Mon Jan 01 00:00:10 2007 +0000 161s - summary: add alpha 161s - 161s - 161s -make sure alpha is not in this manifest 161s - $ hg manifest -r 3 161s - beta 161s - foo/bar 161s - 161s -make sure that only beta is in the manifest 161s - $ hg manifest 161s - beta 161s - 161s - $ hg debug-remove-hggit-state 161s - clearing out the git cache data 161s - $ ls .hg | grep git 161s - [1] 161s - $ hg push ../repo.git 161s - pushing to ../repo.git 161s - searching for changes 161s - adding objects 161s - remote: found 0 deltas to reuse 161s - added 9 commits with 8 trees and 5 blobs 161s - adding reference refs/heads/master 161s - 161s - $ cd .. 161s - $ git --git-dir=repo.git log --pretty=medium 161s - commit 5ee11eeae239d6a99df5a99901ec00ffafbcc46b 161s - Author: test 161s - Date: Mon Jan 1 00:00:18 2007 +0000 161s - 161s - remove betalink 161s - 161s - commit 2c7b324faeccb1acf89c35b7ad38e7956f5705fa 161s - Author: test 161s - Date: Mon Jan 1 00:00:17 2007 +0000 161s - 161s - replace file with symlink 161s - 161s - commit ff0478d2ecc2571d01eb6d406ac29e4e63e5d3d5 161s - Author: test 161s - Date: Mon Jan 1 00:00:16 2007 +0000 161s - 161s - replace symlink with file 161s - 161s - commit 5492e6e410e42df527956be945286cd1ae45acb8 161s - Author: test 161s - Date: Mon Jan 1 00:00:15 2007 +0000 161s - 161s - add symlink to beta 161s - 161s - commit b991de8952c482a7cd51162674ffff8474862218 161s - Author: test 161s - Date: Mon Jan 1 00:00:14 2007 +0000 161s - 161s - remove foo/bar 161s - 161s - commit b0edaf0adac19392cf2867498b983bc5192b41dd 161s - Author: test 161s - Date: Mon Jan 1 00:00:13 2007 +0000 161s - 161s - remove alpha 161s - 161s - commit f2d0d5bfa905e12dee728b509b96cf265bb6ee43 161s - Author: test 161s - Date: Mon Jan 1 00:00:12 2007 +0000 161s - 161s - add foo 161s - 161s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 161s - Author: test 161s - Date: Mon Jan 1 00:00:11 2007 +0000 161s - 161s - add beta 161s - 161s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 161s - Author: test 161s - Date: Mon Jan 1 00:00:10 2007 +0000 161s - 161s - add alpha 161s - 161s -test with rename detection enabled 161s - $ hg --config git.similarity=100 clone gitrepo hgreporenames 161s - importing 9 git commits 161s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 161s - updating to bookmark master 161s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 161s - 161s - $ cd hgreporenames 161s - $ hg log --graph 161s - @ changeset: 8:0995b8a0a943 161s - | bookmark: master 161s - | tag: default/master 161s - | tag: tip 161s - | user: test 161s - | date: Mon Jan 01 00:00:18 2007 +0000 161s - | summary: remove betalink 161s - | 161s - o changeset: 7:a316d3a96c89 161s - | user: test 161s - | date: Mon Jan 01 00:00:17 2007 +0000 161s - | summary: replace file with symlink 161s - | 161s - o changeset: 6:1804acb71f3e 161s - | user: test 161s - | date: Mon Jan 01 00:00:16 2007 +0000 161s - | summary: replace symlink with file 161s - | 161s - o changeset: 5:e19c85becc87 161s - | user: test 161s - | date: Mon Jan 01 00:00:15 2007 +0000 161s - | summary: add symlink to beta 161s - | 161s - o changeset: 4:0d3086c3f8c3 161s - | user: test 161s - | date: Mon Jan 01 00:00:14 2007 +0000 161s - | summary: remove foo/bar 161s - | 161s - o changeset: 3:b2406125ef5c 161s - | user: test 161s - | date: Mon Jan 01 00:00:13 2007 +0000 161s - | summary: remove alpha 161s - | 161s - o changeset: 2:8b3b2f4b4158 161s - | user: test 161s - | date: Mon Jan 01 00:00:12 2007 +0000 161s - | summary: add foo 161s - | 161s - o changeset: 1:7fe02317c63d 161s - | user: test 161s - | date: Mon Jan 01 00:00:11 2007 +0000 161s - | summary: add beta 161s - | 161s - o changeset: 0:ff7a2f2d8d70 161s - user: test 161s - date: Mon Jan 01 00:00:10 2007 +0000 161s - summary: add alpha 161s - 161s 161s ERROR: test-file-removal.t output changed 161s ! 161s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-hg-author.t 161s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-hg-author.t.err 161s @@ -16,256 +16,10 @@ 161s 161s $ cd .. 161s $ hg clone repo.git hgrepo 161s - importing 1 git commits 161s - new changesets ff7a2f2d8d70 (1 drafts) 161s - updating to bookmark master 161s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 161s + abort: repository repo.git not found 161s + [255] 161s 161s $ cd hgrepo 161s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 161s $ hg book master 161s - $ echo beta > beta 161s - $ hg add beta 161s - $ fn_hg_commit -u "test" -m 'add beta' 161s - $ hg push 161s - pushing to $TESTTMP/repo.git 161s - searching for changes 161s - adding objects 161s - remote: found 0 deltas to reuse 161s - added 1 commits with 1 trees and 1 blobs 161s - updating reference refs/heads/master 161s - 161s - $ echo gamma >> beta 161s - $ fn_hg_commit -u "test (comment)" -m 'modify beta' 161s - $ hg push 161s - pushing to $TESTTMP/repo.git 161s - searching for changes 161s - adding objects 161s - remote: found 0 deltas to reuse 161s - added 1 commits with 1 trees and 1 blobs 161s - updating reference refs/heads/master 161s - 161s - $ echo gamma > gamma 161s - $ hg add gamma 161s - $ fn_hg_commit -u "" -m 'add gamma' 161s - $ hg push 161s - pushing to $TESTTMP/repo.git 161s - searching for changes 161s - adding objects 161s - remote: found 0 deltas to reuse 161s - added 1 commits with 1 trees and 1 blobs 161s - updating reference refs/heads/master 161s - 161s - $ echo delta > delta 161s - $ hg add delta 161s - $ fn_hg_commit -u "name" -m 'add delta' 161s - $ hg push 161s - pushing to $TESTTMP/repo.git 161s - searching for changes 161s - adding objects 161s - remote: found 0 deltas to reuse 161s - added 1 commits with 1 trees and 1 blobs 161s - updating reference refs/heads/master 161s - 161s - $ echo epsilon > epsilon 161s - $ hg add epsilon 161s - $ fn_hg_commit -u "name zeta 161s - $ hg add zeta 161s - $ fn_hg_commit -u " test " -m 'add zeta' 161s - $ hg push 161s - pushing to $TESTTMP/repo.git 161s - searching for changes 161s - adding objects 161s - remote: found 0 deltas to reuse 161s - added 1 commits with 1 trees and 1 blobs 161s - updating reference refs/heads/master 161s - 161s - $ echo eta > eta 161s - $ hg add eta 161s - $ fn_hg_commit -u "test < test@example.com >" -m 'add eta' 161s - $ hg push 161s - pushing to $TESTTMP/repo.git 161s - searching for changes 161s - adding objects 161s - remote: found 0 deltas to reuse 161s - added 1 commits with 1 trees and 1 blobs 161s - updating reference refs/heads/master 161s - 161s - $ echo theta > theta 161s - $ hg add theta 161s - $ fn_hg_commit -u "test >test@example.com>" -m 'add theta' 161s - $ hg push 161s - pushing to $TESTTMP/repo.git 161s - searching for changes 161s - adding objects 161s - remote: found 0 deltas to reuse 161s - added 1 commits with 1 trees and 1 blobs 161s - updating reference refs/heads/master 161s - 161s - $ hg log --graph 161s - @ changeset: 8:c5d1976ab12c 161s - | bookmark: master 161s - | tag: default/master 161s - | tag: tip 161s - | user: test >test@example.com> 161s - | date: Mon Jan 01 00:00:18 2007 +0000 161s - | summary: add theta 161s - | 161s - o changeset: 7:0e2fb4d21667 161s - | user: test < test@example.com > 161s - | date: Mon Jan 01 00:00:17 2007 +0000 161s - | summary: add eta 161s - | 161s - o changeset: 6:faa3aae96199 161s - | user: test 161s - | date: Mon Jan 01 00:00:16 2007 +0000 161s - | summary: add zeta 161s - | 161s - o changeset: 5:2cf6ad5a1afc 161s - | user: name 161s - | date: Mon Jan 01 00:00:14 2007 +0000 161s - | summary: add delta 161s - | 161s - o changeset: 3:6b854d65d0d6 161s - | user: 161s - | date: Mon Jan 01 00:00:13 2007 +0000 161s - | summary: add gamma 161s - | 161s - o changeset: 2:46303c652e79 161s - | user: test (comment) 161s - | date: Mon Jan 01 00:00:12 2007 +0000 161s - | summary: modify beta 161s - | 161s - o changeset: 1:47580592d3d6 161s - | user: test 161s - | date: Mon Jan 01 00:00:11 2007 +0000 161s - | summary: add beta 161s - | 161s - o changeset: 0:ff7a2f2d8d70 161s - user: test 161s - date: Mon Jan 01 00:00:10 2007 +0000 161s - summary: add alpha 161s - 161s - 161s - $ cd .. 161s - $ hg clone repo.git hgrepo2 161s - importing 9 git commits 161s - new changesets ff7a2f2d8d70:1fbf3aa91221 (9 drafts) 161s - updating to bookmark master 161s - 8 files updated, 0 files merged, 0 files removed, 0 files unresolved 161s - $ hg -R hgrepo2 log --graph 161s - @ changeset: 8:1fbf3aa91221 161s - | bookmark: master 161s - | tag: default/master 161s - | tag: tip 161s - | user: test ?test@example.com 161s - | date: Mon Jan 01 00:00:18 2007 +0000 161s - | summary: add theta 161s - | 161s - o changeset: 7:20310508f06d 161s - | user: test 161s - | date: Mon Jan 01 00:00:17 2007 +0000 161s - | summary: add eta 161s - | 161s - o changeset: 6:e3d81af8a8c1 161s - | user: test 161s - | date: Mon Jan 01 00:00:16 2007 +0000 161s - | summary: add zeta 161s - | 161s - o changeset: 5:78f609fd208f 161s - | user: name 161s - | date: Mon Jan 01 00:00:15 2007 +0000 161s - | summary: add epsilon 161s - | 161s - o changeset: 4:42fa61d57718 161s - | user: name 161s - | date: Mon Jan 01 00:00:14 2007 +0000 161s - | summary: add delta 161s - | 161s - o changeset: 3:6b854d65d0d6 161s - | user: 161s - | date: Mon Jan 01 00:00:13 2007 +0000 161s - | summary: add gamma 161s - | 161s - o changeset: 2:46303c652e79 161s - | user: test (comment) 161s - | date: Mon Jan 01 00:00:12 2007 +0000 161s - | summary: modify beta 161s - | 161s - o changeset: 1:47580592d3d6 161s - | user: test 161s - | date: Mon Jan 01 00:00:11 2007 +0000 161s - | summary: add beta 161s - | 161s - o changeset: 0:ff7a2f2d8d70 161s - user: test 161s - date: Mon Jan 01 00:00:10 2007 +0000 161s - summary: add alpha 161s - 161s - $ git --git-dir=repo.git log --pretty=medium master 161s - commit 2fe60ba69727981e6ede78be70354c3a9e30e21d 161s - Author: test ?test@example.com 161s - Date: Mon Jan 1 00:00:18 2007 +0000 161s - 161s - add theta 161s - 161s - commit 9f2f7cafdbf2e467928db98de8275141001d3081 161s - Author: test 161s - Date: Mon Jan 1 00:00:17 2007 +0000 161s - 161s - add eta 161s - 161s - commit 172a6f8d8064d73dff7013e395a9fe3cfc3ff807 161s - Author: test 161s - Date: Mon Jan 1 00:00:16 2007 +0000 161s - 161s - add zeta 161s - 161s - commit 71badb8e343a7da391a9b5d98909fbd2ca7d78f2 161s - Author: name 161s - Date: Mon Jan 1 00:00:15 2007 +0000 161s - 161s - add epsilon 161s - 161s - commit 9a9ae7b7f310d4a1a3e732a747ca26f06934f8d8 161s - Author: name 161s - Date: Mon Jan 1 00:00:14 2007 +0000 161s - 161s - add delta 161s - 161s - commit e4149a32e81e380193f59aa8773349201b8ed7f7 161s - Author: 161s - Date: Mon Jan 1 00:00:13 2007 +0000 161s - 161s - add gamma 161s - 161s - commit fae95aef5889a80103c2fbd5d14ff6eb8c9daf93 161s - Author: test ext:(%20%28comment%29) 161s - Date: Mon Jan 1 00:00:12 2007 +0000 161s - 161s - modify beta 161s - 161s - commit 0f378ab6c2c6b5514bd873d3faf8ac4b8095b001 161s - Author: test 161s - Date: Mon Jan 1 00:00:11 2007 +0000 161s - 161s - add beta 161s - 161s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 161s - Author: test 161s - Date: Mon Jan 1 00:00:10 2007 +0000 161s - 161s - add alpha 161s 161s ERROR: test-hg-author.t output changed 163s ! 163s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-subrepos.t 163s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-subrepos.t.err 163s @@ -34,165 +34,8 @@ 163s $ cd .. 163s Ensure gitlinks are transformed to .hgsubstate on hg pull from git 163s $ hg clone -u tip repo.git hgrepo 2>&1 | grep -E -v '^(Cloning into|done)' 163s - importing 3 git commits 163s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 163s - updating to branch default 163s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 163s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 163s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 163s + abort: repository repo.git not found 163s $ cd hgrepo 163s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 163s $ hg bookmarks -f -r default master 163s -1. Ensure gitlinks are transformed to .hgsubstate on hg <- git pull 163s -.hgsub shall list two [git] subrepos 163s - $ cat .hgsub 163s - subrepo1 = [git]../gitsubrepo 163s - xyz/subrepo2 = [git]../gitsubrepo 163s -.hgsubstate shall list two idenitcal revisions 163s - $ cat .hgsubstate 163s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 163s - 56f0304c5250308f14cfbafdc27bd12d40154d17 xyz/subrepo2 163s -hg status shall NOT report .hgsub and .hgsubstate as untracked - either ignored or unmodified 163s - $ hg status --unknown .hgsub .hgsubstate 163s - $ hg status --modified .hgsub .hgsubstate 163s - $ cd .. 163s - 163s -2. Check gitmodules are preserved during hg -> git push 163s - $ cd gitsubrepo 163s - $ echo gamma > gamma 163s - $ git add gamma 163s - $ fn_git_commit -m 'add gamma' 163s - $ cd .. 163s - $ cd hgrepo 163s - $ cd xyz/subrepo2 163s - $ git pull --ff-only | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| */| /' 163s - From $TESTTMP/gitsubrepo 163s - 56f0304..aabf7cd master -> origin/master 163s - Updating 56f0304..aabf7cd 163s - Fast-forward 163s - gamma | 1 + 163s - 1 file changed, 1 insertion(+) 163s - create mode 100644 gamma 163s - $ cd ../.. 163s - $ echo xxx >> alpha 163s - $ fn_hg_commit -m 'Update subrepo2 from hg' | grep -v "committing subrepository" || true 163s - $ hg push 163s - pushing to $TESTTMP/repo.git 163s - searching for changes 163s - adding objects 163s - remote: found 0 deltas to reuse 163s - added 1 commits with 2 trees and 1 blobs 163s - updating reference refs/heads/master 163s - $ cd .. 163s - $ cd gitrepo 163s - $ git pull --ff-only 163s - From $TESTTMP/repo 163s - 89c22d7..275b0a5 master -> origin/master 163s - Fetching submodule xyz/subrepo2 163s - From $TESTTMP/gitsubrepo 163s - 56f0304..aabf7cd master -> origin/master 163s - Updating 89c22d7..275b0a5 163s - Fast-forward 163s - alpha | 1 + 163s - xyz/subrepo2 | 2 +- 163s - 2 files changed, 2 insertions(+), 1 deletion(-) 163s -there shall be two gitlink entries, with values matching that in .hgsubstate 163s - $ git ls-tree -r HEAD^{tree} | grep 'commit' 163s - 160000 commit 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 163s - 160000 commit aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 163s -bring working copy to HEAD state (it's not bare repo) 163s - $ git reset --hard 163s - HEAD is now at 275b0a5 Update subrepo2 from hg 163s - $ cd .. 163s - 163s -3. Check .hgsub and .hgsubstate from git repository are merged, not overwritten 163s - $ hg init hgsub 163s - $ cd hgsub 163s - $ echo delta > delta 163s - $ hg add delta 163s - $ fn_hg_commit -m "add delta" 163s - $ hg tip --template '{node} hgsub\n' > ../gitrepo/.hgsubstate 163s - $ cat > ../gitrepo/.hgsub < hgsub = ../hgsub 163s - > EOF 163s - $ cd ../gitrepo 163s - $ git add .hgsubstate .hgsub 163s - $ fn_git_commit -m "Test3. Prepare .hgsub and .hgsubstate sources" 163s - $ git push 163s - To $TESTTMP/repo.git 163s - 275b0a5..e31d576 master -> master 163s - 163s - $ cd ../hgrepo 163s - $ hg pull 163s - pulling from $TESTTMP/repo.git 163s - importing 1 git commits 163s - updating bookmark master 163s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 163s - (run 'hg update' to get a working copy) 163s - $ hg checkout -C 163s - updating to active bookmark master 163s - cloning subrepo hgsub from $TESTTMP/hgsub 163s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 163s - $ cd .. 163s -pull shall bring .hgsub entry which was added to the git repo 163s - $ cat hgrepo/.hgsub 163s - hgsub = ../hgsub 163s - subrepo1 = [git]../gitsubrepo 163s - xyz/subrepo2 = [git]../gitsubrepo 163s -.hgsubstate shall list revision of the subrepo added through git repo 163s - $ cat hgrepo/.hgsubstate 163s - 481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub 163s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 163s - aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 163s - 163s -4. Try changing the subrepos from the Mercurial side 163s - 163s - $ cd hgrepo 163s - $ cat >> .hgsub < subrepo2 = [git]../gitsubrepo 163s - > EOF 163s - $ git clone ../gitsubrepo subrepo2 163s - Cloning into 'subrepo2'... 163s - done. 163s - $ fn_hg_commit -m 'some stuff' 163s - $ hg push 163s - pushing to $TESTTMP/repo.git 163s - no changes made to subrepo hgsub since last push to $TESTTMP/hgsub 163s - searching for changes 163s - adding objects 163s - remote: found 0 deltas to reuse 163s - added 1 commits with 1 trees and 1 blobs 163s - updating reference refs/heads/master 163s - $ cd .. 163s - 163s -5. But we actually do something quite weird in this case: If a 163s -.gitmodules file exists in the repository, it always wins! In this 163s -case, we break the bidirectional convention, and modify the repository 163s -data. That's odd, so show it: 163s - 163s - $ hg id hgrepo 163s - 42c46c7eef3a default/master/tip master 163s - $ hg clone -U repo.git hgrepo2 163s - importing 6 git commits 163s - new changesets e532b2bfda10:42c46c7eef3a (6 drafts) 163s - $ hg -R hgrepo2 up :master 163s - Cloning into '$TESTTMP/hgrepo2/subrepo1'... 163s - done. 163s - cloning subrepo hgsub from $TESTTMP/hgsub 163s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 163s - checking out detached HEAD in subrepository "subrepo1" 163s - check out a git branch if you intend to make changes 163s - Cloning into '$TESTTMP/hgrepo2/subrepo2'... 163s - done. 163s - Cloning into '$TESTTMP/hgrepo2/xyz/subrepo2'... 163s - done. 163s - cloning subrepo subrepo2 from $TESTTMP/gitsubrepo 163s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 163s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 163s - 163s -We retained bidirectionality! 163s - 163s - $ git diff --stat hgrepo/.hgsub hgrepo2/.hgsub 163s - $ hg id hgrepo 163s - 42c46c7eef3a default/master/tip master 163s - $ hg id hgrepo2 163s - 42c46c7eef3a default/master/tip master 163s 163s ERROR: test-subrepos.t output changed 163s ! 163s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-extra.t 163s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-extra.t.err 163s @@ -12,190 +12,9 @@ 163s 163s $ cd .. 163s $ hg clone gitrepo hgrepo 163s - importing 1 git commits 163s - new changesets aa9eb6424386 (1 drafts) 163s - updating to bookmark not-master 163s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 163s + abort: repository gitrepo not found 163s + [255] 163s $ cd hgrepo 163s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 163s $ hg mv a b 163s - $ fn_hg_commit -mb 163s - $ hg up 0 163s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 163s - (leaving bookmark not-master) 163s - $ touch c 163s - $ hg add c 163s - $ fn_hg_commit -mc 163s - 163s -Rebase will add a rebase_source 163s - 163s - $ hg --config extensions.rebase= rebase -s 1 -d 2 163s - rebasing 1:4c7da7adf18b * (glob) 163s - saved backup bundle to $TESTTMP/*.hg (glob) 163s - $ hg up 2 163s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 163s - 163s -Add a commit with multiple extra fields 163s - $ hg bookmark b1 163s - $ touch d 163s - $ hg add d 163s - $ fn_hg_commitextra --field zzzzzzz=datazzz --field aaaaaaa=dataaaa 163s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 163s - @ 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 163s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 163s - | 163s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 163s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 163s - | 163s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 163s - | branch=default 163s - | 163s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 163s - branch=default hg-git-rename-source=git 163s - 163s - 163s - $ hg push -r b1 163s - pushing to $TESTTMP/gitrepo 163s - searching for changes 163s - adding objects 163s - remote: found 0 deltas to reuse 163s - added 3 commits with 3 trees and 0 blobs 163s - adding reference refs/heads/b1 163s - 163s - $ hg bookmark b2 163s - $ hg mv c c2 163s - $ hg mv d d2 163s - $ fn_hg_commitextra --field yyyyyyy=datayyy --field bbbbbbb=databbb 163s - 163s -Test some nutty filenames 163s - $ hg book b3 163s -#if windows 163s - $ hg mv c2 'c2 => c3' 163s - abort: filename contains '>', which is reserved on Windows: "c2 => c3" 163s - [255] 163s - $ hg mv c2 c3 163s - $ fn_hg_commit -m 'dummy commit' 163s - $ hg mv c3 c4 163s - $ fn_hg_commit -m 'dummy commit' 163s -#else 163s - $ hg mv c2 'c2 => c3' 163s - warning: filename contains '>', which is reserved on Windows: 'c2 => c3' 163s - $ fn_hg_commit -m 'test filename with arrow' 163s - $ hg mv 'c2 => c3' 'c3 => c4' 163s - warning: filename contains '>', which is reserved on Windows: 'c3 => c4' 163s - $ fn_hg_commit -m 'test filename with arrow 2' 163s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" -l 3 --config "experimental.graphstyle.missing=|" 163s - @ 6 bca4ba69a6844c133b069e227dfa043d41e3c197 test filename with arrow 2 163s - | branch=default 163s - | 163s - o 5 864caad1f3493032f8d06f44a89dc9f1c039b09f test filename with arrow 163s - | branch=default 163s - | 163s - o 4 58f855ae26f4930ce857e648d3dd949901cce817 163s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 163s - | 163s -#endif 163s - $ hg push -r b2 -r b3 163s - pushing to $TESTTMP/gitrepo 163s - searching for changes 163s - adding objects 163s - remote: found 0 deltas to reuse 163s - added 3 commits with 3 trees and 0 blobs 163s - adding reference refs/heads/b2 163s - adding reference refs/heads/b3 163s - 163s - $ cd ../gitrepo 163s - $ git cat-file commit b1 163s - tree 1b773a2eb70f29397356f8069c285394835ff85a 163s - parent 54776dace5849bdf273fb26737a48ef64804909d 163s - author test 1167609613 +0000 163s - committer test 1167609613 +0000 163s - HG:extra aaaaaaa:dataaaa 163s - HG:extra zzzzzzz:datazzz 163s - 163s - 163s - 163s - $ git cat-file commit b2 163s - tree 34ad62c6d6ad9464bfe62db5b3d2fa16aaa9fa9e 163s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 163s - author test 1167609614 +0000 163s - committer test 1167609614 +0000 163s - HG:rename c:c2 163s - HG:rename d:d2 163s - HG:extra bbbbbbb:databbb 163s - HG:extra yyyyyyy:datayyy 163s - 163s - 163s - 163s -#if no-windows 163s - $ git cat-file commit b3 163s - tree e63df52695f9b06e54b37e7ef60d0c43994de620 163s - parent 5cafe2555a0666fcf661a3943277a9812a694a98 163s - author test 1167609616 +0000 163s - committer test 1167609616 +0000 163s - HG:rename c2%20%3D%3E%20c3:c3%20%3D%3E%20c4 163s - 163s - test filename with arrow 2 163s -#endif 163s - $ cd ../gitrepo 163s - $ git checkout b1 163s - Switched to branch 'b1' 163s - $ commit_sha=$(git rev-parse HEAD) 163s - $ tree_sha=$(git rev-parse HEAD^{tree}) 163s - 163s -There's no way to create a Git repo with extra metadata via the CLI. Dulwich 163s -lets you do that, though. 163s - 163s - >>> from dulwich.objects import Commit 163s - >>> from dulwich.porcelain import open_repo 163s - >>> repo = open_repo('.') 163s - >>> c = Commit() 163s - >>> c.author = b'test ' 163s - >>> c.author_time = 0 163s - >>> c.author_timezone = 0 163s - >>> c.committer = c.author 163s - >>> c.commit_time = 0 163s - >>> c.commit_timezone = 0 163s - >>> c.parents = [b'$commit_sha'] 163s - >>> c.tree = b'$tree_sha' 163s - >>> c.message = b'extra commit\n' 163s - >>> c.extra.extend([(b'zzz:zzz', b'data:zzz'), (b'aaa:aaa', b'data:aaa'), 163s - ... (b'HG:extra', b'hgaaa:dataaaa'), 163s - ... (b'HG:extra', b'hgzzz:datazzz')]) 163s - >>> repo.object_store.add_object(c) 163s - >>> repo.refs.set_if_equals(b'refs/heads/master', None, c.id) 163s - True 163s - 163s - $ git cat-file commit master 163s - tree 1b773a2eb70f29397356f8069c285394835ff85a 163s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 163s - author test 0 +0000 163s - committer test 0 +0000 163s - zzz:zzz data:zzz 163s - aaa:aaa data:aaa 163s - HG:extra hgaaa:dataaaa 163s - HG:extra hgzzz:datazzz 163s - 163s - extra commit 163s - 163s - $ cd .. 163s - $ hg clone -qU gitrepo hgrepo2 163s - $ cd hgrepo2 163s - $ hg log -G -r :5 -T "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 163s - o 5 58f855ae26f4930ce857e648d3dd949901cce817 163s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 163s - | 163s - | o 4 90acc8c23fcfaeb0930c03c849923a696fd9013c extra commit 163s - |/ GIT0-zzz%3Azzz=data%3Azzz GIT1-aaa%3Aaaa=data%3Aaaa branch=default hgaaa=dataaaa hgzzz=datazzz 163s - | 163s - o 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 163s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 163s - | 163s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 163s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 163s - | 163s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 163s - | branch=default 163s - | 163s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 163s - branch=default hg-git-rename-source=git 163s - 163s 163s ERROR: test-extra.t output changed 165s ! 165s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-bookmark-workflow.t 165s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-bookmark-workflow.t.err 165s @@ -42,13 +42,21 @@ 165s 165s Initialize remote hg and git repos with equivalent initial contents 165s $ hg init hgremoterepo 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 165s $ cd hgremoterepo 165s $ hg bookmark master 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 165s $ for f in alpha beta gamma delta; do 165s > echo $f > $f; hg add $f; hgcommit -m "add $f" 165s > done 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 165s $ hg bookmark -r 1 b1 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 165s $ hgstate 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 165s 3 fc2664cac217 "add delta" bookmarks: [master] 165s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 165s 1 7bcd915dc873 "add beta" bookmarks: [b1] 165s @@ -69,157 +77,19 @@ 165s 165s Cloning transfers all bookmarks from remote to local 165s $ hg clone -q hgremoterepo purehglocalrepo 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 165s $ cd purehglocalrepo 165s $ hgstate 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 165s 3 fc2664cac217 "add delta" bookmarks: [master] 165s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 165s 1 7bcd915dc873 "add beta" bookmarks: [b1] 165s 0 3442585be8a6 "add alpha" bookmarks: [] 165s $ cd .. 165s $ hg clone -q gitremoterepo hggitlocalrepo --config hggit.usephases=True 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 165s + abort: repository gitremoterepo not found 165s + [255] 165s $ cd hggitlocalrepo 165s + $TESTTMP.sh: 78: cd: can't cd to hggitlocalrepo 165s $ hggitstate 165s - 3 03769a650ded 55b133e1d558 "add delta" bookmarks: [master] 165s - 2 ca33a262eb46 d338971a96e2 "add gamma" bookmarks: [] 165s - 1 7fe02317c63d 9497a4ee62e1 "add beta" bookmarks: [b1] 165s - 0 ff7a2f2d8d70 7eeab2ea75ec "add alpha" bookmarks: [] 165s - 165s -Make sure that master is public 165s - $ hg phase -r master 165s - 3: public 165s - $ cd .. 165s - 165s -No changes 165s - $ cd purehglocalrepo 165s - $ hg incoming -B 165s - comparing with $TESTTMP/hgremoterepo 165s - searching for changed bookmarks 165s - no changed bookmarks found 165s - [1] 165s - $ hg outgoing 165s - comparing with $TESTTMP/hgremoterepo 165s - searching for changes 165s - no changes found 165s - [1] 165s - $ hg outgoing -B 165s - comparing with $TESTTMP/hgremoterepo 165s - searching for changed bookmarks 165s - no changed bookmarks found 165s - [1] 165s - $ hg push 165s - pushing to $TESTTMP/hgremoterepo 165s - searching for changes 165s - no changes found 165s - [1] 165s - $ cd .. 165s - $ cd hggitlocalrepo 165s - $ hg incoming -B 165s - comparing with $TESTTMP/gitremoterepo 165s - searching for changed bookmarks 165s - no changed bookmarks found 165s - [1] 165s - $ hg outgoing 165s - comparing with $TESTTMP/gitremoterepo 165s - searching for changes 165s - no changes found 165s - [1] 165s - $ hg outgoing -B 165s - comparing with $TESTTMP/gitremoterepo 165s - searching for changed bookmarks 165s - no changed bookmarks found 165s - [1] 165s - $ hg push 165s - pushing to $TESTTMP/gitremoterepo 165s - searching for changes 165s - no changes found 165s - [1] 165s - $ cd .. 165s - 165s -Bookmarks on existing revs: 165s -- change b1 on local repo 165s -- introduce b2 on local repo 165s -- introduce b3 on remote repo 165s -Bookmarks on new revs 165s -- introduce b4 on a new rev on the remote 165s - $ cd hgremoterepo 165s - $ hg bookmark -r master b3 165s - $ hg bookmark -r master b4 165s - $ hg update -q b4 165s - $ echo epsilon > epsilon; hg add epsilon; hgcommit -m 'add epsilon' 165s - $ hgstate 165s - 4 d979bb8e0fbb "add epsilon" bookmarks: [b4] 165s - 3 fc2664cac217 "add delta" bookmarks: [b3 master] 165s - 2 d85ced7ae9d6 "add gamma" bookmarks: [] 165s - 1 7bcd915dc873 "add beta" bookmarks: [b1] 165s - 0 3442585be8a6 "add alpha" bookmarks: [] 165s - $ cd .. 165s - $ cd purehglocalrepo 165s - $ hg bookmark -fr 2 b1 165s - $ hg bookmark -r 0 b2 165s - $ hgstate 165s - 3 fc2664cac217 "add delta" bookmarks: [master] 165s - 2 d85ced7ae9d6 "add gamma" bookmarks: [b1] 165s - 1 7bcd915dc873 "add beta" bookmarks: [] 165s - 0 3442585be8a6 "add alpha" bookmarks: [b2] 165s - $ hg incoming -B 165s - comparing with $TESTTMP/hgremoterepo 165s - searching for changed bookmarks 165s - b3 fc2664cac217 165s - b4 d979bb8e0fbb 165s - $ hg outgoing 165s - comparing with $TESTTMP/hgremoterepo 165s - searching for changes 165s - no changes found 165s - [1] 165s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 165s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 165s -This changed in 3.4 to start showing changed and deleted bookmarks again. 165s - $ hg outgoing -B | grep -v -E -w 'b1|b3|b4' 165s - comparing with $TESTTMP/hgremoterepo 165s - searching for changed bookmarks 165s - b2 3442585be8a6 165s - $ cd .. 165s - 165s - $ cd gitremoterepo 165s - $ git branch b3 master 165s - $ git checkout -b b4 master 165s - Switched to a new branch 'b4' 165s - $ echo epsilon > epsilon 165s - $ git add epsilon 165s - $ gitcommit -m 'add epsilon' 165s - $ gitstate 165s - fcfd2c0 "add epsilon" refs: (*b4) (glob) 165s - 55b133e "add delta" refs: (master, b3) 165s - d338971 "add gamma" refs: 165s - 9497a4e "add beta" refs: (b1) 165s - 7eeab2e "add alpha" refs: 165s - $ cd .. 165s - $ cd hggitlocalrepo 165s - $ hg bookmark -fr 2 b1 165s - $ hg bookmark -r 0 b2 165s - $ hgstate 165s - 3 03769a650ded "add delta" bookmarks: [master] 165s - 2 ca33a262eb46 "add gamma" bookmarks: [b1] 165s - 1 7fe02317c63d "add beta" bookmarks: [] 165s - 0 ff7a2f2d8d70 "add alpha" bookmarks: [b2] 165s - $ hg incoming -B 165s - comparing with $TESTTMP/gitremoterepo 165s - searching for changed bookmarks 165s - b3 03769a650ded 165s - b4 fcfd2c0262db 165s - $ hg outgoing 165s - comparing with $TESTTMP/gitremoterepo 165s - searching for changes 165s - no changes found 165s - [1] 165s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 165s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 165s -This changed in 3.4 to start showing changed and deleted bookmarks again. 165s - $ hg outgoing -B 165s - comparing with $TESTTMP/gitremoterepo 165s - searching for changed bookmarks 165s - b1 ca33a262eb46 165s - b2 ff7a2f2d8d70 165s - b3 165s - b4 165s - $ cd .. 165s 165s ERROR: test-bookmark-workflow.t output changed 174s ! 174s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-illegal-contents.t 174s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-illegal-contents.t.err 174s @@ -5,6 +5,7 @@ 174s $ . "$TESTDIR/testutil" 174s 174s $ hg init hg 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s $ cd hg 174s $ mkdir -p .git/hooks 174s $ cat > .git/hooks/post-update < EOF 174s $ fn_touch_escaped foo/git~100/wat bar/.gi\\u200ct/wut this/is/safe 174s $ hg addremove 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s adding .git/hooks/post-update 174s adding bar/.gi\xe2\x80\x8ct/wut (esc) 174s adding foo/git~100/wat 174s adding this/is/safe 174s $ hg ci -m "we should refuse to export this" 174s - $ hg book master 174s - $ hg gexport 174s - warning: skipping invalid path '.git/hooks/post-update' 174s - warning: skipping invalid path 'bar/.gi\xe2\x80\x8ct/wut' 174s - warning: skipping invalid path 'foo/git~100/wat' 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + $ hg book master 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + $ hg gexport 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + hg: unknown command 'gexport' 174s + (did you mean one of export, import?) 174s + [10] 174s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 174s - this/is/safe 174s + fatal: not a git repository: '.hg/git' 174s + [128] 174s $ hg debug-remove-hggit-state 174s - clearing out the git cache data 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + hg: unknown command 'debug-remove-hggit-state' 174s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 174s + [10] 174s $ hg gexport --config hggit.invalidpaths=keep 174s - warning: path '.git/hooks/post-update' contains an invalid path component 174s - warning: path 'bar/.gi\xe2\x80\x8ct/wut' contains an invalid path component 174s - warning: path 'foo/git~100/wat' contains an invalid path component 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + hg: unknown command 'gexport' 174s + (did you mean one of export, import?) 174s + [10] 174s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 174s - .git/hooks/post-update 174s - "bar/.gi\342\200\214t/wut" 174s - foo/git~100/wat 174s - this/is/safe 174s - $ cd .. 174s - 174s - $ rm -rf hg 174s - $ hg init hg 174s + fatal: not a git repository: '.hg/git' 174s + [128] 174s + $ cd .. 174s + 174s + $ rm -rf hg 174s + $ hg init hg 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s $ cd hg 174s $ mkdir -p nested/.git/hooks/ 174s $ cat > nested/.git/hooks/post-update < EOF 174s $ chmod +x nested/.git/hooks/post-update 174s $ hg addremove 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s adding nested/.git/hooks/post-update 174s $ hg ci -m "also refuse to export this" 174s - $ hg book master 174s - $ hg gexport 174s - warning: skipping invalid path 'nested/.git/hooks/post-update' 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + $ hg book master 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + $ hg gexport 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + hg: unknown command 'gexport' 174s + (did you mean one of export, import?) 174s + [10] 174s $ git clone .hg/git git 174s - Cloning into 'git'... 174s - done. 174s + fatal: repository '.hg/git' does not exist 174s + [128] 174s $ rm -rf git 174s 174s We can trigger an error: 174s 174s $ hg -q debug-remove-hggit-state 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + hg: unknown command 'debug-remove-hggit-state' 174s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 174s + [10] 174s $ hg --config hggit.invalidpaths=abort gexport 174s - abort: invalid path 'nested/.git/hooks/post-update' rejected by configuration 174s - (see 'hg help config.hggit.invalidpaths for details) 174s - [255] 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + hg: unknown command 'gexport' 174s + (did you mean one of export, import?) 174s + [10] 174s 174s We can override if needed: 174s 174s $ hg --config hggit.invalidpaths=keep gexport 174s - warning: path 'nested/.git/hooks/post-update' contains an invalid path component 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + hg: unknown command 'gexport' 174s + (did you mean one of export, import?) 174s + [10] 174s $ cd .. 174s $ # different git versions give different return codes 174s $ git clone hg/.hg/git git || true 174s - Cloning into 'git'... 174s - done. 174s - error: [Ii]nvalid path 'nested/\.git/hooks/post-update' (re) 174s + fatal: repository 'hg/.hg/git' does not exist 174s fatal: unable to checkout working tree (?) 174s warning: Clone succeeded, but checkout failed. (?) 174s You can inspect what was checked out with 'git status' (?) 174s @@ -88,6 +109,7 @@ 174s $ cd .. 174s $ rm -rf hg 174s $ hg init hg 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s $ cd hg 174s $ mkdir -p .GIT/hooks/ 174s $ cat > .GIT/hooks/post-checkout < EOF 174s $ chmod +x .GIT/hooks/post-checkout 174s $ hg addremove 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s adding .GIT/hooks/post-checkout 174s $ hg ci -m "also refuse to export this" 174s - $ hg book master 174s - $ hg gexport 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + $ hg book master 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + $ hg gexport 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + hg: unknown command 'gexport' 174s + (did you mean one of export, import?) 174s + [10] 174s $ cd .. 174s 174s And the NTFS case: 174s $ cd .. 174s $ rm -rf hg 174s $ hg init hg 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s $ cd hg 174s $ mkdir -p GIT~1/hooks/ 174s $ cat > GIT~1/hooks/post-checkout < EOF 174s $ chmod +x GIT~1/hooks/post-checkout 174s $ hg addremove 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s adding GIT~1/hooks/post-checkout 174s $ hg ci -m "also refuse to export this" 174s - $ hg book master 174s - $ hg gexport 174s - warning: skipping invalid path 'GIT~1/hooks/post-checkout' 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + $ hg book master 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + $ hg gexport 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + hg: unknown command 'gexport' 174s + (did you mean one of export, import?) 174s + [10] 174s $ cd .. 174s 174s Now check a Git repository containing a Mercurial repository, which 174s @@ -127,36 +163,29 @@ 174s $ rm -rf hg git nested 174s $ git init -q git 174s $ hg init nested 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s $ mv nested git 174s $ cd git 174s $ git add nested 174s $ fn_git_commit -m 'add a Mercurial repository' 174s $ cd .. 174s $ hg clone --config hggit.invalidpaths=abort git hg 174s - importing 1 git commits 174s - abort: invalid path 'nested/.hg/00changelog.i' rejected by configuration 174s - (see 'hg help config.hggit.invalidpaths for details) 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + abort: repository git not found 174s [255] 174s $ rm -rf hg 174s $ hg clone --config hggit.invalidpaths=keep git hg 174s - importing 1 git commits 174s - warning: path 'nested/.hg/00changelog.i' contains an invalid path component 174s - warning: path 'nested/.hg/requires' contains an invalid path component 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + abort: repository git not found 174s warning: path 'nested/.hg/store/requires' contains an invalid path component (?) 174s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 174s warning: path 'nested/.hg/store/requires' is within a nested repository, which Mercurial cannot check out. (?) 174s - updating to bookmark master 174s - abort: path 'nested/.hg/00changelog.i' is inside nested repo 'nested' 174s - [10] 174s + [255] 174s $ rm -rf hg 174s $ hg clone git hg 174s - importing 1 git commits 174s - warning: skipping invalid path 'nested/.hg/00changelog.i' 174s - warning: skipping invalid path 'nested/.hg/requires' 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + abort: repository git not found 174s warning: skipping invalid path 'nested/.hg/store/requires' (?) 174s - new changesets 3ea18a67c0e6 (1 drafts) 174s - updating to bookmark master 174s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 174s + [255] 174s $ cd .. 174s 174s Now check a Git repository containing paths with carriage return and 174s @@ -171,23 +200,16 @@ 174s $ fn_git_commit -m 'add files disallowed by mercurial' 174s $ cd .. 174s $ hg clone --config hggit.invalidpaths=abort git hg 174s - importing 1 git commits 174s - abort: invalid path 'Icon\r' rejected by configuration 174s - (see 'hg help config.hggit.invalidpaths for details) 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + abort: repository git not found 174s [255] 174s $ hg clone --config hggit.invalidpaths=keep git hg 174s - importing 1 git commits 174s - warning: skipping invalid path 'Icon\r' 174s - warning: skipping invalid path 'the\nfile' 174s - new changesets 8354c06a5842 (1 drafts) 174s - updating to bookmark master 174s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + abort: repository git not found 174s + [255] 174s $ rm -rf hg 174s $ hg clone git hg 174s - importing 1 git commits 174s - warning: skipping invalid path 'Icon\r' 174s - warning: skipping invalid path 'the\nfile' 174s - new changesets 8354c06a5842 (1 drafts) 174s - updating to bookmark master 174s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 174s - 174s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 174s + abort: repository git not found 174s + [255] 174s + 174s 174s ERROR: test-illegal-contents.t output changed 175s ! 175s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-phases-remote.t 175s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-phases-remote.t.err 175s @@ -26,193 +26,10 @@ 175s $ cd .. 175s 175s $ hg clone --config hggit.usephases=True -U gitrepo hgrepo 175s - importing 4 git commits 175s - new changesets ff7a2f2d8d70:25eed24f5e8f (1 drafts) 175s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 175s + abort: repository gitrepo not found 175s + [255] 175s 175s $ cd hgrepo 175s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 175s $ hg log -G -T '{rev}|{phase}|{bookmarks}|{tags}\n' 175s - o 3|public||thetag tip 175s - | 175s - | o 2|draft|not-master|default/not-master 175s - |/ 175s - | o 1|public|master|default/master 175s - |/ 175s - o 0|public|| 175s - 175s - $ hg phase -r 'all()' | tee $TESTTMP/after-clone 175s - 0: public 175s - 1: public 175s - 2: draft 175s - 3: public 175s - $ cat >> .hg/hgrc < [paths] 175s - > other = $TESTTMP/gitrepo/.git 175s - > other:hg-git.publish = no 175s - > EOF 175s - $ cd .. 175s - 175s -that disables publishing from that remote 175s - 175s - $ cd hgrepo 175s - $ hg phase -fd 'all()' 175s - $ hg pull other 175s - pulling from $TESTTMP/gitrepo/.git 175s - no changes found 175s - $ hg log -qr 'public()' 175s - $ hg pull -v --config hggit.usephases=True other 175s - pulling from $TESTTMP/gitrepo/.git 175s - no changes found 175s - processing commits in batches of 1000 175s - bookmark master is up-to-date 175s - bookmark not-master is up-to-date 175s - $ hg log -qr 'public()' 175s - $ cd .. 175s - 175s -but not default when enable by the global setting 175s - 175s - $ cd hgrepo 175s - $ hg phase -fd 'all()' 175s - no phases changed 175s - $ hg pull -v --config hggit.usephases=True 175s - pulling from $TESTTMP/gitrepo 175s - publishing remote HEAD 175s - publishing tag thetag 175s - no changes found 175s - processing commits in batches of 1000 175s - bookmark master is up-to-date 175s - bookmark not-master is up-to-date 175s - publishing remote HEAD 175s - publishing tag thetag 175s - 3 local changesets published 175s - $ hg phase -r 'all()' > $TESTTMP/after-pull 175s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 175s - $ cd .. 175s - 175s -or the path option 175s - 175s - $ cd hgrepo 175s - $ hg phase -fd 'all()' 175s - $ hg pull -v --config paths.default:hg-git.publish=yes 175s - pulling from $TESTTMP/gitrepo 175s - publishing remote HEAD 175s - publishing tag thetag 175s - no changes found 175s - processing commits in batches of 1000 175s - bookmark master is up-to-date 175s - bookmark not-master is up-to-date 175s - publishing remote HEAD 175s - publishing tag thetag 175s - 3 local changesets published 175s - $ hg phase -r 'all()' > $TESTTMP/after-pull 175s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 175s - $ cd .. 175s - 175s -but we can specify individual branches 175s - 175s - $ cd hgrepo 175s - $ hg phase -fd 'all()' 175s - $ hg pull -v --config paths.default:hg-git.publish=not-master 175s - pulling from $TESTTMP/gitrepo 175s - publishing branch not-master 175s - no changes found 175s - processing commits in batches of 1000 175s - bookmark master is up-to-date 175s - bookmark not-master is up-to-date 175s - publishing branch not-master 175s - 2 local changesets published 175s - $ hg phase -r master -r not-master -r thetag 175s - 1: draft 175s - 2: public 175s - 3: draft 175s - $ cd .. 175s - 175s -and we can also specify the tag 175s - 175s - $ cd hgrepo 175s - $ hg phase -fd 'all()' 175s - $ hg pull -v --config paths.default:hg-git.publish=thetag 175s - pulling from $TESTTMP/gitrepo 175s - publishing tag thetag 175s - no changes found 175s - processing commits in batches of 1000 175s - bookmark master is up-to-date 175s - bookmark not-master is up-to-date 175s - publishing tag thetag 175s - 2 local changesets published 175s - $ hg phase -r master -r not-master -r thetag 175s - 1: draft 175s - 2: draft 175s - 3: public 175s - $ cd .. 175s - 175s - 175s -Check multiple paths behavior 175s -============================= 175s - 175s - 175s - $ cd hgrepo 175s - $ cat >> .hg/hgrc < [paths] 175s - > multi:multi-urls = yes 175s - > multi = path://other, path://default 175s - > recursive:multi-urls = yes 175s - > recursive = path://multi, default 175s - > EOF 175s - 175s -Using multiple path works fine: 175s - 175s - 175s - $ hg pull multi --config paths.default:hg-git.publish=yes 175s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 175s - [255] 175s - 175s -Recursive multiple path are tricker, but Mercurial don't work with them either. 175s -This test exist to make sure we bail out on our own. 175s - 175s - 175s -`yes` should abort (until we implement it) 175s - 175s - $ hg pull multi --config paths.default:hg-git.publish=yes 175s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 175s - [255] 175s - 175s -`some-value` should abort (until we implement it) 175s - 175s - $ hg pull multi --config paths.default:hg-git.publish=thetag 175s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 175s - [255] 175s - 175s -`no` is fine 175s - 175s - $ hg pull multi --config paths.default:hg-git.publish=no 175s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 175s - [255] 175s - 175s - $ cd .. 175s - 175s -Check conflicting paths behavior 175s -================================ 175s - 175s - $ cd hgrepo 175s - $ cat > .hg/hgrc < [paths] 175s - > default = $TESTTMP/gitrepo 175s - > default:hg-git.publish = yes 175s - > also-default = $TESTTMP/gitrepo 175s - > EOF 175s - $ hg pull also-default 175s - pulling from $TESTTMP/gitrepo 175s - abort: different publishing configurations for the same remote location 175s - (conflicting paths: also-default, default) 175s - [255] 175s - $ hg pull --config paths.also-default:hg-git.publish=no 175s - pulling from $TESTTMP/gitrepo 175s - abort: different publishing configurations for the same remote location 175s - (conflicting paths: also-default, default) 175s - [255] 175s - $ hg pull --config paths.also-default:hg-git.publish=true 175s - pulling from $TESTTMP/gitrepo 175s - no changes found 175s - 1 local changesets published 175s - $ cd .. 175s - 175s 175s ERROR: test-phases-remote.t output changed 178s ! 178s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-serve-hg-static.t 178s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-serve-hg-static.t.err 178s @@ -6,6 +6,7 @@ 178s $ . "$TESTDIR/testutil" 178s 178s $ hg clone http://localhost:$HGPORT/ copy 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s abort: * (glob) 178s [100] 178s $ test -d copy 178s @@ -18,14 +19,18 @@ 178s > --logfile server.log 178s $ cat dumb.pid >> $DAEMON_PIDS 178s $ hg init remote 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s $ cd remote 178s $ echo foo > bar 178s $ echo c2 > '.dotfile with spaces' 178s $ hg add 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s adding .dotfile with spaces 178s adding bar 178s $ hg commit -m"test" 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s $ hg tip 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s changeset: 0:02770d679fb8 178s tag: tip 178s user: test 178s @@ -34,6 +39,7 @@ 178s 178s $ cd .. 178s $ hg clone static-http://localhost:$HGPORT/remote local 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s requesting all changes 178s adding changesets 178s adding manifests 178s @@ -44,17 +50,20 @@ 178s 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 178s $ cd local 178s $ hg verify 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s checking changesets 178s checking manifests 178s crosschecking files in changesets and manifests 178s + checking dirstate (?) 178s checking files 178s - checking dirstate (?) 178s + checking dirstate 178s checked 1 changesets with 2 changes to 2 files 178s $ cat bar 178s foo 178s $ cd ../remote 178s $ echo baz > quux 178s $ hg commit -A -mtest2 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s adding quux 178s 178s check for HTTP opener failures when cachefile does not exist 178s @@ -62,6 +71,7 @@ 178s $ rm .hg/cache/* 178s $ cd ../local 178s $ hg pull 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s pulling from static-http://localhost:$HGPORT/remote 178s searching for changes 178s adding changesets 178s @@ -74,10 +84,13 @@ 178s trying to push 178s 178s $ hg update 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 178s $ echo more foo >> bar 178s $ hg commit -m"test" 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s $ hg push 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s pushing to static-http://localhost:$HGPORT/remote 178s abort: destination does not support push 178s [255] 178s @@ -86,9 +99,11 @@ 178s 178s $ cd .. 178s $ hg clone -r doesnotexist static-http://localhost:$HGPORT/remote local0 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s abort: unknown revision 'doesnotexist'!? (re) 178s [10] 178s $ hg clone -r 0 static-http://localhost:$HGPORT/remote local0 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s adding changesets 178s adding manifests 178s adding file changes 178s @@ -100,16 +115,23 @@ 178s test with "/" URI (issue747) and subrepo 178s 178s $ hg init 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s $ hg init sub 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s $ touch sub/test 178s $ hg -R sub commit -A -m "test" 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s adding test 178s $ hg -R sub tag not-empty 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s $ echo sub=sub > .hgsub 178s $ echo a > a 178s $ hg add a .hgsub 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s $ hg -q ci -ma 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s $ hg clone static-http://localhost:$HGPORT/ local2 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s requesting all changes 178s adding changesets 178s adding manifests 178s @@ -127,58 +149,75 @@ 178s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 178s $ cd local2 178s $ hg verify 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s checking changesets 178s checking manifests 178s crosschecking files in changesets and manifests 178s + checking dirstate (?) 178s checking files 178s - checking dirstate (?) 178s + checking dirstate 178s checked 1 changesets with 3 changes to 3 files 178s checking subrepo links 178s $ cat a 178s a 178s $ hg paths 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s default = static-http://localhost:$HGPORT/ 178s 178s test with empty repo (issue965) 178s 178s $ cd .. 178s $ hg init remotempty 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s $ hg clone static-http://localhost:$HGPORT/remotempty local3 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s no changes found 178s updating to branch default 178s 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 178s $ cd local3 178s $ hg verify 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s checking changesets 178s checking manifests 178s crosschecking files in changesets and manifests 178s + checking dirstate (?) 178s checking files 178s - checking dirstate (?) 178s + checking dirstate 178s checked 0 changesets with 0 changes to 0 files 178s $ hg paths 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s default = static-http://localhost:$HGPORT/remotempty 178s $ cd .. 178s 178s Clone with tags and branches works 178s 178s $ hg init remote-with-names 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s $ cd remote-with-names 178s $ echo 0 > foo 178s $ hg -q commit -A -m initial 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s $ echo 1 > foo 178s $ hg commit -m 'commit 1' 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s $ hg -q up 0 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s $ hg branch mybranch 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s marked working directory as branch mybranch 178s (branches are permanent and global, did you want a bookmark?) 178s $ echo 2 > foo 178s $ hg commit -m 'commit 2 (mybranch)' 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s $ hg tag -r 1 'default-tag' 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s $ hg tag -r 2 'branch-tag' 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s 178s $ cd .. 178s 178s $ hg clone static-http://localhost:$HGPORT/remote-with-names local-with-names 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s requesting all changes 178s adding changesets 178s adding manifests 178s @@ -191,6 +230,7 @@ 178s Clone a specific branch works 178s 178s $ hg clone -r mybranch static-http://localhost:$HGPORT/remote-with-names local-with-names-branch 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s adding changesets 178s adding manifests 178s adding file changes 178s @@ -202,6 +242,7 @@ 178s Clone a specific tag works 178s 178s $ hg clone -r default-tag static-http://localhost:$HGPORT/remote-with-names local-with-names-tag 178s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 178s adding changesets 178s adding manifests 178s adding file changes 178s 178s ERROR: test-serve-hg-static.t output changed 179s ! 179s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-octopus.t 179s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-octopus.t.err 179s @@ -62,111 +62,9 @@ 179s $ git init -q --bare repo.git 179s 179s $ hg clone gitrepo hgrepo 179s - importing 8 git commits 179s - new changesets ff7a2f2d8d70:307506d6ae8a (10 drafts) 179s - updating to bookmark master 179s - 6 files updated, 0 files merged, 0 files removed, 0 files unresolved 179s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 179s + abort: repository gitrepo not found 179s + [255] 179s $ cd hgrepo 179s + $TESTTMP.sh: 64: cd: can't cd to hgrepo 179s $ hg log --graph --style compact | sed 's/\[.*\]//g' 179s - @ 9:7,8 307506d6ae8a 2007-01-01 00:00 +0000 test 179s - |\ Merge branches 'branch3' and 'branch4' 179s - | | 179s - | o 8:3,4 2b07220e422e 2007-01-01 00:00 +0000 test 179s - | |\ Merge branches 'branch3' and 'branch4' 179s - | | | 179s - o | | 7:5,6 ccf2d65d982c 2007-01-01 00:00 +0000 test 179s - |\ \ \ Merge branches 'branch1' and 'branch2' 179s - | | | | 179s - | o | | 6:1,2 690b40256117 2007-01-01 00:00 +0000 test 179s - | |\ \ \ Merge branches 'branch1' and 'branch2' 179s - | | | | | 179s - o | | | | 5:0 e459c0629ca4 2007-01-01 00:00 +0000 test 179s - | | | | | add delta 179s - | | | | | 179s - +-------o 4:0 e857c9a04474 2007-01-01 00:00 +0000 test 179s - | | | | add zeta 179s - | | | | 179s - +-----o 3:0 0071dec0de0e 2007-01-01 00:00 +0000 test 179s - | | | add epsilon 179s - | | | 179s - +---o 2:0 205a004356ef 2007-01-01 00:00 +0000 test 179s - | | add gamma 179s - | | 179s - | o 1 7fe02317c63d 2007-01-01 00:00 +0000 test 179s - |/ add beta 179s - | 179s - o 0 ff7a2f2d8d70 2007-01-01 00:00 +0000 test 179s - add alpha 179s - 179s - $ hg gverify -r 9 179s - verifying rev 307506d6ae8a against git commit b32ff845df61df998206b630e4370a44f9b36845 179s - $ hg gverify -r 8 179s - abort: no git commit found for rev 2b07220e422e 179s - (if this is an octopus merge, verify against the last rev) 179s - [255] 179s - 179s - $ hg debug-remove-hggit-state 179s - clearing out the git cache data 179s - $ hg push ../repo.git 179s - pushing to ../repo.git 179s - searching for changes 179s - adding objects 179s - remote: found 0 deltas to reuse 179s - added 8 commits with 8 trees and 6 blobs 179s - adding reference refs/heads/branch1 179s - adding reference refs/heads/branch2 179s - adding reference refs/heads/branch3 179s - adding reference refs/heads/branch4 179s - adding reference refs/heads/master 179s - $ cd .. 179s - 179s - $ git --git-dir=repo.git log --pretty=medium | sed s/\\.\\.\\.//g 179s - commit b32ff845df61df998206b630e4370a44f9b36845 179s - Merge: 9ac68f9 7e9cd9f e695849 179s - Author: test 179s - Date: Mon Jan 1 00:00:15 2007 +0000 179s - 179s - Merge branches 'branch3' and 'branch4' 179s - 179s - commit 9ac68f982ae7426d9597ff16c74afb4e6053c582 179s - Merge: d40f375 9497a4e e5023f9 179s - Author: test 179s - Date: Mon Jan 1 00:00:15 2007 +0000 179s - 179s - Merge branches 'branch1' and 'branch2' 179s - 179s - commit d40f375a81b7d033e92cbad89487115fe2dd472f 179s - Author: test 179s - Date: Mon Jan 1 00:00:15 2007 +0000 179s - 179s - add delta 179s - 179s - commit e695849087f6c320c1a447620492b29a82ca41b1 179s - Author: test 179s - Date: Mon Jan 1 00:00:14 2007 +0000 179s - 179s - add zeta 179s - 179s - commit 7e9cd9f90b6d2c60579375eb796ce706d2d8bbe6 179s - Author: test 179s - Date: Mon Jan 1 00:00:13 2007 +0000 179s - 179s - add epsilon 179s - 179s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 179s - Author: test 179s - Date: Mon Jan 1 00:00:12 2007 +0000 179s - 179s - add gamma 179s - 179s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 179s - Author: test 179s - Date: Mon Jan 1 00:00:11 2007 +0000 179s - 179s - add beta 179s - 179s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 179s - Author: test 179s - Date: Mon Jan 1 00:00:10 2007 +0000 179s - 179s - add alpha 179s 179s ERROR: test-octopus.t output changed 183s ! 183s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-hook.t 183s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-hook.t.err 183s @@ -10,6 +10,7 @@ 183s > fn_${1}_commit -m $2 183s > } 183s $ hg init hgrepo 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s $ cd hgrepo 183s $ cat > .hg/hgrc < [hooks] 183s @@ -22,7 +23,10 @@ 183s > incoming = python:testlib.hooks.showargs 183s > EOF 183s $ fn_commit hg a 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s $ hg book master 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s 183s $ git init -q --bare ../repo.git 183s $ cat >> .hg/hgrc < master 183s + * [new branch] master -> master 183s $ cd ../hgrepo 183s 183s Hooks on pull? 183s 183s $ hg pull -u 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s pulling from $TESTTMP/repo.git 183s - | gitimport.source=pull 183s - | gitimport.git=True 183s - | gitimport.names=[b'default'] 183s - | gitimport.refs={b'HEAD': b'1dab31e7bc9691ba42a2fe7b14680694770bc527', b'refs/heads/master': b'1dab31e7bc9691ba42a2fe7b14680694770bc527'} 183s - | gitimport.heads=None 183s - importing 2 git commits 183s - : pretxncommit 183s - | incoming.git=True 183s - | incoming.source=pull 183s - | incoming.node=382ad5fa1d7727210384d40fa1539af52ca632c5 183s - | incoming.git_node=92150d1529ccaea34a6b36fe4144993193080499 183s - : pretxncommit 183s - | incoming.git=True 183s - | incoming.source=pull 183s - | incoming.node=892115eea5c32152e09ae4013c9a119d7b534049 183s - | incoming.git_node=1dab31e7bc9691ba42a2fe7b14680694770bc527 183s - updating bookmark master 183s - | changegroup.source=push 183s - | changegroup.git=True 183s - | changegroup.node=382ad5fa1d7727210384d40fa1539af52ca632c5 183s - | changegroup.node_last=892115eea5c32152e09ae4013c9a119d7b534049 183s - new changesets 382ad5fa1d77:892115eea5c3 (2 drafts) 183s - updating to active bookmark master 183s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 183s + abort: repository $TESTTMP/repo.git not found 183s + [255] 183s 183s Hooks on push? 183s 183s $ fn_commit hg d 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s $ fn_commit hg e 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s $ hg push 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s pushing to $TESTTMP/repo.git 183s - | preoutgoing.git=True 183s - | preoutgoing.source=push 183s - | preoutgoing.url=$TESTTMP/repo.git 183s - | gitexport.nodes=[b'cc6164a17449d58d7811ff3918f33f89c2c83fa5', b'46737f6a4c9d8307b681cbb2e9e2e5419cc87f82'] 183s - | gitexport.git=True 183s - searching for changes 183s - | prechangegroup.source=push 183s - | prechangegroup.git=True 183s - | prechangegroup.url=$TESTTMP/repo.git 183s - adding objects 183s - remote: found 0 deltas to reuse 183s - added 2 commits with 2 trees and 2 blobs 183s - updating reference refs/heads/master 183s + abort: repository $TESTTMP/repo.git not found 183s + [255] 183s 183s 183s And what does Mercurial do? 183s @@ -124,7 +87,9 @@ 183s On push: 183s 183s $ hg init ../hgrepo-copy 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s $ hg push ../hgrepo-copy 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s pushing to ../hgrepo-copy 183s searching for changes 183s | preoutgoing.source=push 183s @@ -133,19 +98,29 @@ 183s adding changesets 183s adding manifests 183s adding file changes 183s - added 5 changesets with 5 changes to 5 files 183s + added 3 changesets with 3 changes to 3 files 183s 183s With more than one head: 183s 183s $ rm -r ../hgrepo-copy 183s $ hg init ../hgrepo-copy 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s $ hg book -i 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s $ hg branch -q abranch 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s $ fn_commit hg x 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s $ hg up -q default 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s $ hg branch -q alsoabranch 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s $ fn_commit hg y 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s $ hg push ../hgrepo-copy 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s pushing to ../hgrepo-copy 183s searching for changes 183s | preoutgoing.source=push 183s @@ -154,13 +129,15 @@ 183s adding changesets 183s adding manifests 183s adding file changes 183s - added 7 changesets with 7 changes to 7 files (+1 heads) 183s + added 5 changesets with 5 changes to 5 files (+1 heads) 183s 183s On pull: 183s 183s $ hg debugstrip --no-backup tip 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 183s $ hg pull ../hgrepo-copy 183s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 183s pulling from ../hgrepo-copy 183s searching for changes 183s | prechangegroup.txnname=pull 183s @@ -171,16 +148,16 @@ 183s adding manifests 183s adding file changes 183s added 1 changesets with 1 changes to 1 files (+1 heads) 183s - new changesets d4097d98a390 183s + new changesets 11a693974ec5 183s | changegroup.txnname=pull 183s file://$TESTTMP/hgrepo-copy 183s | changegroup.source=pull 183s | changegroup.url=file:$TESTTMP/hgrepo-copy 183s - | changegroup.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 183s - | changegroup.node_last=d4097d98a3905be88e8a566039b1fdcca06e0d2e 183s + | changegroup.node=11a693974ec530e32672629628dde90793335199 183s + | changegroup.node_last=11a693974ec530e32672629628dde90793335199 183s | incoming.txnname=pull 183s file://$TESTTMP/hgrepo-copy 183s | incoming.source=pull 183s | incoming.url=file:$TESTTMP/hgrepo-copy 183s - | incoming.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 183s + | incoming.node=11a693974ec530e32672629628dde90793335199 183s (run 'hg heads' to see heads) 183s 183s ERROR: test-hook.t output changed 187s ! 187s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-transactions.t 187s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-transactions.t.err 187s @@ -42,19 +42,29 @@ 187s 187s $ hg clone gitrepo hgrepo --config hggit.mapsavefrequency=10 --debug \ 187s > | grep -c saving 187s - 1 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s + abort: repository gitrepo not found 187s + 0 187s + [1] 187s $ rm -rf hgrepo 187s 187s pull with mapsavefreq set 187s 187s $ hg init hgrepo 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s $ cat >> hgrepo/.hg/hgrc < [paths] 187s > default = $TESTTMP/gitrepo 187s > EOF 187s $ hg -R hgrepo --config hggit.mapsavefrequency=10 pull --debug \ 187s > | grep -c saving 187s - 10 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s + abort: repository $TESTTMP/gitrepo not found 187s + 0 187s + [1] 187s $ rm -rf hgrepo 187s 187s The user experience 187s @@ -66,6 +76,8 @@ 187s First, create a repository, set up to pull from git, and where we can interrupt the conversion. 187s 187s $ hg init hgrepo 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s $ cat >> hgrepo/.hg/hgrc < [paths] 187s > default = $TESTTMP/gitrepo 187s @@ -75,39 +87,45 @@ 187s A low save interval causes a lot of reports: 187s 187s $ hg --config hggit.mapsavefrequency=25 pull 187s - pulling from $TESTTMP/gitrepo 187s - importing 100 git commits 187s - new changesets 1c8407413fa3:abc468b9e51b (25 drafts) 187s - new changesets 217c308baf47:d5d14eeedd08 (25 drafts) 187s - new changesets d9807ef6abcb:4678067bd500 (25 drafts) 187s - adding bookmark master 187s - new changesets c31a154888bb:eda59117ba04 (25 drafts) 187s - (run 'hg update' to get a working copy) 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s + pulling from $TESTTMP/gitrepo 187s + abort: repository $TESTTMP/gitrepo not found 187s + [255] 187s 187s Reset the repository 187s 187s $ hg debugstrip --no-backup 'all()' 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s $ hg debug-remove-hggit-state 187s - clearing out the git cache data 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s + hg: unknown command 'debug-remove-hggit-state' 187s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 187s + [10] 187s 187s And with phases? No mention of draft changesets, as we publish changes 187s during the conversion: 187s 187s $ hg --config hggit.mapsavefrequency=25 --config hggit.usephases=yes pull 187s - pulling from $TESTTMP/gitrepo 187s - importing 100 git commits 187s - new changesets 1c8407413fa3:abc468b9e51b 187s - new changesets 217c308baf47:d5d14eeedd08 187s - new changesets d9807ef6abcb:4678067bd500 187s - updating bookmark master 187s - new changesets c31a154888bb:eda59117ba04 187s - (run 'hg update' to get a working copy) 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s + pulling from $TESTTMP/gitrepo 187s + abort: repository $TESTTMP/gitrepo not found 187s + [255] 187s 187s Reset the repository 187s 187s $ hg debugstrip --no-backup 'all()' 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s $ hg debug-remove-hggit-state 187s - clearing out the git cache data 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s + hg: unknown command 'debug-remove-hggit-state' 187s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 187s + [10] 187s 187s Interruptions 187s ------------- 187s @@ -121,54 +139,51 @@ 187s Test an error in a pull: 187s 187s $ ABORT_AFTER=99 hg pull 187s - pulling from $TESTTMP/gitrepo 187s - importing 100 git commits 187s - transaction abort! 187s - rollback completed 187s - abort: aborted after 99 commits! 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s + pulling from $TESTTMP/gitrepo 187s + abort: repository $TESTTMP/gitrepo not found 187s [255] 187s $ hg log -l 10 -T '{rev} {gitnode}\n' 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s 187s Test the user exiting in the first transaction: 187s 187s $ EXIT_AFTER=5 hg --config hggit.mapsavefrequency=10 pull 187s - pulling from $TESTTMP/gitrepo 187s - importing 100 git commits 187s - transaction abort! 187s - rollback completed 187s - interrupted! 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s + pulling from $TESTTMP/gitrepo 187s + abort: repository $TESTTMP/gitrepo not found 187s [255] 187s $ hg log -l 10 -T '{rev} {gitnode}\n' 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s 187s Check that we have no state, but clear it just in case 187s 187s $ ls -d .hg/git* 187s - .hg/git 187s + ls: cannot access '.hg/git*': No such file or directory 187s + [2] 187s $ hg debug-remove-hggit-state 187s - clearing out the git cache data 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s + hg: unknown command 'debug-remove-hggit-state' 187s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 187s + [10] 187s 187s Test the user exiting in the middle of a conversion, after the first 187s transaction: 187s 187s $ EXIT_AFTER=15 hg --config hggit.mapsavefrequency=10 pull 187s - pulling from $TESTTMP/gitrepo 187s - importing 100 git commits 187s - new changesets 1c8407413fa3:7c8c534a5fbe (10 drafts) 187s - transaction abort! 187s - rollback completed 187s - interrupted! 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s + pulling from $TESTTMP/gitrepo 187s + abort: repository $TESTTMP/gitrepo not found 187s [255] 187s $ hg log -l 10 -T '{rev} {gitnode}\n' 187s - 9 7cbb16ec981b308e1e2b181f8e1f22c8f409f44e 187s - 8 42da70ed92bbecf9f348ba59c93646be723d0bf2 187s - 7 17e841146e5744b81af9959634d82c20a5d7df52 187s - 6 c31065bf97bf014815e37cdfbdef2c32c687f314 187s - 5 fcf21b8e0520ec1cced1d7593d13f9ee54721269 187s - 4 46acd02d0352e4b92bd6a099bb0490305d847a18 187s - 3 61eeda444b37b8aa3892d5f04c66c5441d21dd66 187s - 2 e55db11bb0472791c7af3fc636772174cdea4a36 187s - 1 17a2672b3c24c02d568f99d8d55ccae2bf362d5c 187s - 0 4e195b4c6e77604b70a8ad3b01306adbb9b1c7e7 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s $ cd .. 187s $ rm -rf hgrepo 187s 187s @@ -183,12 +198,10 @@ 187s > hg --config hggit.mapsavefrequency=10 --config git.intree=yes \ 187s > --cwd hgrepo \ 187s > clone -U $TESTTMP/gitrepo . 187s - importing 100 git commits 187s - transaction abort! 187s - rollback completed 187s - interrupted! 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + *** failed to import extension "breakage" from /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/testlib/ext-break-git-import.py: b'hggit' 187s + abort: repository $TESTTMP/gitrepo not found 187s [255] 187s the leftover below appeared in Mercurial 5.9+; it is unintentional 187s $ ls -A hgrepo 187s - .git 187s - $ rm -rf hgrepo 187s + $ rm -rf hgrepo 187s 187s ERROR: test-transactions.t output changed 187s ! 187s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-outgoing.t 187s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-outgoing.t.err 187s @@ -14,166 +14,10 @@ 187s 187s $ cd .. 187s $ hg clone gitrepo hgrepo 187s - importing 1 git commits 187s - new changesets ff7a2f2d8d70 (1 drafts) 187s - updating to bookmark master 187s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + abort: repository gitrepo not found 187s + [255] 187s 187s $ cd hgrepo 187s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 187s $ hg book 187s - alpha 0:ff7a2f2d8d70 187s - * master 0:ff7a2f2d8d70 187s - $ hg update -q master 187s - $ echo beta > beta 187s - $ hg add beta 187s - $ fn_hg_commit -m 'add beta' 187s - 187s - 187s - $ echo gamma > gamma 187s - $ hg add gamma 187s - $ fn_hg_commit -m 'add gamma' 187s - 187s - $ hg book -r 1 beta 187s - 187s - $ hg outgoing | grep -v 'searching for changes' 187s - comparing with $TESTTMP/gitrepo 187s - changeset: 1:47580592d3d6 187s - bookmark: beta 187s - user: test 187s - date: Mon Jan 01 00:00:11 2007 +0000 187s - summary: add beta 187s - 187s - changeset: 2:953796e1cfd8 187s - bookmark: master 187s - tag: tip 187s - user: test 187s - date: Mon Jan 01 00:00:12 2007 +0000 187s - summary: add gamma 187s - 187s - $ hg outgoing -r beta 187s - comparing with $TESTTMP/gitrepo 187s - searching for changes 187s - changeset: 1:47580592d3d6 187s - bookmark: beta 187s - user: test 187s - date: Mon Jan 01 00:00:11 2007 +0000 187s - summary: add beta 187s - 187s - $ hg outgoing -r master 187s - comparing with $TESTTMP/gitrepo 187s - searching for changes 187s - changeset: 1:47580592d3d6 187s - bookmark: beta 187s - user: test 187s - date: Mon Jan 01 00:00:11 2007 +0000 187s - summary: add beta 187s - 187s - changeset: 2:953796e1cfd8 187s - bookmark: master 187s - tag: tip 187s - user: test 187s - date: Mon Jan 01 00:00:12 2007 +0000 187s - summary: add gamma 187s - 187s - 187s - $ cd .. 187s - 187s -some more work on master from git 187s - $ cd gitrepo 187s - 187s -Check state of refs after outgoing 187s - $ git show-ref 187s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/alpha 187s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/master 187s - 187s - $ git checkout master 2>&1 | sed s/\'/\"/g 187s - Already on "master" 187s - $ echo delta > delta 187s - $ git add delta 187s - $ fn_git_commit -m "add delta" 187s - 187s - $ cd .. 187s - 187s - $ cd hgrepo 187s -this will fail # maybe we should try to make it work 187s - $ hg outgoing 187s - comparing with $TESTTMP/gitrepo 187s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 187s - [255] 187s -let's pull and try again 187s - $ hg pull 187s - pulling from */gitrepo (glob) 187s - importing 1 git commits 187s - not updating diverged bookmark master 187s - new changesets 25eed24f5e8f (1 drafts) 187s - (run 'hg heads' to see heads, 'hg merge' to merge) 187s - $ hg log --graph 187s - o changeset: 3:25eed24f5e8f 187s - | tag: default/master 187s - | tag: tip 187s - | parent: 0:ff7a2f2d8d70 187s - | user: test 187s - | date: Mon Jan 01 00:00:13 2007 +0000 187s - | summary: add delta 187s - | 187s - | @ changeset: 2:953796e1cfd8 187s - | | bookmark: master 187s - | | user: test 187s - | | date: Mon Jan 01 00:00:12 2007 +0000 187s - | | summary: add gamma 187s - | | 187s - | o changeset: 1:47580592d3d6 187s - |/ bookmark: beta 187s - | user: test 187s - | date: Mon Jan 01 00:00:11 2007 +0000 187s - | summary: add beta 187s - | 187s - o changeset: 0:ff7a2f2d8d70 187s - bookmark: alpha 187s - tag: default/alpha 187s - user: test 187s - date: Mon Jan 01 00:00:10 2007 +0000 187s - summary: add alpha 187s - 187s - $ hg outgoing 187s - comparing with $TESTTMP/gitrepo 187s - searching for changes 187s - changeset: 1:47580592d3d6 187s - bookmark: beta 187s - user: test 187s - date: Mon Jan 01 00:00:11 2007 +0000 187s - summary: add beta 187s - 187s - changeset: 2:953796e1cfd8 187s - bookmark: master 187s - user: test 187s - date: Mon Jan 01 00:00:12 2007 +0000 187s - summary: add gamma 187s - 187s - $ hg outgoing -r beta 187s - comparing with $TESTTMP/gitrepo 187s - searching for changes 187s - changeset: 1:47580592d3d6 187s - bookmark: beta 187s - user: test 187s - date: Mon Jan 01 00:00:11 2007 +0000 187s - summary: add beta 187s - 187s - $ hg outgoing -r master 187s - comparing with $TESTTMP/gitrepo 187s - searching for changes 187s - changeset: 1:47580592d3d6 187s - bookmark: beta 187s - user: test 187s - date: Mon Jan 01 00:00:11 2007 +0000 187s - summary: add beta 187s - 187s - changeset: 2:953796e1cfd8 187s - bookmark: master 187s - user: test 187s - date: Mon Jan 01 00:00:12 2007 +0000 187s - summary: add gamma 187s - 187s - 187s - 187s - $ cd .. 187s 187s ERROR: test-outgoing.t output changed 189s ! 189s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-gc.t 189s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-gc.t.err 189s @@ -25,188 +25,9 @@ 189s > done 189s $ cd .. 189s $ hg clone -U gitrepo hgrepo 189s - importing 100 git commits 189s - new changesets 1c8407413fa3:eda59117ba04 (100 drafts) 189s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 189s + abort: repository gitrepo not found 189s + [255] 189s $ cd hgrepo 189s + $TESTTMP.sh: 24: cd: can't cd to hgrepo 189s $ hg debug-remove-hggit-state 189s - clearing out the git cache data 189s - 189s ------------ 189s - 189s -Test garbage collection of loose objects into packs. We first test 189s -this with two threads, which is closest to the expected usage 189s -scenario, as almost all computers have at least two cores these days. 189s -The main downside is that this makes the output order unreliable, so 189s -we just sort it. 189s - 189s - $ hg gexport --config hggit.mapsavefrequency=33 --config hggit.threads=2 --debug | grep pack | sort 189s - packed 3 loose objects! 189s - packed 75 loose objects! 189s - packed 78 loose objects! 189s - packed 86 loose objects! 189s - packing 3 loose objects... 189s - packing 75 loose objects... 189s - packing 78 loose objects... 189s - packing 86 loose objects... 189s - $ hg debug-remove-hggit-state 189s - clearing out the git cache data 189s - 189s -Test the actual order of operations -- this uses a single thread, 189s -which means that the packing happens synchronously in the main thread, 189s -giving us a reliable output order. 189s - 189s -In addition, the transaction size is set up such that we happen to do 189s -nothing in the final, synchronous packing that happens on every pull. 189s -Lots of other tests have a map save frequency higher than the total 189s -amount of commits pulled, but let's just trigger that other odd 189s -occurence here. 189s - 189s - $ hg gexport --debug \ 189s - > --config hggit.mapsavefrequency=10 --config hggit.threads=1 | \ 189s - > sed 's/^converting revision.*/./' 189s - finding unexported changesets 189s - exporting 100 changesets 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 189s - packing 30 loose objects... 189s - packed 30 loose objects! 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 189s - packing 25 loose objects... 189s - packed 25 loose objects! 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 189s - packing 25 loose objects... 189s - packed 25 loose objects! 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 189s - packing 24 loose objects... 189s - packed 24 loose objects! 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 189s - packing 24 loose objects... 189s - packed 24 loose objects! 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 189s - packing 24 loose objects... 189s - packed 24 loose objects! 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 189s - packing 24 loose objects... 189s - packed 24 loose objects! 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 189s - packing 23 loose objects... 189s - packed 23 loose objects! 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 189s - packing 22 loose objects... 189s - packed 22 loose objects! 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - . 189s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 189s - packing 21 loose objects... 189s - packed 21 loose objects! 189s - packing 0 loose objects... 189s - packed 0 loose objects! 189s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 189s - $ find .hg/git/objects -type f | grep -Fv .idx | sort 189s - .hg/git/objects/pack/pack-33903607b479000b976a29a349fe0f4dffb0aaac.pack 189s - .hg/git/objects/pack/pack-40d9440e392d9eab62fa38a2ed66cc763d77aca3.pack 189s - .hg/git/objects/pack/pack-4ab2dac268f94e407788d52d6ba087b626c41651.pack 189s - .hg/git/objects/pack/pack-543e3b37bd36218a4dc6611a96d7c218afb78429.pack 189s - .hg/git/objects/pack/pack-5fc80292253ee10d1b86b5c4d9c51b29d2b4ba47.pack 189s - .hg/git/objects/pack/pack-9c636f5f16302fc5fadf0cc4ed42aeb67fc51f6a.pack 189s - .hg/git/objects/pack/pack-ae74b1f0197dfb45cfb13889453860a40103969a.pack 189s - .hg/git/objects/pack/pack-b432e2f477cb765fc0aeaa850d56e04b10392e6c.pack 189s - .hg/git/objects/pack/pack-cf7023660ce10ede2896d1be117f6ba93a261ff9.pack 189s - .hg/git/objects/pack/pack-e601b2af6a91a9cf6817d71f4eb660d2218d4094.pack 189s 189s ERROR: test-gc.t output changed 190s ! 190s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-phases-public.t 190s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-phases-public.t#publish-defaults.err 190s @@ -24,149 +24,10 @@ 190s 190s cloning with hggit.usephases publishes cloned HEAD 190s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 190s - importing 1 git commits 190s - new changesets ff7a2f2d8d70 190s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 190s + abort: repository gitrepo not found 190s + [255] 190s 190s $ cd hgrepo 190s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 190s $ hg phase -r master 190s - 0: public 190s - $ cd .. 190s - 190s -pulled changesets are public 190s - $ cd gitrepo 190s - $ git checkout -q master 190s - $ echo beta > beta 190s - $ git add beta 190s - $ fn_git_commit -m 'add beta' 190s - $ git checkout -b not-master 190s - Switched to a new branch 'not-master' 190s - $ echo gamma > gamma 190s - $ git add gamma 190s - $ fn_git_commit -m 'add gamma' 190s - $ git tag thetag 190s - $ echo delta > delta 190s - $ git add delta 190s - $ fn_git_commit -m 'add delta' 190s - $ git checkout master 190s - Switched to branch 'master' 190s - $ cd .. 190s - 190s - $ cd hgrepo 190s - $ cat >>$HGRCPATH < [paths] 190s - > other = $TESTTMP/gitrepo/.git 190s - > [hggit] 190s - > usephases = True 190s - > EOF 190s - 190s - $ hg phase -fd 'all()' 190s - 190s -we can restrict publishing to the remote HEAD and that tag, which 190s -happens to be the same thing here 190s - 190s -#if publish-specific 190s - $ cat >>$HGRCPATH < [git] 190s - > public = default/master, thetag 190s - > EOF 190s -#endif 190s - 190s -pulling publishes the branch 190s - 190s - $ hg phase -r master 190s - 0: draft 190s -#if publish-defaults 190s - $ hg pull -r master other 190s - pulling from $TESTTMP/gitrepo/.git 190s - importing 1 git commits 190s - updating bookmark master 190s - new changesets 7fe02317c63d 190s - 1 local changesets published 190s - (run 'hg update' to get a working copy) 190s -#else 190s - $ hg pull -r master other 190s - pulling from $TESTTMP/gitrepo/.git 190s - importing 1 git commits 190s - updating bookmark master 190s - new changesets 7fe02317c63d (1 drafts) 190s - (run 'hg update' to get a working copy) 190s -#endif 190s - $ hg phase -r master 190s - 1: draft (publish-specific !) 190s - 1: public (publish-defaults !) 190s -#if publish-defaults 190s - $ hg phase -fd master 190s - $ hg pull 190s - pulling from $TESTTMP/gitrepo 190s - importing 2 git commits 190s - adding bookmark not-master 190s - new changesets ca33a262eb46:03769a650ded (1 drafts) 190s - 1 local changesets published 190s - (run 'hg update' to get a working copy) 190s -#else 190s - $ hg pull 190s - pulling from $TESTTMP/gitrepo 190s - importing 2 git commits 190s - adding bookmark not-master 190s - new changesets ca33a262eb46:03769a650ded (1 drafts) 190s - 2 local changesets published 190s - (run 'hg update' to get a working copy) 190s -#endif 190s - $ hg phase -r master -r not-master -r thetag 190s - 1: public 190s - 3: draft 190s - 2: public 190s - 190s -public bookmark not pushed is not published after pull 190s - 190s - $ hg update 0 190s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 190s - $ echo delta > delta 190s - $ hg bookmark not-pushed 190s - $ hg add delta 190s - $ hg commit -m 'add delta' 190s - created new head 190s - $ hg phase -r 'all()' > $TESTTMP/before 190s - $ hg pull --config git.public=master,not-pushed 190s - pulling from $TESTTMP/gitrepo 190s - no changes found 190s - $ hg phase -r 'all()' > $TESTTMP/after 190s - $ cmp -s $TESTTMP/before $TESTTMP/after 190s - $ hg phase -r not-pushed 190s - 4: draft 190s - $ rm $TESTTMP/before $TESTTMP/after 190s - 190s -pushing public bookmark publishes local changesets, but only those 190s -actually pushed 190s - 190s - $ hg update master 190s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 190s - (activating bookmark master) 190s - $ echo epsilon > epsilon 190s - $ hg add epsilon 190s - $ hg commit -m 'add epsilon' 190s - created new head 190s - $ hg phase -r 'all() - master' > $TESTTMP/before 190s - $ hg push -B not-pushed 190s - pushing to $TESTTMP/gitrepo 190s - searching for changes 190s - adding objects 190s - remote: found 0 deltas to reuse 190s - added 1 commits with 1 trees and 1 blobs 190s - adding reference refs/heads/not-pushed 190s - $ hg phase -r 'all() - master' > $TESTTMP/after 190s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 190s - $ hg phase -r not-pushed -r master 190s - 4: draft 190s - 5: draft 190s - $ hg push -B master 190s - pushing to $TESTTMP/gitrepo 190s - searching for changes 190s - adding objects 190s - remote: found 0 deltas to reuse 190s - added 1 commits with 1 trees and 1 blobs 190s - updating reference refs/heads/master 190s - $ hg phase -r 'all() - master' > $TESTTMP/after 190s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 190s - $ hg phase -r master 190s - 5: public 190s 190s ERROR: test-phases-public.t#publish-defaults output changed 191s ! 191s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-phases-public.t 191s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-phases-public.t#publish-specific.err 191s @@ -24,149 +24,10 @@ 191s 191s cloning with hggit.usephases publishes cloned HEAD 191s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 191s - importing 1 git commits 191s - new changesets ff7a2f2d8d70 191s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 191s + abort: repository gitrepo not found 191s + [255] 191s 191s $ cd hgrepo 191s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 191s $ hg phase -r master 191s - 0: public 191s - $ cd .. 191s - 191s -pulled changesets are public 191s - $ cd gitrepo 191s - $ git checkout -q master 191s - $ echo beta > beta 191s - $ git add beta 191s - $ fn_git_commit -m 'add beta' 191s - $ git checkout -b not-master 191s - Switched to a new branch 'not-master' 191s - $ echo gamma > gamma 191s - $ git add gamma 191s - $ fn_git_commit -m 'add gamma' 191s - $ git tag thetag 191s - $ echo delta > delta 191s - $ git add delta 191s - $ fn_git_commit -m 'add delta' 191s - $ git checkout master 191s - Switched to branch 'master' 191s - $ cd .. 191s - 191s - $ cd hgrepo 191s - $ cat >>$HGRCPATH < [paths] 191s - > other = $TESTTMP/gitrepo/.git 191s - > [hggit] 191s - > usephases = True 191s - > EOF 191s - 191s - $ hg phase -fd 'all()' 191s - 191s -we can restrict publishing to the remote HEAD and that tag, which 191s -happens to be the same thing here 191s - 191s -#if publish-specific 191s - $ cat >>$HGRCPATH < [git] 191s - > public = default/master, thetag 191s - > EOF 191s -#endif 191s - 191s -pulling publishes the branch 191s - 191s - $ hg phase -r master 191s - 0: draft 191s -#if publish-defaults 191s - $ hg pull -r master other 191s - pulling from $TESTTMP/gitrepo/.git 191s - importing 1 git commits 191s - updating bookmark master 191s - new changesets 7fe02317c63d 191s - 1 local changesets published 191s - (run 'hg update' to get a working copy) 191s -#else 191s - $ hg pull -r master other 191s - pulling from $TESTTMP/gitrepo/.git 191s - importing 1 git commits 191s - updating bookmark master 191s - new changesets 7fe02317c63d (1 drafts) 191s - (run 'hg update' to get a working copy) 191s -#endif 191s - $ hg phase -r master 191s - 1: draft (publish-specific !) 191s - 1: public (publish-defaults !) 191s -#if publish-defaults 191s - $ hg phase -fd master 191s - $ hg pull 191s - pulling from $TESTTMP/gitrepo 191s - importing 2 git commits 191s - adding bookmark not-master 191s - new changesets ca33a262eb46:03769a650ded (1 drafts) 191s - 1 local changesets published 191s - (run 'hg update' to get a working copy) 191s -#else 191s - $ hg pull 191s - pulling from $TESTTMP/gitrepo 191s - importing 2 git commits 191s - adding bookmark not-master 191s - new changesets ca33a262eb46:03769a650ded (1 drafts) 191s - 2 local changesets published 191s - (run 'hg update' to get a working copy) 191s -#endif 191s - $ hg phase -r master -r not-master -r thetag 191s - 1: public 191s - 3: draft 191s - 2: public 191s - 191s -public bookmark not pushed is not published after pull 191s - 191s - $ hg update 0 191s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 191s - $ echo delta > delta 191s - $ hg bookmark not-pushed 191s - $ hg add delta 191s - $ hg commit -m 'add delta' 191s - created new head 191s - $ hg phase -r 'all()' > $TESTTMP/before 191s - $ hg pull --config git.public=master,not-pushed 191s - pulling from $TESTTMP/gitrepo 191s - no changes found 191s - $ hg phase -r 'all()' > $TESTTMP/after 191s - $ cmp -s $TESTTMP/before $TESTTMP/after 191s - $ hg phase -r not-pushed 191s - 4: draft 191s - $ rm $TESTTMP/before $TESTTMP/after 191s - 191s -pushing public bookmark publishes local changesets, but only those 191s -actually pushed 191s - 191s - $ hg update master 191s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 191s - (activating bookmark master) 191s - $ echo epsilon > epsilon 191s - $ hg add epsilon 191s - $ hg commit -m 'add epsilon' 191s - created new head 191s - $ hg phase -r 'all() - master' > $TESTTMP/before 191s - $ hg push -B not-pushed 191s - pushing to $TESTTMP/gitrepo 191s - searching for changes 191s - adding objects 191s - remote: found 0 deltas to reuse 191s - added 1 commits with 1 trees and 1 blobs 191s - adding reference refs/heads/not-pushed 191s - $ hg phase -r 'all() - master' > $TESTTMP/after 191s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 191s - $ hg phase -r not-pushed -r master 191s - 4: draft 191s - 5: draft 191s - $ hg push -B master 191s - pushing to $TESTTMP/gitrepo 191s - searching for changes 191s - adding objects 191s - remote: found 0 deltas to reuse 191s - added 1 commits with 1 trees and 1 blobs 191s - updating reference refs/heads/master 191s - $ hg phase -r 'all() - master' > $TESTTMP/after 191s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 191s - $ hg phase -r master 191s - 5: public 191s 191s ERROR: test-phases-public.t#publish-specific output changed 196s ! 196s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-push-r.t 196s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-push-r.t.err 196s @@ -2,34 +2,43 @@ 196s $ . "$TESTDIR/testutil" 196s 196s $ hg init test 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s $ cd test 196s $ cat >>afile < 0 196s > EOF 196s $ hg add afile 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s $ fn_hg_commit -m "0.0" 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s $ cat >>afile < 1 196s > EOF 196s $ fn_hg_commit -m "0.1" 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s $ cat >>afile < 2 196s > EOF 196s $ fn_hg_commit -m "0.2" 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s $ cat >>afile < 3 196s > EOF 196s $ fn_hg_commit -m "0.3" 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s $ hg update -C 0 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 196s $ cat >>afile < 1 196s > EOF 196s $ fn_hg_commit -m "1.1" 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s $ cat >>afile < 2 196s > EOF 196s $ fn_hg_commit -m "1.2" 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s $ cat >fred < a line 196s > EOF 196s @@ -37,13 +46,20 @@ 196s > 3 196s > EOF 196s $ hg add fred 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s $ fn_hg_commit -m "1.3" 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s $ hg mv afile adifferentfile 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s $ fn_hg_commit -m "1.3m" 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s $ hg update -C 3 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 196s $ hg mv afile anotherfile 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s $ fn_hg_commit -m "0.3m" 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s $ cd .. 196s $ for i in 0 1 2 3 4 5 6 7 8; do 196s > mkdir test-"$i" 196s @@ -53,128 +69,166 @@ 196s > hg verify 196s > cd .. 196s > done 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s pushing to test-0 196s searching for changes 196s adding changesets 196s adding manifests 196s adding file changes 196s added 1 changesets with 1 changes to 1 files 196s - checking changesets 196s - checking manifests 196s - crosschecking files in changesets and manifests 196s - checking files 196s - checking dirstate (?) 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + checking changesets 196s + checking dirstate (?) 196s + checking manifests 196s + crosschecking files in changesets and manifests 196s + checking files 196s + checking dirstate 196s checked 1 changesets with 1 changes to 1 files 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s pushing to test-1 196s searching for changes 196s adding changesets 196s adding manifests 196s + checking dirstate (?) 196s adding file changes 196s added 2 changesets with 2 changes to 1 files 196s - checking changesets 196s - checking manifests 196s - crosschecking files in changesets and manifests 196s - checking files 196s - checking dirstate (?) 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + checking changesets 196s + checking manifests 196s + crosschecking files in changesets and manifests 196s + checking files 196s + checking dirstate 196s checked 2 changesets with 2 changes to 1 files 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + checking dirstate (?) 196s pushing to test-2 196s searching for changes 196s adding changesets 196s adding manifests 196s adding file changes 196s added 3 changesets with 3 changes to 1 files 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s checking changesets 196s checking manifests 196s crosschecking files in changesets and manifests 196s checking files 196s checking dirstate (?) 196s checked 3 changesets with 3 changes to 1 files 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s pushing to test-3 196s searching for changes 196s adding changesets 196s adding manifests 196s adding file changes 196s added 4 changesets with 4 changes to 1 files 196s - checking changesets 196s - checking manifests 196s - crosschecking files in changesets and manifests 196s - checking files 196s - checking dirstate (?) 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + checking changesets 196s + checking dirstate (?) 196s + checking manifests 196s + crosschecking files in changesets and manifests 196s + checking files 196s + checking dirstate 196s checked 4 changesets with 4 changes to 1 files 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s pushing to test-4 196s searching for changes 196s adding changesets 196s adding manifests 196s + checking dirstate (?) 196s adding file changes 196s added 2 changesets with 2 changes to 1 files 196s - checking changesets 196s - checking manifests 196s - crosschecking files in changesets and manifests 196s - checking files 196s - checking dirstate (?) 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + checking changesets 196s + checking manifests 196s + crosschecking files in changesets and manifests 196s + checking files 196s + checking dirstate 196s checked 2 changesets with 2 changes to 1 files 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + checking dirstate (?) 196s pushing to test-5 196s searching for changes 196s adding changesets 196s adding manifests 196s adding file changes 196s added 3 changesets with 3 changes to 1 files 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s checking changesets 196s checking manifests 196s crosschecking files in changesets and manifests 196s checking files 196s checking dirstate (?) 196s checked 3 changesets with 3 changes to 1 files 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s pushing to test-6 196s searching for changes 196s adding changesets 196s adding manifests 196s adding file changes 196s added 4 changesets with 5 changes to 2 files 196s - checking changesets 196s - checking manifests 196s - crosschecking files in changesets and manifests 196s - checking files 196s - checking dirstate (?) 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + checking changesets 196s + checking dirstate (?) 196s + checking manifests 196s + crosschecking files in changesets and manifests 196s + checking files 196s + checking dirstate 196s checked 4 changesets with 5 changes to 2 files 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s pushing to test-7 196s searching for changes 196s adding changesets 196s adding manifests 196s adding file changes 196s added 5 changesets with 6 changes to 3 files 196s - checking changesets 196s - checking manifests 196s - crosschecking files in changesets and manifests 196s - checking files 196s - checking dirstate (?) 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + checking changesets 196s + checking manifests 196s + crosschecking files in changesets and manifests 196s + checking files 196s + checking dirstate 196s checked 5 changesets with 6 changes to 3 files 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s pushing to test-8 196s searching for changes 196s adding changesets 196s adding manifests 196s adding file changes 196s added 5 changesets with 5 changes to 2 files 196s - checking changesets 196s - checking manifests 196s - crosschecking files in changesets and manifests 196s - checking files 196s - checking dirstate (?) 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + checking changesets 196s + checking manifests 196s + crosschecking files in changesets and manifests 196s + checking files 196s + checking dirstate 196s checked 5 changesets with 5 changes to 2 files 196s $ cd test-8 196s $ hg pull ../test-7 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s pulling from ../test-7 196s searching for changes 196s adding changesets 196s adding manifests 196s adding file changes 196s + new changesets c29287bce33f:e70c8671c3d4 (?) 196s added 4 changesets with 2 changes to 3 files (+1 heads) 196s - new changesets c29287bce33f:e70c8671c3d4 (?) 196s + new changesets c29287bce33f:e70c8671c3d4 196s (run 'hg heads' to see heads, 'hg merge' to merge) 196s $ hg verify 196s - checking changesets 196s - checking manifests 196s - crosschecking files in changesets and manifests 196s - checking files 196s - checking dirstate (?) 196s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 196s + checking changesets 196s + checking manifests 196s + crosschecking files in changesets and manifests 196s + checking dirstate (?) 196s + checking files 196s + checking dirstate 196s checked 9 changesets with 7 changes to 4 files 196s 196s ERROR: test-push-r.t output changed 197s !s 197s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-invalid-refs.t 197s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-invalid-refs.t.err 197s @@ -12,115 +12,10 @@ 197s 197s $ cd .. 197s $ hg clone -U gitrepo hgrepo 197s - importing 1 git commits 197s - new changesets ff7a2f2d8d70 (1 drafts) 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s + abort: repository gitrepo not found 197s + [255] 197s 197s $ cd hgrepo 197s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 197s $ hg up master 197s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 197s - (activating bookmark master) 197s - $ fn_hg_tag alph#a 197s - $ fn_hg_tag bet*a 197s - $ fn_hg_tag 'gamm a' 197s - $ hg book -r . delt#a 197s - $ hg book -r . epsil*on 197s - 197s - $ hg gexport 197s - warning: not exporting tag 'bet*a' due to invalid name 197s - warning: not exporting bookmark 'epsil*on' due to invalid name 197s - 197s - $ hg push 197s - pushing to $TESTTMP/gitrepo 197s - warning: not exporting tag 'bet*a' due to invalid name 197s - warning: not exporting bookmark 'epsil*on' due to invalid name 197s - searching for changes 197s - adding objects 197s - remote: found 0 deltas to reuse 197s - added 3 commits with 3 trees and 3 blobs 197s - adding reference refs/heads/delt#a 197s - updating reference refs/heads/master 197s - adding reference refs/tags/alph#a 197s - adding reference refs/tags/gamm_a 197s - 197s - $ hg log --graph 197s - @ changeset: 3:0950ab44ea23 197s - | bookmark: delt#a 197s - | bookmark: epsil*on 197s - | bookmark: master 197s - | tag: default/delt#a 197s - | tag: default/master 197s - | tag: tip 197s - | user: test 197s - | date: Mon Jan 01 00:00:13 2007 +0000 197s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 197s - | 197s - o changeset: 2:0b27ab2b3df6 197s - | tag: gamm a 197s - | user: test 197s - | date: Mon Jan 01 00:00:12 2007 +0000 197s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 197s - | 197s - o changeset: 1:491ceeb1b0f1 197s - | tag: bet*a 197s - | user: test 197s - | date: Mon Jan 01 00:00:11 2007 +0000 197s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 197s - | 197s - o changeset: 0:ff7a2f2d8d70 197s - bookmark: not-master 197s - tag: alph#a 197s - tag: default/not-master 197s - user: test 197s - date: Mon Jan 01 00:00:10 2007 +0000 197s - summary: add alpha 197s - 197s - 197s - $ cd .. 197s - $ cd gitrepo 197s -git should have only the valid tag alph#a but have full commit log including the missing invalid bet*a tag commit 197s - $ git tag -l 197s - alph#a 197s - gamm_a 197s - 197s - $ cd .. 197s - $ hg clone -U gitrepo hgrepo2 197s - importing 4 git commits 197s - new changesets ff7a2f2d8d70:0950ab44ea23 (4 drafts) 197s - $ hg -R hgrepo2 log --graph 197s - o changeset: 3:0950ab44ea23 197s - | bookmark: delt#a 197s - | bookmark: master 197s - | tag: default/delt#a 197s - | tag: default/master 197s - | tag: tip 197s - | user: test 197s - | date: Mon Jan 01 00:00:13 2007 +0000 197s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 197s - | 197s - o changeset: 2:0b27ab2b3df6 197s - | tag: gamm a 197s - | tag: gamm_a 197s - | user: test 197s - | date: Mon Jan 01 00:00:12 2007 +0000 197s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 197s - | 197s - o changeset: 1:491ceeb1b0f1 197s - | tag: bet*a 197s - | user: test 197s - | date: Mon Jan 01 00:00:11 2007 +0000 197s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 197s - | 197s - o changeset: 0:ff7a2f2d8d70 197s - bookmark: not-master 197s - tag: alph#a 197s - tag: default/not-master 197s - user: test 197s - date: Mon Jan 01 00:00:10 2007 +0000 197s - summary: add alpha 197s - 197s - 197s -the tag should be in .hgtags 197s - $ hg cat -r master hgrepo2/.hgtags 197s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alph#a 197s - 491ceeb1b0f10d65d956dfcdd3470ac2bc2c96a8 bet*a 197s - 0b27ab2b3df69c6f7defd7040b93e539136db5be gamm a 197s 197s ERROR: test-invalid-refs.t output changed 197s ! 197s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-git-workflow.t 197s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-git-workflow.t.err 197s @@ -2,13 +2,20 @@ 197s $ . "$TESTDIR/testutil" 197s 197s $ hg init hgrepo 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s $ cd hgrepo 197s $ hg debuggitdir 197s - $TESTTMP/hgrepo/.hg/git 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s + hg: unknown command 'debuggitdir' 197s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 197s + [10] 197s $ echo alpha > alpha 197s $ hg add alpha 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s $ fn_hg_commit -m "add alpha" 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s $ hg log --graph --debug | grep -v phase: 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s @ changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 197s tag: tip 197s parent: -1:0000000000000000000000000000000000000000 197s @@ -27,49 +34,54 @@ 197s 197s configure for use from git 197s $ hg clone hgrepo gitrepo 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s updating to branch default 197s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 197s $ cd gitrepo 197s $ hg book master 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s $ hg up null 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 197s (leaving bookmark master) 197s $ echo "[git]" >> .hg/hgrc 197s $ echo "intree = True" >> .hg/hgrc 197s $ hg debuggitdir 197s - $TESTTMP/gitrepo/.git 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s + hg: unknown command 'debuggitdir' 197s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 197s + [10] 197s $ hg gexport 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s + hg: unknown command 'gexport' 197s + (did you mean one of export, import?) 197s + [10] 197s 197s do some work 197s $ git config core.bare false 197s + fatal: not in a git directory 197s + [128] 197s $ git checkout master 2>&1 | sed s/\'/\"/g 197s - Already on "master" 197s + fatal: not a git repository (or any of the parent directories): .git 197s $ echo beta > beta 197s $ git add beta 197s + fatal: not a git repository (or any of the parent directories): .git 197s + [128] 197s $ fn_git_commit -m 'add beta' 197s + fatal: not a git repository (or any of the parent directories): .git 197s + git commit error 197s 197s get things back to hg 197s $ hg gimport 197s - importing 1 git commits 197s - updating bookmark master 197s - new changesets 9f124f3c1fc2 (1 drafts) 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s + hg: unknown command 'gimport' 197s + (did you mean one of export, import?) 197s + [10] 197s $ hg log --graph --debug | grep -v phase: 197s - o changeset: 1:9f124f3c1fc29a14f5eb027c24811b0ac9d5ff10 197s - | bookmark: master 197s - | tag: tip 197s - | parent: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 197s - | parent: -1:0000000000000000000000000000000000000000 197s - | manifest: 1:f0bd6fbafbaebe4bb59c35108428f6fce152431d 197s - | user: test 197s - | date: Mon Jan 01 00:00:11 2007 +0000 197s - | files+: beta 197s - | extra: branch=default 197s - | extra: hg-git-rename-source=git 197s - | description: 197s - | add beta 197s - | 197s - | 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s o changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 197s + bookmark: master 197s + tag: tip 197s parent: -1:0000000000000000000000000000000000000000 197s parent: -1:0000000000000000000000000000000000000000 197s manifest: 0:8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0 197s @@ -83,7 +95,8 @@ 197s 197s gimport should have updated the bookmarks as well 197s $ hg bookmarks 197s - master 1:9f124f3c1fc2 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s + master 0:0221c246a567 197s 197s gimport support for git.mindate 197s $ cat >> .hg/hgrc << EOF 197s @@ -92,20 +105,23 @@ 197s > EOF 197s $ echo oldcommit > oldcommit 197s $ git add oldcommit 197s + fatal: not a git repository (or any of the parent directories): .git 197s + [128] 197s $ GIT_AUTHOR_DATE="2014-03-01 00:00:00 +0000" \ 197s > GIT_COMMITTER_DATE="2009-01-01 00:00:00 +0000" \ 197s > git commit -m oldcommit > /dev/null || echo "git commit error" 197s + fatal: not a git repository (or any of the parent directories): .git 197s + git commit error 197s $ hg gimport 197s - no changes found 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s + hg: unknown command 'gimport' 197s + (did you mean one of export, import?) 197s + [10] 197s $ hg log --graph 197s - o changeset: 1:9f124f3c1fc2 197s - | bookmark: master 197s - | tag: tip 197s - | user: test 197s - | date: Mon Jan 01 00:00:11 2007 +0000 197s - | summary: add beta 197s - | 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s o changeset: 0:0221c246a567 197s + bookmark: master 197s + tag: tip 197s user: test 197s date: Mon Jan 01 00:00:10 2007 +0000 197s summary: add alpha 197s @@ -113,32 +129,23 @@ 197s 197s $ echo newcommit > newcommit 197s $ git add newcommit 197s + fatal: not a git repository (or any of the parent directories): .git 197s + [128] 197s $ GIT_AUTHOR_DATE="2014-01-01 00:00:00 +0000" \ 197s > GIT_COMMITTER_DATE="2014-01-02 00:00:00 +0000" \ 197s > git commit -m newcommit > /dev/null || echo "git commit error" 197s + fatal: not a git repository (or any of the parent directories): .git 197s + git commit error 197s $ hg gimport 197s - importing 2 git commits 197s - updating bookmark master 197s - new changesets befdecd14df5:3d10b7289d79 (2 drafts) 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s + hg: unknown command 'gimport' 197s + (did you mean one of export, import?) 197s + [10] 197s $ hg log --graph 197s - o changeset: 3:3d10b7289d79 197s - | bookmark: master 197s - | tag: tip 197s - | user: test 197s - | date: Wed Jan 01 00:00:00 2014 +0000 197s - | summary: newcommit 197s - | 197s - o changeset: 2:befdecd14df5 197s - | user: test 197s - | date: Sat Mar 01 00:00:00 2014 +0000 197s - | summary: oldcommit 197s - | 197s - o changeset: 1:9f124f3c1fc2 197s - | user: test 197s - | date: Mon Jan 01 00:00:11 2007 +0000 197s - | summary: add beta 197s - | 197s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 197s o changeset: 0:0221c246a567 197s + bookmark: master 197s + tag: tip 197s user: test 197s date: Mon Jan 01 00:00:10 2007 +0000 197s summary: add alpha 197s 197s ERROR: test-git-workflow.t output changed 199s ! 199s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-serve-hg.t 199s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-serve-hg.t#with-hggit.err 199s @@ -31,11 +31,11 @@ 199s $ cd .. 199s 199s $ hg clone gitrepo hgrepo 199s - importing 2 git commits 199s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 199s - updating to bookmark master 199s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 199s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 199s + abort: repository gitrepo not found 199s + [255] 199s $ cd hgrepo 199s + $TESTTMP.sh: 41: cd: can't cd to hgrepo 199s $ cat >> .hg/hgrc < [push] 199s > pushvars.server = true 199s @@ -45,81 +45,3 @@ 199s > [hooks] 199s > pretxnchangegroup = env | grep HG_USERVAR_ || true 199s > EOF 199s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 199s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 199s - 199s -Test server address cannot be reused 199s - 199s -#if windows 199s - $ hg serve -p $HGPORT1 2>&1 199s - abort: cannot start server at '*:$HGPORT1': * (glob) 199s - [255] 199s -#else 199s - $ hg serve -p $HGPORT1 2>&1 199s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 199s - [255] 199s -#endif 199s - $ cd .. 199s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 199s - 199s -Make sure that clone regular mercurial repos over http doesn't break, 199s -and that we can transfer the hg-git metadata 199s - 199s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 199s - requesting all changes 199s - adding changesets 199s - adding manifests 199s - adding file changes 199s - added 2 changesets with 4 changes to 4 files 199s - new changesets f488b65fa424:c61c38c3d614 (?) 199s - updating to branch default 199s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 199s - 199s -And it shouldn't create a Git repository needlessly: 199s - $ test -e copy/git 199s - [1] 199s - $ cd copy 199s - 199s -#if without-hggit 199s - $ hg tags 199s - tip 1:c61c38c3d614 199s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 199s - 1:c61c38c3d614 | master | | 199s - 0:f488b65fa424 | | | 199s - $ hg pull -u ../gitrepo 199s - pulling from ../gitrepo 199s - importing 2 git commits 199s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 199s -#else 199s - $ hg tags 199s - tip 1:c61c38c3d614 199s - thetag 0:f488b65fa424 199s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 199s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 199s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 199s - $ hg pull -u ../gitrepo 199s - pulling from ../gitrepo 199s - warning: created new git repository at $TESTTMP/copy/.hg/git 199s - no changes found 199s -#endif 199s - 199s - $ hg tags 199s - tip 1:c61c38c3d614 199s - thetag 0:f488b65fa424 199s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 199s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 199s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 199s - 199s -Furthermore, make sure that we pass all arguments when pushing: 199s - 199s - $ echo baz > baz 199s - $ fn_hg_commit -A -m baz 199s - $ hg push --pushvars FOO=BAR 199s - pushing to http://localhost:$HGPORT/ 199s - searching for changes 199s - remote: adding changesets 199s - remote: adding manifests 199s - remote: adding file changes 199s - remote: HG_USERVAR_FOO=BAR 199s - remote: added 1 changesets with 1 changes to 1 files 199s - $ cd .. 199s 199s ERROR: test-serve-hg.t#with-hggit output changed 199s ! 199s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-serve-hg.t 199s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-serve-hg.t#without-hggit.err 199s @@ -31,11 +31,11 @@ 199s $ cd .. 199s 199s $ hg clone gitrepo hgrepo 199s - importing 2 git commits 199s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 199s - updating to bookmark master 199s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 199s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 199s + abort: repository gitrepo not found 199s + [255] 199s $ cd hgrepo 199s + $TESTTMP.sh: 36: cd: can't cd to hgrepo 199s $ cat >> .hg/hgrc < [push] 199s > pushvars.server = true 199s @@ -45,81 +45,3 @@ 199s > [hooks] 199s > pretxnchangegroup = env | grep HG_USERVAR_ || true 199s > EOF 199s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 199s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 199s - 199s -Test server address cannot be reused 199s - 199s -#if windows 199s - $ hg serve -p $HGPORT1 2>&1 199s - abort: cannot start server at '*:$HGPORT1': * (glob) 199s - [255] 199s -#else 199s - $ hg serve -p $HGPORT1 2>&1 199s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 199s - [255] 199s -#endif 199s - $ cd .. 199s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 199s - 199s -Make sure that clone regular mercurial repos over http doesn't break, 199s -and that we can transfer the hg-git metadata 199s - 199s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 199s - requesting all changes 199s - adding changesets 199s - adding manifests 199s - adding file changes 199s - added 2 changesets with 4 changes to 4 files 199s - new changesets f488b65fa424:c61c38c3d614 (?) 199s - updating to branch default 199s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 199s - 199s -And it shouldn't create a Git repository needlessly: 199s - $ test -e copy/git 199s - [1] 199s - $ cd copy 199s - 199s -#if without-hggit 199s - $ hg tags 199s - tip 1:c61c38c3d614 199s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 199s - 1:c61c38c3d614 | master | | 199s - 0:f488b65fa424 | | | 199s - $ hg pull -u ../gitrepo 199s - pulling from ../gitrepo 199s - importing 2 git commits 199s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 199s -#else 199s - $ hg tags 199s - tip 1:c61c38c3d614 199s - thetag 0:f488b65fa424 199s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 199s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 199s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 199s - $ hg pull -u ../gitrepo 199s - pulling from ../gitrepo 199s - warning: created new git repository at $TESTTMP/copy/.hg/git 199s - no changes found 199s -#endif 199s - 199s - $ hg tags 199s - tip 1:c61c38c3d614 199s - thetag 0:f488b65fa424 199s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 199s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 199s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 199s - 199s -Furthermore, make sure that we pass all arguments when pushing: 199s - 199s - $ echo baz > baz 199s - $ fn_hg_commit -A -m baz 199s - $ hg push --pushvars FOO=BAR 199s - pushing to http://localhost:$HGPORT/ 199s - searching for changes 199s - remote: adding changesets 199s - remote: adding manifests 199s - remote: adding file changes 199s - remote: HG_USERVAR_FOO=BAR 199s - remote: added 1 changesets with 1 changes to 1 files 199s - $ cd .. 199s 199s ERROR: test-serve-hg.t#without-hggit output changed 199s ! 199s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-push-authors.t 199s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-push-authors.t.err 199s @@ -8,127 +8,9 @@ 199s Create a Mercurial repository 199s 199s $ hg clone repo.git hgrepo 199s - updating to branch default 199s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 199s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 199s + abort: repository repo.git not found 199s + [255] 199s $ cd hgrepo 199s + $TESTTMP.sh: 8: cd: can't cd to hgrepo 199s $ hg book master 199s - 199s -Configure an author map 199s - 199s - $ touch authors.txt 199s - $ cat >> $HGRCPATH < [git] 199s - > authors = $TESTTMP/authors.txt 199s - > EOF 199s - 199s -Create a commit user that maps to a fully valid user 199s - 199s - $ cat >> $TESTTMP/authors.txt < user1 = User no. 1 199s - > EOF 199s - $ touch alpha 199s - $ hg add alpha 199s - $ fn_hg_commit -m alpha -u user1 199s - 199s -And one that maps to an email address 199s - 199s - $ cat >> $TESTTMP/authors.txt < user2@example.com = user2 199s - > EOF 199s - $ touch beta 199s - $ hg add beta 199s - $ fn_hg_commit -m beta -u user2@example.com 199s - 199s -And one that maps to a "simple" user 199s - 199s - $ cat >> $TESTTMP/authors.txt < User #3 = user3@example.com 199s - > EOF 199s - $ touch gamma 199s - $ hg add gamma 199s - $ fn_hg_commit -m gamma -u "User #3 " 199s - 199s -And one that maps to nothing 199s - 199s - $ cat >> $TESTTMP/authors.txt < user4 = 199s - > EOF 199s - $ touch delta 199s - $ hg add delta 199s - $ fn_hg_commit -m delta -u user4 199s - 199s -And one that doesn't map 199s - 199s - $ touch epsilon 199s - $ hg add epsilon 199s - $ fn_hg_commit -m epsilon -u "User #5 " 199s - 199s -Check the test default 199s - 199s - $ touch zeta 199s - $ hg add zeta 199s - $ fn_hg_commit -m zeta 199s - 199s -Push it! 199s - 199s - $ hg push 199s - pushing to $TESTTMP/repo.git 199s - searching for changes 199s - adding objects 199s - remote: found 0 deltas to reuse 199s - added 6 commits with 6 trees and 1 blobs 199s - adding reference refs/heads/master 199s - 199s -Check the results: 199s - 199s - $ hg log --template='Commit: {gitnode}\nAuthor: {author}\n---\n' 199s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 199s - Author: test 199s - --- 199s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 199s - Author: User #5 199s - --- 199s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 199s - Author: user4 199s - --- 199s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 199s - Author: User #3 199s - --- 199s - Commit: eba936dd13172a2f17936785e3604845aed9170d 199s - Author: user2@example.com 199s - --- 199s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 199s - Author: user1 199s - --- 199s - $ cd ../repo.git 199s - $ cat $TESTTMP/authors.txt 199s - user1 = User no. 1 199s - user2@example.com = user2 199s - User #3 = user3@example.com 199s - user4 = 199s - $ git log --pretty='tformat:Commit: %H%nAuthor: %an <%ae>%nCommitter: %cn <%ce>%n---' 199s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 199s - Author: test 199s - Committer: test 199s - --- 199s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 199s - Author: User #5 199s - Committer: User #5 199s - --- 199s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 199s - Author: 199s - Committer: 199s - --- 199s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 199s - Author: user3@example.com 199s - Committer: user3@example.com 199s - --- 199s - Commit: eba936dd13172a2f17936785e3604845aed9170d 199s - Author: user2 199s - Committer: user2 199s - --- 199s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 199s - Author: User no. 1 199s - Committer: User no. 1 199s - --- 199s - $ cd .. 199s 199s ERROR: test-push-authors.t output changed 200s ! 200s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-push-to-head.t 200s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-push-to-head.t.err 200s @@ -14,65 +14,9 @@ 200s Clone it, and push back to master: 200s 200s $ hg clone gitrepo hgrepo 200s - importing 1 git commits 200s - new changesets ff7a2f2d8d70 (1 drafts) 200s - updating to bookmark master 200s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 200s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 200s + abort: repository gitrepo not found 200s + [255] 200s $ cd hgrepo 200s + $TESTTMP.sh: 18: cd: can't cd to hgrepo 200s $ echo beta > beta 200s - $ fn_hg_commit -A -m "add beta" 200s - 200s -The output is confusing, and this even more-so: 200s - 200s - $ hg push 200s - pushing to $TESTTMP/gitrepo 200s - searching for changes 200s - adding objects 200s - remote: found 0 deltas to reuse 200s - remote: error: refusing to update checked out branch: refs/heads/master 200s - remote: error: By default, updating the current branch in a non-bare repository 200s - remote: is denied, because it will make the index and work tree inconsistent 200s - remote: with what you pushed, and will require 'git reset --hard' to match 200s - remote: the work tree to HEAD. 200s - remote: 200s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 200s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 200s - remote: its current branch; however, this is not recommended unless you 200s - remote: arranged to update its work tree to match what you pushed in some 200s - remote: other way. 200s - remote: 200s - remote: To squelch this message and still keep the default behaviour, set 200s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 200s - added 1 commits with 1 trees and 1 blobs 200s - warning: failed to update refs/heads/master; branch is currently checked out 200s - 200s - $ hg push 200s - pushing to $TESTTMP/gitrepo 200s - searching for changes 200s - adding objects 200s - remote: found 0 deltas to reuse 200s - remote: error: refusing to update checked out branch: refs/heads/master 200s - remote: error: By default, updating the current branch in a non-bare repository 200s - remote: is denied, because it will make the index and work tree inconsistent 200s - remote: with what you pushed, and will require 'git reset --hard' to match 200s - remote: the work tree to HEAD. 200s - remote: 200s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 200s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 200s - remote: its current branch; however, this is not recommended unless you 200s - remote: arranged to update its work tree to match what you pushed in some 200s - remote: other way. 200s - remote: 200s - remote: To squelch this message and still keep the default behaviour, set 200s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 200s - added 1 commits with 1 trees and 1 blobs 200s - warning: failed to update refs/heads/master; branch is currently checked out 200s - 200s -Show that it really didn't get pushed: 200s - 200s - $ hg tags 200s - tip 1:47580592d3d6 200s - default/master 0:ff7a2f2d8d70 200s - $ cd ../gitrepo 200s - $ git log --all --oneline --decorate 200s - 7eeab2e (HEAD -> master) add alpha 200s 200s ERROR: test-push-to-head.t output changed 201s ! 201s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-orphan-tags.t 201s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-orphan-tags.t.err 201s @@ -61,17 +61,17 @@ 201s Create a Mercurial clone 201s 201s $ hg clone -U repo.git hgrepo 201s - importing 4 git commits 201s - new changesets b8e77484829b:387d03400596 (4 drafts) 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository repo.git not found 201s + [255] 201s $ hg outgoing -R hgrepo 201s - comparing with $TESTTMP/repo.git 201s - searching for changes 201s - no changes found 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo not found 201s + [255] 201s + $ hg push --debug -R hgrepo | grep -e reference -e found 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo not found 201s [1] 201s - $ hg push --debug -R hgrepo | grep -e reference -e found 201s - unchanged reference default::refs/heads/master => GIT:996e5084 201s - unchanged reference default::refs/tags/the_tag => GIT:e4338156 201s - no changes found 201s 201s Verify that we can push this tag, and that outgoing doesn't report 201s them (#358) 201s @@ -83,33 +83,5 @@ 201s To $TESTTMP/repo.git 201s - [deleted] the_tag 201s $ cd ../hgrepo 201s + $TESTTMP.sh: 72: cd: can't cd to ../hgrepo 201s $ hg outgoing 201s - comparing with $TESTTMP/repo.git 201s - searching for changes 201s - changeset: 2:7b35eb0afb3f 201s - tag: the_tag 201s - user: test 201s - date: Mon Jan 01 00:00:12 2007 +0000 201s - summary: add foo3 201s - 201s - $ hg push --debug 201s - pushing to $TESTTMP/repo.git 201s - finding unexported changesets 201s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 201s - searching for changes 201s - remote: counting objects: 5, done. 201s - 1 commits found 201s - list of commits: 201s - e12852326ef72772e9696b008ad6546b5266ff13 201s - adding objects 201s - remote: counting objects: 5, done. 201s - remote: found 0 deltas to reuse 201s - added 1 commits with 1 trees and 0 blobs 201s - unchanged reference default::refs/heads/master => GIT:996e5084 201s - adding reference default::refs/tags/the_tag => GIT:e4338156 201s - $ cd ../gitrepo 201s - $ git fetch 201s - From $TESTTMP/repo 201s - * [new tag] the_tag -> the_tag 201s - $ git tag -ln 201s - the_tag Tag message 201s 201s ERROR: test-orphan-tags.t output changed 206s ! 206s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-verify-fail.t 206s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-verify-fail.t.err 206s @@ -25,6 +25,7 @@ 206s $ cd .. 206s 206s $ hg init hgrepo 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s $ cd hgrepo 206s $ echo normalf > normalf 206s $ echo differentf2 > differentf 206s @@ -32,63 +33,93 @@ 206s $ echo exef > exef 206s $ ln -s foo linkf 206s $ hg add normalf differentf unexpectedf exef linkf 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s $ fn_hg_commit -m 'add files' 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s $ git clone --mirror ../gitrepo .hg/git 206s Cloning into bare repository '.hg/git'... 206s done. 206s $ echo "$(cd ../gitrepo && git rev-parse HEAD) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s $ hg gverify 206s - verifying rev 3f1601c3cf54 against git commit 039c1cd9fdda382c9d1e8ec85de6b5b59518ca80 206s - difference in: differentf 206s - file has different flags: exef (hg '', git 'x') 206s - file has different flags: linkf (hg 'l', git '') 206s - file found in git but not hg: missingf 206s - file found in hg but not git: unexpectedf 206s - [1] 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + hg: unknown command 'gverify' 206s + (did you mean verify?) 206s + [10] 206s 206s $ echo newf > newf 206s $ hg add newf 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s $ fn_hg_commit -m 'new hg commit' 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s $ hg gverify 206s - abort: no git commit found for rev 4e582b4eb862 206s - (if this is an octopus merge, verify against the last rev) 206s - [255] 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + hg: unknown command 'gverify' 206s + (did you mean verify?) 206s + [10] 206s 206s invalid git SHA 206s $ echo "ffffffffffffffffffffffffffffffffffffffff $(hg log -r . --template '{node}')" >> .hg/git-mapfile 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s $ hg gverify 206s - abort: git equivalent ffffffffffffffffffffffffffffffffffffffff for rev 4e582b4eb862 not found! 206s - [255] 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + hg: unknown command 'gverify' 206s + (did you mean verify?) 206s + [10] 206s 206s git SHA is not a commit 206s $ echo new2 >> newf 206s $ fn_hg_commit -m 'new hg commit 2' 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s this gets the tree pointed to by the commit at HEAD 206s $ echo "$(cd ../gitrepo && git show --format=%T HEAD | head -n 1) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s $ hg gverify 206s - abort: git equivalent f477b00e4a9907617f346a529cc0fe9ba5d6f6d3 for rev 5c2eb98af3e2 is not a commit! 206s - [255] 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + hg: unknown command 'gverify' 206s + (did you mean verify?) 206s + [10] 206s 206s corrupt git repository 206s 206s $ hg debug-remove-hggit-state 206s - clearing out the git cache data 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + hg: unknown command 'debug-remove-hggit-state' 206s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 206s + [10] 206s $ hg gexport 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + hg: unknown command 'gexport' 206s + (did you mean one of export, import?) 206s + [10] 206s $ mv .hg/git/objects/pack $TESTTMP/pack-old 206s $ for packfile in $TESTTMP/pack-old/*.pack 206s > do 206s > git --git-dir .hg/git unpack-objects < $packfile 206s > done 206s + $TESTTMP.sh: 78: cannot open $TESTTMP/pack-old/*.pack: No such file 206s + [2] 206s $ mv -f .hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 206s + mv: cannot stat '.hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e': No such file or directory 206s + [1] 206s $ hg gverify --fsck 206s - abort: git repository is corrupt! 206s - [255] 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + hg: unknown command 'gverify' 206s + (did you mean verify?) 206s + [10] 206s $ hg gverify 206s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is not a commit! 206s - [255] 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + hg: unknown command 'gverify' 206s + (did you mean verify?) 206s + [10] 206s $ chmod +w .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 206s + chmod: cannot access '.hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74': No such file or directory 206s + [1] 206s $ echo 42 > .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 206s + $TESTTMP.sh: 89: cannot create .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74: Directory nonexistent 206s + [2] 206s $ hg gverify 206s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is corrupt! 206s - (re-run with --traceback for details) 206s - [255] 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + hg: unknown command 'gverify' 206s + (did you mean verify?) 206s + [10] 206s 206s ERROR: test-verify-fail.t output changed 206s ! 206s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-push-missing-commit.t 206s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-push-missing-commit.t.err 206s @@ -22,75 +22,9 @@ 206s clone it and create a commit building on the git history 206s 206s $ hg clone -U repo.git hgrepo 206s - importing 1 git commits 206s - new changesets fb68c5a534ce (1 drafts) 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + abort: repository repo.git not found 206s + [255] 206s $ cd hgrepo 206s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 206s $ hg up -q master 206s - $ echo other > thefile 206s - $ fn_hg_commit -m 'change thefile' 206s - $ cd .. 206s - 206s -now remove the git commit from the cache repository used internally by 206s -hg-git — actually, changing `git.intree` is equivalent to this, and how 206s -a user noticed it in #376. 206s - 206s - $ rm -rf hgrepo/.hg/git 206s - 206s -what happens when we push it? 206s - 206s - $ hg -R hgrepo push 206s - pushing to $TESTTMP/repo.git 206s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 206s - abort: cannot push git commit 533d4e670a8b as it is not present locally 206s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 206s - [255] 206s - 206s -try to follow the hint: 206s - 206s -(and just to see that the warning is useful, try re-resetting first) 206s - 206s - $ rm -rf hgrepo/.hg/git hgrepo/.git 206s - $ hg -R hgrepo pull 206s - pulling from $TESTTMP/repo.git 206s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 206s - no changes found 206s - not updating diverged bookmark master 206s - $ hg -R hgrepo push 206s - pushing to $TESTTMP/repo.git 206s - searching for changes 206s - adding objects 206s - remote: found 0 deltas to reuse 206s - added 1 commits with 1 trees and 1 blobs 206s - updating reference refs/heads/master 206s - 206s -and as an extra test, what if we want to push a commit that's 206s -converted, but gone? 206s - 206s -simply pushing doesn't suffice: 206s - 206s - $ cd hgrepo 206s - $ rm -rf .hg/git 206s - $ hg push 206s - pushing to $TESTTMP/repo.git 206s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 206s - searching for changes 206s - no changes found 206s - [1] 206s - $ cd .. 206s - 206s -but we can't create another commit building on the git history, export 206s -it, and push: 206s - 206s - $ cd hgrepo 206s - $ echo not that > thefile 206s - $ fn_hg_commit -m 'change thefile again' 206s - $ hg gexport 206s - $ rm -rf .hg/git 206s - $ hg push 206s - pushing to $TESTTMP/repo.git 206s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 206s - searching for changes 206s - abort: cannot push git commit 61619410916a as it is not present locally 206s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 206s - [255] 206s - $ cd .. 206s 206s ERROR: test-push-missing-commit.t output changed 207s ! 207s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-hg-branch.t 207s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-hg-branch.t.err 207s @@ -12,82 +12,10 @@ 207s 207s $ cd .. 207s $ hg clone gitrepo hgrepo 207s - importing 1 git commits 207s - new changesets ff7a2f2d8d70 (1 drafts) 207s - updating to bookmark not-master 207s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + abort: repository gitrepo not found 207s + [255] 207s 207s $ cd hgrepo 207s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 207s $ hg co master 207s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 207s - (activating bookmark master) 207s - $ hg mv alpha beta 207s - $ fn_hg_commit -m 'rename alpha to beta' 207s - $ hg push 207s - pushing to $TESTTMP/gitrepo 207s - searching for changes 207s - adding objects 207s - remote: found 0 deltas to reuse 207s - added 1 commits with 1 trees and 0 blobs 207s - updating reference refs/heads/master 207s - 207s - $ hg branch gamma | grep -v 'permanent and global' 207s - marked working directory as branch gamma 207s - $ fn_hg_commit -m 'started branch gamma' 207s - $ hg push 207s - pushing to $TESTTMP/gitrepo 207s - searching for changes 207s - adding objects 207s - remote: found 0 deltas to reuse 207s - added 1 commits with 1 trees and 0 blobs 207s - updating reference refs/heads/master 207s - 207s - $ hg log --graph 207s - @ changeset: 2:400db38f4f64 207s - | branch: gamma 207s - | bookmark: master 207s - | tag: default/master 207s - | tag: tip 207s - | user: test 207s - | date: Mon Jan 01 00:00:12 2007 +0000 207s - | summary: started branch gamma 207s - | 207s - o changeset: 1:3baa67317a4d 207s - | user: test 207s - | date: Mon Jan 01 00:00:11 2007 +0000 207s - | summary: rename alpha to beta 207s - | 207s - o changeset: 0:ff7a2f2d8d70 207s - bookmark: not-master 207s - tag: default/not-master 207s - user: test 207s - date: Mon Jan 01 00:00:10 2007 +0000 207s - summary: add alpha 207s - 207s - 207s - $ cd .. 207s - $ hg clone -U gitrepo hgrepo2 207s - importing 3 git commits 207s - new changesets ff7a2f2d8d70:400db38f4f64 (3 drafts) 207s - $ hg -R hgrepo2 log --graph 207s - o changeset: 2:400db38f4f64 207s - | branch: gamma 207s - | bookmark: master 207s - | tag: default/master 207s - | tag: tip 207s - | user: test 207s - | date: Mon Jan 01 00:00:12 2007 +0000 207s - | summary: started branch gamma 207s - | 207s - o changeset: 1:3baa67317a4d 207s - | user: test 207s - | date: Mon Jan 01 00:00:11 2007 +0000 207s - | summary: rename alpha to beta 207s - | 207s - o changeset: 0:ff7a2f2d8d70 207s - bookmark: not-master 207s - tag: default/not-master 207s - user: test 207s - date: Mon Jan 01 00:00:10 2007 +0000 207s - summary: add alpha 207s - 207s 207s ERROR: test-hg-branch.t output changed 208s ! 208s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-pull-after-strip.t 208s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-pull-after-strip.t.err 208s @@ -15,82 +15,9 @@ 208s 208s $ cd .. 208s $ hg clone -U gitrepo hgrepo 208s - importing 2 git commits 208s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s + abort: repository gitrepo not found 208s + [255] 208s $ cd hgrepo 208s + $TESTTMP.sh: 26: cd: can't cd to hgrepo 208s $ hg up master 208s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 208s - (activating bookmark master) 208s - $ hg log --graph 208s - @ changeset: 1:7fe02317c63d 208s - | bookmark: master 208s - | tag: default/master 208s - | tag: thetag 208s - | tag: tip 208s - | user: test 208s - | date: Mon Jan 01 00:00:11 2007 +0000 208s - | summary: add beta 208s - | 208s - o changeset: 0:ff7a2f2d8d70 208s - user: test 208s - date: Mon Jan 01 00:00:10 2007 +0000 208s - summary: add alpha 208s - 208s - $ cd ../gitrepo 208s - $ echo beta line 2 >> beta 208s - $ git add beta 208s - $ fn_git_commit -m 'add to beta' 208s - 208s - $ cd .. 208s - $ cd hgrepo 208s - $ hg debugstrip --no-backup tip 208s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 208s - $ hg pull 208s - pulling from $TESTTMP/gitrepo 208s - importing 1 git commits 208s - abort: you appear to have run strip - please run hg git-cleanup 208s - [255] 208s - $ hg tags 208s - tip 0:ff7a2f2d8d70 208s - $ hg git-cleanup 208s - git commit map cleaned 208s - 208s -pull works after 'hg git-cleanup' 208s - 208s - $ hg pull 208s - pulling from $TESTTMP/gitrepo 208s - importing 2 git commits 208s - updating bookmark master 208s - new changesets 7fe02317c63d:cc1e605d90db (2 drafts) 208s - (run 'hg update' to get a working copy) 208s - $ hg log --graph 208s - o changeset: 2:cc1e605d90db 208s - | bookmark: master 208s - | tag: default/master 208s - | tag: tip 208s - | user: test 208s - | date: Mon Jan 01 00:00:12 2007 +0000 208s - | summary: add to beta 208s - | 208s - o changeset: 1:7fe02317c63d 208s - | tag: thetag 208s - | user: test 208s - | date: Mon Jan 01 00:00:11 2007 +0000 208s - | summary: add beta 208s - | 208s - @ changeset: 0:ff7a2f2d8d70 208s - user: test 208s - date: Mon Jan 01 00:00:10 2007 +0000 208s - summary: add alpha 208s - 208s - 208s - $ cd .. 208s - 208s -Check that we also remove bad refs: 208s - 208s - $ cd hgrepo 208s - $ echo e93b671cb24bff41779187edff99178e2597c2 > .hg/git/refs/tags/bad-tag 208s - $ hg git-cleanup 208s - git commit map cleaned 208s - $ test -e .hg/git/refs/tags/bad-tag 208s - [1] 208s 208s ERROR: test-pull-after-strip.t output changed 208s ! 208s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-gitignore.t 208s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-gitignore.t.err 208s @@ -2,12 +2,14 @@ 208s $ . "$TESTDIR/testutil" 208s 208s $ hg init repo 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s $ cd repo 208s 208s Create a commit that we can export later on 208s 208s $ touch thefile 208s $ hg commit -A -m "initial commit" 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s adding thefile 208s 208s We should only read .gitignore files in a hg-git repo (i.e. one with .hg/git 208s @@ -18,6 +20,7 @@ 208s $ touch bar 208s $ echo 'foo*' > .gitignore 208s $ hg status 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s ? .gitignore 208s ? bar 208s ? foo 208s @@ -27,103 +30,140 @@ 208s it's gone: 208s 208s $ hg gexport 208s - $ hg status 208s - ? .gitignore 208s - ? bar 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s + hg: unknown command 'gexport' 208s + (did you mean one of export, import?) 208s + [10] 208s + $ hg status 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s + ? .gitignore 208s + ? bar 208s + ? foo 208s + ? foobar 208s 208s $ echo '*bar' > .gitignore 208s $ hg status 208s - ? .gitignore 208s - ? foo 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s + ? .gitignore 208s + ? bar 208s + ? foo 208s + ? foobar 208s 208s $ mkdir dir 208s $ touch dir/foo 208s $ echo 'foo' > .gitignore 208s $ hg status 208s - ? .gitignore 208s - ? bar 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s + ? .gitignore 208s + ? bar 208s + ? dir/foo 208s + ? foo 208s ? foobar 208s 208s $ echo '/foo' > .gitignore 208s $ hg status 208s - ? .gitignore 208s - ? bar 208s - ? dir/foo 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s + ? .gitignore 208s + ? bar 208s + ? dir/foo 208s + ? foo 208s ? foobar 208s 208s $ rm .gitignore 208s $ echo 'foo' > dir/.gitignore 208s $ hg status 208s - ? bar 208s - ? dir/.gitignore 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s + ? bar 208s + ? dir/.gitignore 208s + ? dir/foo 208s ? foo 208s ? foobar 208s 208s $ touch dir/bar 208s $ echo 'bar' > .gitignore 208s $ hg status 208s - ? .gitignore 208s - ? dir/.gitignore 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s + ? .gitignore 208s + ? bar 208s + ? dir/.gitignore 208s + ? dir/bar 208s + ? dir/foo 208s ? foo 208s ? foobar 208s 208s $ echo '/bar' > .gitignore 208s $ hg status 208s - ? .gitignore 208s - ? dir/.gitignore 208s - ? dir/bar 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s + ? .gitignore 208s + ? bar 208s + ? dir/.gitignore 208s + ? dir/bar 208s + ? dir/foo 208s ? foo 208s ? foobar 208s 208s $ echo 'foo*' > .gitignore 208s $ echo '!*bar' >> .gitignore 208s $ hg status 208s - .gitignore: unsupported ignore pattern '!*bar' 208s - ? .gitignore 208s - ? bar 208s - ? dir/.gitignore 208s - ? dir/bar 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s + ? .gitignore 208s + ? bar 208s + ? dir/.gitignore 208s + ? dir/bar 208s + ? dir/foo 208s + ? foo 208s + ? foobar 208s 208s $ echo '.hg/' > .gitignore 208s $ hg status 208s - ? .gitignore 208s - ? bar 208s - ? dir/.gitignore 208s - ? dir/bar 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s + ? .gitignore 208s + ? bar 208s + ? dir/.gitignore 208s + ? dir/bar 208s + ? dir/foo 208s ? foo 208s ? foobar 208s 208s $ echo 'dir/.hg/' > .gitignore 208s $ hg status 208s - ? .gitignore 208s - ? bar 208s - ? dir/.gitignore 208s - ? dir/bar 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s + ? .gitignore 208s + ? bar 208s + ? dir/.gitignore 208s + ? dir/bar 208s + ? dir/foo 208s ? foo 208s ? foobar 208s 208s $ echo '.hg/foo' > .gitignore 208s $ hg status 208s - ? .gitignore 208s - ? bar 208s - ? dir/.gitignore 208s - ? dir/bar 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s + ? .gitignore 208s + ? bar 208s + ? dir/.gitignore 208s + ? dir/bar 208s + ? dir/foo 208s ? foo 208s ? foobar 208s 208s $ touch foo.hg 208s $ echo 'foo.hg' > .gitignore 208s $ hg status 208s - ? .gitignore 208s - ? bar 208s - ? dir/.gitignore 208s - ? dir/bar 208s - ? foo 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s + ? .gitignore 208s + ? bar 208s + ? dir/.gitignore 208s + ? dir/bar 208s + ? dir/foo 208s + ? foo 208s + ? foo.hg 208s ? foobar 208s $ rm foo.hg 208s 208s $ touch .hgignore 208s $ hg status 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s ? .gitignore 208s ? .hgignore 208s ? bar 208s @@ -137,6 +177,7 @@ 208s $ echo 'foo.*$(?> .hgignore 208s $ echo 'dir/foo' >> .hgignore 208s $ hg status 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s ? .gitignore 208s ? .hgignore 208s ? bar 208s @@ -145,14 +186,18 @@ 208s ? foobar 208s 208s $ hg add .gitignore 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s $ hg commit -m "add and commit .gitignore" 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s $ rm .gitignore 208s $ rm .hgignore 208s $ hg status 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s ! .gitignore 208s ? bar 208s ? dir/.gitignore 208s ? dir/bar 208s + ? dir/foo 208s ? foo 208s ? foobar 208s 208s @@ -164,6 +209,7 @@ 208s > foo( 208s > EOF 208s $ hg status --config ui.ignore=$TESTTMP/invalidhgignore 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s abort: $TESTTMP/invalidhgignore: invalid pattern (relre): foo( 208s [255] 208s 208s @@ -172,5 +218,6 @@ 208s > foo( 208s > EOF 208s $ hg status 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s abort: $TESTTMP/repo/.hgignore: invalid pattern (relre): foo( 208s [255] 208s 208s ERROR: test-gitignore.t output changed 208s ! 208s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-subrepos-syntax.t 208s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-subrepos-syntax.t.err 208s @@ -38,54 +38,9 @@ 208s $ cd .. 208s 208s $ hg clone -U repo.git hgrepo 208s - importing 3 git commits 208s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 208s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 208s + abort: repository repo.git not found 208s + [255] 208s $ cd hgrepo 208s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 208s $ hg up master 208s - Cloning into '$TESTTMP/hgrepo/subrepo1'... 208s - done. 208s - Cloning into '$TESTTMP/hgrepo/xyz/subrepo2'... 208s - done. 208s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 208s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 208s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 208s - (activating bookmark master) 208s - $ cat >> .hgsub < # this is a comment 208s - > [subpaths] 208s - > flaf = blyf 208s - > EOF 208s - $ fn_hg_commit -m 'add comment & subsection' 208s - $ hg push 208s - pushing to $TESTTMP/repo.git 208s - searching for changes 208s - adding objects 208s - remote: found 0 deltas to reuse 208s - added 1 commits with 1 trees and 0 blobs 208s - updating reference refs/heads/master 208s - $ cd .. 208s - 208s - $ cd gitrepo 208s - $ git pull --ff-only 208s - From $TESTTMP/repo 208s - 89c22d7..106b34e master -> origin/master 208s - Updating 89c22d7..106b34e 208s - Fast-forward 208s - $ cat .gitmodules 208s - [submodule "subrepo1"] 208s - path = subrepo1 208s - url = ../gitsubrepo 208s - [submodule "xyz/subrepo2"] 208s - path = xyz/subrepo2 208s - url = ../gitsubrepo 208s - $ cd .. 208s - 208s -We broke bidirectionality: 208s - 208s - $ hg clone -U repo.git hgrepo2 208s - importing 4 git commits 208s - new changesets e532b2bfda10:cbf584fe001b (4 drafts) 208s - $ hg id -r tip hgrepo 208s - c58a542b18bc default/master/tip master 208s - $ hg id -r tip hgrepo2 208s - cbf584fe001b default/master/tip master 208s 208s ERROR: test-subrepos-syntax.t output changed 209s ! 209s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-merge.t 209s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-merge.t.err 209s @@ -30,60 +30,11 @@ 209s $ git init -q --bare repo.git 209s 209s $ hg clone gitrepo hgrepo 209s - importing 4 git commits 209s - new changesets ff7a2f2d8d70:89ca4a68d6b9 (4 drafts) 209s - updating to bookmark master 209s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + abort: repository gitrepo not found 209s + [255] 209s $ cd hgrepo 209s + $TESTTMP.sh: 40: cd: can't cd to hgrepo 209s 209s clear the cache to be sure it is regenerated correctly 209s $ hg debug-remove-hggit-state 209s - clearing out the git cache data 209s - $ hg push ../repo.git 209s - pushing to ../repo.git 209s - searching for changes 209s - adding objects 209s - remote: found 0 deltas to reuse 209s - added 4 commits with 4 trees and 3 blobs 209s - adding reference refs/heads/beta 209s - adding reference refs/heads/master 209s - 209s - $ cd .. 209s -git log in repo pushed from hg 209s - $ git --git-dir=repo.git log --pretty=medium master | sed 's/\.\.\.//g' 209s - commit 5806851511aaf3bfe813ae3a86c5027165fa9b96 209s - Merge: e5023f9 9497a4e 209s - Author: test 209s - Date: Mon Jan 1 00:00:12 2007 +0000 209s - 209s - Merge branch 'beta' 209s - 209s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 209s - Author: test 209s - Date: Mon Jan 1 00:00:12 2007 +0000 209s - 209s - add gamma 209s - 209s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 209s - Author: test 209s - Date: Mon Jan 1 00:00:11 2007 +0000 209s - 209s - add beta 209s - 209s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 209s - Author: test 209s - Date: Mon Jan 1 00:00:10 2007 +0000 209s - 209s - add alpha 209s - $ git --git-dir=repo.git log --pretty=medium beta | sed 's/\.\.\.//g' 209s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 209s - Author: test 209s - Date: Mon Jan 1 00:00:11 2007 +0000 209s - 209s - add beta 209s - 209s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 209s - Author: test 209s - Date: Mon Jan 1 00:00:10 2007 +0000 209s - 209s - add alpha 209s 209s ERROR: test-merge.t output changed 210s ! 210s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-hg-tags.t 210s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-hg-tags.t.err 210s @@ -16,69 +16,10 @@ 210s 210s $ cd .. 210s $ hg clone -U repo.git hgrepo 210s - importing 1 git commits 210s - new changesets ff7a2f2d8d70 (1 drafts) 210s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 210s + abort: repository repo.git not found 210s + [255] 210s 210s $ cd hgrepo 210s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 210s $ hg co master 210s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 210s - (activating bookmark master) 210s - $ fn_hg_tag alpha 210s - $ hg push 210s - pushing to $TESTTMP/repo.git 210s - searching for changes 210s - adding objects 210s - remote: found 0 deltas to reuse 210s - added 1 commits with 1 trees and 1 blobs 210s - updating reference refs/heads/master 210s - adding reference refs/tags/alpha 210s - 210s - $ hg log --graph 210s - @ changeset: 1:e8b150f84560 210s - | bookmark: master 210s - | tag: default/master 210s - | tag: tip 210s - | user: test 210s - | date: Mon Jan 01 00:00:11 2007 +0000 210s - | summary: Added tag alpha for changeset ff7a2f2d8d70 210s - | 210s - o changeset: 0:ff7a2f2d8d70 210s - tag: alpha 210s - user: test 210s - date: Mon Jan 01 00:00:10 2007 +0000 210s - summary: add alpha 210s - 210s - 210s - $ cd .. 210s - $ cd gitrepo 210s -git should have the tag alpha 210s - $ git fetch origin 210s - From $TESTTMP/repo 210s - 7eeab2e..bbae830 master -> origin/master 210s - * [new tag] alpha -> alpha 210s - $ cd .. 210s - 210s - $ hg clone repo.git hgrepo2 210s - importing 2 git commits 210s - new changesets ff7a2f2d8d70:e8b150f84560 (2 drafts) 210s - updating to bookmark master 210s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 210s - $ hg -R hgrepo2 log --graph 210s - @ changeset: 1:e8b150f84560 210s - | bookmark: master 210s - | tag: default/master 210s - | tag: tip 210s - | user: test 210s - | date: Mon Jan 01 00:00:11 2007 +0000 210s - | summary: Added tag alpha for changeset ff7a2f2d8d70 210s - | 210s - o changeset: 0:ff7a2f2d8d70 210s - tag: alpha 210s - user: test 210s - date: Mon Jan 01 00:00:10 2007 +0000 210s - summary: add alpha 210s - 210s - 210s -the tag should be in .hgtags 210s - $ cat hgrepo2/.hgtags 210s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alpha 210s 210s ERROR: test-hg-tags.t output changed 210s ! 210s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-multiple-remotes.t 210s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-multiple-remotes.t.err 210s @@ -14,6 +14,7 @@ 210s $ git clone --bare --quiet gitrepo repo.git 210s 210s $ hg init hgrepo 210s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 210s $ cd hgrepo 210s $ cat > .hg/hgrc < [paths] 210s @@ -26,52 +27,28 @@ 210s > EOF 210s 210s $ hg pull 210s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 210s pulling from $TESTTMP/gitrepo 210s - importing 1 git commits 210s - adding bookmark master 210s - adding bookmark not-master 210s - new changesets ff7a2f2d8d70 (1 drafts) 210s - (run 'hg update' to get a working copy) 210s - pulling from $TESTTMP/repo.git 210s - no changes found 210s + abort: repository $TESTTMP/gitrepo not found 210s + [255] 210s $ hg tags 210s - tip 0:ff7a2f2d8d70 210s - git/not-master 0:ff7a2f2d8d70 210s - git/master 0:ff7a2f2d8d70 210s - bare/not-master 0:ff7a2f2d8d70 210s - bare/master 0:ff7a2f2d8d70 210s - also-git/not-master 0:ff7a2f2d8d70 210s - also-git/master 0:ff7a2f2d8d70 210s - also-bare/not-master 0:ff7a2f2d8d70 210s - also-bare/master 0:ff7a2f2d8d70 210s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 210s + tip -1:000000000000 210s 210s $ hg up master 210s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 210s - (activating bookmark master) 210s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 210s + abort: unknown revision 'master' 210s + [10] 210s $ echo beta > beta 210s $ fn_hg_commit -A -m "add beta" 210s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 210s $ hg push 210s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 210s pushing to $TESTTMP/gitrepo 210s - searching for changes 210s - adding objects 210s - remote: found 0 deltas to reuse 210s - added 1 commits with 1 trees and 1 blobs 210s - updating reference refs/heads/master 210s - pushing to $TESTTMP/repo.git 210s - searching for changes 210s - adding objects 210s - remote: found 0 deltas to reuse 210s - added 1 commits with 1 trees and 1 blobs 210s - updating reference refs/heads/master 210s + abort: repository $TESTTMP/gitrepo not found 210s + [255] 210s 210s $ hg tags 210s - tip 1:47580592d3d6 210s - git/master 1:47580592d3d6 210s - bare/master 1:47580592d3d6 210s - also-git/master 1:47580592d3d6 210s - also-bare/master 1:47580592d3d6 210s - git/not-master 0:ff7a2f2d8d70 210s - bare/not-master 0:ff7a2f2d8d70 210s - also-git/not-master 0:ff7a2f2d8d70 210s - also-bare/not-master 0:ff7a2f2d8d70 210s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 210s + tip 0:59e1f63242de 210s 210s 210s ERROR: test-multiple-remotes.t output changed 210s ! 210s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-push-detached.t 210s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-push-detached.t.err 210s @@ -40,37 +40,9 @@ 210s in this case continues to work. 210s 210s $ hg clone gitrepo hgrepo 210s - importing 1 git commits 210s - new changesets ff7a2f2d8d70 (1 drafts) 210s - updating to bookmark master 210s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 210s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 210s + abort: repository gitrepo not found 210s + [255] 210s $ cd hgrepo 210s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 210s $ echo beta > beta 210s - $ hg add beta 210s - $ fn_hg_commit -m "add beta" 210s - 210s -Pushing that changeset, with phases, publishes the detached HEAD. 210s -Whether this should happen is debatable, but it's a side effect from 210s -the fact that pushing to the remote HEAD, with HEAD being the usual 210s -symref, should publish it. 210s - 210s - $ hg push -v --config hggit.usephases=yes 210s - pushing to $TESTTMP/gitrepo 210s - finding unexported changesets 210s - exporting 1 changesets 210s - converting revision 47580592d3d6492421a1e6cebc5c2d701a2e858b 210s - packing 3 loose objects... 210s - searching for changes 210s - remote: counting objects: 5, done. 210s - 1 commits found 210s - adding objects 210s - remote: counting objects: 5, done. 210s - remote: found 0 deltas to reuse 210s - added 1 commits with 1 trees and 1 blobs 210s - updating reference default::refs/heads/master => GIT:0f378ab6 210s - publishing remote HEAD 210s - $ hg phase 'all()' 210s - 0: public 210s - 1: draft 210s - $ cd .. 210s - 210s 210s ERROR: test-push-detached.t output changed 211s ! 211s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-hg-clone.t 211s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-hg-clone.t.err 211s @@ -11,88 +11,17 @@ 211s $ cd .. 211s 211s $ hg clone -U gitrepo hgrepo 211s - importing 1 git commits 211s - new changesets ff7a2f2d8d70 (1 drafts) 211s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 211s + abort: repository gitrepo not found 211s + [255] 211s 211s By default, the Git state isn't preserved across a copying/linking 211s clone 211s 211s $ hg clone -U hgrepo otherhgrepo 211s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 211s + abort: repository hgrepo not found 211s + [255] 211s $ cd otherhgrepo 211s + $TESTTMP.sh: 22: cd: can't cd to otherhgrepo 211s $ find .hg -name 'git*' | sort 211s - $ hg tags -v 211s - tip 0:ff7a2f2d8d70 211s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 211s - $ cd .. 211s - $ rm -r otherhgrepo 211s - 211s -Nor using a pull clone 211s - 211s - $ hg clone -U --pull hgrepo otherhgrepo 211s - requesting all changes 211s - adding changesets 211s - adding manifests 211s - adding file changes 211s - added 1 changesets with 1 changes to 1 files 211s - new changesets ff7a2f2d8d70 211s - $ cd otherhgrepo 211s - $ find .hg -name 'git*' | sort 211s - $ hg tags -v 211s - tip 0:ff7a2f2d8d70 211s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 211s - $ cd .. 211s - $ rm -r otherhgrepo 211s - 211s -But we can enable it! 211s - 211s - $ cat >> $HGRCPATH < [experimental] 211s - > hg-git-serve = yes 211s - > EOF 211s - 211s -Check transferring between Mercurial repositories using a 211s -copying/linking clone 211s - 211s - $ hg clone -U hgrepo otherhgrepo 211s - $ cd otherhgrepo 211s - $ find .hg -name 'git*' | sort 211s - $ hg tags -q 211s - tip 211s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 211s - $ cd .. 211s - 211s -Checking using a pull clone 211s - 211s - $ rm -rf otherhgrepo 211s - $ hg clone -U --pull hgrepo otherhgrepo 211s - requesting all changes 211s - adding changesets 211s - adding manifests 211s - adding file changes 211s - added 1 changesets with 1 changes to 1 files 211s - new changesets ff7a2f2d8d70 211s - $ cd otherhgrepo 211s - $ hg tags -q 211s - tip 211s - alpha 211s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 211s - 0:ff7a2f2d8d70 7eeab2ea75ec 211s - $ cd .. 211s - 211s -Can we repopulate the state from a Mercurial repository? 211s - 211s - $ cd otherhgrepo 211s - $ hg debug-remove-hggit-state 211s - clearing out the git cache data 211s - $ hg log -qr 'fromgit()' 211s - $ hg tags 211s - tip 0:ff7a2f2d8d70 211s - $ hg pull 211s - pulling from $TESTTMP/hgrepo 211s - searching for changes 211s - no changes found 211s - $ hg log -qr 'fromgit()' 211s - $ hg tags 211s - tip 0:ff7a2f2d8d70 211s - 211s -Sadly, no. 211s 211s ERROR: test-hg-clone.t output changed 211s ! 211s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-serve-git.t 211s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-serve-git.t.err 211s @@ -33,28 +33,14 @@ 211s Make sure that clone over the old git protocol doesn't break 211s 211s $ hg clone -U git://localhost:$HGPORT/test copy 2>&1 211s - \r (no-eol) (esc) 211s - Counting objects 1/6 [=====> ]\r (no-eol) (esc) 211s - Counting objects 2/6 [===========> ]\r (no-eol) (esc) 211s - Counting objects 3/6 [=================> ]\r (no-eol) (esc) 212s - Counting objects 4/6 [=======================> ]\r (no-eol) (esc) 212s - Counting objects 5/6 [=============================> ]\r (no-eol) (esc) 212s - Counting objects 6/6 [===================================>]\r (no-eol) (esc) 212s - \r (no-eol) (esc) 212s - \r (no-eol) (esc) 212s - Compressing objects 1/3 [==========> ]\r (no-eol) (esc) 212s - Compressing objects 2/3 [=====================> ]\r (no-eol) (esc) 212s - Compressing objects 3/3 [================================>]\r (no-eol) (esc) 212s - \r (no-eol) (esc) 212s - \r (no-eol) (esc) 212s - importing commits 1/2 b23744d34f97 [======> ]\r (no-eol) (esc) 212s - importing commits 2/2 3af9773036a9 [=============>]\r (no-eol) (esc) 212s - \r (no-eol) (esc) 212s - importing 2 git commits 212s - new changesets c4d188f6e13d:221dd250e933 212s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 212s + abort: repository git://localhost:$HGPORT/test not found 212s + [255] 212s $ hg log -T 'HG:{node|short} GIT:{gitnode|short}\n' -R copy 212s - HG:221dd250e933 GIT:3af9773036a9 212s - HG:c4d188f6e13d GIT:b23744d34f97 212s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 212s + abort: repository copy not found 212s + [255] 212s $ hg tags -v -R copy 212s - tip 1:221dd250e933 212s - default/master 1:221dd250e933 git-remote 212s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 212s + abort: repository copy not found 212s + [255] 212s 212s ERROR: test-serve-git.t output changed 215s ! 215s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-convergedmerge.t 215s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-convergedmerge.t.err 215s @@ -2,29 +2,39 @@ 215s $ . "$TESTDIR/testutil" 215s 215s $ hg init hgrepo1 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ cd hgrepo1 215s $ echo A > afile 215s $ hg add afile 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ hg ci -m "origin" 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s 215s $ echo B > afile 215s $ hg ci -m "A->B" 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s 215s $ echo C > afile 215s $ hg ci -m "B->C" 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s 215s $ hg up -r0 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 215s $ echo C > afile 215s $ hg ci -m "A->C" 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s created new head 215s 215s $ hg merge -r2 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 215s (branch merge, don't forget to commit) 215s $ hg ci -m "merge" 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s 215s $ hg log --graph --style compact | sed 's/\[.*\]//g' 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s @ 4:3,2 eaa21d002113 1970-01-01 00:00 +0000 test 215s |\ merge 215s | | 215s @@ -47,36 +57,23 @@ 215s 215s $ cd hgrepo1 215s $ hg bookmark -r4 master 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ hg push -r master ../repo.git 215s - pushing to ../repo.git 215s - searching for changes 215s - adding objects 215s - remote: found 0 deltas to reuse 215s - added 5 commits with 3 trees and 3 blobs 215s - adding reference refs/heads/master 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + abort: repository ../repo.git does not exist 215s + [255] 215s $ cd .. 215s 215s $ hg clone repo.git hgrepo2 215s - importing 5 git commits 215s - new changesets 5d1a6b64f9d0:eaa21d002113 (5 drafts) 215s - updating to bookmark master 215s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + abort: repository repo.git not found 215s + [255] 215s expect the same revision ids as above 215s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 215s - @ 4:1,3 eaa21d002113 1970-01-01 00:00 +0000 test 215s - |\ merge 215s - | | 215s - | o 3 0dbe4ac1a758 1970-01-01 00:00 +0000 test 215s - | | B->C 215s - | | 215s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 215s - | | A->B 215s - | | 215s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 215s - |/ A->C 215s - | 215s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 215s - origin 215s - 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + abort: repository hgrepo2 not found 215s $ hg -R hgrepo2 gverify 215s - verifying rev eaa21d002113 against git commit fb8c9e2afe5418cfff337eeed79fad5dd58826f0 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + hg: unknown command 'gverify' 215s + (did you mean verify?) 215s + [10] 215s 215s ERROR: test-convergedmerge.t output changed 216s ! 216s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-conflict-2.t 216s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-conflict-2.t.err 216s @@ -2,30 +2,40 @@ 216s $ . "$TESTDIR/testutil" 216s 216s $ hg init hgrepo1 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s $ cd hgrepo1 216s $ echo A > afile 216s $ hg add afile 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s $ hg ci -m "origin" 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s 216s $ echo B > afile 216s $ hg ci -m "A->B" 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s 216s $ hg up -r0 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 216s $ echo C > afile 216s $ hg ci -m "A->C" 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s created new head 216s 216s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s warning: conflicts.* (re) 216s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 216s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 216s resolve using second parent 216s $ echo B > afile 216s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s $ hg ci -m "merge to B" 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s 216s $ hg log --graph --style compact | sed 's/\[.*\]//g' 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s @ 3:2,1 120385945d08 1970-01-01 00:00 +0000 test 216s |\ merge to B 216s | | 216s @@ -45,31 +55,18 @@ 216s 216s $ cd hgrepo1 216s $ hg bookmark -r tip master 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s $ hg push -r master ../repo.git 216s - pushing to ../repo.git 216s - searching for changes 216s - adding objects 216s - remote: found 0 deltas to reuse 216s - added 4 commits with 3 trees and 3 blobs 216s - adding reference refs/heads/master 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s + abort: repository ../repo.git does not exist 216s + [255] 216s $ cd .. 216s 216s $ hg clone repo.git hgrepo2 216s - importing 4 git commits 216s - new changesets 5d1a6b64f9d0:120385945d08 (4 drafts) 216s - updating to bookmark master 216s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s + abort: repository repo.git not found 216s + [255] 216s expect the same revision ids as above 216s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 216s - @ 3:1,2 120385945d08 1970-01-01 00:00 +0000 test 216s - |\ merge to B 216s - | | 216s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 216s - | | A->B 216s - | | 216s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 216s - |/ A->C 216s - | 216s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 216s - origin 216s - 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s + abort: repository hgrepo2 not found 216s 216s ERROR: test-conflict-2.t output changed 216s ! 216s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-phases-draft.t 216s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-phases-draft.t.err 216s @@ -12,73 +12,10 @@ 216s cloning without hggit.usephases does not publish local changesets 216s $ cd .. 216s $ hg clone gitrepo hgrepo | grep -v '^updating' 216s - importing 1 git commits 216s - new changesets ff7a2f2d8d70 (1 drafts) 216s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s + abort: repository gitrepo not found 216s + [1] 216s 216s $ cd hgrepo 216s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 216s $ hg phase -r master 216s - 0: draft 216s - 216s -pulling advances the draft phase, though 216s - 216s - $ hg phase -fs 0 216s - $ hg pull 216s - pulling from $TESTTMP/gitrepo 216s - no changes found 216s - $ hg phase tip 216s - 0: draft 216s - 216s -even if we don't have a name? 216s - 216s - $ hg phase -fs 0 216s - $ mv .hg/hgrc .hg/hgrc.bak 216s - $ hg pull ../gitrepo 216s - pulling from ../gitrepo 216s - no changes found 216s - $ hg phase tip 216s - 0: draft 216s - $ mv .hg/hgrc.bak .hg/hgrc 216s - $ cd .. 216s - 216s - 216s -pulling without hggit.usephases does not publish local changesets 216s - $ cd gitrepo 216s - $ git checkout -q master 216s - $ echo beta > beta 216s - $ git add beta 216s - $ fn_git_commit -m 'add beta' 216s - $ cd .. 216s - 216s - $ cd hgrepo 216s - $ hg pull 216s - pulling from $TESTTMP/gitrepo 216s - importing 1 git commits 216s - updating bookmark master 216s - new changesets 7fe02317c63d (1 drafts) 216s - (run 'hg update' to get a working copy) 216s - $ hg phase -r master 216s - 1: draft 216s - 216s -pulling with git.public does not publish local changesets 216s - $ hg --config git.public=master pull 216s - pulling from $TESTTMP/gitrepo 216s - no changes found 216s - $ hg phase -r master 216s - 1: draft 216s - 216s -pushing without hggit.usephases does not publish local changesets 216s - $ hg update master 216s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 216s - $ echo gamma > gamma 216s - $ hg add gamma 216s - $ hg commit -m 'gamma' 216s - $ hg push 216s - pushing to $TESTTMP/gitrepo 216s - searching for changes 216s - adding objects 216s - remote: found 0 deltas to reuse 216s - added 1 commits with 1 trees and 1 blobs 216s - updating reference refs/heads/master 216s - $ hg phase -r master 216s - 2: draft 216s 216s ERROR: test-phases-draft.t output changed 218s ! 218s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-subrepos-push.t 218s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-subrepos-push.t.err 218s @@ -5,10 +5,13 @@ 218s Initialized empty Git repository in $TESTTMP/repo.git/ 218s 218s $ hg init hgsubrepo 218s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 218s $ cd hgsubrepo 218s $ echo thefile > thefile 218s $ hg add thefile 218s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 218s $ fn_hg_commit -m 'add thefile' 218s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 218s $ cd .. 218s 218s $ git init gitsubrepo 218s @@ -20,59 +23,9 @@ 218s $ cd .. 218s 218s $ hg clone repo.git hgrepo 218s - updating to branch default 218s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 218s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 218s + abort: repository repo.git not found 218s + [255] 218s $ cd hgrepo 218s + $TESTTMP.sh: 32: cd: can't cd to hgrepo 218s $ hg book master 218s - $ echo alpha > alpha 218s - $ hg add alpha 218s - $ fn_hg_commit -m 'add alpha' 218s - $ touch .hgsub 218s - $ hg add .hgsub 218s - $ fn_hg_commit -m "add .hgsub" 218s - $ hg clone -q ../hgsubrepo hg 218s - $ echo "hg = ../hgsubrepo" >> .hgsub 218s - $ fn_hg_commit -m 'add hg subrepo' 218s - $ git clone --quiet ../gitsubrepo git 218s - $ echo "git = [git]../gitsubrepo" >> .hgsub 218s - $ fn_hg_commit -m 'add git subrepo' 218s - $ hg push 218s - pushing to $TESTTMP/repo.git 218s - pushing subrepo hg to $TESTTMP/hgsubrepo 218s - searching for changes 218s - no changes found 218s - searching for changes 218s - adding objects 218s - remote: found 0 deltas to reuse 218s - added 4 commits with 2 trees and 2 blobs 218s - adding reference refs/heads/master 218s - $ cat .hgsub 218s - hg = ../hgsubrepo 218s - git = [git]../gitsubrepo 218s - $ cat .hgsubstate 218s - aaae5224095dca7403147c0e20cbac1f450b0e95 git 218s - df643c539c7541d48eacc76745581e00cbaf3d45 hg 218s - $ cd .. 218s - 218s -Now clone it. Note that no Mercurial state persists: 218s - 218s - $ git clone --recurse-submodules repo.git gitrepo 218s - Cloning into 'gitrepo'... 218s - done. 218s - Submodule 'git' ($TESTTMP/gitsubrepo) registered for path 'git' 218s - Cloning into '$TESTTMP/gitrepo/git'... 218s - done. 218s - Submodule path 'git': checked out 'aaae5224095dca7403147c0e20cbac1f450b0e95' 218s - $ cd gitrepo 218s - $ ls -A 218s - .git 218s - .gitmodules 218s - alpha 218s - git 218s - $ cat .gitmodules 218s - [submodule "git"] 218s - path = git 218s - url = ../gitsubrepo 218s - $ ls -A git 218s - .git 218s - thefile 218s 218s ERROR: test-subrepos-push.t output changed 220s ! 220s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-conflict-1.t 220s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-conflict-1.t.err 220s @@ -2,30 +2,40 @@ 220s $ . "$TESTDIR/testutil" 220s 220s $ hg init hgrepo1 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s $ cd hgrepo1 220s $ echo A > afile 220s $ hg add afile 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s $ hg ci -m "origin" 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s 220s $ echo B > afile 220s $ hg ci -m "A->B" 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s 220s $ hg up -r0 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 220s $ echo C > afile 220s $ hg ci -m "A->C" 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s created new head 220s 220s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s warning: conflicts.* (re) 220s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 220s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 220s resolve using first parent 220s $ echo C > afile 220s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s $ hg ci -m "merge to C" 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s 220s $ hg log --graph --style compact | sed 's/\[.*\]//g' 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s @ 3:2,1 6c53bc0f062f 1970-01-01 00:00 +0000 test 220s |\ merge to C 220s | | 220s @@ -45,31 +55,18 @@ 220s 220s $ cd hgrepo1 220s $ hg bookmark -r tip master 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s $ hg push -r master ../repo.git 220s - pushing to ../repo.git 220s - searching for changes 220s - adding objects 220s - remote: found 0 deltas to reuse 220s - added 4 commits with 3 trees and 3 blobs 220s - adding reference refs/heads/master 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + abort: repository ../repo.git does not exist 220s + [255] 220s $ cd .. 220s 220s $ hg clone repo.git hgrepo2 220s - importing 4 git commits 220s - new changesets 5d1a6b64f9d0:6c53bc0f062f (4 drafts) 220s - updating to bookmark master 220s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + abort: repository repo.git not found 220s + [255] 220s expect the same revision ids as above 220s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 220s - @ 3:1,2 6c53bc0f062f 1970-01-01 00:00 +0000 test 220s - |\ merge to C 220s - | | 220s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 220s - | | A->B 220s - | | 220s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 220s - |/ A->C 220s - | 220s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 220s - origin 220s - 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + abort: repository hgrepo2 not found 220s 220s ERROR: test-conflict-1.t output changed 220s ! 220s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-pull-after-obsolete.t 220s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-pull-after-obsolete.t.err 220s @@ -20,52 +20,9 @@ 220s 220s $ cd .. 220s $ hg clone -U gitrepo hgrepo 220s - importing 2 git commits 220s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + abort: repository gitrepo not found 220s + [255] 220s $ cd hgrepo 220s + $TESTTMP.sh: 31: cd: can't cd to hgrepo 220s $ hg up master 220s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 220s - (activating bookmark master) 220s - $ hg log --graph 220s - @ changeset: 1:7fe02317c63d 220s - | bookmark: master 220s - | tag: default/master 220s - | tag: thetag 220s - | tag: tip 220s - | user: test 220s - | date: Mon Jan 01 00:00:11 2007 +0000 220s - | summary: add beta 220s - | 220s - o changeset: 0:ff7a2f2d8d70 220s - user: test 220s - date: Mon Jan 01 00:00:10 2007 +0000 220s - summary: add alpha 220s - 220s - $ cd ../gitrepo 220s - $ echo beta line 2 >> beta 220s - $ git add beta 220s - $ fn_git_commit -m 'add to beta' 220s - 220s -Create a commit, obsolete it, and pull, to ensure that we can pull if 220s -the tipmost commit is hidden. 220s - 220s - $ cd ../hgrepo 220s - $ hg bookmark --inactive 220s - $ echo gamma > gamma 220s - $ hg add gamma 220s - $ fn_hg_commit -m 'add gamma' 220s - $ hg up master 220s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 220s - (activating bookmark master) 220s - $ hg log -T '{rev}:{node} {desc}\n' -r tip 220s - 2:4090a1266584bc1a47ce562e9349b1e0f1b44611 add gamma 220s - $ hg debugobsolete 4090a1266584bc1a47ce562e9349b1e0f1b44611 220s - 1 new obsolescence markers 220s - obsoleted 1 changesets 220s - 220s - $ hg pull 220s - pulling from $TESTTMP/gitrepo 220s - importing 1 git commits 220s - updating bookmark master 220s - new changesets cc1e605d90db (1 drafts) 220s - (run 'hg update' to get a working copy) 220s 220s ERROR: test-pull-after-obsolete.t output changed 220s ! 220s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-git-clone.t 220s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-git-clone.t.err 220s @@ -14,30 +14,24 @@ 220s $ cd .. 220s 220s $ hg clone gitrepo hgrepo 220s - importing 2 git commits 220s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 220s - updating to bookmark master 220s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + abort: repository gitrepo not found 220s + [255] 220s $ hg -R hgrepo log --graph 220s - @ changeset: 1:7fe02317c63d 220s - | bookmark: master 220s - | tag: default/master 220s - | tag: tip 220s - | user: test 220s - | date: Mon Jan 01 00:00:11 2007 +0000 220s - | summary: add beta 220s - | 220s - o changeset: 0:ff7a2f2d8d70 220s - user: test 220s - date: Mon Jan 01 00:00:10 2007 +0000 220s - summary: add alpha 220s - 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + abort: repository hgrepo not found 220s + [255] 220s 220s we should have some bookmarks 220s $ hg -R hgrepo book 220s - * master 1:7fe02317c63d 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + abort: repository hgrepo not found 220s + [255] 220s $ hg -R hgrepo gverify 220s - verifying rev 7fe02317c63d against git commit 9497a4ee62e16ee641860d7677cdb2589ea15554 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + hg: unknown command 'gverify' 220s + (did you mean verify?) 220s + [10] 220s 220s test for ssh vulnerability 220s 220s @@ -47,16 +41,18 @@ 220s > EOF 220s 220s $ hg clone -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 220s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 220s [255] 220s $ hg clone -q 'git+ssh://%2DoProxyCommand=rm${IFS}nonexistent/path' 220s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 220s [255] 220s $ hg clone -q 'git+ssh://fakehost|rm${IFS}nonexistent/path' 220s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 220s - abort: git remote error: The remote server unexpectedly closed the connection. 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 220s [255] 220s $ hg clone -q 'git+ssh://fakehost%7Crm${IFS}nonexistent/path' 220s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 220s - abort: git remote error: The remote server unexpectedly closed the connection. 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 220s [255] 220s 220s ERROR: test-git-clone.t output changed 222s ! 222s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-git-gpg.t 222s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-git-gpg.t.err 222s @@ -55,23 +55,10 @@ 222s Hg clone it 222s 222s $ hg clone gitrepo hgrepo 222s - importing 2 git commits 222s - new changesets ab60c5e55bd6:[0-9a-f]{12,12} \(2 drafts\) (re) 222s - updating to bookmark signed 222s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 222s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 222s + abort: repository gitrepo not found 222s + [255] 222s 222s $ cd hgrepo 222s + $TESTTMP.sh: 46: cd: can't cd to hgrepo 222s $ hg push ../gitrepo2 -B signed 222s - pushing to ../gitrepo2 222s - searching for changes 222s - adding objects 222s - remote: found 0 deltas to reuse 222s - added 1 commits with 1 trees and 0 blobs 222s - adding reference refs/heads/signed 222s - $ cd .. 222s - 222s -Verify the commit 222s - 222s - $ cd gitrepo2 222s - $ git show --show-signature signed | grep "Good signature from" 222s - gpg: Good signature from "hgtest" [ultimate] 222s 222s ERROR: test-git-gpg.t output changed 222s ! 222s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-push-phases.t 222s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-push-phases.t.err 222s @@ -9,68 +9,13 @@ 222s $ git init -q --bare repo.git 222s 222s $ hg clone repo.git hgrepo 222s - updating to branch default 222s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 222s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 222s + abort: repository repo.git not found 222s + [255] 222s 222s $ cd hgrepo 222s + $TESTTMP.sh: 13: cd: can't cd to hgrepo 222s 222s Create two commits, one secret: 222s 222s $ touch alpha 222s - $ hg add alpha 222s - $ fn_hg_commit -m alpha 222s - $ hg book -r . master 222s - $ touch beta 222s - $ hg add beta 222s - $ fn_hg_commit --secret -m beta 222s - $ hg book -r . secret 222s - $ hg push 222s - pushing to $TESTTMP/repo.git 222s - warning: not exporting secret bookmark 'secret' 222s - searching for changes 222s - adding objects 222s - remote: found 0 deltas to reuse 222s - added 1 commits with 1 trees and 1 blobs 222s - adding reference refs/heads/master 222s - $ cd .. 222s - $ hg -R hgrepo log --graph --template phases 222s - @ changeset: 1:62966756ea96 222s - | bookmark: secret 222s - | tag: tip 222s - | phase: secret 222s - | user: test 222s - | date: Mon Jan 01 00:00:11 2007 +0000 222s - | summary: beta 222s - | 222s - o changeset: 0:d4b83afc35d1 222s - bookmark: master 222s - tag: default/master 222s - phase: public 222s - user: test 222s - date: Mon Jan 01 00:00:10 2007 +0000 222s - summary: alpha 222s - 222s - 222s -What happens when we push the secret? 222s - 222s - $ hg -R hgrepo push -B secret 222s - pushing to $TESTTMP/repo.git 222s - warning: not exporting secret bookmark 'secret' 222s - searching for changes 222s - abort: revision 62966756ea96 cannot be pushed since it doesn't have a bookmark 222s - [255] 222s - 222s -Only one changeset was pushed: 222s - 222s - $ GIT_DIR=repo.git git log --graph --all --decorate=short 222s - * commit 2cc4e3d19551e459a0dd606f4cf890de571c7d33 (HEAD -> master) 222s - Author: test 222s - Date: Mon Jan 1 00:00:10 2007 +0000 222s - 222s - alpha 222s - 222s -And this published the remote head: 222s - 222s - $ hg -R hgrepo phase 'all()' 222s - 0: public 222s - 1: secret 222s 222s ERROR: test-push-phases.t output changed 223s ! 223s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-keywords.t 223s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-keywords.t.err 223s @@ -21,29 +21,9 @@ 223s $ cd .. 223s 223s $ hg clone gitrepo hgrepo 223s - importing 3 git commits 223s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 223s - updating to bookmark master 223s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s + abort: repository gitrepo not found 223s + [255] 223s $ cd hgrepo 223s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 223s $ echo gamma > gamma 223s - $ hg add gamma 223s - $ hg commit -m 'add gamma' 223s - 223s - $ hg log --template "{rev} {node} {node|short} {gitnode} {gitnode|short}\n" 223s - 3 965bf7d08d3ac847dd8eb9e72ee0bf547d1a65d9 965bf7d08d3a 223s - 2 8e3f0ecc9aefd4ea2fdf8e2d5299cac548762a1c 8e3f0ecc9aef 7e2a5465ff4e3b992c429bb87a392620a0ac97b7 7e2a5465ff4e 223s - 1 7fe02317c63d9ee324d4b5df7c9296085162da1b 7fe02317c63d 9497a4ee62e16ee641860d7677cdb2589ea15554 9497a4ee62e1 223s - 0 ff7a2f2d8d7099694ae1e8b03838d40575bebb63 ff7a2f2d8d70 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 7eeab2ea75ec 223s - $ hg log --template "fromgit {rev}\n" --rev "fromgit()" 223s - fromgit 0 223s - fromgit 1 223s - fromgit 2 223s - $ hg log --template "gitnode_existsA {rev}\n" --rev "gitnode(9497a4ee62e16ee641860d7677cdb2589ea15554)" 223s - gitnode_existsA 1 223s - $ hg log --template "gitnode_existsB {rev}\n" --rev "gitnode(7eeab)" 223s - gitnode_existsB 0 223s - $ hg log --rev "gitnode(7e)" 223s - abort: git-mapfile@7e: ambiguous identifier!? (re) 223s - [50] 223s - $ hg log --template "gitnode_notexists {rev}\n" --rev "gitnode(1234567890ab)" 223s 223s ERROR: test-keywords.t output changed 224s ! 224s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-subrepos-delete.t 224s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-subrepos-delete.t.err 224s @@ -52,22 +52,9 @@ 224s And there should be nothing in Mercurial either: 224s 224s $ hg clone -U repo.git hgrepo 224s - importing 3 git commits 224s - new changesets e532b2bfda10:cc611d35fb62 (3 drafts) 224s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 224s + abort: repository repo.git not found 224s + [255] 224s $ cd hgrepo 224s + $TESTTMP.sh: 50: cd: can't cd to hgrepo 224s $ hg log --graph --template info 224s - o 224s - | commit: 2:cc611d35fb62 delete subrepo 224s - | added: 224s - | removed: .hgsub .hgsubstate 224s - o 224s - | commit: 1:8d549bcc5179 add subrepo 224s - | added: .hgsub .hgsubstate 224s - | removed: 224s - o 224s - commit: 0:e532b2bfda10 add alpha 224s - added: alpha 224s - removed: 224s - $ hg manifest -r tip 224s - alpha 224s - $ cd .. 224s 224s ERROR: test-subrepos-delete.t output changed 225s ! 225s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-tree-decomposition.t 225s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-tree-decomposition.t.err 225s @@ -24,45 +24,9 @@ 225s $ git init -q --bare repo.git 225s 225s $ hg clone gitrepo hgrepo 225s - importing 3 git commits 225s - new changesets d4d3d2417141:541f27994b81 (3 drafts) 225s - updating to bookmark master 225s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + abort: repository gitrepo not found 225s + [255] 225s $ cd hgrepo 225s + $TESTTMP.sh: 38: cd: can't cd to hgrepo 225s $ hg log --template 'adds: {file_adds}\ndels: {file_dels}\n' 225s - adds: d1 225s - dels: d1/f1 225s - adds: d2/f2 225s - dels: d1/f2 225s - adds: d1/f1 d1/f2 225s - dels: 225s - 225s - $ hg debug-remove-hggit-state 225s - clearing out the git cache data 225s - $ hg push ../repo.git 225s - pushing to ../repo.git 225s - searching for changes 225s - adding objects 225s - remote: found 0 deltas to reuse 225s - added 3 commits with 6 trees and 3 blobs 225s - adding reference refs/heads/master 225s - $ cd .. 225s - 225s - $ git --git-dir=repo.git log --pretty=medium 225s - commit 6e0dbd8cd92ed4823c69cb48d8a2b81f904e6e69 225s - Author: test 225s - Date: Mon Jan 1 00:00:12 2007 +0000 225s - 225s - replace a dir with a file 225s - 225s - commit a1874d5cd0b1549ed729e36f0da4a93ed36259ee 225s - Author: test 225s - Date: Mon Jan 1 00:00:11 2007 +0000 225s - 225s - rename 225s - 225s - commit 102c17a5deda49db3f10ec5573f9378867098b7c 225s - Author: test 225s - Date: Mon Jan 1 00:00:10 2007 +0000 225s - 225s - initial 225s 225s ERROR: test-tree-decomposition.t output changed 225s ! 225s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-annotate.t 225s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-annotate.t.err 225s @@ -10,6 +10,7 @@ 225s init 225s 225s $ hg init repo 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s $ cd repo 225s 225s commit 225s @@ -19,37 +20,48 @@ 225s > a 225s > EOF 225s $ hg add a 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s $ fn_hg_commit -m 1 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s $ cat < a 225s > a 225s > a 225s > a 225s > EOF 225s $ fn_hg_commit -m 2 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s $ cat < a 225s > a 225s > b 225s > a 225s > EOF 225s $ fn_hg_commit -m 3 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s 225s annotate multiple files 225s 225s $ hg annotate a 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s 0: a 225s 2: b 225s 1: a 225s 225s $ hg annotate --skip 1 a 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s 0: a 225s 2: b 225s 0* a 225s 225s $ hg gexport 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + hg: unknown command 'gexport' 225s + (did you mean one of export, import?) 225s + [10] 225s $ hg log -T '{rev}:{node} {gitnode}\n' 225s - 2:beb139b96eec386addc02d48db524b7646ef1605 19388575d02e71e917e7013aa854d4a21c509819 225s - 1:a9a255d66663f9216bdcf8dda69211d7280f7278 debec50a14cc4830584dd4fa1507c51cce1c098f 225s - 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 88f28c06a1ede9a70852ab1bf9818150fabaaaa9 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + 2:beb139b96eec386addc02d48db524b7646ef1605 225s + 1:a9a255d66663f9216bdcf8dda69211d7280f7278 225s + 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 225s 225s $ cat < .git-blame-ignore-revs 225s > # this is a comment, and the next line should be ignored 225s @@ -59,39 +71,43 @@ 225s > EOF 225s 225s $ hg annotate a 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s 0: a 225s 2: b 225s 1: a 225s $ hg annotate a \ 225s > --debug \ 225s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 225s - skipping debec50a14cc -> a9a255d66663 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s 0: a 225s 2: b 225s - 0* a 225s + 1: a 225s $ hg add .git-blame-ignore-revs 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s $ hg annotate a \ 225s > --debug \ 225s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 225s - skipping debec50a14cc -> a9a255d66663 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s 0: a 225s 2: b 225s - 0* a 225s + 1: a 225s $ hg annotate a \ 225s > --config git.blame.ignoreRevsFile=badfile 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s 0: a 225s 2: b 225s 1: a 225s $ hg annotate -T'{lines % "{rev}:{node|short} {gitnode|short}: {line}"}' a 225s - 0:8d4731bd0f4a 88f28c06a1ed: a 225s - 2:beb139b96eec 19388575d02e: b 225s - 1:a9a255d66663 debec50a14cc: a 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + 0:8d4731bd0f4a : a 225s + 2:beb139b96eec : b 225s + 1:a9a255d66663 : a 225s 225s $ cd .. 225s $ hg -R repo annotate repo/a \ 225s > --debug \ 225s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 225s - skipping debec50a14cc -> a9a255d66663 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s 0: a 225s 2: b 225s - 0* a 225s + 1: a 225s 225s ERROR: test-annotate.t output changed 225s ! 225s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-subrepos-drop.t 225s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-subrepos-drop.t.err 225s @@ -17,52 +17,9 @@ 225s Create a Mercurial repository with a .gitmodules file: 225s 225s $ hg clone repo.git hgrepo 225s - updating to branch default 225s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + abort: repository repo.git not found 225s + [255] 225s $ cd hgrepo 225s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 225s $ hg book master 225s - $ touch this 225s - $ fn_hg_commit -A -m 'add this' 225s - $ cat > .gitmodules < [submodule "subrepo"] 225s - > path = subrepo 225s - > url = ../gitsubrepo 225s - > EOF 225s - $ hg add .gitmodules 225s - $ fn_hg_commit -m "add .gitmodules file" 225s - $ cd .. 225s - 225s -What happens if we push that to Git? 225s - 225s - $ hg -R hgrepo push 225s - pushing to $TESTTMP/repo.git 225s - warning: ignoring modifications to '.gitmodules' file; please use '.hgsub' instead 225s - searching for changes 225s - adding objects 225s - remote: found 0 deltas to reuse 225s - added 2 commits with 1 trees and 1 blobs 225s - adding reference refs/heads/master 225s - 225s -But we don't get a warning if we don't touch .gitmodules: 225s - 225s - $ cd hgrepo 225s - $ touch that 225s - $ fn_hg_commit -A -m 'add that' 225s - $ hg push 225s - pushing to $TESTTMP/repo.git 225s - searching for changes 225s - adding objects 225s - remote: found 0 deltas to reuse 225s - added 1 commits with 1 trees and 0 blobs 225s - updating reference refs/heads/master 225s - $ cd .. 225s - 225s -Check that it didn't silenty come through, or something: 225s - 225s - $ git clone repo.git gitrepo 225s - Cloning into 'gitrepo'... 225s - done. 225s - $ ls -A gitrepo 225s - .git 225s - that 225s - this 225s 225s ERROR: test-subrepos-drop.t output changed 226s ! 226s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-push-anonymous.t 226s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-push-anonymous.t.err 226s @@ -25,28 +25,9 @@ 226s Clone it, deactivate the bookmark, add a commit, and push! 226s 226s $ hg clone -U gitrepo hgrepo 226s - importing 1 git commits 226s - new changesets ff7a2f2d8d70 (1 drafts) 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s + abort: repository gitrepo not found 226s + [255] 226s $ cd hgrepo 226s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 226s $ hg up tip 226s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 226s - $ echo beta > beta 226s - $ hg add beta 226s - $ fn_hg_commit -m "add beta" 226s - 226s -Pushing that changeset should print a helpful message: 226s - 226s - $ hg push 226s - pushing to $TESTTMP/gitrepo 226s - searching for changes 226s - no changes found (ignoring 1 changesets without bookmarks or tags) 226s - [1] 226s - 226s -But what about untagged, but secret changesets? 226s - 226s - $ hg phase -fs tip 226s - $ hg push 226s - pushing to $TESTTMP/gitrepo 226s - searching for changes 226s - no changes found 226s - [1] 226s 226s ERROR: test-push-anonymous.t output changed 226s ! 226s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-empty-working-tree.t 226s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-empty-working-tree.t.err 226s @@ -10,29 +10,9 @@ 226s $ git init -q --bare repo.git 226s 226s $ hg clone gitrepo hgrepo 226s - importing 1 git commits 226s - new changesets 01708ca54a8f (1 drafts) 226s - updating to bookmark master 226s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s + abort: repository gitrepo not found 226s + [255] 226s $ cd hgrepo 226s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 226s $ hg log -r tip --template 'files: {files}\n' 226s - files: 226s - $ hg gverify 226s - verifying rev 01708ca54a8f against git commit 678256865a8c85ae925bf834369264193c88f8de 226s - 226s - $ hg debug-remove-hggit-state 226s - clearing out the git cache data 226s - $ hg push ../repo.git 226s - pushing to ../repo.git 226s - searching for changes 226s - adding objects 226s - remote: found 0 deltas to reuse 226s - added 1 commits with 1 trees and 0 blobs 226s - adding reference refs/heads/master 226s - $ cd .. 226s - $ git --git-dir=repo.git log --pretty=medium 226s - commit 678256865a8c85ae925bf834369264193c88f8de 226s - Author: test 226s - Date: Mon Jan 1 00:00:00 2007 +0000 226s - 226s - empty 226s 226s ERROR: test-empty-working-tree.t output changed 228s ! 228s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-gitignore-permissions.t 228s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-gitignore-permissions.t.err 228s @@ -4,6 +4,7 @@ 228s $ . "$TESTDIR/testutil" 228s 228s $ hg init repo 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ cd repo 228s 228s $ if test `whoami` = root 228s @@ -16,8 +17,14 @@ 228s 228s $ touch thefile 228s $ hg add thefile 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ hg ci -A -m commit 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ hg gexport 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + hg: unknown command 'gexport' 228s + (did you mean one of export, import?) 228s + [10] 228s 228s Create a file that we can ignore 228s 228s @@ -33,9 +40,10 @@ 228s 228s $ echo nothingtoseehere > .gitignore 228s $ hg status 228s - not_readable: Permission denied 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s not_readable: Permission denied 228s ? .gitignore 228s + ? nothingtoseehere 228s 228s And notice that we really did ignore it! 228s 228s 228s ERROR: test-gitignore-permissions.t output changed 229s ! 229s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-gitignore-share.t 229s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-gitignore-share.t.err 229s @@ -9,6 +9,7 @@ 229s $ git init --quiet --bare repo.git 229s 229s $ hg init hgrepo 229s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 229s $ cd hgrepo 229s $ cat > .hg/hgrc < [paths] 229s @@ -16,26 +17,31 @@ 229s > EOF 229s $ echo ignored > .gitignore 229s $ hg add .gitignore 229s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 229s $ hg ci -m ignore 229s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 229s $ hg book master 229s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 229s $ hg push 229s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 229s pushing to $TESTTMP/repo.git 229s - searching for changes 229s - adding objects 229s - remote: found 0 deltas to reuse 229s - added 1 commits with 1 trees and 1 blobs 229s - adding reference refs/heads/master 229s + abort: repository $TESTTMP/repo.git not found 229s + [255] 229s $ cd .. 229s 229s We should also ignore the file in a shared repository: 229s 229s $ hg share hgrepo sharerepo 229s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 229s updating working directory 229s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 229s $ cd sharerepo 229s $ hg paths 229s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 229s default = $TESTTMP/repo.git 229s $ cat .gitignore 229s ignored 229s $ touch ignored 229s $ hg status 229s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 229s + ? ignored 229s 229s ERROR: test-gitignore-share.t output changed 229s ! 229s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-ambiguousprefix.t 229s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-ambiguousprefix.t.err 229s @@ -21,13 +21,11 @@ 229s $ cd .. 229s 229s $ hg clone gitrepo hgrepo 229s - importing 3 git commits 229s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 229s - updating to bookmark master 229s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 229s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 229s + abort: repository gitrepo not found 229s + [255] 229s 229s $ cd hgrepo 229s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 229s 229s $ hg log -r 'gitnode(7e)' 229s - abort: git-mapfile@7e: ambiguous identifier!? (re) 229s - [50] 229s 229s ERROR: test-ambiguousprefix.t output changed 231s ! 231s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-timezone.t 231s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-timezone.t.err 231s @@ -8,10 +8,13 @@ 231s $ . "$TESTDIR/testutil" 231s 231s $ hg init hgrepo 231s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 231s $ cd hgrepo 231s $ touch beta 231s $ hg add beta 231s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 231s $ fn_hg_commit -m "test commit" 231s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 231s $ cat >patch2 < # HG changeset patch 231s > # User J. User 231s @@ -28,5 +31,10 @@ 231s > +alpha 231s > EOF 231s $ hg import patch2 231s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 231s applying patch2 231s $ hg gexport 231s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 231s + hg: unknown command 'gexport' 231s + (did you mean one of export, import?) 231s + [10] 231s 231s ERROR: test-timezone.t output changed 232s ! 232s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-transplant.t 232s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-transplant.t.err 232s @@ -11,12 +11,20 @@ 232s > EOF 232s 232s $ hg init baserepo 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s $ cd baserepo 232s $ for c in A B C 232s > do 232s > echo $c > $c && hg add $c && fn_hg_commit -m $c 232s > done 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s $ hg clone -r 2 . ../otherrepo 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s adding changesets 232s adding manifests 232s adding file changes 232s @@ -26,6 +34,8 @@ 232s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 232s $ cd ../otherrepo 232s $ hg up 1 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 232s $ hg transplant -s ../baserepo tip 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s no changes found 232s 232s ERROR: test-transplant.t output changed 233s !s 233s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-url-parsing.py.out 233s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-url-parsing.py.err 233s @@ -1,46 +1,11 @@ 233s -% expect '/webjam/webjam.git' 233s -/webjam/webjam.git 233s -% expect 'github.com' 233s -github.com 233s -% expect '/webjam/webjam.git' 233s -/webjam/webjam.git 233s -% expect 'github.com' 233s -github.com 233s -% expect '19418' 233s -19418 233s -% expect 'webjam.git' 233s -webjam.git 233s -% expect 'git@heroku.com' 233s -git@heroku.com 233s -% expect '999' 233s -999 233s -% expect 'webjam/webjam.git' 233s -webjam/webjam.git 233s -% expect 'git@github.com' 233s -git@github.com 233s -% expect '42qu/vps.git' 233s -42qu/vps.git 233s -% expect 'git@github.com' 233s -git@github.com 233s -% expect '/webjam/webjam.git' 233s -/webjam/webjam.git 233s -% expect 'git@github.com' 233s -git@github.com 233s -% expect '/webjam/webjam.git' 233s -/webjam/webjam.git 233s -% expect 'git@github.com' 233s -git@github.com 233s -% expect '10022' 233s -10022 233s -% expect 'webjam.git' 233s -webjam.git 233s -% expect 'git@heroku.com' 233s -git@heroku.com 233s -% expect 'webjam.git' 233s -webjam.git 233s -% expect 'git@compatible.com' 233s -git@compatible.com 233s -% expect 'webjam.git' 233s -webjam.git 233s -% expect 'git@heroku.com' 233s -git@heroku.com 233s +Traceback (most recent call last): 233s + File "/tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-url-parsing.py", line 14, in 233s + from hggit.git_handler import GitHandler 233s + File "/usr/lib/python3/dist-packages/hggit/__init__.py", line 163, in 233s + from . import gitdirstate 233s + File "/usr/lib/python3/dist-packages/hggit/gitdirstate.py", line 19, in 233s + from . import gitrepo 233s + File "/usr/lib/python3/dist-packages/hggit/gitrepo.py", line 20, in 233s + class gitrepo(repository.peer): 233s + ^^^^^^^^^^^^^^^ 233s +AttributeError: module 'mercurial.interfaces.repository' has no attribute 'peer'. Did you mean: 'IPeer'? 233s 233s ERROR: test-url-parsing.py output changed 234s !. 234s --- /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-addbranchrevs.t 234s +++ /tmp/autopkgtest.tZFTgP/build.RJz/src/tests/test-addbranchrevs.t.err 234s @@ -7,14 +7,23 @@ 234s caused the pull to not update to the passed revision. 234s 234s $ hg init orig 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s $ cd orig 234s $ echo a > a; hg add a; hg ci -m a 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s $ hg branch foo -q 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s $ echo b > b; hg add b; hg ci -m b 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s 234s $ cd .. 234s $ hg clone orig clone -r 0 -q 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s $ cd clone 234s $ hg pull -u -r 1 -q 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s $ hg id -n 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.tZFTgP/build.RJz/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s 1 234s 234s ERROR: test-addbranchrevs.t output changed 234s ! 234s Skipped test-check-black.t: missing feature: the black formatter for python (>= 22.3) 234s Skipped test-check-commit.t: missing feature: running tests from repository 234s Skipped test-check-pyflakes.t: missing feature: Pyflakes python linter 234s Skipped test-check-pylint.t: missing feature: Pylint python linter 234s Skipped test-encoding.t: blacklisted 234s Skipped test-gitignore-windows.t: missing feature: Windows 234s Skipped test-incoming.t: blacklisted 234s Skipped test-serve-ci.t: skipped 234s Skipped test-serve-dulwich.t: blacklisted 234s Failed test-addbranchrevs.t: output changed 234s Failed test-ambiguousprefix.t: output changed and returned error code 1 234s Failed test-annotate.t: output changed 234s Failed test-bookmark-workflow.t: output changed and returned error code 1 234s Failed test-branch-bookmark-suffix.t#with-path: output changed and returned error code 1 234s Failed test-branch-bookmark-suffix.t#without-path: output changed and returned error code 1 234s Failed test-bundle.t: output changed and returned error code 1 234s Failed test-clone.t#draft: output changed 234s Failed test-clone.t#secret: output changed 234s Failed test-conflict-1.t: output changed 234s Failed test-conflict-2.t: output changed 234s Failed test-convergedmerge.t: output changed 234s Failed test-empty-working-tree.t: output changed and returned error code 1 234s Failed test-extra.t: output changed and returned error code 1 234s Failed test-file-removal.t: output changed and returned error code 1 234s Failed test-gc.t: output changed and returned error code 1 234s Failed test-git-clone.t: output changed 234s Failed test-git-gpg.t: output changed and returned error code 1 234s Failed test-git-submodules.t: output changed and returned error code 1 234s Failed test-git-tags.t#draft: output changed and returned error code 1 234s Failed test-git-tags.t#secret: output changed and returned error code 1 234s Failed test-git-workflow.t: output changed 234s Failed test-gitignore-permissions.t: output changed 234s Failed test-gitignore-share.t: output changed 234s Failed test-gitignore.t: output changed 234s Failed test-help.t: output changed 234s Failed test-hg-author.t: output changed and returned error code 1 234s Failed test-hg-branch.t: output changed and returned error code 1 234s Failed test-hg-clone.t: output changed and returned error code 1 234s Failed test-hg-tags.t: output changed and returned error code 1 234s Failed test-hook.t: output changed 234s Failed test-illegal-contents.t: output changed 234s Failed test-invalid-refs.t: output changed and returned error code 1 234s Failed test-keywords.t: output changed and returned error code 1 234s Failed test-merge.t: output changed and returned error code 1 234s Failed test-multiple-remotes.t: output changed 234s Failed test-octopus.t: output changed and returned error code 1 234s Failed test-orphan-tags.t: output changed and returned error code 1 234s Failed test-outgoing.t: output changed and returned error code 1 234s Failed test-phases-draft.t: output changed and returned error code 1 234s Failed test-phases-public.t#publish-defaults: output changed and returned error code 1 234s Failed test-phases-public.t#publish-specific: output changed and returned error code 1 234s Failed test-phases-remote.t: output changed and returned error code 1 234s Failed test-pull-after-obsolete.t: output changed and returned error code 1 234s Failed test-pull-after-rebase.t: output changed and returned error code 1 234s Failed test-pull-after-strip.t: output changed and returned error code 1 234s Failed test-pull.t#draft: output changed 234s Failed test-pull.t#secret: output changed 234s Failed test-push-anonymous.t: output changed and returned error code 1 234s Failed test-push-authors.t: output changed and returned error code 1 234s Failed test-push-detached.t: output changed and returned error code 1 234s Failed test-push-missing-commit.t: output changed and returned error code 1 234s Failed test-push-phases.t: output changed and returned error code 1 234s Failed test-push-r.t: output changed 234s Failed test-push-to-head.t: output changed and returned error code 1 234s Failed test-push.t: output changed and returned error code 1 234s Failed test-renames.t: output changed and returned error code 1 234s Failed test-serve-git.t: output changed 234s Failed test-serve-hg-static.t: output changed 234s Failed test-serve-hg.t#with-hggit: output changed and returned error code 1 234s Failed test-serve-hg.t#without-hggit: output changed and returned error code 1 234s Failed test-subrepos-delete.t: output changed and returned error code 1 234s Failed test-subrepos-drop.t: output changed and returned error code 1 234s Failed test-subrepos-push.t: output changed and returned error code 1 234s Failed test-subrepos-syntax.t: output changed and returned error code 1 234s Failed test-subrepos.t: output changed and returned error code 1 234s Failed test-timezone.t: output changed 234s Failed test-transactions.t: output changed 234s Failed test-transplant.t: output changed 234s Failed test-tree-decomposition.t: output changed and returned error code 1 234s Failed test-url-parsing.py: output changed and returned error code 1 234s Failed test-verify-fail.t: output changed 234s # Ran 73 tests, 9 skipped, 72 failed. 234s python hash seed: 4205065052 234s make: *** [Makefile:15: tests] Error 1 234s autopkgtest [07:19:11]: test testsuite: -----------------------] 235s autopkgtest [07:19:12]: test testsuite: - - - - - - - - - - results - - - - - - - - - - 235s testsuite FAIL non-zero exit status 2 236s autopkgtest [07:19:13]: test mercurial-git: preparing testbed 256s Creating nova instance adt-resolute-arm64-hg-git-20260210-065559-juju-7f2275-prod-proposed-migration-environment-20-34afd494-19e4-4f79-8645-a231d15a6900 from image adt/ubuntu-resolute-arm64-server-20260209.img (UUID 793037ca-75af-461b-82de-f8081300b2e3)... 344s autopkgtest [07:21:01]: testbed dpkg architecture: arm64 344s autopkgtest [07:21:01]: testbed apt version: 3.1.15 345s autopkgtest [07:21:02]: @@@@@@@@@@@@@@@@@@@@ test bed setup 345s autopkgtest [07:21:02]: testbed release detected to be: resolute 346s autopkgtest [07:21:03]: updating testbed package index (apt update) 346s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 346s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 346s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 346s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 346s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1727 kB] 348s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [178 kB] 348s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [31.1 kB] 348s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/main arm64 Packages [263 kB] 348s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main arm64 c-n-f Metadata [6288 B] 348s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/restricted arm64 c-n-f Metadata [120 B] 348s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/universe arm64 Packages [1769 kB] 350s Get:12 http://ftpmaster.internal/ubuntu resolute-proposed/universe arm64 c-n-f Metadata [31.3 kB] 350s Get:13 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse arm64 Packages [23.0 kB] 350s Get:14 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse arm64 c-n-f Metadata [688 B] 351s Fetched 4153 kB in 4s (1000 kB/s) 352s Reading package lists... 353s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 353s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 353s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 353s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 354s Reading package lists... 354s Reading package lists... 354s Building dependency tree... 354s Reading state information... 355s Calculating upgrade... 355s The following NEW packages will be installed: 355s gcc-16-base 355s The following packages will be upgraded: 355s cryptsetup-bin dracut-install iproute2 iptables libatomic1 libbrotli1 355s libcryptsetup12 libgcc-s1 libip4tc2 libip6tc2 libstdc++6 libxtables12 wget 355s 13 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. 355s Need to get 3779 kB of archives. 355s After this operation, 218 kB of additional disk space will be used. 355s Get:1 http://ftpmaster.internal/ubuntu resolute/main arm64 gcc-16-base arm64 16-20260208-1ubuntu1 [59.7 kB] 355s Get:2 http://ftpmaster.internal/ubuntu resolute/main arm64 libgcc-s1 arm64 16-20260208-1ubuntu1 [60.9 kB] 355s Get:3 http://ftpmaster.internal/ubuntu resolute/main arm64 iptables arm64 1.8.11-2ubuntu3 [386 kB] 355s Get:4 http://ftpmaster.internal/ubuntu resolute/main arm64 libip4tc2 arm64 1.8.11-2ubuntu3 [24.3 kB] 355s Get:5 http://ftpmaster.internal/ubuntu resolute/main arm64 libip6tc2 arm64 1.8.11-2ubuntu3 [24.7 kB] 355s Get:6 http://ftpmaster.internal/ubuntu resolute/main arm64 libxtables12 arm64 1.8.11-2ubuntu3 [36.7 kB] 355s Get:7 http://ftpmaster.internal/ubuntu resolute/main arm64 iproute2 arm64 6.18.0-1ubuntu1 [1171 kB] 356s Get:8 http://ftpmaster.internal/ubuntu resolute/main arm64 libatomic1 arm64 16-20260208-1ubuntu1 [11.1 kB] 356s Get:9 http://ftpmaster.internal/ubuntu resolute/main arm64 libcryptsetup12 arm64 2:2.8.0-1ubuntu3 [274 kB] 356s Get:10 http://ftpmaster.internal/ubuntu resolute/main arm64 libstdc++6 arm64 16-20260208-1ubuntu1 [768 kB] 357s Get:11 http://ftpmaster.internal/ubuntu resolute/main arm64 wget arm64 1.25.0-2ubuntu4 [344 kB] 357s Get:12 http://ftpmaster.internal/ubuntu resolute/main arm64 cryptsetup-bin arm64 2:2.8.0-1ubuntu3 [227 kB] 357s Get:13 http://ftpmaster.internal/ubuntu resolute/main arm64 dracut-install arm64 109-11ubuntu1 [45.3 kB] 357s Get:14 http://ftpmaster.internal/ubuntu resolute/main arm64 libbrotli1 arm64 1.2.0-3 [346 kB] 357s dpkg-preconfigure: unable to re-open stdin: No such file or directory 357s Fetched 3779 kB in 2s (1807 kB/s) 357s Selecting previously unselected package gcc-16-base:arm64. 358s (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 ... 136597 files and directories currently installed.) 358s Preparing to unpack .../gcc-16-base_16-20260208-1ubuntu1_arm64.deb ... 358s Unpacking gcc-16-base:arm64 (16-20260208-1ubuntu1) ... 358s Setting up gcc-16-base:arm64 (16-20260208-1ubuntu1) ... 358s (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 ... 136602 files and directories currently installed.) 358s Preparing to unpack .../libgcc-s1_16-20260208-1ubuntu1_arm64.deb ... 358s Unpacking libgcc-s1:arm64 (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 358s Setting up libgcc-s1:arm64 (16-20260208-1ubuntu1) ... 358s (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 ... 136602 files and directories currently installed.) 358s Preparing to unpack .../00-iptables_1.8.11-2ubuntu3_arm64.deb ... 358s Unpacking iptables (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 358s Preparing to unpack .../01-libip4tc2_1.8.11-2ubuntu3_arm64.deb ... 358s Unpacking libip4tc2:arm64 (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 358s Preparing to unpack .../02-libip6tc2_1.8.11-2ubuntu3_arm64.deb ... 358s Unpacking libip6tc2:arm64 (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 358s Preparing to unpack .../03-libxtables12_1.8.11-2ubuntu3_arm64.deb ... 358s Unpacking libxtables12:arm64 (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 359s Preparing to unpack .../04-iproute2_6.18.0-1ubuntu1_arm64.deb ... 359s Unpacking iproute2 (6.18.0-1ubuntu1) over (6.16.0-1ubuntu3) ... 359s Preparing to unpack .../05-libatomic1_16-20260208-1ubuntu1_arm64.deb ... 359s Unpacking libatomic1:arm64 (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 359s Preparing to unpack .../06-libcryptsetup12_2%3a2.8.0-1ubuntu3_arm64.deb ... 359s Unpacking libcryptsetup12:arm64 (2:2.8.0-1ubuntu3) over (2:2.8.0-1ubuntu2) ... 359s Preparing to unpack .../07-libstdc++6_16-20260208-1ubuntu1_arm64.deb ... 359s Unpacking libstdc++6:arm64 (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 359s Preparing to unpack .../08-wget_1.25.0-2ubuntu4_arm64.deb ... 359s Unpacking wget (1.25.0-2ubuntu4) over (1.25.0-2ubuntu3) ... 359s Preparing to unpack .../09-cryptsetup-bin_2%3a2.8.0-1ubuntu3_arm64.deb ... 359s Unpacking cryptsetup-bin (2:2.8.0-1ubuntu3) over (2:2.8.0-1ubuntu2) ... 359s Preparing to unpack .../10-dracut-install_109-11ubuntu1_arm64.deb ... 359s Unpacking dracut-install (109-11ubuntu1) over (109-9ubuntu1) ... 359s Preparing to unpack .../11-libbrotli1_1.2.0-3_arm64.deb ... 359s Unpacking libbrotli1:arm64 (1.2.0-3) over (1.1.0-2build6) ... 360s Setting up libip4tc2:arm64 (1.8.11-2ubuntu3) ... 360s Setting up wget (1.25.0-2ubuntu4) ... 360s Setting up libip6tc2:arm64 (1.8.11-2ubuntu3) ... 360s Setting up libbrotli1:arm64 (1.2.0-3) ... 360s Setting up libatomic1:arm64 (16-20260208-1ubuntu1) ... 360s Setting up libxtables12:arm64 (1.8.11-2ubuntu3) ... 360s Setting up dracut-install (109-11ubuntu1) ... 360s Setting up libcryptsetup12:arm64 (2:2.8.0-1ubuntu3) ... 360s Setting up libstdc++6:arm64 (16-20260208-1ubuntu1) ... 360s Setting up cryptsetup-bin (2:2.8.0-1ubuntu3) ... 360s Setting up iptables (1.8.11-2ubuntu3) ... 360s Setting up iproute2 (6.18.0-1ubuntu1) ... 360s Processing triggers for man-db (2.13.1-1build1) ... 361s Processing triggers for install-info (7.2-5) ... 361s Processing triggers for libc-bin (2.42-2ubuntu4) ... 361s autopkgtest [07:21:18]: upgrading testbed (apt dist-upgrade and autopurge) 361s Reading package lists... 362s Building dependency tree... 362s Reading state information... 362s Calculating upgrade... 362s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 363s Reading package lists... 363s Building dependency tree... 363s Reading state information... 363s Solving dependencies... 363s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 366s Reading package lists... 366s Building dependency tree... 366s Reading state information... 366s Solving dependencies... 367s The following NEW packages will be installed: 367s git git-man liberror-perl mercurial mercurial-common mercurial-git 367s python3-dulwich 367s 0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded. 367s Need to get 9155 kB of archives. 367s After this operation, 48.6 MB of additional disk space will be used. 367s Get:1 http://ftpmaster.internal/ubuntu resolute/main arm64 liberror-perl all 0.17030-1 [23.5 kB] 367s Get:2 http://ftpmaster.internal/ubuntu resolute/main arm64 git-man all 1:2.51.0-1ubuntu1 [1179 kB] 368s Get:3 http://ftpmaster.internal/ubuntu resolute/main arm64 git arm64 1:2.51.0-1ubuntu1 [4431 kB] 372s Get:4 http://ftpmaster.internal/ubuntu resolute-proposed/universe arm64 mercurial-common all 7.2-2 [2853 kB] 375s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe arm64 mercurial arm64 7.2-2 [425 kB] 376s Get:6 http://ftpmaster.internal/ubuntu resolute/universe arm64 python3-dulwich arm64 0.22.7-1 [183 kB] 376s Get:7 http://ftpmaster.internal/ubuntu resolute/universe arm64 mercurial-git all 1.2.0-1 [60.9 kB] 376s Fetched 9155 kB in 9s (1046 kB/s) 376s Selecting previously unselected package liberror-perl. 376s (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 ... 136605 files and directories currently installed.) 376s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 376s Unpacking liberror-perl (0.17030-1) ... 376s Selecting previously unselected package git-man. 376s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 376s Unpacking git-man (1:2.51.0-1ubuntu1) ... 376s Selecting previously unselected package git. 376s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_arm64.deb ... 376s Unpacking git (1:2.51.0-1ubuntu1) ... 376s Selecting previously unselected package mercurial-common. 376s Preparing to unpack .../3-mercurial-common_7.2-2_all.deb ... 376s Unpacking mercurial-common (7.2-2) ... 376s Selecting previously unselected package mercurial. 376s Preparing to unpack .../4-mercurial_7.2-2_arm64.deb ... 376s Unpacking mercurial (7.2-2) ... 377s Selecting previously unselected package python3-dulwich. 377s Preparing to unpack .../5-python3-dulwich_0.22.7-1_arm64.deb ... 377s Unpacking python3-dulwich (0.22.7-1) ... 377s Selecting previously unselected package mercurial-git. 377s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 377s Unpacking mercurial-git (1.2.0-1) ... 377s Setting up mercurial-common (7.2-2) ... 378s Setting up liberror-perl (0.17030-1) ... 378s Setting up python3-dulwich (0.22.7-1) ... 379s Setting up git-man (1:2.51.0-1ubuntu1) ... 379s Setting up mercurial (7.2-2) ... 379s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 379s Setting up mercurial-git (1.2.0-1) ... 379s mercurial-git extension is disabled by default. 379s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 379s Setting up git (1:2.51.0-1ubuntu1) ... 379s Processing triggers for man-db (2.13.1-1build1) ... 381s autopkgtest [07:21:38]: test mercurial-git: [----------------------- 382s Initialized empty Git repository in /tmp/autopkgtest.tZFTgP/build.RJz/src/git_server/ 382s Cloning into 'git_clone'... 382s warning: You appear to have cloned an empty repository. 382s done. 382s [master (root-commit) aa215fb] a 382s 1 file changed, 1 insertion(+) 382s create mode 100644 a 382s To /tmp/autopkgtest.tZFTgP/build.RJz/src/git_server 382s * [new branch] master -> master 382s Traceback (most recent call last): 382s File "/usr/lib/python3/dist-packages/mercurial/extensions.py", line 291, in _runextsetup 382s extsetup(ui) 382s ~~~~~~~~^^^^ 382s File "/usr/lib/python3/dist-packages/mercurial/exthelper.py", line 227, in finalextsetup 382s c(ui) 382s ~^^^^ 382s File "/usr/lib/python3/dist-packages/hggit/bundle.py", line 76, in install_server_support 382s @bundle2.parthandler(BUNDLEPART_MAP) 382s ^^^^^^^^^^^^^^^^^^^ 382s AttributeError: module 'mercurial.bundle2' has no attribute 'parthandler' 382s *** failed to set up extension hggit: module 'mercurial.bundle2' has no attribute 'parthandler' 382s abort: repository git_server not found 382s autopkgtest [07:21:39]: test mercurial-git: -----------------------] 383s autopkgtest [07:21:40]: test mercurial-git: - - - - - - - - - - results - - - - - - - - - - 383s mercurial-git FAIL non-zero exit status 253 383s autopkgtest [07:21:40]: test mercurial-git: - - - - - - - - - - stderr - - - - - - - - - - 383s Traceback (most recent call last): 383s File "/usr/lib/python3/dist-packages/mercurial/extensions.py", line 291, in _runextsetup 383s extsetup(ui) 383s ~~~~~~~~^^^^ 383s File "/usr/lib/python3/dist-packages/mercurial/exthelper.py", line 227, in finalextsetup 383s c(ui) 383s ~^^^^ 383s File "/usr/lib/python3/dist-packages/hggit/bundle.py", line 76, in install_server_support 383s @bundle2.parthandler(BUNDLEPART_MAP) 383s ^^^^^^^^^^^^^^^^^^^ 383s AttributeError: module 'mercurial.bundle2' has no attribute 'parthandler' 383s *** failed to set up extension hggit: module 'mercurial.bundle2' has no attribute 'parthandler' 383s abort: repository git_server not found 383s autopkgtest [07:21:40]: @@@@@@@@@@@@@@@@@@@@ summary 383s testsuite FAIL non-zero exit status 2 383s mercurial-git FAIL non-zero exit status 253