0s autopkgtest [00:05:48]: starting date and time: 2026-02-03 00:05:48+0000 0s autopkgtest [00:05:48]: git checkout: 4b346b80 nova: make wait_reboot return success even when a no-op 0s autopkgtest [00:05:48]: host juju-7f2275-prod-proposed-migration-environment-15; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.dmmc714x/out --timeout-copy=6000 --needs-internet=try --setup-commands /home/ubuntu/autopkgtest-cloud/worker-config-production/setup-canonical.sh --apt-pocket=proposed=src:dulwich --apt-upgrade hg-git --timeout-short=300 --timeout-copy=20000 --timeout-build=20000 --env=ADT_TEST_TRIGGERS=dulwich/1.0.0-2 -- ssh -s /home/ubuntu/autopkgtest/ssh-setup/nova -- --flavor autopkgtest-cpu2-ram4-disk20-arm64 --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@sto01-arm64-15.secgroup --name adt-resolute-arm64-hg-git-20260203-000548-juju-7f2275-prod-proposed-migration-environment-15-6fb48457-c5fb-4f31-82d2-bd059cdc2c10 --image adt/ubuntu-resolute-arm64-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-15 --net-id=net_prod-autopkgtest-workers-arm64 -e TERM=linux --mirror=http://ftpmaster.internal/ubuntu/ 3s Creating nova instance adt-resolute-arm64-hg-git-20260203-000548-juju-7f2275-prod-proposed-migration-environment-15-6fb48457-c5fb-4f31-82d2-bd059cdc2c10 from image adt/ubuntu-resolute-arm64-server-20260202.img (UUID e5b8703b-d12e-4238-a70e-a72a9b0d7948)... 52s autopkgtest [00:06:40]: testbed dpkg architecture: arm64 52s autopkgtest [00:06:40]: testbed apt version: 3.1.14 52s autopkgtest [00:06:40]: @@@@@@@@@@@@@@@@@@@@ test bed setup 52s autopkgtest [00:06:40]: testbed release detected to be: None 53s autopkgtest [00:06:41]: updating testbed package index (apt update) 53s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 53s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 53s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 53s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 53s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1278 kB] 53s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [28.4 kB] 54s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [105 kB] 54s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/restricted Sources [5256 B] 54s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main arm64 Packages [133 kB] 54s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/main arm64 c-n-f Metadata [3480 B] 54s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/restricted arm64 Packages [52.9 kB] 54s Get:12 http://ftpmaster.internal/ubuntu resolute-proposed/restricted arm64 c-n-f Metadata [328 B] 54s Get:13 http://ftpmaster.internal/ubuntu resolute-proposed/universe arm64 Packages [1076 kB] 54s Get:14 http://ftpmaster.internal/ubuntu resolute-proposed/universe arm64 c-n-f Metadata [26.4 kB] 54s Get:15 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse arm64 Packages [21.3 kB] 54s Get:16 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse arm64 c-n-f Metadata [756 B] 56s Fetched 2855 kB in 1s (3509 kB/s) 57s Reading package lists... 58s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 58s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 58s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 58s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 58s Reading package lists... 59s Reading package lists... 59s Building dependency tree... 59s Reading state information... 59s Calculating upgrade... 59s The following packages will be upgraded: 59s libexpat1 liblocale-gettext-perl 59s 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 59s Need to get 101 kB of archives. 59s After this operation, 2048 B of additional disk space will be used. 59s Get:1 http://ftpmaster.internal/ubuntu resolute/main arm64 libexpat1 arm64 2.7.4-1 [85.7 kB] 59s Get:2 http://ftpmaster.internal/ubuntu resolute/main arm64 liblocale-gettext-perl arm64 1.07-8 [15.6 kB] 60s dpkg-preconfigure: unable to re-open stdin: No such file or directory 60s Fetched 101 kB in 0s (1292 kB/s) 60s (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 ... 89359 files and directories currently installed.) 60s Preparing to unpack .../libexpat1_2.7.4-1_arm64.deb ... 60s Unpacking libexpat1:arm64 (2.7.4-1) over (2.7.3-1) ... 60s Preparing to unpack .../liblocale-gettext-perl_1.07-8_arm64.deb ... 60s Unpacking liblocale-gettext-perl (1.07-8) over (1.07-7build1) ... 60s Setting up libexpat1:arm64 (2.7.4-1) ... 60s Setting up liblocale-gettext-perl (1.07-8) ... 60s Processing triggers for man-db (2.13.1-1) ... 60s Processing triggers for libc-bin (2.42-2ubuntu4) ... 60s autopkgtest [00:06:48]: upgrading testbed (apt dist-upgrade and autopurge) 61s Reading package lists... 61s Building dependency tree... 61s Reading state information... 61s Calculating upgrade... 61s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 61s Reading package lists... 62s Building dependency tree... 62s Reading state information... 62s Solving dependencies... 62s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 65s autopkgtest [00:06:53]: testbed running kernel: Linux 6.18.0-9-generic #9-Ubuntu SMP PREEMPT_DYNAMIC Mon Jan 12 16:41:39 UTC 2026 65s autopkgtest [00:06:53]: @@@@@@@@@@@@@@@@@@@@ apt-source hg-git 66s Get:1 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (dsc) [2142 B] 66s Get:2 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (tar) [222 kB] 66s Get:3 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (diff) [6816 B] 66s gpgv: Signature made Sun Feb 16 14:22:41 2025 UTC 66s gpgv: using RSA key 8F6DE104377F3B11E741748731F3144544A1741A 66s gpgv: issuer "tchet@debian.org" 66s gpgv: Can't check signature: No public key 66s dpkg-source: warning: cannot verify inline signature for ./hg-git_1.2.0-1.dsc: no acceptable signature found 66s autopkgtest [00:06:54]: testing package hg-git version 1.2.0-1 66s autopkgtest [00:06:54]: build not needed 67s autopkgtest [00:06:55]: test testsuite: preparing testbed 67s Reading package lists... 67s Building dependency tree... 67s Reading state information... 67s Solving dependencies... 68s The following NEW packages will be installed: 68s git git-man liberror-perl mercurial mercurial-common mercurial-git 68s python3-dulwich unzip 68s 0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded. 68s Need to get 9840 kB of archives. 68s After this operation, 52.2 MB of additional disk space will be used. 68s Get:1 http://ftpmaster.internal/ubuntu resolute/main arm64 liberror-perl all 0.17030-1 [23.5 kB] 68s Get:2 http://ftpmaster.internal/ubuntu resolute/main arm64 git-man all 1:2.51.0-1ubuntu1 [1179 kB] 68s Get:3 http://ftpmaster.internal/ubuntu resolute/main arm64 git arm64 1:2.51.0-1ubuntu1 [4431 kB] 68s Get:4 http://ftpmaster.internal/ubuntu resolute/universe arm64 mercurial-common all 7.1.1-1ubuntu1 [2789 kB] 68s Get:5 http://ftpmaster.internal/ubuntu resolute/universe arm64 mercurial arm64 7.1.1-1ubuntu1 [389 kB] 68s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/universe arm64 python3-dulwich arm64 1.0.0-2 [792 kB] 68s Get:7 http://ftpmaster.internal/ubuntu resolute/universe arm64 mercurial-git all 1.2.0-1 [60.9 kB] 68s Get:8 http://ftpmaster.internal/ubuntu resolute/main arm64 unzip arm64 6.0-29ubuntu1 [176 kB] 68s Fetched 9840 kB in 1s (18.5 MB/s) 68s Selecting previously unselected package liberror-perl. 69s (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 ... 89359 files and directories currently installed.) 69s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 69s Unpacking liberror-perl (0.17030-1) ... 69s Selecting previously unselected package git-man. 69s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 69s Unpacking git-man (1:2.51.0-1ubuntu1) ... 69s Selecting previously unselected package git. 69s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_arm64.deb ... 69s Unpacking git (1:2.51.0-1ubuntu1) ... 69s Selecting previously unselected package mercurial-common. 69s Preparing to unpack .../3-mercurial-common_7.1.1-1ubuntu1_all.deb ... 69s Unpacking mercurial-common (7.1.1-1ubuntu1) ... 69s Selecting previously unselected package mercurial. 69s Preparing to unpack .../4-mercurial_7.1.1-1ubuntu1_arm64.deb ... 69s Unpacking mercurial (7.1.1-1ubuntu1) ... 69s Selecting previously unselected package python3-dulwich. 69s Preparing to unpack .../5-python3-dulwich_1.0.0-2_arm64.deb ... 69s Unpacking python3-dulwich (1.0.0-2) ... 69s Selecting previously unselected package mercurial-git. 69s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 69s Unpacking mercurial-git (1.2.0-1) ... 69s Selecting previously unselected package unzip. 69s Preparing to unpack .../7-unzip_6.0-29ubuntu1_arm64.deb ... 69s Unpacking unzip (6.0-29ubuntu1) ... 69s Setting up mercurial-common (7.1.1-1ubuntu1) ... 71s Setting up unzip (6.0-29ubuntu1) ... 71s Setting up liberror-perl (0.17030-1) ... 71s Setting up python3-dulwich (1.0.0-2) ... 71s Setting up git-man (1:2.51.0-1ubuntu1) ... 71s Setting up mercurial (7.1.1-1ubuntu1) ... 71s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 71s Setting up mercurial-git (1.2.0-1) ... 71s mercurial-git extension is disabled by default. 71s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 71s Setting up git (1:2.51.0-1ubuntu1) ... 71s Processing triggers for man-db (2.13.1-1) ... 73s autopkgtest [00:07:01]: test testsuite: [----------------------- 73s no username found, using 'ubuntu@autopkgtest.local' instead 73s cd tests && /usr/bin/python3 run-tests.py --with-hg=/usr/bin/hg --blacklist=/tmp/autopkgtest.B7JscZ/build.ihL/src/debian/hg-git.test_blacklist 74s running 82 tests using 2 parallel processes 85s ssssss 85s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-pull.t 85s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-pull.t#draft.err 85s @@ -35,153 +35,132 @@ 85s 85s pull without a name 85s $ hg init hgrepo 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s $ cd hgrepo 85s $ hg pull ../gitrepo 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s pulling from ../gitrepo 85s - importing 3 git commits 85s - adding bookmark beta 85s - adding bookmark delta 85s - adding bookmark master 85s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 85s - (run 'hg heads' to see heads, 'hg merge' to merge) 85s + abort: repository ../gitrepo not found 85s + [255] 85s $ git --git-dir .hg/git for-each-ref 85s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 85s + fatal: not a git repository: '.hg/git' 85s + [128] 85s $ hg log -Tp 85s - 2|draft|delta|tip 85s - 1|draft|beta| 85s - 0|draft|master|t_alpha 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s $ cd .. 85s $ rm -rf hgrepo 85s 85s pull with an implied name 85s $ hg init hgrepo 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s $ cd hgrepo 85s $ echo "[paths]" >> .hg/hgrc 85s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 85s $ hg pull ../gitrepo 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s pulling from ../gitrepo 85s - importing 3 git commits 85s - adding bookmark beta 85s - adding bookmark delta 85s - adding bookmark master 85s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 85s - (run 'hg heads' to see heads, 'hg merge' to merge) 85s + abort: repository ../gitrepo not found 85s + [255] 85s $ git --git-dir .hg/git for-each-ref 85s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 85s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 85s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 85s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 85s + fatal: not a git repository: '.hg/git' 85s + [128] 85s $ hg log -Tp 85s - 2|draft|delta|default/delta tip 85s - 1|draft|beta|default/beta 85s - 0|draft|master|default/master t_alpha 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s $ cd .. 85s $ rm -rf hgrepo 85s 85s pull with an explicit name 85s $ hg init hgrepo 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s $ cd hgrepo 85s $ echo "[paths]" >> .hg/hgrc 85s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 85s $ hg pull 85s - pulling from $TESTTMP/gitrepo 85s - importing 3 git commits 85s - adding bookmark beta 85s - adding bookmark delta 85s - adding bookmark master 85s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 85s - (run 'hg heads' to see heads, 'hg merge' to merge) 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + pulling from $TESTTMP/gitrepo 85s + abort: repository $TESTTMP/gitrepo not found 85s + [255] 85s $ git --git-dir .hg/git for-each-ref 85s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 85s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 85s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 85s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 85s + fatal: not a git repository: '.hg/git' 85s + [128] 85s $ hg log -Tp 85s - 2|draft|delta|default/delta tip 85s - 1|draft|beta|default/beta 85s - 0|draft|master|default/master t_alpha 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s $ cd .. 85s $ rm -rf hgrepo 85s 85s pull a tag 85s $ hg init hgrepo 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s $ echo "[paths]" >> hgrepo/.hg/hgrc 85s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 85s $ hg -R hgrepo pull -r t_alpha 85s - pulling from $TESTTMP/gitrepo 85s - importing 1 git commits 85s - adding bookmark master 85s - new changesets ff7a2f2d8d70 (1 drafts) 85s - (run 'hg update' to get a working copy) 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + pulling from $TESTTMP/gitrepo 85s + abort: repository $TESTTMP/gitrepo not found 85s + [255] 85s $ hg -R hgrepo update t_alpha 85s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + abort: unknown revision 't_alpha' 85s + [10] 85s $ hg log -Tp -R hgrepo 85s - 0|draft|master|default/master t_alpha tip 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s 85s no-op pull 85s $ hg -R hgrepo pull -r t_alpha 85s - pulling from $TESTTMP/gitrepo 85s - no changes found 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + pulling from $TESTTMP/gitrepo 85s + abort: repository $TESTTMP/gitrepo not found 85s + [255] 85s 85s no-op pull with added bookmark 85s $ cd gitrepo 85s $ git checkout -qb epsilon t_alpha 85s $ cd .. 85s $ hg -R hgrepo pull -r epsilon 85s - pulling from $TESTTMP/gitrepo 85s - no changes found 85s - adding bookmark epsilon 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + pulling from $TESTTMP/gitrepo 85s + abort: repository $TESTTMP/gitrepo not found 85s + [255] 85s 85s pull something that doesn't exist 85s $ hg -R hgrepo pull -r kaflaflibob 85s - pulling from $TESTTMP/gitrepo 85s - abort: unknown revision 'kaflaflibob'!? (re) 85s - [10] 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + pulling from $TESTTMP/gitrepo 85s + abort: repository $TESTTMP/gitrepo not found 85s + [255] 85s 85s pull an ambiguous reference 85s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 85s $ hg -R hgrepo pull -r t_alpha 85s - pulling from $TESTTMP/gitrepo 85s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 85s - [10] 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + pulling from $TESTTMP/gitrepo 85s + abort: repository $TESTTMP/gitrepo not found 85s + [255] 85s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 85s 85s pull a branch 85s $ hg -R hgrepo pull -r beta 85s - pulling from $TESTTMP/gitrepo 85s - importing 1 git commits 85s - adding bookmark beta 85s - new changesets 7fe02317c63d (1 drafts) 85s - (run 'hg update' to get a working copy) 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + pulling from $TESTTMP/gitrepo 85s + abort: repository $TESTTMP/gitrepo not found 85s + [255] 85s $ hg -R hgrepo log --graph --template=phases 85s - o changeset: 1:7fe02317c63d 85s - | bookmark: beta 85s - | tag: default/beta 85s - | tag: tip 85s - | phase: draft 85s - | user: test 85s - | date: Mon Jan 01 00:00:11 2007 +0000 85s - | summary: add beta 85s - | 85s - @ changeset: 0:ff7a2f2d8d70 85s - bookmark: epsilon 85s - bookmark: master 85s - tag: default/epsilon 85s - tag: default/master 85s - tag: t_alpha 85s - phase: draft 85s - user: test 85s - date: Mon Jan 01 00:00:10 2007 +0000 85s - summary: add alpha 85s - 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s 85s no-op pull should affect phases 85s $ hg -R hgrepo phase -fs beta 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + abort: unknown revision 'beta' 85s + [10] 85s $ hg -R hgrepo pull -r beta 85s - pulling from $TESTTMP/gitrepo 85s - no changes found 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + pulling from $TESTTMP/gitrepo 85s + abort: repository $TESTTMP/gitrepo not found 85s + [255] 85s $ hg -R hgrepo phase beta 85s - 1: draft 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + abort: unknown revision 'beta' 85s + [10] 85s 85s 85s add another commit and tag to the git repo 85s @@ -196,50 +175,12 @@ 85s 85s pull everything else 85s $ hg -R hgrepo pull 85s - pulling from $TESTTMP/gitrepo 85s - importing 2 git commits 85s - adding bookmark delta 85s - updating bookmark master 85s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 85s - (run 'hg heads' to see heads, 'hg merge' to merge) 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + pulling from $TESTTMP/gitrepo 85s + abort: repository $TESTTMP/gitrepo not found 85s + [255] 85s $ hg -R hgrepo log --graph --template=phases 85s - o changeset: 3:6f898ad1f3e1 85s - | bookmark: master 85s - | tag: default/master 85s - | tag: tip 85s - | phase: draft 85s - | parent: 0:ff7a2f2d8d70 85s - | user: test 85s - | date: Mon Jan 01 00:00:13 2007 +0000 85s - | summary: add gamma 85s - | 85s - | o changeset: 2:678ebee93e38 85s - |/ bookmark: delta 85s - | tag: default/delta 85s - | phase: draft 85s - | parent: 0:ff7a2f2d8d70 85s - | user: test 85s - | date: Mon Jan 01 00:00:12 2007 +0000 85s - | summary: add delta 85s - | 85s - | o changeset: 1:7fe02317c63d 85s - |/ bookmark: beta 85s - | tag: default/beta 85s - | tag: t_beta 85s - | phase: draft 85s - | user: test 85s - | date: Mon Jan 01 00:00:11 2007 +0000 85s - | summary: add beta 85s - | 85s - @ changeset: 0:ff7a2f2d8d70 85s - bookmark: epsilon 85s - tag: default/epsilon 85s - tag: t_alpha 85s - phase: draft 85s - user: test 85s - date: Mon Jan 01 00:00:10 2007 +0000 85s - summary: add alpha 85s - 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s add a merge to the git repo, and delete the branch 85s $ cd gitrepo 85s $ git merge -q -m "Merge branch 'beta'" beta 85s @@ -252,60 +193,26 @@ 85s 85s pull the merge 85s $ hg -R hgrepo tags | grep default/beta 85s - default/beta 1:7fe02317c63d 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + [1] 85s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 85s - pulling from $TESTTMP/gitrepo 85s - importing 1 git commits 85s - updating bookmark master 85s - deleting bookmark beta 85s - new changesets a02330f767a4 (1 drafts) 85s - (run 'hg update' to get a working copy) 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + pulling from $TESTTMP/gitrepo 85s + abort: repository $TESTTMP/gitrepo not found 85s + [255] 85s $ hg -R hgrepo tags | grep default/beta 85s - default/beta 1:7fe02317c63d 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + [1] 85s $ hg -R hgrepo pull 85s - pulling from $TESTTMP/gitrepo 85s - no changes found 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + pulling from $TESTTMP/gitrepo 85s + abort: repository $TESTTMP/gitrepo not found 85s + [255] 85s $ hg -R hgrepo tags | grep default/beta 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s [1] 85s $ hg -R hgrepo log --graph 85s - o changeset: 4:a02330f767a4 85s - |\ bookmark: master 85s - | | tag: default/master 85s - | | tag: tip 85s - | | parent: 3:6f898ad1f3e1 85s - | | parent: 1:7fe02317c63d 85s - | | user: test 85s - | | date: Mon Jan 01 00:00:13 2007 +0000 85s - | | summary: Merge branch 'beta' 85s - | | 85s - | o changeset: 3:6f898ad1f3e1 85s - | | parent: 0:ff7a2f2d8d70 85s - | | user: test 85s - | | date: Mon Jan 01 00:00:13 2007 +0000 85s - | | summary: add gamma 85s - | | 85s - | | o changeset: 2:678ebee93e38 85s - | |/ bookmark: delta 85s - | | tag: default/delta 85s - | | parent: 0:ff7a2f2d8d70 85s - | | user: test 85s - | | date: Mon Jan 01 00:00:12 2007 +0000 85s - | | summary: add delta 85s - | | 85s - o | changeset: 1:7fe02317c63d 85s - |/ tag: t_beta 85s - | user: test 85s - | date: Mon Jan 01 00:00:11 2007 +0000 85s - | summary: add beta 85s - | 85s - @ changeset: 0:ff7a2f2d8d70 85s - bookmark: epsilon 85s - tag: default/epsilon 85s - tag: t_alpha 85s - user: test 85s - date: Mon Jan 01 00:00:10 2007 +0000 85s - summary: add alpha 85s - 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s pull with wildcards 85s $ cd gitrepo 85s $ git checkout -qb releases/v1 master 85s @@ -324,66 +231,12 @@ 85s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 85s $ cd .. 85s $ hg -R hgrepo pull -r 'releases/*' 85s - pulling from $TESTTMP/gitrepo 85s - importing 2 git commits 85s - adding bookmark releases/v1 85s - adding bookmark releases/v2 85s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 85s - (run 'hg heads .' to see heads, 'hg merge' to merge) 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + pulling from $TESTTMP/gitrepo 85s + abort: repository $TESTTMP/gitrepo not found 85s + [255] 85s $ hg -R hgrepo log --graph 85s - o changeset: 6:a3f95e150b0a 85s - | bookmark: releases/v2 85s - | tag: default/releases/v2 85s - | tag: tip 85s - | parent: 4:a02330f767a4 85s - | user: test 85s - | date: Mon Jan 01 00:00:15 2007 +0000 85s - | summary: add eta 85s - | 85s - | o changeset: 5:218b2d0660d3 85s - |/ bookmark: releases/v1 85s - | tag: default/releases/v1 85s - | user: test 85s - | date: Mon Jan 01 00:00:14 2007 +0000 85s - | summary: add zeta 85s - | 85s - o changeset: 4:a02330f767a4 85s - |\ bookmark: master 85s - | | tag: default/master 85s - | | parent: 3:6f898ad1f3e1 85s - | | parent: 1:7fe02317c63d 85s - | | user: test 85s - | | date: Mon Jan 01 00:00:13 2007 +0000 85s - | | summary: Merge branch 'beta' 85s - | | 85s - | o changeset: 3:6f898ad1f3e1 85s - | | parent: 0:ff7a2f2d8d70 85s - | | user: test 85s - | | date: Mon Jan 01 00:00:13 2007 +0000 85s - | | summary: add gamma 85s - | | 85s - | | o changeset: 2:678ebee93e38 85s - | |/ bookmark: delta 85s - | | tag: default/delta 85s - | | parent: 0:ff7a2f2d8d70 85s - | | user: test 85s - | | date: Mon Jan 01 00:00:12 2007 +0000 85s - | | summary: add delta 85s - | | 85s - o | changeset: 1:7fe02317c63d 85s - |/ tag: t_beta 85s - | user: test 85s - | date: Mon Jan 01 00:00:11 2007 +0000 85s - | summary: add beta 85s - | 85s - @ changeset: 0:ff7a2f2d8d70 85s - bookmark: epsilon 85s - tag: default/epsilon 85s - tag: t_alpha 85s - user: test 85s - date: Mon Jan 01 00:00:10 2007 +0000 85s - summary: add alpha 85s - 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s 85s add old and new commits to the git repo -- make sure we're using the commit date 85s and not the author date 85s @@ -412,21 +265,19 @@ 85s Master is now filtered, so it's just stays there: 85s 85s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 85s - pulling from $TESTTMP/gitrepo 85s - no changes found 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + pulling from $TESTTMP/gitrepo 85s + abort: repository $TESTTMP/gitrepo not found 85s + [255] 85s $ hg -R hgrepo pull 85s - pulling from $TESTTMP/gitrepo 85s - no changes found 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + pulling from $TESTTMP/gitrepo 85s + abort: repository $TESTTMP/gitrepo not found 85s + [255] 85s $ hg -R hgrepo log -r master 85s - changeset: 4:a02330f767a4 85s - bookmark: master 85s - tag: default/master 85s - parent: 3:6f898ad1f3e1 85s - parent: 1:7fe02317c63d 85s - user: test 85s - date: Mon Jan 01 00:00:13 2007 +0000 85s - summary: Merge branch 'beta' 85s - 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + abort: unknown revision 'master' 85s + [10] 85s 85s $ cd gitrepo 85s $ git checkout -q master 85s @@ -440,51 +291,13 @@ 85s > git tag -a -m 'tagging newtag' newtag 85s $ cd .. 85s $ hg -R hgrepo pull 85s - pulling from $TESTTMP/gitrepo 85s - importing 3 git commits 85s - updating bookmark master 85s - new changesets 49713da8f665:e103a73f33be (3 drafts) 85s - (run 'hg heads .' to see heads, 'hg merge' to merge) 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + pulling from $TESTTMP/gitrepo 85s + abort: repository $TESTTMP/gitrepo not found 85s + [255] 85s $ hg -R hgrepo heads 85s - changeset: 9:e103a73f33be 85s - bookmark: master 85s - tag: default/master 85s - tag: tip 85s - user: test 85s - date: Wed Jan 01 00:00:00 2014 +0000 85s - summary: newcommit 85s - 85s - changeset: 7:49713da8f665 85s - tag: newtag 85s - tag: oldtag 85s - parent: 4:a02330f767a4 85s - user: test 85s - date: Sat Mar 01 00:00:00 2014 +0000 85s - summary: oldtag 85s - 85s - changeset: 6:a3f95e150b0a 85s - bookmark: releases/v2 85s - tag: default/releases/v2 85s - parent: 4:a02330f767a4 85s - user: test 85s - date: Mon Jan 01 00:00:15 2007 +0000 85s - summary: add eta 85s - 85s - changeset: 5:218b2d0660d3 85s - bookmark: releases/v1 85s - tag: default/releases/v1 85s - user: test 85s - date: Mon Jan 01 00:00:14 2007 +0000 85s - summary: add zeta 85s - 85s - changeset: 2:678ebee93e38 85s - bookmark: delta 85s - tag: default/delta 85s - parent: 0:ff7a2f2d8d70 85s - user: test 85s - date: Mon Jan 01 00:00:12 2007 +0000 85s - summary: add delta 85s - 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + [1] 85s 85s test for ssh vulnerability 85s 85s @@ -494,18 +307,21 @@ 85s > EOF 85s 85s $ hg init a 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s $ cd a 85s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 85s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 85s [255] 85s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 85s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 85s [255] 85s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 85s - ssh: * fakehost%7?shellcommand* (glob) 85s - abort: git remote error: The remote server unexpectedly closed the connection. 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 85s [255] 85s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 85s - ssh: * fakehost%7?shellcommand* (glob) 85s - abort: git remote error: The remote server unexpectedly closed the connection. 85s - [255] 85s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 85s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 85s + [255] 85s 85s ERROR: test-pull.t#draft output changed 86s ! 86s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-pull.t 86s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-pull.t#secret.err 86s @@ -35,153 +35,132 @@ 86s 86s pull without a name 86s $ hg init hgrepo 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s $ cd hgrepo 86s $ hg pull ../gitrepo 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s pulling from ../gitrepo 86s - importing 3 git commits 86s - adding bookmark beta 86s - adding bookmark delta 86s - adding bookmark master 86s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 86s - (run 'hg heads' to see heads, 'hg merge' to merge) 86s + abort: repository ../gitrepo not found 86s + [255] 86s $ git --git-dir .hg/git for-each-ref 86s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 86s + fatal: not a git repository: '.hg/git' 86s + [128] 86s $ hg log -Tp 86s - 2|draft|delta|tip 86s - 1|draft|beta| 86s - 0|draft|master|t_alpha 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s $ cd .. 86s $ rm -rf hgrepo 86s 86s pull with an implied name 86s $ hg init hgrepo 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s $ cd hgrepo 86s $ echo "[paths]" >> .hg/hgrc 86s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 86s $ hg pull ../gitrepo 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s pulling from ../gitrepo 86s - importing 3 git commits 86s - adding bookmark beta 86s - adding bookmark delta 86s - adding bookmark master 86s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 86s - (run 'hg heads' to see heads, 'hg merge' to merge) 86s + abort: repository ../gitrepo not found 86s + [255] 86s $ git --git-dir .hg/git for-each-ref 86s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 86s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 86s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 86s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 86s + fatal: not a git repository: '.hg/git' 86s + [128] 86s $ hg log -Tp 86s - 2|draft|delta|default/delta tip 86s - 1|draft|beta|default/beta 86s - 0|draft|master|default/master t_alpha 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s $ cd .. 86s $ rm -rf hgrepo 86s 86s pull with an explicit name 86s $ hg init hgrepo 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s $ cd hgrepo 86s $ echo "[paths]" >> .hg/hgrc 86s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 86s $ hg pull 86s - pulling from $TESTTMP/gitrepo 86s - importing 3 git commits 86s - adding bookmark beta 86s - adding bookmark delta 86s - adding bookmark master 86s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 86s - (run 'hg heads' to see heads, 'hg merge' to merge) 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + pulling from $TESTTMP/gitrepo 86s + abort: repository $TESTTMP/gitrepo not found 86s + [255] 86s $ git --git-dir .hg/git for-each-ref 86s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 86s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 86s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 86s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 86s + fatal: not a git repository: '.hg/git' 86s + [128] 86s $ hg log -Tp 86s - 2|draft|delta|default/delta tip 86s - 1|draft|beta|default/beta 86s - 0|draft|master|default/master t_alpha 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s $ cd .. 86s $ rm -rf hgrepo 86s 86s pull a tag 86s $ hg init hgrepo 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s $ echo "[paths]" >> hgrepo/.hg/hgrc 86s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 86s $ hg -R hgrepo pull -r t_alpha 86s - pulling from $TESTTMP/gitrepo 86s - importing 1 git commits 86s - adding bookmark master 86s - new changesets ff7a2f2d8d70 (1 drafts) 86s - (run 'hg update' to get a working copy) 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + pulling from $TESTTMP/gitrepo 86s + abort: repository $TESTTMP/gitrepo not found 86s + [255] 86s $ hg -R hgrepo update t_alpha 86s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + abort: unknown revision 't_alpha' 86s + [10] 86s $ hg log -Tp -R hgrepo 86s - 0|draft|master|default/master t_alpha tip 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s 86s no-op pull 86s $ hg -R hgrepo pull -r t_alpha 86s - pulling from $TESTTMP/gitrepo 86s - no changes found 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + pulling from $TESTTMP/gitrepo 86s + abort: repository $TESTTMP/gitrepo not found 86s + [255] 86s 86s no-op pull with added bookmark 86s $ cd gitrepo 86s $ git checkout -qb epsilon t_alpha 86s $ cd .. 86s $ hg -R hgrepo pull -r epsilon 86s - pulling from $TESTTMP/gitrepo 86s - no changes found 86s - adding bookmark epsilon 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + pulling from $TESTTMP/gitrepo 86s + abort: repository $TESTTMP/gitrepo not found 86s + [255] 86s 86s pull something that doesn't exist 86s $ hg -R hgrepo pull -r kaflaflibob 86s - pulling from $TESTTMP/gitrepo 86s - abort: unknown revision 'kaflaflibob'!? (re) 86s - [10] 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + pulling from $TESTTMP/gitrepo 86s + abort: repository $TESTTMP/gitrepo not found 86s + [255] 86s 86s pull an ambiguous reference 86s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 86s $ hg -R hgrepo pull -r t_alpha 86s - pulling from $TESTTMP/gitrepo 86s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 86s - [10] 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + pulling from $TESTTMP/gitrepo 86s + abort: repository $TESTTMP/gitrepo not found 86s + [255] 86s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 86s 86s pull a branch 86s $ hg -R hgrepo pull -r beta 86s - pulling from $TESTTMP/gitrepo 86s - importing 1 git commits 86s - adding bookmark beta 86s - new changesets 7fe02317c63d (1 drafts) 86s - (run 'hg update' to get a working copy) 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + pulling from $TESTTMP/gitrepo 86s + abort: repository $TESTTMP/gitrepo not found 86s + [255] 86s $ hg -R hgrepo log --graph --template=phases 86s - o changeset: 1:7fe02317c63d 86s - | bookmark: beta 86s - | tag: default/beta 86s - | tag: tip 86s - | phase: draft 86s - | user: test 86s - | date: Mon Jan 01 00:00:11 2007 +0000 86s - | summary: add beta 86s - | 86s - @ changeset: 0:ff7a2f2d8d70 86s - bookmark: epsilon 86s - bookmark: master 86s - tag: default/epsilon 86s - tag: default/master 86s - tag: t_alpha 86s - phase: draft 86s - user: test 86s - date: Mon Jan 01 00:00:10 2007 +0000 86s - summary: add alpha 86s - 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s 86s no-op pull should affect phases 86s $ hg -R hgrepo phase -fs beta 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + abort: unknown revision 'beta' 86s + [10] 86s $ hg -R hgrepo pull -r beta 86s - pulling from $TESTTMP/gitrepo 86s - no changes found 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + pulling from $TESTTMP/gitrepo 86s + abort: repository $TESTTMP/gitrepo not found 86s + [255] 86s $ hg -R hgrepo phase beta 86s - 1: draft 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + abort: unknown revision 'beta' 86s + [10] 86s 86s 86s add another commit and tag to the git repo 86s @@ -196,50 +175,12 @@ 86s 86s pull everything else 86s $ hg -R hgrepo pull 86s - pulling from $TESTTMP/gitrepo 86s - importing 2 git commits 86s - adding bookmark delta 86s - updating bookmark master 86s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 86s - (run 'hg heads' to see heads, 'hg merge' to merge) 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + pulling from $TESTTMP/gitrepo 86s + abort: repository $TESTTMP/gitrepo not found 86s + [255] 86s $ hg -R hgrepo log --graph --template=phases 86s - o changeset: 3:6f898ad1f3e1 86s - | bookmark: master 86s - | tag: default/master 86s - | tag: tip 86s - | phase: draft 86s - | parent: 0:ff7a2f2d8d70 86s - | user: test 86s - | date: Mon Jan 01 00:00:13 2007 +0000 86s - | summary: add gamma 86s - | 86s - | o changeset: 2:678ebee93e38 86s - |/ bookmark: delta 86s - | tag: default/delta 86s - | phase: draft 86s - | parent: 0:ff7a2f2d8d70 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: add delta 86s - | 86s - | o changeset: 1:7fe02317c63d 86s - |/ bookmark: beta 86s - | tag: default/beta 86s - | tag: t_beta 86s - | phase: draft 86s - | user: test 86s - | date: Mon Jan 01 00:00:11 2007 +0000 86s - | summary: add beta 86s - | 86s - @ changeset: 0:ff7a2f2d8d70 86s - bookmark: epsilon 86s - tag: default/epsilon 86s - tag: t_alpha 86s - phase: draft 86s - user: test 86s - date: Mon Jan 01 00:00:10 2007 +0000 86s - summary: add alpha 86s - 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s add a merge to the git repo, and delete the branch 86s $ cd gitrepo 86s $ git merge -q -m "Merge branch 'beta'" beta 86s @@ -252,60 +193,26 @@ 86s 86s pull the merge 86s $ hg -R hgrepo tags | grep default/beta 86s - default/beta 1:7fe02317c63d 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + [1] 86s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 86s - pulling from $TESTTMP/gitrepo 86s - importing 1 git commits 86s - updating bookmark master 86s - deleting bookmark beta 86s - new changesets a02330f767a4 (1 drafts) 86s - (run 'hg update' to get a working copy) 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + pulling from $TESTTMP/gitrepo 86s + abort: repository $TESTTMP/gitrepo not found 86s + [255] 86s $ hg -R hgrepo tags | grep default/beta 86s - default/beta 1:7fe02317c63d 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + [1] 86s $ hg -R hgrepo pull 86s - pulling from $TESTTMP/gitrepo 86s - no changes found 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + pulling from $TESTTMP/gitrepo 86s + abort: repository $TESTTMP/gitrepo not found 86s + [255] 86s $ hg -R hgrepo tags | grep default/beta 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s [1] 86s $ hg -R hgrepo log --graph 86s - o changeset: 4:a02330f767a4 86s - |\ bookmark: master 86s - | | tag: default/master 86s - | | tag: tip 86s - | | parent: 3:6f898ad1f3e1 86s - | | parent: 1:7fe02317c63d 86s - | | user: test 86s - | | date: Mon Jan 01 00:00:13 2007 +0000 86s - | | summary: Merge branch 'beta' 86s - | | 86s - | o changeset: 3:6f898ad1f3e1 86s - | | parent: 0:ff7a2f2d8d70 86s - | | user: test 86s - | | date: Mon Jan 01 00:00:13 2007 +0000 86s - | | summary: add gamma 86s - | | 86s - | | o changeset: 2:678ebee93e38 86s - | |/ bookmark: delta 86s - | | tag: default/delta 86s - | | parent: 0:ff7a2f2d8d70 86s - | | user: test 86s - | | date: Mon Jan 01 00:00:12 2007 +0000 86s - | | summary: add delta 86s - | | 86s - o | changeset: 1:7fe02317c63d 86s - |/ tag: t_beta 86s - | user: test 86s - | date: Mon Jan 01 00:00:11 2007 +0000 86s - | summary: add beta 86s - | 86s - @ changeset: 0:ff7a2f2d8d70 86s - bookmark: epsilon 86s - tag: default/epsilon 86s - tag: t_alpha 86s - user: test 86s - date: Mon Jan 01 00:00:10 2007 +0000 86s - summary: add alpha 86s - 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s pull with wildcards 86s $ cd gitrepo 86s $ git checkout -qb releases/v1 master 86s @@ -324,66 +231,12 @@ 86s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 86s $ cd .. 86s $ hg -R hgrepo pull -r 'releases/*' 86s - pulling from $TESTTMP/gitrepo 86s - importing 2 git commits 86s - adding bookmark releases/v1 86s - adding bookmark releases/v2 86s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 86s - (run 'hg heads .' to see heads, 'hg merge' to merge) 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + pulling from $TESTTMP/gitrepo 86s + abort: repository $TESTTMP/gitrepo not found 86s + [255] 86s $ hg -R hgrepo log --graph 86s - o changeset: 6:a3f95e150b0a 86s - | bookmark: releases/v2 86s - | tag: default/releases/v2 86s - | tag: tip 86s - | parent: 4:a02330f767a4 86s - | user: test 86s - | date: Mon Jan 01 00:00:15 2007 +0000 86s - | summary: add eta 86s - | 86s - | o changeset: 5:218b2d0660d3 86s - |/ bookmark: releases/v1 86s - | tag: default/releases/v1 86s - | user: test 86s - | date: Mon Jan 01 00:00:14 2007 +0000 86s - | summary: add zeta 86s - | 86s - o changeset: 4:a02330f767a4 86s - |\ bookmark: master 86s - | | tag: default/master 86s - | | parent: 3:6f898ad1f3e1 86s - | | parent: 1:7fe02317c63d 86s - | | user: test 86s - | | date: Mon Jan 01 00:00:13 2007 +0000 86s - | | summary: Merge branch 'beta' 86s - | | 86s - | o changeset: 3:6f898ad1f3e1 86s - | | parent: 0:ff7a2f2d8d70 86s - | | user: test 86s - | | date: Mon Jan 01 00:00:13 2007 +0000 86s - | | summary: add gamma 86s - | | 86s - | | o changeset: 2:678ebee93e38 86s - | |/ bookmark: delta 86s - | | tag: default/delta 86s - | | parent: 0:ff7a2f2d8d70 86s - | | user: test 86s - | | date: Mon Jan 01 00:00:12 2007 +0000 86s - | | summary: add delta 86s - | | 86s - o | changeset: 1:7fe02317c63d 86s - |/ tag: t_beta 86s - | user: test 86s - | date: Mon Jan 01 00:00:11 2007 +0000 86s - | summary: add beta 86s - | 86s - @ changeset: 0:ff7a2f2d8d70 86s - bookmark: epsilon 86s - tag: default/epsilon 86s - tag: t_alpha 86s - user: test 86s - date: Mon Jan 01 00:00:10 2007 +0000 86s - summary: add alpha 86s - 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s 86s add old and new commits to the git repo -- make sure we're using the commit date 86s and not the author date 86s @@ -412,21 +265,19 @@ 86s Master is now filtered, so it's just stays there: 86s 86s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 86s - pulling from $TESTTMP/gitrepo 86s - no changes found 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + pulling from $TESTTMP/gitrepo 86s + abort: repository $TESTTMP/gitrepo not found 86s + [255] 86s $ hg -R hgrepo pull 86s - pulling from $TESTTMP/gitrepo 86s - no changes found 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + pulling from $TESTTMP/gitrepo 86s + abort: repository $TESTTMP/gitrepo not found 86s + [255] 86s $ hg -R hgrepo log -r master 86s - changeset: 4:a02330f767a4 86s - bookmark: master 86s - tag: default/master 86s - parent: 3:6f898ad1f3e1 86s - parent: 1:7fe02317c63d 86s - user: test 86s - date: Mon Jan 01 00:00:13 2007 +0000 86s - summary: Merge branch 'beta' 86s - 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + abort: unknown revision 'master' 86s + [10] 86s 86s $ cd gitrepo 86s $ git checkout -q master 86s @@ -440,51 +291,13 @@ 86s > git tag -a -m 'tagging newtag' newtag 86s $ cd .. 86s $ hg -R hgrepo pull 86s - pulling from $TESTTMP/gitrepo 86s - importing 3 git commits 86s - updating bookmark master 86s - new changesets 49713da8f665:e103a73f33be (3 drafts) 86s - (run 'hg heads .' to see heads, 'hg merge' to merge) 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + pulling from $TESTTMP/gitrepo 86s + abort: repository $TESTTMP/gitrepo not found 86s + [255] 86s $ hg -R hgrepo heads 86s - changeset: 9:e103a73f33be 86s - bookmark: master 86s - tag: default/master 86s - tag: tip 86s - user: test 86s - date: Wed Jan 01 00:00:00 2014 +0000 86s - summary: newcommit 86s - 86s - changeset: 7:49713da8f665 86s - tag: newtag 86s - tag: oldtag 86s - parent: 4:a02330f767a4 86s - user: test 86s - date: Sat Mar 01 00:00:00 2014 +0000 86s - summary: oldtag 86s - 86s - changeset: 6:a3f95e150b0a 86s - bookmark: releases/v2 86s - tag: default/releases/v2 86s - parent: 4:a02330f767a4 86s - user: test 86s - date: Mon Jan 01 00:00:15 2007 +0000 86s - summary: add eta 86s - 86s - changeset: 5:218b2d0660d3 86s - bookmark: releases/v1 86s - tag: default/releases/v1 86s - user: test 86s - date: Mon Jan 01 00:00:14 2007 +0000 86s - summary: add zeta 86s - 86s - changeset: 2:678ebee93e38 86s - bookmark: delta 86s - tag: default/delta 86s - parent: 0:ff7a2f2d8d70 86s - user: test 86s - date: Mon Jan 01 00:00:12 2007 +0000 86s - summary: add delta 86s - 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + [1] 86s 86s test for ssh vulnerability 86s 86s @@ -494,18 +307,21 @@ 86s > EOF 86s 86s $ hg init a 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s $ cd a 86s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 86s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 86s [255] 86s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 86s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 86s [255] 86s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 86s - ssh: * fakehost%7?shellcommand* (glob) 86s - abort: git remote error: The remote server unexpectedly closed the connection. 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 86s [255] 86s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 86s - ssh: * fakehost%7?shellcommand* (glob) 86s - abort: git remote error: The remote server unexpectedly closed the connection. 86s - [255] 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 86s + [255] 86s 86s ERROR: test-pull.t#secret output changed 86s ! 86s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-git-submodules.t 86s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-git-submodules.t.err 86s @@ -188,261 +188,9 @@ 86s $ cd .. 86s 86s $ hg clone gitrepo2 hgrepo 86s - importing 10 git commits 86s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 86s - updating to bookmark master 86s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 86s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 86s + abort: repository gitrepo2 not found 86s + [255] 86s $ cd hgrepo 86s + $TESTTMP.sh: 133: cd: can't cd to hgrepo 86s $ hg log --graph 86s - @ changeset: 9:0ad944b2c4d8 86s - | bookmark: master 86s - | tag: default/master 86s - | tag: tip 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: remove all subrepos 86s - | 86s - o changeset: 8:33da452ef22f 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: replace subrepo with symlink 86s - | 86s - o changeset: 7:acebec53c0fc 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: replace symlink with subrepo 86s - | 86s - o changeset: 6:78c2ea52db4b 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: add symlink 86s - | 86s - o changeset: 5:c0d52ffc59b8 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: replace file with subrepo 86s - | 86s - o changeset: 4:73e078a178a0 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: replace subrepo with file 86s - | 86s - o changeset: 3:29e236ba4c06 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: add another subrepo 86s - | 86s - o changeset: 2:a6075a162f62 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: change subrepo commit 86s - | 86s - o changeset: 1:a4036e758995 86s - | user: test 86s - | date: Mon Jan 01 00:00:11 2007 +0000 86s - | summary: add subrepo 86s - | 86s - o changeset: 0:ff7a2f2d8d70 86s - user: test 86s - date: Mon Jan 01 00:00:10 2007 +0000 86s - summary: add alpha 86s - 86s - $ hg book 86s - * master 9:0ad944b2c4d8 86s - 86s -(add subrepo) 86s - $ hg cat -r 1 .hgsubstate 86s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo 86s - $ hg cat -r 1 .hgsub 86s - subrepo = [git]../gitsubrepo 86s - $ hg gverify -r 1 86s - verifying rev a4036e758995 against git commit e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 86s - 86s -(change subrepo commit) 86s - $ hg cat -r 2 .hgsubstate 86s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 86s - $ hg cat -r 2 .hgsub 86s - subrepo = [git]../gitsubrepo 86s - $ hg gverify -r 2 86s - verifying rev a6075a162f62 against git commit a000567ceefbd9a2ce364e0dea6e298010b02b6d 86s - 86s -(add another subrepo) 86s - $ hg cat -r 3 .hgsubstate 86s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 86s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 86s - $ hg cat -r 3 .hgsub 86s - subrepo = [git]../gitsubrepo 86s - subrepo2 = [git]../gitsubrepo 86s - $ hg gverify -r 3 86s - verifying rev 29e236ba4c06 against git commit 6e219527869fa40eb6ffbdd013cd86d576b26b01 86s - 86s -(replace subrepo with file) 86s - $ hg cat -r 4 .hgsubstate 86s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 86s - $ hg cat -r 4 .hgsub 86s - subrepo2 = [git]../gitsubrepo 86s - $ hg manifest -r 4 86s - .hgsub 86s - .hgsubstate 86s - alpha 86s - subrepo 86s - $ hg gverify -r 4 86s - verifying rev 73e078a178a0 against git commit f6436a472da00f581d8d257e9bbaf3c358a5e88c 86s - 86s -(replace file with subrepo) 86s - $ hg cat -r 5 .hgsubstate 86s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 86s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 86s - $ hg cat -r 5 .hgsub 86s - subrepo2 = [git]../gitsubrepo 86s - alpha = [git]../gitsubrepo 86s - $ hg manifest -r 5 86s - .hgsub 86s - .hgsubstate 86s - subrepo 86s - $ hg gverify -r 5 86s - verifying rev c0d52ffc59b8 against git commit 88171163bf4795b5570924e51d5f8ede33f8bc28 86s - 86s -(replace symlink with subrepo) 86s - $ hg cat -r 7 .hgsub 86s - subrepo2 = [git]../gitsubrepo 86s - alpha = [git]../gitsubrepo 86s - foolink = [git]../gitsubrepo 86s - $ hg cat -r 7 .hgsubstate 86s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 86s - 6e4ad8da50204560c00fa25e4987eb2e239029ba foolink 86s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 86s - $ hg gverify -r 7 86s - verifying rev acebec53c0fc against git commit e3288fa737d429a60637b3b6782cb25b8298bc00 86s - 86s -(replace subrepo with symlink) 86s - $ hg cat -r 8 .hgsub .hgsubstate 86s - subrepo2 = [git]../gitsubrepo 86s - alpha = [git]../gitsubrepo 86s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 86s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 86s - 86s - $ hg gverify -r 8 86s - verifying rev 33da452ef22f against git commit d28364013fe1a0fde56c0e1921e49ecdeee8571d 86s - 86s -(remove all subrepos) 86s - $ hg cat -r 9 .hgsub .hgsubstate 86s - .hgsub: no such file in rev 0ad944b2c4d8 86s - .hgsubstate: no such file in rev 0ad944b2c4d8 86s - [1] 86s - $ hg gverify -r 9 86s - verifying rev 0ad944b2c4d8 against git commit 15ba94929481c654814178aac1dbca06ae688718 86s - 86s - $ hg debug-remove-hggit-state 86s - clearing out the git cache data 86s - $ hg gexport 86s - $ cd .hg/git 86s - $ git log --pretty=oneline 86s - 73c15b74fb81fa0cc60e9c59c73787a9f26c778b remove all subrepos 86s - d28364013fe1a0fde56c0e1921e49ecdeee8571d replace subrepo with symlink 86s - e3288fa737d429a60637b3b6782cb25b8298bc00 replace symlink with subrepo 86s - 2d1c135447d11df4dfe96dd5d4f37926dc5c821d add symlink 86s - 88171163bf4795b5570924e51d5f8ede33f8bc28 replace file with subrepo 86s - f6436a472da00f581d8d257e9bbaf3c358a5e88c replace subrepo with file 86s - 6e219527869fa40eb6ffbdd013cd86d576b26b01 add another subrepo 86s - a000567ceefbd9a2ce364e0dea6e298010b02b6d change subrepo commit 86s - e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 add subrepo 86s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 add alpha 86s - 86s -test with rename detection enabled -- simply checking that the Mercurial hashes 86s -are the same is enough 86s - $ cd ../../.. 86s - $ hg --config git.similarity=100 clone gitrepo2 hgreporenames 86s - importing 10 git commits 86s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 86s - updating to bookmark master 86s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 86s - $ cd hgreporenames 86s - $ hg log --graph 86s - @ changeset: 9:0ad944b2c4d8 86s - | bookmark: master 86s - | tag: default/master 86s - | tag: tip 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: remove all subrepos 86s - | 86s - o changeset: 8:33da452ef22f 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: replace subrepo with symlink 86s - | 86s - o changeset: 7:acebec53c0fc 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: replace symlink with subrepo 86s - | 86s - o changeset: 6:78c2ea52db4b 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: add symlink 86s - | 86s - o changeset: 5:c0d52ffc59b8 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: replace file with subrepo 86s - | 86s - o changeset: 4:73e078a178a0 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: replace subrepo with file 86s - | 86s - o changeset: 3:29e236ba4c06 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: add another subrepo 86s - | 86s - o changeset: 2:a6075a162f62 86s - | user: test 86s - | date: Mon Jan 01 00:00:12 2007 +0000 86s - | summary: change subrepo commit 86s - | 86s - o changeset: 1:a4036e758995 86s - | user: test 86s - | date: Mon Jan 01 00:00:11 2007 +0000 86s - | summary: add subrepo 86s - | 86s - o changeset: 0:ff7a2f2d8d70 86s - user: test 86s - date: Mon Jan 01 00:00:10 2007 +0000 86s - summary: add alpha 86s - 86s - $ cd .. 86s - 86s -test handling of an invalid .gitmodules file (#380) 86s - 86s - $ git init --quiet gitrepo-issue380 86s - $ cd gitrepo-issue380 86s - $ git submodule add ../gitsubrepo 86s - Cloning into '$TESTTMP/gitrepo-issue380/gitsubrepo'... 86s - done. 86s - $ fn_git_commit -m 'add a submodule' 86s - $ cat >> .gitmodules < <<<<<<< HEAD 86s - > EOF 86s - $ fn_git_commit -a -m 'b0rken .gitmodules' 86s - $ git status 86s - fatal: bad config line 4 in file $TESTTMP/gitrepo-issue380/.gitmodules 86s - [128] 86s - $ sed -i.orig /HEAD/d .gitmodules 86s - $ fn_git_commit -a -m 'fix .gitmodules' 86s - $ git status 86s - On branch master 86s - Untracked files: 86s - (use "git add ..." to include in what will be committed) 86s - .gitmodules.orig 86s - 86s - nothing added to commit but untracked files present (use "git add" to track) 86s - $ cd .. 86s - $ git clone gitrepo-issue380 gitrepo-issue380~ 86s - Cloning into 'gitrepo-issue380~'... 86s - done. 86s - $ hg clone -U gitrepo-issue380 hgrepo-issue380 86s - importing 3 git commits 86s - warning: failed to parse .gitmodules in 2e4ec4293822 86s - new changesets ed60e5fbc192:9dfc0cdf1787 (3 drafts) 86s 86s ERROR: test-git-submodules.t output changed 87s !s 87s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-renames.t 87s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-renames.t.err 87s @@ -95,494 +95,9 @@ 87s 87s $ cd .. 87s $ hg clone -q repo.git hgrepo 87s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 87s + abort: repository repo.git not found 87s + [255] 87s $ cd hgrepo 87s + $TESTTMP.sh: 115: cd: can't cd to hgrepo 87s $ hg book master -q 87s - $ hg log -p --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 87s - @ 8 497105ddbe119aa40af691eb2b1a029c29bf5247 remove submodule and rename back 87s - | branch=default hg-git-rename-source=git 87s - | 87s - | diff --git a/.hgsub b/.hgsub 87s - | --- a/.hgsub 87s - | +++ b/.hgsub 87s - | @@ -1,2 +1,1 @@ 87s - | gitsubmodule2 = [git]../gitsubmodule 87s - | -gamma = [git]../gitsubmodule 87s - | diff --git a/.hgsubstate b/.hgsubstate 87s - | --- a/.hgsubstate 87s - | +++ b/.hgsubstate 87s - | @@ -1,2 +1,1 @@ 87s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 87s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 87s - | diff --git a/gamma-new b/gamma 87s - | rename from gamma-new 87s - | rename to gamma 87s - | 87s - o 7 adfc1ce8461d3174dcf8425e112e2fa848de3913 rename and add submodule 87s - | branch=default hg-git-rename-source=git 87s - | 87s - | diff --git a/.hgsub b/.hgsub 87s - | --- a/.hgsub 87s - | +++ b/.hgsub 87s - | @@ -1,1 +1,2 @@ 87s - | gitsubmodule2 = [git]../gitsubmodule 87s - | +gamma = [git]../gitsubmodule 87s - | diff --git a/.hgsubstate b/.hgsubstate 87s - | --- a/.hgsubstate 87s - | +++ b/.hgsubstate 87s - | @@ -1,1 +1,2 @@ 87s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 87s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 87s - | diff --git a/gamma b/gamma-new 87s - | rename from gamma 87s - | rename to gamma-new 87s - | 87s - o 6 62c1a4b07240b53a71be1b1a46e94e99132c5391 beta renamed back 87s - | branch=default hg-git-rename-source=git 87s - | 87s - | diff --git a/beta b/beta 87s - | old mode 120000 87s - | new mode 100644 87s - | --- a/beta 87s - | +++ b/beta 87s - | @@ -1,1 +1,12 @@ 87s - | -beta-new 87s - | \ No newline at end of file 87s - | +1 87s - | +2 87s - | +3 87s - | +4 87s - | +5 87s - | +6 87s - | +7 87s - | +8 87s - | +9 87s - | +10 87s - | +11 87s - | +12 87s - | diff --git a/beta-new b/beta-new 87s - | deleted file mode 100644 87s - | --- a/beta-new 87s - | +++ /dev/null 87s - | @@ -1,12 +0,0 @@ 87s - | -1 87s - | -2 87s - | -3 87s - | -4 87s - | -5 87s - | -6 87s - | -7 87s - | -8 87s - | -9 87s - | -10 87s - | -11 87s - | -12 87s - | 87s - o 5 f93fefed957cff2220d3f0d11182398350b5fa9a beta renamed 87s - | branch=default hg-git-rename-source=git 87s - | 87s - | diff --git a/beta b/beta 87s - | old mode 100644 87s - | new mode 120000 87s - | --- a/beta 87s - | +++ b/beta 87s - | @@ -1,12 +1,1 @@ 87s - | -1 87s - | -2 87s - | -3 87s - | -4 87s - | -5 87s - | -6 87s - | -7 87s - | -8 87s - | -9 87s - | -10 87s - | -11 87s - | -12 87s - | +beta-new 87s - | \ No newline at end of file 87s - | diff --git a/beta b/beta-new 87s - | copy from beta 87s - | copy to beta-new 87s - | 87s - o 4 b9e63d96abc2783afc59246e798a6936cf05a35e move submodule 87s - | branch=default hg-git-rename-source=git 87s - | 87s - | diff --git a/.hgsub b/.hgsub 87s - | --- a/.hgsub 87s - | +++ b/.hgsub 87s - | @@ -1,1 +1,1 @@ 87s - | -gitsubmodule = [git]../gitsubmodule 87s - | +gitsubmodule2 = [git]../gitsubmodule 87s - | diff --git a/.hgsubstate b/.hgsubstate 87s - | --- a/.hgsubstate 87s - | +++ b/.hgsubstate 87s - | @@ -1,1 +1,1 @@ 87s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 87s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 87s - | 87s - o 3 55537ea256c28be1b5637f4f93a601fdde8a9a7f add submodule 87s - | branch=default hg-git-rename-source=git 87s - | 87s - | diff --git a/.hgsub b/.hgsub 87s - | new file mode 100644 87s - | --- /dev/null 87s - | +++ b/.hgsub 87s - | @@ -0,0 +1,1 @@ 87s - | +gitsubmodule = [git]../gitsubmodule 87s - | diff --git a/.hgsubstate b/.hgsubstate 87s - | new file mode 100644 87s - | --- /dev/null 87s - | +++ b/.hgsubstate 87s - | @@ -0,0 +1,1 @@ 87s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 87s - | 87s - o 2 20f9e56b6d006d0403f853245e483d0892b8ac48 gamma 87s - | branch=default hg-git-rename-source=git 87s - | 87s - | diff --git a/beta b/beta 87s - | --- a/beta 87s - | +++ b/beta 87s - | @@ -9,3 +9,4 @@ 87s - | 9 87s - | 10 87s - | 11 87s - | +12 87s - | diff --git a/beta b/gamma 87s - | copy from beta 87s - | copy to gamma 87s - | --- a/beta 87s - | +++ b/gamma 87s - | @@ -9,3 +9,4 @@ 87s - | 9 87s - | 10 87s - | 11 87s - | +13 87s - | 87s - o 1 9f7744e68def81da3b394f11352f602ca9c8ab68 beta 87s - | branch=default hg-git-rename-source=git 87s - | 87s - | diff --git a/alpha b/beta 87s - | rename from alpha 87s - | rename to beta 87s - | --- a/alpha 87s - | +++ b/beta 87s - | @@ -8,3 +8,4 @@ 87s - | 8 87s - | 9 87s - | 10 87s - | +11 87s - | 87s - o 0 7bc844166f76e49562f81eacd54ea954d01a9e42 alpha 87s - branch=default hg-git-rename-source=git 87s - 87s - diff --git a/alpha b/alpha 87s - new file mode 100644 87s - --- /dev/null 87s - +++ b/alpha 87s - @@ -0,0 +1,10 @@ 87s - +1 87s - +2 87s - +3 87s - +4 87s - +5 87s - +6 87s - +7 87s - +8 87s - +9 87s - +10 87s - 87s - 87s -Make a new ordinary commit in Mercurial (no extra metadata) 87s - $ echo 14 >> gamma 87s - $ hg ci -m "gamma2" 87s - 87s -Make a new commit with a copy and a rename in Mercurial 87s - $ hg cp gamma delta 87s - $ echo 15 >> delta 87s - $ hg mv beta epsilon 87s - $ echo 16 >> epsilon 87s - $ hg ci -m "delta/epsilon" 87s - $ hg export . 87s - # HG changeset patch 87s - # User test 87s - # Date 0 0 87s - # Thu Jan 01 00:00:00 1970 +0000 87s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 87s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 87s - delta/epsilon 87s - 87s - diff --git a/gamma b/delta 87s - copy from gamma 87s - copy to delta 87s - --- a/gamma 87s - +++ b/delta 87s - @@ -11,3 +11,4 @@ 87s - 11 87s - 13 87s - 14 87s - +15 87s - diff --git a/beta b/epsilon 87s - rename from beta 87s - rename to epsilon 87s - --- a/beta 87s - +++ b/epsilon 87s - @@ -10,3 +10,4 @@ 87s - 10 87s - 11 87s - 12 87s - +16 87s - $ hg push 87s - pushing to $TESTTMP/repo.git 87s - searching for changes 87s - adding objects 87s - remote: found 0 deltas to reuse 87s - added 2 commits with 2 trees and 3 blobs 87s - updating reference refs/heads/master 87s - 87s - $ cd ../repo.git 87s - $ git log master --pretty=oneline 87s - 5f2948d029693346043f320620af99a615930dc4 delta/epsilon 87s - bbd2ec050f7fbc64f772009844f7d58a556ec036 gamma2 87s - 50d116676a308b7c22935137d944e725d2296f2a remove submodule and rename back 87s - 59fb8e82ea18f79eab99196f588e8948089c134f rename and add submodule 87s - f95497455dfa891b4cd9b524007eb9514c3ab654 beta renamed back 87s - 055f482277da6cd3dd37c7093d06983bad68f782 beta renamed 87s - d7f31298f27df8a9226eddb1e4feb96922c46fa5 move submodule 87s - c610256cb6959852d9e70d01902a06726317affc add submodule 87s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 87s - cc83241f39927232f690d370894960b0d1943a0e beta 87s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 87s - 87s -Make sure the right metadata is stored 87s - $ git cat-file commit master^ 87s - tree 0adbde18545845f3b42ad1a18939ed60a9dec7a8 87s - parent 50d116676a308b7c22935137d944e725d2296f2a 87s - author test 0 +0000 87s - committer test 0 +0000 87s - HG:rename-source hg 87s - 87s - gamma2 87s - $ git cat-file commit master 87s - tree f8f32f4e20b56a5a74582c6a5952c175bf9ec155 87s - parent bbd2ec050f7fbc64f772009844f7d58a556ec036 87s - author test 0 +0000 87s - committer test 0 +0000 87s - HG:rename gamma:delta 87s - HG:rename beta:epsilon 87s - 87s - delta/epsilon 87s - 87s -Now make another clone and compare the hashes 87s - 87s - $ cd .. 87s - $ hg clone -q repo.git hgrepo2 87s - $ cd hgrepo2 87s - $ hg book master -qf 87s - $ hg export master 87s - # HG changeset patch 87s - # User test 87s - # Date 0 0 87s - # Thu Jan 01 00:00:00 1970 +0000 87s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 87s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 87s - delta/epsilon 87s - 87s - diff --git a/gamma b/delta 87s - copy from gamma 87s - copy to delta 87s - --- a/gamma 87s - +++ b/delta 87s - @@ -11,3 +11,4 @@ 87s - 11 87s - 13 87s - 14 87s - +15 87s - diff --git a/beta b/epsilon 87s - rename from beta 87s - rename to epsilon 87s - --- a/beta 87s - +++ b/epsilon 87s - @@ -10,3 +10,4 @@ 87s - 10 87s - 11 87s - 12 87s - +16 87s - 87s -Regenerate the Git metadata and compare the hashes 87s - $ hg debug-remove-hggit-state 87s - clearing out the git cache data 87s - $ hg gexport 87s - $ cd .hg/git 87s - $ git log master --pretty=oneline 87s - f3f6592447685566af9447c03ae262aa5432511d delta/epsilon (dulwich-rust !) 87s - c51ce14ec367c5ea72bf428dee3f8576f2fe1bb0 gamma2 (dulwich-rust !) 87s - df749cae534e3c7a0ad664cd0f214dd36e0ac259 remove submodule and rename back (dulwich-rust !) 87s - 8f9ec605ad0cc2532202f73cef8e35d3241797ee rename and add submodule (dulwich-rust !) 87s - 8a00d0fb75377c51c9a46e92ff154c919007f0e2 delta/epsilon (no-dulwich-rust !) 87s - dd7d4f1adb942a8d349dce585019f6949184bc64 gamma2 (no-dulwich-rust !) 87s - 3f1cdaf8b603816fcda02bd29e75198ae4cb13db remove submodule and rename back (no-dulwich-rust !) 87s - 2a4abf1178a999e2054158ceb0c7768079665d03 rename and add submodule (no-dulwich-rust !) 87s - 88c416e8d5e0e9dd1187d45ebafaa46111764196 beta renamed back 87s - 027d2a6e050705bf6f7e226e7e97f02ce5ae3200 beta renamed 87s - dc70e620634887e70ac5dd108bcc7ebd99c60ec3 move submodule 87s - c610256cb6959852d9e70d01902a06726317affc add submodule 87s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 87s - cc83241f39927232f690d370894960b0d1943a0e beta 87s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 87s - 87s -Test findcopiesharder 87s - 87s - $ cd $TESTTMP 87s - $ git init -q gitcopyharder 87s - $ cd gitcopyharder 87s - $ cat >> file0 << EOF 87s - > 1 87s - > 2 87s - > 3 87s - > 4 87s - > 5 87s - > EOF 87s - $ git add file0 87s - $ fn_git_commit -m file0 87s - $ cp file0 file1 87s - $ git add file1 87s - $ fn_git_commit -m file1 87s - $ cp file0 file2 87s - $ echo 6 >> file2 87s - $ git add file2 87s - $ fn_git_commit -m file2 87s - 87s - $ cd .. 87s - 87s -Clone without findcopiesharder does not find copies from unmodified files 87s - 87s - $ hg clone gitcopyharder hgnocopyharder 87s - importing 3 git commits 87s - new changesets b45d023c6842:ec77ccdbefe0 (3 drafts) 87s - updating to bookmark master 87s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 87s - $ hg -R hgnocopyharder export 1::2 87s - # HG changeset patch 87s - # User test 87s - # Date 1167609621 0 87s - # Mon Jan 01 00:00:21 2007 +0000 87s - # Node ID 555831c93e2a250e5ba42efad45bf7ba71da13e4 87s - # Parent b45d023c6842337ffe694663a44aa672d311081c 87s - file1 87s - 87s - diff --git a/file1 b/file1 87s - new file mode 100644 87s - --- /dev/null 87s - +++ b/file1 87s - @@ -0,0 +1,5 @@ 87s - +1 87s - +2 87s - +3 87s - +4 87s - +5 87s - # HG changeset patch 87s - # User test 87s - # Date 1167609622 0 87s - # Mon Jan 01 00:00:22 2007 +0000 87s - # Node ID ec77ccdbefe023eb9898b0399f84f670c8c0f5fc 87s - # Parent 555831c93e2a250e5ba42efad45bf7ba71da13e4 87s - file2 87s - 87s - diff --git a/file2 b/file2 87s - new file mode 100644 87s - --- /dev/null 87s - +++ b/file2 87s - @@ -0,0 +1,6 @@ 87s - +1 87s - +2 87s - +3 87s - +4 87s - +5 87s - +6 87s - 87s -findcopiesharder finds copies from unmodified files if similarity is met 87s - 87s - $ hg --config git.findcopiesharder=true clone gitcopyharder hgcopyharder0 87s - importing 3 git commits 87s - new changesets b45d023c6842:9b3099834272 (3 drafts) 87s - updating to bookmark master 87s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 87s - $ hg -R hgcopyharder0 export 1::2 87s - # HG changeset patch 87s - # User test 87s - # Date 1167609621 0 87s - # Mon Jan 01 00:00:21 2007 +0000 87s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 87s - # Parent b45d023c6842337ffe694663a44aa672d311081c 87s - file1 87s - 87s - diff --git a/file0 b/file1 87s - copy from file0 87s - copy to file1 87s - # HG changeset patch 87s - # User test 87s - # Date 1167609622 0 87s - # Mon Jan 01 00:00:22 2007 +0000 87s - # Node ID 9b30998342729c7357d418bebed7399986cfe643 87s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 87s - file2 87s - 87s - diff --git a/file0 b/file2 87s - copy from file0 87s - copy to file2 87s - --- a/file0 87s - +++ b/file2 87s - @@ -3,3 +3,4 @@ 87s - 3 87s - 4 87s - 5 87s - +6 87s - 87s - $ hg --config git.findcopiesharder=true --config git.similarity=95 clone gitcopyharder hgcopyharder1 87s - importing 3 git commits 87s - new changesets b45d023c6842:d9d2e8cbf050 (3 drafts) 87s - updating to bookmark master 87s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 87s - $ hg -R hgcopyharder1 export 1::2 87s - # HG changeset patch 87s - # User test 87s - # Date 1167609621 0 87s - # Mon Jan 01 00:00:21 2007 +0000 87s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 87s - # Parent b45d023c6842337ffe694663a44aa672d311081c 87s - file1 87s - 87s - diff --git a/file0 b/file1 87s - copy from file0 87s - copy to file1 87s - # HG changeset patch 87s - # User test 87s - # Date 1167609622 0 87s - # Mon Jan 01 00:00:22 2007 +0000 87s - # Node ID d9d2e8cbf050772be31dccf78851f71dc547d139 87s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 87s - file2 87s - 87s - diff --git a/file2 b/file2 87s - new file mode 100644 87s - --- /dev/null 87s - +++ b/file2 87s - @@ -0,0 +1,6 @@ 87s - +1 87s - +2 87s - +3 87s - +4 87s - +5 87s - +6 87s - 87s -Config values out of range 87s - $ hg --config git.similarity=999 clone gitcopyharder hgcopyharder2 87s - importing 3 git commits 87s - abort: git.similarity must be between 0 and 100 87s - [255] 87s -Left-over on Windows with some pack files 87s - $ rm -rf hgcopyharder2 87s - $ hg --config git.renamelimit=-5 clone gitcopyharder hgcopyharder2 87s - importing 3 git commits 87s - abort: git.renamelimit must be non-negative 87s - [255] 87s 87s ERROR: test-renames.t output changed 87s ! 87s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-git-tags.t 87s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-git-tags.t#draft.err 87s @@ -41,337 +41,13 @@ 87s Clone it: 87s 87s $ hg clone repo.git hgrepo 87s - importing 2 git commits 87s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 87s - updating to bookmark master 87s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 87s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 87s + abort: repository repo.git not found 87s + [255] 87s 87s $ cd hgrepo 87s + $TESTTMP.sh: 39: cd: can't cd to hgrepo 87s 87s Verify that annotated tags are unaffected by reexports: 87s 87s $ GIT_DIR=.hg/git git tag -ln 87s - beta added tag beta 87s - $ hg gexport 87s - $ GIT_DIR=.hg/git git tag -ln 87s - beta added tag beta 87s - 87s -Error checking on tag creation 87s - 87s - $ hg tag --git beta --remove 87s - abort: cannot remove git tags 87s - (the git documentation heavily discourages editing tags) 87s - [255] 87s - $ hg tag --git beta -r null 87s - abort: cannot remove git tags 87s - (the git documentation heavily discourages editing tags) 87s - [255] 87s - $ hg tag --git beta --remove -r 0 87s - abort: cannot specify both --rev and --remove 87s - [10] 87s - $ hg tag --git alpha 87s - abort: git tags require an explicit revision 87s - (please specify -r/--rev) 87s - [255] 87s - $ hg tag --git alpha alpha -r 0 87s - abort: tag names must be unique 87s - [255] 87s - $ hg tag --git alpha -r 0 -e 87s - abort: cannot specify both --git and --edit 87s - [10] 87s - $ hg tag --git alpha -r 0 -m 42 87s - abort: cannot specify both --git and --message 87s - [10] 87s - $ hg tag --git alpha -r 0 -d 42 87s - abort: cannot specify both --git and --date 87s - [10] 87s - $ hg tag --git alpha -r 0 -u user@example.com 87s - abort: cannot specify both --git and --user 87s - [10] 87s - $ hg tag --git 'with space' -r 0 87s - abort: the name 'with space' is not a valid git tag 87s - [255] 87s - $ hg tag --git ' beta' -r 0 87s - abort: the name 'beta' already exists 87s - [255] 87s - $ hg tag --git master -r 0 87s - abort: the name 'master' already exists 87s - [255] 87s - $ hg tag --git tip -r 0 87s - abort: the name 'tip' is reserved 87s - [10] 87s - 87s -Create a git tag from hg 87s - 87s - $ hg tag --git alpha --debug -r 0 87s - finding unexported changesets 87s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 87s - adding git tag alpha 87s - $ hg log --graph 87s - @ changeset: 1:7fe02317c63d 87s - | bookmark: master 87s - | tag: beta 87s - | tag: default/master 87s - | tag: tip 87s - | user: test 87s - | date: Mon Jan 01 00:00:11 2007 +0000 87s - | summary: add beta 87s - | 87s - o changeset: 0:ff7a2f2d8d70 87s - tag: alpha 87s - user: test 87s - date: Mon Jan 01 00:00:10 2007 +0000 87s - summary: add alpha 87s - 87s - $ echo beta-fix >> beta 87s - $ fn_hg_commit -m 'fix for beta' 87s -#if secret 87s - $ hg phase -d 87s -#endif 87s - $ hg push 87s - pushing to $TESTTMP/repo.git 87s - searching for changes 87s - adding objects 87s - remote: found 0 deltas to reuse 87s - added 1 commits with 1 trees and 1 blobs 87s - updating reference refs/heads/master 87s - adding reference refs/tags/alpha 87s - 87s -Verify that amending commits known to remotes doesn't break anything 87s - 87s - $ cat >> $HGRCPATH << EOF 87s - > [experimental] 87s - > evolution = createmarkers 87s - > evolution.createmarkers = yes 87s - > EOF 87s - $ hg tags 87s - tip 2:61175962e488 87s - default/master 2:61175962e488 87s - beta 1:7fe02317c63d 87s - alpha 0:ff7a2f2d8d70 87s - $ echo beta-fix-again >> beta 87s - $ fn_hg_commit --amend 87s - $ hg log -T shorttags 87s - 3:3094b9e8da41 draft tip 87s - 2:61175962e488 draft default/master X 87s - 1:7fe02317c63d draft beta 87s - 0:ff7a2f2d8d70 draft alpha 87s - $ hg tags 87s - tip 3:3094b9e8da41 87s - default/master 2:61175962e488 87s - beta 1:7fe02317c63d 87s - alpha 0:ff7a2f2d8d70 87s - $ hg push 87s - pushing to $TESTTMP/repo.git 87s - searching for changes 87s - abort: pushing refs/heads/master overwrites 3094b9e8da41 87s - [255] 87s - $ hg push -f 87s - pushing to $TESTTMP/repo.git 87s - searching for changes 87s - adding objects 87s - remote: found 0 deltas to reuse 87s - added 1 commits with 1 trees and 1 blobs 87s - updating reference refs/heads/master 87s - 87s -Now create a tag for the old, obsolete master 87s - 87s - $ cd ../repo.git 87s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 87s - $ git tag 87s - alpha 87s - beta 87s - detached 87s - $ cd ../hgrepo 87s - $ hg pull 87s - pulling from $TESTTMP/repo.git 87s - no changes found 87s - $ hg log -T shorttags 87s - 3:3094b9e8da41 draft default/master tip 87s - 2:61175962e488 draft detached X 87s - 1:7fe02317c63d draft beta 87s - 0:ff7a2f2d8d70 draft alpha 87s - $ hg tags 87s - tip 3:3094b9e8da41 87s - default/master 3:3094b9e8da41 87s - detached 2:61175962e488 87s - beta 1:7fe02317c63d 87s - alpha 0:ff7a2f2d8d70 87s - $ hg push 87s - pushing to $TESTTMP/repo.git 87s - searching for changes 87s - no changes found 87s - [1] 87s - 87s - $ cd .. 87s - 87s -Verify that revsets can point out git tags; for that we need an 87s -untagged commit. 87s - 87s - $ cd hgrepo 87s - $ touch gamma 87s - $ fn_hg_commit -A -m 'add gamma' 87s -#if secret 87s - $ hg phase -d 87s -#endif 87s - $ hg log -T shorttags -r 'gittag()' 87s - 0:ff7a2f2d8d70 draft alpha 87s - 1:7fe02317c63d draft beta 87s - 2:61175962e488 draft detached X 87s - $ hg log -T shorttags -r 'gittag(detached)' 87s - 2:61175962e488 draft detached X 87s - $ hg log -T shorttags -r 'gittag("re:a$")' 87s - 0:ff7a2f2d8d70 draft alpha 87s - 1:7fe02317c63d draft beta 87s - 87s -Create a git tag from hg, but pointing to a new commit: 87s - 87s - $ hg tag --git gamma --debug -r tip 87s - invalid branch cache (visible): tip differs (?) 87s - finding unexported changesets 87s - exporting 1 changesets 87s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 87s - packing 3 loose objects... 87s - packed 3 loose objects! 87s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 87s - adding git tag gamma 87s - $ hg push 87s - pushing to $TESTTMP/repo.git 87s - searching for changes 87s - adding objects 87s - remote: found 0 deltas to reuse 87s - added 1 commits with 1 trees and 1 blobs 87s - updating reference refs/heads/master 87s - adding reference refs/tags/gamma 87s - $ cd ../gitrepo 87s - $ git fetch --quiet --tags 87s - $ git tag 87s - alpha 87s - beta 87s - detached 87s - gamma 87s - $ cd .. 87s - 87s -Try to overwrite an annotated tag: 87s - 87s - $ cd hgrepo 87s - $ hg tags -v 87s - tip 4:0eb1ab0073a8 87s - gamma 4:0eb1ab0073a8 git 87s - default/master 4:0eb1ab0073a8 git-remote 87s - detached 2:61175962e488 git 87s - beta 1:7fe02317c63d git 87s - alpha 0:ff7a2f2d8d70 git 87s - $ hg book not-master 87s - $ hg tag beta 87s - abort: tag 'beta' already exists (use -f to force) 87s - [10] 87s - $ hg tag -f beta 87s -#if secret 87s - $ hg phase -d 87s -#endif 87s - $ hg push 87s - pushing to $TESTTMP/repo.git 87s - warning: not overwriting annotated tag 'beta' 87s - searching for changes 87s - adding objects 87s - remote: found 0 deltas to reuse 87s - added 1 commits with 1 trees and 1 blobs 87s - adding reference refs/heads/not-master 87s - $ hg tags 87s - tip 5:c49682c7cba4 87s - default/not-master 5:c49682c7cba4 87s - gamma 4:0eb1ab0073a8 87s - default/master 4:0eb1ab0073a8 87s - beta 4:0eb1ab0073a8 87s - detached 2:61175962e488 87s - alpha 0:ff7a2f2d8d70 87s - $ cd .. 87s - 87s -Check whether `gimport` handles tags 87s - 87s - $ cd hgrepo 87s - $ rm .hg/git-tags .hg/git-mapfile 87s - $ hg gimport 87s - importing 6 git commits 87s - $ hg tags -q 87s - tip 87s - default/not-master 87s - gamma 87s - default/master 87s - beta 87s - detached 87s - alpha 87s - $ cd .. 87s - 87s -Test how pulling an explicit branch with an annotated tag: 87s - 87s - $ hg clone -r master repo.git hgrepo-2 87s - importing 4 git commits 87s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 87s - updating to branch default 87s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 87s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 87s - 0:ff7a2f2d8d70 draft alpha 87s - 1:7fe02317c63d draft beta 87s - 3:0eb1ab0073a8 draft default/master gamma tip 87s - $ hg tags -v -R hgrepo-2 87s - tip 3:0eb1ab0073a8 87s - gamma 3:0eb1ab0073a8 git 87s - default/master 3:0eb1ab0073a8 git-remote 87s - beta 1:7fe02317c63d git 87s - alpha 0:ff7a2f2d8d70 git 87s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 87s - $ rm -rf hgrepo-2 87s - 87s - $ hg clone -r master repo.git hgrepo-2 87s - importing 4 git commits 87s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 87s - updating to branch default 87s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 87s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 87s - 0:ff7a2f2d8d70 draft alpha 87s - 1:7fe02317c63d draft beta 87s - 3:0eb1ab0073a8 draft default/master gamma tip 87s -This used to die: 87s - $ hg -R hgrepo-2 gexport 87s -This used to fail, since we didn't actually pull the annotated tag: 87s - $ hg -R hgrepo-2 push 87s - pushing to $TESTTMP/repo.git 87s - searching for changes 87s - no changes found 87s - [1] 87s - $ rm -rf hgrepo-2 87s - 87s -Check that pulling will update phases only: 87s - 87s - $ cd hgrepo 87s - $ hg phase -fs gamma detached 87s - $ hg pull 87s - pulling from $TESTTMP/repo.git 87s - no changes found 87s - $ hg log -T shorttags -r gamma -r detached 87s - 4:0eb1ab0073a8 draft beta default/master gamma 87s - 2:61175962e488 draft detached X 87s - $ cd .. 87s - 87s -Check that we pull new tags to existing commits: 87s - $ cd gitrepo 87s - $ git tag 87s - alpha 87s - beta 87s - detached 87s - gamma 87s - $ fn_git_tag extra-simple-tag 87s - $ fn_git_tag -m annotated extra-annotated-tag 87s - $ git push --tags 87s - To $TESTTMP/repo.git 87s - * [new tag] extra-annotated-tag -> extra-annotated-tag 87s - * [new tag] extra-simple-tag -> extra-simple-tag 87s - $ cd ../hgrepo 87s - $ hg pull -r master 87s - pulling from $TESTTMP/repo.git 87s - no changes found 87s - $ hg tags -v | grep extra 87s - extra-simple-tag 1:7fe02317c63d git 87s - extra-annotated-tag 1:7fe02317c63d git 87s 87s ERROR: test-git-tags.t#draft output changed 88s ! 88s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-help.t 88s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-help.t.err 88s @@ -5,250 +5,14 @@ 88s 88s $ hg help | grep 'git' | sed 's/ */ /g' 88s git-cleanup clean up Git commit map after history editing (?) 88s - git-verify verify that a Mercurial rev matches the corresponding Git rev 88s - hggit push and pull from a Git server 88s - hggit-config Configuring hg-git 88s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 88s 88s $ hg help hggit-config 88s - Configuring hg-git 88s - """""""""""""""""" 88s - 88s - "git" 88s - ----- 88s - 88s - Control how the Hg-Git extension interacts with Git. 88s - 88s - "authors" 88s - Git uses a strict convention for "author names" when representing 88s - changesets, using the form "[realname] [email address]". Mercurial 88s - encourages this convention as well but is not as strict, so it's not 88s - uncommon for a Mercurial repository to have authors listed as, for 88s - example, simple usernames. hg-git by default will attempt to translate 88s - Mercurial usernames using the following rules: 88s - 88s - - If the Mercurial username fits the pattern "NAME ", the Git 88s - name will be set to NAME and the email to EMAIL. 88s - - If the Mercurial username looks like an email (if it contains an 88s - "@"), the Git name and email will both be set to that email. 88s - - If the Mercurial username consists of only a name, the email will be 88s - set to "none@none". 88s - - Illegal characters (stray "<"\ s or ">"\ s) will be stripped out, and 88s - for "NAME " usernames, any content after the right-bracket (for 88s - example, a second ">") will be turned into a url-encoded sigil like 88s - "ext:(%3E)" in the Git author name. 88s - 88s - Since these default behaviors may not be what you want ("none@none", for 88s - example, shows up unpleasantly on GitHub as "illegal email address"), 88s - the "git.authors" option provides for an "authors translation file" that 88s - will be used during outgoing transfers from Mercurial to Git only, by 88s - modifying "hgrc" as such: 88s - 88s - [git] 88s - authors = authors.txt 88s - 88s - Where "authors.txt" is the name of a text file containing author name 88s - translations, one per each line, using the following format: 88s - 88s - johnny = John Smith 88s - dougie = Doug Johnson 88s - 88s - Empty lines and lines starting with a "#" are ignored. 88s - 88s - It should be noted that this translation is in *the Mercurial to Git 88s - direction only*. Changesets coming from Git back to Mercurial will not 88s - translate back into Mercurial usernames, so it's best that the same 88s - username/email combination be used on both the Mercurial and Git sides; 88s - the author file is mostly useful for translating legacy changesets. 88s - 88s - "branch_bookmark_suffix" 88s - Hg-Git does not convert between Mercurial named branches and git 88s - branches as the two are conceptually different; instead, it uses 88s - Mercurial bookmarks to represent the concept of a Git branch. Therefore, 88s - when translating a Mercurial repository over to Git, you typically need 88s - to create bookmarks to mirror all the named branches that you'd like to 88s - see transferred over to Git. The major caveat with this is that you 88s - can't use the same name for your bookmark as that of the named branch, 88s - and furthermore there's no feasible way to rename a branch in Mercurial. 88s - For the use case where one would like to transfer a Mercurial repository 88s - over to Git, and maintain the same named branches as are present on the 88s - hg side, the "branch_bookmark_suffix" might be all that's needed. This 88s - presents a string "suffix" that will be recognized on each bookmark 88s - name, and stripped off as the bookmark is translated to a Git branch: 88s - 88s - [git] 88s - branch_bookmark_suffix=_bookmark 88s - 88s - Above, if a Mercurial repository had a named branch called 88s - "release_6_maintenance", you could then link it to a bookmark called 88s - "release_6_maintenance_bookmark". hg-git will then strip off the 88s - "_bookmark" suffix from this bookmark name, and create a Git branch 88s - called "release_6_maintenance". When pulling back from Git to hg, the 88s - "_bookmark" suffix is then applied back, if and only if a Mercurial 88s - named branch of that name exists. E.g., when changes to the 88s - "release_6_maintenance" branch are checked into Git, these will be 88s - placed into the "release_6_maintenance_bookmark" bookmark on hg. But if 88s - a new branch called "release_7_maintenance" were pulled over to hg, and 88s - there was not a "release_7_maintenance" named branch already, the 88s - bookmark will be named "release_7_maintenance" with no usage of the 88s - suffix. 88s - 88s - The "branch_bookmark_suffix" option is, like the "authors" option, 88s - intended for migrating legacy hg named branches. Going forward, a 88s - Mercurial repository that is to be linked with a Git repository should 88s - only use bookmarks for named branching. 88s - 88s - "findcopiesharder" 88s - Whether to consider unmodified files as copy sources. This is a very 88s - expensive operation for large projects, so use it with caution. Similar 88s - to "git diff"'s --find-copies-harder option. 88s - 88s - "intree" 88s - Hg-Git keeps a Git repository clone for reading and updating. By 88s - default, the Git clone is the subdirectory "git" in your local Mercurial 88s - repository. If you would like this Git clone to be at the same level of 88s - your Mercurial repository instead (named ".git"), add the following to 88s - your "hgrc": 88s - 88s - [git] 88s - intree = True 88s - 88s - Please note that changing this setting in an existing repository doesn't 88s - move the local Git repository. You will either have to do so yourself, 88s - or issue an 'hg pull' after the fact to repopulate the new location. 88s - 88s - "mindate" 88s - If set, branches where the latest commit's commit time is older than 88s - this will not be imported. Accepts any date formats that Mercurial does 88s - -- see 'hg help dates' for more. 88s - 88s - "public" 88s - A list of Git branches that should be considered "published", and 88s - therefore converted to Mercurial in the 'public' phase. This is only 88s - used if "hggit.usephases" is set. 88s - 88s - "pull-prune-remote-branches" 88s - Before fetching, remove any remote-tracking references, or pseudo-tags, 88s - that no longer exist on the remote. This is equivalent to the "--prune" 88s - option to "git fetch", and means that pseudo-tags for remotes -- such as 88s - "default/master" -- always actually reflect what's on the remote. 88s - 88s - This option is enabled by default. 88s - 88s - "pull-prune-bookmarks" 88s - On pull, delete any unchanged bookmarks removed on the remote. In other 88s - words, if e.g. the "thebranch" bookmark remains at "default/thebranch", 88s - and the branch is deleted in Git, pulling deletes the bookmark. 88s - 88s - This option is enabled by default. 88s - 88s - "renamelimit" 88s - The number of files to consider when performing the copy/rename 88s - detection. Detection is disabled if the number of files modified in a 88s - commit is above the limit. Detection is O(N^2) in the number of files 88s - modified, so be sure not to set the limit too high. Similar to Git's 88s - "diff.renameLimit" config. The default is "400", the same as Git. 88s - 88s - "similarity" 88s - Specify how similar files modified in a Git commit must be to be 88s - imported as Mercurial renames or copies, as a percentage between "0" 88s - (disabled) and "100" (files must be identical). For example, "90" means 88s - that a delete/add pair will be imported as a rename if more than 90% of 88s - the file has stayed the same. The default is "0" (disabled). 88s - 88s - "blame.ignoreRevsFile" 88s - Specify a file that lists Git commits to ignore when invoking 'hg 88s - annotate'. 88s - 88s - "hggit" 88s - ------- 88s - 88s - Control behavior of the Hg-Git extension. 88s - 88s - "mapsavefrequency" 88s - By default, hg-git only saves the results of a conversion at the end. 88s - Use this option to enable resuming long-running pulls and pushes. Set 88s - this to a number greater than 0 to allow resuming after converting that 88s - many commits. This can help when the conversion encounters an error 88s - partway through a large batch of changes. Otherwise, an error or 88s - interruption will roll back the transaction, similar to regular 88s - Mercurial. 88s - 88s - Defaults to 1000. 88s - 88s - Please note that this is disregarded for an initial clone, as any error 88s - or interruption will delete the destination. So instead of cloning a 88s - large Git repository, you might want to pull instead: 88s - 88s - $ hg init linux 88s - $ cd linux 88s - $ echo "[paths]\ndefault = https://github.com/torvalds/linux" > .hg/hgrc 88s - $ hg pull 88s - 88s - ...and be extremely patient. Please note that converting very large 88s - repositories may take *days* rather than mere *hours*, and may run into 88s - issues with available memory for very long running clones. Even any 88s - small, undiscovered leak will build up when processing hundreds of 88s - thousands of files and commits. Cloning the Linux kernel is likely a 88s - pathological case, but other storied repositories such as CPython do 88s - work well, even if the initial clone requires a some patience. 88s - 88s - "threads" 88s - 88s - During a push to Git, hg-git will pack loose objects at regular 88s - intervals whenever it saves its map. As this is a rather expensive 88s - operation, it's done in separate threads. 88s - 88s - Defaults to the system CPU count or 4, whichever is lower. 88s - 88s - "usephases" 88s - When converting Git revisions to Mercurial, place them in the 'public' 88s - phase as appropriate. Namely, revisions that are reachable from the 88s - remote Git repository's default branch, or "HEAD", will be marked 88s - *public*. For most repositories, this means the remote "master" branch 88s - will be converted as public. The same applies to any commits tagged in 88s - the remote. 88s - 88s - To restrict publishing to specific branches or tags, use the 88s - "git.public" option. 88s - 88s - Publishing commits prevents their modification, and speeds up many local 88s - Mercurial operations, such as 'hg shelve'. 88s - 88s - "fetchbuffer" 88s - Data fetched from Git is buffered in memory, unless it exceeds the given 88s - limit, in megabytes. By default, flush the buffer to disk when it 88s - exceeds 100MB. 88s - 88s - "retries" 88s - Interacting with a remote Git repository may require authentication. 88s - Normally, this will trigger a prompt and a retry, and this option 88s - restricts the amount of retries. Defaults to 3. 88s - 88s - "invalidpaths" 88s - Both Mercurial and Git consider paths as just bytestrings internally, 88s - and allow almost anything. The difference, however, is in the _almost_ 88s - part. For example, many Git servers will reject a push for security 88s - reasons if it contains a nested Git repository. Similarly, Mercurial 88s - cannot checkout commits with a nested repository, and it cannot even 88s - store paths containing an embedded newline or carrage return character. 88s - 88s - The default is to issue a warning and skip these paths. You can change 88s - this by setting "hggit.invalidpaths" in ".hgrc": 88s - 88s - [hggit] 88s - invalidpaths = keep 88s - 88s - Possible values are "keep", "skip" or "abort". Prior to 1.0, the default 88s - was "abort". 88s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 88s + abort: no such help topic: hggit-config 88s + (try 'hg help --keyword hggit-config') 88s + [10] 88s 88s $ hg help config.hggit | head -10 88s - "hggit" 88s - ------- 88s - 88s - Control behavior of the Hg-Git extension. 88s - 88s - "mapsavefrequency" 88s - By default, hg-git only saves the results of a conversion at the end. 88s - Use this option to enable resuming long-running pulls and pushes. Set 88s - this to a number greater than 0 to allow resuming after converting that 88s - many commits. This can help when the conversion encounters an error 88s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 88s + abort: help section not found: config.hggit 88s 88s ERROR: test-help.t output changed 88s ! 88s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-git-tags.t 88s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-git-tags.t#secret.err 88s @@ -41,337 +41,13 @@ 88s Clone it: 88s 88s $ hg clone repo.git hgrepo 88s - importing 2 git commits 88s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 88s - updating to bookmark master 88s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 88s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 88s + abort: repository repo.git not found 88s + [255] 88s 88s $ cd hgrepo 88s + $TESTTMP.sh: 44: cd: can't cd to hgrepo 88s 88s Verify that annotated tags are unaffected by reexports: 88s 88s $ GIT_DIR=.hg/git git tag -ln 88s - beta added tag beta 88s - $ hg gexport 88s - $ GIT_DIR=.hg/git git tag -ln 88s - beta added tag beta 88s - 88s -Error checking on tag creation 88s - 88s - $ hg tag --git beta --remove 88s - abort: cannot remove git tags 88s - (the git documentation heavily discourages editing tags) 88s - [255] 88s - $ hg tag --git beta -r null 88s - abort: cannot remove git tags 88s - (the git documentation heavily discourages editing tags) 88s - [255] 88s - $ hg tag --git beta --remove -r 0 88s - abort: cannot specify both --rev and --remove 88s - [10] 88s - $ hg tag --git alpha 88s - abort: git tags require an explicit revision 88s - (please specify -r/--rev) 88s - [255] 88s - $ hg tag --git alpha alpha -r 0 88s - abort: tag names must be unique 88s - [255] 88s - $ hg tag --git alpha -r 0 -e 88s - abort: cannot specify both --git and --edit 88s - [10] 88s - $ hg tag --git alpha -r 0 -m 42 88s - abort: cannot specify both --git and --message 88s - [10] 88s - $ hg tag --git alpha -r 0 -d 42 88s - abort: cannot specify both --git and --date 88s - [10] 88s - $ hg tag --git alpha -r 0 -u user@example.com 88s - abort: cannot specify both --git and --user 88s - [10] 88s - $ hg tag --git 'with space' -r 0 88s - abort: the name 'with space' is not a valid git tag 88s - [255] 88s - $ hg tag --git ' beta' -r 0 88s - abort: the name 'beta' already exists 88s - [255] 88s - $ hg tag --git master -r 0 88s - abort: the name 'master' already exists 88s - [255] 88s - $ hg tag --git tip -r 0 88s - abort: the name 'tip' is reserved 88s - [10] 88s - 88s -Create a git tag from hg 88s - 88s - $ hg tag --git alpha --debug -r 0 88s - finding unexported changesets 88s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 88s - adding git tag alpha 88s - $ hg log --graph 88s - @ changeset: 1:7fe02317c63d 88s - | bookmark: master 88s - | tag: beta 88s - | tag: default/master 88s - | tag: tip 88s - | user: test 88s - | date: Mon Jan 01 00:00:11 2007 +0000 88s - | summary: add beta 88s - | 88s - o changeset: 0:ff7a2f2d8d70 88s - tag: alpha 88s - user: test 88s - date: Mon Jan 01 00:00:10 2007 +0000 88s - summary: add alpha 88s - 88s - $ echo beta-fix >> beta 88s - $ fn_hg_commit -m 'fix for beta' 88s -#if secret 88s - $ hg phase -d 88s -#endif 88s - $ hg push 88s - pushing to $TESTTMP/repo.git 88s - searching for changes 88s - adding objects 88s - remote: found 0 deltas to reuse 88s - added 1 commits with 1 trees and 1 blobs 88s - updating reference refs/heads/master 88s - adding reference refs/tags/alpha 88s - 88s -Verify that amending commits known to remotes doesn't break anything 88s - 88s - $ cat >> $HGRCPATH << EOF 88s - > [experimental] 88s - > evolution = createmarkers 88s - > evolution.createmarkers = yes 88s - > EOF 88s - $ hg tags 88s - tip 2:61175962e488 88s - default/master 2:61175962e488 88s - beta 1:7fe02317c63d 88s - alpha 0:ff7a2f2d8d70 88s - $ echo beta-fix-again >> beta 88s - $ fn_hg_commit --amend 88s - $ hg log -T shorttags 88s - 3:3094b9e8da41 draft tip 88s - 2:61175962e488 draft default/master X 88s - 1:7fe02317c63d draft beta 88s - 0:ff7a2f2d8d70 draft alpha 88s - $ hg tags 88s - tip 3:3094b9e8da41 88s - default/master 2:61175962e488 88s - beta 1:7fe02317c63d 88s - alpha 0:ff7a2f2d8d70 88s - $ hg push 88s - pushing to $TESTTMP/repo.git 88s - searching for changes 88s - abort: pushing refs/heads/master overwrites 3094b9e8da41 88s - [255] 88s - $ hg push -f 88s - pushing to $TESTTMP/repo.git 88s - searching for changes 88s - adding objects 88s - remote: found 0 deltas to reuse 88s - added 1 commits with 1 trees and 1 blobs 88s - updating reference refs/heads/master 88s - 88s -Now create a tag for the old, obsolete master 88s - 88s - $ cd ../repo.git 88s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 88s - $ git tag 88s - alpha 88s - beta 88s - detached 88s - $ cd ../hgrepo 88s - $ hg pull 88s - pulling from $TESTTMP/repo.git 88s - no changes found 88s - $ hg log -T shorttags 88s - 3:3094b9e8da41 draft default/master tip 88s - 2:61175962e488 draft detached X 88s - 1:7fe02317c63d draft beta 88s - 0:ff7a2f2d8d70 draft alpha 88s - $ hg tags 88s - tip 3:3094b9e8da41 88s - default/master 3:3094b9e8da41 88s - detached 2:61175962e488 88s - beta 1:7fe02317c63d 88s - alpha 0:ff7a2f2d8d70 88s - $ hg push 88s - pushing to $TESTTMP/repo.git 88s - searching for changes 88s - no changes found 88s - [1] 88s - 88s - $ cd .. 88s - 88s -Verify that revsets can point out git tags; for that we need an 88s -untagged commit. 88s - 88s - $ cd hgrepo 88s - $ touch gamma 88s - $ fn_hg_commit -A -m 'add gamma' 88s -#if secret 88s - $ hg phase -d 88s -#endif 88s - $ hg log -T shorttags -r 'gittag()' 88s - 0:ff7a2f2d8d70 draft alpha 88s - 1:7fe02317c63d draft beta 88s - 2:61175962e488 draft detached X 88s - $ hg log -T shorttags -r 'gittag(detached)' 88s - 2:61175962e488 draft detached X 88s - $ hg log -T shorttags -r 'gittag("re:a$")' 88s - 0:ff7a2f2d8d70 draft alpha 88s - 1:7fe02317c63d draft beta 88s - 88s -Create a git tag from hg, but pointing to a new commit: 88s - 88s - $ hg tag --git gamma --debug -r tip 88s - invalid branch cache (visible): tip differs (?) 88s - finding unexported changesets 88s - exporting 1 changesets 88s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 88s - packing 3 loose objects... 88s - packed 3 loose objects! 88s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 88s - adding git tag gamma 88s - $ hg push 88s - pushing to $TESTTMP/repo.git 88s - searching for changes 88s - adding objects 88s - remote: found 0 deltas to reuse 88s - added 1 commits with 1 trees and 1 blobs 88s - updating reference refs/heads/master 88s - adding reference refs/tags/gamma 88s - $ cd ../gitrepo 88s - $ git fetch --quiet --tags 88s - $ git tag 88s - alpha 88s - beta 88s - detached 88s - gamma 88s - $ cd .. 88s - 88s -Try to overwrite an annotated tag: 88s - 88s - $ cd hgrepo 88s - $ hg tags -v 88s - tip 4:0eb1ab0073a8 88s - gamma 4:0eb1ab0073a8 git 88s - default/master 4:0eb1ab0073a8 git-remote 88s - detached 2:61175962e488 git 88s - beta 1:7fe02317c63d git 88s - alpha 0:ff7a2f2d8d70 git 88s - $ hg book not-master 88s - $ hg tag beta 88s - abort: tag 'beta' already exists (use -f to force) 88s - [10] 88s - $ hg tag -f beta 88s -#if secret 88s - $ hg phase -d 88s -#endif 88s - $ hg push 88s - pushing to $TESTTMP/repo.git 88s - warning: not overwriting annotated tag 'beta' 88s - searching for changes 88s - adding objects 88s - remote: found 0 deltas to reuse 88s - added 1 commits with 1 trees and 1 blobs 88s - adding reference refs/heads/not-master 88s - $ hg tags 88s - tip 5:c49682c7cba4 88s - default/not-master 5:c49682c7cba4 88s - gamma 4:0eb1ab0073a8 88s - default/master 4:0eb1ab0073a8 88s - beta 4:0eb1ab0073a8 88s - detached 2:61175962e488 88s - alpha 0:ff7a2f2d8d70 88s - $ cd .. 88s - 88s -Check whether `gimport` handles tags 88s - 88s - $ cd hgrepo 88s - $ rm .hg/git-tags .hg/git-mapfile 88s - $ hg gimport 88s - importing 6 git commits 88s - $ hg tags -q 88s - tip 88s - default/not-master 88s - gamma 88s - default/master 88s - beta 88s - detached 88s - alpha 88s - $ cd .. 88s - 88s -Test how pulling an explicit branch with an annotated tag: 88s - 88s - $ hg clone -r master repo.git hgrepo-2 88s - importing 4 git commits 88s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 88s - updating to branch default 88s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 88s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 88s - 0:ff7a2f2d8d70 draft alpha 88s - 1:7fe02317c63d draft beta 88s - 3:0eb1ab0073a8 draft default/master gamma tip 88s - $ hg tags -v -R hgrepo-2 88s - tip 3:0eb1ab0073a8 88s - gamma 3:0eb1ab0073a8 git 88s - default/master 3:0eb1ab0073a8 git-remote 88s - beta 1:7fe02317c63d git 88s - alpha 0:ff7a2f2d8d70 git 88s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 88s - $ rm -rf hgrepo-2 88s - 88s - $ hg clone -r master repo.git hgrepo-2 88s - importing 4 git commits 88s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 88s - updating to branch default 88s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 88s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 88s - 0:ff7a2f2d8d70 draft alpha 88s - 1:7fe02317c63d draft beta 88s - 3:0eb1ab0073a8 draft default/master gamma tip 88s -This used to die: 88s - $ hg -R hgrepo-2 gexport 88s -This used to fail, since we didn't actually pull the annotated tag: 88s - $ hg -R hgrepo-2 push 88s - pushing to $TESTTMP/repo.git 88s - searching for changes 88s - no changes found 88s - [1] 88s - $ rm -rf hgrepo-2 88s - 88s -Check that pulling will update phases only: 88s - 88s - $ cd hgrepo 88s - $ hg phase -fs gamma detached 88s - $ hg pull 88s - pulling from $TESTTMP/repo.git 88s - no changes found 88s - $ hg log -T shorttags -r gamma -r detached 88s - 4:0eb1ab0073a8 draft beta default/master gamma 88s - 2:61175962e488 draft detached X 88s - $ cd .. 88s - 88s -Check that we pull new tags to existing commits: 88s - $ cd gitrepo 88s - $ git tag 88s - alpha 88s - beta 88s - detached 88s - gamma 88s - $ fn_git_tag extra-simple-tag 88s - $ fn_git_tag -m annotated extra-annotated-tag 88s - $ git push --tags 88s - To $TESTTMP/repo.git 88s - * [new tag] extra-annotated-tag -> extra-annotated-tag 88s - * [new tag] extra-simple-tag -> extra-simple-tag 88s - $ cd ../hgrepo 88s - $ hg pull -r master 88s - pulling from $TESTTMP/repo.git 88s - no changes found 88s - $ hg tags -v | grep extra 88s - extra-simple-tag 1:7fe02317c63d git 88s - extra-annotated-tag 1:7fe02317c63d git 88s 88s ERROR: test-git-tags.t#secret output changed 88s ! 88s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-pull-after-rebase.t 88s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-pull-after-rebase.t.err 88s @@ -38,275 +38,9 @@ 88s Clone it and rebase the branch 88s 88s $ hg clone -U repo.git hgrepo 88s - importing 3 git commits 88s - new changesets ff7a2f2d8d70:205a004356ef (3 drafts) 88s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 88s + abort: repository repo.git not found 88s + [255] 88s $ cd hgrepo 88s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 88s $ hg state 88s - o branch default/branch tip 2:205a004356ef32b8da782afb89d9179d12ca31e9 88s - | add gamma 88s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 88s - |/ add beta 88s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 88s - add alpha 88s - $ hg up branch 88s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 88s - (activating bookmark branch) 88s - $ hg rebase --quiet -d master 88s - $ hg state 88s - @ branch tip 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 88s - | add gamma 88s - | x default/branch 2:205a004356ef32b8da782afb89d9179d12ca31e9 88s - | | add gamma 88s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 88s - |/ add beta 88s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 88s - add alpha 88s - 88s - $ hg push -fr tip 88s - pushing to $TESTTMP/repo.git 88s - searching for changes 88s - adding objects 88s - remote: found 0 deltas to reuse 88s - added 1 commits with 1 trees and 1 blobs 88s - updating reference refs/heads/branch 88s - $ cd .. 88s - 88s -Now switch back to git and create a new commit based on what we just rebased 88s - 88s - $ cd gitrepo 88s - $ git checkout --quiet -b otherbranch branch 88s - $ git log --oneline --graph --all --decorate 88s - * e5023f9 (HEAD -> otherbranch, origin/branch, branch) add gamma 88s - | * 9497a4e (origin/master, master) add beta 88s - |/ 88s - * 7eeab2e add alpha 88s - $ echo delta > delta 88s - $ git add delta 88s - $ fn_git_commit -m 'add delta' 88s - $ git push --quiet --set-upstream origin otherbranch 88s - Branch 'otherbranch' set up to track remote branch 'otherbranch' from 'origin'. (?) 88s - $ git log --oneline --graph --all --decorate 88s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 88s - * e5023f9 (origin/branch, branch) add gamma 88s - | * 9497a4e (origin/master, master) add beta 88s - |/ 88s - * 7eeab2e add alpha 88s - $ cd .. 88s - 88s -Pull that 88s - 88s - $ cd hgrepo 88s - $ hg pull 88s - pulling from $TESTTMP/repo.git 88s - importing 1 git commits 88s - adding bookmark otherbranch 88s - 1 new orphan changesets 88s - new changesets 075302705298 (1 drafts) 88s - (run 'hg heads' to see heads, 'hg merge' to merge) 88s - $ hg state 88s - * otherbranch default/otherbranch tip 4:0753027052980aef9c9c37adb7d76d5719e8d818 88s - | add delta 88s - | @ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 88s - | | add gamma 88s - x | 2:205a004356ef32b8da782afb89d9179d12ca31e9 88s - | | add gamma 88s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 88s - |/ add beta 88s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 88s - add alpha 88s - 88s - $ cd .. 88s - 88s -To reproduce bug #386, do like github and save the old commit in a 88s -ref, and create a clone containing just the converted git commits: 88s - 88s - $ cd repo.git 88s - $ git update-ref refs/pr/1 otherbranch 88s - $ cd .. 88s - $ hg clone -U repo.git hgrepo-issue386 88s - importing 5 git commits 88s - new changesets ff7a2f2d8d70:075302705298 (5 drafts) 88s - 88s -Now try rebasing that branch, from the Git side of things 88s - 88s - $ cd gitrepo 88s - $ git checkout -q otherbranch 88s - $ git log --oneline --graph --all --decorate 88s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 88s - * e5023f9 (origin/branch, branch) add gamma 88s - | * 9497a4e (origin/master, master) add beta 88s - |/ 88s - * 7eeab2e add alpha 88s - $ fn_git_rebase --onto master branch otherbranch 88s - $ git log --oneline --graph --all --decorate 88s - * 9c58139 (HEAD -> otherbranch) add delta 88s - * 9497a4e (origin/master, master) add beta 88s - | * bba0011 (origin/otherbranch) add delta 88s - | * e5023f9 (origin/branch, branch) add gamma 88s - |/ 88s - * 7eeab2e add alpha 88s - $ git push -f 88s - To $TESTTMP/repo.git 88s - + bba0011...9c58139 otherbranch -> otherbranch (forced update) 88s - $ git log --oneline --graph --all --decorate 88s - * 9c58139 (HEAD -> otherbranch, origin/otherbranch) add delta 88s - * 9497a4e (origin/master, master) add beta 88s - | * e5023f9 (origin/branch, branch) add gamma 88s - |/ 88s - * 7eeab2e add alpha 88s - $ cd .. 88s - 88s -Now strip the old commit 88s - 88s - $ cd hgrepo-issue386 88s - $ hg up null 88s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 88s - $ hg id -qr otherbranch 88s - 075302705298 88s - $ hg pull 88s - pulling from $TESTTMP/repo.git 88s - importing 1 git commits 88s - not updating diverged bookmark otherbranch 88s - new changesets d64bf0521af6 (1 drafts) 88s - (run 'hg heads .' to see heads, 'hg merge' to merge) 88s - $ hg debugstrip --hidden --no-backup otherbranch 88s - $ hg book -d otherbranch 88s - $ hg git-cleanup 88s - git commit map cleaned 88s - $ hg pull 88s - pulling from $TESTTMP/repo.git 88s - no changes found 88s - adding bookmark otherbranch 88s - $ cd .. 88s - 88s -And check that pulling something else doesn't delete that branch. 88s - 88s - $ cd hgrepo 88s - $ hg pull -r master 88s - pulling from $TESTTMP/repo.git 88s - no changes found 88s - $ cd .. 88s - 88s -A special case, is that we can pull into a repository, where a commit 88s -corresponding to the new branch exists, but that commit is obsolete. 88s -In order to avoid “pinning” the obsolete commit, and thereby making it 88s -visible, we first pull from Git as an unnamed remote. 88s - 88s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 88s - updating to branch default 88s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 88s - $ cd hgrepo-clone 88s - $ hg pull ../repo.git 88s - pulling from ../repo.git 88s - importing 4 git commits 88s - not updating diverged bookmark otherbranch 88s - new changesets d64bf0521af6 (1 drafts) 88s - (run 'hg heads .' to see heads, 'hg merge' to merge) 88s - $ hg debugobsolete d64bf0521af68fe2160791a1b4ab9baf282a3879 88s - 1 new obsolescence markers 88s - obsoleted 1 changesets 88s - $ cp ../hgrepo/.hg/hgrc .hg 88s - $ hg pull 88s - pulling from $TESTTMP/repo.git 88s - no changes found 88s - not updating diverged bookmark otherbranch 88s - $ cd .. 88s - $ rm -rf hgrepo-clone 88s - 88s -Another special case, is that we should update commits over obsolete boundaries: 88s - 88s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 88s - updating to branch default 88s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 88s - $ cd hgrepo-clone 88s - $ hg pull ../repo.git 88s - pulling from ../repo.git 88s - importing 4 git commits 88s - not updating diverged bookmark otherbranch 88s - new changesets d64bf0521af6 (1 drafts) 88s - (run 'hg heads .' to see heads, 'hg merge' to merge) 88s - $ hg debugobsolete 0753027052980aef9c9c37adb7d76d5719e8d818 d64bf0521af68fe2160791a1b4ab9baf282a3879 88s - 1 new obsolescence markers 88s - obsoleted 1 changesets 88s - $ hg book -r 075302705298 otherbranch 88s - $ cp ../hgrepo/.hg/hgrc .hg 88s - $ hg pull 88s - pulling from $TESTTMP/repo.git 88s - no changes found 88s - updating bookmark otherbranch 88s - $ cd .. 88s - $ rm -rf hgrepo-clone 88s - 88s -Now just pull it: 88s - 88s - $ cd hgrepo 88s - $ hg pull 88s - pulling from $TESTTMP/repo.git 88s - importing 1 git commits 88s - not updating diverged bookmark otherbranch 88s - new changesets d64bf0521af6 (1 drafts) 88s - (run 'hg heads .' to see heads, 'hg merge' to merge) 88s - $ hg state 88s - o default/otherbranch tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 88s - | add delta 88s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 88s - | | add delta 88s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 88s - | | add gamma 88s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 88s - | | add gamma 88s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 88s - |/ add beta 88s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 88s - add alpha 88s - $ cd .. 88s - 88s -And finally, delete it: 88s - 88s - $ cd gitrepo 88s - $ git push origin :otherbranch 88s - To $TESTTMP/repo.git 88s - - [deleted] otherbranch 88s - $ cd .. 88s - 88s -And pull that: 88s - 88s - $ cd hgrepo 88s - $ hg pull 88s - pulling from $TESTTMP/repo.git 88s - no changes found 88s - not deleting diverged bookmark otherbranch 88s - $ hg state 88s - o tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 88s - | add delta 88s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 88s - | | add delta 88s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 88s - | | add gamma 88s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 88s - | | add gamma 88s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 88s - |/ add beta 88s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 88s - add alpha 88s - $ cd .. 88s - 88s -We only get that message once: 88s - 88s - $ hg -R hgrepo pull 88s - pulling from $TESTTMP/repo.git 88s - no changes found 88s - 88s -Now try deleting one already gone locally, which shouldn't output 88s -anything: 88s - 88s - $ cd gitrepo 88s - $ git push origin :branch 88s - To $TESTTMP/repo.git 88s - - [deleted] branch 88s - $ cd ../hgrepo 88s - $ hg book -d branch 88s - $ hg pull 88s - pulling from $TESTTMP/repo.git 88s - no changes found 88s - $ cd .. 88s 88s ERROR: test-pull-after-rebase.t output changed 89s ! 89s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-push.t 89s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-push.t.err 89s @@ -12,287 +12,10 @@ 89s 89s $ cd .. 89s $ hg clone -u tip gitrepo hgrepo 89s - importing 1 git commits 89s - new changesets ff7a2f2d8d70 (1 drafts) 89s - updating to branch default 89s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 89s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 89s + abort: repository gitrepo not found 89s + [255] 89s 89s $ cd hgrepo 89s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 89s $ hg bookmark -q master 89s - $ echo beta > beta 89s - $ hg add beta 89s - $ fn_hg_commit -m 'add beta' 89s - 89s - 89s - $ echo gamma > gamma 89s - $ hg add gamma 89s - $ fn_hg_commit -m 'add gamma' 89s - 89s - $ hg book -r 1 beta 89s - $ hg push -r beta 89s - pushing to $TESTTMP/gitrepo 89s - searching for changes 89s - adding objects 89s - remote: found 0 deltas to reuse 89s - added 1 commits with 1 trees and 1 blobs 89s - adding reference refs/heads/beta 89s - 89s - $ cd .. 89s - 89s -should have two different branches 89s - $ cd gitrepo 89s - $ git branch -v 89s - beta 0f378ab add beta 89s - master 7eeab2e add alpha 89s - * not-master 7eeab2e add alpha 89s - 89s -some more work on master from git 89s - $ git checkout master 2>&1 | sed s/\'/\"/g 89s - Switched to branch "master" 89s - $ echo delta > delta 89s - $ git add delta 89s - $ fn_git_commit -m "add delta" 89s - $ git checkout not-master 2>&1 | sed s/\'/\"/g 89s - Switched to branch "not-master" 89s - 89s - $ cd .. 89s - 89s - $ cd hgrepo 89s -this should fail 89s - $ hg push -r master 89s - pushing to $TESTTMP/gitrepo 89s - searching for changes 89s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 89s - [255] 89s - 89s -... even with -f 89s - $ hg push -fr master 89s - pushing to $TESTTMP/gitrepo 89s - searching for changes 89s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 89s - [255] 89s - 89s - $ hg pull 2>&1 | grep -v 'divergent bookmark' 89s - pulling from $TESTTMP/gitrepo 89s - importing 1 git commits 89s - not updating diverged bookmark master 89s - new changesets 25eed24f5e8f (1 drafts) 89s - (run 'hg heads' to see heads, 'hg merge' to merge) 89s -TODO shouldn't need to do this since we're (in theory) pushing master explicitly, 89s -which should not implicitly also push the not-master ref. 89s - $ hg book not-master -r default/not-master --force 89s -master and default/master should be diferent 89s - $ hg log -r master 89s - changeset: 2:953796e1cfd8 89s - bookmark: master 89s - user: test 89s - date: Mon Jan 01 00:00:12 2007 +0000 89s - summary: add gamma 89s - 89s - $ hg log -r default/master 89s - changeset: 3:25eed24f5e8f 89s - tag: default/master 89s - tag: tip 89s - parent: 0:ff7a2f2d8d70 89s - user: test 89s - date: Mon Jan 01 00:00:13 2007 +0000 89s - summary: add delta 89s - 89s - 89s -this should also fail 89s - $ hg push -r master 89s - pushing to $TESTTMP/gitrepo 89s - searching for changes 89s - abort: pushing refs/heads/master overwrites 953796e1cfd8 89s - [255] 89s - 89s -... but succeed with -f 89s - $ hg push -fr master 89s - pushing to $TESTTMP/gitrepo 89s - searching for changes 89s - adding objects 89s - remote: found 0 deltas to reuse 89s - added 1 commits with 1 trees and 1 blobs 89s - updating reference refs/heads/master 89s - 89s -this should fail, no changes to push 89s - $ hg push -r master 89s - pushing to $TESTTMP/gitrepo 89s - searching for changes 89s - no changes found 89s - [1] 89s - 89s -hg-git issue103 -- directories can lose information at hg-git export time 89s - 89s - $ hg up master 89s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 89s - $ mkdir dir1 89s - $ echo alpha > dir1/alpha 89s - $ hg add dir1/alpha 89s - $ fn_hg_commit -m 'add dir1/alpha' 89s - $ hg push -r master 89s - pushing to $TESTTMP/gitrepo 89s - searching for changes 89s - adding objects 89s - remote: found 0 deltas to reuse 89s - added 1 commits with 2 trees and 0 blobs 89s - updating reference refs/heads/master 89s - 89s - $ echo beta > dir1/beta 89s - $ hg add dir1/beta 89s - $ fn_hg_commit -m 'add dir1/beta' 89s - $ hg push -r master 89s - pushing to $TESTTMP/gitrepo 89s - searching for changes 89s - adding objects 89s - remote: found 0 deltas to reuse 89s - added 1 commits with 2 trees and 0 blobs 89s - updating reference refs/heads/master 89s - $ hg log -r master 89s - changeset: 5:ba0476ff1899 89s - bookmark: master 89s - tag: default/master 89s - tag: tip 89s - user: test 89s - date: Mon Jan 01 00:00:15 2007 +0000 89s - summary: add dir1/beta 89s - 89s - 89s - $ cat >> .hg/hgrc << EOF 89s - > [paths] 89s - > default:pushurl = file:///$TESTTMP/gitrepo 89s - > EOF 89s -NB: the triple slashes are intentional, due to windows 89s - $ hg push -r master 89s - pushing to file:///$TESTTMP/gitrepo 89s - searching for changes 89s - no changes found 89s - [1] 89s - 89s - $ cd .. 89s - 89s - $ hg clone -u tip gitrepo hgrepo-test 89s - importing 5 git commits 89s - new changesets ff7a2f2d8d70:ba0476ff1899 (5 drafts) 89s - updating to branch default 89s - 5 files updated, 0 files merged, 0 files removed, 0 files unresolved 89s - $ hg -R hgrepo-test log -r master 89s - changeset: 4:ba0476ff1899 89s - bookmark: master 89s - tag: default/master 89s - tag: tip 89s - user: test 89s - date: Mon Jan 01 00:00:15 2007 +0000 89s - summary: add dir1/beta 89s - 89s - $ hg tags -R hgrepo-test | grep ^default/ 89s - default/master 4:ba0476ff1899 89s - default/beta 1:47580592d3d6 89s - default/not-master 0:ff7a2f2d8d70 89s - 89s -Push a fast-forward to a currently checked out branch, which sometimes 89s -fails: 89s - 89s - $ cd hgrepo 89s - $ hg book -r master not-master 89s - moving bookmark 'not-master' forward from ff7a2f2d8d70 89s - $ hg push 89s - pushing to file:///$TESTTMP/gitrepo 89s - searching for changes 89s - warning: failed to update HEAD; unable to set b'HEAD' to b'7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03' (?) 89s - updating reference refs/heads/not-master 89s -That should have updated the tag: 89s - $ hg tags | grep ^default/ 89s - default/not-master 5:ba0476ff1899 89s - default/master 5:ba0476ff1899 89s - default/beta 1:47580592d3d6 89s - $ cd .. 89s - 89s -We can push only one of two bookmarks on the same revision: 89s - 89s - $ cd hgrepo 89s - $ hg book -r 0 also-not-master really-not-master 89s - $ hg push -B also-not-master 89s - pushing to file:///$TESTTMP/gitrepo 89s - searching for changes 89s - adding reference refs/heads/also-not-master 89s - 89s -We can also push another bookmark to a path with another revision 89s -specified: 89s - 89s - $ hg book -r 3 also-not-master 89s - moving bookmark 'also-not-master' forward from ff7a2f2d8d70 89s - $ hg push -B also-not-master "file:///$TESTTMP/gitrepo#master" 89s - pushing to file:///$TESTTMP/gitrepo 89s - searching for changes 89s - adding objects 89s - remote: found 0 deltas to reuse 89s - added 1 commits with 1 trees and 1 blobs 89s - updating reference refs/heads/also-not-master 89s - 89s -And we can delete them again afterwards: 89s - 89s - $ hg book -d also-not-master really-not-master 89s - $ hg push -B also-not-master -B really-not-master 89s - pushing to file:///$TESTTMP/gitrepo 89s - searching for changes 89s - warning: unable to delete 'refs/heads/really-not-master' as it does not exist on the remote repository 89s - deleting reference refs/heads/also-not-master 89s - 89s -Push empty Hg repo to empty Git repo (issue #58) 89s - $ hg init hgrepo2 89s - $ git init -q --bare repo.git 89s - $ hg -R hgrepo2 push repo.git 89s - pushing to repo.git 89s - searching for changes 89s - abort: no bookmarks or tags to push to git 89s - (see "hg help bookmarks" for details on creating them) 89s - [255] 89s - 89s -The remote repo is empty and the local one doesn't have any bookmarks/tags 89s - $ cd hgrepo2 89s - $ echo init >> test.txt 89s - $ hg addremove 89s - adding test.txt 89s - $ fn_hg_commit -m init 89s - $ hg update null 89s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 89s - $ hg push ../repo.git 89s - pushing to ../repo.git 89s - searching for changes 89s - abort: no bookmarks or tags to push to git 89s - (see "hg help bookmarks" for details on creating them) 89s - [255] 89s - $ hg summary 89s - parent: -1:000000000000 (no revision checked out) 89s - branch: default 89s - commit: (clean) 89s - update: 1 new changesets (update) 89s - phases: 1 draft 89s -That should not create any bookmarks 89s - $ hg bookmarks 89s - no bookmarks set 89s -And no tags for the remotes either: 89s - $ hg tags 89s - tip 0:8aded40be5af 89s - 89s -test for ssh vulnerability 89s - 89s - $ cat >> $HGRCPATH << EOF 89s - > [ui] 89s - > ssh = ssh -o ConnectTimeout=1 89s - > EOF 89s - $ hg push -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 89s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 89s - [255] 89s - $ hg push -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 89s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 89s - [255] 89s - $ hg push -q 'git+ssh://fakehost|rm%20nonexistent/path' 89s - ssh: * fakehost%7?rm%20nonexistent* (glob) 89s - abort: git remote error: The remote server unexpectedly closed the connection. 89s - [255] 89s - $ hg push -q 'git+ssh://fakehost%7Crm%20nonexistent/path' 89s - ssh: * fakehost%7?rm%20nonexistent* (glob) 89s - abort: git remote error: The remote server unexpectedly closed the connection. 89s - [255] 89s 89s ERROR: test-push.t output changed 95s ! 95s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-clone.t 95s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-clone.t#draft.err 95s @@ -38,60 +38,42 @@ 95s clone a tag 95s 95s $ hg clone -r alpha gitrepo hgrepo-a 95s - importing 1 git commits 95s - new changesets ff7a2f2d8d70 (1 drafts) 95s - updating to branch default 95s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository gitrepo not found 95s + [255] 95s $ hg -R hgrepo-a bookmarks 95s - master 0:ff7a2f2d8d70 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository hgrepo-a not found 95s + [255] 95s $ hg -R hgrepo-a log --graph --template=phases 95s - @ changeset: 0:ff7a2f2d8d70 95s - bookmark: master 95s - tag: alpha 95s - tag: default/master 95s - tag: tip 95s - phase: draft 95s - user: test 95s - date: Mon Jan 01 00:00:10 2007 +0000 95s - summary: add alpha 95s - 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository hgrepo-a not found 95s + [255] 95s $ git --git-dir hgrepo-a/.hg/git for-each-ref 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 95s + fatal: not a git repository: 'hgrepo-a/.hg/git' 95s + [128] 95s Make sure this is still draft since we didn't pull remote's HEAD 95s $ hg -R hgrepo-a phase -r alpha 95s - 0: draft 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository hgrepo-a not found 95s + [255] 95s 95s clone a branch 95s $ hg clone -r beta gitrepo hgrepo-b 95s - importing 2 git commits 95s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 95s - updating to branch default 95s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository gitrepo not found 95s + [255] 95s $ hg -R hgrepo-b bookmarks 95s - * beta 1:7fe02317c63d 95s - master 0:ff7a2f2d8d70 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository hgrepo-b not found 95s + [255] 95s $ hg -R hgrepo-b log --graph 95s - @ changeset: 1:7fe02317c63d 95s - | bookmark: beta 95s - | tag: default/beta 95s - | tag: tip 95s - | user: test 95s - | date: Mon Jan 01 00:00:11 2007 +0000 95s - | summary: add beta 95s - | 95s - o changeset: 0:ff7a2f2d8d70 95s - bookmark: master 95s - tag: alpha 95s - tag: default/master 95s - user: test 95s - date: Mon Jan 01 00:00:10 2007 +0000 95s - summary: add alpha 95s - 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository hgrepo-b not found 95s + [255] 95s $ git --git-dir hgrepo-b/.hg/git for-each-ref 95s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 95s + fatal: not a git repository: 'hgrepo-b/.hg/git' 95s + [128] 95s 95s Make sure that a deleted .hgsubstate does not confuse hg-git 95s 95s @@ -104,48 +86,50 @@ 95s $ cd .. 95s 95s $ hg clone -r beta gitrepo hgrepo-c 95s - importing 4 git commits 95s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 95s - updating to branch default 95s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository gitrepo not found 95s + [255] 95s $ hg -R hgrepo-c bookmarks 95s - * beta 3:47d12948785d 95s - master 0:ff7a2f2d8d70 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository hgrepo-c not found 95s + [255] 95s $ hg --cwd hgrepo-c status 95s + abort: No such file or directory: 'hgrepo-c' 95s + [255] 95s $ git --git-dir hgrepo-c/.hg/git for-each-ref 95s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 95s + fatal: not a git repository: 'hgrepo-c/.hg/git' 95s + [128] 95s 95s test shared repositories 95s 95s $ hg clone gitrepo hgrepo-base 95s - importing 5 git commits 95s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 95s - updating to bookmark beta 95s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository gitrepo not found 95s + [255] 95s $ hg -R hgrepo-base bookmarks 95s - * beta 4:47d12948785d 95s - gamma 2:ca33a262eb46 95s - master 0:ff7a2f2d8d70 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository hgrepo-base not found 95s + [255] 95s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 95s - updating working directory 95s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository hgrepo-base not found 95s + [255] 95s $ hg -R hgrepo-shared pull gitrepo 95s - pulling from gitrepo 95s - no changes found 95s - adding bookmark beta 95s - adding bookmark gamma 95s - adding bookmark master 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository hgrepo-shared not found 95s + [255] 95s $ hg -R hgrepo-shared push gitrepo 95s - pushing to gitrepo 95s - searching for changes 95s - no changes found 95s - [1] 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository hgrepo-shared not found 95s + [255] 95s $ ls hgrepo-shared/.hg | grep git 95s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 95s [1] 95s $ hg -R hgrepo-shared git-cleanup 95s - git commit map cleaned 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + hg: unknown command 'git-cleanup' 95s + (did you mean clean?) 95s + [10] 95s $ rm -rf hgrepo-base hgrepo-shared 95s 95s test cloning HEAD 95s @@ -154,23 +138,21 @@ 95s $ git checkout -q master 95s $ cd .. 95s $ hg clone gitrepo hgrepo-2 95s - importing 5 git commits 95s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 95s - updating to bookmark master 95s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository gitrepo not found 95s + [255] 95s $ git --git-dir hgrepo-2/.hg/git for-each-ref 95s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 95s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 95s + fatal: not a git repository: 'hgrepo-2/.hg/git' 95s + [128] 95s $ rm -rf hgrepo-2 95s 95s clone empty repo 95s $ git init empty 95s Initialized empty Git repository in $TESTTMP/empty/.git/ 95s $ hg clone empty emptyhg 95s - updating to branch default 95s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository empty not found 95s + [255] 95s $ rm -rf empty emptyhg 95s 95s test cloning detached HEAD, but pointing to a branch; we detect this 95s @@ -180,25 +162,20 @@ 95s $ git checkout -q -d master 95s $ cd .. 95s $ hg clone gitrepo hgrepo-2 95s - importing 5 git commits 95s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 95s - updating to bookmark master 95s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository gitrepo not found 95s + [255] 95s $ hg -R hgrepo-2 book 95s - beta 4:47d12948785d 95s - gamma 2:ca33a262eb46 95s - * master 0:ff7a2f2d8d70 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository hgrepo-2 not found 95s + [255] 95s $ hg -R hgrepo-2 tags -v 95s - tip 4:47d12948785d 95s - default/beta 4:47d12948785d git-remote 95s - default/gamma 2:ca33a262eb46 git-remote 95s - default/master 0:ff7a2f2d8d70 git-remote 95s - alpha 0:ff7a2f2d8d70 git 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository hgrepo-2 not found 95s + [255] 95s $ git --git-dir hgrepo-2/.hg/git for-each-ref 95s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 95s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 95s + fatal: not a git repository: 'hgrepo-2/.hg/git' 95s + [128] 95s $ rm -rf hgrepo-2 95s 95s test cloning fully detached HEAD; we don't convert the 95s @@ -212,44 +189,45 @@ 95s $ fn_git_commit -m 'add delta' 95s $ cd .. 95s $ hg clone gitrepo hgrepo-2 95s - importing 5 git commits 95s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 95s - warning: the git source repository has a detached head 95s - (you may want to update to a bookmark) 95s - updating to branch default 95s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository gitrepo not found 95s + [255] 95s $ hg -R hgrepo-2 book 95s - beta 4:47d12948785d 95s - gamma 2:ca33a262eb46 95s - master 0:ff7a2f2d8d70 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository hgrepo-2 not found 95s + [255] 95s $ hg -R hgrepo-2 id --tags 95s - default/beta tip 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository hgrepo-2 not found 95s + [255] 95s $ git --git-dir hgrepo-2/.hg/git for-each-ref 95s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 95s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 95s + fatal: not a git repository: 'hgrepo-2/.hg/git' 95s + [128] 95s $ rm -rf hgrepo-2 95s 95s test that cloning a regular mercurial repository does not introduce 95s git state 95s 95s $ hg init hgrepo-base 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s $ cd hgrepo-base 95s $ touch flaf 95s $ fn_hg_commit -A -m flaf 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s $ cd .. 95s $ hg clone -U hgrepo-base hgrepo-copy 95s requesting all changes (secret !) 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s $ ls hgrepo-copy/.hg | grep git 95s [1] 95s $ hg clone -U --pull hgrepo-base hgrepo-pull 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s requesting all changes 95s - adding changesets (draft !) 95s - adding manifests (draft !) 95s - adding file changes (draft !) 95s - added 1 changesets with 1 changes to 1 files (draft !) 95s - new changesets 76c919376257 (draft !) 95s + adding changesets 95s + adding manifests 95s + adding file changes 95s + added 1 changesets with 1 changes to 1 files 95s + new changesets 76c919376257 95s $ ls hgrepo-pull | grep git 95s [1] 95s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 95s 95s ERROR: test-clone.t#draft output changed 96s ! 96s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-clone.t 96s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-clone.t#secret.err 96s @@ -38,60 +38,42 @@ 96s clone a tag 96s 96s $ hg clone -r alpha gitrepo hgrepo-a 96s - importing 1 git commits 96s - new changesets ff7a2f2d8d70 (1 drafts) 96s - updating to branch default 96s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository gitrepo not found 96s + [255] 96s $ hg -R hgrepo-a bookmarks 96s - master 0:ff7a2f2d8d70 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository hgrepo-a not found 96s + [255] 96s $ hg -R hgrepo-a log --graph --template=phases 96s - @ changeset: 0:ff7a2f2d8d70 96s - bookmark: master 96s - tag: alpha 96s - tag: default/master 96s - tag: tip 96s - phase: draft 96s - user: test 96s - date: Mon Jan 01 00:00:10 2007 +0000 96s - summary: add alpha 96s - 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository hgrepo-a not found 96s + [255] 96s $ git --git-dir hgrepo-a/.hg/git for-each-ref 96s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 96s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 96s + fatal: not a git repository: 'hgrepo-a/.hg/git' 96s + [128] 96s Make sure this is still draft since we didn't pull remote's HEAD 96s $ hg -R hgrepo-a phase -r alpha 96s - 0: draft 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository hgrepo-a not found 96s + [255] 96s 96s clone a branch 96s $ hg clone -r beta gitrepo hgrepo-b 96s - importing 2 git commits 96s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 96s - updating to branch default 96s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository gitrepo not found 96s + [255] 96s $ hg -R hgrepo-b bookmarks 96s - * beta 1:7fe02317c63d 96s - master 0:ff7a2f2d8d70 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository hgrepo-b not found 96s + [255] 96s $ hg -R hgrepo-b log --graph 96s - @ changeset: 1:7fe02317c63d 96s - | bookmark: beta 96s - | tag: default/beta 96s - | tag: tip 96s - | user: test 96s - | date: Mon Jan 01 00:00:11 2007 +0000 96s - | summary: add beta 96s - | 96s - o changeset: 0:ff7a2f2d8d70 96s - bookmark: master 96s - tag: alpha 96s - tag: default/master 96s - user: test 96s - date: Mon Jan 01 00:00:10 2007 +0000 96s - summary: add alpha 96s - 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository hgrepo-b not found 96s + [255] 96s $ git --git-dir hgrepo-b/.hg/git for-each-ref 96s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 96s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 96s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 96s + fatal: not a git repository: 'hgrepo-b/.hg/git' 96s + [128] 96s 96s Make sure that a deleted .hgsubstate does not confuse hg-git 96s 96s @@ -104,48 +86,50 @@ 96s $ cd .. 96s 96s $ hg clone -r beta gitrepo hgrepo-c 96s - importing 4 git commits 96s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 96s - updating to branch default 96s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository gitrepo not found 96s + [255] 96s $ hg -R hgrepo-c bookmarks 96s - * beta 3:47d12948785d 96s - master 0:ff7a2f2d8d70 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository hgrepo-c not found 96s + [255] 96s $ hg --cwd hgrepo-c status 96s + abort: No such file or directory: 'hgrepo-c' 96s + [255] 96s $ git --git-dir hgrepo-c/.hg/git for-each-ref 96s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 96s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 96s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 96s + fatal: not a git repository: 'hgrepo-c/.hg/git' 96s + [128] 96s 96s test shared repositories 96s 96s $ hg clone gitrepo hgrepo-base 96s - importing 5 git commits 96s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 96s - updating to bookmark beta 96s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository gitrepo not found 96s + [255] 96s $ hg -R hgrepo-base bookmarks 96s - * beta 4:47d12948785d 96s - gamma 2:ca33a262eb46 96s - master 0:ff7a2f2d8d70 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository hgrepo-base not found 96s + [255] 96s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 96s - updating working directory 96s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository hgrepo-base not found 96s + [255] 96s $ hg -R hgrepo-shared pull gitrepo 96s - pulling from gitrepo 96s - no changes found 96s - adding bookmark beta 96s - adding bookmark gamma 96s - adding bookmark master 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository hgrepo-shared not found 96s + [255] 96s $ hg -R hgrepo-shared push gitrepo 96s - pushing to gitrepo 96s - searching for changes 96s - no changes found 96s - [1] 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository hgrepo-shared not found 96s + [255] 96s $ ls hgrepo-shared/.hg | grep git 96s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 96s [1] 96s $ hg -R hgrepo-shared git-cleanup 96s - git commit map cleaned 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + hg: unknown command 'git-cleanup' 96s + (did you mean clean?) 96s + [10] 96s $ rm -rf hgrepo-base hgrepo-shared 96s 96s test cloning HEAD 96s @@ -154,23 +138,21 @@ 96s $ git checkout -q master 96s $ cd .. 96s $ hg clone gitrepo hgrepo-2 96s - importing 5 git commits 96s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 96s - updating to bookmark master 96s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository gitrepo not found 96s + [255] 96s $ git --git-dir hgrepo-2/.hg/git for-each-ref 96s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 96s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 96s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 96s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 96s + fatal: not a git repository: 'hgrepo-2/.hg/git' 96s + [128] 96s $ rm -rf hgrepo-2 96s 96s clone empty repo 96s $ git init empty 96s Initialized empty Git repository in $TESTTMP/empty/.git/ 96s $ hg clone empty emptyhg 96s - updating to branch default 96s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository empty not found 96s + [255] 96s $ rm -rf empty emptyhg 96s 96s test cloning detached HEAD, but pointing to a branch; we detect this 96s @@ -180,25 +162,20 @@ 96s $ git checkout -q -d master 96s $ cd .. 96s $ hg clone gitrepo hgrepo-2 96s - importing 5 git commits 96s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 96s - updating to bookmark master 96s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository gitrepo not found 96s + [255] 96s $ hg -R hgrepo-2 book 96s - beta 4:47d12948785d 96s - gamma 2:ca33a262eb46 96s - * master 0:ff7a2f2d8d70 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository hgrepo-2 not found 96s + [255] 96s $ hg -R hgrepo-2 tags -v 96s - tip 4:47d12948785d 96s - default/beta 4:47d12948785d git-remote 96s - default/gamma 2:ca33a262eb46 git-remote 96s - default/master 0:ff7a2f2d8d70 git-remote 96s - alpha 0:ff7a2f2d8d70 git 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository hgrepo-2 not found 96s + [255] 96s $ git --git-dir hgrepo-2/.hg/git for-each-ref 96s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 96s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 96s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 96s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 96s + fatal: not a git repository: 'hgrepo-2/.hg/git' 96s + [128] 96s $ rm -rf hgrepo-2 96s 96s test cloning fully detached HEAD; we don't convert the 96s @@ -212,44 +189,45 @@ 96s $ fn_git_commit -m 'add delta' 96s $ cd .. 96s $ hg clone gitrepo hgrepo-2 96s - importing 5 git commits 96s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 96s - warning: the git source repository has a detached head 96s - (you may want to update to a bookmark) 96s - updating to branch default 96s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository gitrepo not found 96s + [255] 96s $ hg -R hgrepo-2 book 96s - beta 4:47d12948785d 96s - gamma 2:ca33a262eb46 96s - master 0:ff7a2f2d8d70 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository hgrepo-2 not found 96s + [255] 96s $ hg -R hgrepo-2 id --tags 96s - default/beta tip 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository hgrepo-2 not found 96s + [255] 96s $ git --git-dir hgrepo-2/.hg/git for-each-ref 96s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 96s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 96s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 96s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 96s + fatal: not a git repository: 'hgrepo-2/.hg/git' 96s + [128] 96s $ rm -rf hgrepo-2 96s 96s test that cloning a regular mercurial repository does not introduce 96s git state 96s 96s $ hg init hgrepo-base 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s $ cd hgrepo-base 96s $ touch flaf 96s $ fn_hg_commit -A -m flaf 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s $ cd .. 96s $ hg clone -U hgrepo-base hgrepo-copy 96s - requesting all changes (secret !) 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + requesting all changes 96s $ ls hgrepo-copy/.hg | grep git 96s [1] 96s $ hg clone -U --pull hgrepo-base hgrepo-pull 96s - requesting all changes 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s adding changesets (draft !) 96s adding manifests (draft !) 96s adding file changes (draft !) 96s added 1 changesets with 1 changes to 1 files (draft !) 96s new changesets 76c919376257 (draft !) 96s + requesting all changes 96s $ ls hgrepo-pull | grep git 96s [1] 96s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 96s 96s ERROR: test-clone.t#secret output changed 96s ! 96s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-branch-bookmark-suffix.t 96s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-branch-bookmark-suffix.t#with-path.err 96s @@ -9,287 +9,12 @@ 96s $ git init -q --bare repo.git 96s 96s $ hg clone repo.git hgrepo 96s - updating to branch default 96s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository repo.git not found 96s + [255] 96s $ cd hgrepo 96s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 96s #if without-path 96s $ rm .hg/hgrc 96s #endif 96s $ hg branch -q branch1 96s - $ hg bookmark branch1_bookmark 96s - $ echo f1 > f1 96s - $ hg add f1 96s - $ fn_hg_commit -m "add f1" 96s - $ hg branch -q branch2 96s - $ hg bookmark branch2_bookmark 96s - $ echo f2 > f2 96s - $ hg add f2 96s - $ fn_hg_commit -m "add f2" 96s - $ hg log --graph 96s - @ changeset: 1:600de9b6d498 96s - | branch: branch2 96s - | bookmark: branch2_bookmark 96s - | tag: tip 96s - | user: test 96s - | date: Mon Jan 01 00:00:11 2007 +0000 96s - | summary: add f2 96s - | 96s - o changeset: 0:40a840c1f8ae 96s - branch: branch1 96s - bookmark: branch1_bookmark 96s - user: test 96s - date: Mon Jan 01 00:00:10 2007 +0000 96s - summary: add f1 96s - 96s - 96s - $ hg push -B asdasd ../repo.git 96s - pushing to ../repo.git 96s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 96s - [255] 96s - 96s - $ hg push ../repo.git 96s - pushing to ../repo.git 96s - searching for changes 96s - adding objects 96s - remote: found 0 deltas to reuse 96s - added 2 commits with 2 trees and 2 blobs 96s - adding reference refs/heads/branch1 96s - adding reference refs/heads/branch2 96s - 96s - $ cd .. 96s - 96s - $ cd repo.git 96s - $ git symbolic-ref HEAD refs/heads/branch1 96s - $ git branch 96s - * branch1 96s - branch2 96s - $ cd .. 96s - 96s - $ git clone repo.git gitrepo 96s - Cloning into 'gitrepo'... 96s - done. 96s - $ cd gitrepo 96s - $ git checkout -q branch1 96s - $ echo g1 >> f1 96s - $ git add f1 96s - $ fn_git_commit -m "append f1" 96s - $ git checkout -q branch2 96s - $ echo g2 >> f2 96s - $ git add f2 96s - $ fn_git_commit -m "append f2" 96s - $ git checkout -b branch3 96s - Switched to a new branch 'branch3' 96s - $ echo g3 >> f3 96s - $ git add f3 96s - $ fn_git_commit -m "append f3" 96s - $ git push origin branch1 branch2 branch3 96s - To $TESTTMP/repo.git 96s - bbfe79a..d8aef79 branch1 -> branch1 96s - 288e92b..f8f8de5 branch2 -> branch2 96s - * [new branch] branch3 -> branch3 96s -make sure the commit doesn't have an HG:rename-source annotation 96s - $ git cat-file commit d8aef79 96s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 96s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 96s - author test 1167609612 +0000 96s - committer test 1167609612 +0000 96s - 96s - append f1 96s - $ cd .. 96s - 96s - $ cd hgrepo 96s - $ hg paths 96s - default = $TESTTMP/repo.git (with-path !) 96s - $ hg pull ../repo.git 96s - pulling from ../repo.git 96s - importing 3 git commits 96s - updating bookmark branch1_bookmark 96s - updating bookmark branch2_bookmark 96s - adding bookmark branch3_bookmark 96s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 96s - (run 'hg heads' to see heads) 96s - $ hg log --graph 96s - o changeset: 4:faf44fc3a4e8 96s - | bookmark: branch3_bookmark 96s - | tag: default/branch3 (with-path !) 96s - | tag: tip 96s - | user: test 96s - | date: Mon Jan 01 00:00:14 2007 +0000 96s - | summary: append f3 96s - | 96s - o changeset: 3:ae8eb55f7090 96s - | bookmark: branch2_bookmark 96s - | tag: default/branch2 (with-path !) 96s - | parent: 1:600de9b6d498 96s - | user: test 96s - | date: Mon Jan 01 00:00:13 2007 +0000 96s - | summary: append f2 96s - | 96s - | o changeset: 2:8211cade99e4 96s - | | bookmark: branch1_bookmark 96s - | | tag: default/branch1 (with-path !) 96s - | | parent: 0:40a840c1f8ae 96s - | | user: test 96s - | | date: Mon Jan 01 00:00:12 2007 +0000 96s - | | summary: append f1 96s - | | 96s - @ | changeset: 1:600de9b6d498 96s - |/ branch: branch2 96s - | user: test 96s - | date: Mon Jan 01 00:00:11 2007 +0000 96s - | summary: add f2 96s - | 96s - o changeset: 0:40a840c1f8ae 96s - branch: branch1 96s - user: test 96s - date: Mon Jan 01 00:00:10 2007 +0000 96s - summary: add f1 96s - 96s - $ cd .. 96s - 96s -Try cloning a bookmark, and make sure it gets checked out: 96s - 96s - $ rm -r hgrepo 96s - $ hg clone -r branch3 repo.git hgrepo 96s - importing 4 git commits 96s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 96s - updating to bookmark branch3_bookmark 96s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s - $ cd hgrepo 96s - $ hg bookmarks 96s - branch2_bookmark 2:ae8eb55f7090 96s - * branch3_bookmark 3:faf44fc3a4e8 96s - $ hg log --graph 96s - @ changeset: 3:faf44fc3a4e8 96s - | bookmark: branch3_bookmark 96s - | tag: default/branch3 96s - | tag: tip 96s - | user: test 96s - | date: Mon Jan 01 00:00:14 2007 +0000 96s - | summary: append f3 96s - | 96s - o changeset: 2:ae8eb55f7090 96s - | bookmark: branch2_bookmark 96s - | tag: default/branch2 96s - | user: test 96s - | date: Mon Jan 01 00:00:13 2007 +0000 96s - | summary: append f2 96s - | 96s - o changeset: 1:600de9b6d498 96s - | branch: branch2 96s - | user: test 96s - | date: Mon Jan 01 00:00:11 2007 +0000 96s - | summary: add f2 96s - | 96s - o changeset: 0:40a840c1f8ae 96s - branch: branch1 96s - user: test 96s - date: Mon Jan 01 00:00:10 2007 +0000 96s - summary: add f1 96s - 96s - $ cd .. 96s - 96s -Try cloning something that's both a bookmark and a branch, and see the 96s -results. They're a bit suprising as the bookmark does get activated, 96s -but the branch get checked out. Although this does seem a bit odd, so 96s -does the scenario. 96s - 96s - $ rm -r hgrepo 96s - $ hg clone -r branch1 repo.git hgrepo 96s - importing 2 git commits 96s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 96s - updating to branch branch1 96s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s - $ cd hgrepo 96s - $ hg bookmarks 96s - * branch1_bookmark 1:8211cade99e4 96s - $ hg log --graph 96s - o changeset: 1:8211cade99e4 96s - | bookmark: branch1_bookmark 96s - | tag: default/branch1 96s - | tag: tip 96s - | user: test 96s - | date: Mon Jan 01 00:00:12 2007 +0000 96s - | summary: append f1 96s - | 96s - @ changeset: 0:40a840c1f8ae 96s - branch: branch1 96s - user: test 96s - date: Mon Jan 01 00:00:10 2007 +0000 96s - summary: add f1 96s - 96s - 96s - $ cd .. 96s - 96s -Now try pulling a diverged bookmark: 96s - 96s - $ rm -r hgrepo 96s -#if with-path 96s - $ hg clone -U repo.git hgrepo 96s - importing 5 git commits 96s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 96s -#else 96s - $ hg init hgrepo 96s - $ hg -R hgrepo pull repo.git 96s - pulling from repo.git 96s - importing 5 git commits 96s - adding bookmark branch1_bookmark 96s - adding bookmark branch2_bookmark 96s - adding bookmark branch3_bookmark 96s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 96s - (run 'hg heads' to see heads, 'hg merge' to merge) 96s -#endif 96s - $ cd gitrepo 96s - $ git checkout -q branch1 96s - $ fn_git_rebase branch3 96s - $ git push -f 96s - To $TESTTMP/repo.git 96s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 96s - $ cd ../hgrepo 96s - $ hg pull ../repo.git 96s - pulling from ../repo.git 96s - importing 1 git commits 96s - not updating diverged bookmark branch1_bookmark 96s - new changesets 895d0307f8b7 (1 drafts) 96s - (run 'hg update' to get a working copy) 96s - $ hg log --graph 96s - o changeset: 5:895d0307f8b7 96s - | tag: default/branch1 (with-path !) 96s - | tag: tip 96s - | user: test 96s - | date: Mon Jan 01 00:00:12 2007 +0000 96s - | summary: append f1 96s - | 96s - o changeset: 4:faf44fc3a4e8 96s - | bookmark: branch3_bookmark 96s - | tag: default/branch3 (with-path !) 96s - | user: test 96s - | date: Mon Jan 01 00:00:14 2007 +0000 96s - | summary: append f3 96s - | 96s - o changeset: 3:ae8eb55f7090 96s - | bookmark: branch2_bookmark 96s - | tag: default/branch2 (with-path !) 96s - | user: test 96s - | date: Mon Jan 01 00:00:13 2007 +0000 96s - | summary: append f2 96s - | 96s - o changeset: 2:600de9b6d498 96s - | branch: branch2 96s - | parent: 0:40a840c1f8ae 96s - | user: test 96s - | date: Mon Jan 01 00:00:11 2007 +0000 96s - | summary: add f2 96s - | 96s - | o changeset: 1:8211cade99e4 96s - |/ bookmark: branch1_bookmark 96s - | user: test 96s - | date: Mon Jan 01 00:00:12 2007 +0000 96s - | summary: append f1 96s - | 96s - o changeset: 0:40a840c1f8ae 96s - branch: branch1 96s - user: test 96s - date: Mon Jan 01 00:00:10 2007 +0000 96s - summary: add f1 96s - 96s 96s ERROR: test-branch-bookmark-suffix.t#with-path output changed 97s ! 97s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-branch-bookmark-suffix.t 97s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-branch-bookmark-suffix.t#without-path.err 97s @@ -9,287 +9,10 @@ 97s $ git init -q --bare repo.git 97s 97s $ hg clone repo.git hgrepo 97s - updating to branch default 97s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 97s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 97s + abort: repository repo.git not found 97s + [255] 97s $ cd hgrepo 97s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 97s #if without-path 97s $ rm .hg/hgrc 97s -#endif 97s - $ hg branch -q branch1 97s - $ hg bookmark branch1_bookmark 97s - $ echo f1 > f1 97s - $ hg add f1 97s - $ fn_hg_commit -m "add f1" 97s - $ hg branch -q branch2 97s - $ hg bookmark branch2_bookmark 97s - $ echo f2 > f2 97s - $ hg add f2 97s - $ fn_hg_commit -m "add f2" 97s - $ hg log --graph 97s - @ changeset: 1:600de9b6d498 97s - | branch: branch2 97s - | bookmark: branch2_bookmark 97s - | tag: tip 97s - | user: test 97s - | date: Mon Jan 01 00:00:11 2007 +0000 97s - | summary: add f2 97s - | 97s - o changeset: 0:40a840c1f8ae 97s - branch: branch1 97s - bookmark: branch1_bookmark 97s - user: test 97s - date: Mon Jan 01 00:00:10 2007 +0000 97s - summary: add f1 97s - 97s - 97s - $ hg push -B asdasd ../repo.git 97s - pushing to ../repo.git 97s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 97s - [255] 97s - 97s - $ hg push ../repo.git 97s - pushing to ../repo.git 97s - searching for changes 97s - adding objects 97s - remote: found 0 deltas to reuse 97s - added 2 commits with 2 trees and 2 blobs 97s - adding reference refs/heads/branch1 97s - adding reference refs/heads/branch2 97s - 97s - $ cd .. 97s - 97s - $ cd repo.git 97s - $ git symbolic-ref HEAD refs/heads/branch1 97s - $ git branch 97s - * branch1 97s - branch2 97s - $ cd .. 97s - 97s - $ git clone repo.git gitrepo 97s - Cloning into 'gitrepo'... 97s - done. 97s - $ cd gitrepo 97s - $ git checkout -q branch1 97s - $ echo g1 >> f1 97s - $ git add f1 97s - $ fn_git_commit -m "append f1" 97s - $ git checkout -q branch2 97s - $ echo g2 >> f2 97s - $ git add f2 97s - $ fn_git_commit -m "append f2" 97s - $ git checkout -b branch3 97s - Switched to a new branch 'branch3' 97s - $ echo g3 >> f3 97s - $ git add f3 97s - $ fn_git_commit -m "append f3" 97s - $ git push origin branch1 branch2 branch3 97s - To $TESTTMP/repo.git 97s - bbfe79a..d8aef79 branch1 -> branch1 97s - 288e92b..f8f8de5 branch2 -> branch2 97s - * [new branch] branch3 -> branch3 97s -make sure the commit doesn't have an HG:rename-source annotation 97s - $ git cat-file commit d8aef79 97s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 97s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 97s - author test 1167609612 +0000 97s - committer test 1167609612 +0000 97s - 97s - append f1 97s - $ cd .. 97s - 97s - $ cd hgrepo 97s - $ hg paths 97s - default = $TESTTMP/repo.git (with-path !) 97s - $ hg pull ../repo.git 97s - pulling from ../repo.git 97s - importing 3 git commits 97s - updating bookmark branch1_bookmark 97s - updating bookmark branch2_bookmark 97s - adding bookmark branch3_bookmark 97s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 97s - (run 'hg heads' to see heads) 97s - $ hg log --graph 97s - o changeset: 4:faf44fc3a4e8 97s - | bookmark: branch3_bookmark 97s - | tag: default/branch3 (with-path !) 97s - | tag: tip 97s - | user: test 97s - | date: Mon Jan 01 00:00:14 2007 +0000 97s - | summary: append f3 97s - | 97s - o changeset: 3:ae8eb55f7090 97s - | bookmark: branch2_bookmark 97s - | tag: default/branch2 (with-path !) 97s - | parent: 1:600de9b6d498 97s - | user: test 97s - | date: Mon Jan 01 00:00:13 2007 +0000 97s - | summary: append f2 97s - | 97s - | o changeset: 2:8211cade99e4 97s - | | bookmark: branch1_bookmark 97s - | | tag: default/branch1 (with-path !) 97s - | | parent: 0:40a840c1f8ae 97s - | | user: test 97s - | | date: Mon Jan 01 00:00:12 2007 +0000 97s - | | summary: append f1 97s - | | 97s - @ | changeset: 1:600de9b6d498 97s - |/ branch: branch2 97s - | user: test 97s - | date: Mon Jan 01 00:00:11 2007 +0000 97s - | summary: add f2 97s - | 97s - o changeset: 0:40a840c1f8ae 97s - branch: branch1 97s - user: test 97s - date: Mon Jan 01 00:00:10 2007 +0000 97s - summary: add f1 97s - 97s - $ cd .. 97s - 97s -Try cloning a bookmark, and make sure it gets checked out: 97s - 97s - $ rm -r hgrepo 97s - $ hg clone -r branch3 repo.git hgrepo 97s - importing 4 git commits 97s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 97s - updating to bookmark branch3_bookmark 97s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 97s - $ cd hgrepo 97s - $ hg bookmarks 97s - branch2_bookmark 2:ae8eb55f7090 97s - * branch3_bookmark 3:faf44fc3a4e8 97s - $ hg log --graph 97s - @ changeset: 3:faf44fc3a4e8 97s - | bookmark: branch3_bookmark 97s - | tag: default/branch3 97s - | tag: tip 97s - | user: test 97s - | date: Mon Jan 01 00:00:14 2007 +0000 97s - | summary: append f3 97s - | 97s - o changeset: 2:ae8eb55f7090 97s - | bookmark: branch2_bookmark 97s - | tag: default/branch2 97s - | user: test 97s - | date: Mon Jan 01 00:00:13 2007 +0000 97s - | summary: append f2 97s - | 97s - o changeset: 1:600de9b6d498 97s - | branch: branch2 97s - | user: test 97s - | date: Mon Jan 01 00:00:11 2007 +0000 97s - | summary: add f2 97s - | 97s - o changeset: 0:40a840c1f8ae 97s - branch: branch1 97s - user: test 97s - date: Mon Jan 01 00:00:10 2007 +0000 97s - summary: add f1 97s - 97s - $ cd .. 97s - 97s -Try cloning something that's both a bookmark and a branch, and see the 97s -results. They're a bit suprising as the bookmark does get activated, 97s -but the branch get checked out. Although this does seem a bit odd, so 97s -does the scenario. 97s - 97s - $ rm -r hgrepo 97s - $ hg clone -r branch1 repo.git hgrepo 97s - importing 2 git commits 97s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 97s - updating to branch branch1 97s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 97s - $ cd hgrepo 97s - $ hg bookmarks 97s - * branch1_bookmark 1:8211cade99e4 97s - $ hg log --graph 97s - o changeset: 1:8211cade99e4 97s - | bookmark: branch1_bookmark 97s - | tag: default/branch1 97s - | tag: tip 97s - | user: test 97s - | date: Mon Jan 01 00:00:12 2007 +0000 97s - | summary: append f1 97s - | 97s - @ changeset: 0:40a840c1f8ae 97s - branch: branch1 97s - user: test 97s - date: Mon Jan 01 00:00:10 2007 +0000 97s - summary: add f1 97s - 97s - 97s - $ cd .. 97s - 97s -Now try pulling a diverged bookmark: 97s - 97s - $ rm -r hgrepo 97s -#if with-path 97s - $ hg clone -U repo.git hgrepo 97s - importing 5 git commits 97s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 97s -#else 97s - $ hg init hgrepo 97s - $ hg -R hgrepo pull repo.git 97s - pulling from repo.git 97s - importing 5 git commits 97s - adding bookmark branch1_bookmark 97s - adding bookmark branch2_bookmark 97s - adding bookmark branch3_bookmark 97s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 97s - (run 'hg heads' to see heads, 'hg merge' to merge) 97s -#endif 97s - $ cd gitrepo 97s - $ git checkout -q branch1 97s - $ fn_git_rebase branch3 97s - $ git push -f 97s - To $TESTTMP/repo.git 97s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 97s - $ cd ../hgrepo 97s - $ hg pull ../repo.git 97s - pulling from ../repo.git 97s - importing 1 git commits 97s - not updating diverged bookmark branch1_bookmark 97s - new changesets 895d0307f8b7 (1 drafts) 97s - (run 'hg update' to get a working copy) 97s - $ hg log --graph 97s - o changeset: 5:895d0307f8b7 97s - | tag: default/branch1 (with-path !) 97s - | tag: tip 97s - | user: test 97s - | date: Mon Jan 01 00:00:12 2007 +0000 97s - | summary: append f1 97s - | 97s - o changeset: 4:faf44fc3a4e8 97s - | bookmark: branch3_bookmark 97s - | tag: default/branch3 (with-path !) 97s - | user: test 97s - | date: Mon Jan 01 00:00:14 2007 +0000 97s - | summary: append f3 97s - | 97s - o changeset: 3:ae8eb55f7090 97s - | bookmark: branch2_bookmark 97s - | tag: default/branch2 (with-path !) 97s - | user: test 97s - | date: Mon Jan 01 00:00:13 2007 +0000 97s - | summary: append f2 97s - | 97s - o changeset: 2:600de9b6d498 97s - | branch: branch2 97s - | parent: 0:40a840c1f8ae 97s - | user: test 97s - | date: Mon Jan 01 00:00:11 2007 +0000 97s - | summary: add f2 97s - | 97s - | o changeset: 1:8211cade99e4 97s - |/ bookmark: branch1_bookmark 97s - | user: test 97s - | date: Mon Jan 01 00:00:12 2007 +0000 97s - | summary: append f1 97s - | 97s - o changeset: 0:40a840c1f8ae 97s - branch: branch1 97s - user: test 97s - date: Mon Jan 01 00:00:10 2007 +0000 97s - summary: add f1 97s - 97s 97s ERROR: test-branch-bookmark-suffix.t#without-path output changed 97s ! 97s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-bundle.t 97s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-bundle.t.err 97s @@ -36,247 +36,12 @@ 97s Clone it! 97s 97s $ hg clone gitrepo hgrepo 97s - importing 3 git commits 97s - new changesets ff7a2f2d8d70:ca33a262eb46 (3 drafts) 97s - updating to bookmark master 97s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 97s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 97s + abort: repository gitrepo not found 97s + [255] 97s $ cd hgrepo 97s + $TESTTMP.sh: 45: cd: can't cd to hgrepo 97s 97s Create a bundle with our metadata, and inspect it: 97s 97s $ hg bundle --all ../bundle-w-git.hg 97s - 3 changesets found 97s - $ hg debugbundle --all ../bundle-w-git.hg | grep hg-git 97s - exp-hg-git-map -- {} (mandatory: False) 97s - exp-hg-git-tags -- {} (mandatory: False) 97s - $ hg debugbundle --all ../bundle-w-git.hg > bundle-w-git.out 97s - 97s -Create a bundle without our metadata, and inspect it: 97s - 97s - $ hg bundle --all ../bundle-wo-git.hg --config experimental.hg-git-bundle=no 97s - 3 changesets found 97s - $ hg debugbundle --all ../bundle-wo-git.hg | grep hg-git 97s - [1] 97s - 97s -Verify that those are different: 97s - 97s - $ hg debugbundle --all ../bundle-wo-git.hg > bundle-wo-git.out 97s - $ cmp -s bundle-w-git.out bundle-wo-git.out 97s - [1] 97s - 97s -Now create a bundle without hg-git enabled at all, which should be 97s -exactly similar to what you get when you disable metadata embedding; 97s -this verifies we don't accidentally pollute bundles. 97s - 97s - $ hg bundle --all --config extensions.hggit=! ../bundle-wo-hggit.hg 97s - 3 changesets found 97s - $ hg debugbundle --all ../bundle-wo-hggit.hg > bundle-wo-hggit.out 97s - $ cmp -s bundle-wo-git.hg bundle-wo-hggit.hg 97s - [2] 97s - $ cmp -s bundle-wo-git.out bundle-wo-hggit.out 97s - $ cd .. 97s - $ rm -r hgrepo 97s - 97s -Does unbundling transfer state? 97s - 97s - $ hg init hgrepo 97s - $ hg -R hgrepo unbundle bundle-w-git.hg 97s - adding changesets 97s - adding manifests 97s - adding file changes 97s - added 3 changesets with 3 changes to 3 files 97s - new changesets * (glob) 97s - (run 'hg update' to get a working copy) 97s - $ hg -R hgrepo log -T git 97s - 2:ca33a262eb46 | d338971a96e2 | tip | 97s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 97s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 97s - $ hg -R hgrepo pull gitrepo 97s - pulling from gitrepo 97s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 97s - no changes found 97s - adding bookmark master 97s - $ rm -r hgrepo 97s - 97s -Can we unbundle something without git state? 97s - 97s - $ hg init hgrepo 97s - $ hg -R hgrepo unbundle bundle-wo-git.hg 97s - adding changesets 97s - adding manifests 97s - adding file changes 97s - added 3 changesets with 3 changes to 3 files 97s - new changesets * (glob) 97s - (run 'hg update' to get a working copy) 97s - $ hg -R hgrepo log -T git 97s - 2:ca33a262eb46 | | tip | 97s - 1:7fe02317c63d | | | 97s - 0:ff7a2f2d8d70 | | | 97s - $ hg -R hgrepo pull gitrepo 97s - pulling from gitrepo 97s - importing 3 git commits 97s - adding bookmark master 97s - (run 'hg update' to get a working copy) 97s - $ rm -r hgrepo 97s - 97s -Regular mercurial shouldn't choke on our bundle 97s - 97s - $ hg init hgrepo 97s - $ cat >> hgrepo/.hg/hgrc < [extensions] 97s - > hggit = ! 97s - > EOF 97s - $ hg -R hgrepo unbundle bundle-wo-git.hg 97s - adding changesets 97s - adding manifests 97s - adding file changes 97s - added 3 changesets with 3 changes to 3 files 97s - new changesets * (glob) 97s - (run 'hg update' to get a working copy) 97s - $ hg -R hgrepo log -T git 97s - 2:ca33a262eb46 | | tip | 97s - 1:7fe02317c63d | | | 97s - 0:ff7a2f2d8d70 | | | 97s - $ hg -R hgrepo pull gitrepo 97s - pulling from gitrepo 97s - abort: repository gitrepo not found!? (re) 97s - [255] 97s - $ rm -r hgrepo 97s - 97s - 97s -What happens if we unbundle twice? 97s - 97s - $ hg init hgrepo 97s - $ hg -R hgrepo unbundle bundle-w-git.hg 97s - adding changesets 97s - adding manifests 97s - adding file changes 97s - added 3 changesets with 3 changes to 3 files 97s - new changesets * (glob) 97s - (run 'hg update' to get a working copy) 97s - $ hg -R hgrepo unbundle bundle-w-git.hg 97s - adding changesets 97s - adding manifests 97s - adding file changes 97s - added 0 changesets with 0 changes to 3 files 97s - (run 'hg update' to get a working copy) 97s - $ hg -R hgrepo log -T git 97s - 2:ca33a262eb46 | d338971a96e2 | tip | 97s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 97s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 97s - $ hg -R hgrepo pull gitrepo 97s - pulling from gitrepo 97s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 97s - no changes found 97s - adding bookmark master 97s - $ rm -r hgrepo 97s - 97s -Alas, cloning a bundle doesn't work yet: 97s - 97s -(Mercurial is apparently quite dumb here, so we won't try to fix this 97s -for now, but this test mostly exists so that we notice if ever starts 97s -working, or breaks entirely.) 97s - 97s - $ hg clone bundle-w-git.hg hgrepo 97s - requesting all changes 97s - adding changesets 97s - adding manifests 97s - adding file changes 97s - added 3 changesets with 3 changes to 3 files 97s - new changesets * (glob) 97s - updating to branch default 97s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 97s - $ hg -R hgrepo log -T git 97s - 2:ca33a262eb46 | | tip | 97s - 1:7fe02317c63d | | | 97s - 0:ff7a2f2d8d70 | | | 97s - $ rm -r hgrepo 97s - 97s -Now, lets try to be a bit evil. How does pulling partial state work? 97s - 97s -First, more git happenings: 97s - 97s - $ cd gitrepo 97s - $ git checkout -b otherbranch thetag 97s - Switched to a new branch 'otherbranch' 97s - $ echo 42 > baz 97s - $ git add baz 97s - $ fn_git_commit -m 3 97s - $ cd .. 97s - 97s -Pull, 'em, and create a partial bundle: 97s - 97s - $ hg clone gitrepo hgrepo 97s - importing 4 git commits 97s - new changesets ff7a2f2d8d70:d87bf3ef6a53 (4 drafts) 97s - updating to bookmark otherbranch 97s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 97s - $ hg -R hgrepo bundle --base 'p1(tip)' -r tip bundle-w-git-2.hg 97s - 1 changesets found 97s - $ rm -r hgrepo 97s - 97s -Now, load only that bundle into a repository without any git state 97s - 97s - $ hg clone -r 1 bundle-w-git.hg hgrepo --config extensions.hggit=! 97s - adding changesets 97s - adding manifests 97s - adding file changes 97s - added 2 changesets with 2 changes to 2 files 97s - new changesets * (glob) 97s - updating to branch default 97s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 97s - $ cd hgrepo 97s - $ hg unbundle ../bundle-w-git-2.hg 97s - adding changesets 97s - adding manifests 97s - adding file changes 97s - added 1 changesets with 1 changes to 1 files (+1 heads) 97s - new changesets * (glob) 97s - (run 'hg heads' to see heads, 'hg merge' to merge) 97s - $ hg pull ../gitrepo 97s - pulling from ../gitrepo 97s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 97s - importing 3 git commits 97s - adding bookmark master 97s - adding bookmark otherbranch 97s - new changesets ca33a262eb46 (1 drafts) 97s - (run 'hg update' to get a working copy) 97s - $ cd .. 97s - $ rm -r hgrepo 97s - 97s -Now, try pushing with only the metadata: 97s - 97s - $ hg init hgrepo 97s - $ cd hgrepo 97s - $ hg unbundle -u ../bundle-w-git.hg 97s - adding changesets 97s - adding manifests 97s - adding file changes 97s - added 3 changesets with 3 changes to 3 files 97s - new changesets * (glob) 97s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 97s - $ echo kaflaflibob > bajizmo 97s - $ fn_hg_commit -A -m 4 97s - $ hg book -r tip master 97s - $ hg push ../gitrepo 97s - pushing to ../gitrepo 97s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 97s - abort: cannot push git commit d338971a96e2 as it is not present locally 97s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 97s - [255] 97s - 97s -Try to repopulate the git state from a bundle 97s - 97s - $ hg debug-remove-hggit-state 97s - clearing out the git cache data 97s - $ hg log -qr 'fromgit()' 97s - $ hg unbundle -u ../bundle-w-git.hg 97s - adding changesets 97s - adding manifests 97s - adding file changes 97s - added 0 changesets with 0 changes to 3 files 97s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 97s - $ hg log -qr 'fromgit()' 97s - 0:ff7a2f2d8d70 97s - 1:7fe02317c63d 97s - 2:ca33a262eb46 97s 97s ERROR: test-bundle.t output changed 97s ! 97s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-file-removal.t 97s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-file-removal.t.err 97s @@ -98,192 +98,9 @@ 97s $ git init -q --bare repo.git 97s 97s $ hg clone gitrepo hgrepo 97s - importing 9 git commits 97s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 97s - updating to bookmark master 97s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 97s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 97s + abort: repository gitrepo not found 97s + [255] 97s $ cd hgrepo 97s + $TESTTMP.sh: 72: cd: can't cd to hgrepo 97s $ hg log --graph 97s - @ changeset: 8:0995b8a0a943 97s - | bookmark: master 97s - | tag: default/master 97s - | tag: tip 97s - | user: test 97s - | date: Mon Jan 01 00:00:18 2007 +0000 97s - | summary: remove betalink 97s - | 97s - o changeset: 7:a316d3a96c89 97s - | user: test 97s - | date: Mon Jan 01 00:00:17 2007 +0000 97s - | summary: replace file with symlink 97s - | 97s - o changeset: 6:1804acb71f3e 97s - | user: test 97s - | date: Mon Jan 01 00:00:16 2007 +0000 97s - | summary: replace symlink with file 97s - | 97s - o changeset: 5:e19c85becc87 97s - | user: test 97s - | date: Mon Jan 01 00:00:15 2007 +0000 97s - | summary: add symlink to beta 97s - | 97s - o changeset: 4:0d3086c3f8c3 97s - | user: test 97s - | date: Mon Jan 01 00:00:14 2007 +0000 97s - | summary: remove foo/bar 97s - | 97s - o changeset: 3:b2406125ef5c 97s - | user: test 97s - | date: Mon Jan 01 00:00:13 2007 +0000 97s - | summary: remove alpha 97s - | 97s - o changeset: 2:8b3b2f4b4158 97s - | user: test 97s - | date: Mon Jan 01 00:00:12 2007 +0000 97s - | summary: add foo 97s - | 97s - o changeset: 1:7fe02317c63d 97s - | user: test 97s - | date: Mon Jan 01 00:00:11 2007 +0000 97s - | summary: add beta 97s - | 97s - o changeset: 0:ff7a2f2d8d70 97s - user: test 97s - date: Mon Jan 01 00:00:10 2007 +0000 97s - summary: add alpha 97s - 97s - 97s -make sure alpha is not in this manifest 97s - $ hg manifest -r 3 97s - beta 97s - foo/bar 97s - 97s -make sure that only beta is in the manifest 97s - $ hg manifest 97s - beta 97s - 97s - $ hg debug-remove-hggit-state 97s - clearing out the git cache data 97s - $ ls .hg | grep git 97s - [1] 97s - $ hg push ../repo.git 97s - pushing to ../repo.git 97s - searching for changes 97s - adding objects 97s - remote: found 0 deltas to reuse 97s - added 9 commits with 8 trees and 5 blobs 97s - adding reference refs/heads/master 97s - 97s - $ cd .. 97s - $ git --git-dir=repo.git log --pretty=medium 97s - commit 5ee11eeae239d6a99df5a99901ec00ffafbcc46b 97s - Author: test 97s - Date: Mon Jan 1 00:00:18 2007 +0000 97s - 97s - remove betalink 97s - 97s - commit 2c7b324faeccb1acf89c35b7ad38e7956f5705fa 97s - Author: test 97s - Date: Mon Jan 1 00:00:17 2007 +0000 97s - 97s - replace file with symlink 97s - 97s - commit ff0478d2ecc2571d01eb6d406ac29e4e63e5d3d5 97s - Author: test 97s - Date: Mon Jan 1 00:00:16 2007 +0000 97s - 97s - replace symlink with file 97s - 97s - commit 5492e6e410e42df527956be945286cd1ae45acb8 97s - Author: test 97s - Date: Mon Jan 1 00:00:15 2007 +0000 97s - 97s - add symlink to beta 97s - 97s - commit b991de8952c482a7cd51162674ffff8474862218 97s - Author: test 97s - Date: Mon Jan 1 00:00:14 2007 +0000 97s - 97s - remove foo/bar 97s - 97s - commit b0edaf0adac19392cf2867498b983bc5192b41dd 97s - Author: test 97s - Date: Mon Jan 1 00:00:13 2007 +0000 97s - 97s - remove alpha 97s - 97s - commit f2d0d5bfa905e12dee728b509b96cf265bb6ee43 97s - Author: test 97s - Date: Mon Jan 1 00:00:12 2007 +0000 97s - 97s - add foo 97s - 97s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 97s - Author: test 97s - Date: Mon Jan 1 00:00:11 2007 +0000 97s - 97s - add beta 97s - 97s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 97s - Author: test 97s - Date: Mon Jan 1 00:00:10 2007 +0000 97s - 97s - add alpha 97s - 97s -test with rename detection enabled 97s - $ hg --config git.similarity=100 clone gitrepo hgreporenames 97s - importing 9 git commits 97s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 97s - updating to bookmark master 97s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 97s - 97s - $ cd hgreporenames 97s - $ hg log --graph 97s - @ changeset: 8:0995b8a0a943 97s - | bookmark: master 97s - | tag: default/master 97s - | tag: tip 97s - | user: test 97s - | date: Mon Jan 01 00:00:18 2007 +0000 97s - | summary: remove betalink 97s - | 97s - o changeset: 7:a316d3a96c89 97s - | user: test 97s - | date: Mon Jan 01 00:00:17 2007 +0000 97s - | summary: replace file with symlink 97s - | 97s - o changeset: 6:1804acb71f3e 97s - | user: test 97s - | date: Mon Jan 01 00:00:16 2007 +0000 97s - | summary: replace symlink with file 97s - | 97s - o changeset: 5:e19c85becc87 97s - | user: test 97s - | date: Mon Jan 01 00:00:15 2007 +0000 97s - | summary: add symlink to beta 97s - | 97s - o changeset: 4:0d3086c3f8c3 97s - | user: test 97s - | date: Mon Jan 01 00:00:14 2007 +0000 97s - | summary: remove foo/bar 97s - | 97s - o changeset: 3:b2406125ef5c 97s - | user: test 97s - | date: Mon Jan 01 00:00:13 2007 +0000 97s - | summary: remove alpha 97s - | 97s - o changeset: 2:8b3b2f4b4158 97s - | user: test 97s - | date: Mon Jan 01 00:00:12 2007 +0000 97s - | summary: add foo 97s - | 97s - o changeset: 1:7fe02317c63d 97s - | user: test 97s - | date: Mon Jan 01 00:00:11 2007 +0000 97s - | summary: add beta 97s - | 97s - o changeset: 0:ff7a2f2d8d70 97s - user: test 97s - date: Mon Jan 01 00:00:10 2007 +0000 97s - summary: add alpha 97s - 97s 97s ERROR: test-file-removal.t output changed 97s ! 97s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-hg-author.t 97s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-hg-author.t.err 97s @@ -16,256 +16,10 @@ 97s 97s $ cd .. 97s $ hg clone repo.git hgrepo 97s - importing 1 git commits 97s - new changesets ff7a2f2d8d70 (1 drafts) 97s - updating to bookmark master 97s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 97s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 97s + abort: repository repo.git not found 97s + [255] 97s 97s $ cd hgrepo 97s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 97s $ hg book master 97s - $ echo beta > beta 97s - $ hg add beta 97s - $ fn_hg_commit -u "test" -m 'add beta' 97s - $ hg push 97s - pushing to $TESTTMP/repo.git 97s - searching for changes 97s - adding objects 97s - remote: found 0 deltas to reuse 97s - added 1 commits with 1 trees and 1 blobs 97s - updating reference refs/heads/master 97s - 97s - $ echo gamma >> beta 97s - $ fn_hg_commit -u "test (comment)" -m 'modify beta' 97s - $ hg push 97s - pushing to $TESTTMP/repo.git 97s - searching for changes 97s - adding objects 97s - remote: found 0 deltas to reuse 97s - added 1 commits with 1 trees and 1 blobs 97s - updating reference refs/heads/master 97s - 97s - $ echo gamma > gamma 97s - $ hg add gamma 97s - $ fn_hg_commit -u "" -m 'add gamma' 97s - $ hg push 97s - pushing to $TESTTMP/repo.git 97s - searching for changes 97s - adding objects 97s - remote: found 0 deltas to reuse 97s - added 1 commits with 1 trees and 1 blobs 97s - updating reference refs/heads/master 97s - 97s - $ echo delta > delta 97s - $ hg add delta 97s - $ fn_hg_commit -u "name" -m 'add delta' 97s - $ hg push 97s - pushing to $TESTTMP/repo.git 97s - searching for changes 97s - adding objects 97s - remote: found 0 deltas to reuse 97s - added 1 commits with 1 trees and 1 blobs 97s - updating reference refs/heads/master 97s - 97s - $ echo epsilon > epsilon 97s - $ hg add epsilon 97s - $ fn_hg_commit -u "name zeta 97s - $ hg add zeta 97s - $ fn_hg_commit -u " test " -m 'add zeta' 97s - $ hg push 97s - pushing to $TESTTMP/repo.git 97s - searching for changes 97s - adding objects 97s - remote: found 0 deltas to reuse 97s - added 1 commits with 1 trees and 1 blobs 97s - updating reference refs/heads/master 97s - 97s - $ echo eta > eta 97s - $ hg add eta 97s - $ fn_hg_commit -u "test < test@example.com >" -m 'add eta' 97s - $ hg push 97s - pushing to $TESTTMP/repo.git 97s - searching for changes 97s - adding objects 97s - remote: found 0 deltas to reuse 97s - added 1 commits with 1 trees and 1 blobs 97s - updating reference refs/heads/master 97s - 97s - $ echo theta > theta 97s - $ hg add theta 97s - $ fn_hg_commit -u "test >test@example.com>" -m 'add theta' 97s - $ hg push 97s - pushing to $TESTTMP/repo.git 97s - searching for changes 97s - adding objects 97s - remote: found 0 deltas to reuse 97s - added 1 commits with 1 trees and 1 blobs 97s - updating reference refs/heads/master 97s - 97s - $ hg log --graph 97s - @ changeset: 8:c5d1976ab12c 97s - | bookmark: master 97s - | tag: default/master 97s - | tag: tip 97s - | user: test >test@example.com> 97s - | date: Mon Jan 01 00:00:18 2007 +0000 97s - | summary: add theta 97s - | 97s - o changeset: 7:0e2fb4d21667 97s - | user: test < test@example.com > 97s - | date: Mon Jan 01 00:00:17 2007 +0000 97s - | summary: add eta 97s - | 97s - o changeset: 6:faa3aae96199 97s - | user: test 97s - | date: Mon Jan 01 00:00:16 2007 +0000 97s - | summary: add zeta 97s - | 97s - o changeset: 5:2cf6ad5a1afc 97s - | user: name 97s - | date: Mon Jan 01 00:00:14 2007 +0000 97s - | summary: add delta 97s - | 97s - o changeset: 3:6b854d65d0d6 97s - | user: 97s - | date: Mon Jan 01 00:00:13 2007 +0000 97s - | summary: add gamma 97s - | 97s - o changeset: 2:46303c652e79 97s - | user: test (comment) 97s - | date: Mon Jan 01 00:00:12 2007 +0000 97s - | summary: modify beta 97s - | 97s - o changeset: 1:47580592d3d6 97s - | user: test 97s - | date: Mon Jan 01 00:00:11 2007 +0000 97s - | summary: add beta 97s - | 97s - o changeset: 0:ff7a2f2d8d70 97s - user: test 97s - date: Mon Jan 01 00:00:10 2007 +0000 97s - summary: add alpha 97s - 97s - 97s - $ cd .. 97s - $ hg clone repo.git hgrepo2 97s - importing 9 git commits 97s - new changesets ff7a2f2d8d70:1fbf3aa91221 (9 drafts) 97s - updating to bookmark master 97s - 8 files updated, 0 files merged, 0 files removed, 0 files unresolved 97s - $ hg -R hgrepo2 log --graph 97s - @ changeset: 8:1fbf3aa91221 97s - | bookmark: master 97s - | tag: default/master 97s - | tag: tip 97s - | user: test ?test@example.com 97s - | date: Mon Jan 01 00:00:18 2007 +0000 97s - | summary: add theta 97s - | 97s - o changeset: 7:20310508f06d 97s - | user: test 97s - | date: Mon Jan 01 00:00:17 2007 +0000 97s - | summary: add eta 97s - | 97s - o changeset: 6:e3d81af8a8c1 97s - | user: test 97s - | date: Mon Jan 01 00:00:16 2007 +0000 97s - | summary: add zeta 97s - | 97s - o changeset: 5:78f609fd208f 97s - | user: name 97s - | date: Mon Jan 01 00:00:15 2007 +0000 97s - | summary: add epsilon 97s - | 97s - o changeset: 4:42fa61d57718 97s - | user: name 97s - | date: Mon Jan 01 00:00:14 2007 +0000 97s - | summary: add delta 97s - | 97s - o changeset: 3:6b854d65d0d6 97s - | user: 97s - | date: Mon Jan 01 00:00:13 2007 +0000 97s - | summary: add gamma 97s - | 97s - o changeset: 2:46303c652e79 97s - | user: test (comment) 97s - | date: Mon Jan 01 00:00:12 2007 +0000 97s - | summary: modify beta 97s - | 97s - o changeset: 1:47580592d3d6 97s - | user: test 97s - | date: Mon Jan 01 00:00:11 2007 +0000 97s - | summary: add beta 97s - | 97s - o changeset: 0:ff7a2f2d8d70 97s - user: test 97s - date: Mon Jan 01 00:00:10 2007 +0000 97s - summary: add alpha 97s - 97s - $ git --git-dir=repo.git log --pretty=medium master 97s - commit 2fe60ba69727981e6ede78be70354c3a9e30e21d 97s - Author: test ?test@example.com 97s - Date: Mon Jan 1 00:00:18 2007 +0000 97s - 97s - add theta 97s - 97s - commit 9f2f7cafdbf2e467928db98de8275141001d3081 97s - Author: test 97s - Date: Mon Jan 1 00:00:17 2007 +0000 97s - 97s - add eta 97s - 97s - commit 172a6f8d8064d73dff7013e395a9fe3cfc3ff807 97s - Author: test 97s - Date: Mon Jan 1 00:00:16 2007 +0000 97s - 97s - add zeta 97s - 97s - commit 71badb8e343a7da391a9b5d98909fbd2ca7d78f2 97s - Author: name 97s - Date: Mon Jan 1 00:00:15 2007 +0000 97s - 97s - add epsilon 97s - 97s - commit 9a9ae7b7f310d4a1a3e732a747ca26f06934f8d8 97s - Author: name 97s - Date: Mon Jan 1 00:00:14 2007 +0000 97s - 97s - add delta 97s - 97s - commit e4149a32e81e380193f59aa8773349201b8ed7f7 97s - Author: 97s - Date: Mon Jan 1 00:00:13 2007 +0000 97s - 97s - add gamma 97s - 97s - commit fae95aef5889a80103c2fbd5d14ff6eb8c9daf93 97s - Author: test ext:(%20%28comment%29) 97s - Date: Mon Jan 1 00:00:12 2007 +0000 97s - 97s - modify beta 97s - 97s - commit 0f378ab6c2c6b5514bd873d3faf8ac4b8095b001 97s - Author: test 97s - Date: Mon Jan 1 00:00:11 2007 +0000 97s - 97s - add beta 97s - 97s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 97s - Author: test 97s - Date: Mon Jan 1 00:00:10 2007 +0000 97s - 97s - add alpha 97s 97s ERROR: test-hg-author.t output changed 98s ! 98s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-subrepos.t 98s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-subrepos.t.err 98s @@ -34,165 +34,8 @@ 98s $ cd .. 98s Ensure gitlinks are transformed to .hgsubstate on hg pull from git 98s $ hg clone -u tip repo.git hgrepo 2>&1 | grep -E -v '^(Cloning into|done)' 98s - importing 3 git commits 98s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 98s - updating to branch default 98s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 98s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 98s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 98s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 98s + abort: repository repo.git not found 98s $ cd hgrepo 98s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 98s $ hg bookmarks -f -r default master 98s -1. Ensure gitlinks are transformed to .hgsubstate on hg <- git pull 98s -.hgsub shall list two [git] subrepos 98s - $ cat .hgsub 98s - subrepo1 = [git]../gitsubrepo 98s - xyz/subrepo2 = [git]../gitsubrepo 98s -.hgsubstate shall list two idenitcal revisions 98s - $ cat .hgsubstate 98s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 98s - 56f0304c5250308f14cfbafdc27bd12d40154d17 xyz/subrepo2 98s -hg status shall NOT report .hgsub and .hgsubstate as untracked - either ignored or unmodified 98s - $ hg status --unknown .hgsub .hgsubstate 98s - $ hg status --modified .hgsub .hgsubstate 98s - $ cd .. 98s - 98s -2. Check gitmodules are preserved during hg -> git push 98s - $ cd gitsubrepo 98s - $ echo gamma > gamma 98s - $ git add gamma 98s - $ fn_git_commit -m 'add gamma' 98s - $ cd .. 98s - $ cd hgrepo 98s - $ cd xyz/subrepo2 98s - $ git pull --ff-only | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| */| /' 98s - From $TESTTMP/gitsubrepo 98s - 56f0304..aabf7cd master -> origin/master 98s - Updating 56f0304..aabf7cd 98s - Fast-forward 98s - gamma | 1 + 98s - 1 file changed, 1 insertion(+) 98s - create mode 100644 gamma 98s - $ cd ../.. 98s - $ echo xxx >> alpha 98s - $ fn_hg_commit -m 'Update subrepo2 from hg' | grep -v "committing subrepository" || true 98s - $ hg push 98s - pushing to $TESTTMP/repo.git 98s - searching for changes 98s - adding objects 98s - remote: found 0 deltas to reuse 98s - added 1 commits with 2 trees and 1 blobs 98s - updating reference refs/heads/master 98s - $ cd .. 98s - $ cd gitrepo 98s - $ git pull --ff-only 98s - From $TESTTMP/repo 98s - 89c22d7..275b0a5 master -> origin/master 98s - Fetching submodule xyz/subrepo2 98s - From $TESTTMP/gitsubrepo 98s - 56f0304..aabf7cd master -> origin/master 98s - Updating 89c22d7..275b0a5 98s - Fast-forward 98s - alpha | 1 + 98s - xyz/subrepo2 | 2 +- 98s - 2 files changed, 2 insertions(+), 1 deletion(-) 98s -there shall be two gitlink entries, with values matching that in .hgsubstate 98s - $ git ls-tree -r HEAD^{tree} | grep 'commit' 98s - 160000 commit 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 98s - 160000 commit aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 98s -bring working copy to HEAD state (it's not bare repo) 98s - $ git reset --hard 98s - HEAD is now at 275b0a5 Update subrepo2 from hg 98s - $ cd .. 98s - 98s -3. Check .hgsub and .hgsubstate from git repository are merged, not overwritten 98s - $ hg init hgsub 98s - $ cd hgsub 98s - $ echo delta > delta 98s - $ hg add delta 98s - $ fn_hg_commit -m "add delta" 98s - $ hg tip --template '{node} hgsub\n' > ../gitrepo/.hgsubstate 98s - $ cat > ../gitrepo/.hgsub < hgsub = ../hgsub 98s - > EOF 98s - $ cd ../gitrepo 98s - $ git add .hgsubstate .hgsub 98s - $ fn_git_commit -m "Test3. Prepare .hgsub and .hgsubstate sources" 98s - $ git push 98s - To $TESTTMP/repo.git 98s - 275b0a5..e31d576 master -> master 98s - 98s - $ cd ../hgrepo 98s - $ hg pull 98s - pulling from $TESTTMP/repo.git 98s - importing 1 git commits 98s - updating bookmark master 98s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 98s - (run 'hg update' to get a working copy) 98s - $ hg checkout -C 98s - updating to active bookmark master 98s - cloning subrepo hgsub from $TESTTMP/hgsub 98s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 98s - $ cd .. 98s -pull shall bring .hgsub entry which was added to the git repo 98s - $ cat hgrepo/.hgsub 98s - hgsub = ../hgsub 98s - subrepo1 = [git]../gitsubrepo 98s - xyz/subrepo2 = [git]../gitsubrepo 98s -.hgsubstate shall list revision of the subrepo added through git repo 98s - $ cat hgrepo/.hgsubstate 98s - 481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub 98s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 98s - aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 98s - 98s -4. Try changing the subrepos from the Mercurial side 98s - 98s - $ cd hgrepo 98s - $ cat >> .hgsub < subrepo2 = [git]../gitsubrepo 98s - > EOF 98s - $ git clone ../gitsubrepo subrepo2 98s - Cloning into 'subrepo2'... 98s - done. 98s - $ fn_hg_commit -m 'some stuff' 98s - $ hg push 98s - pushing to $TESTTMP/repo.git 98s - no changes made to subrepo hgsub since last push to $TESTTMP/hgsub 98s - searching for changes 98s - adding objects 98s - remote: found 0 deltas to reuse 98s - added 1 commits with 1 trees and 1 blobs 98s - updating reference refs/heads/master 98s - $ cd .. 98s - 98s -5. But we actually do something quite weird in this case: If a 98s -.gitmodules file exists in the repository, it always wins! In this 98s -case, we break the bidirectional convention, and modify the repository 98s -data. That's odd, so show it: 98s - 98s - $ hg id hgrepo 98s - 42c46c7eef3a default/master/tip master 98s - $ hg clone -U repo.git hgrepo2 98s - importing 6 git commits 98s - new changesets e532b2bfda10:42c46c7eef3a (6 drafts) 98s - $ hg -R hgrepo2 up :master 98s - Cloning into '$TESTTMP/hgrepo2/subrepo1'... 98s - done. 98s - cloning subrepo hgsub from $TESTTMP/hgsub 98s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 98s - checking out detached HEAD in subrepository "subrepo1" 98s - check out a git branch if you intend to make changes 98s - Cloning into '$TESTTMP/hgrepo2/subrepo2'... 98s - done. 98s - Cloning into '$TESTTMP/hgrepo2/xyz/subrepo2'... 98s - done. 98s - cloning subrepo subrepo2 from $TESTTMP/gitsubrepo 98s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 98s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 98s - 98s -We retained bidirectionality! 98s - 98s - $ git diff --stat hgrepo/.hgsub hgrepo2/.hgsub 98s - $ hg id hgrepo 98s - 42c46c7eef3a default/master/tip master 98s - $ hg id hgrepo2 98s - 42c46c7eef3a default/master/tip master 98s 98s ERROR: test-subrepos.t output changed 100s ! 100s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-extra.t 100s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-extra.t.err 100s @@ -12,190 +12,9 @@ 100s 100s $ cd .. 100s $ hg clone gitrepo hgrepo 100s - importing 1 git commits 100s - new changesets aa9eb6424386 (1 drafts) 100s - updating to bookmark not-master 100s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository gitrepo not found 100s + [255] 100s $ cd hgrepo 100s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 100s $ hg mv a b 100s - $ fn_hg_commit -mb 100s - $ hg up 0 100s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 100s - (leaving bookmark not-master) 100s - $ touch c 100s - $ hg add c 100s - $ fn_hg_commit -mc 100s - 100s -Rebase will add a rebase_source 100s - 100s - $ hg --config extensions.rebase= rebase -s 1 -d 2 100s - rebasing 1:4c7da7adf18b * (glob) 100s - saved backup bundle to $TESTTMP/*.hg (glob) 100s - $ hg up 2 100s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 100s - 100s -Add a commit with multiple extra fields 100s - $ hg bookmark b1 100s - $ touch d 100s - $ hg add d 100s - $ fn_hg_commitextra --field zzzzzzz=datazzz --field aaaaaaa=dataaaa 100s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 100s - @ 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 100s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 100s - | 100s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 100s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 100s - | 100s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 100s - | branch=default 100s - | 100s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 100s - branch=default hg-git-rename-source=git 100s - 100s - 100s - $ hg push -r b1 100s - pushing to $TESTTMP/gitrepo 100s - searching for changes 100s - adding objects 100s - remote: found 0 deltas to reuse 100s - added 3 commits with 3 trees and 0 blobs 100s - adding reference refs/heads/b1 100s - 100s - $ hg bookmark b2 100s - $ hg mv c c2 100s - $ hg mv d d2 100s - $ fn_hg_commitextra --field yyyyyyy=datayyy --field bbbbbbb=databbb 100s - 100s -Test some nutty filenames 100s - $ hg book b3 100s -#if windows 100s - $ hg mv c2 'c2 => c3' 100s - abort: filename contains '>', which is reserved on Windows: "c2 => c3" 100s - [255] 100s - $ hg mv c2 c3 100s - $ fn_hg_commit -m 'dummy commit' 100s - $ hg mv c3 c4 100s - $ fn_hg_commit -m 'dummy commit' 100s -#else 100s - $ hg mv c2 'c2 => c3' 100s - warning: filename contains '>', which is reserved on Windows: 'c2 => c3' 100s - $ fn_hg_commit -m 'test filename with arrow' 100s - $ hg mv 'c2 => c3' 'c3 => c4' 100s - warning: filename contains '>', which is reserved on Windows: 'c3 => c4' 100s - $ fn_hg_commit -m 'test filename with arrow 2' 100s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" -l 3 --config "experimental.graphstyle.missing=|" 100s - @ 6 bca4ba69a6844c133b069e227dfa043d41e3c197 test filename with arrow 2 100s - | branch=default 100s - | 100s - o 5 864caad1f3493032f8d06f44a89dc9f1c039b09f test filename with arrow 100s - | branch=default 100s - | 100s - o 4 58f855ae26f4930ce857e648d3dd949901cce817 100s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 100s - | 100s -#endif 100s - $ hg push -r b2 -r b3 100s - pushing to $TESTTMP/gitrepo 100s - searching for changes 100s - adding objects 100s - remote: found 0 deltas to reuse 100s - added 3 commits with 3 trees and 0 blobs 100s - adding reference refs/heads/b2 100s - adding reference refs/heads/b3 100s - 100s - $ cd ../gitrepo 100s - $ git cat-file commit b1 100s - tree 1b773a2eb70f29397356f8069c285394835ff85a 100s - parent 54776dace5849bdf273fb26737a48ef64804909d 100s - author test 1167609613 +0000 100s - committer test 1167609613 +0000 100s - HG:extra aaaaaaa:dataaaa 100s - HG:extra zzzzzzz:datazzz 100s - 100s - 100s - 100s - $ git cat-file commit b2 100s - tree 34ad62c6d6ad9464bfe62db5b3d2fa16aaa9fa9e 100s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 100s - author test 1167609614 +0000 100s - committer test 1167609614 +0000 100s - HG:rename c:c2 100s - HG:rename d:d2 100s - HG:extra bbbbbbb:databbb 100s - HG:extra yyyyyyy:datayyy 100s - 100s - 100s - 100s -#if no-windows 100s - $ git cat-file commit b3 100s - tree e63df52695f9b06e54b37e7ef60d0c43994de620 100s - parent 5cafe2555a0666fcf661a3943277a9812a694a98 100s - author test 1167609616 +0000 100s - committer test 1167609616 +0000 100s - HG:rename c2%20%3D%3E%20c3:c3%20%3D%3E%20c4 100s - 100s - test filename with arrow 2 100s -#endif 100s - $ cd ../gitrepo 100s - $ git checkout b1 100s - Switched to branch 'b1' 100s - $ commit_sha=$(git rev-parse HEAD) 100s - $ tree_sha=$(git rev-parse HEAD^{tree}) 100s - 100s -There's no way to create a Git repo with extra metadata via the CLI. Dulwich 100s -lets you do that, though. 100s - 100s - >>> from dulwich.objects import Commit 100s - >>> from dulwich.porcelain import open_repo 100s - >>> repo = open_repo('.') 100s - >>> c = Commit() 100s - >>> c.author = b'test ' 100s - >>> c.author_time = 0 100s - >>> c.author_timezone = 0 100s - >>> c.committer = c.author 100s - >>> c.commit_time = 0 100s - >>> c.commit_timezone = 0 100s - >>> c.parents = [b'$commit_sha'] 100s - >>> c.tree = b'$tree_sha' 100s - >>> c.message = b'extra commit\n' 100s - >>> c.extra.extend([(b'zzz:zzz', b'data:zzz'), (b'aaa:aaa', b'data:aaa'), 100s - ... (b'HG:extra', b'hgaaa:dataaaa'), 100s - ... (b'HG:extra', b'hgzzz:datazzz')]) 100s - >>> repo.object_store.add_object(c) 100s - >>> repo.refs.set_if_equals(b'refs/heads/master', None, c.id) 100s - True 100s - 100s - $ git cat-file commit master 100s - tree 1b773a2eb70f29397356f8069c285394835ff85a 100s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 100s - author test 0 +0000 100s - committer test 0 +0000 100s - zzz:zzz data:zzz 100s - aaa:aaa data:aaa 100s - HG:extra hgaaa:dataaaa 100s - HG:extra hgzzz:datazzz 100s - 100s - extra commit 100s - 100s - $ cd .. 100s - $ hg clone -qU gitrepo hgrepo2 100s - $ cd hgrepo2 100s - $ hg log -G -r :5 -T "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 100s - o 5 58f855ae26f4930ce857e648d3dd949901cce817 100s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 100s - | 100s - | o 4 90acc8c23fcfaeb0930c03c849923a696fd9013c extra commit 100s - |/ GIT0-zzz%3Azzz=data%3Azzz GIT1-aaa%3Aaaa=data%3Aaaa branch=default hgaaa=dataaaa hgzzz=datazzz 100s - | 100s - o 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 100s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 100s - | 100s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 100s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 100s - | 100s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 100s - | branch=default 100s - | 100s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 100s - branch=default hg-git-rename-source=git 100s - 100s 100s ERROR: test-extra.t output changed 102s ! 102s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-bookmark-workflow.t 102s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-bookmark-workflow.t.err 102s @@ -42,13 +42,21 @@ 102s 102s Initialize remote hg and git repos with equivalent initial contents 102s $ hg init hgremoterepo 102s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 102s $ cd hgremoterepo 102s $ hg bookmark master 102s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 102s $ for f in alpha beta gamma delta; do 102s > echo $f > $f; hg add $f; hgcommit -m "add $f" 102s > done 102s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 102s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 102s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 102s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 102s $ hg bookmark -r 1 b1 102s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 102s $ hgstate 102s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 102s 3 fc2664cac217 "add delta" bookmarks: [master] 102s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 102s 1 7bcd915dc873 "add beta" bookmarks: [b1] 102s @@ -69,157 +77,19 @@ 102s 102s Cloning transfers all bookmarks from remote to local 102s $ hg clone -q hgremoterepo purehglocalrepo 102s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 102s $ cd purehglocalrepo 102s $ hgstate 102s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 102s 3 fc2664cac217 "add delta" bookmarks: [master] 102s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 102s 1 7bcd915dc873 "add beta" bookmarks: [b1] 102s 0 3442585be8a6 "add alpha" bookmarks: [] 102s $ cd .. 102s $ hg clone -q gitremoterepo hggitlocalrepo --config hggit.usephases=True 102s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 102s + abort: repository gitremoterepo not found 102s + [255] 102s $ cd hggitlocalrepo 102s + $TESTTMP.sh: 78: cd: can't cd to hggitlocalrepo 102s $ hggitstate 102s - 3 03769a650ded 55b133e1d558 "add delta" bookmarks: [master] 102s - 2 ca33a262eb46 d338971a96e2 "add gamma" bookmarks: [] 102s - 1 7fe02317c63d 9497a4ee62e1 "add beta" bookmarks: [b1] 102s - 0 ff7a2f2d8d70 7eeab2ea75ec "add alpha" bookmarks: [] 102s - 102s -Make sure that master is public 102s - $ hg phase -r master 102s - 3: public 102s - $ cd .. 102s - 102s -No changes 102s - $ cd purehglocalrepo 102s - $ hg incoming -B 102s - comparing with $TESTTMP/hgremoterepo 102s - searching for changed bookmarks 102s - no changed bookmarks found 102s - [1] 102s - $ hg outgoing 102s - comparing with $TESTTMP/hgremoterepo 102s - searching for changes 102s - no changes found 102s - [1] 102s - $ hg outgoing -B 102s - comparing with $TESTTMP/hgremoterepo 102s - searching for changed bookmarks 102s - no changed bookmarks found 102s - [1] 102s - $ hg push 102s - pushing to $TESTTMP/hgremoterepo 102s - searching for changes 102s - no changes found 102s - [1] 102s - $ cd .. 102s - $ cd hggitlocalrepo 102s - $ hg incoming -B 102s - comparing with $TESTTMP/gitremoterepo 102s - searching for changed bookmarks 102s - no changed bookmarks found 102s - [1] 102s - $ hg outgoing 102s - comparing with $TESTTMP/gitremoterepo 102s - searching for changes 102s - no changes found 102s - [1] 102s - $ hg outgoing -B 102s - comparing with $TESTTMP/gitremoterepo 102s - searching for changed bookmarks 102s - no changed bookmarks found 102s - [1] 102s - $ hg push 102s - pushing to $TESTTMP/gitremoterepo 102s - searching for changes 102s - no changes found 102s - [1] 102s - $ cd .. 102s - 102s -Bookmarks on existing revs: 102s -- change b1 on local repo 102s -- introduce b2 on local repo 102s -- introduce b3 on remote repo 102s -Bookmarks on new revs 102s -- introduce b4 on a new rev on the remote 102s - $ cd hgremoterepo 102s - $ hg bookmark -r master b3 102s - $ hg bookmark -r master b4 102s - $ hg update -q b4 102s - $ echo epsilon > epsilon; hg add epsilon; hgcommit -m 'add epsilon' 102s - $ hgstate 102s - 4 d979bb8e0fbb "add epsilon" bookmarks: [b4] 102s - 3 fc2664cac217 "add delta" bookmarks: [b3 master] 102s - 2 d85ced7ae9d6 "add gamma" bookmarks: [] 102s - 1 7bcd915dc873 "add beta" bookmarks: [b1] 102s - 0 3442585be8a6 "add alpha" bookmarks: [] 102s - $ cd .. 102s - $ cd purehglocalrepo 102s - $ hg bookmark -fr 2 b1 102s - $ hg bookmark -r 0 b2 102s - $ hgstate 102s - 3 fc2664cac217 "add delta" bookmarks: [master] 102s - 2 d85ced7ae9d6 "add gamma" bookmarks: [b1] 102s - 1 7bcd915dc873 "add beta" bookmarks: [] 102s - 0 3442585be8a6 "add alpha" bookmarks: [b2] 102s - $ hg incoming -B 102s - comparing with $TESTTMP/hgremoterepo 102s - searching for changed bookmarks 102s - b3 fc2664cac217 102s - b4 d979bb8e0fbb 102s - $ hg outgoing 102s - comparing with $TESTTMP/hgremoterepo 102s - searching for changes 102s - no changes found 102s - [1] 102s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 102s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 102s -This changed in 3.4 to start showing changed and deleted bookmarks again. 102s - $ hg outgoing -B | grep -v -E -w 'b1|b3|b4' 102s - comparing with $TESTTMP/hgremoterepo 102s - searching for changed bookmarks 102s - b2 3442585be8a6 102s - $ cd .. 102s - 102s - $ cd gitremoterepo 102s - $ git branch b3 master 102s - $ git checkout -b b4 master 102s - Switched to a new branch 'b4' 102s - $ echo epsilon > epsilon 102s - $ git add epsilon 102s - $ gitcommit -m 'add epsilon' 102s - $ gitstate 102s - fcfd2c0 "add epsilon" refs: (*b4) (glob) 102s - 55b133e "add delta" refs: (master, b3) 102s - d338971 "add gamma" refs: 102s - 9497a4e "add beta" refs: (b1) 102s - 7eeab2e "add alpha" refs: 102s - $ cd .. 102s - $ cd hggitlocalrepo 102s - $ hg bookmark -fr 2 b1 102s - $ hg bookmark -r 0 b2 102s - $ hgstate 102s - 3 03769a650ded "add delta" bookmarks: [master] 102s - 2 ca33a262eb46 "add gamma" bookmarks: [b1] 102s - 1 7fe02317c63d "add beta" bookmarks: [] 102s - 0 ff7a2f2d8d70 "add alpha" bookmarks: [b2] 102s - $ hg incoming -B 102s - comparing with $TESTTMP/gitremoterepo 102s - searching for changed bookmarks 102s - b3 03769a650ded 102s - b4 fcfd2c0262db 102s - $ hg outgoing 102s - comparing with $TESTTMP/gitremoterepo 102s - searching for changes 102s - no changes found 102s - [1] 102s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 102s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 102s -This changed in 3.4 to start showing changed and deleted bookmarks again. 102s - $ hg outgoing -B 102s - comparing with $TESTTMP/gitremoterepo 102s - searching for changed bookmarks 102s - b1 ca33a262eb46 102s - b2 ff7a2f2d8d70 102s - b3 102s - b4 102s - $ cd .. 102s 102s ERROR: test-bookmark-workflow.t output changed 109s ! 109s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-illegal-contents.t 109s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-illegal-contents.t.err 109s @@ -5,6 +5,7 @@ 109s $ . "$TESTDIR/testutil" 109s 109s $ hg init hg 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s $ cd hg 109s $ mkdir -p .git/hooks 109s $ cat > .git/hooks/post-update < EOF 109s $ fn_touch_escaped foo/git~100/wat bar/.gi\\u200ct/wut this/is/safe 109s $ hg addremove 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s adding .git/hooks/post-update 109s adding bar/.gi\xe2\x80\x8ct/wut (esc) 109s adding foo/git~100/wat 109s adding this/is/safe 109s $ hg ci -m "we should refuse to export this" 109s - $ hg book master 109s - $ hg gexport 109s - warning: skipping invalid path '.git/hooks/post-update' 109s - warning: skipping invalid path 'bar/.gi\xe2\x80\x8ct/wut' 109s - warning: skipping invalid path 'foo/git~100/wat' 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + $ hg book master 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + $ hg gexport 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + hg: unknown command 'gexport' 109s + (did you mean one of export, import?) 109s + [10] 109s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 109s - this/is/safe 109s + fatal: not a git repository: '.hg/git' 109s + [128] 109s $ hg debug-remove-hggit-state 109s - clearing out the git cache data 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + hg: unknown command 'debug-remove-hggit-state' 109s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 109s + [10] 109s $ hg gexport --config hggit.invalidpaths=keep 109s - warning: path '.git/hooks/post-update' contains an invalid path component 109s - warning: path 'bar/.gi\xe2\x80\x8ct/wut' contains an invalid path component 109s - warning: path 'foo/git~100/wat' contains an invalid path component 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + hg: unknown command 'gexport' 109s + (did you mean one of export, import?) 109s + [10] 109s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 109s - .git/hooks/post-update 109s - "bar/.gi\342\200\214t/wut" 109s - foo/git~100/wat 109s - this/is/safe 109s - $ cd .. 109s - 109s - $ rm -rf hg 109s - $ hg init hg 109s + fatal: not a git repository: '.hg/git' 109s + [128] 109s + $ cd .. 109s + 109s + $ rm -rf hg 109s + $ hg init hg 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s $ cd hg 109s $ mkdir -p nested/.git/hooks/ 109s $ cat > nested/.git/hooks/post-update < EOF 109s $ chmod +x nested/.git/hooks/post-update 109s $ hg addremove 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s adding nested/.git/hooks/post-update 109s $ hg ci -m "also refuse to export this" 109s - $ hg book master 109s - $ hg gexport 109s - warning: skipping invalid path 'nested/.git/hooks/post-update' 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + $ hg book master 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + $ hg gexport 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + hg: unknown command 'gexport' 109s + (did you mean one of export, import?) 109s + [10] 109s $ git clone .hg/git git 109s - Cloning into 'git'... 109s - done. 109s + fatal: repository '.hg/git' does not exist 109s + [128] 109s $ rm -rf git 109s 109s We can trigger an error: 109s 109s $ hg -q debug-remove-hggit-state 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + hg: unknown command 'debug-remove-hggit-state' 109s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 109s + [10] 109s $ hg --config hggit.invalidpaths=abort gexport 109s - abort: invalid path 'nested/.git/hooks/post-update' rejected by configuration 109s - (see 'hg help config.hggit.invalidpaths for details) 109s - [255] 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + hg: unknown command 'gexport' 109s + (did you mean one of export, import?) 109s + [10] 109s 109s We can override if needed: 109s 109s $ hg --config hggit.invalidpaths=keep gexport 109s - warning: path 'nested/.git/hooks/post-update' contains an invalid path component 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + hg: unknown command 'gexport' 109s + (did you mean one of export, import?) 109s + [10] 109s $ cd .. 109s $ # different git versions give different return codes 109s $ git clone hg/.hg/git git || true 109s - Cloning into 'git'... 109s - done. 109s - error: [Ii]nvalid path 'nested/\.git/hooks/post-update' (re) 109s + fatal: repository 'hg/.hg/git' does not exist 109s fatal: unable to checkout working tree (?) 109s warning: Clone succeeded, but checkout failed. (?) 109s You can inspect what was checked out with 'git status' (?) 109s @@ -88,6 +109,7 @@ 109s $ cd .. 109s $ rm -rf hg 109s $ hg init hg 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s $ cd hg 109s $ mkdir -p .GIT/hooks/ 109s $ cat > .GIT/hooks/post-checkout < EOF 109s $ chmod +x .GIT/hooks/post-checkout 109s $ hg addremove 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s adding .GIT/hooks/post-checkout 109s $ hg ci -m "also refuse to export this" 109s - $ hg book master 109s - $ hg gexport 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + $ hg book master 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + $ hg gexport 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + hg: unknown command 'gexport' 109s + (did you mean one of export, import?) 109s + [10] 109s $ cd .. 109s 109s And the NTFS case: 109s $ cd .. 109s $ rm -rf hg 109s $ hg init hg 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s $ cd hg 109s $ mkdir -p GIT~1/hooks/ 109s $ cat > GIT~1/hooks/post-checkout < EOF 109s $ chmod +x GIT~1/hooks/post-checkout 109s $ hg addremove 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s adding GIT~1/hooks/post-checkout 109s $ hg ci -m "also refuse to export this" 109s - $ hg book master 109s - $ hg gexport 109s - warning: skipping invalid path 'GIT~1/hooks/post-checkout' 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + $ hg book master 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + $ hg gexport 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + hg: unknown command 'gexport' 109s + (did you mean one of export, import?) 109s + [10] 109s $ cd .. 109s 109s Now check a Git repository containing a Mercurial repository, which 109s @@ -127,36 +163,29 @@ 109s $ rm -rf hg git nested 109s $ git init -q git 109s $ hg init nested 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s $ mv nested git 109s $ cd git 109s $ git add nested 109s $ fn_git_commit -m 'add a Mercurial repository' 109s $ cd .. 109s $ hg clone --config hggit.invalidpaths=abort git hg 109s - importing 1 git commits 109s - abort: invalid path 'nested/.hg/00changelog.i' rejected by configuration 109s - (see 'hg help config.hggit.invalidpaths for details) 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + abort: repository git not found 109s [255] 109s $ rm -rf hg 109s $ hg clone --config hggit.invalidpaths=keep git hg 109s - importing 1 git commits 109s - warning: path 'nested/.hg/00changelog.i' contains an invalid path component 109s - warning: path 'nested/.hg/requires' contains an invalid path component 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + abort: repository git not found 109s warning: path 'nested/.hg/store/requires' contains an invalid path component (?) 109s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 109s warning: path 'nested/.hg/store/requires' is within a nested repository, which Mercurial cannot check out. (?) 109s - updating to bookmark master 109s - abort: path 'nested/.hg/00changelog.i' is inside nested repo 'nested' 109s - [10] 109s + [255] 109s $ rm -rf hg 109s $ hg clone git hg 109s - importing 1 git commits 109s - warning: skipping invalid path 'nested/.hg/00changelog.i' 109s - warning: skipping invalid path 'nested/.hg/requires' 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + abort: repository git not found 109s warning: skipping invalid path 'nested/.hg/store/requires' (?) 109s - new changesets 3ea18a67c0e6 (1 drafts) 109s - updating to bookmark master 109s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 109s + [255] 109s $ cd .. 109s 109s Now check a Git repository containing paths with carriage return and 109s @@ -171,23 +200,16 @@ 109s $ fn_git_commit -m 'add files disallowed by mercurial' 109s $ cd .. 109s $ hg clone --config hggit.invalidpaths=abort git hg 109s - importing 1 git commits 109s - abort: invalid path 'Icon\r' rejected by configuration 109s - (see 'hg help config.hggit.invalidpaths for details) 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + abort: repository git not found 109s [255] 109s $ hg clone --config hggit.invalidpaths=keep git hg 109s - importing 1 git commits 109s - warning: skipping invalid path 'Icon\r' 109s - warning: skipping invalid path 'the\nfile' 109s - new changesets 8354c06a5842 (1 drafts) 109s - updating to bookmark master 109s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + abort: repository git not found 109s + [255] 109s $ rm -rf hg 109s $ hg clone git hg 109s - importing 1 git commits 109s - warning: skipping invalid path 'Icon\r' 109s - warning: skipping invalid path 'the\nfile' 109s - new changesets 8354c06a5842 (1 drafts) 109s - updating to bookmark master 109s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 109s - 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + abort: repository git not found 109s + [255] 109s + 109s 109s ERROR: test-illegal-contents.t output changed 110s ! 110s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-phases-remote.t 110s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-phases-remote.t.err 110s @@ -26,193 +26,10 @@ 110s $ cd .. 110s 110s $ hg clone --config hggit.usephases=True -U gitrepo hgrepo 110s - importing 4 git commits 110s - new changesets ff7a2f2d8d70:25eed24f5e8f (1 drafts) 110s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 110s + abort: repository gitrepo not found 110s + [255] 110s 110s $ cd hgrepo 110s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 110s $ hg log -G -T '{rev}|{phase}|{bookmarks}|{tags}\n' 110s - o 3|public||thetag tip 110s - | 110s - | o 2|draft|not-master|default/not-master 110s - |/ 110s - | o 1|public|master|default/master 110s - |/ 110s - o 0|public|| 110s - 110s - $ hg phase -r 'all()' | tee $TESTTMP/after-clone 110s - 0: public 110s - 1: public 110s - 2: draft 110s - 3: public 110s - $ cat >> .hg/hgrc < [paths] 110s - > other = $TESTTMP/gitrepo/.git 110s - > other:hg-git.publish = no 110s - > EOF 110s - $ cd .. 110s - 110s -that disables publishing from that remote 110s - 110s - $ cd hgrepo 110s - $ hg phase -fd 'all()' 110s - $ hg pull other 110s - pulling from $TESTTMP/gitrepo/.git 110s - no changes found 110s - $ hg log -qr 'public()' 110s - $ hg pull -v --config hggit.usephases=True other 110s - pulling from $TESTTMP/gitrepo/.git 110s - no changes found 110s - processing commits in batches of 1000 110s - bookmark master is up-to-date 110s - bookmark not-master is up-to-date 110s - $ hg log -qr 'public()' 110s - $ cd .. 110s - 110s -but not default when enable by the global setting 110s - 110s - $ cd hgrepo 110s - $ hg phase -fd 'all()' 110s - no phases changed 110s - $ hg pull -v --config hggit.usephases=True 110s - pulling from $TESTTMP/gitrepo 110s - publishing remote HEAD 110s - publishing tag thetag 110s - no changes found 110s - processing commits in batches of 1000 110s - bookmark master is up-to-date 110s - bookmark not-master is up-to-date 110s - publishing remote HEAD 110s - publishing tag thetag 110s - 3 local changesets published 110s - $ hg phase -r 'all()' > $TESTTMP/after-pull 110s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 110s - $ cd .. 110s - 110s -or the path option 110s - 110s - $ cd hgrepo 110s - $ hg phase -fd 'all()' 110s - $ hg pull -v --config paths.default:hg-git.publish=yes 110s - pulling from $TESTTMP/gitrepo 110s - publishing remote HEAD 110s - publishing tag thetag 110s - no changes found 110s - processing commits in batches of 1000 110s - bookmark master is up-to-date 110s - bookmark not-master is up-to-date 110s - publishing remote HEAD 110s - publishing tag thetag 110s - 3 local changesets published 110s - $ hg phase -r 'all()' > $TESTTMP/after-pull 110s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 110s - $ cd .. 110s - 110s -but we can specify individual branches 110s - 110s - $ cd hgrepo 110s - $ hg phase -fd 'all()' 110s - $ hg pull -v --config paths.default:hg-git.publish=not-master 110s - pulling from $TESTTMP/gitrepo 110s - publishing branch not-master 110s - no changes found 110s - processing commits in batches of 1000 110s - bookmark master is up-to-date 110s - bookmark not-master is up-to-date 110s - publishing branch not-master 110s - 2 local changesets published 110s - $ hg phase -r master -r not-master -r thetag 110s - 1: draft 110s - 2: public 110s - 3: draft 110s - $ cd .. 110s - 110s -and we can also specify the tag 110s - 110s - $ cd hgrepo 110s - $ hg phase -fd 'all()' 110s - $ hg pull -v --config paths.default:hg-git.publish=thetag 110s - pulling from $TESTTMP/gitrepo 110s - publishing tag thetag 110s - no changes found 110s - processing commits in batches of 1000 110s - bookmark master is up-to-date 110s - bookmark not-master is up-to-date 110s - publishing tag thetag 110s - 2 local changesets published 110s - $ hg phase -r master -r not-master -r thetag 110s - 1: draft 110s - 2: draft 110s - 3: public 110s - $ cd .. 110s - 110s - 110s -Check multiple paths behavior 110s -============================= 110s - 110s - 110s - $ cd hgrepo 110s - $ cat >> .hg/hgrc < [paths] 110s - > multi:multi-urls = yes 110s - > multi = path://other, path://default 110s - > recursive:multi-urls = yes 110s - > recursive = path://multi, default 110s - > EOF 110s - 110s -Using multiple path works fine: 110s - 110s - 110s - $ hg pull multi --config paths.default:hg-git.publish=yes 110s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 110s - [255] 110s - 110s -Recursive multiple path are tricker, but Mercurial don't work with them either. 110s -This test exist to make sure we bail out on our own. 110s - 110s - 110s -`yes` should abort (until we implement it) 110s - 110s - $ hg pull multi --config paths.default:hg-git.publish=yes 110s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 110s - [255] 110s - 110s -`some-value` should abort (until we implement it) 110s - 110s - $ hg pull multi --config paths.default:hg-git.publish=thetag 110s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 110s - [255] 110s - 110s -`no` is fine 110s - 110s - $ hg pull multi --config paths.default:hg-git.publish=no 110s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 110s - [255] 110s - 110s - $ cd .. 110s - 110s -Check conflicting paths behavior 110s -================================ 110s - 110s - $ cd hgrepo 110s - $ cat > .hg/hgrc < [paths] 110s - > default = $TESTTMP/gitrepo 110s - > default:hg-git.publish = yes 110s - > also-default = $TESTTMP/gitrepo 110s - > EOF 110s - $ hg pull also-default 110s - pulling from $TESTTMP/gitrepo 110s - abort: different publishing configurations for the same remote location 110s - (conflicting paths: also-default, default) 110s - [255] 110s - $ hg pull --config paths.also-default:hg-git.publish=no 110s - pulling from $TESTTMP/gitrepo 110s - abort: different publishing configurations for the same remote location 110s - (conflicting paths: also-default, default) 110s - [255] 110s - $ hg pull --config paths.also-default:hg-git.publish=true 110s - pulling from $TESTTMP/gitrepo 110s - no changes found 110s - 1 local changesets published 110s - $ cd .. 110s - 110s 110s ERROR: test-phases-remote.t output changed 114s ! 114s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-serve-hg-static.t 114s +++ /tmp/autopkgtest.B7JscZ/build.ihL/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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 114s adding .dotfile with spaces 114s adding bar 114s $ hg commit -m"test" 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 114s $ hg tip 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 114s $ hg push 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 114s $ hg init sub 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 114s $ touch sub/test 114s $ hg -R sub commit -A -m "test" 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 114s adding test 114s $ hg -R sub tag not-empty 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 114s $ echo sub=sub > .hgsub 114s $ echo a > a 114s $ hg add a .hgsub 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 114s $ hg -q ci -ma 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 114s $ hg clone static-http://localhost:$HGPORT/ local2 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 114s $ hg clone static-http://localhost:$HGPORT/remotempty local3 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 114s $ echo 1 > foo 114s $ hg commit -m 'commit 1' 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 114s $ hg -q up 0 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 114s $ hg branch mybranch 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 114s $ hg tag -r 1 'default-tag' 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 114s $ hg tag -r 2 'branch-tag' 114s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 114s adding changesets 114s adding manifests 114s adding file changes 114s 114s ERROR: test-serve-hg-static.t output changed 115s ! 115s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-octopus.t 115s +++ /tmp/autopkgtest.B7JscZ/build.ihL/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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/tests/test-hook.t 117s +++ /tmp/autopkgtest.B7JscZ/build.ihL/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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s $ hg book master 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s $ fn_commit hg e 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s $ hg push 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s $ hg push ../hgrepo-copy 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s $ hg book -i 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s $ hg branch -q abranch 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s $ fn_commit hg x 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s $ hg up -q default 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s $ hg branch -q alsoabranch 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s $ fn_commit hg y 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s $ hg push ../hgrepo-copy 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 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 122s ! 122s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-transactions.t 122s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-transactions.t.err 122s @@ -42,19 +42,29 @@ 122s 122s $ hg clone gitrepo hgrepo --config hggit.mapsavefrequency=10 --debug \ 122s > | grep -c saving 122s - 1 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s + abort: repository gitrepo not found 122s + 0 122s + [1] 122s $ rm -rf hgrepo 122s 122s pull with mapsavefreq set 122s 122s $ hg init hgrepo 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s $ cat >> hgrepo/.hg/hgrc < [paths] 122s > default = $TESTTMP/gitrepo 122s > EOF 122s $ hg -R hgrepo --config hggit.mapsavefrequency=10 pull --debug \ 122s > | grep -c saving 122s - 10 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s + abort: repository $TESTTMP/gitrepo not found 122s + 0 122s + [1] 122s $ rm -rf hgrepo 122s 122s The user experience 122s @@ -66,6 +76,8 @@ 122s First, create a repository, set up to pull from git, and where we can interrupt the conversion. 122s 122s $ hg init hgrepo 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s $ cat >> hgrepo/.hg/hgrc < [paths] 122s > default = $TESTTMP/gitrepo 122s @@ -75,39 +87,49 @@ 122s A low save interval causes a lot of reports: 122s 122s $ hg --config hggit.mapsavefrequency=25 pull 122s - pulling from $TESTTMP/gitrepo 122s - importing 100 git commits 122s - new changesets 1c8407413fa3:abc468b9e51b (25 drafts) 122s - new changesets 217c308baf47:d5d14eeedd08 (25 drafts) 122s - new changesets d9807ef6abcb:4678067bd500 (25 drafts) 122s - adding bookmark master 122s - new changesets c31a154888bb:eda59117ba04 (25 drafts) 122s - (run 'hg update' to get a working copy) 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s + pulling from $TESTTMP/gitrepo 122s + abort: repository $TESTTMP/gitrepo not found 122s + [255] 122s 122s Reset the repository 122s 122s $ hg debugstrip --no-backup 'all()' 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s + abort: empty revision set 122s + [255] 122s $ hg debug-remove-hggit-state 122s - clearing out the git cache data 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s + hg: unknown command 'debug-remove-hggit-state' 122s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 122s + [10] 122s 122s And with phases? No mention of draft changesets, as we publish changes 122s during the conversion: 122s 122s $ hg --config hggit.mapsavefrequency=25 --config hggit.usephases=yes pull 122s - pulling from $TESTTMP/gitrepo 122s - importing 100 git commits 122s - new changesets 1c8407413fa3:abc468b9e51b 122s - new changesets 217c308baf47:d5d14eeedd08 122s - new changesets d9807ef6abcb:4678067bd500 122s - updating bookmark master 122s - new changesets c31a154888bb:eda59117ba04 122s - (run 'hg update' to get a working copy) 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s + pulling from $TESTTMP/gitrepo 122s + abort: repository $TESTTMP/gitrepo not found 122s + [255] 122s 122s Reset the repository 122s 122s $ hg debugstrip --no-backup 'all()' 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s + abort: empty revision set 122s + [255] 122s $ hg debug-remove-hggit-state 122s - clearing out the git cache data 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s + hg: unknown command 'debug-remove-hggit-state' 122s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 122s + [10] 122s 122s Interruptions 122s ------------- 122s @@ -121,54 +143,51 @@ 122s Test an error in a pull: 122s 122s $ ABORT_AFTER=99 hg pull 122s - pulling from $TESTTMP/gitrepo 122s - importing 100 git commits 122s - transaction abort! 122s - rollback completed 122s - abort: aborted after 99 commits! 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s + pulling from $TESTTMP/gitrepo 122s + abort: repository $TESTTMP/gitrepo not found 122s [255] 122s $ hg log -l 10 -T '{rev} {gitnode}\n' 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s 122s Test the user exiting in the first transaction: 122s 122s $ EXIT_AFTER=5 hg --config hggit.mapsavefrequency=10 pull 122s - pulling from $TESTTMP/gitrepo 122s - importing 100 git commits 122s - transaction abort! 122s - rollback completed 122s - interrupted! 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s + pulling from $TESTTMP/gitrepo 122s + abort: repository $TESTTMP/gitrepo not found 122s [255] 122s $ hg log -l 10 -T '{rev} {gitnode}\n' 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s 122s Check that we have no state, but clear it just in case 122s 122s $ ls -d .hg/git* 122s - .hg/git 122s + ls: cannot access '.hg/git*': No such file or directory 122s + [2] 122s $ hg debug-remove-hggit-state 122s - clearing out the git cache data 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s + hg: unknown command 'debug-remove-hggit-state' 122s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 122s + [10] 122s 122s Test the user exiting in the middle of a conversion, after the first 122s transaction: 122s 122s $ EXIT_AFTER=15 hg --config hggit.mapsavefrequency=10 pull 122s - pulling from $TESTTMP/gitrepo 122s - importing 100 git commits 122s - new changesets 1c8407413fa3:7c8c534a5fbe (10 drafts) 122s - transaction abort! 122s - rollback completed 122s - interrupted! 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s + pulling from $TESTTMP/gitrepo 122s + abort: repository $TESTTMP/gitrepo not found 122s [255] 122s $ hg log -l 10 -T '{rev} {gitnode}\n' 122s - 9 7cbb16ec981b308e1e2b181f8e1f22c8f409f44e 122s - 8 42da70ed92bbecf9f348ba59c93646be723d0bf2 122s - 7 17e841146e5744b81af9959634d82c20a5d7df52 122s - 6 c31065bf97bf014815e37cdfbdef2c32c687f314 122s - 5 fcf21b8e0520ec1cced1d7593d13f9ee54721269 122s - 4 46acd02d0352e4b92bd6a099bb0490305d847a18 122s - 3 61eeda444b37b8aa3892d5f04c66c5441d21dd66 122s - 2 e55db11bb0472791c7af3fc636772174cdea4a36 122s - 1 17a2672b3c24c02d568f99d8d55ccae2bf362d5c 122s - 0 4e195b4c6e77604b70a8ad3b01306adbb9b1c7e7 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s $ cd .. 122s $ rm -rf hgrepo 122s 122s @@ -183,12 +202,10 @@ 122s > hg --config hggit.mapsavefrequency=10 --config git.intree=yes \ 122s > --cwd hgrepo \ 122s > clone -U $TESTTMP/gitrepo . 122s - importing 100 git commits 122s - transaction abort! 122s - rollback completed 122s - interrupted! 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + *** failed to import extension "breakage" from /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/testlib/ext-break-git-import.py: b'hggit' 122s + abort: repository $TESTTMP/gitrepo not found 122s [255] 122s the leftover below appeared in Mercurial 5.9+; it is unintentional 122s $ ls -A hgrepo 122s - .git 122s - $ rm -rf hgrepo 122s + $ rm -rf hgrepo 122s 122s ERROR: test-transactions.t output changed 123s ! 123s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-outgoing.t 123s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-outgoing.t.err 123s @@ -14,166 +14,10 @@ 123s 123s $ cd .. 123s $ hg clone gitrepo hgrepo 123s - importing 1 git commits 123s - new changesets ff7a2f2d8d70 (1 drafts) 123s - updating to bookmark master 123s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 123s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 123s + abort: repository gitrepo not found 123s + [255] 123s 123s $ cd hgrepo 123s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 123s $ hg book 123s - alpha 0:ff7a2f2d8d70 123s - * master 0:ff7a2f2d8d70 123s - $ hg update -q master 123s - $ echo beta > beta 123s - $ hg add beta 123s - $ fn_hg_commit -m 'add beta' 123s - 123s - 123s - $ echo gamma > gamma 123s - $ hg add gamma 123s - $ fn_hg_commit -m 'add gamma' 123s - 123s - $ hg book -r 1 beta 123s - 123s - $ hg outgoing | grep -v 'searching for changes' 123s - comparing with $TESTTMP/gitrepo 123s - changeset: 1:47580592d3d6 123s - bookmark: beta 123s - user: test 123s - date: Mon Jan 01 00:00:11 2007 +0000 123s - summary: add beta 123s - 123s - changeset: 2:953796e1cfd8 123s - bookmark: master 123s - tag: tip 123s - user: test 123s - date: Mon Jan 01 00:00:12 2007 +0000 123s - summary: add gamma 123s - 123s - $ hg outgoing -r beta 123s - comparing with $TESTTMP/gitrepo 123s - searching for changes 123s - changeset: 1:47580592d3d6 123s - bookmark: beta 123s - user: test 123s - date: Mon Jan 01 00:00:11 2007 +0000 123s - summary: add beta 123s - 123s - $ hg outgoing -r master 123s - comparing with $TESTTMP/gitrepo 123s - searching for changes 123s - changeset: 1:47580592d3d6 123s - bookmark: beta 123s - user: test 123s - date: Mon Jan 01 00:00:11 2007 +0000 123s - summary: add beta 123s - 123s - changeset: 2:953796e1cfd8 123s - bookmark: master 123s - tag: tip 123s - user: test 123s - date: Mon Jan 01 00:00:12 2007 +0000 123s - summary: add gamma 123s - 123s - 123s - $ cd .. 123s - 123s -some more work on master from git 123s - $ cd gitrepo 123s - 123s -Check state of refs after outgoing 123s - $ git show-ref 123s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/alpha 123s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/master 123s - 123s - $ git checkout master 2>&1 | sed s/\'/\"/g 123s - Already on "master" 123s - $ echo delta > delta 123s - $ git add delta 123s - $ fn_git_commit -m "add delta" 123s - 123s - $ cd .. 123s - 123s - $ cd hgrepo 123s -this will fail # maybe we should try to make it work 123s - $ hg outgoing 123s - comparing with $TESTTMP/gitrepo 123s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 123s - [255] 123s -let's pull and try again 123s - $ hg pull 123s - pulling from */gitrepo (glob) 123s - importing 1 git commits 123s - not updating diverged bookmark master 123s - new changesets 25eed24f5e8f (1 drafts) 123s - (run 'hg heads' to see heads, 'hg merge' to merge) 123s - $ hg log --graph 123s - o changeset: 3:25eed24f5e8f 123s - | tag: default/master 123s - | tag: tip 123s - | parent: 0:ff7a2f2d8d70 123s - | user: test 123s - | date: Mon Jan 01 00:00:13 2007 +0000 123s - | summary: add delta 123s - | 123s - | @ changeset: 2:953796e1cfd8 123s - | | bookmark: master 123s - | | user: test 123s - | | date: Mon Jan 01 00:00:12 2007 +0000 123s - | | summary: add gamma 123s - | | 123s - | o changeset: 1:47580592d3d6 123s - |/ bookmark: beta 123s - | user: test 123s - | date: Mon Jan 01 00:00:11 2007 +0000 123s - | summary: add beta 123s - | 123s - o changeset: 0:ff7a2f2d8d70 123s - bookmark: alpha 123s - tag: default/alpha 123s - user: test 123s - date: Mon Jan 01 00:00:10 2007 +0000 123s - summary: add alpha 123s - 123s - $ hg outgoing 123s - comparing with $TESTTMP/gitrepo 123s - searching for changes 123s - changeset: 1:47580592d3d6 123s - bookmark: beta 123s - user: test 123s - date: Mon Jan 01 00:00:11 2007 +0000 123s - summary: add beta 123s - 123s - changeset: 2:953796e1cfd8 123s - bookmark: master 123s - user: test 123s - date: Mon Jan 01 00:00:12 2007 +0000 123s - summary: add gamma 123s - 123s - $ hg outgoing -r beta 123s - comparing with $TESTTMP/gitrepo 123s - searching for changes 123s - changeset: 1:47580592d3d6 123s - bookmark: beta 123s - user: test 123s - date: Mon Jan 01 00:00:11 2007 +0000 123s - summary: add beta 123s - 123s - $ hg outgoing -r master 123s - comparing with $TESTTMP/gitrepo 123s - searching for changes 123s - changeset: 1:47580592d3d6 123s - bookmark: beta 123s - user: test 123s - date: Mon Jan 01 00:00:11 2007 +0000 123s - summary: add beta 123s - 123s - changeset: 2:953796e1cfd8 123s - bookmark: master 123s - user: test 123s - date: Mon Jan 01 00:00:12 2007 +0000 123s - summary: add gamma 123s - 123s - 123s - 123s - $ cd .. 123s 123s ERROR: test-outgoing.t output changed 125s ! 125s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-gc.t 125s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-gc.t.err 125s @@ -25,188 +25,9 @@ 125s > done 125s $ cd .. 125s $ hg clone -U gitrepo hgrepo 125s - importing 100 git commits 125s - new changesets 1c8407413fa3:eda59117ba04 (100 drafts) 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: repository gitrepo not found 125s + [255] 125s $ cd hgrepo 125s + $TESTTMP.sh: 24: cd: can't cd to hgrepo 125s $ hg debug-remove-hggit-state 125s - clearing out the git cache data 125s - 125s ------------ 125s - 125s -Test garbage collection of loose objects into packs. We first test 125s -this with two threads, which is closest to the expected usage 125s -scenario, as almost all computers have at least two cores these days. 125s -The main downside is that this makes the output order unreliable, so 125s -we just sort it. 125s - 125s - $ hg gexport --config hggit.mapsavefrequency=33 --config hggit.threads=2 --debug | grep pack | sort 125s - packed 3 loose objects! 125s - packed 75 loose objects! 125s - packed 78 loose objects! 125s - packed 86 loose objects! 125s - packing 3 loose objects... 125s - packing 75 loose objects... 125s - packing 78 loose objects... 125s - packing 86 loose objects... 125s - $ hg debug-remove-hggit-state 125s - clearing out the git cache data 125s - 125s -Test the actual order of operations -- this uses a single thread, 125s -which means that the packing happens synchronously in the main thread, 125s -giving us a reliable output order. 125s - 125s -In addition, the transaction size is set up such that we happen to do 125s -nothing in the final, synchronous packing that happens on every pull. 125s -Lots of other tests have a map save frequency higher than the total 125s -amount of commits pulled, but let's just trigger that other odd 125s -occurence here. 125s - 125s - $ hg gexport --debug \ 125s - > --config hggit.mapsavefrequency=10 --config hggit.threads=1 | \ 125s - > sed 's/^converting revision.*/./' 125s - finding unexported changesets 125s - exporting 100 changesets 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 125s - packing 30 loose objects... 125s - packed 30 loose objects! 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 125s - packing 25 loose objects... 125s - packed 25 loose objects! 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 125s - packing 25 loose objects... 125s - packed 25 loose objects! 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 125s - packing 24 loose objects... 125s - packed 24 loose objects! 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 125s - packing 24 loose objects... 125s - packed 24 loose objects! 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 125s - packing 24 loose objects... 125s - packed 24 loose objects! 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 125s - packing 24 loose objects... 125s - packed 24 loose objects! 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 125s - packing 23 loose objects... 125s - packed 23 loose objects! 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 125s - packing 22 loose objects... 125s - packed 22 loose objects! 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - . 125s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 125s - packing 21 loose objects... 125s - packed 21 loose objects! 125s - packing 0 loose objects... 125s - packed 0 loose objects! 125s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 125s - $ find .hg/git/objects -type f | grep -Fv .idx | sort 125s - .hg/git/objects/pack/pack-33903607b479000b976a29a349fe0f4dffb0aaac.pack 125s - .hg/git/objects/pack/pack-40d9440e392d9eab62fa38a2ed66cc763d77aca3.pack 125s - .hg/git/objects/pack/pack-4ab2dac268f94e407788d52d6ba087b626c41651.pack 125s - .hg/git/objects/pack/pack-543e3b37bd36218a4dc6611a96d7c218afb78429.pack 125s - .hg/git/objects/pack/pack-5fc80292253ee10d1b86b5c4d9c51b29d2b4ba47.pack 125s - .hg/git/objects/pack/pack-9c636f5f16302fc5fadf0cc4ed42aeb67fc51f6a.pack 125s - .hg/git/objects/pack/pack-ae74b1f0197dfb45cfb13889453860a40103969a.pack 125s - .hg/git/objects/pack/pack-b432e2f477cb765fc0aeaa850d56e04b10392e6c.pack 125s - .hg/git/objects/pack/pack-cf7023660ce10ede2896d1be117f6ba93a261ff9.pack 125s - .hg/git/objects/pack/pack-e601b2af6a91a9cf6817d71f4eb660d2218d4094.pack 125s 125s ERROR: test-gc.t output changed 126s ! 126s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-phases-public.t 126s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-phases-public.t#publish-defaults.err 126s @@ -24,149 +24,10 @@ 126s 126s cloning with hggit.usephases publishes cloned HEAD 126s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 126s - importing 1 git commits 126s - new changesets ff7a2f2d8d70 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s + abort: repository gitrepo not found 126s + [255] 126s 126s $ cd hgrepo 126s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 126s $ hg phase -r master 126s - 0: public 126s - $ cd .. 126s - 126s -pulled changesets are public 126s - $ cd gitrepo 126s - $ git checkout -q master 126s - $ echo beta > beta 126s - $ git add beta 126s - $ fn_git_commit -m 'add beta' 126s - $ git checkout -b not-master 126s - Switched to a new branch 'not-master' 126s - $ echo gamma > gamma 126s - $ git add gamma 126s - $ fn_git_commit -m 'add gamma' 126s - $ git tag thetag 126s - $ echo delta > delta 126s - $ git add delta 126s - $ fn_git_commit -m 'add delta' 126s - $ git checkout master 126s - Switched to branch 'master' 126s - $ cd .. 126s - 126s - $ cd hgrepo 126s - $ cat >>$HGRCPATH < [paths] 126s - > other = $TESTTMP/gitrepo/.git 126s - > [hggit] 126s - > usephases = True 126s - > EOF 126s - 126s - $ hg phase -fd 'all()' 126s - 126s -we can restrict publishing to the remote HEAD and that tag, which 126s -happens to be the same thing here 126s - 126s -#if publish-specific 126s - $ cat >>$HGRCPATH < [git] 126s - > public = default/master, thetag 126s - > EOF 126s -#endif 126s - 126s -pulling publishes the branch 126s - 126s - $ hg phase -r master 126s - 0: draft 126s -#if publish-defaults 126s - $ hg pull -r master other 126s - pulling from $TESTTMP/gitrepo/.git 126s - importing 1 git commits 126s - updating bookmark master 126s - new changesets 7fe02317c63d 126s - 1 local changesets published 126s - (run 'hg update' to get a working copy) 126s -#else 126s - $ hg pull -r master other 126s - pulling from $TESTTMP/gitrepo/.git 126s - importing 1 git commits 126s - updating bookmark master 126s - new changesets 7fe02317c63d (1 drafts) 126s - (run 'hg update' to get a working copy) 126s -#endif 126s - $ hg phase -r master 126s - 1: draft (publish-specific !) 126s - 1: public (publish-defaults !) 126s -#if publish-defaults 126s - $ hg phase -fd master 126s - $ hg pull 126s - pulling from $TESTTMP/gitrepo 126s - importing 2 git commits 126s - adding bookmark not-master 126s - new changesets ca33a262eb46:03769a650ded (1 drafts) 126s - 1 local changesets published 126s - (run 'hg update' to get a working copy) 126s -#else 126s - $ hg pull 126s - pulling from $TESTTMP/gitrepo 126s - importing 2 git commits 126s - adding bookmark not-master 126s - new changesets ca33a262eb46:03769a650ded (1 drafts) 126s - 2 local changesets published 126s - (run 'hg update' to get a working copy) 126s -#endif 126s - $ hg phase -r master -r not-master -r thetag 126s - 1: public 126s - 3: draft 126s - 2: public 126s - 126s -public bookmark not pushed is not published after pull 126s - 126s - $ hg update 0 126s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 126s - $ echo delta > delta 126s - $ hg bookmark not-pushed 126s - $ hg add delta 126s - $ hg commit -m 'add delta' 126s - created new head 126s - $ hg phase -r 'all()' > $TESTTMP/before 126s - $ hg pull --config git.public=master,not-pushed 126s - pulling from $TESTTMP/gitrepo 126s - no changes found 126s - $ hg phase -r 'all()' > $TESTTMP/after 126s - $ cmp -s $TESTTMP/before $TESTTMP/after 126s - $ hg phase -r not-pushed 126s - 4: draft 126s - $ rm $TESTTMP/before $TESTTMP/after 126s - 126s -pushing public bookmark publishes local changesets, but only those 126s -actually pushed 126s - 126s - $ hg update master 126s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 126s - (activating bookmark master) 126s - $ echo epsilon > epsilon 126s - $ hg add epsilon 126s - $ hg commit -m 'add epsilon' 126s - created new head 126s - $ hg phase -r 'all() - master' > $TESTTMP/before 126s - $ hg push -B not-pushed 126s - pushing to $TESTTMP/gitrepo 126s - searching for changes 126s - adding objects 126s - remote: found 0 deltas to reuse 126s - added 1 commits with 1 trees and 1 blobs 126s - adding reference refs/heads/not-pushed 126s - $ hg phase -r 'all() - master' > $TESTTMP/after 126s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 126s - $ hg phase -r not-pushed -r master 126s - 4: draft 126s - 5: draft 126s - $ hg push -B master 126s - pushing to $TESTTMP/gitrepo 126s - searching for changes 126s - adding objects 126s - remote: found 0 deltas to reuse 126s - added 1 commits with 1 trees and 1 blobs 126s - updating reference refs/heads/master 126s - $ hg phase -r 'all() - master' > $TESTTMP/after 126s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 126s - $ hg phase -r master 126s - 5: public 126s 126s ERROR: test-phases-public.t#publish-defaults output changed 127s ! 127s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-phases-public.t 127s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-phases-public.t#publish-specific.err 127s @@ -24,149 +24,10 @@ 127s 127s cloning with hggit.usephases publishes cloned HEAD 127s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 127s - importing 1 git commits 127s - new changesets ff7a2f2d8d70 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + abort: repository gitrepo not found 127s + [255] 127s 127s $ cd hgrepo 127s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 127s $ hg phase -r master 127s - 0: public 127s - $ cd .. 127s - 127s -pulled changesets are public 127s - $ cd gitrepo 127s - $ git checkout -q master 127s - $ echo beta > beta 127s - $ git add beta 127s - $ fn_git_commit -m 'add beta' 127s - $ git checkout -b not-master 127s - Switched to a new branch 'not-master' 127s - $ echo gamma > gamma 127s - $ git add gamma 127s - $ fn_git_commit -m 'add gamma' 127s - $ git tag thetag 127s - $ echo delta > delta 127s - $ git add delta 127s - $ fn_git_commit -m 'add delta' 127s - $ git checkout master 127s - Switched to branch 'master' 127s - $ cd .. 127s - 127s - $ cd hgrepo 127s - $ cat >>$HGRCPATH < [paths] 127s - > other = $TESTTMP/gitrepo/.git 127s - > [hggit] 127s - > usephases = True 127s - > EOF 127s - 127s - $ hg phase -fd 'all()' 127s - 127s -we can restrict publishing to the remote HEAD and that tag, which 127s -happens to be the same thing here 127s - 127s -#if publish-specific 127s - $ cat >>$HGRCPATH < [git] 127s - > public = default/master, thetag 127s - > EOF 127s -#endif 127s - 127s -pulling publishes the branch 127s - 127s - $ hg phase -r master 127s - 0: draft 127s -#if publish-defaults 127s - $ hg pull -r master other 127s - pulling from $TESTTMP/gitrepo/.git 127s - importing 1 git commits 127s - updating bookmark master 127s - new changesets 7fe02317c63d 127s - 1 local changesets published 127s - (run 'hg update' to get a working copy) 127s -#else 127s - $ hg pull -r master other 127s - pulling from $TESTTMP/gitrepo/.git 127s - importing 1 git commits 127s - updating bookmark master 127s - new changesets 7fe02317c63d (1 drafts) 127s - (run 'hg update' to get a working copy) 127s -#endif 127s - $ hg phase -r master 127s - 1: draft (publish-specific !) 127s - 1: public (publish-defaults !) 127s -#if publish-defaults 127s - $ hg phase -fd master 127s - $ hg pull 127s - pulling from $TESTTMP/gitrepo 127s - importing 2 git commits 127s - adding bookmark not-master 127s - new changesets ca33a262eb46:03769a650ded (1 drafts) 127s - 1 local changesets published 127s - (run 'hg update' to get a working copy) 127s -#else 127s - $ hg pull 127s - pulling from $TESTTMP/gitrepo 127s - importing 2 git commits 127s - adding bookmark not-master 127s - new changesets ca33a262eb46:03769a650ded (1 drafts) 127s - 2 local changesets published 127s - (run 'hg update' to get a working copy) 127s -#endif 127s - $ hg phase -r master -r not-master -r thetag 127s - 1: public 127s - 3: draft 127s - 2: public 127s - 127s -public bookmark not pushed is not published after pull 127s - 127s - $ hg update 0 127s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 127s - $ echo delta > delta 127s - $ hg bookmark not-pushed 127s - $ hg add delta 127s - $ hg commit -m 'add delta' 127s - created new head 127s - $ hg phase -r 'all()' > $TESTTMP/before 127s - $ hg pull --config git.public=master,not-pushed 127s - pulling from $TESTTMP/gitrepo 127s - no changes found 127s - $ hg phase -r 'all()' > $TESTTMP/after 127s - $ cmp -s $TESTTMP/before $TESTTMP/after 127s - $ hg phase -r not-pushed 127s - 4: draft 127s - $ rm $TESTTMP/before $TESTTMP/after 127s - 127s -pushing public bookmark publishes local changesets, but only those 127s -actually pushed 127s - 127s - $ hg update master 127s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 127s - (activating bookmark master) 127s - $ echo epsilon > epsilon 127s - $ hg add epsilon 127s - $ hg commit -m 'add epsilon' 127s - created new head 127s - $ hg phase -r 'all() - master' > $TESTTMP/before 127s - $ hg push -B not-pushed 127s - pushing to $TESTTMP/gitrepo 127s - searching for changes 127s - adding objects 127s - remote: found 0 deltas to reuse 127s - added 1 commits with 1 trees and 1 blobs 127s - adding reference refs/heads/not-pushed 127s - $ hg phase -r 'all() - master' > $TESTTMP/after 127s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 127s - $ hg phase -r not-pushed -r master 127s - 4: draft 127s - 5: draft 127s - $ hg push -B master 127s - pushing to $TESTTMP/gitrepo 127s - searching for changes 127s - adding objects 127s - remote: found 0 deltas to reuse 127s - added 1 commits with 1 trees and 1 blobs 127s - updating reference refs/heads/master 127s - $ hg phase -r 'all() - master' > $TESTTMP/after 127s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 127s - $ hg phase -r master 127s - 5: public 127s 127s ERROR: test-phases-public.t#publish-specific output changed 130s ! 130s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-push-r.t 130s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-push-r.t.err 130s @@ -2,34 +2,43 @@ 130s $ . "$TESTDIR/testutil" 130s 130s $ hg init test 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s $ cd test 130s $ cat >>afile < 0 130s > EOF 130s $ hg add afile 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s $ fn_hg_commit -m "0.0" 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s $ cat >>afile < 1 130s > EOF 130s $ fn_hg_commit -m "0.1" 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s $ cat >>afile < 2 130s > EOF 130s $ fn_hg_commit -m "0.2" 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s $ cat >>afile < 3 130s > EOF 130s $ fn_hg_commit -m "0.3" 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s $ hg update -C 0 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 130s $ cat >>afile < 1 130s > EOF 130s $ fn_hg_commit -m "1.1" 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s $ cat >>afile < 2 130s > EOF 130s $ fn_hg_commit -m "1.2" 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s $ cat >fred < a line 130s > EOF 130s @@ -37,13 +46,20 @@ 130s > 3 130s > EOF 130s $ hg add fred 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s $ fn_hg_commit -m "1.3" 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s $ hg mv afile adifferentfile 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s $ fn_hg_commit -m "1.3m" 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s $ hg update -C 3 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 130s $ hg mv afile anotherfile 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s $ fn_hg_commit -m "0.3m" 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s $ cd .. 130s $ for i in 0 1 2 3 4 5 6 7 8; do 130s > mkdir test-"$i" 130s @@ -53,128 +69,166 @@ 130s > hg verify 130s > cd .. 130s > done 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s pushing to test-0 130s searching for changes 130s adding changesets 130s adding manifests 130s adding file changes 130s added 1 changesets with 1 changes to 1 files 130s - checking changesets 130s - checking manifests 130s - crosschecking files in changesets and manifests 130s - checking files 130s - checking dirstate (?) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + checking changesets 130s + checking dirstate (?) 130s + checking manifests 130s + crosschecking files in changesets and manifests 130s + checking files 130s + checking dirstate 130s checked 1 changesets with 1 changes to 1 files 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s pushing to test-1 130s searching for changes 130s adding changesets 130s adding manifests 130s + checking dirstate (?) 130s adding file changes 130s added 2 changesets with 2 changes to 1 files 130s - checking changesets 130s - checking manifests 130s - crosschecking files in changesets and manifests 130s - checking files 130s - checking dirstate (?) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + checking changesets 130s + checking manifests 130s + crosschecking files in changesets and manifests 130s + checking files 130s + checking dirstate 130s checked 2 changesets with 2 changes to 1 files 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + checking dirstate (?) 130s pushing to test-2 130s searching for changes 130s adding changesets 130s adding manifests 130s adding file changes 130s added 3 changesets with 3 changes to 1 files 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s checking changesets 130s checking manifests 130s crosschecking files in changesets and manifests 130s checking files 130s checking dirstate (?) 130s checked 3 changesets with 3 changes to 1 files 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s pushing to test-3 130s searching for changes 130s adding changesets 130s adding manifests 130s adding file changes 130s added 4 changesets with 4 changes to 1 files 130s - checking changesets 130s - checking manifests 130s - crosschecking files in changesets and manifests 130s - checking files 130s - checking dirstate (?) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + checking changesets 130s + checking dirstate (?) 130s + checking manifests 130s + crosschecking files in changesets and manifests 130s + checking files 130s + checking dirstate 130s checked 4 changesets with 4 changes to 1 files 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s pushing to test-4 130s searching for changes 130s adding changesets 130s adding manifests 130s + checking dirstate (?) 130s adding file changes 130s added 2 changesets with 2 changes to 1 files 130s - checking changesets 130s - checking manifests 130s - crosschecking files in changesets and manifests 130s - checking files 130s - checking dirstate (?) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + checking changesets 130s + checking manifests 130s + crosschecking files in changesets and manifests 130s + checking files 130s + checking dirstate 130s checked 2 changesets with 2 changes to 1 files 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + checking dirstate (?) 130s pushing to test-5 130s searching for changes 130s adding changesets 130s adding manifests 130s adding file changes 130s added 3 changesets with 3 changes to 1 files 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s checking changesets 130s checking manifests 130s crosschecking files in changesets and manifests 130s checking files 130s checking dirstate (?) 130s checked 3 changesets with 3 changes to 1 files 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s pushing to test-6 130s searching for changes 130s adding changesets 130s adding manifests 130s adding file changes 130s added 4 changesets with 5 changes to 2 files 130s - checking changesets 130s - checking manifests 130s - crosschecking files in changesets and manifests 130s - checking files 130s - checking dirstate (?) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + checking changesets 130s + checking dirstate (?) 130s + checking manifests 130s + crosschecking files in changesets and manifests 130s + checking files 130s + checking dirstate 130s checked 4 changesets with 5 changes to 2 files 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s pushing to test-7 130s searching for changes 130s adding changesets 130s adding manifests 130s adding file changes 130s added 5 changesets with 6 changes to 3 files 130s - checking changesets 130s - checking manifests 130s - crosschecking files in changesets and manifests 130s - checking files 130s - checking dirstate (?) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + checking changesets 130s + checking manifests 130s + crosschecking files in changesets and manifests 130s + checking files 130s + checking dirstate 130s checked 5 changesets with 6 changes to 3 files 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s pushing to test-8 130s searching for changes 130s adding changesets 130s adding manifests 130s adding file changes 130s added 5 changesets with 5 changes to 2 files 130s - checking changesets 130s - checking manifests 130s - crosschecking files in changesets and manifests 130s - checking files 130s - checking dirstate (?) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + checking changesets 130s + checking manifests 130s + crosschecking files in changesets and manifests 130s + checking files 130s + checking dirstate 130s checked 5 changesets with 5 changes to 2 files 130s $ cd test-8 130s $ hg pull ../test-7 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s pulling from ../test-7 130s searching for changes 130s adding changesets 130s adding manifests 130s adding file changes 130s + new changesets c29287bce33f:e70c8671c3d4 (?) 130s added 4 changesets with 2 changes to 3 files (+1 heads) 130s - new changesets c29287bce33f:e70c8671c3d4 (?) 130s + new changesets c29287bce33f:e70c8671c3d4 130s (run 'hg heads' to see heads, 'hg merge' to merge) 130s $ hg verify 130s - checking changesets 130s - checking manifests 130s - crosschecking files in changesets and manifests 130s - checking files 130s - checking dirstate (?) 130s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 130s + checking changesets 130s + checking manifests 130s + crosschecking files in changesets and manifests 130s + checking dirstate (?) 130s + checking files 130s + checking dirstate 130s checked 9 changesets with 7 changes to 4 files 130s 130s ERROR: test-push-r.t output changed 131s !s 131s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-invalid-refs.t 131s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-invalid-refs.t.err 131s @@ -12,115 +12,10 @@ 131s 131s $ cd .. 131s $ hg clone -U gitrepo hgrepo 131s - importing 1 git commits 131s - new changesets ff7a2f2d8d70 (1 drafts) 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository gitrepo not found 131s + [255] 131s 131s $ cd hgrepo 131s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 131s $ hg up master 131s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s - (activating bookmark master) 131s - $ fn_hg_tag alph#a 131s - $ fn_hg_tag bet*a 131s - $ fn_hg_tag 'gamm a' 131s - $ hg book -r . delt#a 131s - $ hg book -r . epsil*on 131s - 131s - $ hg gexport 131s - warning: not exporting tag 'bet*a' due to invalid name 131s - warning: not exporting bookmark 'epsil*on' due to invalid name 131s - 131s - $ hg push 131s - pushing to $TESTTMP/gitrepo 131s - warning: not exporting tag 'bet*a' due to invalid name 131s - warning: not exporting bookmark 'epsil*on' due to invalid name 131s - searching for changes 131s - adding objects 131s - remote: found 0 deltas to reuse 131s - added 3 commits with 3 trees and 3 blobs 131s - adding reference refs/heads/delt#a 131s - updating reference refs/heads/master 131s - adding reference refs/tags/alph#a 131s - adding reference refs/tags/gamm_a 131s - 131s - $ hg log --graph 131s - @ changeset: 3:0950ab44ea23 131s - | bookmark: delt#a 131s - | bookmark: epsil*on 131s - | bookmark: master 131s - | tag: default/delt#a 131s - | tag: default/master 131s - | tag: tip 131s - | user: test 131s - | date: Mon Jan 01 00:00:13 2007 +0000 131s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 131s - | 131s - o changeset: 2:0b27ab2b3df6 131s - | tag: gamm a 131s - | user: test 131s - | date: Mon Jan 01 00:00:12 2007 +0000 131s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 131s - | 131s - o changeset: 1:491ceeb1b0f1 131s - | tag: bet*a 131s - | user: test 131s - | date: Mon Jan 01 00:00:11 2007 +0000 131s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 131s - | 131s - o changeset: 0:ff7a2f2d8d70 131s - bookmark: not-master 131s - tag: alph#a 131s - tag: default/not-master 131s - user: test 131s - date: Mon Jan 01 00:00:10 2007 +0000 131s - summary: add alpha 131s - 131s - 131s - $ cd .. 131s - $ cd gitrepo 131s -git should have only the valid tag alph#a but have full commit log including the missing invalid bet*a tag commit 131s - $ git tag -l 131s - alph#a 131s - gamm_a 131s - 131s - $ cd .. 131s - $ hg clone -U gitrepo hgrepo2 131s - importing 4 git commits 131s - new changesets ff7a2f2d8d70:0950ab44ea23 (4 drafts) 131s - $ hg -R hgrepo2 log --graph 131s - o changeset: 3:0950ab44ea23 131s - | bookmark: delt#a 131s - | bookmark: master 131s - | tag: default/delt#a 131s - | tag: default/master 131s - | tag: tip 131s - | user: test 131s - | date: Mon Jan 01 00:00:13 2007 +0000 131s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 131s - | 131s - o changeset: 2:0b27ab2b3df6 131s - | tag: gamm a 131s - | tag: gamm_a 131s - | user: test 131s - | date: Mon Jan 01 00:00:12 2007 +0000 131s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 131s - | 131s - o changeset: 1:491ceeb1b0f1 131s - | tag: bet*a 131s - | user: test 131s - | date: Mon Jan 01 00:00:11 2007 +0000 131s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 131s - | 131s - o changeset: 0:ff7a2f2d8d70 131s - bookmark: not-master 131s - tag: alph#a 131s - tag: default/not-master 131s - user: test 131s - date: Mon Jan 01 00:00:10 2007 +0000 131s - summary: add alpha 131s - 131s - 131s -the tag should be in .hgtags 131s - $ hg cat -r master hgrepo2/.hgtags 131s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alph#a 131s - 491ceeb1b0f10d65d956dfcdd3470ac2bc2c96a8 bet*a 131s - 0b27ab2b3df69c6f7defd7040b93e539136db5be gamm a 131s 131s ERROR: test-invalid-refs.t output changed 132s ! 132s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-serve-hg.t 132s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-serve-hg.t#with-hggit.err 132s @@ -31,11 +31,11 @@ 132s $ cd .. 132s 132s $ hg clone gitrepo hgrepo 132s - importing 2 git commits 132s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 132s - updating to bookmark master 132s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s + abort: repository gitrepo not found 132s + [255] 132s $ cd hgrepo 132s + $TESTTMP.sh: 41: cd: can't cd to hgrepo 132s $ cat >> .hg/hgrc < [push] 132s > pushvars.server = true 132s @@ -45,81 +45,3 @@ 132s > [hooks] 132s > pretxnchangegroup = env | grep HG_USERVAR_ || true 132s > EOF 132s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 132s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 132s - 132s -Test server address cannot be reused 132s - 132s -#if windows 132s - $ hg serve -p $HGPORT1 2>&1 132s - abort: cannot start server at '*:$HGPORT1': * (glob) 132s - [255] 132s -#else 132s - $ hg serve -p $HGPORT1 2>&1 132s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 132s - [255] 132s -#endif 132s - $ cd .. 132s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 132s - 132s -Make sure that clone regular mercurial repos over http doesn't break, 132s -and that we can transfer the hg-git metadata 132s - 132s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 132s - requesting all changes 132s - adding changesets 132s - adding manifests 132s - adding file changes 132s - added 2 changesets with 4 changes to 4 files 132s - new changesets f488b65fa424:c61c38c3d614 (?) 132s - updating to branch default 132s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s - 132s -And it shouldn't create a Git repository needlessly: 132s - $ test -e copy/git 132s - [1] 132s - $ cd copy 132s - 132s -#if without-hggit 132s - $ hg tags 132s - tip 1:c61c38c3d614 132s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 132s - 1:c61c38c3d614 | master | | 132s - 0:f488b65fa424 | | | 132s - $ hg pull -u ../gitrepo 132s - pulling from ../gitrepo 132s - importing 2 git commits 132s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s -#else 132s - $ hg tags 132s - tip 1:c61c38c3d614 132s - thetag 0:f488b65fa424 132s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 132s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 132s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 132s - $ hg pull -u ../gitrepo 132s - pulling from ../gitrepo 132s - warning: created new git repository at $TESTTMP/copy/.hg/git 132s - no changes found 132s -#endif 132s - 132s - $ hg tags 132s - tip 1:c61c38c3d614 132s - thetag 0:f488b65fa424 132s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 132s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 132s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 132s - 132s -Furthermore, make sure that we pass all arguments when pushing: 132s - 132s - $ echo baz > baz 132s - $ fn_hg_commit -A -m baz 132s - $ hg push --pushvars FOO=BAR 132s - pushing to http://localhost:$HGPORT/ 132s - searching for changes 132s - remote: adding changesets 132s - remote: adding manifests 132s - remote: adding file changes 132s - remote: HG_USERVAR_FOO=BAR 132s - remote: added 1 changesets with 1 changes to 1 files 132s - $ cd .. 132s 132s ERROR: test-serve-hg.t#with-hggit output changed 132s ! 132s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-git-workflow.t 132s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-git-workflow.t.err 132s @@ -2,13 +2,20 @@ 132s $ . "$TESTDIR/testutil" 132s 132s $ hg init hgrepo 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s $ cd hgrepo 132s $ hg debuggitdir 132s - $TESTTMP/hgrepo/.hg/git 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s + hg: unknown command 'debuggitdir' 132s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 132s + [10] 132s $ echo alpha > alpha 132s $ hg add alpha 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s $ fn_hg_commit -m "add alpha" 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s $ hg log --graph --debug | grep -v phase: 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s @ changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 132s tag: tip 132s parent: -1:0000000000000000000000000000000000000000 132s @@ -27,49 +34,54 @@ 132s 132s configure for use from git 132s $ hg clone hgrepo gitrepo 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s updating to branch default 132s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s $ cd gitrepo 132s $ hg book master 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s $ hg up null 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 132s (leaving bookmark master) 132s $ echo "[git]" >> .hg/hgrc 132s $ echo "intree = True" >> .hg/hgrc 132s $ hg debuggitdir 132s - $TESTTMP/gitrepo/.git 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s + hg: unknown command 'debuggitdir' 132s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 132s + [10] 132s $ hg gexport 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s + hg: unknown command 'gexport' 132s + (did you mean one of export, import?) 132s + [10] 132s 132s do some work 132s $ git config core.bare false 132s + fatal: not in a git directory 132s + [128] 132s $ git checkout master 2>&1 | sed s/\'/\"/g 132s - Already on "master" 132s + fatal: not a git repository (or any of the parent directories): .git 132s $ echo beta > beta 132s $ git add beta 132s + fatal: not a git repository (or any of the parent directories): .git 132s + [128] 132s $ fn_git_commit -m 'add beta' 132s + fatal: not a git repository (or any of the parent directories): .git 132s + git commit error 132s 132s get things back to hg 132s $ hg gimport 132s - importing 1 git commits 132s - updating bookmark master 132s - new changesets 9f124f3c1fc2 (1 drafts) 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s + hg: unknown command 'gimport' 132s + (did you mean one of export, import?) 132s + [10] 132s $ hg log --graph --debug | grep -v phase: 132s - o changeset: 1:9f124f3c1fc29a14f5eb027c24811b0ac9d5ff10 132s - | bookmark: master 132s - | tag: tip 132s - | parent: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 132s - | parent: -1:0000000000000000000000000000000000000000 132s - | manifest: 1:f0bd6fbafbaebe4bb59c35108428f6fce152431d 132s - | user: test 132s - | date: Mon Jan 01 00:00:11 2007 +0000 132s - | files+: beta 132s - | extra: branch=default 132s - | extra: hg-git-rename-source=git 132s - | description: 132s - | add beta 132s - | 132s - | 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s o changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 132s + bookmark: master 132s + tag: tip 132s parent: -1:0000000000000000000000000000000000000000 132s parent: -1:0000000000000000000000000000000000000000 132s manifest: 0:8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0 132s @@ -83,7 +95,8 @@ 132s 132s gimport should have updated the bookmarks as well 132s $ hg bookmarks 132s - master 1:9f124f3c1fc2 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s + master 0:0221c246a567 132s 132s gimport support for git.mindate 132s $ cat >> .hg/hgrc << EOF 132s @@ -92,20 +105,23 @@ 132s > EOF 132s $ echo oldcommit > oldcommit 132s $ git add oldcommit 132s + fatal: not a git repository (or any of the parent directories): .git 132s + [128] 132s $ GIT_AUTHOR_DATE="2014-03-01 00:00:00 +0000" \ 132s > GIT_COMMITTER_DATE="2009-01-01 00:00:00 +0000" \ 132s > git commit -m oldcommit > /dev/null || echo "git commit error" 132s + fatal: not a git repository (or any of the parent directories): .git 132s + git commit error 132s $ hg gimport 132s - no changes found 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s + hg: unknown command 'gimport' 132s + (did you mean one of export, import?) 132s + [10] 132s $ hg log --graph 132s - o changeset: 1:9f124f3c1fc2 132s - | bookmark: master 132s - | tag: tip 132s - | user: test 132s - | date: Mon Jan 01 00:00:11 2007 +0000 132s - | summary: add beta 132s - | 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s o changeset: 0:0221c246a567 132s + bookmark: master 132s + tag: tip 132s user: test 132s date: Mon Jan 01 00:00:10 2007 +0000 132s summary: add alpha 132s @@ -113,32 +129,23 @@ 132s 132s $ echo newcommit > newcommit 132s $ git add newcommit 132s + fatal: not a git repository (or any of the parent directories): .git 132s + [128] 132s $ GIT_AUTHOR_DATE="2014-01-01 00:00:00 +0000" \ 132s > GIT_COMMITTER_DATE="2014-01-02 00:00:00 +0000" \ 132s > git commit -m newcommit > /dev/null || echo "git commit error" 132s + fatal: not a git repository (or any of the parent directories): .git 132s + git commit error 132s $ hg gimport 132s - importing 2 git commits 132s - updating bookmark master 132s - new changesets befdecd14df5:3d10b7289d79 (2 drafts) 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s + hg: unknown command 'gimport' 132s + (did you mean one of export, import?) 132s + [10] 132s $ hg log --graph 132s - o changeset: 3:3d10b7289d79 132s - | bookmark: master 132s - | tag: tip 132s - | user: test 132s - | date: Wed Jan 01 00:00:00 2014 +0000 132s - | summary: newcommit 132s - | 132s - o changeset: 2:befdecd14df5 132s - | user: test 132s - | date: Sat Mar 01 00:00:00 2014 +0000 132s - | summary: oldcommit 132s - | 132s - o changeset: 1:9f124f3c1fc2 132s - | user: test 132s - | date: Mon Jan 01 00:00:11 2007 +0000 132s - | summary: add beta 132s - | 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s o changeset: 0:0221c246a567 132s + bookmark: master 132s + tag: tip 132s user: test 132s date: Mon Jan 01 00:00:10 2007 +0000 132s summary: add alpha 132s 132s ERROR: test-git-workflow.t output changed 134s ! 134s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-serve-hg.t 134s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-serve-hg.t#without-hggit.err 134s @@ -31,11 +31,11 @@ 134s $ cd .. 134s 134s $ hg clone gitrepo hgrepo 134s - importing 2 git commits 134s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 134s - updating to bookmark master 134s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s + abort: repository gitrepo not found 134s + [255] 134s $ cd hgrepo 134s + $TESTTMP.sh: 36: cd: can't cd to hgrepo 134s $ cat >> .hg/hgrc < [push] 134s > pushvars.server = true 134s @@ -45,81 +45,3 @@ 134s > [hooks] 134s > pretxnchangegroup = env | grep HG_USERVAR_ || true 134s > EOF 134s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 134s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 134s - 134s -Test server address cannot be reused 134s - 134s -#if windows 134s - $ hg serve -p $HGPORT1 2>&1 134s - abort: cannot start server at '*:$HGPORT1': * (glob) 134s - [255] 134s -#else 134s - $ hg serve -p $HGPORT1 2>&1 134s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 134s - [255] 134s -#endif 134s - $ cd .. 134s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 134s - 134s -Make sure that clone regular mercurial repos over http doesn't break, 134s -and that we can transfer the hg-git metadata 134s - 134s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 134s - requesting all changes 134s - adding changesets 134s - adding manifests 134s - adding file changes 134s - added 2 changesets with 4 changes to 4 files 134s - new changesets f488b65fa424:c61c38c3d614 (?) 134s - updating to branch default 134s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 134s - 134s -And it shouldn't create a Git repository needlessly: 134s - $ test -e copy/git 134s - [1] 134s - $ cd copy 134s - 134s -#if without-hggit 134s - $ hg tags 134s - tip 1:c61c38c3d614 134s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 134s - 1:c61c38c3d614 | master | | 134s - 0:f488b65fa424 | | | 134s - $ hg pull -u ../gitrepo 134s - pulling from ../gitrepo 134s - importing 2 git commits 134s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 134s -#else 134s - $ hg tags 134s - tip 1:c61c38c3d614 134s - thetag 0:f488b65fa424 134s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 134s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 134s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 134s - $ hg pull -u ../gitrepo 134s - pulling from ../gitrepo 134s - warning: created new git repository at $TESTTMP/copy/.hg/git 134s - no changes found 134s -#endif 134s - 134s - $ hg tags 134s - tip 1:c61c38c3d614 134s - thetag 0:f488b65fa424 134s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 134s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 134s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 134s - 134s -Furthermore, make sure that we pass all arguments when pushing: 134s - 134s - $ echo baz > baz 134s - $ fn_hg_commit -A -m baz 134s - $ hg push --pushvars FOO=BAR 134s - pushing to http://localhost:$HGPORT/ 134s - searching for changes 134s - remote: adding changesets 134s - remote: adding manifests 134s - remote: adding file changes 134s - remote: HG_USERVAR_FOO=BAR 134s - remote: added 1 changesets with 1 changes to 1 files 134s - $ cd .. 134s 134s ERROR: test-serve-hg.t#without-hggit output changed 134s ! 134s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-push-authors.t 134s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-push-authors.t.err 134s @@ -8,127 +8,9 @@ 134s Create a Mercurial repository 134s 134s $ hg clone repo.git hgrepo 134s - updating to branch default 134s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s + abort: repository repo.git not found 134s + [255] 134s $ cd hgrepo 134s + $TESTTMP.sh: 8: cd: can't cd to hgrepo 134s $ hg book master 134s - 134s -Configure an author map 134s - 134s - $ touch authors.txt 134s - $ cat >> $HGRCPATH < [git] 134s - > authors = $TESTTMP/authors.txt 134s - > EOF 134s - 134s -Create a commit user that maps to a fully valid user 134s - 134s - $ cat >> $TESTTMP/authors.txt < user1 = User no. 1 134s - > EOF 134s - $ touch alpha 134s - $ hg add alpha 134s - $ fn_hg_commit -m alpha -u user1 134s - 134s -And one that maps to an email address 134s - 134s - $ cat >> $TESTTMP/authors.txt < user2@example.com = user2 134s - > EOF 134s - $ touch beta 134s - $ hg add beta 134s - $ fn_hg_commit -m beta -u user2@example.com 134s - 134s -And one that maps to a "simple" user 134s - 134s - $ cat >> $TESTTMP/authors.txt < User #3 = user3@example.com 134s - > EOF 134s - $ touch gamma 134s - $ hg add gamma 134s - $ fn_hg_commit -m gamma -u "User #3 " 134s - 134s -And one that maps to nothing 134s - 134s - $ cat >> $TESTTMP/authors.txt < user4 = 134s - > EOF 134s - $ touch delta 134s - $ hg add delta 134s - $ fn_hg_commit -m delta -u user4 134s - 134s -And one that doesn't map 134s - 134s - $ touch epsilon 134s - $ hg add epsilon 134s - $ fn_hg_commit -m epsilon -u "User #5 " 134s - 134s -Check the test default 134s - 134s - $ touch zeta 134s - $ hg add zeta 134s - $ fn_hg_commit -m zeta 134s - 134s -Push it! 134s - 134s - $ hg push 134s - pushing to $TESTTMP/repo.git 134s - searching for changes 134s - adding objects 134s - remote: found 0 deltas to reuse 134s - added 6 commits with 6 trees and 1 blobs 134s - adding reference refs/heads/master 134s - 134s -Check the results: 134s - 134s - $ hg log --template='Commit: {gitnode}\nAuthor: {author}\n---\n' 134s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 134s - Author: test 134s - --- 134s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 134s - Author: User #5 134s - --- 134s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 134s - Author: user4 134s - --- 134s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 134s - Author: User #3 134s - --- 134s - Commit: eba936dd13172a2f17936785e3604845aed9170d 134s - Author: user2@example.com 134s - --- 134s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 134s - Author: user1 134s - --- 134s - $ cd ../repo.git 134s - $ cat $TESTTMP/authors.txt 134s - user1 = User no. 1 134s - user2@example.com = user2 134s - User #3 = user3@example.com 134s - user4 = 134s - $ git log --pretty='tformat:Commit: %H%nAuthor: %an <%ae>%nCommitter: %cn <%ce>%n---' 134s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 134s - Author: test 134s - Committer: test 134s - --- 134s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 134s - Author: User #5 134s - Committer: User #5 134s - --- 134s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 134s - Author: 134s - Committer: 134s - --- 134s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 134s - Author: user3@example.com 134s - Committer: user3@example.com 134s - --- 134s - Commit: eba936dd13172a2f17936785e3604845aed9170d 134s - Author: user2 134s - Committer: user2 134s - --- 134s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 134s - Author: User no. 1 134s - Committer: User no. 1 134s - --- 134s - $ cd .. 134s 134s ERROR: test-push-authors.t output changed 135s ! 135s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-push-to-head.t 135s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-push-to-head.t.err 135s @@ -14,65 +14,9 @@ 135s Clone it, and push back to master: 135s 135s $ hg clone gitrepo hgrepo 135s - importing 1 git commits 135s - new changesets ff7a2f2d8d70 (1 drafts) 135s - updating to bookmark master 135s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 135s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 135s + abort: repository gitrepo not found 135s + [255] 135s $ cd hgrepo 135s + $TESTTMP.sh: 18: cd: can't cd to hgrepo 135s $ echo beta > beta 135s - $ fn_hg_commit -A -m "add beta" 135s - 135s -The output is confusing, and this even more-so: 135s - 135s - $ hg push 135s - pushing to $TESTTMP/gitrepo 135s - searching for changes 135s - adding objects 135s - remote: found 0 deltas to reuse 135s - remote: error: refusing to update checked out branch: refs/heads/master 135s - remote: error: By default, updating the current branch in a non-bare repository 135s - remote: is denied, because it will make the index and work tree inconsistent 135s - remote: with what you pushed, and will require 'git reset --hard' to match 135s - remote: the work tree to HEAD. 135s - remote: 135s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 135s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 135s - remote: its current branch; however, this is not recommended unless you 135s - remote: arranged to update its work tree to match what you pushed in some 135s - remote: other way. 135s - remote: 135s - remote: To squelch this message and still keep the default behaviour, set 135s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 135s - added 1 commits with 1 trees and 1 blobs 135s - warning: failed to update refs/heads/master; branch is currently checked out 135s - 135s - $ hg push 135s - pushing to $TESTTMP/gitrepo 135s - searching for changes 135s - adding objects 135s - remote: found 0 deltas to reuse 135s - remote: error: refusing to update checked out branch: refs/heads/master 135s - remote: error: By default, updating the current branch in a non-bare repository 135s - remote: is denied, because it will make the index and work tree inconsistent 135s - remote: with what you pushed, and will require 'git reset --hard' to match 135s - remote: the work tree to HEAD. 135s - remote: 135s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 135s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 135s - remote: its current branch; however, this is not recommended unless you 135s - remote: arranged to update its work tree to match what you pushed in some 135s - remote: other way. 135s - remote: 135s - remote: To squelch this message and still keep the default behaviour, set 135s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 135s - added 1 commits with 1 trees and 1 blobs 135s - warning: failed to update refs/heads/master; branch is currently checked out 135s - 135s -Show that it really didn't get pushed: 135s - 135s - $ hg tags 135s - tip 1:47580592d3d6 135s - default/master 0:ff7a2f2d8d70 135s - $ cd ../gitrepo 135s - $ git log --all --oneline --decorate 135s - 7eeab2e (HEAD -> master) add alpha 135s 135s ERROR: test-push-to-head.t output changed 136s ! 136s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-orphan-tags.t 136s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-orphan-tags.t.err 136s @@ -61,17 +61,17 @@ 136s Create a Mercurial clone 136s 136s $ hg clone -U repo.git hgrepo 136s - importing 4 git commits 136s - new changesets b8e77484829b:387d03400596 (4 drafts) 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s + abort: repository repo.git not found 136s + [255] 136s $ hg outgoing -R hgrepo 136s - comparing with $TESTTMP/repo.git 136s - searching for changes 136s - no changes found 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s + abort: repository hgrepo not found 136s + [255] 136s + $ hg push --debug -R hgrepo | grep -e reference -e found 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s + abort: repository hgrepo not found 136s [1] 136s - $ hg push --debug -R hgrepo | grep -e reference -e found 136s - unchanged reference default::refs/heads/master => GIT:996e5084 136s - unchanged reference default::refs/tags/the_tag => GIT:e4338156 136s - no changes found 136s 136s Verify that we can push this tag, and that outgoing doesn't report 136s them (#358) 136s @@ -83,33 +83,5 @@ 136s To $TESTTMP/repo.git 136s - [deleted] the_tag 136s $ cd ../hgrepo 136s + $TESTTMP.sh: 72: cd: can't cd to ../hgrepo 136s $ hg outgoing 136s - comparing with $TESTTMP/repo.git 136s - searching for changes 136s - changeset: 2:7b35eb0afb3f 136s - tag: the_tag 136s - user: test 136s - date: Mon Jan 01 00:00:12 2007 +0000 136s - summary: add foo3 136s - 136s - $ hg push --debug 136s - pushing to $TESTTMP/repo.git 136s - finding unexported changesets 136s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 136s - searching for changes 136s - remote: counting objects: 5, done. 136s - 1 commits found 136s - list of commits: 136s - e12852326ef72772e9696b008ad6546b5266ff13 136s - adding objects 136s - remote: counting objects: 5, done. 136s - remote: found 0 deltas to reuse 136s - added 1 commits with 1 trees and 0 blobs 136s - unchanged reference default::refs/heads/master => GIT:996e5084 136s - adding reference default::refs/tags/the_tag => GIT:e4338156 136s - $ cd ../gitrepo 136s - $ git fetch 136s - From $TESTTMP/repo 136s - * [new tag] the_tag -> the_tag 136s - $ git tag -ln 136s - the_tag Tag message 136s 136s ERROR: test-orphan-tags.t output changed 140s ! 140s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-verify-fail.t 140s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-verify-fail.t.err 140s @@ -25,6 +25,7 @@ 140s $ cd .. 140s 140s $ hg init hgrepo 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s $ cd hgrepo 140s $ echo normalf > normalf 140s $ echo differentf2 > differentf 140s @@ -32,63 +33,93 @@ 140s $ echo exef > exef 140s $ ln -s foo linkf 140s $ hg add normalf differentf unexpectedf exef linkf 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s $ fn_hg_commit -m 'add files' 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s $ git clone --mirror ../gitrepo .hg/git 140s Cloning into bare repository '.hg/git'... 140s done. 140s $ echo "$(cd ../gitrepo && git rev-parse HEAD) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s $ hg gverify 140s - verifying rev 3f1601c3cf54 against git commit 039c1cd9fdda382c9d1e8ec85de6b5b59518ca80 140s - difference in: differentf 140s - file has different flags: exef (hg '', git 'x') 140s - file has different flags: linkf (hg 'l', git '') 140s - file found in git but not hg: missingf 140s - file found in hg but not git: unexpectedf 140s - [1] 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s + hg: unknown command 'gverify' 140s + (did you mean verify?) 140s + [10] 140s 140s $ echo newf > newf 140s $ hg add newf 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s $ fn_hg_commit -m 'new hg commit' 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s $ hg gverify 140s - abort: no git commit found for rev 4e582b4eb862 140s - (if this is an octopus merge, verify against the last rev) 140s - [255] 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s + hg: unknown command 'gverify' 140s + (did you mean verify?) 140s + [10] 140s 140s invalid git SHA 140s $ echo "ffffffffffffffffffffffffffffffffffffffff $(hg log -r . --template '{node}')" >> .hg/git-mapfile 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s $ hg gverify 140s - abort: git equivalent ffffffffffffffffffffffffffffffffffffffff for rev 4e582b4eb862 not found! 140s - [255] 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s + hg: unknown command 'gverify' 140s + (did you mean verify?) 140s + [10] 140s 140s git SHA is not a commit 140s $ echo new2 >> newf 140s $ fn_hg_commit -m 'new hg commit 2' 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s this gets the tree pointed to by the commit at HEAD 140s $ echo "$(cd ../gitrepo && git show --format=%T HEAD | head -n 1) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s $ hg gverify 140s - abort: git equivalent f477b00e4a9907617f346a529cc0fe9ba5d6f6d3 for rev 5c2eb98af3e2 is not a commit! 140s - [255] 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s + hg: unknown command 'gverify' 140s + (did you mean verify?) 140s + [10] 140s 140s corrupt git repository 140s 140s $ hg debug-remove-hggit-state 140s - clearing out the git cache data 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s + hg: unknown command 'debug-remove-hggit-state' 140s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 140s + [10] 140s $ hg gexport 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s + hg: unknown command 'gexport' 140s + (did you mean one of export, import?) 140s + [10] 140s $ mv .hg/git/objects/pack $TESTTMP/pack-old 140s $ for packfile in $TESTTMP/pack-old/*.pack 140s > do 140s > git --git-dir .hg/git unpack-objects < $packfile 140s > done 140s + $TESTTMP.sh: 78: cannot open $TESTTMP/pack-old/*.pack: No such file 140s + [2] 140s $ mv -f .hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 140s + mv: cannot stat '.hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e': No such file or directory 140s + [1] 140s $ hg gverify --fsck 140s - abort: git repository is corrupt! 140s - [255] 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s + hg: unknown command 'gverify' 140s + (did you mean verify?) 140s + [10] 140s $ hg gverify 140s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is not a commit! 140s - [255] 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s + hg: unknown command 'gverify' 140s + (did you mean verify?) 140s + [10] 140s $ chmod +w .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 140s + chmod: cannot access '.hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74': No such file or directory 140s + [1] 140s $ echo 42 > .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 140s + $TESTTMP.sh: 89: cannot create .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74: Directory nonexistent 140s + [2] 140s $ hg gverify 140s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is corrupt! 140s - (re-run with --traceback for details) 140s - [255] 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s + hg: unknown command 'gverify' 140s + (did you mean verify?) 140s + [10] 140s 140s ERROR: test-verify-fail.t output changed 140s ! 140s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-push-missing-commit.t 140s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-push-missing-commit.t.err 140s @@ -22,75 +22,9 @@ 140s clone it and create a commit building on the git history 140s 140s $ hg clone -U repo.git hgrepo 140s - importing 1 git commits 140s - new changesets fb68c5a534ce (1 drafts) 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s + abort: repository repo.git not found 140s + [255] 140s $ cd hgrepo 140s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 140s $ hg up -q master 140s - $ echo other > thefile 140s - $ fn_hg_commit -m 'change thefile' 140s - $ cd .. 140s - 140s -now remove the git commit from the cache repository used internally by 140s -hg-git — actually, changing `git.intree` is equivalent to this, and how 140s -a user noticed it in #376. 140s - 140s - $ rm -rf hgrepo/.hg/git 140s - 140s -what happens when we push it? 140s - 140s - $ hg -R hgrepo push 140s - pushing to $TESTTMP/repo.git 140s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 140s - abort: cannot push git commit 533d4e670a8b as it is not present locally 140s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 140s - [255] 140s - 140s -try to follow the hint: 140s - 140s -(and just to see that the warning is useful, try re-resetting first) 140s - 140s - $ rm -rf hgrepo/.hg/git hgrepo/.git 140s - $ hg -R hgrepo pull 140s - pulling from $TESTTMP/repo.git 140s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 140s - no changes found 140s - not updating diverged bookmark master 140s - $ hg -R hgrepo push 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 - 140s -and as an extra test, what if we want to push a commit that's 140s -converted, but gone? 140s - 140s -simply pushing doesn't suffice: 140s - 140s - $ cd hgrepo 140s - $ rm -rf .hg/git 140s - $ hg push 140s - pushing to $TESTTMP/repo.git 140s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 140s - searching for changes 140s - no changes found 140s - [1] 140s - $ cd .. 140s - 140s -but we can't create another commit building on the git history, export 140s -it, and push: 140s - 140s - $ cd hgrepo 140s - $ echo not that > thefile 140s - $ fn_hg_commit -m 'change thefile again' 140s - $ hg gexport 140s - $ rm -rf .hg/git 140s - $ hg push 140s - pushing to $TESTTMP/repo.git 140s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 140s - searching for changes 140s - abort: cannot push git commit 61619410916a as it is not present locally 140s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 140s - [255] 140s - $ cd .. 140s 140s ERROR: test-push-missing-commit.t output changed 141s ! 141s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-hg-branch.t 141s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-hg-branch.t.err 141s @@ -12,82 +12,10 @@ 141s 141s $ cd .. 141s $ hg clone gitrepo hgrepo 141s - importing 1 git commits 141s - new changesets ff7a2f2d8d70 (1 drafts) 141s - updating to bookmark not-master 141s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s + abort: repository gitrepo not found 141s + [255] 141s 141s $ cd hgrepo 141s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 141s $ hg co master 141s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 141s - (activating bookmark master) 141s - $ hg mv alpha beta 141s - $ fn_hg_commit -m 'rename alpha to beta' 141s - $ hg push 141s - pushing to $TESTTMP/gitrepo 141s - searching for changes 141s - adding objects 141s - remote: found 0 deltas to reuse 141s - added 1 commits with 1 trees and 0 blobs 141s - updating reference refs/heads/master 141s - 141s - $ hg branch gamma | grep -v 'permanent and global' 141s - marked working directory as branch gamma 141s - $ fn_hg_commit -m 'started branch gamma' 141s - $ hg push 141s - pushing to $TESTTMP/gitrepo 141s - searching for changes 141s - adding objects 141s - remote: found 0 deltas to reuse 141s - added 1 commits with 1 trees and 0 blobs 141s - updating reference refs/heads/master 141s - 141s - $ hg log --graph 141s - @ changeset: 2:400db38f4f64 141s - | branch: gamma 141s - | bookmark: master 141s - | tag: default/master 141s - | tag: tip 141s - | user: test 141s - | date: Mon Jan 01 00:00:12 2007 +0000 141s - | summary: started branch gamma 141s - | 141s - o changeset: 1:3baa67317a4d 141s - | user: test 141s - | date: Mon Jan 01 00:00:11 2007 +0000 141s - | summary: rename alpha to beta 141s - | 141s - o changeset: 0:ff7a2f2d8d70 141s - bookmark: not-master 141s - tag: default/not-master 141s - user: test 141s - date: Mon Jan 01 00:00:10 2007 +0000 141s - summary: add alpha 141s - 141s - 141s - $ cd .. 141s - $ hg clone -U gitrepo hgrepo2 141s - importing 3 git commits 141s - new changesets ff7a2f2d8d70:400db38f4f64 (3 drafts) 141s - $ hg -R hgrepo2 log --graph 141s - o changeset: 2:400db38f4f64 141s - | branch: gamma 141s - | bookmark: master 141s - | tag: default/master 141s - | tag: tip 141s - | user: test 141s - | date: Mon Jan 01 00:00:12 2007 +0000 141s - | summary: started branch gamma 141s - | 141s - o changeset: 1:3baa67317a4d 141s - | user: test 141s - | date: Mon Jan 01 00:00:11 2007 +0000 141s - | summary: rename alpha to beta 141s - | 141s - o changeset: 0:ff7a2f2d8d70 141s - bookmark: not-master 141s - tag: default/not-master 141s - user: test 141s - date: Mon Jan 01 00:00:10 2007 +0000 141s - summary: add alpha 141s - 141s 141s ERROR: test-hg-branch.t output changed 141s ! 141s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-pull-after-strip.t 141s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-pull-after-strip.t.err 141s @@ -15,82 +15,9 @@ 141s 141s $ cd .. 141s $ hg clone -U gitrepo hgrepo 141s - importing 2 git commits 141s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s + abort: repository gitrepo not found 141s + [255] 141s $ cd hgrepo 141s + $TESTTMP.sh: 26: cd: can't cd to hgrepo 141s $ hg up master 141s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 141s - (activating bookmark master) 141s - $ hg log --graph 141s - @ changeset: 1:7fe02317c63d 141s - | bookmark: master 141s - | tag: default/master 141s - | tag: thetag 141s - | tag: tip 141s - | user: test 141s - | date: Mon Jan 01 00:00:11 2007 +0000 141s - | summary: add beta 141s - | 141s - o changeset: 0:ff7a2f2d8d70 141s - user: test 141s - date: Mon Jan 01 00:00:10 2007 +0000 141s - summary: add alpha 141s - 141s - $ cd ../gitrepo 141s - $ echo beta line 2 >> beta 141s - $ git add beta 141s - $ fn_git_commit -m 'add to beta' 141s - 141s - $ cd .. 141s - $ cd hgrepo 141s - $ hg debugstrip --no-backup tip 141s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 141s - $ hg pull 141s - pulling from $TESTTMP/gitrepo 141s - importing 1 git commits 141s - abort: you appear to have run strip - please run hg git-cleanup 141s - [255] 141s - $ hg tags 141s - tip 0:ff7a2f2d8d70 141s - $ hg git-cleanup 141s - git commit map cleaned 141s - 141s -pull works after 'hg git-cleanup' 141s - 141s - $ hg pull 141s - pulling from $TESTTMP/gitrepo 141s - importing 2 git commits 141s - updating bookmark master 141s - new changesets 7fe02317c63d:cc1e605d90db (2 drafts) 141s - (run 'hg update' to get a working copy) 141s - $ hg log --graph 141s - o changeset: 2:cc1e605d90db 141s - | bookmark: master 141s - | tag: default/master 141s - | tag: tip 141s - | user: test 141s - | date: Mon Jan 01 00:00:12 2007 +0000 141s - | summary: add to beta 141s - | 141s - o changeset: 1:7fe02317c63d 141s - | tag: thetag 141s - | user: test 141s - | date: Mon Jan 01 00:00:11 2007 +0000 141s - | summary: add beta 141s - | 141s - @ changeset: 0:ff7a2f2d8d70 141s - user: test 141s - date: Mon Jan 01 00:00:10 2007 +0000 141s - summary: add alpha 141s - 141s - 141s - $ cd .. 141s - 141s -Check that we also remove bad refs: 141s - 141s - $ cd hgrepo 141s - $ echo e93b671cb24bff41779187edff99178e2597c2 > .hg/git/refs/tags/bad-tag 141s - $ hg git-cleanup 141s - git commit map cleaned 141s - $ test -e .hg/git/refs/tags/bad-tag 141s - [1] 141s 141s ERROR: test-pull-after-strip.t output changed 142s ! 142s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-subrepos-syntax.t 142s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-subrepos-syntax.t.err 142s @@ -38,54 +38,9 @@ 142s $ cd .. 142s 142s $ hg clone -U repo.git hgrepo 142s - importing 3 git commits 142s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s + abort: repository repo.git not found 142s + [255] 142s $ cd hgrepo 142s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 142s $ hg up master 142s - Cloning into '$TESTTMP/hgrepo/subrepo1'... 142s - done. 142s - Cloning into '$TESTTMP/hgrepo/xyz/subrepo2'... 142s - done. 142s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 142s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 142s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 142s - (activating bookmark master) 142s - $ cat >> .hgsub < # this is a comment 142s - > [subpaths] 142s - > flaf = blyf 142s - > EOF 142s - $ fn_hg_commit -m 'add comment & subsection' 142s - $ hg push 142s - pushing to $TESTTMP/repo.git 142s - searching for changes 142s - adding objects 142s - remote: found 0 deltas to reuse 142s - added 1 commits with 1 trees and 0 blobs 142s - updating reference refs/heads/master 142s - $ cd .. 142s - 142s - $ cd gitrepo 142s - $ git pull --ff-only 142s - From $TESTTMP/repo 142s - 89c22d7..106b34e master -> origin/master 142s - Updating 89c22d7..106b34e 142s - Fast-forward 142s - $ cat .gitmodules 142s - [submodule "subrepo1"] 142s - path = subrepo1 142s - url = ../gitsubrepo 142s - [submodule "xyz/subrepo2"] 142s - path = xyz/subrepo2 142s - url = ../gitsubrepo 142s - $ cd .. 142s - 142s -We broke bidirectionality: 142s - 142s - $ hg clone -U repo.git hgrepo2 142s - importing 4 git commits 142s - new changesets e532b2bfda10:cbf584fe001b (4 drafts) 142s - $ hg id -r tip hgrepo 142s - c58a542b18bc default/master/tip master 142s - $ hg id -r tip hgrepo2 142s - cbf584fe001b default/master/tip master 142s 142s ERROR: test-subrepos-syntax.t output changed 142s ! 142s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-gitignore.t 142s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-gitignore.t.err 142s @@ -2,12 +2,14 @@ 142s $ . "$TESTDIR/testutil" 142s 142s $ hg init repo 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s $ cd repo 142s 142s Create a commit that we can export later on 142s 142s $ touch thefile 142s $ hg commit -A -m "initial commit" 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s adding thefile 142s 142s We should only read .gitignore files in a hg-git repo (i.e. one with .hg/git 142s @@ -18,6 +20,7 @@ 142s $ touch bar 142s $ echo 'foo*' > .gitignore 142s $ hg status 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s ? .gitignore 142s ? bar 142s ? foo 142s @@ -27,103 +30,140 @@ 142s it's gone: 142s 142s $ hg gexport 142s - $ hg status 142s - ? .gitignore 142s - ? bar 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s + hg: unknown command 'gexport' 142s + (did you mean one of export, import?) 142s + [10] 142s + $ hg status 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s + ? .gitignore 142s + ? bar 142s + ? foo 142s + ? foobar 142s 142s $ echo '*bar' > .gitignore 142s $ hg status 142s - ? .gitignore 142s - ? foo 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s + ? .gitignore 142s + ? bar 142s + ? foo 142s + ? foobar 142s 142s $ mkdir dir 142s $ touch dir/foo 142s $ echo 'foo' > .gitignore 142s $ hg status 142s - ? .gitignore 142s - ? bar 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s + ? .gitignore 142s + ? bar 142s + ? dir/foo 142s + ? foo 142s ? foobar 142s 142s $ echo '/foo' > .gitignore 142s $ hg status 142s - ? .gitignore 142s - ? bar 142s - ? dir/foo 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s + ? .gitignore 142s + ? bar 142s + ? dir/foo 142s + ? foo 142s ? foobar 142s 142s $ rm .gitignore 142s $ echo 'foo' > dir/.gitignore 142s $ hg status 142s - ? bar 142s - ? dir/.gitignore 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s + ? bar 142s + ? dir/.gitignore 142s + ? dir/foo 142s ? foo 142s ? foobar 142s 142s $ touch dir/bar 142s $ echo 'bar' > .gitignore 142s $ hg status 142s - ? .gitignore 142s - ? dir/.gitignore 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s + ? .gitignore 142s + ? bar 142s + ? dir/.gitignore 142s + ? dir/bar 142s + ? dir/foo 142s ? foo 142s ? foobar 142s 142s $ echo '/bar' > .gitignore 142s $ hg status 142s - ? .gitignore 142s - ? dir/.gitignore 142s - ? dir/bar 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s + ? .gitignore 142s + ? bar 142s + ? dir/.gitignore 142s + ? dir/bar 142s + ? dir/foo 142s ? foo 142s ? foobar 142s 142s $ echo 'foo*' > .gitignore 142s $ echo '!*bar' >> .gitignore 142s $ hg status 142s - .gitignore: unsupported ignore pattern '!*bar' 142s - ? .gitignore 142s - ? bar 142s - ? dir/.gitignore 142s - ? dir/bar 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s + ? .gitignore 142s + ? bar 142s + ? dir/.gitignore 142s + ? dir/bar 142s + ? dir/foo 142s + ? foo 142s + ? foobar 142s 142s $ echo '.hg/' > .gitignore 142s $ hg status 142s - ? .gitignore 142s - ? bar 142s - ? dir/.gitignore 142s - ? dir/bar 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s + ? .gitignore 142s + ? bar 142s + ? dir/.gitignore 142s + ? dir/bar 142s + ? dir/foo 142s ? foo 142s ? foobar 142s 142s $ echo 'dir/.hg/' > .gitignore 142s $ hg status 142s - ? .gitignore 142s - ? bar 142s - ? dir/.gitignore 142s - ? dir/bar 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s + ? .gitignore 142s + ? bar 142s + ? dir/.gitignore 142s + ? dir/bar 142s + ? dir/foo 142s ? foo 142s ? foobar 142s 142s $ echo '.hg/foo' > .gitignore 142s $ hg status 142s - ? .gitignore 142s - ? bar 142s - ? dir/.gitignore 142s - ? dir/bar 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s + ? .gitignore 142s + ? bar 142s + ? dir/.gitignore 142s + ? dir/bar 142s + ? dir/foo 142s ? foo 142s ? foobar 142s 142s $ touch foo.hg 142s $ echo 'foo.hg' > .gitignore 142s $ hg status 142s - ? .gitignore 142s - ? bar 142s - ? dir/.gitignore 142s - ? dir/bar 142s - ? foo 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s + ? .gitignore 142s + ? bar 142s + ? dir/.gitignore 142s + ? dir/bar 142s + ? dir/foo 142s + ? foo 142s + ? foo.hg 142s ? foobar 142s $ rm foo.hg 142s 142s $ touch .hgignore 142s $ hg status 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s ? .gitignore 142s ? .hgignore 142s ? bar 142s @@ -137,6 +177,7 @@ 142s $ echo 'foo.*$(?> .hgignore 142s $ echo 'dir/foo' >> .hgignore 142s $ hg status 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s ? .gitignore 142s ? .hgignore 142s ? bar 142s @@ -145,14 +186,18 @@ 142s ? foobar 142s 142s $ hg add .gitignore 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s $ hg commit -m "add and commit .gitignore" 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s $ rm .gitignore 142s $ rm .hgignore 142s $ hg status 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s ! .gitignore 142s ? bar 142s ? dir/.gitignore 142s ? dir/bar 142s + ? dir/foo 142s ? foo 142s ? foobar 142s 142s @@ -164,6 +209,7 @@ 142s > foo( 142s > EOF 142s $ hg status --config ui.ignore=$TESTTMP/invalidhgignore 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s abort: $TESTTMP/invalidhgignore: invalid pattern (relre): foo( 142s [255] 142s 142s @@ -172,5 +218,6 @@ 142s > foo( 142s > EOF 142s $ hg status 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s abort: $TESTTMP/repo/.hgignore: invalid pattern (relre): foo( 142s [255] 142s 142s ERROR: test-gitignore.t output changed 143s ! 143s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-merge.t 143s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-merge.t.err 143s @@ -30,60 +30,11 @@ 143s $ git init -q --bare repo.git 143s 143s $ hg clone gitrepo hgrepo 143s - importing 4 git commits 143s - new changesets ff7a2f2d8d70:89ca4a68d6b9 (4 drafts) 143s - updating to bookmark master 143s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s + abort: repository gitrepo not found 143s + [255] 143s $ cd hgrepo 143s + $TESTTMP.sh: 40: cd: can't cd to hgrepo 143s 143s clear the cache to be sure it is regenerated correctly 143s $ hg debug-remove-hggit-state 143s - clearing out the git cache data 143s - $ hg push ../repo.git 143s - pushing to ../repo.git 143s - searching for changes 143s - adding objects 143s - remote: found 0 deltas to reuse 143s - added 4 commits with 4 trees and 3 blobs 143s - adding reference refs/heads/beta 143s - adding reference refs/heads/master 143s - 143s - $ cd .. 143s -git log in repo pushed from hg 143s - $ git --git-dir=repo.git log --pretty=medium master | sed 's/\.\.\.//g' 143s - commit 5806851511aaf3bfe813ae3a86c5027165fa9b96 143s - Merge: e5023f9 9497a4e 143s - Author: test 143s - Date: Mon Jan 1 00:00:12 2007 +0000 143s - 143s - Merge branch 'beta' 143s - 143s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 143s - Author: test 143s - Date: Mon Jan 1 00:00:12 2007 +0000 143s - 143s - add gamma 143s - 143s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 143s - Author: test 143s - Date: Mon Jan 1 00:00:11 2007 +0000 143s - 143s - add beta 143s - 143s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 143s - Author: test 143s - Date: Mon Jan 1 00:00:10 2007 +0000 143s - 143s - add alpha 143s - $ git --git-dir=repo.git log --pretty=medium beta | sed 's/\.\.\.//g' 143s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 143s - Author: test 143s - Date: Mon Jan 1 00:00:11 2007 +0000 143s - 143s - add beta 143s - 143s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 143s - Author: test 143s - Date: Mon Jan 1 00:00:10 2007 +0000 143s - 143s - add alpha 143s 143s ERROR: test-merge.t output changed 144s ! 144s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-hg-tags.t 144s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-hg-tags.t.err 144s @@ -16,69 +16,10 @@ 144s 144s $ cd .. 144s $ hg clone -U repo.git hgrepo 144s - importing 1 git commits 144s - new changesets ff7a2f2d8d70 (1 drafts) 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 144s + abort: repository repo.git not found 144s + [255] 144s 144s $ cd hgrepo 144s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 144s $ hg co master 144s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 144s - (activating bookmark master) 144s - $ fn_hg_tag alpha 144s - $ hg push 144s - pushing to $TESTTMP/repo.git 144s - searching for changes 144s - adding objects 144s - remote: found 0 deltas to reuse 144s - added 1 commits with 1 trees and 1 blobs 144s - updating reference refs/heads/master 144s - adding reference refs/tags/alpha 144s - 144s - $ hg log --graph 144s - @ changeset: 1:e8b150f84560 144s - | bookmark: master 144s - | tag: default/master 144s - | tag: tip 144s - | user: test 144s - | date: Mon Jan 01 00:00:11 2007 +0000 144s - | summary: Added tag alpha for changeset ff7a2f2d8d70 144s - | 144s - o changeset: 0:ff7a2f2d8d70 144s - tag: alpha 144s - user: test 144s - date: Mon Jan 01 00:00:10 2007 +0000 144s - summary: add alpha 144s - 144s - 144s - $ cd .. 144s - $ cd gitrepo 144s -git should have the tag alpha 144s - $ git fetch origin 144s - From $TESTTMP/repo 144s - 7eeab2e..bbae830 master -> origin/master 144s - * [new tag] alpha -> alpha 144s - $ cd .. 144s - 144s - $ hg clone repo.git hgrepo2 144s - importing 2 git commits 144s - new changesets ff7a2f2d8d70:e8b150f84560 (2 drafts) 144s - updating to bookmark master 144s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 144s - $ hg -R hgrepo2 log --graph 144s - @ changeset: 1:e8b150f84560 144s - | bookmark: master 144s - | tag: default/master 144s - | tag: tip 144s - | user: test 144s - | date: Mon Jan 01 00:00:11 2007 +0000 144s - | summary: Added tag alpha for changeset ff7a2f2d8d70 144s - | 144s - o changeset: 0:ff7a2f2d8d70 144s - tag: alpha 144s - user: test 144s - date: Mon Jan 01 00:00:10 2007 +0000 144s - summary: add alpha 144s - 144s - 144s -the tag should be in .hgtags 144s - $ cat hgrepo2/.hgtags 144s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alpha 144s 144s ERROR: test-hg-tags.t output changed 144s ! 144s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-multiple-remotes.t 144s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-multiple-remotes.t.err 144s @@ -14,6 +14,7 @@ 144s $ git clone --bare --quiet gitrepo repo.git 144s 144s $ hg init hgrepo 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 144s $ cd hgrepo 144s $ cat > .hg/hgrc < [paths] 144s @@ -26,52 +27,28 @@ 144s > EOF 144s 144s $ hg pull 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 144s pulling from $TESTTMP/gitrepo 144s - importing 1 git commits 144s - adding bookmark master 144s - adding bookmark not-master 144s - new changesets ff7a2f2d8d70 (1 drafts) 144s - (run 'hg update' to get a working copy) 144s - pulling from $TESTTMP/repo.git 144s - no changes found 144s + abort: repository $TESTTMP/gitrepo not found 144s + [255] 144s $ hg tags 144s - tip 0:ff7a2f2d8d70 144s - git/not-master 0:ff7a2f2d8d70 144s - git/master 0:ff7a2f2d8d70 144s - bare/not-master 0:ff7a2f2d8d70 144s - bare/master 0:ff7a2f2d8d70 144s - also-git/not-master 0:ff7a2f2d8d70 144s - also-git/master 0:ff7a2f2d8d70 144s - also-bare/not-master 0:ff7a2f2d8d70 144s - also-bare/master 0:ff7a2f2d8d70 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 144s + tip -1:000000000000 144s 144s $ hg up master 144s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 144s - (activating bookmark master) 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 144s + abort: unknown revision 'master' 144s + [10] 144s $ echo beta > beta 144s $ fn_hg_commit -A -m "add beta" 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 144s $ hg push 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 144s pushing to $TESTTMP/gitrepo 144s - searching for changes 144s - adding objects 144s - remote: found 0 deltas to reuse 144s - added 1 commits with 1 trees and 1 blobs 144s - updating reference refs/heads/master 144s - pushing to $TESTTMP/repo.git 144s - searching for changes 144s - adding objects 144s - remote: found 0 deltas to reuse 144s - added 1 commits with 1 trees and 1 blobs 144s - updating reference refs/heads/master 144s + abort: repository $TESTTMP/gitrepo not found 144s + [255] 144s 144s $ hg tags 144s - tip 1:47580592d3d6 144s - git/master 1:47580592d3d6 144s - bare/master 1:47580592d3d6 144s - also-git/master 1:47580592d3d6 144s - also-bare/master 1:47580592d3d6 144s - git/not-master 0:ff7a2f2d8d70 144s - bare/not-master 0:ff7a2f2d8d70 144s - also-git/not-master 0:ff7a2f2d8d70 144s - also-bare/not-master 0:ff7a2f2d8d70 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 144s + tip 0:59e1f63242de 144s 144s 144s ERROR: test-multiple-remotes.t output changed 144s ! 144s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-hg-clone.t 144s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-hg-clone.t.err 144s @@ -11,88 +11,17 @@ 144s $ cd .. 144s 144s $ hg clone -U gitrepo hgrepo 144s - importing 1 git commits 144s - new changesets ff7a2f2d8d70 (1 drafts) 144s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 144s + abort: repository gitrepo not found 144s + [255] 144s 144s By default, the Git state isn't preserved across a copying/linking 145s clone 145s 145s $ hg clone -U hgrepo otherhgrepo 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + abort: repository hgrepo not found 145s + [255] 145s $ cd otherhgrepo 145s + $TESTTMP.sh: 22: cd: can't cd to otherhgrepo 145s $ find .hg -name 'git*' | sort 145s - $ hg tags -v 145s - tip 0:ff7a2f2d8d70 145s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 145s - $ cd .. 145s - $ rm -r otherhgrepo 145s - 145s -Nor using a pull clone 145s - 145s - $ hg clone -U --pull hgrepo otherhgrepo 145s - requesting all changes 145s - adding changesets 145s - adding manifests 145s - adding file changes 145s - added 1 changesets with 1 changes to 1 files 145s - new changesets ff7a2f2d8d70 145s - $ cd otherhgrepo 145s - $ find .hg -name 'git*' | sort 145s - $ hg tags -v 145s - tip 0:ff7a2f2d8d70 145s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 145s - $ cd .. 145s - $ rm -r otherhgrepo 145s - 145s -But we can enable it! 145s - 145s - $ cat >> $HGRCPATH < [experimental] 145s - > hg-git-serve = yes 145s - > EOF 145s - 145s -Check transferring between Mercurial repositories using a 145s -copying/linking clone 145s - 145s - $ hg clone -U hgrepo otherhgrepo 145s - $ cd otherhgrepo 145s - $ find .hg -name 'git*' | sort 145s - $ hg tags -q 145s - tip 145s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 145s - $ cd .. 145s - 145s -Checking using a pull clone 145s - 145s - $ rm -rf otherhgrepo 145s - $ hg clone -U --pull hgrepo otherhgrepo 145s - requesting all changes 145s - adding changesets 145s - adding manifests 145s - adding file changes 145s - added 1 changesets with 1 changes to 1 files 145s - new changesets ff7a2f2d8d70 145s - $ cd otherhgrepo 145s - $ hg tags -q 145s - tip 145s - alpha 145s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 145s - 0:ff7a2f2d8d70 7eeab2ea75ec 145s - $ cd .. 145s - 145s -Can we repopulate the state from a Mercurial repository? 145s - 145s - $ cd otherhgrepo 145s - $ hg debug-remove-hggit-state 145s - clearing out the git cache data 145s - $ hg log -qr 'fromgit()' 145s - $ hg tags 145s - tip 0:ff7a2f2d8d70 145s - $ hg pull 145s - pulling from $TESTTMP/hgrepo 145s - searching for changes 145s - no changes found 145s - $ hg log -qr 'fromgit()' 145s - $ hg tags 145s - tip 0:ff7a2f2d8d70 145s - 145s -Sadly, no. 145s 145s ERROR: test-hg-clone.t output changed 145s ! 145s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-push-detached.t 145s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-push-detached.t.err 145s @@ -40,37 +40,9 @@ 145s in this case continues to work. 145s 145s $ hg clone gitrepo hgrepo 145s - importing 1 git commits 145s - new changesets ff7a2f2d8d70 (1 drafts) 145s - updating to bookmark master 145s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + abort: repository gitrepo not found 145s + [255] 145s $ cd hgrepo 145s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 145s $ echo beta > beta 145s - $ hg add beta 145s - $ fn_hg_commit -m "add beta" 145s - 145s -Pushing that changeset, with phases, publishes the detached HEAD. 145s -Whether this should happen is debatable, but it's a side effect from 145s -the fact that pushing to the remote HEAD, with HEAD being the usual 145s -symref, should publish it. 145s - 145s - $ hg push -v --config hggit.usephases=yes 145s - pushing to $TESTTMP/gitrepo 145s - finding unexported changesets 145s - exporting 1 changesets 145s - converting revision 47580592d3d6492421a1e6cebc5c2d701a2e858b 145s - packing 3 loose objects... 145s - searching for changes 145s - remote: counting objects: 5, done. 145s - 1 commits found 145s - adding objects 145s - remote: counting objects: 5, done. 145s - remote: found 0 deltas to reuse 145s - added 1 commits with 1 trees and 1 blobs 145s - updating reference default::refs/heads/master => GIT:0f378ab6 145s - publishing remote HEAD 145s - $ hg phase 'all()' 145s - 0: public 145s - 1: draft 145s - $ cd .. 145s - 145s 145s ERROR: test-push-detached.t output changed 146s ! 146s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-serve-git.t 146s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-serve-git.t.err 146s @@ -33,28 +33,14 @@ 146s Make sure that clone over the old git protocol doesn't break 146s 146s $ hg clone -U git://localhost:$HGPORT/test copy 2>&1 146s - \r (no-eol) (esc) 146s - Counting objects 1/6 [=====> ]\r (no-eol) (esc) 146s - Counting objects 2/6 [===========> ]\r (no-eol) (esc) 146s - Counting objects 3/6 [=================> ]\r (no-eol) (esc) 146s - Counting objects 4/6 [=======================> ]\r (no-eol) (esc) 146s - Counting objects 5/6 [=============================> ]\r (no-eol) (esc) 146s - Counting objects 6/6 [===================================>]\r (no-eol) (esc) 146s - \r (no-eol) (esc) 146s - \r (no-eol) (esc) 146s - Compressing objects 1/3 [==========> ]\r (no-eol) (esc) 146s - Compressing objects 2/3 [=====================> ]\r (no-eol) (esc) 146s - Compressing objects 3/3 [================================>]\r (no-eol) (esc) 146s - \r (no-eol) (esc) 146s - \r (no-eol) (esc) 146s - importing commits 1/2 b23744d34f97 [======> ]\r (no-eol) (esc) 146s - importing commits 2/2 3af9773036a9 [=============>]\r (no-eol) (esc) 146s - \r (no-eol) (esc) 146s - importing 2 git commits 146s - new changesets c4d188f6e13d:221dd250e933 146s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 146s + abort: repository git://localhost:$HGPORT/test not found 146s + [255] 146s $ hg log -T 'HG:{node|short} GIT:{gitnode|short}\n' -R copy 146s - HG:221dd250e933 GIT:3af9773036a9 146s - HG:c4d188f6e13d GIT:b23744d34f97 146s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 146s + abort: repository copy not found 146s + [255] 146s $ hg tags -v -R copy 146s - tip 1:221dd250e933 146s - default/master 1:221dd250e933 git-remote 146s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 146s + abort: repository copy not found 146s + [255] 146s 146s ERROR: test-serve-git.t output changed 150s ! 150s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-convergedmerge.t 150s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-convergedmerge.t.err 150s @@ -2,29 +2,39 @@ 150s $ . "$TESTDIR/testutil" 150s 150s $ hg init hgrepo1 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ cd hgrepo1 150s $ echo A > afile 150s $ hg add afile 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ hg ci -m "origin" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s 150s $ echo B > afile 150s $ hg ci -m "A->B" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s 150s $ echo C > afile 150s $ hg ci -m "B->C" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s 150s $ hg up -r0 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 150s $ echo C > afile 150s $ hg ci -m "A->C" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s created new head 150s 150s $ hg merge -r2 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 150s (branch merge, don't forget to commit) 150s $ hg ci -m "merge" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s 150s $ hg log --graph --style compact | sed 's/\[.*\]//g' 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s @ 4:3,2 eaa21d002113 1970-01-01 00:00 +0000 test 150s |\ merge 150s | | 150s @@ -47,36 +57,23 @@ 150s 150s $ cd hgrepo1 150s $ hg bookmark -r4 master 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ hg push -r master ../repo.git 150s - pushing to ../repo.git 150s - searching for changes 150s - adding objects 150s - remote: found 0 deltas to reuse 150s - added 5 commits with 3 trees and 3 blobs 150s - adding reference refs/heads/master 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + abort: repository ../repo.git does not exist 150s + [255] 150s $ cd .. 150s 150s $ hg clone repo.git hgrepo2 150s - importing 5 git commits 150s - new changesets 5d1a6b64f9d0:eaa21d002113 (5 drafts) 150s - updating to bookmark master 150s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + abort: repository repo.git not found 150s + [255] 150s expect the same revision ids as above 150s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 150s - @ 4:1,3 eaa21d002113 1970-01-01 00:00 +0000 test 150s - |\ merge 150s - | | 150s - | o 3 0dbe4ac1a758 1970-01-01 00:00 +0000 test 150s - | | B->C 150s - | | 150s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 150s - | | A->B 150s - | | 150s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 150s - |/ A->C 150s - | 150s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 150s - origin 150s - 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + abort: repository hgrepo2 not found 150s $ hg -R hgrepo2 gverify 150s - verifying rev eaa21d002113 against git commit fb8c9e2afe5418cfff337eeed79fad5dd58826f0 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + hg: unknown command 'gverify' 150s + (did you mean verify?) 150s + [10] 150s 150s ERROR: test-convergedmerge.t output changed 150s ! 150s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-conflict-2.t 150s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-conflict-2.t.err 150s @@ -2,30 +2,40 @@ 150s $ . "$TESTDIR/testutil" 150s 150s $ hg init hgrepo1 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ cd hgrepo1 150s $ echo A > afile 150s $ hg add afile 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ hg ci -m "origin" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s 150s $ echo B > afile 150s $ hg ci -m "A->B" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s 150s $ hg up -r0 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 150s $ echo C > afile 150s $ hg ci -m "A->C" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s created new head 150s 150s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s warning: conflicts.* (re) 150s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 150s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 150s resolve using second parent 150s $ echo B > afile 150s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ hg ci -m "merge to B" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s 150s $ hg log --graph --style compact | sed 's/\[.*\]//g' 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s @ 3:2,1 120385945d08 1970-01-01 00:00 +0000 test 150s |\ merge to B 150s | | 150s @@ -45,31 +55,18 @@ 150s 150s $ cd hgrepo1 150s $ hg bookmark -r tip master 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ hg push -r master ../repo.git 150s - pushing to ../repo.git 150s - searching for changes 150s - adding objects 150s - remote: found 0 deltas to reuse 150s - added 4 commits with 3 trees and 3 blobs 150s - adding reference refs/heads/master 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + abort: repository ../repo.git does not exist 150s + [255] 150s $ cd .. 150s 150s $ hg clone repo.git hgrepo2 150s - importing 4 git commits 150s - new changesets 5d1a6b64f9d0:120385945d08 (4 drafts) 150s - updating to bookmark master 150s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + abort: repository repo.git not found 150s + [255] 150s expect the same revision ids as above 150s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 150s - @ 3:1,2 120385945d08 1970-01-01 00:00 +0000 test 150s - |\ merge to B 150s - | | 150s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 150s - | | A->B 150s - | | 150s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 150s - |/ A->C 150s - | 150s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 150s - origin 150s - 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + abort: repository hgrepo2 not found 150s 150s ERROR: test-conflict-2.t output changed 151s ! 151s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-phases-draft.t 151s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-phases-draft.t.err 151s @@ -12,73 +12,10 @@ 151s cloning without hggit.usephases does not publish local changesets 151s $ cd .. 151s $ hg clone gitrepo hgrepo | grep -v '^updating' 151s - importing 1 git commits 151s - new changesets ff7a2f2d8d70 (1 drafts) 151s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s + abort: repository gitrepo not found 151s + [1] 151s 151s $ cd hgrepo 151s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 151s $ hg phase -r master 151s - 0: draft 151s - 151s -pulling advances the draft phase, though 151s - 151s - $ hg phase -fs 0 151s - $ hg pull 151s - pulling from $TESTTMP/gitrepo 151s - no changes found 151s - $ hg phase tip 151s - 0: draft 151s - 151s -even if we don't have a name? 151s - 151s - $ hg phase -fs 0 151s - $ mv .hg/hgrc .hg/hgrc.bak 151s - $ hg pull ../gitrepo 151s - pulling from ../gitrepo 151s - no changes found 151s - $ hg phase tip 151s - 0: draft 151s - $ mv .hg/hgrc.bak .hg/hgrc 151s - $ cd .. 151s - 151s - 151s -pulling without hggit.usephases does not publish local changesets 151s - $ cd gitrepo 151s - $ git checkout -q master 151s - $ echo beta > beta 151s - $ git add beta 151s - $ fn_git_commit -m 'add beta' 151s - $ cd .. 151s - 151s - $ cd hgrepo 151s - $ hg pull 151s - pulling from $TESTTMP/gitrepo 151s - importing 1 git commits 151s - updating bookmark master 151s - new changesets 7fe02317c63d (1 drafts) 151s - (run 'hg update' to get a working copy) 151s - $ hg phase -r master 151s - 1: draft 151s - 151s -pulling with git.public does not publish local changesets 151s - $ hg --config git.public=master pull 151s - pulling from $TESTTMP/gitrepo 151s - no changes found 151s - $ hg phase -r master 151s - 1: draft 151s - 151s -pushing without hggit.usephases does not publish local changesets 151s - $ hg update master 151s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 151s - $ echo gamma > gamma 151s - $ hg add gamma 151s - $ hg commit -m 'gamma' 151s - $ hg push 151s - pushing to $TESTTMP/gitrepo 151s - searching for changes 151s - adding objects 151s - remote: found 0 deltas to reuse 151s - added 1 commits with 1 trees and 1 blobs 151s - updating reference refs/heads/master 151s - $ hg phase -r master 151s - 2: draft 151s 151s ERROR: test-phases-draft.t output changed 153s ! 153s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-subrepos-push.t 153s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-subrepos-push.t.err 153s @@ -5,10 +5,13 @@ 153s Initialized empty Git repository in $TESTTMP/repo.git/ 153s 153s $ hg init hgsubrepo 153s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 153s $ cd hgsubrepo 153s $ echo thefile > thefile 153s $ hg add thefile 153s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 153s $ fn_hg_commit -m 'add thefile' 153s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 153s $ cd .. 153s 153s $ git init gitsubrepo 153s @@ -20,59 +23,9 @@ 153s $ cd .. 153s 153s $ hg clone repo.git hgrepo 153s - updating to branch default 153s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 153s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 153s + abort: repository repo.git not found 153s + [255] 153s $ cd hgrepo 153s + $TESTTMP.sh: 32: cd: can't cd to hgrepo 153s $ hg book master 153s - $ echo alpha > alpha 153s - $ hg add alpha 153s - $ fn_hg_commit -m 'add alpha' 153s - $ touch .hgsub 153s - $ hg add .hgsub 153s - $ fn_hg_commit -m "add .hgsub" 153s - $ hg clone -q ../hgsubrepo hg 153s - $ echo "hg = ../hgsubrepo" >> .hgsub 153s - $ fn_hg_commit -m 'add hg subrepo' 153s - $ git clone --quiet ../gitsubrepo git 153s - $ echo "git = [git]../gitsubrepo" >> .hgsub 153s - $ fn_hg_commit -m 'add git subrepo' 153s - $ hg push 153s - pushing to $TESTTMP/repo.git 153s - pushing subrepo hg to $TESTTMP/hgsubrepo 153s - searching for changes 153s - no changes found 153s - searching for changes 153s - adding objects 153s - remote: found 0 deltas to reuse 153s - added 4 commits with 2 trees and 2 blobs 153s - adding reference refs/heads/master 153s - $ cat .hgsub 153s - hg = ../hgsubrepo 153s - git = [git]../gitsubrepo 153s - $ cat .hgsubstate 153s - aaae5224095dca7403147c0e20cbac1f450b0e95 git 153s - df643c539c7541d48eacc76745581e00cbaf3d45 hg 153s - $ cd .. 153s - 153s -Now clone it. Note that no Mercurial state persists: 153s - 153s - $ git clone --recurse-submodules repo.git gitrepo 153s - Cloning into 'gitrepo'... 153s - done. 153s - Submodule 'git' ($TESTTMP/gitsubrepo) registered for path 'git' 153s - Cloning into '$TESTTMP/gitrepo/git'... 153s - done. 153s - Submodule path 'git': checked out 'aaae5224095dca7403147c0e20cbac1f450b0e95' 153s - $ cd gitrepo 153s - $ ls -A 153s - .git 153s - .gitmodules 153s - alpha 153s - git 153s - $ cat .gitmodules 153s - [submodule "git"] 153s - path = git 153s - url = ../gitsubrepo 153s - $ ls -A git 153s - .git 153s - thefile 153s 153s ERROR: test-subrepos-push.t output changed 154s ! 154s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-conflict-1.t 154s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-conflict-1.t.err 154s @@ -2,30 +2,40 @@ 154s $ . "$TESTDIR/testutil" 154s 154s $ hg init hgrepo1 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 154s $ cd hgrepo1 154s $ echo A > afile 154s $ hg add afile 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 154s $ hg ci -m "origin" 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 154s 154s $ echo B > afile 154s $ hg ci -m "A->B" 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 154s 154s $ hg up -r0 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 154s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 154s $ echo C > afile 154s $ hg ci -m "A->C" 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 154s created new head 154s 154s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 154s warning: conflicts.* (re) 154s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 154s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 154s resolve using first parent 154s $ echo C > afile 154s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 154s $ hg ci -m "merge to C" 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 154s 154s $ hg log --graph --style compact | sed 's/\[.*\]//g' 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 154s @ 3:2,1 6c53bc0f062f 1970-01-01 00:00 +0000 test 154s |\ merge to C 154s | | 154s @@ -45,31 +55,18 @@ 154s 154s $ cd hgrepo1 154s $ hg bookmark -r tip master 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 154s $ hg push -r master ../repo.git 154s - pushing to ../repo.git 154s - searching for changes 154s - adding objects 154s - remote: found 0 deltas to reuse 154s - added 4 commits with 3 trees and 3 blobs 154s - adding reference refs/heads/master 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 154s + abort: repository ../repo.git does not exist 154s + [255] 154s $ cd .. 154s 154s $ hg clone repo.git hgrepo2 154s - importing 4 git commits 154s - new changesets 5d1a6b64f9d0:6c53bc0f062f (4 drafts) 154s - updating to bookmark master 154s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 154s + abort: repository repo.git not found 154s + [255] 154s expect the same revision ids as above 154s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 154s - @ 3:1,2 6c53bc0f062f 1970-01-01 00:00 +0000 test 154s - |\ merge to C 154s - | | 154s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 154s - | | A->B 154s - | | 154s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 154s - |/ A->C 154s - | 154s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 154s - origin 154s - 154s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 154s + abort: repository hgrepo2 not found 154s 154s ERROR: test-conflict-1.t output changed 155s ! 155s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-git-clone.t 155s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-git-clone.t.err 155s @@ -14,30 +14,24 @@ 155s $ cd .. 155s 155s $ hg clone gitrepo hgrepo 155s - importing 2 git commits 155s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 155s - updating to bookmark master 155s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s + abort: repository gitrepo not found 155s + [255] 155s $ hg -R hgrepo log --graph 155s - @ changeset: 1:7fe02317c63d 155s - | bookmark: master 155s - | tag: default/master 155s - | tag: tip 155s - | user: test 155s - | date: Mon Jan 01 00:00:11 2007 +0000 155s - | summary: add beta 155s - | 155s - o changeset: 0:ff7a2f2d8d70 155s - user: test 155s - date: Mon Jan 01 00:00:10 2007 +0000 155s - summary: add alpha 155s - 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s + abort: repository hgrepo not found 155s + [255] 155s 155s we should have some bookmarks 155s $ hg -R hgrepo book 155s - * master 1:7fe02317c63d 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s + abort: repository hgrepo not found 155s + [255] 155s $ hg -R hgrepo gverify 155s - verifying rev 7fe02317c63d against git commit 9497a4ee62e16ee641860d7677cdb2589ea15554 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s + hg: unknown command 'gverify' 155s + (did you mean verify?) 155s + [10] 155s 155s test for ssh vulnerability 155s 155s @@ -47,16 +41,18 @@ 155s > EOF 155s 155s $ hg clone -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 155s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 155s [255] 155s $ hg clone -q 'git+ssh://%2DoProxyCommand=rm${IFS}nonexistent/path' 155s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 155s [255] 155s $ hg clone -q 'git+ssh://fakehost|rm${IFS}nonexistent/path' 155s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 155s - abort: git remote error: The remote server unexpectedly closed the connection. 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 155s [255] 155s $ hg clone -q 'git+ssh://fakehost%7Crm${IFS}nonexistent/path' 155s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 155s - abort: git remote error: The remote server unexpectedly closed the connection. 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 155s [255] 155s 155s ERROR: test-git-clone.t output changed 155s ! 155s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-pull-after-obsolete.t 155s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-pull-after-obsolete.t.err 155s @@ -20,52 +20,9 @@ 155s 155s $ cd .. 155s $ hg clone -U gitrepo hgrepo 155s - importing 2 git commits 155s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s + abort: repository gitrepo not found 155s + [255] 155s $ cd hgrepo 155s + $TESTTMP.sh: 31: cd: can't cd to hgrepo 155s $ hg up master 155s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 155s - (activating bookmark master) 155s - $ hg log --graph 155s - @ changeset: 1:7fe02317c63d 155s - | bookmark: master 155s - | tag: default/master 155s - | tag: thetag 155s - | tag: tip 155s - | user: test 155s - | date: Mon Jan 01 00:00:11 2007 +0000 155s - | summary: add beta 155s - | 155s - o changeset: 0:ff7a2f2d8d70 155s - user: test 155s - date: Mon Jan 01 00:00:10 2007 +0000 155s - summary: add alpha 155s - 155s - $ cd ../gitrepo 155s - $ echo beta line 2 >> beta 155s - $ git add beta 155s - $ fn_git_commit -m 'add to beta' 155s - 155s -Create a commit, obsolete it, and pull, to ensure that we can pull if 155s -the tipmost commit is hidden. 155s - 155s - $ cd ../hgrepo 155s - $ hg bookmark --inactive 155s - $ echo gamma > gamma 155s - $ hg add gamma 155s - $ fn_hg_commit -m 'add gamma' 155s - $ hg up master 155s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 155s - (activating bookmark master) 155s - $ hg log -T '{rev}:{node} {desc}\n' -r tip 155s - 2:4090a1266584bc1a47ce562e9349b1e0f1b44611 add gamma 155s - $ hg debugobsolete 4090a1266584bc1a47ce562e9349b1e0f1b44611 155s - 1 new obsolescence markers 155s - obsoleted 1 changesets 155s - 155s - $ hg pull 155s - pulling from $TESTTMP/gitrepo 155s - importing 1 git commits 155s - updating bookmark master 155s - new changesets cc1e605d90db (1 drafts) 155s - (run 'hg update' to get a working copy) 155s 155s ERROR: test-pull-after-obsolete.t output changed 156s ! 156s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-git-gpg.t 156s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-git-gpg.t.err 156s @@ -55,23 +55,10 @@ 156s Hg clone it 156s 156s $ hg clone gitrepo hgrepo 156s - importing 2 git commits 156s - new changesets ab60c5e55bd6:[0-9a-f]{12,12} \(2 drafts\) (re) 156s - updating to bookmark signed 156s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 156s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 156s + abort: repository gitrepo not found 156s + [255] 156s 156s $ cd hgrepo 156s + $TESTTMP.sh: 46: cd: can't cd to hgrepo 156s $ hg push ../gitrepo2 -B signed 156s - pushing to ../gitrepo2 156s - searching for changes 156s - adding objects 156s - remote: found 0 deltas to reuse 156s - added 1 commits with 1 trees and 0 blobs 156s - adding reference refs/heads/signed 156s - $ cd .. 156s - 156s -Verify the commit 156s - 156s - $ cd gitrepo2 156s - $ git show --show-signature signed | grep "Good signature from" 156s - gpg: Good signature from "hgtest" [ultimate] 156s 156s ERROR: test-git-gpg.t output changed 157s ! 157s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-push-phases.t 157s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-push-phases.t.err 157s @@ -9,68 +9,13 @@ 157s $ git init -q --bare repo.git 157s 157s $ hg clone repo.git hgrepo 157s - updating to branch default 157s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s + abort: repository repo.git not found 157s + [255] 157s 157s $ cd hgrepo 157s + $TESTTMP.sh: 13: cd: can't cd to hgrepo 157s 157s Create two commits, one secret: 157s 157s $ touch alpha 157s - $ hg add alpha 157s - $ fn_hg_commit -m alpha 157s - $ hg book -r . master 157s - $ touch beta 157s - $ hg add beta 157s - $ fn_hg_commit --secret -m beta 157s - $ hg book -r . secret 157s - $ hg push 157s - pushing to $TESTTMP/repo.git 157s - warning: not exporting secret bookmark 'secret' 157s - searching for changes 157s - adding objects 157s - remote: found 0 deltas to reuse 157s - added 1 commits with 1 trees and 1 blobs 157s - adding reference refs/heads/master 157s - $ cd .. 157s - $ hg -R hgrepo log --graph --template phases 157s - @ changeset: 1:62966756ea96 157s - | bookmark: secret 157s - | tag: tip 157s - | phase: secret 157s - | user: test 157s - | date: Mon Jan 01 00:00:11 2007 +0000 157s - | summary: beta 157s - | 157s - o changeset: 0:d4b83afc35d1 157s - bookmark: master 157s - tag: default/master 157s - phase: public 157s - user: test 157s - date: Mon Jan 01 00:00:10 2007 +0000 157s - summary: alpha 157s - 157s - 157s -What happens when we push the secret? 157s - 157s - $ hg -R hgrepo push -B secret 157s - pushing to $TESTTMP/repo.git 157s - warning: not exporting secret bookmark 'secret' 157s - searching for changes 157s - abort: revision 62966756ea96 cannot be pushed since it doesn't have a bookmark 157s - [255] 157s - 157s -Only one changeset was pushed: 157s - 157s - $ GIT_DIR=repo.git git log --graph --all --decorate=short 157s - * commit 2cc4e3d19551e459a0dd606f4cf890de571c7d33 (HEAD -> master) 157s - Author: test 157s - Date: Mon Jan 1 00:00:10 2007 +0000 157s - 157s - alpha 157s - 157s -And this published the remote head: 157s - 157s - $ hg -R hgrepo phase 'all()' 157s - 0: public 157s - 1: secret 157s 157s ERROR: test-push-phases.t output changed 157s ! 157s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-keywords.t 157s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-keywords.t.err 157s @@ -21,29 +21,9 @@ 157s $ cd .. 157s 157s $ hg clone gitrepo hgrepo 157s - importing 3 git commits 157s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 157s - updating to bookmark master 157s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s + abort: repository gitrepo not found 157s + [255] 157s $ cd hgrepo 157s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 157s $ echo gamma > gamma 157s - $ hg add gamma 157s - $ hg commit -m 'add gamma' 157s - 157s - $ hg log --template "{rev} {node} {node|short} {gitnode} {gitnode|short}\n" 157s - 3 965bf7d08d3ac847dd8eb9e72ee0bf547d1a65d9 965bf7d08d3a 157s - 2 8e3f0ecc9aefd4ea2fdf8e2d5299cac548762a1c 8e3f0ecc9aef 7e2a5465ff4e3b992c429bb87a392620a0ac97b7 7e2a5465ff4e 157s - 1 7fe02317c63d9ee324d4b5df7c9296085162da1b 7fe02317c63d 9497a4ee62e16ee641860d7677cdb2589ea15554 9497a4ee62e1 157s - 0 ff7a2f2d8d7099694ae1e8b03838d40575bebb63 ff7a2f2d8d70 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 7eeab2ea75ec 157s - $ hg log --template "fromgit {rev}\n" --rev "fromgit()" 157s - fromgit 0 157s - fromgit 1 157s - fromgit 2 157s - $ hg log --template "gitnode_existsA {rev}\n" --rev "gitnode(9497a4ee62e16ee641860d7677cdb2589ea15554)" 157s - gitnode_existsA 1 157s - $ hg log --template "gitnode_existsB {rev}\n" --rev "gitnode(7eeab)" 157s - gitnode_existsB 0 157s - $ hg log --rev "gitnode(7e)" 157s - abort: git-mapfile@7e: ambiguous identifier!? (re) 157s - [50] 157s - $ hg log --template "gitnode_notexists {rev}\n" --rev "gitnode(1234567890ab)" 157s 157s ERROR: test-keywords.t output changed 158s ! 158s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-subrepos-delete.t 158s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-subrepos-delete.t.err 158s @@ -52,22 +52,9 @@ 158s And there should be nothing in Mercurial either: 158s 158s $ hg clone -U repo.git hgrepo 158s - importing 3 git commits 158s - new changesets e532b2bfda10:cc611d35fb62 (3 drafts) 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 158s + abort: repository repo.git not found 158s + [255] 158s $ cd hgrepo 158s + $TESTTMP.sh: 50: cd: can't cd to hgrepo 158s $ hg log --graph --template info 158s - o 158s - | commit: 2:cc611d35fb62 delete subrepo 158s - | added: 158s - | removed: .hgsub .hgsubstate 158s - o 158s - | commit: 1:8d549bcc5179 add subrepo 158s - | added: .hgsub .hgsubstate 158s - | removed: 158s - o 158s - commit: 0:e532b2bfda10 add alpha 158s - added: alpha 158s - removed: 158s - $ hg manifest -r tip 158s - alpha 158s - $ cd .. 158s 158s ERROR: test-subrepos-delete.t output changed 159s ! 159s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-tree-decomposition.t 159s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-tree-decomposition.t.err 159s @@ -24,45 +24,9 @@ 159s $ git init -q --bare repo.git 159s 159s $ hg clone gitrepo hgrepo 159s - importing 3 git commits 159s - new changesets d4d3d2417141:541f27994b81 (3 drafts) 159s - updating to bookmark master 159s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 159s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 159s + abort: repository gitrepo not found 159s + [255] 159s $ cd hgrepo 159s + $TESTTMP.sh: 38: cd: can't cd to hgrepo 159s $ hg log --template 'adds: {file_adds}\ndels: {file_dels}\n' 159s - adds: d1 159s - dels: d1/f1 159s - adds: d2/f2 159s - dels: d1/f2 159s - adds: d1/f1 d1/f2 159s - dels: 159s - 159s - $ hg debug-remove-hggit-state 159s - clearing out the git cache data 159s - $ hg push ../repo.git 159s - pushing to ../repo.git 159s - searching for changes 159s - adding objects 159s - remote: found 0 deltas to reuse 159s - added 3 commits with 6 trees and 3 blobs 159s - adding reference refs/heads/master 159s - $ cd .. 159s - 159s - $ git --git-dir=repo.git log --pretty=medium 159s - commit 6e0dbd8cd92ed4823c69cb48d8a2b81f904e6e69 159s - Author: test 159s - Date: Mon Jan 1 00:00:12 2007 +0000 159s - 159s - replace a dir with a file 159s - 159s - commit a1874d5cd0b1549ed729e36f0da4a93ed36259ee 159s - Author: test 159s - Date: Mon Jan 1 00:00:11 2007 +0000 159s - 159s - rename 159s - 159s - commit 102c17a5deda49db3f10ec5573f9378867098b7c 159s - Author: test 159s - Date: Mon Jan 1 00:00:10 2007 +0000 159s - 159s - initial 159s 159s ERROR: test-tree-decomposition.t output changed 160s ! 160s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-subrepos-drop.t 160s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-subrepos-drop.t.err 160s @@ -17,52 +17,9 @@ 160s Create a Mercurial repository with a .gitmodules file: 160s 160s $ hg clone repo.git hgrepo 160s - updating to branch default 160s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s + abort: repository repo.git not found 160s + [255] 160s $ cd hgrepo 160s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 160s $ hg book master 160s - $ touch this 160s - $ fn_hg_commit -A -m 'add this' 160s - $ cat > .gitmodules < [submodule "subrepo"] 160s - > path = subrepo 160s - > url = ../gitsubrepo 160s - > EOF 160s - $ hg add .gitmodules 160s - $ fn_hg_commit -m "add .gitmodules file" 160s - $ cd .. 160s - 160s -What happens if we push that to Git? 160s - 160s - $ hg -R hgrepo push 160s - pushing to $TESTTMP/repo.git 160s - warning: ignoring modifications to '.gitmodules' file; please use '.hgsub' instead 160s - searching for changes 160s - adding objects 160s - remote: found 0 deltas to reuse 160s - added 2 commits with 1 trees and 1 blobs 160s - adding reference refs/heads/master 160s - 160s -But we don't get a warning if we don't touch .gitmodules: 160s - 160s - $ cd hgrepo 160s - $ touch that 160s - $ fn_hg_commit -A -m 'add that' 160s - $ hg push 160s - pushing to $TESTTMP/repo.git 160s - searching for changes 160s - adding objects 160s - remote: found 0 deltas to reuse 160s - added 1 commits with 1 trees and 0 blobs 160s - updating reference refs/heads/master 160s - $ cd .. 160s - 160s -Check that it didn't silenty come through, or something: 160s - 160s - $ git clone repo.git gitrepo 160s - Cloning into 'gitrepo'... 160s - done. 160s - $ ls -A gitrepo 160s - .git 160s - that 160s - this 160s 160s ERROR: test-subrepos-drop.t output changed 160s ! 160s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-annotate.t 160s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-annotate.t.err 160s @@ -10,6 +10,7 @@ 160s init 160s 160s $ hg init repo 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s $ cd repo 160s 160s commit 160s @@ -19,37 +20,48 @@ 160s > a 160s > EOF 160s $ hg add a 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s $ fn_hg_commit -m 1 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s $ cat < a 160s > a 160s > a 160s > a 160s > EOF 160s $ fn_hg_commit -m 2 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s $ cat < a 160s > a 160s > b 160s > a 160s > EOF 160s $ fn_hg_commit -m 3 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s 160s annotate multiple files 160s 160s $ hg annotate a 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s 0: a 160s 2: b 160s 1: a 160s 160s $ hg annotate --skip 1 a 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s 0: a 160s 2: b 160s 0* a 160s 160s $ hg gexport 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s + hg: unknown command 'gexport' 160s + (did you mean one of export, import?) 160s + [10] 160s $ hg log -T '{rev}:{node} {gitnode}\n' 160s - 2:beb139b96eec386addc02d48db524b7646ef1605 19388575d02e71e917e7013aa854d4a21c509819 160s - 1:a9a255d66663f9216bdcf8dda69211d7280f7278 debec50a14cc4830584dd4fa1507c51cce1c098f 160s - 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 88f28c06a1ede9a70852ab1bf9818150fabaaaa9 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s + 2:beb139b96eec386addc02d48db524b7646ef1605 160s + 1:a9a255d66663f9216bdcf8dda69211d7280f7278 160s + 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 160s 160s $ cat < .git-blame-ignore-revs 160s > # this is a comment, and the next line should be ignored 160s @@ -59,39 +71,43 @@ 160s > EOF 160s 160s $ hg annotate a 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s 0: a 160s 2: b 160s 1: a 160s $ hg annotate a \ 160s > --debug \ 160s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 160s - skipping debec50a14cc -> a9a255d66663 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s 0: a 160s 2: b 160s - 0* a 160s + 1: a 160s $ hg add .git-blame-ignore-revs 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s $ hg annotate a \ 160s > --debug \ 160s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 160s - skipping debec50a14cc -> a9a255d66663 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s 0: a 160s 2: b 160s - 0* a 160s + 1: a 160s $ hg annotate a \ 160s > --config git.blame.ignoreRevsFile=badfile 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s 0: a 160s 2: b 160s 1: a 160s $ hg annotate -T'{lines % "{rev}:{node|short} {gitnode|short}: {line}"}' a 160s - 0:8d4731bd0f4a 88f28c06a1ed: a 160s - 2:beb139b96eec 19388575d02e: b 160s - 1:a9a255d66663 debec50a14cc: a 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s + 0:8d4731bd0f4a : a 160s + 2:beb139b96eec : b 160s + 1:a9a255d66663 : a 160s 160s $ cd .. 160s $ hg -R repo annotate repo/a \ 160s > --debug \ 160s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 160s - skipping debec50a14cc -> a9a255d66663 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s 0: a 160s 2: b 160s - 0* a 160s + 1: a 160s 160s ERROR: test-annotate.t output changed 160s ! 160s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-push-anonymous.t 160s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-push-anonymous.t.err 160s @@ -25,28 +25,9 @@ 160s Clone it, deactivate the bookmark, add a commit, and push! 160s 160s $ hg clone -U gitrepo hgrepo 160s - importing 1 git commits 160s - new changesets ff7a2f2d8d70 (1 drafts) 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s + abort: repository gitrepo not found 160s + [255] 160s $ cd hgrepo 160s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 160s $ hg up tip 160s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s - $ echo beta > beta 160s - $ hg add beta 160s - $ fn_hg_commit -m "add beta" 160s - 160s -Pushing that changeset should print a helpful message: 160s - 160s - $ hg push 160s - pushing to $TESTTMP/gitrepo 160s - searching for changes 160s - no changes found (ignoring 1 changesets without bookmarks or tags) 160s - [1] 160s - 160s -But what about untagged, but secret changesets? 160s - 160s - $ hg phase -fs tip 160s - $ hg push 160s - pushing to $TESTTMP/gitrepo 160s - searching for changes 160s - no changes found 160s - [1] 160s 160s ERROR: test-push-anonymous.t output changed 160s ! 160s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-empty-working-tree.t 160s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-empty-working-tree.t.err 160s @@ -10,29 +10,9 @@ 160s $ git init -q --bare repo.git 160s 160s $ hg clone gitrepo hgrepo 160s - importing 1 git commits 160s - new changesets 01708ca54a8f (1 drafts) 160s - updating to bookmark master 160s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 160s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 160s + abort: repository gitrepo not found 160s + [255] 160s $ cd hgrepo 160s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 160s $ hg log -r tip --template 'files: {files}\n' 160s - files: 160s - $ hg gverify 160s - verifying rev 01708ca54a8f against git commit 678256865a8c85ae925bf834369264193c88f8de 160s - 160s - $ hg debug-remove-hggit-state 160s - clearing out the git cache data 160s - $ hg push ../repo.git 160s - pushing to ../repo.git 160s - searching for changes 160s - adding objects 160s - remote: found 0 deltas to reuse 160s - added 1 commits with 1 trees and 0 blobs 160s - adding reference refs/heads/master 160s - $ cd .. 160s - $ git --git-dir=repo.git log --pretty=medium 160s - commit 678256865a8c85ae925bf834369264193c88f8de 160s - Author: test 160s - Date: Mon Jan 1 00:00:00 2007 +0000 160s - 160s - empty 160s 160s ERROR: test-empty-working-tree.t output changed 163s ! 163s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-gitignore-permissions.t 163s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-gitignore-permissions.t.err 163s @@ -4,6 +4,7 @@ 163s $ . "$TESTDIR/testutil" 163s 163s $ hg init repo 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s $ cd repo 163s 163s $ if test `whoami` = root 163s @@ -16,8 +17,14 @@ 163s 163s $ touch thefile 163s $ hg add thefile 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s $ hg ci -A -m commit 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s $ hg gexport 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s + hg: unknown command 'gexport' 163s + (did you mean one of export, import?) 163s + [10] 163s 163s Create a file that we can ignore 163s 163s @@ -33,9 +40,10 @@ 163s 163s $ echo nothingtoseehere > .gitignore 163s $ hg status 163s - not_readable: Permission denied 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s not_readable: Permission denied 163s ? .gitignore 163s + ? nothingtoseehere 163s 163s And notice that we really did ignore it! 163s 163s 163s ERROR: test-gitignore-permissions.t output changed 163s ! 163s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-gitignore-share.t 163s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-gitignore-share.t.err 163s @@ -9,6 +9,7 @@ 163s $ git init --quiet --bare repo.git 163s 163s $ hg init hgrepo 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s $ cd hgrepo 163s $ cat > .hg/hgrc < [paths] 163s @@ -16,26 +17,31 @@ 163s > EOF 163s $ echo ignored > .gitignore 163s $ hg add .gitignore 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s $ hg ci -m ignore 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s $ hg book master 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s $ hg push 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s pushing to $TESTTMP/repo.git 163s - searching for changes 163s - adding objects 163s - remote: found 0 deltas to reuse 163s - added 1 commits with 1 trees and 1 blobs 163s - adding reference refs/heads/master 163s + abort: repository $TESTTMP/repo.git not found 163s + [255] 163s $ cd .. 163s 163s We should also ignore the file in a shared repository: 163s 163s $ hg share hgrepo sharerepo 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s updating working directory 163s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 163s $ cd sharerepo 163s $ hg paths 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s default = $TESTTMP/repo.git 163s $ cat .gitignore 163s ignored 163s $ touch ignored 163s $ hg status 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s + ? ignored 163s 163s ERROR: test-gitignore-share.t output changed 163s ! 163s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-ambiguousprefix.t 163s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-ambiguousprefix.t.err 163s @@ -21,13 +21,11 @@ 163s $ cd .. 163s 163s $ hg clone gitrepo hgrepo 163s - importing 3 git commits 163s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 163s - updating to bookmark master 163s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s + abort: repository gitrepo not found 163s + [255] 163s 163s $ cd hgrepo 163s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 163s 163s $ hg log -r 'gitnode(7e)' 163s - abort: git-mapfile@7e: ambiguous identifier!? (re) 163s - [50] 163s 163s ERROR: test-ambiguousprefix.t output changed 165s ! 165s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-timezone.t 165s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-timezone.t.err 165s @@ -8,10 +8,13 @@ 165s $ . "$TESTDIR/testutil" 165s 165s $ hg init hgrepo 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 165s $ cd hgrepo 165s $ touch beta 165s $ hg add beta 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 165s $ fn_hg_commit -m "test commit" 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 165s $ cat >patch2 < # HG changeset patch 165s > # User J. User 165s @@ -28,5 +31,10 @@ 165s > +alpha 165s > EOF 165s $ hg import patch2 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 165s applying patch2 165s $ hg gexport 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 165s + hg: unknown command 'gexport' 165s + (did you mean one of export, import?) 165s + [10] 165s 165s ERROR: test-timezone.t output changed 166s ! 166s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-transplant.t 166s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-transplant.t.err 166s @@ -11,12 +11,20 @@ 166s > EOF 166s 166s $ hg init baserepo 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s $ cd baserepo 166s $ for c in A B C 166s > do 166s > echo $c > $c && hg add $c && fn_hg_commit -m $c 166s > done 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s $ hg clone -r 2 . ../otherrepo 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s adding changesets 166s adding manifests 166s adding file changes 166s @@ -26,6 +34,8 @@ 166s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 166s $ cd ../otherrepo 166s $ hg up 1 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 166s $ hg transplant -s ../baserepo tip 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s no changes found 166s 166s ERROR: test-transplant.t output changed 167s !s 167s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-url-parsing.py.out 167s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-url-parsing.py.err 167s @@ -1,46 +1,14 @@ 167s -% expect '/webjam/webjam.git' 167s -/webjam/webjam.git 167s -% expect 'github.com' 167s -github.com 167s -% expect '/webjam/webjam.git' 167s -/webjam/webjam.git 167s -% expect 'github.com' 167s -github.com 167s -% expect '19418' 167s -19418 167s -% expect 'webjam.git' 167s -webjam.git 167s -% expect 'git@heroku.com' 167s -git@heroku.com 167s -% expect '999' 167s -999 167s -% expect 'webjam/webjam.git' 167s -webjam/webjam.git 167s -% expect 'git@github.com' 167s -git@github.com 167s -% expect '42qu/vps.git' 167s -42qu/vps.git 167s -% expect 'git@github.com' 167s -git@github.com 167s -% expect '/webjam/webjam.git' 167s -/webjam/webjam.git 167s -% expect 'git@github.com' 167s -git@github.com 167s -% expect '/webjam/webjam.git' 167s -/webjam/webjam.git 167s -% expect 'git@github.com' 167s -git@github.com 167s -% expect '10022' 167s -10022 167s -% expect 'webjam.git' 167s -webjam.git 167s -% expect 'git@heroku.com' 167s -git@heroku.com 167s -% expect 'webjam.git' 167s -webjam.git 167s -% expect 'git@compatible.com' 167s -git@compatible.com 167s -% expect 'webjam.git' 167s -webjam.git 167s -% expect 'git@heroku.com' 167s -git@heroku.com 167s +Traceback (most recent call last): 167s + File "/tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-url-parsing.py", line 14, in 167s + from hggit.git_handler import GitHandler 167s + File "/usr/lib/python3/dist-packages/hggit/__init__.py", line 160, in 167s + from . import commands 167s + File "/usr/lib/python3/dist-packages/hggit/commands.py", line 26, in 167s + from . import verify 167s + File "/usr/lib/python3/dist-packages/hggit/verify.py", line 16, in 167s + from . import git2hg 167s + File "/usr/lib/python3/dist-packages/hggit/git2hg.py", line 8, in 167s + from dulwich.refs import ( 167s + ...<3 lines>... 167s + ) 167s +ImportError: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 167s 167s ERROR: test-url-parsing.py output changed 168s !. 168s --- /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-addbranchrevs.t 168s +++ /tmp/autopkgtest.B7JscZ/build.ihL/src/tests/test-addbranchrevs.t.err 168s @@ -7,14 +7,23 @@ 168s caused the pull to not update to the passed revision. 168s 168s $ hg init orig 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s $ cd orig 168s $ echo a > a; hg add a; hg ci -m a 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s $ hg branch foo -q 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s $ echo b > b; hg add b; hg ci -m b 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s 168s $ cd .. 168s $ hg clone orig clone -r 0 -q 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s $ cd clone 168s $ hg pull -u -r 1 -q 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s $ hg id -n 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.B7JscZ/build.ihL/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s 1 168s 168s ERROR: test-addbranchrevs.t output changed 168s ! 168s Skipped test-check-black.t: missing feature: the black formatter for python (>= 22.3) 168s Skipped test-check-commit.t: missing feature: running tests from repository 168s Skipped test-check-pyflakes.t: missing feature: Pyflakes python linter 168s Skipped test-check-pylint.t: missing feature: Pylint python linter 168s Skipped test-encoding.t: blacklisted 168s Skipped test-gitignore-windows.t: missing feature: Windows 168s Skipped test-incoming.t: blacklisted 168s Skipped test-serve-ci.t: skipped 168s Skipped test-serve-dulwich.t: blacklisted 168s Failed test-addbranchrevs.t: output changed 168s Failed test-ambiguousprefix.t: output changed and returned error code 1 168s Failed test-annotate.t: output changed 168s Failed test-bookmark-workflow.t: output changed and returned error code 1 168s Failed test-branch-bookmark-suffix.t#with-path: output changed and returned error code 1 168s Failed test-branch-bookmark-suffix.t#without-path: output changed and returned error code 1 168s Failed test-bundle.t: output changed and returned error code 1 168s Failed test-clone.t#draft: output changed 168s Failed test-clone.t#secret: output changed 168s Failed test-conflict-1.t: output changed 168s Failed test-conflict-2.t: output changed 168s Failed test-convergedmerge.t: output changed 168s Failed test-empty-working-tree.t: output changed and returned error code 1 168s Failed test-extra.t: output changed and returned error code 1 168s Failed test-file-removal.t: output changed and returned error code 1 168s Failed test-gc.t: output changed and returned error code 1 168s Failed test-git-clone.t: output changed 168s Failed test-git-gpg.t: output changed and returned error code 1 168s Failed test-git-submodules.t: output changed and returned error code 1 168s Failed test-git-tags.t#draft: output changed and returned error code 1 168s Failed test-git-tags.t#secret: output changed and returned error code 1 168s Failed test-git-workflow.t: output changed 168s Failed test-gitignore-permissions.t: output changed 168s Failed test-gitignore-share.t: output changed 168s Failed test-gitignore.t: output changed 168s Failed test-help.t: output changed 168s Failed test-hg-author.t: output changed and returned error code 1 168s Failed test-hg-branch.t: output changed and returned error code 1 168s Failed test-hg-clone.t: output changed and returned error code 1 168s Failed test-hg-tags.t: output changed and returned error code 1 168s Failed test-hook.t: output changed 168s Failed test-illegal-contents.t: output changed 168s Failed test-invalid-refs.t: output changed and returned error code 1 168s Failed test-keywords.t: output changed and returned error code 1 168s Failed test-merge.t: output changed and returned error code 1 168s Failed test-multiple-remotes.t: output changed 168s Failed test-octopus.t: output changed and returned error code 1 168s Failed test-orphan-tags.t: output changed and returned error code 1 168s Failed test-outgoing.t: output changed and returned error code 1 168s Failed test-phases-draft.t: output changed and returned error code 1 168s Failed test-phases-public.t#publish-defaults: output changed and returned error code 1 168s Failed test-phases-public.t#publish-specific: output changed and returned error code 1 168s Failed test-phases-remote.t: output changed and returned error code 1 168s Failed test-pull-after-obsolete.t: output changed and returned error code 1 168s Failed test-pull-after-rebase.t: output changed and returned error code 1 168s Failed test-pull-after-strip.t: output changed and returned error code 1 168s Failed test-pull.t#draft: output changed 168s Failed test-pull.t#secret: output changed 168s Failed test-push-anonymous.t: output changed and returned error code 1 168s Failed test-push-authors.t: output changed and returned error code 1 168s Failed test-push-detached.t: output changed and returned error code 1 168s Failed test-push-missing-commit.t: output changed and returned error code 1 168s Failed test-push-phases.t: output changed and returned error code 1 168s Failed test-push-r.t: output changed 168s Failed test-push-to-head.t: output changed and returned error code 1 168s Failed test-push.t: output changed and returned error code 1 168s Failed test-renames.t: output changed and returned error code 1 168s Failed test-serve-git.t: output changed 168s Failed test-serve-hg-static.t: output changed 168s Failed test-serve-hg.t#with-hggit: output changed and returned error code 1 168s Failed test-serve-hg.t#without-hggit: output changed and returned error code 1 168s Failed test-subrepos-delete.t: output changed and returned error code 1 168s Failed test-subrepos-drop.t: output changed and returned error code 1 168s Failed test-subrepos-push.t: output changed and returned error code 1 168s Failed test-subrepos-syntax.t: output changed and returned error code 1 168s Failed test-subrepos.t: output changed and returned error code 1 168s Failed test-timezone.t: output changed 168s Failed test-transactions.t: output changed 168s Failed test-transplant.t: output changed 168s Failed test-tree-decomposition.t: output changed and returned error code 1 168s Failed test-url-parsing.py: output changed and returned error code 1 168s Failed test-verify-fail.t: output changed 168s # Ran 73 tests, 9 skipped, 72 failed. 168s python hash seed: 2424890660 168s make: *** [Makefile:15: tests] Error 1 168s autopkgtest [00:08:36]: test testsuite: -----------------------] 169s autopkgtest [00:08:37]: test testsuite: - - - - - - - - - - results - - - - - - - - - - 169s testsuite FAIL non-zero exit status 2 169s autopkgtest [00:08:37]: test mercurial-git: preparing testbed 188s Creating nova instance adt-resolute-arm64-hg-git-20260203-000548-juju-7f2275-prod-proposed-migration-environment-15-6fb48457-c5fb-4f31-82d2-bd059cdc2c10 from image adt/ubuntu-resolute-arm64-server-20260202.img (UUID e5b8703b-d12e-4238-a70e-a72a9b0d7948)... 241s autopkgtest [00:09:49]: testbed dpkg architecture: arm64 241s autopkgtest [00:09:49]: testbed apt version: 3.1.14 241s autopkgtest [00:09:49]: @@@@@@@@@@@@@@@@@@@@ test bed setup 241s autopkgtest [00:09:49]: testbed release detected to be: resolute 242s autopkgtest [00:09:50]: updating testbed package index (apt update) 242s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 243s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 243s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 243s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 243s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [28.4 kB] 243s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1278 kB] 243s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/restricted Sources [5256 B] 243s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [105 kB] 243s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main arm64 Packages [133 kB] 243s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/main arm64 c-n-f Metadata [3480 B] 244s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/restricted arm64 Packages [52.9 kB] 244s Get:12 http://ftpmaster.internal/ubuntu resolute-proposed/restricted arm64 c-n-f Metadata [328 B] 244s Get:13 http://ftpmaster.internal/ubuntu resolute-proposed/universe arm64 Packages [1076 kB] 244s Get:14 http://ftpmaster.internal/ubuntu resolute-proposed/universe arm64 c-n-f Metadata [26.4 kB] 244s Get:15 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse arm64 Packages [21.3 kB] 244s Get:16 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse arm64 c-n-f Metadata [756 B] 246s Fetched 2855 kB in 2s (1698 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 packages will be upgraded: 249s libexpat1 liblocale-gettext-perl 249s 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 249s Need to get 101 kB of archives. 249s After this operation, 2048 B of additional disk space will be used. 249s Get:1 http://ftpmaster.internal/ubuntu resolute/main arm64 libexpat1 arm64 2.7.4-1 [85.7 kB] 249s Get:2 http://ftpmaster.internal/ubuntu resolute/main arm64 liblocale-gettext-perl arm64 1.07-8 [15.6 kB] 250s dpkg-preconfigure: unable to re-open stdin: No such file or directory 250s Fetched 101 kB in 0s (4745 kB/s) 250s (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 ... 89359 files and directories currently installed.) 250s Preparing to unpack .../libexpat1_2.7.4-1_arm64.deb ... 250s Unpacking libexpat1:arm64 (2.7.4-1) over (2.7.3-1) ... 250s Preparing to unpack .../liblocale-gettext-perl_1.07-8_arm64.deb ... 250s Unpacking liblocale-gettext-perl (1.07-8) over (1.07-7build1) ... 250s Setting up libexpat1:arm64 (2.7.4-1) ... 250s Setting up liblocale-gettext-perl (1.07-8) ... 250s Processing triggers for man-db (2.13.1-1) ... 250s Processing triggers for libc-bin (2.42-2ubuntu4) ... 250s autopkgtest [00:09:58]: upgrading testbed (apt dist-upgrade and autopurge) 251s Reading package lists... 251s Building dependency tree... 251s Reading state information... 251s Calculating upgrade... 251s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 252s Reading package lists... 252s Building dependency tree... 252s Reading state information... 252s Solving dependencies... 252s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 255s Reading package lists... 255s Building dependency tree... 255s Reading state information... 255s Solving dependencies... 256s The following NEW packages will be installed: 256s git git-man liberror-perl mercurial mercurial-common mercurial-git 256s python3-dulwich 256s 0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded. 256s Need to get 9664 kB of archives. 256s After this operation, 51.7 MB of additional disk space will be used. 256s Get:1 http://ftpmaster.internal/ubuntu resolute/main arm64 liberror-perl all 0.17030-1 [23.5 kB] 256s Get:2 http://ftpmaster.internal/ubuntu resolute/main arm64 git-man all 1:2.51.0-1ubuntu1 [1179 kB] 256s Get:3 http://ftpmaster.internal/ubuntu resolute/main arm64 git arm64 1:2.51.0-1ubuntu1 [4431 kB] 256s Get:4 http://ftpmaster.internal/ubuntu resolute/universe arm64 mercurial-common all 7.1.1-1ubuntu1 [2789 kB] 256s Get:5 http://ftpmaster.internal/ubuntu resolute/universe arm64 mercurial arm64 7.1.1-1ubuntu1 [389 kB] 256s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/universe arm64 python3-dulwich arm64 1.0.0-2 [792 kB] 256s Get:7 http://ftpmaster.internal/ubuntu resolute/universe arm64 mercurial-git all 1.2.0-1 [60.9 kB] 257s Fetched 9664 kB in 1s (10.5 MB/s) 257s Selecting previously unselected package liberror-perl. 257s (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 ... 89359 files and directories currently installed.) 257s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 257s Unpacking liberror-perl (0.17030-1) ... 257s Selecting previously unselected package git-man. 257s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 257s Unpacking git-man (1:2.51.0-1ubuntu1) ... 257s Selecting previously unselected package git. 257s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_arm64.deb ... 257s Unpacking git (1:2.51.0-1ubuntu1) ... 257s Selecting previously unselected package mercurial-common. 257s Preparing to unpack .../3-mercurial-common_7.1.1-1ubuntu1_all.deb ... 257s Unpacking mercurial-common (7.1.1-1ubuntu1) ... 257s Selecting previously unselected package mercurial. 257s Preparing to unpack .../4-mercurial_7.1.1-1ubuntu1_arm64.deb ... 257s Unpacking mercurial (7.1.1-1ubuntu1) ... 257s Selecting previously unselected package python3-dulwich. 257s Preparing to unpack .../5-python3-dulwich_1.0.0-2_arm64.deb ... 257s Unpacking python3-dulwich (1.0.0-2) ... 257s Selecting previously unselected package mercurial-git. 257s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 257s Unpacking mercurial-git (1.2.0-1) ... 257s Setting up mercurial-common (7.1.1-1ubuntu1) ... 259s Setting up liberror-perl (0.17030-1) ... 259s Setting up python3-dulwich (1.0.0-2) ... 259s Setting up git-man (1:2.51.0-1ubuntu1) ... 259s Setting up mercurial (7.1.1-1ubuntu1) ... 260s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 260s Setting up mercurial-git (1.2.0-1) ... 260s mercurial-git extension is disabled by default. 260s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 260s Setting up git (1:2.51.0-1ubuntu1) ... 260s Processing triggers for man-db (2.13.1-1) ... 263s autopkgtest [00:10:11]: test mercurial-git: [----------------------- 264s Initialized empty Git repository in /tmp/autopkgtest.B7JscZ/build.ihL/src/git_server/ 264s Cloning into 'git_clone'... 264s warning: You appear to have cloned an empty repository. 264s done. 264s [master (root-commit) 9f909fe] a 264s 1 file changed, 1 insertion(+) 264s create mode 100644 a 264s To /tmp/autopkgtest.B7JscZ/build.ihL/src/git_server 264s * [new branch] master -> master 264s *** failed to import extension "hggit": cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s abort: repository git_server not found 264s autopkgtest [00:10:12]: test mercurial-git: -----------------------] 265s autopkgtest [00:10:13]: test mercurial-git: - - - - - - - - - - results - - - - - - - - - - 265s mercurial-git FAIL non-zero exit status 253 265s autopkgtest [00:10:13]: test mercurial-git: - - - - - - - - - - stderr - - - - - - - - - - 265s *** failed to import extension "hggit": cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s abort: repository git_server not found 265s autopkgtest [00:10:13]: @@@@@@@@@@@@@@@@@@@@ summary 265s testsuite FAIL non-zero exit status 2 265s mercurial-git FAIL non-zero exit status 253