0s autopkgtest [06:56:02]: starting date and time: 2026-02-10 06:56:02+0000 0s autopkgtest [06:56:02]: git checkout: 4b346b80 nova: make wait_reboot return success even when a no-op 0s autopkgtest [06:56:02]: host juju-7f2275-prod-proposed-migration-environment-2; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.jvio1dhg/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-ppc64el --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-2@sto01-ppc64el-23.secgroup --name adt-resolute-ppc64el-hg-git-20260210-065602-juju-7f2275-prod-proposed-migration-environment-2-e30da19f-08cd-4733-9163-79d85ad7fb0c --image adt/ubuntu-resolute-ppc64el-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-2 --net-id=net_prod-autopkgtest-workers-ppc64el -e TERM=linux --mirror=http://ftpmaster.internal/ubuntu/ 5s Creating nova instance adt-resolute-ppc64el-hg-git-20260210-065602-juju-7f2275-prod-proposed-migration-environment-2-e30da19f-08cd-4733-9163-79d85ad7fb0c from image adt/ubuntu-resolute-ppc64el-server-20260209.img (UUID f7f31435-4cd1-4090-aa55-59cfefa097ca)... 55s autopkgtest [06:56:57]: testbed dpkg architecture: ppc64el 55s autopkgtest [06:56:57]: testbed apt version: 3.1.15 55s autopkgtest [06:56:57]: @@@@@@@@@@@@@@@@@@@@ test bed setup 55s autopkgtest [06:56:57]: testbed release detected to be: None 56s autopkgtest [06:56:58]: updating testbed package index (apt update) 56s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 56s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 56s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 56s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 56s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [178 kB] 56s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [31.1 kB] 56s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1727 kB] 57s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/main ppc64el Packages [261 kB] 57s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/universe ppc64el Packages [1728 kB] 57s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse ppc64el Packages [20.2 kB] 57s Fetched 4069 kB in 1s (4124 kB/s) 58s Reading package lists... 59s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 59s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 59s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 59s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 60s Reading package lists... 60s Reading package lists... 60s Building dependency tree... 60s Reading state information... 60s Calculating upgrade... 60s The following NEW packages will be installed: 60s gcc-16-base 60s The following packages will be upgraded: 60s cryptsetup-bin dracut-install iproute2 iptables libatomic1 libbrotli1 60s libcryptsetup12 libgcc-s1 libip4tc2 libip6tc2 libstdc++6 libxtables12 wget 60s 13 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. 60s Need to get 4597 kB of archives. 60s After this operation, 279 kB of additional disk space will be used. 60s Get:1 http://ftpmaster.internal/ubuntu resolute/main ppc64el gcc-16-base ppc64el 16-20260208-1ubuntu1 [59.7 kB] 60s Get:2 http://ftpmaster.internal/ubuntu resolute/main ppc64el libgcc-s1 ppc64el 16-20260208-1ubuntu1 [39.3 kB] 60s Get:3 http://ftpmaster.internal/ubuntu resolute/main ppc64el iptables ppc64el 1.8.11-2ubuntu3 [464 kB] 60s Get:4 http://ftpmaster.internal/ubuntu resolute/main ppc64el libip4tc2 ppc64el 1.8.11-2ubuntu3 [27.8 kB] 60s Get:5 http://ftpmaster.internal/ubuntu resolute/main ppc64el libip6tc2 ppc64el 1.8.11-2ubuntu3 [28.2 kB] 60s Get:6 http://ftpmaster.internal/ubuntu resolute/main ppc64el libxtables12 ppc64el 1.8.11-2ubuntu3 [41.2 kB] 60s Get:7 http://ftpmaster.internal/ubuntu resolute/main ppc64el iproute2 ppc64el 6.18.0-1ubuntu1 [1458 kB] 61s Get:8 http://ftpmaster.internal/ubuntu resolute/main ppc64el libatomic1 ppc64el 16-20260208-1ubuntu1 [11.0 kB] 61s Get:9 http://ftpmaster.internal/ubuntu resolute/main ppc64el libcryptsetup12 ppc64el 2:2.8.0-1ubuntu3 [404 kB] 61s Get:10 http://ftpmaster.internal/ubuntu resolute/main ppc64el libstdc++6 ppc64el 16-20260208-1ubuntu1 [930 kB] 61s Get:11 http://ftpmaster.internal/ubuntu resolute/main ppc64el wget ppc64el 1.25.0-2ubuntu4 [401 kB] 61s Get:12 http://ftpmaster.internal/ubuntu resolute/main ppc64el cryptsetup-bin ppc64el 2:2.8.0-1ubuntu3 [250 kB] 61s Get:13 http://ftpmaster.internal/ubuntu resolute/main ppc64el dracut-install ppc64el 109-11ubuntu1 [51.3 kB] 61s Get:14 http://ftpmaster.internal/ubuntu resolute/main ppc64el libbrotli1 ppc64el 1.2.0-3 [431 kB] 62s dpkg-preconfigure: unable to re-open stdin: No such file or directory 62s Fetched 4597 kB in 1s (3416 kB/s) 62s Selecting previously unselected package gcc-16-base:ppc64el. 62s (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 ... 122003 files and directories currently installed.) 62s Preparing to unpack .../gcc-16-base_16-20260208-1ubuntu1_ppc64el.deb ... 62s Unpacking gcc-16-base:ppc64el (16-20260208-1ubuntu1) ... 62s Setting up gcc-16-base:ppc64el (16-20260208-1ubuntu1) ... 62s (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 ... 122008 files and directories currently installed.) 62s Preparing to unpack .../libgcc-s1_16-20260208-1ubuntu1_ppc64el.deb ... 62s Unpacking libgcc-s1:ppc64el (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 62s Setting up libgcc-s1:ppc64el (16-20260208-1ubuntu1) ... 63s (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 ... 122008 files and directories currently installed.) 63s Preparing to unpack .../00-iptables_1.8.11-2ubuntu3_ppc64el.deb ... 63s Unpacking iptables (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 63s Preparing to unpack .../01-libip4tc2_1.8.11-2ubuntu3_ppc64el.deb ... 63s Unpacking libip4tc2:ppc64el (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 63s Preparing to unpack .../02-libip6tc2_1.8.11-2ubuntu3_ppc64el.deb ... 63s Unpacking libip6tc2:ppc64el (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 63s Preparing to unpack .../03-libxtables12_1.8.11-2ubuntu3_ppc64el.deb ... 63s Unpacking libxtables12:ppc64el (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 63s Preparing to unpack .../04-iproute2_6.18.0-1ubuntu1_ppc64el.deb ... 63s Unpacking iproute2 (6.18.0-1ubuntu1) over (6.16.0-1ubuntu3) ... 64s Preparing to unpack .../05-libatomic1_16-20260208-1ubuntu1_ppc64el.deb ... 64s Unpacking libatomic1:ppc64el (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 64s Preparing to unpack .../06-libcryptsetup12_2%3a2.8.0-1ubuntu3_ppc64el.deb ... 64s Unpacking libcryptsetup12:ppc64el (2:2.8.0-1ubuntu3) over (2:2.8.0-1ubuntu2) ... 64s Preparing to unpack .../07-libstdc++6_16-20260208-1ubuntu1_ppc64el.deb ... 64s Unpacking libstdc++6:ppc64el (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 64s Preparing to unpack .../08-wget_1.25.0-2ubuntu4_ppc64el.deb ... 64s Unpacking wget (1.25.0-2ubuntu4) over (1.25.0-2ubuntu3) ... 64s Preparing to unpack .../09-cryptsetup-bin_2%3a2.8.0-1ubuntu3_ppc64el.deb ... 64s Unpacking cryptsetup-bin (2:2.8.0-1ubuntu3) over (2:2.8.0-1ubuntu2) ... 65s Preparing to unpack .../10-dracut-install_109-11ubuntu1_ppc64el.deb ... 65s Unpacking dracut-install (109-11ubuntu1) over (109-9ubuntu1) ... 65s Preparing to unpack .../11-libbrotli1_1.2.0-3_ppc64el.deb ... 65s Unpacking libbrotli1:ppc64el (1.2.0-3) over (1.1.0-2build6) ... 65s Setting up libip4tc2:ppc64el (1.8.11-2ubuntu3) ... 65s Setting up wget (1.25.0-2ubuntu4) ... 65s Setting up libip6tc2:ppc64el (1.8.11-2ubuntu3) ... 65s Setting up libbrotli1:ppc64el (1.2.0-3) ... 65s Setting up libatomic1:ppc64el (16-20260208-1ubuntu1) ... 65s Setting up libxtables12:ppc64el (1.8.11-2ubuntu3) ... 65s Setting up dracut-install (109-11ubuntu1) ... 65s Setting up libcryptsetup12:ppc64el (2:2.8.0-1ubuntu3) ... 65s Setting up libstdc++6:ppc64el (16-20260208-1ubuntu1) ... 66s Setting up cryptsetup-bin (2:2.8.0-1ubuntu3) ... 66s Setting up iptables (1.8.11-2ubuntu3) ... 66s Setting up iproute2 (6.18.0-1ubuntu1) ... 66s Processing triggers for man-db (2.13.1-1build1) ... 68s Processing triggers for install-info (7.2-5) ... 68s Processing triggers for libc-bin (2.42-2ubuntu4) ... 69s autopkgtest [06:57:11]: upgrading testbed (apt dist-upgrade and autopurge) 69s Reading package lists... 69s Building dependency tree... 69s Reading state information... 69s Calculating upgrade... 69s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 69s Reading package lists... 70s Building dependency tree... 70s Reading state information... 70s Solving dependencies... 70s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 72s autopkgtest [06:57:14]: testbed running kernel: Linux 6.19.0-3-generic #3-Ubuntu SMP PREEMPT_DYNAMIC Fri Jan 23 20:13:51 UTC 2026 72s autopkgtest [06:57:14]: @@@@@@@@@@@@@@@@@@@@ apt-source hg-git 74s Get:1 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (dsc) [2142 B] 74s Get:2 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (tar) [222 kB] 74s Get:3 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (diff) [6816 B] 74s gpgv: Signature made Sun Feb 16 14:22:41 2025 UTC 74s gpgv: using RSA key 8F6DE104377F3B11E741748731F3144544A1741A 74s gpgv: issuer "tchet@debian.org" 74s gpgv: Can't check signature: No public key 74s dpkg-source: warning: cannot verify inline signature for ./hg-git_1.2.0-1.dsc: no acceptable signature found 74s autopkgtest [06:57:16]: testing package hg-git version 1.2.0-1 74s autopkgtest [06:57:16]: build not needed 74s autopkgtest [06:57:16]: test testsuite: preparing testbed 75s Reading package lists... 75s Building dependency tree... 75s Reading state information... 75s Solving dependencies... 75s The following NEW packages will be installed: 75s git git-man liberror-perl mercurial mercurial-common mercurial-git 75s python3-dulwich unzip 75s 0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded. 75s Need to get 12.7 MB of archives. 75s After this operation, 58.7 MB of additional disk space will be used. 75s Get:1 http://ftpmaster.internal/ubuntu resolute/main ppc64el liberror-perl all 0.17030-1 [23.5 kB] 75s Get:2 http://ftpmaster.internal/ubuntu resolute/main ppc64el git-man all 1:2.51.0-1ubuntu1 [1179 kB] 75s Get:3 http://ftpmaster.internal/ubuntu resolute/main ppc64el git ppc64el 1:2.51.0-1ubuntu1 [7646 kB] 75s Get:4 http://ftpmaster.internal/ubuntu resolute-proposed/universe ppc64el mercurial-common all 7.2-2 [2853 kB] 75s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe ppc64el mercurial ppc64el 7.2-2 [575 kB] 75s Get:6 http://ftpmaster.internal/ubuntu resolute/universe ppc64el python3-dulwich ppc64el 0.22.7-1 [183 kB] 75s Get:7 http://ftpmaster.internal/ubuntu resolute/universe ppc64el mercurial-git all 1.2.0-1 [60.9 kB] 75s Get:8 http://ftpmaster.internal/ubuntu resolute/main ppc64el unzip ppc64el 6.0-29ubuntu1 [200 kB] 75s Fetched 12.7 MB in 0s (27.9 MB/s) 75s Selecting previously unselected package liberror-perl. 76s (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 ... 122011 files and directories currently installed.) 76s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 76s Unpacking liberror-perl (0.17030-1) ... 76s Selecting previously unselected package git-man. 76s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 76s Unpacking git-man (1:2.51.0-1ubuntu1) ... 76s Selecting previously unselected package git. 76s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_ppc64el.deb ... 76s Unpacking git (1:2.51.0-1ubuntu1) ... 76s Selecting previously unselected package mercurial-common. 76s Preparing to unpack .../3-mercurial-common_7.2-2_all.deb ... 76s Unpacking mercurial-common (7.2-2) ... 76s Selecting previously unselected package mercurial. 76s Preparing to unpack .../4-mercurial_7.2-2_ppc64el.deb ... 76s Unpacking mercurial (7.2-2) ... 76s Selecting previously unselected package python3-dulwich. 76s Preparing to unpack .../5-python3-dulwich_0.22.7-1_ppc64el.deb ... 76s Unpacking python3-dulwich (0.22.7-1) ... 76s Selecting previously unselected package mercurial-git. 76s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 76s Unpacking mercurial-git (1.2.0-1) ... 76s Selecting previously unselected package unzip. 76s Preparing to unpack .../7-unzip_6.0-29ubuntu1_ppc64el.deb ... 76s Unpacking unzip (6.0-29ubuntu1) ... 76s Setting up mercurial-common (7.2-2) ... 78s Setting up unzip (6.0-29ubuntu1) ... 78s Setting up liberror-perl (0.17030-1) ... 78s Setting up python3-dulwich (0.22.7-1) ... 78s Setting up git-man (1:2.51.0-1ubuntu1) ... 78s Setting up mercurial (7.2-2) ... 78s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 78s Setting up mercurial-git (1.2.0-1) ... 78s mercurial-git extension is disabled by default. 78s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 78s Setting up git (1:2.51.0-1ubuntu1) ... 78s Processing triggers for man-db (2.13.1-1build1) ... 80s autopkgtest [06:57:22]: test testsuite: [----------------------- 80s no username found, using 'ubuntu@autopkgtest.local' instead 80s cd tests && /usr/bin/python3 run-tests.py --with-hg=/usr/bin/hg --blacklist=/tmp/autopkgtest.PWIkXN/build.ILN/src/debian/hg-git.test_blacklist 81s running 82 tests using 2 parallel processes 90s ssssss 90s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-pull.t 90s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-pull.t#draft.err 90s @@ -35,153 +35,132 @@ 90s 90s pull without a name 90s $ hg init hgrepo 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s $ cd hgrepo 90s $ hg pull ../gitrepo 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s pulling from ../gitrepo 90s - importing 3 git commits 90s - adding bookmark beta 90s - adding bookmark delta 90s - adding bookmark master 90s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 90s - (run 'hg heads' to see heads, 'hg merge' to merge) 90s + abort: repository ../gitrepo not found 90s + [255] 90s $ git --git-dir .hg/git for-each-ref 90s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 90s + fatal: not a git repository: '.hg/git' 90s + [128] 90s $ hg log -Tp 90s - 2|draft|delta|tip 90s - 1|draft|beta| 90s - 0|draft|master|t_alpha 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s $ cd .. 90s $ rm -rf hgrepo 90s 90s pull with an implied name 90s $ hg init hgrepo 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s $ cd hgrepo 90s $ echo "[paths]" >> .hg/hgrc 90s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 90s $ hg pull ../gitrepo 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s pulling from ../gitrepo 90s - importing 3 git commits 90s - adding bookmark beta 90s - adding bookmark delta 90s - adding bookmark master 90s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 90s - (run 'hg heads' to see heads, 'hg merge' to merge) 90s + abort: repository ../gitrepo not found 90s + [255] 90s $ git --git-dir .hg/git for-each-ref 90s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 90s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 90s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 90s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 90s + fatal: not a git repository: '.hg/git' 90s + [128] 90s $ hg log -Tp 90s - 2|draft|delta|default/delta tip 90s - 1|draft|beta|default/beta 90s - 0|draft|master|default/master t_alpha 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s $ cd .. 90s $ rm -rf hgrepo 90s 90s pull with an explicit name 90s $ hg init hgrepo 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s $ cd hgrepo 90s $ echo "[paths]" >> .hg/hgrc 90s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 90s $ hg pull 90s - pulling from $TESTTMP/gitrepo 90s - importing 3 git commits 90s - adding bookmark beta 90s - adding bookmark delta 90s - adding bookmark master 90s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 90s - (run 'hg heads' to see heads, 'hg merge' to merge) 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ git --git-dir .hg/git for-each-ref 90s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 90s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 90s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 90s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 90s + fatal: not a git repository: '.hg/git' 90s + [128] 90s $ hg log -Tp 90s - 2|draft|delta|default/delta tip 90s - 1|draft|beta|default/beta 90s - 0|draft|master|default/master t_alpha 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s $ cd .. 90s $ rm -rf hgrepo 90s 90s pull a tag 90s $ hg init hgrepo 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s $ echo "[paths]" >> hgrepo/.hg/hgrc 90s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 90s $ hg -R hgrepo pull -r t_alpha 90s - pulling from $TESTTMP/gitrepo 90s - importing 1 git commits 90s - adding bookmark master 90s - new changesets ff7a2f2d8d70 (1 drafts) 90s - (run 'hg update' to get a working copy) 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo update t_alpha 90s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + abort: unknown revision 't_alpha' 90s + [10] 90s $ hg log -Tp -R hgrepo 90s - 0|draft|master|default/master t_alpha tip 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s 90s no-op pull 90s $ hg -R hgrepo pull -r t_alpha 90s - pulling from $TESTTMP/gitrepo 90s - no changes found 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s 90s no-op pull with added bookmark 90s $ cd gitrepo 90s $ git checkout -qb epsilon t_alpha 90s $ cd .. 90s $ hg -R hgrepo pull -r epsilon 90s - pulling from $TESTTMP/gitrepo 90s - no changes found 90s - adding bookmark epsilon 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s 90s pull something that doesn't exist 90s $ hg -R hgrepo pull -r kaflaflibob 90s - pulling from $TESTTMP/gitrepo 90s - abort: unknown revision 'kaflaflibob'!? (re) 90s - [10] 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s 90s pull an ambiguous reference 90s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 90s $ hg -R hgrepo pull -r t_alpha 90s - pulling from $TESTTMP/gitrepo 90s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 90s - [10] 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 90s 90s pull a branch 90s $ hg -R hgrepo pull -r beta 90s - pulling from $TESTTMP/gitrepo 90s - importing 1 git commits 90s - adding bookmark beta 90s - new changesets 7fe02317c63d (1 drafts) 90s - (run 'hg update' to get a working copy) 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo log --graph --template=phases 90s - o changeset: 1:7fe02317c63d 90s - | bookmark: beta 90s - | tag: default/beta 90s - | tag: tip 90s - | phase: draft 90s - | user: test 90s - | date: Mon Jan 01 00:00:11 2007 +0000 90s - | summary: add beta 90s - | 90s - @ changeset: 0:ff7a2f2d8d70 90s - bookmark: epsilon 90s - bookmark: master 90s - tag: default/epsilon 90s - tag: default/master 90s - tag: t_alpha 90s - phase: draft 90s - user: test 90s - date: Mon Jan 01 00:00:10 2007 +0000 90s - summary: add alpha 90s - 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s 90s no-op pull should affect phases 90s $ hg -R hgrepo phase -fs beta 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + abort: unknown revision 'beta' 90s + [10] 90s $ hg -R hgrepo pull -r beta 90s - pulling from $TESTTMP/gitrepo 90s - no changes found 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo phase beta 90s - 1: draft 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + abort: unknown revision 'beta' 90s + [10] 90s 90s 90s add another commit and tag to the git repo 90s @@ -196,50 +175,12 @@ 90s 90s pull everything else 90s $ hg -R hgrepo pull 90s - pulling from $TESTTMP/gitrepo 90s - importing 2 git commits 90s - adding bookmark delta 90s - updating bookmark master 90s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 90s - (run 'hg heads' to see heads, 'hg merge' to merge) 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo log --graph --template=phases 90s - o changeset: 3:6f898ad1f3e1 90s - | bookmark: master 90s - | tag: default/master 90s - | tag: tip 90s - | phase: draft 90s - | parent: 0:ff7a2f2d8d70 90s - | user: test 90s - | date: Mon Jan 01 00:00:13 2007 +0000 90s - | summary: add gamma 90s - | 90s - | o changeset: 2:678ebee93e38 90s - |/ bookmark: delta 90s - | tag: default/delta 90s - | phase: draft 90s - | parent: 0:ff7a2f2d8d70 90s - | user: test 90s - | date: Mon Jan 01 00:00:12 2007 +0000 90s - | summary: add delta 90s - | 90s - | o changeset: 1:7fe02317c63d 90s - |/ bookmark: beta 90s - | tag: default/beta 90s - | tag: t_beta 90s - | phase: draft 90s - | user: test 90s - | date: Mon Jan 01 00:00:11 2007 +0000 90s - | summary: add beta 90s - | 90s - @ changeset: 0:ff7a2f2d8d70 90s - bookmark: epsilon 90s - tag: default/epsilon 90s - tag: t_alpha 90s - phase: draft 90s - user: test 90s - date: Mon Jan 01 00:00:10 2007 +0000 90s - summary: add alpha 90s - 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s add a merge to the git repo, and delete the branch 90s $ cd gitrepo 90s $ git merge -q -m "Merge branch 'beta'" beta 90s @@ -252,60 +193,26 @@ 90s 90s pull the merge 90s $ hg -R hgrepo tags | grep default/beta 90s - default/beta 1:7fe02317c63d 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + [1] 90s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 90s - pulling from $TESTTMP/gitrepo 90s - importing 1 git commits 90s - updating bookmark master 90s - deleting bookmark beta 90s - new changesets a02330f767a4 (1 drafts) 90s - (run 'hg update' to get a working copy) 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo tags | grep default/beta 90s - default/beta 1:7fe02317c63d 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + [1] 90s $ hg -R hgrepo pull 90s - pulling from $TESTTMP/gitrepo 90s - no changes found 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo tags | grep default/beta 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s [1] 90s $ hg -R hgrepo log --graph 90s - o changeset: 4:a02330f767a4 90s - |\ bookmark: master 90s - | | tag: default/master 90s - | | tag: tip 90s - | | parent: 3:6f898ad1f3e1 90s - | | parent: 1:7fe02317c63d 90s - | | user: test 90s - | | date: Mon Jan 01 00:00:13 2007 +0000 90s - | | summary: Merge branch 'beta' 90s - | | 90s - | o changeset: 3:6f898ad1f3e1 90s - | | parent: 0:ff7a2f2d8d70 90s - | | user: test 90s - | | date: Mon Jan 01 00:00:13 2007 +0000 90s - | | summary: add gamma 90s - | | 90s - | | o changeset: 2:678ebee93e38 90s - | |/ bookmark: delta 90s - | | tag: default/delta 90s - | | parent: 0:ff7a2f2d8d70 90s - | | user: test 90s - | | date: Mon Jan 01 00:00:12 2007 +0000 90s - | | summary: add delta 90s - | | 90s - o | changeset: 1:7fe02317c63d 90s - |/ tag: t_beta 90s - | user: test 90s - | date: Mon Jan 01 00:00:11 2007 +0000 90s - | summary: add beta 90s - | 90s - @ changeset: 0:ff7a2f2d8d70 90s - bookmark: epsilon 90s - tag: default/epsilon 90s - tag: t_alpha 90s - user: test 90s - date: Mon Jan 01 00:00:10 2007 +0000 90s - summary: add alpha 90s - 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s pull with wildcards 90s $ cd gitrepo 90s $ git checkout -qb releases/v1 master 90s @@ -324,66 +231,12 @@ 90s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 90s $ cd .. 90s $ hg -R hgrepo pull -r 'releases/*' 90s - pulling from $TESTTMP/gitrepo 90s - importing 2 git commits 90s - adding bookmark releases/v1 90s - adding bookmark releases/v2 90s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 90s - (run 'hg heads .' to see heads, 'hg merge' to merge) 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo log --graph 90s - o changeset: 6:a3f95e150b0a 90s - | bookmark: releases/v2 90s - | tag: default/releases/v2 90s - | tag: tip 90s - | parent: 4:a02330f767a4 90s - | user: test 90s - | date: Mon Jan 01 00:00:15 2007 +0000 90s - | summary: add eta 90s - | 90s - | o changeset: 5:218b2d0660d3 90s - |/ bookmark: releases/v1 90s - | tag: default/releases/v1 90s - | user: test 90s - | date: Mon Jan 01 00:00:14 2007 +0000 90s - | summary: add zeta 90s - | 90s - o changeset: 4:a02330f767a4 90s - |\ bookmark: master 90s - | | tag: default/master 90s - | | parent: 3:6f898ad1f3e1 90s - | | parent: 1:7fe02317c63d 90s - | | user: test 90s - | | date: Mon Jan 01 00:00:13 2007 +0000 90s - | | summary: Merge branch 'beta' 90s - | | 90s - | o changeset: 3:6f898ad1f3e1 90s - | | parent: 0:ff7a2f2d8d70 90s - | | user: test 90s - | | date: Mon Jan 01 00:00:13 2007 +0000 90s - | | summary: add gamma 90s - | | 90s - | | o changeset: 2:678ebee93e38 90s - | |/ bookmark: delta 90s - | | tag: default/delta 90s - | | parent: 0:ff7a2f2d8d70 90s - | | user: test 90s - | | date: Mon Jan 01 00:00:12 2007 +0000 90s - | | summary: add delta 90s - | | 90s - o | changeset: 1:7fe02317c63d 90s - |/ tag: t_beta 90s - | user: test 90s - | date: Mon Jan 01 00:00:11 2007 +0000 90s - | summary: add beta 90s - | 90s - @ changeset: 0:ff7a2f2d8d70 90s - bookmark: epsilon 90s - tag: default/epsilon 90s - tag: t_alpha 90s - user: test 90s - date: Mon Jan 01 00:00:10 2007 +0000 90s - summary: add alpha 90s - 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s 90s add old and new commits to the git repo -- make sure we're using the commit date 90s and not the author date 90s @@ -412,21 +265,19 @@ 90s Master is now filtered, so it's just stays there: 90s 90s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 90s - pulling from $TESTTMP/gitrepo 90s - no changes found 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo pull 90s - pulling from $TESTTMP/gitrepo 90s - no changes found 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo log -r master 90s - changeset: 4:a02330f767a4 90s - bookmark: master 90s - tag: default/master 90s - parent: 3:6f898ad1f3e1 90s - parent: 1:7fe02317c63d 90s - user: test 90s - date: Mon Jan 01 00:00:13 2007 +0000 90s - summary: Merge branch 'beta' 90s - 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + abort: unknown revision 'master' 90s + [10] 90s 90s $ cd gitrepo 90s $ git checkout -q master 90s @@ -440,51 +291,13 @@ 90s > git tag -a -m 'tagging newtag' newtag 90s $ cd .. 90s $ hg -R hgrepo pull 90s - pulling from $TESTTMP/gitrepo 90s - importing 3 git commits 90s - updating bookmark master 90s - new changesets 49713da8f665:e103a73f33be (3 drafts) 90s - (run 'hg heads .' to see heads, 'hg merge' to merge) 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo heads 90s - changeset: 9:e103a73f33be 90s - bookmark: master 90s - tag: default/master 90s - tag: tip 90s - user: test 90s - date: Wed Jan 01 00:00:00 2014 +0000 90s - summary: newcommit 90s - 90s - changeset: 7:49713da8f665 90s - tag: newtag 90s - tag: oldtag 90s - parent: 4:a02330f767a4 90s - user: test 90s - date: Sat Mar 01 00:00:00 2014 +0000 90s - summary: oldtag 90s - 90s - changeset: 6:a3f95e150b0a 90s - bookmark: releases/v2 90s - tag: default/releases/v2 90s - parent: 4:a02330f767a4 90s - user: test 90s - date: Mon Jan 01 00:00:15 2007 +0000 90s - summary: add eta 90s - 90s - changeset: 5:218b2d0660d3 90s - bookmark: releases/v1 90s - tag: default/releases/v1 90s - user: test 90s - date: Mon Jan 01 00:00:14 2007 +0000 90s - summary: add zeta 90s - 90s - changeset: 2:678ebee93e38 90s - bookmark: delta 90s - tag: default/delta 90s - parent: 0:ff7a2f2d8d70 90s - user: test 90s - date: Mon Jan 01 00:00:12 2007 +0000 90s - summary: add delta 90s - 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + [1] 90s 90s test for ssh vulnerability 90s 90s @@ -494,18 +307,21 @@ 90s > EOF 90s 90s $ hg init a 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s $ cd a 90s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 90s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 90s [255] 90s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 90s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 90s [255] 90s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 90s - ssh: * fakehost%7?shellcommand* (glob) 90s - abort: git remote error: The remote server unexpectedly closed the connection. 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 90s [255] 90s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 90s - ssh: * fakehost%7?shellcommand* (glob) 90s - abort: git remote error: The remote server unexpectedly closed the connection. 90s - [255] 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 90s + [255] 90s 90s ERROR: test-pull.t#draft output changed 90s ! 90s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-pull.t 90s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-pull.t#secret.err 90s @@ -35,153 +35,132 @@ 90s 90s pull without a name 90s $ hg init hgrepo 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s $ cd hgrepo 90s $ hg pull ../gitrepo 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s pulling from ../gitrepo 90s - importing 3 git commits 90s - adding bookmark beta 90s - adding bookmark delta 90s - adding bookmark master 90s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 90s - (run 'hg heads' to see heads, 'hg merge' to merge) 90s + abort: repository ../gitrepo not found 90s + [255] 90s $ git --git-dir .hg/git for-each-ref 90s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 90s + fatal: not a git repository: '.hg/git' 90s + [128] 90s $ hg log -Tp 90s - 2|draft|delta|tip 90s - 1|draft|beta| 90s - 0|draft|master|t_alpha 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s $ cd .. 90s $ rm -rf hgrepo 90s 90s pull with an implied name 90s $ hg init hgrepo 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s $ cd hgrepo 90s $ echo "[paths]" >> .hg/hgrc 90s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 90s $ hg pull ../gitrepo 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s pulling from ../gitrepo 90s - importing 3 git commits 90s - adding bookmark beta 90s - adding bookmark delta 90s - adding bookmark master 90s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 90s - (run 'hg heads' to see heads, 'hg merge' to merge) 90s + abort: repository ../gitrepo not found 90s + [255] 90s $ git --git-dir .hg/git for-each-ref 90s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 90s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 90s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 90s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 90s + fatal: not a git repository: '.hg/git' 90s + [128] 90s $ hg log -Tp 90s - 2|draft|delta|default/delta tip 90s - 1|draft|beta|default/beta 90s - 0|draft|master|default/master t_alpha 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s $ cd .. 90s $ rm -rf hgrepo 90s 90s pull with an explicit name 90s $ hg init hgrepo 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s $ cd hgrepo 90s $ echo "[paths]" >> .hg/hgrc 90s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 90s $ hg pull 90s - pulling from $TESTTMP/gitrepo 90s - importing 3 git commits 90s - adding bookmark beta 90s - adding bookmark delta 90s - adding bookmark master 90s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 90s - (run 'hg heads' to see heads, 'hg merge' to merge) 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ git --git-dir .hg/git for-each-ref 90s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 90s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 90s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 90s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 90s + fatal: not a git repository: '.hg/git' 90s + [128] 90s $ hg log -Tp 90s - 2|draft|delta|default/delta tip 90s - 1|draft|beta|default/beta 90s - 0|draft|master|default/master t_alpha 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s $ cd .. 90s $ rm -rf hgrepo 90s 90s pull a tag 90s $ hg init hgrepo 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s $ echo "[paths]" >> hgrepo/.hg/hgrc 90s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 90s $ hg -R hgrepo pull -r t_alpha 90s - pulling from $TESTTMP/gitrepo 90s - importing 1 git commits 90s - adding bookmark master 90s - new changesets ff7a2f2d8d70 (1 drafts) 90s - (run 'hg update' to get a working copy) 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo update t_alpha 90s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + abort: unknown revision 't_alpha' 90s + [10] 90s $ hg log -Tp -R hgrepo 90s - 0|draft|master|default/master t_alpha tip 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s 90s no-op pull 90s $ hg -R hgrepo pull -r t_alpha 90s - pulling from $TESTTMP/gitrepo 90s - no changes found 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s 90s no-op pull with added bookmark 90s $ cd gitrepo 90s $ git checkout -qb epsilon t_alpha 90s $ cd .. 90s $ hg -R hgrepo pull -r epsilon 90s - pulling from $TESTTMP/gitrepo 90s - no changes found 90s - adding bookmark epsilon 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s 90s pull something that doesn't exist 90s $ hg -R hgrepo pull -r kaflaflibob 90s - pulling from $TESTTMP/gitrepo 90s - abort: unknown revision 'kaflaflibob'!? (re) 90s - [10] 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s 90s pull an ambiguous reference 90s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 90s $ hg -R hgrepo pull -r t_alpha 90s - pulling from $TESTTMP/gitrepo 90s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 90s - [10] 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 90s 90s pull a branch 90s $ hg -R hgrepo pull -r beta 90s - pulling from $TESTTMP/gitrepo 90s - importing 1 git commits 90s - adding bookmark beta 90s - new changesets 7fe02317c63d (1 drafts) 90s - (run 'hg update' to get a working copy) 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo log --graph --template=phases 90s - o changeset: 1:7fe02317c63d 90s - | bookmark: beta 90s - | tag: default/beta 90s - | tag: tip 90s - | phase: draft 90s - | user: test 90s - | date: Mon Jan 01 00:00:11 2007 +0000 90s - | summary: add beta 90s - | 90s - @ changeset: 0:ff7a2f2d8d70 90s - bookmark: epsilon 90s - bookmark: master 90s - tag: default/epsilon 90s - tag: default/master 90s - tag: t_alpha 90s - phase: draft 90s - user: test 90s - date: Mon Jan 01 00:00:10 2007 +0000 90s - summary: add alpha 90s - 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s 90s no-op pull should affect phases 90s $ hg -R hgrepo phase -fs beta 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + abort: unknown revision 'beta' 90s + [10] 90s $ hg -R hgrepo pull -r beta 90s - pulling from $TESTTMP/gitrepo 90s - no changes found 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo phase beta 90s - 1: draft 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + abort: unknown revision 'beta' 90s + [10] 90s 90s 90s add another commit and tag to the git repo 90s @@ -196,50 +175,12 @@ 90s 90s pull everything else 90s $ hg -R hgrepo pull 90s - pulling from $TESTTMP/gitrepo 90s - importing 2 git commits 90s - adding bookmark delta 90s - updating bookmark master 90s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 90s - (run 'hg heads' to see heads, 'hg merge' to merge) 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo log --graph --template=phases 90s - o changeset: 3:6f898ad1f3e1 90s - | bookmark: master 90s - | tag: default/master 90s - | tag: tip 90s - | phase: draft 90s - | parent: 0:ff7a2f2d8d70 90s - | user: test 90s - | date: Mon Jan 01 00:00:13 2007 +0000 90s - | summary: add gamma 90s - | 90s - | o changeset: 2:678ebee93e38 90s - |/ bookmark: delta 90s - | tag: default/delta 90s - | phase: draft 90s - | parent: 0:ff7a2f2d8d70 90s - | user: test 90s - | date: Mon Jan 01 00:00:12 2007 +0000 90s - | summary: add delta 90s - | 90s - | o changeset: 1:7fe02317c63d 90s - |/ bookmark: beta 90s - | tag: default/beta 90s - | tag: t_beta 90s - | phase: draft 90s - | user: test 90s - | date: Mon Jan 01 00:00:11 2007 +0000 90s - | summary: add beta 90s - | 90s - @ changeset: 0:ff7a2f2d8d70 90s - bookmark: epsilon 90s - tag: default/epsilon 90s - tag: t_alpha 90s - phase: draft 90s - user: test 90s - date: Mon Jan 01 00:00:10 2007 +0000 90s - summary: add alpha 90s - 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s add a merge to the git repo, and delete the branch 90s $ cd gitrepo 90s $ git merge -q -m "Merge branch 'beta'" beta 90s @@ -252,60 +193,26 @@ 90s 90s pull the merge 90s $ hg -R hgrepo tags | grep default/beta 90s - default/beta 1:7fe02317c63d 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + [1] 90s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 90s - pulling from $TESTTMP/gitrepo 90s - importing 1 git commits 90s - updating bookmark master 90s - deleting bookmark beta 90s - new changesets a02330f767a4 (1 drafts) 90s - (run 'hg update' to get a working copy) 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo tags | grep default/beta 90s - default/beta 1:7fe02317c63d 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + [1] 90s $ hg -R hgrepo pull 90s - pulling from $TESTTMP/gitrepo 90s - no changes found 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo tags | grep default/beta 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s [1] 90s $ hg -R hgrepo log --graph 90s - o changeset: 4:a02330f767a4 90s - |\ bookmark: master 90s - | | tag: default/master 90s - | | tag: tip 90s - | | parent: 3:6f898ad1f3e1 90s - | | parent: 1:7fe02317c63d 90s - | | user: test 90s - | | date: Mon Jan 01 00:00:13 2007 +0000 90s - | | summary: Merge branch 'beta' 90s - | | 90s - | o changeset: 3:6f898ad1f3e1 90s - | | parent: 0:ff7a2f2d8d70 90s - | | user: test 90s - | | date: Mon Jan 01 00:00:13 2007 +0000 90s - | | summary: add gamma 90s - | | 90s - | | o changeset: 2:678ebee93e38 90s - | |/ bookmark: delta 90s - | | tag: default/delta 90s - | | parent: 0:ff7a2f2d8d70 90s - | | user: test 90s - | | date: Mon Jan 01 00:00:12 2007 +0000 90s - | | summary: add delta 90s - | | 90s - o | changeset: 1:7fe02317c63d 90s - |/ tag: t_beta 90s - | user: test 90s - | date: Mon Jan 01 00:00:11 2007 +0000 90s - | summary: add beta 90s - | 90s - @ changeset: 0:ff7a2f2d8d70 90s - bookmark: epsilon 90s - tag: default/epsilon 90s - tag: t_alpha 90s - user: test 90s - date: Mon Jan 01 00:00:10 2007 +0000 90s - summary: add alpha 90s - 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s pull with wildcards 90s $ cd gitrepo 90s $ git checkout -qb releases/v1 master 90s @@ -324,66 +231,12 @@ 90s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 90s $ cd .. 90s $ hg -R hgrepo pull -r 'releases/*' 90s - pulling from $TESTTMP/gitrepo 90s - importing 2 git commits 90s - adding bookmark releases/v1 90s - adding bookmark releases/v2 90s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 90s - (run 'hg heads .' to see heads, 'hg merge' to merge) 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo log --graph 90s - o changeset: 6:a3f95e150b0a 90s - | bookmark: releases/v2 90s - | tag: default/releases/v2 90s - | tag: tip 90s - | parent: 4:a02330f767a4 90s - | user: test 90s - | date: Mon Jan 01 00:00:15 2007 +0000 90s - | summary: add eta 90s - | 90s - | o changeset: 5:218b2d0660d3 90s - |/ bookmark: releases/v1 90s - | tag: default/releases/v1 90s - | user: test 90s - | date: Mon Jan 01 00:00:14 2007 +0000 90s - | summary: add zeta 90s - | 90s - o changeset: 4:a02330f767a4 90s - |\ bookmark: master 90s - | | tag: default/master 90s - | | parent: 3:6f898ad1f3e1 90s - | | parent: 1:7fe02317c63d 90s - | | user: test 90s - | | date: Mon Jan 01 00:00:13 2007 +0000 90s - | | summary: Merge branch 'beta' 90s - | | 90s - | o changeset: 3:6f898ad1f3e1 90s - | | parent: 0:ff7a2f2d8d70 90s - | | user: test 90s - | | date: Mon Jan 01 00:00:13 2007 +0000 90s - | | summary: add gamma 90s - | | 90s - | | o changeset: 2:678ebee93e38 90s - | |/ bookmark: delta 90s - | | tag: default/delta 90s - | | parent: 0:ff7a2f2d8d70 90s - | | user: test 90s - | | date: Mon Jan 01 00:00:12 2007 +0000 90s - | | summary: add delta 90s - | | 90s - o | changeset: 1:7fe02317c63d 90s - |/ tag: t_beta 90s - | user: test 90s - | date: Mon Jan 01 00:00:11 2007 +0000 90s - | summary: add beta 90s - | 90s - @ changeset: 0:ff7a2f2d8d70 90s - bookmark: epsilon 90s - tag: default/epsilon 90s - tag: t_alpha 90s - user: test 90s - date: Mon Jan 01 00:00:10 2007 +0000 90s - summary: add alpha 90s - 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s 90s add old and new commits to the git repo -- make sure we're using the commit date 90s and not the author date 90s @@ -412,21 +265,19 @@ 90s Master is now filtered, so it's just stays there: 90s 90s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 90s - pulling from $TESTTMP/gitrepo 90s - no changes found 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo pull 90s - pulling from $TESTTMP/gitrepo 90s - no changes found 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo log -r master 90s - changeset: 4:a02330f767a4 90s - bookmark: master 90s - tag: default/master 90s - parent: 3:6f898ad1f3e1 90s - parent: 1:7fe02317c63d 90s - user: test 90s - date: Mon Jan 01 00:00:13 2007 +0000 90s - summary: Merge branch 'beta' 90s - 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + abort: unknown revision 'master' 90s + [10] 90s 90s $ cd gitrepo 90s $ git checkout -q master 90s @@ -440,51 +291,13 @@ 90s > git tag -a -m 'tagging newtag' newtag 90s $ cd .. 90s $ hg -R hgrepo pull 90s - pulling from $TESTTMP/gitrepo 90s - importing 3 git commits 90s - updating bookmark master 90s - new changesets 49713da8f665:e103a73f33be (3 drafts) 90s - (run 'hg heads .' to see heads, 'hg merge' to merge) 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + pulling from $TESTTMP/gitrepo 90s + abort: repository $TESTTMP/gitrepo not found 90s + [255] 90s $ hg -R hgrepo heads 90s - changeset: 9:e103a73f33be 90s - bookmark: master 90s - tag: default/master 90s - tag: tip 90s - user: test 90s - date: Wed Jan 01 00:00:00 2014 +0000 90s - summary: newcommit 90s - 90s - changeset: 7:49713da8f665 90s - tag: newtag 90s - tag: oldtag 90s - parent: 4:a02330f767a4 90s - user: test 90s - date: Sat Mar 01 00:00:00 2014 +0000 90s - summary: oldtag 90s - 90s - changeset: 6:a3f95e150b0a 90s - bookmark: releases/v2 90s - tag: default/releases/v2 90s - parent: 4:a02330f767a4 90s - user: test 90s - date: Mon Jan 01 00:00:15 2007 +0000 90s - summary: add eta 90s - 90s - changeset: 5:218b2d0660d3 90s - bookmark: releases/v1 90s - tag: default/releases/v1 90s - user: test 90s - date: Mon Jan 01 00:00:14 2007 +0000 90s - summary: add zeta 90s - 90s - changeset: 2:678ebee93e38 90s - bookmark: delta 90s - tag: default/delta 90s - parent: 0:ff7a2f2d8d70 90s - user: test 90s - date: Mon Jan 01 00:00:12 2007 +0000 90s - summary: add delta 90s - 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + [1] 90s 90s test for ssh vulnerability 90s 90s @@ -494,18 +307,21 @@ 90s > EOF 90s 90s $ hg init a 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s $ cd a 90s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 90s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 90s [255] 90s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 90s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 90s [255] 90s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 90s - ssh: * fakehost%7?shellcommand* (glob) 90s - abort: git remote error: The remote server unexpectedly closed the connection. 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 90s [255] 90s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 90s - ssh: * fakehost%7?shellcommand* (glob) 90s - abort: git remote error: The remote server unexpectedly closed the connection. 90s - [255] 90s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 90s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 90s + [255] 90s 90s ERROR: test-pull.t#secret output changed 91s ! 91s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-renames.t 91s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-renames.t.err 91s @@ -95,494 +95,9 @@ 91s 91s $ cd .. 91s $ hg clone -q repo.git hgrepo 91s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 91s + abort: repository repo.git not found 91s + [255] 91s $ cd hgrepo 91s + $TESTTMP.sh: 115: cd: can't cd to hgrepo 91s $ hg book master -q 91s - $ hg log -p --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 91s - @ 8 497105ddbe119aa40af691eb2b1a029c29bf5247 remove submodule and rename back 91s - | branch=default hg-git-rename-source=git 91s - | 91s - | diff --git a/.hgsub b/.hgsub 91s - | --- a/.hgsub 91s - | +++ b/.hgsub 91s - | @@ -1,2 +1,1 @@ 91s - | gitsubmodule2 = [git]../gitsubmodule 91s - | -gamma = [git]../gitsubmodule 91s - | diff --git a/.hgsubstate b/.hgsubstate 91s - | --- a/.hgsubstate 91s - | +++ b/.hgsubstate 91s - | @@ -1,2 +1,1 @@ 91s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 91s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 91s - | diff --git a/gamma-new b/gamma 91s - | rename from gamma-new 91s - | rename to gamma 91s - | 91s - o 7 adfc1ce8461d3174dcf8425e112e2fa848de3913 rename and add submodule 91s - | branch=default hg-git-rename-source=git 91s - | 91s - | diff --git a/.hgsub b/.hgsub 91s - | --- a/.hgsub 91s - | +++ b/.hgsub 91s - | @@ -1,1 +1,2 @@ 91s - | gitsubmodule2 = [git]../gitsubmodule 91s - | +gamma = [git]../gitsubmodule 91s - | diff --git a/.hgsubstate b/.hgsubstate 91s - | --- a/.hgsubstate 91s - | +++ b/.hgsubstate 91s - | @@ -1,1 +1,2 @@ 91s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 91s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 91s - | diff --git a/gamma b/gamma-new 91s - | rename from gamma 91s - | rename to gamma-new 91s - | 91s - o 6 62c1a4b07240b53a71be1b1a46e94e99132c5391 beta renamed back 91s - | branch=default hg-git-rename-source=git 91s - | 91s - | diff --git a/beta b/beta 91s - | old mode 120000 91s - | new mode 100644 91s - | --- a/beta 91s - | +++ b/beta 91s - | @@ -1,1 +1,12 @@ 91s - | -beta-new 91s - | \ No newline at end of file 91s - | +1 91s - | +2 91s - | +3 91s - | +4 91s - | +5 91s - | +6 91s - | +7 91s - | +8 91s - | +9 91s - | +10 91s - | +11 91s - | +12 91s - | diff --git a/beta-new b/beta-new 91s - | deleted file mode 100644 91s - | --- a/beta-new 91s - | +++ /dev/null 91s - | @@ -1,12 +0,0 @@ 91s - | -1 91s - | -2 91s - | -3 91s - | -4 91s - | -5 91s - | -6 91s - | -7 91s - | -8 91s - | -9 91s - | -10 91s - | -11 91s - | -12 91s - | 91s - o 5 f93fefed957cff2220d3f0d11182398350b5fa9a beta renamed 91s - | branch=default hg-git-rename-source=git 91s - | 91s - | diff --git a/beta b/beta 91s - | old mode 100644 91s - | new mode 120000 91s - | --- a/beta 91s - | +++ b/beta 91s - | @@ -1,12 +1,1 @@ 91s - | -1 91s - | -2 91s - | -3 91s - | -4 91s - | -5 91s - | -6 91s - | -7 91s - | -8 91s - | -9 91s - | -10 91s - | -11 91s - | -12 91s - | +beta-new 91s - | \ No newline at end of file 91s - | diff --git a/beta b/beta-new 91s - | copy from beta 91s - | copy to beta-new 91s - | 91s - o 4 b9e63d96abc2783afc59246e798a6936cf05a35e move submodule 91s - | branch=default hg-git-rename-source=git 91s - | 91s - | diff --git a/.hgsub b/.hgsub 91s - | --- a/.hgsub 91s - | +++ b/.hgsub 91s - | @@ -1,1 +1,1 @@ 91s - | -gitsubmodule = [git]../gitsubmodule 91s - | +gitsubmodule2 = [git]../gitsubmodule 91s - | diff --git a/.hgsubstate b/.hgsubstate 91s - | --- a/.hgsubstate 91s - | +++ b/.hgsubstate 91s - | @@ -1,1 +1,1 @@ 91s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 91s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 91s - | 91s - o 3 55537ea256c28be1b5637f4f93a601fdde8a9a7f add submodule 91s - | branch=default hg-git-rename-source=git 91s - | 91s - | diff --git a/.hgsub b/.hgsub 91s - | new file mode 100644 91s - | --- /dev/null 91s - | +++ b/.hgsub 91s - | @@ -0,0 +1,1 @@ 91s - | +gitsubmodule = [git]../gitsubmodule 91s - | diff --git a/.hgsubstate b/.hgsubstate 91s - | new file mode 100644 91s - | --- /dev/null 91s - | +++ b/.hgsubstate 91s - | @@ -0,0 +1,1 @@ 91s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 91s - | 91s - o 2 20f9e56b6d006d0403f853245e483d0892b8ac48 gamma 91s - | branch=default hg-git-rename-source=git 91s - | 91s - | diff --git a/beta b/beta 91s - | --- a/beta 91s - | +++ b/beta 91s - | @@ -9,3 +9,4 @@ 91s - | 9 91s - | 10 91s - | 11 91s - | +12 91s - | diff --git a/beta b/gamma 91s - | copy from beta 91s - | copy to gamma 91s - | --- a/beta 91s - | +++ b/gamma 91s - | @@ -9,3 +9,4 @@ 91s - | 9 91s - | 10 91s - | 11 91s - | +13 91s - | 91s - o 1 9f7744e68def81da3b394f11352f602ca9c8ab68 beta 91s - | branch=default hg-git-rename-source=git 91s - | 91s - | diff --git a/alpha b/beta 91s - | rename from alpha 91s - | rename to beta 91s - | --- a/alpha 91s - | +++ b/beta 91s - | @@ -8,3 +8,4 @@ 91s - | 8 91s - | 9 91s - | 10 91s - | +11 91s - | 91s - o 0 7bc844166f76e49562f81eacd54ea954d01a9e42 alpha 91s - branch=default hg-git-rename-source=git 91s - 91s - diff --git a/alpha b/alpha 91s - new file mode 100644 91s - --- /dev/null 91s - +++ b/alpha 91s - @@ -0,0 +1,10 @@ 91s - +1 91s - +2 91s - +3 91s - +4 91s - +5 91s - +6 91s - +7 91s - +8 91s - +9 91s - +10 91s - 91s - 91s -Make a new ordinary commit in Mercurial (no extra metadata) 91s - $ echo 14 >> gamma 91s - $ hg ci -m "gamma2" 91s - 91s -Make a new commit with a copy and a rename in Mercurial 91s - $ hg cp gamma delta 91s - $ echo 15 >> delta 91s - $ hg mv beta epsilon 91s - $ echo 16 >> epsilon 91s - $ hg ci -m "delta/epsilon" 91s - $ hg export . 91s - # HG changeset patch 91s - # User test 91s - # Date 0 0 91s - # Thu Jan 01 00:00:00 1970 +0000 91s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 91s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 91s - delta/epsilon 91s - 91s - diff --git a/gamma b/delta 91s - copy from gamma 91s - copy to delta 91s - --- a/gamma 91s - +++ b/delta 91s - @@ -11,3 +11,4 @@ 91s - 11 91s - 13 91s - 14 91s - +15 91s - diff --git a/beta b/epsilon 91s - rename from beta 91s - rename to epsilon 91s - --- a/beta 91s - +++ b/epsilon 91s - @@ -10,3 +10,4 @@ 91s - 10 91s - 11 91s - 12 91s - +16 91s - $ hg push 91s - pushing to $TESTTMP/repo.git 91s - searching for changes 91s - adding objects 91s - remote: found 0 deltas to reuse 91s - added 2 commits with 2 trees and 3 blobs 91s - updating reference refs/heads/master 91s - 91s - $ cd ../repo.git 91s - $ git log master --pretty=oneline 91s - 5f2948d029693346043f320620af99a615930dc4 delta/epsilon 91s - bbd2ec050f7fbc64f772009844f7d58a556ec036 gamma2 91s - 50d116676a308b7c22935137d944e725d2296f2a remove submodule and rename back 91s - 59fb8e82ea18f79eab99196f588e8948089c134f rename and add submodule 91s - f95497455dfa891b4cd9b524007eb9514c3ab654 beta renamed back 91s - 055f482277da6cd3dd37c7093d06983bad68f782 beta renamed 91s - d7f31298f27df8a9226eddb1e4feb96922c46fa5 move submodule 91s - c610256cb6959852d9e70d01902a06726317affc add submodule 91s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 91s - cc83241f39927232f690d370894960b0d1943a0e beta 91s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 91s - 91s -Make sure the right metadata is stored 91s - $ git cat-file commit master^ 91s - tree 0adbde18545845f3b42ad1a18939ed60a9dec7a8 91s - parent 50d116676a308b7c22935137d944e725d2296f2a 91s - author test 0 +0000 91s - committer test 0 +0000 91s - HG:rename-source hg 91s - 91s - gamma2 91s - $ git cat-file commit master 91s - tree f8f32f4e20b56a5a74582c6a5952c175bf9ec155 91s - parent bbd2ec050f7fbc64f772009844f7d58a556ec036 91s - author test 0 +0000 91s - committer test 0 +0000 91s - HG:rename gamma:delta 91s - HG:rename beta:epsilon 91s - 91s - delta/epsilon 91s - 91s -Now make another clone and compare the hashes 91s - 91s - $ cd .. 91s - $ hg clone -q repo.git hgrepo2 91s - $ cd hgrepo2 91s - $ hg book master -qf 91s - $ hg export master 91s - # HG changeset patch 91s - # User test 91s - # Date 0 0 91s - # Thu Jan 01 00:00:00 1970 +0000 91s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 91s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 91s - delta/epsilon 91s - 91s - diff --git a/gamma b/delta 91s - copy from gamma 91s - copy to delta 91s - --- a/gamma 91s - +++ b/delta 91s - @@ -11,3 +11,4 @@ 91s - 11 91s - 13 91s - 14 91s - +15 91s - diff --git a/beta b/epsilon 91s - rename from beta 91s - rename to epsilon 91s - --- a/beta 91s - +++ b/epsilon 91s - @@ -10,3 +10,4 @@ 91s - 10 91s - 11 91s - 12 91s - +16 91s - 91s -Regenerate the Git metadata and compare the hashes 91s - $ hg debug-remove-hggit-state 91s - clearing out the git cache data 91s - $ hg gexport 91s - $ cd .hg/git 91s - $ git log master --pretty=oneline 91s - f3f6592447685566af9447c03ae262aa5432511d delta/epsilon (dulwich-rust !) 91s - c51ce14ec367c5ea72bf428dee3f8576f2fe1bb0 gamma2 (dulwich-rust !) 91s - df749cae534e3c7a0ad664cd0f214dd36e0ac259 remove submodule and rename back (dulwich-rust !) 91s - 8f9ec605ad0cc2532202f73cef8e35d3241797ee rename and add submodule (dulwich-rust !) 91s - 8a00d0fb75377c51c9a46e92ff154c919007f0e2 delta/epsilon (no-dulwich-rust !) 91s - dd7d4f1adb942a8d349dce585019f6949184bc64 gamma2 (no-dulwich-rust !) 91s - 3f1cdaf8b603816fcda02bd29e75198ae4cb13db remove submodule and rename back (no-dulwich-rust !) 91s - 2a4abf1178a999e2054158ceb0c7768079665d03 rename and add submodule (no-dulwich-rust !) 91s - 88c416e8d5e0e9dd1187d45ebafaa46111764196 beta renamed back 91s - 027d2a6e050705bf6f7e226e7e97f02ce5ae3200 beta renamed 91s - dc70e620634887e70ac5dd108bcc7ebd99c60ec3 move submodule 91s - c610256cb6959852d9e70d01902a06726317affc add submodule 91s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 91s - cc83241f39927232f690d370894960b0d1943a0e beta 91s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 91s - 91s -Test findcopiesharder 91s - 91s - $ cd $TESTTMP 91s - $ git init -q gitcopyharder 91s - $ cd gitcopyharder 91s - $ cat >> file0 << EOF 91s - > 1 91s - > 2 91s - > 3 91s - > 4 91s - > 5 91s - > EOF 91s - $ git add file0 91s - $ fn_git_commit -m file0 91s - $ cp file0 file1 91s - $ git add file1 91s - $ fn_git_commit -m file1 91s - $ cp file0 file2 91s - $ echo 6 >> file2 91s - $ git add file2 91s - $ fn_git_commit -m file2 91s - 91s - $ cd .. 91s - 91s -Clone without findcopiesharder does not find copies from unmodified files 91s - 91s - $ hg clone gitcopyharder hgnocopyharder 91s - importing 3 git commits 91s - new changesets b45d023c6842:ec77ccdbefe0 (3 drafts) 91s - updating to bookmark master 91s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 91s - $ hg -R hgnocopyharder export 1::2 91s - # HG changeset patch 91s - # User test 91s - # Date 1167609621 0 91s - # Mon Jan 01 00:00:21 2007 +0000 91s - # Node ID 555831c93e2a250e5ba42efad45bf7ba71da13e4 91s - # Parent b45d023c6842337ffe694663a44aa672d311081c 91s - file1 91s - 91s - diff --git a/file1 b/file1 91s - new file mode 100644 91s - --- /dev/null 91s - +++ b/file1 91s - @@ -0,0 +1,5 @@ 91s - +1 91s - +2 91s - +3 91s - +4 91s - +5 91s - # HG changeset patch 91s - # User test 91s - # Date 1167609622 0 91s - # Mon Jan 01 00:00:22 2007 +0000 91s - # Node ID ec77ccdbefe023eb9898b0399f84f670c8c0f5fc 91s - # Parent 555831c93e2a250e5ba42efad45bf7ba71da13e4 91s - file2 91s - 91s - diff --git a/file2 b/file2 91s - new file mode 100644 91s - --- /dev/null 91s - +++ b/file2 91s - @@ -0,0 +1,6 @@ 91s - +1 91s - +2 91s - +3 91s - +4 91s - +5 91s - +6 91s - 91s -findcopiesharder finds copies from unmodified files if similarity is met 91s - 91s - $ hg --config git.findcopiesharder=true clone gitcopyharder hgcopyharder0 91s - importing 3 git commits 91s - new changesets b45d023c6842:9b3099834272 (3 drafts) 91s - updating to bookmark master 91s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 91s - $ hg -R hgcopyharder0 export 1::2 91s - # HG changeset patch 91s - # User test 91s - # Date 1167609621 0 91s - # Mon Jan 01 00:00:21 2007 +0000 91s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 91s - # Parent b45d023c6842337ffe694663a44aa672d311081c 91s - file1 91s - 91s - diff --git a/file0 b/file1 91s - copy from file0 91s - copy to file1 91s - # HG changeset patch 91s - # User test 91s - # Date 1167609622 0 91s - # Mon Jan 01 00:00:22 2007 +0000 91s - # Node ID 9b30998342729c7357d418bebed7399986cfe643 91s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 91s - file2 91s - 91s - diff --git a/file0 b/file2 91s - copy from file0 91s - copy to file2 91s - --- a/file0 91s - +++ b/file2 91s - @@ -3,3 +3,4 @@ 91s - 3 91s - 4 91s - 5 91s - +6 91s - 91s - $ hg --config git.findcopiesharder=true --config git.similarity=95 clone gitcopyharder hgcopyharder1 91s - importing 3 git commits 91s - new changesets b45d023c6842:d9d2e8cbf050 (3 drafts) 91s - updating to bookmark master 91s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 91s - $ hg -R hgcopyharder1 export 1::2 91s - # HG changeset patch 91s - # User test 91s - # Date 1167609621 0 91s - # Mon Jan 01 00:00:21 2007 +0000 91s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 91s - # Parent b45d023c6842337ffe694663a44aa672d311081c 91s - file1 91s - 91s - diff --git a/file0 b/file1 91s - copy from file0 91s - copy to file1 91s - # HG changeset patch 91s - # User test 91s - # Date 1167609622 0 91s - # Mon Jan 01 00:00:22 2007 +0000 91s - # Node ID d9d2e8cbf050772be31dccf78851f71dc547d139 91s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 91s - file2 91s - 91s - diff --git a/file2 b/file2 91s - new file mode 100644 91s - --- /dev/null 91s - +++ b/file2 91s - @@ -0,0 +1,6 @@ 91s - +1 91s - +2 91s - +3 91s - +4 91s - +5 91s - +6 91s - 91s -Config values out of range 91s - $ hg --config git.similarity=999 clone gitcopyharder hgcopyharder2 91s - importing 3 git commits 91s - abort: git.similarity must be between 0 and 100 91s - [255] 91s -Left-over on Windows with some pack files 91s - $ rm -rf hgcopyharder2 91s - $ hg --config git.renamelimit=-5 clone gitcopyharder hgcopyharder2 91s - importing 3 git commits 91s - abort: git.renamelimit must be non-negative 91s - [255] 91s 91s ERROR: test-renames.t output changed 91s ! 91s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-git-submodules.t 91s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-git-submodules.t.err 91s @@ -188,261 +188,9 @@ 91s $ cd .. 91s 91s $ hg clone gitrepo2 hgrepo 91s - importing 10 git commits 91s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 91s - updating to bookmark master 91s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 91s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 91s + abort: repository gitrepo2 not found 91s + [255] 91s $ cd hgrepo 91s + $TESTTMP.sh: 133: cd: can't cd to hgrepo 91s $ hg log --graph 91s - @ changeset: 9:0ad944b2c4d8 91s - | bookmark: master 91s - | tag: default/master 91s - | tag: tip 91s - | user: test 91s - | date: Mon Jan 01 00:00:12 2007 +0000 91s - | summary: remove all subrepos 91s - | 91s - o changeset: 8:33da452ef22f 91s - | user: test 91s - | date: Mon Jan 01 00:00:12 2007 +0000 91s - | summary: replace subrepo with symlink 91s - | 91s - o changeset: 7:acebec53c0fc 91s - | user: test 91s - | date: Mon Jan 01 00:00:12 2007 +0000 91s - | summary: replace symlink with subrepo 91s - | 91s - o changeset: 6:78c2ea52db4b 91s - | user: test 91s - | date: Mon Jan 01 00:00:12 2007 +0000 91s - | summary: add symlink 91s - | 91s - o changeset: 5:c0d52ffc59b8 91s - | user: test 91s - | date: Mon Jan 01 00:00:12 2007 +0000 91s - | summary: replace file with subrepo 91s - | 91s - o changeset: 4:73e078a178a0 91s - | user: test 91s - | date: Mon Jan 01 00:00:12 2007 +0000 91s - | summary: replace subrepo with file 91s - | 91s - o changeset: 3:29e236ba4c06 91s - | user: test 91s - | date: Mon Jan 01 00:00:12 2007 +0000 91s - | summary: add another subrepo 91s - | 91s - o changeset: 2:a6075a162f62 91s - | user: test 91s - | date: Mon Jan 01 00:00:12 2007 +0000 91s - | summary: change subrepo commit 91s - | 91s - o changeset: 1:a4036e758995 91s - | user: test 91s - | date: Mon Jan 01 00:00:11 2007 +0000 91s - | summary: add subrepo 91s - | 91s - o changeset: 0:ff7a2f2d8d70 91s - user: test 91s - date: Mon Jan 01 00:00:10 2007 +0000 91s - summary: add alpha 91s - 91s - $ hg book 91s - * master 9:0ad944b2c4d8 91s - 91s -(add subrepo) 91s - $ hg cat -r 1 .hgsubstate 91s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo 91s - $ hg cat -r 1 .hgsub 91s - subrepo = [git]../gitsubrepo 91s - $ hg gverify -r 1 91s - verifying rev a4036e758995 against git commit e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 91s - 91s -(change subrepo commit) 91s - $ hg cat -r 2 .hgsubstate 91s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 91s - $ hg cat -r 2 .hgsub 91s - subrepo = [git]../gitsubrepo 91s - $ hg gverify -r 2 91s - verifying rev a6075a162f62 against git commit a000567ceefbd9a2ce364e0dea6e298010b02b6d 91s - 91s -(add another subrepo) 91s - $ hg cat -r 3 .hgsubstate 91s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 91s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 91s - $ hg cat -r 3 .hgsub 91s - subrepo = [git]../gitsubrepo 91s - subrepo2 = [git]../gitsubrepo 91s - $ hg gverify -r 3 91s - verifying rev 29e236ba4c06 against git commit 6e219527869fa40eb6ffbdd013cd86d576b26b01 91s - 91s -(replace subrepo with file) 91s - $ hg cat -r 4 .hgsubstate 91s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 91s - $ hg cat -r 4 .hgsub 91s - subrepo2 = [git]../gitsubrepo 91s - $ hg manifest -r 4 91s - .hgsub 91s - .hgsubstate 91s - alpha 91s - subrepo 91s - $ hg gverify -r 4 91s - verifying rev 73e078a178a0 against git commit f6436a472da00f581d8d257e9bbaf3c358a5e88c 91s - 91s -(replace file with subrepo) 91s - $ hg cat -r 5 .hgsubstate 91s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 91s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 91s - $ hg cat -r 5 .hgsub 91s - subrepo2 = [git]../gitsubrepo 91s - alpha = [git]../gitsubrepo 91s - $ hg manifest -r 5 91s - .hgsub 91s - .hgsubstate 91s - subrepo 91s - $ hg gverify -r 5 91s - verifying rev c0d52ffc59b8 against git commit 88171163bf4795b5570924e51d5f8ede33f8bc28 91s - 91s -(replace symlink with subrepo) 91s - $ hg cat -r 7 .hgsub 91s - subrepo2 = [git]../gitsubrepo 91s - alpha = [git]../gitsubrepo 91s - foolink = [git]../gitsubrepo 91s - $ hg cat -r 7 .hgsubstate 91s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 91s - 6e4ad8da50204560c00fa25e4987eb2e239029ba foolink 91s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 91s - $ hg gverify -r 7 91s - verifying rev acebec53c0fc against git commit e3288fa737d429a60637b3b6782cb25b8298bc00 91s - 91s -(replace subrepo with symlink) 91s - $ hg cat -r 8 .hgsub .hgsubstate 91s - subrepo2 = [git]../gitsubrepo 91s - alpha = [git]../gitsubrepo 91s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 91s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 91s - 91s - $ hg gverify -r 8 91s - verifying rev 33da452ef22f against git commit d28364013fe1a0fde56c0e1921e49ecdeee8571d 91s - 91s -(remove all subrepos) 91s - $ hg cat -r 9 .hgsub .hgsubstate 91s - .hgsub: no such file in rev 0ad944b2c4d8 91s - .hgsubstate: no such file in rev 0ad944b2c4d8 91s - [1] 91s - $ hg gverify -r 9 91s - verifying rev 0ad944b2c4d8 against git commit 15ba94929481c654814178aac1dbca06ae688718 91s - 91s - $ hg debug-remove-hggit-state 91s - clearing out the git cache data 91s - $ hg gexport 91s - $ cd .hg/git 91s - $ git log --pretty=oneline 91s - 73c15b74fb81fa0cc60e9c59c73787a9f26c778b remove all subrepos 91s - d28364013fe1a0fde56c0e1921e49ecdeee8571d replace subrepo with symlink 91s - e3288fa737d429a60637b3b6782cb25b8298bc00 replace symlink with subrepo 91s - 2d1c135447d11df4dfe96dd5d4f37926dc5c821d add symlink 91s - 88171163bf4795b5570924e51d5f8ede33f8bc28 replace file with subrepo 91s - f6436a472da00f581d8d257e9bbaf3c358a5e88c replace subrepo with file 91s - 6e219527869fa40eb6ffbdd013cd86d576b26b01 add another subrepo 91s - a000567ceefbd9a2ce364e0dea6e298010b02b6d change subrepo commit 91s - e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 add subrepo 91s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 add alpha 91s - 91s -test with rename detection enabled -- simply checking that the Mercurial hashes 91s -are the same is enough 91s - $ cd ../../.. 91s - $ hg --config git.similarity=100 clone gitrepo2 hgreporenames 91s - importing 10 git commits 91s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 91s - updating to bookmark master 91s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 91s - $ cd hgreporenames 91s - $ hg log --graph 91s - @ changeset: 9:0ad944b2c4d8 91s - | bookmark: master 91s - | tag: default/master 91s - | tag: tip 91s - | user: test 91s - | date: Mon Jan 01 00:00:12 2007 +0000 91s - | summary: remove all subrepos 91s - | 91s - o changeset: 8:33da452ef22f 91s - | user: test 91s - | date: Mon Jan 01 00:00:12 2007 +0000 91s - | summary: replace subrepo with symlink 91s - | 91s - o changeset: 7:acebec53c0fc 91s - | user: test 91s - | date: Mon Jan 01 00:00:12 2007 +0000 91s - | summary: replace symlink with subrepo 91s - | 91s - o changeset: 6:78c2ea52db4b 91s - | user: test 91s - | date: Mon Jan 01 00:00:12 2007 +0000 91s - | summary: add symlink 91s - | 91s - o changeset: 5:c0d52ffc59b8 91s - | user: test 91s - | date: Mon Jan 01 00:00:12 2007 +0000 91s - | summary: replace file with subrepo 91s - | 91s - o changeset: 4:73e078a178a0 91s - | user: test 91s - | date: Mon Jan 01 00:00:12 2007 +0000 91s - | summary: replace subrepo with file 91s - | 91s - o changeset: 3:29e236ba4c06 91s - | user: test 91s - | date: Mon Jan 01 00:00:12 2007 +0000 91s - | summary: add another subrepo 91s - | 91s - o changeset: 2:a6075a162f62 91s - | user: test 91s - | date: Mon Jan 01 00:00:12 2007 +0000 91s - | summary: change subrepo commit 91s - | 91s - o changeset: 1:a4036e758995 91s - | user: test 91s - | date: Mon Jan 01 00:00:11 2007 +0000 91s - | summary: add subrepo 91s - | 91s - o changeset: 0:ff7a2f2d8d70 91s - user: test 91s - date: Mon Jan 01 00:00:10 2007 +0000 91s - summary: add alpha 91s - 91s - $ cd .. 91s - 91s -test handling of an invalid .gitmodules file (#380) 91s - 91s - $ git init --quiet gitrepo-issue380 91s - $ cd gitrepo-issue380 91s - $ git submodule add ../gitsubrepo 91s - Cloning into '$TESTTMP/gitrepo-issue380/gitsubrepo'... 91s - done. 91s - $ fn_git_commit -m 'add a submodule' 91s - $ cat >> .gitmodules < <<<<<<< HEAD 91s - > EOF 91s - $ fn_git_commit -a -m 'b0rken .gitmodules' 91s - $ git status 91s - fatal: bad config line 4 in file $TESTTMP/gitrepo-issue380/.gitmodules 91s - [128] 91s - $ sed -i.orig /HEAD/d .gitmodules 91s - $ fn_git_commit -a -m 'fix .gitmodules' 91s - $ git status 91s - On branch master 91s - Untracked files: 91s - (use "git add ..." to include in what will be committed) 91s - .gitmodules.orig 91s - 91s - nothing added to commit but untracked files present (use "git add" to track) 91s - $ cd .. 91s - $ git clone gitrepo-issue380 gitrepo-issue380~ 91s - Cloning into 'gitrepo-issue380~'... 91s - done. 91s - $ hg clone -U gitrepo-issue380 hgrepo-issue380 91s - importing 3 git commits 91s - warning: failed to parse .gitmodules in 2e4ec4293822 91s - new changesets ed60e5fbc192:9dfc0cdf1787 (3 drafts) 91s 91s ERROR: test-git-submodules.t output changed 92s !s 92s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-git-tags.t 92s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-git-tags.t#draft.err 92s @@ -41,337 +41,13 @@ 92s Clone it: 92s 92s $ hg clone repo.git hgrepo 92s - importing 2 git commits 92s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 92s - updating to bookmark master 92s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 92s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 92s + abort: repository repo.git not found 92s + [255] 92s 92s $ cd hgrepo 92s + $TESTTMP.sh: 39: cd: can't cd to hgrepo 92s 92s Verify that annotated tags are unaffected by reexports: 92s 92s $ GIT_DIR=.hg/git git tag -ln 92s - beta added tag beta 92s - $ hg gexport 92s - $ GIT_DIR=.hg/git git tag -ln 92s - beta added tag beta 92s - 92s -Error checking on tag creation 92s - 92s - $ hg tag --git beta --remove 92s - abort: cannot remove git tags 92s - (the git documentation heavily discourages editing tags) 92s - [255] 92s - $ hg tag --git beta -r null 92s - abort: cannot remove git tags 92s - (the git documentation heavily discourages editing tags) 92s - [255] 92s - $ hg tag --git beta --remove -r 0 92s - abort: cannot specify both --rev and --remove 92s - [10] 92s - $ hg tag --git alpha 92s - abort: git tags require an explicit revision 92s - (please specify -r/--rev) 92s - [255] 92s - $ hg tag --git alpha alpha -r 0 92s - abort: tag names must be unique 92s - [255] 92s - $ hg tag --git alpha -r 0 -e 92s - abort: cannot specify both --git and --edit 92s - [10] 92s - $ hg tag --git alpha -r 0 -m 42 92s - abort: cannot specify both --git and --message 92s - [10] 92s - $ hg tag --git alpha -r 0 -d 42 92s - abort: cannot specify both --git and --date 92s - [10] 92s - $ hg tag --git alpha -r 0 -u user@example.com 92s - abort: cannot specify both --git and --user 92s - [10] 92s - $ hg tag --git 'with space' -r 0 92s - abort: the name 'with space' is not a valid git tag 92s - [255] 92s - $ hg tag --git ' beta' -r 0 92s - abort: the name 'beta' already exists 92s - [255] 92s - $ hg tag --git master -r 0 92s - abort: the name 'master' already exists 92s - [255] 92s - $ hg tag --git tip -r 0 92s - abort: the name 'tip' is reserved 92s - [10] 92s - 92s -Create a git tag from hg 92s - 92s - $ hg tag --git alpha --debug -r 0 92s - finding unexported changesets 92s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 92s - adding git tag alpha 92s - $ hg log --graph 92s - @ changeset: 1:7fe02317c63d 92s - | bookmark: master 92s - | tag: beta 92s - | tag: default/master 92s - | tag: tip 92s - | user: test 92s - | date: Mon Jan 01 00:00:11 2007 +0000 92s - | summary: add beta 92s - | 92s - o changeset: 0:ff7a2f2d8d70 92s - tag: alpha 92s - user: test 92s - date: Mon Jan 01 00:00:10 2007 +0000 92s - summary: add alpha 92s - 92s - $ echo beta-fix >> beta 92s - $ fn_hg_commit -m 'fix for beta' 92s -#if secret 92s - $ hg phase -d 92s -#endif 92s - $ hg push 92s - pushing to $TESTTMP/repo.git 92s - searching for changes 92s - adding objects 92s - remote: found 0 deltas to reuse 92s - added 1 commits with 1 trees and 1 blobs 92s - updating reference refs/heads/master 92s - adding reference refs/tags/alpha 92s - 92s -Verify that amending commits known to remotes doesn't break anything 92s - 92s - $ cat >> $HGRCPATH << EOF 92s - > [experimental] 92s - > evolution = createmarkers 92s - > evolution.createmarkers = yes 92s - > EOF 92s - $ hg tags 92s - tip 2:61175962e488 92s - default/master 2:61175962e488 92s - beta 1:7fe02317c63d 92s - alpha 0:ff7a2f2d8d70 92s - $ echo beta-fix-again >> beta 92s - $ fn_hg_commit --amend 92s - $ hg log -T shorttags 92s - 3:3094b9e8da41 draft tip 92s - 2:61175962e488 draft default/master X 92s - 1:7fe02317c63d draft beta 92s - 0:ff7a2f2d8d70 draft alpha 92s - $ hg tags 92s - tip 3:3094b9e8da41 92s - default/master 2:61175962e488 92s - beta 1:7fe02317c63d 92s - alpha 0:ff7a2f2d8d70 92s - $ hg push 92s - pushing to $TESTTMP/repo.git 92s - searching for changes 92s - abort: pushing refs/heads/master overwrites 3094b9e8da41 92s - [255] 92s - $ hg push -f 92s - pushing to $TESTTMP/repo.git 92s - searching for changes 92s - adding objects 92s - remote: found 0 deltas to reuse 92s - added 1 commits with 1 trees and 1 blobs 92s - updating reference refs/heads/master 92s - 92s -Now create a tag for the old, obsolete master 92s - 92s - $ cd ../repo.git 92s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 92s - $ git tag 92s - alpha 92s - beta 92s - detached 92s - $ cd ../hgrepo 92s - $ hg pull 92s - pulling from $TESTTMP/repo.git 92s - no changes found 92s - $ hg log -T shorttags 92s - 3:3094b9e8da41 draft default/master tip 92s - 2:61175962e488 draft detached X 92s - 1:7fe02317c63d draft beta 92s - 0:ff7a2f2d8d70 draft alpha 92s - $ hg tags 92s - tip 3:3094b9e8da41 92s - default/master 3:3094b9e8da41 92s - detached 2:61175962e488 92s - beta 1:7fe02317c63d 92s - alpha 0:ff7a2f2d8d70 92s - $ hg push 92s - pushing to $TESTTMP/repo.git 92s - searching for changes 92s - no changes found 92s - [1] 92s - 92s - $ cd .. 92s - 92s -Verify that revsets can point out git tags; for that we need an 92s -untagged commit. 92s - 92s - $ cd hgrepo 92s - $ touch gamma 92s - $ fn_hg_commit -A -m 'add gamma' 92s -#if secret 92s - $ hg phase -d 92s -#endif 92s - $ hg log -T shorttags -r 'gittag()' 92s - 0:ff7a2f2d8d70 draft alpha 92s - 1:7fe02317c63d draft beta 92s - 2:61175962e488 draft detached X 92s - $ hg log -T shorttags -r 'gittag(detached)' 92s - 2:61175962e488 draft detached X 92s - $ hg log -T shorttags -r 'gittag("re:a$")' 92s - 0:ff7a2f2d8d70 draft alpha 92s - 1:7fe02317c63d draft beta 92s - 92s -Create a git tag from hg, but pointing to a new commit: 92s - 92s - $ hg tag --git gamma --debug -r tip 92s - invalid branch cache (visible): tip differs (?) 92s - finding unexported changesets 92s - exporting 1 changesets 92s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 92s - packing 3 loose objects... 92s - packed 3 loose objects! 92s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 92s - adding git tag gamma 92s - $ hg push 92s - pushing to $TESTTMP/repo.git 92s - searching for changes 92s - adding objects 92s - remote: found 0 deltas to reuse 92s - added 1 commits with 1 trees and 1 blobs 92s - updating reference refs/heads/master 92s - adding reference refs/tags/gamma 92s - $ cd ../gitrepo 92s - $ git fetch --quiet --tags 92s - $ git tag 92s - alpha 92s - beta 92s - detached 92s - gamma 92s - $ cd .. 92s - 92s -Try to overwrite an annotated tag: 92s - 92s - $ cd hgrepo 92s - $ hg tags -v 92s - tip 4:0eb1ab0073a8 92s - gamma 4:0eb1ab0073a8 git 92s - default/master 4:0eb1ab0073a8 git-remote 92s - detached 2:61175962e488 git 92s - beta 1:7fe02317c63d git 92s - alpha 0:ff7a2f2d8d70 git 92s - $ hg book not-master 92s - $ hg tag beta 92s - abort: tag 'beta' already exists (use -f to force) 92s - [10] 92s - $ hg tag -f beta 92s -#if secret 92s - $ hg phase -d 92s -#endif 92s - $ hg push 92s - pushing to $TESTTMP/repo.git 92s - warning: not overwriting annotated tag 'beta' 92s - searching for changes 92s - adding objects 92s - remote: found 0 deltas to reuse 92s - added 1 commits with 1 trees and 1 blobs 92s - adding reference refs/heads/not-master 92s - $ hg tags 92s - tip 5:c49682c7cba4 92s - default/not-master 5:c49682c7cba4 92s - gamma 4:0eb1ab0073a8 92s - default/master 4:0eb1ab0073a8 92s - beta 4:0eb1ab0073a8 92s - detached 2:61175962e488 92s - alpha 0:ff7a2f2d8d70 92s - $ cd .. 92s - 92s -Check whether `gimport` handles tags 92s - 92s - $ cd hgrepo 92s - $ rm .hg/git-tags .hg/git-mapfile 92s - $ hg gimport 92s - importing 6 git commits 92s - $ hg tags -q 92s - tip 92s - default/not-master 92s - gamma 92s - default/master 92s - beta 92s - detached 92s - alpha 92s - $ cd .. 92s - 92s -Test how pulling an explicit branch with an annotated tag: 92s - 92s - $ hg clone -r master repo.git hgrepo-2 92s - importing 4 git commits 92s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 92s - updating to branch default 92s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 92s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 92s - 0:ff7a2f2d8d70 draft alpha 92s - 1:7fe02317c63d draft beta 92s - 3:0eb1ab0073a8 draft default/master gamma tip 92s - $ hg tags -v -R hgrepo-2 92s - tip 3:0eb1ab0073a8 92s - gamma 3:0eb1ab0073a8 git 92s - default/master 3:0eb1ab0073a8 git-remote 92s - beta 1:7fe02317c63d git 92s - alpha 0:ff7a2f2d8d70 git 92s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 92s - $ rm -rf hgrepo-2 92s - 92s - $ hg clone -r master repo.git hgrepo-2 92s - importing 4 git commits 92s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 92s - updating to branch default 92s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 92s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 92s - 0:ff7a2f2d8d70 draft alpha 92s - 1:7fe02317c63d draft beta 92s - 3:0eb1ab0073a8 draft default/master gamma tip 92s -This used to die: 92s - $ hg -R hgrepo-2 gexport 92s -This used to fail, since we didn't actually pull the annotated tag: 92s - $ hg -R hgrepo-2 push 92s - pushing to $TESTTMP/repo.git 92s - searching for changes 92s - no changes found 92s - [1] 92s - $ rm -rf hgrepo-2 92s - 92s -Check that pulling will update phases only: 92s - 92s - $ cd hgrepo 92s - $ hg phase -fs gamma detached 92s - $ hg pull 92s - pulling from $TESTTMP/repo.git 92s - no changes found 92s - $ hg log -T shorttags -r gamma -r detached 92s - 4:0eb1ab0073a8 draft beta default/master gamma 92s - 2:61175962e488 draft detached X 92s - $ cd .. 92s - 92s -Check that we pull new tags to existing commits: 92s - $ cd gitrepo 92s - $ git tag 92s - alpha 92s - beta 92s - detached 92s - gamma 92s - $ fn_git_tag extra-simple-tag 92s - $ fn_git_tag -m annotated extra-annotated-tag 92s - $ git push --tags 92s - To $TESTTMP/repo.git 92s - * [new tag] extra-annotated-tag -> extra-annotated-tag 92s - * [new tag] extra-simple-tag -> extra-simple-tag 92s - $ cd ../hgrepo 92s - $ hg pull -r master 92s - pulling from $TESTTMP/repo.git 92s - no changes found 92s - $ hg tags -v | grep extra 92s - extra-simple-tag 1:7fe02317c63d git 92s - extra-annotated-tag 1:7fe02317c63d git 92s 92s ERROR: test-git-tags.t#draft output changed 92s ! 92s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-help.t 92s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-help.t.err 92s @@ -5,250 +5,14 @@ 92s 92s $ hg help | grep 'git' | sed 's/ */ /g' 92s git-cleanup clean up Git commit map after history editing (?) 92s - git-verify verify that a Mercurial rev matches the corresponding Git rev 92s - hggit push and pull from a Git server 92s - hggit-config Configuring hg-git 92s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 92s 92s $ hg help hggit-config 92s - Configuring hg-git 92s - """""""""""""""""" 92s - 92s - "git" 92s - ----- 92s - 92s - Control how the Hg-Git extension interacts with Git. 92s - 92s - "authors" 92s - Git uses a strict convention for "author names" when representing 92s - changesets, using the form "[realname] [email address]". Mercurial 92s - encourages this convention as well but is not as strict, so it's not 92s - uncommon for a Mercurial repository to have authors listed as, for 92s - example, simple usernames. hg-git by default will attempt to translate 92s - Mercurial usernames using the following rules: 92s - 92s - - If the Mercurial username fits the pattern "NAME ", the Git 92s - name will be set to NAME and the email to EMAIL. 92s - - If the Mercurial username looks like an email (if it contains an 92s - "@"), the Git name and email will both be set to that email. 92s - - If the Mercurial username consists of only a name, the email will be 92s - set to "none@none". 92s - - Illegal characters (stray "<"\ s or ">"\ s) will be stripped out, and 92s - for "NAME " usernames, any content after the right-bracket (for 92s - example, a second ">") will be turned into a url-encoded sigil like 92s - "ext:(%3E)" in the Git author name. 92s - 92s - Since these default behaviors may not be what you want ("none@none", for 92s - example, shows up unpleasantly on GitHub as "illegal email address"), 92s - the "git.authors" option provides for an "authors translation file" that 92s - will be used during outgoing transfers from Mercurial to Git only, by 92s - modifying "hgrc" as such: 92s - 92s - [git] 92s - authors = authors.txt 92s - 92s - Where "authors.txt" is the name of a text file containing author name 92s - translations, one per each line, using the following format: 92s - 92s - johnny = John Smith 92s - dougie = Doug Johnson 92s - 92s - Empty lines and lines starting with a "#" are ignored. 92s - 92s - It should be noted that this translation is in *the Mercurial to Git 92s - direction only*. Changesets coming from Git back to Mercurial will not 92s - translate back into Mercurial usernames, so it's best that the same 92s - username/email combination be used on both the Mercurial and Git sides; 92s - the author file is mostly useful for translating legacy changesets. 92s - 92s - "branch_bookmark_suffix" 92s - Hg-Git does not convert between Mercurial named branches and git 92s - branches as the two are conceptually different; instead, it uses 92s - Mercurial bookmarks to represent the concept of a Git branch. Therefore, 92s - when translating a Mercurial repository over to Git, you typically need 92s - to create bookmarks to mirror all the named branches that you'd like to 92s - see transferred over to Git. The major caveat with this is that you 92s - can't use the same name for your bookmark as that of the named branch, 92s - and furthermore there's no feasible way to rename a branch in Mercurial. 92s - For the use case where one would like to transfer a Mercurial repository 92s - over to Git, and maintain the same named branches as are present on the 92s - hg side, the "branch_bookmark_suffix" might be all that's needed. This 92s - presents a string "suffix" that will be recognized on each bookmark 92s - name, and stripped off as the bookmark is translated to a Git branch: 92s - 92s - [git] 92s - branch_bookmark_suffix=_bookmark 92s - 92s - Above, if a Mercurial repository had a named branch called 92s - "release_6_maintenance", you could then link it to a bookmark called 92s - "release_6_maintenance_bookmark". hg-git will then strip off the 92s - "_bookmark" suffix from this bookmark name, and create a Git branch 92s - called "release_6_maintenance". When pulling back from Git to hg, the 92s - "_bookmark" suffix is then applied back, if and only if a Mercurial 92s - named branch of that name exists. E.g., when changes to the 92s - "release_6_maintenance" branch are checked into Git, these will be 92s - placed into the "release_6_maintenance_bookmark" bookmark on hg. But if 92s - a new branch called "release_7_maintenance" were pulled over to hg, and 92s - there was not a "release_7_maintenance" named branch already, the 92s - bookmark will be named "release_7_maintenance" with no usage of the 92s - suffix. 92s - 92s - The "branch_bookmark_suffix" option is, like the "authors" option, 92s - intended for migrating legacy hg named branches. Going forward, a 92s - Mercurial repository that is to be linked with a Git repository should 92s - only use bookmarks for named branching. 92s - 92s - "findcopiesharder" 92s - Whether to consider unmodified files as copy sources. This is a very 92s - expensive operation for large projects, so use it with caution. Similar 92s - to "git diff"'s --find-copies-harder option. 92s - 92s - "intree" 92s - Hg-Git keeps a Git repository clone for reading and updating. By 92s - default, the Git clone is the subdirectory "git" in your local Mercurial 92s - repository. If you would like this Git clone to be at the same level of 92s - your Mercurial repository instead (named ".git"), add the following to 92s - your "hgrc": 92s - 92s - [git] 92s - intree = True 92s - 92s - Please note that changing this setting in an existing repository doesn't 92s - move the local Git repository. You will either have to do so yourself, 92s - or issue an 'hg pull' after the fact to repopulate the new location. 92s - 92s - "mindate" 92s - If set, branches where the latest commit's commit time is older than 92s - this will not be imported. Accepts any date formats that Mercurial does 92s - -- see 'hg help dates' for more. 92s - 92s - "public" 92s - A list of Git branches that should be considered "published", and 92s - therefore converted to Mercurial in the 'public' phase. This is only 92s - used if "hggit.usephases" is set. 92s - 92s - "pull-prune-remote-branches" 92s - Before fetching, remove any remote-tracking references, or pseudo-tags, 92s - that no longer exist on the remote. This is equivalent to the "--prune" 92s - option to "git fetch", and means that pseudo-tags for remotes -- such as 92s - "default/master" -- always actually reflect what's on the remote. 92s - 92s - This option is enabled by default. 92s - 92s - "pull-prune-bookmarks" 92s - On pull, delete any unchanged bookmarks removed on the remote. In other 92s - words, if e.g. the "thebranch" bookmark remains at "default/thebranch", 92s - and the branch is deleted in Git, pulling deletes the bookmark. 92s - 92s - This option is enabled by default. 92s - 92s - "renamelimit" 92s - The number of files to consider when performing the copy/rename 92s - detection. Detection is disabled if the number of files modified in a 92s - commit is above the limit. Detection is O(N^2) in the number of files 92s - modified, so be sure not to set the limit too high. Similar to Git's 92s - "diff.renameLimit" config. The default is "400", the same as Git. 92s - 92s - "similarity" 92s - Specify how similar files modified in a Git commit must be to be 92s - imported as Mercurial renames or copies, as a percentage between "0" 92s - (disabled) and "100" (files must be identical). For example, "90" means 92s - that a delete/add pair will be imported as a rename if more than 90% of 92s - the file has stayed the same. The default is "0" (disabled). 92s - 92s - "blame.ignoreRevsFile" 92s - Specify a file that lists Git commits to ignore when invoking 'hg 92s - annotate'. 92s - 92s - "hggit" 92s - ------- 92s - 92s - Control behavior of the Hg-Git extension. 92s - 92s - "mapsavefrequency" 92s - By default, hg-git only saves the results of a conversion at the end. 92s - Use this option to enable resuming long-running pulls and pushes. Set 92s - this to a number greater than 0 to allow resuming after converting that 92s - many commits. This can help when the conversion encounters an error 92s - partway through a large batch of changes. Otherwise, an error or 92s - interruption will roll back the transaction, similar to regular 92s - Mercurial. 92s - 92s - Defaults to 1000. 92s - 92s - Please note that this is disregarded for an initial clone, as any error 92s - or interruption will delete the destination. So instead of cloning a 92s - large Git repository, you might want to pull instead: 92s - 92s - $ hg init linux 92s - $ cd linux 92s - $ echo "[paths]\ndefault = https://github.com/torvalds/linux" > .hg/hgrc 92s - $ hg pull 92s - 92s - ...and be extremely patient. Please note that converting very large 92s - repositories may take *days* rather than mere *hours*, and may run into 92s - issues with available memory for very long running clones. Even any 92s - small, undiscovered leak will build up when processing hundreds of 92s - thousands of files and commits. Cloning the Linux kernel is likely a 92s - pathological case, but other storied repositories such as CPython do 92s - work well, even if the initial clone requires a some patience. 92s - 92s - "threads" 92s - 92s - During a push to Git, hg-git will pack loose objects at regular 92s - intervals whenever it saves its map. As this is a rather expensive 92s - operation, it's done in separate threads. 92s - 92s - Defaults to the system CPU count or 4, whichever is lower. 92s - 92s - "usephases" 92s - When converting Git revisions to Mercurial, place them in the 'public' 92s - phase as appropriate. Namely, revisions that are reachable from the 92s - remote Git repository's default branch, or "HEAD", will be marked 92s - *public*. For most repositories, this means the remote "master" branch 92s - will be converted as public. The same applies to any commits tagged in 92s - the remote. 92s - 92s - To restrict publishing to specific branches or tags, use the 92s - "git.public" option. 92s - 92s - Publishing commits prevents their modification, and speeds up many local 92s - Mercurial operations, such as 'hg shelve'. 92s - 92s - "fetchbuffer" 92s - Data fetched from Git is buffered in memory, unless it exceeds the given 92s - limit, in megabytes. By default, flush the buffer to disk when it 92s - exceeds 100MB. 92s - 92s - "retries" 92s - Interacting with a remote Git repository may require authentication. 92s - Normally, this will trigger a prompt and a retry, and this option 92s - restricts the amount of retries. Defaults to 3. 92s - 92s - "invalidpaths" 92s - Both Mercurial and Git consider paths as just bytestrings internally, 92s - and allow almost anything. The difference, however, is in the _almost_ 92s - part. For example, many Git servers will reject a push for security 92s - reasons if it contains a nested Git repository. Similarly, Mercurial 92s - cannot checkout commits with a nested repository, and it cannot even 92s - store paths containing an embedded newline or carrage return character. 92s - 92s - The default is to issue a warning and skip these paths. You can change 92s - this by setting "hggit.invalidpaths" in ".hgrc": 92s - 92s - [hggit] 92s - invalidpaths = keep 92s - 92s - Possible values are "keep", "skip" or "abort". Prior to 1.0, the default 92s - was "abort". 92s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 92s + abort: no such help topic: hggit-config 92s + (try 'hg help --keyword hggit-config') 92s + [10] 92s 92s $ hg help config.hggit | head -10 92s - "hggit" 92s - ------- 92s - 92s - Control behavior of the Hg-Git extension. 92s - 92s - "mapsavefrequency" 92s - By default, hg-git only saves the results of a conversion at the end. 92s - Use this option to enable resuming long-running pulls and pushes. Set 92s - this to a number greater than 0 to allow resuming after converting that 92s - many commits. This can help when the conversion encounters an error 92s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 92s + abort: help section not found: config.hggit 92s 92s ERROR: test-help.t output changed 93s ! 93s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-git-tags.t 93s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-git-tags.t#secret.err 93s @@ -41,337 +41,13 @@ 93s Clone it: 93s 93s $ hg clone repo.git hgrepo 93s - importing 2 git commits 93s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 93s - updating to bookmark master 93s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 93s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 93s + abort: repository repo.git not found 93s + [255] 93s 93s $ cd hgrepo 93s + $TESTTMP.sh: 44: cd: can't cd to hgrepo 93s 93s Verify that annotated tags are unaffected by reexports: 93s 93s $ GIT_DIR=.hg/git git tag -ln 93s - beta added tag beta 93s - $ hg gexport 93s - $ GIT_DIR=.hg/git git tag -ln 93s - beta added tag beta 93s - 93s -Error checking on tag creation 93s - 93s - $ hg tag --git beta --remove 93s - abort: cannot remove git tags 93s - (the git documentation heavily discourages editing tags) 93s - [255] 93s - $ hg tag --git beta -r null 93s - abort: cannot remove git tags 93s - (the git documentation heavily discourages editing tags) 93s - [255] 93s - $ hg tag --git beta --remove -r 0 93s - abort: cannot specify both --rev and --remove 93s - [10] 93s - $ hg tag --git alpha 93s - abort: git tags require an explicit revision 93s - (please specify -r/--rev) 93s - [255] 93s - $ hg tag --git alpha alpha -r 0 93s - abort: tag names must be unique 93s - [255] 93s - $ hg tag --git alpha -r 0 -e 93s - abort: cannot specify both --git and --edit 93s - [10] 93s - $ hg tag --git alpha -r 0 -m 42 93s - abort: cannot specify both --git and --message 93s - [10] 93s - $ hg tag --git alpha -r 0 -d 42 93s - abort: cannot specify both --git and --date 93s - [10] 93s - $ hg tag --git alpha -r 0 -u user@example.com 93s - abort: cannot specify both --git and --user 93s - [10] 93s - $ hg tag --git 'with space' -r 0 93s - abort: the name 'with space' is not a valid git tag 93s - [255] 93s - $ hg tag --git ' beta' -r 0 93s - abort: the name 'beta' already exists 93s - [255] 93s - $ hg tag --git master -r 0 93s - abort: the name 'master' already exists 93s - [255] 93s - $ hg tag --git tip -r 0 93s - abort: the name 'tip' is reserved 93s - [10] 93s - 93s -Create a git tag from hg 93s - 93s - $ hg tag --git alpha --debug -r 0 93s - finding unexported changesets 93s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 93s - adding git tag alpha 93s - $ hg log --graph 93s - @ changeset: 1:7fe02317c63d 93s - | bookmark: master 93s - | tag: beta 93s - | tag: default/master 93s - | tag: tip 93s - | user: test 93s - | date: Mon Jan 01 00:00:11 2007 +0000 93s - | summary: add beta 93s - | 93s - o changeset: 0:ff7a2f2d8d70 93s - tag: alpha 93s - user: test 93s - date: Mon Jan 01 00:00:10 2007 +0000 93s - summary: add alpha 93s - 93s - $ echo beta-fix >> beta 93s - $ fn_hg_commit -m 'fix for beta' 93s -#if secret 93s - $ hg phase -d 93s -#endif 93s - $ hg push 93s - pushing to $TESTTMP/repo.git 93s - searching for changes 93s - adding objects 93s - remote: found 0 deltas to reuse 93s - added 1 commits with 1 trees and 1 blobs 93s - updating reference refs/heads/master 93s - adding reference refs/tags/alpha 93s - 93s -Verify that amending commits known to remotes doesn't break anything 93s - 93s - $ cat >> $HGRCPATH << EOF 93s - > [experimental] 93s - > evolution = createmarkers 93s - > evolution.createmarkers = yes 93s - > EOF 93s - $ hg tags 93s - tip 2:61175962e488 93s - default/master 2:61175962e488 93s - beta 1:7fe02317c63d 93s - alpha 0:ff7a2f2d8d70 93s - $ echo beta-fix-again >> beta 93s - $ fn_hg_commit --amend 93s - $ hg log -T shorttags 93s - 3:3094b9e8da41 draft tip 93s - 2:61175962e488 draft default/master X 93s - 1:7fe02317c63d draft beta 93s - 0:ff7a2f2d8d70 draft alpha 93s - $ hg tags 93s - tip 3:3094b9e8da41 93s - default/master 2:61175962e488 93s - beta 1:7fe02317c63d 93s - alpha 0:ff7a2f2d8d70 93s - $ hg push 93s - pushing to $TESTTMP/repo.git 93s - searching for changes 93s - abort: pushing refs/heads/master overwrites 3094b9e8da41 93s - [255] 93s - $ hg push -f 93s - pushing to $TESTTMP/repo.git 93s - searching for changes 93s - adding objects 93s - remote: found 0 deltas to reuse 93s - added 1 commits with 1 trees and 1 blobs 93s - updating reference refs/heads/master 93s - 93s -Now create a tag for the old, obsolete master 93s - 93s - $ cd ../repo.git 93s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 93s - $ git tag 93s - alpha 93s - beta 93s - detached 93s - $ cd ../hgrepo 93s - $ hg pull 93s - pulling from $TESTTMP/repo.git 93s - no changes found 93s - $ hg log -T shorttags 93s - 3:3094b9e8da41 draft default/master tip 93s - 2:61175962e488 draft detached X 93s - 1:7fe02317c63d draft beta 93s - 0:ff7a2f2d8d70 draft alpha 93s - $ hg tags 93s - tip 3:3094b9e8da41 93s - default/master 3:3094b9e8da41 93s - detached 2:61175962e488 93s - beta 1:7fe02317c63d 93s - alpha 0:ff7a2f2d8d70 93s - $ hg push 93s - pushing to $TESTTMP/repo.git 93s - searching for changes 93s - no changes found 93s - [1] 93s - 93s - $ cd .. 93s - 93s -Verify that revsets can point out git tags; for that we need an 93s -untagged commit. 93s - 93s - $ cd hgrepo 93s - $ touch gamma 93s - $ fn_hg_commit -A -m 'add gamma' 93s -#if secret 93s - $ hg phase -d 93s -#endif 93s - $ hg log -T shorttags -r 'gittag()' 93s - 0:ff7a2f2d8d70 draft alpha 93s - 1:7fe02317c63d draft beta 93s - 2:61175962e488 draft detached X 93s - $ hg log -T shorttags -r 'gittag(detached)' 93s - 2:61175962e488 draft detached X 93s - $ hg log -T shorttags -r 'gittag("re:a$")' 93s - 0:ff7a2f2d8d70 draft alpha 93s - 1:7fe02317c63d draft beta 93s - 93s -Create a git tag from hg, but pointing to a new commit: 93s - 93s - $ hg tag --git gamma --debug -r tip 93s - invalid branch cache (visible): tip differs (?) 93s - finding unexported changesets 93s - exporting 1 changesets 93s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 93s - packing 3 loose objects... 93s - packed 3 loose objects! 93s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 93s - adding git tag gamma 93s - $ hg push 93s - pushing to $TESTTMP/repo.git 93s - searching for changes 93s - adding objects 93s - remote: found 0 deltas to reuse 93s - added 1 commits with 1 trees and 1 blobs 93s - updating reference refs/heads/master 93s - adding reference refs/tags/gamma 93s - $ cd ../gitrepo 93s - $ git fetch --quiet --tags 93s - $ git tag 93s - alpha 93s - beta 93s - detached 93s - gamma 93s - $ cd .. 93s - 93s -Try to overwrite an annotated tag: 93s - 93s - $ cd hgrepo 93s - $ hg tags -v 93s - tip 4:0eb1ab0073a8 93s - gamma 4:0eb1ab0073a8 git 93s - default/master 4:0eb1ab0073a8 git-remote 93s - detached 2:61175962e488 git 93s - beta 1:7fe02317c63d git 93s - alpha 0:ff7a2f2d8d70 git 93s - $ hg book not-master 93s - $ hg tag beta 93s - abort: tag 'beta' already exists (use -f to force) 93s - [10] 93s - $ hg tag -f beta 93s -#if secret 93s - $ hg phase -d 93s -#endif 93s - $ hg push 93s - pushing to $TESTTMP/repo.git 93s - warning: not overwriting annotated tag 'beta' 93s - searching for changes 93s - adding objects 93s - remote: found 0 deltas to reuse 93s - added 1 commits with 1 trees and 1 blobs 93s - adding reference refs/heads/not-master 93s - $ hg tags 93s - tip 5:c49682c7cba4 93s - default/not-master 5:c49682c7cba4 93s - gamma 4:0eb1ab0073a8 93s - default/master 4:0eb1ab0073a8 93s - beta 4:0eb1ab0073a8 93s - detached 2:61175962e488 93s - alpha 0:ff7a2f2d8d70 93s - $ cd .. 93s - 93s -Check whether `gimport` handles tags 93s - 93s - $ cd hgrepo 93s - $ rm .hg/git-tags .hg/git-mapfile 93s - $ hg gimport 93s - importing 6 git commits 93s - $ hg tags -q 93s - tip 93s - default/not-master 93s - gamma 93s - default/master 93s - beta 93s - detached 93s - alpha 93s - $ cd .. 93s - 93s -Test how pulling an explicit branch with an annotated tag: 93s - 93s - $ hg clone -r master repo.git hgrepo-2 93s - importing 4 git commits 93s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 93s - updating to branch default 93s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 93s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 93s - 0:ff7a2f2d8d70 draft alpha 93s - 1:7fe02317c63d draft beta 93s - 3:0eb1ab0073a8 draft default/master gamma tip 93s - $ hg tags -v -R hgrepo-2 93s - tip 3:0eb1ab0073a8 93s - gamma 3:0eb1ab0073a8 git 93s - default/master 3:0eb1ab0073a8 git-remote 93s - beta 1:7fe02317c63d git 93s - alpha 0:ff7a2f2d8d70 git 93s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 93s - $ rm -rf hgrepo-2 93s - 93s - $ hg clone -r master repo.git hgrepo-2 93s - importing 4 git commits 93s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 93s - updating to branch default 93s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 93s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 93s - 0:ff7a2f2d8d70 draft alpha 93s - 1:7fe02317c63d draft beta 93s - 3:0eb1ab0073a8 draft default/master gamma tip 93s -This used to die: 93s - $ hg -R hgrepo-2 gexport 93s -This used to fail, since we didn't actually pull the annotated tag: 93s - $ hg -R hgrepo-2 push 93s - pushing to $TESTTMP/repo.git 93s - searching for changes 93s - no changes found 93s - [1] 93s - $ rm -rf hgrepo-2 93s - 93s -Check that pulling will update phases only: 93s - 93s - $ cd hgrepo 93s - $ hg phase -fs gamma detached 93s - $ hg pull 93s - pulling from $TESTTMP/repo.git 93s - no changes found 93s - $ hg log -T shorttags -r gamma -r detached 93s - 4:0eb1ab0073a8 draft beta default/master gamma 93s - 2:61175962e488 draft detached X 93s - $ cd .. 93s - 93s -Check that we pull new tags to existing commits: 93s - $ cd gitrepo 93s - $ git tag 93s - alpha 93s - beta 93s - detached 93s - gamma 93s - $ fn_git_tag extra-simple-tag 93s - $ fn_git_tag -m annotated extra-annotated-tag 93s - $ git push --tags 93s - To $TESTTMP/repo.git 93s - * [new tag] extra-annotated-tag -> extra-annotated-tag 93s - * [new tag] extra-simple-tag -> extra-simple-tag 93s - $ cd ../hgrepo 93s - $ hg pull -r master 93s - pulling from $TESTTMP/repo.git 93s - no changes found 93s - $ hg tags -v | grep extra 93s - extra-simple-tag 1:7fe02317c63d git 93s - extra-annotated-tag 1:7fe02317c63d git 93s 93s ERROR: test-git-tags.t#secret output changed 93s ! 93s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-pull-after-rebase.t 93s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-pull-after-rebase.t.err 93s @@ -38,275 +38,9 @@ 93s Clone it and rebase the branch 93s 93s $ hg clone -U repo.git hgrepo 93s - importing 3 git commits 93s - new changesets ff7a2f2d8d70:205a004356ef (3 drafts) 93s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 93s + abort: repository repo.git not found 93s + [255] 93s $ cd hgrepo 93s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 93s $ hg state 93s - o branch default/branch tip 2:205a004356ef32b8da782afb89d9179d12ca31e9 93s - | add gamma 93s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 93s - |/ add beta 93s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 93s - add alpha 93s - $ hg up branch 93s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 93s - (activating bookmark branch) 93s - $ hg rebase --quiet -d master 93s - $ hg state 93s - @ branch tip 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 93s - | add gamma 93s - | x default/branch 2:205a004356ef32b8da782afb89d9179d12ca31e9 93s - | | add gamma 93s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 93s - |/ add beta 93s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 93s - add alpha 93s - 93s - $ hg push -fr tip 93s - pushing to $TESTTMP/repo.git 93s - searching for changes 93s - adding objects 93s - remote: found 0 deltas to reuse 93s - added 1 commits with 1 trees and 1 blobs 93s - updating reference refs/heads/branch 93s - $ cd .. 93s - 93s -Now switch back to git and create a new commit based on what we just rebased 93s - 93s - $ cd gitrepo 93s - $ git checkout --quiet -b otherbranch branch 93s - $ git log --oneline --graph --all --decorate 93s - * e5023f9 (HEAD -> otherbranch, origin/branch, branch) add gamma 93s - | * 9497a4e (origin/master, master) add beta 93s - |/ 93s - * 7eeab2e add alpha 93s - $ echo delta > delta 93s - $ git add delta 93s - $ fn_git_commit -m 'add delta' 93s - $ git push --quiet --set-upstream origin otherbranch 93s - Branch 'otherbranch' set up to track remote branch 'otherbranch' from 'origin'. (?) 93s - $ git log --oneline --graph --all --decorate 93s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 93s - * e5023f9 (origin/branch, branch) add gamma 93s - | * 9497a4e (origin/master, master) add beta 93s - |/ 93s - * 7eeab2e add alpha 93s - $ cd .. 93s - 93s -Pull that 93s - 93s - $ cd hgrepo 93s - $ hg pull 93s - pulling from $TESTTMP/repo.git 93s - importing 1 git commits 93s - adding bookmark otherbranch 93s - 1 new orphan changesets 93s - new changesets 075302705298 (1 drafts) 93s - (run 'hg heads' to see heads, 'hg merge' to merge) 93s - $ hg state 93s - * otherbranch default/otherbranch tip 4:0753027052980aef9c9c37adb7d76d5719e8d818 93s - | add delta 93s - | @ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 93s - | | add gamma 93s - x | 2:205a004356ef32b8da782afb89d9179d12ca31e9 93s - | | add gamma 93s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 93s - |/ add beta 93s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 93s - add alpha 93s - 93s - $ cd .. 93s - 93s -To reproduce bug #386, do like github and save the old commit in a 93s -ref, and create a clone containing just the converted git commits: 93s - 93s - $ cd repo.git 93s - $ git update-ref refs/pr/1 otherbranch 93s - $ cd .. 93s - $ hg clone -U repo.git hgrepo-issue386 93s - importing 5 git commits 93s - new changesets ff7a2f2d8d70:075302705298 (5 drafts) 93s - 93s -Now try rebasing that branch, from the Git side of things 93s - 93s - $ cd gitrepo 93s - $ git checkout -q otherbranch 93s - $ git log --oneline --graph --all --decorate 93s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 93s - * e5023f9 (origin/branch, branch) add gamma 93s - | * 9497a4e (origin/master, master) add beta 93s - |/ 93s - * 7eeab2e add alpha 93s - $ fn_git_rebase --onto master branch otherbranch 93s - $ git log --oneline --graph --all --decorate 93s - * 9c58139 (HEAD -> otherbranch) add delta 93s - * 9497a4e (origin/master, master) add beta 93s - | * bba0011 (origin/otherbranch) add delta 93s - | * e5023f9 (origin/branch, branch) add gamma 93s - |/ 93s - * 7eeab2e add alpha 93s - $ git push -f 93s - To $TESTTMP/repo.git 93s - + bba0011...9c58139 otherbranch -> otherbranch (forced update) 93s - $ git log --oneline --graph --all --decorate 93s - * 9c58139 (HEAD -> otherbranch, origin/otherbranch) add delta 93s - * 9497a4e (origin/master, master) add beta 93s - | * e5023f9 (origin/branch, branch) add gamma 93s - |/ 93s - * 7eeab2e add alpha 93s - $ cd .. 93s - 93s -Now strip the old commit 93s - 93s - $ cd hgrepo-issue386 93s - $ hg up null 93s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 93s - $ hg id -qr otherbranch 93s - 075302705298 93s - $ hg pull 93s - pulling from $TESTTMP/repo.git 93s - importing 1 git commits 93s - not updating diverged bookmark otherbranch 93s - new changesets d64bf0521af6 (1 drafts) 93s - (run 'hg heads .' to see heads, 'hg merge' to merge) 93s - $ hg debugstrip --hidden --no-backup otherbranch 93s - $ hg book -d otherbranch 93s - $ hg git-cleanup 93s - git commit map cleaned 93s - $ hg pull 93s - pulling from $TESTTMP/repo.git 93s - no changes found 93s - adding bookmark otherbranch 93s - $ cd .. 93s - 93s -And check that pulling something else doesn't delete that branch. 93s - 93s - $ cd hgrepo 93s - $ hg pull -r master 93s - pulling from $TESTTMP/repo.git 93s - no changes found 93s - $ cd .. 93s - 93s -A special case, is that we can pull into a repository, where a commit 93s -corresponding to the new branch exists, but that commit is obsolete. 93s -In order to avoid “pinning” the obsolete commit, and thereby making it 93s -visible, we first pull from Git as an unnamed remote. 93s - 93s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 93s - updating to branch default 93s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 93s - $ cd hgrepo-clone 93s - $ hg pull ../repo.git 93s - pulling from ../repo.git 93s - importing 4 git commits 93s - not updating diverged bookmark otherbranch 93s - new changesets d64bf0521af6 (1 drafts) 93s - (run 'hg heads .' to see heads, 'hg merge' to merge) 93s - $ hg debugobsolete d64bf0521af68fe2160791a1b4ab9baf282a3879 93s - 1 new obsolescence markers 93s - obsoleted 1 changesets 93s - $ cp ../hgrepo/.hg/hgrc .hg 93s - $ hg pull 93s - pulling from $TESTTMP/repo.git 93s - no changes found 93s - not updating diverged bookmark otherbranch 93s - $ cd .. 93s - $ rm -rf hgrepo-clone 93s - 93s -Another special case, is that we should update commits over obsolete boundaries: 93s - 93s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 93s - updating to branch default 93s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 93s - $ cd hgrepo-clone 93s - $ hg pull ../repo.git 93s - pulling from ../repo.git 93s - importing 4 git commits 93s - not updating diverged bookmark otherbranch 93s - new changesets d64bf0521af6 (1 drafts) 93s - (run 'hg heads .' to see heads, 'hg merge' to merge) 93s - $ hg debugobsolete 0753027052980aef9c9c37adb7d76d5719e8d818 d64bf0521af68fe2160791a1b4ab9baf282a3879 93s - 1 new obsolescence markers 93s - obsoleted 1 changesets 93s - $ hg book -r 075302705298 otherbranch 93s - $ cp ../hgrepo/.hg/hgrc .hg 93s - $ hg pull 93s - pulling from $TESTTMP/repo.git 93s - no changes found 93s - updating bookmark otherbranch 93s - $ cd .. 93s - $ rm -rf hgrepo-clone 93s - 93s -Now just pull it: 93s - 93s - $ cd hgrepo 93s - $ hg pull 93s - pulling from $TESTTMP/repo.git 93s - importing 1 git commits 93s - not updating diverged bookmark otherbranch 93s - new changesets d64bf0521af6 (1 drafts) 93s - (run 'hg heads .' to see heads, 'hg merge' to merge) 93s - $ hg state 93s - o default/otherbranch tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 93s - | add delta 93s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 93s - | | add delta 93s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 93s - | | add gamma 93s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 93s - | | add gamma 93s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 93s - |/ add beta 93s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 93s - add alpha 93s - $ cd .. 93s - 93s -And finally, delete it: 93s - 93s - $ cd gitrepo 93s - $ git push origin :otherbranch 93s - To $TESTTMP/repo.git 93s - - [deleted] otherbranch 93s - $ cd .. 93s - 93s -And pull that: 93s - 93s - $ cd hgrepo 93s - $ hg pull 93s - pulling from $TESTTMP/repo.git 93s - no changes found 93s - not deleting diverged bookmark otherbranch 93s - $ hg state 93s - o tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 93s - | add delta 93s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 93s - | | add delta 93s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 93s - | | add gamma 93s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 93s - | | add gamma 93s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 93s - |/ add beta 93s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 93s - add alpha 93s - $ cd .. 93s - 93s -We only get that message once: 93s - 93s - $ hg -R hgrepo pull 93s - pulling from $TESTTMP/repo.git 93s - no changes found 93s - 93s -Now try deleting one already gone locally, which shouldn't output 93s -anything: 93s - 93s - $ cd gitrepo 93s - $ git push origin :branch 93s - To $TESTTMP/repo.git 93s - - [deleted] branch 93s - $ cd ../hgrepo 93s - $ hg book -d branch 93s - $ hg pull 93s - pulling from $TESTTMP/repo.git 93s - no changes found 93s - $ cd .. 93s 93s ERROR: test-pull-after-rebase.t output changed 93s ! 93s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-push.t 93s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-push.t.err 93s @@ -12,287 +12,10 @@ 93s 93s $ cd .. 93s $ hg clone -u tip gitrepo hgrepo 93s - importing 1 git commits 93s - new changesets ff7a2f2d8d70 (1 drafts) 93s - updating to branch default 93s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 93s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 93s + abort: repository gitrepo not found 93s + [255] 93s 93s $ cd hgrepo 93s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 93s $ hg bookmark -q master 93s - $ echo beta > beta 93s - $ hg add beta 93s - $ fn_hg_commit -m 'add beta' 93s - 93s - 93s - $ echo gamma > gamma 93s - $ hg add gamma 93s - $ fn_hg_commit -m 'add gamma' 93s - 93s - $ hg book -r 1 beta 93s - $ hg push -r beta 93s - pushing to $TESTTMP/gitrepo 93s - searching for changes 93s - adding objects 93s - remote: found 0 deltas to reuse 93s - added 1 commits with 1 trees and 1 blobs 93s - adding reference refs/heads/beta 93s - 93s - $ cd .. 93s - 93s -should have two different branches 93s - $ cd gitrepo 93s - $ git branch -v 93s - beta 0f378ab add beta 93s - master 7eeab2e add alpha 93s - * not-master 7eeab2e add alpha 93s - 93s -some more work on master from git 93s - $ git checkout master 2>&1 | sed s/\'/\"/g 93s - Switched to branch "master" 93s - $ echo delta > delta 93s - $ git add delta 93s - $ fn_git_commit -m "add delta" 93s - $ git checkout not-master 2>&1 | sed s/\'/\"/g 93s - Switched to branch "not-master" 93s - 93s - $ cd .. 93s - 93s - $ cd hgrepo 93s -this should fail 93s - $ hg push -r master 93s - pushing to $TESTTMP/gitrepo 93s - searching for changes 93s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 93s - [255] 93s - 93s -... even with -f 93s - $ hg push -fr master 93s - pushing to $TESTTMP/gitrepo 93s - searching for changes 93s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 93s - [255] 93s - 93s - $ hg pull 2>&1 | grep -v 'divergent bookmark' 93s - pulling from $TESTTMP/gitrepo 93s - importing 1 git commits 93s - not updating diverged bookmark master 93s - new changesets 25eed24f5e8f (1 drafts) 93s - (run 'hg heads' to see heads, 'hg merge' to merge) 93s -TODO shouldn't need to do this since we're (in theory) pushing master explicitly, 93s -which should not implicitly also push the not-master ref. 93s - $ hg book not-master -r default/not-master --force 93s -master and default/master should be diferent 93s - $ hg log -r master 93s - changeset: 2:953796e1cfd8 93s - bookmark: master 93s - user: test 93s - date: Mon Jan 01 00:00:12 2007 +0000 93s - summary: add gamma 93s - 93s - $ hg log -r default/master 93s - changeset: 3:25eed24f5e8f 93s - tag: default/master 93s - tag: tip 93s - parent: 0:ff7a2f2d8d70 93s - user: test 93s - date: Mon Jan 01 00:00:13 2007 +0000 93s - summary: add delta 93s - 93s - 93s -this should also fail 93s - $ hg push -r master 93s - pushing to $TESTTMP/gitrepo 93s - searching for changes 93s - abort: pushing refs/heads/master overwrites 953796e1cfd8 93s - [255] 93s - 93s -... but succeed with -f 93s - $ hg push -fr master 93s - pushing to $TESTTMP/gitrepo 93s - searching for changes 93s - adding objects 93s - remote: found 0 deltas to reuse 93s - added 1 commits with 1 trees and 1 blobs 93s - updating reference refs/heads/master 93s - 93s -this should fail, no changes to push 93s - $ hg push -r master 93s - pushing to $TESTTMP/gitrepo 93s - searching for changes 93s - no changes found 93s - [1] 93s - 93s -hg-git issue103 -- directories can lose information at hg-git export time 93s - 93s - $ hg up master 93s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 93s - $ mkdir dir1 93s - $ echo alpha > dir1/alpha 93s - $ hg add dir1/alpha 93s - $ fn_hg_commit -m 'add dir1/alpha' 93s - $ hg push -r master 93s - pushing to $TESTTMP/gitrepo 93s - searching for changes 93s - adding objects 93s - remote: found 0 deltas to reuse 93s - added 1 commits with 2 trees and 0 blobs 93s - updating reference refs/heads/master 93s - 93s - $ echo beta > dir1/beta 93s - $ hg add dir1/beta 93s - $ fn_hg_commit -m 'add dir1/beta' 93s - $ hg push -r master 93s - pushing to $TESTTMP/gitrepo 93s - searching for changes 93s - adding objects 93s - remote: found 0 deltas to reuse 93s - added 1 commits with 2 trees and 0 blobs 93s - updating reference refs/heads/master 93s - $ hg log -r master 93s - changeset: 5:ba0476ff1899 93s - bookmark: master 93s - tag: default/master 93s - tag: tip 93s - user: test 93s - date: Mon Jan 01 00:00:15 2007 +0000 93s - summary: add dir1/beta 93s - 93s - 93s - $ cat >> .hg/hgrc << EOF 93s - > [paths] 93s - > default:pushurl = file:///$TESTTMP/gitrepo 93s - > EOF 93s -NB: the triple slashes are intentional, due to windows 93s - $ hg push -r master 93s - pushing to file:///$TESTTMP/gitrepo 93s - searching for changes 93s - no changes found 93s - [1] 93s - 93s - $ cd .. 93s - 93s - $ hg clone -u tip gitrepo hgrepo-test 93s - importing 5 git commits 93s - new changesets ff7a2f2d8d70:ba0476ff1899 (5 drafts) 93s - updating to branch default 93s - 5 files updated, 0 files merged, 0 files removed, 0 files unresolved 93s - $ hg -R hgrepo-test log -r master 93s - changeset: 4:ba0476ff1899 93s - bookmark: master 93s - tag: default/master 93s - tag: tip 93s - user: test 93s - date: Mon Jan 01 00:00:15 2007 +0000 93s - summary: add dir1/beta 93s - 93s - $ hg tags -R hgrepo-test | grep ^default/ 93s - default/master 4:ba0476ff1899 93s - default/beta 1:47580592d3d6 93s - default/not-master 0:ff7a2f2d8d70 93s - 93s -Push a fast-forward to a currently checked out branch, which sometimes 93s -fails: 93s - 93s - $ cd hgrepo 93s - $ hg book -r master not-master 93s - moving bookmark 'not-master' forward from ff7a2f2d8d70 93s - $ hg push 93s - pushing to file:///$TESTTMP/gitrepo 93s - searching for changes 93s - warning: failed to update HEAD; unable to set b'HEAD' to b'7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03' (?) 93s - updating reference refs/heads/not-master 93s -That should have updated the tag: 93s - $ hg tags | grep ^default/ 93s - default/not-master 5:ba0476ff1899 93s - default/master 5:ba0476ff1899 93s - default/beta 1:47580592d3d6 93s - $ cd .. 93s - 93s -We can push only one of two bookmarks on the same revision: 93s - 93s - $ cd hgrepo 93s - $ hg book -r 0 also-not-master really-not-master 93s - $ hg push -B also-not-master 93s - pushing to file:///$TESTTMP/gitrepo 93s - searching for changes 93s - adding reference refs/heads/also-not-master 93s - 93s -We can also push another bookmark to a path with another revision 93s -specified: 93s - 93s - $ hg book -r 3 also-not-master 93s - moving bookmark 'also-not-master' forward from ff7a2f2d8d70 93s - $ hg push -B also-not-master "file:///$TESTTMP/gitrepo#master" 93s - pushing to file:///$TESTTMP/gitrepo 93s - searching for changes 93s - adding objects 93s - remote: found 0 deltas to reuse 93s - added 1 commits with 1 trees and 1 blobs 93s - updating reference refs/heads/also-not-master 93s - 93s -And we can delete them again afterwards: 93s - 93s - $ hg book -d also-not-master really-not-master 93s - $ hg push -B also-not-master -B really-not-master 93s - pushing to file:///$TESTTMP/gitrepo 93s - searching for changes 93s - warning: unable to delete 'refs/heads/really-not-master' as it does not exist on the remote repository 93s - deleting reference refs/heads/also-not-master 93s - 93s -Push empty Hg repo to empty Git repo (issue #58) 93s - $ hg init hgrepo2 93s - $ git init -q --bare repo.git 93s - $ hg -R hgrepo2 push repo.git 93s - pushing to repo.git 93s - searching for changes 93s - abort: no bookmarks or tags to push to git 93s - (see "hg help bookmarks" for details on creating them) 93s - [255] 93s - 93s -The remote repo is empty and the local one doesn't have any bookmarks/tags 93s - $ cd hgrepo2 93s - $ echo init >> test.txt 93s - $ hg addremove 93s - adding test.txt 93s - $ fn_hg_commit -m init 93s - $ hg update null 93s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 93s - $ hg push ../repo.git 93s - pushing to ../repo.git 93s - searching for changes 93s - abort: no bookmarks or tags to push to git 93s - (see "hg help bookmarks" for details on creating them) 93s - [255] 93s - $ hg summary 93s - parent: -1:000000000000 (no revision checked out) 93s - branch: default 93s - commit: (clean) 93s - update: 1 new changesets (update) 93s - phases: 1 draft 93s -That should not create any bookmarks 93s - $ hg bookmarks 93s - no bookmarks set 93s -And no tags for the remotes either: 93s - $ hg tags 93s - tip 0:8aded40be5af 93s - 93s -test for ssh vulnerability 93s - 93s - $ cat >> $HGRCPATH << EOF 93s - > [ui] 93s - > ssh = ssh -o ConnectTimeout=1 93s - > EOF 93s - $ hg push -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 93s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 93s - [255] 93s - $ hg push -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 93s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 93s - [255] 93s - $ hg push -q 'git+ssh://fakehost|rm%20nonexistent/path' 93s - ssh: * fakehost%7?rm%20nonexistent* (glob) 93s - abort: git remote error: The remote server unexpectedly closed the connection. 93s - [255] 93s - $ hg push -q 'git+ssh://fakehost%7Crm%20nonexistent/path' 93s - ssh: * fakehost%7?rm%20nonexistent* (glob) 93s - abort: git remote error: The remote server unexpectedly closed the connection. 93s - [255] 93s 93s ERROR: test-push.t output changed 99s ! 99s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-clone.t 99s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-clone.t#draft.err 99s @@ -38,60 +38,42 @@ 99s clone a tag 99s 99s $ hg clone -r alpha gitrepo hgrepo-a 99s - importing 1 git commits 99s - new changesets ff7a2f2d8d70 (1 drafts) 99s - updating to branch default 99s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository gitrepo not found 99s + [255] 99s $ hg -R hgrepo-a bookmarks 99s - master 0:ff7a2f2d8d70 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-a not found 99s + [255] 99s $ hg -R hgrepo-a log --graph --template=phases 99s - @ changeset: 0:ff7a2f2d8d70 99s - bookmark: master 99s - tag: alpha 99s - tag: default/master 99s - tag: tip 99s - phase: draft 99s - user: test 99s - date: Mon Jan 01 00:00:10 2007 +0000 99s - summary: add alpha 99s - 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-a not found 99s + [255] 99s $ git --git-dir hgrepo-a/.hg/git for-each-ref 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 99s + fatal: not a git repository: 'hgrepo-a/.hg/git' 99s + [128] 99s Make sure this is still draft since we didn't pull remote's HEAD 99s $ hg -R hgrepo-a phase -r alpha 99s - 0: draft 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-a not found 99s + [255] 99s 99s clone a branch 99s $ hg clone -r beta gitrepo hgrepo-b 99s - importing 2 git commits 99s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 99s - updating to branch default 99s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository gitrepo not found 99s + [255] 99s $ hg -R hgrepo-b bookmarks 99s - * beta 1:7fe02317c63d 99s - master 0:ff7a2f2d8d70 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-b not found 99s + [255] 99s $ hg -R hgrepo-b log --graph 99s - @ changeset: 1:7fe02317c63d 99s - | bookmark: beta 99s - | tag: default/beta 99s - | tag: tip 99s - | user: test 99s - | date: Mon Jan 01 00:00:11 2007 +0000 99s - | summary: add beta 99s - | 99s - o changeset: 0:ff7a2f2d8d70 99s - bookmark: master 99s - tag: alpha 99s - tag: default/master 99s - user: test 99s - date: Mon Jan 01 00:00:10 2007 +0000 99s - summary: add alpha 99s - 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-b not found 99s + [255] 99s $ git --git-dir hgrepo-b/.hg/git for-each-ref 99s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 99s + fatal: not a git repository: 'hgrepo-b/.hg/git' 99s + [128] 99s 99s Make sure that a deleted .hgsubstate does not confuse hg-git 99s 99s @@ -104,48 +86,50 @@ 99s $ cd .. 99s 99s $ hg clone -r beta gitrepo hgrepo-c 99s - importing 4 git commits 99s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 99s - updating to branch default 99s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository gitrepo not found 99s + [255] 99s $ hg -R hgrepo-c bookmarks 99s - * beta 3:47d12948785d 99s - master 0:ff7a2f2d8d70 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-c not found 99s + [255] 99s $ hg --cwd hgrepo-c status 99s + abort: No such file or directory: 'hgrepo-c' 99s + [255] 99s $ git --git-dir hgrepo-c/.hg/git for-each-ref 99s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 99s + fatal: not a git repository: 'hgrepo-c/.hg/git' 99s + [128] 99s 99s test shared repositories 99s 99s $ hg clone gitrepo hgrepo-base 99s - importing 5 git commits 99s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 99s - updating to bookmark beta 99s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository gitrepo not found 99s + [255] 99s $ hg -R hgrepo-base bookmarks 99s - * beta 4:47d12948785d 99s - gamma 2:ca33a262eb46 99s - master 0:ff7a2f2d8d70 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-base not found 99s + [255] 99s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 99s - updating working directory 99s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-base not found 99s + [255] 99s $ hg -R hgrepo-shared pull gitrepo 99s - pulling from gitrepo 99s - no changes found 99s - adding bookmark beta 99s - adding bookmark gamma 99s - adding bookmark master 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-shared not found 99s + [255] 99s $ hg -R hgrepo-shared push gitrepo 99s - pushing to gitrepo 99s - searching for changes 99s - no changes found 99s - [1] 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-shared not found 99s + [255] 99s $ ls hgrepo-shared/.hg | grep git 99s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 99s [1] 99s $ hg -R hgrepo-shared git-cleanup 99s - git commit map cleaned 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + hg: unknown command 'git-cleanup' 99s + (did you mean clean?) 99s + [10] 99s $ rm -rf hgrepo-base hgrepo-shared 99s 99s test cloning HEAD 99s @@ -154,23 +138,21 @@ 99s $ git checkout -q master 99s $ cd .. 99s $ hg clone gitrepo hgrepo-2 99s - importing 5 git commits 99s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 99s - updating to bookmark master 99s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository gitrepo not found 99s + [255] 99s $ git --git-dir hgrepo-2/.hg/git for-each-ref 99s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 99s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 99s + fatal: not a git repository: 'hgrepo-2/.hg/git' 99s + [128] 99s $ rm -rf hgrepo-2 99s 99s clone empty repo 99s $ git init empty 99s Initialized empty Git repository in $TESTTMP/empty/.git/ 99s $ hg clone empty emptyhg 99s - updating to branch default 99s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository empty not found 99s + [255] 99s $ rm -rf empty emptyhg 99s 99s test cloning detached HEAD, but pointing to a branch; we detect this 99s @@ -180,25 +162,20 @@ 99s $ git checkout -q -d master 99s $ cd .. 99s $ hg clone gitrepo hgrepo-2 99s - importing 5 git commits 99s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 99s - updating to bookmark master 99s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository gitrepo not found 99s + [255] 99s $ hg -R hgrepo-2 book 99s - beta 4:47d12948785d 99s - gamma 2:ca33a262eb46 99s - * master 0:ff7a2f2d8d70 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-2 not found 99s + [255] 99s $ hg -R hgrepo-2 tags -v 99s - tip 4:47d12948785d 99s - default/beta 4:47d12948785d git-remote 99s - default/gamma 2:ca33a262eb46 git-remote 99s - default/master 0:ff7a2f2d8d70 git-remote 99s - alpha 0:ff7a2f2d8d70 git 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-2 not found 99s + [255] 99s $ git --git-dir hgrepo-2/.hg/git for-each-ref 99s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 99s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 99s + fatal: not a git repository: 'hgrepo-2/.hg/git' 99s + [128] 99s $ rm -rf hgrepo-2 99s 99s test cloning fully detached HEAD; we don't convert the 99s @@ -212,44 +189,45 @@ 99s $ fn_git_commit -m 'add delta' 99s $ cd .. 99s $ hg clone gitrepo hgrepo-2 99s - importing 5 git commits 99s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 99s - warning: the git source repository has a detached head 99s - (you may want to update to a bookmark) 99s - updating to branch default 99s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository gitrepo not found 99s + [255] 99s $ hg -R hgrepo-2 book 99s - beta 4:47d12948785d 99s - gamma 2:ca33a262eb46 99s - master 0:ff7a2f2d8d70 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-2 not found 99s + [255] 99s $ hg -R hgrepo-2 id --tags 99s - default/beta tip 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-2 not found 99s + [255] 99s $ git --git-dir hgrepo-2/.hg/git for-each-ref 99s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 99s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 99s + fatal: not a git repository: 'hgrepo-2/.hg/git' 99s + [128] 99s $ rm -rf hgrepo-2 99s 99s test that cloning a regular mercurial repository does not introduce 99s git state 99s 99s $ hg init hgrepo-base 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s $ cd hgrepo-base 99s $ touch flaf 99s $ fn_hg_commit -A -m flaf 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s $ cd .. 99s $ hg clone -U hgrepo-base hgrepo-copy 99s requesting all changes (secret !) 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s $ ls hgrepo-copy/.hg | grep git 99s [1] 99s $ hg clone -U --pull hgrepo-base hgrepo-pull 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s requesting all changes 99s - adding changesets (draft !) 99s - adding manifests (draft !) 99s - adding file changes (draft !) 99s - added 1 changesets with 1 changes to 1 files (draft !) 99s - new changesets 76c919376257 (draft !) 99s + adding changesets 99s + adding manifests 99s + adding file changes 99s + added 1 changesets with 1 changes to 1 files 99s + new changesets 76c919376257 99s $ ls hgrepo-pull | grep git 99s [1] 99s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 99s 99s ERROR: test-clone.t#draft output changed 99s ! 99s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-clone.t 99s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-clone.t#secret.err 99s @@ -38,60 +38,42 @@ 99s clone a tag 99s 99s $ hg clone -r alpha gitrepo hgrepo-a 99s - importing 1 git commits 99s - new changesets ff7a2f2d8d70 (1 drafts) 99s - updating to branch default 99s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository gitrepo not found 99s + [255] 99s $ hg -R hgrepo-a bookmarks 99s - master 0:ff7a2f2d8d70 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-a not found 99s + [255] 99s $ hg -R hgrepo-a log --graph --template=phases 99s - @ changeset: 0:ff7a2f2d8d70 99s - bookmark: master 99s - tag: alpha 99s - tag: default/master 99s - tag: tip 99s - phase: draft 99s - user: test 99s - date: Mon Jan 01 00:00:10 2007 +0000 99s - summary: add alpha 99s - 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-a not found 99s + [255] 99s $ git --git-dir hgrepo-a/.hg/git for-each-ref 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 99s + fatal: not a git repository: 'hgrepo-a/.hg/git' 99s + [128] 99s Make sure this is still draft since we didn't pull remote's HEAD 99s $ hg -R hgrepo-a phase -r alpha 99s - 0: draft 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-a not found 99s + [255] 99s 99s clone a branch 99s $ hg clone -r beta gitrepo hgrepo-b 99s - importing 2 git commits 99s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 99s - updating to branch default 99s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository gitrepo not found 99s + [255] 99s $ hg -R hgrepo-b bookmarks 99s - * beta 1:7fe02317c63d 99s - master 0:ff7a2f2d8d70 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-b not found 99s + [255] 99s $ hg -R hgrepo-b log --graph 99s - @ changeset: 1:7fe02317c63d 99s - | bookmark: beta 99s - | tag: default/beta 99s - | tag: tip 99s - | user: test 99s - | date: Mon Jan 01 00:00:11 2007 +0000 99s - | summary: add beta 99s - | 99s - o changeset: 0:ff7a2f2d8d70 99s - bookmark: master 99s - tag: alpha 99s - tag: default/master 99s - user: test 99s - date: Mon Jan 01 00:00:10 2007 +0000 99s - summary: add alpha 99s - 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-b not found 99s + [255] 99s $ git --git-dir hgrepo-b/.hg/git for-each-ref 99s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 99s + fatal: not a git repository: 'hgrepo-b/.hg/git' 99s + [128] 99s 99s Make sure that a deleted .hgsubstate does not confuse hg-git 99s 99s @@ -104,48 +86,50 @@ 99s $ cd .. 99s 99s $ hg clone -r beta gitrepo hgrepo-c 99s - importing 4 git commits 99s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 99s - updating to branch default 99s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository gitrepo not found 99s + [255] 99s $ hg -R hgrepo-c bookmarks 99s - * beta 3:47d12948785d 99s - master 0:ff7a2f2d8d70 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-c not found 99s + [255] 99s $ hg --cwd hgrepo-c status 99s + abort: No such file or directory: 'hgrepo-c' 99s + [255] 99s $ git --git-dir hgrepo-c/.hg/git for-each-ref 99s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 99s + fatal: not a git repository: 'hgrepo-c/.hg/git' 99s + [128] 99s 99s test shared repositories 99s 99s $ hg clone gitrepo hgrepo-base 99s - importing 5 git commits 99s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 99s - updating to bookmark beta 99s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository gitrepo not found 99s + [255] 99s $ hg -R hgrepo-base bookmarks 99s - * beta 4:47d12948785d 99s - gamma 2:ca33a262eb46 99s - master 0:ff7a2f2d8d70 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-base not found 99s + [255] 99s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 99s - updating working directory 99s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-base not found 99s + [255] 99s $ hg -R hgrepo-shared pull gitrepo 99s - pulling from gitrepo 99s - no changes found 99s - adding bookmark beta 99s - adding bookmark gamma 99s - adding bookmark master 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-shared not found 99s + [255] 99s $ hg -R hgrepo-shared push gitrepo 99s - pushing to gitrepo 99s - searching for changes 99s - no changes found 99s - [1] 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-shared not found 99s + [255] 99s $ ls hgrepo-shared/.hg | grep git 99s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 99s [1] 99s $ hg -R hgrepo-shared git-cleanup 99s - git commit map cleaned 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + hg: unknown command 'git-cleanup' 99s + (did you mean clean?) 99s + [10] 99s $ rm -rf hgrepo-base hgrepo-shared 99s 99s test cloning HEAD 99s @@ -154,23 +138,21 @@ 99s $ git checkout -q master 99s $ cd .. 99s $ hg clone gitrepo hgrepo-2 99s - importing 5 git commits 99s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 99s - updating to bookmark master 99s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository gitrepo not found 99s + [255] 99s $ git --git-dir hgrepo-2/.hg/git for-each-ref 99s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 99s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 99s + fatal: not a git repository: 'hgrepo-2/.hg/git' 99s + [128] 99s $ rm -rf hgrepo-2 99s 99s clone empty repo 99s $ git init empty 99s Initialized empty Git repository in $TESTTMP/empty/.git/ 99s $ hg clone empty emptyhg 99s - updating to branch default 99s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository empty not found 99s + [255] 99s $ rm -rf empty emptyhg 99s 99s test cloning detached HEAD, but pointing to a branch; we detect this 99s @@ -180,25 +162,20 @@ 99s $ git checkout -q -d master 99s $ cd .. 99s $ hg clone gitrepo hgrepo-2 99s - importing 5 git commits 99s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 99s - updating to bookmark master 99s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository gitrepo not found 99s + [255] 99s $ hg -R hgrepo-2 book 99s - beta 4:47d12948785d 99s - gamma 2:ca33a262eb46 99s - * master 0:ff7a2f2d8d70 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-2 not found 99s + [255] 99s $ hg -R hgrepo-2 tags -v 99s - tip 4:47d12948785d 99s - default/beta 4:47d12948785d git-remote 99s - default/gamma 2:ca33a262eb46 git-remote 99s - default/master 0:ff7a2f2d8d70 git-remote 99s - alpha 0:ff7a2f2d8d70 git 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-2 not found 99s + [255] 99s $ git --git-dir hgrepo-2/.hg/git for-each-ref 99s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 99s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 99s + fatal: not a git repository: 'hgrepo-2/.hg/git' 99s + [128] 99s $ rm -rf hgrepo-2 99s 99s test cloning fully detached HEAD; we don't convert the 99s @@ -212,44 +189,45 @@ 99s $ fn_git_commit -m 'add delta' 99s $ cd .. 99s $ hg clone gitrepo hgrepo-2 99s - importing 5 git commits 99s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 99s - warning: the git source repository has a detached head 99s - (you may want to update to a bookmark) 99s - updating to branch default 99s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository gitrepo not found 99s + [255] 99s $ hg -R hgrepo-2 book 99s - beta 4:47d12948785d 99s - gamma 2:ca33a262eb46 99s - master 0:ff7a2f2d8d70 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-2 not found 99s + [255] 99s $ hg -R hgrepo-2 id --tags 99s - default/beta tip 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + abort: repository hgrepo-2 not found 99s + [255] 99s $ git --git-dir hgrepo-2/.hg/git for-each-ref 99s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 99s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 99s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 99s + fatal: not a git repository: 'hgrepo-2/.hg/git' 99s + [128] 99s $ rm -rf hgrepo-2 99s 99s test that cloning a regular mercurial repository does not introduce 99s git state 99s 99s $ hg init hgrepo-base 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s $ cd hgrepo-base 99s $ touch flaf 99s $ fn_hg_commit -A -m flaf 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s $ cd .. 99s $ hg clone -U hgrepo-base hgrepo-copy 99s - requesting all changes (secret !) 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s + requesting all changes 99s $ ls hgrepo-copy/.hg | grep git 99s [1] 99s $ hg clone -U --pull hgrepo-base hgrepo-pull 99s - requesting all changes 99s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 99s adding changesets (draft !) 99s adding manifests (draft !) 99s adding file changes (draft !) 99s added 1 changesets with 1 changes to 1 files (draft !) 99s new changesets 76c919376257 (draft !) 99s + requesting all changes 99s $ ls hgrepo-pull | grep git 99s [1] 99s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 99s 99s ERROR: test-clone.t#secret output changed 100s ! 100s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-branch-bookmark-suffix.t 100s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-branch-bookmark-suffix.t#with-path.err 100s @@ -9,287 +9,12 @@ 100s $ git init -q --bare repo.git 100s 100s $ hg clone repo.git hgrepo 100s - updating to branch default 100s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 100s + abort: repository repo.git not found 100s + [255] 100s $ cd hgrepo 100s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 100s #if without-path 100s $ rm .hg/hgrc 100s #endif 100s $ hg branch -q branch1 100s - $ hg bookmark branch1_bookmark 100s - $ echo f1 > f1 100s - $ hg add f1 100s - $ fn_hg_commit -m "add f1" 100s - $ hg branch -q branch2 100s - $ hg bookmark branch2_bookmark 100s - $ echo f2 > f2 100s - $ hg add f2 100s - $ fn_hg_commit -m "add f2" 100s - $ hg log --graph 100s - @ changeset: 1:600de9b6d498 100s - | branch: branch2 100s - | bookmark: branch2_bookmark 100s - | tag: tip 100s - | user: test 100s - | date: Mon Jan 01 00:00:11 2007 +0000 100s - | summary: add f2 100s - | 100s - o changeset: 0:40a840c1f8ae 100s - branch: branch1 100s - bookmark: branch1_bookmark 100s - user: test 100s - date: Mon Jan 01 00:00:10 2007 +0000 100s - summary: add f1 100s - 100s - 100s - $ hg push -B asdasd ../repo.git 100s - pushing to ../repo.git 100s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 100s - [255] 100s - 100s - $ hg push ../repo.git 100s - pushing to ../repo.git 100s - searching for changes 100s - adding objects 100s - remote: found 0 deltas to reuse 100s - added 2 commits with 2 trees and 2 blobs 100s - adding reference refs/heads/branch1 100s - adding reference refs/heads/branch2 100s - 100s - $ cd .. 100s - 100s - $ cd repo.git 100s - $ git symbolic-ref HEAD refs/heads/branch1 100s - $ git branch 100s - * branch1 100s - branch2 100s - $ cd .. 100s - 100s - $ git clone repo.git gitrepo 100s - Cloning into 'gitrepo'... 100s - done. 100s - $ cd gitrepo 100s - $ git checkout -q branch1 100s - $ echo g1 >> f1 100s - $ git add f1 100s - $ fn_git_commit -m "append f1" 100s - $ git checkout -q branch2 100s - $ echo g2 >> f2 100s - $ git add f2 100s - $ fn_git_commit -m "append f2" 100s - $ git checkout -b branch3 100s - Switched to a new branch 'branch3' 100s - $ echo g3 >> f3 100s - $ git add f3 100s - $ fn_git_commit -m "append f3" 100s - $ git push origin branch1 branch2 branch3 100s - To $TESTTMP/repo.git 100s - bbfe79a..d8aef79 branch1 -> branch1 100s - 288e92b..f8f8de5 branch2 -> branch2 100s - * [new branch] branch3 -> branch3 100s -make sure the commit doesn't have an HG:rename-source annotation 100s - $ git cat-file commit d8aef79 100s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 100s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 100s - author test 1167609612 +0000 100s - committer test 1167609612 +0000 100s - 100s - append f1 100s - $ cd .. 100s - 100s - $ cd hgrepo 100s - $ hg paths 100s - default = $TESTTMP/repo.git (with-path !) 100s - $ hg pull ../repo.git 100s - pulling from ../repo.git 100s - importing 3 git commits 100s - updating bookmark branch1_bookmark 100s - updating bookmark branch2_bookmark 100s - adding bookmark branch3_bookmark 100s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 100s - (run 'hg heads' to see heads) 100s - $ hg log --graph 100s - o changeset: 4:faf44fc3a4e8 100s - | bookmark: branch3_bookmark 100s - | tag: default/branch3 (with-path !) 100s - | tag: tip 100s - | user: test 100s - | date: Mon Jan 01 00:00:14 2007 +0000 100s - | summary: append f3 100s - | 100s - o changeset: 3:ae8eb55f7090 100s - | bookmark: branch2_bookmark 100s - | tag: default/branch2 (with-path !) 100s - | parent: 1:600de9b6d498 100s - | user: test 100s - | date: Mon Jan 01 00:00:13 2007 +0000 100s - | summary: append f2 100s - | 100s - | o changeset: 2:8211cade99e4 100s - | | bookmark: branch1_bookmark 100s - | | tag: default/branch1 (with-path !) 100s - | | parent: 0:40a840c1f8ae 100s - | | user: test 100s - | | date: Mon Jan 01 00:00:12 2007 +0000 100s - | | summary: append f1 100s - | | 100s - @ | changeset: 1:600de9b6d498 100s - |/ branch: branch2 100s - | user: test 100s - | date: Mon Jan 01 00:00:11 2007 +0000 100s - | summary: add f2 100s - | 100s - o changeset: 0:40a840c1f8ae 100s - branch: branch1 100s - user: test 100s - date: Mon Jan 01 00:00:10 2007 +0000 100s - summary: add f1 100s - 100s - $ cd .. 100s - 100s -Try cloning a bookmark, and make sure it gets checked out: 100s - 100s - $ rm -r hgrepo 100s - $ hg clone -r branch3 repo.git hgrepo 100s - importing 4 git commits 100s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 100s - updating to bookmark branch3_bookmark 100s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s - $ cd hgrepo 100s - $ hg bookmarks 100s - branch2_bookmark 2:ae8eb55f7090 100s - * branch3_bookmark 3:faf44fc3a4e8 100s - $ hg log --graph 100s - @ changeset: 3:faf44fc3a4e8 100s - | bookmark: branch3_bookmark 100s - | tag: default/branch3 100s - | tag: tip 100s - | user: test 100s - | date: Mon Jan 01 00:00:14 2007 +0000 100s - | summary: append f3 100s - | 100s - o changeset: 2:ae8eb55f7090 100s - | bookmark: branch2_bookmark 100s - | tag: default/branch2 100s - | user: test 100s - | date: Mon Jan 01 00:00:13 2007 +0000 100s - | summary: append f2 100s - | 100s - o changeset: 1:600de9b6d498 100s - | branch: branch2 100s - | user: test 100s - | date: Mon Jan 01 00:00:11 2007 +0000 100s - | summary: add f2 100s - | 100s - o changeset: 0:40a840c1f8ae 100s - branch: branch1 100s - user: test 100s - date: Mon Jan 01 00:00:10 2007 +0000 100s - summary: add f1 100s - 100s - $ cd .. 100s - 100s -Try cloning something that's both a bookmark and a branch, and see the 100s -results. They're a bit suprising as the bookmark does get activated, 100s -but the branch get checked out. Although this does seem a bit odd, so 100s -does the scenario. 100s - 100s - $ rm -r hgrepo 100s - $ hg clone -r branch1 repo.git hgrepo 100s - importing 2 git commits 100s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 100s - updating to branch branch1 100s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s - $ cd hgrepo 100s - $ hg bookmarks 100s - * branch1_bookmark 1:8211cade99e4 100s - $ hg log --graph 100s - o changeset: 1:8211cade99e4 100s - | bookmark: branch1_bookmark 100s - | tag: default/branch1 100s - | tag: tip 100s - | user: test 100s - | date: Mon Jan 01 00:00:12 2007 +0000 100s - | summary: append f1 100s - | 100s - @ changeset: 0:40a840c1f8ae 100s - branch: branch1 100s - user: test 100s - date: Mon Jan 01 00:00:10 2007 +0000 100s - summary: add f1 100s - 100s - 100s - $ cd .. 100s - 100s -Now try pulling a diverged bookmark: 100s - 100s - $ rm -r hgrepo 100s -#if with-path 100s - $ hg clone -U repo.git hgrepo 100s - importing 5 git commits 100s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 100s -#else 100s - $ hg init hgrepo 100s - $ hg -R hgrepo pull repo.git 100s - pulling from repo.git 100s - importing 5 git commits 100s - adding bookmark branch1_bookmark 100s - adding bookmark branch2_bookmark 100s - adding bookmark branch3_bookmark 100s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 100s - (run 'hg heads' to see heads, 'hg merge' to merge) 100s -#endif 100s - $ cd gitrepo 100s - $ git checkout -q branch1 100s - $ fn_git_rebase branch3 100s - $ git push -f 100s - To $TESTTMP/repo.git 100s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 100s - $ cd ../hgrepo 100s - $ hg pull ../repo.git 100s - pulling from ../repo.git 100s - importing 1 git commits 100s - not updating diverged bookmark branch1_bookmark 100s - new changesets 895d0307f8b7 (1 drafts) 100s - (run 'hg update' to get a working copy) 100s - $ hg log --graph 100s - o changeset: 5:895d0307f8b7 100s - | tag: default/branch1 (with-path !) 100s - | tag: tip 100s - | user: test 100s - | date: Mon Jan 01 00:00:12 2007 +0000 100s - | summary: append f1 100s - | 100s - o changeset: 4:faf44fc3a4e8 100s - | bookmark: branch3_bookmark 100s - | tag: default/branch3 (with-path !) 100s - | user: test 100s - | date: Mon Jan 01 00:00:14 2007 +0000 100s - | summary: append f3 100s - | 100s - o changeset: 3:ae8eb55f7090 100s - | bookmark: branch2_bookmark 100s - | tag: default/branch2 (with-path !) 100s - | user: test 100s - | date: Mon Jan 01 00:00:13 2007 +0000 100s - | summary: append f2 100s - | 100s - o changeset: 2:600de9b6d498 100s - | branch: branch2 100s - | parent: 0:40a840c1f8ae 100s - | user: test 100s - | date: Mon Jan 01 00:00:11 2007 +0000 100s - | summary: add f2 100s - | 100s - | o changeset: 1:8211cade99e4 100s - |/ bookmark: branch1_bookmark 100s - | user: test 100s - | date: Mon Jan 01 00:00:12 2007 +0000 100s - | summary: append f1 100s - | 100s - o changeset: 0:40a840c1f8ae 100s - branch: branch1 100s - user: test 100s - date: Mon Jan 01 00:00:10 2007 +0000 100s - summary: add f1 100s - 100s 100s ERROR: test-branch-bookmark-suffix.t#with-path output changed 100s ! 100s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-branch-bookmark-suffix.t 100s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-branch-bookmark-suffix.t#without-path.err 100s @@ -9,287 +9,10 @@ 100s $ git init -q --bare repo.git 100s 100s $ hg clone repo.git hgrepo 100s - updating to branch default 100s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 100s + abort: repository repo.git not found 100s + [255] 100s $ cd hgrepo 100s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 100s #if without-path 100s $ rm .hg/hgrc 100s -#endif 100s - $ hg branch -q branch1 100s - $ hg bookmark branch1_bookmark 100s - $ echo f1 > f1 100s - $ hg add f1 100s - $ fn_hg_commit -m "add f1" 100s - $ hg branch -q branch2 100s - $ hg bookmark branch2_bookmark 100s - $ echo f2 > f2 100s - $ hg add f2 100s - $ fn_hg_commit -m "add f2" 100s - $ hg log --graph 100s - @ changeset: 1:600de9b6d498 100s - | branch: branch2 100s - | bookmark: branch2_bookmark 100s - | tag: tip 100s - | user: test 100s - | date: Mon Jan 01 00:00:11 2007 +0000 100s - | summary: add f2 100s - | 100s - o changeset: 0:40a840c1f8ae 100s - branch: branch1 100s - bookmark: branch1_bookmark 100s - user: test 100s - date: Mon Jan 01 00:00:10 2007 +0000 100s - summary: add f1 100s - 100s - 100s - $ hg push -B asdasd ../repo.git 100s - pushing to ../repo.git 100s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 100s - [255] 100s - 100s - $ hg push ../repo.git 100s - pushing to ../repo.git 100s - searching for changes 100s - adding objects 100s - remote: found 0 deltas to reuse 100s - added 2 commits with 2 trees and 2 blobs 100s - adding reference refs/heads/branch1 100s - adding reference refs/heads/branch2 100s - 100s - $ cd .. 100s - 100s - $ cd repo.git 100s - $ git symbolic-ref HEAD refs/heads/branch1 100s - $ git branch 100s - * branch1 100s - branch2 100s - $ cd .. 100s - 100s - $ git clone repo.git gitrepo 100s - Cloning into 'gitrepo'... 100s - done. 100s - $ cd gitrepo 100s - $ git checkout -q branch1 100s - $ echo g1 >> f1 100s - $ git add f1 100s - $ fn_git_commit -m "append f1" 100s - $ git checkout -q branch2 100s - $ echo g2 >> f2 100s - $ git add f2 100s - $ fn_git_commit -m "append f2" 100s - $ git checkout -b branch3 100s - Switched to a new branch 'branch3' 100s - $ echo g3 >> f3 100s - $ git add f3 100s - $ fn_git_commit -m "append f3" 100s - $ git push origin branch1 branch2 branch3 100s - To $TESTTMP/repo.git 100s - bbfe79a..d8aef79 branch1 -> branch1 100s - 288e92b..f8f8de5 branch2 -> branch2 100s - * [new branch] branch3 -> branch3 100s -make sure the commit doesn't have an HG:rename-source annotation 100s - $ git cat-file commit d8aef79 100s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 100s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 100s - author test 1167609612 +0000 100s - committer test 1167609612 +0000 100s - 100s - append f1 100s - $ cd .. 100s - 100s - $ cd hgrepo 100s - $ hg paths 100s - default = $TESTTMP/repo.git (with-path !) 100s - $ hg pull ../repo.git 100s - pulling from ../repo.git 100s - importing 3 git commits 100s - updating bookmark branch1_bookmark 100s - updating bookmark branch2_bookmark 100s - adding bookmark branch3_bookmark 100s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 100s - (run 'hg heads' to see heads) 100s - $ hg log --graph 100s - o changeset: 4:faf44fc3a4e8 100s - | bookmark: branch3_bookmark 100s - | tag: default/branch3 (with-path !) 100s - | tag: tip 100s - | user: test 100s - | date: Mon Jan 01 00:00:14 2007 +0000 100s - | summary: append f3 100s - | 100s - o changeset: 3:ae8eb55f7090 100s - | bookmark: branch2_bookmark 100s - | tag: default/branch2 (with-path !) 100s - | parent: 1:600de9b6d498 100s - | user: test 100s - | date: Mon Jan 01 00:00:13 2007 +0000 100s - | summary: append f2 100s - | 100s - | o changeset: 2:8211cade99e4 100s - | | bookmark: branch1_bookmark 100s - | | tag: default/branch1 (with-path !) 100s - | | parent: 0:40a840c1f8ae 100s - | | user: test 100s - | | date: Mon Jan 01 00:00:12 2007 +0000 100s - | | summary: append f1 100s - | | 100s - @ | changeset: 1:600de9b6d498 100s - |/ branch: branch2 100s - | user: test 100s - | date: Mon Jan 01 00:00:11 2007 +0000 100s - | summary: add f2 100s - | 100s - o changeset: 0:40a840c1f8ae 100s - branch: branch1 100s - user: test 100s - date: Mon Jan 01 00:00:10 2007 +0000 100s - summary: add f1 100s - 100s - $ cd .. 100s - 100s -Try cloning a bookmark, and make sure it gets checked out: 100s - 100s - $ rm -r hgrepo 100s - $ hg clone -r branch3 repo.git hgrepo 100s - importing 4 git commits 100s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 100s - updating to bookmark branch3_bookmark 100s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s - $ cd hgrepo 100s - $ hg bookmarks 100s - branch2_bookmark 2:ae8eb55f7090 100s - * branch3_bookmark 3:faf44fc3a4e8 100s - $ hg log --graph 100s - @ changeset: 3:faf44fc3a4e8 100s - | bookmark: branch3_bookmark 100s - | tag: default/branch3 100s - | tag: tip 100s - | user: test 100s - | date: Mon Jan 01 00:00:14 2007 +0000 100s - | summary: append f3 100s - | 100s - o changeset: 2:ae8eb55f7090 100s - | bookmark: branch2_bookmark 100s - | tag: default/branch2 100s - | user: test 100s - | date: Mon Jan 01 00:00:13 2007 +0000 100s - | summary: append f2 100s - | 100s - o changeset: 1:600de9b6d498 100s - | branch: branch2 100s - | user: test 100s - | date: Mon Jan 01 00:00:11 2007 +0000 100s - | summary: add f2 100s - | 100s - o changeset: 0:40a840c1f8ae 100s - branch: branch1 100s - user: test 100s - date: Mon Jan 01 00:00:10 2007 +0000 100s - summary: add f1 100s - 100s - $ cd .. 100s - 100s -Try cloning something that's both a bookmark and a branch, and see the 100s -results. They're a bit suprising as the bookmark does get activated, 100s -but the branch get checked out. Although this does seem a bit odd, so 100s -does the scenario. 100s - 100s - $ rm -r hgrepo 100s - $ hg clone -r branch1 repo.git hgrepo 100s - importing 2 git commits 100s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 100s - updating to branch branch1 100s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s - $ cd hgrepo 100s - $ hg bookmarks 100s - * branch1_bookmark 1:8211cade99e4 100s - $ hg log --graph 100s - o changeset: 1:8211cade99e4 100s - | bookmark: branch1_bookmark 100s - | tag: default/branch1 100s - | tag: tip 100s - | user: test 100s - | date: Mon Jan 01 00:00:12 2007 +0000 100s - | summary: append f1 100s - | 100s - @ changeset: 0:40a840c1f8ae 100s - branch: branch1 100s - user: test 100s - date: Mon Jan 01 00:00:10 2007 +0000 100s - summary: add f1 100s - 100s - 100s - $ cd .. 100s - 100s -Now try pulling a diverged bookmark: 100s - 100s - $ rm -r hgrepo 100s -#if with-path 100s - $ hg clone -U repo.git hgrepo 100s - importing 5 git commits 100s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 100s -#else 100s - $ hg init hgrepo 100s - $ hg -R hgrepo pull repo.git 100s - pulling from repo.git 100s - importing 5 git commits 100s - adding bookmark branch1_bookmark 100s - adding bookmark branch2_bookmark 100s - adding bookmark branch3_bookmark 100s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 100s - (run 'hg heads' to see heads, 'hg merge' to merge) 100s -#endif 100s - $ cd gitrepo 100s - $ git checkout -q branch1 100s - $ fn_git_rebase branch3 100s - $ git push -f 100s - To $TESTTMP/repo.git 100s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 100s - $ cd ../hgrepo 100s - $ hg pull ../repo.git 100s - pulling from ../repo.git 100s - importing 1 git commits 100s - not updating diverged bookmark branch1_bookmark 100s - new changesets 895d0307f8b7 (1 drafts) 100s - (run 'hg update' to get a working copy) 100s - $ hg log --graph 100s - o changeset: 5:895d0307f8b7 100s - | tag: default/branch1 (with-path !) 100s - | tag: tip 100s - | user: test 100s - | date: Mon Jan 01 00:00:12 2007 +0000 100s - | summary: append f1 100s - | 100s - o changeset: 4:faf44fc3a4e8 100s - | bookmark: branch3_bookmark 100s - | tag: default/branch3 (with-path !) 100s - | user: test 100s - | date: Mon Jan 01 00:00:14 2007 +0000 100s - | summary: append f3 100s - | 100s - o changeset: 3:ae8eb55f7090 100s - | bookmark: branch2_bookmark 100s - | tag: default/branch2 (with-path !) 100s - | user: test 100s - | date: Mon Jan 01 00:00:13 2007 +0000 100s - | summary: append f2 100s - | 100s - o changeset: 2:600de9b6d498 100s - | branch: branch2 100s - | parent: 0:40a840c1f8ae 100s - | user: test 100s - | date: Mon Jan 01 00:00:11 2007 +0000 100s - | summary: add f2 100s - | 100s - | o changeset: 1:8211cade99e4 100s - |/ bookmark: branch1_bookmark 100s - | user: test 100s - | date: Mon Jan 01 00:00:12 2007 +0000 100s - | summary: append f1 100s - | 100s - o changeset: 0:40a840c1f8ae 100s - branch: branch1 100s - user: test 100s - date: Mon Jan 01 00:00:10 2007 +0000 100s - summary: add f1 100s - 100s 100s ERROR: test-branch-bookmark-suffix.t#without-path output changed 100s ! 100s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-bundle.t 100s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-bundle.t.err 100s @@ -36,247 +36,12 @@ 100s Clone it! 100s 100s $ hg clone gitrepo hgrepo 100s - importing 3 git commits 100s - new changesets ff7a2f2d8d70:ca33a262eb46 (3 drafts) 100s - updating to bookmark master 100s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 100s + abort: repository gitrepo not found 100s + [255] 100s $ cd hgrepo 100s + $TESTTMP.sh: 45: cd: can't cd to hgrepo 100s 100s Create a bundle with our metadata, and inspect it: 100s 100s $ hg bundle --all ../bundle-w-git.hg 100s - 3 changesets found 100s - $ hg debugbundle --all ../bundle-w-git.hg | grep hg-git 100s - exp-hg-git-map -- {} (mandatory: False) 100s - exp-hg-git-tags -- {} (mandatory: False) 100s - $ hg debugbundle --all ../bundle-w-git.hg > bundle-w-git.out 100s - 100s -Create a bundle without our metadata, and inspect it: 100s - 100s - $ hg bundle --all ../bundle-wo-git.hg --config experimental.hg-git-bundle=no 100s - 3 changesets found 100s - $ hg debugbundle --all ../bundle-wo-git.hg | grep hg-git 100s - [1] 100s - 100s -Verify that those are different: 100s - 100s - $ hg debugbundle --all ../bundle-wo-git.hg > bundle-wo-git.out 100s - $ cmp -s bundle-w-git.out bundle-wo-git.out 100s - [1] 100s - 100s -Now create a bundle without hg-git enabled at all, which should be 100s -exactly similar to what you get when you disable metadata embedding; 100s -this verifies we don't accidentally pollute bundles. 100s - 100s - $ hg bundle --all --config extensions.hggit=! ../bundle-wo-hggit.hg 100s - 3 changesets found 100s - $ hg debugbundle --all ../bundle-wo-hggit.hg > bundle-wo-hggit.out 100s - $ cmp -s bundle-wo-git.hg bundle-wo-hggit.hg 100s - [2] 100s - $ cmp -s bundle-wo-git.out bundle-wo-hggit.out 100s - $ cd .. 100s - $ rm -r hgrepo 100s - 100s -Does unbundling transfer state? 100s - 100s - $ hg init hgrepo 100s - $ hg -R hgrepo unbundle bundle-w-git.hg 100s - adding changesets 100s - adding manifests 100s - adding file changes 100s - added 3 changesets with 3 changes to 3 files 100s - new changesets * (glob) 100s - (run 'hg update' to get a working copy) 100s - $ hg -R hgrepo log -T git 100s - 2:ca33a262eb46 | d338971a96e2 | tip | 100s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 100s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 100s - $ hg -R hgrepo pull gitrepo 100s - pulling from gitrepo 100s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 100s - no changes found 100s - adding bookmark master 100s - $ rm -r hgrepo 100s - 100s -Can we unbundle something without git state? 100s - 100s - $ hg init hgrepo 100s - $ hg -R hgrepo unbundle bundle-wo-git.hg 100s - adding changesets 100s - adding manifests 100s - adding file changes 100s - added 3 changesets with 3 changes to 3 files 100s - new changesets * (glob) 100s - (run 'hg update' to get a working copy) 100s - $ hg -R hgrepo log -T git 100s - 2:ca33a262eb46 | | tip | 100s - 1:7fe02317c63d | | | 100s - 0:ff7a2f2d8d70 | | | 100s - $ hg -R hgrepo pull gitrepo 100s - pulling from gitrepo 100s - importing 3 git commits 100s - adding bookmark master 100s - (run 'hg update' to get a working copy) 100s - $ rm -r hgrepo 100s - 100s -Regular mercurial shouldn't choke on our bundle 100s - 100s - $ hg init hgrepo 100s - $ cat >> hgrepo/.hg/hgrc < [extensions] 100s - > hggit = ! 100s - > EOF 100s - $ hg -R hgrepo unbundle bundle-wo-git.hg 100s - adding changesets 100s - adding manifests 100s - adding file changes 100s - added 3 changesets with 3 changes to 3 files 100s - new changesets * (glob) 100s - (run 'hg update' to get a working copy) 100s - $ hg -R hgrepo log -T git 100s - 2:ca33a262eb46 | | tip | 100s - 1:7fe02317c63d | | | 100s - 0:ff7a2f2d8d70 | | | 100s - $ hg -R hgrepo pull gitrepo 100s - pulling from gitrepo 100s - abort: repository gitrepo not found!? (re) 100s - [255] 100s - $ rm -r hgrepo 100s - 100s - 100s -What happens if we unbundle twice? 100s - 100s - $ hg init hgrepo 100s - $ hg -R hgrepo unbundle bundle-w-git.hg 100s - adding changesets 100s - adding manifests 100s - adding file changes 100s - added 3 changesets with 3 changes to 3 files 100s - new changesets * (glob) 100s - (run 'hg update' to get a working copy) 100s - $ hg -R hgrepo unbundle bundle-w-git.hg 100s - adding changesets 100s - adding manifests 100s - adding file changes 100s - added 0 changesets with 0 changes to 3 files 100s - (run 'hg update' to get a working copy) 100s - $ hg -R hgrepo log -T git 100s - 2:ca33a262eb46 | d338971a96e2 | tip | 100s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 100s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 100s - $ hg -R hgrepo pull gitrepo 100s - pulling from gitrepo 100s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 100s - no changes found 100s - adding bookmark master 100s - $ rm -r hgrepo 100s - 100s -Alas, cloning a bundle doesn't work yet: 100s - 100s -(Mercurial is apparently quite dumb here, so we won't try to fix this 100s -for now, but this test mostly exists so that we notice if ever starts 100s -working, or breaks entirely.) 100s - 100s - $ hg clone bundle-w-git.hg hgrepo 100s - requesting all changes 100s - adding changesets 100s - adding manifests 100s - adding file changes 100s - added 3 changesets with 3 changes to 3 files 100s - new changesets * (glob) 100s - updating to branch default 100s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s - $ hg -R hgrepo log -T git 100s - 2:ca33a262eb46 | | tip | 100s - 1:7fe02317c63d | | | 100s - 0:ff7a2f2d8d70 | | | 100s - $ rm -r hgrepo 100s - 100s -Now, lets try to be a bit evil. How does pulling partial state work? 100s - 100s -First, more git happenings: 100s - 100s - $ cd gitrepo 100s - $ git checkout -b otherbranch thetag 100s - Switched to a new branch 'otherbranch' 100s - $ echo 42 > baz 100s - $ git add baz 100s - $ fn_git_commit -m 3 100s - $ cd .. 100s - 100s -Pull, 'em, and create a partial bundle: 100s - 100s - $ hg clone gitrepo hgrepo 100s - importing 4 git commits 100s - new changesets ff7a2f2d8d70:d87bf3ef6a53 (4 drafts) 100s - updating to bookmark otherbranch 100s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s - $ hg -R hgrepo bundle --base 'p1(tip)' -r tip bundle-w-git-2.hg 100s - 1 changesets found 100s - $ rm -r hgrepo 100s - 100s -Now, load only that bundle into a repository without any git state 100s - 100s - $ hg clone -r 1 bundle-w-git.hg hgrepo --config extensions.hggit=! 100s - adding changesets 100s - adding manifests 100s - adding file changes 100s - added 2 changesets with 2 changes to 2 files 100s - new changesets * (glob) 100s - updating to branch default 100s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s - $ cd hgrepo 100s - $ hg unbundle ../bundle-w-git-2.hg 100s - adding changesets 100s - adding manifests 100s - adding file changes 100s - added 1 changesets with 1 changes to 1 files (+1 heads) 100s - new changesets * (glob) 100s - (run 'hg heads' to see heads, 'hg merge' to merge) 100s - $ hg pull ../gitrepo 100s - pulling from ../gitrepo 100s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 100s - importing 3 git commits 100s - adding bookmark master 100s - adding bookmark otherbranch 100s - new changesets ca33a262eb46 (1 drafts) 100s - (run 'hg update' to get a working copy) 100s - $ cd .. 100s - $ rm -r hgrepo 100s - 100s -Now, try pushing with only the metadata: 100s - 100s - $ hg init hgrepo 100s - $ cd hgrepo 100s - $ hg unbundle -u ../bundle-w-git.hg 100s - adding changesets 100s - adding manifests 100s - adding file changes 100s - added 3 changesets with 3 changes to 3 files 100s - new changesets * (glob) 100s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s - $ echo kaflaflibob > bajizmo 100s - $ fn_hg_commit -A -m 4 100s - $ hg book -r tip master 100s - $ hg push ../gitrepo 100s - pushing to ../gitrepo 100s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 100s - abort: cannot push git commit d338971a96e2 as it is not present locally 100s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 100s - [255] 100s - 100s -Try to repopulate the git state from a bundle 100s - 100s - $ hg debug-remove-hggit-state 100s - clearing out the git cache data 100s - $ hg log -qr 'fromgit()' 100s - $ hg unbundle -u ../bundle-w-git.hg 100s - adding changesets 100s - adding manifests 100s - adding file changes 100s - added 0 changesets with 0 changes to 3 files 100s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s - $ hg log -qr 'fromgit()' 100s - 0:ff7a2f2d8d70 100s - 1:7fe02317c63d 100s - 2:ca33a262eb46 100s 100s ERROR: test-bundle.t output changed 101s ! 101s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-file-removal.t 101s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-file-removal.t.err 101s @@ -98,192 +98,9 @@ 101s $ git init -q --bare repo.git 101s 101s $ hg clone gitrepo hgrepo 101s - importing 9 git commits 101s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 101s - updating to bookmark master 101s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 101s + abort: repository gitrepo not found 101s + [255] 101s $ cd hgrepo 101s + $TESTTMP.sh: 72: cd: can't cd to hgrepo 101s $ hg log --graph 101s - @ changeset: 8:0995b8a0a943 101s - | bookmark: master 101s - | tag: default/master 101s - | tag: tip 101s - | user: test 101s - | date: Mon Jan 01 00:00:18 2007 +0000 101s - | summary: remove betalink 101s - | 101s - o changeset: 7:a316d3a96c89 101s - | user: test 101s - | date: Mon Jan 01 00:00:17 2007 +0000 101s - | summary: replace file with symlink 101s - | 101s - o changeset: 6:1804acb71f3e 101s - | user: test 101s - | date: Mon Jan 01 00:00:16 2007 +0000 101s - | summary: replace symlink with file 101s - | 101s - o changeset: 5:e19c85becc87 101s - | user: test 101s - | date: Mon Jan 01 00:00:15 2007 +0000 101s - | summary: add symlink to beta 101s - | 101s - o changeset: 4:0d3086c3f8c3 101s - | user: test 101s - | date: Mon Jan 01 00:00:14 2007 +0000 101s - | summary: remove foo/bar 101s - | 101s - o changeset: 3:b2406125ef5c 101s - | user: test 101s - | date: Mon Jan 01 00:00:13 2007 +0000 101s - | summary: remove alpha 101s - | 101s - o changeset: 2:8b3b2f4b4158 101s - | user: test 101s - | date: Mon Jan 01 00:00:12 2007 +0000 101s - | summary: add foo 101s - | 101s - o changeset: 1:7fe02317c63d 101s - | user: test 101s - | date: Mon Jan 01 00:00:11 2007 +0000 101s - | summary: add beta 101s - | 101s - o changeset: 0:ff7a2f2d8d70 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add alpha 101s - 101s - 101s -make sure alpha is not in this manifest 101s - $ hg manifest -r 3 101s - beta 101s - foo/bar 101s - 101s -make sure that only beta is in the manifest 101s - $ hg manifest 101s - beta 101s - 101s - $ hg debug-remove-hggit-state 101s - clearing out the git cache data 101s - $ ls .hg | grep git 101s - [1] 101s - $ hg push ../repo.git 101s - pushing to ../repo.git 101s - searching for changes 101s - adding objects 101s - remote: found 0 deltas to reuse 101s - added 9 commits with 8 trees and 5 blobs 101s - adding reference refs/heads/master 101s - 101s - $ cd .. 101s - $ git --git-dir=repo.git log --pretty=medium 101s - commit 5ee11eeae239d6a99df5a99901ec00ffafbcc46b 101s - Author: test 101s - Date: Mon Jan 1 00:00:18 2007 +0000 101s - 101s - remove betalink 101s - 101s - commit 2c7b324faeccb1acf89c35b7ad38e7956f5705fa 101s - Author: test 101s - Date: Mon Jan 1 00:00:17 2007 +0000 101s - 101s - replace file with symlink 101s - 101s - commit ff0478d2ecc2571d01eb6d406ac29e4e63e5d3d5 101s - Author: test 101s - Date: Mon Jan 1 00:00:16 2007 +0000 101s - 101s - replace symlink with file 101s - 101s - commit 5492e6e410e42df527956be945286cd1ae45acb8 101s - Author: test 101s - Date: Mon Jan 1 00:00:15 2007 +0000 101s - 101s - add symlink to beta 101s - 101s - commit b991de8952c482a7cd51162674ffff8474862218 101s - Author: test 101s - Date: Mon Jan 1 00:00:14 2007 +0000 101s - 101s - remove foo/bar 101s - 101s - commit b0edaf0adac19392cf2867498b983bc5192b41dd 101s - Author: test 101s - Date: Mon Jan 1 00:00:13 2007 +0000 101s - 101s - remove alpha 101s - 101s - commit f2d0d5bfa905e12dee728b509b96cf265bb6ee43 101s - Author: test 101s - Date: Mon Jan 1 00:00:12 2007 +0000 101s - 101s - add foo 101s - 101s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 101s - Author: test 101s - Date: Mon Jan 1 00:00:11 2007 +0000 101s - 101s - add beta 101s - 101s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 101s - Author: test 101s - Date: Mon Jan 1 00:00:10 2007 +0000 101s - 101s - add alpha 101s - 101s -test with rename detection enabled 101s - $ hg --config git.similarity=100 clone gitrepo hgreporenames 101s - importing 9 git commits 101s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 101s - updating to bookmark master 101s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s - 101s - $ cd hgreporenames 101s - $ hg log --graph 101s - @ changeset: 8:0995b8a0a943 101s - | bookmark: master 101s - | tag: default/master 101s - | tag: tip 101s - | user: test 101s - | date: Mon Jan 01 00:00:18 2007 +0000 101s - | summary: remove betalink 101s - | 101s - o changeset: 7:a316d3a96c89 101s - | user: test 101s - | date: Mon Jan 01 00:00:17 2007 +0000 101s - | summary: replace file with symlink 101s - | 101s - o changeset: 6:1804acb71f3e 101s - | user: test 101s - | date: Mon Jan 01 00:00:16 2007 +0000 101s - | summary: replace symlink with file 101s - | 101s - o changeset: 5:e19c85becc87 101s - | user: test 101s - | date: Mon Jan 01 00:00:15 2007 +0000 101s - | summary: add symlink to beta 101s - | 101s - o changeset: 4:0d3086c3f8c3 101s - | user: test 101s - | date: Mon Jan 01 00:00:14 2007 +0000 101s - | summary: remove foo/bar 101s - | 101s - o changeset: 3:b2406125ef5c 101s - | user: test 101s - | date: Mon Jan 01 00:00:13 2007 +0000 101s - | summary: remove alpha 101s - | 101s - o changeset: 2:8b3b2f4b4158 101s - | user: test 101s - | date: Mon Jan 01 00:00:12 2007 +0000 101s - | summary: add foo 101s - | 101s - o changeset: 1:7fe02317c63d 101s - | user: test 101s - | date: Mon Jan 01 00:00:11 2007 +0000 101s - | summary: add beta 101s - | 101s - o changeset: 0:ff7a2f2d8d70 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add alpha 101s - 101s 101s ERROR: test-file-removal.t output changed 101s ! 101s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-hg-author.t 101s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-hg-author.t.err 101s @@ -16,256 +16,10 @@ 101s 101s $ cd .. 101s $ hg clone repo.git hgrepo 101s - importing 1 git commits 101s - new changesets ff7a2f2d8d70 (1 drafts) 101s - updating to bookmark master 101s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 101s + abort: repository repo.git not found 101s + [255] 101s 101s $ cd hgrepo 101s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 101s $ hg book master 101s - $ echo beta > beta 101s - $ hg add beta 101s - $ fn_hg_commit -u "test" -m 'add beta' 101s - $ hg push 101s - pushing to $TESTTMP/repo.git 101s - searching for changes 101s - adding objects 101s - remote: found 0 deltas to reuse 101s - added 1 commits with 1 trees and 1 blobs 101s - updating reference refs/heads/master 101s - 101s - $ echo gamma >> beta 101s - $ fn_hg_commit -u "test (comment)" -m 'modify beta' 101s - $ hg push 101s - pushing to $TESTTMP/repo.git 101s - searching for changes 101s - adding objects 101s - remote: found 0 deltas to reuse 101s - added 1 commits with 1 trees and 1 blobs 101s - updating reference refs/heads/master 101s - 101s - $ echo gamma > gamma 101s - $ hg add gamma 101s - $ fn_hg_commit -u "" -m 'add gamma' 101s - $ hg push 101s - pushing to $TESTTMP/repo.git 101s - searching for changes 101s - adding objects 101s - remote: found 0 deltas to reuse 101s - added 1 commits with 1 trees and 1 blobs 101s - updating reference refs/heads/master 101s - 101s - $ echo delta > delta 101s - $ hg add delta 101s - $ fn_hg_commit -u "name" -m 'add delta' 101s - $ hg push 101s - pushing to $TESTTMP/repo.git 101s - searching for changes 101s - adding objects 101s - remote: found 0 deltas to reuse 101s - added 1 commits with 1 trees and 1 blobs 101s - updating reference refs/heads/master 101s - 101s - $ echo epsilon > epsilon 101s - $ hg add epsilon 101s - $ fn_hg_commit -u "name zeta 101s - $ hg add zeta 101s - $ fn_hg_commit -u " test " -m 'add zeta' 101s - $ hg push 101s - pushing to $TESTTMP/repo.git 101s - searching for changes 101s - adding objects 101s - remote: found 0 deltas to reuse 101s - added 1 commits with 1 trees and 1 blobs 101s - updating reference refs/heads/master 101s - 101s - $ echo eta > eta 101s - $ hg add eta 101s - $ fn_hg_commit -u "test < test@example.com >" -m 'add eta' 101s - $ hg push 101s - pushing to $TESTTMP/repo.git 101s - searching for changes 101s - adding objects 101s - remote: found 0 deltas to reuse 101s - added 1 commits with 1 trees and 1 blobs 101s - updating reference refs/heads/master 101s - 101s - $ echo theta > theta 101s - $ hg add theta 101s - $ fn_hg_commit -u "test >test@example.com>" -m 'add theta' 101s - $ hg push 101s - pushing to $TESTTMP/repo.git 101s - searching for changes 101s - adding objects 101s - remote: found 0 deltas to reuse 101s - added 1 commits with 1 trees and 1 blobs 101s - updating reference refs/heads/master 101s - 101s - $ hg log --graph 101s - @ changeset: 8:c5d1976ab12c 101s - | bookmark: master 101s - | tag: default/master 101s - | tag: tip 101s - | user: test >test@example.com> 101s - | date: Mon Jan 01 00:00:18 2007 +0000 101s - | summary: add theta 101s - | 101s - o changeset: 7:0e2fb4d21667 101s - | user: test < test@example.com > 101s - | date: Mon Jan 01 00:00:17 2007 +0000 101s - | summary: add eta 101s - | 101s - o changeset: 6:faa3aae96199 101s - | user: test 101s - | date: Mon Jan 01 00:00:16 2007 +0000 101s - | summary: add zeta 101s - | 101s - o changeset: 5:2cf6ad5a1afc 101s - | user: name 101s - | date: Mon Jan 01 00:00:14 2007 +0000 101s - | summary: add delta 101s - | 101s - o changeset: 3:6b854d65d0d6 101s - | user: 101s - | date: Mon Jan 01 00:00:13 2007 +0000 101s - | summary: add gamma 101s - | 101s - o changeset: 2:46303c652e79 101s - | user: test (comment) 101s - | date: Mon Jan 01 00:00:12 2007 +0000 101s - | summary: modify beta 101s - | 101s - o changeset: 1:47580592d3d6 101s - | user: test 101s - | date: Mon Jan 01 00:00:11 2007 +0000 101s - | summary: add beta 101s - | 101s - o changeset: 0:ff7a2f2d8d70 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add alpha 101s - 101s - 101s - $ cd .. 101s - $ hg clone repo.git hgrepo2 101s - importing 9 git commits 101s - new changesets ff7a2f2d8d70:1fbf3aa91221 (9 drafts) 101s - updating to bookmark master 101s - 8 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s - $ hg -R hgrepo2 log --graph 101s - @ changeset: 8:1fbf3aa91221 101s - | bookmark: master 101s - | tag: default/master 101s - | tag: tip 101s - | user: test ?test@example.com 101s - | date: Mon Jan 01 00:00:18 2007 +0000 101s - | summary: add theta 101s - | 101s - o changeset: 7:20310508f06d 101s - | user: test 101s - | date: Mon Jan 01 00:00:17 2007 +0000 101s - | summary: add eta 101s - | 101s - o changeset: 6:e3d81af8a8c1 101s - | user: test 101s - | date: Mon Jan 01 00:00:16 2007 +0000 101s - | summary: add zeta 101s - | 101s - o changeset: 5:78f609fd208f 101s - | user: name 101s - | date: Mon Jan 01 00:00:15 2007 +0000 101s - | summary: add epsilon 101s - | 101s - o changeset: 4:42fa61d57718 101s - | user: name 101s - | date: Mon Jan 01 00:00:14 2007 +0000 101s - | summary: add delta 101s - | 101s - o changeset: 3:6b854d65d0d6 101s - | user: 101s - | date: Mon Jan 01 00:00:13 2007 +0000 101s - | summary: add gamma 101s - | 101s - o changeset: 2:46303c652e79 101s - | user: test (comment) 101s - | date: Mon Jan 01 00:00:12 2007 +0000 101s - | summary: modify beta 101s - | 101s - o changeset: 1:47580592d3d6 101s - | user: test 101s - | date: Mon Jan 01 00:00:11 2007 +0000 101s - | summary: add beta 101s - | 101s - o changeset: 0:ff7a2f2d8d70 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add alpha 101s - 101s - $ git --git-dir=repo.git log --pretty=medium master 101s - commit 2fe60ba69727981e6ede78be70354c3a9e30e21d 101s - Author: test ?test@example.com 101s - Date: Mon Jan 1 00:00:18 2007 +0000 101s - 101s - add theta 101s - 101s - commit 9f2f7cafdbf2e467928db98de8275141001d3081 101s - Author: test 101s - Date: Mon Jan 1 00:00:17 2007 +0000 101s - 101s - add eta 101s - 101s - commit 172a6f8d8064d73dff7013e395a9fe3cfc3ff807 101s - Author: test 101s - Date: Mon Jan 1 00:00:16 2007 +0000 101s - 101s - add zeta 101s - 101s - commit 71badb8e343a7da391a9b5d98909fbd2ca7d78f2 101s - Author: name 101s - Date: Mon Jan 1 00:00:15 2007 +0000 101s - 101s - add epsilon 101s - 101s - commit 9a9ae7b7f310d4a1a3e732a747ca26f06934f8d8 101s - Author: name 101s - Date: Mon Jan 1 00:00:14 2007 +0000 101s - 101s - add delta 101s - 101s - commit e4149a32e81e380193f59aa8773349201b8ed7f7 101s - Author: 101s - Date: Mon Jan 1 00:00:13 2007 +0000 101s - 101s - add gamma 101s - 101s - commit fae95aef5889a80103c2fbd5d14ff6eb8c9daf93 101s - Author: test ext:(%20%28comment%29) 101s - Date: Mon Jan 1 00:00:12 2007 +0000 101s - 101s - modify beta 101s - 101s - commit 0f378ab6c2c6b5514bd873d3faf8ac4b8095b001 101s - Author: test 101s - Date: Mon Jan 1 00:00:11 2007 +0000 101s - 101s - add beta 101s - 101s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 101s - Author: test 101s - Date: Mon Jan 1 00:00:10 2007 +0000 101s - 101s - add alpha 101s 101s ERROR: test-hg-author.t output changed 102s ! 102s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-subrepos.t 102s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-subrepos.t.err 102s @@ -34,165 +34,8 @@ 102s $ cd .. 102s Ensure gitlinks are transformed to .hgsubstate on hg pull from git 102s $ hg clone -u tip repo.git hgrepo 2>&1 | grep -E -v '^(Cloning into|done)' 102s - importing 3 git commits 102s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 102s - updating to branch default 102s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 102s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 102s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 102s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 102s + abort: repository repo.git not found 102s $ cd hgrepo 102s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 102s $ hg bookmarks -f -r default master 102s -1. Ensure gitlinks are transformed to .hgsubstate on hg <- git pull 102s -.hgsub shall list two [git] subrepos 102s - $ cat .hgsub 102s - subrepo1 = [git]../gitsubrepo 102s - xyz/subrepo2 = [git]../gitsubrepo 102s -.hgsubstate shall list two idenitcal revisions 102s - $ cat .hgsubstate 102s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 102s - 56f0304c5250308f14cfbafdc27bd12d40154d17 xyz/subrepo2 102s -hg status shall NOT report .hgsub and .hgsubstate as untracked - either ignored or unmodified 102s - $ hg status --unknown .hgsub .hgsubstate 102s - $ hg status --modified .hgsub .hgsubstate 102s - $ cd .. 102s - 102s -2. Check gitmodules are preserved during hg -> git push 102s - $ cd gitsubrepo 102s - $ echo gamma > gamma 102s - $ git add gamma 102s - $ fn_git_commit -m 'add gamma' 102s - $ cd .. 102s - $ cd hgrepo 102s - $ cd xyz/subrepo2 102s - $ git pull --ff-only | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| */| /' 102s - From $TESTTMP/gitsubrepo 102s - 56f0304..aabf7cd master -> origin/master 102s - Updating 56f0304..aabf7cd 102s - Fast-forward 102s - gamma | 1 + 102s - 1 file changed, 1 insertion(+) 102s - create mode 100644 gamma 102s - $ cd ../.. 102s - $ echo xxx >> alpha 102s - $ fn_hg_commit -m 'Update subrepo2 from hg' | grep -v "committing subrepository" || true 102s - $ hg push 102s - pushing to $TESTTMP/repo.git 102s - searching for changes 102s - adding objects 102s - remote: found 0 deltas to reuse 102s - added 1 commits with 2 trees and 1 blobs 102s - updating reference refs/heads/master 102s - $ cd .. 102s - $ cd gitrepo 102s - $ git pull --ff-only 102s - From $TESTTMP/repo 102s - 89c22d7..275b0a5 master -> origin/master 102s - Fetching submodule xyz/subrepo2 102s - From $TESTTMP/gitsubrepo 102s - 56f0304..aabf7cd master -> origin/master 102s - Updating 89c22d7..275b0a5 102s - Fast-forward 102s - alpha | 1 + 102s - xyz/subrepo2 | 2 +- 102s - 2 files changed, 2 insertions(+), 1 deletion(-) 102s -there shall be two gitlink entries, with values matching that in .hgsubstate 102s - $ git ls-tree -r HEAD^{tree} | grep 'commit' 102s - 160000 commit 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 102s - 160000 commit aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 102s -bring working copy to HEAD state (it's not bare repo) 102s - $ git reset --hard 102s - HEAD is now at 275b0a5 Update subrepo2 from hg 102s - $ cd .. 102s - 102s -3. Check .hgsub and .hgsubstate from git repository are merged, not overwritten 102s - $ hg init hgsub 102s - $ cd hgsub 102s - $ echo delta > delta 102s - $ hg add delta 102s - $ fn_hg_commit -m "add delta" 102s - $ hg tip --template '{node} hgsub\n' > ../gitrepo/.hgsubstate 102s - $ cat > ../gitrepo/.hgsub < hgsub = ../hgsub 102s - > EOF 102s - $ cd ../gitrepo 102s - $ git add .hgsubstate .hgsub 102s - $ fn_git_commit -m "Test3. Prepare .hgsub and .hgsubstate sources" 102s - $ git push 102s - To $TESTTMP/repo.git 102s - 275b0a5..e31d576 master -> master 102s - 102s - $ cd ../hgrepo 102s - $ hg pull 102s - pulling from $TESTTMP/repo.git 102s - importing 1 git commits 102s - updating bookmark master 102s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 102s - (run 'hg update' to get a working copy) 102s - $ hg checkout -C 102s - updating to active bookmark master 102s - cloning subrepo hgsub from $TESTTMP/hgsub 102s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 102s - $ cd .. 102s -pull shall bring .hgsub entry which was added to the git repo 102s - $ cat hgrepo/.hgsub 102s - hgsub = ../hgsub 102s - subrepo1 = [git]../gitsubrepo 102s - xyz/subrepo2 = [git]../gitsubrepo 102s -.hgsubstate shall list revision of the subrepo added through git repo 102s - $ cat hgrepo/.hgsubstate 102s - 481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub 102s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 102s - aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 102s - 102s -4. Try changing the subrepos from the Mercurial side 102s - 102s - $ cd hgrepo 102s - $ cat >> .hgsub < subrepo2 = [git]../gitsubrepo 102s - > EOF 102s - $ git clone ../gitsubrepo subrepo2 102s - Cloning into 'subrepo2'... 102s - done. 102s - $ fn_hg_commit -m 'some stuff' 102s - $ hg push 102s - pushing to $TESTTMP/repo.git 102s - no changes made to subrepo hgsub since last push to $TESTTMP/hgsub 102s - searching for changes 102s - adding objects 102s - remote: found 0 deltas to reuse 102s - added 1 commits with 1 trees and 1 blobs 102s - updating reference refs/heads/master 102s - $ cd .. 102s - 102s -5. But we actually do something quite weird in this case: If a 102s -.gitmodules file exists in the repository, it always wins! In this 102s -case, we break the bidirectional convention, and modify the repository 102s -data. That's odd, so show it: 102s - 102s - $ hg id hgrepo 102s - 42c46c7eef3a default/master/tip master 102s - $ hg clone -U repo.git hgrepo2 102s - importing 6 git commits 102s - new changesets e532b2bfda10:42c46c7eef3a (6 drafts) 102s - $ hg -R hgrepo2 up :master 102s - Cloning into '$TESTTMP/hgrepo2/subrepo1'... 102s - done. 102s - cloning subrepo hgsub from $TESTTMP/hgsub 102s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 102s - checking out detached HEAD in subrepository "subrepo1" 102s - check out a git branch if you intend to make changes 102s - Cloning into '$TESTTMP/hgrepo2/subrepo2'... 102s - done. 102s - Cloning into '$TESTTMP/hgrepo2/xyz/subrepo2'... 102s - done. 102s - cloning subrepo subrepo2 from $TESTTMP/gitsubrepo 102s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 102s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 102s - 102s -We retained bidirectionality! 102s - 102s - $ git diff --stat hgrepo/.hgsub hgrepo2/.hgsub 102s - $ hg id hgrepo 102s - 42c46c7eef3a default/master/tip master 102s - $ hg id hgrepo2 102s - 42c46c7eef3a default/master/tip master 102s 102s ERROR: test-subrepos.t output changed 102s ! 102s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-extra.t 102s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-extra.t.err 102s @@ -12,190 +12,9 @@ 102s 102s $ cd .. 102s $ hg clone gitrepo hgrepo 102s - importing 1 git commits 102s - new changesets aa9eb6424386 (1 drafts) 102s - updating to bookmark not-master 102s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 102s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 102s + abort: repository gitrepo not found 102s + [255] 102s $ cd hgrepo 102s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 102s $ hg mv a b 102s - $ fn_hg_commit -mb 102s - $ hg up 0 102s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 102s - (leaving bookmark not-master) 102s - $ touch c 102s - $ hg add c 102s - $ fn_hg_commit -mc 102s - 102s -Rebase will add a rebase_source 102s - 102s - $ hg --config extensions.rebase= rebase -s 1 -d 2 102s - rebasing 1:4c7da7adf18b * (glob) 102s - saved backup bundle to $TESTTMP/*.hg (glob) 102s - $ hg up 2 102s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 102s - 102s -Add a commit with multiple extra fields 102s - $ hg bookmark b1 102s - $ touch d 102s - $ hg add d 102s - $ fn_hg_commitextra --field zzzzzzz=datazzz --field aaaaaaa=dataaaa 102s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 102s - @ 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 102s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 102s - | 102s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 102s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 102s - | 102s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 102s - | branch=default 102s - | 102s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 102s - branch=default hg-git-rename-source=git 102s - 102s - 102s - $ hg push -r b1 102s - pushing to $TESTTMP/gitrepo 102s - searching for changes 102s - adding objects 102s - remote: found 0 deltas to reuse 102s - added 3 commits with 3 trees and 0 blobs 102s - adding reference refs/heads/b1 102s - 102s - $ hg bookmark b2 102s - $ hg mv c c2 102s - $ hg mv d d2 102s - $ fn_hg_commitextra --field yyyyyyy=datayyy --field bbbbbbb=databbb 102s - 102s -Test some nutty filenames 102s - $ hg book b3 102s -#if windows 102s - $ hg mv c2 'c2 => c3' 102s - abort: filename contains '>', which is reserved on Windows: "c2 => c3" 102s - [255] 102s - $ hg mv c2 c3 102s - $ fn_hg_commit -m 'dummy commit' 102s - $ hg mv c3 c4 102s - $ fn_hg_commit -m 'dummy commit' 102s -#else 102s - $ hg mv c2 'c2 => c3' 102s - warning: filename contains '>', which is reserved on Windows: 'c2 => c3' 102s - $ fn_hg_commit -m 'test filename with arrow' 102s - $ hg mv 'c2 => c3' 'c3 => c4' 102s - warning: filename contains '>', which is reserved on Windows: 'c3 => c4' 102s - $ fn_hg_commit -m 'test filename with arrow 2' 102s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" -l 3 --config "experimental.graphstyle.missing=|" 102s - @ 6 bca4ba69a6844c133b069e227dfa043d41e3c197 test filename with arrow 2 102s - | branch=default 102s - | 102s - o 5 864caad1f3493032f8d06f44a89dc9f1c039b09f test filename with arrow 102s - | branch=default 102s - | 102s - o 4 58f855ae26f4930ce857e648d3dd949901cce817 102s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 102s - | 102s -#endif 102s - $ hg push -r b2 -r b3 102s - pushing to $TESTTMP/gitrepo 102s - searching for changes 102s - adding objects 102s - remote: found 0 deltas to reuse 102s - added 3 commits with 3 trees and 0 blobs 102s - adding reference refs/heads/b2 102s - adding reference refs/heads/b3 102s - 102s - $ cd ../gitrepo 102s - $ git cat-file commit b1 102s - tree 1b773a2eb70f29397356f8069c285394835ff85a 102s - parent 54776dace5849bdf273fb26737a48ef64804909d 102s - author test 1167609613 +0000 102s - committer test 1167609613 +0000 102s - HG:extra aaaaaaa:dataaaa 102s - HG:extra zzzzzzz:datazzz 102s - 102s - 102s - 102s - $ git cat-file commit b2 102s - tree 34ad62c6d6ad9464bfe62db5b3d2fa16aaa9fa9e 102s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 102s - author test 1167609614 +0000 102s - committer test 1167609614 +0000 102s - HG:rename c:c2 102s - HG:rename d:d2 102s - HG:extra bbbbbbb:databbb 102s - HG:extra yyyyyyy:datayyy 102s - 102s - 102s - 102s -#if no-windows 102s - $ git cat-file commit b3 102s - tree e63df52695f9b06e54b37e7ef60d0c43994de620 102s - parent 5cafe2555a0666fcf661a3943277a9812a694a98 102s - author test 1167609616 +0000 102s - committer test 1167609616 +0000 102s - HG:rename c2%20%3D%3E%20c3:c3%20%3D%3E%20c4 102s - 102s - test filename with arrow 2 102s -#endif 102s - $ cd ../gitrepo 102s - $ git checkout b1 102s - Switched to branch 'b1' 102s - $ commit_sha=$(git rev-parse HEAD) 102s - $ tree_sha=$(git rev-parse HEAD^{tree}) 102s - 102s -There's no way to create a Git repo with extra metadata via the CLI. Dulwich 102s -lets you do that, though. 102s - 102s - >>> from dulwich.objects import Commit 102s - >>> from dulwich.porcelain import open_repo 102s - >>> repo = open_repo('.') 102s - >>> c = Commit() 102s - >>> c.author = b'test ' 102s - >>> c.author_time = 0 102s - >>> c.author_timezone = 0 102s - >>> c.committer = c.author 102s - >>> c.commit_time = 0 102s - >>> c.commit_timezone = 0 102s - >>> c.parents = [b'$commit_sha'] 102s - >>> c.tree = b'$tree_sha' 102s - >>> c.message = b'extra commit\n' 102s - >>> c.extra.extend([(b'zzz:zzz', b'data:zzz'), (b'aaa:aaa', b'data:aaa'), 102s - ... (b'HG:extra', b'hgaaa:dataaaa'), 102s - ... (b'HG:extra', b'hgzzz:datazzz')]) 102s - >>> repo.object_store.add_object(c) 102s - >>> repo.refs.set_if_equals(b'refs/heads/master', None, c.id) 102s - True 102s - 102s - $ git cat-file commit master 102s - tree 1b773a2eb70f29397356f8069c285394835ff85a 102s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 102s - author test 0 +0000 102s - committer test 0 +0000 102s - zzz:zzz data:zzz 102s - aaa:aaa data:aaa 102s - HG:extra hgaaa:dataaaa 102s - HG:extra hgzzz:datazzz 102s - 102s - extra commit 102s - 102s - $ cd .. 102s - $ hg clone -qU gitrepo hgrepo2 102s - $ cd hgrepo2 102s - $ hg log -G -r :5 -T "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 102s - o 5 58f855ae26f4930ce857e648d3dd949901cce817 102s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 102s - | 102s - | o 4 90acc8c23fcfaeb0930c03c849923a696fd9013c extra commit 102s - |/ GIT0-zzz%3Azzz=data%3Azzz GIT1-aaa%3Aaaa=data%3Aaaa branch=default hgaaa=dataaaa hgzzz=datazzz 102s - | 102s - o 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 102s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 102s - | 102s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 102s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 102s - | 102s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 102s - | branch=default 102s - | 102s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 102s - branch=default hg-git-rename-source=git 102s - 102s 102s ERROR: test-extra.t output changed 104s ! 104s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-bookmark-workflow.t 104s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-bookmark-workflow.t.err 104s @@ -42,13 +42,21 @@ 104s 104s Initialize remote hg and git repos with equivalent initial contents 104s $ hg init hgremoterepo 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 104s $ cd hgremoterepo 104s $ hg bookmark master 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 104s $ for f in alpha beta gamma delta; do 104s > echo $f > $f; hg add $f; hgcommit -m "add $f" 104s > done 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 104s $ hg bookmark -r 1 b1 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 104s $ hgstate 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 104s 3 fc2664cac217 "add delta" bookmarks: [master] 104s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 104s 1 7bcd915dc873 "add beta" bookmarks: [b1] 104s @@ -69,157 +77,19 @@ 104s 104s Cloning transfers all bookmarks from remote to local 104s $ hg clone -q hgremoterepo purehglocalrepo 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 104s $ cd purehglocalrepo 104s $ hgstate 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 104s 3 fc2664cac217 "add delta" bookmarks: [master] 104s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 104s 1 7bcd915dc873 "add beta" bookmarks: [b1] 104s 0 3442585be8a6 "add alpha" bookmarks: [] 104s $ cd .. 104s $ hg clone -q gitremoterepo hggitlocalrepo --config hggit.usephases=True 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 104s + abort: repository gitremoterepo not found 104s + [255] 104s $ cd hggitlocalrepo 104s + $TESTTMP.sh: 78: cd: can't cd to hggitlocalrepo 104s $ hggitstate 104s - 3 03769a650ded 55b133e1d558 "add delta" bookmarks: [master] 104s - 2 ca33a262eb46 d338971a96e2 "add gamma" bookmarks: [] 104s - 1 7fe02317c63d 9497a4ee62e1 "add beta" bookmarks: [b1] 104s - 0 ff7a2f2d8d70 7eeab2ea75ec "add alpha" bookmarks: [] 104s - 104s -Make sure that master is public 104s - $ hg phase -r master 104s - 3: public 104s - $ cd .. 104s - 104s -No changes 104s - $ cd purehglocalrepo 104s - $ hg incoming -B 104s - comparing with $TESTTMP/hgremoterepo 104s - searching for changed bookmarks 104s - no changed bookmarks found 104s - [1] 104s - $ hg outgoing 104s - comparing with $TESTTMP/hgremoterepo 104s - searching for changes 104s - no changes found 104s - [1] 104s - $ hg outgoing -B 104s - comparing with $TESTTMP/hgremoterepo 104s - searching for changed bookmarks 104s - no changed bookmarks found 104s - [1] 104s - $ hg push 104s - pushing to $TESTTMP/hgremoterepo 104s - searching for changes 104s - no changes found 104s - [1] 104s - $ cd .. 104s - $ cd hggitlocalrepo 104s - $ hg incoming -B 104s - comparing with $TESTTMP/gitremoterepo 104s - searching for changed bookmarks 104s - no changed bookmarks found 104s - [1] 104s - $ hg outgoing 104s - comparing with $TESTTMP/gitremoterepo 104s - searching for changes 104s - no changes found 104s - [1] 104s - $ hg outgoing -B 104s - comparing with $TESTTMP/gitremoterepo 104s - searching for changed bookmarks 104s - no changed bookmarks found 104s - [1] 104s - $ hg push 104s - pushing to $TESTTMP/gitremoterepo 104s - searching for changes 104s - no changes found 104s - [1] 104s - $ cd .. 104s - 104s -Bookmarks on existing revs: 104s -- change b1 on local repo 104s -- introduce b2 on local repo 104s -- introduce b3 on remote repo 104s -Bookmarks on new revs 104s -- introduce b4 on a new rev on the remote 104s - $ cd hgremoterepo 104s - $ hg bookmark -r master b3 104s - $ hg bookmark -r master b4 104s - $ hg update -q b4 104s - $ echo epsilon > epsilon; hg add epsilon; hgcommit -m 'add epsilon' 104s - $ hgstate 104s - 4 d979bb8e0fbb "add epsilon" bookmarks: [b4] 104s - 3 fc2664cac217 "add delta" bookmarks: [b3 master] 104s - 2 d85ced7ae9d6 "add gamma" bookmarks: [] 104s - 1 7bcd915dc873 "add beta" bookmarks: [b1] 104s - 0 3442585be8a6 "add alpha" bookmarks: [] 104s - $ cd .. 104s - $ cd purehglocalrepo 104s - $ hg bookmark -fr 2 b1 104s - $ hg bookmark -r 0 b2 104s - $ hgstate 104s - 3 fc2664cac217 "add delta" bookmarks: [master] 104s - 2 d85ced7ae9d6 "add gamma" bookmarks: [b1] 104s - 1 7bcd915dc873 "add beta" bookmarks: [] 104s - 0 3442585be8a6 "add alpha" bookmarks: [b2] 104s - $ hg incoming -B 104s - comparing with $TESTTMP/hgremoterepo 104s - searching for changed bookmarks 104s - b3 fc2664cac217 104s - b4 d979bb8e0fbb 104s - $ hg outgoing 104s - comparing with $TESTTMP/hgremoterepo 104s - searching for changes 104s - no changes found 104s - [1] 104s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 104s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 104s -This changed in 3.4 to start showing changed and deleted bookmarks again. 104s - $ hg outgoing -B | grep -v -E -w 'b1|b3|b4' 104s - comparing with $TESTTMP/hgremoterepo 104s - searching for changed bookmarks 104s - b2 3442585be8a6 104s - $ cd .. 104s - 104s - $ cd gitremoterepo 104s - $ git branch b3 master 104s - $ git checkout -b b4 master 104s - Switched to a new branch 'b4' 104s - $ echo epsilon > epsilon 104s - $ git add epsilon 104s - $ gitcommit -m 'add epsilon' 104s - $ gitstate 104s - fcfd2c0 "add epsilon" refs: (*b4) (glob) 104s - 55b133e "add delta" refs: (master, b3) 104s - d338971 "add gamma" refs: 104s - 9497a4e "add beta" refs: (b1) 104s - 7eeab2e "add alpha" refs: 104s - $ cd .. 104s - $ cd hggitlocalrepo 104s - $ hg bookmark -fr 2 b1 104s - $ hg bookmark -r 0 b2 104s - $ hgstate 104s - 3 03769a650ded "add delta" bookmarks: [master] 104s - 2 ca33a262eb46 "add gamma" bookmarks: [b1] 104s - 1 7fe02317c63d "add beta" bookmarks: [] 104s - 0 ff7a2f2d8d70 "add alpha" bookmarks: [b2] 104s - $ hg incoming -B 104s - comparing with $TESTTMP/gitremoterepo 104s - searching for changed bookmarks 104s - b3 03769a650ded 104s - b4 fcfd2c0262db 104s - $ hg outgoing 104s - comparing with $TESTTMP/gitremoterepo 104s - searching for changes 104s - no changes found 104s - [1] 104s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 104s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 104s -This changed in 3.4 to start showing changed and deleted bookmarks again. 104s - $ hg outgoing -B 104s - comparing with $TESTTMP/gitremoterepo 104s - searching for changed bookmarks 104s - b1 ca33a262eb46 104s - b2 ff7a2f2d8d70 104s - b3 104s - b4 104s - $ cd .. 104s 104s ERROR: test-bookmark-workflow.t output changed 111s ! 111s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-illegal-contents.t 111s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-illegal-contents.t.err 111s @@ -5,6 +5,7 @@ 111s $ . "$TESTDIR/testutil" 111s 111s $ hg init hg 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s $ cd hg 111s $ mkdir -p .git/hooks 111s $ cat > .git/hooks/post-update < EOF 111s $ fn_touch_escaped foo/git~100/wat bar/.gi\\u200ct/wut this/is/safe 111s $ hg addremove 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s adding .git/hooks/post-update 111s adding bar/.gi\xe2\x80\x8ct/wut (esc) 111s adding foo/git~100/wat 111s adding this/is/safe 111s $ hg ci -m "we should refuse to export this" 111s - $ hg book master 111s - $ hg gexport 111s - warning: skipping invalid path '.git/hooks/post-update' 111s - warning: skipping invalid path 'bar/.gi\xe2\x80\x8ct/wut' 111s - warning: skipping invalid path 'foo/git~100/wat' 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + $ hg book master 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + $ hg gexport 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + hg: unknown command 'gexport' 111s + (did you mean one of export, import?) 111s + [10] 111s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 111s - this/is/safe 111s + fatal: not a git repository: '.hg/git' 111s + [128] 111s $ hg debug-remove-hggit-state 111s - clearing out the git cache data 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + hg: unknown command 'debug-remove-hggit-state' 111s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 111s + [10] 111s $ hg gexport --config hggit.invalidpaths=keep 111s - warning: path '.git/hooks/post-update' contains an invalid path component 111s - warning: path 'bar/.gi\xe2\x80\x8ct/wut' contains an invalid path component 111s - warning: path 'foo/git~100/wat' contains an invalid path component 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + hg: unknown command 'gexport' 111s + (did you mean one of export, import?) 111s + [10] 111s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 111s - .git/hooks/post-update 111s - "bar/.gi\342\200\214t/wut" 111s - foo/git~100/wat 111s - this/is/safe 111s - $ cd .. 111s - 111s - $ rm -rf hg 111s - $ hg init hg 111s + fatal: not a git repository: '.hg/git' 111s + [128] 111s + $ cd .. 111s + 111s + $ rm -rf hg 111s + $ hg init hg 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s $ cd hg 111s $ mkdir -p nested/.git/hooks/ 111s $ cat > nested/.git/hooks/post-update < EOF 111s $ chmod +x nested/.git/hooks/post-update 111s $ hg addremove 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s adding nested/.git/hooks/post-update 111s $ hg ci -m "also refuse to export this" 111s - $ hg book master 111s - $ hg gexport 111s - warning: skipping invalid path 'nested/.git/hooks/post-update' 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + $ hg book master 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + $ hg gexport 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + hg: unknown command 'gexport' 111s + (did you mean one of export, import?) 111s + [10] 111s $ git clone .hg/git git 111s - Cloning into 'git'... 111s - done. 111s + fatal: repository '.hg/git' does not exist 111s + [128] 111s $ rm -rf git 111s 111s We can trigger an error: 111s 111s $ hg -q debug-remove-hggit-state 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + hg: unknown command 'debug-remove-hggit-state' 111s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 111s + [10] 111s $ hg --config hggit.invalidpaths=abort gexport 111s - abort: invalid path 'nested/.git/hooks/post-update' rejected by configuration 111s - (see 'hg help config.hggit.invalidpaths for details) 111s - [255] 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + hg: unknown command 'gexport' 111s + (did you mean one of export, import?) 111s + [10] 111s 111s We can override if needed: 111s 111s $ hg --config hggit.invalidpaths=keep gexport 111s - warning: path 'nested/.git/hooks/post-update' contains an invalid path component 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + hg: unknown command 'gexport' 111s + (did you mean one of export, import?) 111s + [10] 111s $ cd .. 111s $ # different git versions give different return codes 111s $ git clone hg/.hg/git git || true 111s - Cloning into 'git'... 111s - done. 111s - error: [Ii]nvalid path 'nested/\.git/hooks/post-update' (re) 111s + fatal: repository 'hg/.hg/git' does not exist 111s fatal: unable to checkout working tree (?) 111s warning: Clone succeeded, but checkout failed. (?) 111s You can inspect what was checked out with 'git status' (?) 111s @@ -88,6 +109,7 @@ 111s $ cd .. 111s $ rm -rf hg 111s $ hg init hg 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s $ cd hg 111s $ mkdir -p .GIT/hooks/ 111s $ cat > .GIT/hooks/post-checkout < EOF 111s $ chmod +x .GIT/hooks/post-checkout 111s $ hg addremove 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s adding .GIT/hooks/post-checkout 111s $ hg ci -m "also refuse to export this" 111s - $ hg book master 111s - $ hg gexport 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + $ hg book master 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + $ hg gexport 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + hg: unknown command 'gexport' 111s + (did you mean one of export, import?) 111s + [10] 111s $ cd .. 111s 111s And the NTFS case: 111s $ cd .. 111s $ rm -rf hg 111s $ hg init hg 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s $ cd hg 111s $ mkdir -p GIT~1/hooks/ 111s $ cat > GIT~1/hooks/post-checkout < EOF 111s $ chmod +x GIT~1/hooks/post-checkout 111s $ hg addremove 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s adding GIT~1/hooks/post-checkout 111s $ hg ci -m "also refuse to export this" 111s - $ hg book master 111s - $ hg gexport 111s - warning: skipping invalid path 'GIT~1/hooks/post-checkout' 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + $ hg book master 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + $ hg gexport 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + hg: unknown command 'gexport' 111s + (did you mean one of export, import?) 111s + [10] 111s $ cd .. 111s 111s Now check a Git repository containing a Mercurial repository, which 111s @@ -127,36 +163,29 @@ 111s $ rm -rf hg git nested 111s $ git init -q git 111s $ hg init nested 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s $ mv nested git 111s $ cd git 111s $ git add nested 111s $ fn_git_commit -m 'add a Mercurial repository' 111s $ cd .. 111s $ hg clone --config hggit.invalidpaths=abort git hg 111s - importing 1 git commits 111s - abort: invalid path 'nested/.hg/00changelog.i' rejected by configuration 111s - (see 'hg help config.hggit.invalidpaths for details) 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + abort: repository git not found 111s [255] 111s $ rm -rf hg 111s $ hg clone --config hggit.invalidpaths=keep git hg 111s - importing 1 git commits 111s - warning: path 'nested/.hg/00changelog.i' contains an invalid path component 111s - warning: path 'nested/.hg/requires' contains an invalid path component 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + abort: repository git not found 111s warning: path 'nested/.hg/store/requires' contains an invalid path component (?) 111s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 111s warning: path 'nested/.hg/store/requires' is within a nested repository, which Mercurial cannot check out. (?) 111s - updating to bookmark master 111s - abort: path 'nested/.hg/00changelog.i' is inside nested repo 'nested' 111s - [10] 111s + [255] 111s $ rm -rf hg 111s $ hg clone git hg 111s - importing 1 git commits 111s - warning: skipping invalid path 'nested/.hg/00changelog.i' 111s - warning: skipping invalid path 'nested/.hg/requires' 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + abort: repository git not found 111s warning: skipping invalid path 'nested/.hg/store/requires' (?) 111s - new changesets 3ea18a67c0e6 (1 drafts) 111s - updating to bookmark master 111s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 111s + [255] 111s $ cd .. 111s 111s Now check a Git repository containing paths with carriage return and 111s @@ -171,23 +200,16 @@ 111s $ fn_git_commit -m 'add files disallowed by mercurial' 111s $ cd .. 111s $ hg clone --config hggit.invalidpaths=abort git hg 111s - importing 1 git commits 111s - abort: invalid path 'Icon\r' rejected by configuration 111s - (see 'hg help config.hggit.invalidpaths for details) 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + abort: repository git not found 111s [255] 111s $ hg clone --config hggit.invalidpaths=keep git hg 111s - importing 1 git commits 111s - warning: skipping invalid path 'Icon\r' 111s - warning: skipping invalid path 'the\nfile' 111s - new changesets 8354c06a5842 (1 drafts) 111s - updating to bookmark master 111s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + abort: repository git not found 111s + [255] 111s $ rm -rf hg 111s $ hg clone git hg 111s - importing 1 git commits 111s - warning: skipping invalid path 'Icon\r' 111s - warning: skipping invalid path 'the\nfile' 111s - new changesets 8354c06a5842 (1 drafts) 111s - updating to bookmark master 111s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 111s - 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 111s + abort: repository git not found 111s + [255] 111s + 111s 111s ERROR: test-illegal-contents.t output changed 112s ! 112s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-phases-remote.t 112s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-phases-remote.t.err 112s @@ -26,193 +26,10 @@ 112s $ cd .. 112s 112s $ hg clone --config hggit.usephases=True -U gitrepo hgrepo 112s - importing 4 git commits 112s - new changesets ff7a2f2d8d70:25eed24f5e8f (1 drafts) 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 112s + abort: repository gitrepo not found 112s + [255] 112s 112s $ cd hgrepo 112s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 112s $ hg log -G -T '{rev}|{phase}|{bookmarks}|{tags}\n' 112s - o 3|public||thetag tip 112s - | 112s - | o 2|draft|not-master|default/not-master 112s - |/ 112s - | o 1|public|master|default/master 112s - |/ 112s - o 0|public|| 112s - 112s - $ hg phase -r 'all()' | tee $TESTTMP/after-clone 112s - 0: public 112s - 1: public 112s - 2: draft 112s - 3: public 112s - $ cat >> .hg/hgrc < [paths] 112s - > other = $TESTTMP/gitrepo/.git 112s - > other:hg-git.publish = no 112s - > EOF 112s - $ cd .. 112s - 112s -that disables publishing from that remote 112s - 112s - $ cd hgrepo 112s - $ hg phase -fd 'all()' 112s - $ hg pull other 112s - pulling from $TESTTMP/gitrepo/.git 112s - no changes found 112s - $ hg log -qr 'public()' 112s - $ hg pull -v --config hggit.usephases=True other 112s - pulling from $TESTTMP/gitrepo/.git 112s - no changes found 112s - processing commits in batches of 1000 112s - bookmark master is up-to-date 112s - bookmark not-master is up-to-date 112s - $ hg log -qr 'public()' 112s - $ cd .. 112s - 112s -but not default when enable by the global setting 112s - 112s - $ cd hgrepo 112s - $ hg phase -fd 'all()' 112s - no phases changed 112s - $ hg pull -v --config hggit.usephases=True 112s - pulling from $TESTTMP/gitrepo 112s - publishing remote HEAD 112s - publishing tag thetag 112s - no changes found 112s - processing commits in batches of 1000 112s - bookmark master is up-to-date 112s - bookmark not-master is up-to-date 112s - publishing remote HEAD 112s - publishing tag thetag 112s - 3 local changesets published 112s - $ hg phase -r 'all()' > $TESTTMP/after-pull 112s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 112s - $ cd .. 112s - 112s -or the path option 112s - 112s - $ cd hgrepo 112s - $ hg phase -fd 'all()' 112s - $ hg pull -v --config paths.default:hg-git.publish=yes 112s - pulling from $TESTTMP/gitrepo 112s - publishing remote HEAD 112s - publishing tag thetag 112s - no changes found 112s - processing commits in batches of 1000 112s - bookmark master is up-to-date 112s - bookmark not-master is up-to-date 112s - publishing remote HEAD 112s - publishing tag thetag 112s - 3 local changesets published 112s - $ hg phase -r 'all()' > $TESTTMP/after-pull 112s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 112s - $ cd .. 112s - 112s -but we can specify individual branches 112s - 112s - $ cd hgrepo 112s - $ hg phase -fd 'all()' 112s - $ hg pull -v --config paths.default:hg-git.publish=not-master 112s - pulling from $TESTTMP/gitrepo 112s - publishing branch not-master 112s - no changes found 112s - processing commits in batches of 1000 112s - bookmark master is up-to-date 112s - bookmark not-master is up-to-date 112s - publishing branch not-master 112s - 2 local changesets published 112s - $ hg phase -r master -r not-master -r thetag 112s - 1: draft 112s - 2: public 112s - 3: draft 112s - $ cd .. 112s - 112s -and we can also specify the tag 112s - 112s - $ cd hgrepo 112s - $ hg phase -fd 'all()' 112s - $ hg pull -v --config paths.default:hg-git.publish=thetag 112s - pulling from $TESTTMP/gitrepo 112s - publishing tag thetag 112s - no changes found 112s - processing commits in batches of 1000 112s - bookmark master is up-to-date 112s - bookmark not-master is up-to-date 112s - publishing tag thetag 112s - 2 local changesets published 112s - $ hg phase -r master -r not-master -r thetag 112s - 1: draft 112s - 2: draft 112s - 3: public 112s - $ cd .. 112s - 112s - 112s -Check multiple paths behavior 112s -============================= 112s - 112s - 112s - $ cd hgrepo 112s - $ cat >> .hg/hgrc < [paths] 112s - > multi:multi-urls = yes 112s - > multi = path://other, path://default 112s - > recursive:multi-urls = yes 112s - > recursive = path://multi, default 112s - > EOF 112s - 112s -Using multiple path works fine: 112s - 112s - 112s - $ hg pull multi --config paths.default:hg-git.publish=yes 112s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 112s - [255] 112s - 112s -Recursive multiple path are tricker, but Mercurial don't work with them either. 112s -This test exist to make sure we bail out on our own. 112s - 112s - 112s -`yes` should abort (until we implement it) 112s - 112s - $ hg pull multi --config paths.default:hg-git.publish=yes 112s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 112s - [255] 112s - 112s -`some-value` should abort (until we implement it) 112s - 112s - $ hg pull multi --config paths.default:hg-git.publish=thetag 112s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 112s - [255] 112s - 112s -`no` is fine 112s - 112s - $ hg pull multi --config paths.default:hg-git.publish=no 112s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 112s - [255] 112s - 112s - $ cd .. 112s - 112s -Check conflicting paths behavior 112s -================================ 112s - 112s - $ cd hgrepo 112s - $ cat > .hg/hgrc < [paths] 112s - > default = $TESTTMP/gitrepo 112s - > default:hg-git.publish = yes 112s - > also-default = $TESTTMP/gitrepo 112s - > EOF 112s - $ hg pull also-default 112s - pulling from $TESTTMP/gitrepo 112s - abort: different publishing configurations for the same remote location 112s - (conflicting paths: also-default, default) 112s - [255] 112s - $ hg pull --config paths.also-default:hg-git.publish=no 112s - pulling from $TESTTMP/gitrepo 112s - abort: different publishing configurations for the same remote location 112s - (conflicting paths: also-default, default) 112s - [255] 112s - $ hg pull --config paths.also-default:hg-git.publish=true 112s - pulling from $TESTTMP/gitrepo 112s - no changes found 112s - 1 local changesets published 112s - $ cd .. 112s - 112s 112s ERROR: test-phases-remote.t output changed 114s ! 114s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-serve-hg-static.t 114s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-serve-hg-static.t.err 114s @@ -6,6 +6,7 @@ 114s $ . "$TESTDIR/testutil" 114s 114s $ hg clone http://localhost:$HGPORT/ copy 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s abort: * (glob) 114s [100] 114s $ test -d copy 114s @@ -18,14 +19,18 @@ 114s > --logfile server.log 114s $ cat dumb.pid >> $DAEMON_PIDS 114s $ hg init remote 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s $ cd remote 114s $ echo foo > bar 114s $ echo c2 > '.dotfile with spaces' 114s $ hg add 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s adding .dotfile with spaces 114s adding bar 114s $ hg commit -m"test" 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s $ hg tip 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s changeset: 0:02770d679fb8 114s tag: tip 114s user: test 114s @@ -34,6 +39,7 @@ 114s 114s $ cd .. 114s $ hg clone static-http://localhost:$HGPORT/remote local 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s requesting all changes 114s adding changesets 114s adding manifests 114s @@ -44,17 +50,20 @@ 114s 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 114s $ cd local 114s $ hg verify 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s checking changesets 114s checking manifests 114s crosschecking files in changesets and manifests 114s + checking dirstate (?) 114s checking files 114s - checking dirstate (?) 114s + checking dirstate 114s checked 1 changesets with 2 changes to 2 files 114s $ cat bar 114s foo 114s $ cd ../remote 114s $ echo baz > quux 114s $ hg commit -A -mtest2 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s adding quux 114s 114s check for HTTP opener failures when cachefile does not exist 114s @@ -62,6 +71,7 @@ 114s $ rm .hg/cache/* 114s $ cd ../local 114s $ hg pull 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s pulling from static-http://localhost:$HGPORT/remote 114s searching for changes 114s adding changesets 114s @@ -74,10 +84,13 @@ 114s trying to push 114s 114s $ hg update 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 114s $ echo more foo >> bar 114s $ hg commit -m"test" 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s $ hg push 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s pushing to static-http://localhost:$HGPORT/remote 114s abort: destination does not support push 114s [255] 114s @@ -86,9 +99,11 @@ 114s 114s $ cd .. 114s $ hg clone -r doesnotexist static-http://localhost:$HGPORT/remote local0 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s abort: unknown revision 'doesnotexist'!? (re) 114s [10] 114s $ hg clone -r 0 static-http://localhost:$HGPORT/remote local0 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s adding changesets 114s adding manifests 114s adding file changes 114s @@ -100,16 +115,23 @@ 114s test with "/" URI (issue747) and subrepo 114s 114s $ hg init 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s $ hg init sub 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s $ touch sub/test 114s $ hg -R sub commit -A -m "test" 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s adding test 114s $ hg -R sub tag not-empty 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s $ echo sub=sub > .hgsub 114s $ echo a > a 114s $ hg add a .hgsub 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s $ hg -q ci -ma 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s $ hg clone static-http://localhost:$HGPORT/ local2 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s requesting all changes 114s adding changesets 114s adding manifests 114s @@ -127,58 +149,75 @@ 114s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 114s $ cd local2 114s $ hg verify 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s checking changesets 114s checking manifests 114s crosschecking files in changesets and manifests 114s + checking dirstate (?) 114s checking files 114s - checking dirstate (?) 114s + checking dirstate 114s checked 1 changesets with 3 changes to 3 files 114s checking subrepo links 114s $ cat a 114s a 114s $ hg paths 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s default = static-http://localhost:$HGPORT/ 114s 114s test with empty repo (issue965) 114s 114s $ cd .. 114s $ hg init remotempty 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s $ hg clone static-http://localhost:$HGPORT/remotempty local3 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s no changes found 114s updating to branch default 114s 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 114s $ cd local3 114s $ hg verify 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s checking changesets 114s checking manifests 114s crosschecking files in changesets and manifests 114s + checking dirstate (?) 114s checking files 114s - checking dirstate (?) 114s + checking dirstate 114s checked 0 changesets with 0 changes to 0 files 114s $ hg paths 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s default = static-http://localhost:$HGPORT/remotempty 114s $ cd .. 114s 114s Clone with tags and branches works 114s 114s $ hg init remote-with-names 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s $ cd remote-with-names 114s $ echo 0 > foo 114s $ hg -q commit -A -m initial 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s $ echo 1 > foo 114s $ hg commit -m 'commit 1' 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s $ hg -q up 0 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s $ hg branch mybranch 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s marked working directory as branch mybranch 114s (branches are permanent and global, did you want a bookmark?) 114s $ echo 2 > foo 114s $ hg commit -m 'commit 2 (mybranch)' 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s $ hg tag -r 1 'default-tag' 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s $ hg tag -r 2 'branch-tag' 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s 114s $ cd .. 114s 114s $ hg clone static-http://localhost:$HGPORT/remote-with-names local-with-names 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s requesting all changes 114s adding changesets 114s adding manifests 114s @@ -191,6 +230,7 @@ 114s Clone a specific branch works 114s 114s $ hg clone -r mybranch static-http://localhost:$HGPORT/remote-with-names local-with-names-branch 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s adding changesets 114s adding manifests 114s adding file changes 114s @@ -202,6 +242,7 @@ 114s Clone a specific tag works 114s 114s $ hg clone -r default-tag static-http://localhost:$HGPORT/remote-with-names local-with-names-tag 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 114s adding changesets 114s adding manifests 114s adding file changes 114s 114s ERROR: test-serve-hg-static.t output changed 115s ! 115s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-octopus.t 115s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-octopus.t.err 115s @@ -62,111 +62,9 @@ 115s $ git init -q --bare repo.git 115s 115s $ hg clone gitrepo hgrepo 115s - importing 8 git commits 115s - new changesets ff7a2f2d8d70:307506d6ae8a (10 drafts) 115s - updating to bookmark master 115s - 6 files updated, 0 files merged, 0 files removed, 0 files unresolved 115s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 115s + abort: repository gitrepo not found 115s + [255] 115s $ cd hgrepo 115s + $TESTTMP.sh: 64: cd: can't cd to hgrepo 115s $ hg log --graph --style compact | sed 's/\[.*\]//g' 115s - @ 9:7,8 307506d6ae8a 2007-01-01 00:00 +0000 test 115s - |\ Merge branches 'branch3' and 'branch4' 115s - | | 115s - | o 8:3,4 2b07220e422e 2007-01-01 00:00 +0000 test 115s - | |\ Merge branches 'branch3' and 'branch4' 115s - | | | 115s - o | | 7:5,6 ccf2d65d982c 2007-01-01 00:00 +0000 test 115s - |\ \ \ Merge branches 'branch1' and 'branch2' 115s - | | | | 115s - | o | | 6:1,2 690b40256117 2007-01-01 00:00 +0000 test 115s - | |\ \ \ Merge branches 'branch1' and 'branch2' 115s - | | | | | 115s - o | | | | 5:0 e459c0629ca4 2007-01-01 00:00 +0000 test 115s - | | | | | add delta 115s - | | | | | 115s - +-------o 4:0 e857c9a04474 2007-01-01 00:00 +0000 test 115s - | | | | add zeta 115s - | | | | 115s - +-----o 3:0 0071dec0de0e 2007-01-01 00:00 +0000 test 115s - | | | add epsilon 115s - | | | 115s - +---o 2:0 205a004356ef 2007-01-01 00:00 +0000 test 115s - | | add gamma 115s - | | 115s - | o 1 7fe02317c63d 2007-01-01 00:00 +0000 test 115s - |/ add beta 115s - | 115s - o 0 ff7a2f2d8d70 2007-01-01 00:00 +0000 test 115s - add alpha 115s - 115s - $ hg gverify -r 9 115s - verifying rev 307506d6ae8a against git commit b32ff845df61df998206b630e4370a44f9b36845 115s - $ hg gverify -r 8 115s - abort: no git commit found for rev 2b07220e422e 115s - (if this is an octopus merge, verify against the last rev) 115s - [255] 115s - 115s - $ hg debug-remove-hggit-state 115s - clearing out the git cache data 115s - $ hg push ../repo.git 115s - pushing to ../repo.git 115s - searching for changes 115s - adding objects 115s - remote: found 0 deltas to reuse 115s - added 8 commits with 8 trees and 6 blobs 115s - adding reference refs/heads/branch1 115s - adding reference refs/heads/branch2 115s - adding reference refs/heads/branch3 115s - adding reference refs/heads/branch4 115s - adding reference refs/heads/master 115s - $ cd .. 115s - 115s - $ git --git-dir=repo.git log --pretty=medium | sed s/\\.\\.\\.//g 115s - commit b32ff845df61df998206b630e4370a44f9b36845 115s - Merge: 9ac68f9 7e9cd9f e695849 115s - Author: test 115s - Date: Mon Jan 1 00:00:15 2007 +0000 115s - 115s - Merge branches 'branch3' and 'branch4' 115s - 115s - commit 9ac68f982ae7426d9597ff16c74afb4e6053c582 115s - Merge: d40f375 9497a4e e5023f9 115s - Author: test 115s - Date: Mon Jan 1 00:00:15 2007 +0000 115s - 115s - Merge branches 'branch1' and 'branch2' 115s - 115s - commit d40f375a81b7d033e92cbad89487115fe2dd472f 115s - Author: test 115s - Date: Mon Jan 1 00:00:15 2007 +0000 115s - 115s - add delta 115s - 115s - commit e695849087f6c320c1a447620492b29a82ca41b1 115s - Author: test 115s - Date: Mon Jan 1 00:00:14 2007 +0000 115s - 115s - add zeta 115s - 115s - commit 7e9cd9f90b6d2c60579375eb796ce706d2d8bbe6 115s - Author: test 115s - Date: Mon Jan 1 00:00:13 2007 +0000 115s - 115s - add epsilon 115s - 115s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 115s - Author: test 115s - Date: Mon Jan 1 00:00:12 2007 +0000 115s - 115s - add gamma 115s - 115s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 115s - Author: test 115s - Date: Mon Jan 1 00:00:11 2007 +0000 115s - 115s - add beta 115s - 115s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 115s - Author: test 115s - Date: Mon Jan 1 00:00:10 2007 +0000 115s - 115s - add alpha 115s 115s ERROR: test-octopus.t output changed 117s ! 117s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-hook.t 117s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-hook.t.err 117s @@ -10,6 +10,7 @@ 117s > fn_${1}_commit -m $2 117s > } 117s $ hg init hgrepo 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s $ cd hgrepo 117s $ cat > .hg/hgrc < [hooks] 117s @@ -22,7 +23,10 @@ 117s > incoming = python:testlib.hooks.showargs 117s > EOF 117s $ fn_commit hg a 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s $ hg book master 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s 117s $ git init -q --bare ../repo.git 117s $ cat >> .hg/hgrc < master 117s + * [new branch] master -> master 117s $ cd ../hgrepo 117s 117s Hooks on pull? 117s 117s $ hg pull -u 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s pulling from $TESTTMP/repo.git 117s - | gitimport.source=pull 117s - | gitimport.git=True 117s - | gitimport.names=[b'default'] 117s - | gitimport.refs={b'HEAD': b'1dab31e7bc9691ba42a2fe7b14680694770bc527', b'refs/heads/master': b'1dab31e7bc9691ba42a2fe7b14680694770bc527'} 117s - | gitimport.heads=None 117s - importing 2 git commits 117s - : pretxncommit 117s - | incoming.git=True 117s - | incoming.source=pull 117s - | incoming.node=382ad5fa1d7727210384d40fa1539af52ca632c5 117s - | incoming.git_node=92150d1529ccaea34a6b36fe4144993193080499 117s - : pretxncommit 117s - | incoming.git=True 117s - | incoming.source=pull 117s - | incoming.node=892115eea5c32152e09ae4013c9a119d7b534049 117s - | incoming.git_node=1dab31e7bc9691ba42a2fe7b14680694770bc527 117s - updating bookmark master 117s - | changegroup.source=push 117s - | changegroup.git=True 117s - | changegroup.node=382ad5fa1d7727210384d40fa1539af52ca632c5 117s - | changegroup.node_last=892115eea5c32152e09ae4013c9a119d7b534049 117s - new changesets 382ad5fa1d77:892115eea5c3 (2 drafts) 117s - updating to active bookmark master 117s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 117s + abort: repository $TESTTMP/repo.git not found 117s + [255] 117s 117s Hooks on push? 117s 117s $ fn_commit hg d 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s $ fn_commit hg e 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s $ hg push 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s pushing to $TESTTMP/repo.git 117s - | preoutgoing.git=True 117s - | preoutgoing.source=push 117s - | preoutgoing.url=$TESTTMP/repo.git 117s - | gitexport.nodes=[b'cc6164a17449d58d7811ff3918f33f89c2c83fa5', b'46737f6a4c9d8307b681cbb2e9e2e5419cc87f82'] 117s - | gitexport.git=True 117s - searching for changes 117s - | prechangegroup.source=push 117s - | prechangegroup.git=True 117s - | prechangegroup.url=$TESTTMP/repo.git 117s - adding objects 117s - remote: found 0 deltas to reuse 117s - added 2 commits with 2 trees and 2 blobs 117s - updating reference refs/heads/master 117s + abort: repository $TESTTMP/repo.git not found 117s + [255] 117s 117s 117s And what does Mercurial do? 117s @@ -124,7 +87,9 @@ 117s On push: 117s 117s $ hg init ../hgrepo-copy 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s $ hg push ../hgrepo-copy 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s pushing to ../hgrepo-copy 117s searching for changes 117s | preoutgoing.source=push 117s @@ -133,19 +98,29 @@ 117s adding changesets 117s adding manifests 117s adding file changes 117s - added 5 changesets with 5 changes to 5 files 117s + added 3 changesets with 3 changes to 3 files 117s 117s With more than one head: 117s 117s $ rm -r ../hgrepo-copy 117s $ hg init ../hgrepo-copy 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s $ hg book -i 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s $ hg branch -q abranch 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s $ fn_commit hg x 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s $ hg up -q default 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s $ hg branch -q alsoabranch 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s $ fn_commit hg y 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s $ hg push ../hgrepo-copy 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s pushing to ../hgrepo-copy 117s searching for changes 117s | preoutgoing.source=push 117s @@ -154,13 +129,15 @@ 117s adding changesets 117s adding manifests 117s adding file changes 117s - added 7 changesets with 7 changes to 7 files (+1 heads) 117s + added 5 changesets with 5 changes to 5 files (+1 heads) 117s 117s On pull: 117s 117s $ hg debugstrip --no-backup tip 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 117s $ hg pull ../hgrepo-copy 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 117s pulling from ../hgrepo-copy 117s searching for changes 117s | prechangegroup.txnname=pull 117s @@ -171,16 +148,16 @@ 117s adding manifests 117s adding file changes 117s added 1 changesets with 1 changes to 1 files (+1 heads) 117s - new changesets d4097d98a390 117s + new changesets 11a693974ec5 117s | changegroup.txnname=pull 117s file://$TESTTMP/hgrepo-copy 117s | changegroup.source=pull 117s | changegroup.url=file:$TESTTMP/hgrepo-copy 117s - | changegroup.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 117s - | changegroup.node_last=d4097d98a3905be88e8a566039b1fdcca06e0d2e 117s + | changegroup.node=11a693974ec530e32672629628dde90793335199 117s + | changegroup.node_last=11a693974ec530e32672629628dde90793335199 117s | incoming.txnname=pull 117s file://$TESTTMP/hgrepo-copy 117s | incoming.source=pull 117s | incoming.url=file:$TESTTMP/hgrepo-copy 117s - | incoming.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 117s + | incoming.node=11a693974ec530e32672629628dde90793335199 117s (run 'hg heads' to see heads) 117s 117s ERROR: test-hook.t output changed 121s ! 121s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-transactions.t 121s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-transactions.t.err 121s @@ -42,19 +42,29 @@ 121s 121s $ hg clone gitrepo hgrepo --config hggit.mapsavefrequency=10 --debug \ 121s > | grep -c saving 121s - 1 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s + abort: repository gitrepo not found 121s + 0 121s + [1] 121s $ rm -rf hgrepo 121s 121s pull with mapsavefreq set 121s 121s $ hg init hgrepo 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s $ cat >> hgrepo/.hg/hgrc < [paths] 121s > default = $TESTTMP/gitrepo 121s > EOF 121s $ hg -R hgrepo --config hggit.mapsavefrequency=10 pull --debug \ 121s > | grep -c saving 121s - 10 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s + abort: repository $TESTTMP/gitrepo not found 121s + 0 121s + [1] 121s $ rm -rf hgrepo 121s 121s The user experience 121s @@ -66,6 +76,8 @@ 121s First, create a repository, set up to pull from git, and where we can interrupt the conversion. 121s 121s $ hg init hgrepo 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s $ cat >> hgrepo/.hg/hgrc < [paths] 121s > default = $TESTTMP/gitrepo 121s @@ -75,39 +87,45 @@ 121s A low save interval causes a lot of reports: 121s 121s $ hg --config hggit.mapsavefrequency=25 pull 121s - pulling from $TESTTMP/gitrepo 121s - importing 100 git commits 121s - new changesets 1c8407413fa3:abc468b9e51b (25 drafts) 121s - new changesets 217c308baf47:d5d14eeedd08 (25 drafts) 121s - new changesets d9807ef6abcb:4678067bd500 (25 drafts) 121s - adding bookmark master 121s - new changesets c31a154888bb:eda59117ba04 (25 drafts) 121s - (run 'hg update' to get a working copy) 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s + pulling from $TESTTMP/gitrepo 121s + abort: repository $TESTTMP/gitrepo not found 121s + [255] 121s 121s Reset the repository 121s 121s $ hg debugstrip --no-backup 'all()' 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s $ hg debug-remove-hggit-state 121s - clearing out the git cache data 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s + hg: unknown command 'debug-remove-hggit-state' 121s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 121s + [10] 121s 121s And with phases? No mention of draft changesets, as we publish changes 121s during the conversion: 121s 121s $ hg --config hggit.mapsavefrequency=25 --config hggit.usephases=yes pull 121s - pulling from $TESTTMP/gitrepo 121s - importing 100 git commits 121s - new changesets 1c8407413fa3:abc468b9e51b 121s - new changesets 217c308baf47:d5d14eeedd08 121s - new changesets d9807ef6abcb:4678067bd500 121s - updating bookmark master 121s - new changesets c31a154888bb:eda59117ba04 121s - (run 'hg update' to get a working copy) 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s + pulling from $TESTTMP/gitrepo 121s + abort: repository $TESTTMP/gitrepo not found 121s + [255] 121s 121s Reset the repository 121s 121s $ hg debugstrip --no-backup 'all()' 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s $ hg debug-remove-hggit-state 121s - clearing out the git cache data 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s + hg: unknown command 'debug-remove-hggit-state' 121s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 121s + [10] 121s 121s Interruptions 121s ------------- 121s @@ -121,54 +139,51 @@ 121s Test an error in a pull: 121s 121s $ ABORT_AFTER=99 hg pull 121s - pulling from $TESTTMP/gitrepo 121s - importing 100 git commits 121s - transaction abort! 121s - rollback completed 121s - abort: aborted after 99 commits! 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s + pulling from $TESTTMP/gitrepo 121s + abort: repository $TESTTMP/gitrepo not found 121s [255] 121s $ hg log -l 10 -T '{rev} {gitnode}\n' 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s 121s Test the user exiting in the first transaction: 121s 121s $ EXIT_AFTER=5 hg --config hggit.mapsavefrequency=10 pull 121s - pulling from $TESTTMP/gitrepo 121s - importing 100 git commits 121s - transaction abort! 121s - rollback completed 121s - interrupted! 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s + pulling from $TESTTMP/gitrepo 121s + abort: repository $TESTTMP/gitrepo not found 121s [255] 121s $ hg log -l 10 -T '{rev} {gitnode}\n' 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s 121s Check that we have no state, but clear it just in case 121s 121s $ ls -d .hg/git* 121s - .hg/git 121s + ls: cannot access '.hg/git*': No such file or directory 121s + [2] 121s $ hg debug-remove-hggit-state 121s - clearing out the git cache data 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s + hg: unknown command 'debug-remove-hggit-state' 121s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 121s + [10] 121s 121s Test the user exiting in the middle of a conversion, after the first 121s transaction: 121s 121s $ EXIT_AFTER=15 hg --config hggit.mapsavefrequency=10 pull 121s - pulling from $TESTTMP/gitrepo 121s - importing 100 git commits 121s - new changesets 1c8407413fa3:7c8c534a5fbe (10 drafts) 121s - transaction abort! 121s - rollback completed 121s - interrupted! 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s + pulling from $TESTTMP/gitrepo 121s + abort: repository $TESTTMP/gitrepo not found 121s [255] 121s $ hg log -l 10 -T '{rev} {gitnode}\n' 121s - 9 7cbb16ec981b308e1e2b181f8e1f22c8f409f44e 121s - 8 42da70ed92bbecf9f348ba59c93646be723d0bf2 121s - 7 17e841146e5744b81af9959634d82c20a5d7df52 121s - 6 c31065bf97bf014815e37cdfbdef2c32c687f314 121s - 5 fcf21b8e0520ec1cced1d7593d13f9ee54721269 121s - 4 46acd02d0352e4b92bd6a099bb0490305d847a18 121s - 3 61eeda444b37b8aa3892d5f04c66c5441d21dd66 121s - 2 e55db11bb0472791c7af3fc636772174cdea4a36 121s - 1 17a2672b3c24c02d568f99d8d55ccae2bf362d5c 121s - 0 4e195b4c6e77604b70a8ad3b01306adbb9b1c7e7 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s $ cd .. 121s $ rm -rf hgrepo 121s 121s @@ -183,12 +198,10 @@ 121s > hg --config hggit.mapsavefrequency=10 --config git.intree=yes \ 121s > --cwd hgrepo \ 121s > clone -U $TESTTMP/gitrepo . 121s - importing 100 git commits 121s - transaction abort! 121s - rollback completed 121s - interrupted! 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + *** failed to import extension "breakage" from /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/testlib/ext-break-git-import.py: b'hggit' 121s + abort: repository $TESTTMP/gitrepo not found 121s [255] 121s the leftover below appeared in Mercurial 5.9+; it is unintentional 121s $ ls -A hgrepo 121s - .git 121s - $ rm -rf hgrepo 121s + $ rm -rf hgrepo 121s 121s ERROR: test-transactions.t output changed 121s ! 121s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-outgoing.t 121s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-outgoing.t.err 121s @@ -14,166 +14,10 @@ 121s 121s $ cd .. 121s $ hg clone gitrepo hgrepo 121s - importing 1 git commits 121s - new changesets ff7a2f2d8d70 (1 drafts) 121s - updating to bookmark master 121s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 121s + abort: repository gitrepo not found 121s + [255] 121s 121s $ cd hgrepo 121s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 121s $ hg book 121s - alpha 0:ff7a2f2d8d70 121s - * master 0:ff7a2f2d8d70 121s - $ hg update -q master 121s - $ echo beta > beta 121s - $ hg add beta 121s - $ fn_hg_commit -m 'add beta' 121s - 121s - 121s - $ echo gamma > gamma 121s - $ hg add gamma 121s - $ fn_hg_commit -m 'add gamma' 121s - 121s - $ hg book -r 1 beta 121s - 121s - $ hg outgoing | grep -v 'searching for changes' 121s - comparing with $TESTTMP/gitrepo 121s - changeset: 1:47580592d3d6 121s - bookmark: beta 121s - user: test 121s - date: Mon Jan 01 00:00:11 2007 +0000 121s - summary: add beta 121s - 121s - changeset: 2:953796e1cfd8 121s - bookmark: master 121s - tag: tip 121s - user: test 121s - date: Mon Jan 01 00:00:12 2007 +0000 121s - summary: add gamma 121s - 121s - $ hg outgoing -r beta 121s - comparing with $TESTTMP/gitrepo 121s - searching for changes 121s - changeset: 1:47580592d3d6 121s - bookmark: beta 121s - user: test 121s - date: Mon Jan 01 00:00:11 2007 +0000 121s - summary: add beta 121s - 121s - $ hg outgoing -r master 121s - comparing with $TESTTMP/gitrepo 121s - searching for changes 121s - changeset: 1:47580592d3d6 121s - bookmark: beta 121s - user: test 121s - date: Mon Jan 01 00:00:11 2007 +0000 121s - summary: add beta 121s - 121s - changeset: 2:953796e1cfd8 121s - bookmark: master 121s - tag: tip 121s - user: test 121s - date: Mon Jan 01 00:00:12 2007 +0000 121s - summary: add gamma 121s - 121s - 121s - $ cd .. 121s - 121s -some more work on master from git 121s - $ cd gitrepo 121s - 121s -Check state of refs after outgoing 121s - $ git show-ref 121s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/alpha 121s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/master 121s - 121s - $ git checkout master 2>&1 | sed s/\'/\"/g 121s - Already on "master" 121s - $ echo delta > delta 121s - $ git add delta 121s - $ fn_git_commit -m "add delta" 121s - 121s - $ cd .. 121s - 121s - $ cd hgrepo 121s -this will fail # maybe we should try to make it work 121s - $ hg outgoing 121s - comparing with $TESTTMP/gitrepo 121s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 121s - [255] 121s -let's pull and try again 121s - $ hg pull 121s - pulling from */gitrepo (glob) 121s - importing 1 git commits 121s - not updating diverged bookmark master 121s - new changesets 25eed24f5e8f (1 drafts) 121s - (run 'hg heads' to see heads, 'hg merge' to merge) 121s - $ hg log --graph 121s - o changeset: 3:25eed24f5e8f 121s - | tag: default/master 121s - | tag: tip 121s - | parent: 0:ff7a2f2d8d70 121s - | user: test 121s - | date: Mon Jan 01 00:00:13 2007 +0000 121s - | summary: add delta 121s - | 121s - | @ changeset: 2:953796e1cfd8 121s - | | bookmark: master 121s - | | user: test 121s - | | date: Mon Jan 01 00:00:12 2007 +0000 121s - | | summary: add gamma 121s - | | 121s - | o changeset: 1:47580592d3d6 121s - |/ bookmark: beta 121s - | user: test 121s - | date: Mon Jan 01 00:00:11 2007 +0000 121s - | summary: add beta 121s - | 121s - o changeset: 0:ff7a2f2d8d70 121s - bookmark: alpha 121s - tag: default/alpha 121s - user: test 121s - date: Mon Jan 01 00:00:10 2007 +0000 121s - summary: add alpha 121s - 121s - $ hg outgoing 121s - comparing with $TESTTMP/gitrepo 121s - searching for changes 121s - changeset: 1:47580592d3d6 121s - bookmark: beta 121s - user: test 121s - date: Mon Jan 01 00:00:11 2007 +0000 121s - summary: add beta 121s - 121s - changeset: 2:953796e1cfd8 121s - bookmark: master 121s - user: test 121s - date: Mon Jan 01 00:00:12 2007 +0000 121s - summary: add gamma 121s - 121s - $ hg outgoing -r beta 121s - comparing with $TESTTMP/gitrepo 121s - searching for changes 121s - changeset: 1:47580592d3d6 121s - bookmark: beta 121s - user: test 121s - date: Mon Jan 01 00:00:11 2007 +0000 121s - summary: add beta 121s - 121s - $ hg outgoing -r master 121s - comparing with $TESTTMP/gitrepo 121s - searching for changes 121s - changeset: 1:47580592d3d6 121s - bookmark: beta 121s - user: test 121s - date: Mon Jan 01 00:00:11 2007 +0000 121s - summary: add beta 121s - 121s - changeset: 2:953796e1cfd8 121s - bookmark: master 121s - user: test 121s - date: Mon Jan 01 00:00:12 2007 +0000 121s - summary: add gamma 121s - 121s - 121s - 121s - $ cd .. 121s 121s ERROR: test-outgoing.t output changed 123s ! 123s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-gc.t 123s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-gc.t.err 123s @@ -25,188 +25,9 @@ 123s > done 123s $ cd .. 123s $ hg clone -U gitrepo hgrepo 123s - importing 100 git commits 123s - new changesets 1c8407413fa3:eda59117ba04 (100 drafts) 123s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 123s + abort: repository gitrepo not found 123s + [255] 123s $ cd hgrepo 123s + $TESTTMP.sh: 24: cd: can't cd to hgrepo 123s $ hg debug-remove-hggit-state 123s - clearing out the git cache data 123s - 123s ------------ 123s - 123s -Test garbage collection of loose objects into packs. We first test 123s -this with two threads, which is closest to the expected usage 123s -scenario, as almost all computers have at least two cores these days. 123s -The main downside is that this makes the output order unreliable, so 123s -we just sort it. 123s - 123s - $ hg gexport --config hggit.mapsavefrequency=33 --config hggit.threads=2 --debug | grep pack | sort 123s - packed 3 loose objects! 123s - packed 75 loose objects! 123s - packed 78 loose objects! 123s - packed 86 loose objects! 123s - packing 3 loose objects... 123s - packing 75 loose objects... 123s - packing 78 loose objects... 123s - packing 86 loose objects... 123s - $ hg debug-remove-hggit-state 123s - clearing out the git cache data 123s - 123s -Test the actual order of operations -- this uses a single thread, 123s -which means that the packing happens synchronously in the main thread, 123s -giving us a reliable output order. 123s - 123s -In addition, the transaction size is set up such that we happen to do 123s -nothing in the final, synchronous packing that happens on every pull. 123s -Lots of other tests have a map save frequency higher than the total 123s -amount of commits pulled, but let's just trigger that other odd 123s -occurence here. 123s - 123s - $ hg gexport --debug \ 123s - > --config hggit.mapsavefrequency=10 --config hggit.threads=1 | \ 123s - > sed 's/^converting revision.*/./' 123s - finding unexported changesets 123s - exporting 100 changesets 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 123s - packing 30 loose objects... 123s - packed 30 loose objects! 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 123s - packing 25 loose objects... 123s - packed 25 loose objects! 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 123s - packing 25 loose objects... 123s - packed 25 loose objects! 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 123s - packing 24 loose objects... 123s - packed 24 loose objects! 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 123s - packing 24 loose objects... 123s - packed 24 loose objects! 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 123s - packing 24 loose objects... 123s - packed 24 loose objects! 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 123s - packing 24 loose objects... 123s - packed 24 loose objects! 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 123s - packing 23 loose objects... 123s - packed 23 loose objects! 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 123s - packing 22 loose objects... 123s - packed 22 loose objects! 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - . 123s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 123s - packing 21 loose objects... 123s - packed 21 loose objects! 123s - packing 0 loose objects... 123s - packed 0 loose objects! 123s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 123s - $ find .hg/git/objects -type f | grep -Fv .idx | sort 123s - .hg/git/objects/pack/pack-33903607b479000b976a29a349fe0f4dffb0aaac.pack 123s - .hg/git/objects/pack/pack-40d9440e392d9eab62fa38a2ed66cc763d77aca3.pack 123s - .hg/git/objects/pack/pack-4ab2dac268f94e407788d52d6ba087b626c41651.pack 123s - .hg/git/objects/pack/pack-543e3b37bd36218a4dc6611a96d7c218afb78429.pack 123s - .hg/git/objects/pack/pack-5fc80292253ee10d1b86b5c4d9c51b29d2b4ba47.pack 123s - .hg/git/objects/pack/pack-9c636f5f16302fc5fadf0cc4ed42aeb67fc51f6a.pack 123s - .hg/git/objects/pack/pack-ae74b1f0197dfb45cfb13889453860a40103969a.pack 123s - .hg/git/objects/pack/pack-b432e2f477cb765fc0aeaa850d56e04b10392e6c.pack 123s - .hg/git/objects/pack/pack-cf7023660ce10ede2896d1be117f6ba93a261ff9.pack 123s - .hg/git/objects/pack/pack-e601b2af6a91a9cf6817d71f4eb660d2218d4094.pack 123s 123s ERROR: test-gc.t output changed 124s ! 124s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-phases-public.t 124s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-phases-public.t#publish-defaults.err 124s @@ -24,149 +24,10 @@ 124s 124s cloning with hggit.usephases publishes cloned HEAD 124s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 124s - importing 1 git commits 124s - new changesets ff7a2f2d8d70 124s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 124s + abort: repository gitrepo not found 124s + [255] 124s 124s $ cd hgrepo 124s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 124s $ hg phase -r master 124s - 0: public 124s - $ cd .. 124s - 124s -pulled changesets are public 124s - $ cd gitrepo 124s - $ git checkout -q master 124s - $ echo beta > beta 124s - $ git add beta 124s - $ fn_git_commit -m 'add beta' 124s - $ git checkout -b not-master 124s - Switched to a new branch 'not-master' 124s - $ echo gamma > gamma 124s - $ git add gamma 124s - $ fn_git_commit -m 'add gamma' 124s - $ git tag thetag 124s - $ echo delta > delta 124s - $ git add delta 124s - $ fn_git_commit -m 'add delta' 124s - $ git checkout master 124s - Switched to branch 'master' 124s - $ cd .. 124s - 124s - $ cd hgrepo 124s - $ cat >>$HGRCPATH < [paths] 124s - > other = $TESTTMP/gitrepo/.git 124s - > [hggit] 124s - > usephases = True 124s - > EOF 124s - 124s - $ hg phase -fd 'all()' 124s - 124s -we can restrict publishing to the remote HEAD and that tag, which 124s -happens to be the same thing here 124s - 124s -#if publish-specific 124s - $ cat >>$HGRCPATH < [git] 124s - > public = default/master, thetag 124s - > EOF 124s -#endif 124s - 124s -pulling publishes the branch 124s - 124s - $ hg phase -r master 124s - 0: draft 124s -#if publish-defaults 124s - $ hg pull -r master other 124s - pulling from $TESTTMP/gitrepo/.git 124s - importing 1 git commits 124s - updating bookmark master 124s - new changesets 7fe02317c63d 124s - 1 local changesets published 124s - (run 'hg update' to get a working copy) 124s -#else 124s - $ hg pull -r master other 124s - pulling from $TESTTMP/gitrepo/.git 124s - importing 1 git commits 124s - updating bookmark master 124s - new changesets 7fe02317c63d (1 drafts) 124s - (run 'hg update' to get a working copy) 124s -#endif 124s - $ hg phase -r master 124s - 1: draft (publish-specific !) 124s - 1: public (publish-defaults !) 124s -#if publish-defaults 124s - $ hg phase -fd master 124s - $ hg pull 124s - pulling from $TESTTMP/gitrepo 124s - importing 2 git commits 124s - adding bookmark not-master 124s - new changesets ca33a262eb46:03769a650ded (1 drafts) 124s - 1 local changesets published 124s - (run 'hg update' to get a working copy) 124s -#else 124s - $ hg pull 124s - pulling from $TESTTMP/gitrepo 124s - importing 2 git commits 124s - adding bookmark not-master 124s - new changesets ca33a262eb46:03769a650ded (1 drafts) 124s - 2 local changesets published 124s - (run 'hg update' to get a working copy) 124s -#endif 124s - $ hg phase -r master -r not-master -r thetag 124s - 1: public 124s - 3: draft 124s - 2: public 124s - 124s -public bookmark not pushed is not published after pull 124s - 124s - $ hg update 0 124s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 124s - $ echo delta > delta 124s - $ hg bookmark not-pushed 124s - $ hg add delta 124s - $ hg commit -m 'add delta' 124s - created new head 124s - $ hg phase -r 'all()' > $TESTTMP/before 124s - $ hg pull --config git.public=master,not-pushed 124s - pulling from $TESTTMP/gitrepo 124s - no changes found 124s - $ hg phase -r 'all()' > $TESTTMP/after 124s - $ cmp -s $TESTTMP/before $TESTTMP/after 124s - $ hg phase -r not-pushed 124s - 4: draft 124s - $ rm $TESTTMP/before $TESTTMP/after 124s - 124s -pushing public bookmark publishes local changesets, but only those 124s -actually pushed 124s - 124s - $ hg update master 124s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 124s - (activating bookmark master) 124s - $ echo epsilon > epsilon 124s - $ hg add epsilon 124s - $ hg commit -m 'add epsilon' 124s - created new head 124s - $ hg phase -r 'all() - master' > $TESTTMP/before 124s - $ hg push -B not-pushed 124s - pushing to $TESTTMP/gitrepo 124s - searching for changes 124s - adding objects 124s - remote: found 0 deltas to reuse 124s - added 1 commits with 1 trees and 1 blobs 124s - adding reference refs/heads/not-pushed 124s - $ hg phase -r 'all() - master' > $TESTTMP/after 124s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 124s - $ hg phase -r not-pushed -r master 124s - 4: draft 124s - 5: draft 124s - $ hg push -B master 124s - pushing to $TESTTMP/gitrepo 124s - searching for changes 124s - adding objects 124s - remote: found 0 deltas to reuse 124s - added 1 commits with 1 trees and 1 blobs 124s - updating reference refs/heads/master 124s - $ hg phase -r 'all() - master' > $TESTTMP/after 124s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 124s - $ hg phase -r master 124s - 5: public 124s 124s ERROR: test-phases-public.t#publish-defaults output changed 124s ! 124s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-phases-public.t 124s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-phases-public.t#publish-specific.err 124s @@ -24,149 +24,10 @@ 124s 124s cloning with hggit.usephases publishes cloned HEAD 124s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 124s - importing 1 git commits 124s - new changesets ff7a2f2d8d70 124s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 124s + abort: repository gitrepo not found 124s + [255] 124s 124s $ cd hgrepo 124s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 124s $ hg phase -r master 124s - 0: public 124s - $ cd .. 124s - 124s -pulled changesets are public 124s - $ cd gitrepo 124s - $ git checkout -q master 124s - $ echo beta > beta 124s - $ git add beta 124s - $ fn_git_commit -m 'add beta' 124s - $ git checkout -b not-master 124s - Switched to a new branch 'not-master' 124s - $ echo gamma > gamma 124s - $ git add gamma 124s - $ fn_git_commit -m 'add gamma' 124s - $ git tag thetag 124s - $ echo delta > delta 124s - $ git add delta 124s - $ fn_git_commit -m 'add delta' 124s - $ git checkout master 124s - Switched to branch 'master' 124s - $ cd .. 124s - 124s - $ cd hgrepo 124s - $ cat >>$HGRCPATH < [paths] 124s - > other = $TESTTMP/gitrepo/.git 124s - > [hggit] 124s - > usephases = True 124s - > EOF 124s - 124s - $ hg phase -fd 'all()' 124s - 124s -we can restrict publishing to the remote HEAD and that tag, which 124s -happens to be the same thing here 124s - 124s -#if publish-specific 124s - $ cat >>$HGRCPATH < [git] 124s - > public = default/master, thetag 124s - > EOF 124s -#endif 124s - 124s -pulling publishes the branch 124s - 124s - $ hg phase -r master 124s - 0: draft 124s -#if publish-defaults 124s - $ hg pull -r master other 124s - pulling from $TESTTMP/gitrepo/.git 124s - importing 1 git commits 124s - updating bookmark master 124s - new changesets 7fe02317c63d 124s - 1 local changesets published 124s - (run 'hg update' to get a working copy) 124s -#else 124s - $ hg pull -r master other 124s - pulling from $TESTTMP/gitrepo/.git 124s - importing 1 git commits 124s - updating bookmark master 124s - new changesets 7fe02317c63d (1 drafts) 124s - (run 'hg update' to get a working copy) 124s -#endif 124s - $ hg phase -r master 124s - 1: draft (publish-specific !) 124s - 1: public (publish-defaults !) 124s -#if publish-defaults 124s - $ hg phase -fd master 124s - $ hg pull 124s - pulling from $TESTTMP/gitrepo 124s - importing 2 git commits 124s - adding bookmark not-master 124s - new changesets ca33a262eb46:03769a650ded (1 drafts) 124s - 1 local changesets published 124s - (run 'hg update' to get a working copy) 124s -#else 124s - $ hg pull 124s - pulling from $TESTTMP/gitrepo 124s - importing 2 git commits 124s - adding bookmark not-master 124s - new changesets ca33a262eb46:03769a650ded (1 drafts) 124s - 2 local changesets published 124s - (run 'hg update' to get a working copy) 124s -#endif 124s - $ hg phase -r master -r not-master -r thetag 124s - 1: public 124s - 3: draft 124s - 2: public 124s - 124s -public bookmark not pushed is not published after pull 124s - 124s - $ hg update 0 124s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 124s - $ echo delta > delta 124s - $ hg bookmark not-pushed 124s - $ hg add delta 124s - $ hg commit -m 'add delta' 124s - created new head 124s - $ hg phase -r 'all()' > $TESTTMP/before 124s - $ hg pull --config git.public=master,not-pushed 124s - pulling from $TESTTMP/gitrepo 124s - no changes found 124s - $ hg phase -r 'all()' > $TESTTMP/after 124s - $ cmp -s $TESTTMP/before $TESTTMP/after 124s - $ hg phase -r not-pushed 124s - 4: draft 124s - $ rm $TESTTMP/before $TESTTMP/after 124s - 124s -pushing public bookmark publishes local changesets, but only those 124s -actually pushed 124s - 124s - $ hg update master 124s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 124s - (activating bookmark master) 124s - $ echo epsilon > epsilon 124s - $ hg add epsilon 124s - $ hg commit -m 'add epsilon' 124s - created new head 124s - $ hg phase -r 'all() - master' > $TESTTMP/before 124s - $ hg push -B not-pushed 124s - pushing to $TESTTMP/gitrepo 124s - searching for changes 124s - adding objects 124s - remote: found 0 deltas to reuse 124s - added 1 commits with 1 trees and 1 blobs 124s - adding reference refs/heads/not-pushed 124s - $ hg phase -r 'all() - master' > $TESTTMP/after 124s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 124s - $ hg phase -r not-pushed -r master 124s - 4: draft 124s - 5: draft 124s - $ hg push -B master 124s - pushing to $TESTTMP/gitrepo 124s - searching for changes 124s - adding objects 124s - remote: found 0 deltas to reuse 124s - added 1 commits with 1 trees and 1 blobs 124s - updating reference refs/heads/master 124s - $ hg phase -r 'all() - master' > $TESTTMP/after 124s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 124s - $ hg phase -r master 124s - 5: public 124s 124s ERROR: test-phases-public.t#publish-specific output changed 128s ! 128s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-push-r.t 128s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-push-r.t.err 128s @@ -2,34 +2,43 @@ 128s $ . "$TESTDIR/testutil" 128s 128s $ hg init test 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s $ cd test 128s $ cat >>afile < 0 128s > EOF 128s $ hg add afile 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s $ fn_hg_commit -m "0.0" 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s $ cat >>afile < 1 128s > EOF 128s $ fn_hg_commit -m "0.1" 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s $ cat >>afile < 2 128s > EOF 128s $ fn_hg_commit -m "0.2" 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s $ cat >>afile < 3 128s > EOF 128s $ fn_hg_commit -m "0.3" 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s $ hg update -C 0 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 128s $ cat >>afile < 1 128s > EOF 128s $ fn_hg_commit -m "1.1" 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s $ cat >>afile < 2 128s > EOF 128s $ fn_hg_commit -m "1.2" 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s $ cat >fred < a line 128s > EOF 128s @@ -37,13 +46,20 @@ 128s > 3 128s > EOF 128s $ hg add fred 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s $ fn_hg_commit -m "1.3" 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s $ hg mv afile adifferentfile 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s $ fn_hg_commit -m "1.3m" 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s $ hg update -C 3 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 128s $ hg mv afile anotherfile 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s $ fn_hg_commit -m "0.3m" 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s $ cd .. 128s $ for i in 0 1 2 3 4 5 6 7 8; do 128s > mkdir test-"$i" 128s @@ -53,128 +69,166 @@ 128s > hg verify 128s > cd .. 128s > done 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s pushing to test-0 128s searching for changes 128s adding changesets 128s adding manifests 128s adding file changes 128s added 1 changesets with 1 changes to 1 files 128s - checking changesets 128s - checking manifests 128s - crosschecking files in changesets and manifests 128s - checking files 128s - checking dirstate (?) 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + checking changesets 128s + checking dirstate (?) 128s + checking manifests 128s + crosschecking files in changesets and manifests 128s + checking files 128s + checking dirstate 128s checked 1 changesets with 1 changes to 1 files 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s pushing to test-1 128s searching for changes 128s adding changesets 128s adding manifests 128s + checking dirstate (?) 128s adding file changes 128s added 2 changesets with 2 changes to 1 files 128s - checking changesets 128s - checking manifests 128s - crosschecking files in changesets and manifests 128s - checking files 128s - checking dirstate (?) 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + checking changesets 128s + checking manifests 128s + crosschecking files in changesets and manifests 128s + checking files 128s + checking dirstate 128s checked 2 changesets with 2 changes to 1 files 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + checking dirstate (?) 128s pushing to test-2 128s searching for changes 128s adding changesets 128s adding manifests 128s adding file changes 128s added 3 changesets with 3 changes to 1 files 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s checking changesets 128s checking manifests 128s crosschecking files in changesets and manifests 128s checking files 128s checking dirstate (?) 128s checked 3 changesets with 3 changes to 1 files 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s pushing to test-3 128s searching for changes 128s adding changesets 128s adding manifests 128s adding file changes 128s added 4 changesets with 4 changes to 1 files 128s - checking changesets 128s - checking manifests 128s - crosschecking files in changesets and manifests 128s - checking files 128s - checking dirstate (?) 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + checking changesets 128s + checking dirstate (?) 128s + checking manifests 128s + crosschecking files in changesets and manifests 128s + checking files 128s + checking dirstate 128s checked 4 changesets with 4 changes to 1 files 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s pushing to test-4 128s searching for changes 128s adding changesets 128s adding manifests 128s + checking dirstate (?) 128s adding file changes 128s added 2 changesets with 2 changes to 1 files 128s - checking changesets 128s - checking manifests 128s - crosschecking files in changesets and manifests 128s - checking files 128s - checking dirstate (?) 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + checking changesets 128s + checking manifests 128s + crosschecking files in changesets and manifests 128s + checking files 128s + checking dirstate 128s checked 2 changesets with 2 changes to 1 files 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + checking dirstate (?) 128s pushing to test-5 128s searching for changes 128s adding changesets 128s adding manifests 128s adding file changes 128s added 3 changesets with 3 changes to 1 files 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s checking changesets 128s checking manifests 128s crosschecking files in changesets and manifests 128s checking files 128s checking dirstate (?) 128s checked 3 changesets with 3 changes to 1 files 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s pushing to test-6 128s searching for changes 128s adding changesets 128s adding manifests 128s adding file changes 128s added 4 changesets with 5 changes to 2 files 128s - checking changesets 128s - checking manifests 128s - crosschecking files in changesets and manifests 128s - checking files 128s - checking dirstate (?) 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + checking changesets 128s + checking dirstate (?) 128s + checking manifests 128s + crosschecking files in changesets and manifests 128s + checking files 128s + checking dirstate 128s checked 4 changesets with 5 changes to 2 files 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s pushing to test-7 128s searching for changes 128s adding changesets 128s adding manifests 128s adding file changes 128s added 5 changesets with 6 changes to 3 files 128s - checking changesets 128s - checking manifests 128s - crosschecking files in changesets and manifests 128s - checking files 128s - checking dirstate (?) 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + checking changesets 128s + checking manifests 128s + crosschecking files in changesets and manifests 128s + checking files 128s + checking dirstate 128s checked 5 changesets with 6 changes to 3 files 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s pushing to test-8 128s searching for changes 128s adding changesets 128s adding manifests 128s adding file changes 128s added 5 changesets with 5 changes to 2 files 128s - checking changesets 128s - checking manifests 128s - crosschecking files in changesets and manifests 128s - checking files 128s - checking dirstate (?) 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + checking changesets 128s + checking manifests 128s + crosschecking files in changesets and manifests 128s + checking files 128s + checking dirstate 128s checked 5 changesets with 5 changes to 2 files 128s $ cd test-8 128s $ hg pull ../test-7 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s pulling from ../test-7 128s searching for changes 128s adding changesets 128s adding manifests 128s adding file changes 128s + new changesets c29287bce33f:e70c8671c3d4 (?) 128s added 4 changesets with 2 changes to 3 files (+1 heads) 128s - new changesets c29287bce33f:e70c8671c3d4 (?) 128s + new changesets c29287bce33f:e70c8671c3d4 128s (run 'hg heads' to see heads, 'hg merge' to merge) 128s $ hg verify 128s - checking changesets 128s - checking manifests 128s - crosschecking files in changesets and manifests 128s - checking files 128s - checking dirstate (?) 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 128s + checking changesets 128s + checking manifests 128s + crosschecking files in changesets and manifests 128s + checking dirstate (?) 128s + checking files 128s + checking dirstate 128s checked 9 changesets with 7 changes to 4 files 128s 128s ERROR: test-push-r.t output changed 129s !s 129s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-invalid-refs.t 129s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-invalid-refs.t.err 129s @@ -12,115 +12,10 @@ 129s 129s $ cd .. 129s $ hg clone -U gitrepo hgrepo 129s - importing 1 git commits 129s - new changesets ff7a2f2d8d70 (1 drafts) 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s + abort: repository gitrepo not found 129s + [255] 129s 129s $ cd hgrepo 129s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 129s $ hg up master 129s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 129s - (activating bookmark master) 129s - $ fn_hg_tag alph#a 129s - $ fn_hg_tag bet*a 129s - $ fn_hg_tag 'gamm a' 129s - $ hg book -r . delt#a 129s - $ hg book -r . epsil*on 129s - 129s - $ hg gexport 129s - warning: not exporting tag 'bet*a' due to invalid name 129s - warning: not exporting bookmark 'epsil*on' due to invalid name 129s - 129s - $ hg push 129s - pushing to $TESTTMP/gitrepo 129s - warning: not exporting tag 'bet*a' due to invalid name 129s - warning: not exporting bookmark 'epsil*on' due to invalid name 129s - searching for changes 129s - adding objects 129s - remote: found 0 deltas to reuse 129s - added 3 commits with 3 trees and 3 blobs 129s - adding reference refs/heads/delt#a 129s - updating reference refs/heads/master 129s - adding reference refs/tags/alph#a 129s - adding reference refs/tags/gamm_a 129s - 129s - $ hg log --graph 129s - @ changeset: 3:0950ab44ea23 129s - | bookmark: delt#a 129s - | bookmark: epsil*on 129s - | bookmark: master 129s - | tag: default/delt#a 129s - | tag: default/master 129s - | tag: tip 129s - | user: test 129s - | date: Mon Jan 01 00:00:13 2007 +0000 129s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 129s - | 129s - o changeset: 2:0b27ab2b3df6 129s - | tag: gamm a 129s - | user: test 129s - | date: Mon Jan 01 00:00:12 2007 +0000 129s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 129s - | 129s - o changeset: 1:491ceeb1b0f1 129s - | tag: bet*a 129s - | user: test 129s - | date: Mon Jan 01 00:00:11 2007 +0000 129s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 129s - | 129s - o changeset: 0:ff7a2f2d8d70 129s - bookmark: not-master 129s - tag: alph#a 129s - tag: default/not-master 129s - user: test 129s - date: Mon Jan 01 00:00:10 2007 +0000 129s - summary: add alpha 129s - 129s - 129s - $ cd .. 129s - $ cd gitrepo 129s -git should have only the valid tag alph#a but have full commit log including the missing invalid bet*a tag commit 129s - $ git tag -l 129s - alph#a 129s - gamm_a 129s - 129s - $ cd .. 129s - $ hg clone -U gitrepo hgrepo2 129s - importing 4 git commits 129s - new changesets ff7a2f2d8d70:0950ab44ea23 (4 drafts) 129s - $ hg -R hgrepo2 log --graph 129s - o changeset: 3:0950ab44ea23 129s - | bookmark: delt#a 129s - | bookmark: master 129s - | tag: default/delt#a 129s - | tag: default/master 129s - | tag: tip 129s - | user: test 129s - | date: Mon Jan 01 00:00:13 2007 +0000 129s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 129s - | 129s - o changeset: 2:0b27ab2b3df6 129s - | tag: gamm a 129s - | tag: gamm_a 129s - | user: test 129s - | date: Mon Jan 01 00:00:12 2007 +0000 129s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 129s - | 129s - o changeset: 1:491ceeb1b0f1 129s - | tag: bet*a 129s - | user: test 129s - | date: Mon Jan 01 00:00:11 2007 +0000 129s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 129s - | 129s - o changeset: 0:ff7a2f2d8d70 129s - bookmark: not-master 129s - tag: alph#a 129s - tag: default/not-master 129s - user: test 129s - date: Mon Jan 01 00:00:10 2007 +0000 129s - summary: add alpha 129s - 129s - 129s -the tag should be in .hgtags 129s - $ hg cat -r master hgrepo2/.hgtags 129s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alph#a 129s - 491ceeb1b0f10d65d956dfcdd3470ac2bc2c96a8 bet*a 129s - 0b27ab2b3df69c6f7defd7040b93e539136db5be gamm a 129s 129s ERROR: test-invalid-refs.t output changed 129s ! 129s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-git-workflow.t 129s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-git-workflow.t.err 129s @@ -2,13 +2,20 @@ 129s $ . "$TESTDIR/testutil" 129s 129s $ hg init hgrepo 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s $ cd hgrepo 129s $ hg debuggitdir 129s - $TESTTMP/hgrepo/.hg/git 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s + hg: unknown command 'debuggitdir' 129s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 129s + [10] 129s $ echo alpha > alpha 129s $ hg add alpha 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s $ fn_hg_commit -m "add alpha" 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s $ hg log --graph --debug | grep -v phase: 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s @ changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 129s tag: tip 129s parent: -1:0000000000000000000000000000000000000000 129s @@ -27,49 +34,54 @@ 129s 129s configure for use from git 129s $ hg clone hgrepo gitrepo 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s updating to branch default 129s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 129s $ cd gitrepo 129s $ hg book master 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s $ hg up null 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 129s (leaving bookmark master) 129s $ echo "[git]" >> .hg/hgrc 129s $ echo "intree = True" >> .hg/hgrc 129s $ hg debuggitdir 129s - $TESTTMP/gitrepo/.git 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s + hg: unknown command 'debuggitdir' 129s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 129s + [10] 129s $ hg gexport 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s + hg: unknown command 'gexport' 129s + (did you mean one of export, import?) 129s + [10] 129s 129s do some work 129s $ git config core.bare false 129s + fatal: not in a git directory 129s + [128] 129s $ git checkout master 2>&1 | sed s/\'/\"/g 129s - Already on "master" 129s + fatal: not a git repository (or any of the parent directories): .git 129s $ echo beta > beta 129s $ git add beta 129s + fatal: not a git repository (or any of the parent directories): .git 129s + [128] 129s $ fn_git_commit -m 'add beta' 129s + fatal: not a git repository (or any of the parent directories): .git 129s + git commit error 129s 129s get things back to hg 129s $ hg gimport 129s - importing 1 git commits 129s - updating bookmark master 129s - new changesets 9f124f3c1fc2 (1 drafts) 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s + hg: unknown command 'gimport' 129s + (did you mean one of export, import?) 129s + [10] 129s $ hg log --graph --debug | grep -v phase: 129s - o changeset: 1:9f124f3c1fc29a14f5eb027c24811b0ac9d5ff10 129s - | bookmark: master 129s - | tag: tip 129s - | parent: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 129s - | parent: -1:0000000000000000000000000000000000000000 129s - | manifest: 1:f0bd6fbafbaebe4bb59c35108428f6fce152431d 129s - | user: test 129s - | date: Mon Jan 01 00:00:11 2007 +0000 129s - | files+: beta 129s - | extra: branch=default 129s - | extra: hg-git-rename-source=git 129s - | description: 129s - | add beta 129s - | 129s - | 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s o changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 129s + bookmark: master 129s + tag: tip 129s parent: -1:0000000000000000000000000000000000000000 129s parent: -1:0000000000000000000000000000000000000000 129s manifest: 0:8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0 129s @@ -83,7 +95,8 @@ 129s 129s gimport should have updated the bookmarks as well 129s $ hg bookmarks 129s - master 1:9f124f3c1fc2 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s + master 0:0221c246a567 129s 129s gimport support for git.mindate 129s $ cat >> .hg/hgrc << EOF 129s @@ -92,20 +105,23 @@ 129s > EOF 129s $ echo oldcommit > oldcommit 129s $ git add oldcommit 129s + fatal: not a git repository (or any of the parent directories): .git 129s + [128] 129s $ GIT_AUTHOR_DATE="2014-03-01 00:00:00 +0000" \ 129s > GIT_COMMITTER_DATE="2009-01-01 00:00:00 +0000" \ 129s > git commit -m oldcommit > /dev/null || echo "git commit error" 129s + fatal: not a git repository (or any of the parent directories): .git 129s + git commit error 129s $ hg gimport 129s - no changes found 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s + hg: unknown command 'gimport' 129s + (did you mean one of export, import?) 129s + [10] 129s $ hg log --graph 129s - o changeset: 1:9f124f3c1fc2 129s - | bookmark: master 129s - | tag: tip 129s - | user: test 129s - | date: Mon Jan 01 00:00:11 2007 +0000 129s - | summary: add beta 129s - | 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s o changeset: 0:0221c246a567 129s + bookmark: master 129s + tag: tip 129s user: test 129s date: Mon Jan 01 00:00:10 2007 +0000 129s summary: add alpha 129s @@ -113,32 +129,23 @@ 129s 129s $ echo newcommit > newcommit 129s $ git add newcommit 129s + fatal: not a git repository (or any of the parent directories): .git 129s + [128] 129s $ GIT_AUTHOR_DATE="2014-01-01 00:00:00 +0000" \ 129s > GIT_COMMITTER_DATE="2014-01-02 00:00:00 +0000" \ 129s > git commit -m newcommit > /dev/null || echo "git commit error" 129s + fatal: not a git repository (or any of the parent directories): .git 129s + git commit error 129s $ hg gimport 129s - importing 2 git commits 129s - updating bookmark master 129s - new changesets befdecd14df5:3d10b7289d79 (2 drafts) 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s + hg: unknown command 'gimport' 129s + (did you mean one of export, import?) 129s + [10] 129s $ hg log --graph 129s - o changeset: 3:3d10b7289d79 129s - | bookmark: master 129s - | tag: tip 129s - | user: test 129s - | date: Wed Jan 01 00:00:00 2014 +0000 129s - | summary: newcommit 129s - | 129s - o changeset: 2:befdecd14df5 129s - | user: test 129s - | date: Sat Mar 01 00:00:00 2014 +0000 129s - | summary: oldcommit 129s - | 129s - o changeset: 1:9f124f3c1fc2 129s - | user: test 129s - | date: Mon Jan 01 00:00:11 2007 +0000 129s - | summary: add beta 129s - | 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 129s o changeset: 0:0221c246a567 129s + bookmark: master 129s + tag: tip 129s user: test 129s date: Mon Jan 01 00:00:10 2007 +0000 129s summary: add alpha 129s 129s ERROR: test-git-workflow.t output changed 130s ! 130s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-serve-hg.t 130s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-serve-hg.t#with-hggit.err 130s @@ -31,11 +31,11 @@ 130s $ cd .. 130s 130s $ hg clone gitrepo hgrepo 130s - importing 2 git commits 130s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 130s - updating to bookmark master 130s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 130s + abort: repository gitrepo not found 130s + [255] 130s $ cd hgrepo 130s + $TESTTMP.sh: 41: cd: can't cd to hgrepo 130s $ cat >> .hg/hgrc < [push] 130s > pushvars.server = true 130s @@ -45,81 +45,3 @@ 130s > [hooks] 130s > pretxnchangegroup = env | grep HG_USERVAR_ || true 130s > EOF 130s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 130s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 130s - 130s -Test server address cannot be reused 130s - 130s -#if windows 130s - $ hg serve -p $HGPORT1 2>&1 130s - abort: cannot start server at '*:$HGPORT1': * (glob) 130s - [255] 130s -#else 130s - $ hg serve -p $HGPORT1 2>&1 130s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 130s - [255] 130s -#endif 130s - $ cd .. 130s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 130s - 130s -Make sure that clone regular mercurial repos over http doesn't break, 130s -and that we can transfer the hg-git metadata 130s - 130s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 130s - requesting all changes 130s - adding changesets 130s - adding manifests 130s - adding file changes 130s - added 2 changesets with 4 changes to 4 files 130s - new changesets f488b65fa424:c61c38c3d614 (?) 130s - updating to branch default 130s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 130s - 130s -And it shouldn't create a Git repository needlessly: 130s - $ test -e copy/git 130s - [1] 130s - $ cd copy 130s - 130s -#if without-hggit 130s - $ hg tags 130s - tip 1:c61c38c3d614 130s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 130s - 1:c61c38c3d614 | master | | 130s - 0:f488b65fa424 | | | 130s - $ hg pull -u ../gitrepo 130s - pulling from ../gitrepo 130s - importing 2 git commits 130s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 130s -#else 130s - $ hg tags 130s - tip 1:c61c38c3d614 130s - thetag 0:f488b65fa424 130s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 130s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 130s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 130s - $ hg pull -u ../gitrepo 130s - pulling from ../gitrepo 130s - warning: created new git repository at $TESTTMP/copy/.hg/git 130s - no changes found 130s -#endif 130s - 130s - $ hg tags 130s - tip 1:c61c38c3d614 130s - thetag 0:f488b65fa424 130s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 130s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 130s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 130s - 130s -Furthermore, make sure that we pass all arguments when pushing: 130s - 130s - $ echo baz > baz 130s - $ fn_hg_commit -A -m baz 130s - $ hg push --pushvars FOO=BAR 130s - pushing to http://localhost:$HGPORT/ 130s - searching for changes 130s - remote: adding changesets 130s - remote: adding manifests 130s - remote: adding file changes 130s - remote: HG_USERVAR_FOO=BAR 130s - remote: added 1 changesets with 1 changes to 1 files 130s - $ cd .. 130s 130s ERROR: test-serve-hg.t#with-hggit output changed 131s ! 131s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-serve-hg.t 131s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-serve-hg.t#without-hggit.err 131s @@ -31,11 +31,11 @@ 131s $ cd .. 131s 131s $ hg clone gitrepo hgrepo 131s - importing 2 git commits 131s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 131s - updating to bookmark master 131s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 131s + abort: repository gitrepo not found 131s + [255] 131s $ cd hgrepo 131s + $TESTTMP.sh: 36: cd: can't cd to hgrepo 131s $ cat >> .hg/hgrc < [push] 131s > pushvars.server = true 131s @@ -45,81 +45,3 @@ 131s > [hooks] 131s > pretxnchangegroup = env | grep HG_USERVAR_ || true 131s > EOF 131s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 131s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 131s - 131s -Test server address cannot be reused 131s - 131s -#if windows 131s - $ hg serve -p $HGPORT1 2>&1 131s - abort: cannot start server at '*:$HGPORT1': * (glob) 131s - [255] 131s -#else 131s - $ hg serve -p $HGPORT1 2>&1 131s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 131s - [255] 131s -#endif 131s - $ cd .. 131s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 131s - 131s -Make sure that clone regular mercurial repos over http doesn't break, 131s -and that we can transfer the hg-git metadata 131s - 131s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 131s - requesting all changes 131s - adding changesets 131s - adding manifests 131s - adding file changes 131s - added 2 changesets with 4 changes to 4 files 131s - new changesets f488b65fa424:c61c38c3d614 (?) 131s - updating to branch default 131s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s - 131s -And it shouldn't create a Git repository needlessly: 131s - $ test -e copy/git 131s - [1] 131s - $ cd copy 131s - 131s -#if without-hggit 131s - $ hg tags 131s - tip 1:c61c38c3d614 131s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 131s - 1:c61c38c3d614 | master | | 131s - 0:f488b65fa424 | | | 131s - $ hg pull -u ../gitrepo 131s - pulling from ../gitrepo 131s - importing 2 git commits 131s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s -#else 131s - $ hg tags 131s - tip 1:c61c38c3d614 131s - thetag 0:f488b65fa424 131s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 131s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 131s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 131s - $ hg pull -u ../gitrepo 131s - pulling from ../gitrepo 131s - warning: created new git repository at $TESTTMP/copy/.hg/git 131s - no changes found 131s -#endif 131s - 131s - $ hg tags 131s - tip 1:c61c38c3d614 131s - thetag 0:f488b65fa424 131s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 131s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 131s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 131s - 131s -Furthermore, make sure that we pass all arguments when pushing: 131s - 131s - $ echo baz > baz 131s - $ fn_hg_commit -A -m baz 131s - $ hg push --pushvars FOO=BAR 131s - pushing to http://localhost:$HGPORT/ 131s - searching for changes 131s - remote: adding changesets 131s - remote: adding manifests 131s - remote: adding file changes 131s - remote: HG_USERVAR_FOO=BAR 131s - remote: added 1 changesets with 1 changes to 1 files 131s - $ cd .. 131s 131s ERROR: test-serve-hg.t#without-hggit output changed 131s ! 131s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-push-authors.t 131s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-push-authors.t.err 131s @@ -8,127 +8,9 @@ 131s Create a Mercurial repository 131s 131s $ hg clone repo.git hgrepo 131s - updating to branch default 131s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 131s + abort: repository repo.git not found 131s + [255] 131s $ cd hgrepo 131s + $TESTTMP.sh: 8: cd: can't cd to hgrepo 131s $ hg book master 131s - 131s -Configure an author map 131s - 131s - $ touch authors.txt 131s - $ cat >> $HGRCPATH < [git] 131s - > authors = $TESTTMP/authors.txt 131s - > EOF 131s - 131s -Create a commit user that maps to a fully valid user 131s - 131s - $ cat >> $TESTTMP/authors.txt < user1 = User no. 1 131s - > EOF 131s - $ touch alpha 131s - $ hg add alpha 131s - $ fn_hg_commit -m alpha -u user1 131s - 131s -And one that maps to an email address 131s - 131s - $ cat >> $TESTTMP/authors.txt < user2@example.com = user2 131s - > EOF 131s - $ touch beta 131s - $ hg add beta 131s - $ fn_hg_commit -m beta -u user2@example.com 131s - 131s -And one that maps to a "simple" user 131s - 131s - $ cat >> $TESTTMP/authors.txt < User #3 = user3@example.com 131s - > EOF 131s - $ touch gamma 131s - $ hg add gamma 131s - $ fn_hg_commit -m gamma -u "User #3 " 131s - 131s -And one that maps to nothing 131s - 131s - $ cat >> $TESTTMP/authors.txt < user4 = 131s - > EOF 131s - $ touch delta 131s - $ hg add delta 131s - $ fn_hg_commit -m delta -u user4 131s - 131s -And one that doesn't map 131s - 131s - $ touch epsilon 131s - $ hg add epsilon 131s - $ fn_hg_commit -m epsilon -u "User #5 " 131s - 131s -Check the test default 131s - 131s - $ touch zeta 131s - $ hg add zeta 131s - $ fn_hg_commit -m zeta 131s - 131s -Push it! 131s - 131s - $ hg push 131s - pushing to $TESTTMP/repo.git 131s - searching for changes 131s - adding objects 131s - remote: found 0 deltas to reuse 131s - added 6 commits with 6 trees and 1 blobs 131s - adding reference refs/heads/master 131s - 131s -Check the results: 131s - 131s - $ hg log --template='Commit: {gitnode}\nAuthor: {author}\n---\n' 131s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 131s - Author: test 131s - --- 131s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 131s - Author: User #5 131s - --- 131s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 131s - Author: user4 131s - --- 131s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 131s - Author: User #3 131s - --- 131s - Commit: eba936dd13172a2f17936785e3604845aed9170d 131s - Author: user2@example.com 131s - --- 131s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 131s - Author: user1 131s - --- 131s - $ cd ../repo.git 131s - $ cat $TESTTMP/authors.txt 131s - user1 = User no. 1 131s - user2@example.com = user2 131s - User #3 = user3@example.com 131s - user4 = 131s - $ git log --pretty='tformat:Commit: %H%nAuthor: %an <%ae>%nCommitter: %cn <%ce>%n---' 131s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 131s - Author: test 131s - Committer: test 131s - --- 131s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 131s - Author: User #5 131s - Committer: User #5 131s - --- 131s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 131s - Author: 131s - Committer: 131s - --- 131s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 131s - Author: user3@example.com 131s - Committer: user3@example.com 131s - --- 131s - Commit: eba936dd13172a2f17936785e3604845aed9170d 131s - Author: user2 131s - Committer: user2 131s - --- 131s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 131s - Author: User no. 1 131s - Committer: User no. 1 131s - --- 131s - $ cd .. 131s 131s ERROR: test-push-authors.t output changed 132s ! 132s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-push-to-head.t 132s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-push-to-head.t.err 132s @@ -14,65 +14,9 @@ 132s Clone it, and push back to master: 132s 132s $ hg clone gitrepo hgrepo 132s - importing 1 git commits 132s - new changesets ff7a2f2d8d70 (1 drafts) 132s - updating to bookmark master 132s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 132s + abort: repository gitrepo not found 132s + [255] 132s $ cd hgrepo 132s + $TESTTMP.sh: 18: cd: can't cd to hgrepo 132s $ echo beta > beta 132s - $ fn_hg_commit -A -m "add beta" 132s - 132s -The output is confusing, and this even more-so: 132s - 132s - $ hg push 132s - pushing to $TESTTMP/gitrepo 132s - searching for changes 132s - adding objects 132s - remote: found 0 deltas to reuse 132s - remote: error: refusing to update checked out branch: refs/heads/master 132s - remote: error: By default, updating the current branch in a non-bare repository 132s - remote: is denied, because it will make the index and work tree inconsistent 132s - remote: with what you pushed, and will require 'git reset --hard' to match 132s - remote: the work tree to HEAD. 132s - remote: 132s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 132s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 132s - remote: its current branch; however, this is not recommended unless you 132s - remote: arranged to update its work tree to match what you pushed in some 132s - remote: other way. 132s - remote: 132s - remote: To squelch this message and still keep the default behaviour, set 132s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 132s - added 1 commits with 1 trees and 1 blobs 132s - warning: failed to update refs/heads/master; branch is currently checked out 132s - 132s - $ hg push 132s - pushing to $TESTTMP/gitrepo 132s - searching for changes 132s - adding objects 132s - remote: found 0 deltas to reuse 132s - remote: error: refusing to update checked out branch: refs/heads/master 132s - remote: error: By default, updating the current branch in a non-bare repository 132s - remote: is denied, because it will make the index and work tree inconsistent 132s - remote: with what you pushed, and will require 'git reset --hard' to match 132s - remote: the work tree to HEAD. 132s - remote: 132s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 132s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 132s - remote: its current branch; however, this is not recommended unless you 132s - remote: arranged to update its work tree to match what you pushed in some 132s - remote: other way. 132s - remote: 132s - remote: To squelch this message and still keep the default behaviour, set 132s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 132s - added 1 commits with 1 trees and 1 blobs 132s - warning: failed to update refs/heads/master; branch is currently checked out 132s - 132s -Show that it really didn't get pushed: 132s - 132s - $ hg tags 132s - tip 1:47580592d3d6 132s - default/master 0:ff7a2f2d8d70 132s - $ cd ../gitrepo 132s - $ git log --all --oneline --decorate 132s - 7eeab2e (HEAD -> master) add alpha 132s 132s ERROR: test-push-to-head.t output changed 133s ! 133s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-orphan-tags.t 133s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-orphan-tags.t.err 133s @@ -61,17 +61,17 @@ 133s Create a Mercurial clone 133s 133s $ hg clone -U repo.git hgrepo 133s - importing 4 git commits 133s - new changesets b8e77484829b:387d03400596 (4 drafts) 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 133s + abort: repository repo.git not found 133s + [255] 133s $ hg outgoing -R hgrepo 133s - comparing with $TESTTMP/repo.git 133s - searching for changes 133s - no changes found 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 133s + abort: repository hgrepo not found 133s + [255] 133s + $ hg push --debug -R hgrepo | grep -e reference -e found 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 133s + abort: repository hgrepo not found 133s [1] 133s - $ hg push --debug -R hgrepo | grep -e reference -e found 133s - unchanged reference default::refs/heads/master => GIT:996e5084 133s - unchanged reference default::refs/tags/the_tag => GIT:e4338156 133s - no changes found 133s 133s Verify that we can push this tag, and that outgoing doesn't report 133s them (#358) 133s @@ -83,33 +83,5 @@ 133s To $TESTTMP/repo.git 133s - [deleted] the_tag 133s $ cd ../hgrepo 133s + $TESTTMP.sh: 72: cd: can't cd to ../hgrepo 133s $ hg outgoing 133s - comparing with $TESTTMP/repo.git 133s - searching for changes 133s - changeset: 2:7b35eb0afb3f 133s - tag: the_tag 133s - user: test 133s - date: Mon Jan 01 00:00:12 2007 +0000 133s - summary: add foo3 133s - 133s - $ hg push --debug 133s - pushing to $TESTTMP/repo.git 133s - finding unexported changesets 133s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 133s - searching for changes 133s - remote: counting objects: 5, done. 133s - 1 commits found 133s - list of commits: 133s - e12852326ef72772e9696b008ad6546b5266ff13 133s - adding objects 133s - remote: counting objects: 5, done. 133s - remote: found 0 deltas to reuse 133s - added 1 commits with 1 trees and 0 blobs 133s - unchanged reference default::refs/heads/master => GIT:996e5084 133s - adding reference default::refs/tags/the_tag => GIT:e4338156 133s - $ cd ../gitrepo 133s - $ git fetch 133s - From $TESTTMP/repo 133s - * [new tag] the_tag -> the_tag 133s - $ git tag -ln 133s - the_tag Tag message 133s 133s ERROR: test-orphan-tags.t output changed 136s ! 136s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-verify-fail.t 136s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-verify-fail.t.err 136s @@ -25,6 +25,7 @@ 136s $ cd .. 136s 136s $ hg init hgrepo 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s $ cd hgrepo 136s $ echo normalf > normalf 136s $ echo differentf2 > differentf 136s @@ -32,63 +33,93 @@ 136s $ echo exef > exef 136s $ ln -s foo linkf 136s $ hg add normalf differentf unexpectedf exef linkf 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s $ fn_hg_commit -m 'add files' 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s $ git clone --mirror ../gitrepo .hg/git 136s Cloning into bare repository '.hg/git'... 136s done. 136s $ echo "$(cd ../gitrepo && git rev-parse HEAD) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s $ hg gverify 136s - verifying rev 3f1601c3cf54 against git commit 039c1cd9fdda382c9d1e8ec85de6b5b59518ca80 136s - difference in: differentf 136s - file has different flags: exef (hg '', git 'x') 136s - file has different flags: linkf (hg 'l', git '') 136s - file found in git but not hg: missingf 136s - file found in hg but not git: unexpectedf 136s - [1] 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s + hg: unknown command 'gverify' 136s + (did you mean verify?) 136s + [10] 136s 136s $ echo newf > newf 136s $ hg add newf 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s $ fn_hg_commit -m 'new hg commit' 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s $ hg gverify 136s - abort: no git commit found for rev 4e582b4eb862 136s - (if this is an octopus merge, verify against the last rev) 136s - [255] 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s + hg: unknown command 'gverify' 136s + (did you mean verify?) 136s + [10] 136s 136s invalid git SHA 136s $ echo "ffffffffffffffffffffffffffffffffffffffff $(hg log -r . --template '{node}')" >> .hg/git-mapfile 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s $ hg gverify 136s - abort: git equivalent ffffffffffffffffffffffffffffffffffffffff for rev 4e582b4eb862 not found! 136s - [255] 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s + hg: unknown command 'gverify' 136s + (did you mean verify?) 136s + [10] 136s 136s git SHA is not a commit 136s $ echo new2 >> newf 136s $ fn_hg_commit -m 'new hg commit 2' 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s this gets the tree pointed to by the commit at HEAD 136s $ echo "$(cd ../gitrepo && git show --format=%T HEAD | head -n 1) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s $ hg gverify 136s - abort: git equivalent f477b00e4a9907617f346a529cc0fe9ba5d6f6d3 for rev 5c2eb98af3e2 is not a commit! 136s - [255] 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s + hg: unknown command 'gverify' 136s + (did you mean verify?) 136s + [10] 136s 136s corrupt git repository 136s 136s $ hg debug-remove-hggit-state 136s - clearing out the git cache data 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s + hg: unknown command 'debug-remove-hggit-state' 136s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 136s + [10] 136s $ hg gexport 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s + hg: unknown command 'gexport' 136s + (did you mean one of export, import?) 136s + [10] 136s $ mv .hg/git/objects/pack $TESTTMP/pack-old 136s $ for packfile in $TESTTMP/pack-old/*.pack 136s > do 136s > git --git-dir .hg/git unpack-objects < $packfile 136s > done 136s + $TESTTMP.sh: 78: cannot open $TESTTMP/pack-old/*.pack: No such file 136s + [2] 136s $ mv -f .hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 136s + mv: cannot stat '.hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e': No such file or directory 136s + [1] 136s $ hg gverify --fsck 136s - abort: git repository is corrupt! 136s - [255] 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s + hg: unknown command 'gverify' 136s + (did you mean verify?) 136s + [10] 136s $ hg gverify 136s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is not a commit! 136s - [255] 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s + hg: unknown command 'gverify' 136s + (did you mean verify?) 136s + [10] 136s $ chmod +w .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 136s + chmod: cannot access '.hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74': No such file or directory 136s + [1] 136s $ echo 42 > .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 136s + $TESTTMP.sh: 89: cannot create .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74: Directory nonexistent 136s + [2] 136s $ hg gverify 136s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is corrupt! 136s - (re-run with --traceback for details) 136s - [255] 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s + hg: unknown command 'gverify' 136s + (did you mean verify?) 136s + [10] 136s 136s ERROR: test-verify-fail.t output changed 136s ! 136s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-push-missing-commit.t 136s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-push-missing-commit.t.err 136s @@ -22,75 +22,9 @@ 136s clone it and create a commit building on the git history 136s 136s $ hg clone -U repo.git hgrepo 136s - importing 1 git commits 136s - new changesets fb68c5a534ce (1 drafts) 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 136s + abort: repository repo.git not found 136s + [255] 136s $ cd hgrepo 136s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 136s $ hg up -q master 136s - $ echo other > thefile 136s - $ fn_hg_commit -m 'change thefile' 136s - $ cd .. 136s - 136s -now remove the git commit from the cache repository used internally by 136s -hg-git — actually, changing `git.intree` is equivalent to this, and how 136s -a user noticed it in #376. 136s - 136s - $ rm -rf hgrepo/.hg/git 136s - 136s -what happens when we push it? 136s - 136s - $ hg -R hgrepo push 136s - pushing to $TESTTMP/repo.git 136s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 136s - abort: cannot push git commit 533d4e670a8b as it is not present locally 136s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 136s - [255] 136s - 136s -try to follow the hint: 136s - 136s -(and just to see that the warning is useful, try re-resetting first) 136s - 136s - $ rm -rf hgrepo/.hg/git hgrepo/.git 136s - $ hg -R hgrepo pull 136s - pulling from $TESTTMP/repo.git 136s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 136s - no changes found 136s - not updating diverged bookmark master 136s - $ hg -R hgrepo push 136s - pushing to $TESTTMP/repo.git 136s - searching for changes 136s - adding objects 136s - remote: found 0 deltas to reuse 136s - added 1 commits with 1 trees and 1 blobs 136s - updating reference refs/heads/master 136s - 136s -and as an extra test, what if we want to push a commit that's 136s -converted, but gone? 136s - 136s -simply pushing doesn't suffice: 136s - 136s - $ cd hgrepo 136s - $ rm -rf .hg/git 136s - $ hg push 136s - pushing to $TESTTMP/repo.git 136s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 136s - searching for changes 136s - no changes found 136s - [1] 136s - $ cd .. 136s - 136s -but we can't create another commit building on the git history, export 136s -it, and push: 136s - 136s - $ cd hgrepo 136s - $ echo not that > thefile 136s - $ fn_hg_commit -m 'change thefile again' 136s - $ hg gexport 136s - $ rm -rf .hg/git 136s - $ hg push 136s - pushing to $TESTTMP/repo.git 136s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 136s - searching for changes 136s - abort: cannot push git commit 61619410916a as it is not present locally 136s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 136s - [255] 136s - $ cd .. 136s 136s ERROR: test-push-missing-commit.t output changed 137s ! 137s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-hg-branch.t 137s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-hg-branch.t.err 137s @@ -12,82 +12,10 @@ 137s 137s $ cd .. 137s $ hg clone gitrepo hgrepo 137s - importing 1 git commits 137s - new changesets ff7a2f2d8d70 (1 drafts) 137s - updating to bookmark not-master 137s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 137s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 137s + abort: repository gitrepo not found 137s + [255] 137s 137s $ cd hgrepo 137s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 137s $ hg co master 137s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 137s - (activating bookmark master) 137s - $ hg mv alpha beta 137s - $ fn_hg_commit -m 'rename alpha to beta' 137s - $ hg push 137s - pushing to $TESTTMP/gitrepo 137s - searching for changes 137s - adding objects 137s - remote: found 0 deltas to reuse 137s - added 1 commits with 1 trees and 0 blobs 137s - updating reference refs/heads/master 137s - 137s - $ hg branch gamma | grep -v 'permanent and global' 137s - marked working directory as branch gamma 137s - $ fn_hg_commit -m 'started branch gamma' 137s - $ hg push 137s - pushing to $TESTTMP/gitrepo 137s - searching for changes 137s - adding objects 137s - remote: found 0 deltas to reuse 137s - added 1 commits with 1 trees and 0 blobs 137s - updating reference refs/heads/master 137s - 137s - $ hg log --graph 137s - @ changeset: 2:400db38f4f64 137s - | branch: gamma 137s - | bookmark: master 137s - | tag: default/master 137s - | tag: tip 137s - | user: test 137s - | date: Mon Jan 01 00:00:12 2007 +0000 137s - | summary: started branch gamma 137s - | 137s - o changeset: 1:3baa67317a4d 137s - | user: test 137s - | date: Mon Jan 01 00:00:11 2007 +0000 137s - | summary: rename alpha to beta 137s - | 137s - o changeset: 0:ff7a2f2d8d70 137s - bookmark: not-master 137s - tag: default/not-master 137s - user: test 137s - date: Mon Jan 01 00:00:10 2007 +0000 137s - summary: add alpha 137s - 137s - 137s - $ cd .. 137s - $ hg clone -U gitrepo hgrepo2 137s - importing 3 git commits 137s - new changesets ff7a2f2d8d70:400db38f4f64 (3 drafts) 137s - $ hg -R hgrepo2 log --graph 137s - o changeset: 2:400db38f4f64 137s - | branch: gamma 137s - | bookmark: master 137s - | tag: default/master 137s - | tag: tip 137s - | user: test 137s - | date: Mon Jan 01 00:00:12 2007 +0000 137s - | summary: started branch gamma 137s - | 137s - o changeset: 1:3baa67317a4d 137s - | user: test 137s - | date: Mon Jan 01 00:00:11 2007 +0000 137s - | summary: rename alpha to beta 137s - | 137s - o changeset: 0:ff7a2f2d8d70 137s - bookmark: not-master 137s - tag: default/not-master 137s - user: test 137s - date: Mon Jan 01 00:00:10 2007 +0000 137s - summary: add alpha 137s - 137s 137s ERROR: test-hg-branch.t output changed 137s ! 137s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-pull-after-strip.t 137s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-pull-after-strip.t.err 137s @@ -15,82 +15,9 @@ 137s 137s $ cd .. 137s $ hg clone -U gitrepo hgrepo 137s - importing 2 git commits 137s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 137s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 137s + abort: repository gitrepo not found 137s + [255] 137s $ cd hgrepo 137s + $TESTTMP.sh: 26: cd: can't cd to hgrepo 137s $ hg up master 137s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 137s - (activating bookmark master) 137s - $ hg log --graph 137s - @ changeset: 1:7fe02317c63d 137s - | bookmark: master 137s - | tag: default/master 137s - | tag: thetag 137s - | tag: tip 137s - | user: test 137s - | date: Mon Jan 01 00:00:11 2007 +0000 137s - | summary: add beta 137s - | 137s - o changeset: 0:ff7a2f2d8d70 137s - user: test 137s - date: Mon Jan 01 00:00:10 2007 +0000 138s - summary: add alpha 138s - 138s - $ cd ../gitrepo 138s - $ echo beta line 2 >> beta 138s - $ git add beta 138s - $ fn_git_commit -m 'add to beta' 138s - 138s - $ cd .. 138s - $ cd hgrepo 138s - $ hg debugstrip --no-backup tip 138s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 138s - $ hg pull 138s - pulling from $TESTTMP/gitrepo 138s - importing 1 git commits 138s - abort: you appear to have run strip - please run hg git-cleanup 138s - [255] 138s - $ hg tags 138s - tip 0:ff7a2f2d8d70 138s - $ hg git-cleanup 138s - git commit map cleaned 138s - 138s -pull works after 'hg git-cleanup' 138s - 138s - $ hg pull 138s - pulling from $TESTTMP/gitrepo 138s - importing 2 git commits 138s - updating bookmark master 138s - new changesets 7fe02317c63d:cc1e605d90db (2 drafts) 138s - (run 'hg update' to get a working copy) 138s - $ hg log --graph 138s - o changeset: 2:cc1e605d90db 138s - | bookmark: master 138s - | tag: default/master 138s - | tag: tip 138s - | user: test 138s - | date: Mon Jan 01 00:00:12 2007 +0000 138s - | summary: add to beta 138s - | 138s - o changeset: 1:7fe02317c63d 138s - | tag: thetag 138s - | user: test 138s - | date: Mon Jan 01 00:00:11 2007 +0000 138s - | summary: add beta 138s - | 138s - @ changeset: 0:ff7a2f2d8d70 138s - user: test 138s - date: Mon Jan 01 00:00:10 2007 +0000 138s - summary: add alpha 138s - 138s - 138s - $ cd .. 138s - 138s -Check that we also remove bad refs: 138s - 138s - $ cd hgrepo 138s - $ echo e93b671cb24bff41779187edff99178e2597c2 > .hg/git/refs/tags/bad-tag 138s - $ hg git-cleanup 138s - git commit map cleaned 138s - $ test -e .hg/git/refs/tags/bad-tag 138s - [1] 138s 138s ERROR: test-pull-after-strip.t output changed 138s ! 138s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-subrepos-syntax.t 138s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-subrepos-syntax.t.err 138s @@ -38,54 +38,9 @@ 138s $ cd .. 138s 138s $ hg clone -U repo.git hgrepo 138s - importing 3 git commits 138s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s + abort: repository repo.git not found 138s + [255] 138s $ cd hgrepo 138s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 138s $ hg up master 138s - Cloning into '$TESTTMP/hgrepo/subrepo1'... 138s - done. 138s - Cloning into '$TESTTMP/hgrepo/xyz/subrepo2'... 138s - done. 138s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 138s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 138s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 138s - (activating bookmark master) 138s - $ cat >> .hgsub < # this is a comment 138s - > [subpaths] 138s - > flaf = blyf 138s - > EOF 138s - $ fn_hg_commit -m 'add comment & subsection' 138s - $ hg push 138s - pushing to $TESTTMP/repo.git 138s - searching for changes 138s - adding objects 138s - remote: found 0 deltas to reuse 138s - added 1 commits with 1 trees and 0 blobs 138s - updating reference refs/heads/master 138s - $ cd .. 138s - 138s - $ cd gitrepo 138s - $ git pull --ff-only 138s - From $TESTTMP/repo 138s - 89c22d7..106b34e master -> origin/master 138s - Updating 89c22d7..106b34e 138s - Fast-forward 138s - $ cat .gitmodules 138s - [submodule "subrepo1"] 138s - path = subrepo1 138s - url = ../gitsubrepo 138s - [submodule "xyz/subrepo2"] 138s - path = xyz/subrepo2 138s - url = ../gitsubrepo 138s - $ cd .. 138s - 138s -We broke bidirectionality: 138s - 138s - $ hg clone -U repo.git hgrepo2 138s - importing 4 git commits 138s - new changesets e532b2bfda10:cbf584fe001b (4 drafts) 138s - $ hg id -r tip hgrepo 138s - c58a542b18bc default/master/tip master 138s - $ hg id -r tip hgrepo2 138s - cbf584fe001b default/master/tip master 138s 138s ERROR: test-subrepos-syntax.t output changed 138s ! 138s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-gitignore.t 138s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-gitignore.t.err 138s @@ -2,12 +2,14 @@ 138s $ . "$TESTDIR/testutil" 138s 138s $ hg init repo 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s $ cd repo 138s 138s Create a commit that we can export later on 138s 138s $ touch thefile 138s $ hg commit -A -m "initial commit" 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s adding thefile 138s 138s We should only read .gitignore files in a hg-git repo (i.e. one with .hg/git 138s @@ -18,6 +20,7 @@ 138s $ touch bar 138s $ echo 'foo*' > .gitignore 138s $ hg status 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s ? .gitignore 138s ? bar 138s ? foo 138s @@ -27,103 +30,140 @@ 138s it's gone: 138s 138s $ hg gexport 138s - $ hg status 138s - ? .gitignore 138s - ? bar 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s + hg: unknown command 'gexport' 138s + (did you mean one of export, import?) 138s + [10] 138s + $ hg status 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s + ? .gitignore 138s + ? bar 138s + ? foo 138s + ? foobar 138s 138s $ echo '*bar' > .gitignore 138s $ hg status 138s - ? .gitignore 138s - ? foo 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s + ? .gitignore 138s + ? bar 138s + ? foo 138s + ? foobar 138s 138s $ mkdir dir 138s $ touch dir/foo 138s $ echo 'foo' > .gitignore 138s $ hg status 138s - ? .gitignore 138s - ? bar 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s + ? .gitignore 138s + ? bar 138s + ? dir/foo 138s + ? foo 138s ? foobar 138s 138s $ echo '/foo' > .gitignore 138s $ hg status 138s - ? .gitignore 138s - ? bar 138s - ? dir/foo 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s + ? .gitignore 138s + ? bar 138s + ? dir/foo 138s + ? foo 138s ? foobar 138s 138s $ rm .gitignore 138s $ echo 'foo' > dir/.gitignore 138s $ hg status 138s - ? bar 138s - ? dir/.gitignore 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s + ? bar 138s + ? dir/.gitignore 138s + ? dir/foo 138s ? foo 138s ? foobar 138s 138s $ touch dir/bar 138s $ echo 'bar' > .gitignore 138s $ hg status 138s - ? .gitignore 138s - ? dir/.gitignore 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s + ? .gitignore 138s + ? bar 138s + ? dir/.gitignore 138s + ? dir/bar 138s + ? dir/foo 138s ? foo 138s ? foobar 138s 138s $ echo '/bar' > .gitignore 138s $ hg status 138s - ? .gitignore 138s - ? dir/.gitignore 138s - ? dir/bar 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s + ? .gitignore 138s + ? bar 138s + ? dir/.gitignore 138s + ? dir/bar 138s + ? dir/foo 138s ? foo 138s ? foobar 138s 138s $ echo 'foo*' > .gitignore 138s $ echo '!*bar' >> .gitignore 138s $ hg status 138s - .gitignore: unsupported ignore pattern '!*bar' 138s - ? .gitignore 138s - ? bar 138s - ? dir/.gitignore 138s - ? dir/bar 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s + ? .gitignore 138s + ? bar 138s + ? dir/.gitignore 138s + ? dir/bar 138s + ? dir/foo 138s + ? foo 138s + ? foobar 138s 138s $ echo '.hg/' > .gitignore 138s $ hg status 138s - ? .gitignore 138s - ? bar 138s - ? dir/.gitignore 138s - ? dir/bar 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s + ? .gitignore 138s + ? bar 138s + ? dir/.gitignore 138s + ? dir/bar 138s + ? dir/foo 138s ? foo 138s ? foobar 138s 138s $ echo 'dir/.hg/' > .gitignore 138s $ hg status 138s - ? .gitignore 138s - ? bar 138s - ? dir/.gitignore 138s - ? dir/bar 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s + ? .gitignore 138s + ? bar 138s + ? dir/.gitignore 138s + ? dir/bar 138s + ? dir/foo 138s ? foo 138s ? foobar 138s 138s $ echo '.hg/foo' > .gitignore 138s $ hg status 138s - ? .gitignore 138s - ? bar 138s - ? dir/.gitignore 138s - ? dir/bar 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s + ? .gitignore 138s + ? bar 138s + ? dir/.gitignore 138s + ? dir/bar 138s + ? dir/foo 138s ? foo 138s ? foobar 138s 138s $ touch foo.hg 138s $ echo 'foo.hg' > .gitignore 138s $ hg status 138s - ? .gitignore 138s - ? bar 138s - ? dir/.gitignore 138s - ? dir/bar 138s - ? foo 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s + ? .gitignore 138s + ? bar 138s + ? dir/.gitignore 138s + ? dir/bar 138s + ? dir/foo 138s + ? foo 138s + ? foo.hg 138s ? foobar 138s $ rm foo.hg 138s 138s $ touch .hgignore 138s $ hg status 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s ? .gitignore 138s ? .hgignore 138s ? bar 138s @@ -137,6 +177,7 @@ 138s $ echo 'foo.*$(?> .hgignore 138s $ echo 'dir/foo' >> .hgignore 138s $ hg status 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s ? .gitignore 138s ? .hgignore 138s ? bar 138s @@ -145,14 +186,18 @@ 138s ? foobar 138s 138s $ hg add .gitignore 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s $ hg commit -m "add and commit .gitignore" 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s $ rm .gitignore 138s $ rm .hgignore 138s $ hg status 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s ! .gitignore 138s ? bar 138s ? dir/.gitignore 138s ? dir/bar 138s + ? dir/foo 138s ? foo 138s ? foobar 138s 138s @@ -164,6 +209,7 @@ 138s > foo( 138s > EOF 138s $ hg status --config ui.ignore=$TESTTMP/invalidhgignore 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s abort: $TESTTMP/invalidhgignore: invalid pattern (relre): foo( 138s [255] 138s 138s @@ -172,5 +218,6 @@ 138s > foo( 138s > EOF 138s $ hg status 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 138s abort: $TESTTMP/repo/.hgignore: invalid pattern (relre): foo( 138s [255] 138s 138s ERROR: test-gitignore.t output changed 139s ! 139s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-merge.t 139s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-merge.t.err 139s @@ -30,60 +30,11 @@ 139s $ git init -q --bare repo.git 139s 139s $ hg clone gitrepo hgrepo 139s - importing 4 git commits 139s - new changesets ff7a2f2d8d70:89ca4a68d6b9 (4 drafts) 139s - updating to bookmark master 139s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 139s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 139s + abort: repository gitrepo not found 139s + [255] 139s $ cd hgrepo 139s + $TESTTMP.sh: 40: cd: can't cd to hgrepo 139s 139s clear the cache to be sure it is regenerated correctly 139s $ hg debug-remove-hggit-state 139s - clearing out the git cache data 139s - $ hg push ../repo.git 139s - pushing to ../repo.git 139s - searching for changes 139s - adding objects 139s - remote: found 0 deltas to reuse 139s - added 4 commits with 4 trees and 3 blobs 139s - adding reference refs/heads/beta 139s - adding reference refs/heads/master 139s - 139s - $ cd .. 139s -git log in repo pushed from hg 139s - $ git --git-dir=repo.git log --pretty=medium master | sed 's/\.\.\.//g' 139s - commit 5806851511aaf3bfe813ae3a86c5027165fa9b96 139s - Merge: e5023f9 9497a4e 139s - Author: test 139s - Date: Mon Jan 1 00:00:12 2007 +0000 139s - 139s - Merge branch 'beta' 139s - 139s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 139s - Author: test 139s - Date: Mon Jan 1 00:00:12 2007 +0000 139s - 139s - add gamma 139s - 139s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 139s - Author: test 139s - Date: Mon Jan 1 00:00:11 2007 +0000 139s - 139s - add beta 139s - 139s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 139s - Author: test 139s - Date: Mon Jan 1 00:00:10 2007 +0000 139s - 139s - add alpha 139s - $ git --git-dir=repo.git log --pretty=medium beta | sed 's/\.\.\.//g' 139s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 139s - Author: test 139s - Date: Mon Jan 1 00:00:11 2007 +0000 139s - 139s - add beta 139s - 139s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 139s - Author: test 139s - Date: Mon Jan 1 00:00:10 2007 +0000 139s - 139s - add alpha 139s 139s ERROR: test-merge.t output changed 139s ! 139s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-hg-tags.t 139s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-hg-tags.t.err 139s @@ -16,69 +16,10 @@ 139s 139s $ cd .. 139s $ hg clone -U repo.git hgrepo 139s - importing 1 git commits 139s - new changesets ff7a2f2d8d70 (1 drafts) 139s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 139s + abort: repository repo.git not found 139s + [255] 139s 139s $ cd hgrepo 139s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 139s $ hg co master 139s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 139s - (activating bookmark master) 139s - $ fn_hg_tag alpha 139s - $ hg push 139s - pushing to $TESTTMP/repo.git 139s - searching for changes 139s - adding objects 139s - remote: found 0 deltas to reuse 139s - added 1 commits with 1 trees and 1 blobs 139s - updating reference refs/heads/master 139s - adding reference refs/tags/alpha 139s - 139s - $ hg log --graph 139s - @ changeset: 1:e8b150f84560 139s - | bookmark: master 139s - | tag: default/master 139s - | tag: tip 139s - | user: test 139s - | date: Mon Jan 01 00:00:11 2007 +0000 139s - | summary: Added tag alpha for changeset ff7a2f2d8d70 139s - | 139s - o changeset: 0:ff7a2f2d8d70 139s - tag: alpha 139s - user: test 139s - date: Mon Jan 01 00:00:10 2007 +0000 139s - summary: add alpha 139s - 139s - 139s - $ cd .. 139s - $ cd gitrepo 139s -git should have the tag alpha 139s - $ git fetch origin 139s - From $TESTTMP/repo 139s - 7eeab2e..bbae830 master -> origin/master 139s - * [new tag] alpha -> alpha 139s - $ cd .. 139s - 139s - $ hg clone repo.git hgrepo2 139s - importing 2 git commits 139s - new changesets ff7a2f2d8d70:e8b150f84560 (2 drafts) 139s - updating to bookmark master 139s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 139s - $ hg -R hgrepo2 log --graph 139s - @ changeset: 1:e8b150f84560 139s - | bookmark: master 139s - | tag: default/master 139s - | tag: tip 139s - | user: test 139s - | date: Mon Jan 01 00:00:11 2007 +0000 139s - | summary: Added tag alpha for changeset ff7a2f2d8d70 139s - | 139s - o changeset: 0:ff7a2f2d8d70 139s - tag: alpha 139s - user: test 139s - date: Mon Jan 01 00:00:10 2007 +0000 139s - summary: add alpha 139s - 139s - 139s -the tag should be in .hgtags 139s - $ cat hgrepo2/.hgtags 139s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alpha 139s 139s ERROR: test-hg-tags.t output changed 140s ! 140s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-push-detached.t 140s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-push-detached.t.err 140s @@ -40,37 +40,9 @@ 140s in this case continues to work. 140s 140s $ hg clone gitrepo hgrepo 140s - importing 1 git commits 140s - new changesets ff7a2f2d8d70 (1 drafts) 140s - updating to bookmark master 140s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 140s + abort: repository gitrepo not found 140s + [255] 140s $ cd hgrepo 140s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 140s $ echo beta > beta 140s - $ hg add beta 140s - $ fn_hg_commit -m "add beta" 140s - 140s -Pushing that changeset, with phases, publishes the detached HEAD. 140s -Whether this should happen is debatable, but it's a side effect from 140s -the fact that pushing to the remote HEAD, with HEAD being the usual 140s -symref, should publish it. 140s - 140s - $ hg push -v --config hggit.usephases=yes 140s - pushing to $TESTTMP/gitrepo 140s - finding unexported changesets 140s - exporting 1 changesets 140s - converting revision 47580592d3d6492421a1e6cebc5c2d701a2e858b 140s - packing 3 loose objects... 140s - searching for changes 140s - remote: counting objects: 5, done. 140s - 1 commits found 140s - adding objects 140s - remote: counting objects: 5, done. 140s - remote: found 0 deltas to reuse 140s - added 1 commits with 1 trees and 1 blobs 140s - updating reference default::refs/heads/master => GIT:0f378ab6 140s - publishing remote HEAD 140s - $ hg phase 'all()' 140s - 0: public 140s - 1: draft 140s - $ cd .. 140s - 140s 140s ERROR: test-push-detached.t output changed 140s ! 140s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-multiple-remotes.t 140s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-multiple-remotes.t.err 140s @@ -14,6 +14,7 @@ 140s $ git clone --bare --quiet gitrepo repo.git 140s 140s $ hg init hgrepo 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 140s $ cd hgrepo 140s $ cat > .hg/hgrc < [paths] 140s @@ -26,52 +27,28 @@ 140s > EOF 140s 140s $ hg pull 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 140s pulling from $TESTTMP/gitrepo 140s - importing 1 git commits 140s - adding bookmark master 140s - adding bookmark not-master 140s - new changesets ff7a2f2d8d70 (1 drafts) 140s - (run 'hg update' to get a working copy) 140s - pulling from $TESTTMP/repo.git 140s - no changes found 140s + abort: repository $TESTTMP/gitrepo not found 140s + [255] 140s $ hg tags 140s - tip 0:ff7a2f2d8d70 140s - git/not-master 0:ff7a2f2d8d70 140s - git/master 0:ff7a2f2d8d70 140s - bare/not-master 0:ff7a2f2d8d70 140s - bare/master 0:ff7a2f2d8d70 140s - also-git/not-master 0:ff7a2f2d8d70 140s - also-git/master 0:ff7a2f2d8d70 140s - also-bare/not-master 0:ff7a2f2d8d70 140s - also-bare/master 0:ff7a2f2d8d70 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 140s + tip -1:000000000000 140s 140s $ hg up master 140s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 140s - (activating bookmark master) 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 140s + abort: unknown revision 'master' 140s + [10] 140s $ echo beta > beta 140s $ fn_hg_commit -A -m "add beta" 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 140s $ hg push 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 140s pushing to $TESTTMP/gitrepo 140s - searching for changes 140s - adding objects 140s - remote: found 0 deltas to reuse 140s - added 1 commits with 1 trees and 1 blobs 140s - updating reference refs/heads/master 140s - pushing to $TESTTMP/repo.git 140s - searching for changes 140s - adding objects 140s - remote: found 0 deltas to reuse 140s - added 1 commits with 1 trees and 1 blobs 140s - updating reference refs/heads/master 140s + abort: repository $TESTTMP/gitrepo not found 140s + [255] 140s 140s $ hg tags 140s - tip 1:47580592d3d6 140s - git/master 1:47580592d3d6 140s - bare/master 1:47580592d3d6 140s - also-git/master 1:47580592d3d6 140s - also-bare/master 1:47580592d3d6 140s - git/not-master 0:ff7a2f2d8d70 140s - bare/not-master 0:ff7a2f2d8d70 140s - also-git/not-master 0:ff7a2f2d8d70 140s - also-bare/not-master 0:ff7a2f2d8d70 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 140s + tip 0:59e1f63242de 140s 140s 140s ERROR: test-multiple-remotes.t output changed 141s ! 141s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-hg-clone.t 141s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-hg-clone.t.err 141s @@ -11,88 +11,17 @@ 141s $ cd .. 141s 141s $ hg clone -U gitrepo hgrepo 141s - importing 1 git commits 141s - new changesets ff7a2f2d8d70 (1 drafts) 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 141s + abort: repository gitrepo not found 141s + [255] 141s 141s By default, the Git state isn't preserved across a copying/linking 141s clone 141s 141s $ hg clone -U hgrepo otherhgrepo 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 141s + abort: repository hgrepo not found 141s + [255] 141s $ cd otherhgrepo 141s + $TESTTMP.sh: 22: cd: can't cd to otherhgrepo 141s $ find .hg -name 'git*' | sort 141s - $ hg tags -v 141s - tip 0:ff7a2f2d8d70 141s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 141s - $ cd .. 141s - $ rm -r otherhgrepo 141s - 141s -Nor using a pull clone 141s - 141s - $ hg clone -U --pull hgrepo otherhgrepo 141s - requesting all changes 141s - adding changesets 141s - adding manifests 141s - adding file changes 141s - added 1 changesets with 1 changes to 1 files 141s - new changesets ff7a2f2d8d70 141s - $ cd otherhgrepo 141s - $ find .hg -name 'git*' | sort 141s - $ hg tags -v 141s - tip 0:ff7a2f2d8d70 141s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 141s - $ cd .. 141s - $ rm -r otherhgrepo 141s - 141s -But we can enable it! 141s - 141s - $ cat >> $HGRCPATH < [experimental] 141s - > hg-git-serve = yes 141s - > EOF 141s - 141s -Check transferring between Mercurial repositories using a 141s -copying/linking clone 141s - 141s - $ hg clone -U hgrepo otherhgrepo 141s - $ cd otherhgrepo 141s - $ find .hg -name 'git*' | sort 141s - $ hg tags -q 141s - tip 141s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 141s - $ cd .. 141s - 141s -Checking using a pull clone 141s - 141s - $ rm -rf otherhgrepo 141s - $ hg clone -U --pull hgrepo otherhgrepo 141s - requesting all changes 141s - adding changesets 141s - adding manifests 141s - adding file changes 141s - added 1 changesets with 1 changes to 1 files 141s - new changesets ff7a2f2d8d70 141s - $ cd otherhgrepo 141s - $ hg tags -q 141s - tip 141s - alpha 141s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 141s - 0:ff7a2f2d8d70 7eeab2ea75ec 141s - $ cd .. 141s - 141s -Can we repopulate the state from a Mercurial repository? 141s - 141s - $ cd otherhgrepo 141s - $ hg debug-remove-hggit-state 141s - clearing out the git cache data 141s - $ hg log -qr 'fromgit()' 141s - $ hg tags 141s - tip 0:ff7a2f2d8d70 141s - $ hg pull 141s - pulling from $TESTTMP/hgrepo 141s - searching for changes 141s - no changes found 141s - $ hg log -qr 'fromgit()' 141s - $ hg tags 141s - tip 0:ff7a2f2d8d70 141s - 141s -Sadly, no. 141s 141s ERROR: test-hg-clone.t output changed 141s ! 141s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-serve-git.t 141s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-serve-git.t.err 141s @@ -33,28 +33,14 @@ 141s Make sure that clone over the old git protocol doesn't break 141s 141s $ hg clone -U git://localhost:$HGPORT/test copy 2>&1 141s - \r (no-eol) (esc) 141s - Counting objects 1/6 [=====> ]\r (no-eol) (esc) 141s - Counting objects 2/6 [===========> ]\r (no-eol) (esc) 141s - Counting objects 3/6 [=================> ]\r (no-eol) (esc) 141s - Counting objects 4/6 [=======================> ]\r (no-eol) (esc) 141s - Counting objects 5/6 [=============================> ]\r (no-eol) (esc) 141s - Counting objects 6/6 [===================================>]\r (no-eol) (esc) 141s - \r (no-eol) (esc) 141s - \r (no-eol) (esc) 141s - Compressing objects 1/3 [==========> ]\r (no-eol) (esc) 141s - Compressing objects 2/3 [=====================> ]\r (no-eol) (esc) 141s - Compressing objects 3/3 [================================>]\r (no-eol) (esc) 141s - \r (no-eol) (esc) 141s - \r (no-eol) (esc) 141s - importing commits 1/2 b23744d34f97 [======> ]\r (no-eol) (esc) 141s - importing commits 2/2 3af9773036a9 [=============>]\r (no-eol) (esc) 141s - \r (no-eol) (esc) 141s - importing 2 git commits 141s - new changesets c4d188f6e13d:221dd250e933 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 141s + abort: repository git://localhost:$HGPORT/test not found 141s + [255] 141s $ hg log -T 'HG:{node|short} GIT:{gitnode|short}\n' -R copy 141s - HG:221dd250e933 GIT:3af9773036a9 141s - HG:c4d188f6e13d GIT:b23744d34f97 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 141s + abort: repository copy not found 141s + [255] 141s $ hg tags -v -R copy 141s - tip 1:221dd250e933 141s - default/master 1:221dd250e933 git-remote 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 141s + abort: repository copy not found 141s + [255] 141s 141s ERROR: test-serve-git.t output changed 144s ! 144s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-convergedmerge.t 144s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-convergedmerge.t.err 144s @@ -2,29 +2,39 @@ 144s $ . "$TESTDIR/testutil" 144s 144s $ hg init hgrepo1 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s $ cd hgrepo1 144s $ echo A > afile 144s $ hg add afile 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s $ hg ci -m "origin" 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s 144s $ echo B > afile 144s $ hg ci -m "A->B" 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s 144s $ echo C > afile 144s $ hg ci -m "B->C" 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s 144s $ hg up -r0 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 144s $ echo C > afile 144s $ hg ci -m "A->C" 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s created new head 144s 144s $ hg merge -r2 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 144s (branch merge, don't forget to commit) 144s $ hg ci -m "merge" 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s 144s $ hg log --graph --style compact | sed 's/\[.*\]//g' 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s @ 4:3,2 eaa21d002113 1970-01-01 00:00 +0000 test 144s |\ merge 144s | | 144s @@ -47,36 +57,23 @@ 144s 144s $ cd hgrepo1 144s $ hg bookmark -r4 master 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s $ hg push -r master ../repo.git 144s - pushing to ../repo.git 144s - searching for changes 144s - adding objects 144s - remote: found 0 deltas to reuse 144s - added 5 commits with 3 trees and 3 blobs 144s - adding reference refs/heads/master 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s + abort: repository ../repo.git does not exist 144s + [255] 144s $ cd .. 144s 144s $ hg clone repo.git hgrepo2 144s - importing 5 git commits 144s - new changesets 5d1a6b64f9d0:eaa21d002113 (5 drafts) 144s - updating to bookmark master 144s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s + abort: repository repo.git not found 144s + [255] 144s expect the same revision ids as above 144s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 144s - @ 4:1,3 eaa21d002113 1970-01-01 00:00 +0000 test 144s - |\ merge 144s - | | 144s - | o 3 0dbe4ac1a758 1970-01-01 00:00 +0000 test 144s - | | B->C 144s - | | 144s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 144s - | | A->B 144s - | | 144s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 144s - |/ A->C 144s - | 144s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 144s - origin 144s - 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s + abort: repository hgrepo2 not found 144s $ hg -R hgrepo2 gverify 144s - verifying rev eaa21d002113 against git commit fb8c9e2afe5418cfff337eeed79fad5dd58826f0 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s + hg: unknown command 'gverify' 144s + (did you mean verify?) 144s + [10] 144s 144s ERROR: test-convergedmerge.t output changed 144s ! 144s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-conflict-2.t 144s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-conflict-2.t.err 144s @@ -2,30 +2,40 @@ 144s $ . "$TESTDIR/testutil" 144s 144s $ hg init hgrepo1 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s $ cd hgrepo1 144s $ echo A > afile 144s $ hg add afile 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s $ hg ci -m "origin" 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s 144s $ echo B > afile 144s $ hg ci -m "A->B" 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s 144s $ hg up -r0 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 144s $ echo C > afile 144s $ hg ci -m "A->C" 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s created new head 144s 144s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s warning: conflicts.* (re) 144s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 144s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 144s resolve using second parent 144s $ echo B > afile 144s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s $ hg ci -m "merge to B" 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s 144s $ hg log --graph --style compact | sed 's/\[.*\]//g' 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s @ 3:2,1 120385945d08 1970-01-01 00:00 +0000 test 144s |\ merge to B 144s | | 144s @@ -45,31 +55,18 @@ 144s 144s $ cd hgrepo1 144s $ hg bookmark -r tip master 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s $ hg push -r master ../repo.git 144s - pushing to ../repo.git 144s - searching for changes 144s - adding objects 144s - remote: found 0 deltas to reuse 144s - added 4 commits with 3 trees and 3 blobs 144s - adding reference refs/heads/master 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s + abort: repository ../repo.git does not exist 144s + [255] 144s $ cd .. 144s 144s $ hg clone repo.git hgrepo2 144s - importing 4 git commits 144s - new changesets 5d1a6b64f9d0:120385945d08 (4 drafts) 144s - updating to bookmark master 144s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s + abort: repository repo.git not found 144s + [255] 144s expect the same revision ids as above 144s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 144s - @ 3:1,2 120385945d08 1970-01-01 00:00 +0000 test 144s - |\ merge to B 144s - | | 144s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 144s - | | A->B 144s - | | 144s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 144s - |/ A->C 144s - | 144s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 144s - origin 144s - 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 144s + abort: repository hgrepo2 not found 144s 144s ERROR: test-conflict-2.t output changed 145s ! 145s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-phases-draft.t 145s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-phases-draft.t.err 145s @@ -12,73 +12,10 @@ 145s cloning without hggit.usephases does not publish local changesets 145s $ cd .. 145s $ hg clone gitrepo hgrepo | grep -v '^updating' 145s - importing 1 git commits 145s - new changesets ff7a2f2d8d70 (1 drafts) 145s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 145s + abort: repository gitrepo not found 145s + [1] 145s 145s $ cd hgrepo 145s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 145s $ hg phase -r master 145s - 0: draft 145s - 145s -pulling advances the draft phase, though 145s - 145s - $ hg phase -fs 0 145s - $ hg pull 145s - pulling from $TESTTMP/gitrepo 145s - no changes found 145s - $ hg phase tip 145s - 0: draft 145s - 145s -even if we don't have a name? 145s - 145s - $ hg phase -fs 0 145s - $ mv .hg/hgrc .hg/hgrc.bak 145s - $ hg pull ../gitrepo 145s - pulling from ../gitrepo 145s - no changes found 145s - $ hg phase tip 145s - 0: draft 145s - $ mv .hg/hgrc.bak .hg/hgrc 145s - $ cd .. 145s - 145s - 145s -pulling without hggit.usephases does not publish local changesets 145s - $ cd gitrepo 145s - $ git checkout -q master 145s - $ echo beta > beta 145s - $ git add beta 145s - $ fn_git_commit -m 'add beta' 145s - $ cd .. 145s - 145s - $ cd hgrepo 145s - $ hg pull 145s - pulling from $TESTTMP/gitrepo 145s - importing 1 git commits 145s - updating bookmark master 145s - new changesets 7fe02317c63d (1 drafts) 145s - (run 'hg update' to get a working copy) 145s - $ hg phase -r master 145s - 1: draft 145s - 145s -pulling with git.public does not publish local changesets 145s - $ hg --config git.public=master pull 145s - pulling from $TESTTMP/gitrepo 145s - no changes found 145s - $ hg phase -r master 145s - 1: draft 145s - 145s -pushing without hggit.usephases does not publish local changesets 145s - $ hg update master 145s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 145s - $ echo gamma > gamma 145s - $ hg add gamma 145s - $ hg commit -m 'gamma' 145s - $ hg push 145s - pushing to $TESTTMP/gitrepo 145s - searching for changes 145s - adding objects 145s - remote: found 0 deltas to reuse 145s - added 1 commits with 1 trees and 1 blobs 145s - updating reference refs/heads/master 145s - $ hg phase -r master 145s - 2: draft 145s 145s ERROR: test-phases-draft.t output changed 146s ! 146s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-subrepos-push.t 146s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-subrepos-push.t.err 146s @@ -5,10 +5,13 @@ 146s Initialized empty Git repository in $TESTTMP/repo.git/ 146s 146s $ hg init hgsubrepo 146s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 146s $ cd hgsubrepo 146s $ echo thefile > thefile 146s $ hg add thefile 146s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 146s $ fn_hg_commit -m 'add thefile' 146s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 146s $ cd .. 146s 146s $ git init gitsubrepo 146s @@ -20,59 +23,9 @@ 146s $ cd .. 146s 146s $ hg clone repo.git hgrepo 146s - updating to branch default 146s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 146s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 146s + abort: repository repo.git not found 146s + [255] 146s $ cd hgrepo 146s + $TESTTMP.sh: 32: cd: can't cd to hgrepo 146s $ hg book master 146s - $ echo alpha > alpha 146s - $ hg add alpha 146s - $ fn_hg_commit -m 'add alpha' 146s - $ touch .hgsub 146s - $ hg add .hgsub 146s - $ fn_hg_commit -m "add .hgsub" 146s - $ hg clone -q ../hgsubrepo hg 146s - $ echo "hg = ../hgsubrepo" >> .hgsub 146s - $ fn_hg_commit -m 'add hg subrepo' 146s - $ git clone --quiet ../gitsubrepo git 146s - $ echo "git = [git]../gitsubrepo" >> .hgsub 146s - $ fn_hg_commit -m 'add git subrepo' 146s - $ hg push 146s - pushing to $TESTTMP/repo.git 146s - pushing subrepo hg to $TESTTMP/hgsubrepo 146s - searching for changes 146s - no changes found 146s - searching for changes 146s - adding objects 146s - remote: found 0 deltas to reuse 146s - added 4 commits with 2 trees and 2 blobs 146s - adding reference refs/heads/master 146s - $ cat .hgsub 146s - hg = ../hgsubrepo 146s - git = [git]../gitsubrepo 146s - $ cat .hgsubstate 146s - aaae5224095dca7403147c0e20cbac1f450b0e95 git 146s - df643c539c7541d48eacc76745581e00cbaf3d45 hg 146s - $ cd .. 146s - 146s -Now clone it. Note that no Mercurial state persists: 146s - 146s - $ git clone --recurse-submodules repo.git gitrepo 146s - Cloning into 'gitrepo'... 146s - done. 146s - Submodule 'git' ($TESTTMP/gitsubrepo) registered for path 'git' 146s - Cloning into '$TESTTMP/gitrepo/git'... 146s - done. 146s - Submodule path 'git': checked out 'aaae5224095dca7403147c0e20cbac1f450b0e95' 146s - $ cd gitrepo 146s - $ ls -A 146s - .git 146s - .gitmodules 146s - alpha 146s - git 146s - $ cat .gitmodules 146s - [submodule "git"] 146s - path = git 146s - url = ../gitsubrepo 146s - $ ls -A git 146s - .git 146s - thefile 146s 146s ERROR: test-subrepos-push.t output changed 148s ! 148s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-conflict-1.t 148s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-conflict-1.t.err 148s @@ -2,30 +2,40 @@ 148s $ . "$TESTDIR/testutil" 148s 148s $ hg init hgrepo1 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ cd hgrepo1 148s $ echo A > afile 148s $ hg add afile 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ hg ci -m "origin" 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s 148s $ echo B > afile 148s $ hg ci -m "A->B" 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s 148s $ hg up -r0 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 148s $ echo C > afile 148s $ hg ci -m "A->C" 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s created new head 148s 148s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s warning: conflicts.* (re) 148s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 148s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 148s resolve using first parent 148s $ echo C > afile 148s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ hg ci -m "merge to C" 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s 148s $ hg log --graph --style compact | sed 's/\[.*\]//g' 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s @ 3:2,1 6c53bc0f062f 1970-01-01 00:00 +0000 test 148s |\ merge to C 148s | | 148s @@ -45,31 +55,18 @@ 148s 148s $ cd hgrepo1 148s $ hg bookmark -r tip master 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s $ hg push -r master ../repo.git 148s - pushing to ../repo.git 148s - searching for changes 148s - adding objects 148s - remote: found 0 deltas to reuse 148s - added 4 commits with 3 trees and 3 blobs 148s - adding reference refs/heads/master 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository ../repo.git does not exist 148s + [255] 148s $ cd .. 148s 148s $ hg clone repo.git hgrepo2 148s - importing 4 git commits 148s - new changesets 5d1a6b64f9d0:6c53bc0f062f (4 drafts) 148s - updating to bookmark master 148s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository repo.git not found 148s + [255] 148s expect the same revision ids as above 148s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 148s - @ 3:1,2 6c53bc0f062f 1970-01-01 00:00 +0000 test 148s - |\ merge to C 148s - | | 148s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 148s - | | A->B 148s - | | 148s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 148s - |/ A->C 148s - | 148s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 148s - origin 148s - 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository hgrepo2 not found 148s 148s ERROR: test-conflict-1.t output changed 148s ! 148s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-pull-after-obsolete.t 148s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-pull-after-obsolete.t.err 148s @@ -20,52 +20,9 @@ 148s 148s $ cd .. 148s $ hg clone -U gitrepo hgrepo 148s - importing 2 git commits 148s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository gitrepo not found 148s + [255] 148s $ cd hgrepo 148s + $TESTTMP.sh: 31: cd: can't cd to hgrepo 148s $ hg up master 148s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 148s - (activating bookmark master) 148s - $ hg log --graph 148s - @ changeset: 1:7fe02317c63d 148s - | bookmark: master 148s - | tag: default/master 148s - | tag: thetag 148s - | tag: tip 148s - | user: test 148s - | date: Mon Jan 01 00:00:11 2007 +0000 148s - | summary: add beta 148s - | 148s - o changeset: 0:ff7a2f2d8d70 148s - user: test 148s - date: Mon Jan 01 00:00:10 2007 +0000 148s - summary: add alpha 148s - 148s - $ cd ../gitrepo 148s - $ echo beta line 2 >> beta 148s - $ git add beta 148s - $ fn_git_commit -m 'add to beta' 148s - 148s -Create a commit, obsolete it, and pull, to ensure that we can pull if 148s -the tipmost commit is hidden. 148s - 148s - $ cd ../hgrepo 148s - $ hg bookmark --inactive 148s - $ echo gamma > gamma 148s - $ hg add gamma 148s - $ fn_hg_commit -m 'add gamma' 148s - $ hg up master 148s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 148s - (activating bookmark master) 148s - $ hg log -T '{rev}:{node} {desc}\n' -r tip 148s - 2:4090a1266584bc1a47ce562e9349b1e0f1b44611 add gamma 148s - $ hg debugobsolete 4090a1266584bc1a47ce562e9349b1e0f1b44611 148s - 1 new obsolescence markers 148s - obsoleted 1 changesets 148s - 148s - $ hg pull 148s - pulling from $TESTTMP/gitrepo 148s - importing 1 git commits 148s - updating bookmark master 148s - new changesets cc1e605d90db (1 drafts) 148s - (run 'hg update' to get a working copy) 148s 148s ERROR: test-pull-after-obsolete.t output changed 148s ! 148s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-git-clone.t 148s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-git-clone.t.err 148s @@ -14,30 +14,24 @@ 148s $ cd .. 148s 148s $ hg clone gitrepo hgrepo 148s - importing 2 git commits 148s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 148s - updating to bookmark master 148s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository gitrepo not found 148s + [255] 148s $ hg -R hgrepo log --graph 148s - @ changeset: 1:7fe02317c63d 148s - | bookmark: master 148s - | tag: default/master 148s - | tag: tip 148s - | user: test 148s - | date: Mon Jan 01 00:00:11 2007 +0000 148s - | summary: add beta 148s - | 148s - o changeset: 0:ff7a2f2d8d70 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.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository hgrepo not found 148s + [255] 148s 148s we should have some bookmarks 148s $ hg -R hgrepo book 148s - * master 1:7fe02317c63d 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository hgrepo not found 148s + [255] 148s $ hg -R hgrepo gverify 148s - verifying rev 7fe02317c63d against git commit 9497a4ee62e16ee641860d7677cdb2589ea15554 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + hg: unknown command 'gverify' 148s + (did you mean verify?) 148s + [10] 148s 148s test for ssh vulnerability 148s 148s @@ -47,16 +41,18 @@ 148s > EOF 148s 148s $ hg clone -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.PWIkXN/build.ILN/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 clone -q 'git+ssh://%2DoProxyCommand=rm${IFS}nonexistent/path' 148s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/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 clone -q 'git+ssh://fakehost|rm${IFS}nonexistent/path' 148s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 148s - abort: git remote error: The remote server unexpectedly closed the connection. 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 148s [255] 148s $ hg clone -q 'git+ssh://fakehost%7Crm${IFS}nonexistent/path' 148s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 148s - abort: git remote error: The remote server unexpectedly closed the connection. 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 148s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 148s [255] 148s 148s ERROR: test-git-clone.t output changed 149s ! 149s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-git-gpg.t 149s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-git-gpg.t.err 149s @@ -55,23 +55,10 @@ 149s Hg clone it 149s 149s $ hg clone gitrepo hgrepo 149s - importing 2 git commits 149s - new changesets ab60c5e55bd6:[0-9a-f]{12,12} \(2 drafts\) (re) 149s - updating to bookmark signed 149s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 149s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 149s + abort: repository gitrepo not found 149s + [255] 149s 149s $ cd hgrepo 149s + $TESTTMP.sh: 46: cd: can't cd to hgrepo 149s $ hg push ../gitrepo2 -B signed 149s - pushing to ../gitrepo2 149s - searching for changes 149s - adding objects 149s - remote: found 0 deltas to reuse 149s - added 1 commits with 1 trees and 0 blobs 149s - adding reference refs/heads/signed 149s - $ cd .. 149s - 149s -Verify the commit 149s - 149s - $ cd gitrepo2 149s - $ git show --show-signature signed | grep "Good signature from" 149s - gpg: Good signature from "hgtest" [ultimate] 149s 149s ERROR: test-git-gpg.t output changed 150s ! 150s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-push-phases.t 150s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-push-phases.t.err 150s @@ -9,68 +9,13 @@ 150s $ git init -q --bare repo.git 150s 150s $ hg clone repo.git hgrepo 150s - updating to branch default 150s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/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: 13: cd: can't cd to hgrepo 150s 150s Create two commits, one secret: 150s 150s $ touch alpha 150s - $ hg add alpha 150s - $ fn_hg_commit -m alpha 150s - $ hg book -r . master 150s - $ touch beta 150s - $ hg add beta 150s - $ fn_hg_commit --secret -m beta 150s - $ hg book -r . secret 150s - $ hg push 150s - pushing to $TESTTMP/repo.git 150s - warning: not exporting secret bookmark 'secret' 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/master 150s - $ cd .. 150s - $ hg -R hgrepo log --graph --template phases 150s - @ changeset: 1:62966756ea96 150s - | bookmark: secret 150s - | tag: tip 150s - | phase: secret 150s - | user: test 150s - | date: Mon Jan 01 00:00:11 2007 +0000 150s - | summary: beta 150s - | 150s - o changeset: 0:d4b83afc35d1 150s - bookmark: master 150s - tag: default/master 150s - phase: public 150s - user: test 150s - date: Mon Jan 01 00:00:10 2007 +0000 150s - summary: alpha 150s - 150s - 150s -What happens when we push the secret? 150s - 150s - $ hg -R hgrepo push -B secret 150s - pushing to $TESTTMP/repo.git 150s - warning: not exporting secret bookmark 'secret' 150s - searching for changes 150s - abort: revision 62966756ea96 cannot be pushed since it doesn't have a bookmark 150s - [255] 150s - 150s -Only one changeset was pushed: 150s - 150s - $ GIT_DIR=repo.git git log --graph --all --decorate=short 150s - * commit 2cc4e3d19551e459a0dd606f4cf890de571c7d33 (HEAD -> master) 150s - Author: test 150s - Date: Mon Jan 1 00:00:10 2007 +0000 150s - 150s - alpha 150s - 150s -And this published the remote head: 150s - 150s - $ hg -R hgrepo phase 'all()' 150s - 0: public 150s - 1: secret 150s 150s ERROR: test-push-phases.t output changed 150s ! 150s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-keywords.t 150s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-keywords.t.err 150s @@ -21,29 +21,9 @@ 150s $ cd .. 150s 150s $ hg clone gitrepo hgrepo 150s - importing 3 git commits 150s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 150s - updating to bookmark master 150s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 150s + abort: repository gitrepo not found 150s + [255] 150s $ cd hgrepo 150s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 150s $ echo gamma > gamma 150s - $ hg add gamma 150s - $ hg commit -m 'add gamma' 150s - 150s - $ hg log --template "{rev} {node} {node|short} {gitnode} {gitnode|short}\n" 150s - 3 965bf7d08d3ac847dd8eb9e72ee0bf547d1a65d9 965bf7d08d3a 150s - 2 8e3f0ecc9aefd4ea2fdf8e2d5299cac548762a1c 8e3f0ecc9aef 7e2a5465ff4e3b992c429bb87a392620a0ac97b7 7e2a5465ff4e 150s - 1 7fe02317c63d9ee324d4b5df7c9296085162da1b 7fe02317c63d 9497a4ee62e16ee641860d7677cdb2589ea15554 9497a4ee62e1 150s - 0 ff7a2f2d8d7099694ae1e8b03838d40575bebb63 ff7a2f2d8d70 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 7eeab2ea75ec 150s - $ hg log --template "fromgit {rev}\n" --rev "fromgit()" 150s - fromgit 0 150s - fromgit 1 150s - fromgit 2 150s - $ hg log --template "gitnode_existsA {rev}\n" --rev "gitnode(9497a4ee62e16ee641860d7677cdb2589ea15554)" 150s - gitnode_existsA 1 150s - $ hg log --template "gitnode_existsB {rev}\n" --rev "gitnode(7eeab)" 150s - gitnode_existsB 0 150s - $ hg log --rev "gitnode(7e)" 150s - abort: git-mapfile@7e: ambiguous identifier!? (re) 150s - [50] 150s - $ hg log --template "gitnode_notexists {rev}\n" --rev "gitnode(1234567890ab)" 150s 150s ERROR: test-keywords.t output changed 151s ! 151s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-subrepos-delete.t 151s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-subrepos-delete.t.err 151s @@ -52,22 +52,9 @@ 151s And there should be nothing in Mercurial either: 151s 151s $ hg clone -U repo.git hgrepo 151s - importing 3 git commits 151s - new changesets e532b2bfda10:cc611d35fb62 (3 drafts) 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/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: 50: cd: can't cd to hgrepo 151s $ hg log --graph --template info 151s - o 151s - | commit: 2:cc611d35fb62 delete subrepo 151s - | added: 151s - | removed: .hgsub .hgsubstate 151s - o 151s - | commit: 1:8d549bcc5179 add subrepo 151s - | added: .hgsub .hgsubstate 151s - | removed: 151s - o 151s - commit: 0:e532b2bfda10 add alpha 151s - added: alpha 151s - removed: 151s - $ hg manifest -r tip 151s - alpha 151s - $ cd .. 151s 151s ERROR: test-subrepos-delete.t output changed 151s ! 151s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-tree-decomposition.t 151s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-tree-decomposition.t.err 151s @@ -24,45 +24,9 @@ 151s $ git init -q --bare repo.git 151s 151s $ hg clone gitrepo hgrepo 151s - importing 3 git commits 151s - new changesets d4d3d2417141:541f27994b81 (3 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.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 151s + abort: repository gitrepo not found 151s + [255] 151s $ cd hgrepo 151s + $TESTTMP.sh: 38: cd: can't cd to hgrepo 151s $ hg log --template 'adds: {file_adds}\ndels: {file_dels}\n' 151s - adds: d1 151s - dels: d1/f1 151s - adds: d2/f2 151s - dels: d1/f2 151s - adds: d1/f1 d1/f2 151s - dels: 151s - 151s - $ hg debug-remove-hggit-state 151s - clearing out the git cache data 151s - $ hg push ../repo.git 151s - pushing to ../repo.git 151s - searching for changes 151s - adding objects 151s - remote: found 0 deltas to reuse 151s - added 3 commits with 6 trees and 3 blobs 151s - adding reference refs/heads/master 151s - $ cd .. 151s - 151s - $ git --git-dir=repo.git log --pretty=medium 151s - commit 6e0dbd8cd92ed4823c69cb48d8a2b81f904e6e69 151s - Author: test 151s - Date: Mon Jan 1 00:00:12 2007 +0000 151s - 151s - replace a dir with a file 151s - 151s - commit a1874d5cd0b1549ed729e36f0da4a93ed36259ee 151s - Author: test 151s - Date: Mon Jan 1 00:00:11 2007 +0000 151s - 151s - rename 151s - 151s - commit 102c17a5deda49db3f10ec5573f9378867098b7c 151s - Author: test 151s - Date: Mon Jan 1 00:00:10 2007 +0000 151s - 151s - initial 151s 151s ERROR: test-tree-decomposition.t output changed 152s ! 152s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-subrepos-drop.t 152s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-subrepos-drop.t.err 152s @@ -17,52 +17,9 @@ 152s Create a Mercurial repository with a .gitmodules file: 152s 152s $ hg clone repo.git hgrepo 152s - updating to branch default 152s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s + abort: repository repo.git not found 152s + [255] 152s $ cd hgrepo 152s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 152s $ hg book master 152s - $ touch this 152s - $ fn_hg_commit -A -m 'add this' 152s - $ cat > .gitmodules < [submodule "subrepo"] 152s - > path = subrepo 152s - > url = ../gitsubrepo 152s - > EOF 152s - $ hg add .gitmodules 152s - $ fn_hg_commit -m "add .gitmodules file" 152s - $ cd .. 152s - 152s -What happens if we push that to Git? 152s - 152s - $ hg -R hgrepo push 152s - pushing to $TESTTMP/repo.git 152s - warning: ignoring modifications to '.gitmodules' file; please use '.hgsub' instead 152s - searching for changes 152s - adding objects 152s - remote: found 0 deltas to reuse 152s - added 2 commits with 1 trees and 1 blobs 152s - adding reference refs/heads/master 152s - 152s -But we don't get a warning if we don't touch .gitmodules: 152s - 152s - $ cd hgrepo 152s - $ touch that 152s - $ fn_hg_commit -A -m 'add that' 152s - $ hg push 152s - pushing to $TESTTMP/repo.git 152s - searching for changes 152s - adding objects 152s - remote: found 0 deltas to reuse 152s - added 1 commits with 1 trees and 0 blobs 152s - updating reference refs/heads/master 152s - $ cd .. 152s - 152s -Check that it didn't silenty come through, or something: 152s - 152s - $ git clone repo.git gitrepo 152s - Cloning into 'gitrepo'... 152s - done. 152s - $ ls -A gitrepo 152s - .git 152s - that 152s - this 152s 152s ERROR: test-subrepos-drop.t output changed 152s ! 152s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-annotate.t 152s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-annotate.t.err 152s @@ -10,6 +10,7 @@ 152s init 152s 152s $ hg init repo 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s $ cd repo 152s 152s commit 152s @@ -19,37 +20,48 @@ 152s > a 152s > EOF 152s $ hg add a 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s $ fn_hg_commit -m 1 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s $ cat < a 152s > a 152s > a 152s > a 152s > EOF 152s $ fn_hg_commit -m 2 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s $ cat < a 152s > a 152s > b 152s > a 152s > EOF 152s $ fn_hg_commit -m 3 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s 152s annotate multiple files 152s 152s $ hg annotate a 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s 0: a 152s 2: b 152s 1: a 152s 152s $ hg annotate --skip 1 a 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s 0: a 152s 2: b 152s 0* a 152s 152s $ hg gexport 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s + hg: unknown command 'gexport' 152s + (did you mean one of export, import?) 152s + [10] 152s $ hg log -T '{rev}:{node} {gitnode}\n' 152s - 2:beb139b96eec386addc02d48db524b7646ef1605 19388575d02e71e917e7013aa854d4a21c509819 152s - 1:a9a255d66663f9216bdcf8dda69211d7280f7278 debec50a14cc4830584dd4fa1507c51cce1c098f 152s - 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 88f28c06a1ede9a70852ab1bf9818150fabaaaa9 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s + 2:beb139b96eec386addc02d48db524b7646ef1605 152s + 1:a9a255d66663f9216bdcf8dda69211d7280f7278 152s + 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 152s 152s $ cat < .git-blame-ignore-revs 152s > # this is a comment, and the next line should be ignored 152s @@ -59,39 +71,43 @@ 152s > EOF 152s 152s $ hg annotate a 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s 0: a 152s 2: b 152s 1: a 152s $ hg annotate a \ 152s > --debug \ 152s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 152s - skipping debec50a14cc -> a9a255d66663 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s 0: a 152s 2: b 152s - 0* a 152s + 1: a 152s $ hg add .git-blame-ignore-revs 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s $ hg annotate a \ 152s > --debug \ 152s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 152s - skipping debec50a14cc -> a9a255d66663 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s 0: a 152s 2: b 152s - 0* a 152s + 1: a 152s $ hg annotate a \ 152s > --config git.blame.ignoreRevsFile=badfile 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s 0: a 152s 2: b 152s 1: a 152s $ hg annotate -T'{lines % "{rev}:{node|short} {gitnode|short}: {line}"}' a 152s - 0:8d4731bd0f4a 88f28c06a1ed: a 152s - 2:beb139b96eec 19388575d02e: b 152s - 1:a9a255d66663 debec50a14cc: a 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s + 0:8d4731bd0f4a : a 152s + 2:beb139b96eec : b 152s + 1:a9a255d66663 : a 152s 152s $ cd .. 152s $ hg -R repo annotate repo/a \ 152s > --debug \ 152s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 152s - skipping debec50a14cc -> a9a255d66663 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s 0: a 152s 2: b 152s - 0* a 152s + 1: a 152s 152s ERROR: test-annotate.t output changed 152s ! 152s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-push-anonymous.t 152s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-push-anonymous.t.err 152s @@ -25,28 +25,9 @@ 152s Clone it, deactivate the bookmark, add a commit, and push! 152s 152s $ hg clone -U gitrepo hgrepo 152s - importing 1 git commits 152s - new changesets ff7a2f2d8d70 (1 drafts) 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 152s + abort: repository gitrepo not found 152s + [255] 152s $ cd hgrepo 152s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 152s $ hg up tip 152s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 152s - $ echo beta > beta 152s - $ hg add beta 152s - $ fn_hg_commit -m "add beta" 152s - 152s -Pushing that changeset should print a helpful message: 152s - 152s - $ hg push 152s - pushing to $TESTTMP/gitrepo 152s - searching for changes 152s - no changes found (ignoring 1 changesets without bookmarks or tags) 152s - [1] 152s - 152s -But what about untagged, but secret changesets? 152s - 152s - $ hg phase -fs tip 152s - $ hg push 152s - pushing to $TESTTMP/gitrepo 152s - searching for changes 152s - no changes found 152s - [1] 152s 152s ERROR: test-push-anonymous.t output changed 153s ! 153s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-empty-working-tree.t 153s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-empty-working-tree.t.err 153s @@ -10,29 +10,9 @@ 153s $ git init -q --bare repo.git 153s 153s $ hg clone gitrepo hgrepo 153s - importing 1 git commits 153s - new changesets 01708ca54a8f (1 drafts) 153s - updating to bookmark master 153s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 153s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 153s + abort: repository gitrepo not found 153s + [255] 153s $ cd hgrepo 153s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 153s $ hg log -r tip --template 'files: {files}\n' 153s - files: 153s - $ hg gverify 153s - verifying rev 01708ca54a8f against git commit 678256865a8c85ae925bf834369264193c88f8de 153s - 153s - $ hg debug-remove-hggit-state 153s - clearing out the git cache data 153s - $ hg push ../repo.git 153s - pushing to ../repo.git 153s - searching for changes 153s - adding objects 153s - remote: found 0 deltas to reuse 153s - added 1 commits with 1 trees and 0 blobs 153s - adding reference refs/heads/master 153s - $ cd .. 153s - $ git --git-dir=repo.git log --pretty=medium 153s - commit 678256865a8c85ae925bf834369264193c88f8de 153s - Author: test 153s - Date: Mon Jan 1 00:00:00 2007 +0000 153s - 153s - empty 153s 153s ERROR: test-empty-working-tree.t output changed 154s ! 154s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-gitignore-permissions.t 154s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-gitignore-permissions.t.err 154s @@ -4,6 +4,7 @@ 154s $ . "$TESTDIR/testutil" 154s 154s $ hg init repo 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 154s $ cd repo 154s 154s $ if test `whoami` = root 154s @@ -16,8 +17,14 @@ 154s 154s $ touch thefile 154s $ hg add thefile 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 154s $ hg ci -A -m commit 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 154s $ hg gexport 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 154s + hg: unknown command 'gexport' 154s + (did you mean one of export, import?) 154s + [10] 154s 154s Create a file that we can ignore 154s 154s @@ -33,9 +40,10 @@ 154s 154s $ echo nothingtoseehere > .gitignore 154s $ hg status 154s - not_readable: Permission denied 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 154s not_readable: Permission denied 154s ? .gitignore 154s + ? nothingtoseehere 154s 154s And notice that we really did ignore it! 154s 154s 154s ERROR: test-gitignore-permissions.t output changed 155s ! 155s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-gitignore-share.t 155s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-gitignore-share.t.err 155s @@ -9,6 +9,7 @@ 155s $ git init --quiet --bare repo.git 155s 155s $ hg init hgrepo 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 155s $ cd hgrepo 155s $ cat > .hg/hgrc < [paths] 155s @@ -16,26 +17,31 @@ 155s > EOF 155s $ echo ignored > .gitignore 155s $ hg add .gitignore 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 155s $ hg ci -m ignore 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 155s $ hg book master 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 155s $ hg push 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 155s pushing to $TESTTMP/repo.git 155s - searching for changes 155s - adding objects 155s - remote: found 0 deltas to reuse 155s - added 1 commits with 1 trees and 1 blobs 155s - adding reference refs/heads/master 155s + abort: repository $TESTTMP/repo.git not found 155s + [255] 155s $ cd .. 155s 155s We should also ignore the file in a shared repository: 155s 155s $ hg share hgrepo sharerepo 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 155s updating working directory 155s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 155s $ cd sharerepo 155s $ hg paths 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 155s default = $TESTTMP/repo.git 155s $ cat .gitignore 155s ignored 155s $ touch ignored 155s $ hg status 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 155s + ? ignored 155s 155s ERROR: test-gitignore-share.t output changed 155s ! 155s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-ambiguousprefix.t 155s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-ambiguousprefix.t.err 155s @@ -21,13 +21,11 @@ 155s $ cd .. 155s 155s $ hg clone gitrepo hgrepo 155s - importing 3 git commits 155s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 155s - updating to bookmark master 155s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 155s + abort: repository gitrepo not found 155s + [255] 155s 155s $ cd hgrepo 155s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 155s 155s $ hg log -r 'gitnode(7e)' 155s - abort: git-mapfile@7e: ambiguous identifier!? (re) 155s - [50] 155s 155s ERROR: test-ambiguousprefix.t output changed 156s ! 156s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-timezone.t 156s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-timezone.t.err 156s @@ -8,10 +8,13 @@ 156s $ . "$TESTDIR/testutil" 156s 156s $ hg init hgrepo 156s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 156s $ cd hgrepo 156s $ touch beta 156s $ hg add beta 156s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 156s $ fn_hg_commit -m "test commit" 156s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 156s $ cat >patch2 < # HG changeset patch 156s > # User J. User 156s @@ -28,5 +31,10 @@ 156s > +alpha 156s > EOF 156s $ hg import patch2 156s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 156s applying patch2 156s $ hg gexport 156s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 156s + hg: unknown command 'gexport' 156s + (did you mean one of export, import?) 156s + [10] 156s 156s ERROR: test-timezone.t output changed 158s ! 158s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-transplant.t 158s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-transplant.t.err 158s @@ -11,12 +11,20 @@ 158s > EOF 158s 158s $ hg init baserepo 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 158s $ cd baserepo 158s $ for c in A B C 158s > do 158s > echo $c > $c && hg add $c && fn_hg_commit -m $c 158s > done 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 158s $ hg clone -r 2 . ../otherrepo 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 158s adding changesets 158s adding manifests 158s adding file changes 158s @@ -26,6 +34,8 @@ 158s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 158s $ cd ../otherrepo 158s $ hg up 1 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 158s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 158s $ hg transplant -s ../baserepo tip 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 158s no changes found 158s 158s ERROR: test-transplant.t output changed 158s !s 158s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-url-parsing.py.out 158s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-url-parsing.py.err 158s @@ -1,46 +1,11 @@ 158s -% expect '/webjam/webjam.git' 158s -/webjam/webjam.git 158s -% expect 'github.com' 158s -github.com 158s -% expect '/webjam/webjam.git' 158s -/webjam/webjam.git 158s -% expect 'github.com' 158s -github.com 158s -% expect '19418' 158s -19418 158s -% expect 'webjam.git' 158s -webjam.git 158s -% expect 'git@heroku.com' 158s -git@heroku.com 158s -% expect '999' 158s -999 158s -% expect 'webjam/webjam.git' 158s -webjam/webjam.git 158s -% expect 'git@github.com' 158s -git@github.com 158s -% expect '42qu/vps.git' 158s -42qu/vps.git 158s -% expect 'git@github.com' 158s -git@github.com 158s -% expect '/webjam/webjam.git' 158s -/webjam/webjam.git 158s -% expect 'git@github.com' 158s -git@github.com 158s -% expect '/webjam/webjam.git' 158s -/webjam/webjam.git 158s -% expect 'git@github.com' 158s -git@github.com 158s -% expect '10022' 158s -10022 158s -% expect 'webjam.git' 158s -webjam.git 158s -% expect 'git@heroku.com' 158s -git@heroku.com 158s -% expect 'webjam.git' 158s -webjam.git 158s -% expect 'git@compatible.com' 158s -git@compatible.com 158s -% expect 'webjam.git' 158s -webjam.git 158s -% expect 'git@heroku.com' 158s -git@heroku.com 158s +Traceback (most recent call last): 158s + File "/tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-url-parsing.py", line 14, in 158s + from hggit.git_handler import GitHandler 158s + File "/usr/lib/python3/dist-packages/hggit/__init__.py", line 163, in 158s + from . import gitdirstate 158s + File "/usr/lib/python3/dist-packages/hggit/gitdirstate.py", line 19, in 158s + from . import gitrepo 158s + File "/usr/lib/python3/dist-packages/hggit/gitrepo.py", line 20, in 158s + class gitrepo(repository.peer): 158s + ^^^^^^^^^^^^^^^ 158s +AttributeError: module 'mercurial.interfaces.repository' has no attribute 'peer'. Did you mean: 'IPeer'? 158s 158s ERROR: test-url-parsing.py output changed 159s !. 159s --- /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-addbranchrevs.t 159s +++ /tmp/autopkgtest.PWIkXN/build.ILN/src/tests/test-addbranchrevs.t.err 159s @@ -7,14 +7,23 @@ 159s caused the pull to not update to the passed revision. 159s 159s $ hg init orig 159s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 159s $ cd orig 159s $ echo a > a; hg add a; hg ci -m a 159s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 159s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 159s $ hg branch foo -q 159s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 159s $ echo b > b; hg add b; hg ci -m b 159s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 159s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 159s 159s $ cd .. 159s $ hg clone orig clone -r 0 -q 159s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 159s $ cd clone 159s $ hg pull -u -r 1 -q 159s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 159s $ hg id -n 159s + *** failed to import extension "hggit" from /tmp/autopkgtest.PWIkXN/build.ILN/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 159s 1 159s 159s ERROR: test-addbranchrevs.t output changed 159s ! 159s Skipped test-check-black.t: missing feature: the black formatter for python (>= 22.3) 159s Skipped test-check-commit.t: missing feature: running tests from repository 159s Skipped test-check-pyflakes.t: missing feature: Pyflakes python linter 159s Skipped test-check-pylint.t: missing feature: Pylint python linter 159s Skipped test-encoding.t: blacklisted 159s Skipped test-gitignore-windows.t: missing feature: Windows 159s Skipped test-incoming.t: blacklisted 159s Skipped test-serve-ci.t: skipped 159s Skipped test-serve-dulwich.t: blacklisted 159s Failed test-addbranchrevs.t: output changed 159s Failed test-ambiguousprefix.t: output changed and returned error code 1 159s Failed test-annotate.t: output changed 159s Failed test-bookmark-workflow.t: output changed and returned error code 1 159s Failed test-branch-bookmark-suffix.t#with-path: output changed and returned error code 1 159s Failed test-branch-bookmark-suffix.t#without-path: output changed and returned error code 1 159s Failed test-bundle.t: output changed and returned error code 1 159s Failed test-clone.t#draft: output changed 159s Failed test-clone.t#secret: output changed 159s Failed test-conflict-1.t: output changed 159s Failed test-conflict-2.t: output changed 159s Failed test-convergedmerge.t: output changed 159s Failed test-empty-working-tree.t: output changed and returned error code 1 159s Failed test-extra.t: output changed and returned error code 1 159s Failed test-file-removal.t: output changed and returned error code 1 159s Failed test-gc.t: output changed and returned error code 1 159s Failed test-git-clone.t: output changed 159s Failed test-git-gpg.t: output changed and returned error code 1 159s Failed test-git-submodules.t: output changed and returned error code 1 159s Failed test-git-tags.t#draft: output changed and returned error code 1 159s Failed test-git-tags.t#secret: output changed and returned error code 1 159s Failed test-git-workflow.t: output changed 159s Failed test-gitignore-permissions.t: output changed 159s Failed test-gitignore-share.t: output changed 159s Failed test-gitignore.t: output changed 159s Failed test-help.t: output changed 159s Failed test-hg-author.t: output changed and returned error code 1 159s Failed test-hg-branch.t: output changed and returned error code 1 159s Failed test-hg-clone.t: output changed and returned error code 1 159s Failed test-hg-tags.t: output changed and returned error code 1 159s Failed test-hook.t: output changed 159s Failed test-illegal-contents.t: output changed 159s Failed test-invalid-refs.t: output changed and returned error code 1 159s Failed test-keywords.t: output changed and returned error code 1 159s Failed test-merge.t: output changed and returned error code 1 159s Failed test-multiple-remotes.t: output changed 159s Failed test-octopus.t: output changed and returned error code 1 159s Failed test-orphan-tags.t: output changed and returned error code 1 159s Failed test-outgoing.t: output changed and returned error code 1 159s Failed test-phases-draft.t: output changed and returned error code 1 159s Failed test-phases-public.t#publish-defaults: output changed and returned error code 1 159s Failed test-phases-public.t#publish-specific: output changed and returned error code 1 159s Failed test-phases-remote.t: output changed and returned error code 1 159s Failed test-pull-after-obsolete.t: output changed and returned error code 1 159s Failed test-pull-after-rebase.t: output changed and returned error code 1 159s Failed test-pull-after-strip.t: output changed and returned error code 1 159s Failed test-pull.t#draft: output changed 159s Failed test-pull.t#secret: output changed 159s Failed test-push-anonymous.t: output changed and returned error code 1 159s Failed test-push-authors.t: output changed and returned error code 1 159s Failed test-push-detached.t: output changed and returned error code 1 159s Failed test-push-missing-commit.t: output changed and returned error code 1 159s Failed test-push-phases.t: output changed and returned error code 1 159s Failed test-push-r.t: output changed 159s Failed test-push-to-head.t: output changed and returned error code 1 159s Failed test-push.t: output changed and returned error code 1 159s Failed test-renames.t: output changed and returned error code 1 159s Failed test-serve-git.t: output changed 159s Failed test-serve-hg-static.t: output changed 159s Failed test-serve-hg.t#with-hggit: output changed and returned error code 1 159s Failed test-serve-hg.t#without-hggit: output changed and returned error code 1 159s Failed test-subrepos-delete.t: output changed and returned error code 1 159s Failed test-subrepos-drop.t: output changed and returned error code 1 159s Failed test-subrepos-push.t: output changed and returned error code 1 159s Failed test-subrepos-syntax.t: output changed and returned error code 1 159s Failed test-subrepos.t: output changed and returned error code 1 159s Failed test-timezone.t: output changed 159s Failed test-transactions.t: output changed 159s Failed test-transplant.t: output changed 159s Failed test-tree-decomposition.t: output changed and returned error code 1 159s Failed test-url-parsing.py: output changed and returned error code 1 159s Failed test-verify-fail.t: output changed 159s # Ran 73 tests, 9 skipped, 72 failed. 159s python hash seed: 4115443983 159s make: *** [Makefile:15: tests] Error 1 159s autopkgtest [06:58:41]: test testsuite: -----------------------] 160s testsuite FAIL non-zero exit status 2 160s autopkgtest [06:58:42]: test testsuite: - - - - - - - - - - results - - - - - - - - - - 160s autopkgtest [06:58:42]: test mercurial-git: preparing testbed 179s Creating nova instance adt-resolute-ppc64el-hg-git-20260210-065602-juju-7f2275-prod-proposed-migration-environment-2-e30da19f-08cd-4733-9163-79d85ad7fb0c from image adt/ubuntu-resolute-ppc64el-server-20260209.img (UUID f7f31435-4cd1-4090-aa55-59cfefa097ca)... 242s autopkgtest [07:00:04]: testbed dpkg architecture: ppc64el 243s autopkgtest [07:00:05]: testbed apt version: 3.1.15 243s autopkgtest [07:00:05]: @@@@@@@@@@@@@@@@@@@@ test bed setup 243s autopkgtest [07:00:05]: testbed release detected to be: resolute 244s autopkgtest [07:00:06]: updating testbed package index (apt update) 244s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 244s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 244s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 244s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 244s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [31.1 kB] 244s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [178 kB] 245s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1727 kB] 245s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/main ppc64el Packages [261 kB] 245s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/universe ppc64el Packages [1728 kB] 246s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse ppc64el Packages [20.2 kB] 246s Fetched 4069 kB in 2s (1870 kB/s) 247s Reading package lists... 248s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 248s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 248s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 248s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 249s Reading package lists... 249s Reading package lists... 249s Building dependency tree... 249s Reading state information... 249s Calculating upgrade... 249s The following NEW packages will be installed: 249s gcc-16-base 249s The following packages will be upgraded: 249s cryptsetup-bin dracut-install iproute2 iptables libatomic1 libbrotli1 249s libcryptsetup12 libgcc-s1 libip4tc2 libip6tc2 libstdc++6 libxtables12 wget 249s 13 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. 249s Need to get 4597 kB of archives. 249s After this operation, 279 kB of additional disk space will be used. 249s Get:1 http://ftpmaster.internal/ubuntu resolute/main ppc64el gcc-16-base ppc64el 16-20260208-1ubuntu1 [59.7 kB] 249s Get:2 http://ftpmaster.internal/ubuntu resolute/main ppc64el libgcc-s1 ppc64el 16-20260208-1ubuntu1 [39.3 kB] 249s Get:3 http://ftpmaster.internal/ubuntu resolute/main ppc64el iptables ppc64el 1.8.11-2ubuntu3 [464 kB] 249s Get:4 http://ftpmaster.internal/ubuntu resolute/main ppc64el libip4tc2 ppc64el 1.8.11-2ubuntu3 [27.8 kB] 249s Get:5 http://ftpmaster.internal/ubuntu resolute/main ppc64el libip6tc2 ppc64el 1.8.11-2ubuntu3 [28.2 kB] 249s Get:6 http://ftpmaster.internal/ubuntu resolute/main ppc64el libxtables12 ppc64el 1.8.11-2ubuntu3 [41.2 kB] 249s Get:7 http://ftpmaster.internal/ubuntu resolute/main ppc64el iproute2 ppc64el 6.18.0-1ubuntu1 [1458 kB] 249s Get:8 http://ftpmaster.internal/ubuntu resolute/main ppc64el libatomic1 ppc64el 16-20260208-1ubuntu1 [11.0 kB] 249s Get:9 http://ftpmaster.internal/ubuntu resolute/main ppc64el libcryptsetup12 ppc64el 2:2.8.0-1ubuntu3 [404 kB] 249s Get:10 http://ftpmaster.internal/ubuntu resolute/main ppc64el libstdc++6 ppc64el 16-20260208-1ubuntu1 [930 kB] 249s Get:11 http://ftpmaster.internal/ubuntu resolute/main ppc64el wget ppc64el 1.25.0-2ubuntu4 [401 kB] 249s Get:12 http://ftpmaster.internal/ubuntu resolute/main ppc64el cryptsetup-bin ppc64el 2:2.8.0-1ubuntu3 [250 kB] 249s Get:13 http://ftpmaster.internal/ubuntu resolute/main ppc64el dracut-install ppc64el 109-11ubuntu1 [51.3 kB] 249s Get:14 http://ftpmaster.internal/ubuntu resolute/main ppc64el libbrotli1 ppc64el 1.2.0-3 [431 kB] 250s dpkg-preconfigure: unable to re-open stdin: No such file or directory 250s Fetched 4597 kB in 0s (13.9 MB/s) 250s Selecting previously unselected package gcc-16-base:ppc64el. 252s (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 ... 122003 files and directories currently installed.) 252s Preparing to unpack .../gcc-16-base_16-20260208-1ubuntu1_ppc64el.deb ... 252s Unpacking gcc-16-base:ppc64el (16-20260208-1ubuntu1) ... 252s Setting up gcc-16-base:ppc64el (16-20260208-1ubuntu1) ... 252s (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 ... 122008 files and directories currently installed.) 252s Preparing to unpack .../libgcc-s1_16-20260208-1ubuntu1_ppc64el.deb ... 252s Unpacking libgcc-s1:ppc64el (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 252s Setting up libgcc-s1:ppc64el (16-20260208-1ubuntu1) ... 253s (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 ... 122008 files and directories currently installed.) 253s Preparing to unpack .../00-iptables_1.8.11-2ubuntu3_ppc64el.deb ... 253s Unpacking iptables (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 253s Preparing to unpack .../01-libip4tc2_1.8.11-2ubuntu3_ppc64el.deb ... 253s Unpacking libip4tc2:ppc64el (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 253s Preparing to unpack .../02-libip6tc2_1.8.11-2ubuntu3_ppc64el.deb ... 253s Unpacking libip6tc2:ppc64el (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 253s Preparing to unpack .../03-libxtables12_1.8.11-2ubuntu3_ppc64el.deb ... 253s Unpacking libxtables12:ppc64el (1.8.11-2ubuntu3) over (1.8.11-2ubuntu2) ... 254s Preparing to unpack .../04-iproute2_6.18.0-1ubuntu1_ppc64el.deb ... 254s Unpacking iproute2 (6.18.0-1ubuntu1) over (6.16.0-1ubuntu3) ... 254s Preparing to unpack .../05-libatomic1_16-20260208-1ubuntu1_ppc64el.deb ... 254s Unpacking libatomic1:ppc64el (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 254s Preparing to unpack .../06-libcryptsetup12_2%3a2.8.0-1ubuntu3_ppc64el.deb ... 254s Unpacking libcryptsetup12:ppc64el (2:2.8.0-1ubuntu3) over (2:2.8.0-1ubuntu2) ... 254s Preparing to unpack .../07-libstdc++6_16-20260208-1ubuntu1_ppc64el.deb ... 254s Unpacking libstdc++6:ppc64el (16-20260208-1ubuntu1) over (15.2.0-12ubuntu1) ... 255s Preparing to unpack .../08-wget_1.25.0-2ubuntu4_ppc64el.deb ... 255s Unpacking wget (1.25.0-2ubuntu4) over (1.25.0-2ubuntu3) ... 255s Preparing to unpack .../09-cryptsetup-bin_2%3a2.8.0-1ubuntu3_ppc64el.deb ... 255s Unpacking cryptsetup-bin (2:2.8.0-1ubuntu3) over (2:2.8.0-1ubuntu2) ... 255s Preparing to unpack .../10-dracut-install_109-11ubuntu1_ppc64el.deb ... 255s Unpacking dracut-install (109-11ubuntu1) over (109-9ubuntu1) ... 255s Preparing to unpack .../11-libbrotli1_1.2.0-3_ppc64el.deb ... 255s Unpacking libbrotli1:ppc64el (1.2.0-3) over (1.1.0-2build6) ... 255s Setting up libip4tc2:ppc64el (1.8.11-2ubuntu3) ... 255s Setting up wget (1.25.0-2ubuntu4) ... 255s Setting up libip6tc2:ppc64el (1.8.11-2ubuntu3) ... 255s Setting up libbrotli1:ppc64el (1.2.0-3) ... 256s Setting up libatomic1:ppc64el (16-20260208-1ubuntu1) ... 256s Setting up libxtables12:ppc64el (1.8.11-2ubuntu3) ... 256s Setting up dracut-install (109-11ubuntu1) ... 256s Setting up libcryptsetup12:ppc64el (2:2.8.0-1ubuntu3) ... 256s Setting up libstdc++6:ppc64el (16-20260208-1ubuntu1) ... 256s Setting up cryptsetup-bin (2:2.8.0-1ubuntu3) ... 256s Setting up iptables (1.8.11-2ubuntu3) ... 256s Setting up iproute2 (6.18.0-1ubuntu1) ... 256s Processing triggers for man-db (2.13.1-1build1) ... 260s Processing triggers for install-info (7.2-5) ... 260s Processing triggers for libc-bin (2.42-2ubuntu4) ... 261s autopkgtest [07:00:23]: upgrading testbed (apt dist-upgrade and autopurge) 261s Reading package lists... 261s Building dependency tree... 261s Reading state information... 261s Calculating upgrade... 261s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 261s Reading package lists... 261s Building dependency tree... 261s Reading state information... 262s Solving dependencies... 262s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 265s Reading package lists... 265s Building dependency tree... 265s Reading state information... 265s Solving dependencies... 265s The following NEW packages will be installed: 265s git git-man liberror-perl mercurial mercurial-common mercurial-git 265s python3-dulwich 265s 0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded. 265s Need to get 12.5 MB of archives. 265s After this operation, 58.1 MB of additional disk space will be used. 265s Get:1 http://ftpmaster.internal/ubuntu resolute/main ppc64el liberror-perl all 0.17030-1 [23.5 kB] 265s Get:2 http://ftpmaster.internal/ubuntu resolute/main ppc64el git-man all 1:2.51.0-1ubuntu1 [1179 kB] 265s Get:3 http://ftpmaster.internal/ubuntu resolute/main ppc64el git ppc64el 1:2.51.0-1ubuntu1 [7646 kB] 266s Get:4 http://ftpmaster.internal/ubuntu resolute-proposed/universe ppc64el mercurial-common all 7.2-2 [2853 kB] 266s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe ppc64el mercurial ppc64el 7.2-2 [575 kB] 266s Get:6 http://ftpmaster.internal/ubuntu resolute/universe ppc64el python3-dulwich ppc64el 0.22.7-1 [183 kB] 266s Get:7 http://ftpmaster.internal/ubuntu resolute/universe ppc64el mercurial-git all 1.2.0-1 [60.9 kB] 266s Fetched 12.5 MB in 1s (9431 kB/s) 266s Selecting previously unselected package liberror-perl. 266s (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 ... 122011 files and directories currently installed.) 266s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 266s Unpacking liberror-perl (0.17030-1) ... 266s Selecting previously unselected package git-man. 266s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 266s Unpacking git-man (1:2.51.0-1ubuntu1) ... 266s Selecting previously unselected package git. 266s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_ppc64el.deb ... 266s Unpacking git (1:2.51.0-1ubuntu1) ... 267s Selecting previously unselected package mercurial-common. 267s Preparing to unpack .../3-mercurial-common_7.2-2_all.deb ... 267s Unpacking mercurial-common (7.2-2) ... 267s Selecting previously unselected package mercurial. 267s Preparing to unpack .../4-mercurial_7.2-2_ppc64el.deb ... 267s Unpacking mercurial (7.2-2) ... 267s Selecting previously unselected package python3-dulwich. 267s Preparing to unpack .../5-python3-dulwich_0.22.7-1_ppc64el.deb ... 267s Unpacking python3-dulwich (0.22.7-1) ... 267s Selecting previously unselected package mercurial-git. 267s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 267s Unpacking mercurial-git (1.2.0-1) ... 267s Setting up mercurial-common (7.2-2) ... 269s Setting up liberror-perl (0.17030-1) ... 269s Setting up python3-dulwich (0.22.7-1) ... 269s Setting up git-man (1:2.51.0-1ubuntu1) ... 269s Setting up mercurial (7.2-2) ... 269s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 269s Setting up mercurial-git (1.2.0-1) ... 269s mercurial-git extension is disabled by default. 269s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 269s Setting up git (1:2.51.0-1ubuntu1) ... 269s Processing triggers for man-db (2.13.1-1build1) ... 272s autopkgtest [07:00:34]: test mercurial-git: [----------------------- 272s Initialized empty Git repository in /tmp/autopkgtest.PWIkXN/build.ILN/src/git_server/ 272s Cloning into 'git_clone'... 272s warning: You appear to have cloned an empty repository. 272s done. 272s [master (root-commit) f70645f] a 272s 1 file changed, 1 insertion(+) 272s create mode 100644 a 272s To /tmp/autopkgtest.PWIkXN/build.ILN/src/git_server 272s * [new branch] master -> master 272s Traceback (most recent call last): 272s File "/usr/lib/python3/dist-packages/mercurial/extensions.py", line 291, in _runextsetup 272s extsetup(ui) 272s ~~~~~~~~^^^^ 272s File "/usr/lib/python3/dist-packages/mercurial/exthelper.py", line 227, in finalextsetup 272s c(ui) 272s ~^^^^ 272s File "/usr/lib/python3/dist-packages/hggit/bundle.py", line 76, in install_server_support 272s @bundle2.parthandler(BUNDLEPART_MAP) 272s ^^^^^^^^^^^^^^^^^^^ 272s AttributeError: module 'mercurial.bundle2' has no attribute 'parthandler' 272s *** failed to set up extension hggit: module 'mercurial.bundle2' has no attribute 'parthandler' 273s abort: repository git_server not found 273s autopkgtest [07:00:35]: test mercurial-git: -----------------------] 273s mercurial-git FAIL non-zero exit status 253 273s autopkgtest [07:00:35]: test mercurial-git: - - - - - - - - - - results - - - - - - - - - - 273s autopkgtest [07:00:35]: test mercurial-git: - - - - - - - - - - stderr - - - - - - - - - - 273s Traceback (most recent call last): 273s File "/usr/lib/python3/dist-packages/mercurial/extensions.py", line 291, in _runextsetup 273s extsetup(ui) 273s ~~~~~~~~^^^^ 273s File "/usr/lib/python3/dist-packages/mercurial/exthelper.py", line 227, in finalextsetup 273s c(ui) 273s ~^^^^ 273s File "/usr/lib/python3/dist-packages/hggit/bundle.py", line 76, in install_server_support 273s @bundle2.parthandler(BUNDLEPART_MAP) 273s ^^^^^^^^^^^^^^^^^^^ 273s AttributeError: module 'mercurial.bundle2' has no attribute 'parthandler' 273s *** failed to set up extension hggit: module 'mercurial.bundle2' has no attribute 'parthandler' 273s abort: repository git_server not found 274s autopkgtest [07:00:36]: @@@@@@@@@@@@@@@@@@@@ summary 274s testsuite FAIL non-zero exit status 2 274s mercurial-git FAIL non-zero exit status 253