0s autopkgtest [01:27:33]: starting date and time: 2026-02-03 01:27:33+0000 0s autopkgtest [01:27:33]: git checkout: 4b346b80 nova: make wait_reboot return success even when a no-op 0s autopkgtest [01:27:33]: host juju-7f2275-prod-proposed-migration-environment-2; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.p31vz_tl/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-amd64 --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-2@sto01-4.secgroup --name adt-resolute-amd64-hg-git-20260203-012733-juju-7f2275-prod-proposed-migration-environment-2-6b11a2c5-ecb0-4f0b-bdce-7da17e20cb77 --image adt/ubuntu-resolute-amd64-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-2 --net-id=net_prod-autopkgtest-workers-amd64 -e TERM=linux --mirror=http://ftpmaster.internal/ubuntu/ 4s Creating nova instance adt-resolute-amd64-hg-git-20260203-012733-juju-7f2275-prod-proposed-migration-environment-2-6b11a2c5-ecb0-4f0b-bdce-7da17e20cb77 from image adt/ubuntu-resolute-amd64-server-20260202.img (UUID 54e94ad2-f1e5-466e-b281-ee6f460760b3)... 72s autopkgtest [01:28:45]: testbed dpkg architecture: amd64 72s autopkgtest [01:28:45]: testbed apt version: 3.1.14 73s autopkgtest [01:28:46]: @@@@@@@@@@@@@@@@@@@@ test bed setup 73s autopkgtest [01:28:46]: testbed release detected to be: None 73s autopkgtest [01:28:46]: updating testbed package index (apt update) 74s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 74s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 74s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 74s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 74s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/restricted Sources [5256 B] 74s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [271 kB] 74s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [28.4 kB] 74s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1275 kB] 75s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 Packages [318 kB] 75s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/main i386 Packages [246 kB] 75s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 c-n-f Metadata [3684 B] 75s Get:12 http://ftpmaster.internal/ubuntu resolute-proposed/restricted amd64 Packages [32.9 kB] 75s Get:13 http://ftpmaster.internal/ubuntu resolute-proposed/restricted i386 Packages [3692 B] 75s Get:14 http://ftpmaster.internal/ubuntu resolute-proposed/restricted amd64 c-n-f Metadata [336 B] 75s Get:15 http://ftpmaster.internal/ubuntu resolute-proposed/universe i386 Packages [437 kB] 75s Get:16 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 Packages [1129 kB] 75s Get:17 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 c-n-f Metadata [27.4 kB] 75s Get:18 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse i386 Packages [4780 B] 75s Get:19 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse amd64 Packages [25.4 kB] 75s Get:20 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse amd64 c-n-f Metadata [1076 B] 76s Fetched 3932 kB in 1s (2743 kB/s) 76s Reading package lists... 77s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 77s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 77s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 77s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 77s Reading package lists... 77s Reading package lists... 78s Building dependency tree... 78s Reading state information... 78s Calculating upgrade... 78s The following packages will be upgraded: 78s cloud-init cloud-init-base libexpat1 libgpg-error-l10n libgpg-error0 78s liblocale-gettext-perl pci.ids 78s 7 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 78s Need to get 1127 kB of archives. 78s After this operation, 13.3 kB of additional disk space will be used. 78s Get:1 http://ftpmaster.internal/ubuntu resolute/main amd64 libexpat1 amd64 2.7.4-1 [94.0 kB] 78s Get:2 http://ftpmaster.internal/ubuntu resolute/main amd64 liblocale-gettext-perl amd64 1.07-8 [15.8 kB] 78s Get:3 http://ftpmaster.internal/ubuntu resolute/main amd64 libgpg-error-l10n all 1.58-2 [9244 B] 78s Get:4 http://ftpmaster.internal/ubuntu resolute/main amd64 libgpg-error0 amd64 1.58-2 [83.3 kB] 78s Get:5 http://ftpmaster.internal/ubuntu resolute/main amd64 pci.ids all 0.0~2026.01.31-1 [299 kB] 78s Get:6 http://ftpmaster.internal/ubuntu resolute/main amd64 cloud-init-base all 25.4~4g26c7d38d-0ubuntu1 [624 kB] 78s Get:7 http://ftpmaster.internal/ubuntu resolute/main amd64 cloud-init all 25.4~4g26c7d38d-0ubuntu1 [2120 B] 78s dpkg-preconfigure: unable to re-open stdin: No such file or directory 78s Fetched 1127 kB in 0s (8979 kB/s) 78s (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 ... 83956 files and directories currently installed.) 78s Preparing to unpack .../0-libexpat1_2.7.4-1_amd64.deb ... 78s Unpacking libexpat1:amd64 (2.7.4-1) over (2.7.3-1) ... 78s Preparing to unpack .../1-liblocale-gettext-perl_1.07-8_amd64.deb ... 78s Unpacking liblocale-gettext-perl (1.07-8) over (1.07-7build1) ... 78s Preparing to unpack .../2-libgpg-error-l10n_1.58-2_all.deb ... 78s Unpacking libgpg-error-l10n (1.58-2) over (1.58-1build1) ... 78s Preparing to unpack .../3-libgpg-error0_1.58-2_amd64.deb ... 78s Unpacking libgpg-error0:amd64 (1.58-2) over (1.58-1build1) ... 78s Preparing to unpack .../4-pci.ids_0.0~2026.01.31-1_all.deb ... 78s Unpacking pci.ids (0.0~2026.01.31-1) over (0.0~2025.12.16-1) ... 78s Preparing to unpack .../5-cloud-init-base_25.4~4g26c7d38d-0ubuntu1_all.deb ... 79s Unpacking cloud-init-base (25.4~4g26c7d38d-0ubuntu1) over (25.4~3g78f6f15e-0ubuntu1) ... 79s Preparing to unpack .../6-cloud-init_25.4~4g26c7d38d-0ubuntu1_all.deb ... 79s Unpacking cloud-init (25.4~4g26c7d38d-0ubuntu1) over (25.4~3g78f6f15e-0ubuntu1) ... 79s Setting up libexpat1:amd64 (2.7.4-1) ... 79s Setting up pci.ids (0.0~2026.01.31-1) ... 79s Setting up libgpg-error0:amd64 (1.58-2) ... 79s Setting up cloud-init-base (25.4~4g26c7d38d-0ubuntu1) ... 79s Clearing ignored debconf value cloud-init/datasources 79s Encountered debconf setting for cloud-init-base/datasources. 80s Setting up libgpg-error-l10n (1.58-2) ... 80s Setting up liblocale-gettext-perl (1.07-8) ... 80s Setting up cloud-init (25.4~4g26c7d38d-0ubuntu1) ... 80s Processing triggers for rsyslog (8.2512.0-1ubuntu2) ... 80s Processing triggers for man-db (2.13.1-1) ... 80s Processing triggers for libc-bin (2.42-2ubuntu4) ... 80s autopkgtest [01:28:53]: upgrading testbed (apt dist-upgrade and autopurge) 81s Reading package lists... 81s Building dependency tree... 81s Reading state information... 81s Calculating upgrade... 81s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 81s Reading package lists... 81s Building dependency tree... 81s Reading state information... 81s Solving dependencies... 81s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 81s autopkgtest [01:28:54]: rebooting testbed after setup commands that affected boot 110s autopkgtest [01:29:23]: testbed running kernel: Linux 6.18.0-9-generic #9-Ubuntu SMP PREEMPT_DYNAMIC Mon Jan 12 16:49:02 UTC 2026 112s autopkgtest [01:29:25]: @@@@@@@@@@@@@@@@@@@@ apt-source hg-git 113s Get:1 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (dsc) [2142 B] 113s Get:2 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (tar) [222 kB] 113s Get:3 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (diff) [6816 B] 113s gpgv: Signature made Sun Feb 16 14:22:41 2025 UTC 113s gpgv: using RSA key 8F6DE104377F3B11E741748731F3144544A1741A 113s gpgv: issuer "tchet@debian.org" 113s gpgv: Can't check signature: No public key 113s dpkg-source: warning: cannot verify inline signature for ./hg-git_1.2.0-1.dsc: no acceptable signature found 113s autopkgtest [01:29:26]: testing package hg-git version 1.2.0-1 114s autopkgtest [01:29:27]: build not needed 114s autopkgtest [01:29:27]: test testsuite: preparing testbed 114s Reading package lists... 114s Building dependency tree... 114s Reading state information... 114s Solving dependencies... 114s The following NEW packages will be installed: 114s git git-man liberror-perl mercurial mercurial-common mercurial-git 114s python3-dulwich unzip 114s 0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded. 114s Need to get 9906 kB of archives. 114s After this operation, 52.2 MB of additional disk space will be used. 114s Get:1 http://ftpmaster.internal/ubuntu resolute/main amd64 liberror-perl all 0.17030-1 [23.5 kB] 114s Get:2 http://ftpmaster.internal/ubuntu resolute/main amd64 git-man all 1:2.51.0-1ubuntu1 [1179 kB] 115s Get:3 http://ftpmaster.internal/ubuntu resolute/main amd64 git amd64 1:2.51.0-1ubuntu1 [4414 kB] 115s Get:4 http://ftpmaster.internal/ubuntu resolute/universe amd64 mercurial-common all 7.1.1-1ubuntu1 [2789 kB] 115s Get:5 http://ftpmaster.internal/ubuntu resolute/universe amd64 mercurial amd64 7.1.1-1ubuntu1 [426 kB] 115s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 python3-dulwich amd64 1.0.0-2 [833 kB] 115s Get:7 http://ftpmaster.internal/ubuntu resolute/universe amd64 mercurial-git all 1.2.0-1 [60.9 kB] 115s Get:8 http://ftpmaster.internal/ubuntu resolute/main amd64 unzip amd64 6.0-29ubuntu1 [180 kB] 115s Fetched 9906 kB in 1s (18.5 MB/s) 115s Selecting previously unselected package liberror-perl. 115s (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 ... 83956 files and directories currently installed.) 115s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 115s Unpacking liberror-perl (0.17030-1) ... 115s Selecting previously unselected package git-man. 115s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 115s Unpacking git-man (1:2.51.0-1ubuntu1) ... 115s Selecting previously unselected package git. 115s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_amd64.deb ... 115s Unpacking git (1:2.51.0-1ubuntu1) ... 115s Selecting previously unselected package mercurial-common. 115s Preparing to unpack .../3-mercurial-common_7.1.1-1ubuntu1_all.deb ... 115s Unpacking mercurial-common (7.1.1-1ubuntu1) ... 115s Selecting previously unselected package mercurial. 115s Preparing to unpack .../4-mercurial_7.1.1-1ubuntu1_amd64.deb ... 115s Unpacking mercurial (7.1.1-1ubuntu1) ... 115s Selecting previously unselected package python3-dulwich. 115s Preparing to unpack .../5-python3-dulwich_1.0.0-2_amd64.deb ... 115s Unpacking python3-dulwich (1.0.0-2) ... 116s Selecting previously unselected package mercurial-git. 116s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 116s Unpacking mercurial-git (1.2.0-1) ... 116s Selecting previously unselected package unzip. 116s Preparing to unpack .../7-unzip_6.0-29ubuntu1_amd64.deb ... 116s Unpacking unzip (6.0-29ubuntu1) ... 116s Setting up mercurial-common (7.1.1-1ubuntu1) ... 116s Setting up unzip (6.0-29ubuntu1) ... 116s Setting up liberror-perl (0.17030-1) ... 116s Setting up python3-dulwich (1.0.0-2) ... 117s Setting up git-man (1:2.51.0-1ubuntu1) ... 117s Setting up mercurial (7.1.1-1ubuntu1) ... 117s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 117s Setting up mercurial-git (1.2.0-1) ... 117s mercurial-git extension is disabled by default. 117s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 117s Setting up git (1:2.51.0-1ubuntu1) ... 117s Processing triggers for man-db (2.13.1-1) ... 118s autopkgtest [01:29:31]: test testsuite: [----------------------- 119s no username found, using 'ubuntu@autopkgtest.local' instead 119s cd tests && /usr/bin/python3 run-tests.py --with-hg=/usr/bin/hg --blacklist=/tmp/autopkgtest.NlWore/build.9Lk/src/debian/hg-git.test_blacklist 119s running 82 tests using 2 parallel processes 125s ssssss 125s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-pull.t 125s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-pull.t#draft.err 125s @@ -35,153 +35,132 @@ 125s 125s pull without a name 125s $ hg init hgrepo 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s $ cd hgrepo 125s $ hg pull ../gitrepo 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s pulling from ../gitrepo 125s - importing 3 git commits 125s - adding bookmark beta 125s - adding bookmark delta 125s - adding bookmark master 125s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 125s - (run 'hg heads' to see heads, 'hg merge' to merge) 125s + abort: repository ../gitrepo not found 125s + [255] 125s $ git --git-dir .hg/git for-each-ref 125s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 125s + fatal: not a git repository: '.hg/git' 125s + [128] 125s $ hg log -Tp 125s - 2|draft|delta|tip 125s - 1|draft|beta| 125s - 0|draft|master|t_alpha 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s $ cd .. 125s $ rm -rf hgrepo 125s 125s pull with an implied name 125s $ hg init hgrepo 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s $ cd hgrepo 125s $ echo "[paths]" >> .hg/hgrc 125s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 125s $ hg pull ../gitrepo 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s pulling from ../gitrepo 125s - importing 3 git commits 125s - adding bookmark beta 125s - adding bookmark delta 125s - adding bookmark master 125s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 125s - (run 'hg heads' to see heads, 'hg merge' to merge) 125s + abort: repository ../gitrepo not found 125s + [255] 125s $ git --git-dir .hg/git for-each-ref 125s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 125s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 125s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 125s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 125s + fatal: not a git repository: '.hg/git' 125s + [128] 125s $ hg log -Tp 125s - 2|draft|delta|default/delta tip 125s - 1|draft|beta|default/beta 125s - 0|draft|master|default/master t_alpha 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s $ cd .. 125s $ rm -rf hgrepo 125s 125s pull with an explicit name 125s $ hg init hgrepo 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s $ cd hgrepo 125s $ echo "[paths]" >> .hg/hgrc 125s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 125s $ hg pull 125s - pulling from $TESTTMP/gitrepo 125s - importing 3 git commits 125s - adding bookmark beta 125s - adding bookmark delta 125s - adding bookmark master 125s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 125s - (run 'hg heads' to see heads, 'hg merge' to merge) 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ git --git-dir .hg/git for-each-ref 125s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 125s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 125s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 125s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 125s + fatal: not a git repository: '.hg/git' 125s + [128] 125s $ hg log -Tp 125s - 2|draft|delta|default/delta tip 125s - 1|draft|beta|default/beta 125s - 0|draft|master|default/master t_alpha 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s $ cd .. 125s $ rm -rf hgrepo 125s 125s pull a tag 125s $ hg init hgrepo 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s $ echo "[paths]" >> hgrepo/.hg/hgrc 125s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 125s $ hg -R hgrepo pull -r t_alpha 125s - pulling from $TESTTMP/gitrepo 125s - importing 1 git commits 125s - adding bookmark master 125s - new changesets ff7a2f2d8d70 (1 drafts) 125s - (run 'hg update' to get a working copy) 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo update t_alpha 125s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: unknown revision 't_alpha' 125s + [10] 125s $ hg log -Tp -R hgrepo 125s - 0|draft|master|default/master t_alpha tip 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s 125s no-op pull 125s $ hg -R hgrepo pull -r t_alpha 125s - pulling from $TESTTMP/gitrepo 125s - no changes found 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s 125s no-op pull with added bookmark 125s $ cd gitrepo 125s $ git checkout -qb epsilon t_alpha 125s $ cd .. 125s $ hg -R hgrepo pull -r epsilon 125s - pulling from $TESTTMP/gitrepo 125s - no changes found 125s - adding bookmark epsilon 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s 125s pull something that doesn't exist 125s $ hg -R hgrepo pull -r kaflaflibob 125s - pulling from $TESTTMP/gitrepo 125s - abort: unknown revision 'kaflaflibob'!? (re) 125s - [10] 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s 125s pull an ambiguous reference 125s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 125s $ hg -R hgrepo pull -r t_alpha 125s - pulling from $TESTTMP/gitrepo 125s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 125s - [10] 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 125s 125s pull a branch 125s $ hg -R hgrepo pull -r beta 125s - pulling from $TESTTMP/gitrepo 125s - importing 1 git commits 125s - adding bookmark beta 125s - new changesets 7fe02317c63d (1 drafts) 125s - (run 'hg update' to get a working copy) 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo log --graph --template=phases 125s - o changeset: 1:7fe02317c63d 125s - | bookmark: beta 125s - | tag: default/beta 125s - | tag: tip 125s - | phase: draft 125s - | user: test 125s - | date: Mon Jan 01 00:00:11 2007 +0000 125s - | summary: add beta 125s - | 125s - @ changeset: 0:ff7a2f2d8d70 125s - bookmark: epsilon 125s - bookmark: master 125s - tag: default/epsilon 125s - tag: default/master 125s - tag: t_alpha 125s - phase: draft 125s - user: test 125s - date: Mon Jan 01 00:00:10 2007 +0000 125s - summary: add alpha 125s - 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s 125s no-op pull should affect phases 125s $ hg -R hgrepo phase -fs beta 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: unknown revision 'beta' 125s + [10] 125s $ hg -R hgrepo pull -r beta 125s - pulling from $TESTTMP/gitrepo 125s - no changes found 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo phase beta 125s - 1: draft 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: unknown revision 'beta' 125s + [10] 125s 125s 125s add another commit and tag to the git repo 125s @@ -196,50 +175,12 @@ 125s 125s pull everything else 125s $ hg -R hgrepo pull 125s - pulling from $TESTTMP/gitrepo 125s - importing 2 git commits 125s - adding bookmark delta 125s - updating bookmark master 125s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 125s - (run 'hg heads' to see heads, 'hg merge' to merge) 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo log --graph --template=phases 125s - o changeset: 3:6f898ad1f3e1 125s - | bookmark: master 125s - | tag: default/master 125s - | tag: tip 125s - | phase: draft 125s - | parent: 0:ff7a2f2d8d70 125s - | user: test 125s - | date: Mon Jan 01 00:00:13 2007 +0000 125s - | summary: add gamma 125s - | 125s - | o changeset: 2:678ebee93e38 125s - |/ bookmark: delta 125s - | tag: default/delta 125s - | phase: draft 125s - | parent: 0:ff7a2f2d8d70 125s - | user: test 125s - | date: Mon Jan 01 00:00:12 2007 +0000 125s - | summary: add delta 125s - | 125s - | o changeset: 1:7fe02317c63d 125s - |/ bookmark: beta 125s - | tag: default/beta 125s - | tag: t_beta 125s - | phase: draft 125s - | user: test 125s - | date: Mon Jan 01 00:00:11 2007 +0000 125s - | summary: add beta 125s - | 125s - @ changeset: 0:ff7a2f2d8d70 125s - bookmark: epsilon 125s - tag: default/epsilon 125s - tag: t_alpha 125s - phase: draft 125s - user: test 125s - date: Mon Jan 01 00:00:10 2007 +0000 125s - summary: add alpha 125s - 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s add a merge to the git repo, and delete the branch 125s $ cd gitrepo 125s $ git merge -q -m "Merge branch 'beta'" beta 125s @@ -252,60 +193,26 @@ 125s 125s pull the merge 125s $ hg -R hgrepo tags | grep default/beta 125s - default/beta 1:7fe02317c63d 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + [1] 125s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 125s - pulling from $TESTTMP/gitrepo 125s - importing 1 git commits 125s - updating bookmark master 125s - deleting bookmark beta 125s - new changesets a02330f767a4 (1 drafts) 125s - (run 'hg update' to get a working copy) 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo tags | grep default/beta 125s - default/beta 1:7fe02317c63d 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + [1] 125s $ hg -R hgrepo pull 125s - pulling from $TESTTMP/gitrepo 125s - no changes found 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo tags | grep default/beta 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s [1] 125s $ hg -R hgrepo log --graph 125s - o changeset: 4:a02330f767a4 125s - |\ bookmark: master 125s - | | tag: default/master 125s - | | tag: tip 125s - | | parent: 3:6f898ad1f3e1 125s - | | parent: 1:7fe02317c63d 125s - | | user: test 125s - | | date: Mon Jan 01 00:00:13 2007 +0000 125s - | | summary: Merge branch 'beta' 125s - | | 125s - | o changeset: 3:6f898ad1f3e1 125s - | | parent: 0:ff7a2f2d8d70 125s - | | user: test 125s - | | date: Mon Jan 01 00:00:13 2007 +0000 125s - | | summary: add gamma 125s - | | 125s - | | o changeset: 2:678ebee93e38 125s - | |/ bookmark: delta 125s - | | tag: default/delta 125s - | | parent: 0:ff7a2f2d8d70 125s - | | user: test 125s - | | date: Mon Jan 01 00:00:12 2007 +0000 125s - | | summary: add delta 125s - | | 125s - o | changeset: 1:7fe02317c63d 125s - |/ tag: t_beta 125s - | user: test 125s - | date: Mon Jan 01 00:00:11 2007 +0000 125s - | summary: add beta 125s - | 125s - @ changeset: 0:ff7a2f2d8d70 125s - bookmark: epsilon 125s - tag: default/epsilon 125s - tag: t_alpha 125s - user: test 125s - date: Mon Jan 01 00:00:10 2007 +0000 125s - summary: add alpha 125s - 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s pull with wildcards 125s $ cd gitrepo 125s $ git checkout -qb releases/v1 master 125s @@ -324,66 +231,12 @@ 125s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 125s $ cd .. 125s $ hg -R hgrepo pull -r 'releases/*' 125s - pulling from $TESTTMP/gitrepo 125s - importing 2 git commits 125s - adding bookmark releases/v1 125s - adding bookmark releases/v2 125s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 125s - (run 'hg heads .' to see heads, 'hg merge' to merge) 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo log --graph 125s - o changeset: 6:a3f95e150b0a 125s - | bookmark: releases/v2 125s - | tag: default/releases/v2 125s - | tag: tip 125s - | parent: 4:a02330f767a4 125s - | user: test 125s - | date: Mon Jan 01 00:00:15 2007 +0000 125s - | summary: add eta 125s - | 125s - | o changeset: 5:218b2d0660d3 125s - |/ bookmark: releases/v1 125s - | tag: default/releases/v1 125s - | user: test 125s - | date: Mon Jan 01 00:00:14 2007 +0000 125s - | summary: add zeta 125s - | 125s - o changeset: 4:a02330f767a4 125s - |\ bookmark: master 125s - | | tag: default/master 125s - | | parent: 3:6f898ad1f3e1 125s - | | parent: 1:7fe02317c63d 125s - | | user: test 125s - | | date: Mon Jan 01 00:00:13 2007 +0000 125s - | | summary: Merge branch 'beta' 125s - | | 125s - | o changeset: 3:6f898ad1f3e1 125s - | | parent: 0:ff7a2f2d8d70 125s - | | user: test 125s - | | date: Mon Jan 01 00:00:13 2007 +0000 125s - | | summary: add gamma 125s - | | 125s - | | o changeset: 2:678ebee93e38 125s - | |/ bookmark: delta 125s - | | tag: default/delta 125s - | | parent: 0:ff7a2f2d8d70 125s - | | user: test 125s - | | date: Mon Jan 01 00:00:12 2007 +0000 125s - | | summary: add delta 125s - | | 125s - o | changeset: 1:7fe02317c63d 125s - |/ tag: t_beta 125s - | user: test 125s - | date: Mon Jan 01 00:00:11 2007 +0000 125s - | summary: add beta 125s - | 125s - @ changeset: 0:ff7a2f2d8d70 125s - bookmark: epsilon 125s - tag: default/epsilon 125s - tag: t_alpha 125s - user: test 125s - date: Mon Jan 01 00:00:10 2007 +0000 125s - summary: add alpha 125s - 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s 125s add old and new commits to the git repo -- make sure we're using the commit date 125s and not the author date 125s @@ -412,21 +265,19 @@ 125s Master is now filtered, so it's just stays there: 125s 125s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 125s - pulling from $TESTTMP/gitrepo 125s - no changes found 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo pull 125s - pulling from $TESTTMP/gitrepo 125s - no changes found 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo log -r master 125s - changeset: 4:a02330f767a4 125s - bookmark: master 125s - tag: default/master 125s - parent: 3:6f898ad1f3e1 125s - parent: 1:7fe02317c63d 125s - user: test 125s - date: Mon Jan 01 00:00:13 2007 +0000 125s - summary: Merge branch 'beta' 125s - 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: unknown revision 'master' 125s + [10] 125s 125s $ cd gitrepo 125s $ git checkout -q master 125s @@ -440,51 +291,13 @@ 125s > git tag -a -m 'tagging newtag' newtag 125s $ cd .. 125s $ hg -R hgrepo pull 125s - pulling from $TESTTMP/gitrepo 125s - importing 3 git commits 125s - updating bookmark master 125s - new changesets 49713da8f665:e103a73f33be (3 drafts) 125s - (run 'hg heads .' to see heads, 'hg merge' to merge) 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo heads 125s - changeset: 9:e103a73f33be 125s - bookmark: master 125s - tag: default/master 125s - tag: tip 125s - user: test 125s - date: Wed Jan 01 00:00:00 2014 +0000 125s - summary: newcommit 125s - 125s - changeset: 7:49713da8f665 125s - tag: newtag 125s - tag: oldtag 125s - parent: 4:a02330f767a4 125s - user: test 125s - date: Sat Mar 01 00:00:00 2014 +0000 125s - summary: oldtag 125s - 125s - changeset: 6:a3f95e150b0a 125s - bookmark: releases/v2 125s - tag: default/releases/v2 125s - parent: 4:a02330f767a4 125s - user: test 125s - date: Mon Jan 01 00:00:15 2007 +0000 125s - summary: add eta 125s - 125s - changeset: 5:218b2d0660d3 125s - bookmark: releases/v1 125s - tag: default/releases/v1 125s - user: test 125s - date: Mon Jan 01 00:00:14 2007 +0000 125s - summary: add zeta 125s - 125s - changeset: 2:678ebee93e38 125s - bookmark: delta 125s - tag: default/delta 125s - parent: 0:ff7a2f2d8d70 125s - user: test 125s - date: Mon Jan 01 00:00:12 2007 +0000 125s - summary: add delta 125s - 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + [1] 125s 125s test for ssh vulnerability 125s 125s @@ -494,18 +307,21 @@ 125s > EOF 125s 125s $ hg init a 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s $ cd a 125s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 125s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 125s [255] 125s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 125s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 125s [255] 125s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 125s - ssh: * fakehost%7?shellcommand* (glob) 125s - abort: git remote error: The remote server unexpectedly closed the connection. 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 125s [255] 125s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 125s - ssh: * fakehost%7?shellcommand* (glob) 125s - abort: git remote error: The remote server unexpectedly closed the connection. 125s - [255] 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 125s + [255] 125s 125s ERROR: test-pull.t#draft output changed 125s ! 125s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-pull.t 125s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-pull.t#secret.err 125s @@ -35,153 +35,132 @@ 125s 125s pull without a name 125s $ hg init hgrepo 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s $ cd hgrepo 125s $ hg pull ../gitrepo 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s pulling from ../gitrepo 125s - importing 3 git commits 125s - adding bookmark beta 125s - adding bookmark delta 125s - adding bookmark master 125s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 125s - (run 'hg heads' to see heads, 'hg merge' to merge) 125s + abort: repository ../gitrepo not found 125s + [255] 125s $ git --git-dir .hg/git for-each-ref 125s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 125s + fatal: not a git repository: '.hg/git' 125s + [128] 125s $ hg log -Tp 125s - 2|draft|delta|tip 125s - 1|draft|beta| 125s - 0|draft|master|t_alpha 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s $ cd .. 125s $ rm -rf hgrepo 125s 125s pull with an implied name 125s $ hg init hgrepo 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s $ cd hgrepo 125s $ echo "[paths]" >> .hg/hgrc 125s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 125s $ hg pull ../gitrepo 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s pulling from ../gitrepo 125s - importing 3 git commits 125s - adding bookmark beta 125s - adding bookmark delta 125s - adding bookmark master 125s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 125s - (run 'hg heads' to see heads, 'hg merge' to merge) 125s + abort: repository ../gitrepo not found 125s + [255] 125s $ git --git-dir .hg/git for-each-ref 125s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 125s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 125s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 125s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 125s + fatal: not a git repository: '.hg/git' 125s + [128] 125s $ hg log -Tp 125s - 2|draft|delta|default/delta tip 125s - 1|draft|beta|default/beta 125s - 0|draft|master|default/master t_alpha 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s $ cd .. 125s $ rm -rf hgrepo 125s 125s pull with an explicit name 125s $ hg init hgrepo 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s $ cd hgrepo 125s $ echo "[paths]" >> .hg/hgrc 125s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 125s $ hg pull 125s - pulling from $TESTTMP/gitrepo 125s - importing 3 git commits 125s - adding bookmark beta 125s - adding bookmark delta 125s - adding bookmark master 125s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 125s - (run 'hg heads' to see heads, 'hg merge' to merge) 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ git --git-dir .hg/git for-each-ref 125s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 125s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 125s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 125s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 125s + fatal: not a git repository: '.hg/git' 125s + [128] 125s $ hg log -Tp 125s - 2|draft|delta|default/delta tip 125s - 1|draft|beta|default/beta 125s - 0|draft|master|default/master t_alpha 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s $ cd .. 125s $ rm -rf hgrepo 125s 125s pull a tag 125s $ hg init hgrepo 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s $ echo "[paths]" >> hgrepo/.hg/hgrc 125s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 125s $ hg -R hgrepo pull -r t_alpha 125s - pulling from $TESTTMP/gitrepo 125s - importing 1 git commits 125s - adding bookmark master 125s - new changesets ff7a2f2d8d70 (1 drafts) 125s - (run 'hg update' to get a working copy) 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo update t_alpha 125s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: unknown revision 't_alpha' 125s + [10] 125s $ hg log -Tp -R hgrepo 125s - 0|draft|master|default/master t_alpha tip 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s 125s no-op pull 125s $ hg -R hgrepo pull -r t_alpha 125s - pulling from $TESTTMP/gitrepo 125s - no changes found 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s 125s no-op pull with added bookmark 125s $ cd gitrepo 125s $ git checkout -qb epsilon t_alpha 125s $ cd .. 125s $ hg -R hgrepo pull -r epsilon 125s - pulling from $TESTTMP/gitrepo 125s - no changes found 125s - adding bookmark epsilon 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s 125s pull something that doesn't exist 125s $ hg -R hgrepo pull -r kaflaflibob 125s - pulling from $TESTTMP/gitrepo 125s - abort: unknown revision 'kaflaflibob'!? (re) 125s - [10] 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s 125s pull an ambiguous reference 125s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 125s $ hg -R hgrepo pull -r t_alpha 125s - pulling from $TESTTMP/gitrepo 125s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 125s - [10] 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 125s 125s pull a branch 125s $ hg -R hgrepo pull -r beta 125s - pulling from $TESTTMP/gitrepo 125s - importing 1 git commits 125s - adding bookmark beta 125s - new changesets 7fe02317c63d (1 drafts) 125s - (run 'hg update' to get a working copy) 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo log --graph --template=phases 125s - o changeset: 1:7fe02317c63d 125s - | bookmark: beta 125s - | tag: default/beta 125s - | tag: tip 125s - | phase: draft 125s - | user: test 125s - | date: Mon Jan 01 00:00:11 2007 +0000 125s - | summary: add beta 125s - | 125s - @ changeset: 0:ff7a2f2d8d70 125s - bookmark: epsilon 125s - bookmark: master 125s - tag: default/epsilon 125s - tag: default/master 125s - tag: t_alpha 125s - phase: draft 125s - user: test 125s - date: Mon Jan 01 00:00:10 2007 +0000 125s - summary: add alpha 125s - 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s 125s no-op pull should affect phases 125s $ hg -R hgrepo phase -fs beta 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: unknown revision 'beta' 125s + [10] 125s $ hg -R hgrepo pull -r beta 125s - pulling from $TESTTMP/gitrepo 125s - no changes found 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo phase beta 125s - 1: draft 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: unknown revision 'beta' 125s + [10] 125s 125s 125s add another commit and tag to the git repo 125s @@ -196,50 +175,12 @@ 125s 125s pull everything else 125s $ hg -R hgrepo pull 125s - pulling from $TESTTMP/gitrepo 125s - importing 2 git commits 125s - adding bookmark delta 125s - updating bookmark master 125s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 125s - (run 'hg heads' to see heads, 'hg merge' to merge) 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo log --graph --template=phases 125s - o changeset: 3:6f898ad1f3e1 125s - | bookmark: master 125s - | tag: default/master 125s - | tag: tip 125s - | phase: draft 125s - | parent: 0:ff7a2f2d8d70 125s - | user: test 125s - | date: Mon Jan 01 00:00:13 2007 +0000 125s - | summary: add gamma 125s - | 125s - | o changeset: 2:678ebee93e38 125s - |/ bookmark: delta 125s - | tag: default/delta 125s - | phase: draft 125s - | parent: 0:ff7a2f2d8d70 125s - | user: test 125s - | date: Mon Jan 01 00:00:12 2007 +0000 125s - | summary: add delta 125s - | 125s - | o changeset: 1:7fe02317c63d 125s - |/ bookmark: beta 125s - | tag: default/beta 125s - | tag: t_beta 125s - | phase: draft 125s - | user: test 125s - | date: Mon Jan 01 00:00:11 2007 +0000 125s - | summary: add beta 125s - | 125s - @ changeset: 0:ff7a2f2d8d70 125s - bookmark: epsilon 125s - tag: default/epsilon 125s - tag: t_alpha 125s - phase: draft 125s - user: test 125s - date: Mon Jan 01 00:00:10 2007 +0000 125s - summary: add alpha 125s - 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s add a merge to the git repo, and delete the branch 125s $ cd gitrepo 125s $ git merge -q -m "Merge branch 'beta'" beta 125s @@ -252,60 +193,26 @@ 125s 125s pull the merge 125s $ hg -R hgrepo tags | grep default/beta 125s - default/beta 1:7fe02317c63d 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + [1] 125s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 125s - pulling from $TESTTMP/gitrepo 125s - importing 1 git commits 125s - updating bookmark master 125s - deleting bookmark beta 125s - new changesets a02330f767a4 (1 drafts) 125s - (run 'hg update' to get a working copy) 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo tags | grep default/beta 125s - default/beta 1:7fe02317c63d 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + [1] 125s $ hg -R hgrepo pull 125s - pulling from $TESTTMP/gitrepo 125s - no changes found 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo tags | grep default/beta 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s [1] 125s $ hg -R hgrepo log --graph 125s - o changeset: 4:a02330f767a4 125s - |\ bookmark: master 125s - | | tag: default/master 125s - | | tag: tip 125s - | | parent: 3:6f898ad1f3e1 125s - | | parent: 1:7fe02317c63d 125s - | | user: test 125s - | | date: Mon Jan 01 00:00:13 2007 +0000 125s - | | summary: Merge branch 'beta' 125s - | | 125s - | o changeset: 3:6f898ad1f3e1 125s - | | parent: 0:ff7a2f2d8d70 125s - | | user: test 125s - | | date: Mon Jan 01 00:00:13 2007 +0000 125s - | | summary: add gamma 125s - | | 125s - | | o changeset: 2:678ebee93e38 125s - | |/ bookmark: delta 125s - | | tag: default/delta 125s - | | parent: 0:ff7a2f2d8d70 125s - | | user: test 125s - | | date: Mon Jan 01 00:00:12 2007 +0000 125s - | | summary: add delta 125s - | | 125s - o | changeset: 1:7fe02317c63d 125s - |/ tag: t_beta 125s - | user: test 125s - | date: Mon Jan 01 00:00:11 2007 +0000 125s - | summary: add beta 125s - | 125s - @ changeset: 0:ff7a2f2d8d70 125s - bookmark: epsilon 125s - tag: default/epsilon 125s - tag: t_alpha 125s - user: test 125s - date: Mon Jan 01 00:00:10 2007 +0000 125s - summary: add alpha 125s - 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s pull with wildcards 125s $ cd gitrepo 125s $ git checkout -qb releases/v1 master 125s @@ -324,66 +231,12 @@ 125s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 125s $ cd .. 125s $ hg -R hgrepo pull -r 'releases/*' 125s - pulling from $TESTTMP/gitrepo 125s - importing 2 git commits 125s - adding bookmark releases/v1 125s - adding bookmark releases/v2 125s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 125s - (run 'hg heads .' to see heads, 'hg merge' to merge) 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo log --graph 125s - o changeset: 6:a3f95e150b0a 125s - | bookmark: releases/v2 125s - | tag: default/releases/v2 125s - | tag: tip 125s - | parent: 4:a02330f767a4 125s - | user: test 125s - | date: Mon Jan 01 00:00:15 2007 +0000 125s - | summary: add eta 125s - | 125s - | o changeset: 5:218b2d0660d3 125s - |/ bookmark: releases/v1 125s - | tag: default/releases/v1 125s - | user: test 125s - | date: Mon Jan 01 00:00:14 2007 +0000 125s - | summary: add zeta 125s - | 125s - o changeset: 4:a02330f767a4 125s - |\ bookmark: master 125s - | | tag: default/master 125s - | | parent: 3:6f898ad1f3e1 125s - | | parent: 1:7fe02317c63d 125s - | | user: test 125s - | | date: Mon Jan 01 00:00:13 2007 +0000 125s - | | summary: Merge branch 'beta' 125s - | | 125s - | o changeset: 3:6f898ad1f3e1 125s - | | parent: 0:ff7a2f2d8d70 125s - | | user: test 125s - | | date: Mon Jan 01 00:00:13 2007 +0000 125s - | | summary: add gamma 125s - | | 125s - | | o changeset: 2:678ebee93e38 125s - | |/ bookmark: delta 125s - | | tag: default/delta 125s - | | parent: 0:ff7a2f2d8d70 125s - | | user: test 125s - | | date: Mon Jan 01 00:00:12 2007 +0000 125s - | | summary: add delta 125s - | | 125s - o | changeset: 1:7fe02317c63d 125s - |/ tag: t_beta 125s - | user: test 125s - | date: Mon Jan 01 00:00:11 2007 +0000 125s - | summary: add beta 125s - | 125s - @ changeset: 0:ff7a2f2d8d70 125s - bookmark: epsilon 125s - tag: default/epsilon 125s - tag: t_alpha 125s - user: test 125s - date: Mon Jan 01 00:00:10 2007 +0000 125s - summary: add alpha 125s - 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s 125s add old and new commits to the git repo -- make sure we're using the commit date 125s and not the author date 125s @@ -412,21 +265,19 @@ 125s Master is now filtered, so it's just stays there: 125s 125s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 125s - pulling from $TESTTMP/gitrepo 125s - no changes found 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo pull 125s - pulling from $TESTTMP/gitrepo 125s - no changes found 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo log -r master 125s - changeset: 4:a02330f767a4 125s - bookmark: master 125s - tag: default/master 125s - parent: 3:6f898ad1f3e1 125s - parent: 1:7fe02317c63d 125s - user: test 125s - date: Mon Jan 01 00:00:13 2007 +0000 125s - summary: Merge branch 'beta' 125s - 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: unknown revision 'master' 125s + [10] 125s 125s $ cd gitrepo 125s $ git checkout -q master 125s @@ -440,51 +291,13 @@ 125s > git tag -a -m 'tagging newtag' newtag 125s $ cd .. 125s $ hg -R hgrepo pull 125s - pulling from $TESTTMP/gitrepo 125s - importing 3 git commits 125s - updating bookmark master 125s - new changesets 49713da8f665:e103a73f33be (3 drafts) 125s - (run 'hg heads .' to see heads, 'hg merge' to merge) 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + pulling from $TESTTMP/gitrepo 125s + abort: repository $TESTTMP/gitrepo not found 125s + [255] 125s $ hg -R hgrepo heads 125s - changeset: 9:e103a73f33be 125s - bookmark: master 125s - tag: default/master 125s - tag: tip 125s - user: test 125s - date: Wed Jan 01 00:00:00 2014 +0000 125s - summary: newcommit 125s - 125s - changeset: 7:49713da8f665 125s - tag: newtag 125s - tag: oldtag 125s - parent: 4:a02330f767a4 125s - user: test 125s - date: Sat Mar 01 00:00:00 2014 +0000 125s - summary: oldtag 125s - 125s - changeset: 6:a3f95e150b0a 125s - bookmark: releases/v2 125s - tag: default/releases/v2 125s - parent: 4:a02330f767a4 125s - user: test 125s - date: Mon Jan 01 00:00:15 2007 +0000 125s - summary: add eta 125s - 125s - changeset: 5:218b2d0660d3 125s - bookmark: releases/v1 125s - tag: default/releases/v1 125s - user: test 125s - date: Mon Jan 01 00:00:14 2007 +0000 125s - summary: add zeta 125s - 125s - changeset: 2:678ebee93e38 125s - bookmark: delta 125s - tag: default/delta 125s - parent: 0:ff7a2f2d8d70 125s - user: test 125s - date: Mon Jan 01 00:00:12 2007 +0000 125s - summary: add delta 125s - 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + [1] 125s 125s test for ssh vulnerability 125s 125s @@ -494,18 +307,21 @@ 125s > EOF 125s 125s $ hg init a 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s $ cd a 125s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 125s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 125s [255] 125s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 125s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 125s [255] 125s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 125s - ssh: * fakehost%7?shellcommand* (glob) 125s - abort: git remote error: The remote server unexpectedly closed the connection. 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 125s [255] 125s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 125s - ssh: * fakehost%7?shellcommand* (glob) 125s - abort: git remote error: The remote server unexpectedly closed the connection. 125s - [255] 125s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 125s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 125s + [255] 125s 125s ERROR: test-pull.t#secret output changed 126s ! 126s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-git-submodules.t 126s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-git-submodules.t.err 126s @@ -188,261 +188,9 @@ 126s $ cd .. 126s 126s $ hg clone gitrepo2 hgrepo 126s - importing 10 git commits 126s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 126s - updating to bookmark master 126s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s + abort: repository gitrepo2 not found 126s + [255] 126s $ cd hgrepo 126s + $TESTTMP.sh: 133: cd: can't cd to hgrepo 126s $ hg log --graph 126s - @ changeset: 9:0ad944b2c4d8 126s - | bookmark: master 126s - | tag: default/master 126s - | tag: tip 126s - | user: test 126s - | date: Mon Jan 01 00:00:12 2007 +0000 126s - | summary: remove all subrepos 126s - | 126s - o changeset: 8:33da452ef22f 126s - | user: test 126s - | date: Mon Jan 01 00:00:12 2007 +0000 126s - | summary: replace subrepo with symlink 126s - | 126s - o changeset: 7:acebec53c0fc 126s - | user: test 126s - | date: Mon Jan 01 00:00:12 2007 +0000 126s - | summary: replace symlink with subrepo 126s - | 126s - o changeset: 6:78c2ea52db4b 126s - | user: test 126s - | date: Mon Jan 01 00:00:12 2007 +0000 126s - | summary: add symlink 126s - | 126s - o changeset: 5:c0d52ffc59b8 126s - | user: test 126s - | date: Mon Jan 01 00:00:12 2007 +0000 126s - | summary: replace file with subrepo 126s - | 126s - o changeset: 4:73e078a178a0 126s - | user: test 126s - | date: Mon Jan 01 00:00:12 2007 +0000 126s - | summary: replace subrepo with file 126s - | 126s - o changeset: 3:29e236ba4c06 126s - | user: test 126s - | date: Mon Jan 01 00:00:12 2007 +0000 126s - | summary: add another subrepo 126s - | 126s - o changeset: 2:a6075a162f62 126s - | user: test 126s - | date: Mon Jan 01 00:00:12 2007 +0000 126s - | summary: change subrepo commit 126s - | 126s - o changeset: 1:a4036e758995 126s - | user: test 126s - | date: Mon Jan 01 00:00:11 2007 +0000 126s - | summary: add subrepo 126s - | 126s - o changeset: 0:ff7a2f2d8d70 126s - user: test 126s - date: Mon Jan 01 00:00:10 2007 +0000 126s - summary: add alpha 126s - 126s - $ hg book 126s - * master 9:0ad944b2c4d8 126s - 126s -(add subrepo) 126s - $ hg cat -r 1 .hgsubstate 126s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo 126s - $ hg cat -r 1 .hgsub 126s - subrepo = [git]../gitsubrepo 126s - $ hg gverify -r 1 126s - verifying rev a4036e758995 against git commit e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 126s - 126s -(change subrepo commit) 126s - $ hg cat -r 2 .hgsubstate 126s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 126s - $ hg cat -r 2 .hgsub 126s - subrepo = [git]../gitsubrepo 126s - $ hg gverify -r 2 126s - verifying rev a6075a162f62 against git commit a000567ceefbd9a2ce364e0dea6e298010b02b6d 126s - 126s -(add another subrepo) 126s - $ hg cat -r 3 .hgsubstate 126s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 126s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 126s - $ hg cat -r 3 .hgsub 126s - subrepo = [git]../gitsubrepo 126s - subrepo2 = [git]../gitsubrepo 126s - $ hg gverify -r 3 126s - verifying rev 29e236ba4c06 against git commit 6e219527869fa40eb6ffbdd013cd86d576b26b01 126s - 126s -(replace subrepo with file) 126s - $ hg cat -r 4 .hgsubstate 126s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 126s - $ hg cat -r 4 .hgsub 126s - subrepo2 = [git]../gitsubrepo 126s - $ hg manifest -r 4 126s - .hgsub 126s - .hgsubstate 126s - alpha 126s - subrepo 126s - $ hg gverify -r 4 126s - verifying rev 73e078a178a0 against git commit f6436a472da00f581d8d257e9bbaf3c358a5e88c 126s - 126s -(replace file with subrepo) 126s - $ hg cat -r 5 .hgsubstate 126s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 126s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 126s - $ hg cat -r 5 .hgsub 126s - subrepo2 = [git]../gitsubrepo 126s - alpha = [git]../gitsubrepo 126s - $ hg manifest -r 5 126s - .hgsub 126s - .hgsubstate 126s - subrepo 126s - $ hg gverify -r 5 126s - verifying rev c0d52ffc59b8 against git commit 88171163bf4795b5570924e51d5f8ede33f8bc28 126s - 126s -(replace symlink with subrepo) 126s - $ hg cat -r 7 .hgsub 126s - subrepo2 = [git]../gitsubrepo 126s - alpha = [git]../gitsubrepo 126s - foolink = [git]../gitsubrepo 126s - $ hg cat -r 7 .hgsubstate 126s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 126s - 6e4ad8da50204560c00fa25e4987eb2e239029ba foolink 126s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 126s - $ hg gverify -r 7 126s - verifying rev acebec53c0fc against git commit e3288fa737d429a60637b3b6782cb25b8298bc00 126s - 126s -(replace subrepo with symlink) 126s - $ hg cat -r 8 .hgsub .hgsubstate 126s - subrepo2 = [git]../gitsubrepo 126s - alpha = [git]../gitsubrepo 126s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 126s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 126s - 126s - $ hg gverify -r 8 126s - verifying rev 33da452ef22f against git commit d28364013fe1a0fde56c0e1921e49ecdeee8571d 126s - 126s -(remove all subrepos) 126s - $ hg cat -r 9 .hgsub .hgsubstate 126s - .hgsub: no such file in rev 0ad944b2c4d8 126s - .hgsubstate: no such file in rev 0ad944b2c4d8 126s - [1] 126s - $ hg gverify -r 9 126s - verifying rev 0ad944b2c4d8 against git commit 15ba94929481c654814178aac1dbca06ae688718 126s - 126s - $ hg debug-remove-hggit-state 126s - clearing out the git cache data 126s - $ hg gexport 126s - $ cd .hg/git 126s - $ git log --pretty=oneline 126s - 73c15b74fb81fa0cc60e9c59c73787a9f26c778b remove all subrepos 126s - d28364013fe1a0fde56c0e1921e49ecdeee8571d replace subrepo with symlink 126s - e3288fa737d429a60637b3b6782cb25b8298bc00 replace symlink with subrepo 126s - 2d1c135447d11df4dfe96dd5d4f37926dc5c821d add symlink 126s - 88171163bf4795b5570924e51d5f8ede33f8bc28 replace file with subrepo 126s - f6436a472da00f581d8d257e9bbaf3c358a5e88c replace subrepo with file 126s - 6e219527869fa40eb6ffbdd013cd86d576b26b01 add another subrepo 126s - a000567ceefbd9a2ce364e0dea6e298010b02b6d change subrepo commit 126s - e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 add subrepo 126s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 add alpha 126s - 126s -test with rename detection enabled -- simply checking that the Mercurial hashes 126s -are the same is enough 126s - $ cd ../../.. 126s - $ hg --config git.similarity=100 clone gitrepo2 hgreporenames 126s - importing 10 git commits 126s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 126s - updating to bookmark master 126s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 126s - $ cd hgreporenames 126s - $ hg log --graph 126s - @ changeset: 9:0ad944b2c4d8 126s - | bookmark: master 126s - | tag: default/master 126s - | tag: tip 126s - | user: test 126s - | date: Mon Jan 01 00:00:12 2007 +0000 126s - | summary: remove all subrepos 126s - | 126s - o changeset: 8:33da452ef22f 126s - | user: test 126s - | date: Mon Jan 01 00:00:12 2007 +0000 126s - | summary: replace subrepo with symlink 126s - | 126s - o changeset: 7:acebec53c0fc 126s - | user: test 126s - | date: Mon Jan 01 00:00:12 2007 +0000 126s - | summary: replace symlink with subrepo 126s - | 126s - o changeset: 6:78c2ea52db4b 126s - | user: test 126s - | date: Mon Jan 01 00:00:12 2007 +0000 126s - | summary: add symlink 126s - | 126s - o changeset: 5:c0d52ffc59b8 126s - | user: test 126s - | date: Mon Jan 01 00:00:12 2007 +0000 126s - | summary: replace file with subrepo 126s - | 126s - o changeset: 4:73e078a178a0 126s - | user: test 126s - | date: Mon Jan 01 00:00:12 2007 +0000 126s - | summary: replace subrepo with file 126s - | 126s - o changeset: 3:29e236ba4c06 126s - | user: test 126s - | date: Mon Jan 01 00:00:12 2007 +0000 126s - | summary: add another subrepo 126s - | 126s - o changeset: 2:a6075a162f62 126s - | user: test 126s - | date: Mon Jan 01 00:00:12 2007 +0000 126s - | summary: change subrepo commit 126s - | 126s - o changeset: 1:a4036e758995 126s - | user: test 126s - | date: Mon Jan 01 00:00:11 2007 +0000 126s - | summary: add subrepo 126s - | 126s - o changeset: 0:ff7a2f2d8d70 126s - user: test 126s - date: Mon Jan 01 00:00:10 2007 +0000 126s - summary: add alpha 126s - 126s - $ cd .. 126s - 126s -test handling of an invalid .gitmodules file (#380) 126s - 126s - $ git init --quiet gitrepo-issue380 126s - $ cd gitrepo-issue380 126s - $ git submodule add ../gitsubrepo 126s - Cloning into '$TESTTMP/gitrepo-issue380/gitsubrepo'... 126s - done. 126s - $ fn_git_commit -m 'add a submodule' 126s - $ cat >> .gitmodules < <<<<<<< HEAD 126s - > EOF 126s - $ fn_git_commit -a -m 'b0rken .gitmodules' 126s - $ git status 126s - fatal: bad config line 4 in file $TESTTMP/gitrepo-issue380/.gitmodules 126s - [128] 126s - $ sed -i.orig /HEAD/d .gitmodules 126s - $ fn_git_commit -a -m 'fix .gitmodules' 126s - $ git status 126s - On branch master 126s - Untracked files: 126s - (use "git add ..." to include in what will be committed) 126s - .gitmodules.orig 126s - 126s - nothing added to commit but untracked files present (use "git add" to track) 126s - $ cd .. 126s - $ git clone gitrepo-issue380 gitrepo-issue380~ 126s - Cloning into 'gitrepo-issue380~'... 126s - done. 126s - $ hg clone -U gitrepo-issue380 hgrepo-issue380 126s - importing 3 git commits 126s - warning: failed to parse .gitmodules in 2e4ec4293822 126s - new changesets ed60e5fbc192:9dfc0cdf1787 (3 drafts) 126s 126s ERROR: test-git-submodules.t output changed 126s ! 126s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-renames.t 126s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-renames.t.err 126s @@ -95,494 +95,9 @@ 126s 126s $ cd .. 126s $ hg clone -q repo.git hgrepo 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s + abort: repository repo.git not found 126s + [255] 126s $ cd hgrepo 126s + $TESTTMP.sh: 115: cd: can't cd to hgrepo 126s $ hg book master -q 126s - $ hg log -p --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 126s - @ 8 497105ddbe119aa40af691eb2b1a029c29bf5247 remove submodule and rename back 126s - | branch=default hg-git-rename-source=git 126s - | 126s - | diff --git a/.hgsub b/.hgsub 126s - | --- a/.hgsub 126s - | +++ b/.hgsub 126s - | @@ -1,2 +1,1 @@ 126s - | gitsubmodule2 = [git]../gitsubmodule 126s - | -gamma = [git]../gitsubmodule 126s - | diff --git a/.hgsubstate b/.hgsubstate 126s - | --- a/.hgsubstate 126s - | +++ b/.hgsubstate 126s - | @@ -1,2 +1,1 @@ 126s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 126s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 126s - | diff --git a/gamma-new b/gamma 126s - | rename from gamma-new 126s - | rename to gamma 126s - | 126s - o 7 adfc1ce8461d3174dcf8425e112e2fa848de3913 rename and add submodule 126s - | branch=default hg-git-rename-source=git 126s - | 126s - | diff --git a/.hgsub b/.hgsub 126s - | --- a/.hgsub 126s - | +++ b/.hgsub 126s - | @@ -1,1 +1,2 @@ 126s - | gitsubmodule2 = [git]../gitsubmodule 126s - | +gamma = [git]../gitsubmodule 126s - | diff --git a/.hgsubstate b/.hgsubstate 126s - | --- a/.hgsubstate 126s - | +++ b/.hgsubstate 126s - | @@ -1,1 +1,2 @@ 126s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 126s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 126s - | diff --git a/gamma b/gamma-new 126s - | rename from gamma 126s - | rename to gamma-new 126s - | 126s - o 6 62c1a4b07240b53a71be1b1a46e94e99132c5391 beta renamed back 126s - | branch=default hg-git-rename-source=git 126s - | 126s - | diff --git a/beta b/beta 126s - | old mode 120000 126s - | new mode 100644 126s - | --- a/beta 126s - | +++ b/beta 126s - | @@ -1,1 +1,12 @@ 126s - | -beta-new 126s - | \ No newline at end of file 126s - | +1 126s - | +2 126s - | +3 126s - | +4 126s - | +5 126s - | +6 126s - | +7 126s - | +8 126s - | +9 126s - | +10 126s - | +11 126s - | +12 126s - | diff --git a/beta-new b/beta-new 126s - | deleted file mode 100644 126s - | --- a/beta-new 126s - | +++ /dev/null 126s - | @@ -1,12 +0,0 @@ 126s - | -1 126s - | -2 126s - | -3 126s - | -4 126s - | -5 126s - | -6 126s - | -7 126s - | -8 126s - | -9 126s - | -10 126s - | -11 126s - | -12 126s - | 126s - o 5 f93fefed957cff2220d3f0d11182398350b5fa9a beta renamed 126s - | branch=default hg-git-rename-source=git 126s - | 126s - | diff --git a/beta b/beta 126s - | old mode 100644 126s - | new mode 120000 126s - | --- a/beta 126s - | +++ b/beta 126s - | @@ -1,12 +1,1 @@ 126s - | -1 126s - | -2 126s - | -3 126s - | -4 126s - | -5 126s - | -6 126s - | -7 126s - | -8 126s - | -9 126s - | -10 126s - | -11 126s - | -12 126s - | +beta-new 126s - | \ No newline at end of file 126s - | diff --git a/beta b/beta-new 126s - | copy from beta 126s - | copy to beta-new 126s - | 126s - o 4 b9e63d96abc2783afc59246e798a6936cf05a35e move submodule 126s - | branch=default hg-git-rename-source=git 126s - | 126s - | diff --git a/.hgsub b/.hgsub 126s - | --- a/.hgsub 126s - | +++ b/.hgsub 126s - | @@ -1,1 +1,1 @@ 126s - | -gitsubmodule = [git]../gitsubmodule 126s - | +gitsubmodule2 = [git]../gitsubmodule 126s - | diff --git a/.hgsubstate b/.hgsubstate 126s - | --- a/.hgsubstate 126s - | +++ b/.hgsubstate 126s - | @@ -1,1 +1,1 @@ 126s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 126s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 126s - | 126s - o 3 55537ea256c28be1b5637f4f93a601fdde8a9a7f add submodule 126s - | branch=default hg-git-rename-source=git 126s - | 126s - | diff --git a/.hgsub b/.hgsub 126s - | new file mode 100644 126s - | --- /dev/null 126s - | +++ b/.hgsub 126s - | @@ -0,0 +1,1 @@ 126s - | +gitsubmodule = [git]../gitsubmodule 126s - | diff --git a/.hgsubstate b/.hgsubstate 126s - | new file mode 100644 126s - | --- /dev/null 126s - | +++ b/.hgsubstate 126s - | @@ -0,0 +1,1 @@ 126s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 126s - | 126s - o 2 20f9e56b6d006d0403f853245e483d0892b8ac48 gamma 126s - | branch=default hg-git-rename-source=git 126s - | 126s - | diff --git a/beta b/beta 126s - | --- a/beta 126s - | +++ b/beta 126s - | @@ -9,3 +9,4 @@ 126s - | 9 126s - | 10 126s - | 11 126s - | +12 126s - | diff --git a/beta b/gamma 126s - | copy from beta 126s - | copy to gamma 126s - | --- a/beta 126s - | +++ b/gamma 126s - | @@ -9,3 +9,4 @@ 126s - | 9 126s - | 10 126s - | 11 126s - | +13 126s - | 126s - o 1 9f7744e68def81da3b394f11352f602ca9c8ab68 beta 126s - | branch=default hg-git-rename-source=git 126s - | 126s - | diff --git a/alpha b/beta 126s - | rename from alpha 126s - | rename to beta 126s - | --- a/alpha 126s - | +++ b/beta 126s - | @@ -8,3 +8,4 @@ 126s - | 8 126s - | 9 126s - | 10 126s - | +11 126s - | 126s - o 0 7bc844166f76e49562f81eacd54ea954d01a9e42 alpha 126s - branch=default hg-git-rename-source=git 126s - 126s - diff --git a/alpha b/alpha 126s - new file mode 100644 126s - --- /dev/null 126s - +++ b/alpha 126s - @@ -0,0 +1,10 @@ 126s - +1 126s - +2 126s - +3 126s - +4 126s - +5 126s - +6 126s - +7 126s - +8 126s - +9 126s - +10 126s - 126s - 126s -Make a new ordinary commit in Mercurial (no extra metadata) 126s - $ echo 14 >> gamma 126s - $ hg ci -m "gamma2" 126s - 126s -Make a new commit with a copy and a rename in Mercurial 126s - $ hg cp gamma delta 126s - $ echo 15 >> delta 126s - $ hg mv beta epsilon 126s - $ echo 16 >> epsilon 126s - $ hg ci -m "delta/epsilon" 126s - $ hg export . 126s - # HG changeset patch 126s - # User test 126s - # Date 0 0 126s - # Thu Jan 01 00:00:00 1970 +0000 126s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 126s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 126s - delta/epsilon 126s - 126s - diff --git a/gamma b/delta 126s - copy from gamma 126s - copy to delta 126s - --- a/gamma 126s - +++ b/delta 126s - @@ -11,3 +11,4 @@ 126s - 11 126s - 13 126s - 14 126s - +15 126s - diff --git a/beta b/epsilon 126s - rename from beta 126s - rename to epsilon 126s - --- a/beta 126s - +++ b/epsilon 126s - @@ -10,3 +10,4 @@ 126s - 10 126s - 11 126s - 12 126s - +16 126s - $ hg push 126s - pushing to $TESTTMP/repo.git 126s - searching for changes 126s - adding objects 126s - remote: found 0 deltas to reuse 126s - added 2 commits with 2 trees and 3 blobs 126s - updating reference refs/heads/master 126s - 126s - $ cd ../repo.git 126s - $ git log master --pretty=oneline 126s - 5f2948d029693346043f320620af99a615930dc4 delta/epsilon 126s - bbd2ec050f7fbc64f772009844f7d58a556ec036 gamma2 126s - 50d116676a308b7c22935137d944e725d2296f2a remove submodule and rename back 126s - 59fb8e82ea18f79eab99196f588e8948089c134f rename and add submodule 126s - f95497455dfa891b4cd9b524007eb9514c3ab654 beta renamed back 126s - 055f482277da6cd3dd37c7093d06983bad68f782 beta renamed 126s - d7f31298f27df8a9226eddb1e4feb96922c46fa5 move submodule 126s - c610256cb6959852d9e70d01902a06726317affc add submodule 126s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 126s - cc83241f39927232f690d370894960b0d1943a0e beta 126s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 126s - 126s -Make sure the right metadata is stored 126s - $ git cat-file commit master^ 126s - tree 0adbde18545845f3b42ad1a18939ed60a9dec7a8 126s - parent 50d116676a308b7c22935137d944e725d2296f2a 126s - author test 0 +0000 126s - committer test 0 +0000 126s - HG:rename-source hg 126s - 126s - gamma2 126s - $ git cat-file commit master 126s - tree f8f32f4e20b56a5a74582c6a5952c175bf9ec155 126s - parent bbd2ec050f7fbc64f772009844f7d58a556ec036 126s - author test 0 +0000 126s - committer test 0 +0000 126s - HG:rename gamma:delta 126s - HG:rename beta:epsilon 126s - 126s - delta/epsilon 126s - 126s -Now make another clone and compare the hashes 126s - 126s - $ cd .. 126s - $ hg clone -q repo.git hgrepo2 126s - $ cd hgrepo2 126s - $ hg book master -qf 126s - $ hg export master 126s - # HG changeset patch 126s - # User test 126s - # Date 0 0 126s - # Thu Jan 01 00:00:00 1970 +0000 126s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 126s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 126s - delta/epsilon 126s - 126s - diff --git a/gamma b/delta 126s - copy from gamma 126s - copy to delta 126s - --- a/gamma 126s - +++ b/delta 126s - @@ -11,3 +11,4 @@ 126s - 11 126s - 13 126s - 14 126s - +15 126s - diff --git a/beta b/epsilon 126s - rename from beta 126s - rename to epsilon 126s - --- a/beta 126s - +++ b/epsilon 126s - @@ -10,3 +10,4 @@ 126s - 10 126s - 11 126s - 12 126s - +16 126s - 126s -Regenerate the Git metadata and compare the hashes 126s - $ hg debug-remove-hggit-state 126s - clearing out the git cache data 126s - $ hg gexport 126s - $ cd .hg/git 126s - $ git log master --pretty=oneline 126s - f3f6592447685566af9447c03ae262aa5432511d delta/epsilon (dulwich-rust !) 126s - c51ce14ec367c5ea72bf428dee3f8576f2fe1bb0 gamma2 (dulwich-rust !) 126s - df749cae534e3c7a0ad664cd0f214dd36e0ac259 remove submodule and rename back (dulwich-rust !) 126s - 8f9ec605ad0cc2532202f73cef8e35d3241797ee rename and add submodule (dulwich-rust !) 126s - 8a00d0fb75377c51c9a46e92ff154c919007f0e2 delta/epsilon (no-dulwich-rust !) 126s - dd7d4f1adb942a8d349dce585019f6949184bc64 gamma2 (no-dulwich-rust !) 126s - 3f1cdaf8b603816fcda02bd29e75198ae4cb13db remove submodule and rename back (no-dulwich-rust !) 126s - 2a4abf1178a999e2054158ceb0c7768079665d03 rename and add submodule (no-dulwich-rust !) 126s - 88c416e8d5e0e9dd1187d45ebafaa46111764196 beta renamed back 126s - 027d2a6e050705bf6f7e226e7e97f02ce5ae3200 beta renamed 126s - dc70e620634887e70ac5dd108bcc7ebd99c60ec3 move submodule 126s - c610256cb6959852d9e70d01902a06726317affc add submodule 126s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 126s - cc83241f39927232f690d370894960b0d1943a0e beta 126s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 126s - 126s -Test findcopiesharder 126s - 126s - $ cd $TESTTMP 126s - $ git init -q gitcopyharder 126s - $ cd gitcopyharder 126s - $ cat >> file0 << EOF 126s - > 1 126s - > 2 126s - > 3 126s - > 4 126s - > 5 126s - > EOF 126s - $ git add file0 126s - $ fn_git_commit -m file0 126s - $ cp file0 file1 126s - $ git add file1 126s - $ fn_git_commit -m file1 126s - $ cp file0 file2 126s - $ echo 6 >> file2 126s - $ git add file2 126s - $ fn_git_commit -m file2 126s - 126s - $ cd .. 126s - 126s -Clone without findcopiesharder does not find copies from unmodified files 126s - 126s - $ hg clone gitcopyharder hgnocopyharder 126s - importing 3 git commits 126s - new changesets b45d023c6842:ec77ccdbefe0 (3 drafts) 126s - updating to bookmark master 126s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 126s - $ hg -R hgnocopyharder export 1::2 126s - # HG changeset patch 126s - # User test 126s - # Date 1167609621 0 126s - # Mon Jan 01 00:00:21 2007 +0000 126s - # Node ID 555831c93e2a250e5ba42efad45bf7ba71da13e4 126s - # Parent b45d023c6842337ffe694663a44aa672d311081c 126s - file1 126s - 126s - diff --git a/file1 b/file1 126s - new file mode 100644 126s - --- /dev/null 126s - +++ b/file1 126s - @@ -0,0 +1,5 @@ 126s - +1 126s - +2 126s - +3 126s - +4 126s - +5 126s - # HG changeset patch 126s - # User test 126s - # Date 1167609622 0 126s - # Mon Jan 01 00:00:22 2007 +0000 126s - # Node ID ec77ccdbefe023eb9898b0399f84f670c8c0f5fc 126s - # Parent 555831c93e2a250e5ba42efad45bf7ba71da13e4 126s - file2 126s - 126s - diff --git a/file2 b/file2 126s - new file mode 100644 126s - --- /dev/null 126s - +++ b/file2 126s - @@ -0,0 +1,6 @@ 126s - +1 126s - +2 126s - +3 126s - +4 126s - +5 126s - +6 126s - 126s -findcopiesharder finds copies from unmodified files if similarity is met 126s - 126s - $ hg --config git.findcopiesharder=true clone gitcopyharder hgcopyharder0 126s - importing 3 git commits 126s - new changesets b45d023c6842:9b3099834272 (3 drafts) 126s - updating to bookmark master 126s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 126s - $ hg -R hgcopyharder0 export 1::2 126s - # HG changeset patch 126s - # User test 126s - # Date 1167609621 0 126s - # Mon Jan 01 00:00:21 2007 +0000 126s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 126s - # Parent b45d023c6842337ffe694663a44aa672d311081c 126s - file1 126s - 126s - diff --git a/file0 b/file1 126s - copy from file0 126s - copy to file1 126s - # HG changeset patch 126s - # User test 126s - # Date 1167609622 0 126s - # Mon Jan 01 00:00:22 2007 +0000 126s - # Node ID 9b30998342729c7357d418bebed7399986cfe643 126s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 126s - file2 126s - 126s - diff --git a/file0 b/file2 126s - copy from file0 126s - copy to file2 126s - --- a/file0 126s - +++ b/file2 126s - @@ -3,3 +3,4 @@ 126s - 3 126s - 4 126s - 5 126s - +6 126s - 126s - $ hg --config git.findcopiesharder=true --config git.similarity=95 clone gitcopyharder hgcopyharder1 126s - importing 3 git commits 126s - new changesets b45d023c6842:d9d2e8cbf050 (3 drafts) 126s - updating to bookmark master 126s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 126s - $ hg -R hgcopyharder1 export 1::2 126s - # HG changeset patch 126s - # User test 126s - # Date 1167609621 0 126s - # Mon Jan 01 00:00:21 2007 +0000 126s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 126s - # Parent b45d023c6842337ffe694663a44aa672d311081c 126s - file1 126s - 126s - diff --git a/file0 b/file1 126s - copy from file0 126s - copy to file1 126s - # HG changeset patch 126s - # User test 126s - # Date 1167609622 0 126s - # Mon Jan 01 00:00:22 2007 +0000 126s - # Node ID d9d2e8cbf050772be31dccf78851f71dc547d139 126s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 126s - file2 126s - 126s - diff --git a/file2 b/file2 126s - new file mode 100644 126s - --- /dev/null 126s - +++ b/file2 126s - @@ -0,0 +1,6 @@ 126s - +1 126s - +2 126s - +3 126s - +4 126s - +5 126s - +6 126s - 126s -Config values out of range 126s - $ hg --config git.similarity=999 clone gitcopyharder hgcopyharder2 126s - importing 3 git commits 126s - abort: git.similarity must be between 0 and 100 126s - [255] 126s -Left-over on Windows with some pack files 126s - $ rm -rf hgcopyharder2 126s - $ hg --config git.renamelimit=-5 clone gitcopyharder hgcopyharder2 126s - importing 3 git commits 126s - abort: git.renamelimit must be non-negative 126s - [255] 126s 126s ERROR: test-renames.t output changed 126s !s 126s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-git-tags.t 126s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-git-tags.t#draft.err 126s @@ -41,337 +41,13 @@ 126s Clone it: 126s 126s $ hg clone repo.git hgrepo 126s - importing 2 git commits 126s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 126s - updating to bookmark master 126s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s + abort: repository repo.git not found 126s + [255] 126s 126s $ cd hgrepo 126s + $TESTTMP.sh: 39: cd: can't cd to hgrepo 126s 126s Verify that annotated tags are unaffected by reexports: 126s 126s $ GIT_DIR=.hg/git git tag -ln 126s - beta added tag beta 126s - $ hg gexport 126s - $ GIT_DIR=.hg/git git tag -ln 126s - beta added tag beta 126s - 126s -Error checking on tag creation 126s - 126s - $ hg tag --git beta --remove 126s - abort: cannot remove git tags 126s - (the git documentation heavily discourages editing tags) 126s - [255] 126s - $ hg tag --git beta -r null 126s - abort: cannot remove git tags 126s - (the git documentation heavily discourages editing tags) 126s - [255] 126s - $ hg tag --git beta --remove -r 0 126s - abort: cannot specify both --rev and --remove 126s - [10] 126s - $ hg tag --git alpha 126s - abort: git tags require an explicit revision 126s - (please specify -r/--rev) 126s - [255] 126s - $ hg tag --git alpha alpha -r 0 126s - abort: tag names must be unique 126s - [255] 126s - $ hg tag --git alpha -r 0 -e 126s - abort: cannot specify both --git and --edit 126s - [10] 126s - $ hg tag --git alpha -r 0 -m 42 126s - abort: cannot specify both --git and --message 126s - [10] 126s - $ hg tag --git alpha -r 0 -d 42 126s - abort: cannot specify both --git and --date 126s - [10] 126s - $ hg tag --git alpha -r 0 -u user@example.com 126s - abort: cannot specify both --git and --user 126s - [10] 126s - $ hg tag --git 'with space' -r 0 126s - abort: the name 'with space' is not a valid git tag 126s - [255] 126s - $ hg tag --git ' beta' -r 0 126s - abort: the name 'beta' already exists 126s - [255] 126s - $ hg tag --git master -r 0 126s - abort: the name 'master' already exists 126s - [255] 126s - $ hg tag --git tip -r 0 126s - abort: the name 'tip' is reserved 126s - [10] 126s - 126s -Create a git tag from hg 126s - 126s - $ hg tag --git alpha --debug -r 0 126s - finding unexported changesets 126s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 126s - adding git tag alpha 126s - $ hg log --graph 126s - @ changeset: 1:7fe02317c63d 126s - | bookmark: master 126s - | tag: beta 126s - | tag: default/master 126s - | tag: tip 126s - | user: test 126s - | date: Mon Jan 01 00:00:11 2007 +0000 126s - | summary: add beta 126s - | 126s - o changeset: 0:ff7a2f2d8d70 126s - tag: alpha 126s - user: test 126s - date: Mon Jan 01 00:00:10 2007 +0000 126s - summary: add alpha 126s - 126s - $ echo beta-fix >> beta 126s - $ fn_hg_commit -m 'fix for beta' 126s -#if secret 126s - $ hg phase -d 126s -#endif 126s - $ hg push 126s - pushing to $TESTTMP/repo.git 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 - adding reference refs/tags/alpha 126s - 126s -Verify that amending commits known to remotes doesn't break anything 126s - 126s - $ cat >> $HGRCPATH << EOF 126s - > [experimental] 126s - > evolution = createmarkers 126s - > evolution.createmarkers = yes 126s - > EOF 126s - $ hg tags 126s - tip 2:61175962e488 126s - default/master 2:61175962e488 126s - beta 1:7fe02317c63d 126s - alpha 0:ff7a2f2d8d70 126s - $ echo beta-fix-again >> beta 126s - $ fn_hg_commit --amend 126s - $ hg log -T shorttags 126s - 3:3094b9e8da41 draft tip 126s - 2:61175962e488 draft default/master X 126s - 1:7fe02317c63d draft beta 126s - 0:ff7a2f2d8d70 draft alpha 126s - $ hg tags 126s - tip 3:3094b9e8da41 126s - default/master 2:61175962e488 126s - beta 1:7fe02317c63d 126s - alpha 0:ff7a2f2d8d70 126s - $ hg push 126s - pushing to $TESTTMP/repo.git 126s - searching for changes 126s - abort: pushing refs/heads/master overwrites 3094b9e8da41 126s - [255] 126s - $ hg push -f 126s - pushing to $TESTTMP/repo.git 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 - 126s -Now create a tag for the old, obsolete master 126s - 126s - $ cd ../repo.git 126s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 126s - $ git tag 126s - alpha 126s - beta 126s - detached 126s - $ cd ../hgrepo 126s - $ hg pull 126s - pulling from $TESTTMP/repo.git 126s - no changes found 126s - $ hg log -T shorttags 126s - 3:3094b9e8da41 draft default/master tip 126s - 2:61175962e488 draft detached X 126s - 1:7fe02317c63d draft beta 126s - 0:ff7a2f2d8d70 draft alpha 126s - $ hg tags 126s - tip 3:3094b9e8da41 126s - default/master 3:3094b9e8da41 126s - detached 2:61175962e488 126s - beta 1:7fe02317c63d 126s - alpha 0:ff7a2f2d8d70 126s - $ hg push 126s - pushing to $TESTTMP/repo.git 126s - searching for changes 126s - no changes found 126s - [1] 126s - 126s - $ cd .. 126s - 126s -Verify that revsets can point out git tags; for that we need an 126s -untagged commit. 126s - 126s - $ cd hgrepo 126s - $ touch gamma 126s - $ fn_hg_commit -A -m 'add gamma' 126s -#if secret 126s - $ hg phase -d 126s -#endif 126s - $ hg log -T shorttags -r 'gittag()' 126s - 0:ff7a2f2d8d70 draft alpha 126s - 1:7fe02317c63d draft beta 126s - 2:61175962e488 draft detached X 126s - $ hg log -T shorttags -r 'gittag(detached)' 126s - 2:61175962e488 draft detached X 126s - $ hg log -T shorttags -r 'gittag("re:a$")' 126s - 0:ff7a2f2d8d70 draft alpha 126s - 1:7fe02317c63d draft beta 126s - 126s -Create a git tag from hg, but pointing to a new commit: 126s - 126s - $ hg tag --git gamma --debug -r tip 126s - invalid branch cache (visible): tip differs (?) 126s - finding unexported changesets 126s - exporting 1 changesets 126s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 126s - packing 3 loose objects... 126s - packed 3 loose objects! 126s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 126s - adding git tag gamma 126s - $ hg push 126s - pushing to $TESTTMP/repo.git 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 - adding reference refs/tags/gamma 126s - $ cd ../gitrepo 126s - $ git fetch --quiet --tags 126s - $ git tag 126s - alpha 126s - beta 126s - detached 126s - gamma 126s - $ cd .. 126s - 126s -Try to overwrite an annotated tag: 126s - 126s - $ cd hgrepo 126s - $ hg tags -v 126s - tip 4:0eb1ab0073a8 126s - gamma 4:0eb1ab0073a8 git 126s - default/master 4:0eb1ab0073a8 git-remote 126s - detached 2:61175962e488 git 126s - beta 1:7fe02317c63d git 126s - alpha 0:ff7a2f2d8d70 git 126s - $ hg book not-master 126s - $ hg tag beta 126s - abort: tag 'beta' already exists (use -f to force) 126s - [10] 126s - $ hg tag -f beta 126s -#if secret 126s - $ hg phase -d 126s -#endif 126s - $ hg push 126s - pushing to $TESTTMP/repo.git 126s - warning: not overwriting annotated tag 'beta' 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-master 126s - $ hg tags 126s - tip 5:c49682c7cba4 126s - default/not-master 5:c49682c7cba4 126s - gamma 4:0eb1ab0073a8 126s - default/master 4:0eb1ab0073a8 126s - beta 4:0eb1ab0073a8 126s - detached 2:61175962e488 126s - alpha 0:ff7a2f2d8d70 126s - $ cd .. 126s - 126s -Check whether `gimport` handles tags 126s - 126s - $ cd hgrepo 126s - $ rm .hg/git-tags .hg/git-mapfile 126s - $ hg gimport 126s - importing 6 git commits 126s - $ hg tags -q 126s - tip 126s - default/not-master 126s - gamma 126s - default/master 126s - beta 126s - detached 126s - alpha 126s - $ cd .. 126s - 126s -Test how pulling an explicit branch with an annotated tag: 126s - 126s - $ hg clone -r master repo.git hgrepo-2 126s - importing 4 git commits 126s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 126s - updating to branch default 126s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 126s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 126s - 0:ff7a2f2d8d70 draft alpha 126s - 1:7fe02317c63d draft beta 126s - 3:0eb1ab0073a8 draft default/master gamma tip 126s - $ hg tags -v -R hgrepo-2 126s - tip 3:0eb1ab0073a8 126s - gamma 3:0eb1ab0073a8 git 126s - default/master 3:0eb1ab0073a8 git-remote 126s - beta 1:7fe02317c63d git 126s - alpha 0:ff7a2f2d8d70 git 126s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 126s - $ rm -rf hgrepo-2 126s - 126s - $ hg clone -r master repo.git hgrepo-2 126s - importing 4 git commits 126s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 126s - updating to branch default 126s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 126s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 126s - 0:ff7a2f2d8d70 draft alpha 126s - 1:7fe02317c63d draft beta 126s - 3:0eb1ab0073a8 draft default/master gamma tip 126s -This used to die: 126s - $ hg -R hgrepo-2 gexport 126s -This used to fail, since we didn't actually pull the annotated tag: 126s - $ hg -R hgrepo-2 push 126s - pushing to $TESTTMP/repo.git 126s - searching for changes 126s - no changes found 126s - [1] 126s - $ rm -rf hgrepo-2 126s - 126s -Check that pulling will update phases only: 126s - 126s - $ cd hgrepo 126s - $ hg phase -fs gamma detached 126s - $ hg pull 126s - pulling from $TESTTMP/repo.git 126s - no changes found 126s - $ hg log -T shorttags -r gamma -r detached 126s - 4:0eb1ab0073a8 draft beta default/master gamma 126s - 2:61175962e488 draft detached X 126s - $ cd .. 126s - 126s -Check that we pull new tags to existing commits: 126s - $ cd gitrepo 126s - $ git tag 126s - alpha 126s - beta 126s - detached 126s - gamma 126s - $ fn_git_tag extra-simple-tag 126s - $ fn_git_tag -m annotated extra-annotated-tag 126s - $ git push --tags 126s - To $TESTTMP/repo.git 126s - * [new tag] extra-annotated-tag -> extra-annotated-tag 126s - * [new tag] extra-simple-tag -> extra-simple-tag 126s - $ cd ../hgrepo 126s - $ hg pull -r master 126s - pulling from $TESTTMP/repo.git 126s - no changes found 126s - $ hg tags -v | grep extra 126s - extra-simple-tag 1:7fe02317c63d git 126s - extra-annotated-tag 1:7fe02317c63d git 126s 126s ERROR: test-git-tags.t#draft output changed 126s ! 126s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-help.t 126s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-help.t.err 126s @@ -5,250 +5,14 @@ 126s 126s $ hg help | grep 'git' | sed 's/ */ /g' 126s git-cleanup clean up Git commit map after history editing (?) 126s - git-verify verify that a Mercurial rev matches the corresponding Git rev 126s - hggit push and pull from a Git server 126s - hggit-config Configuring hg-git 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s 126s $ hg help hggit-config 126s - Configuring hg-git 126s - """""""""""""""""" 126s - 126s - "git" 126s - ----- 126s - 126s - Control how the Hg-Git extension interacts with Git. 126s - 126s - "authors" 126s - Git uses a strict convention for "author names" when representing 126s - changesets, using the form "[realname] [email address]". Mercurial 126s - encourages this convention as well but is not as strict, so it's not 126s - uncommon for a Mercurial repository to have authors listed as, for 126s - example, simple usernames. hg-git by default will attempt to translate 126s - Mercurial usernames using the following rules: 126s - 126s - - If the Mercurial username fits the pattern "NAME ", the Git 126s - name will be set to NAME and the email to EMAIL. 126s - - If the Mercurial username looks like an email (if it contains an 126s - "@"), the Git name and email will both be set to that email. 126s - - If the Mercurial username consists of only a name, the email will be 126s - set to "none@none". 126s - - Illegal characters (stray "<"\ s or ">"\ s) will be stripped out, and 126s - for "NAME " usernames, any content after the right-bracket (for 126s - example, a second ">") will be turned into a url-encoded sigil like 126s - "ext:(%3E)" in the Git author name. 126s - 126s - Since these default behaviors may not be what you want ("none@none", for 126s - example, shows up unpleasantly on GitHub as "illegal email address"), 126s - the "git.authors" option provides for an "authors translation file" that 126s - will be used during outgoing transfers from Mercurial to Git only, by 126s - modifying "hgrc" as such: 126s - 126s - [git] 126s - authors = authors.txt 126s - 126s - Where "authors.txt" is the name of a text file containing author name 126s - translations, one per each line, using the following format: 126s - 126s - johnny = John Smith 126s - dougie = Doug Johnson 126s - 126s - Empty lines and lines starting with a "#" are ignored. 126s - 126s - It should be noted that this translation is in *the Mercurial to Git 126s - direction only*. Changesets coming from Git back to Mercurial will not 126s - translate back into Mercurial usernames, so it's best that the same 126s - username/email combination be used on both the Mercurial and Git sides; 126s - the author file is mostly useful for translating legacy changesets. 126s - 126s - "branch_bookmark_suffix" 126s - Hg-Git does not convert between Mercurial named branches and git 126s - branches as the two are conceptually different; instead, it uses 126s - Mercurial bookmarks to represent the concept of a Git branch. Therefore, 126s - when translating a Mercurial repository over to Git, you typically need 126s - to create bookmarks to mirror all the named branches that you'd like to 126s - see transferred over to Git. The major caveat with this is that you 126s - can't use the same name for your bookmark as that of the named branch, 126s - and furthermore there's no feasible way to rename a branch in Mercurial. 126s - For the use case where one would like to transfer a Mercurial repository 126s - over to Git, and maintain the same named branches as are present on the 126s - hg side, the "branch_bookmark_suffix" might be all that's needed. This 126s - presents a string "suffix" that will be recognized on each bookmark 126s - name, and stripped off as the bookmark is translated to a Git branch: 126s - 126s - [git] 126s - branch_bookmark_suffix=_bookmark 126s - 126s - Above, if a Mercurial repository had a named branch called 126s - "release_6_maintenance", you could then link it to a bookmark called 126s - "release_6_maintenance_bookmark". hg-git will then strip off the 126s - "_bookmark" suffix from this bookmark name, and create a Git branch 126s - called "release_6_maintenance". When pulling back from Git to hg, the 126s - "_bookmark" suffix is then applied back, if and only if a Mercurial 126s - named branch of that name exists. E.g., when changes to the 126s - "release_6_maintenance" branch are checked into Git, these will be 126s - placed into the "release_6_maintenance_bookmark" bookmark on hg. But if 126s - a new branch called "release_7_maintenance" were pulled over to hg, and 126s - there was not a "release_7_maintenance" named branch already, the 126s - bookmark will be named "release_7_maintenance" with no usage of the 126s - suffix. 126s - 126s - The "branch_bookmark_suffix" option is, like the "authors" option, 126s - intended for migrating legacy hg named branches. Going forward, a 126s - Mercurial repository that is to be linked with a Git repository should 126s - only use bookmarks for named branching. 126s - 126s - "findcopiesharder" 126s - Whether to consider unmodified files as copy sources. This is a very 126s - expensive operation for large projects, so use it with caution. Similar 126s - to "git diff"'s --find-copies-harder option. 126s - 126s - "intree" 126s - Hg-Git keeps a Git repository clone for reading and updating. By 126s - default, the Git clone is the subdirectory "git" in your local Mercurial 126s - repository. If you would like this Git clone to be at the same level of 126s - your Mercurial repository instead (named ".git"), add the following to 126s - your "hgrc": 126s - 126s - [git] 126s - intree = True 126s - 126s - Please note that changing this setting in an existing repository doesn't 126s - move the local Git repository. You will either have to do so yourself, 126s - or issue an 'hg pull' after the fact to repopulate the new location. 126s - 126s - "mindate" 126s - If set, branches where the latest commit's commit time is older than 126s - this will not be imported. Accepts any date formats that Mercurial does 126s - -- see 'hg help dates' for more. 126s - 126s - "public" 126s - A list of Git branches that should be considered "published", and 126s - therefore converted to Mercurial in the 'public' phase. This is only 126s - used if "hggit.usephases" is set. 126s - 126s - "pull-prune-remote-branches" 126s - Before fetching, remove any remote-tracking references, or pseudo-tags, 126s - that no longer exist on the remote. This is equivalent to the "--prune" 126s - option to "git fetch", and means that pseudo-tags for remotes -- such as 126s - "default/master" -- always actually reflect what's on the remote. 126s - 126s - This option is enabled by default. 126s - 126s - "pull-prune-bookmarks" 126s - On pull, delete any unchanged bookmarks removed on the remote. In other 126s - words, if e.g. the "thebranch" bookmark remains at "default/thebranch", 126s - and the branch is deleted in Git, pulling deletes the bookmark. 126s - 126s - This option is enabled by default. 126s - 126s - "renamelimit" 126s - The number of files to consider when performing the copy/rename 126s - detection. Detection is disabled if the number of files modified in a 126s - commit is above the limit. Detection is O(N^2) in the number of files 126s - modified, so be sure not to set the limit too high. Similar to Git's 126s - "diff.renameLimit" config. The default is "400", the same as Git. 126s - 126s - "similarity" 126s - Specify how similar files modified in a Git commit must be to be 126s - imported as Mercurial renames or copies, as a percentage between "0" 126s - (disabled) and "100" (files must be identical). For example, "90" means 126s - that a delete/add pair will be imported as a rename if more than 90% of 126s - the file has stayed the same. The default is "0" (disabled). 126s - 126s - "blame.ignoreRevsFile" 126s - Specify a file that lists Git commits to ignore when invoking 'hg 126s - annotate'. 126s - 126s - "hggit" 126s - ------- 126s - 126s - Control behavior of the Hg-Git extension. 126s - 126s - "mapsavefrequency" 126s - By default, hg-git only saves the results of a conversion at the end. 126s - Use this option to enable resuming long-running pulls and pushes. Set 126s - this to a number greater than 0 to allow resuming after converting that 126s - many commits. This can help when the conversion encounters an error 126s - partway through a large batch of changes. Otherwise, an error or 126s - interruption will roll back the transaction, similar to regular 126s - Mercurial. 126s - 126s - Defaults to 1000. 126s - 126s - Please note that this is disregarded for an initial clone, as any error 126s - or interruption will delete the destination. So instead of cloning a 126s - large Git repository, you might want to pull instead: 126s - 126s - $ hg init linux 126s - $ cd linux 126s - $ echo "[paths]\ndefault = https://github.com/torvalds/linux" > .hg/hgrc 126s - $ hg pull 126s - 126s - ...and be extremely patient. Please note that converting very large 126s - repositories may take *days* rather than mere *hours*, and may run into 126s - issues with available memory for very long running clones. Even any 126s - small, undiscovered leak will build up when processing hundreds of 126s - thousands of files and commits. Cloning the Linux kernel is likely a 126s - pathological case, but other storied repositories such as CPython do 126s - work well, even if the initial clone requires a some patience. 126s - 126s - "threads" 126s - 126s - During a push to Git, hg-git will pack loose objects at regular 126s - intervals whenever it saves its map. As this is a rather expensive 126s - operation, it's done in separate threads. 126s - 126s - Defaults to the system CPU count or 4, whichever is lower. 126s - 126s - "usephases" 126s - When converting Git revisions to Mercurial, place them in the 'public' 126s - phase as appropriate. Namely, revisions that are reachable from the 126s - remote Git repository's default branch, or "HEAD", will be marked 126s - *public*. For most repositories, this means the remote "master" branch 126s - will be converted as public. The same applies to any commits tagged in 126s - the remote. 126s - 126s - To restrict publishing to specific branches or tags, use the 126s - "git.public" option. 126s - 126s - Publishing commits prevents their modification, and speeds up many local 126s - Mercurial operations, such as 'hg shelve'. 126s - 126s - "fetchbuffer" 126s - Data fetched from Git is buffered in memory, unless it exceeds the given 126s - limit, in megabytes. By default, flush the buffer to disk when it 126s - exceeds 100MB. 126s - 126s - "retries" 126s - Interacting with a remote Git repository may require authentication. 126s - Normally, this will trigger a prompt and a retry, and this option 126s - restricts the amount of retries. Defaults to 3. 126s - 126s - "invalidpaths" 126s - Both Mercurial and Git consider paths as just bytestrings internally, 126s - and allow almost anything. The difference, however, is in the _almost_ 126s - part. For example, many Git servers will reject a push for security 126s - reasons if it contains a nested Git repository. Similarly, Mercurial 126s - cannot checkout commits with a nested repository, and it cannot even 127s - store paths containing an embedded newline or carrage return character. 127s - 127s - The default is to issue a warning and skip these paths. You can change 127s - this by setting "hggit.invalidpaths" in ".hgrc": 127s - 127s - [hggit] 127s - invalidpaths = keep 127s - 127s - Possible values are "keep", "skip" or "abort". Prior to 1.0, the default 127s - was "abort". 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + abort: no such help topic: hggit-config 127s + (try 'hg help --keyword hggit-config') 127s + [10] 127s 127s $ hg help config.hggit | head -10 127s - "hggit" 127s - ------- 127s - 127s - Control behavior of the Hg-Git extension. 127s - 127s - "mapsavefrequency" 127s - By default, hg-git only saves the results of a conversion at the end. 127s - Use this option to enable resuming long-running pulls and pushes. Set 127s - this to a number greater than 0 to allow resuming after converting that 127s - many commits. This can help when the conversion encounters an error 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + abort: help section not found: config.hggit 127s 127s ERROR: test-help.t output changed 127s ! 127s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-git-tags.t 127s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-git-tags.t#secret.err 127s @@ -41,337 +41,13 @@ 127s Clone it: 127s 127s $ hg clone repo.git hgrepo 127s - importing 2 git commits 127s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 127s - updating to bookmark master 127s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + abort: repository repo.git not found 127s + [255] 127s 127s $ cd hgrepo 127s + $TESTTMP.sh: 44: cd: can't cd to hgrepo 127s 127s Verify that annotated tags are unaffected by reexports: 127s 127s $ GIT_DIR=.hg/git git tag -ln 127s - beta added tag beta 127s - $ hg gexport 127s - $ GIT_DIR=.hg/git git tag -ln 127s - beta added tag beta 127s - 127s -Error checking on tag creation 127s - 127s - $ hg tag --git beta --remove 127s - abort: cannot remove git tags 127s - (the git documentation heavily discourages editing tags) 127s - [255] 127s - $ hg tag --git beta -r null 127s - abort: cannot remove git tags 127s - (the git documentation heavily discourages editing tags) 127s - [255] 127s - $ hg tag --git beta --remove -r 0 127s - abort: cannot specify both --rev and --remove 127s - [10] 127s - $ hg tag --git alpha 127s - abort: git tags require an explicit revision 127s - (please specify -r/--rev) 127s - [255] 127s - $ hg tag --git alpha alpha -r 0 127s - abort: tag names must be unique 127s - [255] 127s - $ hg tag --git alpha -r 0 -e 127s - abort: cannot specify both --git and --edit 127s - [10] 127s - $ hg tag --git alpha -r 0 -m 42 127s - abort: cannot specify both --git and --message 127s - [10] 127s - $ hg tag --git alpha -r 0 -d 42 127s - abort: cannot specify both --git and --date 127s - [10] 127s - $ hg tag --git alpha -r 0 -u user@example.com 127s - abort: cannot specify both --git and --user 127s - [10] 127s - $ hg tag --git 'with space' -r 0 127s - abort: the name 'with space' is not a valid git tag 127s - [255] 127s - $ hg tag --git ' beta' -r 0 127s - abort: the name 'beta' already exists 127s - [255] 127s - $ hg tag --git master -r 0 127s - abort: the name 'master' already exists 127s - [255] 127s - $ hg tag --git tip -r 0 127s - abort: the name 'tip' is reserved 127s - [10] 127s - 127s -Create a git tag from hg 127s - 127s - $ hg tag --git alpha --debug -r 0 127s - finding unexported changesets 127s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 127s - adding git tag alpha 127s - $ hg log --graph 127s - @ changeset: 1:7fe02317c63d 127s - | bookmark: master 127s - | tag: beta 127s - | tag: default/master 127s - | tag: tip 127s - | user: test 127s - | date: Mon Jan 01 00:00:11 2007 +0000 127s - | summary: add beta 127s - | 127s - o changeset: 0:ff7a2f2d8d70 127s - tag: alpha 127s - user: test 127s - date: Mon Jan 01 00:00:10 2007 +0000 127s - summary: add alpha 127s - 127s - $ echo beta-fix >> beta 127s - $ fn_hg_commit -m 'fix for beta' 127s -#if secret 127s - $ hg phase -d 127s -#endif 127s - $ hg push 127s - pushing to $TESTTMP/repo.git 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 - adding reference refs/tags/alpha 127s - 127s -Verify that amending commits known to remotes doesn't break anything 127s - 127s - $ cat >> $HGRCPATH << EOF 127s - > [experimental] 127s - > evolution = createmarkers 127s - > evolution.createmarkers = yes 127s - > EOF 127s - $ hg tags 127s - tip 2:61175962e488 127s - default/master 2:61175962e488 127s - beta 1:7fe02317c63d 127s - alpha 0:ff7a2f2d8d70 127s - $ echo beta-fix-again >> beta 127s - $ fn_hg_commit --amend 127s - $ hg log -T shorttags 127s - 3:3094b9e8da41 draft tip 127s - 2:61175962e488 draft default/master X 127s - 1:7fe02317c63d draft beta 127s - 0:ff7a2f2d8d70 draft alpha 127s - $ hg tags 127s - tip 3:3094b9e8da41 127s - default/master 2:61175962e488 127s - beta 1:7fe02317c63d 127s - alpha 0:ff7a2f2d8d70 127s - $ hg push 127s - pushing to $TESTTMP/repo.git 127s - searching for changes 127s - abort: pushing refs/heads/master overwrites 3094b9e8da41 127s - [255] 127s - $ hg push -f 127s - pushing to $TESTTMP/repo.git 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 - 127s -Now create a tag for the old, obsolete master 127s - 127s - $ cd ../repo.git 127s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 127s - $ git tag 127s - alpha 127s - beta 127s - detached 127s - $ cd ../hgrepo 127s - $ hg pull 127s - pulling from $TESTTMP/repo.git 127s - no changes found 127s - $ hg log -T shorttags 127s - 3:3094b9e8da41 draft default/master tip 127s - 2:61175962e488 draft detached X 127s - 1:7fe02317c63d draft beta 127s - 0:ff7a2f2d8d70 draft alpha 127s - $ hg tags 127s - tip 3:3094b9e8da41 127s - default/master 3:3094b9e8da41 127s - detached 2:61175962e488 127s - beta 1:7fe02317c63d 127s - alpha 0:ff7a2f2d8d70 127s - $ hg push 127s - pushing to $TESTTMP/repo.git 127s - searching for changes 127s - no changes found 127s - [1] 127s - 127s - $ cd .. 127s - 127s -Verify that revsets can point out git tags; for that we need an 127s -untagged commit. 127s - 127s - $ cd hgrepo 127s - $ touch gamma 127s - $ fn_hg_commit -A -m 'add gamma' 127s -#if secret 127s - $ hg phase -d 127s -#endif 127s - $ hg log -T shorttags -r 'gittag()' 127s - 0:ff7a2f2d8d70 draft alpha 127s - 1:7fe02317c63d draft beta 127s - 2:61175962e488 draft detached X 127s - $ hg log -T shorttags -r 'gittag(detached)' 127s - 2:61175962e488 draft detached X 127s - $ hg log -T shorttags -r 'gittag("re:a$")' 127s - 0:ff7a2f2d8d70 draft alpha 127s - 1:7fe02317c63d draft beta 127s - 127s -Create a git tag from hg, but pointing to a new commit: 127s - 127s - $ hg tag --git gamma --debug -r tip 127s - invalid branch cache (visible): tip differs (?) 127s - finding unexported changesets 127s - exporting 1 changesets 127s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 127s - packing 3 loose objects... 127s - packed 3 loose objects! 127s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 127s - adding git tag gamma 127s - $ hg push 127s - pushing to $TESTTMP/repo.git 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 - adding reference refs/tags/gamma 127s - $ cd ../gitrepo 127s - $ git fetch --quiet --tags 127s - $ git tag 127s - alpha 127s - beta 127s - detached 127s - gamma 127s - $ cd .. 127s - 127s -Try to overwrite an annotated tag: 127s - 127s - $ cd hgrepo 127s - $ hg tags -v 127s - tip 4:0eb1ab0073a8 127s - gamma 4:0eb1ab0073a8 git 127s - default/master 4:0eb1ab0073a8 git-remote 127s - detached 2:61175962e488 git 127s - beta 1:7fe02317c63d git 127s - alpha 0:ff7a2f2d8d70 git 127s - $ hg book not-master 127s - $ hg tag beta 127s - abort: tag 'beta' already exists (use -f to force) 127s - [10] 127s - $ hg tag -f beta 127s -#if secret 127s - $ hg phase -d 127s -#endif 127s - $ hg push 127s - pushing to $TESTTMP/repo.git 127s - warning: not overwriting annotated tag 'beta' 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-master 127s - $ hg tags 127s - tip 5:c49682c7cba4 127s - default/not-master 5:c49682c7cba4 127s - gamma 4:0eb1ab0073a8 127s - default/master 4:0eb1ab0073a8 127s - beta 4:0eb1ab0073a8 127s - detached 2:61175962e488 127s - alpha 0:ff7a2f2d8d70 127s - $ cd .. 127s - 127s -Check whether `gimport` handles tags 127s - 127s - $ cd hgrepo 127s - $ rm .hg/git-tags .hg/git-mapfile 127s - $ hg gimport 127s - importing 6 git commits 127s - $ hg tags -q 127s - tip 127s - default/not-master 127s - gamma 127s - default/master 127s - beta 127s - detached 127s - alpha 127s - $ cd .. 127s - 127s -Test how pulling an explicit branch with an annotated tag: 127s - 127s - $ hg clone -r master repo.git hgrepo-2 127s - importing 4 git commits 127s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 127s - updating to branch default 127s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 127s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 127s - 0:ff7a2f2d8d70 draft alpha 127s - 1:7fe02317c63d draft beta 127s - 3:0eb1ab0073a8 draft default/master gamma tip 127s - $ hg tags -v -R hgrepo-2 127s - tip 3:0eb1ab0073a8 127s - gamma 3:0eb1ab0073a8 git 127s - default/master 3:0eb1ab0073a8 git-remote 127s - beta 1:7fe02317c63d git 127s - alpha 0:ff7a2f2d8d70 git 127s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 127s - $ rm -rf hgrepo-2 127s - 127s - $ hg clone -r master repo.git hgrepo-2 127s - importing 4 git commits 127s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 127s - updating to branch default 127s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 127s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 127s - 0:ff7a2f2d8d70 draft alpha 127s - 1:7fe02317c63d draft beta 127s - 3:0eb1ab0073a8 draft default/master gamma tip 127s -This used to die: 127s - $ hg -R hgrepo-2 gexport 127s -This used to fail, since we didn't actually pull the annotated tag: 127s - $ hg -R hgrepo-2 push 127s - pushing to $TESTTMP/repo.git 127s - searching for changes 127s - no changes found 127s - [1] 127s - $ rm -rf hgrepo-2 127s - 127s -Check that pulling will update phases only: 127s - 127s - $ cd hgrepo 127s - $ hg phase -fs gamma detached 127s - $ hg pull 127s - pulling from $TESTTMP/repo.git 127s - no changes found 127s - $ hg log -T shorttags -r gamma -r detached 127s - 4:0eb1ab0073a8 draft beta default/master gamma 127s - 2:61175962e488 draft detached X 127s - $ cd .. 127s - 127s -Check that we pull new tags to existing commits: 127s - $ cd gitrepo 127s - $ git tag 127s - alpha 127s - beta 127s - detached 127s - gamma 127s - $ fn_git_tag extra-simple-tag 127s - $ fn_git_tag -m annotated extra-annotated-tag 127s - $ git push --tags 127s - To $TESTTMP/repo.git 127s - * [new tag] extra-annotated-tag -> extra-annotated-tag 127s - * [new tag] extra-simple-tag -> extra-simple-tag 127s - $ cd ../hgrepo 127s - $ hg pull -r master 127s - pulling from $TESTTMP/repo.git 127s - no changes found 127s - $ hg tags -v | grep extra 127s - extra-simple-tag 1:7fe02317c63d git 127s - extra-annotated-tag 1:7fe02317c63d git 127s 127s ERROR: test-git-tags.t#secret output changed 127s ! 127s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-pull-after-rebase.t 127s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-pull-after-rebase.t.err 127s @@ -38,275 +38,9 @@ 127s Clone it and rebase the branch 127s 127s $ hg clone -U repo.git hgrepo 127s - importing 3 git commits 127s - new changesets ff7a2f2d8d70:205a004356ef (3 drafts) 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + abort: repository repo.git not found 127s + [255] 127s $ cd hgrepo 127s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 127s $ hg state 127s - o branch default/branch tip 2:205a004356ef32b8da782afb89d9179d12ca31e9 127s - | add gamma 127s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 127s - |/ add beta 127s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 127s - add alpha 127s - $ hg up branch 127s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 127s - (activating bookmark branch) 127s - $ hg rebase --quiet -d master 127s - $ hg state 127s - @ branch tip 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 127s - | add gamma 127s - | x default/branch 2:205a004356ef32b8da782afb89d9179d12ca31e9 127s - | | add gamma 127s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 127s - |/ add beta 127s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 127s - add alpha 127s - 127s - $ hg push -fr tip 127s - pushing to $TESTTMP/repo.git 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/branch 127s - $ cd .. 127s - 127s -Now switch back to git and create a new commit based on what we just rebased 127s - 127s - $ cd gitrepo 127s - $ git checkout --quiet -b otherbranch branch 127s - $ git log --oneline --graph --all --decorate 127s - * e5023f9 (HEAD -> otherbranch, origin/branch, branch) add gamma 127s - | * 9497a4e (origin/master, master) add beta 127s - |/ 127s - * 7eeab2e add alpha 127s - $ echo delta > delta 127s - $ git add delta 127s - $ fn_git_commit -m 'add delta' 127s - $ git push --quiet --set-upstream origin otherbranch 127s - Branch 'otherbranch' set up to track remote branch 'otherbranch' from 'origin'. (?) 127s - $ git log --oneline --graph --all --decorate 127s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 127s - * e5023f9 (origin/branch, branch) add gamma 127s - | * 9497a4e (origin/master, master) add beta 127s - |/ 127s - * 7eeab2e add alpha 127s - $ cd .. 127s - 127s -Pull that 127s - 127s - $ cd hgrepo 127s - $ hg pull 127s - pulling from $TESTTMP/repo.git 127s - importing 1 git commits 127s - adding bookmark otherbranch 127s - 1 new orphan changesets 127s - new changesets 075302705298 (1 drafts) 127s - (run 'hg heads' to see heads, 'hg merge' to merge) 127s - $ hg state 127s - * otherbranch default/otherbranch tip 4:0753027052980aef9c9c37adb7d76d5719e8d818 127s - | add delta 127s - | @ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 127s - | | add gamma 127s - x | 2:205a004356ef32b8da782afb89d9179d12ca31e9 127s - | | add gamma 127s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 127s - |/ add beta 127s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 127s - add alpha 127s - 127s - $ cd .. 127s - 127s -To reproduce bug #386, do like github and save the old commit in a 127s -ref, and create a clone containing just the converted git commits: 127s - 127s - $ cd repo.git 127s - $ git update-ref refs/pr/1 otherbranch 127s - $ cd .. 127s - $ hg clone -U repo.git hgrepo-issue386 127s - importing 5 git commits 127s - new changesets ff7a2f2d8d70:075302705298 (5 drafts) 127s - 127s -Now try rebasing that branch, from the Git side of things 127s - 127s - $ cd gitrepo 127s - $ git checkout -q otherbranch 127s - $ git log --oneline --graph --all --decorate 127s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 127s - * e5023f9 (origin/branch, branch) add gamma 127s - | * 9497a4e (origin/master, master) add beta 127s - |/ 127s - * 7eeab2e add alpha 127s - $ fn_git_rebase --onto master branch otherbranch 127s - $ git log --oneline --graph --all --decorate 127s - * 9c58139 (HEAD -> otherbranch) add delta 127s - * 9497a4e (origin/master, master) add beta 127s - | * bba0011 (origin/otherbranch) add delta 127s - | * e5023f9 (origin/branch, branch) add gamma 127s - |/ 127s - * 7eeab2e add alpha 127s - $ git push -f 127s - To $TESTTMP/repo.git 127s - + bba0011...9c58139 otherbranch -> otherbranch (forced update) 127s - $ git log --oneline --graph --all --decorate 127s - * 9c58139 (HEAD -> otherbranch, origin/otherbranch) add delta 127s - * 9497a4e (origin/master, master) add beta 127s - | * e5023f9 (origin/branch, branch) add gamma 127s - |/ 127s - * 7eeab2e add alpha 127s - $ cd .. 127s - 127s -Now strip the old commit 127s - 127s - $ cd hgrepo-issue386 127s - $ hg up null 127s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 127s - $ hg id -qr otherbranch 127s - 075302705298 127s - $ hg pull 127s - pulling from $TESTTMP/repo.git 127s - importing 1 git commits 127s - not updating diverged bookmark otherbranch 127s - new changesets d64bf0521af6 (1 drafts) 127s - (run 'hg heads .' to see heads, 'hg merge' to merge) 127s - $ hg debugstrip --hidden --no-backup otherbranch 127s - $ hg book -d otherbranch 127s - $ hg git-cleanup 127s - git commit map cleaned 127s - $ hg pull 127s - pulling from $TESTTMP/repo.git 127s - no changes found 127s - adding bookmark otherbranch 127s - $ cd .. 127s - 127s -And check that pulling something else doesn't delete that branch. 127s - 127s - $ cd hgrepo 127s - $ hg pull -r master 127s - pulling from $TESTTMP/repo.git 127s - no changes found 127s - $ cd .. 127s - 127s -A special case, is that we can pull into a repository, where a commit 127s -corresponding to the new branch exists, but that commit is obsolete. 127s -In order to avoid “pinning” the obsolete commit, and thereby making it 127s -visible, we first pull from Git as an unnamed remote. 127s - 127s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 127s - updating to branch default 127s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 127s - $ cd hgrepo-clone 127s - $ hg pull ../repo.git 127s - pulling from ../repo.git 127s - importing 4 git commits 127s - not updating diverged bookmark otherbranch 127s - new changesets d64bf0521af6 (1 drafts) 127s - (run 'hg heads .' to see heads, 'hg merge' to merge) 127s - $ hg debugobsolete d64bf0521af68fe2160791a1b4ab9baf282a3879 127s - 1 new obsolescence markers 127s - obsoleted 1 changesets 127s - $ cp ../hgrepo/.hg/hgrc .hg 127s - $ hg pull 127s - pulling from $TESTTMP/repo.git 127s - no changes found 127s - not updating diverged bookmark otherbranch 127s - $ cd .. 127s - $ rm -rf hgrepo-clone 127s - 127s -Another special case, is that we should update commits over obsolete boundaries: 127s - 127s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 127s - updating to branch default 127s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 127s - $ cd hgrepo-clone 127s - $ hg pull ../repo.git 127s - pulling from ../repo.git 127s - importing 4 git commits 127s - not updating diverged bookmark otherbranch 127s - new changesets d64bf0521af6 (1 drafts) 127s - (run 'hg heads .' to see heads, 'hg merge' to merge) 127s - $ hg debugobsolete 0753027052980aef9c9c37adb7d76d5719e8d818 d64bf0521af68fe2160791a1b4ab9baf282a3879 127s - 1 new obsolescence markers 127s - obsoleted 1 changesets 127s - $ hg book -r 075302705298 otherbranch 127s - $ cp ../hgrepo/.hg/hgrc .hg 127s - $ hg pull 127s - pulling from $TESTTMP/repo.git 127s - no changes found 127s - updating bookmark otherbranch 127s - $ cd .. 127s - $ rm -rf hgrepo-clone 127s - 127s -Now just pull it: 127s - 127s - $ cd hgrepo 127s - $ hg pull 127s - pulling from $TESTTMP/repo.git 127s - importing 1 git commits 127s - not updating diverged bookmark otherbranch 127s - new changesets d64bf0521af6 (1 drafts) 127s - (run 'hg heads .' to see heads, 'hg merge' to merge) 127s - $ hg state 127s - o default/otherbranch tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 127s - | add delta 127s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 127s - | | add delta 127s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 127s - | | add gamma 127s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 127s - | | add gamma 127s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 127s - |/ add beta 127s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 127s - add alpha 127s - $ cd .. 127s - 127s -And finally, delete it: 127s - 127s - $ cd gitrepo 127s - $ git push origin :otherbranch 127s - To $TESTTMP/repo.git 127s - - [deleted] otherbranch 127s - $ cd .. 127s - 127s -And pull that: 127s - 127s - $ cd hgrepo 127s - $ hg pull 127s - pulling from $TESTTMP/repo.git 127s - no changes found 127s - not deleting diverged bookmark otherbranch 127s - $ hg state 127s - o tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 127s - | add delta 127s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 127s - | | add delta 127s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 127s - | | add gamma 127s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 127s - | | add gamma 127s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 127s - |/ add beta 127s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 127s - add alpha 127s - $ cd .. 127s - 127s -We only get that message once: 127s - 127s - $ hg -R hgrepo pull 127s - pulling from $TESTTMP/repo.git 127s - no changes found 127s - 127s -Now try deleting one already gone locally, which shouldn't output 127s -anything: 127s - 127s - $ cd gitrepo 127s - $ git push origin :branch 127s - To $TESTTMP/repo.git 127s - - [deleted] branch 127s - $ cd ../hgrepo 127s - $ hg book -d branch 127s - $ hg pull 127s - pulling from $TESTTMP/repo.git 127s - no changes found 127s - $ cd .. 127s 127s ERROR: test-pull-after-rebase.t output changed 127s ! 127s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-push.t 127s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-push.t.err 127s @@ -12,287 +12,10 @@ 127s 127s $ cd .. 127s $ hg clone -u tip gitrepo hgrepo 127s - importing 1 git commits 127s - new changesets ff7a2f2d8d70 (1 drafts) 127s - updating to branch default 127s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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: 20: cd: can't cd to hgrepo 127s $ hg bookmark -q master 127s - $ echo beta > beta 127s - $ hg add beta 127s - $ fn_hg_commit -m 'add beta' 127s - 127s - 127s - $ echo gamma > gamma 127s - $ hg add gamma 127s - $ fn_hg_commit -m 'add gamma' 127s - 127s - $ hg book -r 1 beta 127s - $ hg push -r beta 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/beta 127s - 127s - $ cd .. 127s - 127s -should have two different branches 127s - $ cd gitrepo 127s - $ git branch -v 127s - beta 0f378ab add beta 127s - master 7eeab2e add alpha 127s - * not-master 7eeab2e add alpha 127s - 127s -some more work on master from git 127s - $ git checkout master 2>&1 | sed s/\'/\"/g 127s - Switched to branch "master" 127s - $ echo delta > delta 127s - $ git add delta 127s - $ fn_git_commit -m "add delta" 127s - $ git checkout not-master 2>&1 | sed s/\'/\"/g 127s - Switched to branch "not-master" 127s - 127s - $ cd .. 127s - 127s - $ cd hgrepo 127s -this should fail 127s - $ hg push -r master 127s - pushing to $TESTTMP/gitrepo 127s - searching for changes 127s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 127s - [255] 127s - 127s -... even with -f 127s - $ hg push -fr master 127s - pushing to $TESTTMP/gitrepo 127s - searching for changes 127s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 127s - [255] 127s - 127s - $ hg pull 2>&1 | grep -v 'divergent bookmark' 127s - pulling from $TESTTMP/gitrepo 127s - importing 1 git commits 127s - not updating diverged bookmark master 127s - new changesets 25eed24f5e8f (1 drafts) 127s - (run 'hg heads' to see heads, 'hg merge' to merge) 127s -TODO shouldn't need to do this since we're (in theory) pushing master explicitly, 127s -which should not implicitly also push the not-master ref. 127s - $ hg book not-master -r default/not-master --force 127s -master and default/master should be diferent 127s - $ hg log -r master 127s - changeset: 2:953796e1cfd8 127s - bookmark: master 127s - user: test 127s - date: Mon Jan 01 00:00:12 2007 +0000 127s - summary: add gamma 127s - 127s - $ hg log -r default/master 127s - changeset: 3:25eed24f5e8f 127s - tag: default/master 127s - tag: tip 127s - parent: 0:ff7a2f2d8d70 127s - user: test 127s - date: Mon Jan 01 00:00:13 2007 +0000 127s - summary: add delta 127s - 127s - 127s -this should also fail 127s - $ hg push -r master 127s - pushing to $TESTTMP/gitrepo 127s - searching for changes 127s - abort: pushing refs/heads/master overwrites 953796e1cfd8 127s - [255] 127s - 127s -... but succeed with -f 127s - $ hg push -fr 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 - 127s -this should fail, no changes to push 127s - $ hg push -r master 127s - pushing to $TESTTMP/gitrepo 127s - searching for changes 127s - no changes found 127s - [1] 127s - 127s -hg-git issue103 -- directories can lose information at hg-git export time 127s - 127s - $ hg up master 127s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 127s - $ mkdir dir1 127s - $ echo alpha > dir1/alpha 127s - $ hg add dir1/alpha 127s - $ fn_hg_commit -m 'add dir1/alpha' 127s - $ hg push -r 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 2 trees and 0 blobs 127s - updating reference refs/heads/master 127s - 127s - $ echo beta > dir1/beta 127s - $ hg add dir1/beta 127s - $ fn_hg_commit -m 'add dir1/beta' 127s - $ hg push -r 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 2 trees and 0 blobs 127s - updating reference refs/heads/master 127s - $ hg log -r master 127s - changeset: 5:ba0476ff1899 127s - bookmark: master 127s - tag: default/master 127s - tag: tip 127s - user: test 127s - date: Mon Jan 01 00:00:15 2007 +0000 127s - summary: add dir1/beta 127s - 127s - 127s - $ cat >> .hg/hgrc << EOF 127s - > [paths] 127s - > default:pushurl = file:///$TESTTMP/gitrepo 127s - > EOF 127s -NB: the triple slashes are intentional, due to windows 127s - $ hg push -r master 127s - pushing to file:///$TESTTMP/gitrepo 127s - searching for changes 127s - no changes found 127s - [1] 127s - 127s - $ cd .. 127s - 127s - $ hg clone -u tip gitrepo hgrepo-test 127s - importing 5 git commits 127s - new changesets ff7a2f2d8d70:ba0476ff1899 (5 drafts) 127s - updating to branch default 127s - 5 files updated, 0 files merged, 0 files removed, 0 files unresolved 127s - $ hg -R hgrepo-test log -r master 127s - changeset: 4:ba0476ff1899 127s - bookmark: master 127s - tag: default/master 127s - tag: tip 127s - user: test 127s - date: Mon Jan 01 00:00:15 2007 +0000 127s - summary: add dir1/beta 127s - 127s - $ hg tags -R hgrepo-test | grep ^default/ 127s - default/master 4:ba0476ff1899 127s - default/beta 1:47580592d3d6 127s - default/not-master 0:ff7a2f2d8d70 127s - 127s -Push a fast-forward to a currently checked out branch, which sometimes 127s -fails: 127s - 127s - $ cd hgrepo 127s - $ hg book -r master not-master 127s - moving bookmark 'not-master' forward from ff7a2f2d8d70 127s - $ hg push 127s - pushing to file:///$TESTTMP/gitrepo 127s - searching for changes 127s - warning: failed to update HEAD; unable to set b'HEAD' to b'7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03' (?) 127s - updating reference refs/heads/not-master 127s -That should have updated the tag: 127s - $ hg tags | grep ^default/ 127s - default/not-master 5:ba0476ff1899 127s - default/master 5:ba0476ff1899 127s - default/beta 1:47580592d3d6 127s - $ cd .. 127s - 127s -We can push only one of two bookmarks on the same revision: 127s - 127s - $ cd hgrepo 127s - $ hg book -r 0 also-not-master really-not-master 127s - $ hg push -B also-not-master 127s - pushing to file:///$TESTTMP/gitrepo 127s - searching for changes 127s - adding reference refs/heads/also-not-master 127s - 127s -We can also push another bookmark to a path with another revision 127s -specified: 127s - 127s - $ hg book -r 3 also-not-master 127s - moving bookmark 'also-not-master' forward from ff7a2f2d8d70 127s - $ hg push -B also-not-master "file:///$TESTTMP/gitrepo#master" 127s - pushing to file:///$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/also-not-master 127s - 127s -And we can delete them again afterwards: 127s - 127s - $ hg book -d also-not-master really-not-master 127s - $ hg push -B also-not-master -B really-not-master 127s - pushing to file:///$TESTTMP/gitrepo 127s - searching for changes 127s - warning: unable to delete 'refs/heads/really-not-master' as it does not exist on the remote repository 127s - deleting reference refs/heads/also-not-master 127s - 127s -Push empty Hg repo to empty Git repo (issue #58) 127s - $ hg init hgrepo2 127s - $ git init -q --bare repo.git 127s - $ hg -R hgrepo2 push repo.git 127s - pushing to repo.git 127s - searching for changes 127s - abort: no bookmarks or tags to push to git 127s - (see "hg help bookmarks" for details on creating them) 127s - [255] 127s - 127s -The remote repo is empty and the local one doesn't have any bookmarks/tags 127s - $ cd hgrepo2 127s - $ echo init >> test.txt 127s - $ hg addremove 127s - adding test.txt 127s - $ fn_hg_commit -m init 127s - $ hg update null 127s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 127s - $ hg push ../repo.git 127s - pushing to ../repo.git 127s - searching for changes 127s - abort: no bookmarks or tags to push to git 127s - (see "hg help bookmarks" for details on creating them) 127s - [255] 127s - $ hg summary 127s - parent: -1:000000000000 (no revision checked out) 127s - branch: default 127s - commit: (clean) 127s - update: 1 new changesets (update) 127s - phases: 1 draft 127s -That should not create any bookmarks 127s - $ hg bookmarks 127s - no bookmarks set 127s -And no tags for the remotes either: 127s - $ hg tags 127s - tip 0:8aded40be5af 127s - 127s -test for ssh vulnerability 127s - 127s - $ cat >> $HGRCPATH << EOF 127s - > [ui] 127s - > ssh = ssh -o ConnectTimeout=1 127s - > EOF 127s - $ hg push -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 127s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 127s - [255] 127s - $ hg push -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 127s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 127s - [255] 127s - $ hg push -q 'git+ssh://fakehost|rm%20nonexistent/path' 127s - ssh: * fakehost%7?rm%20nonexistent* (glob) 127s - abort: git remote error: The remote server unexpectedly closed the connection. 127s - [255] 127s - $ hg push -q 'git+ssh://fakehost%7Crm%20nonexistent/path' 127s - ssh: * fakehost%7?rm%20nonexistent* (glob) 127s - abort: git remote error: The remote server unexpectedly closed the connection. 127s - [255] 127s 127s ERROR: test-push.t output changed 131s ! 131s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-clone.t 131s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-clone.t#draft.err 131s @@ -38,60 +38,42 @@ 131s clone a tag 131s 131s $ hg clone -r alpha gitrepo hgrepo-a 131s - importing 1 git commits 131s - new changesets ff7a2f2d8d70 (1 drafts) 131s - updating to branch default 131s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ hg -R hgrepo-a bookmarks 131s - master 0:ff7a2f2d8d70 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-a not found 131s + [255] 131s $ hg -R hgrepo-a log --graph --template=phases 131s - @ changeset: 0:ff7a2f2d8d70 131s - bookmark: master 131s - tag: alpha 131s - tag: default/master 131s - tag: tip 131s - phase: draft 131s - user: test 131s - date: Mon Jan 01 00:00:10 2007 +0000 131s - summary: add alpha 131s - 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-a not found 131s + [255] 131s $ git --git-dir hgrepo-a/.hg/git for-each-ref 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 131s + fatal: not a git repository: 'hgrepo-a/.hg/git' 131s + [128] 131s Make sure this is still draft since we didn't pull remote's HEAD 131s $ hg -R hgrepo-a phase -r alpha 131s - 0: draft 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-a not found 131s + [255] 131s 131s clone a branch 131s $ hg clone -r beta gitrepo hgrepo-b 131s - importing 2 git commits 131s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 131s - updating to branch default 131s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ hg -R hgrepo-b bookmarks 131s - * beta 1:7fe02317c63d 131s - master 0:ff7a2f2d8d70 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-b not found 131s + [255] 131s $ hg -R hgrepo-b log --graph 131s - @ changeset: 1:7fe02317c63d 131s - | bookmark: beta 131s - | tag: default/beta 131s - | tag: tip 131s - | user: test 131s - | date: Mon Jan 01 00:00:11 2007 +0000 131s - | summary: add beta 131s - | 131s - o changeset: 0:ff7a2f2d8d70 131s - bookmark: master 131s - tag: alpha 131s - tag: default/master 131s - user: test 131s - date: Mon Jan 01 00:00:10 2007 +0000 131s - summary: add alpha 131s - 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-b not found 131s + [255] 131s $ git --git-dir hgrepo-b/.hg/git for-each-ref 131s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 131s + fatal: not a git repository: 'hgrepo-b/.hg/git' 131s + [128] 131s 131s Make sure that a deleted .hgsubstate does not confuse hg-git 131s 131s @@ -104,48 +86,50 @@ 131s $ cd .. 131s 131s $ hg clone -r beta gitrepo hgrepo-c 131s - importing 4 git commits 131s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 131s - updating to branch default 131s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ hg -R hgrepo-c bookmarks 131s - * beta 3:47d12948785d 131s - master 0:ff7a2f2d8d70 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-c not found 131s + [255] 131s $ hg --cwd hgrepo-c status 131s + abort: No such file or directory: 'hgrepo-c' 131s + [255] 131s $ git --git-dir hgrepo-c/.hg/git for-each-ref 131s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 131s + fatal: not a git repository: 'hgrepo-c/.hg/git' 131s + [128] 131s 131s test shared repositories 131s 131s $ hg clone gitrepo hgrepo-base 131s - importing 5 git commits 131s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 131s - updating to bookmark beta 131s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ hg -R hgrepo-base bookmarks 131s - * beta 4:47d12948785d 131s - gamma 2:ca33a262eb46 131s - master 0:ff7a2f2d8d70 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-base not found 131s + [255] 131s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 131s - updating working directory 131s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-base not found 131s + [255] 131s $ hg -R hgrepo-shared pull gitrepo 131s - pulling from gitrepo 131s - no changes found 131s - adding bookmark beta 131s - adding bookmark gamma 131s - adding bookmark master 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-shared not found 131s + [255] 131s $ hg -R hgrepo-shared push gitrepo 131s - pushing to gitrepo 131s - searching for changes 131s - no changes found 131s - [1] 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-shared not found 131s + [255] 131s $ ls hgrepo-shared/.hg | grep git 131s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 131s [1] 131s $ hg -R hgrepo-shared git-cleanup 131s - git commit map cleaned 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + hg: unknown command 'git-cleanup' 131s + (did you mean clean?) 131s + [10] 131s $ rm -rf hgrepo-base hgrepo-shared 131s 131s test cloning HEAD 131s @@ -154,23 +138,21 @@ 131s $ git checkout -q master 131s $ cd .. 131s $ hg clone gitrepo hgrepo-2 131s - importing 5 git commits 131s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 131s - updating to bookmark master 131s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ git --git-dir hgrepo-2/.hg/git for-each-ref 131s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 131s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 131s + fatal: not a git repository: 'hgrepo-2/.hg/git' 131s + [128] 131s $ rm -rf hgrepo-2 131s 131s clone empty repo 131s $ git init empty 131s Initialized empty Git repository in $TESTTMP/empty/.git/ 131s $ hg clone empty emptyhg 131s - updating to branch default 131s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository empty not found 131s + [255] 131s $ rm -rf empty emptyhg 131s 131s test cloning detached HEAD, but pointing to a branch; we detect this 131s @@ -180,25 +162,20 @@ 131s $ git checkout -q -d master 131s $ cd .. 131s $ hg clone gitrepo hgrepo-2 131s - importing 5 git commits 131s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 131s - updating to bookmark master 131s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ hg -R hgrepo-2 book 131s - beta 4:47d12948785d 131s - gamma 2:ca33a262eb46 131s - * master 0:ff7a2f2d8d70 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-2 not found 131s + [255] 131s $ hg -R hgrepo-2 tags -v 131s - tip 4:47d12948785d 131s - default/beta 4:47d12948785d git-remote 131s - default/gamma 2:ca33a262eb46 git-remote 131s - default/master 0:ff7a2f2d8d70 git-remote 131s - alpha 0:ff7a2f2d8d70 git 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-2 not found 131s + [255] 131s $ git --git-dir hgrepo-2/.hg/git for-each-ref 131s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 131s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 131s + fatal: not a git repository: 'hgrepo-2/.hg/git' 131s + [128] 131s $ rm -rf hgrepo-2 131s 131s test cloning fully detached HEAD; we don't convert the 131s @@ -212,44 +189,45 @@ 131s $ fn_git_commit -m 'add delta' 131s $ cd .. 131s $ hg clone gitrepo hgrepo-2 131s - importing 5 git commits 131s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 131s - warning: the git source repository has a detached head 131s - (you may want to update to a bookmark) 131s - updating to branch default 131s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ hg -R hgrepo-2 book 131s - beta 4:47d12948785d 131s - gamma 2:ca33a262eb46 131s - master 0:ff7a2f2d8d70 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-2 not found 131s + [255] 131s $ hg -R hgrepo-2 id --tags 131s - default/beta tip 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-2 not found 131s + [255] 131s $ git --git-dir hgrepo-2/.hg/git for-each-ref 131s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 131s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 131s + fatal: not a git repository: 'hgrepo-2/.hg/git' 131s + [128] 131s $ rm -rf hgrepo-2 131s 131s test that cloning a regular mercurial repository does not introduce 131s git state 131s 131s $ hg init hgrepo-base 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s $ cd hgrepo-base 131s $ touch flaf 131s $ fn_hg_commit -A -m flaf 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s $ cd .. 131s $ hg clone -U hgrepo-base hgrepo-copy 131s requesting all changes (secret !) 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s $ ls hgrepo-copy/.hg | grep git 131s [1] 131s $ hg clone -U --pull hgrepo-base hgrepo-pull 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s requesting all changes 131s - adding changesets (draft !) 131s - adding manifests (draft !) 131s - adding file changes (draft !) 131s - added 1 changesets with 1 changes to 1 files (draft !) 131s - new changesets 76c919376257 (draft !) 131s + adding changesets 131s + adding manifests 131s + adding file changes 131s + added 1 changesets with 1 changes to 1 files 131s + new changesets 76c919376257 131s $ ls hgrepo-pull | grep git 131s [1] 131s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 131s 131s ERROR: test-clone.t#draft output changed 131s ! 131s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-clone.t 131s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-clone.t#secret.err 131s @@ -38,60 +38,42 @@ 131s clone a tag 131s 131s $ hg clone -r alpha gitrepo hgrepo-a 131s - importing 1 git commits 131s - new changesets ff7a2f2d8d70 (1 drafts) 131s - updating to branch default 131s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ hg -R hgrepo-a bookmarks 131s - master 0:ff7a2f2d8d70 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-a not found 131s + [255] 131s $ hg -R hgrepo-a log --graph --template=phases 131s - @ changeset: 0:ff7a2f2d8d70 131s - bookmark: master 131s - tag: alpha 131s - tag: default/master 131s - tag: tip 131s - phase: draft 131s - user: test 131s - date: Mon Jan 01 00:00:10 2007 +0000 131s - summary: add alpha 131s - 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-a not found 131s + [255] 131s $ git --git-dir hgrepo-a/.hg/git for-each-ref 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 131s + fatal: not a git repository: 'hgrepo-a/.hg/git' 131s + [128] 131s Make sure this is still draft since we didn't pull remote's HEAD 131s $ hg -R hgrepo-a phase -r alpha 131s - 0: draft 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-a not found 131s + [255] 131s 131s clone a branch 131s $ hg clone -r beta gitrepo hgrepo-b 131s - importing 2 git commits 131s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 131s - updating to branch default 131s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ hg -R hgrepo-b bookmarks 131s - * beta 1:7fe02317c63d 131s - master 0:ff7a2f2d8d70 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-b not found 131s + [255] 131s $ hg -R hgrepo-b log --graph 131s - @ changeset: 1:7fe02317c63d 131s - | bookmark: beta 131s - | tag: default/beta 131s - | tag: tip 131s - | user: test 131s - | date: Mon Jan 01 00:00:11 2007 +0000 131s - | summary: add beta 131s - | 131s - o changeset: 0:ff7a2f2d8d70 131s - bookmark: master 131s - tag: alpha 131s - tag: default/master 131s - user: test 131s - date: Mon Jan 01 00:00:10 2007 +0000 131s - summary: add alpha 131s - 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-b not found 131s + [255] 131s $ git --git-dir hgrepo-b/.hg/git for-each-ref 131s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 131s + fatal: not a git repository: 'hgrepo-b/.hg/git' 131s + [128] 131s 131s Make sure that a deleted .hgsubstate does not confuse hg-git 131s 131s @@ -104,48 +86,50 @@ 131s $ cd .. 131s 131s $ hg clone -r beta gitrepo hgrepo-c 131s - importing 4 git commits 131s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 131s - updating to branch default 131s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ hg -R hgrepo-c bookmarks 131s - * beta 3:47d12948785d 131s - master 0:ff7a2f2d8d70 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-c not found 131s + [255] 131s $ hg --cwd hgrepo-c status 131s + abort: No such file or directory: 'hgrepo-c' 131s + [255] 131s $ git --git-dir hgrepo-c/.hg/git for-each-ref 131s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 131s + fatal: not a git repository: 'hgrepo-c/.hg/git' 131s + [128] 131s 131s test shared repositories 131s 131s $ hg clone gitrepo hgrepo-base 131s - importing 5 git commits 131s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 131s - updating to bookmark beta 131s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ hg -R hgrepo-base bookmarks 131s - * beta 4:47d12948785d 131s - gamma 2:ca33a262eb46 131s - master 0:ff7a2f2d8d70 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-base not found 131s + [255] 131s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 131s - updating working directory 131s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-base not found 131s + [255] 131s $ hg -R hgrepo-shared pull gitrepo 131s - pulling from gitrepo 131s - no changes found 131s - adding bookmark beta 131s - adding bookmark gamma 131s - adding bookmark master 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-shared not found 131s + [255] 131s $ hg -R hgrepo-shared push gitrepo 131s - pushing to gitrepo 131s - searching for changes 131s - no changes found 131s - [1] 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-shared not found 131s + [255] 131s $ ls hgrepo-shared/.hg | grep git 131s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 131s [1] 131s $ hg -R hgrepo-shared git-cleanup 131s - git commit map cleaned 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + hg: unknown command 'git-cleanup' 131s + (did you mean clean?) 131s + [10] 131s $ rm -rf hgrepo-base hgrepo-shared 131s 131s test cloning HEAD 131s @@ -154,23 +138,21 @@ 131s $ git checkout -q master 131s $ cd .. 131s $ hg clone gitrepo hgrepo-2 131s - importing 5 git commits 131s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 131s - updating to bookmark master 131s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ git --git-dir hgrepo-2/.hg/git for-each-ref 131s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 131s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 131s + fatal: not a git repository: 'hgrepo-2/.hg/git' 131s + [128] 131s $ rm -rf hgrepo-2 131s 131s clone empty repo 131s $ git init empty 131s Initialized empty Git repository in $TESTTMP/empty/.git/ 131s $ hg clone empty emptyhg 131s - updating to branch default 131s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository empty not found 131s + [255] 131s $ rm -rf empty emptyhg 131s 131s test cloning detached HEAD, but pointing to a branch; we detect this 131s @@ -180,25 +162,20 @@ 131s $ git checkout -q -d master 131s $ cd .. 131s $ hg clone gitrepo hgrepo-2 131s - importing 5 git commits 131s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 131s - updating to bookmark master 131s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ hg -R hgrepo-2 book 131s - beta 4:47d12948785d 131s - gamma 2:ca33a262eb46 131s - * master 0:ff7a2f2d8d70 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-2 not found 131s + [255] 131s $ hg -R hgrepo-2 tags -v 131s - tip 4:47d12948785d 131s - default/beta 4:47d12948785d git-remote 131s - default/gamma 2:ca33a262eb46 git-remote 131s - default/master 0:ff7a2f2d8d70 git-remote 131s - alpha 0:ff7a2f2d8d70 git 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-2 not found 131s + [255] 131s $ git --git-dir hgrepo-2/.hg/git for-each-ref 131s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 131s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 131s + fatal: not a git repository: 'hgrepo-2/.hg/git' 131s + [128] 131s $ rm -rf hgrepo-2 131s 131s test cloning fully detached HEAD; we don't convert the 131s @@ -212,44 +189,45 @@ 131s $ fn_git_commit -m 'add delta' 131s $ cd .. 131s $ hg clone gitrepo hgrepo-2 131s - importing 5 git commits 131s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 131s - warning: the git source repository has a detached head 131s - (you may want to update to a bookmark) 131s - updating to branch default 131s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ hg -R hgrepo-2 book 131s - beta 4:47d12948785d 131s - gamma 2:ca33a262eb46 131s - master 0:ff7a2f2d8d70 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-2 not found 131s + [255] 131s $ hg -R hgrepo-2 id --tags 131s - default/beta tip 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo-2 not found 131s + [255] 131s $ git --git-dir hgrepo-2/.hg/git for-each-ref 131s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 131s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 131s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 131s + fatal: not a git repository: 'hgrepo-2/.hg/git' 131s + [128] 131s $ rm -rf hgrepo-2 131s 131s test that cloning a regular mercurial repository does not introduce 131s git state 131s 131s $ hg init hgrepo-base 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s $ cd hgrepo-base 131s $ touch flaf 131s $ fn_hg_commit -A -m flaf 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s $ cd .. 131s $ hg clone -U hgrepo-base hgrepo-copy 131s - requesting all changes (secret !) 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + requesting all changes 131s $ ls hgrepo-copy/.hg | grep git 131s [1] 131s $ hg clone -U --pull hgrepo-base hgrepo-pull 131s - requesting all changes 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s adding changesets (draft !) 131s adding manifests (draft !) 131s adding file changes (draft !) 131s added 1 changesets with 1 changes to 1 files (draft !) 131s new changesets 76c919376257 (draft !) 131s + requesting all changes 131s $ ls hgrepo-pull | grep git 131s [1] 131s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 131s 131s ERROR: test-clone.t#secret output changed 131s ! 131s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-branch-bookmark-suffix.t 131s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-branch-bookmark-suffix.t#with-path.err 131s @@ -9,287 +9,12 @@ 131s $ git init -q --bare repo.git 131s 131s $ hg clone repo.git hgrepo 131s - updating to branch default 131s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository repo.git not found 131s + [255] 131s $ cd hgrepo 131s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 131s #if without-path 131s $ rm .hg/hgrc 131s #endif 131s $ hg branch -q branch1 131s - $ hg bookmark branch1_bookmark 131s - $ echo f1 > f1 131s - $ hg add f1 131s - $ fn_hg_commit -m "add f1" 131s - $ hg branch -q branch2 131s - $ hg bookmark branch2_bookmark 131s - $ echo f2 > f2 131s - $ hg add f2 131s - $ fn_hg_commit -m "add f2" 131s - $ hg log --graph 131s - @ changeset: 1:600de9b6d498 131s - | branch: branch2 131s - | bookmark: branch2_bookmark 131s - | tag: tip 131s - | user: test 131s - | date: Mon Jan 01 00:00:11 2007 +0000 131s - | summary: add f2 131s - | 131s - o changeset: 0:40a840c1f8ae 131s - branch: branch1 131s - bookmark: branch1_bookmark 131s - user: test 131s - date: Mon Jan 01 00:00:10 2007 +0000 131s - summary: add f1 131s - 131s - 131s - $ hg push -B asdasd ../repo.git 131s - pushing to ../repo.git 131s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 131s - [255] 131s - 131s - $ hg push ../repo.git 131s - pushing to ../repo.git 131s - searching for changes 131s - adding objects 131s - remote: found 0 deltas to reuse 131s - added 2 commits with 2 trees and 2 blobs 131s - adding reference refs/heads/branch1 131s - adding reference refs/heads/branch2 131s - 131s - $ cd .. 131s - 131s - $ cd repo.git 131s - $ git symbolic-ref HEAD refs/heads/branch1 131s - $ git branch 131s - * branch1 131s - branch2 131s - $ cd .. 131s - 131s - $ git clone repo.git gitrepo 131s - Cloning into 'gitrepo'... 131s - done. 131s - $ cd gitrepo 131s - $ git checkout -q branch1 131s - $ echo g1 >> f1 131s - $ git add f1 131s - $ fn_git_commit -m "append f1" 131s - $ git checkout -q branch2 131s - $ echo g2 >> f2 131s - $ git add f2 131s - $ fn_git_commit -m "append f2" 131s - $ git checkout -b branch3 131s - Switched to a new branch 'branch3' 131s - $ echo g3 >> f3 131s - $ git add f3 131s - $ fn_git_commit -m "append f3" 131s - $ git push origin branch1 branch2 branch3 131s - To $TESTTMP/repo.git 131s - bbfe79a..d8aef79 branch1 -> branch1 131s - 288e92b..f8f8de5 branch2 -> branch2 131s - * [new branch] branch3 -> branch3 131s -make sure the commit doesn't have an HG:rename-source annotation 131s - $ git cat-file commit d8aef79 131s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 131s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 131s - author test 1167609612 +0000 131s - committer test 1167609612 +0000 131s - 131s - append f1 131s - $ cd .. 131s - 131s - $ cd hgrepo 131s - $ hg paths 131s - default = $TESTTMP/repo.git (with-path !) 131s - $ hg pull ../repo.git 131s - pulling from ../repo.git 131s - importing 3 git commits 131s - updating bookmark branch1_bookmark 131s - updating bookmark branch2_bookmark 131s - adding bookmark branch3_bookmark 131s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 131s - (run 'hg heads' to see heads) 131s - $ hg log --graph 131s - o changeset: 4:faf44fc3a4e8 131s - | bookmark: branch3_bookmark 131s - | tag: default/branch3 (with-path !) 131s - | tag: tip 131s - | user: test 131s - | date: Mon Jan 01 00:00:14 2007 +0000 131s - | summary: append f3 131s - | 131s - o changeset: 3:ae8eb55f7090 131s - | bookmark: branch2_bookmark 131s - | tag: default/branch2 (with-path !) 131s - | parent: 1:600de9b6d498 131s - | user: test 131s - | date: Mon Jan 01 00:00:13 2007 +0000 131s - | summary: append f2 131s - | 131s - | o changeset: 2:8211cade99e4 131s - | | bookmark: branch1_bookmark 131s - | | tag: default/branch1 (with-path !) 131s - | | parent: 0:40a840c1f8ae 131s - | | user: test 131s - | | date: Mon Jan 01 00:00:12 2007 +0000 131s - | | summary: append f1 131s - | | 131s - @ | changeset: 1:600de9b6d498 131s - |/ branch: branch2 131s - | user: test 131s - | date: Mon Jan 01 00:00:11 2007 +0000 131s - | summary: add f2 131s - | 131s - o changeset: 0:40a840c1f8ae 131s - branch: branch1 131s - user: test 131s - date: Mon Jan 01 00:00:10 2007 +0000 131s - summary: add f1 131s - 131s - $ cd .. 131s - 131s -Try cloning a bookmark, and make sure it gets checked out: 131s - 131s - $ rm -r hgrepo 131s - $ hg clone -r branch3 repo.git hgrepo 131s - importing 4 git commits 131s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 131s - updating to bookmark branch3_bookmark 131s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s - $ cd hgrepo 131s - $ hg bookmarks 131s - branch2_bookmark 2:ae8eb55f7090 131s - * branch3_bookmark 3:faf44fc3a4e8 131s - $ hg log --graph 131s - @ changeset: 3:faf44fc3a4e8 131s - | bookmark: branch3_bookmark 131s - | tag: default/branch3 131s - | tag: tip 131s - | user: test 131s - | date: Mon Jan 01 00:00:14 2007 +0000 131s - | summary: append f3 131s - | 131s - o changeset: 2:ae8eb55f7090 131s - | bookmark: branch2_bookmark 131s - | tag: default/branch2 131s - | user: test 131s - | date: Mon Jan 01 00:00:13 2007 +0000 131s - | summary: append f2 131s - | 131s - o changeset: 1:600de9b6d498 131s - | branch: branch2 131s - | user: test 131s - | date: Mon Jan 01 00:00:11 2007 +0000 131s - | summary: add f2 131s - | 131s - o changeset: 0:40a840c1f8ae 131s - branch: branch1 131s - user: test 131s - date: Mon Jan 01 00:00:10 2007 +0000 131s - summary: add f1 131s - 131s - $ cd .. 131s - 131s -Try cloning something that's both a bookmark and a branch, and see the 131s -results. They're a bit suprising as the bookmark does get activated, 131s -but the branch get checked out. Although this does seem a bit odd, so 131s -does the scenario. 131s - 131s - $ rm -r hgrepo 131s - $ hg clone -r branch1 repo.git hgrepo 131s - importing 2 git commits 131s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 131s - updating to branch branch1 131s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s - $ cd hgrepo 131s - $ hg bookmarks 131s - * branch1_bookmark 1:8211cade99e4 131s - $ hg log --graph 131s - o changeset: 1:8211cade99e4 131s - | bookmark: branch1_bookmark 131s - | tag: default/branch1 131s - | tag: tip 131s - | user: test 131s - | date: Mon Jan 01 00:00:12 2007 +0000 131s - | summary: append f1 131s - | 131s - @ changeset: 0:40a840c1f8ae 131s - branch: branch1 131s - user: test 131s - date: Mon Jan 01 00:00:10 2007 +0000 131s - summary: add f1 131s - 131s - 131s - $ cd .. 131s - 131s -Now try pulling a diverged bookmark: 131s - 131s - $ rm -r hgrepo 131s -#if with-path 131s - $ hg clone -U repo.git hgrepo 131s - importing 5 git commits 131s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 131s -#else 131s - $ hg init hgrepo 131s - $ hg -R hgrepo pull repo.git 131s - pulling from repo.git 131s - importing 5 git commits 131s - adding bookmark branch1_bookmark 131s - adding bookmark branch2_bookmark 131s - adding bookmark branch3_bookmark 131s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 131s - (run 'hg heads' to see heads, 'hg merge' to merge) 131s -#endif 131s - $ cd gitrepo 131s - $ git checkout -q branch1 131s - $ fn_git_rebase branch3 131s - $ git push -f 131s - To $TESTTMP/repo.git 131s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 131s - $ cd ../hgrepo 131s - $ hg pull ../repo.git 131s - pulling from ../repo.git 131s - importing 1 git commits 131s - not updating diverged bookmark branch1_bookmark 131s - new changesets 895d0307f8b7 (1 drafts) 131s - (run 'hg update' to get a working copy) 131s - $ hg log --graph 131s - o changeset: 5:895d0307f8b7 131s - | tag: default/branch1 (with-path !) 131s - | tag: tip 131s - | user: test 131s - | date: Mon Jan 01 00:00:12 2007 +0000 131s - | summary: append f1 131s - | 131s - o changeset: 4:faf44fc3a4e8 131s - | bookmark: branch3_bookmark 131s - | tag: default/branch3 (with-path !) 131s - | user: test 131s - | date: Mon Jan 01 00:00:14 2007 +0000 131s - | summary: append f3 131s - | 131s - o changeset: 3:ae8eb55f7090 131s - | bookmark: branch2_bookmark 131s - | tag: default/branch2 (with-path !) 131s - | user: test 131s - | date: Mon Jan 01 00:00:13 2007 +0000 131s - | summary: append f2 131s - | 131s - o changeset: 2:600de9b6d498 131s - | branch: branch2 131s - | parent: 0:40a840c1f8ae 131s - | user: test 131s - | date: Mon Jan 01 00:00:11 2007 +0000 131s - | summary: add f2 131s - | 131s - | o changeset: 1:8211cade99e4 131s - |/ bookmark: branch1_bookmark 131s - | user: test 131s - | date: Mon Jan 01 00:00:12 2007 +0000 131s - | summary: append f1 131s - | 131s - o changeset: 0:40a840c1f8ae 131s - branch: branch1 131s - user: test 131s - date: Mon Jan 01 00:00:10 2007 +0000 131s - summary: add f1 131s - 131s 131s ERROR: test-branch-bookmark-suffix.t#with-path output changed 131s ! 131s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-branch-bookmark-suffix.t 131s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-branch-bookmark-suffix.t#without-path.err 131s @@ -9,287 +9,10 @@ 131s $ git init -q --bare repo.git 131s 131s $ hg clone repo.git hgrepo 131s - updating to branch default 131s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository repo.git not found 131s + [255] 131s $ cd hgrepo 131s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 131s #if without-path 131s $ rm .hg/hgrc 131s -#endif 131s - $ hg branch -q branch1 131s - $ hg bookmark branch1_bookmark 131s - $ echo f1 > f1 131s - $ hg add f1 131s - $ fn_hg_commit -m "add f1" 131s - $ hg branch -q branch2 131s - $ hg bookmark branch2_bookmark 131s - $ echo f2 > f2 131s - $ hg add f2 131s - $ fn_hg_commit -m "add f2" 131s - $ hg log --graph 131s - @ changeset: 1:600de9b6d498 131s - | branch: branch2 131s - | bookmark: branch2_bookmark 131s - | tag: tip 131s - | user: test 131s - | date: Mon Jan 01 00:00:11 2007 +0000 131s - | summary: add f2 131s - | 131s - o changeset: 0:40a840c1f8ae 131s - branch: branch1 131s - bookmark: branch1_bookmark 131s - user: test 131s - date: Mon Jan 01 00:00:10 2007 +0000 131s - summary: add f1 131s - 131s - 131s - $ hg push -B asdasd ../repo.git 131s - pushing to ../repo.git 131s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 131s - [255] 131s - 131s - $ hg push ../repo.git 131s - pushing to ../repo.git 131s - searching for changes 131s - adding objects 131s - remote: found 0 deltas to reuse 131s - added 2 commits with 2 trees and 2 blobs 131s - adding reference refs/heads/branch1 131s - adding reference refs/heads/branch2 131s - 131s - $ cd .. 131s - 131s - $ cd repo.git 131s - $ git symbolic-ref HEAD refs/heads/branch1 131s - $ git branch 131s - * branch1 131s - branch2 131s - $ cd .. 131s - 131s - $ git clone repo.git gitrepo 131s - Cloning into 'gitrepo'... 131s - done. 131s - $ cd gitrepo 131s - $ git checkout -q branch1 131s - $ echo g1 >> f1 131s - $ git add f1 131s - $ fn_git_commit -m "append f1" 131s - $ git checkout -q branch2 131s - $ echo g2 >> f2 131s - $ git add f2 131s - $ fn_git_commit -m "append f2" 131s - $ git checkout -b branch3 131s - Switched to a new branch 'branch3' 131s - $ echo g3 >> f3 131s - $ git add f3 131s - $ fn_git_commit -m "append f3" 131s - $ git push origin branch1 branch2 branch3 131s - To $TESTTMP/repo.git 131s - bbfe79a..d8aef79 branch1 -> branch1 131s - 288e92b..f8f8de5 branch2 -> branch2 131s - * [new branch] branch3 -> branch3 131s -make sure the commit doesn't have an HG:rename-source annotation 131s - $ git cat-file commit d8aef79 131s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 131s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 131s - author test 1167609612 +0000 131s - committer test 1167609612 +0000 131s - 131s - append f1 131s - $ cd .. 131s - 131s - $ cd hgrepo 131s - $ hg paths 131s - default = $TESTTMP/repo.git (with-path !) 131s - $ hg pull ../repo.git 131s - pulling from ../repo.git 131s - importing 3 git commits 131s - updating bookmark branch1_bookmark 131s - updating bookmark branch2_bookmark 131s - adding bookmark branch3_bookmark 131s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 131s - (run 'hg heads' to see heads) 131s - $ hg log --graph 131s - o changeset: 4:faf44fc3a4e8 131s - | bookmark: branch3_bookmark 131s - | tag: default/branch3 (with-path !) 131s - | tag: tip 131s - | user: test 131s - | date: Mon Jan 01 00:00:14 2007 +0000 131s - | summary: append f3 131s - | 131s - o changeset: 3:ae8eb55f7090 131s - | bookmark: branch2_bookmark 131s - | tag: default/branch2 (with-path !) 131s - | parent: 1:600de9b6d498 131s - | user: test 131s - | date: Mon Jan 01 00:00:13 2007 +0000 131s - | summary: append f2 131s - | 131s - | o changeset: 2:8211cade99e4 131s - | | bookmark: branch1_bookmark 131s - | | tag: default/branch1 (with-path !) 131s - | | parent: 0:40a840c1f8ae 131s - | | user: test 131s - | | date: Mon Jan 01 00:00:12 2007 +0000 131s - | | summary: append f1 131s - | | 131s - @ | changeset: 1:600de9b6d498 131s - |/ branch: branch2 131s - | user: test 131s - | date: Mon Jan 01 00:00:11 2007 +0000 131s - | summary: add f2 131s - | 131s - o changeset: 0:40a840c1f8ae 131s - branch: branch1 131s - user: test 131s - date: Mon Jan 01 00:00:10 2007 +0000 131s - summary: add f1 131s - 131s - $ cd .. 131s - 131s -Try cloning a bookmark, and make sure it gets checked out: 131s - 131s - $ rm -r hgrepo 131s - $ hg clone -r branch3 repo.git hgrepo 131s - importing 4 git commits 131s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 131s - updating to bookmark branch3_bookmark 131s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s - $ cd hgrepo 131s - $ hg bookmarks 131s - branch2_bookmark 2:ae8eb55f7090 131s - * branch3_bookmark 3:faf44fc3a4e8 131s - $ hg log --graph 131s - @ changeset: 3:faf44fc3a4e8 131s - | bookmark: branch3_bookmark 131s - | tag: default/branch3 131s - | tag: tip 131s - | user: test 131s - | date: Mon Jan 01 00:00:14 2007 +0000 131s - | summary: append f3 131s - | 131s - o changeset: 2:ae8eb55f7090 131s - | bookmark: branch2_bookmark 131s - | tag: default/branch2 131s - | user: test 131s - | date: Mon Jan 01 00:00:13 2007 +0000 131s - | summary: append f2 131s - | 131s - o changeset: 1:600de9b6d498 131s - | branch: branch2 131s - | user: test 131s - | date: Mon Jan 01 00:00:11 2007 +0000 131s - | summary: add f2 131s - | 131s - o changeset: 0:40a840c1f8ae 131s - branch: branch1 131s - user: test 131s - date: Mon Jan 01 00:00:10 2007 +0000 131s - summary: add f1 131s - 131s - $ cd .. 131s - 131s -Try cloning something that's both a bookmark and a branch, and see the 131s -results. They're a bit suprising as the bookmark does get activated, 131s -but the branch get checked out. Although this does seem a bit odd, so 131s -does the scenario. 131s - 131s - $ rm -r hgrepo 131s - $ hg clone -r branch1 repo.git hgrepo 131s - importing 2 git commits 131s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 131s - updating to branch branch1 131s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s - $ cd hgrepo 131s - $ hg bookmarks 131s - * branch1_bookmark 1:8211cade99e4 131s - $ hg log --graph 131s - o changeset: 1:8211cade99e4 131s - | bookmark: branch1_bookmark 131s - | tag: default/branch1 131s - | tag: tip 131s - | user: test 131s - | date: Mon Jan 01 00:00:12 2007 +0000 131s - | summary: append f1 131s - | 131s - @ changeset: 0:40a840c1f8ae 131s - branch: branch1 131s - user: test 131s - date: Mon Jan 01 00:00:10 2007 +0000 131s - summary: add f1 131s - 131s - 131s - $ cd .. 131s - 131s -Now try pulling a diverged bookmark: 131s - 131s - $ rm -r hgrepo 131s -#if with-path 131s - $ hg clone -U repo.git hgrepo 131s - importing 5 git commits 131s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 131s -#else 131s - $ hg init hgrepo 131s - $ hg -R hgrepo pull repo.git 131s - pulling from repo.git 131s - importing 5 git commits 131s - adding bookmark branch1_bookmark 131s - adding bookmark branch2_bookmark 131s - adding bookmark branch3_bookmark 131s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 131s - (run 'hg heads' to see heads, 'hg merge' to merge) 131s -#endif 131s - $ cd gitrepo 131s - $ git checkout -q branch1 131s - $ fn_git_rebase branch3 131s - $ git push -f 131s - To $TESTTMP/repo.git 131s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 131s - $ cd ../hgrepo 131s - $ hg pull ../repo.git 131s - pulling from ../repo.git 131s - importing 1 git commits 131s - not updating diverged bookmark branch1_bookmark 131s - new changesets 895d0307f8b7 (1 drafts) 131s - (run 'hg update' to get a working copy) 131s - $ hg log --graph 131s - o changeset: 5:895d0307f8b7 131s - | tag: default/branch1 (with-path !) 131s - | tag: tip 131s - | user: test 131s - | date: Mon Jan 01 00:00:12 2007 +0000 131s - | summary: append f1 131s - | 131s - o changeset: 4:faf44fc3a4e8 131s - | bookmark: branch3_bookmark 131s - | tag: default/branch3 (with-path !) 131s - | user: test 131s - | date: Mon Jan 01 00:00:14 2007 +0000 131s - | summary: append f3 131s - | 131s - o changeset: 3:ae8eb55f7090 131s - | bookmark: branch2_bookmark 131s - | tag: default/branch2 (with-path !) 131s - | user: test 131s - | date: Mon Jan 01 00:00:13 2007 +0000 131s - | summary: append f2 131s - | 131s - o changeset: 2:600de9b6d498 131s - | branch: branch2 131s - | parent: 0:40a840c1f8ae 131s - | user: test 131s - | date: Mon Jan 01 00:00:11 2007 +0000 131s - | summary: add f2 131s - | 131s - | o changeset: 1:8211cade99e4 131s - |/ bookmark: branch1_bookmark 131s - | user: test 131s - | date: Mon Jan 01 00:00:12 2007 +0000 131s - | summary: append f1 131s - | 131s - o changeset: 0:40a840c1f8ae 131s - branch: branch1 131s - user: test 131s - date: Mon Jan 01 00:00:10 2007 +0000 131s - summary: add f1 131s - 131s 131s ERROR: test-branch-bookmark-suffix.t#without-path output changed 132s ! 132s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-bundle.t 132s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-bundle.t.err 132s @@ -36,247 +36,12 @@ 132s Clone it! 132s 132s $ hg clone gitrepo hgrepo 132s - importing 3 git commits 132s - new changesets ff7a2f2d8d70:ca33a262eb46 (3 drafts) 132s - updating to bookmark master 132s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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: 45: cd: can't cd to hgrepo 132s 132s Create a bundle with our metadata, and inspect it: 132s 132s $ hg bundle --all ../bundle-w-git.hg 132s - 3 changesets found 132s - $ hg debugbundle --all ../bundle-w-git.hg | grep hg-git 132s - exp-hg-git-map -- {} (mandatory: False) 132s - exp-hg-git-tags -- {} (mandatory: False) 132s - $ hg debugbundle --all ../bundle-w-git.hg > bundle-w-git.out 132s - 132s -Create a bundle without our metadata, and inspect it: 132s - 132s - $ hg bundle --all ../bundle-wo-git.hg --config experimental.hg-git-bundle=no 132s - 3 changesets found 132s - $ hg debugbundle --all ../bundle-wo-git.hg | grep hg-git 132s - [1] 132s - 132s -Verify that those are different: 132s - 132s - $ hg debugbundle --all ../bundle-wo-git.hg > bundle-wo-git.out 132s - $ cmp -s bundle-w-git.out bundle-wo-git.out 132s - [1] 132s - 132s -Now create a bundle without hg-git enabled at all, which should be 132s -exactly similar to what you get when you disable metadata embedding; 132s -this verifies we don't accidentally pollute bundles. 132s - 132s - $ hg bundle --all --config extensions.hggit=! ../bundle-wo-hggit.hg 132s - 3 changesets found 132s - $ hg debugbundle --all ../bundle-wo-hggit.hg > bundle-wo-hggit.out 132s - $ cmp -s bundle-wo-git.hg bundle-wo-hggit.hg 132s - [2] 132s - $ cmp -s bundle-wo-git.out bundle-wo-hggit.out 132s - $ cd .. 132s - $ rm -r hgrepo 132s - 132s -Does unbundling transfer state? 132s - 132s - $ hg init hgrepo 132s - $ hg -R hgrepo unbundle bundle-w-git.hg 132s - adding changesets 132s - adding manifests 132s - adding file changes 132s - added 3 changesets with 3 changes to 3 files 132s - new changesets * (glob) 132s - (run 'hg update' to get a working copy) 132s - $ hg -R hgrepo log -T git 132s - 2:ca33a262eb46 | d338971a96e2 | tip | 132s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 132s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 132s - $ hg -R hgrepo pull gitrepo 132s - pulling from gitrepo 132s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 132s - no changes found 132s - adding bookmark master 132s - $ rm -r hgrepo 132s - 132s -Can we unbundle something without git state? 132s - 132s - $ hg init hgrepo 132s - $ hg -R hgrepo unbundle bundle-wo-git.hg 132s - adding changesets 132s - adding manifests 132s - adding file changes 132s - added 3 changesets with 3 changes to 3 files 132s - new changesets * (glob) 132s - (run 'hg update' to get a working copy) 132s - $ hg -R hgrepo log -T git 132s - 2:ca33a262eb46 | | tip | 132s - 1:7fe02317c63d | | | 132s - 0:ff7a2f2d8d70 | | | 132s - $ hg -R hgrepo pull gitrepo 132s - pulling from gitrepo 132s - importing 3 git commits 132s - adding bookmark master 132s - (run 'hg update' to get a working copy) 132s - $ rm -r hgrepo 132s - 132s -Regular mercurial shouldn't choke on our bundle 132s - 132s - $ hg init hgrepo 132s - $ cat >> hgrepo/.hg/hgrc < [extensions] 132s - > hggit = ! 132s - > EOF 132s - $ hg -R hgrepo unbundle bundle-wo-git.hg 132s - adding changesets 132s - adding manifests 132s - adding file changes 132s - added 3 changesets with 3 changes to 3 files 132s - new changesets * (glob) 132s - (run 'hg update' to get a working copy) 132s - $ hg -R hgrepo log -T git 132s - 2:ca33a262eb46 | | tip | 132s - 1:7fe02317c63d | | | 132s - 0:ff7a2f2d8d70 | | | 132s - $ hg -R hgrepo pull gitrepo 132s - pulling from gitrepo 132s - abort: repository gitrepo not found!? (re) 132s - [255] 132s - $ rm -r hgrepo 132s - 132s - 132s -What happens if we unbundle twice? 132s - 132s - $ hg init hgrepo 132s - $ hg -R hgrepo unbundle bundle-w-git.hg 132s - adding changesets 132s - adding manifests 132s - adding file changes 132s - added 3 changesets with 3 changes to 3 files 132s - new changesets * (glob) 132s - (run 'hg update' to get a working copy) 132s - $ hg -R hgrepo unbundle bundle-w-git.hg 132s - adding changesets 132s - adding manifests 132s - adding file changes 132s - added 0 changesets with 0 changes to 3 files 132s - (run 'hg update' to get a working copy) 132s - $ hg -R hgrepo log -T git 132s - 2:ca33a262eb46 | d338971a96e2 | tip | 132s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 132s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 132s - $ hg -R hgrepo pull gitrepo 132s - pulling from gitrepo 132s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 132s - no changes found 132s - adding bookmark master 132s - $ rm -r hgrepo 132s - 132s -Alas, cloning a bundle doesn't work yet: 132s - 132s -(Mercurial is apparently quite dumb here, so we won't try to fix this 132s -for now, but this test mostly exists so that we notice if ever starts 132s -working, or breaks entirely.) 132s - 132s - $ hg clone bundle-w-git.hg hgrepo 132s - requesting all changes 132s - adding changesets 132s - adding manifests 132s - adding file changes 132s - added 3 changesets with 3 changes to 3 files 132s - new changesets * (glob) 132s - updating to branch default 132s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s - $ hg -R hgrepo log -T git 132s - 2:ca33a262eb46 | | tip | 132s - 1:7fe02317c63d | | | 132s - 0:ff7a2f2d8d70 | | | 132s - $ rm -r hgrepo 132s - 132s -Now, lets try to be a bit evil. How does pulling partial state work? 132s - 132s -First, more git happenings: 132s - 132s - $ cd gitrepo 132s - $ git checkout -b otherbranch thetag 132s - Switched to a new branch 'otherbranch' 132s - $ echo 42 > baz 132s - $ git add baz 132s - $ fn_git_commit -m 3 132s - $ cd .. 132s - 132s -Pull, 'em, and create a partial bundle: 132s - 132s - $ hg clone gitrepo hgrepo 132s - importing 4 git commits 132s - new changesets ff7a2f2d8d70:d87bf3ef6a53 (4 drafts) 132s - updating to bookmark otherbranch 132s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s - $ hg -R hgrepo bundle --base 'p1(tip)' -r tip bundle-w-git-2.hg 132s - 1 changesets found 132s - $ rm -r hgrepo 132s - 132s -Now, load only that bundle into a repository without any git state 132s - 132s - $ hg clone -r 1 bundle-w-git.hg hgrepo --config extensions.hggit=! 132s - adding changesets 132s - adding manifests 132s - adding file changes 132s - added 2 changesets with 2 changes to 2 files 132s - new changesets * (glob) 132s - updating to branch default 132s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s - $ cd hgrepo 132s - $ hg unbundle ../bundle-w-git-2.hg 132s - adding changesets 132s - adding manifests 132s - adding file changes 132s - added 1 changesets with 1 changes to 1 files (+1 heads) 132s - new changesets * (glob) 132s - (run 'hg heads' to see heads, 'hg merge' to merge) 132s - $ hg pull ../gitrepo 132s - pulling from ../gitrepo 132s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 132s - importing 3 git commits 132s - adding bookmark master 132s - adding bookmark otherbranch 132s - new changesets ca33a262eb46 (1 drafts) 132s - (run 'hg update' to get a working copy) 132s - $ cd .. 132s - $ rm -r hgrepo 132s - 132s -Now, try pushing with only the metadata: 132s - 132s - $ hg init hgrepo 132s - $ cd hgrepo 132s - $ hg unbundle -u ../bundle-w-git.hg 132s - adding changesets 132s - adding manifests 132s - adding file changes 132s - added 3 changesets with 3 changes to 3 files 132s - new changesets * (glob) 132s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s - $ echo kaflaflibob > bajizmo 132s - $ fn_hg_commit -A -m 4 132s - $ hg book -r tip master 132s - $ hg push ../gitrepo 132s - pushing to ../gitrepo 132s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 132s - abort: cannot push git commit d338971a96e2 as it is not present locally 132s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 132s - [255] 132s - 132s -Try to repopulate the git state from a bundle 132s - 132s - $ hg debug-remove-hggit-state 132s - clearing out the git cache data 132s - $ hg log -qr 'fromgit()' 132s - $ hg unbundle -u ../bundle-w-git.hg 132s - adding changesets 132s - adding manifests 132s - adding file changes 132s - added 0 changesets with 0 changes to 3 files 132s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s - $ hg log -qr 'fromgit()' 132s - 0:ff7a2f2d8d70 132s - 1:7fe02317c63d 132s - 2:ca33a262eb46 132s 132s ERROR: test-bundle.t output changed 132s ! 132s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-file-removal.t 132s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-file-removal.t.err 132s @@ -98,192 +98,9 @@ 132s $ git init -q --bare repo.git 132s 132s $ hg clone gitrepo hgrepo 132s - importing 9 git commits 132s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 132s - updating to bookmark master 132s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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: 72: cd: can't cd to hgrepo 132s $ hg log --graph 132s - @ changeset: 8:0995b8a0a943 132s - | bookmark: master 132s - | tag: default/master 132s - | tag: tip 132s - | user: test 132s - | date: Mon Jan 01 00:00:18 2007 +0000 132s - | summary: remove betalink 132s - | 132s - o changeset: 7:a316d3a96c89 132s - | user: test 132s - | date: Mon Jan 01 00:00:17 2007 +0000 132s - | summary: replace file with symlink 132s - | 132s - o changeset: 6:1804acb71f3e 132s - | user: test 132s - | date: Mon Jan 01 00:00:16 2007 +0000 132s - | summary: replace symlink with file 132s - | 132s - o changeset: 5:e19c85becc87 132s - | user: test 132s - | date: Mon Jan 01 00:00:15 2007 +0000 132s - | summary: add symlink to beta 132s - | 132s - o changeset: 4:0d3086c3f8c3 132s - | user: test 132s - | date: Mon Jan 01 00:00:14 2007 +0000 132s - | summary: remove foo/bar 132s - | 132s - o changeset: 3:b2406125ef5c 132s - | user: test 132s - | date: Mon Jan 01 00:00:13 2007 +0000 132s - | summary: remove alpha 132s - | 132s - o changeset: 2:8b3b2f4b4158 132s - | user: test 132s - | date: Mon Jan 01 00:00:12 2007 +0000 132s - | summary: add foo 132s - | 132s - o changeset: 1:7fe02317c63d 132s - | user: test 132s - | date: Mon Jan 01 00:00:11 2007 +0000 132s - | summary: add beta 132s - | 132s - o changeset: 0:ff7a2f2d8d70 132s - user: test 132s - date: Mon Jan 01 00:00:10 2007 +0000 132s - summary: add alpha 132s - 132s - 132s -make sure alpha is not in this manifest 132s - $ hg manifest -r 3 132s - beta 132s - foo/bar 132s - 132s -make sure that only beta is in the manifest 132s - $ hg manifest 132s - beta 132s - 132s - $ hg debug-remove-hggit-state 132s - clearing out the git cache data 132s - $ ls .hg | grep git 132s - [1] 132s - $ hg push ../repo.git 132s - pushing to ../repo.git 132s - searching for changes 132s - adding objects 132s - remote: found 0 deltas to reuse 132s - added 9 commits with 8 trees and 5 blobs 132s - adding reference refs/heads/master 132s - 132s - $ cd .. 132s - $ git --git-dir=repo.git log --pretty=medium 132s - commit 5ee11eeae239d6a99df5a99901ec00ffafbcc46b 132s - Author: test 132s - Date: Mon Jan 1 00:00:18 2007 +0000 132s - 132s - remove betalink 132s - 132s - commit 2c7b324faeccb1acf89c35b7ad38e7956f5705fa 132s - Author: test 132s - Date: Mon Jan 1 00:00:17 2007 +0000 132s - 132s - replace file with symlink 132s - 132s - commit ff0478d2ecc2571d01eb6d406ac29e4e63e5d3d5 132s - Author: test 132s - Date: Mon Jan 1 00:00:16 2007 +0000 132s - 132s - replace symlink with file 132s - 132s - commit 5492e6e410e42df527956be945286cd1ae45acb8 132s - Author: test 132s - Date: Mon Jan 1 00:00:15 2007 +0000 132s - 132s - add symlink to beta 132s - 132s - commit b991de8952c482a7cd51162674ffff8474862218 132s - Author: test 132s - Date: Mon Jan 1 00:00:14 2007 +0000 132s - 132s - remove foo/bar 132s - 132s - commit b0edaf0adac19392cf2867498b983bc5192b41dd 132s - Author: test 132s - Date: Mon Jan 1 00:00:13 2007 +0000 132s - 132s - remove alpha 132s - 132s - commit f2d0d5bfa905e12dee728b509b96cf265bb6ee43 132s - Author: test 132s - Date: Mon Jan 1 00:00:12 2007 +0000 132s - 132s - add foo 132s - 132s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 132s - Author: test 132s - Date: Mon Jan 1 00:00:11 2007 +0000 132s - 132s - add beta 132s - 132s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 132s - Author: test 132s - Date: Mon Jan 1 00:00:10 2007 +0000 132s - 132s - add alpha 132s - 132s -test with rename detection enabled 132s - $ hg --config git.similarity=100 clone gitrepo hgreporenames 132s - importing 9 git commits 132s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 132s - updating to bookmark master 132s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s - 132s - $ cd hgreporenames 132s - $ hg log --graph 132s - @ changeset: 8:0995b8a0a943 132s - | bookmark: master 132s - | tag: default/master 132s - | tag: tip 132s - | user: test 132s - | date: Mon Jan 01 00:00:18 2007 +0000 132s - | summary: remove betalink 132s - | 132s - o changeset: 7:a316d3a96c89 132s - | user: test 132s - | date: Mon Jan 01 00:00:17 2007 +0000 132s - | summary: replace file with symlink 132s - | 132s - o changeset: 6:1804acb71f3e 132s - | user: test 132s - | date: Mon Jan 01 00:00:16 2007 +0000 132s - | summary: replace symlink with file 132s - | 132s - o changeset: 5:e19c85becc87 132s - | user: test 132s - | date: Mon Jan 01 00:00:15 2007 +0000 132s - | summary: add symlink to beta 132s - | 132s - o changeset: 4:0d3086c3f8c3 132s - | user: test 132s - | date: Mon Jan 01 00:00:14 2007 +0000 132s - | summary: remove foo/bar 132s - | 132s - o changeset: 3:b2406125ef5c 132s - | user: test 132s - | date: Mon Jan 01 00:00:13 2007 +0000 132s - | summary: remove alpha 132s - | 132s - o changeset: 2:8b3b2f4b4158 132s - | user: test 132s - | date: Mon Jan 01 00:00:12 2007 +0000 132s - | summary: add foo 132s - | 132s - o changeset: 1:7fe02317c63d 132s - | user: test 132s - | date: Mon Jan 01 00:00:11 2007 +0000 132s - | summary: add beta 132s - | 132s - o changeset: 0:ff7a2f2d8d70 132s - user: test 132s - date: Mon Jan 01 00:00:10 2007 +0000 132s - summary: add alpha 132s - 132s 132s ERROR: test-file-removal.t output changed 132s ! 132s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-hg-author.t 132s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-hg-author.t.err 132s @@ -16,256 +16,10 @@ 132s 132s $ cd .. 132s $ hg clone repo.git hgrepo 132s - importing 1 git commits 132s - new changesets ff7a2f2d8d70 (1 drafts) 132s - updating to bookmark master 132s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s + abort: repository repo.git not found 132s + [255] 132s 132s $ cd hgrepo 132s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 132s $ hg book master 132s - $ echo beta > beta 132s - $ hg add beta 132s - $ fn_hg_commit -u "test" -m 'add beta' 132s - $ hg push 132s - pushing to $TESTTMP/repo.git 132s - searching for changes 132s - adding objects 132s - remote: found 0 deltas to reuse 132s - added 1 commits with 1 trees and 1 blobs 132s - updating reference refs/heads/master 132s - 132s - $ echo gamma >> beta 132s - $ fn_hg_commit -u "test (comment)" -m 'modify beta' 132s - $ hg push 132s - pushing to $TESTTMP/repo.git 132s - searching for changes 132s - adding objects 132s - remote: found 0 deltas to reuse 132s - added 1 commits with 1 trees and 1 blobs 132s - updating reference refs/heads/master 132s - 132s - $ echo gamma > gamma 132s - $ hg add gamma 132s - $ fn_hg_commit -u "" -m 'add gamma' 132s - $ hg push 132s - pushing to $TESTTMP/repo.git 132s - searching for changes 132s - adding objects 132s - remote: found 0 deltas to reuse 132s - added 1 commits with 1 trees and 1 blobs 132s - updating reference refs/heads/master 132s - 132s - $ echo delta > delta 132s - $ hg add delta 132s - $ fn_hg_commit -u "name" -m 'add delta' 132s - $ hg push 132s - pushing to $TESTTMP/repo.git 132s - searching for changes 132s - adding objects 132s - remote: found 0 deltas to reuse 132s - added 1 commits with 1 trees and 1 blobs 132s - updating reference refs/heads/master 132s - 132s - $ echo epsilon > epsilon 132s - $ hg add epsilon 132s - $ fn_hg_commit -u "name zeta 132s - $ hg add zeta 132s - $ fn_hg_commit -u " test " -m 'add zeta' 132s - $ hg push 132s - pushing to $TESTTMP/repo.git 132s - searching for changes 132s - adding objects 132s - remote: found 0 deltas to reuse 132s - added 1 commits with 1 trees and 1 blobs 132s - updating reference refs/heads/master 132s - 132s - $ echo eta > eta 132s - $ hg add eta 132s - $ fn_hg_commit -u "test < test@example.com >" -m 'add eta' 132s - $ hg push 132s - pushing to $TESTTMP/repo.git 132s - searching for changes 132s - adding objects 132s - remote: found 0 deltas to reuse 132s - added 1 commits with 1 trees and 1 blobs 132s - updating reference refs/heads/master 132s - 132s - $ echo theta > theta 132s - $ hg add theta 132s - $ fn_hg_commit -u "test >test@example.com>" -m 'add theta' 132s - $ hg push 132s - pushing to $TESTTMP/repo.git 132s - searching for changes 132s - adding objects 132s - remote: found 0 deltas to reuse 132s - added 1 commits with 1 trees and 1 blobs 132s - updating reference refs/heads/master 132s - 132s - $ hg log --graph 132s - @ changeset: 8:c5d1976ab12c 132s - | bookmark: master 132s - | tag: default/master 132s - | tag: tip 132s - | user: test >test@example.com> 132s - | date: Mon Jan 01 00:00:18 2007 +0000 132s - | summary: add theta 132s - | 132s - o changeset: 7:0e2fb4d21667 132s - | user: test < test@example.com > 132s - | date: Mon Jan 01 00:00:17 2007 +0000 132s - | summary: add eta 132s - | 132s - o changeset: 6:faa3aae96199 132s - | user: test 132s - | date: Mon Jan 01 00:00:16 2007 +0000 132s - | summary: add zeta 132s - | 132s - o changeset: 5:2cf6ad5a1afc 132s - | user: name 132s - | date: Mon Jan 01 00:00:14 2007 +0000 132s - | summary: add delta 132s - | 132s - o changeset: 3:6b854d65d0d6 132s - | user: 132s - | date: Mon Jan 01 00:00:13 2007 +0000 132s - | summary: add gamma 132s - | 132s - o changeset: 2:46303c652e79 132s - | user: test (comment) 132s - | date: Mon Jan 01 00:00:12 2007 +0000 132s - | summary: modify beta 132s - | 132s - o changeset: 1:47580592d3d6 132s - | user: test 132s - | date: Mon Jan 01 00:00:11 2007 +0000 132s - | summary: add beta 132s - | 132s - o changeset: 0:ff7a2f2d8d70 132s - user: test 132s - date: Mon Jan 01 00:00:10 2007 +0000 132s - summary: add alpha 132s - 132s - 132s - $ cd .. 132s - $ hg clone repo.git hgrepo2 132s - importing 9 git commits 132s - new changesets ff7a2f2d8d70:1fbf3aa91221 (9 drafts) 132s - updating to bookmark master 132s - 8 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s - $ hg -R hgrepo2 log --graph 132s - @ changeset: 8:1fbf3aa91221 132s - | bookmark: master 132s - | tag: default/master 132s - | tag: tip 132s - | user: test ?test@example.com 132s - | date: Mon Jan 01 00:00:18 2007 +0000 132s - | summary: add theta 132s - | 132s - o changeset: 7:20310508f06d 132s - | user: test 132s - | date: Mon Jan 01 00:00:17 2007 +0000 132s - | summary: add eta 132s - | 132s - o changeset: 6:e3d81af8a8c1 132s - | user: test 132s - | date: Mon Jan 01 00:00:16 2007 +0000 132s - | summary: add zeta 132s - | 132s - o changeset: 5:78f609fd208f 132s - | user: name 132s - | date: Mon Jan 01 00:00:15 2007 +0000 132s - | summary: add epsilon 132s - | 132s - o changeset: 4:42fa61d57718 132s - | user: name 132s - | date: Mon Jan 01 00:00:14 2007 +0000 132s - | summary: add delta 132s - | 132s - o changeset: 3:6b854d65d0d6 132s - | user: 132s - | date: Mon Jan 01 00:00:13 2007 +0000 132s - | summary: add gamma 132s - | 132s - o changeset: 2:46303c652e79 132s - | user: test (comment) 132s - | date: Mon Jan 01 00:00:12 2007 +0000 132s - | summary: modify beta 132s - | 132s - o changeset: 1:47580592d3d6 132s - | user: test 132s - | date: Mon Jan 01 00:00:11 2007 +0000 132s - | summary: add beta 132s - | 132s - o changeset: 0:ff7a2f2d8d70 132s - user: test 132s - date: Mon Jan 01 00:00:10 2007 +0000 132s - summary: add alpha 132s - 132s - $ git --git-dir=repo.git log --pretty=medium master 132s - commit 2fe60ba69727981e6ede78be70354c3a9e30e21d 132s - Author: test ?test@example.com 132s - Date: Mon Jan 1 00:00:18 2007 +0000 132s - 132s - add theta 132s - 132s - commit 9f2f7cafdbf2e467928db98de8275141001d3081 132s - Author: test 132s - Date: Mon Jan 1 00:00:17 2007 +0000 132s - 132s - add eta 132s - 132s - commit 172a6f8d8064d73dff7013e395a9fe3cfc3ff807 132s - Author: test 132s - Date: Mon Jan 1 00:00:16 2007 +0000 132s - 132s - add zeta 132s - 132s - commit 71badb8e343a7da391a9b5d98909fbd2ca7d78f2 132s - Author: name 132s - Date: Mon Jan 1 00:00:15 2007 +0000 132s - 132s - add epsilon 132s - 132s - commit 9a9ae7b7f310d4a1a3e732a747ca26f06934f8d8 132s - Author: name 132s - Date: Mon Jan 1 00:00:14 2007 +0000 132s - 132s - add delta 132s - 132s - commit e4149a32e81e380193f59aa8773349201b8ed7f7 132s - Author: 132s - Date: Mon Jan 1 00:00:13 2007 +0000 132s - 132s - add gamma 132s - 132s - commit fae95aef5889a80103c2fbd5d14ff6eb8c9daf93 132s - Author: test ext:(%20%28comment%29) 132s - Date: Mon Jan 1 00:00:12 2007 +0000 132s - 132s - modify beta 132s - 132s - commit 0f378ab6c2c6b5514bd873d3faf8ac4b8095b001 132s - Author: test 132s - Date: Mon Jan 1 00:00:11 2007 +0000 132s - 132s - add beta 132s - 132s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 132s - Author: test 132s - Date: Mon Jan 1 00:00:10 2007 +0000 132s - 132s - add alpha 132s 132s ERROR: test-hg-author.t output changed 132s ! 132s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-subrepos.t 132s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-subrepos.t.err 132s @@ -34,165 +34,8 @@ 132s $ cd .. 132s Ensure gitlinks are transformed to .hgsubstate on hg pull from git 132s $ hg clone -u tip repo.git hgrepo 2>&1 | grep -E -v '^(Cloning into|done)' 132s - importing 3 git commits 132s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 132s - updating to branch default 132s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 132s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 132s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s + abort: repository repo.git not found 132s $ cd hgrepo 132s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 132s $ hg bookmarks -f -r default master 132s -1. Ensure gitlinks are transformed to .hgsubstate on hg <- git pull 132s -.hgsub shall list two [git] subrepos 132s - $ cat .hgsub 132s - subrepo1 = [git]../gitsubrepo 132s - xyz/subrepo2 = [git]../gitsubrepo 132s -.hgsubstate shall list two idenitcal revisions 132s - $ cat .hgsubstate 132s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 132s - 56f0304c5250308f14cfbafdc27bd12d40154d17 xyz/subrepo2 132s -hg status shall NOT report .hgsub and .hgsubstate as untracked - either ignored or unmodified 132s - $ hg status --unknown .hgsub .hgsubstate 132s - $ hg status --modified .hgsub .hgsubstate 132s - $ cd .. 132s - 132s -2. Check gitmodules are preserved during hg -> git push 132s - $ cd gitsubrepo 132s - $ echo gamma > gamma 132s - $ git add gamma 132s - $ fn_git_commit -m 'add gamma' 132s - $ cd .. 132s - $ cd hgrepo 132s - $ cd xyz/subrepo2 132s - $ git pull --ff-only | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| */| /' 132s - From $TESTTMP/gitsubrepo 132s - 56f0304..aabf7cd master -> origin/master 132s - Updating 56f0304..aabf7cd 132s - Fast-forward 132s - gamma | 1 + 132s - 1 file changed, 1 insertion(+) 132s - create mode 100644 gamma 132s - $ cd ../.. 132s - $ echo xxx >> alpha 132s - $ fn_hg_commit -m 'Update subrepo2 from hg' | grep -v "committing subrepository" || true 132s - $ hg push 132s - pushing to $TESTTMP/repo.git 132s - searching for changes 132s - adding objects 132s - remote: found 0 deltas to reuse 132s - added 1 commits with 2 trees and 1 blobs 132s - updating reference refs/heads/master 132s - $ cd .. 132s - $ cd gitrepo 132s - $ git pull --ff-only 132s - From $TESTTMP/repo 132s - 89c22d7..275b0a5 master -> origin/master 132s - Fetching submodule xyz/subrepo2 132s - From $TESTTMP/gitsubrepo 132s - 56f0304..aabf7cd master -> origin/master 132s - Updating 89c22d7..275b0a5 132s - Fast-forward 132s - alpha | 1 + 132s - xyz/subrepo2 | 2 +- 132s - 2 files changed, 2 insertions(+), 1 deletion(-) 132s -there shall be two gitlink entries, with values matching that in .hgsubstate 132s - $ git ls-tree -r HEAD^{tree} | grep 'commit' 132s - 160000 commit 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 132s - 160000 commit aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 132s -bring working copy to HEAD state (it's not bare repo) 132s - $ git reset --hard 132s - HEAD is now at 275b0a5 Update subrepo2 from hg 132s - $ cd .. 132s - 132s -3. Check .hgsub and .hgsubstate from git repository are merged, not overwritten 132s - $ hg init hgsub 132s - $ cd hgsub 132s - $ echo delta > delta 132s - $ hg add delta 132s - $ fn_hg_commit -m "add delta" 132s - $ hg tip --template '{node} hgsub\n' > ../gitrepo/.hgsubstate 132s - $ cat > ../gitrepo/.hgsub < hgsub = ../hgsub 132s - > EOF 132s - $ cd ../gitrepo 132s - $ git add .hgsubstate .hgsub 132s - $ fn_git_commit -m "Test3. Prepare .hgsub and .hgsubstate sources" 132s - $ git push 132s - To $TESTTMP/repo.git 132s - 275b0a5..e31d576 master -> master 132s - 132s - $ cd ../hgrepo 132s - $ hg pull 132s - pulling from $TESTTMP/repo.git 132s - importing 1 git commits 132s - updating bookmark master 132s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 132s - (run 'hg update' to get a working copy) 132s - $ hg checkout -C 132s - updating to active bookmark master 132s - cloning subrepo hgsub from $TESTTMP/hgsub 132s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s - $ cd .. 132s -pull shall bring .hgsub entry which was added to the git repo 132s - $ cat hgrepo/.hgsub 132s - hgsub = ../hgsub 132s - subrepo1 = [git]../gitsubrepo 132s - xyz/subrepo2 = [git]../gitsubrepo 132s -.hgsubstate shall list revision of the subrepo added through git repo 132s - $ cat hgrepo/.hgsubstate 132s - 481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub 132s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 132s - aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 132s - 132s -4. Try changing the subrepos from the Mercurial side 132s - 132s - $ cd hgrepo 132s - $ cat >> .hgsub < subrepo2 = [git]../gitsubrepo 132s - > EOF 132s - $ git clone ../gitsubrepo subrepo2 132s - Cloning into 'subrepo2'... 132s - done. 132s - $ fn_hg_commit -m 'some stuff' 132s - $ hg push 132s - pushing to $TESTTMP/repo.git 132s - no changes made to subrepo hgsub since last push to $TESTTMP/hgsub 132s - searching for changes 132s - adding objects 132s - remote: found 0 deltas to reuse 132s - added 1 commits with 1 trees and 1 blobs 132s - updating reference refs/heads/master 132s - $ cd .. 132s - 132s -5. But we actually do something quite weird in this case: If a 132s -.gitmodules file exists in the repository, it always wins! In this 132s -case, we break the bidirectional convention, and modify the repository 132s -data. That's odd, so show it: 132s - 132s - $ hg id hgrepo 132s - 42c46c7eef3a default/master/tip master 132s - $ hg clone -U repo.git hgrepo2 132s - importing 6 git commits 132s - new changesets e532b2bfda10:42c46c7eef3a (6 drafts) 132s - $ hg -R hgrepo2 up :master 132s - Cloning into '$TESTTMP/hgrepo2/subrepo1'... 132s - done. 132s - cloning subrepo hgsub from $TESTTMP/hgsub 132s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 132s - checking out detached HEAD in subrepository "subrepo1" 132s - check out a git branch if you intend to make changes 132s - Cloning into '$TESTTMP/hgrepo2/subrepo2'... 132s - done. 132s - Cloning into '$TESTTMP/hgrepo2/xyz/subrepo2'... 132s - done. 132s - cloning subrepo subrepo2 from $TESTTMP/gitsubrepo 132s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 132s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s - 132s -We retained bidirectionality! 132s - 132s - $ git diff --stat hgrepo/.hgsub hgrepo2/.hgsub 132s - $ hg id hgrepo 132s - 42c46c7eef3a default/master/tip master 132s - $ hg id hgrepo2 132s - 42c46c7eef3a default/master/tip master 132s 132s ERROR: test-subrepos.t output changed 133s ! 133s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-extra.t 133s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-extra.t.err 133s @@ -12,190 +12,9 @@ 133s 133s $ cd .. 133s $ hg clone gitrepo hgrepo 133s - importing 1 git commits 133s - new changesets aa9eb6424386 (1 drafts) 133s - updating to bookmark not-master 133s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 133s + abort: repository gitrepo not found 133s + [255] 133s $ cd hgrepo 133s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 133s $ hg mv a b 133s - $ fn_hg_commit -mb 133s - $ hg up 0 133s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 133s - (leaving bookmark not-master) 133s - $ touch c 133s - $ hg add c 133s - $ fn_hg_commit -mc 133s - 133s -Rebase will add a rebase_source 133s - 133s - $ hg --config extensions.rebase= rebase -s 1 -d 2 133s - rebasing 1:4c7da7adf18b * (glob) 133s - saved backup bundle to $TESTTMP/*.hg (glob) 133s - $ hg up 2 133s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 133s - 133s -Add a commit with multiple extra fields 133s - $ hg bookmark b1 133s - $ touch d 133s - $ hg add d 133s - $ fn_hg_commitextra --field zzzzzzz=datazzz --field aaaaaaa=dataaaa 133s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 133s - @ 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 133s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 133s - | 133s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 133s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 133s - | 133s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 133s - | branch=default 133s - | 133s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 133s - branch=default hg-git-rename-source=git 133s - 133s - 133s - $ hg push -r b1 133s - pushing to $TESTTMP/gitrepo 133s - searching for changes 133s - adding objects 133s - remote: found 0 deltas to reuse 133s - added 3 commits with 3 trees and 0 blobs 133s - adding reference refs/heads/b1 133s - 133s - $ hg bookmark b2 133s - $ hg mv c c2 133s - $ hg mv d d2 133s - $ fn_hg_commitextra --field yyyyyyy=datayyy --field bbbbbbb=databbb 133s - 133s -Test some nutty filenames 133s - $ hg book b3 133s -#if windows 133s - $ hg mv c2 'c2 => c3' 133s - abort: filename contains '>', which is reserved on Windows: "c2 => c3" 133s - [255] 133s - $ hg mv c2 c3 133s - $ fn_hg_commit -m 'dummy commit' 133s - $ hg mv c3 c4 133s - $ fn_hg_commit -m 'dummy commit' 133s -#else 133s - $ hg mv c2 'c2 => c3' 133s - warning: filename contains '>', which is reserved on Windows: 'c2 => c3' 133s - $ fn_hg_commit -m 'test filename with arrow' 133s - $ hg mv 'c2 => c3' 'c3 => c4' 133s - warning: filename contains '>', which is reserved on Windows: 'c3 => c4' 133s - $ fn_hg_commit -m 'test filename with arrow 2' 133s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" -l 3 --config "experimental.graphstyle.missing=|" 133s - @ 6 bca4ba69a6844c133b069e227dfa043d41e3c197 test filename with arrow 2 133s - | branch=default 133s - | 133s - o 5 864caad1f3493032f8d06f44a89dc9f1c039b09f test filename with arrow 133s - | branch=default 133s - | 133s - o 4 58f855ae26f4930ce857e648d3dd949901cce817 133s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 133s - | 133s -#endif 133s - $ hg push -r b2 -r b3 133s - pushing to $TESTTMP/gitrepo 133s - searching for changes 133s - adding objects 133s - remote: found 0 deltas to reuse 133s - added 3 commits with 3 trees and 0 blobs 133s - adding reference refs/heads/b2 133s - adding reference refs/heads/b3 133s - 133s - $ cd ../gitrepo 133s - $ git cat-file commit b1 133s - tree 1b773a2eb70f29397356f8069c285394835ff85a 133s - parent 54776dace5849bdf273fb26737a48ef64804909d 133s - author test 1167609613 +0000 133s - committer test 1167609613 +0000 133s - HG:extra aaaaaaa:dataaaa 133s - HG:extra zzzzzzz:datazzz 133s - 133s - 133s - 133s - $ git cat-file commit b2 133s - tree 34ad62c6d6ad9464bfe62db5b3d2fa16aaa9fa9e 133s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 133s - author test 1167609614 +0000 133s - committer test 1167609614 +0000 133s - HG:rename c:c2 133s - HG:rename d:d2 133s - HG:extra bbbbbbb:databbb 133s - HG:extra yyyyyyy:datayyy 133s - 133s - 133s - 133s -#if no-windows 133s - $ git cat-file commit b3 133s - tree e63df52695f9b06e54b37e7ef60d0c43994de620 133s - parent 5cafe2555a0666fcf661a3943277a9812a694a98 133s - author test 1167609616 +0000 133s - committer test 1167609616 +0000 133s - HG:rename c2%20%3D%3E%20c3:c3%20%3D%3E%20c4 133s - 133s - test filename with arrow 2 133s -#endif 133s - $ cd ../gitrepo 133s - $ git checkout b1 133s - Switched to branch 'b1' 133s - $ commit_sha=$(git rev-parse HEAD) 133s - $ tree_sha=$(git rev-parse HEAD^{tree}) 133s - 133s -There's no way to create a Git repo with extra metadata via the CLI. Dulwich 133s -lets you do that, though. 133s - 133s - >>> from dulwich.objects import Commit 133s - >>> from dulwich.porcelain import open_repo 133s - >>> repo = open_repo('.') 133s - >>> c = Commit() 133s - >>> c.author = b'test ' 133s - >>> c.author_time = 0 133s - >>> c.author_timezone = 0 133s - >>> c.committer = c.author 133s - >>> c.commit_time = 0 133s - >>> c.commit_timezone = 0 133s - >>> c.parents = [b'$commit_sha'] 133s - >>> c.tree = b'$tree_sha' 133s - >>> c.message = b'extra commit\n' 133s - >>> c.extra.extend([(b'zzz:zzz', b'data:zzz'), (b'aaa:aaa', b'data:aaa'), 133s - ... (b'HG:extra', b'hgaaa:dataaaa'), 133s - ... (b'HG:extra', b'hgzzz:datazzz')]) 133s - >>> repo.object_store.add_object(c) 133s - >>> repo.refs.set_if_equals(b'refs/heads/master', None, c.id) 133s - True 133s - 133s - $ git cat-file commit master 133s - tree 1b773a2eb70f29397356f8069c285394835ff85a 133s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 133s - author test 0 +0000 133s - committer test 0 +0000 133s - zzz:zzz data:zzz 133s - aaa:aaa data:aaa 133s - HG:extra hgaaa:dataaaa 133s - HG:extra hgzzz:datazzz 133s - 133s - extra commit 133s - 133s - $ cd .. 133s - $ hg clone -qU gitrepo hgrepo2 133s - $ cd hgrepo2 133s - $ hg log -G -r :5 -T "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 133s - o 5 58f855ae26f4930ce857e648d3dd949901cce817 133s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 133s - | 133s - | o 4 90acc8c23fcfaeb0930c03c849923a696fd9013c extra commit 133s - |/ GIT0-zzz%3Azzz=data%3Azzz GIT1-aaa%3Aaaa=data%3Aaaa branch=default hgaaa=dataaaa hgzzz=datazzz 133s - | 133s - o 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 133s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 133s - | 133s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 133s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 133s - | 133s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 133s - | branch=default 133s - | 133s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 133s - branch=default hg-git-rename-source=git 133s - 133s 133s ERROR: test-extra.t output changed 134s ! 134s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-bookmark-workflow.t 134s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-bookmark-workflow.t.err 134s @@ -42,13 +42,21 @@ 134s 134s Initialize remote hg and git repos with equivalent initial contents 134s $ hg init hgremoterepo 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s $ cd hgremoterepo 134s $ hg bookmark master 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s $ for f in alpha beta gamma delta; do 134s > echo $f > $f; hg add $f; hgcommit -m "add $f" 134s > done 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s $ hg bookmark -r 1 b1 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s $ hgstate 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s 3 fc2664cac217 "add delta" bookmarks: [master] 134s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 134s 1 7bcd915dc873 "add beta" bookmarks: [b1] 134s @@ -69,157 +77,19 @@ 134s 134s Cloning transfers all bookmarks from remote to local 134s $ hg clone -q hgremoterepo purehglocalrepo 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s $ cd purehglocalrepo 134s $ hgstate 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s 3 fc2664cac217 "add delta" bookmarks: [master] 134s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 134s 1 7bcd915dc873 "add beta" bookmarks: [b1] 134s 0 3442585be8a6 "add alpha" bookmarks: [] 134s $ cd .. 134s $ hg clone -q gitremoterepo hggitlocalrepo --config hggit.usephases=True 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s + abort: repository gitremoterepo not found 134s + [255] 134s $ cd hggitlocalrepo 134s + $TESTTMP.sh: 78: cd: can't cd to hggitlocalrepo 134s $ hggitstate 134s - 3 03769a650ded 55b133e1d558 "add delta" bookmarks: [master] 134s - 2 ca33a262eb46 d338971a96e2 "add gamma" bookmarks: [] 134s - 1 7fe02317c63d 9497a4ee62e1 "add beta" bookmarks: [b1] 134s - 0 ff7a2f2d8d70 7eeab2ea75ec "add alpha" bookmarks: [] 134s - 134s -Make sure that master is public 134s - $ hg phase -r master 134s - 3: public 134s - $ cd .. 134s - 134s -No changes 134s - $ cd purehglocalrepo 134s - $ hg incoming -B 134s - comparing with $TESTTMP/hgremoterepo 134s - searching for changed bookmarks 134s - no changed bookmarks found 134s - [1] 134s - $ hg outgoing 134s - comparing with $TESTTMP/hgremoterepo 134s - searching for changes 134s - no changes found 134s - [1] 134s - $ hg outgoing -B 134s - comparing with $TESTTMP/hgremoterepo 134s - searching for changed bookmarks 134s - no changed bookmarks found 134s - [1] 134s - $ hg push 134s - pushing to $TESTTMP/hgremoterepo 134s - searching for changes 134s - no changes found 134s - [1] 134s - $ cd .. 134s - $ cd hggitlocalrepo 134s - $ hg incoming -B 134s - comparing with $TESTTMP/gitremoterepo 134s - searching for changed bookmarks 134s - no changed bookmarks found 134s - [1] 134s - $ hg outgoing 134s - comparing with $TESTTMP/gitremoterepo 134s - searching for changes 134s - no changes found 134s - [1] 134s - $ hg outgoing -B 134s - comparing with $TESTTMP/gitremoterepo 134s - searching for changed bookmarks 134s - no changed bookmarks found 134s - [1] 134s - $ hg push 134s - pushing to $TESTTMP/gitremoterepo 134s - searching for changes 134s - no changes found 134s - [1] 134s - $ cd .. 134s - 134s -Bookmarks on existing revs: 134s -- change b1 on local repo 134s -- introduce b2 on local repo 134s -- introduce b3 on remote repo 134s -Bookmarks on new revs 134s -- introduce b4 on a new rev on the remote 134s - $ cd hgremoterepo 134s - $ hg bookmark -r master b3 134s - $ hg bookmark -r master b4 134s - $ hg update -q b4 134s - $ echo epsilon > epsilon; hg add epsilon; hgcommit -m 'add epsilon' 134s - $ hgstate 134s - 4 d979bb8e0fbb "add epsilon" bookmarks: [b4] 134s - 3 fc2664cac217 "add delta" bookmarks: [b3 master] 134s - 2 d85ced7ae9d6 "add gamma" bookmarks: [] 134s - 1 7bcd915dc873 "add beta" bookmarks: [b1] 134s - 0 3442585be8a6 "add alpha" bookmarks: [] 134s - $ cd .. 134s - $ cd purehglocalrepo 134s - $ hg bookmark -fr 2 b1 134s - $ hg bookmark -r 0 b2 134s - $ hgstate 134s - 3 fc2664cac217 "add delta" bookmarks: [master] 134s - 2 d85ced7ae9d6 "add gamma" bookmarks: [b1] 134s - 1 7bcd915dc873 "add beta" bookmarks: [] 134s - 0 3442585be8a6 "add alpha" bookmarks: [b2] 134s - $ hg incoming -B 134s - comparing with $TESTTMP/hgremoterepo 134s - searching for changed bookmarks 134s - b3 fc2664cac217 134s - b4 d979bb8e0fbb 134s - $ hg outgoing 134s - comparing with $TESTTMP/hgremoterepo 134s - searching for changes 134s - no changes found 134s - [1] 134s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 134s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 134s -This changed in 3.4 to start showing changed and deleted bookmarks again. 134s - $ hg outgoing -B | grep -v -E -w 'b1|b3|b4' 134s - comparing with $TESTTMP/hgremoterepo 134s - searching for changed bookmarks 134s - b2 3442585be8a6 134s - $ cd .. 134s - 134s - $ cd gitremoterepo 134s - $ git branch b3 master 134s - $ git checkout -b b4 master 134s - Switched to a new branch 'b4' 134s - $ echo epsilon > epsilon 134s - $ git add epsilon 134s - $ gitcommit -m 'add epsilon' 134s - $ gitstate 134s - fcfd2c0 "add epsilon" refs: (*b4) (glob) 134s - 55b133e "add delta" refs: (master, b3) 134s - d338971 "add gamma" refs: 134s - 9497a4e "add beta" refs: (b1) 134s - 7eeab2e "add alpha" refs: 134s - $ cd .. 134s - $ cd hggitlocalrepo 134s - $ hg bookmark -fr 2 b1 134s - $ hg bookmark -r 0 b2 134s - $ hgstate 134s - 3 03769a650ded "add delta" bookmarks: [master] 134s - 2 ca33a262eb46 "add gamma" bookmarks: [b1] 134s - 1 7fe02317c63d "add beta" bookmarks: [] 134s - 0 ff7a2f2d8d70 "add alpha" bookmarks: [b2] 134s - $ hg incoming -B 134s - comparing with $TESTTMP/gitremoterepo 134s - searching for changed bookmarks 134s - b3 03769a650ded 134s - b4 fcfd2c0262db 134s - $ hg outgoing 134s - comparing with $TESTTMP/gitremoterepo 134s - searching for changes 134s - no changes found 134s - [1] 134s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 134s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 134s -This changed in 3.4 to start showing changed and deleted bookmarks again. 134s - $ hg outgoing -B 134s - comparing with $TESTTMP/gitremoterepo 134s - searching for changed bookmarks 134s - b1 ca33a262eb46 134s - b2 ff7a2f2d8d70 134s - b3 134s - b4 134s - $ cd .. 134s 134s ERROR: test-bookmark-workflow.t output changed 138s ! 138s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-illegal-contents.t 138s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-illegal-contents.t.err 138s @@ -5,6 +5,7 @@ 138s $ . "$TESTDIR/testutil" 138s 138s $ hg init hg 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s $ cd hg 138s $ mkdir -p .git/hooks 138s $ cat > .git/hooks/post-update < EOF 138s $ fn_touch_escaped foo/git~100/wat bar/.gi\\u200ct/wut this/is/safe 138s $ hg addremove 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s adding .git/hooks/post-update 138s adding bar/.gi\xe2\x80\x8ct/wut (esc) 138s adding foo/git~100/wat 138s adding this/is/safe 138s $ hg ci -m "we should refuse to export this" 138s - $ hg book master 138s - $ hg gexport 138s - warning: skipping invalid path '.git/hooks/post-update' 138s - warning: skipping invalid path 'bar/.gi\xe2\x80\x8ct/wut' 138s - warning: skipping invalid path 'foo/git~100/wat' 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + $ hg book master 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + $ hg gexport 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + hg: unknown command 'gexport' 138s + (did you mean one of export, import?) 138s + [10] 138s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 138s - this/is/safe 138s + fatal: not a git repository: '.hg/git' 138s + [128] 138s $ hg debug-remove-hggit-state 138s - clearing out the git cache data 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + hg: unknown command 'debug-remove-hggit-state' 138s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 138s + [10] 138s $ hg gexport --config hggit.invalidpaths=keep 138s - warning: path '.git/hooks/post-update' contains an invalid path component 138s - warning: path 'bar/.gi\xe2\x80\x8ct/wut' contains an invalid path component 138s - warning: path 'foo/git~100/wat' contains an invalid path component 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + hg: unknown command 'gexport' 138s + (did you mean one of export, import?) 138s + [10] 138s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 138s - .git/hooks/post-update 138s - "bar/.gi\342\200\214t/wut" 138s - foo/git~100/wat 138s - this/is/safe 138s - $ cd .. 138s - 138s - $ rm -rf hg 138s - $ hg init hg 138s + fatal: not a git repository: '.hg/git' 138s + [128] 138s + $ cd .. 138s + 138s + $ rm -rf hg 138s + $ hg init hg 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s $ cd hg 138s $ mkdir -p nested/.git/hooks/ 138s $ cat > nested/.git/hooks/post-update < EOF 138s $ chmod +x nested/.git/hooks/post-update 138s $ hg addremove 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s adding nested/.git/hooks/post-update 138s $ hg ci -m "also refuse to export this" 138s - $ hg book master 138s - $ hg gexport 138s - warning: skipping invalid path 'nested/.git/hooks/post-update' 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + $ hg book master 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + $ hg gexport 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + hg: unknown command 'gexport' 138s + (did you mean one of export, import?) 138s + [10] 138s $ git clone .hg/git git 138s - Cloning into 'git'... 138s - done. 138s + fatal: repository '.hg/git' does not exist 138s + [128] 138s $ rm -rf git 138s 138s We can trigger an error: 138s 138s $ hg -q debug-remove-hggit-state 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + hg: unknown command 'debug-remove-hggit-state' 138s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 138s + [10] 138s $ hg --config hggit.invalidpaths=abort gexport 138s - abort: invalid path 'nested/.git/hooks/post-update' rejected by configuration 138s - (see 'hg help config.hggit.invalidpaths for details) 138s - [255] 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + hg: unknown command 'gexport' 138s + (did you mean one of export, import?) 138s + [10] 138s 138s We can override if needed: 138s 138s $ hg --config hggit.invalidpaths=keep gexport 138s - warning: path 'nested/.git/hooks/post-update' contains an invalid path component 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + hg: unknown command 'gexport' 138s + (did you mean one of export, import?) 138s + [10] 138s $ cd .. 138s $ # different git versions give different return codes 138s $ git clone hg/.hg/git git || true 138s - Cloning into 'git'... 138s - done. 138s - error: [Ii]nvalid path 'nested/\.git/hooks/post-update' (re) 138s + fatal: repository 'hg/.hg/git' does not exist 138s fatal: unable to checkout working tree (?) 138s warning: Clone succeeded, but checkout failed. (?) 138s You can inspect what was checked out with 'git status' (?) 138s @@ -88,6 +109,7 @@ 138s $ cd .. 138s $ rm -rf hg 138s $ hg init hg 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s $ cd hg 138s $ mkdir -p .GIT/hooks/ 138s $ cat > .GIT/hooks/post-checkout < EOF 138s $ chmod +x .GIT/hooks/post-checkout 138s $ hg addremove 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s adding .GIT/hooks/post-checkout 138s $ hg ci -m "also refuse to export this" 138s - $ hg book master 138s - $ hg gexport 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + $ hg book master 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + $ hg gexport 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + hg: unknown command 'gexport' 138s + (did you mean one of export, import?) 138s + [10] 138s $ cd .. 138s 138s And the NTFS case: 138s $ cd .. 138s $ rm -rf hg 138s $ hg init hg 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s $ cd hg 138s $ mkdir -p GIT~1/hooks/ 138s $ cat > GIT~1/hooks/post-checkout < EOF 138s $ chmod +x GIT~1/hooks/post-checkout 138s $ hg addremove 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s adding GIT~1/hooks/post-checkout 138s $ hg ci -m "also refuse to export this" 138s - $ hg book master 138s - $ hg gexport 138s - warning: skipping invalid path 'GIT~1/hooks/post-checkout' 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + $ hg book master 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + $ hg gexport 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + hg: unknown command 'gexport' 138s + (did you mean one of export, import?) 138s + [10] 138s $ cd .. 138s 138s Now check a Git repository containing a Mercurial repository, which 138s @@ -127,36 +163,29 @@ 138s $ rm -rf hg git nested 138s $ git init -q git 138s $ hg init nested 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s $ mv nested git 138s $ cd git 138s $ git add nested 138s $ fn_git_commit -m 'add a Mercurial repository' 138s $ cd .. 138s $ hg clone --config hggit.invalidpaths=abort git hg 138s - importing 1 git commits 138s - abort: invalid path 'nested/.hg/00changelog.i' rejected by configuration 138s - (see 'hg help config.hggit.invalidpaths for details) 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + abort: repository git not found 138s [255] 138s $ rm -rf hg 138s $ hg clone --config hggit.invalidpaths=keep git hg 138s - importing 1 git commits 138s - warning: path 'nested/.hg/00changelog.i' contains an invalid path component 138s - warning: path 'nested/.hg/requires' contains an invalid path component 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + abort: repository git not found 138s warning: path 'nested/.hg/store/requires' contains an invalid path component (?) 138s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 138s warning: path 'nested/.hg/store/requires' is within a nested repository, which Mercurial cannot check out. (?) 138s - updating to bookmark master 138s - abort: path 'nested/.hg/00changelog.i' is inside nested repo 'nested' 138s - [10] 138s + [255] 138s $ rm -rf hg 138s $ hg clone git hg 138s - importing 1 git commits 138s - warning: skipping invalid path 'nested/.hg/00changelog.i' 138s - warning: skipping invalid path 'nested/.hg/requires' 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + abort: repository git not found 138s warning: skipping invalid path 'nested/.hg/store/requires' (?) 138s - new changesets 3ea18a67c0e6 (1 drafts) 138s - updating to bookmark master 138s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 138s + [255] 138s $ cd .. 138s 138s Now check a Git repository containing paths with carriage return and 138s @@ -171,23 +200,16 @@ 138s $ fn_git_commit -m 'add files disallowed by mercurial' 138s $ cd .. 138s $ hg clone --config hggit.invalidpaths=abort git hg 138s - importing 1 git commits 138s - abort: invalid path 'Icon\r' rejected by configuration 138s - (see 'hg help config.hggit.invalidpaths for details) 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + abort: repository git not found 138s [255] 138s $ hg clone --config hggit.invalidpaths=keep git hg 138s - importing 1 git commits 138s - warning: skipping invalid path 'Icon\r' 138s - warning: skipping invalid path 'the\nfile' 138s - new changesets 8354c06a5842 (1 drafts) 138s - updating to bookmark master 138s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + abort: repository git not found 138s + [255] 138s $ rm -rf hg 138s $ hg clone git hg 138s - importing 1 git commits 138s - warning: skipping invalid path 'Icon\r' 138s - warning: skipping invalid path 'the\nfile' 138s - new changesets 8354c06a5842 (1 drafts) 138s - updating to bookmark master 138s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 138s - 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + abort: repository git not found 138s + [255] 138s + 138s 138s ERROR: test-illegal-contents.t output changed 139s ! 139s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-phases-remote.t 139s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-phases-remote.t.err 139s @@ -26,193 +26,10 @@ 139s $ cd .. 139s 139s $ hg clone --config hggit.usephases=True -U gitrepo hgrepo 139s - importing 4 git commits 139s - new changesets ff7a2f2d8d70:25eed24f5e8f (1 drafts) 139s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 139s + abort: repository gitrepo not found 139s + [255] 139s 139s $ cd hgrepo 139s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 139s $ hg log -G -T '{rev}|{phase}|{bookmarks}|{tags}\n' 139s - o 3|public||thetag tip 139s - | 139s - | o 2|draft|not-master|default/not-master 139s - |/ 139s - | o 1|public|master|default/master 139s - |/ 139s - o 0|public|| 139s - 139s - $ hg phase -r 'all()' | tee $TESTTMP/after-clone 139s - 0: public 139s - 1: public 139s - 2: draft 139s - 3: public 139s - $ cat >> .hg/hgrc < [paths] 139s - > other = $TESTTMP/gitrepo/.git 139s - > other:hg-git.publish = no 139s - > EOF 139s - $ cd .. 139s - 139s -that disables publishing from that remote 139s - 139s - $ cd hgrepo 139s - $ hg phase -fd 'all()' 139s - $ hg pull other 139s - pulling from $TESTTMP/gitrepo/.git 139s - no changes found 139s - $ hg log -qr 'public()' 139s - $ hg pull -v --config hggit.usephases=True other 139s - pulling from $TESTTMP/gitrepo/.git 139s - no changes found 139s - processing commits in batches of 1000 139s - bookmark master is up-to-date 139s - bookmark not-master is up-to-date 139s - $ hg log -qr 'public()' 139s - $ cd .. 139s - 139s -but not default when enable by the global setting 139s - 139s - $ cd hgrepo 139s - $ hg phase -fd 'all()' 139s - no phases changed 139s - $ hg pull -v --config hggit.usephases=True 139s - pulling from $TESTTMP/gitrepo 139s - publishing remote HEAD 139s - publishing tag thetag 139s - no changes found 139s - processing commits in batches of 1000 139s - bookmark master is up-to-date 139s - bookmark not-master is up-to-date 139s - publishing remote HEAD 139s - publishing tag thetag 139s - 3 local changesets published 139s - $ hg phase -r 'all()' > $TESTTMP/after-pull 139s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 139s - $ cd .. 139s - 139s -or the path option 139s - 139s - $ cd hgrepo 139s - $ hg phase -fd 'all()' 139s - $ hg pull -v --config paths.default:hg-git.publish=yes 139s - pulling from $TESTTMP/gitrepo 139s - publishing remote HEAD 139s - publishing tag thetag 139s - no changes found 139s - processing commits in batches of 1000 139s - bookmark master is up-to-date 139s - bookmark not-master is up-to-date 139s - publishing remote HEAD 139s - publishing tag thetag 139s - 3 local changesets published 139s - $ hg phase -r 'all()' > $TESTTMP/after-pull 139s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 139s - $ cd .. 139s - 139s -but we can specify individual branches 139s - 139s - $ cd hgrepo 139s - $ hg phase -fd 'all()' 139s - $ hg pull -v --config paths.default:hg-git.publish=not-master 139s - pulling from $TESTTMP/gitrepo 139s - publishing branch not-master 139s - no changes found 139s - processing commits in batches of 1000 139s - bookmark master is up-to-date 139s - bookmark not-master is up-to-date 139s - publishing branch not-master 139s - 2 local changesets published 139s - $ hg phase -r master -r not-master -r thetag 139s - 1: draft 139s - 2: public 139s - 3: draft 139s - $ cd .. 139s - 139s -and we can also specify the tag 139s - 139s - $ cd hgrepo 139s - $ hg phase -fd 'all()' 139s - $ hg pull -v --config paths.default:hg-git.publish=thetag 139s - pulling from $TESTTMP/gitrepo 139s - publishing tag thetag 139s - no changes found 139s - processing commits in batches of 1000 139s - bookmark master is up-to-date 139s - bookmark not-master is up-to-date 139s - publishing tag thetag 139s - 2 local changesets published 139s - $ hg phase -r master -r not-master -r thetag 139s - 1: draft 139s - 2: draft 139s - 3: public 139s - $ cd .. 139s - 139s - 139s -Check multiple paths behavior 139s -============================= 139s - 139s - 139s - $ cd hgrepo 139s - $ cat >> .hg/hgrc < [paths] 139s - > multi:multi-urls = yes 139s - > multi = path://other, path://default 139s - > recursive:multi-urls = yes 139s - > recursive = path://multi, default 139s - > EOF 139s - 139s -Using multiple path works fine: 139s - 139s - 139s - $ hg pull multi --config paths.default:hg-git.publish=yes 139s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 139s - [255] 139s - 139s -Recursive multiple path are tricker, but Mercurial don't work with them either. 139s -This test exist to make sure we bail out on our own. 139s - 139s - 139s -`yes` should abort (until we implement it) 139s - 139s - $ hg pull multi --config paths.default:hg-git.publish=yes 139s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 139s - [255] 139s - 139s -`some-value` should abort (until we implement it) 139s - 139s - $ hg pull multi --config paths.default:hg-git.publish=thetag 139s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 139s - [255] 139s - 139s -`no` is fine 139s - 139s - $ hg pull multi --config paths.default:hg-git.publish=no 139s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 139s - [255] 139s - 139s - $ cd .. 139s - 139s -Check conflicting paths behavior 139s -================================ 139s - 139s - $ cd hgrepo 139s - $ cat > .hg/hgrc < [paths] 139s - > default = $TESTTMP/gitrepo 139s - > default:hg-git.publish = yes 139s - > also-default = $TESTTMP/gitrepo 139s - > EOF 139s - $ hg pull also-default 139s - pulling from $TESTTMP/gitrepo 139s - abort: different publishing configurations for the same remote location 139s - (conflicting paths: also-default, default) 139s - [255] 139s - $ hg pull --config paths.also-default:hg-git.publish=no 139s - pulling from $TESTTMP/gitrepo 139s - abort: different publishing configurations for the same remote location 139s - (conflicting paths: also-default, default) 139s - [255] 139s - $ hg pull --config paths.also-default:hg-git.publish=true 139s - pulling from $TESTTMP/gitrepo 139s - no changes found 139s - 1 local changesets published 139s - $ cd .. 139s - 139s 139s ERROR: test-phases-remote.t output changed 141s ! 141s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-serve-hg-static.t 141s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-serve-hg-static.t.err 141s @@ -6,6 +6,7 @@ 141s $ . "$TESTDIR/testutil" 141s 141s $ hg clone http://localhost:$HGPORT/ copy 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s abort: * (glob) 141s [100] 141s $ test -d copy 141s @@ -18,14 +19,18 @@ 141s > --logfile server.log 141s $ cat dumb.pid >> $DAEMON_PIDS 141s $ hg init remote 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ cd remote 141s $ echo foo > bar 141s $ echo c2 > '.dotfile with spaces' 141s $ hg add 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s adding .dotfile with spaces 141s adding bar 141s $ hg commit -m"test" 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ hg tip 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s changeset: 0:02770d679fb8 141s tag: tip 141s user: test 141s @@ -34,6 +39,7 @@ 141s 141s $ cd .. 141s $ hg clone static-http://localhost:$HGPORT/remote local 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s requesting all changes 141s adding changesets 141s adding manifests 141s @@ -44,17 +50,20 @@ 141s 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 141s $ cd local 141s $ hg verify 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s checking changesets 141s checking manifests 141s crosschecking files in changesets and manifests 141s + checking dirstate (?) 141s checking files 141s - checking dirstate (?) 141s + checking dirstate 141s checked 1 changesets with 2 changes to 2 files 141s $ cat bar 141s foo 141s $ cd ../remote 141s $ echo baz > quux 141s $ hg commit -A -mtest2 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s adding quux 141s 141s check for HTTP opener failures when cachefile does not exist 141s @@ -62,6 +71,7 @@ 141s $ rm .hg/cache/* 141s $ cd ../local 141s $ hg pull 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s pulling from static-http://localhost:$HGPORT/remote 141s searching for changes 141s adding changesets 141s @@ -74,10 +84,13 @@ 141s trying to push 141s 141s $ hg update 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 141s $ echo more foo >> bar 141s $ hg commit -m"test" 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ hg push 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s pushing to static-http://localhost:$HGPORT/remote 141s abort: destination does not support push 141s [255] 141s @@ -86,9 +99,11 @@ 141s 141s $ cd .. 141s $ hg clone -r doesnotexist static-http://localhost:$HGPORT/remote local0 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s abort: unknown revision 'doesnotexist'!? (re) 141s [10] 141s $ hg clone -r 0 static-http://localhost:$HGPORT/remote local0 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s adding changesets 141s adding manifests 141s adding file changes 141s @@ -100,16 +115,23 @@ 141s test with "/" URI (issue747) and subrepo 141s 141s $ hg init 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ hg init sub 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ touch sub/test 141s $ hg -R sub commit -A -m "test" 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s adding test 141s $ hg -R sub tag not-empty 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ echo sub=sub > .hgsub 141s $ echo a > a 141s $ hg add a .hgsub 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ hg -q ci -ma 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ hg clone static-http://localhost:$HGPORT/ local2 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s requesting all changes 141s adding changesets 141s adding manifests 141s @@ -127,58 +149,75 @@ 141s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 141s $ cd local2 141s $ hg verify 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s checking changesets 141s checking manifests 141s crosschecking files in changesets and manifests 141s + checking dirstate (?) 141s checking files 141s - checking dirstate (?) 141s + checking dirstate 141s checked 1 changesets with 3 changes to 3 files 141s checking subrepo links 141s $ cat a 141s a 141s $ hg paths 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s default = static-http://localhost:$HGPORT/ 141s 141s test with empty repo (issue965) 141s 141s $ cd .. 141s $ hg init remotempty 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ hg clone static-http://localhost:$HGPORT/remotempty local3 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s no changes found 141s updating to branch default 141s 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 141s $ cd local3 141s $ hg verify 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s checking changesets 141s checking manifests 141s crosschecking files in changesets and manifests 141s + checking dirstate (?) 141s checking files 141s - checking dirstate (?) 141s + checking dirstate 141s checked 0 changesets with 0 changes to 0 files 141s $ hg paths 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s default = static-http://localhost:$HGPORT/remotempty 141s $ cd .. 141s 141s Clone with tags and branches works 141s 141s $ hg init remote-with-names 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ cd remote-with-names 141s $ echo 0 > foo 141s $ hg -q commit -A -m initial 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ echo 1 > foo 141s $ hg commit -m 'commit 1' 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ hg -q up 0 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ hg branch mybranch 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s marked working directory as branch mybranch 141s (branches are permanent and global, did you want a bookmark?) 141s $ echo 2 > foo 141s $ hg commit -m 'commit 2 (mybranch)' 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ hg tag -r 1 'default-tag' 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ hg tag -r 2 'branch-tag' 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s 141s $ cd .. 141s 141s $ hg clone static-http://localhost:$HGPORT/remote-with-names local-with-names 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s requesting all changes 141s adding changesets 141s adding manifests 141s @@ -191,6 +230,7 @@ 141s Clone a specific branch works 141s 141s $ hg clone -r mybranch static-http://localhost:$HGPORT/remote-with-names local-with-names-branch 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s adding changesets 141s adding manifests 141s adding file changes 141s @@ -202,6 +242,7 @@ 141s Clone a specific tag works 141s 141s $ hg clone -r default-tag static-http://localhost:$HGPORT/remote-with-names local-with-names-tag 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s adding changesets 141s adding manifests 141s adding file changes 141s 141s ERROR: test-serve-hg-static.t output changed 142s ! 142s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-octopus.t 142s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-octopus.t.err 142s @@ -62,111 +62,9 @@ 142s $ git init -q --bare repo.git 142s 142s $ hg clone gitrepo hgrepo 142s - importing 8 git commits 142s - new changesets ff7a2f2d8d70:307506d6ae8a (10 drafts) 142s - updating to bookmark master 142s - 6 files updated, 0 files merged, 0 files removed, 0 files unresolved 142s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 142s + abort: repository gitrepo not found 142s + [255] 142s $ cd hgrepo 142s + $TESTTMP.sh: 64: cd: can't cd to hgrepo 142s $ hg log --graph --style compact | sed 's/\[.*\]//g' 142s - @ 9:7,8 307506d6ae8a 2007-01-01 00:00 +0000 test 142s - |\ Merge branches 'branch3' and 'branch4' 142s - | | 142s - | o 8:3,4 2b07220e422e 2007-01-01 00:00 +0000 test 142s - | |\ Merge branches 'branch3' and 'branch4' 142s - | | | 142s - o | | 7:5,6 ccf2d65d982c 2007-01-01 00:00 +0000 test 142s - |\ \ \ Merge branches 'branch1' and 'branch2' 142s - | | | | 142s - | o | | 6:1,2 690b40256117 2007-01-01 00:00 +0000 test 142s - | |\ \ \ Merge branches 'branch1' and 'branch2' 142s - | | | | | 142s - o | | | | 5:0 e459c0629ca4 2007-01-01 00:00 +0000 test 142s - | | | | | add delta 142s - | | | | | 142s - +-------o 4:0 e857c9a04474 2007-01-01 00:00 +0000 test 142s - | | | | add zeta 142s - | | | | 142s - +-----o 3:0 0071dec0de0e 2007-01-01 00:00 +0000 test 142s - | | | add epsilon 142s - | | | 142s - +---o 2:0 205a004356ef 2007-01-01 00:00 +0000 test 142s - | | add gamma 142s - | | 142s - | o 1 7fe02317c63d 2007-01-01 00:00 +0000 test 142s - |/ add beta 142s - | 142s - o 0 ff7a2f2d8d70 2007-01-01 00:00 +0000 test 142s - add alpha 142s - 142s - $ hg gverify -r 9 142s - verifying rev 307506d6ae8a against git commit b32ff845df61df998206b630e4370a44f9b36845 142s - $ hg gverify -r 8 142s - abort: no git commit found for rev 2b07220e422e 142s - (if this is an octopus merge, verify against the last rev) 142s - [255] 142s - 142s - $ hg debug-remove-hggit-state 142s - clearing out the git cache data 142s - $ hg push ../repo.git 142s - pushing to ../repo.git 142s - searching for changes 142s - adding objects 142s - remote: found 0 deltas to reuse 142s - added 8 commits with 8 trees and 6 blobs 142s - adding reference refs/heads/branch1 142s - adding reference refs/heads/branch2 142s - adding reference refs/heads/branch3 142s - adding reference refs/heads/branch4 142s - adding reference refs/heads/master 142s - $ cd .. 142s - 142s - $ git --git-dir=repo.git log --pretty=medium | sed s/\\.\\.\\.//g 142s - commit b32ff845df61df998206b630e4370a44f9b36845 142s - Merge: 9ac68f9 7e9cd9f e695849 142s - Author: test 142s - Date: Mon Jan 1 00:00:15 2007 +0000 142s - 142s - Merge branches 'branch3' and 'branch4' 142s - 142s - commit 9ac68f982ae7426d9597ff16c74afb4e6053c582 142s - Merge: d40f375 9497a4e e5023f9 142s - Author: test 142s - Date: Mon Jan 1 00:00:15 2007 +0000 142s - 142s - Merge branches 'branch1' and 'branch2' 142s - 142s - commit d40f375a81b7d033e92cbad89487115fe2dd472f 142s - Author: test 142s - Date: Mon Jan 1 00:00:15 2007 +0000 142s - 142s - add delta 142s - 142s - commit e695849087f6c320c1a447620492b29a82ca41b1 142s - Author: test 142s - Date: Mon Jan 1 00:00:14 2007 +0000 142s - 142s - add zeta 142s - 142s - commit 7e9cd9f90b6d2c60579375eb796ce706d2d8bbe6 142s - Author: test 142s - Date: Mon Jan 1 00:00:13 2007 +0000 142s - 142s - add epsilon 142s - 142s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 142s - Author: test 142s - Date: Mon Jan 1 00:00:12 2007 +0000 142s - 142s - add gamma 142s - 142s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 142s - Author: test 142s - Date: Mon Jan 1 00:00:11 2007 +0000 142s - 142s - add beta 142s - 142s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 142s - Author: test 142s - Date: Mon Jan 1 00:00:10 2007 +0000 142s - 142s - add alpha 142s 142s ERROR: test-octopus.t output changed 143s ! 143s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-hook.t 143s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-hook.t.err 143s @@ -10,6 +10,7 @@ 143s > fn_${1}_commit -m $2 143s > } 143s $ hg init hgrepo 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s $ cd hgrepo 143s $ cat > .hg/hgrc < [hooks] 143s @@ -22,7 +23,10 @@ 143s > incoming = python:testlib.hooks.showargs 143s > EOF 143s $ fn_commit hg a 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s $ hg book master 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s 143s $ git init -q --bare ../repo.git 143s $ cat >> .hg/hgrc < master 143s + * [new branch] master -> master 143s $ cd ../hgrepo 143s 143s Hooks on pull? 143s 143s $ hg pull -u 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s pulling from $TESTTMP/repo.git 143s - | gitimport.source=pull 143s - | gitimport.git=True 143s - | gitimport.names=[b'default'] 143s - | gitimport.refs={b'HEAD': b'1dab31e7bc9691ba42a2fe7b14680694770bc527', b'refs/heads/master': b'1dab31e7bc9691ba42a2fe7b14680694770bc527'} 143s - | gitimport.heads=None 143s - importing 2 git commits 143s - : pretxncommit 143s - | incoming.git=True 143s - | incoming.source=pull 143s - | incoming.node=382ad5fa1d7727210384d40fa1539af52ca632c5 143s - | incoming.git_node=92150d1529ccaea34a6b36fe4144993193080499 143s - : pretxncommit 143s - | incoming.git=True 143s - | incoming.source=pull 143s - | incoming.node=892115eea5c32152e09ae4013c9a119d7b534049 143s - | incoming.git_node=1dab31e7bc9691ba42a2fe7b14680694770bc527 143s - updating bookmark master 143s - | changegroup.source=push 143s - | changegroup.git=True 143s - | changegroup.node=382ad5fa1d7727210384d40fa1539af52ca632c5 143s - | changegroup.node_last=892115eea5c32152e09ae4013c9a119d7b534049 143s - new changesets 382ad5fa1d77:892115eea5c3 (2 drafts) 143s - updating to active bookmark master 143s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 143s + abort: repository $TESTTMP/repo.git not found 143s + [255] 143s 143s Hooks on push? 143s 143s $ fn_commit hg d 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s $ fn_commit hg e 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s $ hg push 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s pushing to $TESTTMP/repo.git 143s - | preoutgoing.git=True 143s - | preoutgoing.source=push 143s - | preoutgoing.url=$TESTTMP/repo.git 143s - | gitexport.nodes=[b'cc6164a17449d58d7811ff3918f33f89c2c83fa5', b'46737f6a4c9d8307b681cbb2e9e2e5419cc87f82'] 143s - | gitexport.git=True 143s - searching for changes 143s - | prechangegroup.source=push 143s - | prechangegroup.git=True 143s - | prechangegroup.url=$TESTTMP/repo.git 143s - adding objects 143s - remote: found 0 deltas to reuse 143s - added 2 commits with 2 trees and 2 blobs 143s - updating reference refs/heads/master 143s + abort: repository $TESTTMP/repo.git not found 143s + [255] 143s 143s 143s And what does Mercurial do? 143s @@ -124,7 +87,9 @@ 143s On push: 143s 143s $ hg init ../hgrepo-copy 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s $ hg push ../hgrepo-copy 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s pushing to ../hgrepo-copy 143s searching for changes 143s | preoutgoing.source=push 143s @@ -133,19 +98,29 @@ 143s adding changesets 143s adding manifests 143s adding file changes 143s - added 5 changesets with 5 changes to 5 files 143s + added 3 changesets with 3 changes to 3 files 143s 143s With more than one head: 143s 143s $ rm -r ../hgrepo-copy 143s $ hg init ../hgrepo-copy 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s $ hg book -i 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s $ hg branch -q abranch 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s $ fn_commit hg x 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s $ hg up -q default 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s $ hg branch -q alsoabranch 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s $ fn_commit hg y 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s $ hg push ../hgrepo-copy 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s pushing to ../hgrepo-copy 143s searching for changes 143s | preoutgoing.source=push 143s @@ -154,13 +129,15 @@ 143s adding changesets 143s adding manifests 143s adding file changes 143s - added 7 changesets with 7 changes to 7 files (+1 heads) 143s + added 5 changesets with 5 changes to 5 files (+1 heads) 143s 143s On pull: 143s 143s $ hg debugstrip --no-backup tip 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 143s $ hg pull ../hgrepo-copy 143s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 143s pulling from ../hgrepo-copy 143s searching for changes 143s | prechangegroup.txnname=pull 143s @@ -171,16 +148,16 @@ 143s adding manifests 143s adding file changes 143s added 1 changesets with 1 changes to 1 files (+1 heads) 143s - new changesets d4097d98a390 143s + new changesets 11a693974ec5 143s | changegroup.txnname=pull 143s file://$TESTTMP/hgrepo-copy 143s | changegroup.source=pull 143s | changegroup.url=file:$TESTTMP/hgrepo-copy 143s - | changegroup.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 143s - | changegroup.node_last=d4097d98a3905be88e8a566039b1fdcca06e0d2e 143s + | changegroup.node=11a693974ec530e32672629628dde90793335199 143s + | changegroup.node_last=11a693974ec530e32672629628dde90793335199 143s | incoming.txnname=pull 143s file://$TESTTMP/hgrepo-copy 143s | incoming.source=pull 143s | incoming.url=file:$TESTTMP/hgrepo-copy 143s - | incoming.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 143s + | incoming.node=11a693974ec530e32672629628dde90793335199 143s (run 'hg heads' to see heads) 143s 143s ERROR: test-hook.t output changed 145s ! 145s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-transactions.t 145s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-transactions.t.err 145s @@ -42,19 +42,29 @@ 145s 145s $ hg clone gitrepo hgrepo --config hggit.mapsavefrequency=10 --debug \ 145s > | grep -c saving 145s - 1 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s + abort: repository gitrepo not found 145s + 0 145s + [1] 145s $ rm -rf hgrepo 145s 145s pull with mapsavefreq set 145s 145s $ hg init hgrepo 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s $ cat >> hgrepo/.hg/hgrc < [paths] 145s > default = $TESTTMP/gitrepo 145s > EOF 145s $ hg -R hgrepo --config hggit.mapsavefrequency=10 pull --debug \ 145s > | grep -c saving 145s - 10 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s + abort: repository $TESTTMP/gitrepo not found 145s + 0 145s + [1] 145s $ rm -rf hgrepo 145s 145s The user experience 145s @@ -66,6 +76,8 @@ 145s First, create a repository, set up to pull from git, and where we can interrupt the conversion. 145s 145s $ hg init hgrepo 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s $ cat >> hgrepo/.hg/hgrc < [paths] 145s > default = $TESTTMP/gitrepo 145s @@ -75,39 +87,49 @@ 145s A low save interval causes a lot of reports: 145s 145s $ hg --config hggit.mapsavefrequency=25 pull 145s - pulling from $TESTTMP/gitrepo 145s - importing 100 git commits 145s - new changesets 1c8407413fa3:abc468b9e51b (25 drafts) 145s - new changesets 217c308baf47:d5d14eeedd08 (25 drafts) 145s - new changesets d9807ef6abcb:4678067bd500 (25 drafts) 145s - adding bookmark master 145s - new changesets c31a154888bb:eda59117ba04 (25 drafts) 145s - (run 'hg update' to get a working copy) 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s + pulling from $TESTTMP/gitrepo 145s + abort: repository $TESTTMP/gitrepo not found 145s + [255] 145s 145s Reset the repository 145s 145s $ hg debugstrip --no-backup 'all()' 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s + abort: empty revision set 145s + [255] 145s $ hg debug-remove-hggit-state 145s - clearing out the git cache data 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s + hg: unknown command 'debug-remove-hggit-state' 145s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 145s + [10] 145s 145s And with phases? No mention of draft changesets, as we publish changes 145s during the conversion: 145s 145s $ hg --config hggit.mapsavefrequency=25 --config hggit.usephases=yes pull 145s - pulling from $TESTTMP/gitrepo 145s - importing 100 git commits 145s - new changesets 1c8407413fa3:abc468b9e51b 145s - new changesets 217c308baf47:d5d14eeedd08 145s - new changesets d9807ef6abcb:4678067bd500 145s - updating bookmark master 145s - new changesets c31a154888bb:eda59117ba04 145s - (run 'hg update' to get a working copy) 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s + pulling from $TESTTMP/gitrepo 145s + abort: repository $TESTTMP/gitrepo not found 145s + [255] 145s 145s Reset the repository 145s 145s $ hg debugstrip --no-backup 'all()' 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s + abort: empty revision set 145s + [255] 145s $ hg debug-remove-hggit-state 145s - clearing out the git cache data 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s + hg: unknown command 'debug-remove-hggit-state' 145s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 145s + [10] 145s 145s Interruptions 145s ------------- 145s @@ -121,54 +143,51 @@ 145s Test an error in a pull: 145s 145s $ ABORT_AFTER=99 hg pull 145s - pulling from $TESTTMP/gitrepo 145s - importing 100 git commits 145s - transaction abort! 145s - rollback completed 145s - abort: aborted after 99 commits! 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s + pulling from $TESTTMP/gitrepo 145s + abort: repository $TESTTMP/gitrepo not found 145s [255] 145s $ hg log -l 10 -T '{rev} {gitnode}\n' 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s 145s Test the user exiting in the first transaction: 145s 145s $ EXIT_AFTER=5 hg --config hggit.mapsavefrequency=10 pull 145s - pulling from $TESTTMP/gitrepo 145s - importing 100 git commits 145s - transaction abort! 145s - rollback completed 145s - interrupted! 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s + pulling from $TESTTMP/gitrepo 145s + abort: repository $TESTTMP/gitrepo not found 145s [255] 145s $ hg log -l 10 -T '{rev} {gitnode}\n' 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s 145s Check that we have no state, but clear it just in case 145s 145s $ ls -d .hg/git* 145s - .hg/git 145s + ls: cannot access '.hg/git*': No such file or directory 145s + [2] 145s $ hg debug-remove-hggit-state 145s - clearing out the git cache data 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s + hg: unknown command 'debug-remove-hggit-state' 145s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 145s + [10] 145s 145s Test the user exiting in the middle of a conversion, after the first 145s transaction: 145s 145s $ EXIT_AFTER=15 hg --config hggit.mapsavefrequency=10 pull 145s - pulling from $TESTTMP/gitrepo 145s - importing 100 git commits 145s - new changesets 1c8407413fa3:7c8c534a5fbe (10 drafts) 145s - transaction abort! 145s - rollback completed 145s - interrupted! 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s + pulling from $TESTTMP/gitrepo 145s + abort: repository $TESTTMP/gitrepo not found 145s [255] 145s $ hg log -l 10 -T '{rev} {gitnode}\n' 145s - 9 7cbb16ec981b308e1e2b181f8e1f22c8f409f44e 145s - 8 42da70ed92bbecf9f348ba59c93646be723d0bf2 145s - 7 17e841146e5744b81af9959634d82c20a5d7df52 145s - 6 c31065bf97bf014815e37cdfbdef2c32c687f314 145s - 5 fcf21b8e0520ec1cced1d7593d13f9ee54721269 145s - 4 46acd02d0352e4b92bd6a099bb0490305d847a18 145s - 3 61eeda444b37b8aa3892d5f04c66c5441d21dd66 145s - 2 e55db11bb0472791c7af3fc636772174cdea4a36 145s - 1 17a2672b3c24c02d568f99d8d55ccae2bf362d5c 145s - 0 4e195b4c6e77604b70a8ad3b01306adbb9b1c7e7 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s $ cd .. 145s $ rm -rf hgrepo 145s 145s @@ -183,12 +202,10 @@ 145s > hg --config hggit.mapsavefrequency=10 --config git.intree=yes \ 145s > --cwd hgrepo \ 145s > clone -U $TESTTMP/gitrepo . 145s - importing 100 git commits 145s - transaction abort! 145s - rollback completed 145s - interrupted! 145s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 145s + *** failed to import extension "breakage" from /tmp/autopkgtest.NlWore/build.9Lk/src/tests/testlib/ext-break-git-import.py: b'hggit' 145s + abort: repository $TESTTMP/gitrepo not found 145s [255] 145s the leftover below appeared in Mercurial 5.9+; it is unintentional 145s $ ls -A hgrepo 145s - .git 145s - $ rm -rf hgrepo 145s + $ rm -rf hgrepo 145s 145s ERROR: test-transactions.t output changed 146s ! 146s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-outgoing.t 146s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-outgoing.t.err 146s @@ -14,166 +14,10 @@ 146s 146s $ cd .. 146s $ hg clone gitrepo hgrepo 146s - importing 1 git commits 146s - new changesets ff7a2f2d8d70 (1 drafts) 146s - updating to bookmark master 146s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 146s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 146s + abort: repository gitrepo not found 146s + [255] 146s 146s $ cd hgrepo 146s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 146s $ hg book 146s - alpha 0:ff7a2f2d8d70 146s - * master 0:ff7a2f2d8d70 146s - $ hg update -q master 146s - $ echo beta > beta 146s - $ hg add beta 146s - $ fn_hg_commit -m 'add beta' 146s - 146s - 146s - $ echo gamma > gamma 146s - $ hg add gamma 146s - $ fn_hg_commit -m 'add gamma' 146s - 146s - $ hg book -r 1 beta 146s - 146s - $ hg outgoing | grep -v 'searching for changes' 146s - comparing with $TESTTMP/gitrepo 146s - changeset: 1:47580592d3d6 146s - bookmark: beta 146s - user: test 146s - date: Mon Jan 01 00:00:11 2007 +0000 146s - summary: add beta 146s - 146s - changeset: 2:953796e1cfd8 146s - bookmark: master 146s - tag: tip 146s - user: test 146s - date: Mon Jan 01 00:00:12 2007 +0000 146s - summary: add gamma 146s - 146s - $ hg outgoing -r beta 146s - comparing with $TESTTMP/gitrepo 146s - searching for changes 146s - changeset: 1:47580592d3d6 146s - bookmark: beta 146s - user: test 146s - date: Mon Jan 01 00:00:11 2007 +0000 146s - summary: add beta 146s - 146s - $ hg outgoing -r master 146s - comparing with $TESTTMP/gitrepo 146s - searching for changes 146s - changeset: 1:47580592d3d6 146s - bookmark: beta 146s - user: test 146s - date: Mon Jan 01 00:00:11 2007 +0000 146s - summary: add beta 146s - 146s - changeset: 2:953796e1cfd8 146s - bookmark: master 146s - tag: tip 146s - user: test 146s - date: Mon Jan 01 00:00:12 2007 +0000 146s - summary: add gamma 146s - 146s - 146s - $ cd .. 146s - 146s -some more work on master from git 146s - $ cd gitrepo 146s - 146s -Check state of refs after outgoing 146s - $ git show-ref 146s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/alpha 146s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/master 146s - 146s - $ git checkout master 2>&1 | sed s/\'/\"/g 146s - Already on "master" 146s - $ echo delta > delta 146s - $ git add delta 146s - $ fn_git_commit -m "add delta" 146s - 146s - $ cd .. 146s - 146s - $ cd hgrepo 146s -this will fail # maybe we should try to make it work 146s - $ hg outgoing 146s - comparing with $TESTTMP/gitrepo 146s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 146s - [255] 146s -let's pull and try again 146s - $ hg pull 146s - pulling from */gitrepo (glob) 146s - importing 1 git commits 146s - not updating diverged bookmark master 146s - new changesets 25eed24f5e8f (1 drafts) 146s - (run 'hg heads' to see heads, 'hg merge' to merge) 146s - $ hg log --graph 146s - o changeset: 3:25eed24f5e8f 146s - | tag: default/master 146s - | tag: tip 146s - | parent: 0:ff7a2f2d8d70 146s - | user: test 146s - | date: Mon Jan 01 00:00:13 2007 +0000 146s - | summary: add delta 146s - | 146s - | @ changeset: 2:953796e1cfd8 146s - | | bookmark: master 146s - | | user: test 146s - | | date: Mon Jan 01 00:00:12 2007 +0000 146s - | | summary: add gamma 146s - | | 146s - | o changeset: 1:47580592d3d6 146s - |/ bookmark: beta 146s - | user: test 146s - | date: Mon Jan 01 00:00:11 2007 +0000 146s - | summary: add beta 146s - | 146s - o changeset: 0:ff7a2f2d8d70 146s - bookmark: alpha 146s - tag: default/alpha 146s - user: test 146s - date: Mon Jan 01 00:00:10 2007 +0000 146s - summary: add alpha 146s - 146s - $ hg outgoing 146s - comparing with $TESTTMP/gitrepo 146s - searching for changes 146s - changeset: 1:47580592d3d6 146s - bookmark: beta 146s - user: test 146s - date: Mon Jan 01 00:00:11 2007 +0000 146s - summary: add beta 146s - 146s - changeset: 2:953796e1cfd8 146s - bookmark: master 146s - user: test 146s - date: Mon Jan 01 00:00:12 2007 +0000 146s - summary: add gamma 146s - 146s - $ hg outgoing -r beta 146s - comparing with $TESTTMP/gitrepo 146s - searching for changes 146s - changeset: 1:47580592d3d6 146s - bookmark: beta 146s - user: test 146s - date: Mon Jan 01 00:00:11 2007 +0000 146s - summary: add beta 146s - 146s - $ hg outgoing -r master 146s - comparing with $TESTTMP/gitrepo 146s - searching for changes 146s - changeset: 1:47580592d3d6 146s - bookmark: beta 146s - user: test 146s - date: Mon Jan 01 00:00:11 2007 +0000 146s - summary: add beta 146s - 146s - changeset: 2:953796e1cfd8 146s - bookmark: master 146s - user: test 146s - date: Mon Jan 01 00:00:12 2007 +0000 146s - summary: add gamma 146s - 146s - 146s - 146s - $ cd .. 146s 146s ERROR: test-outgoing.t output changed 147s ! 147s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-gc.t 147s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-gc.t.err 147s @@ -25,188 +25,9 @@ 147s > done 147s $ cd .. 147s $ hg clone -U gitrepo hgrepo 147s - importing 100 git commits 147s - new changesets 1c8407413fa3:eda59117ba04 (100 drafts) 147s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 147s + abort: repository gitrepo not found 147s + [255] 147s $ cd hgrepo 147s + $TESTTMP.sh: 24: cd: can't cd to hgrepo 147s $ hg debug-remove-hggit-state 147s - clearing out the git cache data 147s - 147s ------------ 147s - 147s -Test garbage collection of loose objects into packs. We first test 147s -this with two threads, which is closest to the expected usage 147s -scenario, as almost all computers have at least two cores these days. 147s -The main downside is that this makes the output order unreliable, so 147s -we just sort it. 147s - 147s - $ hg gexport --config hggit.mapsavefrequency=33 --config hggit.threads=2 --debug | grep pack | sort 147s - packed 3 loose objects! 147s - packed 75 loose objects! 147s - packed 78 loose objects! 147s - packed 86 loose objects! 147s - packing 3 loose objects... 147s - packing 75 loose objects... 147s - packing 78 loose objects... 147s - packing 86 loose objects... 147s - $ hg debug-remove-hggit-state 147s - clearing out the git cache data 147s - 147s -Test the actual order of operations -- this uses a single thread, 147s -which means that the packing happens synchronously in the main thread, 147s -giving us a reliable output order. 147s - 147s -In addition, the transaction size is set up such that we happen to do 147s -nothing in the final, synchronous packing that happens on every pull. 147s -Lots of other tests have a map save frequency higher than the total 147s -amount of commits pulled, but let's just trigger that other odd 147s -occurence here. 147s - 147s - $ hg gexport --debug \ 147s - > --config hggit.mapsavefrequency=10 --config hggit.threads=1 | \ 147s - > sed 's/^converting revision.*/./' 147s - finding unexported changesets 147s - exporting 100 changesets 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 147s - packing 30 loose objects... 147s - packed 30 loose objects! 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 147s - packing 25 loose objects... 147s - packed 25 loose objects! 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 147s - packing 25 loose objects... 147s - packed 25 loose objects! 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 147s - packing 24 loose objects... 147s - packed 24 loose objects! 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 147s - packing 24 loose objects... 147s - packed 24 loose objects! 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 147s - packing 24 loose objects... 147s - packed 24 loose objects! 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 147s - packing 24 loose objects... 147s - packed 24 loose objects! 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 147s - packing 23 loose objects... 147s - packed 23 loose objects! 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 147s - packing 22 loose objects... 147s - packed 22 loose objects! 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - . 147s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 147s - packing 21 loose objects... 147s - packed 21 loose objects! 147s - packing 0 loose objects... 147s - packed 0 loose objects! 147s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 147s - $ find .hg/git/objects -type f | grep -Fv .idx | sort 147s - .hg/git/objects/pack/pack-33903607b479000b976a29a349fe0f4dffb0aaac.pack 147s - .hg/git/objects/pack/pack-40d9440e392d9eab62fa38a2ed66cc763d77aca3.pack 147s - .hg/git/objects/pack/pack-4ab2dac268f94e407788d52d6ba087b626c41651.pack 147s - .hg/git/objects/pack/pack-543e3b37bd36218a4dc6611a96d7c218afb78429.pack 147s - .hg/git/objects/pack/pack-5fc80292253ee10d1b86b5c4d9c51b29d2b4ba47.pack 147s - .hg/git/objects/pack/pack-9c636f5f16302fc5fadf0cc4ed42aeb67fc51f6a.pack 147s - .hg/git/objects/pack/pack-ae74b1f0197dfb45cfb13889453860a40103969a.pack 147s - .hg/git/objects/pack/pack-b432e2f477cb765fc0aeaa850d56e04b10392e6c.pack 147s - .hg/git/objects/pack/pack-cf7023660ce10ede2896d1be117f6ba93a261ff9.pack 147s - .hg/git/objects/pack/pack-e601b2af6a91a9cf6817d71f4eb660d2218d4094.pack 147s 147s ERROR: test-gc.t output changed 148s ! 148s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-phases-public.t 148s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-phases-public.t#publish-defaults.err 148s @@ -24,149 +24,10 @@ 148s 148s cloning with hggit.usephases publishes cloned HEAD 148s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 148s - importing 1 git commits 148s - new changesets ff7a2f2d8d70 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 148s + abort: repository gitrepo not found 148s + [255] 148s 148s $ cd hgrepo 148s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 148s $ hg phase -r master 148s - 0: public 148s - $ cd .. 148s - 148s -pulled changesets are public 148s - $ cd gitrepo 148s - $ git checkout -q master 148s - $ echo beta > beta 148s - $ git add beta 148s - $ fn_git_commit -m 'add beta' 148s - $ git checkout -b not-master 148s - Switched to a new branch 'not-master' 148s - $ echo gamma > gamma 148s - $ git add gamma 148s - $ fn_git_commit -m 'add gamma' 148s - $ git tag thetag 148s - $ echo delta > delta 148s - $ git add delta 148s - $ fn_git_commit -m 'add delta' 148s - $ git checkout master 148s - Switched to branch 'master' 148s - $ cd .. 148s - 148s - $ cd hgrepo 148s - $ cat >>$HGRCPATH < [paths] 148s - > other = $TESTTMP/gitrepo/.git 148s - > [hggit] 148s - > usephases = True 148s - > EOF 148s - 148s - $ hg phase -fd 'all()' 148s - 148s -we can restrict publishing to the remote HEAD and that tag, which 148s -happens to be the same thing here 148s - 148s -#if publish-specific 148s - $ cat >>$HGRCPATH < [git] 148s - > public = default/master, thetag 148s - > EOF 148s -#endif 148s - 148s -pulling publishes the branch 148s - 148s - $ hg phase -r master 148s - 0: draft 148s -#if publish-defaults 148s - $ hg pull -r master other 148s - pulling from $TESTTMP/gitrepo/.git 148s - importing 1 git commits 148s - updating bookmark master 148s - new changesets 7fe02317c63d 148s - 1 local changesets published 148s - (run 'hg update' to get a working copy) 148s -#else 148s - $ hg pull -r master other 148s - pulling from $TESTTMP/gitrepo/.git 148s - importing 1 git commits 148s - updating bookmark master 148s - new changesets 7fe02317c63d (1 drafts) 148s - (run 'hg update' to get a working copy) 148s -#endif 148s - $ hg phase -r master 148s - 1: draft (publish-specific !) 148s - 1: public (publish-defaults !) 148s -#if publish-defaults 148s - $ hg phase -fd master 148s - $ hg pull 148s - pulling from $TESTTMP/gitrepo 148s - importing 2 git commits 148s - adding bookmark not-master 148s - new changesets ca33a262eb46:03769a650ded (1 drafts) 148s - 1 local changesets published 148s - (run 'hg update' to get a working copy) 148s -#else 148s - $ hg pull 148s - pulling from $TESTTMP/gitrepo 148s - importing 2 git commits 148s - adding bookmark not-master 148s - new changesets ca33a262eb46:03769a650ded (1 drafts) 148s - 2 local changesets published 148s - (run 'hg update' to get a working copy) 148s -#endif 148s - $ hg phase -r master -r not-master -r thetag 148s - 1: public 148s - 3: draft 148s - 2: public 148s - 148s -public bookmark not pushed is not published after pull 148s - 148s - $ hg update 0 148s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 148s - $ echo delta > delta 148s - $ hg bookmark not-pushed 148s - $ hg add delta 148s - $ hg commit -m 'add delta' 148s - created new head 148s - $ hg phase -r 'all()' > $TESTTMP/before 148s - $ hg pull --config git.public=master,not-pushed 148s - pulling from $TESTTMP/gitrepo 148s - no changes found 148s - $ hg phase -r 'all()' > $TESTTMP/after 148s - $ cmp -s $TESTTMP/before $TESTTMP/after 148s - $ hg phase -r not-pushed 148s - 4: draft 148s - $ rm $TESTTMP/before $TESTTMP/after 148s - 148s -pushing public bookmark publishes local changesets, but only those 148s -actually pushed 148s - 148s - $ hg update master 148s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 148s - (activating bookmark master) 148s - $ echo epsilon > epsilon 148s - $ hg add epsilon 148s - $ hg commit -m 'add epsilon' 148s - created new head 148s - $ hg phase -r 'all() - master' > $TESTTMP/before 148s - $ hg push -B not-pushed 148s - pushing to $TESTTMP/gitrepo 148s - searching for changes 148s - adding objects 148s - remote: found 0 deltas to reuse 148s - added 1 commits with 1 trees and 1 blobs 148s - adding reference refs/heads/not-pushed 148s - $ hg phase -r 'all() - master' > $TESTTMP/after 148s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 148s - $ hg phase -r not-pushed -r master 148s - 4: draft 148s - 5: draft 148s - $ hg push -B master 148s - pushing to $TESTTMP/gitrepo 148s - searching for changes 148s - adding objects 148s - remote: found 0 deltas to reuse 148s - added 1 commits with 1 trees and 1 blobs 148s - updating reference refs/heads/master 148s - $ hg phase -r 'all() - master' > $TESTTMP/after 148s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 148s - $ hg phase -r master 148s - 5: public 148s 148s ERROR: test-phases-public.t#publish-defaults output changed 148s ! 148s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-phases-public.t 148s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-phases-public.t#publish-specific.err 148s @@ -24,149 +24,10 @@ 148s 148s cloning with hggit.usephases publishes cloned HEAD 148s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 148s - importing 1 git commits 148s - new changesets ff7a2f2d8d70 148s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 148s + abort: repository gitrepo not found 148s + [255] 148s 148s $ cd hgrepo 148s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 148s $ hg phase -r master 148s - 0: public 148s - $ cd .. 148s - 148s -pulled changesets are public 148s - $ cd gitrepo 148s - $ git checkout -q master 148s - $ echo beta > beta 148s - $ git add beta 148s - $ fn_git_commit -m 'add beta' 148s - $ git checkout -b not-master 148s - Switched to a new branch 'not-master' 148s - $ echo gamma > gamma 148s - $ git add gamma 148s - $ fn_git_commit -m 'add gamma' 148s - $ git tag thetag 148s - $ echo delta > delta 148s - $ git add delta 148s - $ fn_git_commit -m 'add delta' 148s - $ git checkout master 148s - Switched to branch 'master' 148s - $ cd .. 148s - 148s - $ cd hgrepo 148s - $ cat >>$HGRCPATH < [paths] 148s - > other = $TESTTMP/gitrepo/.git 148s - > [hggit] 148s - > usephases = True 148s - > EOF 148s - 148s - $ hg phase -fd 'all()' 148s - 148s -we can restrict publishing to the remote HEAD and that tag, which 148s -happens to be the same thing here 148s - 148s -#if publish-specific 148s - $ cat >>$HGRCPATH < [git] 148s - > public = default/master, thetag 148s - > EOF 148s -#endif 148s - 148s -pulling publishes the branch 148s - 148s - $ hg phase -r master 148s - 0: draft 148s -#if publish-defaults 148s - $ hg pull -r master other 148s - pulling from $TESTTMP/gitrepo/.git 148s - importing 1 git commits 148s - updating bookmark master 148s - new changesets 7fe02317c63d 148s - 1 local changesets published 148s - (run 'hg update' to get a working copy) 148s -#else 148s - $ hg pull -r master other 148s - pulling from $TESTTMP/gitrepo/.git 148s - importing 1 git commits 148s - updating bookmark master 148s - new changesets 7fe02317c63d (1 drafts) 148s - (run 'hg update' to get a working copy) 148s -#endif 148s - $ hg phase -r master 148s - 1: draft (publish-specific !) 148s - 1: public (publish-defaults !) 148s -#if publish-defaults 148s - $ hg phase -fd master 148s - $ hg pull 148s - pulling from $TESTTMP/gitrepo 148s - importing 2 git commits 148s - adding bookmark not-master 148s - new changesets ca33a262eb46:03769a650ded (1 drafts) 148s - 1 local changesets published 148s - (run 'hg update' to get a working copy) 148s -#else 148s - $ hg pull 148s - pulling from $TESTTMP/gitrepo 148s - importing 2 git commits 148s - adding bookmark not-master 148s - new changesets ca33a262eb46:03769a650ded (1 drafts) 148s - 2 local changesets published 148s - (run 'hg update' to get a working copy) 148s -#endif 148s - $ hg phase -r master -r not-master -r thetag 148s - 1: public 148s - 3: draft 148s - 2: public 148s - 148s -public bookmark not pushed is not published after pull 148s - 148s - $ hg update 0 148s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 148s - $ echo delta > delta 148s - $ hg bookmark not-pushed 148s - $ hg add delta 148s - $ hg commit -m 'add delta' 148s - created new head 148s - $ hg phase -r 'all()' > $TESTTMP/before 148s - $ hg pull --config git.public=master,not-pushed 148s - pulling from $TESTTMP/gitrepo 148s - no changes found 148s - $ hg phase -r 'all()' > $TESTTMP/after 148s - $ cmp -s $TESTTMP/before $TESTTMP/after 148s - $ hg phase -r not-pushed 148s - 4: draft 148s - $ rm $TESTTMP/before $TESTTMP/after 148s - 148s -pushing public bookmark publishes local changesets, but only those 148s -actually pushed 148s - 148s - $ hg update master 148s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 148s - (activating bookmark master) 148s - $ echo epsilon > epsilon 148s - $ hg add epsilon 148s - $ hg commit -m 'add epsilon' 148s - created new head 148s - $ hg phase -r 'all() - master' > $TESTTMP/before 148s - $ hg push -B not-pushed 148s - pushing to $TESTTMP/gitrepo 148s - searching for changes 148s - adding objects 148s - remote: found 0 deltas to reuse 148s - added 1 commits with 1 trees and 1 blobs 148s - adding reference refs/heads/not-pushed 148s - $ hg phase -r 'all() - master' > $TESTTMP/after 148s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 148s - $ hg phase -r not-pushed -r master 148s - 4: draft 148s - 5: draft 148s - $ hg push -B master 148s - pushing to $TESTTMP/gitrepo 148s - searching for changes 148s - adding objects 148s - remote: found 0 deltas to reuse 148s - added 1 commits with 1 trees and 1 blobs 148s - updating reference refs/heads/master 148s - $ hg phase -r 'all() - master' > $TESTTMP/after 148s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 148s - $ hg phase -r master 148s - 5: public 148s 148s ERROR: test-phases-public.t#publish-specific output changed 150s ! 150s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-push-r.t 150s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-push-r.t.err 150s @@ -2,34 +2,43 @@ 150s $ . "$TESTDIR/testutil" 150s 150s $ hg init test 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ cd test 150s $ cat >>afile < 0 150s > EOF 150s $ hg add afile 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ fn_hg_commit -m "0.0" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ cat >>afile < 1 150s > EOF 150s $ fn_hg_commit -m "0.1" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ cat >>afile < 2 150s > EOF 150s $ fn_hg_commit -m "0.2" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ cat >>afile < 3 150s > EOF 150s $ fn_hg_commit -m "0.3" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ hg update -C 0 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ cat >>afile < 1 150s > EOF 150s $ fn_hg_commit -m "1.1" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ cat >>afile < 2 150s > EOF 150s $ fn_hg_commit -m "1.2" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ cat >fred < a line 150s > EOF 150s @@ -37,13 +46,20 @@ 150s > 3 150s > EOF 150s $ hg add fred 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ fn_hg_commit -m "1.3" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ hg mv afile adifferentfile 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ fn_hg_commit -m "1.3m" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ hg update -C 3 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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, 2 files removed, 0 files unresolved 150s $ hg mv afile anotherfile 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ fn_hg_commit -m "0.3m" 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s $ cd .. 150s $ for i in 0 1 2 3 4 5 6 7 8; do 150s > mkdir test-"$i" 150s @@ -53,128 +69,166 @@ 150s > hg verify 150s > cd .. 150s > done 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s pushing to test-0 150s searching for changes 150s adding changesets 150s adding manifests 150s adding file changes 150s added 1 changesets with 1 changes to 1 files 150s - checking changesets 150s - checking manifests 150s - crosschecking files in changesets and manifests 150s - checking files 150s - checking dirstate (?) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + checking changesets 150s + checking dirstate (?) 150s + checking manifests 150s + crosschecking files in changesets and manifests 150s + checking files 150s + checking dirstate 150s checked 1 changesets with 1 changes to 1 files 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s pushing to test-1 150s searching for changes 150s adding changesets 150s adding manifests 150s + checking dirstate (?) 150s adding file changes 150s added 2 changesets with 2 changes to 1 files 150s - checking changesets 150s - checking manifests 150s - crosschecking files in changesets and manifests 150s - checking files 150s - checking dirstate (?) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + checking changesets 150s + checking manifests 150s + crosschecking files in changesets and manifests 150s + checking files 150s + checking dirstate 150s checked 2 changesets with 2 changes to 1 files 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + checking dirstate (?) 150s pushing to test-2 150s searching for changes 150s adding changesets 150s adding manifests 150s adding file changes 150s added 3 changesets with 3 changes to 1 files 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s checking changesets 150s checking manifests 150s crosschecking files in changesets and manifests 150s checking files 150s checking dirstate (?) 150s checked 3 changesets with 3 changes to 1 files 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s pushing to test-3 150s searching for changes 150s adding changesets 150s adding manifests 150s adding file changes 150s added 4 changesets with 4 changes to 1 files 150s - checking changesets 150s - checking manifests 150s - crosschecking files in changesets and manifests 150s - checking files 150s - checking dirstate (?) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + checking changesets 150s + checking dirstate (?) 150s + checking manifests 150s + crosschecking files in changesets and manifests 150s + checking files 150s + checking dirstate 150s checked 4 changesets with 4 changes to 1 files 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s pushing to test-4 150s searching for changes 150s adding changesets 150s adding manifests 150s + checking dirstate (?) 150s adding file changes 150s added 2 changesets with 2 changes to 1 files 150s - checking changesets 150s - checking manifests 150s - crosschecking files in changesets and manifests 150s - checking files 150s - checking dirstate (?) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + checking changesets 150s + checking manifests 150s + crosschecking files in changesets and manifests 150s + checking files 150s + checking dirstate 150s checked 2 changesets with 2 changes to 1 files 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + checking dirstate (?) 150s pushing to test-5 150s searching for changes 150s adding changesets 150s adding manifests 150s adding file changes 150s added 3 changesets with 3 changes to 1 files 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s checking changesets 150s checking manifests 150s crosschecking files in changesets and manifests 150s checking files 150s checking dirstate (?) 150s checked 3 changesets with 3 changes to 1 files 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s pushing to test-6 150s searching for changes 150s adding changesets 150s adding manifests 150s adding file changes 150s added 4 changesets with 5 changes to 2 files 150s - checking changesets 150s - checking manifests 150s - crosschecking files in changesets and manifests 150s - checking files 150s - checking dirstate (?) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + checking changesets 150s + checking dirstate (?) 150s + checking manifests 150s + crosschecking files in changesets and manifests 150s + checking files 150s + checking dirstate 150s checked 4 changesets with 5 changes to 2 files 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s pushing to test-7 150s searching for changes 150s adding changesets 150s adding manifests 150s adding file changes 150s added 5 changesets with 6 changes to 3 files 150s - checking changesets 150s - checking manifests 150s - crosschecking files in changesets and manifests 150s - checking files 150s - checking dirstate (?) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + checking changesets 150s + checking manifests 150s + crosschecking files in changesets and manifests 150s + checking files 150s + checking dirstate 150s checked 5 changesets with 6 changes to 3 files 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s pushing to test-8 150s searching for changes 150s adding changesets 150s adding manifests 150s adding file changes 150s added 5 changesets with 5 changes to 2 files 150s - checking changesets 150s - checking manifests 150s - crosschecking files in changesets and manifests 150s - checking files 150s - checking dirstate (?) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + checking changesets 150s + checking manifests 150s + crosschecking files in changesets and manifests 150s + checking files 150s + checking dirstate 150s checked 5 changesets with 5 changes to 2 files 150s $ cd test-8 150s $ hg pull ../test-7 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s pulling from ../test-7 150s searching for changes 150s adding changesets 150s adding manifests 150s adding file changes 150s + new changesets c29287bce33f:e70c8671c3d4 (?) 150s added 4 changesets with 2 changes to 3 files (+1 heads) 150s - new changesets c29287bce33f:e70c8671c3d4 (?) 150s + new changesets c29287bce33f:e70c8671c3d4 150s (run 'hg heads' to see heads, 'hg merge' to merge) 150s $ hg verify 150s - checking changesets 150s - checking manifests 150s - crosschecking files in changesets and manifests 150s - checking files 150s - checking dirstate (?) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + checking changesets 150s + checking manifests 150s + crosschecking files in changesets and manifests 150s + checking dirstate (?) 150s + checking files 150s + checking dirstate 150s checked 9 changesets with 7 changes to 4 files 150s 150s ERROR: test-push-r.t output changed 150s !s 150s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-invalid-refs.t 150s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-invalid-refs.t.err 150s @@ -12,115 +12,10 @@ 150s 150s $ cd .. 150s $ hg clone -U gitrepo hgrepo 150s - importing 1 git commits 150s - new changesets ff7a2f2d8d70 (1 drafts) 150s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 150s + abort: repository gitrepo not found 150s + [255] 150s 150s $ cd hgrepo 150s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 150s $ hg up master 150s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 150s - (activating bookmark master) 150s - $ fn_hg_tag alph#a 150s - $ fn_hg_tag bet*a 150s - $ fn_hg_tag 'gamm a' 150s - $ hg book -r . delt#a 150s - $ hg book -r . epsil*on 150s - 150s - $ hg gexport 150s - warning: not exporting tag 'bet*a' due to invalid name 150s - warning: not exporting bookmark 'epsil*on' due to invalid name 150s - 150s - $ hg push 150s - pushing to $TESTTMP/gitrepo 150s - warning: not exporting tag 'bet*a' due to invalid name 150s - warning: not exporting bookmark 'epsil*on' due to invalid name 150s - searching for changes 150s - adding objects 150s - remote: found 0 deltas to reuse 150s - added 3 commits with 3 trees and 3 blobs 150s - adding reference refs/heads/delt#a 150s - updating reference refs/heads/master 150s - adding reference refs/tags/alph#a 150s - adding reference refs/tags/gamm_a 150s - 150s - $ hg log --graph 150s - @ changeset: 3:0950ab44ea23 150s - | bookmark: delt#a 150s - | bookmark: epsil*on 150s - | bookmark: master 150s - | tag: default/delt#a 150s - | tag: default/master 150s - | tag: tip 150s - | user: test 150s - | date: Mon Jan 01 00:00:13 2007 +0000 150s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 150s - | 150s - o changeset: 2:0b27ab2b3df6 150s - | tag: gamm a 150s - | user: test 150s - | date: Mon Jan 01 00:00:12 2007 +0000 150s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 150s - | 150s - o changeset: 1:491ceeb1b0f1 150s - | tag: bet*a 150s - | user: test 150s - | date: Mon Jan 01 00:00:11 2007 +0000 150s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 150s - | 150s - o changeset: 0:ff7a2f2d8d70 150s - bookmark: not-master 150s - tag: alph#a 150s - tag: default/not-master 150s - user: test 150s - date: Mon Jan 01 00:00:10 2007 +0000 150s - summary: add alpha 150s - 150s - 150s - $ cd .. 150s - $ cd gitrepo 150s -git should have only the valid tag alph#a but have full commit log including the missing invalid bet*a tag commit 150s - $ git tag -l 150s - alph#a 150s - gamm_a 150s - 150s - $ cd .. 150s - $ hg clone -U gitrepo hgrepo2 150s - importing 4 git commits 150s - new changesets ff7a2f2d8d70:0950ab44ea23 (4 drafts) 150s - $ hg -R hgrepo2 log --graph 150s - o changeset: 3:0950ab44ea23 150s - | bookmark: delt#a 150s - | bookmark: master 150s - | tag: default/delt#a 150s - | tag: default/master 150s - | tag: tip 150s - | user: test 150s - | date: Mon Jan 01 00:00:13 2007 +0000 150s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 150s - | 150s - o changeset: 2:0b27ab2b3df6 150s - | tag: gamm a 150s - | tag: gamm_a 150s - | user: test 150s - | date: Mon Jan 01 00:00:12 2007 +0000 150s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 150s - | 150s - o changeset: 1:491ceeb1b0f1 150s - | tag: bet*a 150s - | user: test 150s - | date: Mon Jan 01 00:00:11 2007 +0000 150s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 150s - | 150s - o changeset: 0:ff7a2f2d8d70 150s - bookmark: not-master 150s - tag: alph#a 150s - tag: default/not-master 150s - user: test 150s - date: Mon Jan 01 00:00:10 2007 +0000 150s - summary: add alpha 150s - 150s - 150s -the tag should be in .hgtags 150s - $ hg cat -r master hgrepo2/.hgtags 150s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alph#a 150s - 491ceeb1b0f10d65d956dfcdd3470ac2bc2c96a8 bet*a 150s - 0b27ab2b3df69c6f7defd7040b93e539136db5be gamm a 150s 150s ERROR: test-invalid-refs.t output changed 151s ! 151s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-serve-hg.t 151s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-serve-hg.t#with-hggit.err 151s @@ -31,11 +31,11 @@ 151s $ cd .. 151s 151s $ hg clone gitrepo hgrepo 151s - importing 2 git commits 151s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 151s - updating to bookmark master 151s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 + [255] 151s $ cd hgrepo 151s + $TESTTMP.sh: 41: cd: can't cd to hgrepo 151s $ cat >> .hg/hgrc < [push] 151s > pushvars.server = true 151s @@ -45,81 +45,3 @@ 151s > [hooks] 151s > pretxnchangegroup = env | grep HG_USERVAR_ || true 151s > EOF 151s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 151s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 151s - 151s -Test server address cannot be reused 151s - 151s -#if windows 151s - $ hg serve -p $HGPORT1 2>&1 151s - abort: cannot start server at '*:$HGPORT1': * (glob) 151s - [255] 151s -#else 151s - $ hg serve -p $HGPORT1 2>&1 151s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 151s - [255] 151s -#endif 151s - $ cd .. 151s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 151s - 151s -Make sure that clone regular mercurial repos over http doesn't break, 151s -and that we can transfer the hg-git metadata 151s - 151s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 151s - requesting all changes 151s - adding changesets 151s - adding manifests 151s - adding file changes 151s - added 2 changesets with 4 changes to 4 files 151s - new changesets f488b65fa424:c61c38c3d614 (?) 151s - updating to branch default 151s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 151s - 151s -And it shouldn't create a Git repository needlessly: 151s - $ test -e copy/git 151s - [1] 151s - $ cd copy 151s - 151s -#if without-hggit 151s - $ hg tags 151s - tip 1:c61c38c3d614 151s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 151s - 1:c61c38c3d614 | master | | 151s - 0:f488b65fa424 | | | 151s - $ hg pull -u ../gitrepo 151s - pulling from ../gitrepo 151s - importing 2 git commits 151s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 151s -#else 151s - $ hg tags 151s - tip 1:c61c38c3d614 151s - thetag 0:f488b65fa424 151s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 151s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 151s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 151s - $ hg pull -u ../gitrepo 151s - pulling from ../gitrepo 151s - warning: created new git repository at $TESTTMP/copy/.hg/git 151s - no changes found 151s -#endif 151s - 151s - $ hg tags 151s - tip 1:c61c38c3d614 151s - thetag 0:f488b65fa424 151s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 151s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 151s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 151s - 151s -Furthermore, make sure that we pass all arguments when pushing: 151s - 151s - $ echo baz > baz 151s - $ fn_hg_commit -A -m baz 151s - $ hg push --pushvars FOO=BAR 151s - pushing to http://localhost:$HGPORT/ 151s - searching for changes 151s - remote: adding changesets 151s - remote: adding manifests 151s - remote: adding file changes 151s - remote: HG_USERVAR_FOO=BAR 151s - remote: added 1 changesets with 1 changes to 1 files 151s - $ cd .. 151s 151s ERROR: test-serve-hg.t#with-hggit output changed 151s ! 151s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-git-workflow.t 151s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-git-workflow.t.err 151s @@ -2,13 +2,20 @@ 151s $ . "$TESTDIR/testutil" 151s 151s $ hg init hgrepo 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s $ cd hgrepo 151s $ hg debuggitdir 151s - $TESTTMP/hgrepo/.hg/git 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s + hg: unknown command 'debuggitdir' 151s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 151s + [10] 151s $ echo alpha > alpha 151s $ hg add alpha 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s $ fn_hg_commit -m "add alpha" 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s $ hg log --graph --debug | grep -v phase: 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s @ changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 151s tag: tip 151s parent: -1:0000000000000000000000000000000000000000 151s @@ -27,49 +34,54 @@ 151s 151s configure for use from git 151s $ hg clone hgrepo gitrepo 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s updating to branch default 151s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 151s $ cd gitrepo 151s $ hg book master 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s $ hg up null 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 151s (leaving bookmark master) 151s $ echo "[git]" >> .hg/hgrc 151s $ echo "intree = True" >> .hg/hgrc 151s $ hg debuggitdir 151s - $TESTTMP/gitrepo/.git 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s + hg: unknown command 'debuggitdir' 151s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 151s + [10] 151s $ hg gexport 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s + hg: unknown command 'gexport' 151s + (did you mean one of export, import?) 151s + [10] 151s 151s do some work 151s $ git config core.bare false 151s + fatal: not in a git directory 151s + [128] 151s $ git checkout master 2>&1 | sed s/\'/\"/g 151s - Already on "master" 151s + fatal: not a git repository (or any of the parent directories): .git 151s $ echo beta > beta 151s $ git add beta 151s + fatal: not a git repository (or any of the parent directories): .git 151s + [128] 151s $ fn_git_commit -m 'add beta' 151s + fatal: not a git repository (or any of the parent directories): .git 151s + git commit error 151s 151s get things back to hg 151s $ hg gimport 151s - importing 1 git commits 151s - updating bookmark master 151s - new changesets 9f124f3c1fc2 (1 drafts) 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s + hg: unknown command 'gimport' 151s + (did you mean one of export, import?) 151s + [10] 151s $ hg log --graph --debug | grep -v phase: 151s - o changeset: 1:9f124f3c1fc29a14f5eb027c24811b0ac9d5ff10 151s - | bookmark: master 151s - | tag: tip 151s - | parent: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 151s - | parent: -1:0000000000000000000000000000000000000000 151s - | manifest: 1:f0bd6fbafbaebe4bb59c35108428f6fce152431d 151s - | user: test 151s - | date: Mon Jan 01 00:00:11 2007 +0000 151s - | files+: beta 151s - | extra: branch=default 151s - | extra: hg-git-rename-source=git 151s - | description: 151s - | add beta 151s - | 151s - | 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s o changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 151s + bookmark: master 151s + tag: tip 151s parent: -1:0000000000000000000000000000000000000000 151s parent: -1:0000000000000000000000000000000000000000 151s manifest: 0:8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0 151s @@ -83,7 +95,8 @@ 151s 151s gimport should have updated the bookmarks as well 151s $ hg bookmarks 151s - master 1:9f124f3c1fc2 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s + master 0:0221c246a567 151s 151s gimport support for git.mindate 151s $ cat >> .hg/hgrc << EOF 151s @@ -92,20 +105,23 @@ 151s > EOF 151s $ echo oldcommit > oldcommit 151s $ git add oldcommit 151s + fatal: not a git repository (or any of the parent directories): .git 151s + [128] 151s $ GIT_AUTHOR_DATE="2014-03-01 00:00:00 +0000" \ 151s > GIT_COMMITTER_DATE="2009-01-01 00:00:00 +0000" \ 151s > git commit -m oldcommit > /dev/null || echo "git commit error" 151s + fatal: not a git repository (or any of the parent directories): .git 151s + git commit error 151s $ hg gimport 151s - no changes found 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s + hg: unknown command 'gimport' 151s + (did you mean one of export, import?) 151s + [10] 151s $ hg log --graph 151s - o changeset: 1:9f124f3c1fc2 151s - | bookmark: master 151s - | tag: tip 151s - | user: test 151s - | date: Mon Jan 01 00:00:11 2007 +0000 151s - | summary: add beta 151s - | 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s o changeset: 0:0221c246a567 151s + bookmark: master 151s + tag: tip 151s user: test 151s date: Mon Jan 01 00:00:10 2007 +0000 151s summary: add alpha 151s @@ -113,32 +129,23 @@ 151s 151s $ echo newcommit > newcommit 151s $ git add newcommit 151s + fatal: not a git repository (or any of the parent directories): .git 151s + [128] 151s $ GIT_AUTHOR_DATE="2014-01-01 00:00:00 +0000" \ 151s > GIT_COMMITTER_DATE="2014-01-02 00:00:00 +0000" \ 151s > git commit -m newcommit > /dev/null || echo "git commit error" 151s + fatal: not a git repository (or any of the parent directories): .git 151s + git commit error 151s $ hg gimport 151s - importing 2 git commits 151s - updating bookmark master 151s - new changesets befdecd14df5:3d10b7289d79 (2 drafts) 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s + hg: unknown command 'gimport' 151s + (did you mean one of export, import?) 151s + [10] 151s $ hg log --graph 151s - o changeset: 3:3d10b7289d79 151s - | bookmark: master 151s - | tag: tip 151s - | user: test 151s - | date: Wed Jan 01 00:00:00 2014 +0000 151s - | summary: newcommit 151s - | 151s - o changeset: 2:befdecd14df5 151s - | user: test 151s - | date: Sat Mar 01 00:00:00 2014 +0000 151s - | summary: oldcommit 151s - | 151s - o changeset: 1:9f124f3c1fc2 151s - | user: test 151s - | date: Mon Jan 01 00:00:11 2007 +0000 151s - | summary: add beta 151s - | 151s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 151s o changeset: 0:0221c246a567 151s + bookmark: master 151s + tag: tip 151s user: test 151s date: Mon Jan 01 00:00:10 2007 +0000 151s summary: add alpha 151s 151s ERROR: test-git-workflow.t output changed 152s ! 152s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-serve-hg.t 152s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-serve-hg.t#without-hggit.err 152s @@ -31,11 +31,11 @@ 152s $ cd .. 152s 152s $ hg clone gitrepo hgrepo 152s - importing 2 git commits 152s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 152s - updating to bookmark master 152s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 152s + abort: repository gitrepo not found 152s + [255] 152s $ cd hgrepo 152s + $TESTTMP.sh: 36: cd: can't cd to hgrepo 152s $ cat >> .hg/hgrc < [push] 152s > pushvars.server = true 152s @@ -45,81 +45,3 @@ 152s > [hooks] 152s > pretxnchangegroup = env | grep HG_USERVAR_ || true 152s > EOF 152s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 152s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 152s - 152s -Test server address cannot be reused 152s - 152s -#if windows 152s - $ hg serve -p $HGPORT1 2>&1 152s - abort: cannot start server at '*:$HGPORT1': * (glob) 152s - [255] 152s -#else 152s - $ hg serve -p $HGPORT1 2>&1 152s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 152s - [255] 152s -#endif 152s - $ cd .. 152s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 152s - 152s -Make sure that clone regular mercurial repos over http doesn't break, 152s -and that we can transfer the hg-git metadata 152s - 152s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 152s - requesting all changes 152s - adding changesets 152s - adding manifests 152s - adding file changes 152s - added 2 changesets with 4 changes to 4 files 152s - new changesets f488b65fa424:c61c38c3d614 (?) 152s - updating to branch default 152s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 152s - 152s -And it shouldn't create a Git repository needlessly: 152s - $ test -e copy/git 152s - [1] 152s - $ cd copy 152s - 152s -#if without-hggit 152s - $ hg tags 152s - tip 1:c61c38c3d614 152s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 152s - 1:c61c38c3d614 | master | | 152s - 0:f488b65fa424 | | | 152s - $ hg pull -u ../gitrepo 152s - pulling from ../gitrepo 152s - importing 2 git commits 152s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 152s -#else 152s - $ hg tags 152s - tip 1:c61c38c3d614 152s - thetag 0:f488b65fa424 152s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 152s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 152s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 152s - $ hg pull -u ../gitrepo 152s - pulling from ../gitrepo 152s - warning: created new git repository at $TESTTMP/copy/.hg/git 152s - no changes found 152s -#endif 152s - 152s - $ hg tags 152s - tip 1:c61c38c3d614 152s - thetag 0:f488b65fa424 152s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 152s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 152s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 152s - 152s -Furthermore, make sure that we pass all arguments when pushing: 152s - 152s - $ echo baz > baz 152s - $ fn_hg_commit -A -m baz 152s - $ hg push --pushvars FOO=BAR 152s - pushing to http://localhost:$HGPORT/ 152s - searching for changes 152s - remote: adding changesets 152s - remote: adding manifests 152s - remote: adding file changes 152s - remote: HG_USERVAR_FOO=BAR 152s - remote: added 1 changesets with 1 changes to 1 files 152s - $ cd .. 152s 152s ERROR: test-serve-hg.t#without-hggit output changed 152s ! 152s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-push-authors.t 152s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-push-authors.t.err 152s @@ -8,127 +8,9 @@ 152s Create a Mercurial repository 152s 152s $ hg clone repo.git hgrepo 152s - updating to branch default 152s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 152s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 152s + abort: repository repo.git not found 152s + [255] 152s $ cd hgrepo 152s + $TESTTMP.sh: 8: cd: can't cd to hgrepo 152s $ hg book master 152s - 152s -Configure an author map 152s - 152s - $ touch authors.txt 152s - $ cat >> $HGRCPATH < [git] 152s - > authors = $TESTTMP/authors.txt 152s - > EOF 152s - 152s -Create a commit user that maps to a fully valid user 152s - 152s - $ cat >> $TESTTMP/authors.txt < user1 = User no. 1 152s - > EOF 152s - $ touch alpha 152s - $ hg add alpha 152s - $ fn_hg_commit -m alpha -u user1 152s - 152s -And one that maps to an email address 152s - 152s - $ cat >> $TESTTMP/authors.txt < user2@example.com = user2 152s - > EOF 152s - $ touch beta 152s - $ hg add beta 152s - $ fn_hg_commit -m beta -u user2@example.com 152s - 152s -And one that maps to a "simple" user 152s - 152s - $ cat >> $TESTTMP/authors.txt < User #3 = user3@example.com 152s - > EOF 152s - $ touch gamma 152s - $ hg add gamma 152s - $ fn_hg_commit -m gamma -u "User #3 " 152s - 152s -And one that maps to nothing 152s - 152s - $ cat >> $TESTTMP/authors.txt < user4 = 152s - > EOF 152s - $ touch delta 152s - $ hg add delta 152s - $ fn_hg_commit -m delta -u user4 152s - 152s -And one that doesn't map 152s - 152s - $ touch epsilon 152s - $ hg add epsilon 152s - $ fn_hg_commit -m epsilon -u "User #5 " 152s - 152s -Check the test default 152s - 152s - $ touch zeta 152s - $ hg add zeta 152s - $ fn_hg_commit -m zeta 152s - 152s -Push it! 152s - 152s - $ hg push 152s - pushing to $TESTTMP/repo.git 152s - searching for changes 152s - adding objects 152s - remote: found 0 deltas to reuse 152s - added 6 commits with 6 trees and 1 blobs 152s - adding reference refs/heads/master 152s - 152s -Check the results: 152s - 152s - $ hg log --template='Commit: {gitnode}\nAuthor: {author}\n---\n' 152s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 152s - Author: test 152s - --- 152s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 152s - Author: User #5 152s - --- 152s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 152s - Author: user4 152s - --- 152s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 152s - Author: User #3 152s - --- 152s - Commit: eba936dd13172a2f17936785e3604845aed9170d 152s - Author: user2@example.com 152s - --- 152s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 152s - Author: user1 152s - --- 152s - $ cd ../repo.git 152s - $ cat $TESTTMP/authors.txt 152s - user1 = User no. 1 152s - user2@example.com = user2 152s - User #3 = user3@example.com 152s - user4 = 152s - $ git log --pretty='tformat:Commit: %H%nAuthor: %an <%ae>%nCommitter: %cn <%ce>%n---' 152s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 152s - Author: test 152s - Committer: test 152s - --- 152s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 152s - Author: User #5 152s - Committer: User #5 152s - --- 152s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 152s - Author: 152s - Committer: 152s - --- 152s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 152s - Author: user3@example.com 152s - Committer: user3@example.com 152s - --- 152s - Commit: eba936dd13172a2f17936785e3604845aed9170d 152s - Author: user2 152s - Committer: user2 152s - --- 152s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 152s - Author: User no. 1 152s - Committer: User no. 1 152s - --- 152s - $ cd .. 152s 152s ERROR: test-push-authors.t output changed 153s ! 153s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-push-to-head.t 153s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-push-to-head.t.err 153s @@ -14,65 +14,9 @@ 153s Clone it, and push back to master: 153s 153s $ hg clone gitrepo hgrepo 153s - importing 1 git commits 153s - new changesets ff7a2f2d8d70 (1 drafts) 153s - updating to bookmark master 153s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 153s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 153s + abort: repository gitrepo not found 153s + [255] 153s $ cd hgrepo 153s + $TESTTMP.sh: 18: cd: can't cd to hgrepo 153s $ echo beta > beta 153s - $ fn_hg_commit -A -m "add beta" 153s - 153s -The output is confusing, and this even more-so: 153s - 153s - $ hg push 153s - pushing to $TESTTMP/gitrepo 153s - searching for changes 153s - adding objects 153s - remote: found 0 deltas to reuse 153s - remote: error: refusing to update checked out branch: refs/heads/master 153s - remote: error: By default, updating the current branch in a non-bare repository 153s - remote: is denied, because it will make the index and work tree inconsistent 153s - remote: with what you pushed, and will require 'git reset --hard' to match 153s - remote: the work tree to HEAD. 153s - remote: 153s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 153s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 153s - remote: its current branch; however, this is not recommended unless you 153s - remote: arranged to update its work tree to match what you pushed in some 153s - remote: other way. 153s - remote: 153s - remote: To squelch this message and still keep the default behaviour, set 153s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 153s - added 1 commits with 1 trees and 1 blobs 153s - warning: failed to update refs/heads/master; branch is currently checked out 153s - 153s - $ hg push 153s - pushing to $TESTTMP/gitrepo 153s - searching for changes 153s - adding objects 153s - remote: found 0 deltas to reuse 153s - remote: error: refusing to update checked out branch: refs/heads/master 153s - remote: error: By default, updating the current branch in a non-bare repository 153s - remote: is denied, because it will make the index and work tree inconsistent 153s - remote: with what you pushed, and will require 'git reset --hard' to match 153s - remote: the work tree to HEAD. 153s - remote: 153s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 153s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 153s - remote: its current branch; however, this is not recommended unless you 153s - remote: arranged to update its work tree to match what you pushed in some 153s - remote: other way. 153s - remote: 153s - remote: To squelch this message and still keep the default behaviour, set 153s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 153s - added 1 commits with 1 trees and 1 blobs 153s - warning: failed to update refs/heads/master; branch is currently checked out 153s - 153s -Show that it really didn't get pushed: 153s - 153s - $ hg tags 153s - tip 1:47580592d3d6 153s - default/master 0:ff7a2f2d8d70 153s - $ cd ../gitrepo 153s - $ git log --all --oneline --decorate 153s - 7eeab2e (HEAD -> master) add alpha 153s 153s ERROR: test-push-to-head.t output changed 153s ! 153s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-orphan-tags.t 153s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-orphan-tags.t.err 153s @@ -61,17 +61,17 @@ 153s Create a Mercurial clone 153s 153s $ hg clone -U repo.git hgrepo 153s - importing 4 git commits 153s - new changesets b8e77484829b:387d03400596 (4 drafts) 153s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ hg outgoing -R hgrepo 153s - comparing with $TESTTMP/repo.git 153s - searching for changes 153s - no changes found 153s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 153s + abort: repository hgrepo not found 153s + [255] 153s + $ hg push --debug -R hgrepo | grep -e reference -e found 153s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 153s + abort: repository hgrepo not found 153s [1] 153s - $ hg push --debug -R hgrepo | grep -e reference -e found 153s - unchanged reference default::refs/heads/master => GIT:996e5084 153s - unchanged reference default::refs/tags/the_tag => GIT:e4338156 153s - no changes found 153s 153s Verify that we can push this tag, and that outgoing doesn't report 153s them (#358) 153s @@ -83,33 +83,5 @@ 153s To $TESTTMP/repo.git 153s - [deleted] the_tag 153s $ cd ../hgrepo 153s + $TESTTMP.sh: 72: cd: can't cd to ../hgrepo 153s $ hg outgoing 153s - comparing with $TESTTMP/repo.git 153s - searching for changes 153s - changeset: 2:7b35eb0afb3f 153s - tag: the_tag 153s - user: test 153s - date: Mon Jan 01 00:00:12 2007 +0000 153s - summary: add foo3 153s - 153s - $ hg push --debug 153s - pushing to $TESTTMP/repo.git 153s - finding unexported changesets 153s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 153s - searching for changes 153s - remote: counting objects: 5, done. 153s - 1 commits found 153s - list of commits: 153s - e12852326ef72772e9696b008ad6546b5266ff13 153s - adding objects 153s - remote: counting objects: 5, done. 153s - remote: found 0 deltas to reuse 153s - added 1 commits with 1 trees and 0 blobs 153s - unchanged reference default::refs/heads/master => GIT:996e5084 153s - adding reference default::refs/tags/the_tag => GIT:e4338156 153s - $ cd ../gitrepo 153s - $ git fetch 153s - From $TESTTMP/repo 153s - * [new tag] the_tag -> the_tag 153s - $ git tag -ln 153s - the_tag Tag message 153s 153s ERROR: test-orphan-tags.t output changed 155s ! 155s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-verify-fail.t 155s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-verify-fail.t.err 155s @@ -25,6 +25,7 @@ 155s $ cd .. 155s 155s $ hg init hgrepo 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s $ cd hgrepo 155s $ echo normalf > normalf 155s $ echo differentf2 > differentf 155s @@ -32,63 +33,93 @@ 155s $ echo exef > exef 155s $ ln -s foo linkf 155s $ hg add normalf differentf unexpectedf exef linkf 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s $ fn_hg_commit -m 'add files' 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s $ git clone --mirror ../gitrepo .hg/git 155s Cloning into bare repository '.hg/git'... 155s done. 155s $ echo "$(cd ../gitrepo && git rev-parse HEAD) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s $ hg gverify 155s - verifying rev 3f1601c3cf54 against git commit 039c1cd9fdda382c9d1e8ec85de6b5b59518ca80 155s - difference in: differentf 155s - file has different flags: exef (hg '', git 'x') 155s - file has different flags: linkf (hg 'l', git '') 155s - file found in git but not hg: missingf 155s - file found in hg but not git: unexpectedf 155s - [1] 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ echo newf > newf 155s $ hg add newf 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s $ fn_hg_commit -m 'new hg commit' 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s $ hg gverify 155s - abort: no git commit found for rev 4e582b4eb862 155s - (if this is an octopus merge, verify against the last rev) 155s - [255] 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 invalid git SHA 155s $ echo "ffffffffffffffffffffffffffffffffffffffff $(hg log -r . --template '{node}')" >> .hg/git-mapfile 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s $ hg gverify 155s - abort: git equivalent ffffffffffffffffffffffffffffffffffffffff for rev 4e582b4eb862 not found! 155s - [255] 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 git SHA is not a commit 155s $ echo new2 >> newf 155s $ fn_hg_commit -m 'new hg commit 2' 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s this gets the tree pointed to by the commit at HEAD 155s $ echo "$(cd ../gitrepo && git show --format=%T HEAD | head -n 1) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s $ hg gverify 155s - abort: git equivalent f477b00e4a9907617f346a529cc0fe9ba5d6f6d3 for rev 5c2eb98af3e2 is not a commit! 155s - [255] 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 corrupt git repository 155s 155s $ hg debug-remove-hggit-state 155s - clearing out the git cache data 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s + hg: unknown command 'debug-remove-hggit-state' 155s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 155s + [10] 155s $ hg gexport 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 155s + hg: unknown command 'gexport' 155s + (did you mean one of export, import?) 155s + [10] 155s $ mv .hg/git/objects/pack $TESTTMP/pack-old 155s $ for packfile in $TESTTMP/pack-old/*.pack 155s > do 155s > git --git-dir .hg/git unpack-objects < $packfile 155s > done 155s + $TESTTMP.sh: 78: cannot open $TESTTMP/pack-old/*.pack: No such file 155s + [2] 155s $ mv -f .hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 155s + mv: cannot stat '.hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e': No such file or directory 155s + [1] 155s $ hg gverify --fsck 155s - abort: git repository is corrupt! 155s - [255] 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ hg gverify 155s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is not a commit! 155s - [255] 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ chmod +w .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 155s + chmod: cannot access '.hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74': No such file or directory 155s + [1] 155s $ echo 42 > .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 155s + $TESTTMP.sh: 89: cannot create .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74: Directory nonexistent 155s + [2] 155s $ hg gverify 155s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is corrupt! 155s - (re-run with --traceback for details) 155s - [255] 155s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 ERROR: test-verify-fail.t output changed 156s ! 156s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-push-missing-commit.t 156s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-push-missing-commit.t.err 156s @@ -22,75 +22,9 @@ 156s clone it and create a commit building on the git history 156s 156s $ hg clone -U repo.git hgrepo 156s - importing 1 git commits 156s - new changesets fb68c5a534ce (1 drafts) 156s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 156s + abort: repository repo.git not found 156s + [255] 156s $ cd hgrepo 156s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 156s $ hg up -q master 156s - $ echo other > thefile 156s - $ fn_hg_commit -m 'change thefile' 156s - $ cd .. 156s - 156s -now remove the git commit from the cache repository used internally by 156s -hg-git — actually, changing `git.intree` is equivalent to this, and how 156s -a user noticed it in #376. 156s - 156s - $ rm -rf hgrepo/.hg/git 156s - 156s -what happens when we push it? 156s - 156s - $ hg -R hgrepo push 156s - pushing to $TESTTMP/repo.git 156s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 156s - abort: cannot push git commit 533d4e670a8b as it is not present locally 156s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 156s - [255] 156s - 156s -try to follow the hint: 156s - 156s -(and just to see that the warning is useful, try re-resetting first) 156s - 156s - $ rm -rf hgrepo/.hg/git hgrepo/.git 156s - $ hg -R hgrepo pull 156s - pulling from $TESTTMP/repo.git 156s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 156s - no changes found 156s - not updating diverged bookmark master 156s - $ hg -R hgrepo push 156s - pushing to $TESTTMP/repo.git 156s - searching for changes 156s - adding objects 156s - remote: found 0 deltas to reuse 156s - added 1 commits with 1 trees and 1 blobs 156s - updating reference refs/heads/master 156s - 156s -and as an extra test, what if we want to push a commit that's 156s -converted, but gone? 156s - 156s -simply pushing doesn't suffice: 156s - 156s - $ cd hgrepo 156s - $ rm -rf .hg/git 156s - $ hg push 156s - pushing to $TESTTMP/repo.git 156s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 156s - searching for changes 156s - no changes found 156s - [1] 156s - $ cd .. 156s - 156s -but we can't create another commit building on the git history, export 156s -it, and push: 156s - 156s - $ cd hgrepo 156s - $ echo not that > thefile 156s - $ fn_hg_commit -m 'change thefile again' 156s - $ hg gexport 156s - $ rm -rf .hg/git 156s - $ hg push 156s - pushing to $TESTTMP/repo.git 156s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 156s - searching for changes 156s - abort: cannot push git commit 61619410916a as it is not present locally 156s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 156s - [255] 156s - $ cd .. 156s 156s ERROR: test-push-missing-commit.t output changed 156s ! 156s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-hg-branch.t 156s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-hg-branch.t.err 156s @@ -12,82 +12,10 @@ 156s 156s $ cd .. 156s $ hg clone gitrepo hgrepo 156s - importing 1 git commits 156s - new changesets ff7a2f2d8d70 (1 drafts) 156s - updating to bookmark not-master 156s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 156s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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: 20: cd: can't cd to hgrepo 156s $ hg co master 156s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 156s - (activating bookmark master) 156s - $ hg mv alpha beta 156s - $ fn_hg_commit -m 'rename alpha to beta' 156s - $ hg push 156s - pushing to $TESTTMP/gitrepo 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 - updating reference refs/heads/master 156s - 156s - $ hg branch gamma | grep -v 'permanent and global' 156s - marked working directory as branch gamma 156s - $ fn_hg_commit -m 'started branch gamma' 156s - $ hg push 156s - pushing to $TESTTMP/gitrepo 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 - updating reference refs/heads/master 156s - 156s - $ hg log --graph 156s - @ changeset: 2:400db38f4f64 156s - | branch: gamma 156s - | bookmark: master 156s - | tag: default/master 156s - | tag: tip 156s - | user: test 156s - | date: Mon Jan 01 00:00:12 2007 +0000 156s - | summary: started branch gamma 156s - | 156s - o changeset: 1:3baa67317a4d 156s - | user: test 156s - | date: Mon Jan 01 00:00:11 2007 +0000 156s - | summary: rename alpha to beta 156s - | 156s - o changeset: 0:ff7a2f2d8d70 156s - bookmark: not-master 156s - tag: default/not-master 156s - user: test 156s - date: Mon Jan 01 00:00:10 2007 +0000 156s - summary: add alpha 156s - 156s - 156s - $ cd .. 156s - $ hg clone -U gitrepo hgrepo2 156s - importing 3 git commits 156s - new changesets ff7a2f2d8d70:400db38f4f64 (3 drafts) 156s - $ hg -R hgrepo2 log --graph 156s - o changeset: 2:400db38f4f64 156s - | branch: gamma 156s - | bookmark: master 156s - | tag: default/master 156s - | tag: tip 156s - | user: test 156s - | date: Mon Jan 01 00:00:12 2007 +0000 156s - | summary: started branch gamma 156s - | 156s - o changeset: 1:3baa67317a4d 156s - | user: test 156s - | date: Mon Jan 01 00:00:11 2007 +0000 156s - | summary: rename alpha to beta 156s - | 156s - o changeset: 0:ff7a2f2d8d70 156s - bookmark: not-master 156s - tag: default/not-master 156s - user: test 156s - date: Mon Jan 01 00:00:10 2007 +0000 156s - summary: add alpha 156s - 156s 156s ERROR: test-hg-branch.t output changed 156s ! 156s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-pull-after-strip.t 156s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-pull-after-strip.t.err 156s @@ -15,82 +15,9 @@ 156s 156s $ cd .. 156s $ hg clone -U gitrepo hgrepo 156s - importing 2 git commits 156s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 156s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ cd hgrepo 156s + $TESTTMP.sh: 26: cd: can't cd to hgrepo 156s $ hg up master 156s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 156s - (activating bookmark master) 156s - $ hg log --graph 156s - @ changeset: 1:7fe02317c63d 156s - | bookmark: master 156s - | tag: default/master 156s - | tag: thetag 156s - | tag: tip 156s - | user: test 156s - | date: Mon Jan 01 00:00:11 2007 +0000 156s - | summary: add beta 156s - | 156s - o changeset: 0:ff7a2f2d8d70 156s - user: test 156s - date: Mon Jan 01 00:00:10 2007 +0000 156s - summary: add alpha 156s - 156s - $ cd ../gitrepo 156s - $ echo beta line 2 >> beta 156s - $ git add beta 156s - $ fn_git_commit -m 'add to beta' 156s - 156s - $ cd .. 156s - $ cd hgrepo 156s - $ hg debugstrip --no-backup tip 156s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 156s - $ hg pull 156s - pulling from $TESTTMP/gitrepo 156s - importing 1 git commits 156s - abort: you appear to have run strip - please run hg git-cleanup 156s - [255] 156s - $ hg tags 156s - tip 0:ff7a2f2d8d70 156s - $ hg git-cleanup 156s - git commit map cleaned 156s - 156s -pull works after 'hg git-cleanup' 156s - 156s - $ hg pull 156s - pulling from $TESTTMP/gitrepo 156s - importing 2 git commits 156s - updating bookmark master 156s - new changesets 7fe02317c63d:cc1e605d90db (2 drafts) 156s - (run 'hg update' to get a working copy) 156s - $ hg log --graph 156s - o changeset: 2:cc1e605d90db 156s - | bookmark: master 156s - | tag: default/master 156s - | tag: tip 156s - | user: test 156s - | date: Mon Jan 01 00:00:12 2007 +0000 156s - | summary: add to beta 156s - | 156s - o changeset: 1:7fe02317c63d 156s - | tag: thetag 156s - | user: test 156s - | date: Mon Jan 01 00:00:11 2007 +0000 156s - | summary: add beta 156s - | 156s - @ changeset: 0:ff7a2f2d8d70 156s - user: test 156s - date: Mon Jan 01 00:00:10 2007 +0000 156s - summary: add alpha 156s - 156s - 156s - $ cd .. 156s - 156s -Check that we also remove bad refs: 156s - 156s - $ cd hgrepo 156s - $ echo e93b671cb24bff41779187edff99178e2597c2 > .hg/git/refs/tags/bad-tag 156s - $ hg git-cleanup 156s - git commit map cleaned 156s - $ test -e .hg/git/refs/tags/bad-tag 156s - [1] 156s 156s ERROR: test-pull-after-strip.t output changed 157s ! 157s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-subrepos-syntax.t 157s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-subrepos-syntax.t.err 157s @@ -38,54 +38,9 @@ 157s $ cd .. 157s 157s $ hg clone -U repo.git hgrepo 157s - importing 3 git commits 157s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ cd hgrepo 157s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 157s $ hg up master 157s - Cloning into '$TESTTMP/hgrepo/subrepo1'... 157s - done. 157s - Cloning into '$TESTTMP/hgrepo/xyz/subrepo2'... 157s - done. 157s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 157s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 157s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 157s - (activating bookmark master) 157s - $ cat >> .hgsub < # this is a comment 157s - > [subpaths] 157s - > flaf = blyf 157s - > EOF 157s - $ fn_hg_commit -m 'add comment & subsection' 157s - $ hg push 157s - pushing to $TESTTMP/repo.git 157s - searching for changes 157s - adding objects 157s - remote: found 0 deltas to reuse 157s - added 1 commits with 1 trees and 0 blobs 157s - updating reference refs/heads/master 157s - $ cd .. 157s - 157s - $ cd gitrepo 157s - $ git pull --ff-only 157s - From $TESTTMP/repo 157s - 89c22d7..106b34e master -> origin/master 157s - Updating 89c22d7..106b34e 157s - Fast-forward 157s - $ cat .gitmodules 157s - [submodule "subrepo1"] 157s - path = subrepo1 157s - url = ../gitsubrepo 157s - [submodule "xyz/subrepo2"] 157s - path = xyz/subrepo2 157s - url = ../gitsubrepo 157s - $ cd .. 157s - 157s -We broke bidirectionality: 157s - 157s - $ hg clone -U repo.git hgrepo2 157s - importing 4 git commits 157s - new changesets e532b2bfda10:cbf584fe001b (4 drafts) 157s - $ hg id -r tip hgrepo 157s - c58a542b18bc default/master/tip master 157s - $ hg id -r tip hgrepo2 157s - cbf584fe001b default/master/tip master 157s 157s ERROR: test-subrepos-syntax.t output changed 157s ! 157s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-gitignore.t 157s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-gitignore.t.err 157s @@ -2,12 +2,14 @@ 157s $ . "$TESTDIR/testutil" 157s 157s $ hg init repo 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s $ cd repo 157s 157s Create a commit that we can export later on 157s 157s $ touch thefile 157s $ hg commit -A -m "initial commit" 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s adding thefile 157s 157s We should only read .gitignore files in a hg-git repo (i.e. one with .hg/git 157s @@ -18,6 +20,7 @@ 157s $ touch bar 157s $ echo 'foo*' > .gitignore 157s $ hg status 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s ? .gitignore 157s ? bar 157s ? foo 157s @@ -27,103 +30,140 @@ 157s it's gone: 157s 157s $ hg gexport 157s - $ hg status 157s - ? .gitignore 157s - ? bar 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s + hg: unknown command 'gexport' 157s + (did you mean one of export, import?) 157s + [10] 157s + $ hg status 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s + ? .gitignore 157s + ? bar 157s + ? foo 157s + ? foobar 157s 157s $ echo '*bar' > .gitignore 157s $ hg status 157s - ? .gitignore 157s - ? foo 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s + ? .gitignore 157s + ? bar 157s + ? foo 157s + ? foobar 157s 157s $ mkdir dir 157s $ touch dir/foo 157s $ echo 'foo' > .gitignore 157s $ hg status 157s - ? .gitignore 157s - ? bar 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s + ? .gitignore 157s + ? bar 157s + ? dir/foo 157s + ? foo 157s ? foobar 157s 157s $ echo '/foo' > .gitignore 157s $ hg status 157s - ? .gitignore 157s - ? bar 157s - ? dir/foo 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s + ? .gitignore 157s + ? bar 157s + ? dir/foo 157s + ? foo 157s ? foobar 157s 157s $ rm .gitignore 157s $ echo 'foo' > dir/.gitignore 157s $ hg status 157s - ? bar 157s - ? dir/.gitignore 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s + ? bar 157s + ? dir/.gitignore 157s + ? dir/foo 157s ? foo 157s ? foobar 157s 157s $ touch dir/bar 157s $ echo 'bar' > .gitignore 157s $ hg status 157s - ? .gitignore 157s - ? dir/.gitignore 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s + ? .gitignore 157s + ? bar 157s + ? dir/.gitignore 157s + ? dir/bar 157s + ? dir/foo 157s ? foo 157s ? foobar 157s 157s $ echo '/bar' > .gitignore 157s $ hg status 157s - ? .gitignore 157s - ? dir/.gitignore 157s - ? dir/bar 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s + ? .gitignore 157s + ? bar 157s + ? dir/.gitignore 157s + ? dir/bar 157s + ? dir/foo 157s ? foo 157s ? foobar 157s 157s $ echo 'foo*' > .gitignore 157s $ echo '!*bar' >> .gitignore 157s $ hg status 157s - .gitignore: unsupported ignore pattern '!*bar' 157s - ? .gitignore 157s - ? bar 157s - ? dir/.gitignore 157s - ? dir/bar 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s + ? .gitignore 157s + ? bar 157s + ? dir/.gitignore 157s + ? dir/bar 157s + ? dir/foo 157s + ? foo 157s + ? foobar 157s 157s $ echo '.hg/' > .gitignore 157s $ hg status 157s - ? .gitignore 157s - ? bar 157s - ? dir/.gitignore 157s - ? dir/bar 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s + ? .gitignore 157s + ? bar 157s + ? dir/.gitignore 157s + ? dir/bar 157s + ? dir/foo 157s ? foo 157s ? foobar 157s 157s $ echo 'dir/.hg/' > .gitignore 157s $ hg status 157s - ? .gitignore 157s - ? bar 157s - ? dir/.gitignore 157s - ? dir/bar 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s + ? .gitignore 157s + ? bar 157s + ? dir/.gitignore 157s + ? dir/bar 157s + ? dir/foo 157s ? foo 157s ? foobar 157s 157s $ echo '.hg/foo' > .gitignore 157s $ hg status 157s - ? .gitignore 157s - ? bar 157s - ? dir/.gitignore 157s - ? dir/bar 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s + ? .gitignore 157s + ? bar 157s + ? dir/.gitignore 157s + ? dir/bar 157s + ? dir/foo 157s ? foo 157s ? foobar 157s 157s $ touch foo.hg 157s $ echo 'foo.hg' > .gitignore 157s $ hg status 157s - ? .gitignore 157s - ? bar 157s - ? dir/.gitignore 157s - ? dir/bar 157s - ? foo 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s + ? .gitignore 157s + ? bar 157s + ? dir/.gitignore 157s + ? dir/bar 157s + ? dir/foo 157s + ? foo 157s + ? foo.hg 157s ? foobar 157s $ rm foo.hg 157s 157s $ touch .hgignore 157s $ hg status 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s ? .gitignore 157s ? .hgignore 157s ? bar 157s @@ -137,6 +177,7 @@ 157s $ echo 'foo.*$(?> .hgignore 157s $ echo 'dir/foo' >> .hgignore 157s $ hg status 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s ? .gitignore 157s ? .hgignore 157s ? bar 157s @@ -145,14 +186,18 @@ 157s ? foobar 157s 157s $ hg add .gitignore 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s $ hg commit -m "add and commit .gitignore" 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s $ rm .gitignore 157s $ rm .hgignore 157s $ hg status 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s ! .gitignore 157s ? bar 157s ? dir/.gitignore 157s ? dir/bar 157s + ? dir/foo 157s ? foo 157s ? foobar 157s 157s @@ -164,6 +209,7 @@ 157s > foo( 157s > EOF 157s $ hg status --config ui.ignore=$TESTTMP/invalidhgignore 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s abort: $TESTTMP/invalidhgignore: invalid pattern (relre): foo( 157s [255] 157s 157s @@ -172,5 +218,6 @@ 157s > foo( 157s > EOF 157s $ hg status 157s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 157s abort: $TESTTMP/repo/.hgignore: invalid pattern (relre): foo( 157s [255] 157s 157s ERROR: test-gitignore.t output changed 157s ! 157s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-merge.t 157s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-merge.t.err 157s @@ -30,60 +30,11 @@ 157s $ git init -q --bare repo.git 157s 157s $ hg clone gitrepo hgrepo 157s - importing 4 git commits 157s - new changesets ff7a2f2d8d70:89ca4a68d6b9 (4 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.NlWore/build.9Lk/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: 40: cd: can't cd to hgrepo 157s 157s clear the cache to be sure it is regenerated correctly 157s $ hg debug-remove-hggit-state 157s - clearing out the git cache data 157s - $ hg push ../repo.git 157s - pushing to ../repo.git 157s - searching for changes 157s - adding objects 157s - remote: found 0 deltas to reuse 157s - added 4 commits with 4 trees and 3 blobs 157s - adding reference refs/heads/beta 157s - adding reference refs/heads/master 157s - 157s - $ cd .. 157s -git log in repo pushed from hg 157s - $ git --git-dir=repo.git log --pretty=medium master | sed 's/\.\.\.//g' 157s - commit 5806851511aaf3bfe813ae3a86c5027165fa9b96 157s - Merge: e5023f9 9497a4e 157s - Author: test 157s - Date: Mon Jan 1 00:00:12 2007 +0000 157s - 157s - Merge branch 'beta' 157s - 157s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 157s - Author: test 157s - Date: Mon Jan 1 00:00:12 2007 +0000 157s - 157s - add gamma 157s - 157s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 157s - Author: test 157s - Date: Mon Jan 1 00:00:11 2007 +0000 157s - 157s - add beta 157s - 157s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 157s - Author: test 157s - Date: Mon Jan 1 00:00:10 2007 +0000 157s - 157s - add alpha 157s - $ git --git-dir=repo.git log --pretty=medium beta | sed 's/\.\.\.//g' 157s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 157s - Author: test 157s - Date: Mon Jan 1 00:00:11 2007 +0000 157s - 157s - add beta 157s - 157s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 157s - Author: test 157s - Date: Mon Jan 1 00:00:10 2007 +0000 157s - 157s - add alpha 157s 157s ERROR: test-merge.t output changed 158s ! 158s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-hg-tags.t 158s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-hg-tags.t.err 158s @@ -16,69 +16,10 @@ 158s 158s $ cd .. 158s $ hg clone -U repo.git hgrepo 158s - importing 1 git commits 158s - new changesets ff7a2f2d8d70 (1 drafts) 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 158s $ cd hgrepo 158s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 158s $ hg co master 158s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 158s - (activating bookmark master) 158s - $ fn_hg_tag alpha 158s - $ hg push 158s - pushing to $TESTTMP/repo.git 158s - searching for changes 158s - adding objects 158s - remote: found 0 deltas to reuse 158s - added 1 commits with 1 trees and 1 blobs 158s - updating reference refs/heads/master 158s - adding reference refs/tags/alpha 158s - 158s - $ hg log --graph 158s - @ changeset: 1:e8b150f84560 158s - | bookmark: master 158s - | tag: default/master 158s - | tag: tip 158s - | user: test 158s - | date: Mon Jan 01 00:00:11 2007 +0000 158s - | summary: Added tag alpha for changeset ff7a2f2d8d70 158s - | 158s - o changeset: 0:ff7a2f2d8d70 158s - tag: alpha 158s - user: test 158s - date: Mon Jan 01 00:00:10 2007 +0000 158s - summary: add alpha 158s - 158s - 158s - $ cd .. 158s - $ cd gitrepo 158s -git should have the tag alpha 158s - $ git fetch origin 158s - From $TESTTMP/repo 158s - 7eeab2e..bbae830 master -> origin/master 158s - * [new tag] alpha -> alpha 158s - $ cd .. 158s - 158s - $ hg clone repo.git hgrepo2 158s - importing 2 git commits 158s - new changesets ff7a2f2d8d70:e8b150f84560 (2 drafts) 158s - updating to bookmark master 158s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 158s - $ hg -R hgrepo2 log --graph 158s - @ changeset: 1:e8b150f84560 158s - | bookmark: master 158s - | tag: default/master 158s - | tag: tip 158s - | user: test 158s - | date: Mon Jan 01 00:00:11 2007 +0000 158s - | summary: Added tag alpha for changeset ff7a2f2d8d70 158s - | 158s - o changeset: 0:ff7a2f2d8d70 158s - tag: alpha 158s - user: test 158s - date: Mon Jan 01 00:00:10 2007 +0000 158s - summary: add alpha 158s - 158s - 158s -the tag should be in .hgtags 158s - $ cat hgrepo2/.hgtags 158s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alpha 158s 158s ERROR: test-hg-tags.t output changed 158s ! 158s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-multiple-remotes.t 158s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-multiple-remotes.t.err 158s @@ -14,6 +14,7 @@ 158s $ git clone --bare --quiet gitrepo repo.git 158s 158s $ hg init hgrepo 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 158s $ cd hgrepo 158s $ cat > .hg/hgrc < [paths] 158s @@ -26,52 +27,28 @@ 158s > EOF 158s 158s $ hg pull 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 158s pulling from $TESTTMP/gitrepo 158s - importing 1 git commits 158s - adding bookmark master 158s - adding bookmark not-master 158s - new changesets ff7a2f2d8d70 (1 drafts) 158s - (run 'hg update' to get a working copy) 158s - pulling from $TESTTMP/repo.git 158s - no changes found 158s + abort: repository $TESTTMP/gitrepo not found 158s + [255] 158s $ hg tags 158s - tip 0:ff7a2f2d8d70 158s - git/not-master 0:ff7a2f2d8d70 158s - git/master 0:ff7a2f2d8d70 158s - bare/not-master 0:ff7a2f2d8d70 158s - bare/master 0:ff7a2f2d8d70 158s - also-git/not-master 0:ff7a2f2d8d70 158s - also-git/master 0:ff7a2f2d8d70 158s - also-bare/not-master 0:ff7a2f2d8d70 158s - also-bare/master 0:ff7a2f2d8d70 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 158s + tip -1:000000000000 158s 158s $ hg up master 158s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 158s - (activating bookmark master) 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 158s + abort: unknown revision 'master' 158s + [10] 158s $ echo beta > beta 158s $ fn_hg_commit -A -m "add beta" 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 158s $ hg push 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 158s pushing to $TESTTMP/gitrepo 158s - searching for changes 158s - adding objects 158s - remote: found 0 deltas to reuse 158s - added 1 commits with 1 trees and 1 blobs 158s - updating reference refs/heads/master 158s - pushing to $TESTTMP/repo.git 158s - searching for changes 158s - adding objects 158s - remote: found 0 deltas to reuse 158s - added 1 commits with 1 trees and 1 blobs 158s - updating reference refs/heads/master 158s + abort: repository $TESTTMP/gitrepo not found 158s + [255] 158s 158s $ hg tags 158s - tip 1:47580592d3d6 158s - git/master 1:47580592d3d6 158s - bare/master 1:47580592d3d6 158s - also-git/master 1:47580592d3d6 158s - also-bare/master 1:47580592d3d6 158s - git/not-master 0:ff7a2f2d8d70 158s - bare/not-master 0:ff7a2f2d8d70 158s - also-git/not-master 0:ff7a2f2d8d70 158s - also-bare/not-master 0:ff7a2f2d8d70 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 158s + tip 0:59e1f63242de 158s 158s 158s ERROR: test-multiple-remotes.t output changed 158s ! 158s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-hg-clone.t 158s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-hg-clone.t.err 158s @@ -11,88 +11,17 @@ 158s $ cd .. 158s 158s $ hg clone -U gitrepo hgrepo 158s - importing 1 git commits 158s - new changesets ff7a2f2d8d70 (1 drafts) 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 158s + abort: repository gitrepo not found 158s + [255] 158s 158s By default, the Git state isn't preserved across a copying/linking 158s clone 158s 158s $ hg clone -U hgrepo otherhgrepo 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 158s + abort: repository hgrepo not found 158s + [255] 158s $ cd otherhgrepo 158s + $TESTTMP.sh: 22: cd: can't cd to otherhgrepo 158s $ find .hg -name 'git*' | sort 158s - $ hg tags -v 158s - tip 0:ff7a2f2d8d70 158s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 158s - $ cd .. 158s - $ rm -r otherhgrepo 158s - 158s -Nor using a pull clone 158s - 158s - $ hg clone -U --pull hgrepo otherhgrepo 158s - requesting all changes 158s - adding changesets 158s - adding manifests 158s - adding file changes 158s - added 1 changesets with 1 changes to 1 files 158s - new changesets ff7a2f2d8d70 158s - $ cd otherhgrepo 158s - $ find .hg -name 'git*' | sort 158s - $ hg tags -v 158s - tip 0:ff7a2f2d8d70 158s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 158s - $ cd .. 158s - $ rm -r otherhgrepo 158s - 158s -But we can enable it! 158s - 158s - $ cat >> $HGRCPATH < [experimental] 158s - > hg-git-serve = yes 158s - > EOF 158s - 158s -Check transferring between Mercurial repositories using a 158s -copying/linking clone 158s - 158s - $ hg clone -U hgrepo otherhgrepo 158s - $ cd otherhgrepo 158s - $ find .hg -name 'git*' | sort 158s - $ hg tags -q 158s - tip 158s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 158s - $ cd .. 158s - 158s -Checking using a pull clone 158s - 158s - $ rm -rf otherhgrepo 158s - $ hg clone -U --pull hgrepo otherhgrepo 158s - requesting all changes 158s - adding changesets 158s - adding manifests 158s - adding file changes 158s - added 1 changesets with 1 changes to 1 files 158s - new changesets ff7a2f2d8d70 158s - $ cd otherhgrepo 158s - $ hg tags -q 158s - tip 158s - alpha 158s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 158s - 0:ff7a2f2d8d70 7eeab2ea75ec 158s - $ cd .. 158s - 158s -Can we repopulate the state from a Mercurial repository? 158s - 158s - $ cd otherhgrepo 158s - $ hg debug-remove-hggit-state 158s - clearing out the git cache data 158s - $ hg log -qr 'fromgit()' 158s - $ hg tags 158s - tip 0:ff7a2f2d8d70 158s - $ hg pull 158s - pulling from $TESTTMP/hgrepo 158s - searching for changes 158s - no changes found 158s - $ hg log -qr 'fromgit()' 158s - $ hg tags 158s - tip 0:ff7a2f2d8d70 158s - 158s -Sadly, no. 158s 158s ERROR: test-hg-clone.t output changed 158s ! 158s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-push-detached.t 158s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-push-detached.t.err 158s @@ -40,37 +40,9 @@ 158s in this case continues to work. 158s 158s $ hg clone gitrepo hgrepo 158s - importing 1 git commits 158s - new changesets ff7a2f2d8d70 (1 drafts) 158s - updating to bookmark master 158s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 158s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 158s + abort: repository gitrepo not found 158s + [255] 158s $ cd hgrepo 158s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 158s $ echo beta > beta 158s - $ hg add beta 158s - $ fn_hg_commit -m "add beta" 158s - 158s -Pushing that changeset, with phases, publishes the detached HEAD. 158s -Whether this should happen is debatable, but it's a side effect from 158s -the fact that pushing to the remote HEAD, with HEAD being the usual 158s -symref, should publish it. 158s - 158s - $ hg push -v --config hggit.usephases=yes 158s - pushing to $TESTTMP/gitrepo 158s - finding unexported changesets 158s - exporting 1 changesets 158s - converting revision 47580592d3d6492421a1e6cebc5c2d701a2e858b 158s - packing 3 loose objects... 158s - searching for changes 158s - remote: counting objects: 5, done. 158s - 1 commits found 158s - adding objects 158s - remote: counting objects: 5, done. 158s - remote: found 0 deltas to reuse 158s - added 1 commits with 1 trees and 1 blobs 158s - updating reference default::refs/heads/master => GIT:0f378ab6 158s - publishing remote HEAD 158s - $ hg phase 'all()' 158s - 0: public 158s - 1: draft 158s - $ cd .. 158s - 158s 158s ERROR: test-push-detached.t output changed 159s ! 159s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-serve-git.t 159s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-serve-git.t.err 159s @@ -33,28 +33,14 @@ 159s Make sure that clone over the old git protocol doesn't break 159s 159s $ hg clone -U git://localhost:$HGPORT/test copy 2>&1 159s - \r (no-eol) (esc) 159s - Counting objects 1/6 [=====> ]\r (no-eol) (esc) 159s - Counting objects 2/6 [===========> ]\r (no-eol) (esc) 159s - Counting objects 3/6 [=================> ]\r (no-eol) (esc) 159s - Counting objects 4/6 [=======================> ]\r (no-eol) (esc) 159s - Counting objects 5/6 [=============================> ]\r (no-eol) (esc) 159s - Counting objects 6/6 [===================================>]\r (no-eol) (esc) 159s - \r (no-eol) (esc) 159s - \r (no-eol) (esc) 159s - Compressing objects 1/3 [==========> ]\r (no-eol) (esc) 159s - Compressing objects 2/3 [=====================> ]\r (no-eol) (esc) 159s - Compressing objects 3/3 [================================>]\r (no-eol) (esc) 159s - \r (no-eol) (esc) 159s - \r (no-eol) (esc) 159s - importing commits 1/2 b23744d34f97 [======> ]\r (no-eol) (esc) 159s - importing commits 2/2 3af9773036a9 [=============>]\r (no-eol) (esc) 159s - \r (no-eol) (esc) 159s - importing 2 git commits 159s - new changesets c4d188f6e13d:221dd250e933 159s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 159s + abort: repository git://localhost:$HGPORT/test not found 159s + [255] 159s $ hg log -T 'HG:{node|short} GIT:{gitnode|short}\n' -R copy 159s - HG:221dd250e933 GIT:3af9773036a9 159s - HG:c4d188f6e13d GIT:b23744d34f97 159s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 159s + abort: repository copy not found 159s + [255] 159s $ hg tags -v -R copy 159s - tip 1:221dd250e933 159s - default/master 1:221dd250e933 git-remote 159s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 159s + abort: repository copy not found 159s + [255] 159s 159s ERROR: test-serve-git.t output changed 161s ! 161s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-convergedmerge.t 161s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-convergedmerge.t.err 161s @@ -2,29 +2,39 @@ 161s $ . "$TESTDIR/testutil" 161s 161s $ hg init hgrepo1 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s $ cd hgrepo1 161s $ echo A > afile 161s $ hg add afile 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s $ hg ci -m "origin" 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s 161s $ echo B > afile 161s $ hg ci -m "A->B" 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s 161s $ echo C > afile 161s $ hg ci -m "B->C" 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s 161s $ hg up -r0 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 161s $ echo C > afile 161s $ hg ci -m "A->C" 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s created new head 161s 161s $ hg merge -r2 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 161s (branch merge, don't forget to commit) 161s $ hg ci -m "merge" 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s 161s $ hg log --graph --style compact | sed 's/\[.*\]//g' 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s @ 4:3,2 eaa21d002113 1970-01-01 00:00 +0000 test 161s |\ merge 161s | | 161s @@ -47,36 +57,23 @@ 161s 161s $ cd hgrepo1 161s $ hg bookmark -r4 master 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s $ hg push -r master ../repo.git 161s - pushing to ../repo.git 161s - searching for changes 161s - adding objects 161s - remote: found 0 deltas to reuse 161s - added 5 commits with 3 trees and 3 blobs 161s - adding reference refs/heads/master 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s + abort: repository ../repo.git does not exist 161s + [255] 161s $ cd .. 161s 161s $ hg clone repo.git hgrepo2 161s - importing 5 git commits 161s - new changesets 5d1a6b64f9d0:eaa21d002113 (5 drafts) 161s - updating to bookmark master 161s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s + abort: repository repo.git not found 161s + [255] 161s expect the same revision ids as above 161s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 161s - @ 4:1,3 eaa21d002113 1970-01-01 00:00 +0000 test 161s - |\ merge 161s - | | 161s - | o 3 0dbe4ac1a758 1970-01-01 00:00 +0000 test 161s - | | B->C 161s - | | 161s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 161s - | | A->B 161s - | | 161s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 161s - |/ A->C 161s - | 161s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 161s - origin 161s - 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s + abort: repository hgrepo2 not found 161s $ hg -R hgrepo2 gverify 161s - verifying rev eaa21d002113 against git commit fb8c9e2afe5418cfff337eeed79fad5dd58826f0 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s + hg: unknown command 'gverify' 161s + (did you mean verify?) 161s + [10] 161s 161s ERROR: test-convergedmerge.t output changed 161s ! 161s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-conflict-2.t 161s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-conflict-2.t.err 161s @@ -2,30 +2,40 @@ 161s $ . "$TESTDIR/testutil" 161s 161s $ hg init hgrepo1 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s $ cd hgrepo1 161s $ echo A > afile 161s $ hg add afile 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s $ hg ci -m "origin" 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s 161s $ echo B > afile 161s $ hg ci -m "A->B" 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s 161s $ hg up -r0 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 161s $ echo C > afile 161s $ hg ci -m "A->C" 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s created new head 161s 161s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s warning: conflicts.* (re) 161s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 161s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 161s resolve using second parent 161s $ echo B > afile 161s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s $ hg ci -m "merge to B" 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s 161s $ hg log --graph --style compact | sed 's/\[.*\]//g' 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s @ 3:2,1 120385945d08 1970-01-01 00:00 +0000 test 161s |\ merge to B 161s | | 161s @@ -45,31 +55,18 @@ 161s 161s $ cd hgrepo1 161s $ hg bookmark -r tip master 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s $ hg push -r master ../repo.git 161s - pushing to ../repo.git 161s - searching for changes 161s - adding objects 161s - remote: found 0 deltas to reuse 161s - added 4 commits with 3 trees and 3 blobs 161s - adding reference refs/heads/master 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s + abort: repository ../repo.git does not exist 161s + [255] 161s $ cd .. 161s 161s $ hg clone repo.git hgrepo2 161s - importing 4 git commits 161s - new changesets 5d1a6b64f9d0:120385945d08 (4 drafts) 161s - updating to bookmark master 161s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s + abort: repository repo.git not found 161s + [255] 161s expect the same revision ids as above 161s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 161s - @ 3:1,2 120385945d08 1970-01-01 00:00 +0000 test 161s - |\ merge to B 161s - | | 161s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 161s - | | A->B 161s - | | 161s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 161s - |/ A->C 161s - | 161s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 161s - origin 161s - 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s + abort: repository hgrepo2 not found 161s 161s ERROR: test-conflict-2.t output changed 161s ! 161s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-phases-draft.t 161s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-phases-draft.t.err 161s @@ -12,73 +12,10 @@ 161s cloning without hggit.usephases does not publish local changesets 161s $ cd .. 161s $ hg clone gitrepo hgrepo | grep -v '^updating' 161s - importing 1 git commits 161s - new changesets ff7a2f2d8d70 (1 drafts) 161s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 161s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 161s + abort: repository gitrepo not found 161s + [1] 161s 161s $ cd hgrepo 161s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 161s $ hg phase -r master 161s - 0: draft 161s - 161s -pulling advances the draft phase, though 161s - 161s - $ hg phase -fs 0 161s - $ hg pull 161s - pulling from $TESTTMP/gitrepo 161s - no changes found 161s - $ hg phase tip 161s - 0: draft 161s - 161s -even if we don't have a name? 161s - 161s - $ hg phase -fs 0 161s - $ mv .hg/hgrc .hg/hgrc.bak 161s - $ hg pull ../gitrepo 161s - pulling from ../gitrepo 161s - no changes found 161s - $ hg phase tip 161s - 0: draft 161s - $ mv .hg/hgrc.bak .hg/hgrc 161s - $ cd .. 161s - 161s - 161s -pulling without hggit.usephases does not publish local changesets 161s - $ cd gitrepo 161s - $ git checkout -q master 161s - $ echo beta > beta 161s - $ git add beta 161s - $ fn_git_commit -m 'add beta' 161s - $ cd .. 161s - 161s - $ cd hgrepo 161s - $ hg pull 161s - pulling from $TESTTMP/gitrepo 161s - importing 1 git commits 161s - updating bookmark master 161s - new changesets 7fe02317c63d (1 drafts) 161s - (run 'hg update' to get a working copy) 161s - $ hg phase -r master 161s - 1: draft 161s - 161s -pulling with git.public does not publish local changesets 161s - $ hg --config git.public=master pull 161s - pulling from $TESTTMP/gitrepo 161s - no changes found 161s - $ hg phase -r master 161s - 1: draft 161s - 161s -pushing without hggit.usephases does not publish local changesets 161s - $ hg update master 161s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 161s - $ echo gamma > gamma 161s - $ hg add gamma 161s - $ hg commit -m 'gamma' 161s - $ hg push 161s - pushing to $TESTTMP/gitrepo 161s - searching for changes 161s - adding objects 161s - remote: found 0 deltas to reuse 161s - added 1 commits with 1 trees and 1 blobs 161s - updating reference refs/heads/master 161s - $ hg phase -r master 161s - 2: draft 161s 161s ERROR: test-phases-draft.t output changed 162s ! 162s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-subrepos-push.t 162s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-subrepos-push.t.err 162s @@ -5,10 +5,13 @@ 162s Initialized empty Git repository in $TESTTMP/repo.git/ 162s 162s $ hg init hgsubrepo 162s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 162s $ cd hgsubrepo 162s $ echo thefile > thefile 162s $ hg add thefile 162s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 162s $ fn_hg_commit -m 'add thefile' 162s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 162s $ cd .. 162s 162s $ git init gitsubrepo 162s @@ -20,59 +23,9 @@ 162s $ cd .. 162s 162s $ hg clone repo.git hgrepo 162s - updating to branch default 162s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 162s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 162s + abort: repository repo.git not found 162s + [255] 162s $ cd hgrepo 162s + $TESTTMP.sh: 32: cd: can't cd to hgrepo 162s $ hg book master 162s - $ echo alpha > alpha 162s - $ hg add alpha 162s - $ fn_hg_commit -m 'add alpha' 162s - $ touch .hgsub 162s - $ hg add .hgsub 162s - $ fn_hg_commit -m "add .hgsub" 162s - $ hg clone -q ../hgsubrepo hg 162s - $ echo "hg = ../hgsubrepo" >> .hgsub 162s - $ fn_hg_commit -m 'add hg subrepo' 162s - $ git clone --quiet ../gitsubrepo git 162s - $ echo "git = [git]../gitsubrepo" >> .hgsub 162s - $ fn_hg_commit -m 'add git subrepo' 162s - $ hg push 162s - pushing to $TESTTMP/repo.git 162s - pushing subrepo hg to $TESTTMP/hgsubrepo 162s - searching for changes 162s - no changes found 162s - searching for changes 162s - adding objects 162s - remote: found 0 deltas to reuse 162s - added 4 commits with 2 trees and 2 blobs 162s - adding reference refs/heads/master 162s - $ cat .hgsub 162s - hg = ../hgsubrepo 162s - git = [git]../gitsubrepo 162s - $ cat .hgsubstate 162s - aaae5224095dca7403147c0e20cbac1f450b0e95 git 162s - df643c539c7541d48eacc76745581e00cbaf3d45 hg 162s - $ cd .. 162s - 162s -Now clone it. Note that no Mercurial state persists: 162s - 162s - $ git clone --recurse-submodules repo.git gitrepo 162s - Cloning into 'gitrepo'... 162s - done. 162s - Submodule 'git' ($TESTTMP/gitsubrepo) registered for path 'git' 162s - Cloning into '$TESTTMP/gitrepo/git'... 162s - done. 162s - Submodule path 'git': checked out 'aaae5224095dca7403147c0e20cbac1f450b0e95' 162s - $ cd gitrepo 162s - $ ls -A 162s - .git 162s - .gitmodules 162s - alpha 162s - git 162s - $ cat .gitmodules 162s - [submodule "git"] 162s - path = git 162s - url = ../gitsubrepo 162s - $ ls -A git 162s - .git 162s - thefile 162s 162s ERROR: test-subrepos-push.t output changed 163s ! 163s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-conflict-1.t 163s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-conflict-1.t.err 163s @@ -2,30 +2,40 @@ 163s $ . "$TESTDIR/testutil" 163s 163s $ hg init hgrepo1 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s $ cd hgrepo1 163s $ echo A > afile 163s $ hg add afile 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s $ hg ci -m "origin" 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s 163s $ echo B > afile 163s $ hg ci -m "A->B" 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s 163s $ hg up -r0 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 163s $ echo C > afile 163s $ hg ci -m "A->C" 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s created new head 163s 163s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s warning: conflicts.* (re) 163s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 163s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 163s resolve using first parent 163s $ echo C > afile 163s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s $ hg ci -m "merge to C" 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s 163s $ hg log --graph --style compact | sed 's/\[.*\]//g' 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s @ 3:2,1 6c53bc0f062f 1970-01-01 00:00 +0000 test 163s |\ merge to C 163s | | 163s @@ -45,31 +55,18 @@ 163s 163s $ cd hgrepo1 163s $ hg bookmark -r tip master 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s $ hg push -r master ../repo.git 163s - pushing to ../repo.git 163s - searching for changes 163s - adding objects 163s - remote: found 0 deltas to reuse 163s - added 4 commits with 3 trees and 3 blobs 163s - adding reference refs/heads/master 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s + abort: repository ../repo.git does not exist 163s + [255] 163s $ cd .. 163s 163s $ hg clone repo.git hgrepo2 163s - importing 4 git commits 163s - new changesets 5d1a6b64f9d0:6c53bc0f062f (4 drafts) 163s - updating to bookmark master 163s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s + abort: repository repo.git not found 163s + [255] 163s expect the same revision ids as above 163s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 163s - @ 3:1,2 6c53bc0f062f 1970-01-01 00:00 +0000 test 163s - |\ merge to C 163s - | | 163s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 163s - | | A->B 163s - | | 163s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 163s - |/ A->C 163s - | 163s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 163s - origin 163s - 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 163s + abort: repository hgrepo2 not found 163s 163s ERROR: test-conflict-1.t output changed 163s ! 163s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-pull-after-obsolete.t 163s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-pull-after-obsolete.t.err 163s @@ -20,52 +20,9 @@ 163s 163s $ cd .. 163s $ hg clone -U gitrepo hgrepo 163s - importing 2 git commits 163s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 163s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/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 $ cd hgrepo 163s + $TESTTMP.sh: 31: cd: can't cd to hgrepo 163s $ hg up master 163s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 163s - (activating bookmark master) 163s - $ hg log --graph 163s - @ changeset: 1:7fe02317c63d 163s - | bookmark: master 163s - | tag: default/master 163s - | tag: thetag 163s - | tag: tip 163s - | user: test 163s - | date: Mon Jan 01 00:00:11 2007 +0000 163s - | summary: add beta 163s - | 163s - o changeset: 0:ff7a2f2d8d70 163s - user: test 163s - date: Mon Jan 01 00:00:10 2007 +0000 163s - summary: add alpha 163s - 163s - $ cd ../gitrepo 163s - $ echo beta line 2 >> beta 163s - $ git add beta 163s - $ fn_git_commit -m 'add to beta' 163s - 163s -Create a commit, obsolete it, and pull, to ensure that we can pull if 163s -the tipmost commit is hidden. 163s - 163s - $ cd ../hgrepo 163s - $ hg bookmark --inactive 163s - $ echo gamma > gamma 163s - $ hg add gamma 163s - $ fn_hg_commit -m 'add gamma' 163s - $ hg up master 163s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 163s - (activating bookmark master) 163s - $ hg log -T '{rev}:{node} {desc}\n' -r tip 163s - 2:4090a1266584bc1a47ce562e9349b1e0f1b44611 add gamma 163s - $ hg debugobsolete 4090a1266584bc1a47ce562e9349b1e0f1b44611 163s - 1 new obsolescence markers 163s - obsoleted 1 changesets 163s - 163s - $ hg pull 163s - pulling from $TESTTMP/gitrepo 163s - importing 1 git commits 163s - updating bookmark master 163s - new changesets cc1e605d90db (1 drafts) 163s - (run 'hg update' to get a working copy) 163s 163s ERROR: test-pull-after-obsolete.t output changed 164s ! 164s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-git-clone.t 164s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-git-clone.t.err 164s @@ -14,30 +14,24 @@ 164s $ cd .. 164s 164s $ hg clone gitrepo hgrepo 164s - importing 2 git commits 164s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 164s - updating to bookmark master 164s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 164s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 164s + abort: repository gitrepo not found 164s + [255] 164s $ hg -R hgrepo log --graph 164s - @ changeset: 1:7fe02317c63d 164s - | bookmark: master 164s - | tag: default/master 164s - | tag: tip 164s - | user: test 164s - | date: Mon Jan 01 00:00:11 2007 +0000 164s - | summary: add beta 164s - | 164s - o changeset: 0:ff7a2f2d8d70 164s - user: test 164s - date: Mon Jan 01 00:00:10 2007 +0000 164s - summary: add alpha 164s - 164s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 164s + abort: repository hgrepo not found 164s + [255] 164s 164s we should have some bookmarks 164s $ hg -R hgrepo book 164s - * master 1:7fe02317c63d 164s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 164s + abort: repository hgrepo not found 164s + [255] 164s $ hg -R hgrepo gverify 164s - verifying rev 7fe02317c63d against git commit 9497a4ee62e16ee641860d7677cdb2589ea15554 164s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 164s + hg: unknown command 'gverify' 164s + (did you mean verify?) 164s + [10] 164s 164s test for ssh vulnerability 164s 164s @@ -47,16 +41,18 @@ 164s > EOF 164s 164s $ hg clone -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 164s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 164s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 164s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 164s [255] 164s $ hg clone -q 'git+ssh://%2DoProxyCommand=rm${IFS}nonexistent/path' 164s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 164s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 164s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 164s [255] 164s $ hg clone -q 'git+ssh://fakehost|rm${IFS}nonexistent/path' 164s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 164s - abort: git remote error: The remote server unexpectedly closed the connection. 164s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 164s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 164s [255] 164s $ hg clone -q 'git+ssh://fakehost%7Crm${IFS}nonexistent/path' 164s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 164s - abort: git remote error: The remote server unexpectedly closed the connection. 164s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 164s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 164s [255] 164s 164s ERROR: test-git-clone.t output changed 164s ! 164s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-git-gpg.t 164s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-git-gpg.t.err 164s @@ -55,23 +55,10 @@ 164s Hg clone it 164s 164s $ hg clone gitrepo hgrepo 164s - importing 2 git commits 164s - new changesets ab60c5e55bd6:[0-9a-f]{12,12} \(2 drafts\) (re) 164s - updating to bookmark signed 164s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 164s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 164s + abort: repository gitrepo not found 164s + [255] 164s 164s $ cd hgrepo 164s + $TESTTMP.sh: 46: cd: can't cd to hgrepo 164s $ hg push ../gitrepo2 -B signed 164s - pushing to ../gitrepo2 164s - searching for changes 164s - adding objects 164s - remote: found 0 deltas to reuse 164s - added 1 commits with 1 trees and 0 blobs 164s - adding reference refs/heads/signed 164s - $ cd .. 164s - 164s -Verify the commit 164s - 164s - $ cd gitrepo2 164s - $ git show --show-signature signed | grep "Good signature from" 164s - gpg: Good signature from "hgtest" [ultimate] 164s 164s ERROR: test-git-gpg.t output changed 165s ! 165s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-push-phases.t 165s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-push-phases.t.err 165s @@ -9,68 +9,13 @@ 165s $ git init -q --bare repo.git 165s 165s $ hg clone repo.git hgrepo 165s - updating to branch default 165s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 165s + abort: repository repo.git not found 165s + [255] 165s 165s $ cd hgrepo 165s + $TESTTMP.sh: 13: cd: can't cd to hgrepo 165s 165s Create two commits, one secret: 165s 165s $ touch alpha 165s - $ hg add alpha 165s - $ fn_hg_commit -m alpha 165s - $ hg book -r . master 165s - $ touch beta 165s - $ hg add beta 165s - $ fn_hg_commit --secret -m beta 165s - $ hg book -r . secret 165s - $ hg push 165s - pushing to $TESTTMP/repo.git 165s - warning: not exporting secret bookmark 'secret' 165s - searching for changes 165s - adding objects 165s - remote: found 0 deltas to reuse 165s - added 1 commits with 1 trees and 1 blobs 165s - adding reference refs/heads/master 165s - $ cd .. 165s - $ hg -R hgrepo log --graph --template phases 165s - @ changeset: 1:62966756ea96 165s - | bookmark: secret 165s - | tag: tip 165s - | phase: secret 165s - | user: test 165s - | date: Mon Jan 01 00:00:11 2007 +0000 165s - | summary: beta 165s - | 165s - o changeset: 0:d4b83afc35d1 165s - bookmark: master 165s - tag: default/master 165s - phase: public 165s - user: test 165s - date: Mon Jan 01 00:00:10 2007 +0000 165s - summary: alpha 165s - 165s - 165s -What happens when we push the secret? 165s - 165s - $ hg -R hgrepo push -B secret 165s - pushing to $TESTTMP/repo.git 165s - warning: not exporting secret bookmark 'secret' 165s - searching for changes 165s - abort: revision 62966756ea96 cannot be pushed since it doesn't have a bookmark 165s - [255] 165s - 165s -Only one changeset was pushed: 165s - 165s - $ GIT_DIR=repo.git git log --graph --all --decorate=short 165s - * commit 2cc4e3d19551e459a0dd606f4cf890de571c7d33 (HEAD -> master) 165s - Author: test 165s - Date: Mon Jan 1 00:00:10 2007 +0000 165s - 165s - alpha 165s - 165s -And this published the remote head: 165s - 165s - $ hg -R hgrepo phase 'all()' 165s - 0: public 165s - 1: secret 165s 165s ERROR: test-push-phases.t output changed 165s ! 165s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-keywords.t 165s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-keywords.t.err 165s @@ -21,29 +21,9 @@ 165s $ cd .. 165s 165s $ hg clone gitrepo hgrepo 165s - importing 3 git commits 165s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 165s - updating to bookmark master 165s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 165s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 165s + abort: repository gitrepo not found 165s + [255] 165s $ cd hgrepo 165s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 165s $ echo gamma > gamma 165s - $ hg add gamma 165s - $ hg commit -m 'add gamma' 165s - 165s - $ hg log --template "{rev} {node} {node|short} {gitnode} {gitnode|short}\n" 165s - 3 965bf7d08d3ac847dd8eb9e72ee0bf547d1a65d9 965bf7d08d3a 165s - 2 8e3f0ecc9aefd4ea2fdf8e2d5299cac548762a1c 8e3f0ecc9aef 7e2a5465ff4e3b992c429bb87a392620a0ac97b7 7e2a5465ff4e 165s - 1 7fe02317c63d9ee324d4b5df7c9296085162da1b 7fe02317c63d 9497a4ee62e16ee641860d7677cdb2589ea15554 9497a4ee62e1 165s - 0 ff7a2f2d8d7099694ae1e8b03838d40575bebb63 ff7a2f2d8d70 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 7eeab2ea75ec 165s - $ hg log --template "fromgit {rev}\n" --rev "fromgit()" 165s - fromgit 0 165s - fromgit 1 165s - fromgit 2 165s - $ hg log --template "gitnode_existsA {rev}\n" --rev "gitnode(9497a4ee62e16ee641860d7677cdb2589ea15554)" 165s - gitnode_existsA 1 165s - $ hg log --template "gitnode_existsB {rev}\n" --rev "gitnode(7eeab)" 165s - gitnode_existsB 0 165s - $ hg log --rev "gitnode(7e)" 165s - abort: git-mapfile@7e: ambiguous identifier!? (re) 165s - [50] 165s - $ hg log --template "gitnode_notexists {rev}\n" --rev "gitnode(1234567890ab)" 165s 165s ERROR: test-keywords.t output changed 166s ! 166s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-subrepos-delete.t 166s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-subrepos-delete.t.err 166s @@ -52,22 +52,9 @@ 166s And there should be nothing in Mercurial either: 166s 166s $ hg clone -U repo.git hgrepo 166s - importing 3 git commits 166s - new changesets e532b2bfda10:cc611d35fb62 (3 drafts) 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s + abort: repository repo.git not found 166s + [255] 166s $ cd hgrepo 166s + $TESTTMP.sh: 50: cd: can't cd to hgrepo 166s $ hg log --graph --template info 166s - o 166s - | commit: 2:cc611d35fb62 delete subrepo 166s - | added: 166s - | removed: .hgsub .hgsubstate 166s - o 166s - | commit: 1:8d549bcc5179 add subrepo 166s - | added: .hgsub .hgsubstate 166s - | removed: 166s - o 166s - commit: 0:e532b2bfda10 add alpha 166s - added: alpha 166s - removed: 166s - $ hg manifest -r tip 166s - alpha 166s - $ cd .. 166s 166s ERROR: test-subrepos-delete.t output changed 166s ! 166s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-annotate.t 166s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-annotate.t.err 166s @@ -10,6 +10,7 @@ 166s init 166s 166s $ hg init repo 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s $ cd repo 166s 166s commit 166s @@ -19,37 +20,48 @@ 166s > a 166s > EOF 166s $ hg add a 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s $ fn_hg_commit -m 1 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s $ cat < a 166s > a 166s > a 166s > a 166s > EOF 166s $ fn_hg_commit -m 2 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s $ cat < a 166s > a 166s > b 166s > a 166s > EOF 166s $ fn_hg_commit -m 3 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s 166s annotate multiple files 166s 166s $ hg annotate a 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s 0: a 166s 2: b 166s 1: a 166s 166s $ hg annotate --skip 1 a 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s 0: a 166s 2: b 166s 0* a 166s 166s $ hg gexport 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s + hg: unknown command 'gexport' 166s + (did you mean one of export, import?) 166s + [10] 166s $ hg log -T '{rev}:{node} {gitnode}\n' 166s - 2:beb139b96eec386addc02d48db524b7646ef1605 19388575d02e71e917e7013aa854d4a21c509819 166s - 1:a9a255d66663f9216bdcf8dda69211d7280f7278 debec50a14cc4830584dd4fa1507c51cce1c098f 166s - 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 88f28c06a1ede9a70852ab1bf9818150fabaaaa9 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s + 2:beb139b96eec386addc02d48db524b7646ef1605 166s + 1:a9a255d66663f9216bdcf8dda69211d7280f7278 166s + 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 166s 166s $ cat < .git-blame-ignore-revs 166s > # this is a comment, and the next line should be ignored 166s @@ -59,39 +71,43 @@ 166s > EOF 166s 166s $ hg annotate a 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s 0: a 166s 2: b 166s 1: a 166s $ hg annotate a \ 166s > --debug \ 166s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 166s - skipping debec50a14cc -> a9a255d66663 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s 0: a 166s 2: b 166s - 0* a 166s + 1: a 166s $ hg add .git-blame-ignore-revs 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s $ hg annotate a \ 166s > --debug \ 166s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 166s - skipping debec50a14cc -> a9a255d66663 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s 0: a 166s 2: b 166s - 0* a 166s + 1: a 166s $ hg annotate a \ 166s > --config git.blame.ignoreRevsFile=badfile 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s 0: a 166s 2: b 166s 1: a 166s $ hg annotate -T'{lines % "{rev}:{node|short} {gitnode|short}: {line}"}' a 166s - 0:8d4731bd0f4a 88f28c06a1ed: a 166s - 2:beb139b96eec 19388575d02e: b 166s - 1:a9a255d66663 debec50a14cc: a 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s + 0:8d4731bd0f4a : a 166s + 2:beb139b96eec : b 166s + 1:a9a255d66663 : a 166s 166s $ cd .. 166s $ hg -R repo annotate repo/a \ 166s > --debug \ 166s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 166s - skipping debec50a14cc -> a9a255d66663 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s 0: a 166s 2: b 166s - 0* a 166s + 1: a 166s 166s ERROR: test-annotate.t output changed 166s ! 166s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-tree-decomposition.t 166s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-tree-decomposition.t.err 166s @@ -24,45 +24,9 @@ 166s $ git init -q --bare repo.git 166s 166s $ hg clone gitrepo hgrepo 166s - importing 3 git commits 166s - new changesets d4d3d2417141:541f27994b81 (3 drafts) 166s - updating to bookmark master 166s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s + abort: repository gitrepo not found 166s + [255] 166s $ cd hgrepo 166s + $TESTTMP.sh: 38: cd: can't cd to hgrepo 166s $ hg log --template 'adds: {file_adds}\ndels: {file_dels}\n' 166s - adds: d1 166s - dels: d1/f1 166s - adds: d2/f2 166s - dels: d1/f2 166s - adds: d1/f1 d1/f2 166s - dels: 166s - 166s - $ hg debug-remove-hggit-state 166s - clearing out the git cache data 166s - $ hg push ../repo.git 166s - pushing to ../repo.git 166s - searching for changes 166s - adding objects 166s - remote: found 0 deltas to reuse 166s - added 3 commits with 6 trees and 3 blobs 166s - adding reference refs/heads/master 166s - $ cd .. 166s - 166s - $ git --git-dir=repo.git log --pretty=medium 166s - commit 6e0dbd8cd92ed4823c69cb48d8a2b81f904e6e69 166s - Author: test 166s - Date: Mon Jan 1 00:00:12 2007 +0000 166s - 166s - replace a dir with a file 166s - 166s - commit a1874d5cd0b1549ed729e36f0da4a93ed36259ee 166s - Author: test 166s - Date: Mon Jan 1 00:00:11 2007 +0000 166s - 166s - rename 166s - 166s - commit 102c17a5deda49db3f10ec5573f9378867098b7c 166s - Author: test 166s - Date: Mon Jan 1 00:00:10 2007 +0000 166s - 166s - initial 166s 166s ERROR: test-tree-decomposition.t output changed 166s ! 166s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-subrepos-drop.t 166s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-subrepos-drop.t.err 166s @@ -17,52 +17,9 @@ 166s Create a Mercurial repository with a .gitmodules file: 166s 166s $ hg clone repo.git hgrepo 166s - updating to branch default 166s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s + abort: repository repo.git not found 166s + [255] 166s $ cd hgrepo 166s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 166s $ hg book master 166s - $ touch this 166s - $ fn_hg_commit -A -m 'add this' 166s - $ cat > .gitmodules < [submodule "subrepo"] 166s - > path = subrepo 166s - > url = ../gitsubrepo 166s - > EOF 166s - $ hg add .gitmodules 166s - $ fn_hg_commit -m "add .gitmodules file" 166s - $ cd .. 166s - 166s -What happens if we push that to Git? 166s - 166s - $ hg -R hgrepo push 166s - pushing to $TESTTMP/repo.git 166s - warning: ignoring modifications to '.gitmodules' file; please use '.hgsub' instead 166s - searching for changes 166s - adding objects 166s - remote: found 0 deltas to reuse 166s - added 2 commits with 1 trees and 1 blobs 166s - adding reference refs/heads/master 166s - 166s -But we don't get a warning if we don't touch .gitmodules: 166s - 166s - $ cd hgrepo 166s - $ touch that 166s - $ fn_hg_commit -A -m 'add that' 166s - $ hg push 166s - pushing to $TESTTMP/repo.git 166s - searching for changes 166s - adding objects 166s - remote: found 0 deltas to reuse 166s - added 1 commits with 1 trees and 0 blobs 166s - updating reference refs/heads/master 166s - $ cd .. 166s - 166s -Check that it didn't silenty come through, or something: 166s - 166s - $ git clone repo.git gitrepo 166s - Cloning into 'gitrepo'... 166s - done. 166s - $ ls -A gitrepo 166s - .git 166s - that 166s - this 166s 166s ERROR: test-subrepos-drop.t output changed 166s ! 166s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-push-anonymous.t 166s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-push-anonymous.t.err 166s @@ -25,28 +25,9 @@ 166s Clone it, deactivate the bookmark, add a commit, and push! 166s 166s $ hg clone -U gitrepo hgrepo 166s - importing 1 git commits 166s - new changesets ff7a2f2d8d70 (1 drafts) 166s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 166s + abort: repository gitrepo not found 166s + [255] 166s $ cd hgrepo 166s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 166s $ hg up tip 166s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 166s - $ echo beta > beta 166s - $ hg add beta 166s - $ fn_hg_commit -m "add beta" 166s - 166s -Pushing that changeset should print a helpful message: 166s - 166s - $ hg push 166s - pushing to $TESTTMP/gitrepo 166s - searching for changes 166s - no changes found (ignoring 1 changesets without bookmarks or tags) 166s - [1] 166s - 166s -But what about untagged, but secret changesets? 166s - 166s - $ hg phase -fs tip 166s - $ hg push 166s - pushing to $TESTTMP/gitrepo 166s - searching for changes 166s - no changes found 166s - [1] 166s 166s ERROR: test-push-anonymous.t output changed 167s ! 167s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-empty-working-tree.t 167s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-empty-working-tree.t.err 167s @@ -10,29 +10,9 @@ 167s $ git init -q --bare repo.git 167s 167s $ hg clone gitrepo hgrepo 167s - importing 1 git commits 167s - new changesets 01708ca54a8f (1 drafts) 167s - updating to bookmark master 167s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 167s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 167s + abort: repository gitrepo not found 167s + [255] 167s $ cd hgrepo 167s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 167s $ hg log -r tip --template 'files: {files}\n' 167s - files: 167s - $ hg gverify 167s - verifying rev 01708ca54a8f against git commit 678256865a8c85ae925bf834369264193c88f8de 167s - 167s - $ hg debug-remove-hggit-state 167s - clearing out the git cache data 167s - $ hg push ../repo.git 167s - pushing to ../repo.git 167s - searching for changes 167s - adding objects 167s - remote: found 0 deltas to reuse 167s - added 1 commits with 1 trees and 0 blobs 167s - adding reference refs/heads/master 167s - $ cd .. 167s - $ git --git-dir=repo.git log --pretty=medium 167s - commit 678256865a8c85ae925bf834369264193c88f8de 167s - Author: test 167s - Date: Mon Jan 1 00:00:00 2007 +0000 167s - 167s - empty 167s 167s ERROR: test-empty-working-tree.t output changed 168s ! 168s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-gitignore-permissions.t 168s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-gitignore-permissions.t.err 168s @@ -4,6 +4,7 @@ 168s $ . "$TESTDIR/testutil" 168s 168s $ hg init repo 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s $ cd repo 168s 168s $ if test `whoami` = root 168s @@ -16,8 +17,14 @@ 168s 168s $ touch thefile 168s $ hg add thefile 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s $ hg ci -A -m commit 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s $ hg gexport 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s + hg: unknown command 'gexport' 168s + (did you mean one of export, import?) 168s + [10] 168s 168s Create a file that we can ignore 168s 168s @@ -33,9 +40,10 @@ 168s 168s $ echo nothingtoseehere > .gitignore 168s $ hg status 168s - not_readable: Permission denied 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s not_readable: Permission denied 168s ? .gitignore 168s + ? nothingtoseehere 168s 168s And notice that we really did ignore it! 168s 168s 168s ERROR: test-gitignore-permissions.t output changed 168s ! 168s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-ambiguousprefix.t 168s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-ambiguousprefix.t.err 168s @@ -21,13 +21,11 @@ 168s $ cd .. 168s 168s $ hg clone gitrepo hgrepo 168s - importing 3 git commits 168s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 168s - updating to bookmark master 168s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s + abort: repository gitrepo not found 168s + [255] 168s 168s $ cd hgrepo 168s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 168s 168s $ hg log -r 'gitnode(7e)' 168s - abort: git-mapfile@7e: ambiguous identifier!? (re) 168s - [50] 168s 168s ERROR: test-ambiguousprefix.t output changed 168s ! 168s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-gitignore-share.t 168s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-gitignore-share.t.err 168s @@ -9,6 +9,7 @@ 168s $ git init --quiet --bare repo.git 168s 168s $ hg init hgrepo 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s $ cd hgrepo 168s $ cat > .hg/hgrc < [paths] 168s @@ -16,26 +17,31 @@ 168s > EOF 168s $ echo ignored > .gitignore 168s $ hg add .gitignore 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s $ hg ci -m ignore 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s $ hg book master 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s $ hg push 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s pushing to $TESTTMP/repo.git 168s - searching for changes 168s - adding objects 168s - remote: found 0 deltas to reuse 168s - added 1 commits with 1 trees and 1 blobs 168s - adding reference refs/heads/master 168s + abort: repository $TESTTMP/repo.git not found 168s + [255] 168s $ cd .. 168s 168s We should also ignore the file in a shared repository: 168s 168s $ hg share hgrepo sharerepo 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s updating working directory 168s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 168s $ cd sharerepo 168s $ hg paths 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s default = $TESTTMP/repo.git 168s $ cat .gitignore 168s ignored 168s $ touch ignored 168s $ hg status 168s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 168s + ? ignored 168s 168s ERROR: test-gitignore-share.t output changed 169s ! 169s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-timezone.t 169s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-timezone.t.err 169s @@ -8,10 +8,13 @@ 169s $ . "$TESTDIR/testutil" 169s 169s $ hg init hgrepo 169s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 169s $ cd hgrepo 169s $ touch beta 169s $ hg add beta 169s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 169s $ fn_hg_commit -m "test commit" 169s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 169s $ cat >patch2 < # HG changeset patch 169s > # User J. User 169s @@ -28,5 +31,10 @@ 169s > +alpha 169s > EOF 169s $ hg import patch2 169s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 169s applying patch2 169s $ hg gexport 169s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 169s + hg: unknown command 'gexport' 169s + (did you mean one of export, import?) 169s + [10] 169s 169s ERROR: test-timezone.t output changed 170s ! 170s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-transplant.t 170s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-transplant.t.err 170s @@ -11,12 +11,20 @@ 170s > EOF 170s 170s $ hg init baserepo 170s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 170s $ cd baserepo 170s $ for c in A B C 170s > do 170s > echo $c > $c && hg add $c && fn_hg_commit -m $c 170s > done 170s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 170s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 170s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 170s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 170s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 170s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 170s $ hg clone -r 2 . ../otherrepo 170s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 170s adding changesets 170s adding manifests 170s adding file changes 170s @@ -26,6 +34,8 @@ 170s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 170s $ cd ../otherrepo 170s $ hg up 1 170s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 170s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 170s $ hg transplant -s ../baserepo tip 170s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 170s no changes found 170s 170s ERROR: test-transplant.t output changed 170s !s 170s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-url-parsing.py.out 170s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-url-parsing.py.err 170s @@ -1,46 +1,14 @@ 170s -% expect '/webjam/webjam.git' 170s -/webjam/webjam.git 170s -% expect 'github.com' 170s -github.com 170s -% expect '/webjam/webjam.git' 170s -/webjam/webjam.git 170s -% expect 'github.com' 170s -github.com 170s -% expect '19418' 170s -19418 170s -% expect 'webjam.git' 170s -webjam.git 170s -% expect 'git@heroku.com' 170s -git@heroku.com 170s -% expect '999' 170s -999 170s -% expect 'webjam/webjam.git' 170s -webjam/webjam.git 170s -% expect 'git@github.com' 170s -git@github.com 170s -% expect '42qu/vps.git' 170s -42qu/vps.git 170s -% expect 'git@github.com' 170s -git@github.com 170s -% expect '/webjam/webjam.git' 170s -/webjam/webjam.git 170s -% expect 'git@github.com' 170s -git@github.com 170s -% expect '/webjam/webjam.git' 170s -/webjam/webjam.git 170s -% expect 'git@github.com' 170s -git@github.com 170s -% expect '10022' 170s -10022 170s -% expect 'webjam.git' 170s -webjam.git 170s -% expect 'git@heroku.com' 170s -git@heroku.com 170s -% expect 'webjam.git' 170s -webjam.git 170s -% expect 'git@compatible.com' 170s -git@compatible.com 170s -% expect 'webjam.git' 170s -webjam.git 170s -% expect 'git@heroku.com' 170s -git@heroku.com 170s +Traceback (most recent call last): 170s + File "/tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-url-parsing.py", line 14, in 170s + from hggit.git_handler import GitHandler 170s + File "/usr/lib/python3/dist-packages/hggit/__init__.py", line 160, in 170s + from . import commands 170s + File "/usr/lib/python3/dist-packages/hggit/commands.py", line 26, in 170s + from . import verify 170s + File "/usr/lib/python3/dist-packages/hggit/verify.py", line 16, in 170s + from . import git2hg 170s + File "/usr/lib/python3/dist-packages/hggit/git2hg.py", line 8, in 170s + from dulwich.refs import ( 170s + ...<3 lines>... 170s + ) 170s +ImportError: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 170s 170s ERROR: test-url-parsing.py output changed 171s !. 171s --- /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-addbranchrevs.t 171s +++ /tmp/autopkgtest.NlWore/build.9Lk/src/tests/test-addbranchrevs.t.err 171s @@ -7,14 +7,23 @@ 171s caused the pull to not update to the passed revision. 171s 171s $ hg init orig 171s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 171s $ cd orig 171s $ echo a > a; hg add a; hg ci -m a 171s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 171s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 171s $ hg branch foo -q 171s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 171s $ echo b > b; hg add b; hg ci -m b 171s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 171s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 171s 171s $ cd .. 171s $ hg clone orig clone -r 0 -q 171s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 171s $ cd clone 171s $ hg pull -u -r 1 -q 171s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 171s $ hg id -n 171s + *** failed to import extension "hggit" from /tmp/autopkgtest.NlWore/build.9Lk/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 171s 1 171s 171s ERROR: test-addbranchrevs.t output changed 171s ! 171s Skipped test-check-black.t: missing feature: the black formatter for python (>= 22.3) 171s Skipped test-check-commit.t: missing feature: running tests from repository 171s Skipped test-check-pyflakes.t: missing feature: Pyflakes python linter 171s Skipped test-check-pylint.t: missing feature: Pylint python linter 171s Skipped test-encoding.t: blacklisted 171s Skipped test-gitignore-windows.t: missing feature: Windows 171s Skipped test-incoming.t: blacklisted 171s Skipped test-serve-ci.t: skipped 171s Skipped test-serve-dulwich.t: blacklisted 171s Failed test-addbranchrevs.t: output changed 171s Failed test-ambiguousprefix.t: output changed and returned error code 1 171s Failed test-annotate.t: output changed 171s Failed test-bookmark-workflow.t: output changed and returned error code 1 171s Failed test-branch-bookmark-suffix.t#with-path: output changed and returned error code 1 171s Failed test-branch-bookmark-suffix.t#without-path: output changed and returned error code 1 171s Failed test-bundle.t: output changed and returned error code 1 171s Failed test-clone.t#draft: output changed 171s Failed test-clone.t#secret: output changed 171s Failed test-conflict-1.t: output changed 171s Failed test-conflict-2.t: output changed 171s Failed test-convergedmerge.t: output changed 171s Failed test-empty-working-tree.t: output changed and returned error code 1 171s Failed test-extra.t: output changed and returned error code 1 171s Failed test-file-removal.t: output changed and returned error code 1 171s Failed test-gc.t: output changed and returned error code 1 171s Failed test-git-clone.t: output changed 171s Failed test-git-gpg.t: output changed and returned error code 1 171s Failed test-git-submodules.t: output changed and returned error code 1 171s Failed test-git-tags.t#draft: output changed and returned error code 1 171s Failed test-git-tags.t#secret: output changed and returned error code 1 171s Failed test-git-workflow.t: output changed 171s Failed test-gitignore-permissions.t: output changed 171s Failed test-gitignore-share.t: output changed 171s Failed test-gitignore.t: output changed 171s Failed test-help.t: output changed 171s Failed test-hg-author.t: output changed and returned error code 1 171s Failed test-hg-branch.t: output changed and returned error code 1 171s Failed test-hg-clone.t: output changed and returned error code 1 171s Failed test-hg-tags.t: output changed and returned error code 1 171s Failed test-hook.t: output changed 171s Failed test-illegal-contents.t: output changed 171s Failed test-invalid-refs.t: output changed and returned error code 1 171s Failed test-keywords.t: output changed and returned error code 1 171s Failed test-merge.t: output changed and returned error code 1 171s Failed test-multiple-remotes.t: output changed 171s Failed test-octopus.t: output changed and returned error code 1 171s Failed test-orphan-tags.t: output changed and returned error code 1 171s Failed test-outgoing.t: output changed and returned error code 1 171s Failed test-phases-draft.t: output changed and returned error code 1 171s Failed test-phases-public.t#publish-defaults: output changed and returned error code 1 171s Failed test-phases-public.t#publish-specific: output changed and returned error code 1 171s Failed test-phases-remote.t: output changed and returned error code 1 171s Failed test-pull-after-obsolete.t: output changed and returned error code 1 171s Failed test-pull-after-rebase.t: output changed and returned error code 1 171s Failed test-pull-after-strip.t: output changed and returned error code 1 171s Failed test-pull.t#draft: output changed 171s Failed test-pull.t#secret: output changed 171s Failed test-push-anonymous.t: output changed and returned error code 1 171s Failed test-push-authors.t: output changed and returned error code 1 171s Failed test-push-detached.t: output changed and returned error code 1 171s Failed test-push-missing-commit.t: output changed and returned error code 1 171s Failed test-push-phases.t: output changed and returned error code 1 171s Failed test-push-r.t: output changed 171s Failed test-push-to-head.t: output changed and returned error code 1 171s Failed test-push.t: output changed and returned error code 1 171s Failed test-renames.t: output changed and returned error code 1 171s Failed test-serve-git.t: output changed 171s Failed test-serve-hg-static.t: output changed 171s Failed test-serve-hg.t#with-hggit: output changed and returned error code 1 171s Failed test-serve-hg.t#without-hggit: output changed and returned error code 1 171s Failed test-subrepos-delete.t: output changed and returned error code 1 171s Failed test-subrepos-drop.t: output changed and returned error code 1 171s Failed test-subrepos-push.t: output changed and returned error code 1 171s Failed test-subrepos-syntax.t: output changed and returned error code 1 171s Failed test-subrepos.t: output changed and returned error code 1 171s Failed test-timezone.t: output changed 171s Failed test-transactions.t: output changed 171s Failed test-transplant.t: output changed 171s Failed test-tree-decomposition.t: output changed and returned error code 1 171s Failed test-url-parsing.py: output changed and returned error code 1 171s Failed test-verify-fail.t: output changed 171s # Ran 73 tests, 9 skipped, 72 failed. 171s python hash seed: 955224479 171s make: *** [Makefile:15: tests] Error 1 171s autopkgtest [01:30:24]: test testsuite: -----------------------] 172s testsuite FAIL non-zero exit status 2 172s autopkgtest [01:30:25]: test testsuite: - - - - - - - - - - results - - - - - - - - - - 172s autopkgtest [01:30:25]: test mercurial-git: preparing testbed 191s Creating nova instance adt-resolute-amd64-hg-git-20260203-012733-juju-7f2275-prod-proposed-migration-environment-2-6b11a2c5-ecb0-4f0b-bdce-7da17e20cb77 from image adt/ubuntu-resolute-amd64-server-20260202.img (UUID 54e94ad2-f1e5-466e-b281-ee6f460760b3)... 259s autopkgtest [01:31:52]: testbed dpkg architecture: amd64 260s autopkgtest [01:31:53]: testbed apt version: 3.1.14 260s autopkgtest [01:31:53]: @@@@@@@@@@@@@@@@@@@@ test bed setup 260s autopkgtest [01:31:53]: testbed release detected to be: resolute 261s autopkgtest [01:31:54]: updating testbed package index (apt update) 261s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 261s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 261s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 261s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 261s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1275 kB] 261s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [271 kB] 261s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [28.4 kB] 261s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/restricted Sources [5256 B] 261s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main i386 Packages [246 kB] 262s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 Packages [318 kB] 262s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 c-n-f Metadata [3684 B] 262s Get:12 http://ftpmaster.internal/ubuntu resolute-proposed/restricted i386 Packages [3692 B] 262s Get:13 http://ftpmaster.internal/ubuntu resolute-proposed/restricted amd64 Packages [32.9 kB] 262s Get:14 http://ftpmaster.internal/ubuntu resolute-proposed/restricted amd64 c-n-f Metadata [336 B] 262s Get:15 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 Packages [1129 kB] 262s Get:16 http://ftpmaster.internal/ubuntu resolute-proposed/universe i386 Packages [437 kB] 262s Get:17 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 c-n-f Metadata [27.4 kB] 262s Get:18 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse amd64 Packages [25.4 kB] 262s Get:19 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse i386 Packages [4780 B] 262s Get:20 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse amd64 c-n-f Metadata [1076 B] 262s Fetched 3932 kB in 1s (3742 kB/s) 263s Reading package lists... 263s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 263s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 264s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 264s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 264s Reading package lists... 264s Reading package lists... 264s Building dependency tree... 264s Reading state information... 264s Calculating upgrade... 264s The following packages will be upgraded: 264s cloud-init cloud-init-base libexpat1 libgpg-error-l10n libgpg-error0 264s liblocale-gettext-perl pci.ids 264s 7 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 264s Need to get 1127 kB of archives. 264s After this operation, 13.3 kB of additional disk space will be used. 264s Get:1 http://ftpmaster.internal/ubuntu resolute/main amd64 libexpat1 amd64 2.7.4-1 [94.0 kB] 264s Get:2 http://ftpmaster.internal/ubuntu resolute/main amd64 liblocale-gettext-perl amd64 1.07-8 [15.8 kB] 264s Get:3 http://ftpmaster.internal/ubuntu resolute/main amd64 libgpg-error-l10n all 1.58-2 [9244 B] 264s Get:4 http://ftpmaster.internal/ubuntu resolute/main amd64 libgpg-error0 amd64 1.58-2 [83.3 kB] 264s Get:5 http://ftpmaster.internal/ubuntu resolute/main amd64 pci.ids all 0.0~2026.01.31-1 [299 kB] 265s Get:6 http://ftpmaster.internal/ubuntu resolute/main amd64 cloud-init-base all 25.4~4g26c7d38d-0ubuntu1 [624 kB] 265s Get:7 http://ftpmaster.internal/ubuntu resolute/main amd64 cloud-init all 25.4~4g26c7d38d-0ubuntu1 [2120 B] 265s dpkg-preconfigure: unable to re-open stdin: No such file or directory 265s Fetched 1127 kB in 0s (14.7 MB/s) 265s (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 ... 83956 files and directories currently installed.) 265s Preparing to unpack .../0-libexpat1_2.7.4-1_amd64.deb ... 265s Unpacking libexpat1:amd64 (2.7.4-1) over (2.7.3-1) ... 265s Preparing to unpack .../1-liblocale-gettext-perl_1.07-8_amd64.deb ... 265s Unpacking liblocale-gettext-perl (1.07-8) over (1.07-7build1) ... 265s Preparing to unpack .../2-libgpg-error-l10n_1.58-2_all.deb ... 265s Unpacking libgpg-error-l10n (1.58-2) over (1.58-1build1) ... 265s Preparing to unpack .../3-libgpg-error0_1.58-2_amd64.deb ... 265s Unpacking libgpg-error0:amd64 (1.58-2) over (1.58-1build1) ... 265s Preparing to unpack .../4-pci.ids_0.0~2026.01.31-1_all.deb ... 265s Unpacking pci.ids (0.0~2026.01.31-1) over (0.0~2025.12.16-1) ... 265s Preparing to unpack .../5-cloud-init-base_25.4~4g26c7d38d-0ubuntu1_all.deb ... 265s Unpacking cloud-init-base (25.4~4g26c7d38d-0ubuntu1) over (25.4~3g78f6f15e-0ubuntu1) ... 265s Preparing to unpack .../6-cloud-init_25.4~4g26c7d38d-0ubuntu1_all.deb ... 265s Unpacking cloud-init (25.4~4g26c7d38d-0ubuntu1) over (25.4~3g78f6f15e-0ubuntu1) ... 265s Setting up libexpat1:amd64 (2.7.4-1) ... 265s Setting up pci.ids (0.0~2026.01.31-1) ... 265s Setting up libgpg-error0:amd64 (1.58-2) ... 265s Setting up cloud-init-base (25.4~4g26c7d38d-0ubuntu1) ... 265s Clearing ignored debconf value cloud-init/datasources 265s Encountered debconf setting for cloud-init-base/datasources. 266s Setting up libgpg-error-l10n (1.58-2) ... 266s Setting up liblocale-gettext-perl (1.07-8) ... 266s Setting up cloud-init (25.4~4g26c7d38d-0ubuntu1) ... 266s Processing triggers for rsyslog (8.2512.0-1ubuntu2) ... 266s Processing triggers for man-db (2.13.1-1) ... 267s Processing triggers for libc-bin (2.42-2ubuntu4) ... 267s autopkgtest [01:32:00]: upgrading testbed (apt dist-upgrade and autopurge) 267s Reading package lists... 267s Building dependency tree... 267s Reading state information... 267s Calculating upgrade... 267s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 267s Reading package lists... 268s Building dependency tree... 268s Reading state information... 268s Solving dependencies... 268s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 268s autopkgtest [01:32:01]: rebooting testbed after setup commands that affected boot 299s Reading package lists... 299s Building dependency tree... 299s Reading state information... 299s Solving dependencies... 299s The following NEW packages will be installed: 299s git git-man liberror-perl mercurial mercurial-common mercurial-git 299s python3-dulwich 299s 0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded. 299s Need to get 9726 kB of archives. 299s After this operation, 51.7 MB of additional disk space will be used. 299s Get:1 http://ftpmaster.internal/ubuntu resolute/main amd64 liberror-perl all 0.17030-1 [23.5 kB] 299s Get:2 http://ftpmaster.internal/ubuntu resolute/main amd64 git-man all 1:2.51.0-1ubuntu1 [1179 kB] 299s Get:3 http://ftpmaster.internal/ubuntu resolute/main amd64 git amd64 1:2.51.0-1ubuntu1 [4414 kB] 300s Get:4 http://ftpmaster.internal/ubuntu resolute/universe amd64 mercurial-common all 7.1.1-1ubuntu1 [2789 kB] 300s Get:5 http://ftpmaster.internal/ubuntu resolute/universe amd64 mercurial amd64 7.1.1-1ubuntu1 [426 kB] 300s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 python3-dulwich amd64 1.0.0-2 [833 kB] 300s Get:7 http://ftpmaster.internal/ubuntu resolute/universe amd64 mercurial-git all 1.2.0-1 [60.9 kB] 300s Fetched 9726 kB in 1s (15.7 MB/s) 300s Selecting previously unselected package liberror-perl. 300s (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 ... 83956 files and directories currently installed.) 300s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 300s Unpacking liberror-perl (0.17030-1) ... 300s Selecting previously unselected package git-man. 300s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 300s Unpacking git-man (1:2.51.0-1ubuntu1) ... 300s Selecting previously unselected package git. 300s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_amd64.deb ... 300s Unpacking git (1:2.51.0-1ubuntu1) ... 300s Selecting previously unselected package mercurial-common. 300s Preparing to unpack .../3-mercurial-common_7.1.1-1ubuntu1_all.deb ... 300s Unpacking mercurial-common (7.1.1-1ubuntu1) ... 300s Selecting previously unselected package mercurial. 300s Preparing to unpack .../4-mercurial_7.1.1-1ubuntu1_amd64.deb ... 300s Unpacking mercurial (7.1.1-1ubuntu1) ... 300s Selecting previously unselected package python3-dulwich. 300s Preparing to unpack .../5-python3-dulwich_1.0.0-2_amd64.deb ... 300s Unpacking python3-dulwich (1.0.0-2) ... 300s Selecting previously unselected package mercurial-git. 300s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 300s Unpacking mercurial-git (1.2.0-1) ... 300s Setting up mercurial-common (7.1.1-1ubuntu1) ... 301s Setting up liberror-perl (0.17030-1) ... 301s Setting up python3-dulwich (1.0.0-2) ... 302s Setting up git-man (1:2.51.0-1ubuntu1) ... 302s Setting up mercurial (7.1.1-1ubuntu1) ... 302s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 302s Setting up mercurial-git (1.2.0-1) ... 302s mercurial-git extension is disabled by default. 302s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 302s Setting up git (1:2.51.0-1ubuntu1) ... 302s Processing triggers for man-db (2.13.1-1) ... 304s autopkgtest [01:32:37]: test mercurial-git: [----------------------- 304s Initialized empty Git repository in /tmp/autopkgtest.NlWore/build.9Lk/src/git_server/ 304s Cloning into 'git_clone'... 304s warning: You appear to have cloned an empty repository. 304s done. 304s [master (root-commit) 7c632f5] a 304s 1 file changed, 1 insertion(+) 304s create mode 100644 a 304s To /tmp/autopkgtest.NlWore/build.9Lk/src/git_server 304s * [new branch] master -> master 304s *** failed to import extension "hggit": cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 304s abort: repository git_server not found 305s autopkgtest [01:32:38]: test mercurial-git: -----------------------] 305s mercurial-git FAIL non-zero exit status 253 305s autopkgtest [01:32:38]: test mercurial-git: - - - - - - - - - - results - - - - - - - - - - 305s autopkgtest [01:32:38]: test mercurial-git: - - - - - - - - - - stderr - - - - - - - - - - 305s *** failed to import extension "hggit": cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 305s abort: repository git_server not found 305s autopkgtest [01:32:38]: @@@@@@@@@@@@@@@@@@@@ summary 305s testsuite FAIL non-zero exit status 2 305s mercurial-git FAIL non-zero exit status 253