0s autopkgtest [00:26:23]: starting date and time: 2026-02-03 00:26:23+0000 0s autopkgtest [00:26:23]: git checkout: 4b346b80 nova: make wait_reboot return success even when a no-op 0s autopkgtest [00:26:23]: host juju-7f2275-prod-proposed-migration-environment-2; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.jof4nx4q/out --timeout-copy=6000 --needs-internet=try -a i386 --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-3.secgroup --name adt-resolute-i386-hg-git-20260203-002623-juju-7f2275-prod-proposed-migration-environment-2-1c6bb326-fccd-4b66-a927-ed090352e137 --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-i386-hg-git-20260203-002623-juju-7f2275-prod-proposed-migration-environment-2-1c6bb326-fccd-4b66-a927-ed090352e137 from image adt/ubuntu-resolute-amd64-server-20260202.img (UUID 54e94ad2-f1e5-466e-b281-ee6f460760b3)... 72s autopkgtest [00:27:35]: testbed dpkg architecture: amd64 72s autopkgtest [00:27:35]: testbed apt version: 3.1.14 72s autopkgtest [00:27:35]: @@@@@@@@@@@@@@@@@@@@ test bed setup 72s autopkgtest [00:27:35]: testbed release detected to be: None 73s autopkgtest [00:27:36]: updating testbed package index (apt update) 73s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 73s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 73s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 73s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 73s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [105 kB] 73s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/restricted Sources [5256 B] 73s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [28.4 kB] 73s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1278 kB] 74s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 Packages [138 kB] 74s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/main i386 Packages [102 kB] 74s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 c-n-f Metadata [3536 B] 74s Get:12 http://ftpmaster.internal/ubuntu resolute-proposed/restricted amd64 Packages [32.9 kB] 74s Get:13 http://ftpmaster.internal/ubuntu resolute-proposed/restricted i386 Packages [3692 B] 74s Get:14 http://ftpmaster.internal/ubuntu resolute-proposed/restricted amd64 c-n-f Metadata [336 B] 74s Get:15 http://ftpmaster.internal/ubuntu resolute-proposed/universe i386 Packages [409 kB] 74s Get:16 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 Packages [1088 kB] 74s Get:17 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 c-n-f Metadata [27.6 kB] 74s Get:18 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse i386 Packages [4240 B] 74s Get:19 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse amd64 Packages [24.9 kB] 74s Get:20 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse amd64 c-n-f Metadata [1076 B] 75s Fetched 3375 kB in 1s (3336 kB/s) 75s Reading package lists... 76s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 76s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 76s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 76s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 76s Reading package lists... 76s Reading package lists... 77s Building dependency tree... 77s Reading state information... 77s Calculating upgrade... 77s The following packages will be upgraded: 77s libexpat1 libgpg-error-l10n libgpg-error0 liblocale-gettext-perl pci.ids 77s 5 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 77s Need to get 501 kB of archives. 77s After this operation, 13.3 kB of additional disk space will be used. 77s Get:1 http://ftpmaster.internal/ubuntu resolute/main amd64 libexpat1 amd64 2.7.4-1 [94.0 kB] 77s Get:2 http://ftpmaster.internal/ubuntu resolute/main amd64 liblocale-gettext-perl amd64 1.07-8 [15.8 kB] 77s Get:3 http://ftpmaster.internal/ubuntu resolute/main amd64 libgpg-error-l10n all 1.58-2 [9244 B] 77s Get:4 http://ftpmaster.internal/ubuntu resolute/main amd64 libgpg-error0 amd64 1.58-2 [83.3 kB] 77s Get:5 http://ftpmaster.internal/ubuntu resolute/main amd64 pci.ids all 0.0~2026.01.31-1 [299 kB] 77s dpkg-preconfigure: unable to re-open stdin: No such file or directory 77s Fetched 501 kB in 0s (38.4 MB/s) 77s (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.) 77s Preparing to unpack .../libexpat1_2.7.4-1_amd64.deb ... 77s Unpacking libexpat1:amd64 (2.7.4-1) over (2.7.3-1) ... 77s Preparing to unpack .../liblocale-gettext-perl_1.07-8_amd64.deb ... 77s Unpacking liblocale-gettext-perl (1.07-8) over (1.07-7build1) ... 77s Preparing to unpack .../libgpg-error-l10n_1.58-2_all.deb ... 77s Unpacking libgpg-error-l10n (1.58-2) over (1.58-1build1) ... 77s Preparing to unpack .../libgpg-error0_1.58-2_amd64.deb ... 77s Unpacking libgpg-error0:amd64 (1.58-2) over (1.58-1build1) ... 77s Preparing to unpack .../pci.ids_0.0~2026.01.31-1_all.deb ... 77s Unpacking pci.ids (0.0~2026.01.31-1) over (0.0~2025.12.16-1) ... 77s Setting up libexpat1:amd64 (2.7.4-1) ... 77s Setting up pci.ids (0.0~2026.01.31-1) ... 77s Setting up libgpg-error0:amd64 (1.58-2) ... 78s Setting up libgpg-error-l10n (1.58-2) ... 78s Setting up liblocale-gettext-perl (1.07-8) ... 78s Processing triggers for man-db (2.13.1-1) ... 78s Processing triggers for libc-bin (2.42-2ubuntu4) ... 78s autopkgtest [00:27:41]: upgrading testbed (apt dist-upgrade and autopurge) 78s Reading package lists... 78s Building dependency tree... 78s Reading state information... 78s Calculating upgrade... 78s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 78s Reading package lists... 79s Building dependency tree... 79s Reading state information... 79s Solving dependencies... 79s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 81s autopkgtest [00:27:44]: testbed running kernel: Linux 6.18.0-9-generic #9-Ubuntu SMP PREEMPT_DYNAMIC Mon Jan 12 16:49:02 UTC 2026 81s autopkgtest [00:27:44]: @@@@@@@@@@@@@@@@@@@@ apt-source hg-git 82s Get:1 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (dsc) [2142 B] 82s Get:2 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (tar) [222 kB] 82s Get:3 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (diff) [6816 B] 82s gpgv: Signature made Sun Feb 16 14:22:41 2025 UTC 82s gpgv: using RSA key 8F6DE104377F3B11E741748731F3144544A1741A 82s gpgv: issuer "tchet@debian.org" 82s gpgv: Can't check signature: No public key 82s dpkg-source: warning: cannot verify inline signature for ./hg-git_1.2.0-1.dsc: no acceptable signature found 82s autopkgtest [00:27:45]: testing package hg-git version 1.2.0-1 82s autopkgtest [00:27:45]: build not needed 83s autopkgtest [00:27:46]: test testsuite: preparing testbed 83s Reading package lists... 83s Building dependency tree... 83s Reading state information... 83s Solving dependencies... 83s The following NEW packages will be installed: 83s git git-man liberror-perl mercurial mercurial-common mercurial-git 83s python3-dulwich unzip 83s 0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded. 83s Need to get 9906 kB of archives. 83s After this operation, 52.2 MB of additional disk space will be used. 83s Get:1 http://ftpmaster.internal/ubuntu resolute/main amd64 liberror-perl all 0.17030-1 [23.5 kB] 83s Get:2 http://ftpmaster.internal/ubuntu resolute/main amd64 git-man all 1:2.51.0-1ubuntu1 [1179 kB] 83s Get:3 http://ftpmaster.internal/ubuntu resolute/main amd64 git amd64 1:2.51.0-1ubuntu1 [4414 kB] 84s Get:4 http://ftpmaster.internal/ubuntu resolute/universe amd64 mercurial-common all 7.1.1-1ubuntu1 [2789 kB] 84s Get:5 http://ftpmaster.internal/ubuntu resolute/universe amd64 mercurial amd64 7.1.1-1ubuntu1 [426 kB] 84s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 python3-dulwich amd64 1.0.0-2 [833 kB] 84s Get:7 http://ftpmaster.internal/ubuntu resolute/universe amd64 mercurial-git all 1.2.0-1 [60.9 kB] 84s Get:8 http://ftpmaster.internal/ubuntu resolute/main amd64 unzip amd64 6.0-29ubuntu1 [180 kB] 84s Fetched 9906 kB in 1s (10.8 MB/s) 84s Selecting previously unselected package liberror-perl. 84s (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.) 84s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 84s Unpacking liberror-perl (0.17030-1) ... 84s Selecting previously unselected package git-man. 84s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 84s Unpacking git-man (1:2.51.0-1ubuntu1) ... 84s Selecting previously unselected package git. 84s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_amd64.deb ... 84s Unpacking git (1:2.51.0-1ubuntu1) ... 84s Selecting previously unselected package mercurial-common. 84s Preparing to unpack .../3-mercurial-common_7.1.1-1ubuntu1_all.deb ... 84s Unpacking mercurial-common (7.1.1-1ubuntu1) ... 84s Selecting previously unselected package mercurial. 84s Preparing to unpack .../4-mercurial_7.1.1-1ubuntu1_amd64.deb ... 84s Unpacking mercurial (7.1.1-1ubuntu1) ... 84s Selecting previously unselected package python3-dulwich. 84s Preparing to unpack .../5-python3-dulwich_1.0.0-2_amd64.deb ... 84s Unpacking python3-dulwich (1.0.0-2) ... 84s Selecting previously unselected package mercurial-git. 85s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 85s Unpacking mercurial-git (1.2.0-1) ... 85s Selecting previously unselected package unzip. 85s Preparing to unpack .../7-unzip_6.0-29ubuntu1_amd64.deb ... 85s Unpacking unzip (6.0-29ubuntu1) ... 85s Setting up mercurial-common (7.1.1-1ubuntu1) ... 86s Setting up unzip (6.0-29ubuntu1) ... 86s Setting up liberror-perl (0.17030-1) ... 86s Setting up python3-dulwich (1.0.0-2) ... 86s Setting up git-man (1:2.51.0-1ubuntu1) ... 86s Setting up mercurial (7.1.1-1ubuntu1) ... 86s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 86s Setting up mercurial-git (1.2.0-1) ... 86s mercurial-git extension is disabled by default. 86s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 86s Setting up git (1:2.51.0-1ubuntu1) ... 86s Processing triggers for man-db (2.13.1-1) ... 88s autopkgtest [00:27:51]: test environment configured for cross building 88s autopkgtest [00:27:51]: test testsuite: [----------------------- 88s no username found, using 'ubuntu@autopkgtest.local' instead 88s cd tests && /usr/bin/python3 run-tests.py --with-hg=/usr/bin/hg --blacklist=/tmp/autopkgtest.hVkeld/build.mNu/src/debian/hg-git.test_blacklist 88s running 82 tests using 2 parallel processes 94s ssssss 94s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-pull.t 94s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-pull.t#draft.err 94s @@ -35,153 +35,132 @@ 94s 94s pull without a name 94s $ hg init hgrepo 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s $ cd hgrepo 94s $ hg pull ../gitrepo 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s pulling from ../gitrepo 94s - importing 3 git commits 94s - adding bookmark beta 94s - adding bookmark delta 94s - adding bookmark master 94s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 94s - (run 'hg heads' to see heads, 'hg merge' to merge) 94s + abort: repository ../gitrepo not found 94s + [255] 94s $ git --git-dir .hg/git for-each-ref 94s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 94s + fatal: not a git repository: '.hg/git' 94s + [128] 94s $ hg log -Tp 94s - 2|draft|delta|tip 94s - 1|draft|beta| 94s - 0|draft|master|t_alpha 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s $ cd .. 94s $ rm -rf hgrepo 94s 94s pull with an implied name 94s $ hg init hgrepo 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s $ cd hgrepo 94s $ echo "[paths]" >> .hg/hgrc 94s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 94s $ hg pull ../gitrepo 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s pulling from ../gitrepo 94s - importing 3 git commits 94s - adding bookmark beta 94s - adding bookmark delta 94s - adding bookmark master 94s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 94s - (run 'hg heads' to see heads, 'hg merge' to merge) 94s + abort: repository ../gitrepo not found 94s + [255] 94s $ git --git-dir .hg/git for-each-ref 94s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 94s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 94s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 94s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 94s + fatal: not a git repository: '.hg/git' 94s + [128] 94s $ hg log -Tp 94s - 2|draft|delta|default/delta tip 94s - 1|draft|beta|default/beta 94s - 0|draft|master|default/master t_alpha 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s $ cd .. 94s $ rm -rf hgrepo 94s 94s pull with an explicit name 94s $ hg init hgrepo 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s $ cd hgrepo 94s $ echo "[paths]" >> .hg/hgrc 94s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 94s $ hg pull 94s - pulling from $TESTTMP/gitrepo 94s - importing 3 git commits 94s - adding bookmark beta 94s - adding bookmark delta 94s - adding bookmark master 94s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 94s - (run 'hg heads' to see heads, 'hg merge' to merge) 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + pulling from $TESTTMP/gitrepo 94s + abort: repository $TESTTMP/gitrepo not found 94s + [255] 94s $ git --git-dir .hg/git for-each-ref 94s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 94s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 94s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 94s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 94s + fatal: not a git repository: '.hg/git' 94s + [128] 94s $ hg log -Tp 94s - 2|draft|delta|default/delta tip 94s - 1|draft|beta|default/beta 94s - 0|draft|master|default/master t_alpha 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s $ cd .. 94s $ rm -rf hgrepo 94s 94s pull a tag 94s $ hg init hgrepo 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s $ echo "[paths]" >> hgrepo/.hg/hgrc 94s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 94s $ hg -R hgrepo pull -r t_alpha 94s - pulling from $TESTTMP/gitrepo 94s - importing 1 git commits 94s - adding bookmark master 94s - new changesets ff7a2f2d8d70 (1 drafts) 94s - (run 'hg update' to get a working copy) 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + pulling from $TESTTMP/gitrepo 94s + abort: repository $TESTTMP/gitrepo not found 94s + [255] 94s $ hg -R hgrepo update t_alpha 94s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + abort: unknown revision 't_alpha' 94s + [10] 94s $ hg log -Tp -R hgrepo 94s - 0|draft|master|default/master t_alpha tip 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s 94s no-op pull 94s $ hg -R hgrepo pull -r t_alpha 94s - pulling from $TESTTMP/gitrepo 94s - no changes found 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + pulling from $TESTTMP/gitrepo 94s + abort: repository $TESTTMP/gitrepo not found 94s + [255] 94s 94s no-op pull with added bookmark 94s $ cd gitrepo 94s $ git checkout -qb epsilon t_alpha 94s $ cd .. 94s $ hg -R hgrepo pull -r epsilon 94s - pulling from $TESTTMP/gitrepo 94s - no changes found 94s - adding bookmark epsilon 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + pulling from $TESTTMP/gitrepo 94s + abort: repository $TESTTMP/gitrepo not found 94s + [255] 94s 94s pull something that doesn't exist 94s $ hg -R hgrepo pull -r kaflaflibob 94s - pulling from $TESTTMP/gitrepo 94s - abort: unknown revision 'kaflaflibob'!? (re) 94s - [10] 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + pulling from $TESTTMP/gitrepo 94s + abort: repository $TESTTMP/gitrepo not found 94s + [255] 94s 94s pull an ambiguous reference 94s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 94s $ hg -R hgrepo pull -r t_alpha 94s - pulling from $TESTTMP/gitrepo 94s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 94s - [10] 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + pulling from $TESTTMP/gitrepo 94s + abort: repository $TESTTMP/gitrepo not found 94s + [255] 94s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 94s 94s pull a branch 94s $ hg -R hgrepo pull -r beta 94s - pulling from $TESTTMP/gitrepo 94s - importing 1 git commits 94s - adding bookmark beta 94s - new changesets 7fe02317c63d (1 drafts) 94s - (run 'hg update' to get a working copy) 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + pulling from $TESTTMP/gitrepo 94s + abort: repository $TESTTMP/gitrepo not found 94s + [255] 94s $ hg -R hgrepo log --graph --template=phases 94s - o changeset: 1:7fe02317c63d 94s - | bookmark: beta 94s - | tag: default/beta 94s - | tag: tip 94s - | phase: draft 94s - | user: test 94s - | date: Mon Jan 01 00:00:11 2007 +0000 94s - | summary: add beta 94s - | 94s - @ changeset: 0:ff7a2f2d8d70 94s - bookmark: epsilon 94s - bookmark: master 94s - tag: default/epsilon 94s - tag: default/master 94s - tag: t_alpha 94s - phase: draft 94s - user: test 94s - date: Mon Jan 01 00:00:10 2007 +0000 94s - summary: add alpha 94s - 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s 94s no-op pull should affect phases 94s $ hg -R hgrepo phase -fs beta 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + abort: unknown revision 'beta' 94s + [10] 94s $ hg -R hgrepo pull -r beta 94s - pulling from $TESTTMP/gitrepo 94s - no changes found 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + pulling from $TESTTMP/gitrepo 94s + abort: repository $TESTTMP/gitrepo not found 94s + [255] 94s $ hg -R hgrepo phase beta 94s - 1: draft 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + abort: unknown revision 'beta' 94s + [10] 94s 94s 94s add another commit and tag to the git repo 94s @@ -196,50 +175,12 @@ 94s 94s pull everything else 94s $ hg -R hgrepo pull 94s - pulling from $TESTTMP/gitrepo 94s - importing 2 git commits 94s - adding bookmark delta 94s - updating bookmark master 94s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 94s - (run 'hg heads' to see heads, 'hg merge' to merge) 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + pulling from $TESTTMP/gitrepo 94s + abort: repository $TESTTMP/gitrepo not found 94s + [255] 94s $ hg -R hgrepo log --graph --template=phases 94s - o changeset: 3:6f898ad1f3e1 94s - | bookmark: master 94s - | tag: default/master 94s - | tag: tip 94s - | phase: draft 94s - | parent: 0:ff7a2f2d8d70 94s - | user: test 94s - | date: Mon Jan 01 00:00:13 2007 +0000 94s - | summary: add gamma 94s - | 94s - | o changeset: 2:678ebee93e38 94s - |/ bookmark: delta 94s - | tag: default/delta 94s - | phase: draft 94s - | parent: 0:ff7a2f2d8d70 94s - | user: test 94s - | date: Mon Jan 01 00:00:12 2007 +0000 94s - | summary: add delta 94s - | 94s - | o changeset: 1:7fe02317c63d 94s - |/ bookmark: beta 94s - | tag: default/beta 94s - | tag: t_beta 94s - | phase: draft 94s - | user: test 94s - | date: Mon Jan 01 00:00:11 2007 +0000 94s - | summary: add beta 94s - | 94s - @ changeset: 0:ff7a2f2d8d70 94s - bookmark: epsilon 94s - tag: default/epsilon 94s - tag: t_alpha 94s - phase: draft 94s - user: test 94s - date: Mon Jan 01 00:00:10 2007 +0000 94s - summary: add alpha 94s - 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s add a merge to the git repo, and delete the branch 94s $ cd gitrepo 94s $ git merge -q -m "Merge branch 'beta'" beta 94s @@ -252,60 +193,26 @@ 94s 94s pull the merge 94s $ hg -R hgrepo tags | grep default/beta 94s - default/beta 1:7fe02317c63d 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + [1] 94s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 94s - pulling from $TESTTMP/gitrepo 94s - importing 1 git commits 94s - updating bookmark master 94s - deleting bookmark beta 94s - new changesets a02330f767a4 (1 drafts) 94s - (run 'hg update' to get a working copy) 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + pulling from $TESTTMP/gitrepo 94s + abort: repository $TESTTMP/gitrepo not found 94s + [255] 94s $ hg -R hgrepo tags | grep default/beta 94s - default/beta 1:7fe02317c63d 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + [1] 94s $ hg -R hgrepo pull 94s - pulling from $TESTTMP/gitrepo 94s - no changes found 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + pulling from $TESTTMP/gitrepo 94s + abort: repository $TESTTMP/gitrepo not found 94s + [255] 94s $ hg -R hgrepo tags | grep default/beta 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s [1] 94s $ hg -R hgrepo log --graph 94s - o changeset: 4:a02330f767a4 94s - |\ bookmark: master 94s - | | tag: default/master 94s - | | tag: tip 94s - | | parent: 3:6f898ad1f3e1 94s - | | parent: 1:7fe02317c63d 94s - | | user: test 94s - | | date: Mon Jan 01 00:00:13 2007 +0000 94s - | | summary: Merge branch 'beta' 94s - | | 94s - | o changeset: 3:6f898ad1f3e1 94s - | | parent: 0:ff7a2f2d8d70 94s - | | user: test 94s - | | date: Mon Jan 01 00:00:13 2007 +0000 94s - | | summary: add gamma 94s - | | 94s - | | o changeset: 2:678ebee93e38 94s - | |/ bookmark: delta 94s - | | tag: default/delta 94s - | | parent: 0:ff7a2f2d8d70 94s - | | user: test 94s - | | date: Mon Jan 01 00:00:12 2007 +0000 94s - | | summary: add delta 94s - | | 94s - o | changeset: 1:7fe02317c63d 94s - |/ tag: t_beta 94s - | user: test 94s - | date: Mon Jan 01 00:00:11 2007 +0000 94s - | summary: add beta 94s - | 94s - @ changeset: 0:ff7a2f2d8d70 94s - bookmark: epsilon 94s - tag: default/epsilon 94s - tag: t_alpha 94s - user: test 94s - date: Mon Jan 01 00:00:10 2007 +0000 94s - summary: add alpha 94s - 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s pull with wildcards 94s $ cd gitrepo 94s $ git checkout -qb releases/v1 master 94s @@ -324,66 +231,12 @@ 94s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 94s $ cd .. 94s $ hg -R hgrepo pull -r 'releases/*' 94s - pulling from $TESTTMP/gitrepo 94s - importing 2 git commits 94s - adding bookmark releases/v1 94s - adding bookmark releases/v2 94s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 94s - (run 'hg heads .' to see heads, 'hg merge' to merge) 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + pulling from $TESTTMP/gitrepo 94s + abort: repository $TESTTMP/gitrepo not found 94s + [255] 94s $ hg -R hgrepo log --graph 94s - o changeset: 6:a3f95e150b0a 94s - | bookmark: releases/v2 94s - | tag: default/releases/v2 94s - | tag: tip 94s - | parent: 4:a02330f767a4 94s - | user: test 94s - | date: Mon Jan 01 00:00:15 2007 +0000 94s - | summary: add eta 94s - | 94s - | o changeset: 5:218b2d0660d3 94s - |/ bookmark: releases/v1 94s - | tag: default/releases/v1 94s - | user: test 94s - | date: Mon Jan 01 00:00:14 2007 +0000 94s - | summary: add zeta 94s - | 94s - o changeset: 4:a02330f767a4 94s - |\ bookmark: master 94s - | | tag: default/master 94s - | | parent: 3:6f898ad1f3e1 94s - | | parent: 1:7fe02317c63d 94s - | | user: test 94s - | | date: Mon Jan 01 00:00:13 2007 +0000 94s - | | summary: Merge branch 'beta' 94s - | | 94s - | o changeset: 3:6f898ad1f3e1 94s - | | parent: 0:ff7a2f2d8d70 94s - | | user: test 94s - | | date: Mon Jan 01 00:00:13 2007 +0000 94s - | | summary: add gamma 94s - | | 94s - | | o changeset: 2:678ebee93e38 94s - | |/ bookmark: delta 94s - | | tag: default/delta 94s - | | parent: 0:ff7a2f2d8d70 94s - | | user: test 94s - | | date: Mon Jan 01 00:00:12 2007 +0000 94s - | | summary: add delta 94s - | | 94s - o | changeset: 1:7fe02317c63d 94s - |/ tag: t_beta 94s - | user: test 94s - | date: Mon Jan 01 00:00:11 2007 +0000 94s - | summary: add beta 94s - | 94s - @ changeset: 0:ff7a2f2d8d70 94s - bookmark: epsilon 94s - tag: default/epsilon 94s - tag: t_alpha 94s - user: test 94s - date: Mon Jan 01 00:00:10 2007 +0000 94s - summary: add alpha 94s - 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s 94s add old and new commits to the git repo -- make sure we're using the commit date 94s and not the author date 94s @@ -412,21 +265,19 @@ 94s Master is now filtered, so it's just stays there: 94s 94s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 94s - pulling from $TESTTMP/gitrepo 94s - no changes found 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + pulling from $TESTTMP/gitrepo 94s + abort: repository $TESTTMP/gitrepo not found 94s + [255] 94s $ hg -R hgrepo pull 94s - pulling from $TESTTMP/gitrepo 94s - no changes found 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + pulling from $TESTTMP/gitrepo 94s + abort: repository $TESTTMP/gitrepo not found 94s + [255] 94s $ hg -R hgrepo log -r master 94s - changeset: 4:a02330f767a4 94s - bookmark: master 94s - tag: default/master 94s - parent: 3:6f898ad1f3e1 94s - parent: 1:7fe02317c63d 94s - user: test 94s - date: Mon Jan 01 00:00:13 2007 +0000 94s - summary: Merge branch 'beta' 94s - 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + abort: unknown revision 'master' 94s + [10] 94s 94s $ cd gitrepo 94s $ git checkout -q master 94s @@ -440,51 +291,13 @@ 94s > git tag -a -m 'tagging newtag' newtag 94s $ cd .. 94s $ hg -R hgrepo pull 94s - pulling from $TESTTMP/gitrepo 94s - importing 3 git commits 94s - updating bookmark master 94s - new changesets 49713da8f665:e103a73f33be (3 drafts) 94s - (run 'hg heads .' to see heads, 'hg merge' to merge) 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + pulling from $TESTTMP/gitrepo 94s + abort: repository $TESTTMP/gitrepo not found 94s + [255] 94s $ hg -R hgrepo heads 94s - changeset: 9:e103a73f33be 94s - bookmark: master 94s - tag: default/master 94s - tag: tip 94s - user: test 94s - date: Wed Jan 01 00:00:00 2014 +0000 94s - summary: newcommit 94s - 94s - changeset: 7:49713da8f665 94s - tag: newtag 94s - tag: oldtag 94s - parent: 4:a02330f767a4 94s - user: test 94s - date: Sat Mar 01 00:00:00 2014 +0000 94s - summary: oldtag 94s - 94s - changeset: 6:a3f95e150b0a 94s - bookmark: releases/v2 94s - tag: default/releases/v2 94s - parent: 4:a02330f767a4 94s - user: test 94s - date: Mon Jan 01 00:00:15 2007 +0000 94s - summary: add eta 94s - 94s - changeset: 5:218b2d0660d3 94s - bookmark: releases/v1 94s - tag: default/releases/v1 94s - user: test 94s - date: Mon Jan 01 00:00:14 2007 +0000 94s - summary: add zeta 94s - 94s - changeset: 2:678ebee93e38 94s - bookmark: delta 94s - tag: default/delta 94s - parent: 0:ff7a2f2d8d70 94s - user: test 94s - date: Mon Jan 01 00:00:12 2007 +0000 94s - summary: add delta 94s - 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + [1] 94s 94s test for ssh vulnerability 94s 94s @@ -494,18 +307,21 @@ 94s > EOF 94s 94s $ hg init a 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s $ cd a 94s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 94s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 94s [255] 94s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 94s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 94s [255] 94s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 94s - ssh: * fakehost%7?shellcommand* (glob) 94s - abort: git remote error: The remote server unexpectedly closed the connection. 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 94s [255] 94s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 94s - ssh: * fakehost%7?shellcommand* (glob) 94s - abort: git remote error: The remote server unexpectedly closed the connection. 94s - [255] 94s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 94s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 94s + [255] 94s 94s ERROR: test-pull.t#draft output changed 95s ! 95s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-pull.t 95s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-pull.t#secret.err 95s @@ -35,153 +35,132 @@ 95s 95s pull without a name 95s $ hg init hgrepo 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s $ cd hgrepo 95s $ hg pull ../gitrepo 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s pulling from ../gitrepo 95s - importing 3 git commits 95s - adding bookmark beta 95s - adding bookmark delta 95s - adding bookmark master 95s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 95s - (run 'hg heads' to see heads, 'hg merge' to merge) 95s + abort: repository ../gitrepo not found 95s + [255] 95s $ git --git-dir .hg/git for-each-ref 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 95s + fatal: not a git repository: '.hg/git' 95s + [128] 95s $ hg log -Tp 95s - 2|draft|delta|tip 95s - 1|draft|beta| 95s - 0|draft|master|t_alpha 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s $ cd .. 95s $ rm -rf hgrepo 95s 95s pull with an implied name 95s $ hg init hgrepo 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s $ cd hgrepo 95s $ echo "[paths]" >> .hg/hgrc 95s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 95s $ hg pull ../gitrepo 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s pulling from ../gitrepo 95s - importing 3 git commits 95s - adding bookmark beta 95s - adding bookmark delta 95s - adding bookmark master 95s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 95s - (run 'hg heads' to see heads, 'hg merge' to merge) 95s + abort: repository ../gitrepo not found 95s + [255] 95s $ git --git-dir .hg/git for-each-ref 95s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 95s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 95s + fatal: not a git repository: '.hg/git' 95s + [128] 95s $ hg log -Tp 95s - 2|draft|delta|default/delta tip 95s - 1|draft|beta|default/beta 95s - 0|draft|master|default/master t_alpha 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s $ cd .. 95s $ rm -rf hgrepo 95s 95s pull with an explicit name 95s $ hg init hgrepo 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s $ cd hgrepo 95s $ echo "[paths]" >> .hg/hgrc 95s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 95s $ hg pull 95s - pulling from $TESTTMP/gitrepo 95s - importing 3 git commits 95s - adding bookmark beta 95s - adding bookmark delta 95s - adding bookmark master 95s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 95s - (run 'hg heads' to see heads, 'hg merge' to merge) 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + pulling from $TESTTMP/gitrepo 95s + abort: repository $TESTTMP/gitrepo not found 95s + [255] 95s $ git --git-dir .hg/git for-each-ref 95s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 95s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 95s + fatal: not a git repository: '.hg/git' 95s + [128] 95s $ hg log -Tp 95s - 2|draft|delta|default/delta tip 95s - 1|draft|beta|default/beta 95s - 0|draft|master|default/master t_alpha 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s $ cd .. 95s $ rm -rf hgrepo 95s 95s pull a tag 95s $ hg init hgrepo 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s $ echo "[paths]" >> hgrepo/.hg/hgrc 95s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 95s $ hg -R hgrepo pull -r t_alpha 95s - pulling from $TESTTMP/gitrepo 95s - importing 1 git commits 95s - adding bookmark master 95s - new changesets ff7a2f2d8d70 (1 drafts) 95s - (run 'hg update' to get a working copy) 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + pulling from $TESTTMP/gitrepo 95s + abort: repository $TESTTMP/gitrepo not found 95s + [255] 95s $ hg -R hgrepo update t_alpha 95s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: unknown revision 't_alpha' 95s + [10] 95s $ hg log -Tp -R hgrepo 95s - 0|draft|master|default/master t_alpha tip 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s 95s no-op pull 95s $ hg -R hgrepo pull -r t_alpha 95s - pulling from $TESTTMP/gitrepo 95s - no changes found 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + pulling from $TESTTMP/gitrepo 95s + abort: repository $TESTTMP/gitrepo not found 95s + [255] 95s 95s no-op pull with added bookmark 95s $ cd gitrepo 95s $ git checkout -qb epsilon t_alpha 95s $ cd .. 95s $ hg -R hgrepo pull -r epsilon 95s - pulling from $TESTTMP/gitrepo 95s - no changes found 95s - adding bookmark epsilon 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + pulling from $TESTTMP/gitrepo 95s + abort: repository $TESTTMP/gitrepo not found 95s + [255] 95s 95s pull something that doesn't exist 95s $ hg -R hgrepo pull -r kaflaflibob 95s - pulling from $TESTTMP/gitrepo 95s - abort: unknown revision 'kaflaflibob'!? (re) 95s - [10] 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + pulling from $TESTTMP/gitrepo 95s + abort: repository $TESTTMP/gitrepo not found 95s + [255] 95s 95s pull an ambiguous reference 95s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 95s $ hg -R hgrepo pull -r t_alpha 95s - pulling from $TESTTMP/gitrepo 95s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 95s - [10] 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + pulling from $TESTTMP/gitrepo 95s + abort: repository $TESTTMP/gitrepo not found 95s + [255] 95s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 95s 95s pull a branch 95s $ hg -R hgrepo pull -r beta 95s - pulling from $TESTTMP/gitrepo 95s - importing 1 git commits 95s - adding bookmark beta 95s - new changesets 7fe02317c63d (1 drafts) 95s - (run 'hg update' to get a working copy) 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + pulling from $TESTTMP/gitrepo 95s + abort: repository $TESTTMP/gitrepo not found 95s + [255] 95s $ hg -R hgrepo log --graph --template=phases 95s - o changeset: 1:7fe02317c63d 95s - | bookmark: beta 95s - | tag: default/beta 95s - | tag: tip 95s - | phase: draft 95s - | user: test 95s - | date: Mon Jan 01 00:00:11 2007 +0000 95s - | summary: add beta 95s - | 95s - @ changeset: 0:ff7a2f2d8d70 95s - bookmark: epsilon 95s - bookmark: master 95s - tag: default/epsilon 95s - tag: default/master 95s - tag: t_alpha 95s - phase: draft 95s - user: test 95s - date: Mon Jan 01 00:00:10 2007 +0000 95s - summary: add alpha 95s - 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s 95s no-op pull should affect phases 95s $ hg -R hgrepo phase -fs beta 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: unknown revision 'beta' 95s + [10] 95s $ hg -R hgrepo pull -r beta 95s - pulling from $TESTTMP/gitrepo 95s - no changes found 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + pulling from $TESTTMP/gitrepo 95s + abort: repository $TESTTMP/gitrepo not found 95s + [255] 95s $ hg -R hgrepo phase beta 95s - 1: draft 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: unknown revision 'beta' 95s + [10] 95s 95s 95s add another commit and tag to the git repo 95s @@ -196,50 +175,12 @@ 95s 95s pull everything else 95s $ hg -R hgrepo pull 95s - pulling from $TESTTMP/gitrepo 95s - importing 2 git commits 95s - adding bookmark delta 95s - updating bookmark master 95s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 95s - (run 'hg heads' to see heads, 'hg merge' to merge) 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + pulling from $TESTTMP/gitrepo 95s + abort: repository $TESTTMP/gitrepo not found 95s + [255] 95s $ hg -R hgrepo log --graph --template=phases 95s - o changeset: 3:6f898ad1f3e1 95s - | bookmark: master 95s - | tag: default/master 95s - | tag: tip 95s - | phase: draft 95s - | parent: 0:ff7a2f2d8d70 95s - | user: test 95s - | date: Mon Jan 01 00:00:13 2007 +0000 95s - | summary: add gamma 95s - | 95s - | o changeset: 2:678ebee93e38 95s - |/ bookmark: delta 95s - | tag: default/delta 95s - | phase: draft 95s - | parent: 0:ff7a2f2d8d70 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: add delta 95s - | 95s - | o changeset: 1:7fe02317c63d 95s - |/ bookmark: beta 95s - | tag: default/beta 95s - | tag: t_beta 95s - | phase: draft 95s - | user: test 95s - | date: Mon Jan 01 00:00:11 2007 +0000 95s - | summary: add beta 95s - | 95s - @ changeset: 0:ff7a2f2d8d70 95s - bookmark: epsilon 95s - tag: default/epsilon 95s - tag: t_alpha 95s - phase: draft 95s - user: test 95s - date: Mon Jan 01 00:00:10 2007 +0000 95s - summary: add alpha 95s - 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s add a merge to the git repo, and delete the branch 95s $ cd gitrepo 95s $ git merge -q -m "Merge branch 'beta'" beta 95s @@ -252,60 +193,26 @@ 95s 95s pull the merge 95s $ hg -R hgrepo tags | grep default/beta 95s - default/beta 1:7fe02317c63d 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + [1] 95s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 95s - pulling from $TESTTMP/gitrepo 95s - importing 1 git commits 95s - updating bookmark master 95s - deleting bookmark beta 95s - new changesets a02330f767a4 (1 drafts) 95s - (run 'hg update' to get a working copy) 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + pulling from $TESTTMP/gitrepo 95s + abort: repository $TESTTMP/gitrepo not found 95s + [255] 95s $ hg -R hgrepo tags | grep default/beta 95s - default/beta 1:7fe02317c63d 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + [1] 95s $ hg -R hgrepo pull 95s - pulling from $TESTTMP/gitrepo 95s - no changes found 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + pulling from $TESTTMP/gitrepo 95s + abort: repository $TESTTMP/gitrepo not found 95s + [255] 95s $ hg -R hgrepo tags | grep default/beta 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s [1] 95s $ hg -R hgrepo log --graph 95s - o changeset: 4:a02330f767a4 95s - |\ bookmark: master 95s - | | tag: default/master 95s - | | tag: tip 95s - | | parent: 3:6f898ad1f3e1 95s - | | parent: 1:7fe02317c63d 95s - | | user: test 95s - | | date: Mon Jan 01 00:00:13 2007 +0000 95s - | | summary: Merge branch 'beta' 95s - | | 95s - | o changeset: 3:6f898ad1f3e1 95s - | | parent: 0:ff7a2f2d8d70 95s - | | user: test 95s - | | date: Mon Jan 01 00:00:13 2007 +0000 95s - | | summary: add gamma 95s - | | 95s - | | o changeset: 2:678ebee93e38 95s - | |/ bookmark: delta 95s - | | tag: default/delta 95s - | | parent: 0:ff7a2f2d8d70 95s - | | user: test 95s - | | date: Mon Jan 01 00:00:12 2007 +0000 95s - | | summary: add delta 95s - | | 95s - o | changeset: 1:7fe02317c63d 95s - |/ tag: t_beta 95s - | user: test 95s - | date: Mon Jan 01 00:00:11 2007 +0000 95s - | summary: add beta 95s - | 95s - @ changeset: 0:ff7a2f2d8d70 95s - bookmark: epsilon 95s - tag: default/epsilon 95s - tag: t_alpha 95s - user: test 95s - date: Mon Jan 01 00:00:10 2007 +0000 95s - summary: add alpha 95s - 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s pull with wildcards 95s $ cd gitrepo 95s $ git checkout -qb releases/v1 master 95s @@ -324,66 +231,12 @@ 95s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 95s $ cd .. 95s $ hg -R hgrepo pull -r 'releases/*' 95s - pulling from $TESTTMP/gitrepo 95s - importing 2 git commits 95s - adding bookmark releases/v1 95s - adding bookmark releases/v2 95s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 95s - (run 'hg heads .' to see heads, 'hg merge' to merge) 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + pulling from $TESTTMP/gitrepo 95s + abort: repository $TESTTMP/gitrepo not found 95s + [255] 95s $ hg -R hgrepo log --graph 95s - o changeset: 6:a3f95e150b0a 95s - | bookmark: releases/v2 95s - | tag: default/releases/v2 95s - | tag: tip 95s - | parent: 4:a02330f767a4 95s - | user: test 95s - | date: Mon Jan 01 00:00:15 2007 +0000 95s - | summary: add eta 95s - | 95s - | o changeset: 5:218b2d0660d3 95s - |/ bookmark: releases/v1 95s - | tag: default/releases/v1 95s - | user: test 95s - | date: Mon Jan 01 00:00:14 2007 +0000 95s - | summary: add zeta 95s - | 95s - o changeset: 4:a02330f767a4 95s - |\ bookmark: master 95s - | | tag: default/master 95s - | | parent: 3:6f898ad1f3e1 95s - | | parent: 1:7fe02317c63d 95s - | | user: test 95s - | | date: Mon Jan 01 00:00:13 2007 +0000 95s - | | summary: Merge branch 'beta' 95s - | | 95s - | o changeset: 3:6f898ad1f3e1 95s - | | parent: 0:ff7a2f2d8d70 95s - | | user: test 95s - | | date: Mon Jan 01 00:00:13 2007 +0000 95s - | | summary: add gamma 95s - | | 95s - | | o changeset: 2:678ebee93e38 95s - | |/ bookmark: delta 95s - | | tag: default/delta 95s - | | parent: 0:ff7a2f2d8d70 95s - | | user: test 95s - | | date: Mon Jan 01 00:00:12 2007 +0000 95s - | | summary: add delta 95s - | | 95s - o | changeset: 1:7fe02317c63d 95s - |/ tag: t_beta 95s - | user: test 95s - | date: Mon Jan 01 00:00:11 2007 +0000 95s - | summary: add beta 95s - | 95s - @ changeset: 0:ff7a2f2d8d70 95s - bookmark: epsilon 95s - tag: default/epsilon 95s - tag: t_alpha 95s - user: test 95s - date: Mon Jan 01 00:00:10 2007 +0000 95s - summary: add alpha 95s - 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s 95s add old and new commits to the git repo -- make sure we're using the commit date 95s and not the author date 95s @@ -412,21 +265,19 @@ 95s Master is now filtered, so it's just stays there: 95s 95s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 95s - pulling from $TESTTMP/gitrepo 95s - no changes found 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + pulling from $TESTTMP/gitrepo 95s + abort: repository $TESTTMP/gitrepo not found 95s + [255] 95s $ hg -R hgrepo pull 95s - pulling from $TESTTMP/gitrepo 95s - no changes found 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + pulling from $TESTTMP/gitrepo 95s + abort: repository $TESTTMP/gitrepo not found 95s + [255] 95s $ hg -R hgrepo log -r master 95s - changeset: 4:a02330f767a4 95s - bookmark: master 95s - tag: default/master 95s - parent: 3:6f898ad1f3e1 95s - parent: 1:7fe02317c63d 95s - user: test 95s - date: Mon Jan 01 00:00:13 2007 +0000 95s - summary: Merge branch 'beta' 95s - 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: unknown revision 'master' 95s + [10] 95s 95s $ cd gitrepo 95s $ git checkout -q master 95s @@ -440,51 +291,13 @@ 95s > git tag -a -m 'tagging newtag' newtag 95s $ cd .. 95s $ hg -R hgrepo pull 95s - pulling from $TESTTMP/gitrepo 95s - importing 3 git commits 95s - updating bookmark master 95s - new changesets 49713da8f665:e103a73f33be (3 drafts) 95s - (run 'hg heads .' to see heads, 'hg merge' to merge) 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + pulling from $TESTTMP/gitrepo 95s + abort: repository $TESTTMP/gitrepo not found 95s + [255] 95s $ hg -R hgrepo heads 95s - changeset: 9:e103a73f33be 95s - bookmark: master 95s - tag: default/master 95s - tag: tip 95s - user: test 95s - date: Wed Jan 01 00:00:00 2014 +0000 95s - summary: newcommit 95s - 95s - changeset: 7:49713da8f665 95s - tag: newtag 95s - tag: oldtag 95s - parent: 4:a02330f767a4 95s - user: test 95s - date: Sat Mar 01 00:00:00 2014 +0000 95s - summary: oldtag 95s - 95s - changeset: 6:a3f95e150b0a 95s - bookmark: releases/v2 95s - tag: default/releases/v2 95s - parent: 4:a02330f767a4 95s - user: test 95s - date: Mon Jan 01 00:00:15 2007 +0000 95s - summary: add eta 95s - 95s - changeset: 5:218b2d0660d3 95s - bookmark: releases/v1 95s - tag: default/releases/v1 95s - user: test 95s - date: Mon Jan 01 00:00:14 2007 +0000 95s - summary: add zeta 95s - 95s - changeset: 2:678ebee93e38 95s - bookmark: delta 95s - tag: default/delta 95s - parent: 0:ff7a2f2d8d70 95s - user: test 95s - date: Mon Jan 01 00:00:12 2007 +0000 95s - summary: add delta 95s - 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + [1] 95s 95s test for ssh vulnerability 95s 95s @@ -494,18 +307,21 @@ 95s > EOF 95s 95s $ hg init a 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s $ cd a 95s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 95s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 95s [255] 95s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 95s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 95s [255] 95s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 95s - ssh: * fakehost%7?shellcommand* (glob) 95s - abort: git remote error: The remote server unexpectedly closed the connection. 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 95s [255] 95s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 95s - ssh: * fakehost%7?shellcommand* (glob) 95s - abort: git remote error: The remote server unexpectedly closed the connection. 95s - [255] 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 95s + [255] 95s 95s ERROR: test-pull.t#secret output changed 95s ! 95s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-git-submodules.t 95s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-git-submodules.t.err 95s @@ -188,261 +188,9 @@ 95s $ cd .. 95s 95s $ hg clone gitrepo2 hgrepo 95s - importing 10 git commits 95s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 95s - updating to bookmark master 95s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository gitrepo2 not found 95s + [255] 95s $ cd hgrepo 95s + $TESTTMP.sh: 133: cd: can't cd to hgrepo 95s $ hg log --graph 95s - @ changeset: 9:0ad944b2c4d8 95s - | bookmark: master 95s - | tag: default/master 95s - | tag: tip 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: remove all subrepos 95s - | 95s - o changeset: 8:33da452ef22f 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: replace subrepo with symlink 95s - | 95s - o changeset: 7:acebec53c0fc 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: replace symlink with subrepo 95s - | 95s - o changeset: 6:78c2ea52db4b 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: add symlink 95s - | 95s - o changeset: 5:c0d52ffc59b8 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: replace file with subrepo 95s - | 95s - o changeset: 4:73e078a178a0 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: replace subrepo with file 95s - | 95s - o changeset: 3:29e236ba4c06 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: add another subrepo 95s - | 95s - o changeset: 2:a6075a162f62 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: change subrepo commit 95s - | 95s - o changeset: 1:a4036e758995 95s - | user: test 95s - | date: Mon Jan 01 00:00:11 2007 +0000 95s - | summary: add subrepo 95s - | 95s - o changeset: 0:ff7a2f2d8d70 95s - user: test 95s - date: Mon Jan 01 00:00:10 2007 +0000 95s - summary: add alpha 95s - 95s - $ hg book 95s - * master 9:0ad944b2c4d8 95s - 95s -(add subrepo) 95s - $ hg cat -r 1 .hgsubstate 95s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo 95s - $ hg cat -r 1 .hgsub 95s - subrepo = [git]../gitsubrepo 95s - $ hg gverify -r 1 95s - verifying rev a4036e758995 against git commit e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 95s - 95s -(change subrepo commit) 95s - $ hg cat -r 2 .hgsubstate 95s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 95s - $ hg cat -r 2 .hgsub 95s - subrepo = [git]../gitsubrepo 95s - $ hg gverify -r 2 95s - verifying rev a6075a162f62 against git commit a000567ceefbd9a2ce364e0dea6e298010b02b6d 95s - 95s -(add another subrepo) 95s - $ hg cat -r 3 .hgsubstate 95s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 95s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 95s - $ hg cat -r 3 .hgsub 95s - subrepo = [git]../gitsubrepo 95s - subrepo2 = [git]../gitsubrepo 95s - $ hg gverify -r 3 95s - verifying rev 29e236ba4c06 against git commit 6e219527869fa40eb6ffbdd013cd86d576b26b01 95s - 95s -(replace subrepo with file) 95s - $ hg cat -r 4 .hgsubstate 95s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 95s - $ hg cat -r 4 .hgsub 95s - subrepo2 = [git]../gitsubrepo 95s - $ hg manifest -r 4 95s - .hgsub 95s - .hgsubstate 95s - alpha 95s - subrepo 95s - $ hg gverify -r 4 95s - verifying rev 73e078a178a0 against git commit f6436a472da00f581d8d257e9bbaf3c358a5e88c 95s - 95s -(replace file with subrepo) 95s - $ hg cat -r 5 .hgsubstate 95s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 95s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 95s - $ hg cat -r 5 .hgsub 95s - subrepo2 = [git]../gitsubrepo 95s - alpha = [git]../gitsubrepo 95s - $ hg manifest -r 5 95s - .hgsub 95s - .hgsubstate 95s - subrepo 95s - $ hg gverify -r 5 95s - verifying rev c0d52ffc59b8 against git commit 88171163bf4795b5570924e51d5f8ede33f8bc28 95s - 95s -(replace symlink with subrepo) 95s - $ hg cat -r 7 .hgsub 95s - subrepo2 = [git]../gitsubrepo 95s - alpha = [git]../gitsubrepo 95s - foolink = [git]../gitsubrepo 95s - $ hg cat -r 7 .hgsubstate 95s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 95s - 6e4ad8da50204560c00fa25e4987eb2e239029ba foolink 95s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 95s - $ hg gverify -r 7 95s - verifying rev acebec53c0fc against git commit e3288fa737d429a60637b3b6782cb25b8298bc00 95s - 95s -(replace subrepo with symlink) 95s - $ hg cat -r 8 .hgsub .hgsubstate 95s - subrepo2 = [git]../gitsubrepo 95s - alpha = [git]../gitsubrepo 95s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 95s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 95s - 95s - $ hg gverify -r 8 95s - verifying rev 33da452ef22f against git commit d28364013fe1a0fde56c0e1921e49ecdeee8571d 95s - 95s -(remove all subrepos) 95s - $ hg cat -r 9 .hgsub .hgsubstate 95s - .hgsub: no such file in rev 0ad944b2c4d8 95s - .hgsubstate: no such file in rev 0ad944b2c4d8 95s - [1] 95s - $ hg gverify -r 9 95s - verifying rev 0ad944b2c4d8 against git commit 15ba94929481c654814178aac1dbca06ae688718 95s - 95s - $ hg debug-remove-hggit-state 95s - clearing out the git cache data 95s - $ hg gexport 95s - $ cd .hg/git 95s - $ git log --pretty=oneline 95s - 73c15b74fb81fa0cc60e9c59c73787a9f26c778b remove all subrepos 95s - d28364013fe1a0fde56c0e1921e49ecdeee8571d replace subrepo with symlink 95s - e3288fa737d429a60637b3b6782cb25b8298bc00 replace symlink with subrepo 95s - 2d1c135447d11df4dfe96dd5d4f37926dc5c821d add symlink 95s - 88171163bf4795b5570924e51d5f8ede33f8bc28 replace file with subrepo 95s - f6436a472da00f581d8d257e9bbaf3c358a5e88c replace subrepo with file 95s - 6e219527869fa40eb6ffbdd013cd86d576b26b01 add another subrepo 95s - a000567ceefbd9a2ce364e0dea6e298010b02b6d change subrepo commit 95s - e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 add subrepo 95s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 add alpha 95s - 95s -test with rename detection enabled -- simply checking that the Mercurial hashes 95s -are the same is enough 95s - $ cd ../../.. 95s - $ hg --config git.similarity=100 clone gitrepo2 hgreporenames 95s - importing 10 git commits 95s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 95s - updating to bookmark master 95s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 95s - $ cd hgreporenames 95s - $ hg log --graph 95s - @ changeset: 9:0ad944b2c4d8 95s - | bookmark: master 95s - | tag: default/master 95s - | tag: tip 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: remove all subrepos 95s - | 95s - o changeset: 8:33da452ef22f 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: replace subrepo with symlink 95s - | 95s - o changeset: 7:acebec53c0fc 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: replace symlink with subrepo 95s - | 95s - o changeset: 6:78c2ea52db4b 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: add symlink 95s - | 95s - o changeset: 5:c0d52ffc59b8 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: replace file with subrepo 95s - | 95s - o changeset: 4:73e078a178a0 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: replace subrepo with file 95s - | 95s - o changeset: 3:29e236ba4c06 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: add another subrepo 95s - | 95s - o changeset: 2:a6075a162f62 95s - | user: test 95s - | date: Mon Jan 01 00:00:12 2007 +0000 95s - | summary: change subrepo commit 95s - | 95s - o changeset: 1:a4036e758995 95s - | user: test 95s - | date: Mon Jan 01 00:00:11 2007 +0000 95s - | summary: add subrepo 95s - | 95s - o changeset: 0:ff7a2f2d8d70 95s - user: test 95s - date: Mon Jan 01 00:00:10 2007 +0000 95s - summary: add alpha 95s - 95s - $ cd .. 95s - 95s -test handling of an invalid .gitmodules file (#380) 95s - 95s - $ git init --quiet gitrepo-issue380 95s - $ cd gitrepo-issue380 95s - $ git submodule add ../gitsubrepo 95s - Cloning into '$TESTTMP/gitrepo-issue380/gitsubrepo'... 95s - done. 95s - $ fn_git_commit -m 'add a submodule' 95s - $ cat >> .gitmodules < <<<<<<< HEAD 95s - > EOF 95s - $ fn_git_commit -a -m 'b0rken .gitmodules' 95s - $ git status 95s - fatal: bad config line 4 in file $TESTTMP/gitrepo-issue380/.gitmodules 95s - [128] 95s - $ sed -i.orig /HEAD/d .gitmodules 95s - $ fn_git_commit -a -m 'fix .gitmodules' 95s - $ git status 95s - On branch master 95s - Untracked files: 95s - (use "git add ..." to include in what will be committed) 95s - .gitmodules.orig 95s - 95s - nothing added to commit but untracked files present (use "git add" to track) 95s - $ cd .. 95s - $ git clone gitrepo-issue380 gitrepo-issue380~ 95s - Cloning into 'gitrepo-issue380~'... 95s - done. 95s - $ hg clone -U gitrepo-issue380 hgrepo-issue380 95s - importing 3 git commits 95s - warning: failed to parse .gitmodules in 2e4ec4293822 95s - new changesets ed60e5fbc192:9dfc0cdf1787 (3 drafts) 95s 95s ERROR: test-git-submodules.t output changed 95s !s 95s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-renames.t 95s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-renames.t.err 95s @@ -95,494 +95,9 @@ 95s 95s $ cd .. 95s $ hg clone -q repo.git hgrepo 95s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 95s + abort: repository repo.git not found 95s + [255] 95s $ cd hgrepo 95s + $TESTTMP.sh: 115: cd: can't cd to hgrepo 95s $ hg book master -q 95s - $ hg log -p --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 95s - @ 8 497105ddbe119aa40af691eb2b1a029c29bf5247 remove submodule and rename back 95s - | branch=default hg-git-rename-source=git 95s - | 95s - | diff --git a/.hgsub b/.hgsub 95s - | --- a/.hgsub 95s - | +++ b/.hgsub 95s - | @@ -1,2 +1,1 @@ 95s - | gitsubmodule2 = [git]../gitsubmodule 95s - | -gamma = [git]../gitsubmodule 95s - | diff --git a/.hgsubstate b/.hgsubstate 95s - | --- a/.hgsubstate 95s - | +++ b/.hgsubstate 95s - | @@ -1,2 +1,1 @@ 95s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 95s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 95s - | diff --git a/gamma-new b/gamma 95s - | rename from gamma-new 95s - | rename to gamma 95s - | 95s - o 7 adfc1ce8461d3174dcf8425e112e2fa848de3913 rename and add submodule 95s - | branch=default hg-git-rename-source=git 95s - | 95s - | diff --git a/.hgsub b/.hgsub 95s - | --- a/.hgsub 95s - | +++ b/.hgsub 95s - | @@ -1,1 +1,2 @@ 95s - | gitsubmodule2 = [git]../gitsubmodule 95s - | +gamma = [git]../gitsubmodule 95s - | diff --git a/.hgsubstate b/.hgsubstate 95s - | --- a/.hgsubstate 95s - | +++ b/.hgsubstate 95s - | @@ -1,1 +1,2 @@ 95s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 95s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 95s - | diff --git a/gamma b/gamma-new 95s - | rename from gamma 95s - | rename to gamma-new 95s - | 95s - o 6 62c1a4b07240b53a71be1b1a46e94e99132c5391 beta renamed back 95s - | branch=default hg-git-rename-source=git 95s - | 95s - | diff --git a/beta b/beta 95s - | old mode 120000 95s - | new mode 100644 95s - | --- a/beta 95s - | +++ b/beta 95s - | @@ -1,1 +1,12 @@ 95s - | -beta-new 95s - | \ No newline at end of file 95s - | +1 95s - | +2 95s - | +3 95s - | +4 95s - | +5 95s - | +6 95s - | +7 95s - | +8 95s - | +9 95s - | +10 95s - | +11 95s - | +12 95s - | diff --git a/beta-new b/beta-new 95s - | deleted file mode 100644 95s - | --- a/beta-new 95s - | +++ /dev/null 95s - | @@ -1,12 +0,0 @@ 95s - | -1 95s - | -2 95s - | -3 95s - | -4 95s - | -5 95s - | -6 95s - | -7 95s - | -8 95s - | -9 95s - | -10 95s - | -11 95s - | -12 95s - | 95s - o 5 f93fefed957cff2220d3f0d11182398350b5fa9a beta renamed 95s - | branch=default hg-git-rename-source=git 95s - | 95s - | diff --git a/beta b/beta 95s - | old mode 100644 95s - | new mode 120000 95s - | --- a/beta 95s - | +++ b/beta 95s - | @@ -1,12 +1,1 @@ 95s - | -1 95s - | -2 95s - | -3 95s - | -4 95s - | -5 95s - | -6 95s - | -7 95s - | -8 95s - | -9 95s - | -10 95s - | -11 95s - | -12 95s - | +beta-new 95s - | \ No newline at end of file 95s - | diff --git a/beta b/beta-new 95s - | copy from beta 95s - | copy to beta-new 95s - | 95s - o 4 b9e63d96abc2783afc59246e798a6936cf05a35e move submodule 95s - | branch=default hg-git-rename-source=git 95s - | 95s - | diff --git a/.hgsub b/.hgsub 95s - | --- a/.hgsub 95s - | +++ b/.hgsub 95s - | @@ -1,1 +1,1 @@ 95s - | -gitsubmodule = [git]../gitsubmodule 95s - | +gitsubmodule2 = [git]../gitsubmodule 95s - | diff --git a/.hgsubstate b/.hgsubstate 95s - | --- a/.hgsubstate 95s - | +++ b/.hgsubstate 95s - | @@ -1,1 +1,1 @@ 95s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 95s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 95s - | 95s - o 3 55537ea256c28be1b5637f4f93a601fdde8a9a7f add submodule 95s - | branch=default hg-git-rename-source=git 95s - | 95s - | diff --git a/.hgsub b/.hgsub 95s - | new file mode 100644 95s - | --- /dev/null 95s - | +++ b/.hgsub 95s - | @@ -0,0 +1,1 @@ 95s - | +gitsubmodule = [git]../gitsubmodule 95s - | diff --git a/.hgsubstate b/.hgsubstate 95s - | new file mode 100644 95s - | --- /dev/null 95s - | +++ b/.hgsubstate 95s - | @@ -0,0 +1,1 @@ 95s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 95s - | 95s - o 2 20f9e56b6d006d0403f853245e483d0892b8ac48 gamma 95s - | branch=default hg-git-rename-source=git 95s - | 95s - | diff --git a/beta b/beta 95s - | --- a/beta 95s - | +++ b/beta 95s - | @@ -9,3 +9,4 @@ 95s - | 9 95s - | 10 95s - | 11 95s - | +12 95s - | diff --git a/beta b/gamma 95s - | copy from beta 95s - | copy to gamma 95s - | --- a/beta 95s - | +++ b/gamma 95s - | @@ -9,3 +9,4 @@ 95s - | 9 95s - | 10 95s - | 11 95s - | +13 95s - | 95s - o 1 9f7744e68def81da3b394f11352f602ca9c8ab68 beta 95s - | branch=default hg-git-rename-source=git 95s - | 95s - | diff --git a/alpha b/beta 95s - | rename from alpha 95s - | rename to beta 95s - | --- a/alpha 95s - | +++ b/beta 95s - | @@ -8,3 +8,4 @@ 95s - | 8 95s - | 9 95s - | 10 95s - | +11 95s - | 95s - o 0 7bc844166f76e49562f81eacd54ea954d01a9e42 alpha 95s - branch=default hg-git-rename-source=git 95s - 95s - diff --git a/alpha b/alpha 95s - new file mode 100644 95s - --- /dev/null 95s - +++ b/alpha 95s - @@ -0,0 +1,10 @@ 95s - +1 95s - +2 95s - +3 95s - +4 95s - +5 95s - +6 95s - +7 95s - +8 95s - +9 95s - +10 95s - 95s - 95s -Make a new ordinary commit in Mercurial (no extra metadata) 95s - $ echo 14 >> gamma 95s - $ hg ci -m "gamma2" 95s - 95s -Make a new commit with a copy and a rename in Mercurial 95s - $ hg cp gamma delta 95s - $ echo 15 >> delta 95s - $ hg mv beta epsilon 95s - $ echo 16 >> epsilon 95s - $ hg ci -m "delta/epsilon" 95s - $ hg export . 95s - # HG changeset patch 95s - # User test 95s - # Date 0 0 95s - # Thu Jan 01 00:00:00 1970 +0000 95s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 95s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 95s - delta/epsilon 95s - 95s - diff --git a/gamma b/delta 95s - copy from gamma 95s - copy to delta 95s - --- a/gamma 95s - +++ b/delta 95s - @@ -11,3 +11,4 @@ 95s - 11 95s - 13 95s - 14 95s - +15 95s - diff --git a/beta b/epsilon 95s - rename from beta 95s - rename to epsilon 95s - --- a/beta 95s - +++ b/epsilon 95s - @@ -10,3 +10,4 @@ 95s - 10 95s - 11 95s - 12 95s - +16 95s - $ hg push 95s - pushing to $TESTTMP/repo.git 95s - searching for changes 95s - adding objects 95s - remote: found 0 deltas to reuse 95s - added 2 commits with 2 trees and 3 blobs 95s - updating reference refs/heads/master 95s - 95s - $ cd ../repo.git 95s - $ git log master --pretty=oneline 95s - 5f2948d029693346043f320620af99a615930dc4 delta/epsilon 95s - bbd2ec050f7fbc64f772009844f7d58a556ec036 gamma2 95s - 50d116676a308b7c22935137d944e725d2296f2a remove submodule and rename back 95s - 59fb8e82ea18f79eab99196f588e8948089c134f rename and add submodule 95s - f95497455dfa891b4cd9b524007eb9514c3ab654 beta renamed back 95s - 055f482277da6cd3dd37c7093d06983bad68f782 beta renamed 95s - d7f31298f27df8a9226eddb1e4feb96922c46fa5 move submodule 95s - c610256cb6959852d9e70d01902a06726317affc add submodule 95s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 95s - cc83241f39927232f690d370894960b0d1943a0e beta 95s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 95s - 95s -Make sure the right metadata is stored 95s - $ git cat-file commit master^ 95s - tree 0adbde18545845f3b42ad1a18939ed60a9dec7a8 95s - parent 50d116676a308b7c22935137d944e725d2296f2a 95s - author test 0 +0000 95s - committer test 0 +0000 95s - HG:rename-source hg 95s - 95s - gamma2 95s - $ git cat-file commit master 95s - tree f8f32f4e20b56a5a74582c6a5952c175bf9ec155 95s - parent bbd2ec050f7fbc64f772009844f7d58a556ec036 95s - author test 0 +0000 95s - committer test 0 +0000 95s - HG:rename gamma:delta 95s - HG:rename beta:epsilon 95s - 95s - delta/epsilon 95s - 95s -Now make another clone and compare the hashes 95s - 95s - $ cd .. 95s - $ hg clone -q repo.git hgrepo2 95s - $ cd hgrepo2 95s - $ hg book master -qf 95s - $ hg export master 95s - # HG changeset patch 95s - # User test 95s - # Date 0 0 95s - # Thu Jan 01 00:00:00 1970 +0000 95s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 95s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 95s - delta/epsilon 95s - 95s - diff --git a/gamma b/delta 95s - copy from gamma 95s - copy to delta 95s - --- a/gamma 95s - +++ b/delta 95s - @@ -11,3 +11,4 @@ 95s - 11 95s - 13 95s - 14 95s - +15 95s - diff --git a/beta b/epsilon 95s - rename from beta 95s - rename to epsilon 95s - --- a/beta 95s - +++ b/epsilon 95s - @@ -10,3 +10,4 @@ 95s - 10 95s - 11 95s - 12 95s - +16 95s - 95s -Regenerate the Git metadata and compare the hashes 95s - $ hg debug-remove-hggit-state 95s - clearing out the git cache data 95s - $ hg gexport 95s - $ cd .hg/git 95s - $ git log master --pretty=oneline 95s - f3f6592447685566af9447c03ae262aa5432511d delta/epsilon (dulwich-rust !) 95s - c51ce14ec367c5ea72bf428dee3f8576f2fe1bb0 gamma2 (dulwich-rust !) 95s - df749cae534e3c7a0ad664cd0f214dd36e0ac259 remove submodule and rename back (dulwich-rust !) 95s - 8f9ec605ad0cc2532202f73cef8e35d3241797ee rename and add submodule (dulwich-rust !) 95s - 8a00d0fb75377c51c9a46e92ff154c919007f0e2 delta/epsilon (no-dulwich-rust !) 95s - dd7d4f1adb942a8d349dce585019f6949184bc64 gamma2 (no-dulwich-rust !) 95s - 3f1cdaf8b603816fcda02bd29e75198ae4cb13db remove submodule and rename back (no-dulwich-rust !) 95s - 2a4abf1178a999e2054158ceb0c7768079665d03 rename and add submodule (no-dulwich-rust !) 95s - 88c416e8d5e0e9dd1187d45ebafaa46111764196 beta renamed back 95s - 027d2a6e050705bf6f7e226e7e97f02ce5ae3200 beta renamed 95s - dc70e620634887e70ac5dd108bcc7ebd99c60ec3 move submodule 95s - c610256cb6959852d9e70d01902a06726317affc add submodule 95s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 95s - cc83241f39927232f690d370894960b0d1943a0e beta 95s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 95s - 95s -Test findcopiesharder 95s - 95s - $ cd $TESTTMP 95s - $ git init -q gitcopyharder 95s - $ cd gitcopyharder 95s - $ cat >> file0 << EOF 95s - > 1 95s - > 2 95s - > 3 95s - > 4 95s - > 5 95s - > EOF 95s - $ git add file0 95s - $ fn_git_commit -m file0 95s - $ cp file0 file1 95s - $ git add file1 95s - $ fn_git_commit -m file1 95s - $ cp file0 file2 95s - $ echo 6 >> file2 95s - $ git add file2 95s - $ fn_git_commit -m file2 95s - 95s - $ cd .. 95s - 95s -Clone without findcopiesharder does not find copies from unmodified files 95s - 95s - $ hg clone gitcopyharder hgnocopyharder 95s - importing 3 git commits 95s - new changesets b45d023c6842:ec77ccdbefe0 (3 drafts) 95s - updating to bookmark master 95s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 95s - $ hg -R hgnocopyharder export 1::2 95s - # HG changeset patch 95s - # User test 95s - # Date 1167609621 0 95s - # Mon Jan 01 00:00:21 2007 +0000 95s - # Node ID 555831c93e2a250e5ba42efad45bf7ba71da13e4 95s - # Parent b45d023c6842337ffe694663a44aa672d311081c 95s - file1 95s - 95s - diff --git a/file1 b/file1 95s - new file mode 100644 95s - --- /dev/null 95s - +++ b/file1 95s - @@ -0,0 +1,5 @@ 95s - +1 95s - +2 95s - +3 95s - +4 95s - +5 95s - # HG changeset patch 95s - # User test 95s - # Date 1167609622 0 95s - # Mon Jan 01 00:00:22 2007 +0000 95s - # Node ID ec77ccdbefe023eb9898b0399f84f670c8c0f5fc 95s - # Parent 555831c93e2a250e5ba42efad45bf7ba71da13e4 95s - file2 95s - 95s - diff --git a/file2 b/file2 95s - new file mode 100644 95s - --- /dev/null 95s - +++ b/file2 95s - @@ -0,0 +1,6 @@ 95s - +1 95s - +2 95s - +3 95s - +4 95s - +5 95s - +6 95s - 95s -findcopiesharder finds copies from unmodified files if similarity is met 95s - 95s - $ hg --config git.findcopiesharder=true clone gitcopyharder hgcopyharder0 95s - importing 3 git commits 95s - new changesets b45d023c6842:9b3099834272 (3 drafts) 95s - updating to bookmark master 95s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 95s - $ hg -R hgcopyharder0 export 1::2 95s - # HG changeset patch 95s - # User test 95s - # Date 1167609621 0 95s - # Mon Jan 01 00:00:21 2007 +0000 95s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 95s - # Parent b45d023c6842337ffe694663a44aa672d311081c 95s - file1 95s - 95s - diff --git a/file0 b/file1 95s - copy from file0 95s - copy to file1 95s - # HG changeset patch 95s - # User test 95s - # Date 1167609622 0 95s - # Mon Jan 01 00:00:22 2007 +0000 95s - # Node ID 9b30998342729c7357d418bebed7399986cfe643 95s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 95s - file2 95s - 95s - diff --git a/file0 b/file2 95s - copy from file0 95s - copy to file2 95s - --- a/file0 95s - +++ b/file2 95s - @@ -3,3 +3,4 @@ 95s - 3 95s - 4 95s - 5 95s - +6 95s - 95s - $ hg --config git.findcopiesharder=true --config git.similarity=95 clone gitcopyharder hgcopyharder1 95s - importing 3 git commits 95s - new changesets b45d023c6842:d9d2e8cbf050 (3 drafts) 95s - updating to bookmark master 95s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 95s - $ hg -R hgcopyharder1 export 1::2 95s - # HG changeset patch 95s - # User test 95s - # Date 1167609621 0 95s - # Mon Jan 01 00:00:21 2007 +0000 95s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 95s - # Parent b45d023c6842337ffe694663a44aa672d311081c 95s - file1 95s - 95s - diff --git a/file0 b/file1 95s - copy from file0 95s - copy to file1 95s - # HG changeset patch 95s - # User test 95s - # Date 1167609622 0 95s - # Mon Jan 01 00:00:22 2007 +0000 95s - # Node ID d9d2e8cbf050772be31dccf78851f71dc547d139 95s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 95s - file2 95s - 95s - diff --git a/file2 b/file2 95s - new file mode 100644 95s - --- /dev/null 95s - +++ b/file2 95s - @@ -0,0 +1,6 @@ 95s - +1 95s - +2 95s - +3 95s - +4 95s - +5 95s - +6 95s - 95s -Config values out of range 95s - $ hg --config git.similarity=999 clone gitcopyharder hgcopyharder2 95s - importing 3 git commits 95s - abort: git.similarity must be between 0 and 100 95s - [255] 95s -Left-over on Windows with some pack files 95s - $ rm -rf hgcopyharder2 95s - $ hg --config git.renamelimit=-5 clone gitcopyharder hgcopyharder2 95s - importing 3 git commits 95s - abort: git.renamelimit must be non-negative 95s - [255] 95s 95s ERROR: test-renames.t output changed 96s ! 96s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-git-tags.t 96s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-git-tags.t#draft.err 96s @@ -41,337 +41,13 @@ 96s Clone it: 96s 96s $ hg clone repo.git hgrepo 96s - importing 2 git commits 96s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 96s - updating to bookmark master 96s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository repo.git not found 96s + [255] 96s 96s $ cd hgrepo 96s + $TESTTMP.sh: 39: cd: can't cd to hgrepo 96s 96s Verify that annotated tags are unaffected by reexports: 96s 96s $ GIT_DIR=.hg/git git tag -ln 96s - beta added tag beta 96s - $ hg gexport 96s - $ GIT_DIR=.hg/git git tag -ln 96s - beta added tag beta 96s - 96s -Error checking on tag creation 96s - 96s - $ hg tag --git beta --remove 96s - abort: cannot remove git tags 96s - (the git documentation heavily discourages editing tags) 96s - [255] 96s - $ hg tag --git beta -r null 96s - abort: cannot remove git tags 96s - (the git documentation heavily discourages editing tags) 96s - [255] 96s - $ hg tag --git beta --remove -r 0 96s - abort: cannot specify both --rev and --remove 96s - [10] 96s - $ hg tag --git alpha 96s - abort: git tags require an explicit revision 96s - (please specify -r/--rev) 96s - [255] 96s - $ hg tag --git alpha alpha -r 0 96s - abort: tag names must be unique 96s - [255] 96s - $ hg tag --git alpha -r 0 -e 96s - abort: cannot specify both --git and --edit 96s - [10] 96s - $ hg tag --git alpha -r 0 -m 42 96s - abort: cannot specify both --git and --message 96s - [10] 96s - $ hg tag --git alpha -r 0 -d 42 96s - abort: cannot specify both --git and --date 96s - [10] 96s - $ hg tag --git alpha -r 0 -u user@example.com 96s - abort: cannot specify both --git and --user 96s - [10] 96s - $ hg tag --git 'with space' -r 0 96s - abort: the name 'with space' is not a valid git tag 96s - [255] 96s - $ hg tag --git ' beta' -r 0 96s - abort: the name 'beta' already exists 96s - [255] 96s - $ hg tag --git master -r 0 96s - abort: the name 'master' already exists 96s - [255] 96s - $ hg tag --git tip -r 0 96s - abort: the name 'tip' is reserved 96s - [10] 96s - 96s -Create a git tag from hg 96s - 96s - $ hg tag --git alpha --debug -r 0 96s - finding unexported changesets 96s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 96s - adding git tag alpha 96s - $ hg log --graph 96s - @ changeset: 1:7fe02317c63d 96s - | bookmark: master 96s - | tag: beta 96s - | tag: default/master 96s - | tag: tip 96s - | user: test 96s - | date: Mon Jan 01 00:00:11 2007 +0000 96s - | summary: add beta 96s - | 96s - o changeset: 0:ff7a2f2d8d70 96s - tag: alpha 96s - user: test 96s - date: Mon Jan 01 00:00:10 2007 +0000 96s - summary: add alpha 96s - 96s - $ echo beta-fix >> beta 96s - $ fn_hg_commit -m 'fix for beta' 96s -#if secret 96s - $ hg phase -d 96s -#endif 96s - $ hg push 96s - pushing to $TESTTMP/repo.git 96s - searching for changes 96s - adding objects 96s - remote: found 0 deltas to reuse 96s - added 1 commits with 1 trees and 1 blobs 96s - updating reference refs/heads/master 96s - adding reference refs/tags/alpha 96s - 96s -Verify that amending commits known to remotes doesn't break anything 96s - 96s - $ cat >> $HGRCPATH << EOF 96s - > [experimental] 96s - > evolution = createmarkers 96s - > evolution.createmarkers = yes 96s - > EOF 96s - $ hg tags 96s - tip 2:61175962e488 96s - default/master 2:61175962e488 96s - beta 1:7fe02317c63d 96s - alpha 0:ff7a2f2d8d70 96s - $ echo beta-fix-again >> beta 96s - $ fn_hg_commit --amend 96s - $ hg log -T shorttags 96s - 3:3094b9e8da41 draft tip 96s - 2:61175962e488 draft default/master X 96s - 1:7fe02317c63d draft beta 96s - 0:ff7a2f2d8d70 draft alpha 96s - $ hg tags 96s - tip 3:3094b9e8da41 96s - default/master 2:61175962e488 96s - beta 1:7fe02317c63d 96s - alpha 0:ff7a2f2d8d70 96s - $ hg push 96s - pushing to $TESTTMP/repo.git 96s - searching for changes 96s - abort: pushing refs/heads/master overwrites 3094b9e8da41 96s - [255] 96s - $ hg push -f 96s - pushing to $TESTTMP/repo.git 96s - searching for changes 96s - adding objects 96s - remote: found 0 deltas to reuse 96s - added 1 commits with 1 trees and 1 blobs 96s - updating reference refs/heads/master 96s - 96s -Now create a tag for the old, obsolete master 96s - 96s - $ cd ../repo.git 96s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 96s - $ git tag 96s - alpha 96s - beta 96s - detached 96s - $ cd ../hgrepo 96s - $ hg pull 96s - pulling from $TESTTMP/repo.git 96s - no changes found 96s - $ hg log -T shorttags 96s - 3:3094b9e8da41 draft default/master tip 96s - 2:61175962e488 draft detached X 96s - 1:7fe02317c63d draft beta 96s - 0:ff7a2f2d8d70 draft alpha 96s - $ hg tags 96s - tip 3:3094b9e8da41 96s - default/master 3:3094b9e8da41 96s - detached 2:61175962e488 96s - beta 1:7fe02317c63d 96s - alpha 0:ff7a2f2d8d70 96s - $ hg push 96s - pushing to $TESTTMP/repo.git 96s - searching for changes 96s - no changes found 96s - [1] 96s - 96s - $ cd .. 96s - 96s -Verify that revsets can point out git tags; for that we need an 96s -untagged commit. 96s - 96s - $ cd hgrepo 96s - $ touch gamma 96s - $ fn_hg_commit -A -m 'add gamma' 96s -#if secret 96s - $ hg phase -d 96s -#endif 96s - $ hg log -T shorttags -r 'gittag()' 96s - 0:ff7a2f2d8d70 draft alpha 96s - 1:7fe02317c63d draft beta 96s - 2:61175962e488 draft detached X 96s - $ hg log -T shorttags -r 'gittag(detached)' 96s - 2:61175962e488 draft detached X 96s - $ hg log -T shorttags -r 'gittag("re:a$")' 96s - 0:ff7a2f2d8d70 draft alpha 96s - 1:7fe02317c63d draft beta 96s - 96s -Create a git tag from hg, but pointing to a new commit: 96s - 96s - $ hg tag --git gamma --debug -r tip 96s - invalid branch cache (visible): tip differs (?) 96s - finding unexported changesets 96s - exporting 1 changesets 96s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 96s - packing 3 loose objects... 96s - packed 3 loose objects! 96s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 96s - adding git tag gamma 96s - $ hg push 96s - pushing to $TESTTMP/repo.git 96s - searching for changes 96s - adding objects 96s - remote: found 0 deltas to reuse 96s - added 1 commits with 1 trees and 1 blobs 96s - updating reference refs/heads/master 96s - adding reference refs/tags/gamma 96s - $ cd ../gitrepo 96s - $ git fetch --quiet --tags 96s - $ git tag 96s - alpha 96s - beta 96s - detached 96s - gamma 96s - $ cd .. 96s - 96s -Try to overwrite an annotated tag: 96s - 96s - $ cd hgrepo 96s - $ hg tags -v 96s - tip 4:0eb1ab0073a8 96s - gamma 4:0eb1ab0073a8 git 96s - default/master 4:0eb1ab0073a8 git-remote 96s - detached 2:61175962e488 git 96s - beta 1:7fe02317c63d git 96s - alpha 0:ff7a2f2d8d70 git 96s - $ hg book not-master 96s - $ hg tag beta 96s - abort: tag 'beta' already exists (use -f to force) 96s - [10] 96s - $ hg tag -f beta 96s -#if secret 96s - $ hg phase -d 96s -#endif 96s - $ hg push 96s - pushing to $TESTTMP/repo.git 96s - warning: not overwriting annotated tag 'beta' 96s - searching for changes 96s - adding objects 96s - remote: found 0 deltas to reuse 96s - added 1 commits with 1 trees and 1 blobs 96s - adding reference refs/heads/not-master 96s - $ hg tags 96s - tip 5:c49682c7cba4 96s - default/not-master 5:c49682c7cba4 96s - gamma 4:0eb1ab0073a8 96s - default/master 4:0eb1ab0073a8 96s - beta 4:0eb1ab0073a8 96s - detached 2:61175962e488 96s - alpha 0:ff7a2f2d8d70 96s - $ cd .. 96s - 96s -Check whether `gimport` handles tags 96s - 96s - $ cd hgrepo 96s - $ rm .hg/git-tags .hg/git-mapfile 96s - $ hg gimport 96s - importing 6 git commits 96s - $ hg tags -q 96s - tip 96s - default/not-master 96s - gamma 96s - default/master 96s - beta 96s - detached 96s - alpha 96s - $ cd .. 96s - 96s -Test how pulling an explicit branch with an annotated tag: 96s - 96s - $ hg clone -r master repo.git hgrepo-2 96s - importing 4 git commits 96s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 96s - updating to branch default 96s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 96s - 0:ff7a2f2d8d70 draft alpha 96s - 1:7fe02317c63d draft beta 96s - 3:0eb1ab0073a8 draft default/master gamma tip 96s - $ hg tags -v -R hgrepo-2 96s - tip 3:0eb1ab0073a8 96s - gamma 3:0eb1ab0073a8 git 96s - default/master 3:0eb1ab0073a8 git-remote 96s - beta 1:7fe02317c63d git 96s - alpha 0:ff7a2f2d8d70 git 96s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 96s - $ rm -rf hgrepo-2 96s - 96s - $ hg clone -r master repo.git hgrepo-2 96s - importing 4 git commits 96s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 96s - updating to branch default 96s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 96s - 0:ff7a2f2d8d70 draft alpha 96s - 1:7fe02317c63d draft beta 96s - 3:0eb1ab0073a8 draft default/master gamma tip 96s -This used to die: 96s - $ hg -R hgrepo-2 gexport 96s -This used to fail, since we didn't actually pull the annotated tag: 96s - $ hg -R hgrepo-2 push 96s - pushing to $TESTTMP/repo.git 96s - searching for changes 96s - no changes found 96s - [1] 96s - $ rm -rf hgrepo-2 96s - 96s -Check that pulling will update phases only: 96s - 96s - $ cd hgrepo 96s - $ hg phase -fs gamma detached 96s - $ hg pull 96s - pulling from $TESTTMP/repo.git 96s - no changes found 96s - $ hg log -T shorttags -r gamma -r detached 96s - 4:0eb1ab0073a8 draft beta default/master gamma 96s - 2:61175962e488 draft detached X 96s - $ cd .. 96s - 96s -Check that we pull new tags to existing commits: 96s - $ cd gitrepo 96s - $ git tag 96s - alpha 96s - beta 96s - detached 96s - gamma 96s - $ fn_git_tag extra-simple-tag 96s - $ fn_git_tag -m annotated extra-annotated-tag 96s - $ git push --tags 96s - To $TESTTMP/repo.git 96s - * [new tag] extra-annotated-tag -> extra-annotated-tag 96s - * [new tag] extra-simple-tag -> extra-simple-tag 96s - $ cd ../hgrepo 96s - $ hg pull -r master 96s - pulling from $TESTTMP/repo.git 96s - no changes found 96s - $ hg tags -v | grep extra 96s - extra-simple-tag 1:7fe02317c63d git 96s - extra-annotated-tag 1:7fe02317c63d git 96s 96s ERROR: test-git-tags.t#draft output changed 96s ! 96s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-help.t 96s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-help.t.err 96s @@ -5,250 +5,14 @@ 96s 96s $ hg help | grep 'git' | sed 's/ */ /g' 96s git-cleanup clean up Git commit map after history editing (?) 96s - git-verify verify that a Mercurial rev matches the corresponding Git rev 96s - hggit push and pull from a Git server 96s - hggit-config Configuring hg-git 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s 96s $ hg help hggit-config 96s - Configuring hg-git 96s - """""""""""""""""" 96s - 96s - "git" 96s - ----- 96s - 96s - Control how the Hg-Git extension interacts with Git. 96s - 96s - "authors" 96s - Git uses a strict convention for "author names" when representing 96s - changesets, using the form "[realname] [email address]". Mercurial 96s - encourages this convention as well but is not as strict, so it's not 96s - uncommon for a Mercurial repository to have authors listed as, for 96s - example, simple usernames. hg-git by default will attempt to translate 96s - Mercurial usernames using the following rules: 96s - 96s - - If the Mercurial username fits the pattern "NAME ", the Git 96s - name will be set to NAME and the email to EMAIL. 96s - - If the Mercurial username looks like an email (if it contains an 96s - "@"), the Git name and email will both be set to that email. 96s - - If the Mercurial username consists of only a name, the email will be 96s - set to "none@none". 96s - - Illegal characters (stray "<"\ s or ">"\ s) will be stripped out, and 96s - for "NAME " usernames, any content after the right-bracket (for 96s - example, a second ">") will be turned into a url-encoded sigil like 96s - "ext:(%3E)" in the Git author name. 96s - 96s - Since these default behaviors may not be what you want ("none@none", for 96s - example, shows up unpleasantly on GitHub as "illegal email address"), 96s - the "git.authors" option provides for an "authors translation file" that 96s - will be used during outgoing transfers from Mercurial to Git only, by 96s - modifying "hgrc" as such: 96s - 96s - [git] 96s - authors = authors.txt 96s - 96s - Where "authors.txt" is the name of a text file containing author name 96s - translations, one per each line, using the following format: 96s - 96s - johnny = John Smith 96s - dougie = Doug Johnson 96s - 96s - Empty lines and lines starting with a "#" are ignored. 96s - 96s - It should be noted that this translation is in *the Mercurial to Git 96s - direction only*. Changesets coming from Git back to Mercurial will not 96s - translate back into Mercurial usernames, so it's best that the same 96s - username/email combination be used on both the Mercurial and Git sides; 96s - the author file is mostly useful for translating legacy changesets. 96s - 96s - "branch_bookmark_suffix" 96s - Hg-Git does not convert between Mercurial named branches and git 96s - branches as the two are conceptually different; instead, it uses 96s - Mercurial bookmarks to represent the concept of a Git branch. Therefore, 96s - when translating a Mercurial repository over to Git, you typically need 96s - to create bookmarks to mirror all the named branches that you'd like to 96s - see transferred over to Git. The major caveat with this is that you 96s - can't use the same name for your bookmark as that of the named branch, 96s - and furthermore there's no feasible way to rename a branch in Mercurial. 96s - For the use case where one would like to transfer a Mercurial repository 96s - over to Git, and maintain the same named branches as are present on the 96s - hg side, the "branch_bookmark_suffix" might be all that's needed. This 96s - presents a string "suffix" that will be recognized on each bookmark 96s - name, and stripped off as the bookmark is translated to a Git branch: 96s - 96s - [git] 96s - branch_bookmark_suffix=_bookmark 96s - 96s - Above, if a Mercurial repository had a named branch called 96s - "release_6_maintenance", you could then link it to a bookmark called 96s - "release_6_maintenance_bookmark". hg-git will then strip off the 96s - "_bookmark" suffix from this bookmark name, and create a Git branch 96s - called "release_6_maintenance". When pulling back from Git to hg, the 96s - "_bookmark" suffix is then applied back, if and only if a Mercurial 96s - named branch of that name exists. E.g., when changes to the 96s - "release_6_maintenance" branch are checked into Git, these will be 96s - placed into the "release_6_maintenance_bookmark" bookmark on hg. But if 96s - a new branch called "release_7_maintenance" were pulled over to hg, and 96s - there was not a "release_7_maintenance" named branch already, the 96s - bookmark will be named "release_7_maintenance" with no usage of the 96s - suffix. 96s - 96s - The "branch_bookmark_suffix" option is, like the "authors" option, 96s - intended for migrating legacy hg named branches. Going forward, a 96s - Mercurial repository that is to be linked with a Git repository should 96s - only use bookmarks for named branching. 96s - 96s - "findcopiesharder" 96s - Whether to consider unmodified files as copy sources. This is a very 96s - expensive operation for large projects, so use it with caution. Similar 96s - to "git diff"'s --find-copies-harder option. 96s - 96s - "intree" 96s - Hg-Git keeps a Git repository clone for reading and updating. By 96s - default, the Git clone is the subdirectory "git" in your local Mercurial 96s - repository. If you would like this Git clone to be at the same level of 96s - your Mercurial repository instead (named ".git"), add the following to 96s - your "hgrc": 96s - 96s - [git] 96s - intree = True 96s - 96s - Please note that changing this setting in an existing repository doesn't 96s - move the local Git repository. You will either have to do so yourself, 96s - or issue an 'hg pull' after the fact to repopulate the new location. 96s - 96s - "mindate" 96s - If set, branches where the latest commit's commit time is older than 96s - this will not be imported. Accepts any date formats that Mercurial does 96s - -- see 'hg help dates' for more. 96s - 96s - "public" 96s - A list of Git branches that should be considered "published", and 96s - therefore converted to Mercurial in the 'public' phase. This is only 96s - used if "hggit.usephases" is set. 96s - 96s - "pull-prune-remote-branches" 96s - Before fetching, remove any remote-tracking references, or pseudo-tags, 96s - that no longer exist on the remote. This is equivalent to the "--prune" 96s - option to "git fetch", and means that pseudo-tags for remotes -- such as 96s - "default/master" -- always actually reflect what's on the remote. 96s - 96s - This option is enabled by default. 96s - 96s - "pull-prune-bookmarks" 96s - On pull, delete any unchanged bookmarks removed on the remote. In other 96s - words, if e.g. the "thebranch" bookmark remains at "default/thebranch", 96s - and the branch is deleted in Git, pulling deletes the bookmark. 96s - 96s - This option is enabled by default. 96s - 96s - "renamelimit" 96s - The number of files to consider when performing the copy/rename 96s - detection. Detection is disabled if the number of files modified in a 96s - commit is above the limit. Detection is O(N^2) in the number of files 96s - modified, so be sure not to set the limit too high. Similar to Git's 96s - "diff.renameLimit" config. The default is "400", the same as Git. 96s - 96s - "similarity" 96s - Specify how similar files modified in a Git commit must be to be 96s - imported as Mercurial renames or copies, as a percentage between "0" 96s - (disabled) and "100" (files must be identical). For example, "90" means 96s - that a delete/add pair will be imported as a rename if more than 90% of 96s - the file has stayed the same. The default is "0" (disabled). 96s - 96s - "blame.ignoreRevsFile" 96s - Specify a file that lists Git commits to ignore when invoking 'hg 96s - annotate'. 96s - 96s - "hggit" 96s - ------- 96s - 96s - Control behavior of the Hg-Git extension. 96s - 96s - "mapsavefrequency" 96s - By default, hg-git only saves the results of a conversion at the end. 96s - Use this option to enable resuming long-running pulls and pushes. Set 96s - this to a number greater than 0 to allow resuming after converting that 96s - many commits. This can help when the conversion encounters an error 96s - partway through a large batch of changes. Otherwise, an error or 96s - interruption will roll back the transaction, similar to regular 96s - Mercurial. 96s - 96s - Defaults to 1000. 96s - 96s - Please note that this is disregarded for an initial clone, as any error 96s - or interruption will delete the destination. So instead of cloning a 96s - large Git repository, you might want to pull instead: 96s - 96s - $ hg init linux 96s - $ cd linux 96s - $ echo "[paths]\ndefault = https://github.com/torvalds/linux" > .hg/hgrc 96s - $ hg pull 96s - 96s - ...and be extremely patient. Please note that converting very large 96s - repositories may take *days* rather than mere *hours*, and may run into 96s - issues with available memory for very long running clones. Even any 96s - small, undiscovered leak will build up when processing hundreds of 96s - thousands of files and commits. Cloning the Linux kernel is likely a 96s - pathological case, but other storied repositories such as CPython do 96s - work well, even if the initial clone requires a some patience. 96s - 96s - "threads" 96s - 96s - During a push to Git, hg-git will pack loose objects at regular 96s - intervals whenever it saves its map. As this is a rather expensive 96s - operation, it's done in separate threads. 96s - 96s - Defaults to the system CPU count or 4, whichever is lower. 96s - 96s - "usephases" 96s - When converting Git revisions to Mercurial, place them in the 'public' 96s - phase as appropriate. Namely, revisions that are reachable from the 96s - remote Git repository's default branch, or "HEAD", will be marked 96s - *public*. For most repositories, this means the remote "master" branch 96s - will be converted as public. The same applies to any commits tagged in 96s - the remote. 96s - 96s - To restrict publishing to specific branches or tags, use the 96s - "git.public" option. 96s - 96s - Publishing commits prevents their modification, and speeds up many local 96s - Mercurial operations, such as 'hg shelve'. 96s - 96s - "fetchbuffer" 96s - Data fetched from Git is buffered in memory, unless it exceeds the given 96s - limit, in megabytes. By default, flush the buffer to disk when it 96s - exceeds 100MB. 96s - 96s - "retries" 96s - Interacting with a remote Git repository may require authentication. 96s - Normally, this will trigger a prompt and a retry, and this option 96s - restricts the amount of retries. Defaults to 3. 96s - 96s - "invalidpaths" 96s - Both Mercurial and Git consider paths as just bytestrings internally, 96s - and allow almost anything. The difference, however, is in the _almost_ 96s - part. For example, many Git servers will reject a push for security 96s - reasons if it contains a nested Git repository. Similarly, Mercurial 96s - cannot checkout commits with a nested repository, and it cannot even 96s - store paths containing an embedded newline or carrage return character. 96s - 96s - The default is to issue a warning and skip these paths. You can change 96s - this by setting "hggit.invalidpaths" in ".hgrc": 96s - 96s - [hggit] 96s - invalidpaths = keep 96s - 96s - Possible values are "keep", "skip" or "abort". Prior to 1.0, the default 96s - was "abort". 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: no such help topic: hggit-config 96s + (try 'hg help --keyword hggit-config') 96s + [10] 96s 96s $ hg help config.hggit | head -10 96s - "hggit" 96s - ------- 96s - 96s - Control behavior of the Hg-Git extension. 96s - 96s - "mapsavefrequency" 96s - By default, hg-git only saves the results of a conversion at the end. 96s - Use this option to enable resuming long-running pulls and pushes. Set 96s - this to a number greater than 0 to allow resuming after converting that 96s - many commits. This can help when the conversion encounters an error 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: help section not found: config.hggit 96s 96s ERROR: test-help.t output changed 96s ! 96s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-git-tags.t 96s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-git-tags.t#secret.err 96s @@ -41,337 +41,13 @@ 96s Clone it: 96s 96s $ hg clone repo.git hgrepo 96s - importing 2 git commits 96s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 96s - updating to bookmark master 96s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository repo.git not found 96s + [255] 96s 96s $ cd hgrepo 96s + $TESTTMP.sh: 44: cd: can't cd to hgrepo 96s 96s Verify that annotated tags are unaffected by reexports: 96s 96s $ GIT_DIR=.hg/git git tag -ln 96s - beta added tag beta 96s - $ hg gexport 96s - $ GIT_DIR=.hg/git git tag -ln 96s - beta added tag beta 96s - 96s -Error checking on tag creation 96s - 96s - $ hg tag --git beta --remove 96s - abort: cannot remove git tags 96s - (the git documentation heavily discourages editing tags) 96s - [255] 96s - $ hg tag --git beta -r null 96s - abort: cannot remove git tags 96s - (the git documentation heavily discourages editing tags) 96s - [255] 96s - $ hg tag --git beta --remove -r 0 96s - abort: cannot specify both --rev and --remove 96s - [10] 96s - $ hg tag --git alpha 96s - abort: git tags require an explicit revision 96s - (please specify -r/--rev) 96s - [255] 96s - $ hg tag --git alpha alpha -r 0 96s - abort: tag names must be unique 96s - [255] 96s - $ hg tag --git alpha -r 0 -e 96s - abort: cannot specify both --git and --edit 96s - [10] 96s - $ hg tag --git alpha -r 0 -m 42 96s - abort: cannot specify both --git and --message 96s - [10] 96s - $ hg tag --git alpha -r 0 -d 42 96s - abort: cannot specify both --git and --date 96s - [10] 96s - $ hg tag --git alpha -r 0 -u user@example.com 96s - abort: cannot specify both --git and --user 96s - [10] 96s - $ hg tag --git 'with space' -r 0 96s - abort: the name 'with space' is not a valid git tag 96s - [255] 96s - $ hg tag --git ' beta' -r 0 96s - abort: the name 'beta' already exists 96s - [255] 96s - $ hg tag --git master -r 0 96s - abort: the name 'master' already exists 96s - [255] 96s - $ hg tag --git tip -r 0 96s - abort: the name 'tip' is reserved 96s - [10] 96s - 96s -Create a git tag from hg 96s - 96s - $ hg tag --git alpha --debug -r 0 96s - finding unexported changesets 96s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 96s - adding git tag alpha 96s - $ hg log --graph 96s - @ changeset: 1:7fe02317c63d 96s - | bookmark: master 96s - | tag: beta 96s - | tag: default/master 96s - | tag: tip 96s - | user: test 96s - | date: Mon Jan 01 00:00:11 2007 +0000 96s - | summary: add beta 96s - | 96s - o changeset: 0:ff7a2f2d8d70 96s - tag: alpha 96s - user: test 96s - date: Mon Jan 01 00:00:10 2007 +0000 96s - summary: add alpha 96s - 96s - $ echo beta-fix >> beta 96s - $ fn_hg_commit -m 'fix for beta' 96s -#if secret 96s - $ hg phase -d 96s -#endif 96s - $ hg push 96s - pushing to $TESTTMP/repo.git 96s - searching for changes 96s - adding objects 96s - remote: found 0 deltas to reuse 96s - added 1 commits with 1 trees and 1 blobs 96s - updating reference refs/heads/master 96s - adding reference refs/tags/alpha 96s - 96s -Verify that amending commits known to remotes doesn't break anything 96s - 96s - $ cat >> $HGRCPATH << EOF 96s - > [experimental] 96s - > evolution = createmarkers 96s - > evolution.createmarkers = yes 96s - > EOF 96s - $ hg tags 96s - tip 2:61175962e488 96s - default/master 2:61175962e488 96s - beta 1:7fe02317c63d 96s - alpha 0:ff7a2f2d8d70 96s - $ echo beta-fix-again >> beta 96s - $ fn_hg_commit --amend 96s - $ hg log -T shorttags 96s - 3:3094b9e8da41 draft tip 96s - 2:61175962e488 draft default/master X 96s - 1:7fe02317c63d draft beta 96s - 0:ff7a2f2d8d70 draft alpha 96s - $ hg tags 96s - tip 3:3094b9e8da41 96s - default/master 2:61175962e488 96s - beta 1:7fe02317c63d 96s - alpha 0:ff7a2f2d8d70 96s - $ hg push 96s - pushing to $TESTTMP/repo.git 96s - searching for changes 96s - abort: pushing refs/heads/master overwrites 3094b9e8da41 96s - [255] 96s - $ hg push -f 96s - pushing to $TESTTMP/repo.git 96s - searching for changes 96s - adding objects 96s - remote: found 0 deltas to reuse 96s - added 1 commits with 1 trees and 1 blobs 96s - updating reference refs/heads/master 96s - 96s -Now create a tag for the old, obsolete master 96s - 96s - $ cd ../repo.git 96s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 96s - $ git tag 96s - alpha 96s - beta 96s - detached 96s - $ cd ../hgrepo 96s - $ hg pull 96s - pulling from $TESTTMP/repo.git 96s - no changes found 96s - $ hg log -T shorttags 96s - 3:3094b9e8da41 draft default/master tip 96s - 2:61175962e488 draft detached X 96s - 1:7fe02317c63d draft beta 96s - 0:ff7a2f2d8d70 draft alpha 96s - $ hg tags 96s - tip 3:3094b9e8da41 96s - default/master 3:3094b9e8da41 96s - detached 2:61175962e488 96s - beta 1:7fe02317c63d 96s - alpha 0:ff7a2f2d8d70 96s - $ hg push 96s - pushing to $TESTTMP/repo.git 96s - searching for changes 96s - no changes found 96s - [1] 96s - 96s - $ cd .. 96s - 96s -Verify that revsets can point out git tags; for that we need an 96s -untagged commit. 96s - 96s - $ cd hgrepo 96s - $ touch gamma 96s - $ fn_hg_commit -A -m 'add gamma' 96s -#if secret 96s - $ hg phase -d 96s -#endif 96s - $ hg log -T shorttags -r 'gittag()' 96s - 0:ff7a2f2d8d70 draft alpha 96s - 1:7fe02317c63d draft beta 96s - 2:61175962e488 draft detached X 96s - $ hg log -T shorttags -r 'gittag(detached)' 96s - 2:61175962e488 draft detached X 96s - $ hg log -T shorttags -r 'gittag("re:a$")' 96s - 0:ff7a2f2d8d70 draft alpha 96s - 1:7fe02317c63d draft beta 96s - 96s -Create a git tag from hg, but pointing to a new commit: 96s - 96s - $ hg tag --git gamma --debug -r tip 96s - invalid branch cache (visible): tip differs (?) 96s - finding unexported changesets 96s - exporting 1 changesets 96s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 96s - packing 3 loose objects... 96s - packed 3 loose objects! 96s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 96s - adding git tag gamma 96s - $ hg push 96s - pushing to $TESTTMP/repo.git 96s - searching for changes 96s - adding objects 96s - remote: found 0 deltas to reuse 96s - added 1 commits with 1 trees and 1 blobs 96s - updating reference refs/heads/master 96s - adding reference refs/tags/gamma 96s - $ cd ../gitrepo 96s - $ git fetch --quiet --tags 96s - $ git tag 96s - alpha 96s - beta 96s - detached 96s - gamma 96s - $ cd .. 96s - 96s -Try to overwrite an annotated tag: 96s - 96s - $ cd hgrepo 96s - $ hg tags -v 96s - tip 4:0eb1ab0073a8 96s - gamma 4:0eb1ab0073a8 git 96s - default/master 4:0eb1ab0073a8 git-remote 96s - detached 2:61175962e488 git 96s - beta 1:7fe02317c63d git 96s - alpha 0:ff7a2f2d8d70 git 96s - $ hg book not-master 96s - $ hg tag beta 96s - abort: tag 'beta' already exists (use -f to force) 96s - [10] 96s - $ hg tag -f beta 96s -#if secret 96s - $ hg phase -d 96s -#endif 96s - $ hg push 96s - pushing to $TESTTMP/repo.git 96s - warning: not overwriting annotated tag 'beta' 96s - searching for changes 96s - adding objects 96s - remote: found 0 deltas to reuse 96s - added 1 commits with 1 trees and 1 blobs 96s - adding reference refs/heads/not-master 96s - $ hg tags 96s - tip 5:c49682c7cba4 96s - default/not-master 5:c49682c7cba4 96s - gamma 4:0eb1ab0073a8 96s - default/master 4:0eb1ab0073a8 96s - beta 4:0eb1ab0073a8 96s - detached 2:61175962e488 96s - alpha 0:ff7a2f2d8d70 96s - $ cd .. 96s - 96s -Check whether `gimport` handles tags 96s - 96s - $ cd hgrepo 96s - $ rm .hg/git-tags .hg/git-mapfile 96s - $ hg gimport 96s - importing 6 git commits 96s - $ hg tags -q 96s - tip 96s - default/not-master 96s - gamma 96s - default/master 96s - beta 96s - detached 96s - alpha 96s - $ cd .. 96s - 96s -Test how pulling an explicit branch with an annotated tag: 96s - 96s - $ hg clone -r master repo.git hgrepo-2 96s - importing 4 git commits 96s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 96s - updating to branch default 96s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 96s - 0:ff7a2f2d8d70 draft alpha 96s - 1:7fe02317c63d draft beta 96s - 3:0eb1ab0073a8 draft default/master gamma tip 96s - $ hg tags -v -R hgrepo-2 96s - tip 3:0eb1ab0073a8 96s - gamma 3:0eb1ab0073a8 git 96s - default/master 3:0eb1ab0073a8 git-remote 96s - beta 1:7fe02317c63d git 96s - alpha 0:ff7a2f2d8d70 git 96s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 96s - $ rm -rf hgrepo-2 96s - 96s - $ hg clone -r master repo.git hgrepo-2 96s - importing 4 git commits 96s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 96s - updating to branch default 96s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 96s - 0:ff7a2f2d8d70 draft alpha 96s - 1:7fe02317c63d draft beta 96s - 3:0eb1ab0073a8 draft default/master gamma tip 96s -This used to die: 96s - $ hg -R hgrepo-2 gexport 96s -This used to fail, since we didn't actually pull the annotated tag: 96s - $ hg -R hgrepo-2 push 96s - pushing to $TESTTMP/repo.git 96s - searching for changes 96s - no changes found 96s - [1] 96s - $ rm -rf hgrepo-2 96s - 96s -Check that pulling will update phases only: 96s - 96s - $ cd hgrepo 96s - $ hg phase -fs gamma detached 96s - $ hg pull 96s - pulling from $TESTTMP/repo.git 96s - no changes found 96s - $ hg log -T shorttags -r gamma -r detached 96s - 4:0eb1ab0073a8 draft beta default/master gamma 96s - 2:61175962e488 draft detached X 96s - $ cd .. 96s - 96s -Check that we pull new tags to existing commits: 96s - $ cd gitrepo 96s - $ git tag 96s - alpha 96s - beta 96s - detached 96s - gamma 96s - $ fn_git_tag extra-simple-tag 96s - $ fn_git_tag -m annotated extra-annotated-tag 96s - $ git push --tags 96s - To $TESTTMP/repo.git 96s - * [new tag] extra-annotated-tag -> extra-annotated-tag 96s - * [new tag] extra-simple-tag -> extra-simple-tag 96s - $ cd ../hgrepo 96s - $ hg pull -r master 96s - pulling from $TESTTMP/repo.git 96s - no changes found 96s - $ hg tags -v | grep extra 96s - extra-simple-tag 1:7fe02317c63d git 96s - extra-annotated-tag 1:7fe02317c63d git 96s 96s ERROR: test-git-tags.t#secret output changed 96s ! 96s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-pull-after-rebase.t 96s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-pull-after-rebase.t.err 96s @@ -38,275 +38,9 @@ 96s Clone it and rebase the branch 96s 96s $ hg clone -U repo.git hgrepo 96s - importing 3 git commits 96s - new changesets ff7a2f2d8d70:205a004356ef (3 drafts) 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository repo.git not found 96s + [255] 96s $ cd hgrepo 96s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 96s $ hg state 96s - o branch default/branch tip 2:205a004356ef32b8da782afb89d9179d12ca31e9 96s - | add gamma 96s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 96s - |/ add beta 96s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 96s - add alpha 96s - $ hg up branch 96s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s - (activating bookmark branch) 96s - $ hg rebase --quiet -d master 96s - $ hg state 96s - @ branch tip 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 96s - | add gamma 96s - | x default/branch 2:205a004356ef32b8da782afb89d9179d12ca31e9 96s - | | add gamma 96s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 96s - |/ add beta 96s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 96s - add alpha 96s - 96s - $ hg push -fr tip 96s - pushing to $TESTTMP/repo.git 96s - searching for changes 96s - adding objects 96s - remote: found 0 deltas to reuse 96s - added 1 commits with 1 trees and 1 blobs 96s - updating reference refs/heads/branch 96s - $ cd .. 96s - 96s -Now switch back to git and create a new commit based on what we just rebased 96s - 96s - $ cd gitrepo 96s - $ git checkout --quiet -b otherbranch branch 96s - $ git log --oneline --graph --all --decorate 96s - * e5023f9 (HEAD -> otherbranch, origin/branch, branch) add gamma 96s - | * 9497a4e (origin/master, master) add beta 96s - |/ 96s - * 7eeab2e add alpha 96s - $ echo delta > delta 96s - $ git add delta 96s - $ fn_git_commit -m 'add delta' 96s - $ git push --quiet --set-upstream origin otherbranch 96s - Branch 'otherbranch' set up to track remote branch 'otherbranch' from 'origin'. (?) 96s - $ git log --oneline --graph --all --decorate 96s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 96s - * e5023f9 (origin/branch, branch) add gamma 96s - | * 9497a4e (origin/master, master) add beta 96s - |/ 96s - * 7eeab2e add alpha 96s - $ cd .. 96s - 96s -Pull that 96s - 96s - $ cd hgrepo 96s - $ hg pull 96s - pulling from $TESTTMP/repo.git 96s - importing 1 git commits 96s - adding bookmark otherbranch 96s - 1 new orphan changesets 96s - new changesets 075302705298 (1 drafts) 96s - (run 'hg heads' to see heads, 'hg merge' to merge) 96s - $ hg state 96s - * otherbranch default/otherbranch tip 4:0753027052980aef9c9c37adb7d76d5719e8d818 96s - | add delta 96s - | @ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 96s - | | add gamma 96s - x | 2:205a004356ef32b8da782afb89d9179d12ca31e9 96s - | | add gamma 96s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 96s - |/ add beta 96s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 96s - add alpha 96s - 96s - $ cd .. 96s - 96s -To reproduce bug #386, do like github and save the old commit in a 96s -ref, and create a clone containing just the converted git commits: 96s - 96s - $ cd repo.git 96s - $ git update-ref refs/pr/1 otherbranch 96s - $ cd .. 96s - $ hg clone -U repo.git hgrepo-issue386 96s - importing 5 git commits 96s - new changesets ff7a2f2d8d70:075302705298 (5 drafts) 96s - 96s -Now try rebasing that branch, from the Git side of things 96s - 96s - $ cd gitrepo 96s - $ git checkout -q otherbranch 96s - $ git log --oneline --graph --all --decorate 96s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 96s - * e5023f9 (origin/branch, branch) add gamma 96s - | * 9497a4e (origin/master, master) add beta 96s - |/ 96s - * 7eeab2e add alpha 96s - $ fn_git_rebase --onto master branch otherbranch 96s - $ git log --oneline --graph --all --decorate 96s - * 9c58139 (HEAD -> otherbranch) add delta 96s - * 9497a4e (origin/master, master) add beta 96s - | * bba0011 (origin/otherbranch) add delta 96s - | * e5023f9 (origin/branch, branch) add gamma 96s - |/ 96s - * 7eeab2e add alpha 96s - $ git push -f 96s - To $TESTTMP/repo.git 96s - + bba0011...9c58139 otherbranch -> otherbranch (forced update) 96s - $ git log --oneline --graph --all --decorate 96s - * 9c58139 (HEAD -> otherbranch, origin/otherbranch) add delta 96s - * 9497a4e (origin/master, master) add beta 96s - | * e5023f9 (origin/branch, branch) add gamma 96s - |/ 96s - * 7eeab2e add alpha 96s - $ cd .. 96s - 96s -Now strip the old commit 96s - 96s - $ cd hgrepo-issue386 96s - $ hg up null 96s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s - $ hg id -qr otherbranch 96s - 075302705298 96s - $ hg pull 96s - pulling from $TESTTMP/repo.git 96s - importing 1 git commits 96s - not updating diverged bookmark otherbranch 96s - new changesets d64bf0521af6 (1 drafts) 96s - (run 'hg heads .' to see heads, 'hg merge' to merge) 96s - $ hg debugstrip --hidden --no-backup otherbranch 96s - $ hg book -d otherbranch 96s - $ hg git-cleanup 96s - git commit map cleaned 96s - $ hg pull 96s - pulling from $TESTTMP/repo.git 96s - no changes found 96s - adding bookmark otherbranch 96s - $ cd .. 96s - 96s -And check that pulling something else doesn't delete that branch. 96s - 96s - $ cd hgrepo 96s - $ hg pull -r master 96s - pulling from $TESTTMP/repo.git 96s - no changes found 96s - $ cd .. 96s - 96s -A special case, is that we can pull into a repository, where a commit 96s -corresponding to the new branch exists, but that commit is obsolete. 96s -In order to avoid “pinning” the obsolete commit, and thereby making it 96s -visible, we first pull from Git as an unnamed remote. 96s - 96s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 96s - updating to branch default 96s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s - $ cd hgrepo-clone 96s - $ hg pull ../repo.git 96s - pulling from ../repo.git 96s - importing 4 git commits 96s - not updating diverged bookmark otherbranch 96s - new changesets d64bf0521af6 (1 drafts) 96s - (run 'hg heads .' to see heads, 'hg merge' to merge) 96s - $ hg debugobsolete d64bf0521af68fe2160791a1b4ab9baf282a3879 96s - 1 new obsolescence markers 96s - obsoleted 1 changesets 96s - $ cp ../hgrepo/.hg/hgrc .hg 96s - $ hg pull 96s - pulling from $TESTTMP/repo.git 96s - no changes found 96s - not updating diverged bookmark otherbranch 96s - $ cd .. 96s - $ rm -rf hgrepo-clone 96s - 96s -Another special case, is that we should update commits over obsolete boundaries: 96s - 96s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 96s - updating to branch default 96s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s - $ cd hgrepo-clone 96s - $ hg pull ../repo.git 96s - pulling from ../repo.git 96s - importing 4 git commits 96s - not updating diverged bookmark otherbranch 96s - new changesets d64bf0521af6 (1 drafts) 96s - (run 'hg heads .' to see heads, 'hg merge' to merge) 96s - $ hg debugobsolete 0753027052980aef9c9c37adb7d76d5719e8d818 d64bf0521af68fe2160791a1b4ab9baf282a3879 96s - 1 new obsolescence markers 96s - obsoleted 1 changesets 96s - $ hg book -r 075302705298 otherbranch 96s - $ cp ../hgrepo/.hg/hgrc .hg 96s - $ hg pull 96s - pulling from $TESTTMP/repo.git 96s - no changes found 96s - updating bookmark otherbranch 96s - $ cd .. 96s - $ rm -rf hgrepo-clone 96s - 96s -Now just pull it: 96s - 96s - $ cd hgrepo 96s - $ hg pull 96s - pulling from $TESTTMP/repo.git 96s - importing 1 git commits 96s - not updating diverged bookmark otherbranch 96s - new changesets d64bf0521af6 (1 drafts) 96s - (run 'hg heads .' to see heads, 'hg merge' to merge) 96s - $ hg state 96s - o default/otherbranch tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 96s - | add delta 96s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 96s - | | add delta 96s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 96s - | | add gamma 96s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 96s - | | add gamma 96s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 96s - |/ add beta 96s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 96s - add alpha 96s - $ cd .. 96s - 96s -And finally, delete it: 96s - 96s - $ cd gitrepo 96s - $ git push origin :otherbranch 96s - To $TESTTMP/repo.git 96s - - [deleted] otherbranch 96s - $ cd .. 96s - 96s -And pull that: 96s - 96s - $ cd hgrepo 96s - $ hg pull 96s - pulling from $TESTTMP/repo.git 96s - no changes found 96s - not deleting diverged bookmark otherbranch 96s - $ hg state 96s - o tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 96s - | add delta 96s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 96s - | | add delta 96s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 96s - | | add gamma 96s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 96s - | | add gamma 96s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 96s - |/ add beta 96s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 96s - add alpha 96s - $ cd .. 96s - 96s -We only get that message once: 96s - 96s - $ hg -R hgrepo pull 96s - pulling from $TESTTMP/repo.git 96s - no changes found 96s - 96s -Now try deleting one already gone locally, which shouldn't output 96s -anything: 96s - 96s - $ cd gitrepo 96s - $ git push origin :branch 96s - To $TESTTMP/repo.git 96s - - [deleted] branch 96s - $ cd ../hgrepo 96s - $ hg book -d branch 96s - $ hg pull 96s - pulling from $TESTTMP/repo.git 96s - no changes found 96s - $ cd .. 96s 96s ERROR: test-pull-after-rebase.t output changed 96s ! 96s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-push.t 96s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-push.t.err 96s @@ -12,287 +12,10 @@ 96s 96s $ cd .. 96s $ hg clone -u tip gitrepo hgrepo 96s - importing 1 git commits 96s - new changesets ff7a2f2d8d70 (1 drafts) 96s - updating to branch default 96s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 96s + abort: repository gitrepo not found 96s + [255] 96s 96s $ cd hgrepo 96s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 96s $ hg bookmark -q master 96s - $ echo beta > beta 96s - $ hg add beta 96s - $ fn_hg_commit -m 'add beta' 96s - 96s - 96s - $ echo gamma > gamma 96s - $ hg add gamma 96s - $ fn_hg_commit -m 'add gamma' 96s - 96s - $ hg book -r 1 beta 96s - $ hg push -r beta 96s - pushing to $TESTTMP/gitrepo 96s - searching for changes 96s - adding objects 96s - remote: found 0 deltas to reuse 96s - added 1 commits with 1 trees and 1 blobs 96s - adding reference refs/heads/beta 96s - 96s - $ cd .. 96s - 96s -should have two different branches 96s - $ cd gitrepo 96s - $ git branch -v 96s - beta 0f378ab add beta 96s - master 7eeab2e add alpha 96s - * not-master 7eeab2e add alpha 96s - 96s -some more work on master from git 96s - $ git checkout master 2>&1 | sed s/\'/\"/g 96s - Switched to branch "master" 96s - $ echo delta > delta 96s - $ git add delta 96s - $ fn_git_commit -m "add delta" 96s - $ git checkout not-master 2>&1 | sed s/\'/\"/g 96s - Switched to branch "not-master" 96s - 96s - $ cd .. 96s - 96s - $ cd hgrepo 96s -this should fail 96s - $ hg push -r master 96s - pushing to $TESTTMP/gitrepo 96s - searching for changes 96s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 96s - [255] 96s - 96s -... even with -f 96s - $ hg push -fr master 96s - pushing to $TESTTMP/gitrepo 96s - searching for changes 96s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 96s - [255] 96s - 96s - $ hg pull 2>&1 | grep -v 'divergent bookmark' 96s - pulling from $TESTTMP/gitrepo 96s - importing 1 git commits 96s - not updating diverged bookmark master 96s - new changesets 25eed24f5e8f (1 drafts) 96s - (run 'hg heads' to see heads, 'hg merge' to merge) 96s -TODO shouldn't need to do this since we're (in theory) pushing master explicitly, 96s -which should not implicitly also push the not-master ref. 96s - $ hg book not-master -r default/not-master --force 96s -master and default/master should be diferent 96s - $ hg log -r master 96s - changeset: 2:953796e1cfd8 96s - bookmark: master 96s - user: test 96s - date: Mon Jan 01 00:00:12 2007 +0000 96s - summary: add gamma 96s - 96s - $ hg log -r default/master 96s - changeset: 3:25eed24f5e8f 96s - tag: default/master 96s - tag: tip 96s - parent: 0:ff7a2f2d8d70 96s - user: test 96s - date: Mon Jan 01 00:00:13 2007 +0000 96s - summary: add delta 96s - 96s - 96s -this should also fail 96s - $ hg push -r master 96s - pushing to $TESTTMP/gitrepo 96s - searching for changes 96s - abort: pushing refs/heads/master overwrites 953796e1cfd8 96s - [255] 96s - 96s -... but succeed with -f 96s - $ hg push -fr master 96s - pushing to $TESTTMP/gitrepo 96s - searching for changes 96s - adding objects 96s - remote: found 0 deltas to reuse 96s - added 1 commits with 1 trees and 1 blobs 96s - updating reference refs/heads/master 96s - 96s -this should fail, no changes to push 96s - $ hg push -r master 96s - pushing to $TESTTMP/gitrepo 96s - searching for changes 96s - no changes found 96s - [1] 96s - 96s -hg-git issue103 -- directories can lose information at hg-git export time 96s - 96s - $ hg up master 96s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s - $ mkdir dir1 96s - $ echo alpha > dir1/alpha 96s - $ hg add dir1/alpha 96s - $ fn_hg_commit -m 'add dir1/alpha' 96s - $ hg push -r master 96s - pushing to $TESTTMP/gitrepo 96s - searching for changes 96s - adding objects 96s - remote: found 0 deltas to reuse 96s - added 1 commits with 2 trees and 0 blobs 96s - updating reference refs/heads/master 96s - 96s - $ echo beta > dir1/beta 96s - $ hg add dir1/beta 96s - $ fn_hg_commit -m 'add dir1/beta' 96s - $ hg push -r master 96s - pushing to $TESTTMP/gitrepo 96s - searching for changes 96s - adding objects 96s - remote: found 0 deltas to reuse 96s - added 1 commits with 2 trees and 0 blobs 96s - updating reference refs/heads/master 96s - $ hg log -r master 96s - changeset: 5:ba0476ff1899 96s - bookmark: master 96s - tag: default/master 96s - tag: tip 96s - user: test 96s - date: Mon Jan 01 00:00:15 2007 +0000 96s - summary: add dir1/beta 96s - 96s - 96s - $ cat >> .hg/hgrc << EOF 96s - > [paths] 96s - > default:pushurl = file:///$TESTTMP/gitrepo 96s - > EOF 96s -NB: the triple slashes are intentional, due to windows 96s - $ hg push -r master 96s - pushing to file:///$TESTTMP/gitrepo 96s - searching for changes 96s - no changes found 96s - [1] 96s - 96s - $ cd .. 96s - 96s - $ hg clone -u tip gitrepo hgrepo-test 96s - importing 5 git commits 96s - new changesets ff7a2f2d8d70:ba0476ff1899 (5 drafts) 96s - updating to branch default 96s - 5 files updated, 0 files merged, 0 files removed, 0 files unresolved 96s - $ hg -R hgrepo-test log -r master 96s - changeset: 4:ba0476ff1899 96s - bookmark: master 96s - tag: default/master 96s - tag: tip 96s - user: test 96s - date: Mon Jan 01 00:00:15 2007 +0000 96s - summary: add dir1/beta 96s - 96s - $ hg tags -R hgrepo-test | grep ^default/ 96s - default/master 4:ba0476ff1899 96s - default/beta 1:47580592d3d6 96s - default/not-master 0:ff7a2f2d8d70 96s - 96s -Push a fast-forward to a currently checked out branch, which sometimes 96s -fails: 96s - 96s - $ cd hgrepo 96s - $ hg book -r master not-master 96s - moving bookmark 'not-master' forward from ff7a2f2d8d70 96s - $ hg push 96s - pushing to file:///$TESTTMP/gitrepo 96s - searching for changes 96s - warning: failed to update HEAD; unable to set b'HEAD' to b'7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03' (?) 96s - updating reference refs/heads/not-master 96s -That should have updated the tag: 96s - $ hg tags | grep ^default/ 96s - default/not-master 5:ba0476ff1899 96s - default/master 5:ba0476ff1899 96s - default/beta 1:47580592d3d6 96s - $ cd .. 96s - 96s -We can push only one of two bookmarks on the same revision: 96s - 96s - $ cd hgrepo 96s - $ hg book -r 0 also-not-master really-not-master 96s - $ hg push -B also-not-master 96s - pushing to file:///$TESTTMP/gitrepo 96s - searching for changes 96s - adding reference refs/heads/also-not-master 96s - 96s -We can also push another bookmark to a path with another revision 96s -specified: 96s - 96s - $ hg book -r 3 also-not-master 96s - moving bookmark 'also-not-master' forward from ff7a2f2d8d70 96s - $ hg push -B also-not-master "file:///$TESTTMP/gitrepo#master" 96s - pushing to file:///$TESTTMP/gitrepo 96s - searching for changes 96s - adding objects 96s - remote: found 0 deltas to reuse 96s - added 1 commits with 1 trees and 1 blobs 96s - updating reference refs/heads/also-not-master 96s - 96s -And we can delete them again afterwards: 96s - 96s - $ hg book -d also-not-master really-not-master 96s - $ hg push -B also-not-master -B really-not-master 96s - pushing to file:///$TESTTMP/gitrepo 96s - searching for changes 96s - warning: unable to delete 'refs/heads/really-not-master' as it does not exist on the remote repository 96s - deleting reference refs/heads/also-not-master 96s - 96s -Push empty Hg repo to empty Git repo (issue #58) 96s - $ hg init hgrepo2 96s - $ git init -q --bare repo.git 96s - $ hg -R hgrepo2 push repo.git 96s - pushing to repo.git 96s - searching for changes 96s - abort: no bookmarks or tags to push to git 96s - (see "hg help bookmarks" for details on creating them) 96s - [255] 96s - 96s -The remote repo is empty and the local one doesn't have any bookmarks/tags 96s - $ cd hgrepo2 96s - $ echo init >> test.txt 96s - $ hg addremove 96s - adding test.txt 96s - $ fn_hg_commit -m init 96s - $ hg update null 96s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 96s - $ hg push ../repo.git 96s - pushing to ../repo.git 96s - searching for changes 96s - abort: no bookmarks or tags to push to git 96s - (see "hg help bookmarks" for details on creating them) 96s - [255] 96s - $ hg summary 96s - parent: -1:000000000000 (no revision checked out) 96s - branch: default 96s - commit: (clean) 96s - update: 1 new changesets (update) 96s - phases: 1 draft 96s -That should not create any bookmarks 96s - $ hg bookmarks 96s - no bookmarks set 96s -And no tags for the remotes either: 96s - $ hg tags 96s - tip 0:8aded40be5af 96s - 96s -test for ssh vulnerability 96s - 96s - $ cat >> $HGRCPATH << EOF 96s - > [ui] 96s - > ssh = ssh -o ConnectTimeout=1 96s - > EOF 96s - $ hg push -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 96s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 96s - [255] 96s - $ hg push -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 96s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 96s - [255] 96s - $ hg push -q 'git+ssh://fakehost|rm%20nonexistent/path' 96s - ssh: * fakehost%7?rm%20nonexistent* (glob) 96s - abort: git remote error: The remote server unexpectedly closed the connection. 96s - [255] 96s - $ hg push -q 'git+ssh://fakehost%7Crm%20nonexistent/path' 96s - ssh: * fakehost%7?rm%20nonexistent* (glob) 96s - abort: git remote error: The remote server unexpectedly closed the connection. 96s - [255] 96s 96s ERROR: test-push.t output changed 100s ! 100s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-clone.t 100s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-clone.t#draft.err 100s @@ -38,60 +38,42 @@ 100s clone a tag 100s 100s $ hg clone -r alpha gitrepo hgrepo-a 100s - importing 1 git commits 100s - new changesets ff7a2f2d8d70 (1 drafts) 100s - updating to branch default 100s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository gitrepo not found 100s + [255] 100s $ hg -R hgrepo-a bookmarks 100s - master 0:ff7a2f2d8d70 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository hgrepo-a not found 100s + [255] 100s $ hg -R hgrepo-a log --graph --template=phases 100s - @ changeset: 0:ff7a2f2d8d70 100s - bookmark: master 100s - tag: alpha 100s - tag: default/master 100s - tag: tip 100s - phase: draft 100s - user: test 100s - date: Mon Jan 01 00:00:10 2007 +0000 100s - summary: add alpha 100s - 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository hgrepo-a not found 100s + [255] 100s $ git --git-dir hgrepo-a/.hg/git for-each-ref 100s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 100s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 100s + fatal: not a git repository: 'hgrepo-a/.hg/git' 100s + [128] 100s Make sure this is still draft since we didn't pull remote's HEAD 100s $ hg -R hgrepo-a phase -r alpha 100s - 0: draft 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository hgrepo-a not found 100s + [255] 100s 100s clone a branch 100s $ hg clone -r beta gitrepo hgrepo-b 100s - importing 2 git commits 100s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 100s - updating to branch default 100s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository gitrepo not found 100s + [255] 100s $ hg -R hgrepo-b bookmarks 100s - * beta 1:7fe02317c63d 100s - master 0:ff7a2f2d8d70 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository hgrepo-b not found 100s + [255] 100s $ hg -R hgrepo-b log --graph 100s - @ changeset: 1:7fe02317c63d 100s - | bookmark: beta 100s - | tag: default/beta 100s - | tag: tip 100s - | user: test 100s - | date: Mon Jan 01 00:00:11 2007 +0000 100s - | summary: add beta 100s - | 100s - o changeset: 0:ff7a2f2d8d70 100s - bookmark: master 100s - tag: alpha 100s - tag: default/master 100s - user: test 100s - date: Mon Jan 01 00:00:10 2007 +0000 100s - summary: add alpha 100s - 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository hgrepo-b not found 100s + [255] 100s $ git --git-dir hgrepo-b/.hg/git for-each-ref 100s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 100s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 100s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 100s + fatal: not a git repository: 'hgrepo-b/.hg/git' 100s + [128] 100s 100s Make sure that a deleted .hgsubstate does not confuse hg-git 100s 100s @@ -104,48 +86,50 @@ 100s $ cd .. 100s 100s $ hg clone -r beta gitrepo hgrepo-c 100s - importing 4 git commits 100s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 100s - updating to branch default 100s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository gitrepo not found 100s + [255] 100s $ hg -R hgrepo-c bookmarks 100s - * beta 3:47d12948785d 100s - master 0:ff7a2f2d8d70 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository hgrepo-c not found 100s + [255] 100s $ hg --cwd hgrepo-c status 100s + abort: No such file or directory: 'hgrepo-c' 100s + [255] 100s $ git --git-dir hgrepo-c/.hg/git for-each-ref 100s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 100s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 100s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 100s + fatal: not a git repository: 'hgrepo-c/.hg/git' 100s + [128] 100s 100s test shared repositories 100s 100s $ hg clone gitrepo hgrepo-base 100s - importing 5 git commits 100s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 100s - updating to bookmark beta 100s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository gitrepo not found 100s + [255] 100s $ hg -R hgrepo-base bookmarks 100s - * beta 4:47d12948785d 100s - gamma 2:ca33a262eb46 100s - master 0:ff7a2f2d8d70 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository hgrepo-base not found 100s + [255] 100s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 100s - updating working directory 100s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository hgrepo-base not found 100s + [255] 100s $ hg -R hgrepo-shared pull gitrepo 100s - pulling from gitrepo 100s - no changes found 100s - adding bookmark beta 100s - adding bookmark gamma 100s - adding bookmark master 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository hgrepo-shared not found 100s + [255] 100s $ hg -R hgrepo-shared push gitrepo 100s - pushing to gitrepo 100s - searching for changes 100s - no changes found 100s - [1] 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository hgrepo-shared not found 100s + [255] 100s $ ls hgrepo-shared/.hg | grep git 100s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 100s [1] 100s $ hg -R hgrepo-shared git-cleanup 100s - git commit map cleaned 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + hg: unknown command 'git-cleanup' 100s + (did you mean clean?) 100s + [10] 100s $ rm -rf hgrepo-base hgrepo-shared 100s 100s test cloning HEAD 100s @@ -154,23 +138,21 @@ 100s $ git checkout -q master 100s $ cd .. 100s $ hg clone gitrepo hgrepo-2 100s - importing 5 git commits 100s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 100s - updating to bookmark master 100s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository gitrepo not found 100s + [255] 100s $ git --git-dir hgrepo-2/.hg/git for-each-ref 100s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 100s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 100s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 100s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 100s + fatal: not a git repository: 'hgrepo-2/.hg/git' 100s + [128] 100s $ rm -rf hgrepo-2 100s 100s clone empty repo 100s $ git init empty 100s Initialized empty Git repository in $TESTTMP/empty/.git/ 100s $ hg clone empty emptyhg 100s - updating to branch default 100s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository empty not found 100s + [255] 100s $ rm -rf empty emptyhg 100s 100s test cloning detached HEAD, but pointing to a branch; we detect this 100s @@ -180,25 +162,20 @@ 100s $ git checkout -q -d master 100s $ cd .. 100s $ hg clone gitrepo hgrepo-2 100s - importing 5 git commits 100s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 100s - updating to bookmark master 100s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository gitrepo not found 100s + [255] 100s $ hg -R hgrepo-2 book 100s - beta 4:47d12948785d 100s - gamma 2:ca33a262eb46 100s - * master 0:ff7a2f2d8d70 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository hgrepo-2 not found 100s + [255] 100s $ hg -R hgrepo-2 tags -v 100s - tip 4:47d12948785d 100s - default/beta 4:47d12948785d git-remote 100s - default/gamma 2:ca33a262eb46 git-remote 100s - default/master 0:ff7a2f2d8d70 git-remote 100s - alpha 0:ff7a2f2d8d70 git 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository hgrepo-2 not found 100s + [255] 100s $ git --git-dir hgrepo-2/.hg/git for-each-ref 100s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 100s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 100s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 100s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 100s + fatal: not a git repository: 'hgrepo-2/.hg/git' 100s + [128] 100s $ rm -rf hgrepo-2 100s 100s test cloning fully detached HEAD; we don't convert the 100s @@ -212,44 +189,45 @@ 100s $ fn_git_commit -m 'add delta' 100s $ cd .. 100s $ hg clone gitrepo hgrepo-2 100s - importing 5 git commits 100s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 100s - warning: the git source repository has a detached head 100s - (you may want to update to a bookmark) 100s - updating to branch default 100s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository gitrepo not found 100s + [255] 100s $ hg -R hgrepo-2 book 100s - beta 4:47d12948785d 100s - gamma 2:ca33a262eb46 100s - master 0:ff7a2f2d8d70 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository hgrepo-2 not found 100s + [255] 100s $ hg -R hgrepo-2 id --tags 100s - default/beta tip 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s + abort: repository hgrepo-2 not found 100s + [255] 100s $ git --git-dir hgrepo-2/.hg/git for-each-ref 100s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 100s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 100s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 100s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 100s + fatal: not a git repository: 'hgrepo-2/.hg/git' 100s + [128] 100s $ rm -rf hgrepo-2 100s 100s test that cloning a regular mercurial repository does not introduce 100s git state 100s 100s $ hg init hgrepo-base 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s $ cd hgrepo-base 100s $ touch flaf 100s $ fn_hg_commit -A -m flaf 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s $ cd .. 100s $ hg clone -U hgrepo-base hgrepo-copy 100s requesting all changes (secret !) 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s $ ls hgrepo-copy/.hg | grep git 100s [1] 100s $ hg clone -U --pull hgrepo-base hgrepo-pull 100s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 100s requesting all changes 100s - adding changesets (draft !) 100s - adding manifests (draft !) 100s - adding file changes (draft !) 100s - added 1 changesets with 1 changes to 1 files (draft !) 100s - new changesets 76c919376257 (draft !) 100s + adding changesets 100s + adding manifests 100s + adding file changes 100s + added 1 changesets with 1 changes to 1 files 100s + new changesets 76c919376257 100s $ ls hgrepo-pull | grep git 100s [1] 100s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 100s 100s ERROR: test-clone.t#draft output changed 101s ! 101s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-clone.t 101s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-clone.t#secret.err 101s @@ -38,60 +38,42 @@ 101s clone a tag 101s 101s $ hg clone -r alpha gitrepo hgrepo-a 101s - importing 1 git commits 101s - new changesets ff7a2f2d8d70 (1 drafts) 101s - updating to branch default 101s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository gitrepo not found 101s + [255] 101s $ hg -R hgrepo-a bookmarks 101s - master 0:ff7a2f2d8d70 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository hgrepo-a not found 101s + [255] 101s $ hg -R hgrepo-a log --graph --template=phases 101s - @ changeset: 0:ff7a2f2d8d70 101s - bookmark: master 101s - tag: alpha 101s - tag: default/master 101s - tag: tip 101s - phase: draft 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add alpha 101s - 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository hgrepo-a not found 101s + [255] 101s $ git --git-dir hgrepo-a/.hg/git for-each-ref 101s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 101s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 101s + fatal: not a git repository: 'hgrepo-a/.hg/git' 101s + [128] 101s Make sure this is still draft since we didn't pull remote's HEAD 101s $ hg -R hgrepo-a phase -r alpha 101s - 0: draft 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository hgrepo-a not found 101s + [255] 101s 101s clone a branch 101s $ hg clone -r beta gitrepo hgrepo-b 101s - importing 2 git commits 101s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 101s - updating to branch default 101s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository gitrepo not found 101s + [255] 101s $ hg -R hgrepo-b bookmarks 101s - * beta 1:7fe02317c63d 101s - master 0:ff7a2f2d8d70 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository hgrepo-b not found 101s + [255] 101s $ hg -R hgrepo-b log --graph 101s - @ changeset: 1:7fe02317c63d 101s - | bookmark: beta 101s - | tag: default/beta 101s - | tag: tip 101s - | user: test 101s - | date: Mon Jan 01 00:00:11 2007 +0000 101s - | summary: add beta 101s - | 101s - o changeset: 0:ff7a2f2d8d70 101s - bookmark: master 101s - tag: alpha 101s - tag: default/master 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add alpha 101s - 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository hgrepo-b not found 101s + [255] 101s $ git --git-dir hgrepo-b/.hg/git for-each-ref 101s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 101s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 101s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 101s + fatal: not a git repository: 'hgrepo-b/.hg/git' 101s + [128] 101s 101s Make sure that a deleted .hgsubstate does not confuse hg-git 101s 101s @@ -104,48 +86,50 @@ 101s $ cd .. 101s 101s $ hg clone -r beta gitrepo hgrepo-c 101s - importing 4 git commits 101s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 101s - updating to branch default 101s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository gitrepo not found 101s + [255] 101s $ hg -R hgrepo-c bookmarks 101s - * beta 3:47d12948785d 101s - master 0:ff7a2f2d8d70 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository hgrepo-c not found 101s + [255] 101s $ hg --cwd hgrepo-c status 101s + abort: No such file or directory: 'hgrepo-c' 101s + [255] 101s $ git --git-dir hgrepo-c/.hg/git for-each-ref 101s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 101s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 101s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 101s + fatal: not a git repository: 'hgrepo-c/.hg/git' 101s + [128] 101s 101s test shared repositories 101s 101s $ hg clone gitrepo hgrepo-base 101s - importing 5 git commits 101s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 101s - updating to bookmark beta 101s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository gitrepo not found 101s + [255] 101s $ hg -R hgrepo-base bookmarks 101s - * beta 4:47d12948785d 101s - gamma 2:ca33a262eb46 101s - master 0:ff7a2f2d8d70 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository hgrepo-base not found 101s + [255] 101s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 101s - updating working directory 101s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository hgrepo-base not found 101s + [255] 101s $ hg -R hgrepo-shared pull gitrepo 101s - pulling from gitrepo 101s - no changes found 101s - adding bookmark beta 101s - adding bookmark gamma 101s - adding bookmark master 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository hgrepo-shared not found 101s + [255] 101s $ hg -R hgrepo-shared push gitrepo 101s - pushing to gitrepo 101s - searching for changes 101s - no changes found 101s - [1] 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository hgrepo-shared not found 101s + [255] 101s $ ls hgrepo-shared/.hg | grep git 101s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 101s [1] 101s $ hg -R hgrepo-shared git-cleanup 101s - git commit map cleaned 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + hg: unknown command 'git-cleanup' 101s + (did you mean clean?) 101s + [10] 101s $ rm -rf hgrepo-base hgrepo-shared 101s 101s test cloning HEAD 101s @@ -154,23 +138,21 @@ 101s $ git checkout -q master 101s $ cd .. 101s $ hg clone gitrepo hgrepo-2 101s - importing 5 git commits 101s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 101s - updating to bookmark master 101s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository gitrepo not found 101s + [255] 101s $ git --git-dir hgrepo-2/.hg/git for-each-ref 101s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 101s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 101s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 101s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 101s + fatal: not a git repository: 'hgrepo-2/.hg/git' 101s + [128] 101s $ rm -rf hgrepo-2 101s 101s clone empty repo 101s $ git init empty 101s Initialized empty Git repository in $TESTTMP/empty/.git/ 101s $ hg clone empty emptyhg 101s - updating to branch default 101s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository empty not found 101s + [255] 101s $ rm -rf empty emptyhg 101s 101s test cloning detached HEAD, but pointing to a branch; we detect this 101s @@ -180,25 +162,20 @@ 101s $ git checkout -q -d master 101s $ cd .. 101s $ hg clone gitrepo hgrepo-2 101s - importing 5 git commits 101s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 101s - updating to bookmark master 101s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository gitrepo not found 101s + [255] 101s $ hg -R hgrepo-2 book 101s - beta 4:47d12948785d 101s - gamma 2:ca33a262eb46 101s - * master 0:ff7a2f2d8d70 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository hgrepo-2 not found 101s + [255] 101s $ hg -R hgrepo-2 tags -v 101s - tip 4:47d12948785d 101s - default/beta 4:47d12948785d git-remote 101s - default/gamma 2:ca33a262eb46 git-remote 101s - default/master 0:ff7a2f2d8d70 git-remote 101s - alpha 0:ff7a2f2d8d70 git 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository hgrepo-2 not found 101s + [255] 101s $ git --git-dir hgrepo-2/.hg/git for-each-ref 101s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 101s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 101s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 101s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 101s + fatal: not a git repository: 'hgrepo-2/.hg/git' 101s + [128] 101s $ rm -rf hgrepo-2 101s 101s test cloning fully detached HEAD; we don't convert the 101s @@ -212,44 +189,45 @@ 101s $ fn_git_commit -m 'add delta' 101s $ cd .. 101s $ hg clone gitrepo hgrepo-2 101s - importing 5 git commits 101s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 101s - warning: the git source repository has a detached head 101s - (you may want to update to a bookmark) 101s - updating to branch default 101s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository gitrepo not found 101s + [255] 101s $ hg -R hgrepo-2 book 101s - beta 4:47d12948785d 101s - gamma 2:ca33a262eb46 101s - master 0:ff7a2f2d8d70 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository hgrepo-2 not found 101s + [255] 101s $ hg -R hgrepo-2 id --tags 101s - default/beta tip 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository hgrepo-2 not found 101s + [255] 101s $ git --git-dir hgrepo-2/.hg/git for-each-ref 101s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 101s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 101s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 101s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 101s + fatal: not a git repository: 'hgrepo-2/.hg/git' 101s + [128] 101s $ rm -rf hgrepo-2 101s 101s test that cloning a regular mercurial repository does not introduce 101s git state 101s 101s $ hg init hgrepo-base 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s $ cd hgrepo-base 101s $ touch flaf 101s $ fn_hg_commit -A -m flaf 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s $ cd .. 101s $ hg clone -U hgrepo-base hgrepo-copy 101s - requesting all changes (secret !) 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + requesting all changes 101s $ ls hgrepo-copy/.hg | grep git 101s [1] 101s $ hg clone -U --pull hgrepo-base hgrepo-pull 101s - requesting all changes 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s adding changesets (draft !) 101s adding manifests (draft !) 101s adding file changes (draft !) 101s added 1 changesets with 1 changes to 1 files (draft !) 101s new changesets 76c919376257 (draft !) 101s + requesting all changes 101s $ ls hgrepo-pull | grep git 101s [1] 101s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 101s 101s ERROR: test-clone.t#secret output changed 101s ! 101s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-branch-bookmark-suffix.t 101s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-branch-bookmark-suffix.t#with-path.err 101s @@ -9,287 +9,12 @@ 101s $ git init -q --bare repo.git 101s 101s $ hg clone repo.git hgrepo 101s - updating to branch default 101s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository repo.git not found 101s + [255] 101s $ cd hgrepo 101s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 101s #if without-path 101s $ rm .hg/hgrc 101s #endif 101s $ hg branch -q branch1 101s - $ hg bookmark branch1_bookmark 101s - $ echo f1 > f1 101s - $ hg add f1 101s - $ fn_hg_commit -m "add f1" 101s - $ hg branch -q branch2 101s - $ hg bookmark branch2_bookmark 101s - $ echo f2 > f2 101s - $ hg add f2 101s - $ fn_hg_commit -m "add f2" 101s - $ hg log --graph 101s - @ changeset: 1:600de9b6d498 101s - | branch: branch2 101s - | bookmark: branch2_bookmark 101s - | tag: tip 101s - | user: test 101s - | date: Mon Jan 01 00:00:11 2007 +0000 101s - | summary: add f2 101s - | 101s - o changeset: 0:40a840c1f8ae 101s - branch: branch1 101s - bookmark: branch1_bookmark 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add f1 101s - 101s - 101s - $ hg push -B asdasd ../repo.git 101s - pushing to ../repo.git 101s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 101s - [255] 101s - 101s - $ hg push ../repo.git 101s - pushing to ../repo.git 101s - searching for changes 101s - adding objects 101s - remote: found 0 deltas to reuse 101s - added 2 commits with 2 trees and 2 blobs 101s - adding reference refs/heads/branch1 101s - adding reference refs/heads/branch2 101s - 101s - $ cd .. 101s - 101s - $ cd repo.git 101s - $ git symbolic-ref HEAD refs/heads/branch1 101s - $ git branch 101s - * branch1 101s - branch2 101s - $ cd .. 101s - 101s - $ git clone repo.git gitrepo 101s - Cloning into 'gitrepo'... 101s - done. 101s - $ cd gitrepo 101s - $ git checkout -q branch1 101s - $ echo g1 >> f1 101s - $ git add f1 101s - $ fn_git_commit -m "append f1" 101s - $ git checkout -q branch2 101s - $ echo g2 >> f2 101s - $ git add f2 101s - $ fn_git_commit -m "append f2" 101s - $ git checkout -b branch3 101s - Switched to a new branch 'branch3' 101s - $ echo g3 >> f3 101s - $ git add f3 101s - $ fn_git_commit -m "append f3" 101s - $ git push origin branch1 branch2 branch3 101s - To $TESTTMP/repo.git 101s - bbfe79a..d8aef79 branch1 -> branch1 101s - 288e92b..f8f8de5 branch2 -> branch2 101s - * [new branch] branch3 -> branch3 101s -make sure the commit doesn't have an HG:rename-source annotation 101s - $ git cat-file commit d8aef79 101s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 101s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 101s - author test 1167609612 +0000 101s - committer test 1167609612 +0000 101s - 101s - append f1 101s - $ cd .. 101s - 101s - $ cd hgrepo 101s - $ hg paths 101s - default = $TESTTMP/repo.git (with-path !) 101s - $ hg pull ../repo.git 101s - pulling from ../repo.git 101s - importing 3 git commits 101s - updating bookmark branch1_bookmark 101s - updating bookmark branch2_bookmark 101s - adding bookmark branch3_bookmark 101s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 101s - (run 'hg heads' to see heads) 101s - $ hg log --graph 101s - o changeset: 4:faf44fc3a4e8 101s - | bookmark: branch3_bookmark 101s - | tag: default/branch3 (with-path !) 101s - | tag: tip 101s - | user: test 101s - | date: Mon Jan 01 00:00:14 2007 +0000 101s - | summary: append f3 101s - | 101s - o changeset: 3:ae8eb55f7090 101s - | bookmark: branch2_bookmark 101s - | tag: default/branch2 (with-path !) 101s - | parent: 1:600de9b6d498 101s - | user: test 101s - | date: Mon Jan 01 00:00:13 2007 +0000 101s - | summary: append f2 101s - | 101s - | o changeset: 2:8211cade99e4 101s - | | bookmark: branch1_bookmark 101s - | | tag: default/branch1 (with-path !) 101s - | | parent: 0:40a840c1f8ae 101s - | | user: test 101s - | | date: Mon Jan 01 00:00:12 2007 +0000 101s - | | summary: append f1 101s - | | 101s - @ | changeset: 1:600de9b6d498 101s - |/ branch: branch2 101s - | user: test 101s - | date: Mon Jan 01 00:00:11 2007 +0000 101s - | summary: add f2 101s - | 101s - o changeset: 0:40a840c1f8ae 101s - branch: branch1 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add f1 101s - 101s - $ cd .. 101s - 101s -Try cloning a bookmark, and make sure it gets checked out: 101s - 101s - $ rm -r hgrepo 101s - $ hg clone -r branch3 repo.git hgrepo 101s - importing 4 git commits 101s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 101s - updating to bookmark branch3_bookmark 101s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s - $ cd hgrepo 101s - $ hg bookmarks 101s - branch2_bookmark 2:ae8eb55f7090 101s - * branch3_bookmark 3:faf44fc3a4e8 101s - $ hg log --graph 101s - @ changeset: 3:faf44fc3a4e8 101s - | bookmark: branch3_bookmark 101s - | tag: default/branch3 101s - | tag: tip 101s - | user: test 101s - | date: Mon Jan 01 00:00:14 2007 +0000 101s - | summary: append f3 101s - | 101s - o changeset: 2:ae8eb55f7090 101s - | bookmark: branch2_bookmark 101s - | tag: default/branch2 101s - | user: test 101s - | date: Mon Jan 01 00:00:13 2007 +0000 101s - | summary: append f2 101s - | 101s - o changeset: 1:600de9b6d498 101s - | branch: branch2 101s - | user: test 101s - | date: Mon Jan 01 00:00:11 2007 +0000 101s - | summary: add f2 101s - | 101s - o changeset: 0:40a840c1f8ae 101s - branch: branch1 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add f1 101s - 101s - $ cd .. 101s - 101s -Try cloning something that's both a bookmark and a branch, and see the 101s -results. They're a bit suprising as the bookmark does get activated, 101s -but the branch get checked out. Although this does seem a bit odd, so 101s -does the scenario. 101s - 101s - $ rm -r hgrepo 101s - $ hg clone -r branch1 repo.git hgrepo 101s - importing 2 git commits 101s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 101s - updating to branch branch1 101s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s - $ cd hgrepo 101s - $ hg bookmarks 101s - * branch1_bookmark 1:8211cade99e4 101s - $ hg log --graph 101s - o changeset: 1:8211cade99e4 101s - | bookmark: branch1_bookmark 101s - | tag: default/branch1 101s - | tag: tip 101s - | user: test 101s - | date: Mon Jan 01 00:00:12 2007 +0000 101s - | summary: append f1 101s - | 101s - @ changeset: 0:40a840c1f8ae 101s - branch: branch1 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add f1 101s - 101s - 101s - $ cd .. 101s - 101s -Now try pulling a diverged bookmark: 101s - 101s - $ rm -r hgrepo 101s -#if with-path 101s - $ hg clone -U repo.git hgrepo 101s - importing 5 git commits 101s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 101s -#else 101s - $ hg init hgrepo 101s - $ hg -R hgrepo pull repo.git 101s - pulling from repo.git 101s - importing 5 git commits 101s - adding bookmark branch1_bookmark 101s - adding bookmark branch2_bookmark 101s - adding bookmark branch3_bookmark 101s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 101s - (run 'hg heads' to see heads, 'hg merge' to merge) 101s -#endif 101s - $ cd gitrepo 101s - $ git checkout -q branch1 101s - $ fn_git_rebase branch3 101s - $ git push -f 101s - To $TESTTMP/repo.git 101s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 101s - $ cd ../hgrepo 101s - $ hg pull ../repo.git 101s - pulling from ../repo.git 101s - importing 1 git commits 101s - not updating diverged bookmark branch1_bookmark 101s - new changesets 895d0307f8b7 (1 drafts) 101s - (run 'hg update' to get a working copy) 101s - $ hg log --graph 101s - o changeset: 5:895d0307f8b7 101s - | tag: default/branch1 (with-path !) 101s - | tag: tip 101s - | user: test 101s - | date: Mon Jan 01 00:00:12 2007 +0000 101s - | summary: append f1 101s - | 101s - o changeset: 4:faf44fc3a4e8 101s - | bookmark: branch3_bookmark 101s - | tag: default/branch3 (with-path !) 101s - | user: test 101s - | date: Mon Jan 01 00:00:14 2007 +0000 101s - | summary: append f3 101s - | 101s - o changeset: 3:ae8eb55f7090 101s - | bookmark: branch2_bookmark 101s - | tag: default/branch2 (with-path !) 101s - | user: test 101s - | date: Mon Jan 01 00:00:13 2007 +0000 101s - | summary: append f2 101s - | 101s - o changeset: 2:600de9b6d498 101s - | branch: branch2 101s - | parent: 0:40a840c1f8ae 101s - | user: test 101s - | date: Mon Jan 01 00:00:11 2007 +0000 101s - | summary: add f2 101s - | 101s - | o changeset: 1:8211cade99e4 101s - |/ bookmark: branch1_bookmark 101s - | user: test 101s - | date: Mon Jan 01 00:00:12 2007 +0000 101s - | summary: append f1 101s - | 101s - o changeset: 0:40a840c1f8ae 101s - branch: branch1 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add f1 101s - 101s 101s ERROR: test-branch-bookmark-suffix.t#with-path output changed 101s ! 101s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-branch-bookmark-suffix.t 101s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-branch-bookmark-suffix.t#without-path.err 101s @@ -9,287 +9,10 @@ 101s $ git init -q --bare repo.git 101s 101s $ hg clone repo.git hgrepo 101s - updating to branch default 101s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository repo.git not found 101s + [255] 101s $ cd hgrepo 101s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 101s #if without-path 101s $ rm .hg/hgrc 101s -#endif 101s - $ hg branch -q branch1 101s - $ hg bookmark branch1_bookmark 101s - $ echo f1 > f1 101s - $ hg add f1 101s - $ fn_hg_commit -m "add f1" 101s - $ hg branch -q branch2 101s - $ hg bookmark branch2_bookmark 101s - $ echo f2 > f2 101s - $ hg add f2 101s - $ fn_hg_commit -m "add f2" 101s - $ hg log --graph 101s - @ changeset: 1:600de9b6d498 101s - | branch: branch2 101s - | bookmark: branch2_bookmark 101s - | tag: tip 101s - | user: test 101s - | date: Mon Jan 01 00:00:11 2007 +0000 101s - | summary: add f2 101s - | 101s - o changeset: 0:40a840c1f8ae 101s - branch: branch1 101s - bookmark: branch1_bookmark 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add f1 101s - 101s - 101s - $ hg push -B asdasd ../repo.git 101s - pushing to ../repo.git 101s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 101s - [255] 101s - 101s - $ hg push ../repo.git 101s - pushing to ../repo.git 101s - searching for changes 101s - adding objects 101s - remote: found 0 deltas to reuse 101s - added 2 commits with 2 trees and 2 blobs 101s - adding reference refs/heads/branch1 101s - adding reference refs/heads/branch2 101s - 101s - $ cd .. 101s - 101s - $ cd repo.git 101s - $ git symbolic-ref HEAD refs/heads/branch1 101s - $ git branch 101s - * branch1 101s - branch2 101s - $ cd .. 101s - 101s - $ git clone repo.git gitrepo 101s - Cloning into 'gitrepo'... 101s - done. 101s - $ cd gitrepo 101s - $ git checkout -q branch1 101s - $ echo g1 >> f1 101s - $ git add f1 101s - $ fn_git_commit -m "append f1" 101s - $ git checkout -q branch2 101s - $ echo g2 >> f2 101s - $ git add f2 101s - $ fn_git_commit -m "append f2" 101s - $ git checkout -b branch3 101s - Switched to a new branch 'branch3' 101s - $ echo g3 >> f3 101s - $ git add f3 101s - $ fn_git_commit -m "append f3" 101s - $ git push origin branch1 branch2 branch3 101s - To $TESTTMP/repo.git 101s - bbfe79a..d8aef79 branch1 -> branch1 101s - 288e92b..f8f8de5 branch2 -> branch2 101s - * [new branch] branch3 -> branch3 101s -make sure the commit doesn't have an HG:rename-source annotation 101s - $ git cat-file commit d8aef79 101s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 101s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 101s - author test 1167609612 +0000 101s - committer test 1167609612 +0000 101s - 101s - append f1 101s - $ cd .. 101s - 101s - $ cd hgrepo 101s - $ hg paths 101s - default = $TESTTMP/repo.git (with-path !) 101s - $ hg pull ../repo.git 101s - pulling from ../repo.git 101s - importing 3 git commits 101s - updating bookmark branch1_bookmark 101s - updating bookmark branch2_bookmark 101s - adding bookmark branch3_bookmark 101s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 101s - (run 'hg heads' to see heads) 101s - $ hg log --graph 101s - o changeset: 4:faf44fc3a4e8 101s - | bookmark: branch3_bookmark 101s - | tag: default/branch3 (with-path !) 101s - | tag: tip 101s - | user: test 101s - | date: Mon Jan 01 00:00:14 2007 +0000 101s - | summary: append f3 101s - | 101s - o changeset: 3:ae8eb55f7090 101s - | bookmark: branch2_bookmark 101s - | tag: default/branch2 (with-path !) 101s - | parent: 1:600de9b6d498 101s - | user: test 101s - | date: Mon Jan 01 00:00:13 2007 +0000 101s - | summary: append f2 101s - | 101s - | o changeset: 2:8211cade99e4 101s - | | bookmark: branch1_bookmark 101s - | | tag: default/branch1 (with-path !) 101s - | | parent: 0:40a840c1f8ae 101s - | | user: test 101s - | | date: Mon Jan 01 00:00:12 2007 +0000 101s - | | summary: append f1 101s - | | 101s - @ | changeset: 1:600de9b6d498 101s - |/ branch: branch2 101s - | user: test 101s - | date: Mon Jan 01 00:00:11 2007 +0000 101s - | summary: add f2 101s - | 101s - o changeset: 0:40a840c1f8ae 101s - branch: branch1 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add f1 101s - 101s - $ cd .. 101s - 101s -Try cloning a bookmark, and make sure it gets checked out: 101s - 101s - $ rm -r hgrepo 101s - $ hg clone -r branch3 repo.git hgrepo 101s - importing 4 git commits 101s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 101s - updating to bookmark branch3_bookmark 101s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s - $ cd hgrepo 101s - $ hg bookmarks 101s - branch2_bookmark 2:ae8eb55f7090 101s - * branch3_bookmark 3:faf44fc3a4e8 101s - $ hg log --graph 101s - @ changeset: 3:faf44fc3a4e8 101s - | bookmark: branch3_bookmark 101s - | tag: default/branch3 101s - | tag: tip 101s - | user: test 101s - | date: Mon Jan 01 00:00:14 2007 +0000 101s - | summary: append f3 101s - | 101s - o changeset: 2:ae8eb55f7090 101s - | bookmark: branch2_bookmark 101s - | tag: default/branch2 101s - | user: test 101s - | date: Mon Jan 01 00:00:13 2007 +0000 101s - | summary: append f2 101s - | 101s - o changeset: 1:600de9b6d498 101s - | branch: branch2 101s - | user: test 101s - | date: Mon Jan 01 00:00:11 2007 +0000 101s - | summary: add f2 101s - | 101s - o changeset: 0:40a840c1f8ae 101s - branch: branch1 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add f1 101s - 101s - $ cd .. 101s - 101s -Try cloning something that's both a bookmark and a branch, and see the 101s -results. They're a bit suprising as the bookmark does get activated, 101s -but the branch get checked out. Although this does seem a bit odd, so 101s -does the scenario. 101s - 101s - $ rm -r hgrepo 101s - $ hg clone -r branch1 repo.git hgrepo 101s - importing 2 git commits 101s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 101s - updating to branch branch1 101s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s - $ cd hgrepo 101s - $ hg bookmarks 101s - * branch1_bookmark 1:8211cade99e4 101s - $ hg log --graph 101s - o changeset: 1:8211cade99e4 101s - | bookmark: branch1_bookmark 101s - | tag: default/branch1 101s - | tag: tip 101s - | user: test 101s - | date: Mon Jan 01 00:00:12 2007 +0000 101s - | summary: append f1 101s - | 101s - @ changeset: 0:40a840c1f8ae 101s - branch: branch1 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add f1 101s - 101s - 101s - $ cd .. 101s - 101s -Now try pulling a diverged bookmark: 101s - 101s - $ rm -r hgrepo 101s -#if with-path 101s - $ hg clone -U repo.git hgrepo 101s - importing 5 git commits 101s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 101s -#else 101s - $ hg init hgrepo 101s - $ hg -R hgrepo pull repo.git 101s - pulling from repo.git 101s - importing 5 git commits 101s - adding bookmark branch1_bookmark 101s - adding bookmark branch2_bookmark 101s - adding bookmark branch3_bookmark 101s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 101s - (run 'hg heads' to see heads, 'hg merge' to merge) 101s -#endif 101s - $ cd gitrepo 101s - $ git checkout -q branch1 101s - $ fn_git_rebase branch3 101s - $ git push -f 101s - To $TESTTMP/repo.git 101s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 101s - $ cd ../hgrepo 101s - $ hg pull ../repo.git 101s - pulling from ../repo.git 101s - importing 1 git commits 101s - not updating diverged bookmark branch1_bookmark 101s - new changesets 895d0307f8b7 (1 drafts) 101s - (run 'hg update' to get a working copy) 101s - $ hg log --graph 101s - o changeset: 5:895d0307f8b7 101s - | tag: default/branch1 (with-path !) 101s - | tag: tip 101s - | user: test 101s - | date: Mon Jan 01 00:00:12 2007 +0000 101s - | summary: append f1 101s - | 101s - o changeset: 4:faf44fc3a4e8 101s - | bookmark: branch3_bookmark 101s - | tag: default/branch3 (with-path !) 101s - | user: test 101s - | date: Mon Jan 01 00:00:14 2007 +0000 101s - | summary: append f3 101s - | 101s - o changeset: 3:ae8eb55f7090 101s - | bookmark: branch2_bookmark 101s - | tag: default/branch2 (with-path !) 101s - | user: test 101s - | date: Mon Jan 01 00:00:13 2007 +0000 101s - | summary: append f2 101s - | 101s - o changeset: 2:600de9b6d498 101s - | branch: branch2 101s - | parent: 0:40a840c1f8ae 101s - | user: test 101s - | date: Mon Jan 01 00:00:11 2007 +0000 101s - | summary: add f2 101s - | 101s - | o changeset: 1:8211cade99e4 101s - |/ bookmark: branch1_bookmark 101s - | user: test 101s - | date: Mon Jan 01 00:00:12 2007 +0000 101s - | summary: append f1 101s - | 101s - o changeset: 0:40a840c1f8ae 101s - branch: branch1 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add f1 101s - 101s 101s ERROR: test-branch-bookmark-suffix.t#without-path output changed 101s ! 101s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-bundle.t 101s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-bundle.t.err 101s @@ -36,247 +36,12 @@ 101s Clone it! 101s 101s $ hg clone gitrepo hgrepo 101s - importing 3 git commits 101s - new changesets ff7a2f2d8d70:ca33a262eb46 (3 drafts) 101s - updating to bookmark master 101s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository gitrepo not found 101s + [255] 101s $ cd hgrepo 101s + $TESTTMP.sh: 45: cd: can't cd to hgrepo 101s 101s Create a bundle with our metadata, and inspect it: 101s 101s $ hg bundle --all ../bundle-w-git.hg 101s - 3 changesets found 101s - $ hg debugbundle --all ../bundle-w-git.hg | grep hg-git 101s - exp-hg-git-map -- {} (mandatory: False) 101s - exp-hg-git-tags -- {} (mandatory: False) 101s - $ hg debugbundle --all ../bundle-w-git.hg > bundle-w-git.out 101s - 101s -Create a bundle without our metadata, and inspect it: 101s - 101s - $ hg bundle --all ../bundle-wo-git.hg --config experimental.hg-git-bundle=no 101s - 3 changesets found 101s - $ hg debugbundle --all ../bundle-wo-git.hg | grep hg-git 101s - [1] 101s - 101s -Verify that those are different: 101s - 101s - $ hg debugbundle --all ../bundle-wo-git.hg > bundle-wo-git.out 101s - $ cmp -s bundle-w-git.out bundle-wo-git.out 101s - [1] 101s - 101s -Now create a bundle without hg-git enabled at all, which should be 101s -exactly similar to what you get when you disable metadata embedding; 101s -this verifies we don't accidentally pollute bundles. 101s - 101s - $ hg bundle --all --config extensions.hggit=! ../bundle-wo-hggit.hg 101s - 3 changesets found 101s - $ hg debugbundle --all ../bundle-wo-hggit.hg > bundle-wo-hggit.out 101s - $ cmp -s bundle-wo-git.hg bundle-wo-hggit.hg 101s - [2] 101s - $ cmp -s bundle-wo-git.out bundle-wo-hggit.out 101s - $ cd .. 101s - $ rm -r hgrepo 101s - 101s -Does unbundling transfer state? 101s - 101s - $ hg init hgrepo 101s - $ hg -R hgrepo unbundle bundle-w-git.hg 101s - adding changesets 101s - adding manifests 101s - adding file changes 101s - added 3 changesets with 3 changes to 3 files 101s - new changesets * (glob) 101s - (run 'hg update' to get a working copy) 101s - $ hg -R hgrepo log -T git 101s - 2:ca33a262eb46 | d338971a96e2 | tip | 101s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 101s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 101s - $ hg -R hgrepo pull gitrepo 101s - pulling from gitrepo 101s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 101s - no changes found 101s - adding bookmark master 101s - $ rm -r hgrepo 101s - 101s -Can we unbundle something without git state? 101s - 101s - $ hg init hgrepo 101s - $ hg -R hgrepo unbundle bundle-wo-git.hg 101s - adding changesets 101s - adding manifests 101s - adding file changes 101s - added 3 changesets with 3 changes to 3 files 101s - new changesets * (glob) 101s - (run 'hg update' to get a working copy) 101s - $ hg -R hgrepo log -T git 101s - 2:ca33a262eb46 | | tip | 101s - 1:7fe02317c63d | | | 101s - 0:ff7a2f2d8d70 | | | 101s - $ hg -R hgrepo pull gitrepo 101s - pulling from gitrepo 101s - importing 3 git commits 101s - adding bookmark master 101s - (run 'hg update' to get a working copy) 101s - $ rm -r hgrepo 101s - 101s -Regular mercurial shouldn't choke on our bundle 101s - 101s - $ hg init hgrepo 101s - $ cat >> hgrepo/.hg/hgrc < [extensions] 101s - > hggit = ! 101s - > EOF 101s - $ hg -R hgrepo unbundle bundle-wo-git.hg 101s - adding changesets 101s - adding manifests 101s - adding file changes 101s - added 3 changesets with 3 changes to 3 files 101s - new changesets * (glob) 101s - (run 'hg update' to get a working copy) 101s - $ hg -R hgrepo log -T git 101s - 2:ca33a262eb46 | | tip | 101s - 1:7fe02317c63d | | | 101s - 0:ff7a2f2d8d70 | | | 101s - $ hg -R hgrepo pull gitrepo 101s - pulling from gitrepo 101s - abort: repository gitrepo not found!? (re) 101s - [255] 101s - $ rm -r hgrepo 101s - 101s - 101s -What happens if we unbundle twice? 101s - 101s - $ hg init hgrepo 101s - $ hg -R hgrepo unbundle bundle-w-git.hg 101s - adding changesets 101s - adding manifests 101s - adding file changes 101s - added 3 changesets with 3 changes to 3 files 101s - new changesets * (glob) 101s - (run 'hg update' to get a working copy) 101s - $ hg -R hgrepo unbundle bundle-w-git.hg 101s - adding changesets 101s - adding manifests 101s - adding file changes 101s - added 0 changesets with 0 changes to 3 files 101s - (run 'hg update' to get a working copy) 101s - $ hg -R hgrepo log -T git 101s - 2:ca33a262eb46 | d338971a96e2 | tip | 101s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 101s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 101s - $ hg -R hgrepo pull gitrepo 101s - pulling from gitrepo 101s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 101s - no changes found 101s - adding bookmark master 101s - $ rm -r hgrepo 101s - 101s -Alas, cloning a bundle doesn't work yet: 101s - 101s -(Mercurial is apparently quite dumb here, so we won't try to fix this 101s -for now, but this test mostly exists so that we notice if ever starts 101s -working, or breaks entirely.) 101s - 101s - $ hg clone bundle-w-git.hg hgrepo 101s - requesting all changes 101s - adding changesets 101s - adding manifests 101s - adding file changes 101s - added 3 changesets with 3 changes to 3 files 101s - new changesets * (glob) 101s - updating to branch default 101s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s - $ hg -R hgrepo log -T git 101s - 2:ca33a262eb46 | | tip | 101s - 1:7fe02317c63d | | | 101s - 0:ff7a2f2d8d70 | | | 101s - $ rm -r hgrepo 101s - 101s -Now, lets try to be a bit evil. How does pulling partial state work? 101s - 101s -First, more git happenings: 101s - 101s - $ cd gitrepo 101s - $ git checkout -b otherbranch thetag 101s - Switched to a new branch 'otherbranch' 101s - $ echo 42 > baz 101s - $ git add baz 101s - $ fn_git_commit -m 3 101s - $ cd .. 101s - 101s -Pull, 'em, and create a partial bundle: 101s - 101s - $ hg clone gitrepo hgrepo 101s - importing 4 git commits 101s - new changesets ff7a2f2d8d70:d87bf3ef6a53 (4 drafts) 101s - updating to bookmark otherbranch 101s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s - $ hg -R hgrepo bundle --base 'p1(tip)' -r tip bundle-w-git-2.hg 101s - 1 changesets found 101s - $ rm -r hgrepo 101s - 101s -Now, load only that bundle into a repository without any git state 101s - 101s - $ hg clone -r 1 bundle-w-git.hg hgrepo --config extensions.hggit=! 101s - adding changesets 101s - adding manifests 101s - adding file changes 101s - added 2 changesets with 2 changes to 2 files 101s - new changesets * (glob) 101s - updating to branch default 101s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s - $ cd hgrepo 101s - $ hg unbundle ../bundle-w-git-2.hg 101s - adding changesets 101s - adding manifests 101s - adding file changes 101s - added 1 changesets with 1 changes to 1 files (+1 heads) 101s - new changesets * (glob) 101s - (run 'hg heads' to see heads, 'hg merge' to merge) 101s - $ hg pull ../gitrepo 101s - pulling from ../gitrepo 101s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 101s - importing 3 git commits 101s - adding bookmark master 101s - adding bookmark otherbranch 101s - new changesets ca33a262eb46 (1 drafts) 101s - (run 'hg update' to get a working copy) 101s - $ cd .. 101s - $ rm -r hgrepo 101s - 101s -Now, try pushing with only the metadata: 101s - 101s - $ hg init hgrepo 101s - $ cd hgrepo 101s - $ hg unbundle -u ../bundle-w-git.hg 101s - adding changesets 101s - adding manifests 101s - adding file changes 101s - added 3 changesets with 3 changes to 3 files 101s - new changesets * (glob) 101s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s - $ echo kaflaflibob > bajizmo 101s - $ fn_hg_commit -A -m 4 101s - $ hg book -r tip master 101s - $ hg push ../gitrepo 101s - pushing to ../gitrepo 101s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 101s - abort: cannot push git commit d338971a96e2 as it is not present locally 101s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 101s - [255] 101s - 101s -Try to repopulate the git state from a bundle 101s - 101s - $ hg debug-remove-hggit-state 101s - clearing out the git cache data 101s - $ hg log -qr 'fromgit()' 101s - $ hg unbundle -u ../bundle-w-git.hg 101s - adding changesets 101s - adding manifests 101s - adding file changes 101s - added 0 changesets with 0 changes to 3 files 101s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s - $ hg log -qr 'fromgit()' 101s - 0:ff7a2f2d8d70 101s - 1:7fe02317c63d 101s - 2:ca33a262eb46 101s 101s ERROR: test-bundle.t output changed 101s ! 101s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-file-removal.t 101s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-file-removal.t.err 101s @@ -98,192 +98,9 @@ 101s $ git init -q --bare repo.git 101s 101s $ hg clone gitrepo hgrepo 101s - importing 9 git commits 101s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 101s - updating to bookmark master 101s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 101s + abort: repository gitrepo not found 101s + [255] 101s $ cd hgrepo 101s + $TESTTMP.sh: 72: cd: can't cd to hgrepo 101s $ hg log --graph 101s - @ changeset: 8:0995b8a0a943 101s - | bookmark: master 101s - | tag: default/master 101s - | tag: tip 101s - | user: test 101s - | date: Mon Jan 01 00:00:18 2007 +0000 101s - | summary: remove betalink 101s - | 101s - o changeset: 7:a316d3a96c89 101s - | user: test 101s - | date: Mon Jan 01 00:00:17 2007 +0000 101s - | summary: replace file with symlink 101s - | 101s - o changeset: 6:1804acb71f3e 101s - | user: test 101s - | date: Mon Jan 01 00:00:16 2007 +0000 101s - | summary: replace symlink with file 101s - | 101s - o changeset: 5:e19c85becc87 101s - | user: test 101s - | date: Mon Jan 01 00:00:15 2007 +0000 101s - | summary: add symlink to beta 101s - | 101s - o changeset: 4:0d3086c3f8c3 101s - | user: test 101s - | date: Mon Jan 01 00:00:14 2007 +0000 101s - | summary: remove foo/bar 101s - | 101s - o changeset: 3:b2406125ef5c 101s - | user: test 101s - | date: Mon Jan 01 00:00:13 2007 +0000 101s - | summary: remove alpha 101s - | 101s - o changeset: 2:8b3b2f4b4158 101s - | user: test 101s - | date: Mon Jan 01 00:00:12 2007 +0000 101s - | summary: add foo 101s - | 101s - o changeset: 1:7fe02317c63d 101s - | user: test 101s - | date: Mon Jan 01 00:00:11 2007 +0000 101s - | summary: add beta 101s - | 101s - o changeset: 0:ff7a2f2d8d70 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add alpha 101s - 101s - 101s -make sure alpha is not in this manifest 101s - $ hg manifest -r 3 101s - beta 101s - foo/bar 101s - 101s -make sure that only beta is in the manifest 101s - $ hg manifest 101s - beta 101s - 101s - $ hg debug-remove-hggit-state 101s - clearing out the git cache data 101s - $ ls .hg | grep git 101s - [1] 101s - $ hg push ../repo.git 101s - pushing to ../repo.git 101s - searching for changes 101s - adding objects 101s - remote: found 0 deltas to reuse 101s - added 9 commits with 8 trees and 5 blobs 101s - adding reference refs/heads/master 101s - 101s - $ cd .. 101s - $ git --git-dir=repo.git log --pretty=medium 101s - commit 5ee11eeae239d6a99df5a99901ec00ffafbcc46b 101s - Author: test 101s - Date: Mon Jan 1 00:00:18 2007 +0000 101s - 101s - remove betalink 101s - 101s - commit 2c7b324faeccb1acf89c35b7ad38e7956f5705fa 101s - Author: test 101s - Date: Mon Jan 1 00:00:17 2007 +0000 101s - 101s - replace file with symlink 101s - 101s - commit ff0478d2ecc2571d01eb6d406ac29e4e63e5d3d5 101s - Author: test 101s - Date: Mon Jan 1 00:00:16 2007 +0000 101s - 101s - replace symlink with file 101s - 101s - commit 5492e6e410e42df527956be945286cd1ae45acb8 101s - Author: test 101s - Date: Mon Jan 1 00:00:15 2007 +0000 101s - 101s - add symlink to beta 101s - 101s - commit b991de8952c482a7cd51162674ffff8474862218 101s - Author: test 101s - Date: Mon Jan 1 00:00:14 2007 +0000 101s - 101s - remove foo/bar 101s - 101s - commit b0edaf0adac19392cf2867498b983bc5192b41dd 101s - Author: test 101s - Date: Mon Jan 1 00:00:13 2007 +0000 101s - 101s - remove alpha 101s - 101s - commit f2d0d5bfa905e12dee728b509b96cf265bb6ee43 101s - Author: test 101s - Date: Mon Jan 1 00:00:12 2007 +0000 101s - 101s - add foo 101s - 101s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 101s - Author: test 101s - Date: Mon Jan 1 00:00:11 2007 +0000 101s - 101s - add beta 101s - 101s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 101s - Author: test 101s - Date: Mon Jan 1 00:00:10 2007 +0000 101s - 101s - add alpha 101s - 101s -test with rename detection enabled 101s - $ hg --config git.similarity=100 clone gitrepo hgreporenames 101s - importing 9 git commits 101s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 101s - updating to bookmark master 101s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 101s - 101s - $ cd hgreporenames 101s - $ hg log --graph 101s - @ changeset: 8:0995b8a0a943 101s - | bookmark: master 101s - | tag: default/master 101s - | tag: tip 101s - | user: test 101s - | date: Mon Jan 01 00:00:18 2007 +0000 101s - | summary: remove betalink 101s - | 101s - o changeset: 7:a316d3a96c89 101s - | user: test 101s - | date: Mon Jan 01 00:00:17 2007 +0000 101s - | summary: replace file with symlink 101s - | 101s - o changeset: 6:1804acb71f3e 101s - | user: test 101s - | date: Mon Jan 01 00:00:16 2007 +0000 101s - | summary: replace symlink with file 101s - | 101s - o changeset: 5:e19c85becc87 101s - | user: test 101s - | date: Mon Jan 01 00:00:15 2007 +0000 101s - | summary: add symlink to beta 101s - | 101s - o changeset: 4:0d3086c3f8c3 101s - | user: test 101s - | date: Mon Jan 01 00:00:14 2007 +0000 101s - | summary: remove foo/bar 101s - | 101s - o changeset: 3:b2406125ef5c 101s - | user: test 101s - | date: Mon Jan 01 00:00:13 2007 +0000 101s - | summary: remove alpha 101s - | 101s - o changeset: 2:8b3b2f4b4158 101s - | user: test 101s - | date: Mon Jan 01 00:00:12 2007 +0000 101s - | summary: add foo 101s - | 101s - o changeset: 1:7fe02317c63d 101s - | user: test 101s - | date: Mon Jan 01 00:00:11 2007 +0000 101s - | summary: add beta 101s - | 101s - o changeset: 0:ff7a2f2d8d70 101s - user: test 101s - date: Mon Jan 01 00:00:10 2007 +0000 101s - summary: add alpha 101s - 101s 101s ERROR: test-file-removal.t output changed 102s ! 102s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-hg-author.t 102s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-hg-author.t.err 102s @@ -16,256 +16,10 @@ 102s 102s $ cd .. 102s $ hg clone repo.git hgrepo 102s - importing 1 git commits 102s - new changesets ff7a2f2d8d70 (1 drafts) 102s - updating to bookmark master 102s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 102s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 102s + abort: repository repo.git not found 102s + [255] 102s 102s $ cd hgrepo 102s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 102s $ hg book master 102s - $ echo beta > beta 102s - $ hg add beta 102s - $ fn_hg_commit -u "test" -m 'add beta' 102s - $ hg push 102s - pushing to $TESTTMP/repo.git 102s - searching for changes 102s - adding objects 102s - remote: found 0 deltas to reuse 102s - added 1 commits with 1 trees and 1 blobs 102s - updating reference refs/heads/master 102s - 102s - $ echo gamma >> beta 102s - $ fn_hg_commit -u "test (comment)" -m 'modify beta' 102s - $ hg push 102s - pushing to $TESTTMP/repo.git 102s - searching for changes 102s - adding objects 102s - remote: found 0 deltas to reuse 102s - added 1 commits with 1 trees and 1 blobs 102s - updating reference refs/heads/master 102s - 102s - $ echo gamma > gamma 102s - $ hg add gamma 102s - $ fn_hg_commit -u "" -m 'add gamma' 102s - $ hg push 102s - pushing to $TESTTMP/repo.git 102s - searching for changes 102s - adding objects 102s - remote: found 0 deltas to reuse 102s - added 1 commits with 1 trees and 1 blobs 102s - updating reference refs/heads/master 102s - 102s - $ echo delta > delta 102s - $ hg add delta 102s - $ fn_hg_commit -u "name" -m 'add delta' 102s - $ hg push 102s - pushing to $TESTTMP/repo.git 102s - searching for changes 102s - adding objects 102s - remote: found 0 deltas to reuse 102s - added 1 commits with 1 trees and 1 blobs 102s - updating reference refs/heads/master 102s - 102s - $ echo epsilon > epsilon 102s - $ hg add epsilon 102s - $ fn_hg_commit -u "name zeta 102s - $ hg add zeta 102s - $ fn_hg_commit -u " test " -m 'add zeta' 102s - $ hg push 102s - pushing to $TESTTMP/repo.git 102s - searching for changes 102s - adding objects 102s - remote: found 0 deltas to reuse 102s - added 1 commits with 1 trees and 1 blobs 102s - updating reference refs/heads/master 102s - 102s - $ echo eta > eta 102s - $ hg add eta 102s - $ fn_hg_commit -u "test < test@example.com >" -m 'add eta' 102s - $ hg push 102s - pushing to $TESTTMP/repo.git 102s - searching for changes 102s - adding objects 102s - remote: found 0 deltas to reuse 102s - added 1 commits with 1 trees and 1 blobs 102s - updating reference refs/heads/master 102s - 102s - $ echo theta > theta 102s - $ hg add theta 102s - $ fn_hg_commit -u "test >test@example.com>" -m 'add theta' 102s - $ hg push 102s - pushing to $TESTTMP/repo.git 102s - searching for changes 102s - adding objects 102s - remote: found 0 deltas to reuse 102s - added 1 commits with 1 trees and 1 blobs 102s - updating reference refs/heads/master 102s - 102s - $ hg log --graph 102s - @ changeset: 8:c5d1976ab12c 102s - | bookmark: master 102s - | tag: default/master 102s - | tag: tip 102s - | user: test >test@example.com> 102s - | date: Mon Jan 01 00:00:18 2007 +0000 102s - | summary: add theta 102s - | 102s - o changeset: 7:0e2fb4d21667 102s - | user: test < test@example.com > 102s - | date: Mon Jan 01 00:00:17 2007 +0000 102s - | summary: add eta 102s - | 102s - o changeset: 6:faa3aae96199 102s - | user: test 102s - | date: Mon Jan 01 00:00:16 2007 +0000 102s - | summary: add zeta 102s - | 102s - o changeset: 5:2cf6ad5a1afc 102s - | user: name 102s - | date: Mon Jan 01 00:00:14 2007 +0000 102s - | summary: add delta 102s - | 102s - o changeset: 3:6b854d65d0d6 102s - | user: 102s - | date: Mon Jan 01 00:00:13 2007 +0000 102s - | summary: add gamma 102s - | 102s - o changeset: 2:46303c652e79 102s - | user: test (comment) 102s - | date: Mon Jan 01 00:00:12 2007 +0000 102s - | summary: modify beta 102s - | 102s - o changeset: 1:47580592d3d6 102s - | user: test 102s - | date: Mon Jan 01 00:00:11 2007 +0000 102s - | summary: add beta 102s - | 102s - o changeset: 0:ff7a2f2d8d70 102s - user: test 102s - date: Mon Jan 01 00:00:10 2007 +0000 102s - summary: add alpha 102s - 102s - 102s - $ cd .. 102s - $ hg clone repo.git hgrepo2 102s - importing 9 git commits 102s - new changesets ff7a2f2d8d70:1fbf3aa91221 (9 drafts) 102s - updating to bookmark master 102s - 8 files updated, 0 files merged, 0 files removed, 0 files unresolved 102s - $ hg -R hgrepo2 log --graph 102s - @ changeset: 8:1fbf3aa91221 102s - | bookmark: master 102s - | tag: default/master 102s - | tag: tip 102s - | user: test ?test@example.com 102s - | date: Mon Jan 01 00:00:18 2007 +0000 102s - | summary: add theta 102s - | 102s - o changeset: 7:20310508f06d 102s - | user: test 102s - | date: Mon Jan 01 00:00:17 2007 +0000 102s - | summary: add eta 102s - | 102s - o changeset: 6:e3d81af8a8c1 102s - | user: test 102s - | date: Mon Jan 01 00:00:16 2007 +0000 102s - | summary: add zeta 102s - | 102s - o changeset: 5:78f609fd208f 102s - | user: name 102s - | date: Mon Jan 01 00:00:15 2007 +0000 102s - | summary: add epsilon 102s - | 102s - o changeset: 4:42fa61d57718 102s - | user: name 102s - | date: Mon Jan 01 00:00:14 2007 +0000 102s - | summary: add delta 102s - | 102s - o changeset: 3:6b854d65d0d6 102s - | user: 102s - | date: Mon Jan 01 00:00:13 2007 +0000 102s - | summary: add gamma 102s - | 102s - o changeset: 2:46303c652e79 102s - | user: test (comment) 102s - | date: Mon Jan 01 00:00:12 2007 +0000 102s - | summary: modify beta 102s - | 102s - o changeset: 1:47580592d3d6 102s - | user: test 102s - | date: Mon Jan 01 00:00:11 2007 +0000 102s - | summary: add beta 102s - | 102s - o changeset: 0:ff7a2f2d8d70 102s - user: test 102s - date: Mon Jan 01 00:00:10 2007 +0000 102s - summary: add alpha 102s - 102s - $ git --git-dir=repo.git log --pretty=medium master 102s - commit 2fe60ba69727981e6ede78be70354c3a9e30e21d 102s - Author: test ?test@example.com 102s - Date: Mon Jan 1 00:00:18 2007 +0000 102s - 102s - add theta 102s - 102s - commit 9f2f7cafdbf2e467928db98de8275141001d3081 102s - Author: test 102s - Date: Mon Jan 1 00:00:17 2007 +0000 102s - 102s - add eta 102s - 102s - commit 172a6f8d8064d73dff7013e395a9fe3cfc3ff807 102s - Author: test 102s - Date: Mon Jan 1 00:00:16 2007 +0000 102s - 102s - add zeta 102s - 102s - commit 71badb8e343a7da391a9b5d98909fbd2ca7d78f2 102s - Author: name 102s - Date: Mon Jan 1 00:00:15 2007 +0000 102s - 102s - add epsilon 102s - 102s - commit 9a9ae7b7f310d4a1a3e732a747ca26f06934f8d8 102s - Author: name 102s - Date: Mon Jan 1 00:00:14 2007 +0000 102s - 102s - add delta 102s - 102s - commit e4149a32e81e380193f59aa8773349201b8ed7f7 102s - Author: 102s - Date: Mon Jan 1 00:00:13 2007 +0000 102s - 102s - add gamma 102s - 102s - commit fae95aef5889a80103c2fbd5d14ff6eb8c9daf93 102s - Author: test ext:(%20%28comment%29) 102s - Date: Mon Jan 1 00:00:12 2007 +0000 102s - 102s - modify beta 102s - 102s - commit 0f378ab6c2c6b5514bd873d3faf8ac4b8095b001 102s - Author: test 102s - Date: Mon Jan 1 00:00:11 2007 +0000 102s - 102s - add beta 102s - 102s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 102s - Author: test 102s - Date: Mon Jan 1 00:00:10 2007 +0000 102s - 102s - add alpha 102s 102s ERROR: test-hg-author.t output changed 102s ! 102s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-subrepos.t 102s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-subrepos.t.err 102s @@ -34,165 +34,8 @@ 102s $ cd .. 102s Ensure gitlinks are transformed to .hgsubstate on hg pull from git 102s $ hg clone -u tip repo.git hgrepo 2>&1 | grep -E -v '^(Cloning into|done)' 102s - importing 3 git commits 102s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 102s - updating to branch default 102s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 102s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 102s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 102s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 102s + abort: repository repo.git not found 102s $ cd hgrepo 102s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 102s $ hg bookmarks -f -r default master 102s -1. Ensure gitlinks are transformed to .hgsubstate on hg <- git pull 102s -.hgsub shall list two [git] subrepos 102s - $ cat .hgsub 102s - subrepo1 = [git]../gitsubrepo 102s - xyz/subrepo2 = [git]../gitsubrepo 102s -.hgsubstate shall list two idenitcal revisions 102s - $ cat .hgsubstate 102s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 102s - 56f0304c5250308f14cfbafdc27bd12d40154d17 xyz/subrepo2 102s -hg status shall NOT report .hgsub and .hgsubstate as untracked - either ignored or unmodified 102s - $ hg status --unknown .hgsub .hgsubstate 102s - $ hg status --modified .hgsub .hgsubstate 102s - $ cd .. 102s - 102s -2. Check gitmodules are preserved during hg -> git push 102s - $ cd gitsubrepo 102s - $ echo gamma > gamma 102s - $ git add gamma 102s - $ fn_git_commit -m 'add gamma' 102s - $ cd .. 102s - $ cd hgrepo 102s - $ cd xyz/subrepo2 102s - $ git pull --ff-only | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| */| /' 102s - From $TESTTMP/gitsubrepo 102s - 56f0304..aabf7cd master -> origin/master 102s - Updating 56f0304..aabf7cd 102s - Fast-forward 102s - gamma | 1 + 102s - 1 file changed, 1 insertion(+) 102s - create mode 100644 gamma 102s - $ cd ../.. 102s - $ echo xxx >> alpha 102s - $ fn_hg_commit -m 'Update subrepo2 from hg' | grep -v "committing subrepository" || true 102s - $ hg push 102s - pushing to $TESTTMP/repo.git 102s - searching for changes 102s - adding objects 102s - remote: found 0 deltas to reuse 102s - added 1 commits with 2 trees and 1 blobs 102s - updating reference refs/heads/master 102s - $ cd .. 102s - $ cd gitrepo 102s - $ git pull --ff-only 102s - From $TESTTMP/repo 102s - 89c22d7..275b0a5 master -> origin/master 102s - Fetching submodule xyz/subrepo2 102s - From $TESTTMP/gitsubrepo 102s - 56f0304..aabf7cd master -> origin/master 102s - Updating 89c22d7..275b0a5 102s - Fast-forward 102s - alpha | 1 + 102s - xyz/subrepo2 | 2 +- 102s - 2 files changed, 2 insertions(+), 1 deletion(-) 102s -there shall be two gitlink entries, with values matching that in .hgsubstate 102s - $ git ls-tree -r HEAD^{tree} | grep 'commit' 102s - 160000 commit 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 102s - 160000 commit aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 102s -bring working copy to HEAD state (it's not bare repo) 102s - $ git reset --hard 102s - HEAD is now at 275b0a5 Update subrepo2 from hg 102s - $ cd .. 102s - 102s -3. Check .hgsub and .hgsubstate from git repository are merged, not overwritten 102s - $ hg init hgsub 102s - $ cd hgsub 102s - $ echo delta > delta 102s - $ hg add delta 102s - $ fn_hg_commit -m "add delta" 102s - $ hg tip --template '{node} hgsub\n' > ../gitrepo/.hgsubstate 102s - $ cat > ../gitrepo/.hgsub < hgsub = ../hgsub 102s - > EOF 102s - $ cd ../gitrepo 102s - $ git add .hgsubstate .hgsub 102s - $ fn_git_commit -m "Test3. Prepare .hgsub and .hgsubstate sources" 102s - $ git push 102s - To $TESTTMP/repo.git 102s - 275b0a5..e31d576 master -> master 102s - 102s - $ cd ../hgrepo 102s - $ hg pull 102s - pulling from $TESTTMP/repo.git 102s - importing 1 git commits 102s - updating bookmark master 102s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 102s - (run 'hg update' to get a working copy) 102s - $ hg checkout -C 102s - updating to active bookmark master 102s - cloning subrepo hgsub from $TESTTMP/hgsub 102s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 102s - $ cd .. 102s -pull shall bring .hgsub entry which was added to the git repo 102s - $ cat hgrepo/.hgsub 102s - hgsub = ../hgsub 102s - subrepo1 = [git]../gitsubrepo 102s - xyz/subrepo2 = [git]../gitsubrepo 102s -.hgsubstate shall list revision of the subrepo added through git repo 102s - $ cat hgrepo/.hgsubstate 102s - 481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub 102s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 102s - aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 102s - 102s -4. Try changing the subrepos from the Mercurial side 102s - 102s - $ cd hgrepo 102s - $ cat >> .hgsub < subrepo2 = [git]../gitsubrepo 102s - > EOF 102s - $ git clone ../gitsubrepo subrepo2 102s - Cloning into 'subrepo2'... 102s - done. 102s - $ fn_hg_commit -m 'some stuff' 102s - $ hg push 102s - pushing to $TESTTMP/repo.git 102s - no changes made to subrepo hgsub since last push to $TESTTMP/hgsub 102s - searching for changes 102s - adding objects 102s - remote: found 0 deltas to reuse 102s - added 1 commits with 1 trees and 1 blobs 102s - updating reference refs/heads/master 102s - $ cd .. 102s - 102s -5. But we actually do something quite weird in this case: If a 102s -.gitmodules file exists in the repository, it always wins! In this 102s -case, we break the bidirectional convention, and modify the repository 102s -data. That's odd, so show it: 102s - 102s - $ hg id hgrepo 102s - 42c46c7eef3a default/master/tip master 102s - $ hg clone -U repo.git hgrepo2 102s - importing 6 git commits 102s - new changesets e532b2bfda10:42c46c7eef3a (6 drafts) 102s - $ hg -R hgrepo2 up :master 102s - Cloning into '$TESTTMP/hgrepo2/subrepo1'... 102s - done. 102s - cloning subrepo hgsub from $TESTTMP/hgsub 102s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 102s - checking out detached HEAD in subrepository "subrepo1" 102s - check out a git branch if you intend to make changes 102s - Cloning into '$TESTTMP/hgrepo2/subrepo2'... 102s - done. 102s - Cloning into '$TESTTMP/hgrepo2/xyz/subrepo2'... 102s - done. 102s - cloning subrepo subrepo2 from $TESTTMP/gitsubrepo 102s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 102s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 102s - 102s -We retained bidirectionality! 102s - 102s - $ git diff --stat hgrepo/.hgsub hgrepo2/.hgsub 102s - $ hg id hgrepo 102s - 42c46c7eef3a default/master/tip master 102s - $ hg id hgrepo2 102s - 42c46c7eef3a default/master/tip master 102s 102s ERROR: test-subrepos.t output changed 102s ! 102s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-extra.t 102s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-extra.t.err 102s @@ -12,190 +12,9 @@ 102s 102s $ cd .. 102s $ hg clone gitrepo hgrepo 102s - importing 1 git commits 102s - new changesets aa9eb6424386 (1 drafts) 102s - updating to bookmark not-master 102s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 102s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 102s + abort: repository gitrepo not found 102s + [255] 102s $ cd hgrepo 102s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 102s $ hg mv a b 102s - $ fn_hg_commit -mb 102s - $ hg up 0 102s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 102s - (leaving bookmark not-master) 102s - $ touch c 102s - $ hg add c 102s - $ fn_hg_commit -mc 102s - 102s -Rebase will add a rebase_source 102s - 102s - $ hg --config extensions.rebase= rebase -s 1 -d 2 102s - rebasing 1:4c7da7adf18b * (glob) 102s - saved backup bundle to $TESTTMP/*.hg (glob) 102s - $ hg up 2 102s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 102s - 102s -Add a commit with multiple extra fields 102s - $ hg bookmark b1 102s - $ touch d 102s - $ hg add d 102s - $ fn_hg_commitextra --field zzzzzzz=datazzz --field aaaaaaa=dataaaa 102s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 102s - @ 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 102s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 102s - | 102s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 102s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 102s - | 102s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 102s - | branch=default 102s - | 102s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 102s - branch=default hg-git-rename-source=git 102s - 102s - 102s - $ hg push -r b1 102s - pushing to $TESTTMP/gitrepo 102s - searching for changes 102s - adding objects 102s - remote: found 0 deltas to reuse 102s - added 3 commits with 3 trees and 0 blobs 102s - adding reference refs/heads/b1 102s - 102s - $ hg bookmark b2 102s - $ hg mv c c2 102s - $ hg mv d d2 102s - $ fn_hg_commitextra --field yyyyyyy=datayyy --field bbbbbbb=databbb 102s - 102s -Test some nutty filenames 102s - $ hg book b3 102s -#if windows 102s - $ hg mv c2 'c2 => c3' 102s - abort: filename contains '>', which is reserved on Windows: "c2 => c3" 102s - [255] 102s - $ hg mv c2 c3 102s - $ fn_hg_commit -m 'dummy commit' 102s - $ hg mv c3 c4 102s - $ fn_hg_commit -m 'dummy commit' 102s -#else 102s - $ hg mv c2 'c2 => c3' 102s - warning: filename contains '>', which is reserved on Windows: 'c2 => c3' 102s - $ fn_hg_commit -m 'test filename with arrow' 102s - $ hg mv 'c2 => c3' 'c3 => c4' 102s - warning: filename contains '>', which is reserved on Windows: 'c3 => c4' 102s - $ fn_hg_commit -m 'test filename with arrow 2' 102s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" -l 3 --config "experimental.graphstyle.missing=|" 102s - @ 6 bca4ba69a6844c133b069e227dfa043d41e3c197 test filename with arrow 2 102s - | branch=default 102s - | 102s - o 5 864caad1f3493032f8d06f44a89dc9f1c039b09f test filename with arrow 102s - | branch=default 102s - | 102s - o 4 58f855ae26f4930ce857e648d3dd949901cce817 102s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 102s - | 102s -#endif 102s - $ hg push -r b2 -r b3 102s - pushing to $TESTTMP/gitrepo 102s - searching for changes 102s - adding objects 102s - remote: found 0 deltas to reuse 102s - added 3 commits with 3 trees and 0 blobs 102s - adding reference refs/heads/b2 102s - adding reference refs/heads/b3 102s - 102s - $ cd ../gitrepo 102s - $ git cat-file commit b1 102s - tree 1b773a2eb70f29397356f8069c285394835ff85a 102s - parent 54776dace5849bdf273fb26737a48ef64804909d 102s - author test 1167609613 +0000 102s - committer test 1167609613 +0000 102s - HG:extra aaaaaaa:dataaaa 102s - HG:extra zzzzzzz:datazzz 102s - 102s - 102s - 102s - $ git cat-file commit b2 102s - tree 34ad62c6d6ad9464bfe62db5b3d2fa16aaa9fa9e 102s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 102s - author test 1167609614 +0000 102s - committer test 1167609614 +0000 102s - HG:rename c:c2 102s - HG:rename d:d2 102s - HG:extra bbbbbbb:databbb 102s - HG:extra yyyyyyy:datayyy 102s - 102s - 102s - 102s -#if no-windows 102s - $ git cat-file commit b3 102s - tree e63df52695f9b06e54b37e7ef60d0c43994de620 102s - parent 5cafe2555a0666fcf661a3943277a9812a694a98 102s - author test 1167609616 +0000 102s - committer test 1167609616 +0000 102s - HG:rename c2%20%3D%3E%20c3:c3%20%3D%3E%20c4 102s - 102s - test filename with arrow 2 102s -#endif 102s - $ cd ../gitrepo 102s - $ git checkout b1 102s - Switched to branch 'b1' 102s - $ commit_sha=$(git rev-parse HEAD) 102s - $ tree_sha=$(git rev-parse HEAD^{tree}) 102s - 102s -There's no way to create a Git repo with extra metadata via the CLI. Dulwich 102s -lets you do that, though. 102s - 102s - >>> from dulwich.objects import Commit 102s - >>> from dulwich.porcelain import open_repo 102s - >>> repo = open_repo('.') 102s - >>> c = Commit() 102s - >>> c.author = b'test ' 102s - >>> c.author_time = 0 102s - >>> c.author_timezone = 0 102s - >>> c.committer = c.author 102s - >>> c.commit_time = 0 102s - >>> c.commit_timezone = 0 102s - >>> c.parents = [b'$commit_sha'] 102s - >>> c.tree = b'$tree_sha' 102s - >>> c.message = b'extra commit\n' 102s - >>> c.extra.extend([(b'zzz:zzz', b'data:zzz'), (b'aaa:aaa', b'data:aaa'), 102s - ... (b'HG:extra', b'hgaaa:dataaaa'), 102s - ... (b'HG:extra', b'hgzzz:datazzz')]) 102s - >>> repo.object_store.add_object(c) 102s - >>> repo.refs.set_if_equals(b'refs/heads/master', None, c.id) 102s - True 102s - 102s - $ git cat-file commit master 102s - tree 1b773a2eb70f29397356f8069c285394835ff85a 102s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 102s - author test 0 +0000 102s - committer test 0 +0000 102s - zzz:zzz data:zzz 102s - aaa:aaa data:aaa 102s - HG:extra hgaaa:dataaaa 102s - HG:extra hgzzz:datazzz 102s - 102s - extra commit 102s - 102s - $ cd .. 102s - $ hg clone -qU gitrepo hgrepo2 102s - $ cd hgrepo2 102s - $ hg log -G -r :5 -T "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 102s - o 5 58f855ae26f4930ce857e648d3dd949901cce817 102s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 102s - | 102s - | o 4 90acc8c23fcfaeb0930c03c849923a696fd9013c extra commit 102s - |/ GIT0-zzz%3Azzz=data%3Azzz GIT1-aaa%3Aaaa=data%3Aaaa branch=default hgaaa=dataaaa hgzzz=datazzz 102s - | 102s - o 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 102s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 102s - | 102s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 102s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 102s - | 102s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 102s - | branch=default 102s - | 102s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 102s - branch=default hg-git-rename-source=git 102s - 102s 102s ERROR: test-extra.t output changed 104s ! 104s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-bookmark-workflow.t 104s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-bookmark-workflow.t.err 104s @@ -42,13 +42,21 @@ 104s 104s Initialize remote hg and git repos with equivalent initial contents 104s $ hg init hgremoterepo 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 104s $ cd hgremoterepo 104s $ hg bookmark master 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 104s $ for f in alpha beta gamma delta; do 104s > echo $f > $f; hg add $f; hgcommit -m "add $f" 104s > done 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 104s $ hg bookmark -r 1 b1 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 104s $ hgstate 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 104s 3 fc2664cac217 "add delta" bookmarks: [master] 104s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 104s 1 7bcd915dc873 "add beta" bookmarks: [b1] 104s @@ -69,157 +77,19 @@ 104s 104s Cloning transfers all bookmarks from remote to local 104s $ hg clone -q hgremoterepo purehglocalrepo 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 104s $ cd purehglocalrepo 104s $ hgstate 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 104s 3 fc2664cac217 "add delta" bookmarks: [master] 104s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 104s 1 7bcd915dc873 "add beta" bookmarks: [b1] 104s 0 3442585be8a6 "add alpha" bookmarks: [] 104s $ cd .. 104s $ hg clone -q gitremoterepo hggitlocalrepo --config hggit.usephases=True 104s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 104s + abort: repository gitremoterepo not found 104s + [255] 104s $ cd hggitlocalrepo 104s + $TESTTMP.sh: 78: cd: can't cd to hggitlocalrepo 104s $ hggitstate 104s - 3 03769a650ded 55b133e1d558 "add delta" bookmarks: [master] 104s - 2 ca33a262eb46 d338971a96e2 "add gamma" bookmarks: [] 104s - 1 7fe02317c63d 9497a4ee62e1 "add beta" bookmarks: [b1] 104s - 0 ff7a2f2d8d70 7eeab2ea75ec "add alpha" bookmarks: [] 104s - 104s -Make sure that master is public 104s - $ hg phase -r master 104s - 3: public 104s - $ cd .. 104s - 104s -No changes 104s - $ cd purehglocalrepo 104s - $ hg incoming -B 104s - comparing with $TESTTMP/hgremoterepo 104s - searching for changed bookmarks 104s - no changed bookmarks found 104s - [1] 104s - $ hg outgoing 104s - comparing with $TESTTMP/hgremoterepo 104s - searching for changes 104s - no changes found 104s - [1] 104s - $ hg outgoing -B 104s - comparing with $TESTTMP/hgremoterepo 104s - searching for changed bookmarks 104s - no changed bookmarks found 104s - [1] 104s - $ hg push 104s - pushing to $TESTTMP/hgremoterepo 104s - searching for changes 104s - no changes found 104s - [1] 104s - $ cd .. 104s - $ cd hggitlocalrepo 104s - $ hg incoming -B 104s - comparing with $TESTTMP/gitremoterepo 104s - searching for changed bookmarks 104s - no changed bookmarks found 104s - [1] 104s - $ hg outgoing 104s - comparing with $TESTTMP/gitremoterepo 104s - searching for changes 104s - no changes found 104s - [1] 104s - $ hg outgoing -B 104s - comparing with $TESTTMP/gitremoterepo 104s - searching for changed bookmarks 104s - no changed bookmarks found 104s - [1] 104s - $ hg push 104s - pushing to $TESTTMP/gitremoterepo 104s - searching for changes 104s - no changes found 104s - [1] 104s - $ cd .. 104s - 104s -Bookmarks on existing revs: 104s -- change b1 on local repo 104s -- introduce b2 on local repo 104s -- introduce b3 on remote repo 104s -Bookmarks on new revs 104s -- introduce b4 on a new rev on the remote 104s - $ cd hgremoterepo 104s - $ hg bookmark -r master b3 104s - $ hg bookmark -r master b4 104s - $ hg update -q b4 104s - $ echo epsilon > epsilon; hg add epsilon; hgcommit -m 'add epsilon' 104s - $ hgstate 104s - 4 d979bb8e0fbb "add epsilon" bookmarks: [b4] 104s - 3 fc2664cac217 "add delta" bookmarks: [b3 master] 104s - 2 d85ced7ae9d6 "add gamma" bookmarks: [] 104s - 1 7bcd915dc873 "add beta" bookmarks: [b1] 104s - 0 3442585be8a6 "add alpha" bookmarks: [] 104s - $ cd .. 104s - $ cd purehglocalrepo 104s - $ hg bookmark -fr 2 b1 104s - $ hg bookmark -r 0 b2 104s - $ hgstate 104s - 3 fc2664cac217 "add delta" bookmarks: [master] 104s - 2 d85ced7ae9d6 "add gamma" bookmarks: [b1] 104s - 1 7bcd915dc873 "add beta" bookmarks: [] 104s - 0 3442585be8a6 "add alpha" bookmarks: [b2] 104s - $ hg incoming -B 104s - comparing with $TESTTMP/hgremoterepo 104s - searching for changed bookmarks 104s - b3 fc2664cac217 104s - b4 d979bb8e0fbb 104s - $ hg outgoing 104s - comparing with $TESTTMP/hgremoterepo 104s - searching for changes 104s - no changes found 104s - [1] 104s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 104s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 104s -This changed in 3.4 to start showing changed and deleted bookmarks again. 104s - $ hg outgoing -B | grep -v -E -w 'b1|b3|b4' 104s - comparing with $TESTTMP/hgremoterepo 104s - searching for changed bookmarks 104s - b2 3442585be8a6 104s - $ cd .. 104s - 104s - $ cd gitremoterepo 104s - $ git branch b3 master 104s - $ git checkout -b b4 master 104s - Switched to a new branch 'b4' 104s - $ echo epsilon > epsilon 104s - $ git add epsilon 104s - $ gitcommit -m 'add epsilon' 104s - $ gitstate 104s - fcfd2c0 "add epsilon" refs: (*b4) (glob) 104s - 55b133e "add delta" refs: (master, b3) 104s - d338971 "add gamma" refs: 104s - 9497a4e "add beta" refs: (b1) 104s - 7eeab2e "add alpha" refs: 104s - $ cd .. 104s - $ cd hggitlocalrepo 104s - $ hg bookmark -fr 2 b1 104s - $ hg bookmark -r 0 b2 104s - $ hgstate 104s - 3 03769a650ded "add delta" bookmarks: [master] 104s - 2 ca33a262eb46 "add gamma" bookmarks: [b1] 104s - 1 7fe02317c63d "add beta" bookmarks: [] 104s - 0 ff7a2f2d8d70 "add alpha" bookmarks: [b2] 104s - $ hg incoming -B 104s - comparing with $TESTTMP/gitremoterepo 104s - searching for changed bookmarks 104s - b3 03769a650ded 104s - b4 fcfd2c0262db 104s - $ hg outgoing 104s - comparing with $TESTTMP/gitremoterepo 104s - searching for changes 104s - no changes found 104s - [1] 104s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 104s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 104s -This changed in 3.4 to start showing changed and deleted bookmarks again. 104s - $ hg outgoing -B 104s - comparing with $TESTTMP/gitremoterepo 104s - searching for changed bookmarks 104s - b1 ca33a262eb46 104s - b2 ff7a2f2d8d70 104s - b3 104s - b4 104s - $ cd .. 104s 104s ERROR: test-bookmark-workflow.t output changed 108s ! 108s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-illegal-contents.t 108s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-illegal-contents.t.err 108s @@ -5,6 +5,7 @@ 108s $ . "$TESTDIR/testutil" 108s 108s $ hg init hg 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s $ cd hg 108s $ mkdir -p .git/hooks 108s $ cat > .git/hooks/post-update < EOF 108s $ fn_touch_escaped foo/git~100/wat bar/.gi\\u200ct/wut this/is/safe 108s $ hg addremove 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s adding .git/hooks/post-update 108s adding bar/.gi\xe2\x80\x8ct/wut (esc) 108s adding foo/git~100/wat 108s adding this/is/safe 108s $ hg ci -m "we should refuse to export this" 108s - $ hg book master 108s - $ hg gexport 108s - warning: skipping invalid path '.git/hooks/post-update' 108s - warning: skipping invalid path 'bar/.gi\xe2\x80\x8ct/wut' 108s - warning: skipping invalid path 'foo/git~100/wat' 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + $ hg book master 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + $ hg gexport 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + hg: unknown command 'gexport' 108s + (did you mean one of export, import?) 108s + [10] 108s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 108s - this/is/safe 108s + fatal: not a git repository: '.hg/git' 108s + [128] 108s $ hg debug-remove-hggit-state 108s - clearing out the git cache data 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + hg: unknown command 'debug-remove-hggit-state' 108s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 108s + [10] 108s $ hg gexport --config hggit.invalidpaths=keep 108s - warning: path '.git/hooks/post-update' contains an invalid path component 108s - warning: path 'bar/.gi\xe2\x80\x8ct/wut' contains an invalid path component 108s - warning: path 'foo/git~100/wat' contains an invalid path component 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + hg: unknown command 'gexport' 108s + (did you mean one of export, import?) 108s + [10] 108s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 108s - .git/hooks/post-update 108s - "bar/.gi\342\200\214t/wut" 108s - foo/git~100/wat 108s - this/is/safe 108s - $ cd .. 108s - 108s - $ rm -rf hg 108s - $ hg init hg 108s + fatal: not a git repository: '.hg/git' 108s + [128] 108s + $ cd .. 108s + 108s + $ rm -rf hg 108s + $ hg init hg 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s $ cd hg 108s $ mkdir -p nested/.git/hooks/ 108s $ cat > nested/.git/hooks/post-update < EOF 108s $ chmod +x nested/.git/hooks/post-update 108s $ hg addremove 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s adding nested/.git/hooks/post-update 108s $ hg ci -m "also refuse to export this" 108s - $ hg book master 108s - $ hg gexport 108s - warning: skipping invalid path 'nested/.git/hooks/post-update' 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + $ hg book master 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + $ hg gexport 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + hg: unknown command 'gexport' 108s + (did you mean one of export, import?) 108s + [10] 108s $ git clone .hg/git git 108s - Cloning into 'git'... 108s - done. 108s + fatal: repository '.hg/git' does not exist 108s + [128] 108s $ rm -rf git 108s 108s We can trigger an error: 108s 108s $ hg -q debug-remove-hggit-state 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + hg: unknown command 'debug-remove-hggit-state' 108s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 108s + [10] 108s $ hg --config hggit.invalidpaths=abort gexport 108s - abort: invalid path 'nested/.git/hooks/post-update' rejected by configuration 108s - (see 'hg help config.hggit.invalidpaths for details) 108s - [255] 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + hg: unknown command 'gexport' 108s + (did you mean one of export, import?) 108s + [10] 108s 108s We can override if needed: 108s 108s $ hg --config hggit.invalidpaths=keep gexport 108s - warning: path 'nested/.git/hooks/post-update' contains an invalid path component 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + hg: unknown command 'gexport' 108s + (did you mean one of export, import?) 108s + [10] 108s $ cd .. 108s $ # different git versions give different return codes 108s $ git clone hg/.hg/git git || true 108s - Cloning into 'git'... 108s - done. 108s - error: [Ii]nvalid path 'nested/\.git/hooks/post-update' (re) 108s + fatal: repository 'hg/.hg/git' does not exist 108s fatal: unable to checkout working tree (?) 108s warning: Clone succeeded, but checkout failed. (?) 108s You can inspect what was checked out with 'git status' (?) 108s @@ -88,6 +109,7 @@ 108s $ cd .. 108s $ rm -rf hg 108s $ hg init hg 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s $ cd hg 108s $ mkdir -p .GIT/hooks/ 108s $ cat > .GIT/hooks/post-checkout < EOF 108s $ chmod +x .GIT/hooks/post-checkout 108s $ hg addremove 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s adding .GIT/hooks/post-checkout 108s $ hg ci -m "also refuse to export this" 108s - $ hg book master 108s - $ hg gexport 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + $ hg book master 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + $ hg gexport 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + hg: unknown command 'gexport' 108s + (did you mean one of export, import?) 108s + [10] 108s $ cd .. 108s 108s And the NTFS case: 108s $ cd .. 108s $ rm -rf hg 108s $ hg init hg 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s $ cd hg 108s $ mkdir -p GIT~1/hooks/ 108s $ cat > GIT~1/hooks/post-checkout < EOF 108s $ chmod +x GIT~1/hooks/post-checkout 108s $ hg addremove 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s adding GIT~1/hooks/post-checkout 108s $ hg ci -m "also refuse to export this" 108s - $ hg book master 108s - $ hg gexport 108s - warning: skipping invalid path 'GIT~1/hooks/post-checkout' 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + $ hg book master 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + $ hg gexport 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + hg: unknown command 'gexport' 108s + (did you mean one of export, import?) 108s + [10] 108s $ cd .. 108s 108s Now check a Git repository containing a Mercurial repository, which 108s @@ -127,36 +163,29 @@ 108s $ rm -rf hg git nested 108s $ git init -q git 108s $ hg init nested 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s $ mv nested git 108s $ cd git 108s $ git add nested 108s $ fn_git_commit -m 'add a Mercurial repository' 108s $ cd .. 108s $ hg clone --config hggit.invalidpaths=abort git hg 108s - importing 1 git commits 108s - abort: invalid path 'nested/.hg/00changelog.i' rejected by configuration 108s - (see 'hg help config.hggit.invalidpaths for details) 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + abort: repository git not found 108s [255] 108s $ rm -rf hg 108s $ hg clone --config hggit.invalidpaths=keep git hg 108s - importing 1 git commits 108s - warning: path 'nested/.hg/00changelog.i' contains an invalid path component 108s - warning: path 'nested/.hg/requires' contains an invalid path component 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + abort: repository git not found 108s warning: path 'nested/.hg/store/requires' contains an invalid path component (?) 108s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 108s warning: path 'nested/.hg/store/requires' is within a nested repository, which Mercurial cannot check out. (?) 108s - updating to bookmark master 108s - abort: path 'nested/.hg/00changelog.i' is inside nested repo 'nested' 108s - [10] 108s + [255] 108s $ rm -rf hg 108s $ hg clone git hg 108s - importing 1 git commits 108s - warning: skipping invalid path 'nested/.hg/00changelog.i' 108s - warning: skipping invalid path 'nested/.hg/requires' 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + abort: repository git not found 108s warning: skipping invalid path 'nested/.hg/store/requires' (?) 108s - new changesets 3ea18a67c0e6 (1 drafts) 108s - updating to bookmark master 108s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 108s + [255] 108s $ cd .. 108s 108s Now check a Git repository containing paths with carriage return and 108s @@ -171,23 +200,16 @@ 108s $ fn_git_commit -m 'add files disallowed by mercurial' 108s $ cd .. 108s $ hg clone --config hggit.invalidpaths=abort git hg 108s - importing 1 git commits 108s - abort: invalid path 'Icon\r' rejected by configuration 108s - (see 'hg help config.hggit.invalidpaths for details) 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + abort: repository git not found 108s [255] 108s $ hg clone --config hggit.invalidpaths=keep git hg 108s - importing 1 git commits 108s - warning: skipping invalid path 'Icon\r' 108s - warning: skipping invalid path 'the\nfile' 108s - new changesets 8354c06a5842 (1 drafts) 108s - updating to bookmark master 108s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + abort: repository git not found 108s + [255] 108s $ rm -rf hg 108s $ hg clone git hg 108s - importing 1 git commits 108s - warning: skipping invalid path 'Icon\r' 108s - warning: skipping invalid path 'the\nfile' 108s - new changesets 8354c06a5842 (1 drafts) 108s - updating to bookmark master 108s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 108s - 108s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 108s + abort: repository git not found 108s + [255] 108s + 108s 108s ERROR: test-illegal-contents.t output changed 109s ! 109s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-phases-remote.t 109s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-phases-remote.t.err 109s @@ -26,193 +26,10 @@ 109s $ cd .. 109s 109s $ hg clone --config hggit.usephases=True -U gitrepo hgrepo 109s - importing 4 git commits 109s - new changesets ff7a2f2d8d70:25eed24f5e8f (1 drafts) 109s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 109s + abort: repository gitrepo not found 109s + [255] 109s 109s $ cd hgrepo 109s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 109s $ hg log -G -T '{rev}|{phase}|{bookmarks}|{tags}\n' 109s - o 3|public||thetag tip 109s - | 109s - | o 2|draft|not-master|default/not-master 109s - |/ 109s - | o 1|public|master|default/master 109s - |/ 109s - o 0|public|| 109s - 109s - $ hg phase -r 'all()' | tee $TESTTMP/after-clone 109s - 0: public 109s - 1: public 109s - 2: draft 109s - 3: public 109s - $ cat >> .hg/hgrc < [paths] 109s - > other = $TESTTMP/gitrepo/.git 109s - > other:hg-git.publish = no 109s - > EOF 109s - $ cd .. 109s - 109s -that disables publishing from that remote 109s - 109s - $ cd hgrepo 109s - $ hg phase -fd 'all()' 109s - $ hg pull other 109s - pulling from $TESTTMP/gitrepo/.git 109s - no changes found 109s - $ hg log -qr 'public()' 109s - $ hg pull -v --config hggit.usephases=True other 109s - pulling from $TESTTMP/gitrepo/.git 109s - no changes found 109s - processing commits in batches of 1000 109s - bookmark master is up-to-date 109s - bookmark not-master is up-to-date 109s - $ hg log -qr 'public()' 109s - $ cd .. 109s - 109s -but not default when enable by the global setting 109s - 109s - $ cd hgrepo 109s - $ hg phase -fd 'all()' 109s - no phases changed 109s - $ hg pull -v --config hggit.usephases=True 109s - pulling from $TESTTMP/gitrepo 109s - publishing remote HEAD 109s - publishing tag thetag 109s - no changes found 109s - processing commits in batches of 1000 109s - bookmark master is up-to-date 109s - bookmark not-master is up-to-date 109s - publishing remote HEAD 109s - publishing tag thetag 109s - 3 local changesets published 109s - $ hg phase -r 'all()' > $TESTTMP/after-pull 109s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 109s - $ cd .. 109s - 109s -or the path option 109s - 109s - $ cd hgrepo 109s - $ hg phase -fd 'all()' 109s - $ hg pull -v --config paths.default:hg-git.publish=yes 109s - pulling from $TESTTMP/gitrepo 109s - publishing remote HEAD 109s - publishing tag thetag 109s - no changes found 109s - processing commits in batches of 1000 109s - bookmark master is up-to-date 109s - bookmark not-master is up-to-date 109s - publishing remote HEAD 109s - publishing tag thetag 109s - 3 local changesets published 109s - $ hg phase -r 'all()' > $TESTTMP/after-pull 109s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 109s - $ cd .. 109s - 109s -but we can specify individual branches 109s - 109s - $ cd hgrepo 109s - $ hg phase -fd 'all()' 109s - $ hg pull -v --config paths.default:hg-git.publish=not-master 109s - pulling from $TESTTMP/gitrepo 109s - publishing branch not-master 109s - no changes found 109s - processing commits in batches of 1000 109s - bookmark master is up-to-date 109s - bookmark not-master is up-to-date 109s - publishing branch not-master 109s - 2 local changesets published 109s - $ hg phase -r master -r not-master -r thetag 109s - 1: draft 109s - 2: public 109s - 3: draft 109s - $ cd .. 109s - 109s -and we can also specify the tag 109s - 109s - $ cd hgrepo 109s - $ hg phase -fd 'all()' 109s - $ hg pull -v --config paths.default:hg-git.publish=thetag 109s - pulling from $TESTTMP/gitrepo 109s - publishing tag thetag 109s - no changes found 109s - processing commits in batches of 1000 109s - bookmark master is up-to-date 109s - bookmark not-master is up-to-date 109s - publishing tag thetag 109s - 2 local changesets published 109s - $ hg phase -r master -r not-master -r thetag 109s - 1: draft 109s - 2: draft 109s - 3: public 109s - $ cd .. 109s - 109s - 109s -Check multiple paths behavior 109s -============================= 109s - 109s - 109s - $ cd hgrepo 109s - $ cat >> .hg/hgrc < [paths] 109s - > multi:multi-urls = yes 109s - > multi = path://other, path://default 109s - > recursive:multi-urls = yes 109s - > recursive = path://multi, default 109s - > EOF 109s - 109s -Using multiple path works fine: 109s - 109s - 109s - $ hg pull multi --config paths.default:hg-git.publish=yes 109s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 109s - [255] 109s - 109s -Recursive multiple path are tricker, but Mercurial don't work with them either. 109s -This test exist to make sure we bail out on our own. 109s - 109s - 109s -`yes` should abort (until we implement it) 109s - 109s - $ hg pull multi --config paths.default:hg-git.publish=yes 109s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 109s - [255] 109s - 109s -`some-value` should abort (until we implement it) 109s - 109s - $ hg pull multi --config paths.default:hg-git.publish=thetag 109s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 109s - [255] 109s - 109s -`no` is fine 109s - 109s - $ hg pull multi --config paths.default:hg-git.publish=no 109s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 109s - [255] 109s - 109s - $ cd .. 109s - 109s -Check conflicting paths behavior 109s -================================ 109s - 109s - $ cd hgrepo 109s - $ cat > .hg/hgrc < [paths] 109s - > default = $TESTTMP/gitrepo 109s - > default:hg-git.publish = yes 109s - > also-default = $TESTTMP/gitrepo 109s - > EOF 109s - $ hg pull also-default 109s - pulling from $TESTTMP/gitrepo 109s - abort: different publishing configurations for the same remote location 109s - (conflicting paths: also-default, default) 109s - [255] 109s - $ hg pull --config paths.also-default:hg-git.publish=no 109s - pulling from $TESTTMP/gitrepo 109s - abort: different publishing configurations for the same remote location 109s - (conflicting paths: also-default, default) 109s - [255] 109s - $ hg pull --config paths.also-default:hg-git.publish=true 109s - pulling from $TESTTMP/gitrepo 109s - no changes found 109s - 1 local changesets published 109s - $ cd .. 109s - 109s 109s ERROR: test-phases-remote.t output changed 111s ! 111s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-serve-hg-static.t 111s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-serve-hg-static.t.err 111s @@ -6,6 +6,7 @@ 111s $ . "$TESTDIR/testutil" 111s 111s $ hg clone http://localhost:$HGPORT/ copy 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s abort: * (glob) 111s [100] 111s $ test -d copy 111s @@ -18,14 +19,18 @@ 111s > --logfile server.log 111s $ cat dumb.pid >> $DAEMON_PIDS 111s $ hg init remote 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s $ cd remote 111s $ echo foo > bar 111s $ echo c2 > '.dotfile with spaces' 111s $ hg add 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s adding .dotfile with spaces 111s adding bar 111s $ hg commit -m"test" 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s $ hg tip 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s changeset: 0:02770d679fb8 111s tag: tip 111s user: test 111s @@ -34,6 +39,7 @@ 111s 111s $ cd .. 111s $ hg clone static-http://localhost:$HGPORT/remote local 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s requesting all changes 111s adding changesets 111s adding manifests 111s @@ -44,17 +50,20 @@ 111s 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 111s $ cd local 111s $ hg verify 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s checking changesets 111s checking manifests 111s crosschecking files in changesets and manifests 111s + checking dirstate (?) 111s checking files 111s - checking dirstate (?) 111s + checking dirstate 111s checked 1 changesets with 2 changes to 2 files 111s $ cat bar 111s foo 111s $ cd ../remote 111s $ echo baz > quux 111s $ hg commit -A -mtest2 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s adding quux 111s 111s check for HTTP opener failures when cachefile does not exist 111s @@ -62,6 +71,7 @@ 111s $ rm .hg/cache/* 111s $ cd ../local 111s $ hg pull 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s pulling from static-http://localhost:$HGPORT/remote 111s searching for changes 111s adding changesets 111s @@ -74,10 +84,13 @@ 111s trying to push 111s 111s $ hg update 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 111s $ echo more foo >> bar 111s $ hg commit -m"test" 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s $ hg push 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s pushing to static-http://localhost:$HGPORT/remote 111s abort: destination does not support push 111s [255] 111s @@ -86,9 +99,11 @@ 111s 111s $ cd .. 111s $ hg clone -r doesnotexist static-http://localhost:$HGPORT/remote local0 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s abort: unknown revision 'doesnotexist'!? (re) 111s [10] 111s $ hg clone -r 0 static-http://localhost:$HGPORT/remote local0 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s adding changesets 111s adding manifests 111s adding file changes 111s @@ -100,16 +115,23 @@ 111s test with "/" URI (issue747) and subrepo 111s 111s $ hg init 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s $ hg init sub 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s $ touch sub/test 111s $ hg -R sub commit -A -m "test" 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s adding test 111s $ hg -R sub tag not-empty 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s $ echo sub=sub > .hgsub 111s $ echo a > a 111s $ hg add a .hgsub 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s $ hg -q ci -ma 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s $ hg clone static-http://localhost:$HGPORT/ local2 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s requesting all changes 111s adding changesets 111s adding manifests 111s @@ -127,58 +149,75 @@ 111s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 111s $ cd local2 111s $ hg verify 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s checking changesets 111s checking manifests 111s crosschecking files in changesets and manifests 111s + checking dirstate (?) 111s checking files 111s - checking dirstate (?) 111s + checking dirstate 111s checked 1 changesets with 3 changes to 3 files 111s checking subrepo links 111s $ cat a 111s a 111s $ hg paths 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s default = static-http://localhost:$HGPORT/ 111s 111s test with empty repo (issue965) 111s 111s $ cd .. 111s $ hg init remotempty 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s $ hg clone static-http://localhost:$HGPORT/remotempty local3 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s no changes found 111s updating to branch default 111s 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 111s $ cd local3 111s $ hg verify 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s checking changesets 111s checking manifests 111s crosschecking files in changesets and manifests 111s + checking dirstate (?) 111s checking files 111s - checking dirstate (?) 111s + checking dirstate 111s checked 0 changesets with 0 changes to 0 files 111s $ hg paths 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s default = static-http://localhost:$HGPORT/remotempty 111s $ cd .. 111s 111s Clone with tags and branches works 111s 111s $ hg init remote-with-names 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s $ cd remote-with-names 111s $ echo 0 > foo 111s $ hg -q commit -A -m initial 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s $ echo 1 > foo 111s $ hg commit -m 'commit 1' 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s $ hg -q up 0 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s $ hg branch mybranch 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s marked working directory as branch mybranch 111s (branches are permanent and global, did you want a bookmark?) 111s $ echo 2 > foo 111s $ hg commit -m 'commit 2 (mybranch)' 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s $ hg tag -r 1 'default-tag' 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s $ hg tag -r 2 'branch-tag' 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s 111s $ cd .. 111s 111s $ hg clone static-http://localhost:$HGPORT/remote-with-names local-with-names 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s requesting all changes 111s adding changesets 111s adding manifests 111s @@ -191,6 +230,7 @@ 111s Clone a specific branch works 111s 111s $ hg clone -r mybranch static-http://localhost:$HGPORT/remote-with-names local-with-names-branch 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s adding changesets 111s adding manifests 111s adding file changes 111s @@ -202,6 +242,7 @@ 111s Clone a specific tag works 111s 111s $ hg clone -r default-tag static-http://localhost:$HGPORT/remote-with-names local-with-names-tag 111s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 111s adding changesets 111s adding manifests 111s adding file changes 111s 111s ERROR: test-serve-hg-static.t output changed 112s ! 112s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-octopus.t 112s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-octopus.t.err 112s @@ -62,111 +62,9 @@ 112s $ git init -q --bare repo.git 112s 112s $ hg clone gitrepo hgrepo 112s - importing 8 git commits 112s - new changesets ff7a2f2d8d70:307506d6ae8a (10 drafts) 112s - updating to bookmark master 112s - 6 files updated, 0 files merged, 0 files removed, 0 files unresolved 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s + abort: repository gitrepo not found 112s + [255] 112s $ cd hgrepo 112s + $TESTTMP.sh: 64: cd: can't cd to hgrepo 112s $ hg log --graph --style compact | sed 's/\[.*\]//g' 112s - @ 9:7,8 307506d6ae8a 2007-01-01 00:00 +0000 test 112s - |\ Merge branches 'branch3' and 'branch4' 112s - | | 112s - | o 8:3,4 2b07220e422e 2007-01-01 00:00 +0000 test 112s - | |\ Merge branches 'branch3' and 'branch4' 112s - | | | 112s - o | | 7:5,6 ccf2d65d982c 2007-01-01 00:00 +0000 test 112s - |\ \ \ Merge branches 'branch1' and 'branch2' 112s - | | | | 112s - | o | | 6:1,2 690b40256117 2007-01-01 00:00 +0000 test 112s - | |\ \ \ Merge branches 'branch1' and 'branch2' 112s - | | | | | 112s - o | | | | 5:0 e459c0629ca4 2007-01-01 00:00 +0000 test 112s - | | | | | add delta 112s - | | | | | 112s - +-------o 4:0 e857c9a04474 2007-01-01 00:00 +0000 test 112s - | | | | add zeta 112s - | | | | 112s - +-----o 3:0 0071dec0de0e 2007-01-01 00:00 +0000 test 112s - | | | add epsilon 112s - | | | 112s - +---o 2:0 205a004356ef 2007-01-01 00:00 +0000 test 112s - | | add gamma 112s - | | 112s - | o 1 7fe02317c63d 2007-01-01 00:00 +0000 test 112s - |/ add beta 112s - | 112s - o 0 ff7a2f2d8d70 2007-01-01 00:00 +0000 test 112s - add alpha 112s - 112s - $ hg gverify -r 9 112s - verifying rev 307506d6ae8a against git commit b32ff845df61df998206b630e4370a44f9b36845 112s - $ hg gverify -r 8 112s - abort: no git commit found for rev 2b07220e422e 112s - (if this is an octopus merge, verify against the last rev) 112s - [255] 112s - 112s - $ hg debug-remove-hggit-state 112s - clearing out the git cache data 112s - $ hg push ../repo.git 112s - pushing to ../repo.git 112s - searching for changes 112s - adding objects 112s - remote: found 0 deltas to reuse 112s - added 8 commits with 8 trees and 6 blobs 112s - adding reference refs/heads/branch1 112s - adding reference refs/heads/branch2 112s - adding reference refs/heads/branch3 112s - adding reference refs/heads/branch4 112s - adding reference refs/heads/master 112s - $ cd .. 112s - 112s - $ git --git-dir=repo.git log --pretty=medium | sed s/\\.\\.\\.//g 112s - commit b32ff845df61df998206b630e4370a44f9b36845 112s - Merge: 9ac68f9 7e9cd9f e695849 112s - Author: test 112s - Date: Mon Jan 1 00:00:15 2007 +0000 112s - 112s - Merge branches 'branch3' and 'branch4' 112s - 112s - commit 9ac68f982ae7426d9597ff16c74afb4e6053c582 112s - Merge: d40f375 9497a4e e5023f9 112s - Author: test 112s - Date: Mon Jan 1 00:00:15 2007 +0000 112s - 112s - Merge branches 'branch1' and 'branch2' 112s - 112s - commit d40f375a81b7d033e92cbad89487115fe2dd472f 112s - Author: test 112s - Date: Mon Jan 1 00:00:15 2007 +0000 112s - 112s - add delta 112s - 112s - commit e695849087f6c320c1a447620492b29a82ca41b1 112s - Author: test 112s - Date: Mon Jan 1 00:00:14 2007 +0000 112s - 112s - add zeta 112s - 112s - commit 7e9cd9f90b6d2c60579375eb796ce706d2d8bbe6 112s - Author: test 112s - Date: Mon Jan 1 00:00:13 2007 +0000 112s - 112s - add epsilon 112s - 112s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 112s - Author: test 112s - Date: Mon Jan 1 00:00:12 2007 +0000 112s - 112s - add gamma 112s - 112s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 112s - Author: test 112s - Date: Mon Jan 1 00:00:11 2007 +0000 112s - 112s - add beta 112s - 112s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 112s - Author: test 112s - Date: Mon Jan 1 00:00:10 2007 +0000 112s - 112s - add alpha 112s 112s ERROR: test-octopus.t output changed 112s ! 112s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-hook.t 112s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-hook.t.err 112s @@ -10,6 +10,7 @@ 112s > fn_${1}_commit -m $2 112s > } 112s $ hg init hgrepo 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s $ cd hgrepo 112s $ cat > .hg/hgrc < [hooks] 112s @@ -22,7 +23,10 @@ 112s > incoming = python:testlib.hooks.showargs 112s > EOF 112s $ fn_commit hg a 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s $ hg book master 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s 112s $ git init -q --bare ../repo.git 112s $ cat >> .hg/hgrc < master 112s + * [new branch] master -> master 112s $ cd ../hgrepo 112s 112s Hooks on pull? 112s 112s $ hg pull -u 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s pulling from $TESTTMP/repo.git 112s - | gitimport.source=pull 112s - | gitimport.git=True 112s - | gitimport.names=[b'default'] 112s - | gitimport.refs={b'HEAD': b'1dab31e7bc9691ba42a2fe7b14680694770bc527', b'refs/heads/master': b'1dab31e7bc9691ba42a2fe7b14680694770bc527'} 112s - | gitimport.heads=None 112s - importing 2 git commits 112s - : pretxncommit 112s - | incoming.git=True 112s - | incoming.source=pull 112s - | incoming.node=382ad5fa1d7727210384d40fa1539af52ca632c5 112s - | incoming.git_node=92150d1529ccaea34a6b36fe4144993193080499 112s - : pretxncommit 112s - | incoming.git=True 112s - | incoming.source=pull 112s - | incoming.node=892115eea5c32152e09ae4013c9a119d7b534049 112s - | incoming.git_node=1dab31e7bc9691ba42a2fe7b14680694770bc527 112s - updating bookmark master 112s - | changegroup.source=push 112s - | changegroup.git=True 112s - | changegroup.node=382ad5fa1d7727210384d40fa1539af52ca632c5 112s - | changegroup.node_last=892115eea5c32152e09ae4013c9a119d7b534049 112s - new changesets 382ad5fa1d77:892115eea5c3 (2 drafts) 112s - updating to active bookmark master 112s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 112s + abort: repository $TESTTMP/repo.git not found 112s + [255] 112s 112s Hooks on push? 112s 112s $ fn_commit hg d 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s $ fn_commit hg e 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s $ hg push 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s pushing to $TESTTMP/repo.git 112s - | preoutgoing.git=True 112s - | preoutgoing.source=push 112s - | preoutgoing.url=$TESTTMP/repo.git 112s - | gitexport.nodes=[b'cc6164a17449d58d7811ff3918f33f89c2c83fa5', b'46737f6a4c9d8307b681cbb2e9e2e5419cc87f82'] 112s - | gitexport.git=True 112s - searching for changes 112s - | prechangegroup.source=push 112s - | prechangegroup.git=True 112s - | prechangegroup.url=$TESTTMP/repo.git 112s - adding objects 112s - remote: found 0 deltas to reuse 112s - added 2 commits with 2 trees and 2 blobs 112s - updating reference refs/heads/master 112s + abort: repository $TESTTMP/repo.git not found 112s + [255] 112s 112s 112s And what does Mercurial do? 112s @@ -124,7 +87,9 @@ 112s On push: 112s 112s $ hg init ../hgrepo-copy 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s $ hg push ../hgrepo-copy 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s pushing to ../hgrepo-copy 112s searching for changes 112s | preoutgoing.source=push 112s @@ -133,19 +98,29 @@ 112s adding changesets 112s adding manifests 112s adding file changes 112s - added 5 changesets with 5 changes to 5 files 112s + added 3 changesets with 3 changes to 3 files 112s 112s With more than one head: 112s 112s $ rm -r ../hgrepo-copy 112s $ hg init ../hgrepo-copy 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s $ hg book -i 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s $ hg branch -q abranch 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s $ fn_commit hg x 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s $ hg up -q default 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s $ hg branch -q alsoabranch 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s $ fn_commit hg y 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s $ hg push ../hgrepo-copy 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s pushing to ../hgrepo-copy 112s searching for changes 112s | preoutgoing.source=push 112s @@ -154,13 +129,15 @@ 112s adding changesets 112s adding manifests 112s adding file changes 112s - added 7 changesets with 7 changes to 7 files (+1 heads) 112s + added 5 changesets with 5 changes to 5 files (+1 heads) 112s 112s On pull: 112s 112s $ hg debugstrip --no-backup tip 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 112s $ hg pull ../hgrepo-copy 112s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 112s pulling from ../hgrepo-copy 112s searching for changes 112s | prechangegroup.txnname=pull 112s @@ -171,16 +148,16 @@ 112s adding manifests 112s adding file changes 112s added 1 changesets with 1 changes to 1 files (+1 heads) 112s - new changesets d4097d98a390 112s + new changesets 11a693974ec5 112s | changegroup.txnname=pull 112s file://$TESTTMP/hgrepo-copy 112s | changegroup.source=pull 112s | changegroup.url=file:$TESTTMP/hgrepo-copy 112s - | changegroup.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 112s - | changegroup.node_last=d4097d98a3905be88e8a566039b1fdcca06e0d2e 112s + | changegroup.node=11a693974ec530e32672629628dde90793335199 112s + | changegroup.node_last=11a693974ec530e32672629628dde90793335199 112s | incoming.txnname=pull 112s file://$TESTTMP/hgrepo-copy 112s | incoming.source=pull 112s | incoming.url=file:$TESTTMP/hgrepo-copy 112s - | incoming.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 112s + | incoming.node=11a693974ec530e32672629628dde90793335199 112s (run 'hg heads' to see heads) 112s 112s ERROR: test-hook.t output changed 116s ! 116s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-transactions.t 116s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-transactions.t.err 116s @@ -42,19 +42,29 @@ 116s 116s $ hg clone gitrepo hgrepo --config hggit.mapsavefrequency=10 --debug \ 116s > | grep -c saving 116s - 1 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s + abort: repository gitrepo not found 116s + 0 116s + [1] 116s $ rm -rf hgrepo 116s 116s pull with mapsavefreq set 116s 116s $ hg init hgrepo 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s $ cat >> hgrepo/.hg/hgrc < [paths] 116s > default = $TESTTMP/gitrepo 116s > EOF 116s $ hg -R hgrepo --config hggit.mapsavefrequency=10 pull --debug \ 116s > | grep -c saving 116s - 10 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s + abort: repository $TESTTMP/gitrepo not found 116s + 0 116s + [1] 116s $ rm -rf hgrepo 116s 116s The user experience 116s @@ -66,6 +76,8 @@ 116s First, create a repository, set up to pull from git, and where we can interrupt the conversion. 116s 116s $ hg init hgrepo 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s $ cat >> hgrepo/.hg/hgrc < [paths] 116s > default = $TESTTMP/gitrepo 116s @@ -75,39 +87,49 @@ 116s A low save interval causes a lot of reports: 116s 116s $ hg --config hggit.mapsavefrequency=25 pull 116s - pulling from $TESTTMP/gitrepo 116s - importing 100 git commits 116s - new changesets 1c8407413fa3:abc468b9e51b (25 drafts) 116s - new changesets 217c308baf47:d5d14eeedd08 (25 drafts) 116s - new changesets d9807ef6abcb:4678067bd500 (25 drafts) 116s - adding bookmark master 116s - new changesets c31a154888bb:eda59117ba04 (25 drafts) 116s - (run 'hg update' to get a working copy) 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s + pulling from $TESTTMP/gitrepo 116s + abort: repository $TESTTMP/gitrepo not found 116s + [255] 116s 116s Reset the repository 116s 116s $ hg debugstrip --no-backup 'all()' 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s + abort: empty revision set 116s + [255] 116s $ hg debug-remove-hggit-state 116s - clearing out the git cache data 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s + hg: unknown command 'debug-remove-hggit-state' 116s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 116s + [10] 116s 116s And with phases? No mention of draft changesets, as we publish changes 116s during the conversion: 116s 116s $ hg --config hggit.mapsavefrequency=25 --config hggit.usephases=yes pull 116s - pulling from $TESTTMP/gitrepo 116s - importing 100 git commits 116s - new changesets 1c8407413fa3:abc468b9e51b 116s - new changesets 217c308baf47:d5d14eeedd08 116s - new changesets d9807ef6abcb:4678067bd500 116s - updating bookmark master 116s - new changesets c31a154888bb:eda59117ba04 116s - (run 'hg update' to get a working copy) 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s + pulling from $TESTTMP/gitrepo 116s + abort: repository $TESTTMP/gitrepo not found 116s + [255] 116s 116s Reset the repository 116s 116s $ hg debugstrip --no-backup 'all()' 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s + abort: empty revision set 116s + [255] 116s $ hg debug-remove-hggit-state 116s - clearing out the git cache data 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s + hg: unknown command 'debug-remove-hggit-state' 116s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 116s + [10] 116s 116s Interruptions 116s ------------- 116s @@ -121,54 +143,51 @@ 116s Test an error in a pull: 116s 116s $ ABORT_AFTER=99 hg pull 116s - pulling from $TESTTMP/gitrepo 116s - importing 100 git commits 116s - transaction abort! 116s - rollback completed 116s - abort: aborted after 99 commits! 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s + pulling from $TESTTMP/gitrepo 116s + abort: repository $TESTTMP/gitrepo not found 116s [255] 116s $ hg log -l 10 -T '{rev} {gitnode}\n' 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s 116s Test the user exiting in the first transaction: 116s 116s $ EXIT_AFTER=5 hg --config hggit.mapsavefrequency=10 pull 116s - pulling from $TESTTMP/gitrepo 116s - importing 100 git commits 116s - transaction abort! 116s - rollback completed 116s - interrupted! 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s + pulling from $TESTTMP/gitrepo 116s + abort: repository $TESTTMP/gitrepo not found 116s [255] 116s $ hg log -l 10 -T '{rev} {gitnode}\n' 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s 116s Check that we have no state, but clear it just in case 116s 116s $ ls -d .hg/git* 116s - .hg/git 116s + ls: cannot access '.hg/git*': No such file or directory 116s + [2] 116s $ hg debug-remove-hggit-state 116s - clearing out the git cache data 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s + hg: unknown command 'debug-remove-hggit-state' 116s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 116s + [10] 116s 116s Test the user exiting in the middle of a conversion, after the first 116s transaction: 116s 116s $ EXIT_AFTER=15 hg --config hggit.mapsavefrequency=10 pull 116s - pulling from $TESTTMP/gitrepo 116s - importing 100 git commits 116s - new changesets 1c8407413fa3:7c8c534a5fbe (10 drafts) 116s - transaction abort! 116s - rollback completed 116s - interrupted! 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s + pulling from $TESTTMP/gitrepo 116s + abort: repository $TESTTMP/gitrepo not found 116s [255] 116s $ hg log -l 10 -T '{rev} {gitnode}\n' 116s - 9 7cbb16ec981b308e1e2b181f8e1f22c8f409f44e 116s - 8 42da70ed92bbecf9f348ba59c93646be723d0bf2 116s - 7 17e841146e5744b81af9959634d82c20a5d7df52 116s - 6 c31065bf97bf014815e37cdfbdef2c32c687f314 116s - 5 fcf21b8e0520ec1cced1d7593d13f9ee54721269 116s - 4 46acd02d0352e4b92bd6a099bb0490305d847a18 116s - 3 61eeda444b37b8aa3892d5f04c66c5441d21dd66 116s - 2 e55db11bb0472791c7af3fc636772174cdea4a36 116s - 1 17a2672b3c24c02d568f99d8d55ccae2bf362d5c 116s - 0 4e195b4c6e77604b70a8ad3b01306adbb9b1c7e7 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s $ cd .. 116s $ rm -rf hgrepo 116s 116s @@ -183,12 +202,10 @@ 116s > hg --config hggit.mapsavefrequency=10 --config git.intree=yes \ 116s > --cwd hgrepo \ 116s > clone -U $TESTTMP/gitrepo . 116s - importing 100 git commits 116s - transaction abort! 116s - rollback completed 116s - interrupted! 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + *** failed to import extension "breakage" from /tmp/autopkgtest.hVkeld/build.mNu/src/tests/testlib/ext-break-git-import.py: b'hggit' 116s + abort: repository $TESTTMP/gitrepo not found 116s [255] 116s the leftover below appeared in Mercurial 5.9+; it is unintentional 116s $ ls -A hgrepo 116s - .git 116s - $ rm -rf hgrepo 116s + $ rm -rf hgrepo 116s 116s ERROR: test-transactions.t output changed 116s ! 116s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-outgoing.t 116s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-outgoing.t.err 116s @@ -14,166 +14,10 @@ 116s 116s $ cd .. 116s $ hg clone gitrepo hgrepo 116s - importing 1 git commits 116s - new changesets ff7a2f2d8d70 (1 drafts) 116s - updating to bookmark master 116s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 116s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 116s + abort: repository gitrepo not found 116s + [255] 116s 116s $ cd hgrepo 116s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 116s $ hg book 116s - alpha 0:ff7a2f2d8d70 116s - * master 0:ff7a2f2d8d70 116s - $ hg update -q master 116s - $ echo beta > beta 116s - $ hg add beta 116s - $ fn_hg_commit -m 'add beta' 116s - 116s - 116s - $ echo gamma > gamma 116s - $ hg add gamma 116s - $ fn_hg_commit -m 'add gamma' 116s - 116s - $ hg book -r 1 beta 116s - 116s - $ hg outgoing | grep -v 'searching for changes' 116s - comparing with $TESTTMP/gitrepo 116s - changeset: 1:47580592d3d6 116s - bookmark: beta 116s - user: test 116s - date: Mon Jan 01 00:00:11 2007 +0000 116s - summary: add beta 116s - 116s - changeset: 2:953796e1cfd8 116s - bookmark: master 116s - tag: tip 116s - user: test 116s - date: Mon Jan 01 00:00:12 2007 +0000 116s - summary: add gamma 116s - 116s - $ hg outgoing -r beta 116s - comparing with $TESTTMP/gitrepo 116s - searching for changes 116s - changeset: 1:47580592d3d6 116s - bookmark: beta 116s - user: test 116s - date: Mon Jan 01 00:00:11 2007 +0000 116s - summary: add beta 116s - 116s - $ hg outgoing -r master 116s - comparing with $TESTTMP/gitrepo 116s - searching for changes 116s - changeset: 1:47580592d3d6 116s - bookmark: beta 116s - user: test 116s - date: Mon Jan 01 00:00:11 2007 +0000 116s - summary: add beta 116s - 116s - changeset: 2:953796e1cfd8 116s - bookmark: master 116s - tag: tip 116s - user: test 116s - date: Mon Jan 01 00:00:12 2007 +0000 116s - summary: add gamma 116s - 116s - 116s - $ cd .. 116s - 116s -some more work on master from git 116s - $ cd gitrepo 116s - 116s -Check state of refs after outgoing 116s - $ git show-ref 116s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/alpha 116s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/master 116s - 116s - $ git checkout master 2>&1 | sed s/\'/\"/g 116s - Already on "master" 116s - $ echo delta > delta 116s - $ git add delta 116s - $ fn_git_commit -m "add delta" 116s - 116s - $ cd .. 116s - 116s - $ cd hgrepo 116s -this will fail # maybe we should try to make it work 116s - $ hg outgoing 116s - comparing with $TESTTMP/gitrepo 116s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 116s - [255] 116s -let's pull and try again 116s - $ hg pull 116s - pulling from */gitrepo (glob) 116s - importing 1 git commits 116s - not updating diverged bookmark master 116s - new changesets 25eed24f5e8f (1 drafts) 116s - (run 'hg heads' to see heads, 'hg merge' to merge) 116s - $ hg log --graph 116s - o changeset: 3:25eed24f5e8f 116s - | tag: default/master 116s - | tag: tip 116s - | parent: 0:ff7a2f2d8d70 116s - | user: test 116s - | date: Mon Jan 01 00:00:13 2007 +0000 116s - | summary: add delta 116s - | 116s - | @ changeset: 2:953796e1cfd8 116s - | | bookmark: master 116s - | | user: test 116s - | | date: Mon Jan 01 00:00:12 2007 +0000 116s - | | summary: add gamma 116s - | | 116s - | o changeset: 1:47580592d3d6 116s - |/ bookmark: beta 116s - | user: test 116s - | date: Mon Jan 01 00:00:11 2007 +0000 116s - | summary: add beta 116s - | 116s - o changeset: 0:ff7a2f2d8d70 116s - bookmark: alpha 116s - tag: default/alpha 116s - user: test 116s - date: Mon Jan 01 00:00:10 2007 +0000 116s - summary: add alpha 116s - 116s - $ hg outgoing 116s - comparing with $TESTTMP/gitrepo 116s - searching for changes 116s - changeset: 1:47580592d3d6 116s - bookmark: beta 116s - user: test 116s - date: Mon Jan 01 00:00:11 2007 +0000 116s - summary: add beta 116s - 116s - changeset: 2:953796e1cfd8 116s - bookmark: master 116s - user: test 116s - date: Mon Jan 01 00:00:12 2007 +0000 116s - summary: add gamma 116s - 116s - $ hg outgoing -r beta 116s - comparing with $TESTTMP/gitrepo 116s - searching for changes 116s - changeset: 1:47580592d3d6 116s - bookmark: beta 116s - user: test 116s - date: Mon Jan 01 00:00:11 2007 +0000 116s - summary: add beta 116s - 116s - $ hg outgoing -r master 116s - comparing with $TESTTMP/gitrepo 116s - searching for changes 116s - changeset: 1:47580592d3d6 116s - bookmark: beta 116s - user: test 116s - date: Mon Jan 01 00:00:11 2007 +0000 116s - summary: add beta 116s - 116s - changeset: 2:953796e1cfd8 116s - bookmark: master 116s - user: test 116s - date: Mon Jan 01 00:00:12 2007 +0000 116s - summary: add gamma 116s - 116s - 116s - 116s - $ cd .. 116s 116s ERROR: test-outgoing.t output changed 117s ! 117s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-gc.t 117s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-gc.t.err 117s @@ -25,188 +25,9 @@ 117s > done 117s $ cd .. 117s $ hg clone -U gitrepo hgrepo 117s - importing 100 git commits 117s - new changesets 1c8407413fa3:eda59117ba04 (100 drafts) 117s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 117s + abort: repository gitrepo not found 117s + [255] 117s $ cd hgrepo 117s + $TESTTMP.sh: 24: cd: can't cd to hgrepo 117s $ hg debug-remove-hggit-state 117s - clearing out the git cache data 117s - 117s ------------ 117s - 117s -Test garbage collection of loose objects into packs. We first test 117s -this with two threads, which is closest to the expected usage 117s -scenario, as almost all computers have at least two cores these days. 117s -The main downside is that this makes the output order unreliable, so 117s -we just sort it. 117s - 117s - $ hg gexport --config hggit.mapsavefrequency=33 --config hggit.threads=2 --debug | grep pack | sort 117s - packed 3 loose objects! 117s - packed 75 loose objects! 117s - packed 78 loose objects! 117s - packed 86 loose objects! 117s - packing 3 loose objects... 117s - packing 75 loose objects... 117s - packing 78 loose objects... 117s - packing 86 loose objects... 117s - $ hg debug-remove-hggit-state 117s - clearing out the git cache data 117s - 117s -Test the actual order of operations -- this uses a single thread, 117s -which means that the packing happens synchronously in the main thread, 117s -giving us a reliable output order. 117s - 117s -In addition, the transaction size is set up such that we happen to do 117s -nothing in the final, synchronous packing that happens on every pull. 117s -Lots of other tests have a map save frequency higher than the total 117s -amount of commits pulled, but let's just trigger that other odd 117s -occurence here. 117s - 117s - $ hg gexport --debug \ 117s - > --config hggit.mapsavefrequency=10 --config hggit.threads=1 | \ 117s - > sed 's/^converting revision.*/./' 117s - finding unexported changesets 117s - exporting 100 changesets 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 117s - packing 30 loose objects... 117s - packed 30 loose objects! 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 117s - packing 25 loose objects... 117s - packed 25 loose objects! 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 117s - packing 25 loose objects... 117s - packed 25 loose objects! 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 117s - packing 24 loose objects... 117s - packed 24 loose objects! 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 117s - packing 24 loose objects... 117s - packed 24 loose objects! 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 117s - packing 24 loose objects... 117s - packed 24 loose objects! 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 117s - packing 24 loose objects... 117s - packed 24 loose objects! 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 117s - packing 23 loose objects... 117s - packed 23 loose objects! 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 117s - packing 22 loose objects... 117s - packed 22 loose objects! 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - . 117s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 117s - packing 21 loose objects... 117s - packed 21 loose objects! 117s - packing 0 loose objects... 117s - packed 0 loose objects! 117s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 117s - $ find .hg/git/objects -type f | grep -Fv .idx | sort 117s - .hg/git/objects/pack/pack-33903607b479000b976a29a349fe0f4dffb0aaac.pack 117s - .hg/git/objects/pack/pack-40d9440e392d9eab62fa38a2ed66cc763d77aca3.pack 117s - .hg/git/objects/pack/pack-4ab2dac268f94e407788d52d6ba087b626c41651.pack 117s - .hg/git/objects/pack/pack-543e3b37bd36218a4dc6611a96d7c218afb78429.pack 117s - .hg/git/objects/pack/pack-5fc80292253ee10d1b86b5c4d9c51b29d2b4ba47.pack 117s - .hg/git/objects/pack/pack-9c636f5f16302fc5fadf0cc4ed42aeb67fc51f6a.pack 117s - .hg/git/objects/pack/pack-ae74b1f0197dfb45cfb13889453860a40103969a.pack 117s - .hg/git/objects/pack/pack-b432e2f477cb765fc0aeaa850d56e04b10392e6c.pack 117s - .hg/git/objects/pack/pack-cf7023660ce10ede2896d1be117f6ba93a261ff9.pack 117s - .hg/git/objects/pack/pack-e601b2af6a91a9cf6817d71f4eb660d2218d4094.pack 117s 117s ERROR: test-gc.t output changed 118s ! 118s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-phases-public.t 118s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-phases-public.t#publish-defaults.err 118s @@ -24,149 +24,10 @@ 118s 118s cloning with hggit.usephases publishes cloned HEAD 118s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 118s - importing 1 git commits 118s - new changesets ff7a2f2d8d70 118s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 118s + abort: repository gitrepo not found 118s + [255] 118s 118s $ cd hgrepo 118s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 118s $ hg phase -r master 118s - 0: public 118s - $ cd .. 118s - 118s -pulled changesets are public 118s - $ cd gitrepo 118s - $ git checkout -q master 118s - $ echo beta > beta 118s - $ git add beta 118s - $ fn_git_commit -m 'add beta' 118s - $ git checkout -b not-master 118s - Switched to a new branch 'not-master' 118s - $ echo gamma > gamma 118s - $ git add gamma 118s - $ fn_git_commit -m 'add gamma' 118s - $ git tag thetag 118s - $ echo delta > delta 118s - $ git add delta 118s - $ fn_git_commit -m 'add delta' 118s - $ git checkout master 118s - Switched to branch 'master' 118s - $ cd .. 118s - 118s - $ cd hgrepo 118s - $ cat >>$HGRCPATH < [paths] 118s - > other = $TESTTMP/gitrepo/.git 118s - > [hggit] 118s - > usephases = True 118s - > EOF 118s - 118s - $ hg phase -fd 'all()' 118s - 118s -we can restrict publishing to the remote HEAD and that tag, which 118s -happens to be the same thing here 118s - 118s -#if publish-specific 118s - $ cat >>$HGRCPATH < [git] 118s - > public = default/master, thetag 118s - > EOF 118s -#endif 118s - 118s -pulling publishes the branch 118s - 118s - $ hg phase -r master 118s - 0: draft 118s -#if publish-defaults 118s - $ hg pull -r master other 118s - pulling from $TESTTMP/gitrepo/.git 118s - importing 1 git commits 118s - updating bookmark master 118s - new changesets 7fe02317c63d 118s - 1 local changesets published 118s - (run 'hg update' to get a working copy) 118s -#else 118s - $ hg pull -r master other 118s - pulling from $TESTTMP/gitrepo/.git 118s - importing 1 git commits 118s - updating bookmark master 118s - new changesets 7fe02317c63d (1 drafts) 118s - (run 'hg update' to get a working copy) 118s -#endif 118s - $ hg phase -r master 118s - 1: draft (publish-specific !) 118s - 1: public (publish-defaults !) 118s -#if publish-defaults 118s - $ hg phase -fd master 118s - $ hg pull 118s - pulling from $TESTTMP/gitrepo 118s - importing 2 git commits 118s - adding bookmark not-master 118s - new changesets ca33a262eb46:03769a650ded (1 drafts) 118s - 1 local changesets published 118s - (run 'hg update' to get a working copy) 118s -#else 118s - $ hg pull 118s - pulling from $TESTTMP/gitrepo 118s - importing 2 git commits 118s - adding bookmark not-master 118s - new changesets ca33a262eb46:03769a650ded (1 drafts) 118s - 2 local changesets published 118s - (run 'hg update' to get a working copy) 118s -#endif 118s - $ hg phase -r master -r not-master -r thetag 118s - 1: public 118s - 3: draft 118s - 2: public 118s - 118s -public bookmark not pushed is not published after pull 118s - 118s - $ hg update 0 118s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 118s - $ echo delta > delta 118s - $ hg bookmark not-pushed 118s - $ hg add delta 118s - $ hg commit -m 'add delta' 118s - created new head 118s - $ hg phase -r 'all()' > $TESTTMP/before 118s - $ hg pull --config git.public=master,not-pushed 118s - pulling from $TESTTMP/gitrepo 118s - no changes found 118s - $ hg phase -r 'all()' > $TESTTMP/after 118s - $ cmp -s $TESTTMP/before $TESTTMP/after 118s - $ hg phase -r not-pushed 118s - 4: draft 118s - $ rm $TESTTMP/before $TESTTMP/after 118s - 118s -pushing public bookmark publishes local changesets, but only those 118s -actually pushed 118s - 118s - $ hg update master 118s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 118s - (activating bookmark master) 118s - $ echo epsilon > epsilon 118s - $ hg add epsilon 118s - $ hg commit -m 'add epsilon' 118s - created new head 118s - $ hg phase -r 'all() - master' > $TESTTMP/before 118s - $ hg push -B not-pushed 118s - pushing to $TESTTMP/gitrepo 118s - searching for changes 118s - adding objects 118s - remote: found 0 deltas to reuse 118s - added 1 commits with 1 trees and 1 blobs 118s - adding reference refs/heads/not-pushed 118s - $ hg phase -r 'all() - master' > $TESTTMP/after 118s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 118s - $ hg phase -r not-pushed -r master 118s - 4: draft 118s - 5: draft 118s - $ hg push -B master 118s - pushing to $TESTTMP/gitrepo 118s - searching for changes 118s - adding objects 118s - remote: found 0 deltas to reuse 118s - added 1 commits with 1 trees and 1 blobs 118s - updating reference refs/heads/master 118s - $ hg phase -r 'all() - master' > $TESTTMP/after 118s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 118s - $ hg phase -r master 118s - 5: public 118s 118s ERROR: test-phases-public.t#publish-defaults output changed 118s ! 118s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-phases-public.t 118s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-phases-public.t#publish-specific.err 118s @@ -24,149 +24,10 @@ 118s 118s cloning with hggit.usephases publishes cloned HEAD 118s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 118s - importing 1 git commits 118s - new changesets ff7a2f2d8d70 118s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 118s + abort: repository gitrepo not found 118s + [255] 118s 118s $ cd hgrepo 118s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 118s $ hg phase -r master 118s - 0: public 118s - $ cd .. 118s - 118s -pulled changesets are public 118s - $ cd gitrepo 118s - $ git checkout -q master 118s - $ echo beta > beta 118s - $ git add beta 118s - $ fn_git_commit -m 'add beta' 118s - $ git checkout -b not-master 118s - Switched to a new branch 'not-master' 118s - $ echo gamma > gamma 118s - $ git add gamma 118s - $ fn_git_commit -m 'add gamma' 118s - $ git tag thetag 118s - $ echo delta > delta 118s - $ git add delta 118s - $ fn_git_commit -m 'add delta' 118s - $ git checkout master 118s - Switched to branch 'master' 118s - $ cd .. 118s - 118s - $ cd hgrepo 118s - $ cat >>$HGRCPATH < [paths] 118s - > other = $TESTTMP/gitrepo/.git 118s - > [hggit] 118s - > usephases = True 118s - > EOF 118s - 118s - $ hg phase -fd 'all()' 118s - 118s -we can restrict publishing to the remote HEAD and that tag, which 118s -happens to be the same thing here 118s - 118s -#if publish-specific 118s - $ cat >>$HGRCPATH < [git] 118s - > public = default/master, thetag 118s - > EOF 118s -#endif 118s - 118s -pulling publishes the branch 118s - 118s - $ hg phase -r master 118s - 0: draft 118s -#if publish-defaults 118s - $ hg pull -r master other 118s - pulling from $TESTTMP/gitrepo/.git 118s - importing 1 git commits 118s - updating bookmark master 118s - new changesets 7fe02317c63d 118s - 1 local changesets published 118s - (run 'hg update' to get a working copy) 118s -#else 118s - $ hg pull -r master other 118s - pulling from $TESTTMP/gitrepo/.git 118s - importing 1 git commits 118s - updating bookmark master 118s - new changesets 7fe02317c63d (1 drafts) 118s - (run 'hg update' to get a working copy) 118s -#endif 118s - $ hg phase -r master 118s - 1: draft (publish-specific !) 118s - 1: public (publish-defaults !) 118s -#if publish-defaults 118s - $ hg phase -fd master 118s - $ hg pull 118s - pulling from $TESTTMP/gitrepo 118s - importing 2 git commits 118s - adding bookmark not-master 118s - new changesets ca33a262eb46:03769a650ded (1 drafts) 118s - 1 local changesets published 118s - (run 'hg update' to get a working copy) 118s -#else 118s - $ hg pull 118s - pulling from $TESTTMP/gitrepo 118s - importing 2 git commits 118s - adding bookmark not-master 118s - new changesets ca33a262eb46:03769a650ded (1 drafts) 118s - 2 local changesets published 118s - (run 'hg update' to get a working copy) 118s -#endif 118s - $ hg phase -r master -r not-master -r thetag 118s - 1: public 118s - 3: draft 118s - 2: public 118s - 118s -public bookmark not pushed is not published after pull 118s - 118s - $ hg update 0 118s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 118s - $ echo delta > delta 118s - $ hg bookmark not-pushed 118s - $ hg add delta 118s - $ hg commit -m 'add delta' 118s - created new head 118s - $ hg phase -r 'all()' > $TESTTMP/before 118s - $ hg pull --config git.public=master,not-pushed 118s - pulling from $TESTTMP/gitrepo 118s - no changes found 118s - $ hg phase -r 'all()' > $TESTTMP/after 118s - $ cmp -s $TESTTMP/before $TESTTMP/after 118s - $ hg phase -r not-pushed 118s - 4: draft 118s - $ rm $TESTTMP/before $TESTTMP/after 118s - 118s -pushing public bookmark publishes local changesets, but only those 118s -actually pushed 118s - 118s - $ hg update master 118s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 118s - (activating bookmark master) 118s - $ echo epsilon > epsilon 118s - $ hg add epsilon 118s - $ hg commit -m 'add epsilon' 118s - created new head 118s - $ hg phase -r 'all() - master' > $TESTTMP/before 118s - $ hg push -B not-pushed 118s - pushing to $TESTTMP/gitrepo 118s - searching for changes 118s - adding objects 118s - remote: found 0 deltas to reuse 118s - added 1 commits with 1 trees and 1 blobs 118s - adding reference refs/heads/not-pushed 118s - $ hg phase -r 'all() - master' > $TESTTMP/after 118s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 118s - $ hg phase -r not-pushed -r master 118s - 4: draft 118s - 5: draft 118s - $ hg push -B master 118s - pushing to $TESTTMP/gitrepo 118s - searching for changes 118s - adding objects 118s - remote: found 0 deltas to reuse 118s - added 1 commits with 1 trees and 1 blobs 118s - updating reference refs/heads/master 118s - $ hg phase -r 'all() - master' > $TESTTMP/after 118s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 118s - $ hg phase -r master 118s - 5: public 118s 118s ERROR: test-phases-public.t#publish-specific output changed 120s ! 120s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-push-r.t 120s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-push-r.t.err 120s @@ -2,34 +2,43 @@ 120s $ . "$TESTDIR/testutil" 120s 120s $ hg init test 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s $ cd test 120s $ cat >>afile < 0 120s > EOF 120s $ hg add afile 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s $ fn_hg_commit -m "0.0" 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s $ cat >>afile < 1 120s > EOF 120s $ fn_hg_commit -m "0.1" 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s $ cat >>afile < 2 120s > EOF 120s $ fn_hg_commit -m "0.2" 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s $ cat >>afile < 3 120s > EOF 120s $ fn_hg_commit -m "0.3" 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s $ hg update -C 0 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 120s $ cat >>afile < 1 120s > EOF 120s $ fn_hg_commit -m "1.1" 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s $ cat >>afile < 2 120s > EOF 120s $ fn_hg_commit -m "1.2" 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s $ cat >fred < a line 120s > EOF 120s @@ -37,13 +46,20 @@ 120s > 3 120s > EOF 120s $ hg add fred 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s $ fn_hg_commit -m "1.3" 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s $ hg mv afile adifferentfile 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s $ fn_hg_commit -m "1.3m" 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s $ hg update -C 3 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 120s $ hg mv afile anotherfile 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s $ fn_hg_commit -m "0.3m" 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s $ cd .. 120s $ for i in 0 1 2 3 4 5 6 7 8; do 120s > mkdir test-"$i" 120s @@ -53,128 +69,166 @@ 120s > hg verify 120s > cd .. 120s > done 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s pushing to test-0 120s searching for changes 120s adding changesets 120s adding manifests 120s adding file changes 120s added 1 changesets with 1 changes to 1 files 120s - checking changesets 120s - checking manifests 120s - crosschecking files in changesets and manifests 120s - checking files 120s - checking dirstate (?) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + checking changesets 120s + checking dirstate (?) 120s + checking manifests 120s + crosschecking files in changesets and manifests 120s + checking files 120s + checking dirstate 120s checked 1 changesets with 1 changes to 1 files 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s pushing to test-1 120s searching for changes 120s adding changesets 120s adding manifests 120s + checking dirstate (?) 120s adding file changes 120s added 2 changesets with 2 changes to 1 files 120s - checking changesets 120s - checking manifests 120s - crosschecking files in changesets and manifests 120s - checking files 120s - checking dirstate (?) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + checking changesets 120s + checking manifests 120s + crosschecking files in changesets and manifests 120s + checking files 120s + checking dirstate 120s checked 2 changesets with 2 changes to 1 files 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + checking dirstate (?) 120s pushing to test-2 120s searching for changes 120s adding changesets 120s adding manifests 120s adding file changes 120s added 3 changesets with 3 changes to 1 files 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s checking changesets 120s checking manifests 120s crosschecking files in changesets and manifests 120s checking files 120s checking dirstate (?) 120s checked 3 changesets with 3 changes to 1 files 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s pushing to test-3 120s searching for changes 120s adding changesets 120s adding manifests 120s adding file changes 120s added 4 changesets with 4 changes to 1 files 120s - checking changesets 120s - checking manifests 120s - crosschecking files in changesets and manifests 120s - checking files 120s - checking dirstate (?) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + checking changesets 120s + checking dirstate (?) 120s + checking manifests 120s + crosschecking files in changesets and manifests 120s + checking files 120s + checking dirstate 120s checked 4 changesets with 4 changes to 1 files 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s pushing to test-4 120s searching for changes 120s adding changesets 120s adding manifests 120s + checking dirstate (?) 120s adding file changes 120s added 2 changesets with 2 changes to 1 files 120s - checking changesets 120s - checking manifests 120s - crosschecking files in changesets and manifests 120s - checking files 120s - checking dirstate (?) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + checking changesets 120s + checking manifests 120s + crosschecking files in changesets and manifests 120s + checking files 120s + checking dirstate 120s checked 2 changesets with 2 changes to 1 files 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + checking dirstate (?) 120s pushing to test-5 120s searching for changes 120s adding changesets 120s adding manifests 120s adding file changes 120s added 3 changesets with 3 changes to 1 files 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s checking changesets 120s checking manifests 120s crosschecking files in changesets and manifests 120s checking files 120s checking dirstate (?) 120s checked 3 changesets with 3 changes to 1 files 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s pushing to test-6 120s searching for changes 120s adding changesets 120s adding manifests 120s adding file changes 120s added 4 changesets with 5 changes to 2 files 120s - checking changesets 120s - checking manifests 120s - crosschecking files in changesets and manifests 120s - checking files 120s - checking dirstate (?) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + checking changesets 120s + checking dirstate (?) 120s + checking manifests 120s + crosschecking files in changesets and manifests 120s + checking files 120s + checking dirstate 120s checked 4 changesets with 5 changes to 2 files 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s pushing to test-7 120s searching for changes 120s adding changesets 120s adding manifests 120s adding file changes 120s added 5 changesets with 6 changes to 3 files 120s - checking changesets 120s - checking manifests 120s - crosschecking files in changesets and manifests 120s - checking files 120s - checking dirstate (?) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + checking changesets 120s + checking manifests 120s + crosschecking files in changesets and manifests 120s + checking files 120s + checking dirstate 120s checked 5 changesets with 6 changes to 3 files 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s pushing to test-8 120s searching for changes 120s adding changesets 120s adding manifests 120s adding file changes 120s added 5 changesets with 5 changes to 2 files 120s - checking changesets 120s - checking manifests 120s - crosschecking files in changesets and manifests 120s - checking files 120s - checking dirstate (?) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + checking changesets 120s + checking manifests 120s + crosschecking files in changesets and manifests 120s + checking files 120s + checking dirstate 120s checked 5 changesets with 5 changes to 2 files 120s $ cd test-8 120s $ hg pull ../test-7 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s pulling from ../test-7 120s searching for changes 120s adding changesets 120s adding manifests 120s adding file changes 120s + new changesets c29287bce33f:e70c8671c3d4 (?) 120s added 4 changesets with 2 changes to 3 files (+1 heads) 120s - new changesets c29287bce33f:e70c8671c3d4 (?) 120s + new changesets c29287bce33f:e70c8671c3d4 120s (run 'hg heads' to see heads, 'hg merge' to merge) 120s $ hg verify 120s - checking changesets 120s - checking manifests 120s - crosschecking files in changesets and manifests 120s - checking files 120s - checking dirstate (?) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + checking changesets 120s + checking manifests 120s + crosschecking files in changesets and manifests 120s + checking dirstate (?) 120s + checking files 120s + checking dirstate 120s checked 9 changesets with 7 changes to 4 files 120s 120s ERROR: test-push-r.t output changed 120s !s 120s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-invalid-refs.t 120s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-invalid-refs.t.err 120s @@ -12,115 +12,10 @@ 120s 120s $ cd .. 120s $ hg clone -U gitrepo hgrepo 120s - importing 1 git commits 120s - new changesets ff7a2f2d8d70 (1 drafts) 120s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 120s + abort: repository gitrepo not found 120s + [255] 120s 120s $ cd hgrepo 120s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 120s $ hg up master 120s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 120s - (activating bookmark master) 120s - $ fn_hg_tag alph#a 120s - $ fn_hg_tag bet*a 120s - $ fn_hg_tag 'gamm a' 120s - $ hg book -r . delt#a 120s - $ hg book -r . epsil*on 120s - 120s - $ hg gexport 120s - warning: not exporting tag 'bet*a' due to invalid name 120s - warning: not exporting bookmark 'epsil*on' due to invalid name 120s - 120s - $ hg push 120s - pushing to $TESTTMP/gitrepo 120s - warning: not exporting tag 'bet*a' due to invalid name 120s - warning: not exporting bookmark 'epsil*on' due to invalid name 120s - searching for changes 120s - adding objects 120s - remote: found 0 deltas to reuse 120s - added 3 commits with 3 trees and 3 blobs 120s - adding reference refs/heads/delt#a 120s - updating reference refs/heads/master 120s - adding reference refs/tags/alph#a 120s - adding reference refs/tags/gamm_a 120s - 120s - $ hg log --graph 120s - @ changeset: 3:0950ab44ea23 120s - | bookmark: delt#a 120s - | bookmark: epsil*on 120s - | bookmark: master 120s - | tag: default/delt#a 120s - | tag: default/master 120s - | tag: tip 120s - | user: test 120s - | date: Mon Jan 01 00:00:13 2007 +0000 120s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 120s - | 120s - o changeset: 2:0b27ab2b3df6 120s - | tag: gamm a 120s - | user: test 120s - | date: Mon Jan 01 00:00:12 2007 +0000 120s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 120s - | 120s - o changeset: 1:491ceeb1b0f1 120s - | tag: bet*a 120s - | user: test 120s - | date: Mon Jan 01 00:00:11 2007 +0000 120s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 120s - | 120s - o changeset: 0:ff7a2f2d8d70 120s - bookmark: not-master 120s - tag: alph#a 120s - tag: default/not-master 120s - user: test 120s - date: Mon Jan 01 00:00:10 2007 +0000 120s - summary: add alpha 120s - 120s - 120s - $ cd .. 120s - $ cd gitrepo 120s -git should have only the valid tag alph#a but have full commit log including the missing invalid bet*a tag commit 120s - $ git tag -l 120s - alph#a 120s - gamm_a 120s - 120s - $ cd .. 120s - $ hg clone -U gitrepo hgrepo2 120s - importing 4 git commits 120s - new changesets ff7a2f2d8d70:0950ab44ea23 (4 drafts) 120s - $ hg -R hgrepo2 log --graph 120s - o changeset: 3:0950ab44ea23 120s - | bookmark: delt#a 120s - | bookmark: master 120s - | tag: default/delt#a 120s - | tag: default/master 120s - | tag: tip 120s - | user: test 120s - | date: Mon Jan 01 00:00:13 2007 +0000 120s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 120s - | 120s - o changeset: 2:0b27ab2b3df6 120s - | tag: gamm a 120s - | tag: gamm_a 120s - | user: test 120s - | date: Mon Jan 01 00:00:12 2007 +0000 120s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 120s - | 120s - o changeset: 1:491ceeb1b0f1 120s - | tag: bet*a 120s - | user: test 120s - | date: Mon Jan 01 00:00:11 2007 +0000 120s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 120s - | 120s - o changeset: 0:ff7a2f2d8d70 120s - bookmark: not-master 120s - tag: alph#a 120s - tag: default/not-master 120s - user: test 120s - date: Mon Jan 01 00:00:10 2007 +0000 120s - summary: add alpha 120s - 120s - 120s -the tag should be in .hgtags 120s - $ hg cat -r master hgrepo2/.hgtags 120s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alph#a 120s - 491ceeb1b0f10d65d956dfcdd3470ac2bc2c96a8 bet*a 120s - 0b27ab2b3df69c6f7defd7040b93e539136db5be gamm a 120s 120s ERROR: test-invalid-refs.t output changed 121s ! 121s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-serve-hg.t 121s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-serve-hg.t#with-hggit.err 121s @@ -31,11 +31,11 @@ 121s $ cd .. 121s 121s $ hg clone gitrepo hgrepo 121s - importing 2 git commits 121s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 121s - updating to bookmark master 121s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 121s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 121s + abort: repository gitrepo not found 121s + [255] 121s $ cd hgrepo 121s + $TESTTMP.sh: 41: cd: can't cd to hgrepo 121s $ cat >> .hg/hgrc < [push] 121s > pushvars.server = true 121s @@ -45,81 +45,3 @@ 121s > [hooks] 121s > pretxnchangegroup = env | grep HG_USERVAR_ || true 121s > EOF 121s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 121s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 121s - 121s -Test server address cannot be reused 121s - 121s -#if windows 121s - $ hg serve -p $HGPORT1 2>&1 121s - abort: cannot start server at '*:$HGPORT1': * (glob) 121s - [255] 121s -#else 121s - $ hg serve -p $HGPORT1 2>&1 121s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 121s - [255] 121s -#endif 121s - $ cd .. 121s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 121s - 121s -Make sure that clone regular mercurial repos over http doesn't break, 121s -and that we can transfer the hg-git metadata 121s - 121s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 121s - requesting all changes 121s - adding changesets 121s - adding manifests 121s - adding file changes 121s - added 2 changesets with 4 changes to 4 files 121s - new changesets f488b65fa424:c61c38c3d614 (?) 121s - updating to branch default 121s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 121s - 121s -And it shouldn't create a Git repository needlessly: 121s - $ test -e copy/git 121s - [1] 121s - $ cd copy 121s - 121s -#if without-hggit 121s - $ hg tags 121s - tip 1:c61c38c3d614 121s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 121s - 1:c61c38c3d614 | master | | 121s - 0:f488b65fa424 | | | 121s - $ hg pull -u ../gitrepo 121s - pulling from ../gitrepo 121s - importing 2 git commits 121s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 121s -#else 121s - $ hg tags 121s - tip 1:c61c38c3d614 121s - thetag 0:f488b65fa424 121s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 121s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 121s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 121s - $ hg pull -u ../gitrepo 121s - pulling from ../gitrepo 121s - warning: created new git repository at $TESTTMP/copy/.hg/git 121s - no changes found 121s -#endif 121s - 121s - $ hg tags 121s - tip 1:c61c38c3d614 121s - thetag 0:f488b65fa424 121s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 121s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 121s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 121s - 121s -Furthermore, make sure that we pass all arguments when pushing: 121s - 121s - $ echo baz > baz 121s - $ fn_hg_commit -A -m baz 121s - $ hg push --pushvars FOO=BAR 121s - pushing to http://localhost:$HGPORT/ 121s - searching for changes 121s - remote: adding changesets 121s - remote: adding manifests 121s - remote: adding file changes 121s - remote: HG_USERVAR_FOO=BAR 121s - remote: added 1 changesets with 1 changes to 1 files 121s - $ cd .. 121s 121s ERROR: test-serve-hg.t#with-hggit output changed 122s ! 122s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-git-workflow.t 122s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-git-workflow.t.err 122s @@ -2,13 +2,20 @@ 122s $ . "$TESTDIR/testutil" 122s 122s $ hg init hgrepo 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s $ cd hgrepo 122s $ hg debuggitdir 122s - $TESTTMP/hgrepo/.hg/git 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + hg: unknown command 'debuggitdir' 122s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 122s + [10] 122s $ echo alpha > alpha 122s $ hg add alpha 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s $ fn_hg_commit -m "add alpha" 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s $ hg log --graph --debug | grep -v phase: 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s @ changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 122s tag: tip 122s parent: -1:0000000000000000000000000000000000000000 122s @@ -27,49 +34,54 @@ 122s 122s configure for use from git 122s $ hg clone hgrepo gitrepo 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s updating to branch default 122s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 122s $ cd gitrepo 122s $ hg book master 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s $ hg up null 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 122s (leaving bookmark master) 122s $ echo "[git]" >> .hg/hgrc 122s $ echo "intree = True" >> .hg/hgrc 122s $ hg debuggitdir 122s - $TESTTMP/gitrepo/.git 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + hg: unknown command 'debuggitdir' 122s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 122s + [10] 122s $ hg gexport 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + hg: unknown command 'gexport' 122s + (did you mean one of export, import?) 122s + [10] 122s 122s do some work 122s $ git config core.bare false 122s + fatal: not in a git directory 122s + [128] 122s $ git checkout master 2>&1 | sed s/\'/\"/g 122s - Already on "master" 122s + fatal: not a git repository (or any of the parent directories): .git 122s $ echo beta > beta 122s $ git add beta 122s + fatal: not a git repository (or any of the parent directories): .git 122s + [128] 122s $ fn_git_commit -m 'add beta' 122s + fatal: not a git repository (or any of the parent directories): .git 122s + git commit error 122s 122s get things back to hg 122s $ hg gimport 122s - importing 1 git commits 122s - updating bookmark master 122s - new changesets 9f124f3c1fc2 (1 drafts) 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + hg: unknown command 'gimport' 122s + (did you mean one of export, import?) 122s + [10] 122s $ hg log --graph --debug | grep -v phase: 122s - o changeset: 1:9f124f3c1fc29a14f5eb027c24811b0ac9d5ff10 122s - | bookmark: master 122s - | tag: tip 122s - | parent: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 122s - | parent: -1:0000000000000000000000000000000000000000 122s - | manifest: 1:f0bd6fbafbaebe4bb59c35108428f6fce152431d 122s - | user: test 122s - | date: Mon Jan 01 00:00:11 2007 +0000 122s - | files+: beta 122s - | extra: branch=default 122s - | extra: hg-git-rename-source=git 122s - | description: 122s - | add beta 122s - | 122s - | 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s o changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 122s + bookmark: master 122s + tag: tip 122s parent: -1:0000000000000000000000000000000000000000 122s parent: -1:0000000000000000000000000000000000000000 122s manifest: 0:8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0 122s @@ -83,7 +95,8 @@ 122s 122s gimport should have updated the bookmarks as well 122s $ hg bookmarks 122s - master 1:9f124f3c1fc2 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + master 0:0221c246a567 122s 122s gimport support for git.mindate 122s $ cat >> .hg/hgrc << EOF 122s @@ -92,20 +105,23 @@ 122s > EOF 122s $ echo oldcommit > oldcommit 122s $ git add oldcommit 122s + fatal: not a git repository (or any of the parent directories): .git 122s + [128] 122s $ GIT_AUTHOR_DATE="2014-03-01 00:00:00 +0000" \ 122s > GIT_COMMITTER_DATE="2009-01-01 00:00:00 +0000" \ 122s > git commit -m oldcommit > /dev/null || echo "git commit error" 122s + fatal: not a git repository (or any of the parent directories): .git 122s + git commit error 122s $ hg gimport 122s - no changes found 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + hg: unknown command 'gimport' 122s + (did you mean one of export, import?) 122s + [10] 122s $ hg log --graph 122s - o changeset: 1:9f124f3c1fc2 122s - | bookmark: master 122s - | tag: tip 122s - | user: test 122s - | date: Mon Jan 01 00:00:11 2007 +0000 122s - | summary: add beta 122s - | 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s o changeset: 0:0221c246a567 122s + bookmark: master 122s + tag: tip 122s user: test 122s date: Mon Jan 01 00:00:10 2007 +0000 122s summary: add alpha 122s @@ -113,32 +129,23 @@ 122s 122s $ echo newcommit > newcommit 122s $ git add newcommit 122s + fatal: not a git repository (or any of the parent directories): .git 122s + [128] 122s $ GIT_AUTHOR_DATE="2014-01-01 00:00:00 +0000" \ 122s > GIT_COMMITTER_DATE="2014-01-02 00:00:00 +0000" \ 122s > git commit -m newcommit > /dev/null || echo "git commit error" 122s + fatal: not a git repository (or any of the parent directories): .git 122s + git commit error 122s $ hg gimport 122s - importing 2 git commits 122s - updating bookmark master 122s - new changesets befdecd14df5:3d10b7289d79 (2 drafts) 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + hg: unknown command 'gimport' 122s + (did you mean one of export, import?) 122s + [10] 122s $ hg log --graph 122s - o changeset: 3:3d10b7289d79 122s - | bookmark: master 122s - | tag: tip 122s - | user: test 122s - | date: Wed Jan 01 00:00:00 2014 +0000 122s - | summary: newcommit 122s - | 122s - o changeset: 2:befdecd14df5 122s - | user: test 122s - | date: Sat Mar 01 00:00:00 2014 +0000 122s - | summary: oldcommit 122s - | 122s - o changeset: 1:9f124f3c1fc2 122s - | user: test 122s - | date: Mon Jan 01 00:00:11 2007 +0000 122s - | summary: add beta 122s - | 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s o changeset: 0:0221c246a567 122s + bookmark: master 122s + tag: tip 122s user: test 122s date: Mon Jan 01 00:00:10 2007 +0000 122s summary: add alpha 122s 122s ERROR: test-git-workflow.t output changed 122s ! 122s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-serve-hg.t 122s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-serve-hg.t#without-hggit.err 122s @@ -31,11 +31,11 @@ 122s $ cd .. 122s 122s $ hg clone gitrepo hgrepo 122s - importing 2 git commits 122s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 122s - updating to bookmark master 122s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + abort: repository gitrepo not found 122s + [255] 122s $ cd hgrepo 122s + $TESTTMP.sh: 36: cd: can't cd to hgrepo 122s $ cat >> .hg/hgrc < [push] 122s > pushvars.server = true 122s @@ -45,81 +45,3 @@ 122s > [hooks] 122s > pretxnchangegroup = env | grep HG_USERVAR_ || true 122s > EOF 122s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 122s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 122s - 122s -Test server address cannot be reused 122s - 122s -#if windows 122s - $ hg serve -p $HGPORT1 2>&1 122s - abort: cannot start server at '*:$HGPORT1': * (glob) 122s - [255] 122s -#else 122s - $ hg serve -p $HGPORT1 2>&1 122s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 122s - [255] 122s -#endif 122s - $ cd .. 122s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 122s - 122s -Make sure that clone regular mercurial repos over http doesn't break, 122s -and that we can transfer the hg-git metadata 122s - 122s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 122s - requesting all changes 122s - adding changesets 122s - adding manifests 122s - adding file changes 122s - added 2 changesets with 4 changes to 4 files 122s - new changesets f488b65fa424:c61c38c3d614 (?) 122s - updating to branch default 122s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 122s - 122s -And it shouldn't create a Git repository needlessly: 122s - $ test -e copy/git 122s - [1] 122s - $ cd copy 122s - 122s -#if without-hggit 122s - $ hg tags 122s - tip 1:c61c38c3d614 122s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 122s - 1:c61c38c3d614 | master | | 122s - 0:f488b65fa424 | | | 122s - $ hg pull -u ../gitrepo 122s - pulling from ../gitrepo 122s - importing 2 git commits 122s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 122s -#else 122s - $ hg tags 122s - tip 1:c61c38c3d614 122s - thetag 0:f488b65fa424 122s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 122s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 122s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 122s - $ hg pull -u ../gitrepo 122s - pulling from ../gitrepo 122s - warning: created new git repository at $TESTTMP/copy/.hg/git 122s - no changes found 122s -#endif 122s - 122s - $ hg tags 122s - tip 1:c61c38c3d614 122s - thetag 0:f488b65fa424 122s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 122s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 122s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 122s - 122s -Furthermore, make sure that we pass all arguments when pushing: 122s - 122s - $ echo baz > baz 122s - $ fn_hg_commit -A -m baz 122s - $ hg push --pushvars FOO=BAR 122s - pushing to http://localhost:$HGPORT/ 122s - searching for changes 122s - remote: adding changesets 122s - remote: adding manifests 122s - remote: adding file changes 122s - remote: HG_USERVAR_FOO=BAR 122s - remote: added 1 changesets with 1 changes to 1 files 122s - $ cd .. 122s 122s ERROR: test-serve-hg.t#without-hggit output changed 122s ! 122s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-push-authors.t 122s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-push-authors.t.err 122s @@ -8,127 +8,9 @@ 122s Create a Mercurial repository 122s 122s $ hg clone repo.git hgrepo 122s - updating to branch default 122s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + abort: repository repo.git not found 122s + [255] 122s $ cd hgrepo 122s + $TESTTMP.sh: 8: cd: can't cd to hgrepo 122s $ hg book master 122s - 122s -Configure an author map 122s - 122s - $ touch authors.txt 122s - $ cat >> $HGRCPATH < [git] 122s - > authors = $TESTTMP/authors.txt 122s - > EOF 122s - 122s -Create a commit user that maps to a fully valid user 122s - 122s - $ cat >> $TESTTMP/authors.txt < user1 = User no. 1 122s - > EOF 122s - $ touch alpha 122s - $ hg add alpha 122s - $ fn_hg_commit -m alpha -u user1 122s - 122s -And one that maps to an email address 122s - 122s - $ cat >> $TESTTMP/authors.txt < user2@example.com = user2 122s - > EOF 122s - $ touch beta 122s - $ hg add beta 122s - $ fn_hg_commit -m beta -u user2@example.com 122s - 122s -And one that maps to a "simple" user 122s - 122s - $ cat >> $TESTTMP/authors.txt < User #3 = user3@example.com 122s - > EOF 122s - $ touch gamma 122s - $ hg add gamma 122s - $ fn_hg_commit -m gamma -u "User #3 " 122s - 122s -And one that maps to nothing 122s - 122s - $ cat >> $TESTTMP/authors.txt < user4 = 122s - > EOF 122s - $ touch delta 122s - $ hg add delta 122s - $ fn_hg_commit -m delta -u user4 122s - 122s -And one that doesn't map 122s - 122s - $ touch epsilon 122s - $ hg add epsilon 122s - $ fn_hg_commit -m epsilon -u "User #5 " 122s - 122s -Check the test default 122s - 122s - $ touch zeta 122s - $ hg add zeta 122s - $ fn_hg_commit -m zeta 122s - 122s -Push it! 122s - 122s - $ hg push 122s - pushing to $TESTTMP/repo.git 122s - searching for changes 122s - adding objects 122s - remote: found 0 deltas to reuse 122s - added 6 commits with 6 trees and 1 blobs 122s - adding reference refs/heads/master 122s - 122s -Check the results: 122s - 122s - $ hg log --template='Commit: {gitnode}\nAuthor: {author}\n---\n' 122s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 122s - Author: test 122s - --- 122s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 122s - Author: User #5 122s - --- 122s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 122s - Author: user4 122s - --- 122s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 122s - Author: User #3 122s - --- 122s - Commit: eba936dd13172a2f17936785e3604845aed9170d 122s - Author: user2@example.com 122s - --- 122s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 122s - Author: user1 122s - --- 122s - $ cd ../repo.git 122s - $ cat $TESTTMP/authors.txt 122s - user1 = User no. 1 122s - user2@example.com = user2 122s - User #3 = user3@example.com 122s - user4 = 122s - $ git log --pretty='tformat:Commit: %H%nAuthor: %an <%ae>%nCommitter: %cn <%ce>%n---' 122s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 122s - Author: test 122s - Committer: test 122s - --- 122s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 122s - Author: User #5 122s - Committer: User #5 122s - --- 122s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 122s - Author: 122s - Committer: 122s - --- 122s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 122s - Author: user3@example.com 122s - Committer: user3@example.com 122s - --- 122s - Commit: eba936dd13172a2f17936785e3604845aed9170d 122s - Author: user2 122s - Committer: user2 122s - --- 122s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 122s - Author: User no. 1 122s - Committer: User no. 1 122s - --- 122s - $ cd .. 122s 122s ERROR: test-push-authors.t output changed 122s ! 122s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-push-to-head.t 122s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-push-to-head.t.err 122s @@ -14,65 +14,9 @@ 122s Clone it, and push back to master: 122s 122s $ hg clone gitrepo hgrepo 122s - importing 1 git commits 122s - new changesets ff7a2f2d8d70 (1 drafts) 122s - updating to bookmark master 122s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 122s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 122s + abort: repository gitrepo not found 122s + [255] 122s $ cd hgrepo 122s + $TESTTMP.sh: 18: cd: can't cd to hgrepo 122s $ echo beta > beta 122s - $ fn_hg_commit -A -m "add beta" 122s - 122s -The output is confusing, and this even more-so: 122s - 122s - $ hg push 122s - pushing to $TESTTMP/gitrepo 122s - searching for changes 122s - adding objects 122s - remote: found 0 deltas to reuse 122s - remote: error: refusing to update checked out branch: refs/heads/master 122s - remote: error: By default, updating the current branch in a non-bare repository 122s - remote: is denied, because it will make the index and work tree inconsistent 122s - remote: with what you pushed, and will require 'git reset --hard' to match 122s - remote: the work tree to HEAD. 122s - remote: 122s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 122s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 122s - remote: its current branch; however, this is not recommended unless you 122s - remote: arranged to update its work tree to match what you pushed in some 122s - remote: other way. 122s - remote: 122s - remote: To squelch this message and still keep the default behaviour, set 122s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 122s - added 1 commits with 1 trees and 1 blobs 122s - warning: failed to update refs/heads/master; branch is currently checked out 122s - 122s - $ hg push 122s - pushing to $TESTTMP/gitrepo 122s - searching for changes 122s - adding objects 122s - remote: found 0 deltas to reuse 122s - remote: error: refusing to update checked out branch: refs/heads/master 122s - remote: error: By default, updating the current branch in a non-bare repository 122s - remote: is denied, because it will make the index and work tree inconsistent 122s - remote: with what you pushed, and will require 'git reset --hard' to match 122s - remote: the work tree to HEAD. 122s - remote: 122s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 122s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 122s - remote: its current branch; however, this is not recommended unless you 122s - remote: arranged to update its work tree to match what you pushed in some 122s - remote: other way. 122s - remote: 122s - remote: To squelch this message and still keep the default behaviour, set 122s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 122s - added 1 commits with 1 trees and 1 blobs 122s - warning: failed to update refs/heads/master; branch is currently checked out 122s - 122s -Show that it really didn't get pushed: 122s - 122s - $ hg tags 122s - tip 1:47580592d3d6 122s - default/master 0:ff7a2f2d8d70 122s - $ cd ../gitrepo 122s - $ git log --all --oneline --decorate 122s - 7eeab2e (HEAD -> master) add alpha 122s 122s ERROR: test-push-to-head.t output changed 123s ! 123s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-orphan-tags.t 123s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-orphan-tags.t.err 123s @@ -61,17 +61,17 @@ 123s Create a Mercurial clone 123s 123s $ hg clone -U repo.git hgrepo 123s - importing 4 git commits 123s - new changesets b8e77484829b:387d03400596 (4 drafts) 123s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 123s + abort: repository repo.git not found 123s + [255] 123s $ hg outgoing -R hgrepo 123s - comparing with $TESTTMP/repo.git 123s - searching for changes 123s - no changes found 123s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 123s + abort: repository hgrepo not found 123s + [255] 123s + $ hg push --debug -R hgrepo | grep -e reference -e found 123s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 123s + abort: repository hgrepo not found 123s [1] 123s - $ hg push --debug -R hgrepo | grep -e reference -e found 123s - unchanged reference default::refs/heads/master => GIT:996e5084 123s - unchanged reference default::refs/tags/the_tag => GIT:e4338156 123s - no changes found 123s 123s Verify that we can push this tag, and that outgoing doesn't report 123s them (#358) 123s @@ -83,33 +83,5 @@ 123s To $TESTTMP/repo.git 123s - [deleted] the_tag 123s $ cd ../hgrepo 123s + $TESTTMP.sh: 72: cd: can't cd to ../hgrepo 123s $ hg outgoing 123s - comparing with $TESTTMP/repo.git 123s - searching for changes 123s - changeset: 2:7b35eb0afb3f 123s - tag: the_tag 123s - user: test 123s - date: Mon Jan 01 00:00:12 2007 +0000 123s - summary: add foo3 123s - 123s - $ hg push --debug 123s - pushing to $TESTTMP/repo.git 123s - finding unexported changesets 123s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 123s - searching for changes 123s - remote: counting objects: 5, done. 123s - 1 commits found 123s - list of commits: 123s - e12852326ef72772e9696b008ad6546b5266ff13 123s - adding objects 123s - remote: counting objects: 5, done. 123s - remote: found 0 deltas to reuse 123s - added 1 commits with 1 trees and 0 blobs 123s - unchanged reference default::refs/heads/master => GIT:996e5084 123s - adding reference default::refs/tags/the_tag => GIT:e4338156 123s - $ cd ../gitrepo 123s - $ git fetch 123s - From $TESTTMP/repo 123s - * [new tag] the_tag -> the_tag 123s - $ git tag -ln 123s - the_tag Tag message 123s 123s ERROR: test-orphan-tags.t output changed 126s ! 126s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-verify-fail.t 126s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-verify-fail.t.err 126s @@ -25,6 +25,7 @@ 126s $ cd .. 126s 126s $ hg init hgrepo 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s $ cd hgrepo 126s $ echo normalf > normalf 126s $ echo differentf2 > differentf 126s @@ -32,63 +33,93 @@ 126s $ echo exef > exef 126s $ ln -s foo linkf 126s $ hg add normalf differentf unexpectedf exef linkf 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s $ fn_hg_commit -m 'add files' 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s $ git clone --mirror ../gitrepo .hg/git 126s Cloning into bare repository '.hg/git'... 126s done. 126s $ echo "$(cd ../gitrepo && git rev-parse HEAD) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s $ hg gverify 126s - verifying rev 3f1601c3cf54 against git commit 039c1cd9fdda382c9d1e8ec85de6b5b59518ca80 126s - difference in: differentf 126s - file has different flags: exef (hg '', git 'x') 126s - file has different flags: linkf (hg 'l', git '') 126s - file found in git but not hg: missingf 126s - file found in hg but not git: unexpectedf 126s - [1] 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s + hg: unknown command 'gverify' 126s + (did you mean verify?) 126s + [10] 126s 126s $ echo newf > newf 126s $ hg add newf 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s $ fn_hg_commit -m 'new hg commit' 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s $ hg gverify 126s - abort: no git commit found for rev 4e582b4eb862 126s - (if this is an octopus merge, verify against the last rev) 126s - [255] 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s + hg: unknown command 'gverify' 126s + (did you mean verify?) 126s + [10] 126s 126s invalid git SHA 126s $ echo "ffffffffffffffffffffffffffffffffffffffff $(hg log -r . --template '{node}')" >> .hg/git-mapfile 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s $ hg gverify 126s - abort: git equivalent ffffffffffffffffffffffffffffffffffffffff for rev 4e582b4eb862 not found! 126s - [255] 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s + hg: unknown command 'gverify' 126s + (did you mean verify?) 126s + [10] 126s 126s git SHA is not a commit 126s $ echo new2 >> newf 126s $ fn_hg_commit -m 'new hg commit 2' 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s this gets the tree pointed to by the commit at HEAD 126s $ echo "$(cd ../gitrepo && git show --format=%T HEAD | head -n 1) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s $ hg gverify 126s - abort: git equivalent f477b00e4a9907617f346a529cc0fe9ba5d6f6d3 for rev 5c2eb98af3e2 is not a commit! 126s - [255] 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s + hg: unknown command 'gverify' 126s + (did you mean verify?) 126s + [10] 126s 126s corrupt git repository 126s 126s $ hg debug-remove-hggit-state 126s - clearing out the git cache data 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s + hg: unknown command 'debug-remove-hggit-state' 126s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 126s + [10] 126s $ hg gexport 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s + hg: unknown command 'gexport' 126s + (did you mean one of export, import?) 126s + [10] 126s $ mv .hg/git/objects/pack $TESTTMP/pack-old 126s $ for packfile in $TESTTMP/pack-old/*.pack 126s > do 126s > git --git-dir .hg/git unpack-objects < $packfile 126s > done 126s + $TESTTMP.sh: 78: cannot open $TESTTMP/pack-old/*.pack: No such file 126s + [2] 126s $ mv -f .hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 126s + mv: cannot stat '.hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e': No such file or directory 126s + [1] 126s $ hg gverify --fsck 126s - abort: git repository is corrupt! 126s - [255] 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s + hg: unknown command 'gverify' 126s + (did you mean verify?) 126s + [10] 126s $ hg gverify 126s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is not a commit! 126s - [255] 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s + hg: unknown command 'gverify' 126s + (did you mean verify?) 126s + [10] 126s $ chmod +w .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 126s + chmod: cannot access '.hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74': No such file or directory 126s + [1] 126s $ echo 42 > .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 126s + $TESTTMP.sh: 89: cannot create .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74: Directory nonexistent 126s + [2] 126s $ hg gverify 126s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is corrupt! 126s - (re-run with --traceback for details) 126s - [255] 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s + hg: unknown command 'gverify' 126s + (did you mean verify?) 126s + [10] 126s 126s ERROR: test-verify-fail.t output changed 126s ! 126s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-push-missing-commit.t 126s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-push-missing-commit.t.err 126s @@ -22,75 +22,9 @@ 126s clone it and create a commit building on the git history 126s 126s $ hg clone -U repo.git hgrepo 126s - importing 1 git commits 126s - new changesets fb68c5a534ce (1 drafts) 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/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: 20: cd: can't cd to hgrepo 126s $ hg up -q master 126s - $ echo other > thefile 126s - $ fn_hg_commit -m 'change thefile' 126s - $ cd .. 126s - 126s -now remove the git commit from the cache repository used internally by 126s -hg-git — actually, changing `git.intree` is equivalent to this, and how 126s -a user noticed it in #376. 126s - 126s - $ rm -rf hgrepo/.hg/git 126s - 126s -what happens when we push it? 126s - 126s - $ hg -R hgrepo push 126s - pushing to $TESTTMP/repo.git 126s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 126s - abort: cannot push git commit 533d4e670a8b as it is not present locally 126s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 126s - [255] 126s - 126s -try to follow the hint: 126s - 126s -(and just to see that the warning is useful, try re-resetting first) 126s - 126s - $ rm -rf hgrepo/.hg/git hgrepo/.git 126s - $ hg -R hgrepo pull 126s - pulling from $TESTTMP/repo.git 126s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 126s - no changes found 126s - not updating diverged bookmark master 126s - $ hg -R hgrepo 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 - 126s -and as an extra test, what if we want to push a commit that's 126s -converted, but gone? 126s - 126s -simply pushing doesn't suffice: 126s - 126s - $ cd hgrepo 126s - $ rm -rf .hg/git 126s - $ hg push 126s - pushing to $TESTTMP/repo.git 126s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 126s - searching for changes 126s - no changes found 126s - [1] 126s - $ cd .. 126s - 126s -but we can't create another commit building on the git history, export 126s -it, and push: 126s - 126s - $ cd hgrepo 126s - $ echo not that > thefile 126s - $ fn_hg_commit -m 'change thefile again' 126s - $ hg gexport 126s - $ rm -rf .hg/git 126s - $ hg push 126s - pushing to $TESTTMP/repo.git 126s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 126s - searching for changes 126s - abort: cannot push git commit 61619410916a as it is not present locally 126s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 126s - [255] 126s - $ cd .. 126s 126s ERROR: test-push-missing-commit.t output changed 126s ! 126s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-hg-branch.t 126s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-hg-branch.t.err 126s @@ -12,82 +12,10 @@ 126s 126s $ cd .. 126s $ hg clone gitrepo hgrepo 126s - importing 1 git commits 126s - new changesets ff7a2f2d8d70 (1 drafts) 126s - updating to bookmark not-master 126s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 126s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 126s + abort: repository gitrepo not found 126s + [255] 126s 126s $ cd hgrepo 126s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 126s $ hg co master 126s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 126s - (activating bookmark master) 126s - $ hg mv alpha beta 126s - $ fn_hg_commit -m 'rename alpha to beta' 126s - $ hg push 126s - pushing to $TESTTMP/gitrepo 126s - searching for changes 126s - adding objects 126s - remote: found 0 deltas to reuse 126s - added 1 commits with 1 trees and 0 blobs 126s - updating reference refs/heads/master 126s - 126s - $ hg branch gamma | grep -v 'permanent and global' 126s - marked working directory as branch gamma 126s - $ fn_hg_commit -m 'started branch gamma' 126s - $ hg push 126s - pushing to $TESTTMP/gitrepo 126s - searching for changes 126s - adding objects 126s - remote: found 0 deltas to reuse 126s - added 1 commits with 1 trees and 0 blobs 126s - updating reference refs/heads/master 126s - 126s - $ hg log --graph 126s - @ changeset: 2:400db38f4f64 126s - | branch: gamma 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: started branch gamma 126s - | 126s - o changeset: 1:3baa67317a4d 126s - | user: test 126s - | date: Mon Jan 01 00:00:11 2007 +0000 126s - | summary: rename alpha to beta 126s - | 126s - o changeset: 0:ff7a2f2d8d70 126s - bookmark: not-master 126s - tag: default/not-master 126s - user: test 126s - date: Mon Jan 01 00:00:10 2007 +0000 126s - summary: add alpha 126s - 126s - 126s - $ cd .. 126s - $ hg clone -U gitrepo hgrepo2 126s - importing 3 git commits 126s - new changesets ff7a2f2d8d70:400db38f4f64 (3 drafts) 126s - $ hg -R hgrepo2 log --graph 126s - o changeset: 2:400db38f4f64 126s - | branch: gamma 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: started branch gamma 126s - | 126s - o changeset: 1:3baa67317a4d 126s - | user: test 126s - | date: Mon Jan 01 00:00:11 2007 +0000 126s - | summary: rename alpha to beta 126s - | 126s - o changeset: 0:ff7a2f2d8d70 126s - bookmark: not-master 126s - tag: default/not-master 126s - user: test 126s - date: Mon Jan 01 00:00:10 2007 +0000 126s - summary: add alpha 126s - 126s 126s ERROR: test-hg-branch.t output changed 127s ! 127s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-pull-after-strip.t 127s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-pull-after-strip.t.err 127s @@ -15,82 +15,9 @@ 127s 127s $ cd .. 127s $ hg clone -U gitrepo hgrepo 127s - importing 2 git commits 127s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/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 $ cd hgrepo 127s + $TESTTMP.sh: 26: cd: can't cd to hgrepo 127s $ hg up master 127s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 127s - (activating bookmark master) 127s - $ hg log --graph 127s - @ changeset: 1:7fe02317c63d 127s - | bookmark: master 127s - | tag: default/master 127s - | tag: thetag 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 - user: test 127s - date: Mon Jan 01 00:00:10 2007 +0000 127s - summary: add alpha 127s - 127s - $ cd ../gitrepo 127s - $ echo beta line 2 >> beta 127s - $ git add beta 127s - $ fn_git_commit -m 'add to beta' 127s - 127s - $ cd .. 127s - $ cd hgrepo 127s - $ hg debugstrip --no-backup tip 127s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 127s - $ hg pull 127s - pulling from $TESTTMP/gitrepo 127s - importing 1 git commits 127s - abort: you appear to have run strip - please run hg git-cleanup 127s - [255] 127s - $ hg tags 127s - tip 0:ff7a2f2d8d70 127s - $ hg git-cleanup 127s - git commit map cleaned 127s - 127s -pull works after 'hg git-cleanup' 127s - 127s - $ hg pull 127s - pulling from $TESTTMP/gitrepo 127s - importing 2 git commits 127s - updating bookmark master 127s - new changesets 7fe02317c63d:cc1e605d90db (2 drafts) 127s - (run 'hg update' to get a working copy) 127s - $ hg log --graph 127s - o changeset: 2:cc1e605d90db 127s - | bookmark: master 127s - | tag: default/master 127s - | tag: tip 127s - | user: test 127s - | date: Mon Jan 01 00:00:12 2007 +0000 127s - | summary: add to beta 127s - | 127s - o changeset: 1:7fe02317c63d 127s - | tag: thetag 127s - | user: test 127s - | date: Mon Jan 01 00:00:11 2007 +0000 127s - | summary: add beta 127s - | 127s - @ changeset: 0:ff7a2f2d8d70 127s - user: test 127s - date: Mon Jan 01 00:00:10 2007 +0000 127s - summary: add alpha 127s - 127s - 127s - $ cd .. 127s - 127s -Check that we also remove bad refs: 127s - 127s - $ cd hgrepo 127s - $ echo e93b671cb24bff41779187edff99178e2597c2 > .hg/git/refs/tags/bad-tag 127s - $ hg git-cleanup 127s - git commit map cleaned 127s - $ test -e .hg/git/refs/tags/bad-tag 127s - [1] 127s 127s ERROR: test-pull-after-strip.t output changed 127s ! 127s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-gitignore.t 127s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-gitignore.t.err 127s @@ -2,12 +2,14 @@ 127s $ . "$TESTDIR/testutil" 127s 127s $ hg init repo 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s $ cd repo 127s 127s Create a commit that we can export later on 127s 127s $ touch thefile 127s $ hg commit -A -m "initial commit" 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s adding thefile 127s 127s We should only read .gitignore files in a hg-git repo (i.e. one with .hg/git 127s @@ -18,6 +20,7 @@ 127s $ touch bar 127s $ echo 'foo*' > .gitignore 127s $ hg status 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s ? .gitignore 127s ? bar 127s ? foo 127s @@ -27,103 +30,140 @@ 127s it's gone: 127s 127s $ hg gexport 127s - $ hg status 127s - ? .gitignore 127s - ? bar 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + hg: unknown command 'gexport' 127s + (did you mean one of export, import?) 127s + [10] 127s + $ hg status 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + ? .gitignore 127s + ? bar 127s + ? foo 127s + ? foobar 127s 127s $ echo '*bar' > .gitignore 127s $ hg status 127s - ? .gitignore 127s - ? foo 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + ? .gitignore 127s + ? bar 127s + ? foo 127s + ? foobar 127s 127s $ mkdir dir 127s $ touch dir/foo 127s $ echo 'foo' > .gitignore 127s $ hg status 127s - ? .gitignore 127s - ? bar 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + ? .gitignore 127s + ? bar 127s + ? dir/foo 127s + ? foo 127s ? foobar 127s 127s $ echo '/foo' > .gitignore 127s $ hg status 127s - ? .gitignore 127s - ? bar 127s - ? dir/foo 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + ? .gitignore 127s + ? bar 127s + ? dir/foo 127s + ? foo 127s ? foobar 127s 127s $ rm .gitignore 127s $ echo 'foo' > dir/.gitignore 127s $ hg status 127s - ? bar 127s - ? dir/.gitignore 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + ? bar 127s + ? dir/.gitignore 127s + ? dir/foo 127s ? foo 127s ? foobar 127s 127s $ touch dir/bar 127s $ echo 'bar' > .gitignore 127s $ hg status 127s - ? .gitignore 127s - ? dir/.gitignore 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + ? .gitignore 127s + ? bar 127s + ? dir/.gitignore 127s + ? dir/bar 127s + ? dir/foo 127s ? foo 127s ? foobar 127s 127s $ echo '/bar' > .gitignore 127s $ hg status 127s - ? .gitignore 127s - ? dir/.gitignore 127s - ? dir/bar 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + ? .gitignore 127s + ? bar 127s + ? dir/.gitignore 127s + ? dir/bar 127s + ? dir/foo 127s ? foo 127s ? foobar 127s 127s $ echo 'foo*' > .gitignore 127s $ echo '!*bar' >> .gitignore 127s $ hg status 127s - .gitignore: unsupported ignore pattern '!*bar' 127s - ? .gitignore 127s - ? bar 127s - ? dir/.gitignore 127s - ? dir/bar 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + ? .gitignore 127s + ? bar 127s + ? dir/.gitignore 127s + ? dir/bar 127s + ? dir/foo 127s + ? foo 127s + ? foobar 127s 127s $ echo '.hg/' > .gitignore 127s $ hg status 127s - ? .gitignore 127s - ? bar 127s - ? dir/.gitignore 127s - ? dir/bar 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + ? .gitignore 127s + ? bar 127s + ? dir/.gitignore 127s + ? dir/bar 127s + ? dir/foo 127s ? foo 127s ? foobar 127s 127s $ echo 'dir/.hg/' > .gitignore 127s $ hg status 127s - ? .gitignore 127s - ? bar 127s - ? dir/.gitignore 127s - ? dir/bar 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + ? .gitignore 127s + ? bar 127s + ? dir/.gitignore 127s + ? dir/bar 127s + ? dir/foo 127s ? foo 127s ? foobar 127s 127s $ echo '.hg/foo' > .gitignore 127s $ hg status 127s - ? .gitignore 127s - ? bar 127s - ? dir/.gitignore 127s - ? dir/bar 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + ? .gitignore 127s + ? bar 127s + ? dir/.gitignore 127s + ? dir/bar 127s + ? dir/foo 127s ? foo 127s ? foobar 127s 127s $ touch foo.hg 127s $ echo 'foo.hg' > .gitignore 127s $ hg status 127s - ? .gitignore 127s - ? bar 127s - ? dir/.gitignore 127s - ? dir/bar 127s - ? foo 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s + ? .gitignore 127s + ? bar 127s + ? dir/.gitignore 127s + ? dir/bar 127s + ? dir/foo 127s + ? foo 127s + ? foo.hg 127s ? foobar 127s $ rm foo.hg 127s 127s $ touch .hgignore 127s $ hg status 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s ? .gitignore 127s ? .hgignore 127s ? bar 127s @@ -137,6 +177,7 @@ 127s $ echo 'foo.*$(?> .hgignore 127s $ echo 'dir/foo' >> .hgignore 127s $ hg status 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s ? .gitignore 127s ? .hgignore 127s ? bar 127s @@ -145,14 +186,18 @@ 127s ? foobar 127s 127s $ hg add .gitignore 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s $ hg commit -m "add and commit .gitignore" 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s $ rm .gitignore 127s $ rm .hgignore 127s $ hg status 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s ! .gitignore 127s ? bar 127s ? dir/.gitignore 127s ? dir/bar 127s + ? dir/foo 127s ? foo 127s ? foobar 127s 127s @@ -164,6 +209,7 @@ 127s > foo( 127s > EOF 127s $ hg status --config ui.ignore=$TESTTMP/invalidhgignore 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s abort: $TESTTMP/invalidhgignore: invalid pattern (relre): foo( 127s [255] 127s 127s @@ -172,5 +218,6 @@ 127s > foo( 127s > EOF 127s $ hg status 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 127s abort: $TESTTMP/repo/.hgignore: invalid pattern (relre): foo( 127s [255] 127s 127s ERROR: test-gitignore.t output changed 127s ! 127s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-subrepos-syntax.t 127s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-subrepos-syntax.t.err 127s @@ -38,54 +38,9 @@ 127s $ cd .. 127s 127s $ hg clone -U repo.git hgrepo 127s - importing 3 git commits 127s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/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: 42: cd: can't cd to hgrepo 127s $ hg up master 127s - Cloning into '$TESTTMP/hgrepo/subrepo1'... 127s - done. 127s - Cloning into '$TESTTMP/hgrepo/xyz/subrepo2'... 127s - done. 127s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 127s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 127s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 127s - (activating bookmark master) 127s - $ cat >> .hgsub < # this is a comment 127s - > [subpaths] 127s - > flaf = blyf 127s - > EOF 127s - $ fn_hg_commit -m 'add comment & subsection' 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 0 blobs 127s - updating reference refs/heads/master 127s - $ cd .. 127s - 127s - $ cd gitrepo 127s - $ git pull --ff-only 127s - From $TESTTMP/repo 127s - 89c22d7..106b34e master -> origin/master 127s - Updating 89c22d7..106b34e 127s - Fast-forward 127s - $ cat .gitmodules 127s - [submodule "subrepo1"] 127s - path = subrepo1 127s - url = ../gitsubrepo 127s - [submodule "xyz/subrepo2"] 127s - path = xyz/subrepo2 127s - url = ../gitsubrepo 127s - $ cd .. 127s - 127s -We broke bidirectionality: 127s - 127s - $ hg clone -U repo.git hgrepo2 127s - importing 4 git commits 127s - new changesets e532b2bfda10:cbf584fe001b (4 drafts) 127s - $ hg id -r tip hgrepo 127s - c58a542b18bc default/master/tip master 127s - $ hg id -r tip hgrepo2 127s - cbf584fe001b default/master/tip master 127s 127s ERROR: test-subrepos-syntax.t output changed 127s ! 127s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-merge.t 127s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-merge.t.err 127s @@ -30,60 +30,11 @@ 127s $ git init -q --bare repo.git 127s 127s $ hg clone gitrepo hgrepo 127s - importing 4 git commits 127s - new changesets ff7a2f2d8d70:89ca4a68d6b9 (4 drafts) 127s - updating to bookmark master 127s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 127s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/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 $ cd hgrepo 127s + $TESTTMP.sh: 40: cd: can't cd to hgrepo 127s 127s clear the cache to be sure it is regenerated correctly 127s $ hg debug-remove-hggit-state 127s - clearing out the git cache data 127s - $ hg push ../repo.git 127s - pushing to ../repo.git 127s - searching for changes 127s - adding objects 127s - remote: found 0 deltas to reuse 127s - added 4 commits with 4 trees and 3 blobs 127s - adding reference refs/heads/beta 127s - adding reference refs/heads/master 127s - 127s - $ cd .. 127s -git log in repo pushed from hg 127s - $ git --git-dir=repo.git log --pretty=medium master | sed 's/\.\.\.//g' 127s - commit 5806851511aaf3bfe813ae3a86c5027165fa9b96 127s - Merge: e5023f9 9497a4e 127s - Author: test 127s - Date: Mon Jan 1 00:00:12 2007 +0000 127s - 127s - Merge branch 'beta' 127s - 127s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 127s - Author: test 127s - Date: Mon Jan 1 00:00:12 2007 +0000 127s - 127s - add gamma 127s - 127s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 127s - Author: test 127s - Date: Mon Jan 1 00:00:11 2007 +0000 127s - 127s - add beta 127s - 127s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 127s - Author: test 127s - Date: Mon Jan 1 00:00:10 2007 +0000 127s - 127s - add alpha 127s - $ git --git-dir=repo.git log --pretty=medium beta | sed 's/\.\.\.//g' 127s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 127s - Author: test 127s - Date: Mon Jan 1 00:00:11 2007 +0000 127s - 127s - add beta 127s - 127s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 127s - Author: test 127s - Date: Mon Jan 1 00:00:10 2007 +0000 127s - 127s - add alpha 127s 127s ERROR: test-merge.t output changed 128s ! 128s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-hg-tags.t 128s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-hg-tags.t.err 128s @@ -16,69 +16,10 @@ 128s 128s $ cd .. 128s $ hg clone -U repo.git hgrepo 128s - importing 1 git commits 128s - new changesets ff7a2f2d8d70 (1 drafts) 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 128s + abort: repository repo.git not found 128s + [255] 128s 128s $ cd hgrepo 128s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 128s $ hg co master 128s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 128s - (activating bookmark master) 128s - $ fn_hg_tag alpha 128s - $ hg push 128s - pushing to $TESTTMP/repo.git 128s - searching for changes 128s - adding objects 128s - remote: found 0 deltas to reuse 128s - added 1 commits with 1 trees and 1 blobs 128s - updating reference refs/heads/master 128s - adding reference refs/tags/alpha 128s - 128s - $ hg log --graph 128s - @ changeset: 1:e8b150f84560 128s - | bookmark: master 128s - | tag: default/master 128s - | tag: tip 128s - | user: test 128s - | date: Mon Jan 01 00:00:11 2007 +0000 128s - | summary: Added tag alpha for changeset ff7a2f2d8d70 128s - | 128s - o changeset: 0:ff7a2f2d8d70 128s - tag: alpha 128s - user: test 128s - date: Mon Jan 01 00:00:10 2007 +0000 128s - summary: add alpha 128s - 128s - 128s - $ cd .. 128s - $ cd gitrepo 128s -git should have the tag alpha 128s - $ git fetch origin 128s - From $TESTTMP/repo 128s - 7eeab2e..bbae830 master -> origin/master 128s - * [new tag] alpha -> alpha 128s - $ cd .. 128s - 128s - $ hg clone repo.git hgrepo2 128s - importing 2 git commits 128s - new changesets ff7a2f2d8d70:e8b150f84560 (2 drafts) 128s - updating to bookmark master 128s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 128s - $ hg -R hgrepo2 log --graph 128s - @ changeset: 1:e8b150f84560 128s - | bookmark: master 128s - | tag: default/master 128s - | tag: tip 128s - | user: test 128s - | date: Mon Jan 01 00:00:11 2007 +0000 128s - | summary: Added tag alpha for changeset ff7a2f2d8d70 128s - | 128s - o changeset: 0:ff7a2f2d8d70 128s - tag: alpha 128s - user: test 128s - date: Mon Jan 01 00:00:10 2007 +0000 128s - summary: add alpha 128s - 128s - 128s -the tag should be in .hgtags 128s - $ cat hgrepo2/.hgtags 128s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alpha 128s 128s ERROR: test-hg-tags.t output changed 128s ! 128s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-multiple-remotes.t 128s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-multiple-remotes.t.err 128s @@ -14,6 +14,7 @@ 128s $ git clone --bare --quiet gitrepo repo.git 128s 128s $ hg init hgrepo 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 128s $ cd hgrepo 128s $ cat > .hg/hgrc < [paths] 128s @@ -26,52 +27,28 @@ 128s > EOF 128s 128s $ hg pull 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 128s pulling from $TESTTMP/gitrepo 128s - importing 1 git commits 128s - adding bookmark master 128s - adding bookmark not-master 128s - new changesets ff7a2f2d8d70 (1 drafts) 128s - (run 'hg update' to get a working copy) 128s - pulling from $TESTTMP/repo.git 128s - no changes found 128s + abort: repository $TESTTMP/gitrepo not found 128s + [255] 128s $ hg tags 128s - tip 0:ff7a2f2d8d70 128s - git/not-master 0:ff7a2f2d8d70 128s - git/master 0:ff7a2f2d8d70 128s - bare/not-master 0:ff7a2f2d8d70 128s - bare/master 0:ff7a2f2d8d70 128s - also-git/not-master 0:ff7a2f2d8d70 128s - also-git/master 0:ff7a2f2d8d70 128s - also-bare/not-master 0:ff7a2f2d8d70 128s - also-bare/master 0:ff7a2f2d8d70 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 128s + tip -1:000000000000 128s 128s $ hg up master 128s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 128s - (activating bookmark master) 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 128s + abort: unknown revision 'master' 128s + [10] 128s $ echo beta > beta 128s $ fn_hg_commit -A -m "add beta" 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 128s $ hg push 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 128s pushing to $TESTTMP/gitrepo 128s - searching for changes 128s - adding objects 128s - remote: found 0 deltas to reuse 128s - added 1 commits with 1 trees and 1 blobs 128s - updating reference refs/heads/master 128s - pushing to $TESTTMP/repo.git 128s - searching for changes 128s - adding objects 128s - remote: found 0 deltas to reuse 128s - added 1 commits with 1 trees and 1 blobs 128s - updating reference refs/heads/master 128s + abort: repository $TESTTMP/gitrepo not found 128s + [255] 128s 128s $ hg tags 128s - tip 1:47580592d3d6 128s - git/master 1:47580592d3d6 128s - bare/master 1:47580592d3d6 128s - also-git/master 1:47580592d3d6 128s - also-bare/master 1:47580592d3d6 128s - git/not-master 0:ff7a2f2d8d70 128s - bare/not-master 0:ff7a2f2d8d70 128s - also-git/not-master 0:ff7a2f2d8d70 128s - also-bare/not-master 0:ff7a2f2d8d70 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 128s + tip 0:59e1f63242de 128s 128s 128s ERROR: test-multiple-remotes.t output changed 128s ! 128s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-hg-clone.t 128s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-hg-clone.t.err 128s @@ -11,88 +11,17 @@ 128s $ cd .. 128s 128s $ hg clone -U gitrepo hgrepo 128s - importing 1 git commits 128s - new changesets ff7a2f2d8d70 (1 drafts) 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 128s + abort: repository gitrepo not found 128s + [255] 128s 128s By default, the Git state isn't preserved across a copying/linking 128s clone 128s 128s $ hg clone -U hgrepo otherhgrepo 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 128s + abort: repository hgrepo not found 128s + [255] 128s $ cd otherhgrepo 128s + $TESTTMP.sh: 22: cd: can't cd to otherhgrepo 128s $ find .hg -name 'git*' | sort 128s - $ hg tags -v 128s - tip 0:ff7a2f2d8d70 128s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 128s - $ cd .. 128s - $ rm -r otherhgrepo 128s - 128s -Nor using a pull clone 128s - 128s - $ hg clone -U --pull hgrepo otherhgrepo 128s - requesting all changes 128s - adding changesets 128s - adding manifests 128s - adding file changes 128s - added 1 changesets with 1 changes to 1 files 128s - new changesets ff7a2f2d8d70 128s - $ cd otherhgrepo 128s - $ find .hg -name 'git*' | sort 128s - $ hg tags -v 128s - tip 0:ff7a2f2d8d70 128s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 128s - $ cd .. 128s - $ rm -r otherhgrepo 128s - 128s -But we can enable it! 128s - 128s - $ cat >> $HGRCPATH < [experimental] 128s - > hg-git-serve = yes 128s - > EOF 128s - 128s -Check transferring between Mercurial repositories using a 128s -copying/linking clone 128s - 128s - $ hg clone -U hgrepo otherhgrepo 128s - $ cd otherhgrepo 128s - $ find .hg -name 'git*' | sort 128s - $ hg tags -q 128s - tip 128s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 128s - $ cd .. 128s - 128s -Checking using a pull clone 128s - 128s - $ rm -rf otherhgrepo 128s - $ hg clone -U --pull hgrepo otherhgrepo 128s - requesting all changes 128s - adding changesets 128s - adding manifests 128s - adding file changes 128s - added 1 changesets with 1 changes to 1 files 128s - new changesets ff7a2f2d8d70 128s - $ cd otherhgrepo 128s - $ hg tags -q 128s - tip 128s - alpha 128s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 128s - 0:ff7a2f2d8d70 7eeab2ea75ec 128s - $ cd .. 128s - 128s -Can we repopulate the state from a Mercurial repository? 128s - 128s - $ cd otherhgrepo 128s - $ hg debug-remove-hggit-state 128s - clearing out the git cache data 128s - $ hg log -qr 'fromgit()' 128s - $ hg tags 128s - tip 0:ff7a2f2d8d70 128s - $ hg pull 128s - pulling from $TESTTMP/hgrepo 128s - searching for changes 128s - no changes found 128s - $ hg log -qr 'fromgit()' 128s - $ hg tags 128s - tip 0:ff7a2f2d8d70 128s - 128s -Sadly, no. 128s 128s ERROR: test-hg-clone.t output changed 128s ! 128s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-push-detached.t 128s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-push-detached.t.err 128s @@ -40,37 +40,9 @@ 128s in this case continues to work. 128s 128s $ hg clone gitrepo hgrepo 128s - importing 1 git commits 128s - new changesets ff7a2f2d8d70 (1 drafts) 128s - updating to bookmark master 128s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 128s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 128s + abort: repository gitrepo not found 128s + [255] 128s $ cd hgrepo 128s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 128s $ echo beta > beta 128s - $ hg add beta 128s - $ fn_hg_commit -m "add beta" 128s - 128s -Pushing that changeset, with phases, publishes the detached HEAD. 128s -Whether this should happen is debatable, but it's a side effect from 128s -the fact that pushing to the remote HEAD, with HEAD being the usual 128s -symref, should publish it. 128s - 128s - $ hg push -v --config hggit.usephases=yes 128s - pushing to $TESTTMP/gitrepo 128s - finding unexported changesets 128s - exporting 1 changesets 128s - converting revision 47580592d3d6492421a1e6cebc5c2d701a2e858b 128s - packing 3 loose objects... 128s - searching for changes 128s - remote: counting objects: 5, done. 128s - 1 commits found 128s - adding objects 128s - remote: counting objects: 5, done. 128s - remote: found 0 deltas to reuse 128s - added 1 commits with 1 trees and 1 blobs 128s - updating reference default::refs/heads/master => GIT:0f378ab6 128s - publishing remote HEAD 128s - $ hg phase 'all()' 128s - 0: public 128s - 1: draft 128s - $ cd .. 128s - 128s 128s ERROR: test-push-detached.t output changed 129s ! 129s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-serve-git.t 129s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-serve-git.t.err 129s @@ -33,28 +33,14 @@ 129s Make sure that clone over the old git protocol doesn't break 129s 129s $ hg clone -U git://localhost:$HGPORT/test copy 2>&1 129s - \r (no-eol) (esc) 129s - Counting objects 1/6 [=====> ]\r (no-eol) (esc) 129s - Counting objects 2/6 [===========> ]\r (no-eol) (esc) 129s - Counting objects 3/6 [=================> ]\r (no-eol) (esc) 129s - Counting objects 4/6 [=======================> ]\r (no-eol) (esc) 129s - Counting objects 5/6 [=============================> ]\r (no-eol) (esc) 129s - Counting objects 6/6 [===================================>]\r (no-eol) (esc) 129s - \r (no-eol) (esc) 129s - \r (no-eol) (esc) 129s - Compressing objects 1/3 [==========> ]\r (no-eol) (esc) 129s - Compressing objects 2/3 [=====================> ]\r (no-eol) (esc) 129s - Compressing objects 3/3 [================================>]\r (no-eol) (esc) 129s - \r (no-eol) (esc) 129s - \r (no-eol) (esc) 129s - importing commits 1/2 b23744d34f97 [======> ]\r (no-eol) (esc) 129s - importing commits 2/2 3af9773036a9 [=============>]\r (no-eol) (esc) 129s - \r (no-eol) (esc) 129s - importing 2 git commits 129s - new changesets c4d188f6e13d:221dd250e933 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 129s + abort: repository git://localhost:$HGPORT/test not found 129s + [255] 129s $ hg log -T 'HG:{node|short} GIT:{gitnode|short}\n' -R copy 129s - HG:221dd250e933 GIT:3af9773036a9 129s - HG:c4d188f6e13d GIT:b23744d34f97 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 129s + abort: repository copy not found 129s + [255] 129s $ hg tags -v -R copy 129s - tip 1:221dd250e933 129s - default/master 1:221dd250e933 git-remote 129s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 129s + abort: repository copy not found 129s + [255] 129s 129s ERROR: test-serve-git.t output changed 131s ! 131s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-convergedmerge.t 131s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-convergedmerge.t.err 131s @@ -2,29 +2,39 @@ 131s $ . "$TESTDIR/testutil" 131s 131s $ hg init hgrepo1 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s $ cd hgrepo1 131s $ echo A > afile 131s $ hg add afile 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s $ hg ci -m "origin" 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s 131s $ echo B > afile 131s $ hg ci -m "A->B" 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s 131s $ echo C > afile 131s $ hg ci -m "B->C" 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s 131s $ hg up -r0 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s $ echo C > afile 131s $ hg ci -m "A->C" 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s created new head 131s 131s $ hg merge -r2 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s (branch merge, don't forget to commit) 131s $ hg ci -m "merge" 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s 131s $ hg log --graph --style compact | sed 's/\[.*\]//g' 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s @ 4:3,2 eaa21d002113 1970-01-01 00:00 +0000 test 131s |\ merge 131s | | 131s @@ -47,36 +57,23 @@ 131s 131s $ cd hgrepo1 131s $ hg bookmark -r4 master 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s $ hg push -r master ../repo.git 131s - pushing to ../repo.git 131s - searching for changes 131s - adding objects 131s - remote: found 0 deltas to reuse 131s - added 5 commits with 3 trees and 3 blobs 131s - adding reference refs/heads/master 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository ../repo.git does not exist 131s + [255] 131s $ cd .. 131s 131s $ hg clone repo.git hgrepo2 131s - importing 5 git commits 131s - new changesets 5d1a6b64f9d0:eaa21d002113 (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.hVkeld/build.mNu/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 expect the same revision ids as above 131s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 131s - @ 4:1,3 eaa21d002113 1970-01-01 00:00 +0000 test 131s - |\ merge 131s - | | 131s - | o 3 0dbe4ac1a758 1970-01-01 00:00 +0000 test 131s - | | B->C 131s - | | 131s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 131s - | | A->B 131s - | | 131s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 131s - |/ A->C 131s - | 131s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 131s - origin 131s - 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo2 not found 131s $ hg -R hgrepo2 gverify 131s - verifying rev eaa21d002113 against git commit fb8c9e2afe5418cfff337eeed79fad5dd58826f0 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + hg: unknown command 'gverify' 131s + (did you mean verify?) 131s + [10] 131s 131s ERROR: test-convergedmerge.t output changed 131s ! 131s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-conflict-2.t 131s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-conflict-2.t.err 131s @@ -2,30 +2,40 @@ 131s $ . "$TESTDIR/testutil" 131s 131s $ hg init hgrepo1 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s $ cd hgrepo1 131s $ echo A > afile 131s $ hg add afile 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s $ hg ci -m "origin" 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s 131s $ echo B > afile 131s $ hg ci -m "A->B" 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s 131s $ hg up -r0 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 131s $ echo C > afile 131s $ hg ci -m "A->C" 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s created new head 131s 131s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s warning: conflicts.* (re) 131s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 131s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 131s resolve using second parent 131s $ echo B > afile 131s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s $ hg ci -m "merge to B" 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s 131s $ hg log --graph --style compact | sed 's/\[.*\]//g' 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s @ 3:2,1 120385945d08 1970-01-01 00:00 +0000 test 131s |\ merge to B 131s | | 131s @@ -45,31 +55,18 @@ 131s 131s $ cd hgrepo1 131s $ hg bookmark -r tip master 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s $ hg push -r master ../repo.git 131s - pushing to ../repo.git 131s - searching for changes 131s - adding objects 131s - remote: found 0 deltas to reuse 131s - added 4 commits with 3 trees and 3 blobs 131s - adding reference refs/heads/master 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository ../repo.git does not exist 131s + [255] 131s $ cd .. 131s 131s $ hg clone repo.git hgrepo2 131s - importing 4 git commits 131s - new changesets 5d1a6b64f9d0:120385945d08 (4 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.hVkeld/build.mNu/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 expect the same revision ids as above 131s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 131s - @ 3:1,2 120385945d08 1970-01-01 00:00 +0000 test 131s - |\ merge to B 131s - | | 131s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 131s - | | A->B 131s - | | 131s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 131s - |/ A->C 131s - | 131s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 131s - origin 131s - 131s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 131s + abort: repository hgrepo2 not found 131s 131s ERROR: test-conflict-2.t output changed 132s ! 132s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-phases-draft.t 132s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-phases-draft.t.err 132s @@ -12,73 +12,10 @@ 132s cloning without hggit.usephases does not publish local changesets 132s $ cd .. 132s $ hg clone gitrepo hgrepo | grep -v '^updating' 132s - importing 1 git commits 132s - new changesets ff7a2f2d8d70 (1 drafts) 132s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/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 + [1] 132s 132s $ cd hgrepo 132s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 132s $ hg phase -r master 132s - 0: draft 132s - 132s -pulling advances the draft phase, though 132s - 132s - $ hg phase -fs 0 132s - $ hg pull 132s - pulling from $TESTTMP/gitrepo 132s - no changes found 132s - $ hg phase tip 132s - 0: draft 132s - 132s -even if we don't have a name? 132s - 132s - $ hg phase -fs 0 132s - $ mv .hg/hgrc .hg/hgrc.bak 132s - $ hg pull ../gitrepo 132s - pulling from ../gitrepo 132s - no changes found 132s - $ hg phase tip 132s - 0: draft 132s - $ mv .hg/hgrc.bak .hg/hgrc 132s - $ cd .. 132s - 132s - 132s -pulling without hggit.usephases does not publish local changesets 132s - $ cd gitrepo 132s - $ git checkout -q master 132s - $ echo beta > beta 132s - $ git add beta 132s - $ fn_git_commit -m 'add beta' 132s - $ cd .. 132s - 132s - $ cd hgrepo 132s - $ hg pull 132s - pulling from $TESTTMP/gitrepo 132s - importing 1 git commits 132s - updating bookmark master 132s - new changesets 7fe02317c63d (1 drafts) 132s - (run 'hg update' to get a working copy) 132s - $ hg phase -r master 132s - 1: draft 132s - 132s -pulling with git.public does not publish local changesets 132s - $ hg --config git.public=master pull 132s - pulling from $TESTTMP/gitrepo 132s - no changes found 132s - $ hg phase -r master 132s - 1: draft 132s - 132s -pushing without hggit.usephases does not publish local changesets 132s - $ hg update master 132s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s - $ echo gamma > gamma 132s - $ hg add gamma 132s - $ hg commit -m 'gamma' 132s - $ hg push 132s - pushing to $TESTTMP/gitrepo 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 - $ hg phase -r master 132s - 2: draft 132s 132s ERROR: test-phases-draft.t output changed 132s ! 132s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-subrepos-push.t 132s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-subrepos-push.t.err 132s @@ -5,10 +5,13 @@ 132s Initialized empty Git repository in $TESTTMP/repo.git/ 132s 132s $ hg init hgsubrepo 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s $ cd hgsubrepo 132s $ echo thefile > thefile 132s $ hg add thefile 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s $ fn_hg_commit -m 'add thefile' 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 132s $ cd .. 132s 132s $ git init gitsubrepo 132s @@ -20,59 +23,9 @@ 132s $ cd .. 132s 132s $ hg clone repo.git hgrepo 132s - updating to branch default 132s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 132s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/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 $ cd hgrepo 132s + $TESTTMP.sh: 32: cd: can't cd to hgrepo 132s $ hg book master 132s - $ echo alpha > alpha 132s - $ hg add alpha 132s - $ fn_hg_commit -m 'add alpha' 132s - $ touch .hgsub 132s - $ hg add .hgsub 132s - $ fn_hg_commit -m "add .hgsub" 132s - $ hg clone -q ../hgsubrepo hg 132s - $ echo "hg = ../hgsubrepo" >> .hgsub 132s - $ fn_hg_commit -m 'add hg subrepo' 132s - $ git clone --quiet ../gitsubrepo git 132s - $ echo "git = [git]../gitsubrepo" >> .hgsub 132s - $ fn_hg_commit -m 'add git subrepo' 132s - $ hg push 132s - pushing to $TESTTMP/repo.git 132s - pushing subrepo hg to $TESTTMP/hgsubrepo 132s - searching for changes 132s - no changes found 132s - searching for changes 132s - adding objects 132s - remote: found 0 deltas to reuse 132s - added 4 commits with 2 trees and 2 blobs 132s - adding reference refs/heads/master 132s - $ cat .hgsub 132s - hg = ../hgsubrepo 132s - git = [git]../gitsubrepo 132s - $ cat .hgsubstate 132s - aaae5224095dca7403147c0e20cbac1f450b0e95 git 132s - df643c539c7541d48eacc76745581e00cbaf3d45 hg 132s - $ cd .. 132s - 132s -Now clone it. Note that no Mercurial state persists: 132s - 132s - $ git clone --recurse-submodules repo.git gitrepo 132s - Cloning into 'gitrepo'... 132s - done. 132s - Submodule 'git' ($TESTTMP/gitsubrepo) registered for path 'git' 132s - Cloning into '$TESTTMP/gitrepo/git'... 132s - done. 132s - Submodule path 'git': checked out 'aaae5224095dca7403147c0e20cbac1f450b0e95' 132s - $ cd gitrepo 132s - $ ls -A 132s - .git 132s - .gitmodules 132s - alpha 132s - git 132s - $ cat .gitmodules 132s - [submodule "git"] 132s - path = git 132s - url = ../gitsubrepo 132s - $ ls -A git 132s - .git 132s - thefile 132s 132s ERROR: test-subrepos-push.t output changed 133s ! 133s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-conflict-1.t 133s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-conflict-1.t.err 133s @@ -2,30 +2,40 @@ 133s $ . "$TESTDIR/testutil" 133s 133s $ hg init hgrepo1 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 133s $ cd hgrepo1 133s $ echo A > afile 133s $ hg add afile 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 133s $ hg ci -m "origin" 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 133s 133s $ echo B > afile 133s $ hg ci -m "A->B" 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 133s 133s $ hg up -r0 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 133s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 133s $ echo C > afile 133s $ hg ci -m "A->C" 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 133s created new head 133s 133s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 133s warning: conflicts.* (re) 133s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 133s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 133s resolve using first parent 133s $ echo C > afile 133s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 133s $ hg ci -m "merge to C" 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 133s 133s $ hg log --graph --style compact | sed 's/\[.*\]//g' 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 133s @ 3:2,1 6c53bc0f062f 1970-01-01 00:00 +0000 test 133s |\ merge to C 133s | | 133s @@ -45,31 +55,18 @@ 133s 133s $ cd hgrepo1 133s $ hg bookmark -r tip master 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 133s $ hg push -r master ../repo.git 133s - pushing to ../repo.git 133s - searching for changes 133s - adding objects 133s - remote: found 0 deltas to reuse 133s - added 4 commits with 3 trees and 3 blobs 133s - adding reference refs/heads/master 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 133s + abort: repository ../repo.git does not exist 133s + [255] 133s $ cd .. 133s 133s $ hg clone repo.git hgrepo2 133s - importing 4 git commits 133s - new changesets 5d1a6b64f9d0:6c53bc0f062f (4 drafts) 133s - updating to bookmark master 133s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 133s + abort: repository repo.git not found 133s + [255] 133s expect the same revision ids as above 133s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 133s - @ 3:1,2 6c53bc0f062f 1970-01-01 00:00 +0000 test 133s - |\ merge to C 133s - | | 133s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 133s - | | A->B 133s - | | 133s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 133s - |/ A->C 133s - | 133s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 133s - origin 133s - 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 133s + abort: repository hgrepo2 not found 133s 133s ERROR: test-conflict-1.t output changed 133s ! 133s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-pull-after-obsolete.t 133s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-pull-after-obsolete.t.err 133s @@ -20,52 +20,9 @@ 133s 133s $ cd .. 133s $ hg clone -U gitrepo hgrepo 133s - importing 2 git commits 133s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 133s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/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: 31: cd: can't cd to hgrepo 133s $ hg up master 133s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 133s - (activating bookmark master) 133s - $ hg log --graph 133s - @ changeset: 1:7fe02317c63d 133s - | bookmark: master 133s - | tag: default/master 133s - | tag: thetag 133s - | tag: tip 133s - | user: test 133s - | date: Mon Jan 01 00:00:11 2007 +0000 133s - | summary: add beta 133s - | 133s - o changeset: 0:ff7a2f2d8d70 133s - user: test 133s - date: Mon Jan 01 00:00:10 2007 +0000 133s - summary: add alpha 133s - 133s - $ cd ../gitrepo 133s - $ echo beta line 2 >> beta 133s - $ git add beta 133s - $ fn_git_commit -m 'add to beta' 133s - 133s -Create a commit, obsolete it, and pull, to ensure that we can pull if 133s -the tipmost commit is hidden. 133s - 133s - $ cd ../hgrepo 133s - $ hg bookmark --inactive 133s - $ echo gamma > gamma 133s - $ hg add gamma 133s - $ fn_hg_commit -m 'add gamma' 133s - $ hg up master 133s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 133s - (activating bookmark master) 133s - $ hg log -T '{rev}:{node} {desc}\n' -r tip 133s - 2:4090a1266584bc1a47ce562e9349b1e0f1b44611 add gamma 133s - $ hg debugobsolete 4090a1266584bc1a47ce562e9349b1e0f1b44611 133s - 1 new obsolescence markers 133s - obsoleted 1 changesets 133s - 133s - $ hg pull 133s - pulling from $TESTTMP/gitrepo 133s - importing 1 git commits 133s - updating bookmark master 133s - new changesets cc1e605d90db (1 drafts) 133s - (run 'hg update' to get a working copy) 133s 133s ERROR: test-pull-after-obsolete.t output changed 134s ! 134s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-git-clone.t 134s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-git-clone.t.err 134s @@ -14,30 +14,24 @@ 134s $ cd .. 134s 134s $ hg clone gitrepo hgrepo 134s - importing 2 git commits 134s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 134s - updating to bookmark master 134s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s + abort: repository gitrepo not found 134s + [255] 134s $ hg -R hgrepo log --graph 134s - @ changeset: 1:7fe02317c63d 134s - | bookmark: master 134s - | tag: default/master 134s - | tag: tip 134s - | user: test 134s - | date: Mon Jan 01 00:00:11 2007 +0000 134s - | summary: add beta 134s - | 134s - o changeset: 0:ff7a2f2d8d70 134s - user: test 134s - date: Mon Jan 01 00:00:10 2007 +0000 134s - summary: add alpha 134s - 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s + abort: repository hgrepo not found 134s + [255] 134s 134s we should have some bookmarks 134s $ hg -R hgrepo book 134s - * master 1:7fe02317c63d 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s + abort: repository hgrepo not found 134s + [255] 134s $ hg -R hgrepo gverify 134s - verifying rev 7fe02317c63d against git commit 9497a4ee62e16ee641860d7677cdb2589ea15554 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s + hg: unknown command 'gverify' 134s + (did you mean verify?) 134s + [10] 134s 134s test for ssh vulnerability 134s 134s @@ -47,16 +41,18 @@ 134s > EOF 134s 134s $ hg clone -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 134s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 134s [255] 134s $ hg clone -q 'git+ssh://%2DoProxyCommand=rm${IFS}nonexistent/path' 134s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 134s [255] 134s $ hg clone -q 'git+ssh://fakehost|rm${IFS}nonexistent/path' 134s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 134s - abort: git remote error: The remote server unexpectedly closed the connection. 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 134s [255] 134s $ hg clone -q 'git+ssh://fakehost%7Crm${IFS}nonexistent/path' 134s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 134s - abort: git remote error: The remote server unexpectedly closed the connection. 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 134s [255] 134s 134s ERROR: test-git-clone.t output changed 134s ! 134s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-git-gpg.t 134s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-git-gpg.t.err 134s @@ -55,23 +55,10 @@ 134s Hg clone it 134s 134s $ hg clone gitrepo hgrepo 134s - importing 2 git commits 134s - new changesets ab60c5e55bd6:[0-9a-f]{12,12} \(2 drafts\) (re) 134s - updating to bookmark signed 134s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 134s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 134s + abort: repository gitrepo not found 134s + [255] 134s 134s $ cd hgrepo 134s + $TESTTMP.sh: 46: cd: can't cd to hgrepo 134s $ hg push ../gitrepo2 -B signed 134s - pushing to ../gitrepo2 134s - searching for changes 134s - adding objects 134s - remote: found 0 deltas to reuse 134s - added 1 commits with 1 trees and 0 blobs 134s - adding reference refs/heads/signed 134s - $ cd .. 134s - 134s -Verify the commit 134s - 134s - $ cd gitrepo2 134s - $ git show --show-signature signed | grep "Good signature from" 134s - gpg: Good signature from "hgtest" [ultimate] 134s 134s ERROR: test-git-gpg.t output changed 135s ! 135s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-push-phases.t 135s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-push-phases.t.err 135s @@ -9,68 +9,13 @@ 135s $ git init -q --bare repo.git 135s 135s $ hg clone repo.git hgrepo 135s - updating to branch default 135s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 135s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 135s + abort: repository repo.git not found 135s + [255] 135s 135s $ cd hgrepo 135s + $TESTTMP.sh: 13: cd: can't cd to hgrepo 135s 135s Create two commits, one secret: 135s 135s $ touch alpha 135s - $ hg add alpha 135s - $ fn_hg_commit -m alpha 135s - $ hg book -r . master 135s - $ touch beta 135s - $ hg add beta 135s - $ fn_hg_commit --secret -m beta 135s - $ hg book -r . secret 135s - $ hg push 135s - pushing to $TESTTMP/repo.git 135s - warning: not exporting secret bookmark 'secret' 135s - searching for changes 135s - adding objects 135s - remote: found 0 deltas to reuse 135s - added 1 commits with 1 trees and 1 blobs 135s - adding reference refs/heads/master 135s - $ cd .. 135s - $ hg -R hgrepo log --graph --template phases 135s - @ changeset: 1:62966756ea96 135s - | bookmark: secret 135s - | tag: tip 135s - | phase: secret 135s - | user: test 135s - | date: Mon Jan 01 00:00:11 2007 +0000 135s - | summary: beta 135s - | 135s - o changeset: 0:d4b83afc35d1 135s - bookmark: master 135s - tag: default/master 135s - phase: public 135s - user: test 135s - date: Mon Jan 01 00:00:10 2007 +0000 135s - summary: alpha 135s - 135s - 135s -What happens when we push the secret? 135s - 135s - $ hg -R hgrepo push -B secret 135s - pushing to $TESTTMP/repo.git 135s - warning: not exporting secret bookmark 'secret' 135s - searching for changes 135s - abort: revision 62966756ea96 cannot be pushed since it doesn't have a bookmark 135s - [255] 135s - 135s -Only one changeset was pushed: 135s - 135s - $ GIT_DIR=repo.git git log --graph --all --decorate=short 135s - * commit 2cc4e3d19551e459a0dd606f4cf890de571c7d33 (HEAD -> master) 135s - Author: test 135s - Date: Mon Jan 1 00:00:10 2007 +0000 135s - 135s - alpha 135s - 135s -And this published the remote head: 135s - 135s - $ hg -R hgrepo phase 'all()' 135s - 0: public 135s - 1: secret 135s 135s ERROR: test-push-phases.t output changed 135s ! 135s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-keywords.t 135s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-keywords.t.err 135s @@ -21,29 +21,9 @@ 135s $ cd .. 135s 135s $ hg clone gitrepo hgrepo 135s - importing 3 git commits 135s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 135s - updating to bookmark master 135s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 135s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 135s + abort: repository gitrepo not found 135s + [255] 135s $ cd hgrepo 135s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 135s $ echo gamma > gamma 135s - $ hg add gamma 135s - $ hg commit -m 'add gamma' 135s - 135s - $ hg log --template "{rev} {node} {node|short} {gitnode} {gitnode|short}\n" 135s - 3 965bf7d08d3ac847dd8eb9e72ee0bf547d1a65d9 965bf7d08d3a 135s - 2 8e3f0ecc9aefd4ea2fdf8e2d5299cac548762a1c 8e3f0ecc9aef 7e2a5465ff4e3b992c429bb87a392620a0ac97b7 7e2a5465ff4e 135s - 1 7fe02317c63d9ee324d4b5df7c9296085162da1b 7fe02317c63d 9497a4ee62e16ee641860d7677cdb2589ea15554 9497a4ee62e1 135s - 0 ff7a2f2d8d7099694ae1e8b03838d40575bebb63 ff7a2f2d8d70 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 7eeab2ea75ec 135s - $ hg log --template "fromgit {rev}\n" --rev "fromgit()" 135s - fromgit 0 135s - fromgit 1 135s - fromgit 2 135s - $ hg log --template "gitnode_existsA {rev}\n" --rev "gitnode(9497a4ee62e16ee641860d7677cdb2589ea15554)" 135s - gitnode_existsA 1 135s - $ hg log --template "gitnode_existsB {rev}\n" --rev "gitnode(7eeab)" 135s - gitnode_existsB 0 135s - $ hg log --rev "gitnode(7e)" 135s - abort: git-mapfile@7e: ambiguous identifier!? (re) 135s - [50] 135s - $ hg log --template "gitnode_notexists {rev}\n" --rev "gitnode(1234567890ab)" 135s 135s ERROR: test-keywords.t output changed 135s ! 135s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-subrepos-delete.t 135s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-subrepos-delete.t.err 135s @@ -52,22 +52,9 @@ 135s And there should be nothing in Mercurial either: 135s 135s $ hg clone -U repo.git hgrepo 135s - importing 3 git commits 135s - new changesets e532b2bfda10:cc611d35fb62 (3 drafts) 135s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 135s + abort: repository repo.git not found 135s + [255] 135s $ cd hgrepo 135s + $TESTTMP.sh: 50: cd: can't cd to hgrepo 135s $ hg log --graph --template info 135s - o 135s - | commit: 2:cc611d35fb62 delete subrepo 135s - | added: 135s - | removed: .hgsub .hgsubstate 135s - o 135s - | commit: 1:8d549bcc5179 add subrepo 135s - | added: .hgsub .hgsubstate 135s - | removed: 135s - o 135s - commit: 0:e532b2bfda10 add alpha 135s - added: alpha 135s - removed: 135s - $ hg manifest -r tip 135s - alpha 135s - $ cd .. 135s 135s ERROR: test-subrepos-delete.t output changed 136s ! 136s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-tree-decomposition.t 136s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-tree-decomposition.t.err 136s @@ -24,45 +24,9 @@ 136s $ git init -q --bare repo.git 136s 136s $ hg clone gitrepo hgrepo 136s - importing 3 git commits 136s - new changesets d4d3d2417141:541f27994b81 (3 drafts) 136s - updating to bookmark master 136s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s + abort: repository gitrepo not found 136s + [255] 136s $ cd hgrepo 136s + $TESTTMP.sh: 38: cd: can't cd to hgrepo 136s $ hg log --template 'adds: {file_adds}\ndels: {file_dels}\n' 136s - adds: d1 136s - dels: d1/f1 136s - adds: d2/f2 136s - dels: d1/f2 136s - adds: d1/f1 d1/f2 136s - dels: 136s - 136s - $ hg debug-remove-hggit-state 136s - clearing out the git cache data 136s - $ hg push ../repo.git 136s - pushing to ../repo.git 136s - searching for changes 136s - adding objects 136s - remote: found 0 deltas to reuse 136s - added 3 commits with 6 trees and 3 blobs 136s - adding reference refs/heads/master 136s - $ cd .. 136s - 136s - $ git --git-dir=repo.git log --pretty=medium 136s - commit 6e0dbd8cd92ed4823c69cb48d8a2b81f904e6e69 136s - Author: test 136s - Date: Mon Jan 1 00:00:12 2007 +0000 136s - 136s - replace a dir with a file 136s - 136s - commit a1874d5cd0b1549ed729e36f0da4a93ed36259ee 136s - Author: test 136s - Date: Mon Jan 1 00:00:11 2007 +0000 136s - 136s - rename 136s - 136s - commit 102c17a5deda49db3f10ec5573f9378867098b7c 136s - Author: test 136s - Date: Mon Jan 1 00:00:10 2007 +0000 136s - 136s - initial 136s 136s ERROR: test-tree-decomposition.t output changed 136s ! 136s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-annotate.t 136s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-annotate.t.err 136s @@ -10,6 +10,7 @@ 136s init 136s 136s $ hg init repo 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s $ cd repo 136s 136s commit 136s @@ -19,37 +20,48 @@ 136s > a 136s > EOF 136s $ hg add a 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s $ fn_hg_commit -m 1 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s $ cat < a 136s > a 136s > a 136s > a 136s > EOF 136s $ fn_hg_commit -m 2 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s $ cat < a 136s > a 136s > b 136s > a 136s > EOF 136s $ fn_hg_commit -m 3 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s 136s annotate multiple files 136s 136s $ hg annotate a 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s 0: a 136s 2: b 136s 1: a 136s 136s $ hg annotate --skip 1 a 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s 0: a 136s 2: b 136s 0* a 136s 136s $ hg gexport 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s + hg: unknown command 'gexport' 136s + (did you mean one of export, import?) 136s + [10] 136s $ hg log -T '{rev}:{node} {gitnode}\n' 136s - 2:beb139b96eec386addc02d48db524b7646ef1605 19388575d02e71e917e7013aa854d4a21c509819 136s - 1:a9a255d66663f9216bdcf8dda69211d7280f7278 debec50a14cc4830584dd4fa1507c51cce1c098f 136s - 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 88f28c06a1ede9a70852ab1bf9818150fabaaaa9 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s + 2:beb139b96eec386addc02d48db524b7646ef1605 136s + 1:a9a255d66663f9216bdcf8dda69211d7280f7278 136s + 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 136s 136s $ cat < .git-blame-ignore-revs 136s > # this is a comment, and the next line should be ignored 136s @@ -59,39 +71,43 @@ 136s > EOF 136s 136s $ hg annotate a 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s 0: a 136s 2: b 136s 1: a 136s $ hg annotate a \ 136s > --debug \ 136s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 136s - skipping debec50a14cc -> a9a255d66663 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s 0: a 136s 2: b 136s - 0* a 136s + 1: a 136s $ hg add .git-blame-ignore-revs 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s $ hg annotate a \ 136s > --debug \ 136s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 136s - skipping debec50a14cc -> a9a255d66663 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s 0: a 136s 2: b 136s - 0* a 136s + 1: a 136s $ hg annotate a \ 136s > --config git.blame.ignoreRevsFile=badfile 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s 0: a 136s 2: b 136s 1: a 136s $ hg annotate -T'{lines % "{rev}:{node|short} {gitnode|short}: {line}"}' a 136s - 0:8d4731bd0f4a 88f28c06a1ed: a 136s - 2:beb139b96eec 19388575d02e: b 136s - 1:a9a255d66663 debec50a14cc: a 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s + 0:8d4731bd0f4a : a 136s + 2:beb139b96eec : b 136s + 1:a9a255d66663 : a 136s 136s $ cd .. 136s $ hg -R repo annotate repo/a \ 136s > --debug \ 136s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 136s - skipping debec50a14cc -> a9a255d66663 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s 0: a 136s 2: b 136s - 0* a 136s + 1: a 136s 136s ERROR: test-annotate.t output changed 136s ! 136s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-subrepos-drop.t 136s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-subrepos-drop.t.err 136s @@ -17,52 +17,9 @@ 136s Create a Mercurial repository with a .gitmodules file: 136s 136s $ hg clone repo.git hgrepo 136s - updating to branch default 136s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s + abort: repository repo.git not found 136s + [255] 136s $ cd hgrepo 136s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 136s $ hg book master 136s - $ touch this 136s - $ fn_hg_commit -A -m 'add this' 136s - $ cat > .gitmodules < [submodule "subrepo"] 136s - > path = subrepo 136s - > url = ../gitsubrepo 136s - > EOF 136s - $ hg add .gitmodules 136s - $ fn_hg_commit -m "add .gitmodules file" 136s - $ cd .. 136s - 136s -What happens if we push that to Git? 136s - 136s - $ hg -R hgrepo push 136s - pushing to $TESTTMP/repo.git 136s - warning: ignoring modifications to '.gitmodules' file; please use '.hgsub' instead 136s - searching for changes 136s - adding objects 136s - remote: found 0 deltas to reuse 136s - added 2 commits with 1 trees and 1 blobs 136s - adding reference refs/heads/master 136s - 136s -But we don't get a warning if we don't touch .gitmodules: 136s - 136s - $ cd hgrepo 136s - $ touch that 136s - $ fn_hg_commit -A -m 'add that' 136s - $ hg push 136s - pushing to $TESTTMP/repo.git 136s - searching for changes 136s - adding objects 136s - remote: found 0 deltas to reuse 136s - added 1 commits with 1 trees and 0 blobs 136s - updating reference refs/heads/master 136s - $ cd .. 136s - 136s -Check that it didn't silenty come through, or something: 136s - 136s - $ git clone repo.git gitrepo 136s - Cloning into 'gitrepo'... 136s - done. 136s - $ ls -A gitrepo 136s - .git 136s - that 136s - this 136s 136s ERROR: test-subrepos-drop.t output changed 136s ! 136s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-push-anonymous.t 136s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-push-anonymous.t.err 136s @@ -25,28 +25,9 @@ 136s Clone it, deactivate the bookmark, add a commit, and push! 136s 136s $ hg clone -U gitrepo hgrepo 136s - importing 1 git commits 136s - new changesets ff7a2f2d8d70 (1 drafts) 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s + abort: repository gitrepo not found 136s + [255] 136s $ cd hgrepo 136s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 136s $ hg up tip 136s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 136s - $ echo beta > beta 136s - $ hg add beta 136s - $ fn_hg_commit -m "add beta" 136s - 136s -Pushing that changeset should print a helpful message: 136s - 136s - $ hg push 136s - pushing to $TESTTMP/gitrepo 136s - searching for changes 136s - no changes found (ignoring 1 changesets without bookmarks or tags) 136s - [1] 136s - 136s -But what about untagged, but secret changesets? 136s - 136s - $ hg phase -fs tip 136s - $ hg push 136s - pushing to $TESTTMP/gitrepo 136s - searching for changes 136s - no changes found 136s - [1] 136s 136s ERROR: test-push-anonymous.t output changed 136s ! 136s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-empty-working-tree.t 136s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-empty-working-tree.t.err 136s @@ -10,29 +10,9 @@ 136s $ git init -q --bare repo.git 136s 136s $ hg clone gitrepo hgrepo 136s - importing 1 git commits 136s - new changesets 01708ca54a8f (1 drafts) 136s - updating to bookmark master 136s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 136s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 136s + abort: repository gitrepo not found 136s + [255] 136s $ cd hgrepo 136s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 136s $ hg log -r tip --template 'files: {files}\n' 136s - files: 136s - $ hg gverify 136s - verifying rev 01708ca54a8f against git commit 678256865a8c85ae925bf834369264193c88f8de 136s - 136s - $ hg debug-remove-hggit-state 136s - clearing out the git cache data 136s - $ hg push ../repo.git 136s - pushing to ../repo.git 136s - searching for changes 136s - adding objects 136s - remote: found 0 deltas to reuse 136s - added 1 commits with 1 trees and 0 blobs 136s - adding reference refs/heads/master 136s - $ cd .. 136s - $ git --git-dir=repo.git log --pretty=medium 136s - commit 678256865a8c85ae925bf834369264193c88f8de 136s - Author: test 136s - Date: Mon Jan 1 00:00:00 2007 +0000 136s - 136s - empty 136s 136s ERROR: test-empty-working-tree.t output changed 138s ! 138s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-gitignore-permissions.t 138s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-gitignore-permissions.t.err 138s @@ -4,6 +4,7 @@ 138s $ . "$TESTDIR/testutil" 138s 138s $ hg init repo 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s $ cd repo 138s 138s $ if test `whoami` = root 138s @@ -16,8 +17,14 @@ 138s 138s $ touch thefile 138s $ hg add thefile 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s $ hg ci -A -m commit 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/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.hVkeld/build.mNu/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 Create a file that we can ignore 138s 138s @@ -33,9 +40,10 @@ 138s 138s $ echo nothingtoseehere > .gitignore 138s $ hg status 138s - not_readable: Permission denied 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s not_readable: Permission denied 138s ? .gitignore 138s + ? nothingtoseehere 138s 138s And notice that we really did ignore it! 138s 138s 138s ERROR: test-gitignore-permissions.t output changed 138s ! 138s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-gitignore-share.t 138s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-gitignore-share.t.err 138s @@ -9,6 +9,7 @@ 138s $ git init --quiet --bare repo.git 138s 138s $ hg init hgrepo 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s $ cd hgrepo 138s $ cat > .hg/hgrc < [paths] 138s @@ -16,26 +17,31 @@ 138s > EOF 138s $ echo ignored > .gitignore 138s $ hg add .gitignore 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s $ hg ci -m ignore 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/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.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s $ hg push 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s pushing to $TESTTMP/repo.git 138s - searching for changes 138s - adding objects 138s - remote: found 0 deltas to reuse 138s - added 1 commits with 1 trees and 1 blobs 138s - adding reference refs/heads/master 138s + abort: repository $TESTTMP/repo.git not found 138s + [255] 138s $ cd .. 138s 138s We should also ignore the file in a shared repository: 138s 138s $ hg share hgrepo sharerepo 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s updating working directory 138s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 138s $ cd sharerepo 138s $ hg paths 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s default = $TESTTMP/repo.git 138s $ cat .gitignore 138s ignored 138s $ touch ignored 138s $ hg status 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + ? ignored 138s 138s ERROR: test-gitignore-share.t output changed 138s ! 138s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-ambiguousprefix.t 138s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-ambiguousprefix.t.err 138s @@ -21,13 +21,11 @@ 138s $ cd .. 138s 138s $ hg clone gitrepo hgrepo 138s - importing 3 git commits 138s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 138s - updating to bookmark master 138s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 138s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 138s + abort: repository gitrepo not found 138s + [255] 138s 138s $ cd hgrepo 138s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 138s 138s $ hg log -r 'gitnode(7e)' 138s - abort: git-mapfile@7e: ambiguous identifier!? (re) 138s - [50] 138s 138s ERROR: test-ambiguousprefix.t output changed 139s ! 139s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-timezone.t 139s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-timezone.t.err 139s @@ -8,10 +8,13 @@ 139s $ . "$TESTDIR/testutil" 139s 139s $ hg init hgrepo 139s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 139s $ cd hgrepo 139s $ touch beta 139s $ hg add beta 139s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 139s $ fn_hg_commit -m "test commit" 139s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 139s $ cat >patch2 < # HG changeset patch 139s > # User J. User 139s @@ -28,5 +31,10 @@ 139s > +alpha 139s > EOF 139s $ hg import patch2 139s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 139s applying patch2 139s $ hg gexport 139s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 139s + hg: unknown command 'gexport' 139s + (did you mean one of export, import?) 139s + [10] 139s 139s ERROR: test-timezone.t output changed 140s ! 140s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-transplant.t 140s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-transplant.t.err 140s @@ -11,12 +11,20 @@ 140s > EOF 140s 140s $ hg init baserepo 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s $ cd baserepo 140s $ for c in A B C 140s > do 140s > echo $c > $c && hg add $c && fn_hg_commit -m $c 140s > done 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s $ hg clone -r 2 . ../otherrepo 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s adding changesets 140s adding manifests 140s adding file changes 140s @@ -26,6 +34,8 @@ 140s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 140s $ cd ../otherrepo 140s $ hg up 1 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 140s $ hg transplant -s ../baserepo tip 140s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s no changes found 140s 140s ERROR: test-transplant.t output changed 140s !s 140s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-url-parsing.py.out 140s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-url-parsing.py.err 140s @@ -1,46 +1,14 @@ 140s -% expect '/webjam/webjam.git' 140s -/webjam/webjam.git 140s -% expect 'github.com' 140s -github.com 140s -% expect '/webjam/webjam.git' 140s -/webjam/webjam.git 140s -% expect 'github.com' 140s -github.com 140s -% expect '19418' 140s -19418 140s -% expect 'webjam.git' 140s -webjam.git 140s -% expect 'git@heroku.com' 140s -git@heroku.com 140s -% expect '999' 140s -999 140s -% expect 'webjam/webjam.git' 140s -webjam/webjam.git 140s -% expect 'git@github.com' 140s -git@github.com 140s -% expect '42qu/vps.git' 140s -42qu/vps.git 140s -% expect 'git@github.com' 140s -git@github.com 140s -% expect '/webjam/webjam.git' 140s -/webjam/webjam.git 140s -% expect 'git@github.com' 140s -git@github.com 140s -% expect '/webjam/webjam.git' 140s -/webjam/webjam.git 140s -% expect 'git@github.com' 140s -git@github.com 140s -% expect '10022' 140s -10022 140s -% expect 'webjam.git' 140s -webjam.git 140s -% expect 'git@heroku.com' 140s -git@heroku.com 140s -% expect 'webjam.git' 140s -webjam.git 140s -% expect 'git@compatible.com' 140s -git@compatible.com 140s -% expect 'webjam.git' 140s -webjam.git 140s -% expect 'git@heroku.com' 140s -git@heroku.com 140s +Traceback (most recent call last): 140s + File "/tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-url-parsing.py", line 14, in 140s + from hggit.git_handler import GitHandler 140s + File "/usr/lib/python3/dist-packages/hggit/__init__.py", line 160, in 140s + from . import commands 140s + File "/usr/lib/python3/dist-packages/hggit/commands.py", line 26, in 140s + from . import verify 140s + File "/usr/lib/python3/dist-packages/hggit/verify.py", line 16, in 140s + from . import git2hg 140s + File "/usr/lib/python3/dist-packages/hggit/git2hg.py", line 8, in 140s + from dulwich.refs import ( 140s + ...<3 lines>... 140s + ) 140s +ImportError: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 140s 140s ERROR: test-url-parsing.py output changed 140s !. 141s --- /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-addbranchrevs.t 141s +++ /tmp/autopkgtest.hVkeld/build.mNu/src/tests/test-addbranchrevs.t.err 141s @@ -7,14 +7,23 @@ 141s caused the pull to not update to the passed revision. 141s 141s $ hg init orig 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ cd orig 141s $ echo a > a; hg add a; hg ci -m a 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ hg branch foo -q 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ echo b > b; hg add b; hg ci -m b 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s 141s $ cd .. 141s $ hg clone orig clone -r 0 -q 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ cd clone 141s $ hg pull -u -r 1 -q 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s $ hg id -n 141s + *** failed to import extension "hggit" from /tmp/autopkgtest.hVkeld/build.mNu/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 141s 1 141s 141s ERROR: test-addbranchrevs.t output changed 141s ! 141s Skipped test-check-black.t: missing feature: the black formatter for python (>= 22.3) 141s Skipped test-check-commit.t: missing feature: running tests from repository 141s Skipped test-check-pyflakes.t: missing feature: Pyflakes python linter 141s Skipped test-check-pylint.t: missing feature: Pylint python linter 141s Skipped test-encoding.t: blacklisted 141s Skipped test-gitignore-windows.t: missing feature: Windows 141s Skipped test-incoming.t: blacklisted 141s Skipped test-serve-ci.t: skipped 141s Skipped test-serve-dulwich.t: blacklisted 141s Failed test-addbranchrevs.t: output changed 141s Failed test-ambiguousprefix.t: output changed and returned error code 1 141s Failed test-annotate.t: output changed 141s Failed test-bookmark-workflow.t: output changed and returned error code 1 141s Failed test-branch-bookmark-suffix.t#with-path: output changed and returned error code 1 141s Failed test-branch-bookmark-suffix.t#without-path: output changed and returned error code 1 141s Failed test-bundle.t: output changed and returned error code 1 141s Failed test-clone.t#draft: output changed 141s Failed test-clone.t#secret: output changed 141s Failed test-conflict-1.t: output changed 141s Failed test-conflict-2.t: output changed 141s Failed test-convergedmerge.t: output changed 141s Failed test-empty-working-tree.t: output changed and returned error code 1 141s Failed test-extra.t: output changed and returned error code 1 141s Failed test-file-removal.t: output changed and returned error code 1 141s Failed test-gc.t: output changed and returned error code 1 141s Failed test-git-clone.t: output changed 141s Failed test-git-gpg.t: output changed and returned error code 1 141s Failed test-git-submodules.t: output changed and returned error code 1 141s Failed test-git-tags.t#draft: output changed and returned error code 1 141s Failed test-git-tags.t#secret: output changed and returned error code 1 141s Failed test-git-workflow.t: output changed 141s Failed test-gitignore-permissions.t: output changed 141s Failed test-gitignore-share.t: output changed 141s Failed test-gitignore.t: output changed 141s Failed test-help.t: output changed 141s Failed test-hg-author.t: output changed and returned error code 1 141s Failed test-hg-branch.t: output changed and returned error code 1 141s Failed test-hg-clone.t: output changed and returned error code 1 141s Failed test-hg-tags.t: output changed and returned error code 1 141s Failed test-hook.t: output changed 141s Failed test-illegal-contents.t: output changed 141s Failed test-invalid-refs.t: output changed and returned error code 1 141s Failed test-keywords.t: output changed and returned error code 1 141s Failed test-merge.t: output changed and returned error code 1 141s Failed test-multiple-remotes.t: output changed 141s Failed test-octopus.t: output changed and returned error code 1 141s Failed test-orphan-tags.t: output changed and returned error code 1 141s Failed test-outgoing.t: output changed and returned error code 1 141s Failed test-phases-draft.t: output changed and returned error code 1 141s Failed test-phases-public.t#publish-defaults: output changed and returned error code 1 141s Failed test-phases-public.t#publish-specific: output changed and returned error code 1 141s Failed test-phases-remote.t: output changed and returned error code 1 141s Failed test-pull-after-obsolete.t: output changed and returned error code 1 141s Failed test-pull-after-rebase.t: output changed and returned error code 1 141s Failed test-pull-after-strip.t: output changed and returned error code 1 141s Failed test-pull.t#draft: output changed 141s Failed test-pull.t#secret: output changed 141s Failed test-push-anonymous.t: output changed and returned error code 1 141s Failed test-push-authors.t: output changed and returned error code 1 141s Failed test-push-detached.t: output changed and returned error code 1 141s Failed test-push-missing-commit.t: output changed and returned error code 1 141s Failed test-push-phases.t: output changed and returned error code 1 141s Failed test-push-r.t: output changed 141s Failed test-push-to-head.t: output changed and returned error code 1 141s Failed test-push.t: output changed and returned error code 1 141s Failed test-renames.t: output changed and returned error code 1 141s Failed test-serve-git.t: output changed 141s Failed test-serve-hg-static.t: output changed 141s Failed test-serve-hg.t#with-hggit: output changed and returned error code 1 141s Failed test-serve-hg.t#without-hggit: output changed and returned error code 1 141s Failed test-subrepos-delete.t: output changed and returned error code 1 141s Failed test-subrepos-drop.t: output changed and returned error code 1 141s Failed test-subrepos-push.t: output changed and returned error code 1 141s Failed test-subrepos-syntax.t: output changed and returned error code 1 141s Failed test-subrepos.t: output changed and returned error code 1 141s Failed test-timezone.t: output changed 141s Failed test-transactions.t: output changed 141s Failed test-transplant.t: output changed 141s Failed test-tree-decomposition.t: output changed and returned error code 1 141s Failed test-url-parsing.py: output changed and returned error code 1 141s Failed test-verify-fail.t: output changed 141s # Ran 73 tests, 9 skipped, 72 failed. 141s python hash seed: 3182637193 141s make: *** [Makefile:15: tests] Error 1 141s autopkgtest [00:28:44]: test testsuite: -----------------------] 142s testsuite FAIL non-zero exit status 2 142s autopkgtest [00:28:45]: test testsuite: - - - - - - - - - - results - - - - - - - - - - 142s autopkgtest [00:28:45]: test mercurial-git: preparing testbed 161s Creating nova instance adt-resolute-i386-hg-git-20260203-002623-juju-7f2275-prod-proposed-migration-environment-2-1c6bb326-fccd-4b66-a927-ed090352e137 from image adt/ubuntu-resolute-amd64-server-20260202.img (UUID 54e94ad2-f1e5-466e-b281-ee6f460760b3)... 228s autopkgtest [00:30:11]: testbed dpkg architecture: amd64 228s autopkgtest [00:30:11]: testbed apt version: 3.1.14 228s autopkgtest [00:30:11]: @@@@@@@@@@@@@@@@@@@@ test bed setup 229s autopkgtest [00:30:12]: testbed release detected to be: resolute 229s autopkgtest [00:30:12]: updating testbed package index (apt update) 229s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 229s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 229s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 230s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 230s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/restricted Sources [5256 B] 230s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [28.4 kB] 230s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [105 kB] 230s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1278 kB] 230s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 Packages [138 kB] 230s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/main i386 Packages [102 kB] 230s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/main amd64 c-n-f Metadata [3536 B] 230s Get:12 http://ftpmaster.internal/ubuntu resolute-proposed/restricted i386 Packages [3692 B] 230s Get:13 http://ftpmaster.internal/ubuntu resolute-proposed/restricted amd64 Packages [32.9 kB] 230s Get:14 http://ftpmaster.internal/ubuntu resolute-proposed/restricted amd64 c-n-f Metadata [336 B] 230s Get:15 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 Packages [1088 kB] 230s Get:16 http://ftpmaster.internal/ubuntu resolute-proposed/universe i386 Packages [409 kB] 230s Get:17 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 c-n-f Metadata [27.6 kB] 230s Get:18 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse i386 Packages [4240 B] 230s Get:19 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse amd64 Packages [24.9 kB] 230s Get:20 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse amd64 c-n-f Metadata [1076 B] 231s Fetched 3375 kB in 1s (4132 kB/s) 231s Reading package lists... 232s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 232s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 232s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 232s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 232s Reading package lists... 232s Reading package lists... 233s Building dependency tree... 233s Reading state information... 233s Calculating upgrade... 233s The following packages will be upgraded: 233s libexpat1 libgpg-error-l10n libgpg-error0 liblocale-gettext-perl pci.ids 233s 5 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 233s Need to get 501 kB of archives. 233s After this operation, 13.3 kB of additional disk space will be used. 233s Get:1 http://ftpmaster.internal/ubuntu resolute/main amd64 libexpat1 amd64 2.7.4-1 [94.0 kB] 233s Get:2 http://ftpmaster.internal/ubuntu resolute/main amd64 liblocale-gettext-perl amd64 1.07-8 [15.8 kB] 233s Get:3 http://ftpmaster.internal/ubuntu resolute/main amd64 libgpg-error-l10n all 1.58-2 [9244 B] 233s Get:4 http://ftpmaster.internal/ubuntu resolute/main amd64 libgpg-error0 amd64 1.58-2 [83.3 kB] 233s Get:5 http://ftpmaster.internal/ubuntu resolute/main amd64 pci.ids all 0.0~2026.01.31-1 [299 kB] 233s dpkg-preconfigure: unable to re-open stdin: No such file or directory 233s Fetched 501 kB in 0s (43.9 MB/s) 233s (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.) 233s Preparing to unpack .../libexpat1_2.7.4-1_amd64.deb ... 233s Unpacking libexpat1:amd64 (2.7.4-1) over (2.7.3-1) ... 233s Preparing to unpack .../liblocale-gettext-perl_1.07-8_amd64.deb ... 233s Unpacking liblocale-gettext-perl (1.07-8) over (1.07-7build1) ... 233s Preparing to unpack .../libgpg-error-l10n_1.58-2_all.deb ... 233s Unpacking libgpg-error-l10n (1.58-2) over (1.58-1build1) ... 233s Preparing to unpack .../libgpg-error0_1.58-2_amd64.deb ... 233s Unpacking libgpg-error0:amd64 (1.58-2) over (1.58-1build1) ... 233s Preparing to unpack .../pci.ids_0.0~2026.01.31-1_all.deb ... 233s Unpacking pci.ids (0.0~2026.01.31-1) over (0.0~2025.12.16-1) ... 233s Setting up libexpat1:amd64 (2.7.4-1) ... 233s Setting up pci.ids (0.0~2026.01.31-1) ... 233s Setting up libgpg-error0:amd64 (1.58-2) ... 233s Setting up libgpg-error-l10n (1.58-2) ... 233s Setting up liblocale-gettext-perl (1.07-8) ... 233s Processing triggers for man-db (2.13.1-1) ... 233s Processing triggers for libc-bin (2.42-2ubuntu4) ... 234s autopkgtest [00:30:17]: upgrading testbed (apt dist-upgrade and autopurge) 234s Reading package lists... 234s Building dependency tree... 234s Reading state information... 234s Calculating upgrade... 234s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 234s Reading package lists... 234s Building dependency tree... 234s Reading state information... 234s Solving dependencies... 234s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 237s Reading package lists... 237s Building dependency tree... 237s Reading state information... 237s Solving dependencies... 237s The following NEW packages will be installed: 237s git git-man liberror-perl mercurial mercurial-common mercurial-git 237s python3-dulwich 237s 0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded. 237s Need to get 9726 kB of archives. 237s After this operation, 51.7 MB of additional disk space will be used. 237s Get:1 http://ftpmaster.internal/ubuntu resolute/main amd64 liberror-perl all 0.17030-1 [23.5 kB] 237s Get:2 http://ftpmaster.internal/ubuntu resolute/main amd64 git-man all 1:2.51.0-1ubuntu1 [1179 kB] 238s Get:3 http://ftpmaster.internal/ubuntu resolute/main amd64 git amd64 1:2.51.0-1ubuntu1 [4414 kB] 238s Get:4 http://ftpmaster.internal/ubuntu resolute/universe amd64 mercurial-common all 7.1.1-1ubuntu1 [2789 kB] 238s Get:5 http://ftpmaster.internal/ubuntu resolute/universe amd64 mercurial amd64 7.1.1-1ubuntu1 [426 kB] 239s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/universe amd64 python3-dulwich amd64 1.0.0-2 [833 kB] 239s Get:7 http://ftpmaster.internal/ubuntu resolute/universe amd64 mercurial-git all 1.2.0-1 [60.9 kB] 239s Fetched 9726 kB in 2s (5947 kB/s) 239s Selecting previously unselected package liberror-perl. 239s (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.) 239s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 239s Unpacking liberror-perl (0.17030-1) ... 239s Selecting previously unselected package git-man. 239s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 239s Unpacking git-man (1:2.51.0-1ubuntu1) ... 239s Selecting previously unselected package git. 239s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_amd64.deb ... 239s Unpacking git (1:2.51.0-1ubuntu1) ... 239s Selecting previously unselected package mercurial-common. 239s Preparing to unpack .../3-mercurial-common_7.1.1-1ubuntu1_all.deb ... 239s Unpacking mercurial-common (7.1.1-1ubuntu1) ... 239s Selecting previously unselected package mercurial. 239s Preparing to unpack .../4-mercurial_7.1.1-1ubuntu1_amd64.deb ... 239s Unpacking mercurial (7.1.1-1ubuntu1) ... 239s Selecting previously unselected package python3-dulwich. 239s Preparing to unpack .../5-python3-dulwich_1.0.0-2_amd64.deb ... 239s Unpacking python3-dulwich (1.0.0-2) ... 239s Selecting previously unselected package mercurial-git. 239s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 239s Unpacking mercurial-git (1.2.0-1) ... 239s Setting up mercurial-common (7.1.1-1ubuntu1) ... 240s Setting up liberror-perl (0.17030-1) ... 240s Setting up python3-dulwich (1.0.0-2) ... 240s Setting up git-man (1:2.51.0-1ubuntu1) ... 240s Setting up mercurial (7.1.1-1ubuntu1) ... 240s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 240s Setting up mercurial-git (1.2.0-1) ... 240s mercurial-git extension is disabled by default. 240s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 241s Setting up git (1:2.51.0-1ubuntu1) ... 241s Processing triggers for man-db (2.13.1-1) ... 243s autopkgtest [00:30:26]: test environment configured for cross building 243s autopkgtest [00:30:26]: test mercurial-git: [----------------------- 243s Initialized empty Git repository in /tmp/autopkgtest.hVkeld/build.mNu/src/git_server/ 243s Cloning into 'git_clone'... 243s warning: You appear to have cloned an empty repository. 243s done. 243s [master (root-commit) 901554c] a 243s 1 file changed, 1 insertion(+) 243s create mode 100644 a 243s To /tmp/autopkgtest.hVkeld/build.mNu/src/git_server 243s * [new branch] master -> master 244s *** failed to import extension "hggit": cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 244s abort: repository git_server not found 244s autopkgtest [00:30:27]: test mercurial-git: -----------------------] 244s autopkgtest [00:30:27]: test mercurial-git: - - - - - - - - - - results - - - - - - - - - - 244s mercurial-git FAIL non-zero exit status 253 244s autopkgtest [00:30:27]: test mercurial-git: - - - - - - - - - - stderr - - - - - - - - - - 244s *** failed to import extension "hggit": cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 244s abort: repository git_server not found 245s autopkgtest [00:30:28]: @@@@@@@@@@@@@@@@@@@@ summary 245s testsuite FAIL non-zero exit status 2 245s mercurial-git FAIL non-zero exit status 253