0s autopkgtest [00:34:20]: starting date and time: 2026-02-03 00:34:20+0000 0s autopkgtest [00:34:20]: git checkout: 4b346b80 nova: make wait_reboot return success even when a no-op 0s autopkgtest [00:34:20]: host juju-7f2275-prod-proposed-migration-environment-15; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.01v33mi1/out --timeout-copy=6000 --needs-internet=try --setup-commands /home/ubuntu/autopkgtest-cloud/worker-config-production/setup-canonical.sh --apt-pocket=proposed=src:dulwich --apt-upgrade hg-git --timeout-short=300 --timeout-copy=20000 --timeout-build=20000 --env=ADT_TEST_TRIGGERS=dulwich/1.0.0-2 -- ssh -s /home/ubuntu/autopkgtest/ssh-setup/nova -- --flavor autopkgtest-cpu2-ram4-disk20-s390x --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@sto01-s390x-7.secgroup --name adt-resolute-s390x-hg-git-20260203-003420-juju-7f2275-prod-proposed-migration-environment-15-04d8ecaa-b23d-4b98-9d7b-5473c83d2cb8 --image adt/ubuntu-resolute-s390x-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-15 --net-id=net_prod-autopkgtest-workers-s390x -e TERM=linux --mirror=http://ftpmaster.internal/ubuntu/ 3s Creating nova instance adt-resolute-s390x-hg-git-20260203-003420-juju-7f2275-prod-proposed-migration-environment-15-04d8ecaa-b23d-4b98-9d7b-5473c83d2cb8 from image adt/ubuntu-resolute-s390x-server-20260202.img (UUID 2cf7d089-99a1-4704-af48-01d74c62f797)... 131s autopkgtest [00:36:31]: testbed dpkg architecture: s390x 132s autopkgtest [00:36:32]: testbed apt version: 3.1.14 133s autopkgtest [00:36:33]: @@@@@@@@@@@@@@@@@@@@ test bed setup 133s autopkgtest [00:36:33]: testbed release detected to be: None 134s autopkgtest [00:36:34]: updating testbed package index (apt update) 135s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 135s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 135s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 135s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 135s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1278 kB] 136s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [105 kB] 136s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [28.4 kB] 136s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/restricted Sources [5256 B] 136s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main s390x Packages [123 kB] 136s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/universe s390x Packages [1002 kB] 136s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse s390x Packages [7312 B] 138s Fetched 2672 kB in 3s (1037 kB/s) 144s Reading package lists... 146s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 146s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 146s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 146s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 152s Reading package lists... 152s Reading package lists... 153s Building dependency tree... 153s Reading state information... 154s Calculating upgrade... 155s The following packages will be upgraded: 155s libexpat1 liblocale-gettext-perl 155s 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 155s Need to get 116 kB of archives. 155s After this operation, 1024 B of additional disk space will be used. 155s Get:1 http://ftpmaster.internal/ubuntu resolute/main s390x libexpat1 s390x 2.7.4-1 [99.7 kB] 155s Get:2 http://ftpmaster.internal/ubuntu resolute/main s390x liblocale-gettext-perl s390x 1.07-8 [15.9 kB] 159s dpkg-preconfigure: unable to re-open stdin: No such file or directory 160s Fetched 116 kB in 0s (697 kB/s) 163s (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 ... 61953 files and directories currently installed.) 163s Preparing to unpack .../libexpat1_2.7.4-1_s390x.deb ... 163s Unpacking libexpat1:s390x (2.7.4-1) over (2.7.3-1) ... 163s Preparing to unpack .../liblocale-gettext-perl_1.07-8_s390x.deb ... 163s Unpacking liblocale-gettext-perl (1.07-8) over (1.07-7build1) ... 166s Setting up libexpat1:s390x (2.7.4-1) ... 167s Setting up liblocale-gettext-perl (1.07-8) ... 168s Processing triggers for man-db (2.13.1-1) ... 171s Processing triggers for libc-bin (2.42-2ubuntu4) ... 173s autopkgtest [00:37:13]: upgrading testbed (apt dist-upgrade and autopurge) 174s Reading package lists... 174s Building dependency tree... 174s Reading state information... 175s Calculating upgrade... 176s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 177s Reading package lists... 178s Building dependency tree... 178s Reading state information... 178s Solving dependencies... 179s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 184s autopkgtest [00:37:23]: testbed running kernel: Linux 6.18.0-9-generic #9-Ubuntu SMP Mon Jan 12 15:39:23 UTC 2026 184s autopkgtest [00:37:24]: @@@@@@@@@@@@@@@@@@@@ apt-source hg-git 187s Get:1 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (dsc) [2142 B] 187s Get:2 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (tar) [222 kB] 187s Get:3 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (diff) [6816 B] 189s gpgv: Signature made Sun Feb 16 14:22:41 2025 UTC 189s gpgv: using RSA key 8F6DE104377F3B11E741748731F3144544A1741A 189s gpgv: issuer "tchet@debian.org" 189s gpgv: Can't check signature: No public key 189s dpkg-source: warning: cannot verify inline signature for ./hg-git_1.2.0-1.dsc: no acceptable signature found 190s autopkgtest [00:37:30]: testing package hg-git version 1.2.0-1 190s autopkgtest [00:37:30]: build not needed 190s autopkgtest [00:37:30]: test testsuite: preparing testbed 191s Reading package lists... 192s Building dependency tree... 192s Reading state information... 193s Solving dependencies... 194s The following NEW packages will be installed: 194s git git-man liberror-perl mercurial mercurial-common mercurial-git 194s python3-dulwich unzip 194s 0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded. 194s Need to get 9815 kB of archives. 194s After this operation, 52.3 MB of additional disk space will be used. 194s Get:1 http://ftpmaster.internal/ubuntu resolute/main s390x liberror-perl all 0.17030-1 [23.5 kB] 194s Get:2 http://ftpmaster.internal/ubuntu resolute/main s390x git-man all 1:2.51.0-1ubuntu1 [1179 kB] 194s Get:3 http://ftpmaster.internal/ubuntu resolute/main s390x git s390x 1:2.51.0-1ubuntu1 [4290 kB] 195s Get:4 http://ftpmaster.internal/ubuntu resolute/universe s390x mercurial-common all 7.1.1-1ubuntu1 [2789 kB] 195s Get:5 http://ftpmaster.internal/ubuntu resolute/universe s390x mercurial s390x 7.1.1-1ubuntu1 [456 kB] 195s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/universe s390x python3-dulwich s390x 1.0.0-2 [833 kB] 195s Get:7 http://ftpmaster.internal/ubuntu resolute/universe s390x mercurial-git all 1.2.0-1 [60.9 kB] 195s Get:8 http://ftpmaster.internal/ubuntu resolute/main s390x unzip s390x 6.0-29ubuntu1 [185 kB] 197s Fetched 9815 kB in 1s (7233 kB/s) 197s Selecting previously unselected package liberror-perl. 197s (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 ... 61953 files and directories currently installed.) 197s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 197s Unpacking liberror-perl (0.17030-1) ... 197s Selecting previously unselected package git-man. 197s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 197s Unpacking git-man (1:2.51.0-1ubuntu1) ... 197s Selecting previously unselected package git. 197s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_s390x.deb ... 198s Unpacking git (1:2.51.0-1ubuntu1) ... 199s Selecting previously unselected package mercurial-common. 199s Preparing to unpack .../3-mercurial-common_7.1.1-1ubuntu1_all.deb ... 199s Unpacking mercurial-common (7.1.1-1ubuntu1) ... 200s Selecting previously unselected package mercurial. 201s Preparing to unpack .../4-mercurial_7.1.1-1ubuntu1_s390x.deb ... 201s Unpacking mercurial (7.1.1-1ubuntu1) ... 201s Selecting previously unselected package python3-dulwich. 201s Preparing to unpack .../5-python3-dulwich_1.0.0-2_s390x.deb ... 201s Unpacking python3-dulwich (1.0.0-2) ... 202s Selecting previously unselected package mercurial-git. 202s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 202s Unpacking mercurial-git (1.2.0-1) ... 202s Selecting previously unselected package unzip. 202s Preparing to unpack .../7-unzip_6.0-29ubuntu1_s390x.deb ... 202s Unpacking unzip (6.0-29ubuntu1) ... 202s Setting up mercurial-common (7.1.1-1ubuntu1) ... 212s Setting up unzip (6.0-29ubuntu1) ... 212s Setting up liberror-perl (0.17030-1) ... 212s Setting up python3-dulwich (1.0.0-2) ... 216s Setting up git-man (1:2.51.0-1ubuntu1) ... 216s Setting up mercurial (7.1.1-1ubuntu1) ... 218s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 218s Setting up mercurial-git (1.2.0-1) ... 218s mercurial-git extension is disabled by default. 218s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 219s Setting up git (1:2.51.0-1ubuntu1) ... 219s Processing triggers for man-db (2.13.1-1) ... 234s autopkgtest [00:38:14]: test testsuite: [----------------------- 236s no username found, using 'ubuntu@autopkgtest.local' instead 236s cd tests && /usr/bin/python3 run-tests.py --with-hg=/usr/bin/hg --blacklist=/tmp/autopkgtest.XGDgyD/build.lIf/src/debian/hg-git.test_blacklist 237s running 82 tests using 2 parallel processes 280s ssssss 280s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-pull.t 280s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-pull.t#draft.err 280s @@ -35,153 +35,132 @@ 280s 280s pull without a name 280s $ hg init hgrepo 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s $ cd hgrepo 280s $ hg pull ../gitrepo 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s pulling from ../gitrepo 280s - importing 3 git commits 280s - adding bookmark beta 280s - adding bookmark delta 280s - adding bookmark master 280s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 280s - (run 'hg heads' to see heads, 'hg merge' to merge) 280s + abort: repository ../gitrepo not found 280s + [255] 280s $ git --git-dir .hg/git for-each-ref 280s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 280s + fatal: not a git repository: '.hg/git' 280s + [128] 280s $ hg log -Tp 280s - 2|draft|delta|tip 280s - 1|draft|beta| 280s - 0|draft|master|t_alpha 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s $ cd .. 280s $ rm -rf hgrepo 280s 280s pull with an implied name 280s $ hg init hgrepo 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s $ cd hgrepo 280s $ echo "[paths]" >> .hg/hgrc 280s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 280s $ hg pull ../gitrepo 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s pulling from ../gitrepo 280s - importing 3 git commits 280s - adding bookmark beta 280s - adding bookmark delta 280s - adding bookmark master 280s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 280s - (run 'hg heads' to see heads, 'hg merge' to merge) 280s + abort: repository ../gitrepo not found 280s + [255] 280s $ git --git-dir .hg/git for-each-ref 280s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 280s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 280s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 280s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 280s + fatal: not a git repository: '.hg/git' 280s + [128] 280s $ hg log -Tp 280s - 2|draft|delta|default/delta tip 280s - 1|draft|beta|default/beta 280s - 0|draft|master|default/master t_alpha 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s $ cd .. 280s $ rm -rf hgrepo 280s 280s pull with an explicit name 280s $ hg init hgrepo 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s $ cd hgrepo 280s $ echo "[paths]" >> .hg/hgrc 280s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 280s $ hg pull 280s - pulling from $TESTTMP/gitrepo 280s - importing 3 git commits 280s - adding bookmark beta 280s - adding bookmark delta 280s - adding bookmark master 280s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 280s - (run 'hg heads' to see heads, 'hg merge' to merge) 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + pulling from $TESTTMP/gitrepo 280s + abort: repository $TESTTMP/gitrepo not found 280s + [255] 280s $ git --git-dir .hg/git for-each-ref 280s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 280s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 280s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 280s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 280s + fatal: not a git repository: '.hg/git' 280s + [128] 280s $ hg log -Tp 280s - 2|draft|delta|default/delta tip 280s - 1|draft|beta|default/beta 280s - 0|draft|master|default/master t_alpha 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s $ cd .. 280s $ rm -rf hgrepo 280s 280s pull a tag 280s $ hg init hgrepo 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s $ echo "[paths]" >> hgrepo/.hg/hgrc 280s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 280s $ hg -R hgrepo pull -r t_alpha 280s - pulling from $TESTTMP/gitrepo 280s - importing 1 git commits 280s - adding bookmark master 280s - new changesets ff7a2f2d8d70 (1 drafts) 280s - (run 'hg update' to get a working copy) 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + pulling from $TESTTMP/gitrepo 280s + abort: repository $TESTTMP/gitrepo not found 280s + [255] 280s $ hg -R hgrepo update t_alpha 280s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + abort: unknown revision 't_alpha' 280s + [10] 280s $ hg log -Tp -R hgrepo 280s - 0|draft|master|default/master t_alpha tip 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s 280s no-op pull 280s $ hg -R hgrepo pull -r t_alpha 280s - pulling from $TESTTMP/gitrepo 280s - no changes found 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + pulling from $TESTTMP/gitrepo 280s + abort: repository $TESTTMP/gitrepo not found 280s + [255] 280s 280s no-op pull with added bookmark 280s $ cd gitrepo 280s $ git checkout -qb epsilon t_alpha 280s $ cd .. 280s $ hg -R hgrepo pull -r epsilon 280s - pulling from $TESTTMP/gitrepo 280s - no changes found 280s - adding bookmark epsilon 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + pulling from $TESTTMP/gitrepo 280s + abort: repository $TESTTMP/gitrepo not found 280s + [255] 280s 280s pull something that doesn't exist 280s $ hg -R hgrepo pull -r kaflaflibob 280s - pulling from $TESTTMP/gitrepo 280s - abort: unknown revision 'kaflaflibob'!? (re) 280s - [10] 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + pulling from $TESTTMP/gitrepo 280s + abort: repository $TESTTMP/gitrepo not found 280s + [255] 280s 280s pull an ambiguous reference 280s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 280s $ hg -R hgrepo pull -r t_alpha 280s - pulling from $TESTTMP/gitrepo 280s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 280s - [10] 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + pulling from $TESTTMP/gitrepo 280s + abort: repository $TESTTMP/gitrepo not found 280s + [255] 280s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 280s 280s pull a branch 280s $ hg -R hgrepo pull -r beta 280s - pulling from $TESTTMP/gitrepo 280s - importing 1 git commits 280s - adding bookmark beta 280s - new changesets 7fe02317c63d (1 drafts) 280s - (run 'hg update' to get a working copy) 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + pulling from $TESTTMP/gitrepo 280s + abort: repository $TESTTMP/gitrepo not found 280s + [255] 280s $ hg -R hgrepo log --graph --template=phases 280s - o changeset: 1:7fe02317c63d 280s - | bookmark: beta 280s - | tag: default/beta 280s - | tag: tip 280s - | phase: draft 280s - | user: test 280s - | date: Mon Jan 01 00:00:11 2007 +0000 280s - | summary: add beta 280s - | 280s - @ changeset: 0:ff7a2f2d8d70 280s - bookmark: epsilon 280s - bookmark: master 280s - tag: default/epsilon 280s - tag: default/master 280s - tag: t_alpha 280s - phase: draft 280s - user: test 280s - date: Mon Jan 01 00:00:10 2007 +0000 280s - summary: add alpha 280s - 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s 280s no-op pull should affect phases 280s $ hg -R hgrepo phase -fs beta 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + abort: unknown revision 'beta' 280s + [10] 280s $ hg -R hgrepo pull -r beta 280s - pulling from $TESTTMP/gitrepo 280s - no changes found 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + pulling from $TESTTMP/gitrepo 280s + abort: repository $TESTTMP/gitrepo not found 280s + [255] 280s $ hg -R hgrepo phase beta 280s - 1: draft 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + abort: unknown revision 'beta' 280s + [10] 280s 280s 280s add another commit and tag to the git repo 280s @@ -196,50 +175,12 @@ 280s 280s pull everything else 280s $ hg -R hgrepo pull 280s - pulling from $TESTTMP/gitrepo 280s - importing 2 git commits 280s - adding bookmark delta 280s - updating bookmark master 280s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 280s - (run 'hg heads' to see heads, 'hg merge' to merge) 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + pulling from $TESTTMP/gitrepo 280s + abort: repository $TESTTMP/gitrepo not found 280s + [255] 280s $ hg -R hgrepo log --graph --template=phases 280s - o changeset: 3:6f898ad1f3e1 280s - | bookmark: master 280s - | tag: default/master 280s - | tag: tip 280s - | phase: draft 280s - | parent: 0:ff7a2f2d8d70 280s - | user: test 280s - | date: Mon Jan 01 00:00:13 2007 +0000 280s - | summary: add gamma 280s - | 280s - | o changeset: 2:678ebee93e38 280s - |/ bookmark: delta 280s - | tag: default/delta 280s - | phase: draft 280s - | parent: 0:ff7a2f2d8d70 280s - | user: test 280s - | date: Mon Jan 01 00:00:12 2007 +0000 280s - | summary: add delta 280s - | 280s - | o changeset: 1:7fe02317c63d 280s - |/ bookmark: beta 280s - | tag: default/beta 280s - | tag: t_beta 280s - | phase: draft 280s - | user: test 280s - | date: Mon Jan 01 00:00:11 2007 +0000 280s - | summary: add beta 280s - | 280s - @ changeset: 0:ff7a2f2d8d70 280s - bookmark: epsilon 280s - tag: default/epsilon 280s - tag: t_alpha 280s - phase: draft 280s - user: test 280s - date: Mon Jan 01 00:00:10 2007 +0000 280s - summary: add alpha 280s - 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s add a merge to the git repo, and delete the branch 280s $ cd gitrepo 280s $ git merge -q -m "Merge branch 'beta'" beta 280s @@ -252,60 +193,26 @@ 280s 280s pull the merge 280s $ hg -R hgrepo tags | grep default/beta 280s - default/beta 1:7fe02317c63d 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + [1] 280s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 280s - pulling from $TESTTMP/gitrepo 280s - importing 1 git commits 280s - updating bookmark master 280s - deleting bookmark beta 280s - new changesets a02330f767a4 (1 drafts) 280s - (run 'hg update' to get a working copy) 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + pulling from $TESTTMP/gitrepo 280s + abort: repository $TESTTMP/gitrepo not found 280s + [255] 280s $ hg -R hgrepo tags | grep default/beta 280s - default/beta 1:7fe02317c63d 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + [1] 280s $ hg -R hgrepo pull 280s - pulling from $TESTTMP/gitrepo 280s - no changes found 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + pulling from $TESTTMP/gitrepo 280s + abort: repository $TESTTMP/gitrepo not found 280s + [255] 280s $ hg -R hgrepo tags | grep default/beta 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s [1] 280s $ hg -R hgrepo log --graph 280s - o changeset: 4:a02330f767a4 280s - |\ bookmark: master 280s - | | tag: default/master 280s - | | tag: tip 280s - | | parent: 3:6f898ad1f3e1 280s - | | parent: 1:7fe02317c63d 280s - | | user: test 280s - | | date: Mon Jan 01 00:00:13 2007 +0000 280s - | | summary: Merge branch 'beta' 280s - | | 280s - | o changeset: 3:6f898ad1f3e1 280s - | | parent: 0:ff7a2f2d8d70 280s - | | user: test 280s - | | date: Mon Jan 01 00:00:13 2007 +0000 280s - | | summary: add gamma 280s - | | 280s - | | o changeset: 2:678ebee93e38 280s - | |/ bookmark: delta 280s - | | tag: default/delta 280s - | | parent: 0:ff7a2f2d8d70 280s - | | user: test 280s - | | date: Mon Jan 01 00:00:12 2007 +0000 280s - | | summary: add delta 280s - | | 280s - o | changeset: 1:7fe02317c63d 280s - |/ tag: t_beta 280s - | user: test 280s - | date: Mon Jan 01 00:00:11 2007 +0000 280s - | summary: add beta 280s - | 280s - @ changeset: 0:ff7a2f2d8d70 280s - bookmark: epsilon 280s - tag: default/epsilon 280s - tag: t_alpha 280s - user: test 280s - date: Mon Jan 01 00:00:10 2007 +0000 280s - summary: add alpha 280s - 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s pull with wildcards 280s $ cd gitrepo 280s $ git checkout -qb releases/v1 master 280s @@ -324,66 +231,12 @@ 280s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 280s $ cd .. 280s $ hg -R hgrepo pull -r 'releases/*' 280s - pulling from $TESTTMP/gitrepo 280s - importing 2 git commits 280s - adding bookmark releases/v1 280s - adding bookmark releases/v2 280s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 280s - (run 'hg heads .' to see heads, 'hg merge' to merge) 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + pulling from $TESTTMP/gitrepo 280s + abort: repository $TESTTMP/gitrepo not found 280s + [255] 280s $ hg -R hgrepo log --graph 280s - o changeset: 6:a3f95e150b0a 280s - | bookmark: releases/v2 280s - | tag: default/releases/v2 280s - | tag: tip 280s - | parent: 4:a02330f767a4 280s - | user: test 280s - | date: Mon Jan 01 00:00:15 2007 +0000 280s - | summary: add eta 280s - | 280s - | o changeset: 5:218b2d0660d3 280s - |/ bookmark: releases/v1 280s - | tag: default/releases/v1 280s - | user: test 280s - | date: Mon Jan 01 00:00:14 2007 +0000 280s - | summary: add zeta 280s - | 280s - o changeset: 4:a02330f767a4 280s - |\ bookmark: master 280s - | | tag: default/master 280s - | | parent: 3:6f898ad1f3e1 280s - | | parent: 1:7fe02317c63d 280s - | | user: test 280s - | | date: Mon Jan 01 00:00:13 2007 +0000 280s - | | summary: Merge branch 'beta' 280s - | | 280s - | o changeset: 3:6f898ad1f3e1 280s - | | parent: 0:ff7a2f2d8d70 280s - | | user: test 280s - | | date: Mon Jan 01 00:00:13 2007 +0000 280s - | | summary: add gamma 280s - | | 280s - | | o changeset: 2:678ebee93e38 280s - | |/ bookmark: delta 280s - | | tag: default/delta 280s - | | parent: 0:ff7a2f2d8d70 280s - | | user: test 280s - | | date: Mon Jan 01 00:00:12 2007 +0000 280s - | | summary: add delta 280s - | | 280s - o | changeset: 1:7fe02317c63d 280s - |/ tag: t_beta 280s - | user: test 280s - | date: Mon Jan 01 00:00:11 2007 +0000 280s - | summary: add beta 280s - | 280s - @ changeset: 0:ff7a2f2d8d70 280s - bookmark: epsilon 280s - tag: default/epsilon 280s - tag: t_alpha 280s - user: test 280s - date: Mon Jan 01 00:00:10 2007 +0000 280s - summary: add alpha 280s - 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s 280s add old and new commits to the git repo -- make sure we're using the commit date 280s and not the author date 280s @@ -412,21 +265,19 @@ 280s Master is now filtered, so it's just stays there: 280s 280s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 280s - pulling from $TESTTMP/gitrepo 280s - no changes found 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + pulling from $TESTTMP/gitrepo 280s + abort: repository $TESTTMP/gitrepo not found 280s + [255] 280s $ hg -R hgrepo pull 280s - pulling from $TESTTMP/gitrepo 280s - no changes found 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + pulling from $TESTTMP/gitrepo 280s + abort: repository $TESTTMP/gitrepo not found 280s + [255] 280s $ hg -R hgrepo log -r master 280s - changeset: 4:a02330f767a4 280s - bookmark: master 280s - tag: default/master 280s - parent: 3:6f898ad1f3e1 280s - parent: 1:7fe02317c63d 280s - user: test 280s - date: Mon Jan 01 00:00:13 2007 +0000 280s - summary: Merge branch 'beta' 280s - 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + abort: unknown revision 'master' 280s + [10] 280s 280s $ cd gitrepo 280s $ git checkout -q master 280s @@ -440,51 +291,13 @@ 280s > git tag -a -m 'tagging newtag' newtag 280s $ cd .. 280s $ hg -R hgrepo pull 280s - pulling from $TESTTMP/gitrepo 280s - importing 3 git commits 280s - updating bookmark master 280s - new changesets 49713da8f665:e103a73f33be (3 drafts) 280s - (run 'hg heads .' to see heads, 'hg merge' to merge) 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + pulling from $TESTTMP/gitrepo 280s + abort: repository $TESTTMP/gitrepo not found 280s + [255] 280s $ hg -R hgrepo heads 280s - changeset: 9:e103a73f33be 280s - bookmark: master 280s - tag: default/master 280s - tag: tip 280s - user: test 280s - date: Wed Jan 01 00:00:00 2014 +0000 280s - summary: newcommit 280s - 280s - changeset: 7:49713da8f665 280s - tag: newtag 280s - tag: oldtag 280s - parent: 4:a02330f767a4 280s - user: test 280s - date: Sat Mar 01 00:00:00 2014 +0000 280s - summary: oldtag 280s - 280s - changeset: 6:a3f95e150b0a 280s - bookmark: releases/v2 280s - tag: default/releases/v2 280s - parent: 4:a02330f767a4 280s - user: test 280s - date: Mon Jan 01 00:00:15 2007 +0000 280s - summary: add eta 280s - 280s - changeset: 5:218b2d0660d3 280s - bookmark: releases/v1 280s - tag: default/releases/v1 280s - user: test 280s - date: Mon Jan 01 00:00:14 2007 +0000 280s - summary: add zeta 280s - 280s - changeset: 2:678ebee93e38 280s - bookmark: delta 280s - tag: default/delta 280s - parent: 0:ff7a2f2d8d70 280s - user: test 280s - date: Mon Jan 01 00:00:12 2007 +0000 280s - summary: add delta 280s - 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + [1] 280s 280s test for ssh vulnerability 280s 280s @@ -494,18 +307,21 @@ 280s > EOF 280s 280s $ hg init a 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s $ cd a 280s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 280s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 280s [255] 280s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 280s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 280s [255] 280s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 280s - ssh: * fakehost%7?shellcommand* (glob) 280s - abort: git remote error: The remote server unexpectedly closed the connection. 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 280s [255] 280s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 280s - ssh: * fakehost%7?shellcommand* (glob) 280s - abort: git remote error: The remote server unexpectedly closed the connection. 280s - [255] 280s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 280s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 280s + [255] 280s 280s ERROR: test-pull.t#draft output changed 281s ! 281s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-pull.t 281s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-pull.t#secret.err 281s @@ -35,153 +35,132 @@ 281s 281s pull without a name 281s $ hg init hgrepo 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s $ cd hgrepo 281s $ hg pull ../gitrepo 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s pulling from ../gitrepo 281s - importing 3 git commits 281s - adding bookmark beta 281s - adding bookmark delta 281s - adding bookmark master 281s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 281s - (run 'hg heads' to see heads, 'hg merge' to merge) 281s + abort: repository ../gitrepo not found 281s + [255] 281s $ git --git-dir .hg/git for-each-ref 281s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 281s + fatal: not a git repository: '.hg/git' 281s + [128] 281s $ hg log -Tp 281s - 2|draft|delta|tip 281s - 1|draft|beta| 281s - 0|draft|master|t_alpha 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s $ cd .. 281s $ rm -rf hgrepo 281s 281s pull with an implied name 281s $ hg init hgrepo 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s $ cd hgrepo 281s $ echo "[paths]" >> .hg/hgrc 281s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 281s $ hg pull ../gitrepo 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s pulling from ../gitrepo 281s - importing 3 git commits 281s - adding bookmark beta 281s - adding bookmark delta 281s - adding bookmark master 281s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 281s - (run 'hg heads' to see heads, 'hg merge' to merge) 281s + abort: repository ../gitrepo not found 281s + [255] 281s $ git --git-dir .hg/git for-each-ref 281s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 281s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 281s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 281s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 281s + fatal: not a git repository: '.hg/git' 281s + [128] 281s $ hg log -Tp 281s - 2|draft|delta|default/delta tip 281s - 1|draft|beta|default/beta 281s - 0|draft|master|default/master t_alpha 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s $ cd .. 281s $ rm -rf hgrepo 281s 281s pull with an explicit name 281s $ hg init hgrepo 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s $ cd hgrepo 281s $ echo "[paths]" >> .hg/hgrc 281s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 281s $ hg pull 281s - pulling from $TESTTMP/gitrepo 281s - importing 3 git commits 281s - adding bookmark beta 281s - adding bookmark delta 281s - adding bookmark master 281s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 281s - (run 'hg heads' to see heads, 'hg merge' to merge) 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + pulling from $TESTTMP/gitrepo 281s + abort: repository $TESTTMP/gitrepo not found 281s + [255] 281s $ git --git-dir .hg/git for-each-ref 281s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 281s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 281s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 281s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 281s + fatal: not a git repository: '.hg/git' 281s + [128] 281s $ hg log -Tp 281s - 2|draft|delta|default/delta tip 281s - 1|draft|beta|default/beta 281s - 0|draft|master|default/master t_alpha 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s $ cd .. 281s $ rm -rf hgrepo 281s 281s pull a tag 281s $ hg init hgrepo 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s $ echo "[paths]" >> hgrepo/.hg/hgrc 281s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 281s $ hg -R hgrepo pull -r t_alpha 281s - pulling from $TESTTMP/gitrepo 281s - importing 1 git commits 281s - adding bookmark master 281s - new changesets ff7a2f2d8d70 (1 drafts) 281s - (run 'hg update' to get a working copy) 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + pulling from $TESTTMP/gitrepo 281s + abort: repository $TESTTMP/gitrepo not found 281s + [255] 281s $ hg -R hgrepo update t_alpha 281s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + abort: unknown revision 't_alpha' 281s + [10] 281s $ hg log -Tp -R hgrepo 281s - 0|draft|master|default/master t_alpha tip 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s 281s no-op pull 281s $ hg -R hgrepo pull -r t_alpha 281s - pulling from $TESTTMP/gitrepo 281s - no changes found 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + pulling from $TESTTMP/gitrepo 281s + abort: repository $TESTTMP/gitrepo not found 281s + [255] 281s 281s no-op pull with added bookmark 281s $ cd gitrepo 281s $ git checkout -qb epsilon t_alpha 281s $ cd .. 281s $ hg -R hgrepo pull -r epsilon 281s - pulling from $TESTTMP/gitrepo 281s - no changes found 281s - adding bookmark epsilon 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + pulling from $TESTTMP/gitrepo 281s + abort: repository $TESTTMP/gitrepo not found 281s + [255] 281s 281s pull something that doesn't exist 281s $ hg -R hgrepo pull -r kaflaflibob 281s - pulling from $TESTTMP/gitrepo 281s - abort: unknown revision 'kaflaflibob'!? (re) 281s - [10] 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + pulling from $TESTTMP/gitrepo 281s + abort: repository $TESTTMP/gitrepo not found 281s + [255] 281s 281s pull an ambiguous reference 281s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 281s $ hg -R hgrepo pull -r t_alpha 281s - pulling from $TESTTMP/gitrepo 281s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 281s - [10] 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + pulling from $TESTTMP/gitrepo 281s + abort: repository $TESTTMP/gitrepo not found 281s + [255] 281s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 281s 281s pull a branch 281s $ hg -R hgrepo pull -r beta 281s - pulling from $TESTTMP/gitrepo 281s - importing 1 git commits 281s - adding bookmark beta 281s - new changesets 7fe02317c63d (1 drafts) 281s - (run 'hg update' to get a working copy) 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + pulling from $TESTTMP/gitrepo 281s + abort: repository $TESTTMP/gitrepo not found 281s + [255] 281s $ hg -R hgrepo log --graph --template=phases 281s - o changeset: 1:7fe02317c63d 281s - | bookmark: beta 281s - | tag: default/beta 281s - | tag: tip 281s - | phase: draft 281s - | user: test 281s - | date: Mon Jan 01 00:00:11 2007 +0000 281s - | summary: add beta 281s - | 281s - @ changeset: 0:ff7a2f2d8d70 281s - bookmark: epsilon 281s - bookmark: master 281s - tag: default/epsilon 281s - tag: default/master 281s - tag: t_alpha 281s - phase: draft 281s - user: test 281s - date: Mon Jan 01 00:00:10 2007 +0000 281s - summary: add alpha 281s - 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s 281s no-op pull should affect phases 281s $ hg -R hgrepo phase -fs beta 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + abort: unknown revision 'beta' 281s + [10] 281s $ hg -R hgrepo pull -r beta 281s - pulling from $TESTTMP/gitrepo 281s - no changes found 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + pulling from $TESTTMP/gitrepo 281s + abort: repository $TESTTMP/gitrepo not found 281s + [255] 281s $ hg -R hgrepo phase beta 281s - 1: draft 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + abort: unknown revision 'beta' 281s + [10] 281s 281s 281s add another commit and tag to the git repo 281s @@ -196,50 +175,12 @@ 281s 281s pull everything else 281s $ hg -R hgrepo pull 281s - pulling from $TESTTMP/gitrepo 281s - importing 2 git commits 281s - adding bookmark delta 281s - updating bookmark master 281s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 281s - (run 'hg heads' to see heads, 'hg merge' to merge) 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + pulling from $TESTTMP/gitrepo 281s + abort: repository $TESTTMP/gitrepo not found 281s + [255] 281s $ hg -R hgrepo log --graph --template=phases 281s - o changeset: 3:6f898ad1f3e1 281s - | bookmark: master 281s - | tag: default/master 281s - | tag: tip 281s - | phase: draft 281s - | parent: 0:ff7a2f2d8d70 281s - | user: test 281s - | date: Mon Jan 01 00:00:13 2007 +0000 281s - | summary: add gamma 281s - | 281s - | o changeset: 2:678ebee93e38 281s - |/ bookmark: delta 281s - | tag: default/delta 281s - | phase: draft 281s - | parent: 0:ff7a2f2d8d70 281s - | user: test 281s - | date: Mon Jan 01 00:00:12 2007 +0000 281s - | summary: add delta 281s - | 281s - | o changeset: 1:7fe02317c63d 281s - |/ bookmark: beta 281s - | tag: default/beta 281s - | tag: t_beta 281s - | phase: draft 281s - | user: test 281s - | date: Mon Jan 01 00:00:11 2007 +0000 281s - | summary: add beta 281s - | 281s - @ changeset: 0:ff7a2f2d8d70 281s - bookmark: epsilon 281s - tag: default/epsilon 281s - tag: t_alpha 281s - phase: draft 281s - user: test 281s - date: Mon Jan 01 00:00:10 2007 +0000 281s - summary: add alpha 281s - 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s add a merge to the git repo, and delete the branch 281s $ cd gitrepo 281s $ git merge -q -m "Merge branch 'beta'" beta 281s @@ -252,60 +193,26 @@ 281s 281s pull the merge 281s $ hg -R hgrepo tags | grep default/beta 281s - default/beta 1:7fe02317c63d 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + [1] 281s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 281s - pulling from $TESTTMP/gitrepo 281s - importing 1 git commits 281s - updating bookmark master 281s - deleting bookmark beta 281s - new changesets a02330f767a4 (1 drafts) 281s - (run 'hg update' to get a working copy) 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + pulling from $TESTTMP/gitrepo 281s + abort: repository $TESTTMP/gitrepo not found 281s + [255] 281s $ hg -R hgrepo tags | grep default/beta 281s - default/beta 1:7fe02317c63d 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + [1] 281s $ hg -R hgrepo pull 281s - pulling from $TESTTMP/gitrepo 281s - no changes found 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + pulling from $TESTTMP/gitrepo 281s + abort: repository $TESTTMP/gitrepo not found 281s + [255] 281s $ hg -R hgrepo tags | grep default/beta 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s [1] 281s $ hg -R hgrepo log --graph 281s - o changeset: 4:a02330f767a4 281s - |\ bookmark: master 281s - | | tag: default/master 281s - | | tag: tip 281s - | | parent: 3:6f898ad1f3e1 281s - | | parent: 1:7fe02317c63d 281s - | | user: test 281s - | | date: Mon Jan 01 00:00:13 2007 +0000 281s - | | summary: Merge branch 'beta' 281s - | | 281s - | o changeset: 3:6f898ad1f3e1 281s - | | parent: 0:ff7a2f2d8d70 281s - | | user: test 281s - | | date: Mon Jan 01 00:00:13 2007 +0000 281s - | | summary: add gamma 281s - | | 281s - | | o changeset: 2:678ebee93e38 281s - | |/ bookmark: delta 281s - | | tag: default/delta 281s - | | parent: 0:ff7a2f2d8d70 281s - | | user: test 281s - | | date: Mon Jan 01 00:00:12 2007 +0000 281s - | | summary: add delta 281s - | | 281s - o | changeset: 1:7fe02317c63d 281s - |/ tag: t_beta 281s - | user: test 281s - | date: Mon Jan 01 00:00:11 2007 +0000 281s - | summary: add beta 281s - | 281s - @ changeset: 0:ff7a2f2d8d70 281s - bookmark: epsilon 281s - tag: default/epsilon 281s - tag: t_alpha 281s - user: test 281s - date: Mon Jan 01 00:00:10 2007 +0000 281s - summary: add alpha 281s - 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s pull with wildcards 281s $ cd gitrepo 281s $ git checkout -qb releases/v1 master 281s @@ -324,66 +231,12 @@ 281s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 281s $ cd .. 281s $ hg -R hgrepo pull -r 'releases/*' 281s - pulling from $TESTTMP/gitrepo 281s - importing 2 git commits 281s - adding bookmark releases/v1 281s - adding bookmark releases/v2 281s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 281s - (run 'hg heads .' to see heads, 'hg merge' to merge) 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + pulling from $TESTTMP/gitrepo 281s + abort: repository $TESTTMP/gitrepo not found 281s + [255] 281s $ hg -R hgrepo log --graph 281s - o changeset: 6:a3f95e150b0a 281s - | bookmark: releases/v2 281s - | tag: default/releases/v2 281s - | tag: tip 281s - | parent: 4:a02330f767a4 281s - | user: test 281s - | date: Mon Jan 01 00:00:15 2007 +0000 281s - | summary: add eta 281s - | 281s - | o changeset: 5:218b2d0660d3 281s - |/ bookmark: releases/v1 281s - | tag: default/releases/v1 281s - | user: test 281s - | date: Mon Jan 01 00:00:14 2007 +0000 281s - | summary: add zeta 281s - | 281s - o changeset: 4:a02330f767a4 281s - |\ bookmark: master 281s - | | tag: default/master 281s - | | parent: 3:6f898ad1f3e1 281s - | | parent: 1:7fe02317c63d 281s - | | user: test 281s - | | date: Mon Jan 01 00:00:13 2007 +0000 281s - | | summary: Merge branch 'beta' 281s - | | 281s - | o changeset: 3:6f898ad1f3e1 281s - | | parent: 0:ff7a2f2d8d70 281s - | | user: test 281s - | | date: Mon Jan 01 00:00:13 2007 +0000 281s - | | summary: add gamma 281s - | | 281s - | | o changeset: 2:678ebee93e38 281s - | |/ bookmark: delta 281s - | | tag: default/delta 281s - | | parent: 0:ff7a2f2d8d70 281s - | | user: test 281s - | | date: Mon Jan 01 00:00:12 2007 +0000 281s - | | summary: add delta 281s - | | 281s - o | changeset: 1:7fe02317c63d 281s - |/ tag: t_beta 281s - | user: test 281s - | date: Mon Jan 01 00:00:11 2007 +0000 281s - | summary: add beta 281s - | 281s - @ changeset: 0:ff7a2f2d8d70 281s - bookmark: epsilon 281s - tag: default/epsilon 281s - tag: t_alpha 281s - user: test 281s - date: Mon Jan 01 00:00:10 2007 +0000 281s - summary: add alpha 281s - 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s 281s add old and new commits to the git repo -- make sure we're using the commit date 281s and not the author date 281s @@ -412,21 +265,19 @@ 281s Master is now filtered, so it's just stays there: 281s 281s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 281s - pulling from $TESTTMP/gitrepo 281s - no changes found 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + pulling from $TESTTMP/gitrepo 281s + abort: repository $TESTTMP/gitrepo not found 281s + [255] 281s $ hg -R hgrepo pull 281s - pulling from $TESTTMP/gitrepo 281s - no changes found 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + pulling from $TESTTMP/gitrepo 281s + abort: repository $TESTTMP/gitrepo not found 281s + [255] 281s $ hg -R hgrepo log -r master 281s - changeset: 4:a02330f767a4 281s - bookmark: master 281s - tag: default/master 281s - parent: 3:6f898ad1f3e1 281s - parent: 1:7fe02317c63d 281s - user: test 281s - date: Mon Jan 01 00:00:13 2007 +0000 281s - summary: Merge branch 'beta' 281s - 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + abort: unknown revision 'master' 281s + [10] 281s 281s $ cd gitrepo 281s $ git checkout -q master 281s @@ -440,51 +291,13 @@ 281s > git tag -a -m 'tagging newtag' newtag 281s $ cd .. 281s $ hg -R hgrepo pull 281s - pulling from $TESTTMP/gitrepo 281s - importing 3 git commits 281s - updating bookmark master 281s - new changesets 49713da8f665:e103a73f33be (3 drafts) 281s - (run 'hg heads .' to see heads, 'hg merge' to merge) 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + pulling from $TESTTMP/gitrepo 281s + abort: repository $TESTTMP/gitrepo not found 281s + [255] 281s $ hg -R hgrepo heads 281s - changeset: 9:e103a73f33be 281s - bookmark: master 281s - tag: default/master 281s - tag: tip 281s - user: test 281s - date: Wed Jan 01 00:00:00 2014 +0000 281s - summary: newcommit 281s - 281s - changeset: 7:49713da8f665 281s - tag: newtag 281s - tag: oldtag 281s - parent: 4:a02330f767a4 281s - user: test 281s - date: Sat Mar 01 00:00:00 2014 +0000 281s - summary: oldtag 281s - 281s - changeset: 6:a3f95e150b0a 281s - bookmark: releases/v2 281s - tag: default/releases/v2 281s - parent: 4:a02330f767a4 281s - user: test 281s - date: Mon Jan 01 00:00:15 2007 +0000 281s - summary: add eta 281s - 281s - changeset: 5:218b2d0660d3 281s - bookmark: releases/v1 281s - tag: default/releases/v1 281s - user: test 281s - date: Mon Jan 01 00:00:14 2007 +0000 281s - summary: add zeta 281s - 281s - changeset: 2:678ebee93e38 281s - bookmark: delta 281s - tag: default/delta 281s - parent: 0:ff7a2f2d8d70 281s - user: test 281s - date: Mon Jan 01 00:00:12 2007 +0000 281s - summary: add delta 281s - 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + [1] 281s 281s test for ssh vulnerability 281s 281s @@ -494,18 +307,21 @@ 281s > EOF 281s 281s $ hg init a 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s $ cd a 281s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 281s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 281s [255] 281s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 281s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 281s [255] 281s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 281s - ssh: * fakehost%7?shellcommand* (glob) 281s - abort: git remote error: The remote server unexpectedly closed the connection. 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 281s [255] 281s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 281s - ssh: * fakehost%7?shellcommand* (glob) 281s - abort: git remote error: The remote server unexpectedly closed the connection. 281s - [255] 281s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 281s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 281s + [255] 281s 281s ERROR: test-pull.t#secret output changed 282s ! 282s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-git-submodules.t 282s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-git-submodules.t.err 282s @@ -188,261 +188,9 @@ 282s $ cd .. 282s 282s $ hg clone gitrepo2 hgrepo 282s - importing 10 git commits 282s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 282s - updating to bookmark master 282s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 282s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 282s + abort: repository gitrepo2 not found 282s + [255] 282s $ cd hgrepo 282s + $TESTTMP.sh: 133: cd: can't cd to hgrepo 282s $ hg log --graph 282s - @ changeset: 9:0ad944b2c4d8 282s - | bookmark: master 282s - | tag: default/master 282s - | tag: tip 282s - | user: test 282s - | date: Mon Jan 01 00:00:12 2007 +0000 282s - | summary: remove all subrepos 282s - | 282s - o changeset: 8:33da452ef22f 282s - | user: test 282s - | date: Mon Jan 01 00:00:12 2007 +0000 282s - | summary: replace subrepo with symlink 282s - | 282s - o changeset: 7:acebec53c0fc 282s - | user: test 282s - | date: Mon Jan 01 00:00:12 2007 +0000 282s - | summary: replace symlink with subrepo 282s - | 282s - o changeset: 6:78c2ea52db4b 282s - | user: test 282s - | date: Mon Jan 01 00:00:12 2007 +0000 282s - | summary: add symlink 282s - | 282s - o changeset: 5:c0d52ffc59b8 282s - | user: test 282s - | date: Mon Jan 01 00:00:12 2007 +0000 282s - | summary: replace file with subrepo 282s - | 282s - o changeset: 4:73e078a178a0 282s - | user: test 282s - | date: Mon Jan 01 00:00:12 2007 +0000 282s - | summary: replace subrepo with file 282s - | 282s - o changeset: 3:29e236ba4c06 282s - | user: test 282s - | date: Mon Jan 01 00:00:12 2007 +0000 282s - | summary: add another subrepo 282s - | 282s - o changeset: 2:a6075a162f62 282s - | user: test 282s - | date: Mon Jan 01 00:00:12 2007 +0000 282s - | summary: change subrepo commit 282s - | 282s - o changeset: 1:a4036e758995 282s - | user: test 282s - | date: Mon Jan 01 00:00:11 2007 +0000 282s - | summary: add subrepo 282s - | 282s - o changeset: 0:ff7a2f2d8d70 282s - user: test 282s - date: Mon Jan 01 00:00:10 2007 +0000 282s - summary: add alpha 282s - 282s - $ hg book 282s - * master 9:0ad944b2c4d8 282s - 282s -(add subrepo) 282s - $ hg cat -r 1 .hgsubstate 282s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo 282s - $ hg cat -r 1 .hgsub 282s - subrepo = [git]../gitsubrepo 282s - $ hg gverify -r 1 282s - verifying rev a4036e758995 against git commit e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 282s - 282s -(change subrepo commit) 282s - $ hg cat -r 2 .hgsubstate 282s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 282s - $ hg cat -r 2 .hgsub 282s - subrepo = [git]../gitsubrepo 282s - $ hg gverify -r 2 282s - verifying rev a6075a162f62 against git commit a000567ceefbd9a2ce364e0dea6e298010b02b6d 282s - 282s -(add another subrepo) 282s - $ hg cat -r 3 .hgsubstate 282s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 282s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 282s - $ hg cat -r 3 .hgsub 282s - subrepo = [git]../gitsubrepo 282s - subrepo2 = [git]../gitsubrepo 282s - $ hg gverify -r 3 282s - verifying rev 29e236ba4c06 against git commit 6e219527869fa40eb6ffbdd013cd86d576b26b01 282s - 282s -(replace subrepo with file) 282s - $ hg cat -r 4 .hgsubstate 282s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 282s - $ hg cat -r 4 .hgsub 282s - subrepo2 = [git]../gitsubrepo 282s - $ hg manifest -r 4 282s - .hgsub 282s - .hgsubstate 282s - alpha 282s - subrepo 282s - $ hg gverify -r 4 282s - verifying rev 73e078a178a0 against git commit f6436a472da00f581d8d257e9bbaf3c358a5e88c 282s - 282s -(replace file with subrepo) 282s - $ hg cat -r 5 .hgsubstate 282s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 282s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 282s - $ hg cat -r 5 .hgsub 282s - subrepo2 = [git]../gitsubrepo 282s - alpha = [git]../gitsubrepo 282s - $ hg manifest -r 5 282s - .hgsub 282s - .hgsubstate 282s - subrepo 282s - $ hg gverify -r 5 282s - verifying rev c0d52ffc59b8 against git commit 88171163bf4795b5570924e51d5f8ede33f8bc28 282s - 282s -(replace symlink with subrepo) 282s - $ hg cat -r 7 .hgsub 282s - subrepo2 = [git]../gitsubrepo 282s - alpha = [git]../gitsubrepo 282s - foolink = [git]../gitsubrepo 282s - $ hg cat -r 7 .hgsubstate 282s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 282s - 6e4ad8da50204560c00fa25e4987eb2e239029ba foolink 282s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 282s - $ hg gverify -r 7 282s - verifying rev acebec53c0fc against git commit e3288fa737d429a60637b3b6782cb25b8298bc00 282s - 282s -(replace subrepo with symlink) 282s - $ hg cat -r 8 .hgsub .hgsubstate 282s - subrepo2 = [git]../gitsubrepo 282s - alpha = [git]../gitsubrepo 282s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 282s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 282s - 282s - $ hg gverify -r 8 282s - verifying rev 33da452ef22f against git commit d28364013fe1a0fde56c0e1921e49ecdeee8571d 282s - 282s -(remove all subrepos) 282s - $ hg cat -r 9 .hgsub .hgsubstate 282s - .hgsub: no such file in rev 0ad944b2c4d8 282s - .hgsubstate: no such file in rev 0ad944b2c4d8 282s - [1] 282s - $ hg gverify -r 9 282s - verifying rev 0ad944b2c4d8 against git commit 15ba94929481c654814178aac1dbca06ae688718 282s - 282s - $ hg debug-remove-hggit-state 282s - clearing out the git cache data 282s - $ hg gexport 282s - $ cd .hg/git 282s - $ git log --pretty=oneline 282s - 73c15b74fb81fa0cc60e9c59c73787a9f26c778b remove all subrepos 282s - d28364013fe1a0fde56c0e1921e49ecdeee8571d replace subrepo with symlink 282s - e3288fa737d429a60637b3b6782cb25b8298bc00 replace symlink with subrepo 282s - 2d1c135447d11df4dfe96dd5d4f37926dc5c821d add symlink 282s - 88171163bf4795b5570924e51d5f8ede33f8bc28 replace file with subrepo 282s - f6436a472da00f581d8d257e9bbaf3c358a5e88c replace subrepo with file 282s - 6e219527869fa40eb6ffbdd013cd86d576b26b01 add another subrepo 282s - a000567ceefbd9a2ce364e0dea6e298010b02b6d change subrepo commit 282s - e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 add subrepo 282s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 add alpha 282s - 282s -test with rename detection enabled -- simply checking that the Mercurial hashes 282s -are the same is enough 282s - $ cd ../../.. 282s - $ hg --config git.similarity=100 clone gitrepo2 hgreporenames 282s - importing 10 git commits 282s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 282s - updating to bookmark master 282s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 282s - $ cd hgreporenames 282s - $ hg log --graph 282s - @ changeset: 9:0ad944b2c4d8 282s - | bookmark: master 282s - | tag: default/master 282s - | tag: tip 282s - | user: test 282s - | date: Mon Jan 01 00:00:12 2007 +0000 282s - | summary: remove all subrepos 282s - | 282s - o changeset: 8:33da452ef22f 282s - | user: test 282s - | date: Mon Jan 01 00:00:12 2007 +0000 282s - | summary: replace subrepo with symlink 282s - | 282s - o changeset: 7:acebec53c0fc 282s - | user: test 282s - | date: Mon Jan 01 00:00:12 2007 +0000 282s - | summary: replace symlink with subrepo 282s - | 282s - o changeset: 6:78c2ea52db4b 282s - | user: test 282s - | date: Mon Jan 01 00:00:12 2007 +0000 282s - | summary: add symlink 282s - | 282s - o changeset: 5:c0d52ffc59b8 282s - | user: test 282s - | date: Mon Jan 01 00:00:12 2007 +0000 282s - | summary: replace file with subrepo 282s - | 282s - o changeset: 4:73e078a178a0 282s - | user: test 282s - | date: Mon Jan 01 00:00:12 2007 +0000 282s - | summary: replace subrepo with file 282s - | 282s - o changeset: 3:29e236ba4c06 282s - | user: test 282s - | date: Mon Jan 01 00:00:12 2007 +0000 282s - | summary: add another subrepo 282s - | 282s - o changeset: 2:a6075a162f62 282s - | user: test 282s - | date: Mon Jan 01 00:00:12 2007 +0000 282s - | summary: change subrepo commit 282s - | 282s - o changeset: 1:a4036e758995 282s - | user: test 282s - | date: Mon Jan 01 00:00:11 2007 +0000 282s - | summary: add subrepo 282s - | 282s - o changeset: 0:ff7a2f2d8d70 282s - user: test 282s - date: Mon Jan 01 00:00:10 2007 +0000 282s - summary: add alpha 282s - 282s - $ cd .. 282s - 282s -test handling of an invalid .gitmodules file (#380) 282s - 282s - $ git init --quiet gitrepo-issue380 282s - $ cd gitrepo-issue380 282s - $ git submodule add ../gitsubrepo 282s - Cloning into '$TESTTMP/gitrepo-issue380/gitsubrepo'... 282s - done. 282s - $ fn_git_commit -m 'add a submodule' 282s - $ cat >> .gitmodules < <<<<<<< HEAD 282s - > EOF 282s - $ fn_git_commit -a -m 'b0rken .gitmodules' 282s - $ git status 282s - fatal: bad config line 4 in file $TESTTMP/gitrepo-issue380/.gitmodules 282s - [128] 282s - $ sed -i.orig /HEAD/d .gitmodules 282s - $ fn_git_commit -a -m 'fix .gitmodules' 282s - $ git status 282s - On branch master 282s - Untracked files: 282s - (use "git add ..." to include in what will be committed) 282s - .gitmodules.orig 282s - 282s - nothing added to commit but untracked files present (use "git add" to track) 282s - $ cd .. 282s - $ git clone gitrepo-issue380 gitrepo-issue380~ 282s - Cloning into 'gitrepo-issue380~'... 282s - done. 282s - $ hg clone -U gitrepo-issue380 hgrepo-issue380 282s - importing 3 git commits 282s - warning: failed to parse .gitmodules in 2e4ec4293822 282s - new changesets ed60e5fbc192:9dfc0cdf1787 (3 drafts) 282s 282s ERROR: test-git-submodules.t output changed 285s !s 285s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-renames.t 285s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-renames.t.err 285s @@ -95,494 +95,9 @@ 285s 285s $ cd .. 285s $ hg clone -q repo.git hgrepo 285s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 285s + abort: repository repo.git not found 285s + [255] 285s $ cd hgrepo 285s + $TESTTMP.sh: 115: cd: can't cd to hgrepo 285s $ hg book master -q 285s - $ hg log -p --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 285s - @ 8 497105ddbe119aa40af691eb2b1a029c29bf5247 remove submodule and rename back 285s - | branch=default hg-git-rename-source=git 285s - | 285s - | diff --git a/.hgsub b/.hgsub 285s - | --- a/.hgsub 285s - | +++ b/.hgsub 285s - | @@ -1,2 +1,1 @@ 285s - | gitsubmodule2 = [git]../gitsubmodule 285s - | -gamma = [git]../gitsubmodule 285s - | diff --git a/.hgsubstate b/.hgsubstate 285s - | --- a/.hgsubstate 285s - | +++ b/.hgsubstate 285s - | @@ -1,2 +1,1 @@ 285s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 285s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 285s - | diff --git a/gamma-new b/gamma 285s - | rename from gamma-new 285s - | rename to gamma 285s - | 285s - o 7 adfc1ce8461d3174dcf8425e112e2fa848de3913 rename and add submodule 285s - | branch=default hg-git-rename-source=git 285s - | 285s - | diff --git a/.hgsub b/.hgsub 285s - | --- a/.hgsub 285s - | +++ b/.hgsub 285s - | @@ -1,1 +1,2 @@ 285s - | gitsubmodule2 = [git]../gitsubmodule 285s - | +gamma = [git]../gitsubmodule 285s - | diff --git a/.hgsubstate b/.hgsubstate 285s - | --- a/.hgsubstate 285s - | +++ b/.hgsubstate 285s - | @@ -1,1 +1,2 @@ 285s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 285s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 285s - | diff --git a/gamma b/gamma-new 285s - | rename from gamma 285s - | rename to gamma-new 285s - | 285s - o 6 62c1a4b07240b53a71be1b1a46e94e99132c5391 beta renamed back 285s - | branch=default hg-git-rename-source=git 285s - | 285s - | diff --git a/beta b/beta 285s - | old mode 120000 285s - | new mode 100644 285s - | --- a/beta 285s - | +++ b/beta 285s - | @@ -1,1 +1,12 @@ 285s - | -beta-new 285s - | \ No newline at end of file 285s - | +1 285s - | +2 285s - | +3 285s - | +4 285s - | +5 285s - | +6 285s - | +7 285s - | +8 285s - | +9 285s - | +10 285s - | +11 285s - | +12 285s - | diff --git a/beta-new b/beta-new 285s - | deleted file mode 100644 285s - | --- a/beta-new 285s - | +++ /dev/null 285s - | @@ -1,12 +0,0 @@ 285s - | -1 285s - | -2 285s - | -3 285s - | -4 285s - | -5 285s - | -6 285s - | -7 285s - | -8 285s - | -9 285s - | -10 285s - | -11 285s - | -12 285s - | 285s - o 5 f93fefed957cff2220d3f0d11182398350b5fa9a beta renamed 285s - | branch=default hg-git-rename-source=git 285s - | 285s - | diff --git a/beta b/beta 285s - | old mode 100644 285s - | new mode 120000 285s - | --- a/beta 285s - | +++ b/beta 285s - | @@ -1,12 +1,1 @@ 285s - | -1 285s - | -2 285s - | -3 285s - | -4 285s - | -5 285s - | -6 285s - | -7 285s - | -8 285s - | -9 285s - | -10 285s - | -11 285s - | -12 285s - | +beta-new 285s - | \ No newline at end of file 285s - | diff --git a/beta b/beta-new 285s - | copy from beta 285s - | copy to beta-new 285s - | 285s - o 4 b9e63d96abc2783afc59246e798a6936cf05a35e move submodule 285s - | branch=default hg-git-rename-source=git 285s - | 285s - | diff --git a/.hgsub b/.hgsub 285s - | --- a/.hgsub 285s - | +++ b/.hgsub 285s - | @@ -1,1 +1,1 @@ 285s - | -gitsubmodule = [git]../gitsubmodule 285s - | +gitsubmodule2 = [git]../gitsubmodule 285s - | diff --git a/.hgsubstate b/.hgsubstate 285s - | --- a/.hgsubstate 285s - | +++ b/.hgsubstate 285s - | @@ -1,1 +1,1 @@ 285s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 285s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 285s - | 285s - o 3 55537ea256c28be1b5637f4f93a601fdde8a9a7f add submodule 285s - | branch=default hg-git-rename-source=git 285s - | 285s - | diff --git a/.hgsub b/.hgsub 285s - | new file mode 100644 285s - | --- /dev/null 285s - | +++ b/.hgsub 285s - | @@ -0,0 +1,1 @@ 285s - | +gitsubmodule = [git]../gitsubmodule 285s - | diff --git a/.hgsubstate b/.hgsubstate 285s - | new file mode 100644 285s - | --- /dev/null 285s - | +++ b/.hgsubstate 285s - | @@ -0,0 +1,1 @@ 285s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 285s - | 285s - o 2 20f9e56b6d006d0403f853245e483d0892b8ac48 gamma 285s - | branch=default hg-git-rename-source=git 285s - | 285s - | diff --git a/beta b/beta 285s - | --- a/beta 285s - | +++ b/beta 285s - | @@ -9,3 +9,4 @@ 285s - | 9 285s - | 10 285s - | 11 285s - | +12 285s - | diff --git a/beta b/gamma 285s - | copy from beta 285s - | copy to gamma 285s - | --- a/beta 285s - | +++ b/gamma 285s - | @@ -9,3 +9,4 @@ 285s - | 9 285s - | 10 285s - | 11 285s - | +13 285s - | 285s - o 1 9f7744e68def81da3b394f11352f602ca9c8ab68 beta 285s - | branch=default hg-git-rename-source=git 285s - | 285s - | diff --git a/alpha b/beta 285s - | rename from alpha 285s - | rename to beta 285s - | --- a/alpha 285s - | +++ b/beta 285s - | @@ -8,3 +8,4 @@ 285s - | 8 285s - | 9 285s - | 10 285s - | +11 285s - | 285s - o 0 7bc844166f76e49562f81eacd54ea954d01a9e42 alpha 285s - branch=default hg-git-rename-source=git 285s - 285s - diff --git a/alpha b/alpha 285s - new file mode 100644 285s - --- /dev/null 285s - +++ b/alpha 285s - @@ -0,0 +1,10 @@ 285s - +1 285s - +2 285s - +3 285s - +4 285s - +5 285s - +6 285s - +7 285s - +8 285s - +9 285s - +10 285s - 285s - 285s -Make a new ordinary commit in Mercurial (no extra metadata) 285s - $ echo 14 >> gamma 285s - $ hg ci -m "gamma2" 285s - 285s -Make a new commit with a copy and a rename in Mercurial 285s - $ hg cp gamma delta 285s - $ echo 15 >> delta 285s - $ hg mv beta epsilon 285s - $ echo 16 >> epsilon 285s - $ hg ci -m "delta/epsilon" 285s - $ hg export . 285s - # HG changeset patch 285s - # User test 285s - # Date 0 0 285s - # Thu Jan 01 00:00:00 1970 +0000 285s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 285s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 285s - delta/epsilon 285s - 285s - diff --git a/gamma b/delta 285s - copy from gamma 285s - copy to delta 285s - --- a/gamma 285s - +++ b/delta 285s - @@ -11,3 +11,4 @@ 285s - 11 285s - 13 285s - 14 285s - +15 285s - diff --git a/beta b/epsilon 285s - rename from beta 285s - rename to epsilon 285s - --- a/beta 285s - +++ b/epsilon 285s - @@ -10,3 +10,4 @@ 285s - 10 285s - 11 285s - 12 285s - +16 285s - $ hg push 285s - pushing to $TESTTMP/repo.git 285s - searching for changes 285s - adding objects 285s - remote: found 0 deltas to reuse 285s - added 2 commits with 2 trees and 3 blobs 285s - updating reference refs/heads/master 285s - 285s - $ cd ../repo.git 285s - $ git log master --pretty=oneline 285s - 5f2948d029693346043f320620af99a615930dc4 delta/epsilon 285s - bbd2ec050f7fbc64f772009844f7d58a556ec036 gamma2 285s - 50d116676a308b7c22935137d944e725d2296f2a remove submodule and rename back 285s - 59fb8e82ea18f79eab99196f588e8948089c134f rename and add submodule 285s - f95497455dfa891b4cd9b524007eb9514c3ab654 beta renamed back 285s - 055f482277da6cd3dd37c7093d06983bad68f782 beta renamed 285s - d7f31298f27df8a9226eddb1e4feb96922c46fa5 move submodule 285s - c610256cb6959852d9e70d01902a06726317affc add submodule 285s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 285s - cc83241f39927232f690d370894960b0d1943a0e beta 285s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 285s - 285s -Make sure the right metadata is stored 285s - $ git cat-file commit master^ 285s - tree 0adbde18545845f3b42ad1a18939ed60a9dec7a8 285s - parent 50d116676a308b7c22935137d944e725d2296f2a 285s - author test 0 +0000 285s - committer test 0 +0000 285s - HG:rename-source hg 285s - 285s - gamma2 285s - $ git cat-file commit master 285s - tree f8f32f4e20b56a5a74582c6a5952c175bf9ec155 285s - parent bbd2ec050f7fbc64f772009844f7d58a556ec036 285s - author test 0 +0000 285s - committer test 0 +0000 285s - HG:rename gamma:delta 285s - HG:rename beta:epsilon 285s - 285s - delta/epsilon 285s - 285s -Now make another clone and compare the hashes 285s - 285s - $ cd .. 285s - $ hg clone -q repo.git hgrepo2 285s - $ cd hgrepo2 285s - $ hg book master -qf 285s - $ hg export master 285s - # HG changeset patch 285s - # User test 285s - # Date 0 0 285s - # Thu Jan 01 00:00:00 1970 +0000 285s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 285s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 285s - delta/epsilon 285s - 285s - diff --git a/gamma b/delta 285s - copy from gamma 285s - copy to delta 285s - --- a/gamma 285s - +++ b/delta 285s - @@ -11,3 +11,4 @@ 285s - 11 285s - 13 285s - 14 285s - +15 285s - diff --git a/beta b/epsilon 285s - rename from beta 285s - rename to epsilon 285s - --- a/beta 285s - +++ b/epsilon 285s - @@ -10,3 +10,4 @@ 285s - 10 285s - 11 285s - 12 285s - +16 285s - 285s -Regenerate the Git metadata and compare the hashes 285s - $ hg debug-remove-hggit-state 285s - clearing out the git cache data 285s - $ hg gexport 285s - $ cd .hg/git 285s - $ git log master --pretty=oneline 285s - f3f6592447685566af9447c03ae262aa5432511d delta/epsilon (dulwich-rust !) 285s - c51ce14ec367c5ea72bf428dee3f8576f2fe1bb0 gamma2 (dulwich-rust !) 285s - df749cae534e3c7a0ad664cd0f214dd36e0ac259 remove submodule and rename back (dulwich-rust !) 285s - 8f9ec605ad0cc2532202f73cef8e35d3241797ee rename and add submodule (dulwich-rust !) 285s - 8a00d0fb75377c51c9a46e92ff154c919007f0e2 delta/epsilon (no-dulwich-rust !) 285s - dd7d4f1adb942a8d349dce585019f6949184bc64 gamma2 (no-dulwich-rust !) 285s - 3f1cdaf8b603816fcda02bd29e75198ae4cb13db remove submodule and rename back (no-dulwich-rust !) 285s - 2a4abf1178a999e2054158ceb0c7768079665d03 rename and add submodule (no-dulwich-rust !) 285s - 88c416e8d5e0e9dd1187d45ebafaa46111764196 beta renamed back 285s - 027d2a6e050705bf6f7e226e7e97f02ce5ae3200 beta renamed 285s - dc70e620634887e70ac5dd108bcc7ebd99c60ec3 move submodule 285s - c610256cb6959852d9e70d01902a06726317affc add submodule 285s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 285s - cc83241f39927232f690d370894960b0d1943a0e beta 285s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 285s - 285s -Test findcopiesharder 285s - 285s - $ cd $TESTTMP 285s - $ git init -q gitcopyharder 285s - $ cd gitcopyharder 285s - $ cat >> file0 << EOF 285s - > 1 285s - > 2 285s - > 3 285s - > 4 285s - > 5 285s - > EOF 285s - $ git add file0 285s - $ fn_git_commit -m file0 285s - $ cp file0 file1 285s - $ git add file1 285s - $ fn_git_commit -m file1 285s - $ cp file0 file2 285s - $ echo 6 >> file2 285s - $ git add file2 285s - $ fn_git_commit -m file2 285s - 285s - $ cd .. 285s - 285s -Clone without findcopiesharder does not find copies from unmodified files 285s - 285s - $ hg clone gitcopyharder hgnocopyharder 285s - importing 3 git commits 285s - new changesets b45d023c6842:ec77ccdbefe0 (3 drafts) 285s - updating to bookmark master 285s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s - $ hg -R hgnocopyharder export 1::2 285s - # HG changeset patch 285s - # User test 285s - # Date 1167609621 0 285s - # Mon Jan 01 00:00:21 2007 +0000 285s - # Node ID 555831c93e2a250e5ba42efad45bf7ba71da13e4 285s - # Parent b45d023c6842337ffe694663a44aa672d311081c 285s - file1 285s - 285s - diff --git a/file1 b/file1 285s - new file mode 100644 285s - --- /dev/null 285s - +++ b/file1 285s - @@ -0,0 +1,5 @@ 285s - +1 285s - +2 285s - +3 285s - +4 285s - +5 285s - # HG changeset patch 285s - # User test 285s - # Date 1167609622 0 285s - # Mon Jan 01 00:00:22 2007 +0000 285s - # Node ID ec77ccdbefe023eb9898b0399f84f670c8c0f5fc 285s - # Parent 555831c93e2a250e5ba42efad45bf7ba71da13e4 285s - file2 285s - 285s - diff --git a/file2 b/file2 285s - new file mode 100644 285s - --- /dev/null 285s - +++ b/file2 285s - @@ -0,0 +1,6 @@ 285s - +1 285s - +2 285s - +3 285s - +4 285s - +5 285s - +6 285s - 285s -findcopiesharder finds copies from unmodified files if similarity is met 285s - 285s - $ hg --config git.findcopiesharder=true clone gitcopyharder hgcopyharder0 285s - importing 3 git commits 285s - new changesets b45d023c6842:9b3099834272 (3 drafts) 285s - updating to bookmark master 285s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s - $ hg -R hgcopyharder0 export 1::2 285s - # HG changeset patch 285s - # User test 285s - # Date 1167609621 0 285s - # Mon Jan 01 00:00:21 2007 +0000 285s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 285s - # Parent b45d023c6842337ffe694663a44aa672d311081c 285s - file1 285s - 285s - diff --git a/file0 b/file1 285s - copy from file0 285s - copy to file1 285s - # HG changeset patch 285s - # User test 285s - # Date 1167609622 0 285s - # Mon Jan 01 00:00:22 2007 +0000 285s - # Node ID 9b30998342729c7357d418bebed7399986cfe643 285s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 285s - file2 285s - 285s - diff --git a/file0 b/file2 285s - copy from file0 285s - copy to file2 285s - --- a/file0 285s - +++ b/file2 285s - @@ -3,3 +3,4 @@ 285s - 3 285s - 4 285s - 5 285s - +6 285s - 285s - $ hg --config git.findcopiesharder=true --config git.similarity=95 clone gitcopyharder hgcopyharder1 285s - importing 3 git commits 285s - new changesets b45d023c6842:d9d2e8cbf050 (3 drafts) 285s - updating to bookmark master 285s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 285s - $ hg -R hgcopyharder1 export 1::2 285s - # HG changeset patch 285s - # User test 285s - # Date 1167609621 0 285s - # Mon Jan 01 00:00:21 2007 +0000 285s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 285s - # Parent b45d023c6842337ffe694663a44aa672d311081c 285s - file1 285s - 285s - diff --git a/file0 b/file1 285s - copy from file0 285s - copy to file1 285s - # HG changeset patch 285s - # User test 285s - # Date 1167609622 0 285s - # Mon Jan 01 00:00:22 2007 +0000 285s - # Node ID d9d2e8cbf050772be31dccf78851f71dc547d139 285s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 285s - file2 285s - 285s - diff --git a/file2 b/file2 285s - new file mode 100644 285s - --- /dev/null 285s - +++ b/file2 285s - @@ -0,0 +1,6 @@ 285s - +1 285s - +2 285s - +3 285s - +4 285s - +5 285s - +6 285s - 285s -Config values out of range 285s - $ hg --config git.similarity=999 clone gitcopyharder hgcopyharder2 285s - importing 3 git commits 285s - abort: git.similarity must be between 0 and 100 285s - [255] 285s -Left-over on Windows with some pack files 285s - $ rm -rf hgcopyharder2 285s - $ hg --config git.renamelimit=-5 clone gitcopyharder hgcopyharder2 285s - importing 3 git commits 285s - abort: git.renamelimit must be non-negative 285s - [255] 285s 285s ERROR: test-renames.t output changed 288s ! 288s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-git-tags.t 288s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-git-tags.t#draft.err 288s @@ -41,337 +41,13 @@ 288s Clone it: 288s 288s $ hg clone repo.git hgrepo 288s - importing 2 git commits 288s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 288s - updating to bookmark master 288s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 288s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 288s + abort: repository repo.git not found 288s + [255] 288s 288s $ cd hgrepo 288s + $TESTTMP.sh: 39: cd: can't cd to hgrepo 288s 288s Verify that annotated tags are unaffected by reexports: 288s 288s $ GIT_DIR=.hg/git git tag -ln 288s - beta added tag beta 288s - $ hg gexport 288s - $ GIT_DIR=.hg/git git tag -ln 288s - beta added tag beta 288s - 288s -Error checking on tag creation 288s - 288s - $ hg tag --git beta --remove 288s - abort: cannot remove git tags 288s - (the git documentation heavily discourages editing tags) 288s - [255] 288s - $ hg tag --git beta -r null 288s - abort: cannot remove git tags 288s - (the git documentation heavily discourages editing tags) 288s - [255] 288s - $ hg tag --git beta --remove -r 0 288s - abort: cannot specify both --rev and --remove 288s - [10] 288s - $ hg tag --git alpha 288s - abort: git tags require an explicit revision 288s - (please specify -r/--rev) 288s - [255] 288s - $ hg tag --git alpha alpha -r 0 288s - abort: tag names must be unique 288s - [255] 288s - $ hg tag --git alpha -r 0 -e 288s - abort: cannot specify both --git and --edit 288s - [10] 288s - $ hg tag --git alpha -r 0 -m 42 288s - abort: cannot specify both --git and --message 288s - [10] 288s - $ hg tag --git alpha -r 0 -d 42 288s - abort: cannot specify both --git and --date 288s - [10] 288s - $ hg tag --git alpha -r 0 -u user@example.com 288s - abort: cannot specify both --git and --user 288s - [10] 288s - $ hg tag --git 'with space' -r 0 288s - abort: the name 'with space' is not a valid git tag 288s - [255] 288s - $ hg tag --git ' beta' -r 0 288s - abort: the name 'beta' already exists 288s - [255] 288s - $ hg tag --git master -r 0 288s - abort: the name 'master' already exists 288s - [255] 288s - $ hg tag --git tip -r 0 288s - abort: the name 'tip' is reserved 288s - [10] 288s - 288s -Create a git tag from hg 288s - 288s - $ hg tag --git alpha --debug -r 0 288s - finding unexported changesets 288s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 288s - adding git tag alpha 288s - $ hg log --graph 288s - @ changeset: 1:7fe02317c63d 288s - | bookmark: master 288s - | tag: beta 288s - | tag: default/master 288s - | tag: tip 288s - | user: test 288s - | date: Mon Jan 01 00:00:11 2007 +0000 288s - | summary: add beta 288s - | 288s - o changeset: 0:ff7a2f2d8d70 288s - tag: alpha 288s - user: test 288s - date: Mon Jan 01 00:00:10 2007 +0000 288s - summary: add alpha 288s - 288s - $ echo beta-fix >> beta 288s - $ fn_hg_commit -m 'fix for beta' 288s -#if secret 288s - $ hg phase -d 288s -#endif 288s - $ hg push 288s - pushing to $TESTTMP/repo.git 288s - searching for changes 288s - adding objects 288s - remote: found 0 deltas to reuse 288s - added 1 commits with 1 trees and 1 blobs 288s - updating reference refs/heads/master 288s - adding reference refs/tags/alpha 288s - 288s -Verify that amending commits known to remotes doesn't break anything 288s - 288s - $ cat >> $HGRCPATH << EOF 288s - > [experimental] 288s - > evolution = createmarkers 288s - > evolution.createmarkers = yes 288s - > EOF 288s - $ hg tags 288s - tip 2:61175962e488 288s - default/master 2:61175962e488 288s - beta 1:7fe02317c63d 288s - alpha 0:ff7a2f2d8d70 288s - $ echo beta-fix-again >> beta 288s - $ fn_hg_commit --amend 288s - $ hg log -T shorttags 288s - 3:3094b9e8da41 draft tip 288s - 2:61175962e488 draft default/master X 288s - 1:7fe02317c63d draft beta 288s - 0:ff7a2f2d8d70 draft alpha 288s - $ hg tags 288s - tip 3:3094b9e8da41 288s - default/master 2:61175962e488 288s - beta 1:7fe02317c63d 288s - alpha 0:ff7a2f2d8d70 288s - $ hg push 288s - pushing to $TESTTMP/repo.git 288s - searching for changes 288s - abort: pushing refs/heads/master overwrites 3094b9e8da41 288s - [255] 288s - $ hg push -f 288s - pushing to $TESTTMP/repo.git 288s - searching for changes 288s - adding objects 288s - remote: found 0 deltas to reuse 288s - added 1 commits with 1 trees and 1 blobs 288s - updating reference refs/heads/master 288s - 288s -Now create a tag for the old, obsolete master 288s - 288s - $ cd ../repo.git 288s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 288s - $ git tag 288s - alpha 288s - beta 288s - detached 288s - $ cd ../hgrepo 288s - $ hg pull 288s - pulling from $TESTTMP/repo.git 288s - no changes found 288s - $ hg log -T shorttags 288s - 3:3094b9e8da41 draft default/master tip 288s - 2:61175962e488 draft detached X 288s - 1:7fe02317c63d draft beta 288s - 0:ff7a2f2d8d70 draft alpha 288s - $ hg tags 288s - tip 3:3094b9e8da41 288s - default/master 3:3094b9e8da41 288s - detached 2:61175962e488 288s - beta 1:7fe02317c63d 288s - alpha 0:ff7a2f2d8d70 288s - $ hg push 288s - pushing to $TESTTMP/repo.git 288s - searching for changes 288s - no changes found 288s - [1] 288s - 288s - $ cd .. 288s - 288s -Verify that revsets can point out git tags; for that we need an 288s -untagged commit. 288s - 288s - $ cd hgrepo 288s - $ touch gamma 288s - $ fn_hg_commit -A -m 'add gamma' 288s -#if secret 288s - $ hg phase -d 288s -#endif 288s - $ hg log -T shorttags -r 'gittag()' 288s - 0:ff7a2f2d8d70 draft alpha 288s - 1:7fe02317c63d draft beta 288s - 2:61175962e488 draft detached X 288s - $ hg log -T shorttags -r 'gittag(detached)' 288s - 2:61175962e488 draft detached X 288s - $ hg log -T shorttags -r 'gittag("re:a$")' 288s - 0:ff7a2f2d8d70 draft alpha 288s - 1:7fe02317c63d draft beta 288s - 288s -Create a git tag from hg, but pointing to a new commit: 288s - 288s - $ hg tag --git gamma --debug -r tip 288s - invalid branch cache (visible): tip differs (?) 288s - finding unexported changesets 288s - exporting 1 changesets 288s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 288s - packing 3 loose objects... 288s - packed 3 loose objects! 288s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 288s - adding git tag gamma 288s - $ hg push 288s - pushing to $TESTTMP/repo.git 288s - searching for changes 288s - adding objects 288s - remote: found 0 deltas to reuse 288s - added 1 commits with 1 trees and 1 blobs 288s - updating reference refs/heads/master 288s - adding reference refs/tags/gamma 288s - $ cd ../gitrepo 288s - $ git fetch --quiet --tags 288s - $ git tag 288s - alpha 288s - beta 288s - detached 288s - gamma 288s - $ cd .. 288s - 288s -Try to overwrite an annotated tag: 288s - 288s - $ cd hgrepo 288s - $ hg tags -v 288s - tip 4:0eb1ab0073a8 288s - gamma 4:0eb1ab0073a8 git 288s - default/master 4:0eb1ab0073a8 git-remote 288s - detached 2:61175962e488 git 288s - beta 1:7fe02317c63d git 288s - alpha 0:ff7a2f2d8d70 git 288s - $ hg book not-master 288s - $ hg tag beta 288s - abort: tag 'beta' already exists (use -f to force) 288s - [10] 288s - $ hg tag -f beta 288s -#if secret 288s - $ hg phase -d 288s -#endif 288s - $ hg push 288s - pushing to $TESTTMP/repo.git 288s - warning: not overwriting annotated tag 'beta' 288s - searching for changes 288s - adding objects 288s - remote: found 0 deltas to reuse 288s - added 1 commits with 1 trees and 1 blobs 288s - adding reference refs/heads/not-master 288s - $ hg tags 288s - tip 5:c49682c7cba4 288s - default/not-master 5:c49682c7cba4 288s - gamma 4:0eb1ab0073a8 288s - default/master 4:0eb1ab0073a8 288s - beta 4:0eb1ab0073a8 288s - detached 2:61175962e488 288s - alpha 0:ff7a2f2d8d70 288s - $ cd .. 288s - 288s -Check whether `gimport` handles tags 288s - 288s - $ cd hgrepo 288s - $ rm .hg/git-tags .hg/git-mapfile 288s - $ hg gimport 288s - importing 6 git commits 288s - $ hg tags -q 288s - tip 288s - default/not-master 288s - gamma 288s - default/master 288s - beta 288s - detached 288s - alpha 288s - $ cd .. 288s - 288s -Test how pulling an explicit branch with an annotated tag: 288s - 288s - $ hg clone -r master repo.git hgrepo-2 288s - importing 4 git commits 288s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 288s - updating to branch default 288s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 288s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 288s - 0:ff7a2f2d8d70 draft alpha 288s - 1:7fe02317c63d draft beta 288s - 3:0eb1ab0073a8 draft default/master gamma tip 288s - $ hg tags -v -R hgrepo-2 288s - tip 3:0eb1ab0073a8 288s - gamma 3:0eb1ab0073a8 git 288s - default/master 3:0eb1ab0073a8 git-remote 288s - beta 1:7fe02317c63d git 288s - alpha 0:ff7a2f2d8d70 git 288s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 288s - $ rm -rf hgrepo-2 288s - 288s - $ hg clone -r master repo.git hgrepo-2 288s - importing 4 git commits 288s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 288s - updating to branch default 288s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 288s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 288s - 0:ff7a2f2d8d70 draft alpha 288s - 1:7fe02317c63d draft beta 288s - 3:0eb1ab0073a8 draft default/master gamma tip 288s -This used to die: 288s - $ hg -R hgrepo-2 gexport 288s -This used to fail, since we didn't actually pull the annotated tag: 288s - $ hg -R hgrepo-2 push 288s - pushing to $TESTTMP/repo.git 288s - searching for changes 288s - no changes found 288s - [1] 288s - $ rm -rf hgrepo-2 288s - 288s -Check that pulling will update phases only: 288s - 288s - $ cd hgrepo 288s - $ hg phase -fs gamma detached 288s - $ hg pull 288s - pulling from $TESTTMP/repo.git 288s - no changes found 288s - $ hg log -T shorttags -r gamma -r detached 288s - 4:0eb1ab0073a8 draft beta default/master gamma 288s - 2:61175962e488 draft detached X 288s - $ cd .. 288s - 288s -Check that we pull new tags to existing commits: 288s - $ cd gitrepo 288s - $ git tag 288s - alpha 288s - beta 288s - detached 288s - gamma 288s - $ fn_git_tag extra-simple-tag 288s - $ fn_git_tag -m annotated extra-annotated-tag 288s - $ git push --tags 288s - To $TESTTMP/repo.git 288s - * [new tag] extra-annotated-tag -> extra-annotated-tag 288s - * [new tag] extra-simple-tag -> extra-simple-tag 288s - $ cd ../hgrepo 288s - $ hg pull -r master 288s - pulling from $TESTTMP/repo.git 288s - no changes found 288s - $ hg tags -v | grep extra 288s - extra-simple-tag 1:7fe02317c63d git 288s - extra-annotated-tag 1:7fe02317c63d git 288s 288s ERROR: test-git-tags.t#draft output changed 289s ! 289s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-help.t 289s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-help.t.err 289s @@ -5,250 +5,14 @@ 289s 289s $ hg help | grep 'git' | sed 's/ */ /g' 289s git-cleanup clean up Git commit map after history editing (?) 289s - git-verify verify that a Mercurial rev matches the corresponding Git rev 289s - hggit push and pull from a Git server 289s - hggit-config Configuring hg-git 289s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 289s 289s $ hg help hggit-config 289s - Configuring hg-git 289s - """""""""""""""""" 289s - 289s - "git" 289s - ----- 289s - 289s - Control how the Hg-Git extension interacts with Git. 289s - 289s - "authors" 289s - Git uses a strict convention for "author names" when representing 289s - changesets, using the form "[realname] [email address]". Mercurial 289s - encourages this convention as well but is not as strict, so it's not 289s - uncommon for a Mercurial repository to have authors listed as, for 289s - example, simple usernames. hg-git by default will attempt to translate 289s - Mercurial usernames using the following rules: 289s - 289s - - If the Mercurial username fits the pattern "NAME ", the Git 289s - name will be set to NAME and the email to EMAIL. 289s - - If the Mercurial username looks like an email (if it contains an 289s - "@"), the Git name and email will both be set to that email. 289s - - If the Mercurial username consists of only a name, the email will be 289s - set to "none@none". 289s - - Illegal characters (stray "<"\ s or ">"\ s) will be stripped out, and 289s - for "NAME " usernames, any content after the right-bracket (for 289s - example, a second ">") will be turned into a url-encoded sigil like 289s - "ext:(%3E)" in the Git author name. 289s - 289s - Since these default behaviors may not be what you want ("none@none", for 289s - example, shows up unpleasantly on GitHub as "illegal email address"), 289s - the "git.authors" option provides for an "authors translation file" that 289s - will be used during outgoing transfers from Mercurial to Git only, by 289s - modifying "hgrc" as such: 289s - 289s - [git] 289s - authors = authors.txt 289s - 289s - Where "authors.txt" is the name of a text file containing author name 289s - translations, one per each line, using the following format: 289s - 289s - johnny = John Smith 289s - dougie = Doug Johnson 289s - 289s - Empty lines and lines starting with a "#" are ignored. 289s - 289s - It should be noted that this translation is in *the Mercurial to Git 289s - direction only*. Changesets coming from Git back to Mercurial will not 289s - translate back into Mercurial usernames, so it's best that the same 289s - username/email combination be used on both the Mercurial and Git sides; 289s - the author file is mostly useful for translating legacy changesets. 289s - 289s - "branch_bookmark_suffix" 289s - Hg-Git does not convert between Mercurial named branches and git 289s - branches as the two are conceptually different; instead, it uses 289s - Mercurial bookmarks to represent the concept of a Git branch. Therefore, 289s - when translating a Mercurial repository over to Git, you typically need 289s - to create bookmarks to mirror all the named branches that you'd like to 289s - see transferred over to Git. The major caveat with this is that you 289s - can't use the same name for your bookmark as that of the named branch, 289s - and furthermore there's no feasible way to rename a branch in Mercurial. 289s - For the use case where one would like to transfer a Mercurial repository 289s - over to Git, and maintain the same named branches as are present on the 289s - hg side, the "branch_bookmark_suffix" might be all that's needed. This 289s - presents a string "suffix" that will be recognized on each bookmark 289s - name, and stripped off as the bookmark is translated to a Git branch: 289s - 289s - [git] 289s - branch_bookmark_suffix=_bookmark 289s - 289s - Above, if a Mercurial repository had a named branch called 289s - "release_6_maintenance", you could then link it to a bookmark called 289s - "release_6_maintenance_bookmark". hg-git will then strip off the 289s - "_bookmark" suffix from this bookmark name, and create a Git branch 289s - called "release_6_maintenance". When pulling back from Git to hg, the 289s - "_bookmark" suffix is then applied back, if and only if a Mercurial 289s - named branch of that name exists. E.g., when changes to the 289s - "release_6_maintenance" branch are checked into Git, these will be 289s - placed into the "release_6_maintenance_bookmark" bookmark on hg. But if 289s - a new branch called "release_7_maintenance" were pulled over to hg, and 289s - there was not a "release_7_maintenance" named branch already, the 289s - bookmark will be named "release_7_maintenance" with no usage of the 289s - suffix. 289s - 289s - The "branch_bookmark_suffix" option is, like the "authors" option, 289s - intended for migrating legacy hg named branches. Going forward, a 289s - Mercurial repository that is to be linked with a Git repository should 289s - only use bookmarks for named branching. 289s - 289s - "findcopiesharder" 289s - Whether to consider unmodified files as copy sources. This is a very 289s - expensive operation for large projects, so use it with caution. Similar 289s - to "git diff"'s --find-copies-harder option. 289s - 289s - "intree" 289s - Hg-Git keeps a Git repository clone for reading and updating. By 289s - default, the Git clone is the subdirectory "git" in your local Mercurial 289s - repository. If you would like this Git clone to be at the same level of 289s - your Mercurial repository instead (named ".git"), add the following to 289s - your "hgrc": 289s - 289s - [git] 289s - intree = True 289s - 289s - Please note that changing this setting in an existing repository doesn't 289s - move the local Git repository. You will either have to do so yourself, 289s - or issue an 'hg pull' after the fact to repopulate the new location. 289s - 289s - "mindate" 289s - If set, branches where the latest commit's commit time is older than 289s - this will not be imported. Accepts any date formats that Mercurial does 289s - -- see 'hg help dates' for more. 289s - 289s - "public" 289s - A list of Git branches that should be considered "published", and 289s - therefore converted to Mercurial in the 'public' phase. This is only 289s - used if "hggit.usephases" is set. 289s - 289s - "pull-prune-remote-branches" 289s - Before fetching, remove any remote-tracking references, or pseudo-tags, 289s - that no longer exist on the remote. This is equivalent to the "--prune" 289s - option to "git fetch", and means that pseudo-tags for remotes -- such as 289s - "default/master" -- always actually reflect what's on the remote. 289s - 289s - This option is enabled by default. 289s - 289s - "pull-prune-bookmarks" 289s - On pull, delete any unchanged bookmarks removed on the remote. In other 289s - words, if e.g. the "thebranch" bookmark remains at "default/thebranch", 289s - and the branch is deleted in Git, pulling deletes the bookmark. 289s - 289s - This option is enabled by default. 289s - 289s - "renamelimit" 289s - The number of files to consider when performing the copy/rename 289s - detection. Detection is disabled if the number of files modified in a 289s - commit is above the limit. Detection is O(N^2) in the number of files 289s - modified, so be sure not to set the limit too high. Similar to Git's 289s - "diff.renameLimit" config. The default is "400", the same as Git. 289s - 289s - "similarity" 289s - Specify how similar files modified in a Git commit must be to be 289s - imported as Mercurial renames or copies, as a percentage between "0" 289s - (disabled) and "100" (files must be identical). For example, "90" means 289s - that a delete/add pair will be imported as a rename if more than 90% of 289s - the file has stayed the same. The default is "0" (disabled). 289s - 289s - "blame.ignoreRevsFile" 289s - Specify a file that lists Git commits to ignore when invoking 'hg 289s - annotate'. 289s - 289s - "hggit" 289s - ------- 289s - 289s - Control behavior of the Hg-Git extension. 289s - 289s - "mapsavefrequency" 289s - By default, hg-git only saves the results of a conversion at the end. 289s - Use this option to enable resuming long-running pulls and pushes. Set 289s - this to a number greater than 0 to allow resuming after converting that 289s - many commits. This can help when the conversion encounters an error 289s - partway through a large batch of changes. Otherwise, an error or 289s - interruption will roll back the transaction, similar to regular 289s - Mercurial. 289s - 289s - Defaults to 1000. 289s - 289s - Please note that this is disregarded for an initial clone, as any error 289s - or interruption will delete the destination. So instead of cloning a 289s - large Git repository, you might want to pull instead: 289s - 289s - $ hg init linux 289s - $ cd linux 289s - $ echo "[paths]\ndefault = https://github.com/torvalds/linux" > .hg/hgrc 289s - $ hg pull 289s - 289s - ...and be extremely patient. Please note that converting very large 289s - repositories may take *days* rather than mere *hours*, and may run into 289s - issues with available memory for very long running clones. Even any 289s - small, undiscovered leak will build up when processing hundreds of 289s - thousands of files and commits. Cloning the Linux kernel is likely a 289s - pathological case, but other storied repositories such as CPython do 289s - work well, even if the initial clone requires a some patience. 289s - 289s - "threads" 289s - 289s - During a push to Git, hg-git will pack loose objects at regular 289s - intervals whenever it saves its map. As this is a rather expensive 289s - operation, it's done in separate threads. 289s - 289s - Defaults to the system CPU count or 4, whichever is lower. 289s - 289s - "usephases" 289s - When converting Git revisions to Mercurial, place them in the 'public' 289s - phase as appropriate. Namely, revisions that are reachable from the 289s - remote Git repository's default branch, or "HEAD", will be marked 289s - *public*. For most repositories, this means the remote "master" branch 289s - will be converted as public. The same applies to any commits tagged in 289s - the remote. 289s - 289s - To restrict publishing to specific branches or tags, use the 289s - "git.public" option. 289s - 289s - Publishing commits prevents their modification, and speeds up many local 289s - Mercurial operations, such as 'hg shelve'. 289s - 289s - "fetchbuffer" 289s - Data fetched from Git is buffered in memory, unless it exceeds the given 289s - limit, in megabytes. By default, flush the buffer to disk when it 289s - exceeds 100MB. 289s - 289s - "retries" 289s - Interacting with a remote Git repository may require authentication. 289s - Normally, this will trigger a prompt and a retry, and this option 289s - restricts the amount of retries. Defaults to 3. 289s - 289s - "invalidpaths" 289s - Both Mercurial and Git consider paths as just bytestrings internally, 289s - and allow almost anything. The difference, however, is in the _almost_ 289s - part. For example, many Git servers will reject a push for security 289s - reasons if it contains a nested Git repository. Similarly, Mercurial 289s - cannot checkout commits with a nested repository, and it cannot even 289s - store paths containing an embedded newline or carrage return character. 289s - 289s - The default is to issue a warning and skip these paths. You can change 289s - this by setting "hggit.invalidpaths" in ".hgrc": 289s - 289s - [hggit] 289s - invalidpaths = keep 289s - 289s - Possible values are "keep", "skip" or "abort". Prior to 1.0, the default 289s - was "abort". 289s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 289s + abort: no such help topic: hggit-config 289s + (try 'hg help --keyword hggit-config') 289s + [10] 289s 289s $ hg help config.hggit | head -10 289s - "hggit" 289s - ------- 289s - 289s - Control behavior of the Hg-Git extension. 289s - 289s - "mapsavefrequency" 289s - By default, hg-git only saves the results of a conversion at the end. 289s - Use this option to enable resuming long-running pulls and pushes. Set 289s - this to a number greater than 0 to allow resuming after converting that 289s - many commits. This can help when the conversion encounters an error 289s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 289s + abort: help section not found: config.hggit 289s 289s ERROR: test-help.t output changed 292s ! 292s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-pull-after-rebase.t 292s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-pull-after-rebase.t.err 292s @@ -38,275 +38,9 @@ 292s Clone it and rebase the branch 292s 292s $ hg clone -U repo.git hgrepo 292s - importing 3 git commits 292s - new changesets ff7a2f2d8d70:205a004356ef (3 drafts) 292s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 292s + abort: repository repo.git not found 292s + [255] 292s $ cd hgrepo 292s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 292s $ hg state 292s - o branch default/branch tip 2:205a004356ef32b8da782afb89d9179d12ca31e9 292s - | add gamma 292s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 292s - |/ add beta 292s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 292s - add alpha 292s - $ hg up branch 292s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 292s - (activating bookmark branch) 292s - $ hg rebase --quiet -d master 292s - $ hg state 292s - @ branch tip 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 292s - | add gamma 292s - | x default/branch 2:205a004356ef32b8da782afb89d9179d12ca31e9 292s - | | add gamma 292s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 292s - |/ add beta 292s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 292s - add alpha 292s - 292s - $ hg push -fr tip 292s - pushing to $TESTTMP/repo.git 292s - searching for changes 292s - adding objects 292s - remote: found 0 deltas to reuse 292s - added 1 commits with 1 trees and 1 blobs 292s - updating reference refs/heads/branch 292s - $ cd .. 292s - 292s -Now switch back to git and create a new commit based on what we just rebased 292s - 292s - $ cd gitrepo 292s - $ git checkout --quiet -b otherbranch branch 292s - $ git log --oneline --graph --all --decorate 292s - * e5023f9 (HEAD -> otherbranch, origin/branch, branch) add gamma 292s - | * 9497a4e (origin/master, master) add beta 292s - |/ 292s - * 7eeab2e add alpha 292s - $ echo delta > delta 292s - $ git add delta 292s - $ fn_git_commit -m 'add delta' 292s - $ git push --quiet --set-upstream origin otherbranch 292s - Branch 'otherbranch' set up to track remote branch 'otherbranch' from 'origin'. (?) 292s - $ git log --oneline --graph --all --decorate 292s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 292s - * e5023f9 (origin/branch, branch) add gamma 292s - | * 9497a4e (origin/master, master) add beta 292s - |/ 292s - * 7eeab2e add alpha 292s - $ cd .. 292s - 292s -Pull that 292s - 292s - $ cd hgrepo 292s - $ hg pull 292s - pulling from $TESTTMP/repo.git 292s - importing 1 git commits 292s - adding bookmark otherbranch 292s - 1 new orphan changesets 292s - new changesets 075302705298 (1 drafts) 292s - (run 'hg heads' to see heads, 'hg merge' to merge) 292s - $ hg state 292s - * otherbranch default/otherbranch tip 4:0753027052980aef9c9c37adb7d76d5719e8d818 292s - | add delta 292s - | @ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 292s - | | add gamma 292s - x | 2:205a004356ef32b8da782afb89d9179d12ca31e9 292s - | | add gamma 292s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 292s - |/ add beta 292s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 292s - add alpha 292s - 292s - $ cd .. 292s - 292s -To reproduce bug #386, do like github and save the old commit in a 292s -ref, and create a clone containing just the converted git commits: 292s - 292s - $ cd repo.git 292s - $ git update-ref refs/pr/1 otherbranch 292s - $ cd .. 292s - $ hg clone -U repo.git hgrepo-issue386 292s - importing 5 git commits 292s - new changesets ff7a2f2d8d70:075302705298 (5 drafts) 292s - 292s -Now try rebasing that branch, from the Git side of things 292s - 292s - $ cd gitrepo 292s - $ git checkout -q otherbranch 292s - $ git log --oneline --graph --all --decorate 292s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 292s - * e5023f9 (origin/branch, branch) add gamma 292s - | * 9497a4e (origin/master, master) add beta 292s - |/ 292s - * 7eeab2e add alpha 292s - $ fn_git_rebase --onto master branch otherbranch 292s - $ git log --oneline --graph --all --decorate 292s - * 9c58139 (HEAD -> otherbranch) add delta 292s - * 9497a4e (origin/master, master) add beta 292s - | * bba0011 (origin/otherbranch) add delta 292s - | * e5023f9 (origin/branch, branch) add gamma 292s - |/ 292s - * 7eeab2e add alpha 292s - $ git push -f 292s - To $TESTTMP/repo.git 292s - + bba0011...9c58139 otherbranch -> otherbranch (forced update) 292s - $ git log --oneline --graph --all --decorate 292s - * 9c58139 (HEAD -> otherbranch, origin/otherbranch) add delta 292s - * 9497a4e (origin/master, master) add beta 292s - | * e5023f9 (origin/branch, branch) add gamma 292s - |/ 292s - * 7eeab2e add alpha 292s - $ cd .. 292s - 292s -Now strip the old commit 292s - 292s - $ cd hgrepo-issue386 292s - $ hg up null 292s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 292s - $ hg id -qr otherbranch 292s - 075302705298 292s - $ hg pull 292s - pulling from $TESTTMP/repo.git 292s - importing 1 git commits 292s - not updating diverged bookmark otherbranch 292s - new changesets d64bf0521af6 (1 drafts) 292s - (run 'hg heads .' to see heads, 'hg merge' to merge) 292s - $ hg debugstrip --hidden --no-backup otherbranch 292s - $ hg book -d otherbranch 292s - $ hg git-cleanup 292s - git commit map cleaned 292s - $ hg pull 292s - pulling from $TESTTMP/repo.git 292s - no changes found 292s - adding bookmark otherbranch 292s - $ cd .. 292s - 292s -And check that pulling something else doesn't delete that branch. 292s - 292s - $ cd hgrepo 292s - $ hg pull -r master 292s - pulling from $TESTTMP/repo.git 292s - no changes found 292s - $ cd .. 292s - 292s -A special case, is that we can pull into a repository, where a commit 292s -corresponding to the new branch exists, but that commit is obsolete. 292s -In order to avoid “pinning” the obsolete commit, and thereby making it 292s -visible, we first pull from Git as an unnamed remote. 292s - 292s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 292s - updating to branch default 292s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 292s - $ cd hgrepo-clone 292s - $ hg pull ../repo.git 292s - pulling from ../repo.git 292s - importing 4 git commits 292s - not updating diverged bookmark otherbranch 292s - new changesets d64bf0521af6 (1 drafts) 292s - (run 'hg heads .' to see heads, 'hg merge' to merge) 292s - $ hg debugobsolete d64bf0521af68fe2160791a1b4ab9baf282a3879 292s - 1 new obsolescence markers 292s - obsoleted 1 changesets 292s - $ cp ../hgrepo/.hg/hgrc .hg 292s - $ hg pull 292s - pulling from $TESTTMP/repo.git 292s - no changes found 292s - not updating diverged bookmark otherbranch 292s - $ cd .. 292s - $ rm -rf hgrepo-clone 292s - 292s -Another special case, is that we should update commits over obsolete boundaries: 292s - 292s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 292s - updating to branch default 292s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 292s - $ cd hgrepo-clone 292s - $ hg pull ../repo.git 292s - pulling from ../repo.git 292s - importing 4 git commits 292s - not updating diverged bookmark otherbranch 292s - new changesets d64bf0521af6 (1 drafts) 292s - (run 'hg heads .' to see heads, 'hg merge' to merge) 292s - $ hg debugobsolete 0753027052980aef9c9c37adb7d76d5719e8d818 d64bf0521af68fe2160791a1b4ab9baf282a3879 292s - 1 new obsolescence markers 292s - obsoleted 1 changesets 292s - $ hg book -r 075302705298 otherbranch 292s - $ cp ../hgrepo/.hg/hgrc .hg 292s - $ hg pull 292s - pulling from $TESTTMP/repo.git 292s - no changes found 292s - updating bookmark otherbranch 292s - $ cd .. 292s - $ rm -rf hgrepo-clone 292s - 292s -Now just pull it: 292s - 292s - $ cd hgrepo 292s - $ hg pull 292s - pulling from $TESTTMP/repo.git 292s - importing 1 git commits 292s - not updating diverged bookmark otherbranch 292s - new changesets d64bf0521af6 (1 drafts) 292s - (run 'hg heads .' to see heads, 'hg merge' to merge) 292s - $ hg state 292s - o default/otherbranch tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 292s - | add delta 292s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 292s - | | add delta 292s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 292s - | | add gamma 292s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 292s - | | add gamma 292s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 292s - |/ add beta 292s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 292s - add alpha 292s - $ cd .. 292s - 292s -And finally, delete it: 292s - 292s - $ cd gitrepo 292s - $ git push origin :otherbranch 292s - To $TESTTMP/repo.git 292s - - [deleted] otherbranch 292s - $ cd .. 292s - 292s -And pull that: 292s - 292s - $ cd hgrepo 292s - $ hg pull 292s - pulling from $TESTTMP/repo.git 292s - no changes found 292s - not deleting diverged bookmark otherbranch 292s - $ hg state 292s - o tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 292s - | add delta 292s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 292s - | | add delta 292s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 292s - | | add gamma 292s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 292s - | | add gamma 292s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 292s - |/ add beta 292s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 292s - add alpha 292s - $ cd .. 292s - 292s -We only get that message once: 292s - 292s - $ hg -R hgrepo pull 292s - pulling from $TESTTMP/repo.git 292s - no changes found 292s - 292s -Now try deleting one already gone locally, which shouldn't output 292s -anything: 292s - 292s - $ cd gitrepo 292s - $ git push origin :branch 292s - To $TESTTMP/repo.git 292s - - [deleted] branch 292s - $ cd ../hgrepo 292s - $ hg book -d branch 292s - $ hg pull 292s - pulling from $TESTTMP/repo.git 292s - no changes found 292s - $ cd .. 292s 292s ERROR: test-pull-after-rebase.t output changed 292s ! 292s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-git-tags.t 292s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-git-tags.t#secret.err 292s @@ -41,337 +41,13 @@ 292s Clone it: 292s 292s $ hg clone repo.git hgrepo 292s - importing 2 git commits 292s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 292s - updating to bookmark master 292s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 292s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 292s + abort: repository repo.git not found 292s + [255] 292s 292s $ cd hgrepo 292s + $TESTTMP.sh: 44: cd: can't cd to hgrepo 292s 292s Verify that annotated tags are unaffected by reexports: 292s 292s $ GIT_DIR=.hg/git git tag -ln 292s - beta added tag beta 292s - $ hg gexport 292s - $ GIT_DIR=.hg/git git tag -ln 292s - beta added tag beta 292s - 292s -Error checking on tag creation 292s - 292s - $ hg tag --git beta --remove 292s - abort: cannot remove git tags 292s - (the git documentation heavily discourages editing tags) 292s - [255] 292s - $ hg tag --git beta -r null 292s - abort: cannot remove git tags 292s - (the git documentation heavily discourages editing tags) 292s - [255] 292s - $ hg tag --git beta --remove -r 0 292s - abort: cannot specify both --rev and --remove 292s - [10] 292s - $ hg tag --git alpha 292s - abort: git tags require an explicit revision 292s - (please specify -r/--rev) 292s - [255] 292s - $ hg tag --git alpha alpha -r 0 292s - abort: tag names must be unique 292s - [255] 292s - $ hg tag --git alpha -r 0 -e 292s - abort: cannot specify both --git and --edit 292s - [10] 292s - $ hg tag --git alpha -r 0 -m 42 292s - abort: cannot specify both --git and --message 292s - [10] 292s - $ hg tag --git alpha -r 0 -d 42 292s - abort: cannot specify both --git and --date 292s - [10] 292s - $ hg tag --git alpha -r 0 -u user@example.com 292s - abort: cannot specify both --git and --user 292s - [10] 292s - $ hg tag --git 'with space' -r 0 292s - abort: the name 'with space' is not a valid git tag 292s - [255] 292s - $ hg tag --git ' beta' -r 0 292s - abort: the name 'beta' already exists 292s - [255] 292s - $ hg tag --git master -r 0 292s - abort: the name 'master' already exists 292s - [255] 292s - $ hg tag --git tip -r 0 292s - abort: the name 'tip' is reserved 292s - [10] 292s - 292s -Create a git tag from hg 292s - 292s - $ hg tag --git alpha --debug -r 0 292s - finding unexported changesets 292s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 292s - adding git tag alpha 292s - $ hg log --graph 292s - @ changeset: 1:7fe02317c63d 292s - | bookmark: master 292s - | tag: beta 292s - | tag: default/master 292s - | tag: tip 292s - | user: test 292s - | date: Mon Jan 01 00:00:11 2007 +0000 292s - | summary: add beta 292s - | 292s - o changeset: 0:ff7a2f2d8d70 292s - tag: alpha 292s - user: test 292s - date: Mon Jan 01 00:00:10 2007 +0000 292s - summary: add alpha 292s - 292s - $ echo beta-fix >> beta 292s - $ fn_hg_commit -m 'fix for beta' 292s -#if secret 292s - $ hg phase -d 292s -#endif 292s - $ hg push 292s - pushing to $TESTTMP/repo.git 292s - searching for changes 292s - adding objects 292s - remote: found 0 deltas to reuse 292s - added 1 commits with 1 trees and 1 blobs 292s - updating reference refs/heads/master 292s - adding reference refs/tags/alpha 292s - 292s -Verify that amending commits known to remotes doesn't break anything 292s - 292s - $ cat >> $HGRCPATH << EOF 292s - > [experimental] 292s - > evolution = createmarkers 292s - > evolution.createmarkers = yes 292s - > EOF 292s - $ hg tags 292s - tip 2:61175962e488 292s - default/master 2:61175962e488 292s - beta 1:7fe02317c63d 292s - alpha 0:ff7a2f2d8d70 292s - $ echo beta-fix-again >> beta 292s - $ fn_hg_commit --amend 292s - $ hg log -T shorttags 292s - 3:3094b9e8da41 draft tip 292s - 2:61175962e488 draft default/master X 292s - 1:7fe02317c63d draft beta 292s - 0:ff7a2f2d8d70 draft alpha 292s - $ hg tags 292s - tip 3:3094b9e8da41 292s - default/master 2:61175962e488 292s - beta 1:7fe02317c63d 292s - alpha 0:ff7a2f2d8d70 292s - $ hg push 292s - pushing to $TESTTMP/repo.git 292s - searching for changes 292s - abort: pushing refs/heads/master overwrites 3094b9e8da41 292s - [255] 292s - $ hg push -f 292s - pushing to $TESTTMP/repo.git 292s - searching for changes 292s - adding objects 292s - remote: found 0 deltas to reuse 292s - added 1 commits with 1 trees and 1 blobs 292s - updating reference refs/heads/master 292s - 292s -Now create a tag for the old, obsolete master 292s - 292s - $ cd ../repo.git 292s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 292s - $ git tag 292s - alpha 292s - beta 292s - detached 292s - $ cd ../hgrepo 292s - $ hg pull 292s - pulling from $TESTTMP/repo.git 292s - no changes found 292s - $ hg log -T shorttags 292s - 3:3094b9e8da41 draft default/master tip 292s - 2:61175962e488 draft detached X 292s - 1:7fe02317c63d draft beta 292s - 0:ff7a2f2d8d70 draft alpha 292s - $ hg tags 292s - tip 3:3094b9e8da41 292s - default/master 3:3094b9e8da41 292s - detached 2:61175962e488 292s - beta 1:7fe02317c63d 292s - alpha 0:ff7a2f2d8d70 292s - $ hg push 292s - pushing to $TESTTMP/repo.git 292s - searching for changes 292s - no changes found 292s - [1] 292s - 292s - $ cd .. 292s - 292s -Verify that revsets can point out git tags; for that we need an 292s -untagged commit. 292s - 292s - $ cd hgrepo 292s - $ touch gamma 292s - $ fn_hg_commit -A -m 'add gamma' 292s -#if secret 292s - $ hg phase -d 292s -#endif 292s - $ hg log -T shorttags -r 'gittag()' 292s - 0:ff7a2f2d8d70 draft alpha 292s - 1:7fe02317c63d draft beta 292s - 2:61175962e488 draft detached X 292s - $ hg log -T shorttags -r 'gittag(detached)' 292s - 2:61175962e488 draft detached X 292s - $ hg log -T shorttags -r 'gittag("re:a$")' 292s - 0:ff7a2f2d8d70 draft alpha 292s - 1:7fe02317c63d draft beta 292s - 292s -Create a git tag from hg, but pointing to a new commit: 292s - 292s - $ hg tag --git gamma --debug -r tip 292s - invalid branch cache (visible): tip differs (?) 292s - finding unexported changesets 292s - exporting 1 changesets 292s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 292s - packing 3 loose objects... 292s - packed 3 loose objects! 292s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 292s - adding git tag gamma 292s - $ hg push 292s - pushing to $TESTTMP/repo.git 292s - searching for changes 292s - adding objects 292s - remote: found 0 deltas to reuse 292s - added 1 commits with 1 trees and 1 blobs 292s - updating reference refs/heads/master 292s - adding reference refs/tags/gamma 292s - $ cd ../gitrepo 292s - $ git fetch --quiet --tags 292s - $ git tag 292s - alpha 292s - beta 292s - detached 292s - gamma 292s - $ cd .. 292s - 292s -Try to overwrite an annotated tag: 292s - 292s - $ cd hgrepo 292s - $ hg tags -v 292s - tip 4:0eb1ab0073a8 292s - gamma 4:0eb1ab0073a8 git 292s - default/master 4:0eb1ab0073a8 git-remote 292s - detached 2:61175962e488 git 292s - beta 1:7fe02317c63d git 292s - alpha 0:ff7a2f2d8d70 git 292s - $ hg book not-master 292s - $ hg tag beta 292s - abort: tag 'beta' already exists (use -f to force) 292s - [10] 292s - $ hg tag -f beta 292s -#if secret 292s - $ hg phase -d 292s -#endif 292s - $ hg push 292s - pushing to $TESTTMP/repo.git 292s - warning: not overwriting annotated tag 'beta' 292s - searching for changes 292s - adding objects 292s - remote: found 0 deltas to reuse 292s - added 1 commits with 1 trees and 1 blobs 292s - adding reference refs/heads/not-master 292s - $ hg tags 292s - tip 5:c49682c7cba4 292s - default/not-master 5:c49682c7cba4 292s - gamma 4:0eb1ab0073a8 292s - default/master 4:0eb1ab0073a8 292s - beta 4:0eb1ab0073a8 292s - detached 2:61175962e488 292s - alpha 0:ff7a2f2d8d70 292s - $ cd .. 292s - 292s -Check whether `gimport` handles tags 292s - 292s - $ cd hgrepo 292s - $ rm .hg/git-tags .hg/git-mapfile 292s - $ hg gimport 292s - importing 6 git commits 292s - $ hg tags -q 292s - tip 292s - default/not-master 292s - gamma 292s - default/master 292s - beta 292s - detached 292s - alpha 292s - $ cd .. 292s - 292s -Test how pulling an explicit branch with an annotated tag: 292s - 292s - $ hg clone -r master repo.git hgrepo-2 292s - importing 4 git commits 292s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 292s - updating to branch default 292s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 292s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 292s - 0:ff7a2f2d8d70 draft alpha 292s - 1:7fe02317c63d draft beta 292s - 3:0eb1ab0073a8 draft default/master gamma tip 292s - $ hg tags -v -R hgrepo-2 292s - tip 3:0eb1ab0073a8 292s - gamma 3:0eb1ab0073a8 git 292s - default/master 3:0eb1ab0073a8 git-remote 292s - beta 1:7fe02317c63d git 292s - alpha 0:ff7a2f2d8d70 git 292s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 292s - $ rm -rf hgrepo-2 292s - 292s - $ hg clone -r master repo.git hgrepo-2 292s - importing 4 git commits 292s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 292s - updating to branch default 292s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 292s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 292s - 0:ff7a2f2d8d70 draft alpha 292s - 1:7fe02317c63d draft beta 292s - 3:0eb1ab0073a8 draft default/master gamma tip 292s -This used to die: 292s - $ hg -R hgrepo-2 gexport 292s -This used to fail, since we didn't actually pull the annotated tag: 292s - $ hg -R hgrepo-2 push 292s - pushing to $TESTTMP/repo.git 292s - searching for changes 292s - no changes found 292s - [1] 292s - $ rm -rf hgrepo-2 292s - 292s -Check that pulling will update phases only: 292s - 292s - $ cd hgrepo 292s - $ hg phase -fs gamma detached 292s - $ hg pull 292s - pulling from $TESTTMP/repo.git 292s - no changes found 292s - $ hg log -T shorttags -r gamma -r detached 292s - 4:0eb1ab0073a8 draft beta default/master gamma 292s - 2:61175962e488 draft detached X 292s - $ cd .. 292s - 292s -Check that we pull new tags to existing commits: 292s - $ cd gitrepo 292s - $ git tag 292s - alpha 292s - beta 292s - detached 292s - gamma 292s - $ fn_git_tag extra-simple-tag 292s - $ fn_git_tag -m annotated extra-annotated-tag 292s - $ git push --tags 292s - To $TESTTMP/repo.git 292s - * [new tag] extra-annotated-tag -> extra-annotated-tag 292s - * [new tag] extra-simple-tag -> extra-simple-tag 292s - $ cd ../hgrepo 292s - $ hg pull -r master 292s - pulling from $TESTTMP/repo.git 292s - no changes found 292s - $ hg tags -v | grep extra 292s - extra-simple-tag 1:7fe02317c63d git 292s - extra-annotated-tag 1:7fe02317c63d git 292s 292s ERROR: test-git-tags.t#secret output changed 294s ! 294s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-push.t 294s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-push.t.err 294s @@ -12,287 +12,10 @@ 294s 294s $ cd .. 294s $ hg clone -u tip gitrepo hgrepo 294s - importing 1 git commits 294s - new changesets ff7a2f2d8d70 (1 drafts) 294s - updating to branch default 294s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 294s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 294s + abort: repository gitrepo not found 294s + [255] 294s 294s $ cd hgrepo 294s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 294s $ hg bookmark -q master 294s - $ echo beta > beta 294s - $ hg add beta 294s - $ fn_hg_commit -m 'add beta' 294s - 294s - 294s - $ echo gamma > gamma 294s - $ hg add gamma 294s - $ fn_hg_commit -m 'add gamma' 294s - 294s - $ hg book -r 1 beta 294s - $ hg push -r beta 294s - pushing to $TESTTMP/gitrepo 294s - searching for changes 294s - adding objects 294s - remote: found 0 deltas to reuse 294s - added 1 commits with 1 trees and 1 blobs 294s - adding reference refs/heads/beta 294s - 294s - $ cd .. 294s - 294s -should have two different branches 294s - $ cd gitrepo 294s - $ git branch -v 294s - beta 0f378ab add beta 294s - master 7eeab2e add alpha 294s - * not-master 7eeab2e add alpha 294s - 294s -some more work on master from git 294s - $ git checkout master 2>&1 | sed s/\'/\"/g 294s - Switched to branch "master" 294s - $ echo delta > delta 294s - $ git add delta 294s - $ fn_git_commit -m "add delta" 294s - $ git checkout not-master 2>&1 | sed s/\'/\"/g 294s - Switched to branch "not-master" 294s - 294s - $ cd .. 294s - 294s - $ cd hgrepo 294s -this should fail 294s - $ hg push -r master 294s - pushing to $TESTTMP/gitrepo 294s - searching for changes 294s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 294s - [255] 294s - 294s -... even with -f 294s - $ hg push -fr master 294s - pushing to $TESTTMP/gitrepo 294s - searching for changes 294s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 294s - [255] 294s - 294s - $ hg pull 2>&1 | grep -v 'divergent bookmark' 294s - pulling from $TESTTMP/gitrepo 294s - importing 1 git commits 294s - not updating diverged bookmark master 294s - new changesets 25eed24f5e8f (1 drafts) 294s - (run 'hg heads' to see heads, 'hg merge' to merge) 294s -TODO shouldn't need to do this since we're (in theory) pushing master explicitly, 294s -which should not implicitly also push the not-master ref. 294s - $ hg book not-master -r default/not-master --force 294s -master and default/master should be diferent 294s - $ hg log -r master 294s - changeset: 2:953796e1cfd8 294s - bookmark: master 294s - user: test 294s - date: Mon Jan 01 00:00:12 2007 +0000 294s - summary: add gamma 294s - 294s - $ hg log -r default/master 294s - changeset: 3:25eed24f5e8f 294s - tag: default/master 294s - tag: tip 294s - parent: 0:ff7a2f2d8d70 294s - user: test 294s - date: Mon Jan 01 00:00:13 2007 +0000 294s - summary: add delta 294s - 294s - 294s -this should also fail 294s - $ hg push -r master 294s - pushing to $TESTTMP/gitrepo 294s - searching for changes 294s - abort: pushing refs/heads/master overwrites 953796e1cfd8 294s - [255] 294s - 294s -... but succeed with -f 294s - $ hg push -fr master 294s - pushing to $TESTTMP/gitrepo 294s - searching for changes 294s - adding objects 294s - remote: found 0 deltas to reuse 294s - added 1 commits with 1 trees and 1 blobs 294s - updating reference refs/heads/master 294s - 294s -this should fail, no changes to push 294s - $ hg push -r master 294s - pushing to $TESTTMP/gitrepo 294s - searching for changes 294s - no changes found 294s - [1] 294s - 294s -hg-git issue103 -- directories can lose information at hg-git export time 294s - 294s - $ hg up master 294s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 294s - $ mkdir dir1 294s - $ echo alpha > dir1/alpha 294s - $ hg add dir1/alpha 294s - $ fn_hg_commit -m 'add dir1/alpha' 294s - $ hg push -r master 294s - pushing to $TESTTMP/gitrepo 294s - searching for changes 294s - adding objects 294s - remote: found 0 deltas to reuse 294s - added 1 commits with 2 trees and 0 blobs 294s - updating reference refs/heads/master 294s - 294s - $ echo beta > dir1/beta 294s - $ hg add dir1/beta 294s - $ fn_hg_commit -m 'add dir1/beta' 294s - $ hg push -r master 294s - pushing to $TESTTMP/gitrepo 294s - searching for changes 294s - adding objects 294s - remote: found 0 deltas to reuse 294s - added 1 commits with 2 trees and 0 blobs 294s - updating reference refs/heads/master 294s - $ hg log -r master 294s - changeset: 5:ba0476ff1899 294s - bookmark: master 294s - tag: default/master 294s - tag: tip 294s - user: test 294s - date: Mon Jan 01 00:00:15 2007 +0000 294s - summary: add dir1/beta 294s - 294s - 294s - $ cat >> .hg/hgrc << EOF 294s - > [paths] 294s - > default:pushurl = file:///$TESTTMP/gitrepo 294s - > EOF 294s -NB: the triple slashes are intentional, due to windows 294s - $ hg push -r master 294s - pushing to file:///$TESTTMP/gitrepo 294s - searching for changes 294s - no changes found 294s - [1] 294s - 294s - $ cd .. 294s - 294s - $ hg clone -u tip gitrepo hgrepo-test 294s - importing 5 git commits 294s - new changesets ff7a2f2d8d70:ba0476ff1899 (5 drafts) 294s - updating to branch default 294s - 5 files updated, 0 files merged, 0 files removed, 0 files unresolved 294s - $ hg -R hgrepo-test log -r master 294s - changeset: 4:ba0476ff1899 294s - bookmark: master 294s - tag: default/master 294s - tag: tip 294s - user: test 294s - date: Mon Jan 01 00:00:15 2007 +0000 294s - summary: add dir1/beta 294s - 294s - $ hg tags -R hgrepo-test | grep ^default/ 294s - default/master 4:ba0476ff1899 294s - default/beta 1:47580592d3d6 294s - default/not-master 0:ff7a2f2d8d70 294s - 294s -Push a fast-forward to a currently checked out branch, which sometimes 294s -fails: 294s - 294s - $ cd hgrepo 294s - $ hg book -r master not-master 294s - moving bookmark 'not-master' forward from ff7a2f2d8d70 294s - $ hg push 294s - pushing to file:///$TESTTMP/gitrepo 294s - searching for changes 294s - warning: failed to update HEAD; unable to set b'HEAD' to b'7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03' (?) 294s - updating reference refs/heads/not-master 294s -That should have updated the tag: 294s - $ hg tags | grep ^default/ 294s - default/not-master 5:ba0476ff1899 294s - default/master 5:ba0476ff1899 294s - default/beta 1:47580592d3d6 294s - $ cd .. 294s - 294s -We can push only one of two bookmarks on the same revision: 294s - 294s - $ cd hgrepo 294s - $ hg book -r 0 also-not-master really-not-master 294s - $ hg push -B also-not-master 294s - pushing to file:///$TESTTMP/gitrepo 294s - searching for changes 294s - adding reference refs/heads/also-not-master 294s - 294s -We can also push another bookmark to a path with another revision 294s -specified: 294s - 294s - $ hg book -r 3 also-not-master 294s - moving bookmark 'also-not-master' forward from ff7a2f2d8d70 294s - $ hg push -B also-not-master "file:///$TESTTMP/gitrepo#master" 294s - pushing to file:///$TESTTMP/gitrepo 294s - searching for changes 294s - adding objects 294s - remote: found 0 deltas to reuse 294s - added 1 commits with 1 trees and 1 blobs 294s - updating reference refs/heads/also-not-master 294s - 294s -And we can delete them again afterwards: 294s - 294s - $ hg book -d also-not-master really-not-master 294s - $ hg push -B also-not-master -B really-not-master 294s - pushing to file:///$TESTTMP/gitrepo 294s - searching for changes 294s - warning: unable to delete 'refs/heads/really-not-master' as it does not exist on the remote repository 294s - deleting reference refs/heads/also-not-master 294s - 294s -Push empty Hg repo to empty Git repo (issue #58) 294s - $ hg init hgrepo2 294s - $ git init -q --bare repo.git 294s - $ hg -R hgrepo2 push repo.git 294s - pushing to repo.git 294s - searching for changes 294s - abort: no bookmarks or tags to push to git 294s - (see "hg help bookmarks" for details on creating them) 294s - [255] 294s - 294s -The remote repo is empty and the local one doesn't have any bookmarks/tags 294s - $ cd hgrepo2 294s - $ echo init >> test.txt 294s - $ hg addremove 294s - adding test.txt 294s - $ fn_hg_commit -m init 294s - $ hg update null 294s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 294s - $ hg push ../repo.git 294s - pushing to ../repo.git 294s - searching for changes 294s - abort: no bookmarks or tags to push to git 294s - (see "hg help bookmarks" for details on creating them) 294s - [255] 294s - $ hg summary 294s - parent: -1:000000000000 (no revision checked out) 294s - branch: default 294s - commit: (clean) 294s - update: 1 new changesets (update) 294s - phases: 1 draft 294s -That should not create any bookmarks 294s - $ hg bookmarks 294s - no bookmarks set 294s -And no tags for the remotes either: 294s - $ hg tags 294s - tip 0:8aded40be5af 294s - 294s -test for ssh vulnerability 294s - 294s - $ cat >> $HGRCPATH << EOF 294s - > [ui] 294s - > ssh = ssh -o ConnectTimeout=1 294s - > EOF 294s - $ hg push -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 294s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 294s - [255] 294s - $ hg push -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 294s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 294s - [255] 294s - $ hg push -q 'git+ssh://fakehost|rm%20nonexistent/path' 294s - ssh: * fakehost%7?rm%20nonexistent* (glob) 294s - abort: git remote error: The remote server unexpectedly closed the connection. 294s - [255] 294s - $ hg push -q 'git+ssh://fakehost%7Crm%20nonexistent/path' 294s - ssh: * fakehost%7?rm%20nonexistent* (glob) 294s - abort: git remote error: The remote server unexpectedly closed the connection. 294s - [255] 294s 294s ERROR: test-push.t output changed 322s ! 322s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-clone.t 322s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-clone.t#draft.err 322s @@ -38,60 +38,42 @@ 322s clone a tag 322s 322s $ hg clone -r alpha gitrepo hgrepo-a 322s - importing 1 git commits 322s - new changesets ff7a2f2d8d70 (1 drafts) 322s - updating to branch default 322s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository gitrepo not found 322s + [255] 322s $ hg -R hgrepo-a bookmarks 322s - master 0:ff7a2f2d8d70 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository hgrepo-a not found 322s + [255] 322s $ hg -R hgrepo-a log --graph --template=phases 322s - @ changeset: 0:ff7a2f2d8d70 322s - bookmark: master 322s - tag: alpha 322s - tag: default/master 322s - tag: tip 322s - phase: draft 322s - user: test 322s - date: Mon Jan 01 00:00:10 2007 +0000 322s - summary: add alpha 322s - 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository hgrepo-a not found 322s + [255] 322s $ git --git-dir hgrepo-a/.hg/git for-each-ref 322s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 322s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 322s + fatal: not a git repository: 'hgrepo-a/.hg/git' 322s + [128] 322s Make sure this is still draft since we didn't pull remote's HEAD 322s $ hg -R hgrepo-a phase -r alpha 322s - 0: draft 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository hgrepo-a not found 322s + [255] 322s 322s clone a branch 322s $ hg clone -r beta gitrepo hgrepo-b 322s - importing 2 git commits 322s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 322s - updating to branch default 322s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository gitrepo not found 322s + [255] 322s $ hg -R hgrepo-b bookmarks 322s - * beta 1:7fe02317c63d 322s - master 0:ff7a2f2d8d70 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository hgrepo-b not found 322s + [255] 322s $ hg -R hgrepo-b log --graph 322s - @ changeset: 1:7fe02317c63d 322s - | bookmark: beta 322s - | tag: default/beta 322s - | tag: tip 322s - | user: test 322s - | date: Mon Jan 01 00:00:11 2007 +0000 322s - | summary: add beta 322s - | 322s - o changeset: 0:ff7a2f2d8d70 322s - bookmark: master 322s - tag: alpha 322s - tag: default/master 322s - user: test 322s - date: Mon Jan 01 00:00:10 2007 +0000 322s - summary: add alpha 322s - 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository hgrepo-b not found 322s + [255] 322s $ git --git-dir hgrepo-b/.hg/git for-each-ref 322s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 322s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 322s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 322s + fatal: not a git repository: 'hgrepo-b/.hg/git' 322s + [128] 322s 322s Make sure that a deleted .hgsubstate does not confuse hg-git 322s 322s @@ -104,48 +86,50 @@ 322s $ cd .. 322s 322s $ hg clone -r beta gitrepo hgrepo-c 322s - importing 4 git commits 322s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 322s - updating to branch default 322s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository gitrepo not found 322s + [255] 322s $ hg -R hgrepo-c bookmarks 322s - * beta 3:47d12948785d 322s - master 0:ff7a2f2d8d70 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository hgrepo-c not found 322s + [255] 322s $ hg --cwd hgrepo-c status 322s + abort: No such file or directory: 'hgrepo-c' 322s + [255] 322s $ git --git-dir hgrepo-c/.hg/git for-each-ref 322s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 322s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 322s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 322s + fatal: not a git repository: 'hgrepo-c/.hg/git' 322s + [128] 322s 322s test shared repositories 322s 322s $ hg clone gitrepo hgrepo-base 322s - importing 5 git commits 322s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 322s - updating to bookmark beta 322s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository gitrepo not found 322s + [255] 322s $ hg -R hgrepo-base bookmarks 322s - * beta 4:47d12948785d 322s - gamma 2:ca33a262eb46 322s - master 0:ff7a2f2d8d70 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository hgrepo-base not found 322s + [255] 322s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 322s - updating working directory 322s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository hgrepo-base not found 322s + [255] 322s $ hg -R hgrepo-shared pull gitrepo 322s - pulling from gitrepo 322s - no changes found 322s - adding bookmark beta 322s - adding bookmark gamma 322s - adding bookmark master 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository hgrepo-shared not found 322s + [255] 322s $ hg -R hgrepo-shared push gitrepo 322s - pushing to gitrepo 322s - searching for changes 322s - no changes found 322s - [1] 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository hgrepo-shared not found 322s + [255] 322s $ ls hgrepo-shared/.hg | grep git 322s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 322s [1] 322s $ hg -R hgrepo-shared git-cleanup 322s - git commit map cleaned 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + hg: unknown command 'git-cleanup' 322s + (did you mean clean?) 322s + [10] 322s $ rm -rf hgrepo-base hgrepo-shared 322s 322s test cloning HEAD 322s @@ -154,23 +138,21 @@ 322s $ git checkout -q master 322s $ cd .. 322s $ hg clone gitrepo hgrepo-2 322s - importing 5 git commits 322s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 322s - updating to bookmark master 322s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository gitrepo not found 322s + [255] 322s $ git --git-dir hgrepo-2/.hg/git for-each-ref 322s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 322s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 322s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 322s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 322s + fatal: not a git repository: 'hgrepo-2/.hg/git' 322s + [128] 322s $ rm -rf hgrepo-2 322s 322s clone empty repo 322s $ git init empty 322s Initialized empty Git repository in $TESTTMP/empty/.git/ 322s $ hg clone empty emptyhg 322s - updating to branch default 322s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository empty not found 322s + [255] 322s $ rm -rf empty emptyhg 322s 322s test cloning detached HEAD, but pointing to a branch; we detect this 322s @@ -180,25 +162,20 @@ 322s $ git checkout -q -d master 322s $ cd .. 322s $ hg clone gitrepo hgrepo-2 322s - importing 5 git commits 322s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 322s - updating to bookmark master 322s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository gitrepo not found 322s + [255] 322s $ hg -R hgrepo-2 book 322s - beta 4:47d12948785d 322s - gamma 2:ca33a262eb46 322s - * master 0:ff7a2f2d8d70 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository hgrepo-2 not found 322s + [255] 322s $ hg -R hgrepo-2 tags -v 322s - tip 4:47d12948785d 322s - default/beta 4:47d12948785d git-remote 322s - default/gamma 2:ca33a262eb46 git-remote 322s - default/master 0:ff7a2f2d8d70 git-remote 322s - alpha 0:ff7a2f2d8d70 git 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository hgrepo-2 not found 322s + [255] 322s $ git --git-dir hgrepo-2/.hg/git for-each-ref 322s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 322s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 322s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 322s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 322s + fatal: not a git repository: 'hgrepo-2/.hg/git' 322s + [128] 322s $ rm -rf hgrepo-2 322s 322s test cloning fully detached HEAD; we don't convert the 322s @@ -212,44 +189,45 @@ 322s $ fn_git_commit -m 'add delta' 322s $ cd .. 322s $ hg clone gitrepo hgrepo-2 322s - importing 5 git commits 322s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 322s - warning: the git source repository has a detached head 322s - (you may want to update to a bookmark) 322s - updating to branch default 322s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository gitrepo not found 322s + [255] 322s $ hg -R hgrepo-2 book 322s - beta 4:47d12948785d 322s - gamma 2:ca33a262eb46 322s - master 0:ff7a2f2d8d70 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository hgrepo-2 not found 322s + [255] 322s $ hg -R hgrepo-2 id --tags 322s - default/beta tip 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s + abort: repository hgrepo-2 not found 322s + [255] 322s $ git --git-dir hgrepo-2/.hg/git for-each-ref 322s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 322s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 322s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 322s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 322s + fatal: not a git repository: 'hgrepo-2/.hg/git' 322s + [128] 322s $ rm -rf hgrepo-2 322s 322s test that cloning a regular mercurial repository does not introduce 322s git state 322s 322s $ hg init hgrepo-base 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s $ cd hgrepo-base 322s $ touch flaf 322s $ fn_hg_commit -A -m flaf 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s $ cd .. 322s $ hg clone -U hgrepo-base hgrepo-copy 322s requesting all changes (secret !) 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s $ ls hgrepo-copy/.hg | grep git 322s [1] 322s $ hg clone -U --pull hgrepo-base hgrepo-pull 322s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 322s requesting all changes 322s - adding changesets (draft !) 322s - adding manifests (draft !) 322s - adding file changes (draft !) 322s - added 1 changesets with 1 changes to 1 files (draft !) 322s - new changesets 76c919376257 (draft !) 322s + adding changesets 322s + adding manifests 322s + adding file changes 322s + added 1 changesets with 1 changes to 1 files 322s + new changesets 76c919376257 322s $ ls hgrepo-pull | grep git 322s [1] 322s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 322s 322s ERROR: test-clone.t#draft output changed 324s ! 324s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-clone.t 324s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-clone.t#secret.err 324s @@ -38,60 +38,42 @@ 324s clone a tag 324s 324s $ hg clone -r alpha gitrepo hgrepo-a 324s - importing 1 git commits 324s - new changesets ff7a2f2d8d70 (1 drafts) 324s - updating to branch default 324s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository gitrepo not found 324s + [255] 324s $ hg -R hgrepo-a bookmarks 324s - master 0:ff7a2f2d8d70 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository hgrepo-a not found 324s + [255] 324s $ hg -R hgrepo-a log --graph --template=phases 324s - @ changeset: 0:ff7a2f2d8d70 324s - bookmark: master 324s - tag: alpha 324s - tag: default/master 324s - tag: tip 324s - phase: draft 324s - user: test 324s - date: Mon Jan 01 00:00:10 2007 +0000 324s - summary: add alpha 324s - 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository hgrepo-a not found 324s + [255] 324s $ git --git-dir hgrepo-a/.hg/git for-each-ref 324s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 324s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 324s + fatal: not a git repository: 'hgrepo-a/.hg/git' 324s + [128] 324s Make sure this is still draft since we didn't pull remote's HEAD 324s $ hg -R hgrepo-a phase -r alpha 324s - 0: draft 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository hgrepo-a not found 324s + [255] 324s 324s clone a branch 324s $ hg clone -r beta gitrepo hgrepo-b 324s - importing 2 git commits 324s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 324s - updating to branch default 324s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository gitrepo not found 324s + [255] 324s $ hg -R hgrepo-b bookmarks 324s - * beta 1:7fe02317c63d 324s - master 0:ff7a2f2d8d70 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository hgrepo-b not found 324s + [255] 324s $ hg -R hgrepo-b log --graph 324s - @ changeset: 1:7fe02317c63d 324s - | bookmark: beta 324s - | tag: default/beta 324s - | tag: tip 324s - | user: test 324s - | date: Mon Jan 01 00:00:11 2007 +0000 324s - | summary: add beta 324s - | 324s - o changeset: 0:ff7a2f2d8d70 324s - bookmark: master 324s - tag: alpha 324s - tag: default/master 324s - user: test 324s - date: Mon Jan 01 00:00:10 2007 +0000 324s - summary: add alpha 324s - 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository hgrepo-b not found 324s + [255] 324s $ git --git-dir hgrepo-b/.hg/git for-each-ref 324s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 324s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 324s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 324s + fatal: not a git repository: 'hgrepo-b/.hg/git' 324s + [128] 324s 324s Make sure that a deleted .hgsubstate does not confuse hg-git 324s 324s @@ -104,48 +86,50 @@ 324s $ cd .. 324s 324s $ hg clone -r beta gitrepo hgrepo-c 324s - importing 4 git commits 324s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 324s - updating to branch default 324s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository gitrepo not found 324s + [255] 324s $ hg -R hgrepo-c bookmarks 324s - * beta 3:47d12948785d 324s - master 0:ff7a2f2d8d70 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository hgrepo-c not found 324s + [255] 324s $ hg --cwd hgrepo-c status 324s + abort: No such file or directory: 'hgrepo-c' 324s + [255] 324s $ git --git-dir hgrepo-c/.hg/git for-each-ref 324s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 324s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 324s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 324s + fatal: not a git repository: 'hgrepo-c/.hg/git' 324s + [128] 324s 324s test shared repositories 324s 324s $ hg clone gitrepo hgrepo-base 324s - importing 5 git commits 324s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 324s - updating to bookmark beta 324s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository gitrepo not found 324s + [255] 324s $ hg -R hgrepo-base bookmarks 324s - * beta 4:47d12948785d 324s - gamma 2:ca33a262eb46 324s - master 0:ff7a2f2d8d70 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository hgrepo-base not found 324s + [255] 324s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 324s - updating working directory 324s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository hgrepo-base not found 324s + [255] 324s $ hg -R hgrepo-shared pull gitrepo 324s - pulling from gitrepo 324s - no changes found 324s - adding bookmark beta 324s - adding bookmark gamma 324s - adding bookmark master 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository hgrepo-shared not found 324s + [255] 324s $ hg -R hgrepo-shared push gitrepo 324s - pushing to gitrepo 324s - searching for changes 324s - no changes found 324s - [1] 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository hgrepo-shared not found 324s + [255] 324s $ ls hgrepo-shared/.hg | grep git 324s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 324s [1] 324s $ hg -R hgrepo-shared git-cleanup 324s - git commit map cleaned 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + hg: unknown command 'git-cleanup' 324s + (did you mean clean?) 324s + [10] 324s $ rm -rf hgrepo-base hgrepo-shared 324s 324s test cloning HEAD 324s @@ -154,23 +138,21 @@ 324s $ git checkout -q master 324s $ cd .. 324s $ hg clone gitrepo hgrepo-2 324s - importing 5 git commits 324s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 324s - updating to bookmark master 324s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository gitrepo not found 324s + [255] 324s $ git --git-dir hgrepo-2/.hg/git for-each-ref 324s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 324s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 324s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 324s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 324s + fatal: not a git repository: 'hgrepo-2/.hg/git' 324s + [128] 324s $ rm -rf hgrepo-2 324s 324s clone empty repo 324s $ git init empty 324s Initialized empty Git repository in $TESTTMP/empty/.git/ 324s $ hg clone empty emptyhg 324s - updating to branch default 324s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository empty not found 324s + [255] 324s $ rm -rf empty emptyhg 324s 324s test cloning detached HEAD, but pointing to a branch; we detect this 324s @@ -180,25 +162,20 @@ 324s $ git checkout -q -d master 324s $ cd .. 324s $ hg clone gitrepo hgrepo-2 324s - importing 5 git commits 324s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 324s - updating to bookmark master 324s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository gitrepo not found 324s + [255] 324s $ hg -R hgrepo-2 book 324s - beta 4:47d12948785d 324s - gamma 2:ca33a262eb46 324s - * master 0:ff7a2f2d8d70 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository hgrepo-2 not found 324s + [255] 324s $ hg -R hgrepo-2 tags -v 324s - tip 4:47d12948785d 324s - default/beta 4:47d12948785d git-remote 324s - default/gamma 2:ca33a262eb46 git-remote 324s - default/master 0:ff7a2f2d8d70 git-remote 324s - alpha 0:ff7a2f2d8d70 git 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository hgrepo-2 not found 324s + [255] 324s $ git --git-dir hgrepo-2/.hg/git for-each-ref 324s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 324s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 324s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 324s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 324s + fatal: not a git repository: 'hgrepo-2/.hg/git' 324s + [128] 324s $ rm -rf hgrepo-2 324s 324s test cloning fully detached HEAD; we don't convert the 324s @@ -212,44 +189,45 @@ 324s $ fn_git_commit -m 'add delta' 324s $ cd .. 324s $ hg clone gitrepo hgrepo-2 324s - importing 5 git commits 324s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 324s - warning: the git source repository has a detached head 324s - (you may want to update to a bookmark) 324s - updating to branch default 324s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository gitrepo not found 324s + [255] 324s $ hg -R hgrepo-2 book 324s - beta 4:47d12948785d 324s - gamma 2:ca33a262eb46 324s - master 0:ff7a2f2d8d70 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository hgrepo-2 not found 324s + [255] 324s $ hg -R hgrepo-2 id --tags 324s - default/beta tip 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + abort: repository hgrepo-2 not found 324s + [255] 324s $ git --git-dir hgrepo-2/.hg/git for-each-ref 324s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 324s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 324s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 324s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 324s + fatal: not a git repository: 'hgrepo-2/.hg/git' 324s + [128] 324s $ rm -rf hgrepo-2 324s 324s test that cloning a regular mercurial repository does not introduce 324s git state 324s 324s $ hg init hgrepo-base 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s $ cd hgrepo-base 324s $ touch flaf 324s $ fn_hg_commit -A -m flaf 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s $ cd .. 324s $ hg clone -U hgrepo-base hgrepo-copy 324s - requesting all changes (secret !) 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s + requesting all changes 324s $ ls hgrepo-copy/.hg | grep git 324s [1] 324s $ hg clone -U --pull hgrepo-base hgrepo-pull 324s - requesting all changes 324s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 324s adding changesets (draft !) 324s adding manifests (draft !) 324s adding file changes (draft !) 324s added 1 changesets with 1 changes to 1 files (draft !) 324s new changesets 76c919376257 (draft !) 324s + requesting all changes 324s $ ls hgrepo-pull | grep git 324s [1] 324s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 324s 324s ERROR: test-clone.t#secret output changed 326s ! 326s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-branch-bookmark-suffix.t 326s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-branch-bookmark-suffix.t#with-path.err 326s @@ -9,287 +9,12 @@ 326s $ git init -q --bare repo.git 326s 326s $ hg clone repo.git hgrepo 326s - updating to branch default 326s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 326s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 326s + abort: repository repo.git not found 326s + [255] 326s $ cd hgrepo 326s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 326s #if without-path 326s $ rm .hg/hgrc 326s #endif 326s $ hg branch -q branch1 326s - $ hg bookmark branch1_bookmark 326s - $ echo f1 > f1 326s - $ hg add f1 326s - $ fn_hg_commit -m "add f1" 326s - $ hg branch -q branch2 326s - $ hg bookmark branch2_bookmark 326s - $ echo f2 > f2 326s - $ hg add f2 326s - $ fn_hg_commit -m "add f2" 326s - $ hg log --graph 326s - @ changeset: 1:600de9b6d498 326s - | branch: branch2 326s - | bookmark: branch2_bookmark 326s - | tag: tip 326s - | user: test 326s - | date: Mon Jan 01 00:00:11 2007 +0000 326s - | summary: add f2 326s - | 326s - o changeset: 0:40a840c1f8ae 326s - branch: branch1 326s - bookmark: branch1_bookmark 326s - user: test 326s - date: Mon Jan 01 00:00:10 2007 +0000 326s - summary: add f1 326s - 326s - 326s - $ hg push -B asdasd ../repo.git 326s - pushing to ../repo.git 326s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 326s - [255] 326s - 326s - $ hg push ../repo.git 326s - pushing to ../repo.git 326s - searching for changes 326s - adding objects 326s - remote: found 0 deltas to reuse 326s - added 2 commits with 2 trees and 2 blobs 326s - adding reference refs/heads/branch1 326s - adding reference refs/heads/branch2 326s - 326s - $ cd .. 326s - 326s - $ cd repo.git 326s - $ git symbolic-ref HEAD refs/heads/branch1 326s - $ git branch 326s - * branch1 326s - branch2 326s - $ cd .. 326s - 326s - $ git clone repo.git gitrepo 326s - Cloning into 'gitrepo'... 326s - done. 326s - $ cd gitrepo 326s - $ git checkout -q branch1 326s - $ echo g1 >> f1 326s - $ git add f1 326s - $ fn_git_commit -m "append f1" 326s - $ git checkout -q branch2 326s - $ echo g2 >> f2 326s - $ git add f2 326s - $ fn_git_commit -m "append f2" 326s - $ git checkout -b branch3 326s - Switched to a new branch 'branch3' 326s - $ echo g3 >> f3 326s - $ git add f3 326s - $ fn_git_commit -m "append f3" 326s - $ git push origin branch1 branch2 branch3 326s - To $TESTTMP/repo.git 326s - bbfe79a..d8aef79 branch1 -> branch1 326s - 288e92b..f8f8de5 branch2 -> branch2 326s - * [new branch] branch3 -> branch3 326s -make sure the commit doesn't have an HG:rename-source annotation 326s - $ git cat-file commit d8aef79 326s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 326s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 326s - author test 1167609612 +0000 326s - committer test 1167609612 +0000 326s - 326s - append f1 326s - $ cd .. 326s - 326s - $ cd hgrepo 326s - $ hg paths 326s - default = $TESTTMP/repo.git (with-path !) 326s - $ hg pull ../repo.git 326s - pulling from ../repo.git 326s - importing 3 git commits 326s - updating bookmark branch1_bookmark 326s - updating bookmark branch2_bookmark 326s - adding bookmark branch3_bookmark 326s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 326s - (run 'hg heads' to see heads) 326s - $ hg log --graph 326s - o changeset: 4:faf44fc3a4e8 326s - | bookmark: branch3_bookmark 326s - | tag: default/branch3 (with-path !) 326s - | tag: tip 326s - | user: test 326s - | date: Mon Jan 01 00:00:14 2007 +0000 326s - | summary: append f3 326s - | 326s - o changeset: 3:ae8eb55f7090 326s - | bookmark: branch2_bookmark 326s - | tag: default/branch2 (with-path !) 326s - | parent: 1:600de9b6d498 326s - | user: test 326s - | date: Mon Jan 01 00:00:13 2007 +0000 326s - | summary: append f2 326s - | 326s - | o changeset: 2:8211cade99e4 326s - | | bookmark: branch1_bookmark 326s - | | tag: default/branch1 (with-path !) 326s - | | parent: 0:40a840c1f8ae 326s - | | user: test 326s - | | date: Mon Jan 01 00:00:12 2007 +0000 326s - | | summary: append f1 326s - | | 326s - @ | changeset: 1:600de9b6d498 326s - |/ branch: branch2 326s - | user: test 326s - | date: Mon Jan 01 00:00:11 2007 +0000 326s - | summary: add f2 326s - | 326s - o changeset: 0:40a840c1f8ae 326s - branch: branch1 326s - user: test 326s - date: Mon Jan 01 00:00:10 2007 +0000 326s - summary: add f1 326s - 326s - $ cd .. 326s - 326s -Try cloning a bookmark, and make sure it gets checked out: 326s - 326s - $ rm -r hgrepo 326s - $ hg clone -r branch3 repo.git hgrepo 326s - importing 4 git commits 326s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 326s - updating to bookmark branch3_bookmark 326s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 326s - $ cd hgrepo 326s - $ hg bookmarks 326s - branch2_bookmark 2:ae8eb55f7090 326s - * branch3_bookmark 3:faf44fc3a4e8 326s - $ hg log --graph 326s - @ changeset: 3:faf44fc3a4e8 326s - | bookmark: branch3_bookmark 326s - | tag: default/branch3 326s - | tag: tip 326s - | user: test 326s - | date: Mon Jan 01 00:00:14 2007 +0000 326s - | summary: append f3 326s - | 326s - o changeset: 2:ae8eb55f7090 326s - | bookmark: branch2_bookmark 326s - | tag: default/branch2 326s - | user: test 326s - | date: Mon Jan 01 00:00:13 2007 +0000 326s - | summary: append f2 326s - | 326s - o changeset: 1:600de9b6d498 326s - | branch: branch2 326s - | user: test 326s - | date: Mon Jan 01 00:00:11 2007 +0000 326s - | summary: add f2 326s - | 326s - o changeset: 0:40a840c1f8ae 326s - branch: branch1 326s - user: test 326s - date: Mon Jan 01 00:00:10 2007 +0000 326s - summary: add f1 326s - 326s - $ cd .. 326s - 326s -Try cloning something that's both a bookmark and a branch, and see the 326s -results. They're a bit suprising as the bookmark does get activated, 326s -but the branch get checked out. Although this does seem a bit odd, so 326s -does the scenario. 326s - 326s - $ rm -r hgrepo 326s - $ hg clone -r branch1 repo.git hgrepo 326s - importing 2 git commits 326s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 326s - updating to branch branch1 326s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 326s - $ cd hgrepo 326s - $ hg bookmarks 326s - * branch1_bookmark 1:8211cade99e4 326s - $ hg log --graph 326s - o changeset: 1:8211cade99e4 326s - | bookmark: branch1_bookmark 326s - | tag: default/branch1 326s - | tag: tip 326s - | user: test 326s - | date: Mon Jan 01 00:00:12 2007 +0000 326s - | summary: append f1 326s - | 326s - @ changeset: 0:40a840c1f8ae 326s - branch: branch1 326s - user: test 326s - date: Mon Jan 01 00:00:10 2007 +0000 326s - summary: add f1 326s - 326s - 326s - $ cd .. 326s - 326s -Now try pulling a diverged bookmark: 326s - 326s - $ rm -r hgrepo 326s -#if with-path 326s - $ hg clone -U repo.git hgrepo 326s - importing 5 git commits 326s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 326s -#else 326s - $ hg init hgrepo 326s - $ hg -R hgrepo pull repo.git 326s - pulling from repo.git 326s - importing 5 git commits 326s - adding bookmark branch1_bookmark 326s - adding bookmark branch2_bookmark 326s - adding bookmark branch3_bookmark 326s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 326s - (run 'hg heads' to see heads, 'hg merge' to merge) 326s -#endif 326s - $ cd gitrepo 326s - $ git checkout -q branch1 326s - $ fn_git_rebase branch3 326s - $ git push -f 326s - To $TESTTMP/repo.git 326s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 326s - $ cd ../hgrepo 326s - $ hg pull ../repo.git 326s - pulling from ../repo.git 326s - importing 1 git commits 326s - not updating diverged bookmark branch1_bookmark 326s - new changesets 895d0307f8b7 (1 drafts) 326s - (run 'hg update' to get a working copy) 326s - $ hg log --graph 326s - o changeset: 5:895d0307f8b7 326s - | tag: default/branch1 (with-path !) 326s - | tag: tip 326s - | user: test 326s - | date: Mon Jan 01 00:00:12 2007 +0000 326s - | summary: append f1 326s - | 326s - o changeset: 4:faf44fc3a4e8 326s - | bookmark: branch3_bookmark 326s - | tag: default/branch3 (with-path !) 326s - | user: test 326s - | date: Mon Jan 01 00:00:14 2007 +0000 326s - | summary: append f3 326s - | 326s - o changeset: 3:ae8eb55f7090 326s - | bookmark: branch2_bookmark 326s - | tag: default/branch2 (with-path !) 326s - | user: test 326s - | date: Mon Jan 01 00:00:13 2007 +0000 326s - | summary: append f2 326s - | 326s - o changeset: 2:600de9b6d498 326s - | branch: branch2 326s - | parent: 0:40a840c1f8ae 326s - | user: test 326s - | date: Mon Jan 01 00:00:11 2007 +0000 326s - | summary: add f2 326s - | 326s - | o changeset: 1:8211cade99e4 326s - |/ bookmark: branch1_bookmark 326s - | user: test 326s - | date: Mon Jan 01 00:00:12 2007 +0000 326s - | summary: append f1 326s - | 326s - o changeset: 0:40a840c1f8ae 326s - branch: branch1 326s - user: test 326s - date: Mon Jan 01 00:00:10 2007 +0000 326s - summary: add f1 326s - 326s 326s ERROR: test-branch-bookmark-suffix.t#with-path output changed 328s ! 328s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-branch-bookmark-suffix.t 328s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-branch-bookmark-suffix.t#without-path.err 328s @@ -9,287 +9,10 @@ 328s $ git init -q --bare repo.git 328s 328s $ hg clone repo.git hgrepo 328s - updating to branch default 328s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 328s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 328s + abort: repository repo.git not found 328s + [255] 328s $ cd hgrepo 328s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 328s #if without-path 328s $ rm .hg/hgrc 328s -#endif 328s - $ hg branch -q branch1 328s - $ hg bookmark branch1_bookmark 328s - $ echo f1 > f1 328s - $ hg add f1 328s - $ fn_hg_commit -m "add f1" 328s - $ hg branch -q branch2 328s - $ hg bookmark branch2_bookmark 328s - $ echo f2 > f2 328s - $ hg add f2 328s - $ fn_hg_commit -m "add f2" 328s - $ hg log --graph 328s - @ changeset: 1:600de9b6d498 328s - | branch: branch2 328s - | bookmark: branch2_bookmark 328s - | tag: tip 328s - | user: test 328s - | date: Mon Jan 01 00:00:11 2007 +0000 328s - | summary: add f2 328s - | 328s - o changeset: 0:40a840c1f8ae 328s - branch: branch1 328s - bookmark: branch1_bookmark 328s - user: test 328s - date: Mon Jan 01 00:00:10 2007 +0000 328s - summary: add f1 328s - 328s - 328s - $ hg push -B asdasd ../repo.git 328s - pushing to ../repo.git 328s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 328s - [255] 328s - 328s - $ hg push ../repo.git 328s - pushing to ../repo.git 328s - searching for changes 328s - adding objects 328s - remote: found 0 deltas to reuse 328s - added 2 commits with 2 trees and 2 blobs 328s - adding reference refs/heads/branch1 328s - adding reference refs/heads/branch2 328s - 328s - $ cd .. 328s - 328s - $ cd repo.git 328s - $ git symbolic-ref HEAD refs/heads/branch1 328s - $ git branch 328s - * branch1 328s - branch2 328s - $ cd .. 328s - 328s - $ git clone repo.git gitrepo 328s - Cloning into 'gitrepo'... 328s - done. 328s - $ cd gitrepo 328s - $ git checkout -q branch1 328s - $ echo g1 >> f1 328s - $ git add f1 328s - $ fn_git_commit -m "append f1" 328s - $ git checkout -q branch2 328s - $ echo g2 >> f2 328s - $ git add f2 328s - $ fn_git_commit -m "append f2" 328s - $ git checkout -b branch3 328s - Switched to a new branch 'branch3' 328s - $ echo g3 >> f3 328s - $ git add f3 328s - $ fn_git_commit -m "append f3" 328s - $ git push origin branch1 branch2 branch3 328s - To $TESTTMP/repo.git 328s - bbfe79a..d8aef79 branch1 -> branch1 328s - 288e92b..f8f8de5 branch2 -> branch2 328s - * [new branch] branch3 -> branch3 328s -make sure the commit doesn't have an HG:rename-source annotation 328s - $ git cat-file commit d8aef79 328s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 328s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 328s - author test 1167609612 +0000 328s - committer test 1167609612 +0000 328s - 328s - append f1 328s - $ cd .. 328s - 328s - $ cd hgrepo 328s - $ hg paths 328s - default = $TESTTMP/repo.git (with-path !) 328s - $ hg pull ../repo.git 328s - pulling from ../repo.git 328s - importing 3 git commits 328s - updating bookmark branch1_bookmark 328s - updating bookmark branch2_bookmark 328s - adding bookmark branch3_bookmark 328s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 328s - (run 'hg heads' to see heads) 328s - $ hg log --graph 328s - o changeset: 4:faf44fc3a4e8 328s - | bookmark: branch3_bookmark 328s - | tag: default/branch3 (with-path !) 328s - | tag: tip 328s - | user: test 328s - | date: Mon Jan 01 00:00:14 2007 +0000 328s - | summary: append f3 328s - | 328s - o changeset: 3:ae8eb55f7090 328s - | bookmark: branch2_bookmark 328s - | tag: default/branch2 (with-path !) 328s - | parent: 1:600de9b6d498 328s - | user: test 328s - | date: Mon Jan 01 00:00:13 2007 +0000 328s - | summary: append f2 328s - | 328s - | o changeset: 2:8211cade99e4 328s - | | bookmark: branch1_bookmark 328s - | | tag: default/branch1 (with-path !) 328s - | | parent: 0:40a840c1f8ae 328s - | | user: test 328s - | | date: Mon Jan 01 00:00:12 2007 +0000 328s - | | summary: append f1 328s - | | 328s - @ | changeset: 1:600de9b6d498 328s - |/ branch: branch2 328s - | user: test 328s - | date: Mon Jan 01 00:00:11 2007 +0000 328s - | summary: add f2 328s - | 328s - o changeset: 0:40a840c1f8ae 328s - branch: branch1 328s - user: test 328s - date: Mon Jan 01 00:00:10 2007 +0000 328s - summary: add f1 328s - 328s - $ cd .. 328s - 328s -Try cloning a bookmark, and make sure it gets checked out: 328s - 328s - $ rm -r hgrepo 328s - $ hg clone -r branch3 repo.git hgrepo 328s - importing 4 git commits 328s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 328s - updating to bookmark branch3_bookmark 328s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 328s - $ cd hgrepo 328s - $ hg bookmarks 328s - branch2_bookmark 2:ae8eb55f7090 328s - * branch3_bookmark 3:faf44fc3a4e8 328s - $ hg log --graph 328s - @ changeset: 3:faf44fc3a4e8 328s - | bookmark: branch3_bookmark 328s - | tag: default/branch3 328s - | tag: tip 328s - | user: test 328s - | date: Mon Jan 01 00:00:14 2007 +0000 328s - | summary: append f3 328s - | 328s - o changeset: 2:ae8eb55f7090 328s - | bookmark: branch2_bookmark 328s - | tag: default/branch2 328s - | user: test 328s - | date: Mon Jan 01 00:00:13 2007 +0000 328s - | summary: append f2 328s - | 328s - o changeset: 1:600de9b6d498 328s - | branch: branch2 328s - | user: test 328s - | date: Mon Jan 01 00:00:11 2007 +0000 328s - | summary: add f2 328s - | 328s - o changeset: 0:40a840c1f8ae 328s - branch: branch1 328s - user: test 328s - date: Mon Jan 01 00:00:10 2007 +0000 328s - summary: add f1 328s - 328s - $ cd .. 328s - 328s -Try cloning something that's both a bookmark and a branch, and see the 328s -results. They're a bit suprising as the bookmark does get activated, 328s -but the branch get checked out. Although this does seem a bit odd, so 328s -does the scenario. 328s - 328s - $ rm -r hgrepo 328s - $ hg clone -r branch1 repo.git hgrepo 328s - importing 2 git commits 328s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 328s - updating to branch branch1 328s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 328s - $ cd hgrepo 328s - $ hg bookmarks 328s - * branch1_bookmark 1:8211cade99e4 328s - $ hg log --graph 328s - o changeset: 1:8211cade99e4 328s - | bookmark: branch1_bookmark 328s - | tag: default/branch1 328s - | tag: tip 328s - | user: test 328s - | date: Mon Jan 01 00:00:12 2007 +0000 328s - | summary: append f1 328s - | 328s - @ changeset: 0:40a840c1f8ae 328s - branch: branch1 328s - user: test 328s - date: Mon Jan 01 00:00:10 2007 +0000 328s - summary: add f1 328s - 328s - 328s - $ cd .. 328s - 328s -Now try pulling a diverged bookmark: 328s - 328s - $ rm -r hgrepo 328s -#if with-path 328s - $ hg clone -U repo.git hgrepo 328s - importing 5 git commits 328s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 328s -#else 328s - $ hg init hgrepo 328s - $ hg -R hgrepo pull repo.git 328s - pulling from repo.git 328s - importing 5 git commits 328s - adding bookmark branch1_bookmark 328s - adding bookmark branch2_bookmark 328s - adding bookmark branch3_bookmark 328s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 328s - (run 'hg heads' to see heads, 'hg merge' to merge) 328s -#endif 328s - $ cd gitrepo 328s - $ git checkout -q branch1 328s - $ fn_git_rebase branch3 328s - $ git push -f 328s - To $TESTTMP/repo.git 328s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 328s - $ cd ../hgrepo 328s - $ hg pull ../repo.git 328s - pulling from ../repo.git 328s - importing 1 git commits 328s - not updating diverged bookmark branch1_bookmark 328s - new changesets 895d0307f8b7 (1 drafts) 328s - (run 'hg update' to get a working copy) 328s - $ hg log --graph 328s - o changeset: 5:895d0307f8b7 328s - | tag: default/branch1 (with-path !) 328s - | tag: tip 328s - | user: test 328s - | date: Mon Jan 01 00:00:12 2007 +0000 328s - | summary: append f1 328s - | 328s - o changeset: 4:faf44fc3a4e8 328s - | bookmark: branch3_bookmark 328s - | tag: default/branch3 (with-path !) 328s - | user: test 328s - | date: Mon Jan 01 00:00:14 2007 +0000 328s - | summary: append f3 328s - | 328s - o changeset: 3:ae8eb55f7090 328s - | bookmark: branch2_bookmark 328s - | tag: default/branch2 (with-path !) 328s - | user: test 328s - | date: Mon Jan 01 00:00:13 2007 +0000 328s - | summary: append f2 328s - | 328s - o changeset: 2:600de9b6d498 328s - | branch: branch2 328s - | parent: 0:40a840c1f8ae 328s - | user: test 328s - | date: Mon Jan 01 00:00:11 2007 +0000 328s - | summary: add f2 328s - | 328s - | o changeset: 1:8211cade99e4 328s - |/ bookmark: branch1_bookmark 328s - | user: test 328s - | date: Mon Jan 01 00:00:12 2007 +0000 328s - | summary: append f1 328s - | 328s - o changeset: 0:40a840c1f8ae 328s - branch: branch1 328s - user: test 328s - date: Mon Jan 01 00:00:10 2007 +0000 328s - summary: add f1 328s - 328s 328s ERROR: test-branch-bookmark-suffix.t#without-path output changed 329s ! 329s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-bundle.t 329s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-bundle.t.err 329s @@ -36,247 +36,12 @@ 329s Clone it! 329s 329s $ hg clone gitrepo hgrepo 329s - importing 3 git commits 329s - new changesets ff7a2f2d8d70:ca33a262eb46 (3 drafts) 329s - updating to bookmark master 329s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 329s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 329s + abort: repository gitrepo not found 329s + [255] 329s $ cd hgrepo 329s + $TESTTMP.sh: 45: cd: can't cd to hgrepo 329s 329s Create a bundle with our metadata, and inspect it: 329s 329s $ hg bundle --all ../bundle-w-git.hg 329s - 3 changesets found 329s - $ hg debugbundle --all ../bundle-w-git.hg | grep hg-git 329s - exp-hg-git-map -- {} (mandatory: False) 329s - exp-hg-git-tags -- {} (mandatory: False) 329s - $ hg debugbundle --all ../bundle-w-git.hg > bundle-w-git.out 329s - 329s -Create a bundle without our metadata, and inspect it: 329s - 329s - $ hg bundle --all ../bundle-wo-git.hg --config experimental.hg-git-bundle=no 329s - 3 changesets found 329s - $ hg debugbundle --all ../bundle-wo-git.hg | grep hg-git 329s - [1] 329s - 329s -Verify that those are different: 329s - 329s - $ hg debugbundle --all ../bundle-wo-git.hg > bundle-wo-git.out 329s - $ cmp -s bundle-w-git.out bundle-wo-git.out 329s - [1] 329s - 329s -Now create a bundle without hg-git enabled at all, which should be 329s -exactly similar to what you get when you disable metadata embedding; 329s -this verifies we don't accidentally pollute bundles. 329s - 329s - $ hg bundle --all --config extensions.hggit=! ../bundle-wo-hggit.hg 329s - 3 changesets found 329s - $ hg debugbundle --all ../bundle-wo-hggit.hg > bundle-wo-hggit.out 329s - $ cmp -s bundle-wo-git.hg bundle-wo-hggit.hg 329s - [2] 329s - $ cmp -s bundle-wo-git.out bundle-wo-hggit.out 329s - $ cd .. 329s - $ rm -r hgrepo 329s - 329s -Does unbundling transfer state? 329s - 329s - $ hg init hgrepo 329s - $ hg -R hgrepo unbundle bundle-w-git.hg 329s - adding changesets 329s - adding manifests 329s - adding file changes 329s - added 3 changesets with 3 changes to 3 files 329s - new changesets * (glob) 329s - (run 'hg update' to get a working copy) 329s - $ hg -R hgrepo log -T git 329s - 2:ca33a262eb46 | d338971a96e2 | tip | 329s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 329s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 329s - $ hg -R hgrepo pull gitrepo 329s - pulling from gitrepo 329s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 329s - no changes found 329s - adding bookmark master 329s - $ rm -r hgrepo 329s - 329s -Can we unbundle something without git state? 329s - 329s - $ hg init hgrepo 329s - $ hg -R hgrepo unbundle bundle-wo-git.hg 329s - adding changesets 329s - adding manifests 329s - adding file changes 329s - added 3 changesets with 3 changes to 3 files 329s - new changesets * (glob) 329s - (run 'hg update' to get a working copy) 329s - $ hg -R hgrepo log -T git 329s - 2:ca33a262eb46 | | tip | 329s - 1:7fe02317c63d | | | 329s - 0:ff7a2f2d8d70 | | | 329s - $ hg -R hgrepo pull gitrepo 329s - pulling from gitrepo 329s - importing 3 git commits 329s - adding bookmark master 329s - (run 'hg update' to get a working copy) 329s - $ rm -r hgrepo 329s - 329s -Regular mercurial shouldn't choke on our bundle 329s - 329s - $ hg init hgrepo 329s - $ cat >> hgrepo/.hg/hgrc < [extensions] 329s - > hggit = ! 329s - > EOF 329s - $ hg -R hgrepo unbundle bundle-wo-git.hg 329s - adding changesets 329s - adding manifests 329s - adding file changes 329s - added 3 changesets with 3 changes to 3 files 329s - new changesets * (glob) 329s - (run 'hg update' to get a working copy) 329s - $ hg -R hgrepo log -T git 329s - 2:ca33a262eb46 | | tip | 329s - 1:7fe02317c63d | | | 329s - 0:ff7a2f2d8d70 | | | 329s - $ hg -R hgrepo pull gitrepo 329s - pulling from gitrepo 329s - abort: repository gitrepo not found!? (re) 329s - [255] 329s - $ rm -r hgrepo 329s - 329s - 329s -What happens if we unbundle twice? 329s - 329s - $ hg init hgrepo 329s - $ hg -R hgrepo unbundle bundle-w-git.hg 329s - adding changesets 329s - adding manifests 329s - adding file changes 329s - added 3 changesets with 3 changes to 3 files 329s - new changesets * (glob) 329s - (run 'hg update' to get a working copy) 329s - $ hg -R hgrepo unbundle bundle-w-git.hg 329s - adding changesets 329s - adding manifests 329s - adding file changes 329s - added 0 changesets with 0 changes to 3 files 329s - (run 'hg update' to get a working copy) 329s - $ hg -R hgrepo log -T git 329s - 2:ca33a262eb46 | d338971a96e2 | tip | 329s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 329s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 329s - $ hg -R hgrepo pull gitrepo 329s - pulling from gitrepo 329s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 329s - no changes found 329s - adding bookmark master 329s - $ rm -r hgrepo 329s - 329s -Alas, cloning a bundle doesn't work yet: 329s - 329s -(Mercurial is apparently quite dumb here, so we won't try to fix this 329s -for now, but this test mostly exists so that we notice if ever starts 329s -working, or breaks entirely.) 329s - 329s - $ hg clone bundle-w-git.hg hgrepo 329s - requesting all changes 329s - adding changesets 329s - adding manifests 329s - adding file changes 329s - added 3 changesets with 3 changes to 3 files 329s - new changesets * (glob) 329s - updating to branch default 329s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 329s - $ hg -R hgrepo log -T git 329s - 2:ca33a262eb46 | | tip | 329s - 1:7fe02317c63d | | | 329s - 0:ff7a2f2d8d70 | | | 329s - $ rm -r hgrepo 329s - 329s -Now, lets try to be a bit evil. How does pulling partial state work? 329s - 329s -First, more git happenings: 329s - 329s - $ cd gitrepo 329s - $ git checkout -b otherbranch thetag 329s - Switched to a new branch 'otherbranch' 329s - $ echo 42 > baz 329s - $ git add baz 329s - $ fn_git_commit -m 3 329s - $ cd .. 329s - 329s -Pull, 'em, and create a partial bundle: 329s - 329s - $ hg clone gitrepo hgrepo 329s - importing 4 git commits 329s - new changesets ff7a2f2d8d70:d87bf3ef6a53 (4 drafts) 329s - updating to bookmark otherbranch 329s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 329s - $ hg -R hgrepo bundle --base 'p1(tip)' -r tip bundle-w-git-2.hg 329s - 1 changesets found 329s - $ rm -r hgrepo 329s - 329s -Now, load only that bundle into a repository without any git state 329s - 329s - $ hg clone -r 1 bundle-w-git.hg hgrepo --config extensions.hggit=! 329s - adding changesets 329s - adding manifests 329s - adding file changes 329s - added 2 changesets with 2 changes to 2 files 329s - new changesets * (glob) 329s - updating to branch default 329s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 329s - $ cd hgrepo 329s - $ hg unbundle ../bundle-w-git-2.hg 329s - adding changesets 329s - adding manifests 329s - adding file changes 329s - added 1 changesets with 1 changes to 1 files (+1 heads) 329s - new changesets * (glob) 329s - (run 'hg heads' to see heads, 'hg merge' to merge) 329s - $ hg pull ../gitrepo 329s - pulling from ../gitrepo 329s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 329s - importing 3 git commits 329s - adding bookmark master 329s - adding bookmark otherbranch 329s - new changesets ca33a262eb46 (1 drafts) 329s - (run 'hg update' to get a working copy) 329s - $ cd .. 329s - $ rm -r hgrepo 329s - 329s -Now, try pushing with only the metadata: 329s - 329s - $ hg init hgrepo 329s - $ cd hgrepo 329s - $ hg unbundle -u ../bundle-w-git.hg 329s - adding changesets 329s - adding manifests 329s - adding file changes 329s - added 3 changesets with 3 changes to 3 files 329s - new changesets * (glob) 329s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 329s - $ echo kaflaflibob > bajizmo 329s - $ fn_hg_commit -A -m 4 329s - $ hg book -r tip master 329s - $ hg push ../gitrepo 329s - pushing to ../gitrepo 329s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 329s - abort: cannot push git commit d338971a96e2 as it is not present locally 329s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 329s - [255] 329s - 329s -Try to repopulate the git state from a bundle 329s - 329s - $ hg debug-remove-hggit-state 329s - clearing out the git cache data 329s - $ hg log -qr 'fromgit()' 329s - $ hg unbundle -u ../bundle-w-git.hg 329s - adding changesets 329s - adding manifests 329s - adding file changes 329s - added 0 changesets with 0 changes to 3 files 329s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 329s - $ hg log -qr 'fromgit()' 329s - 0:ff7a2f2d8d70 329s - 1:7fe02317c63d 329s - 2:ca33a262eb46 329s 329s ERROR: test-bundle.t output changed 331s ! 331s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-file-removal.t 331s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-file-removal.t.err 331s @@ -98,192 +98,9 @@ 331s $ git init -q --bare repo.git 331s 331s $ hg clone gitrepo hgrepo 331s - importing 9 git commits 331s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 331s - updating to bookmark master 331s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 331s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 331s + abort: repository gitrepo not found 331s + [255] 331s $ cd hgrepo 331s + $TESTTMP.sh: 72: cd: can't cd to hgrepo 331s $ hg log --graph 331s - @ changeset: 8:0995b8a0a943 331s - | bookmark: master 331s - | tag: default/master 331s - | tag: tip 331s - | user: test 331s - | date: Mon Jan 01 00:00:18 2007 +0000 331s - | summary: remove betalink 331s - | 331s - o changeset: 7:a316d3a96c89 331s - | user: test 331s - | date: Mon Jan 01 00:00:17 2007 +0000 331s - | summary: replace file with symlink 331s - | 331s - o changeset: 6:1804acb71f3e 331s - | user: test 331s - | date: Mon Jan 01 00:00:16 2007 +0000 331s - | summary: replace symlink with file 331s - | 331s - o changeset: 5:e19c85becc87 331s - | user: test 331s - | date: Mon Jan 01 00:00:15 2007 +0000 331s - | summary: add symlink to beta 331s - | 331s - o changeset: 4:0d3086c3f8c3 331s - | user: test 331s - | date: Mon Jan 01 00:00:14 2007 +0000 331s - | summary: remove foo/bar 331s - | 331s - o changeset: 3:b2406125ef5c 331s - | user: test 331s - | date: Mon Jan 01 00:00:13 2007 +0000 331s - | summary: remove alpha 331s - | 331s - o changeset: 2:8b3b2f4b4158 331s - | user: test 331s - | date: Mon Jan 01 00:00:12 2007 +0000 331s - | summary: add foo 331s - | 331s - o changeset: 1:7fe02317c63d 331s - | user: test 331s - | date: Mon Jan 01 00:00:11 2007 +0000 331s - | summary: add beta 331s - | 331s - o changeset: 0:ff7a2f2d8d70 331s - user: test 331s - date: Mon Jan 01 00:00:10 2007 +0000 331s - summary: add alpha 331s - 331s - 331s -make sure alpha is not in this manifest 331s - $ hg manifest -r 3 331s - beta 331s - foo/bar 331s - 331s -make sure that only beta is in the manifest 331s - $ hg manifest 331s - beta 331s - 331s - $ hg debug-remove-hggit-state 331s - clearing out the git cache data 331s - $ ls .hg | grep git 331s - [1] 331s - $ hg push ../repo.git 331s - pushing to ../repo.git 331s - searching for changes 331s - adding objects 331s - remote: found 0 deltas to reuse 331s - added 9 commits with 8 trees and 5 blobs 331s - adding reference refs/heads/master 331s - 331s - $ cd .. 331s - $ git --git-dir=repo.git log --pretty=medium 331s - commit 5ee11eeae239d6a99df5a99901ec00ffafbcc46b 331s - Author: test 331s - Date: Mon Jan 1 00:00:18 2007 +0000 331s - 331s - remove betalink 331s - 331s - commit 2c7b324faeccb1acf89c35b7ad38e7956f5705fa 331s - Author: test 331s - Date: Mon Jan 1 00:00:17 2007 +0000 331s - 331s - replace file with symlink 331s - 331s - commit ff0478d2ecc2571d01eb6d406ac29e4e63e5d3d5 331s - Author: test 331s - Date: Mon Jan 1 00:00:16 2007 +0000 331s - 331s - replace symlink with file 331s - 331s - commit 5492e6e410e42df527956be945286cd1ae45acb8 331s - Author: test 331s - Date: Mon Jan 1 00:00:15 2007 +0000 331s - 331s - add symlink to beta 331s - 331s - commit b991de8952c482a7cd51162674ffff8474862218 331s - Author: test 331s - Date: Mon Jan 1 00:00:14 2007 +0000 331s - 331s - remove foo/bar 331s - 331s - commit b0edaf0adac19392cf2867498b983bc5192b41dd 331s - Author: test 331s - Date: Mon Jan 1 00:00:13 2007 +0000 331s - 331s - remove alpha 331s - 331s - commit f2d0d5bfa905e12dee728b509b96cf265bb6ee43 331s - Author: test 331s - Date: Mon Jan 1 00:00:12 2007 +0000 331s - 331s - add foo 331s - 331s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 331s - Author: test 331s - Date: Mon Jan 1 00:00:11 2007 +0000 331s - 331s - add beta 331s - 331s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 331s - Author: test 331s - Date: Mon Jan 1 00:00:10 2007 +0000 331s - 331s - add alpha 331s - 331s -test with rename detection enabled 331s - $ hg --config git.similarity=100 clone gitrepo hgreporenames 331s - importing 9 git commits 331s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 331s - updating to bookmark master 331s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 331s - 331s - $ cd hgreporenames 331s - $ hg log --graph 331s - @ changeset: 8:0995b8a0a943 331s - | bookmark: master 331s - | tag: default/master 331s - | tag: tip 331s - | user: test 331s - | date: Mon Jan 01 00:00:18 2007 +0000 331s - | summary: remove betalink 331s - | 331s - o changeset: 7:a316d3a96c89 331s - | user: test 331s - | date: Mon Jan 01 00:00:17 2007 +0000 331s - | summary: replace file with symlink 331s - | 331s - o changeset: 6:1804acb71f3e 331s - | user: test 331s - | date: Mon Jan 01 00:00:16 2007 +0000 331s - | summary: replace symlink with file 331s - | 331s - o changeset: 5:e19c85becc87 331s - | user: test 331s - | date: Mon Jan 01 00:00:15 2007 +0000 331s - | summary: add symlink to beta 331s - | 331s - o changeset: 4:0d3086c3f8c3 331s - | user: test 331s - | date: Mon Jan 01 00:00:14 2007 +0000 331s - | summary: remove foo/bar 331s - | 331s - o changeset: 3:b2406125ef5c 331s - | user: test 331s - | date: Mon Jan 01 00:00:13 2007 +0000 331s - | summary: remove alpha 331s - | 331s - o changeset: 2:8b3b2f4b4158 331s - | user: test 331s - | date: Mon Jan 01 00:00:12 2007 +0000 331s - | summary: add foo 331s - | 331s - o changeset: 1:7fe02317c63d 331s - | user: test 331s - | date: Mon Jan 01 00:00:11 2007 +0000 331s - | summary: add beta 331s - | 331s - o changeset: 0:ff7a2f2d8d70 331s - user: test 331s - date: Mon Jan 01 00:00:10 2007 +0000 331s - summary: add alpha 331s - 331s 331s ERROR: test-file-removal.t output changed 332s ! 332s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-hg-author.t 332s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-hg-author.t.err 332s @@ -16,256 +16,10 @@ 332s 332s $ cd .. 332s $ hg clone repo.git hgrepo 332s - importing 1 git commits 332s - new changesets ff7a2f2d8d70 (1 drafts) 332s - updating to bookmark master 332s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 332s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 332s + abort: repository repo.git not found 332s + [255] 332s 332s $ cd hgrepo 332s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 332s $ hg book master 332s - $ echo beta > beta 332s - $ hg add beta 332s - $ fn_hg_commit -u "test" -m 'add beta' 332s - $ hg push 332s - pushing to $TESTTMP/repo.git 332s - searching for changes 332s - adding objects 332s - remote: found 0 deltas to reuse 332s - added 1 commits with 1 trees and 1 blobs 332s - updating reference refs/heads/master 332s - 332s - $ echo gamma >> beta 332s - $ fn_hg_commit -u "test (comment)" -m 'modify beta' 332s - $ hg push 332s - pushing to $TESTTMP/repo.git 332s - searching for changes 332s - adding objects 332s - remote: found 0 deltas to reuse 332s - added 1 commits with 1 trees and 1 blobs 332s - updating reference refs/heads/master 332s - 332s - $ echo gamma > gamma 332s - $ hg add gamma 332s - $ fn_hg_commit -u "" -m 'add gamma' 332s - $ hg push 332s - pushing to $TESTTMP/repo.git 332s - searching for changes 332s - adding objects 332s - remote: found 0 deltas to reuse 332s - added 1 commits with 1 trees and 1 blobs 332s - updating reference refs/heads/master 332s - 332s - $ echo delta > delta 332s - $ hg add delta 332s - $ fn_hg_commit -u "name" -m 'add delta' 332s - $ hg push 332s - pushing to $TESTTMP/repo.git 332s - searching for changes 332s - adding objects 332s - remote: found 0 deltas to reuse 332s - added 1 commits with 1 trees and 1 blobs 332s - updating reference refs/heads/master 332s - 332s - $ echo epsilon > epsilon 332s - $ hg add epsilon 332s - $ fn_hg_commit -u "name zeta 332s - $ hg add zeta 332s - $ fn_hg_commit -u " test " -m 'add zeta' 332s - $ hg push 332s - pushing to $TESTTMP/repo.git 332s - searching for changes 332s - adding objects 332s - remote: found 0 deltas to reuse 332s - added 1 commits with 1 trees and 1 blobs 332s - updating reference refs/heads/master 332s - 332s - $ echo eta > eta 332s - $ hg add eta 332s - $ fn_hg_commit -u "test < test@example.com >" -m 'add eta' 332s - $ hg push 332s - pushing to $TESTTMP/repo.git 332s - searching for changes 332s - adding objects 332s - remote: found 0 deltas to reuse 332s - added 1 commits with 1 trees and 1 blobs 332s - updating reference refs/heads/master 332s - 332s - $ echo theta > theta 332s - $ hg add theta 332s - $ fn_hg_commit -u "test >test@example.com>" -m 'add theta' 332s - $ hg push 332s - pushing to $TESTTMP/repo.git 332s - searching for changes 332s - adding objects 332s - remote: found 0 deltas to reuse 332s - added 1 commits with 1 trees and 1 blobs 332s - updating reference refs/heads/master 332s - 332s - $ hg log --graph 332s - @ changeset: 8:c5d1976ab12c 332s - | bookmark: master 332s - | tag: default/master 332s - | tag: tip 332s - | user: test >test@example.com> 332s - | date: Mon Jan 01 00:00:18 2007 +0000 332s - | summary: add theta 332s - | 332s - o changeset: 7:0e2fb4d21667 332s - | user: test < test@example.com > 332s - | date: Mon Jan 01 00:00:17 2007 +0000 332s - | summary: add eta 332s - | 332s - o changeset: 6:faa3aae96199 332s - | user: test 332s - | date: Mon Jan 01 00:00:16 2007 +0000 332s - | summary: add zeta 332s - | 332s - o changeset: 5:2cf6ad5a1afc 332s - | user: name 332s - | date: Mon Jan 01 00:00:14 2007 +0000 332s - | summary: add delta 332s - | 332s - o changeset: 3:6b854d65d0d6 332s - | user: 332s - | date: Mon Jan 01 00:00:13 2007 +0000 332s - | summary: add gamma 332s - | 332s - o changeset: 2:46303c652e79 332s - | user: test (comment) 332s - | date: Mon Jan 01 00:00:12 2007 +0000 332s - | summary: modify beta 332s - | 332s - o changeset: 1:47580592d3d6 332s - | user: test 332s - | date: Mon Jan 01 00:00:11 2007 +0000 332s - | summary: add beta 332s - | 332s - o changeset: 0:ff7a2f2d8d70 332s - user: test 332s - date: Mon Jan 01 00:00:10 2007 +0000 332s - summary: add alpha 332s - 332s - 332s - $ cd .. 332s - $ hg clone repo.git hgrepo2 332s - importing 9 git commits 332s - new changesets ff7a2f2d8d70:1fbf3aa91221 (9 drafts) 332s - updating to bookmark master 332s - 8 files updated, 0 files merged, 0 files removed, 0 files unresolved 332s - $ hg -R hgrepo2 log --graph 332s - @ changeset: 8:1fbf3aa91221 332s - | bookmark: master 332s - | tag: default/master 332s - | tag: tip 332s - | user: test ?test@example.com 332s - | date: Mon Jan 01 00:00:18 2007 +0000 332s - | summary: add theta 332s - | 332s - o changeset: 7:20310508f06d 332s - | user: test 332s - | date: Mon Jan 01 00:00:17 2007 +0000 332s - | summary: add eta 332s - | 332s - o changeset: 6:e3d81af8a8c1 332s - | user: test 332s - | date: Mon Jan 01 00:00:16 2007 +0000 332s - | summary: add zeta 332s - | 332s - o changeset: 5:78f609fd208f 332s - | user: name 332s - | date: Mon Jan 01 00:00:15 2007 +0000 332s - | summary: add epsilon 332s - | 332s - o changeset: 4:42fa61d57718 332s - | user: name 332s - | date: Mon Jan 01 00:00:14 2007 +0000 332s - | summary: add delta 332s - | 332s - o changeset: 3:6b854d65d0d6 332s - | user: 332s - | date: Mon Jan 01 00:00:13 2007 +0000 332s - | summary: add gamma 332s - | 332s - o changeset: 2:46303c652e79 332s - | user: test (comment) 332s - | date: Mon Jan 01 00:00:12 2007 +0000 332s - | summary: modify beta 332s - | 332s - o changeset: 1:47580592d3d6 332s - | user: test 332s - | date: Mon Jan 01 00:00:11 2007 +0000 332s - | summary: add beta 332s - | 332s - o changeset: 0:ff7a2f2d8d70 332s - user: test 332s - date: Mon Jan 01 00:00:10 2007 +0000 332s - summary: add alpha 332s - 332s - $ git --git-dir=repo.git log --pretty=medium master 332s - commit 2fe60ba69727981e6ede78be70354c3a9e30e21d 332s - Author: test ?test@example.com 332s - Date: Mon Jan 1 00:00:18 2007 +0000 332s - 332s - add theta 332s - 332s - commit 9f2f7cafdbf2e467928db98de8275141001d3081 332s - Author: test 332s - Date: Mon Jan 1 00:00:17 2007 +0000 332s - 332s - add eta 332s - 332s - commit 172a6f8d8064d73dff7013e395a9fe3cfc3ff807 332s - Author: test 332s - Date: Mon Jan 1 00:00:16 2007 +0000 332s - 332s - add zeta 332s - 332s - commit 71badb8e343a7da391a9b5d98909fbd2ca7d78f2 332s - Author: name 332s - Date: Mon Jan 1 00:00:15 2007 +0000 332s - 332s - add epsilon 332s - 332s - commit 9a9ae7b7f310d4a1a3e732a747ca26f06934f8d8 332s - Author: name 332s - Date: Mon Jan 1 00:00:14 2007 +0000 332s - 332s - add delta 332s - 332s - commit e4149a32e81e380193f59aa8773349201b8ed7f7 332s - Author: 332s - Date: Mon Jan 1 00:00:13 2007 +0000 332s - 332s - add gamma 332s - 332s - commit fae95aef5889a80103c2fbd5d14ff6eb8c9daf93 332s - Author: test ext:(%20%28comment%29) 332s - Date: Mon Jan 1 00:00:12 2007 +0000 332s - 332s - modify beta 332s - 332s - commit 0f378ab6c2c6b5514bd873d3faf8ac4b8095b001 332s - Author: test 332s - Date: Mon Jan 1 00:00:11 2007 +0000 332s - 332s - add beta 332s - 332s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 332s - Author: test 332s - Date: Mon Jan 1 00:00:10 2007 +0000 332s - 332s - add alpha 332s 332s ERROR: test-hg-author.t output changed 336s ! 336s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-subrepos.t 336s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-subrepos.t.err 336s @@ -34,165 +34,8 @@ 336s $ cd .. 336s Ensure gitlinks are transformed to .hgsubstate on hg pull from git 336s $ hg clone -u tip repo.git hgrepo 2>&1 | grep -E -v '^(Cloning into|done)' 336s - importing 3 git commits 336s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 336s - updating to branch default 336s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 336s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 336s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 336s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 336s + abort: repository repo.git not found 336s $ cd hgrepo 336s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 336s $ hg bookmarks -f -r default master 336s -1. Ensure gitlinks are transformed to .hgsubstate on hg <- git pull 336s -.hgsub shall list two [git] subrepos 336s - $ cat .hgsub 336s - subrepo1 = [git]../gitsubrepo 336s - xyz/subrepo2 = [git]../gitsubrepo 336s -.hgsubstate shall list two idenitcal revisions 336s - $ cat .hgsubstate 336s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 336s - 56f0304c5250308f14cfbafdc27bd12d40154d17 xyz/subrepo2 336s -hg status shall NOT report .hgsub and .hgsubstate as untracked - either ignored or unmodified 336s - $ hg status --unknown .hgsub .hgsubstate 336s - $ hg status --modified .hgsub .hgsubstate 336s - $ cd .. 336s - 336s -2. Check gitmodules are preserved during hg -> git push 336s - $ cd gitsubrepo 336s - $ echo gamma > gamma 336s - $ git add gamma 336s - $ fn_git_commit -m 'add gamma' 336s - $ cd .. 336s - $ cd hgrepo 336s - $ cd xyz/subrepo2 336s - $ git pull --ff-only | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| */| /' 336s - From $TESTTMP/gitsubrepo 336s - 56f0304..aabf7cd master -> origin/master 336s - Updating 56f0304..aabf7cd 336s - Fast-forward 336s - gamma | 1 + 336s - 1 file changed, 1 insertion(+) 336s - create mode 100644 gamma 336s - $ cd ../.. 336s - $ echo xxx >> alpha 336s - $ fn_hg_commit -m 'Update subrepo2 from hg' | grep -v "committing subrepository" || true 336s - $ hg push 336s - pushing to $TESTTMP/repo.git 336s - searching for changes 336s - adding objects 336s - remote: found 0 deltas to reuse 336s - added 1 commits with 2 trees and 1 blobs 336s - updating reference refs/heads/master 336s - $ cd .. 336s - $ cd gitrepo 336s - $ git pull --ff-only 336s - From $TESTTMP/repo 336s - 89c22d7..275b0a5 master -> origin/master 336s - Fetching submodule xyz/subrepo2 336s - From $TESTTMP/gitsubrepo 336s - 56f0304..aabf7cd master -> origin/master 336s - Updating 89c22d7..275b0a5 336s - Fast-forward 336s - alpha | 1 + 336s - xyz/subrepo2 | 2 +- 336s - 2 files changed, 2 insertions(+), 1 deletion(-) 336s -there shall be two gitlink entries, with values matching that in .hgsubstate 336s - $ git ls-tree -r HEAD^{tree} | grep 'commit' 336s - 160000 commit 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 336s - 160000 commit aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 336s -bring working copy to HEAD state (it's not bare repo) 336s - $ git reset --hard 336s - HEAD is now at 275b0a5 Update subrepo2 from hg 336s - $ cd .. 336s - 336s -3. Check .hgsub and .hgsubstate from git repository are merged, not overwritten 336s - $ hg init hgsub 336s - $ cd hgsub 336s - $ echo delta > delta 336s - $ hg add delta 336s - $ fn_hg_commit -m "add delta" 336s - $ hg tip --template '{node} hgsub\n' > ../gitrepo/.hgsubstate 336s - $ cat > ../gitrepo/.hgsub < hgsub = ../hgsub 336s - > EOF 336s - $ cd ../gitrepo 336s - $ git add .hgsubstate .hgsub 336s - $ fn_git_commit -m "Test3. Prepare .hgsub and .hgsubstate sources" 336s - $ git push 336s - To $TESTTMP/repo.git 336s - 275b0a5..e31d576 master -> master 336s - 336s - $ cd ../hgrepo 336s - $ hg pull 336s - pulling from $TESTTMP/repo.git 336s - importing 1 git commits 336s - updating bookmark master 336s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 336s - (run 'hg update' to get a working copy) 336s - $ hg checkout -C 336s - updating to active bookmark master 336s - cloning subrepo hgsub from $TESTTMP/hgsub 336s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 336s - $ cd .. 336s -pull shall bring .hgsub entry which was added to the git repo 336s - $ cat hgrepo/.hgsub 336s - hgsub = ../hgsub 336s - subrepo1 = [git]../gitsubrepo 336s - xyz/subrepo2 = [git]../gitsubrepo 336s -.hgsubstate shall list revision of the subrepo added through git repo 336s - $ cat hgrepo/.hgsubstate 336s - 481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub 336s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 336s - aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 336s - 336s -4. Try changing the subrepos from the Mercurial side 336s - 336s - $ cd hgrepo 336s - $ cat >> .hgsub < subrepo2 = [git]../gitsubrepo 336s - > EOF 336s - $ git clone ../gitsubrepo subrepo2 336s - Cloning into 'subrepo2'... 336s - done. 336s - $ fn_hg_commit -m 'some stuff' 336s - $ hg push 336s - pushing to $TESTTMP/repo.git 336s - no changes made to subrepo hgsub since last push to $TESTTMP/hgsub 336s - searching for changes 336s - adding objects 336s - remote: found 0 deltas to reuse 336s - added 1 commits with 1 trees and 1 blobs 336s - updating reference refs/heads/master 336s - $ cd .. 336s - 336s -5. But we actually do something quite weird in this case: If a 336s -.gitmodules file exists in the repository, it always wins! In this 336s -case, we break the bidirectional convention, and modify the repository 336s -data. That's odd, so show it: 336s - 336s - $ hg id hgrepo 336s - 42c46c7eef3a default/master/tip master 336s - $ hg clone -U repo.git hgrepo2 336s - importing 6 git commits 336s - new changesets e532b2bfda10:42c46c7eef3a (6 drafts) 336s - $ hg -R hgrepo2 up :master 336s - Cloning into '$TESTTMP/hgrepo2/subrepo1'... 336s - done. 336s - cloning subrepo hgsub from $TESTTMP/hgsub 336s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 336s - checking out detached HEAD in subrepository "subrepo1" 336s - check out a git branch if you intend to make changes 336s - Cloning into '$TESTTMP/hgrepo2/subrepo2'... 336s - done. 336s - Cloning into '$TESTTMP/hgrepo2/xyz/subrepo2'... 336s - done. 336s - cloning subrepo subrepo2 from $TESTTMP/gitsubrepo 336s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 336s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 336s - 336s -We retained bidirectionality! 336s - 336s - $ git diff --stat hgrepo/.hgsub hgrepo2/.hgsub 336s - $ hg id hgrepo 336s - 42c46c7eef3a default/master/tip master 336s - $ hg id hgrepo2 336s - 42c46c7eef3a default/master/tip master 336s 336s ERROR: test-subrepos.t output changed 341s ! 341s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-extra.t 341s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-extra.t.err 341s @@ -12,190 +12,9 @@ 341s 341s $ cd .. 341s $ hg clone gitrepo hgrepo 341s - importing 1 git commits 341s - new changesets aa9eb6424386 (1 drafts) 341s - updating to bookmark not-master 341s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 341s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 341s + abort: repository gitrepo not found 341s + [255] 341s $ cd hgrepo 341s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 341s $ hg mv a b 341s - $ fn_hg_commit -mb 341s - $ hg up 0 341s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 341s - (leaving bookmark not-master) 341s - $ touch c 341s - $ hg add c 341s - $ fn_hg_commit -mc 341s - 341s -Rebase will add a rebase_source 341s - 341s - $ hg --config extensions.rebase= rebase -s 1 -d 2 341s - rebasing 1:4c7da7adf18b * (glob) 341s - saved backup bundle to $TESTTMP/*.hg (glob) 341s - $ hg up 2 341s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 341s - 341s -Add a commit with multiple extra fields 341s - $ hg bookmark b1 341s - $ touch d 341s - $ hg add d 341s - $ fn_hg_commitextra --field zzzzzzz=datazzz --field aaaaaaa=dataaaa 341s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 341s - @ 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 341s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 341s - | 341s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 341s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 341s - | 341s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 341s - | branch=default 341s - | 341s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 341s - branch=default hg-git-rename-source=git 341s - 341s - 341s - $ hg push -r b1 341s - pushing to $TESTTMP/gitrepo 341s - searching for changes 341s - adding objects 341s - remote: found 0 deltas to reuse 341s - added 3 commits with 3 trees and 0 blobs 341s - adding reference refs/heads/b1 341s - 341s - $ hg bookmark b2 341s - $ hg mv c c2 341s - $ hg mv d d2 341s - $ fn_hg_commitextra --field yyyyyyy=datayyy --field bbbbbbb=databbb 341s - 341s -Test some nutty filenames 341s - $ hg book b3 341s -#if windows 341s - $ hg mv c2 'c2 => c3' 341s - abort: filename contains '>', which is reserved on Windows: "c2 => c3" 341s - [255] 341s - $ hg mv c2 c3 341s - $ fn_hg_commit -m 'dummy commit' 341s - $ hg mv c3 c4 341s - $ fn_hg_commit -m 'dummy commit' 341s -#else 341s - $ hg mv c2 'c2 => c3' 341s - warning: filename contains '>', which is reserved on Windows: 'c2 => c3' 341s - $ fn_hg_commit -m 'test filename with arrow' 341s - $ hg mv 'c2 => c3' 'c3 => c4' 341s - warning: filename contains '>', which is reserved on Windows: 'c3 => c4' 341s - $ fn_hg_commit -m 'test filename with arrow 2' 341s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" -l 3 --config "experimental.graphstyle.missing=|" 341s - @ 6 bca4ba69a6844c133b069e227dfa043d41e3c197 test filename with arrow 2 341s - | branch=default 341s - | 341s - o 5 864caad1f3493032f8d06f44a89dc9f1c039b09f test filename with arrow 341s - | branch=default 341s - | 341s - o 4 58f855ae26f4930ce857e648d3dd949901cce817 341s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 341s - | 341s -#endif 341s - $ hg push -r b2 -r b3 341s - pushing to $TESTTMP/gitrepo 341s - searching for changes 341s - adding objects 341s - remote: found 0 deltas to reuse 341s - added 3 commits with 3 trees and 0 blobs 341s - adding reference refs/heads/b2 341s - adding reference refs/heads/b3 341s - 341s - $ cd ../gitrepo 341s - $ git cat-file commit b1 341s - tree 1b773a2eb70f29397356f8069c285394835ff85a 341s - parent 54776dace5849bdf273fb26737a48ef64804909d 341s - author test 1167609613 +0000 341s - committer test 1167609613 +0000 341s - HG:extra aaaaaaa:dataaaa 341s - HG:extra zzzzzzz:datazzz 341s - 341s - 341s - 341s - $ git cat-file commit b2 341s - tree 34ad62c6d6ad9464bfe62db5b3d2fa16aaa9fa9e 341s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 341s - author test 1167609614 +0000 341s - committer test 1167609614 +0000 341s - HG:rename c:c2 341s - HG:rename d:d2 341s - HG:extra bbbbbbb:databbb 341s - HG:extra yyyyyyy:datayyy 341s - 341s - 341s - 341s -#if no-windows 341s - $ git cat-file commit b3 341s - tree e63df52695f9b06e54b37e7ef60d0c43994de620 341s - parent 5cafe2555a0666fcf661a3943277a9812a694a98 341s - author test 1167609616 +0000 341s - committer test 1167609616 +0000 341s - HG:rename c2%20%3D%3E%20c3:c3%20%3D%3E%20c4 341s - 341s - test filename with arrow 2 341s -#endif 341s - $ cd ../gitrepo 341s - $ git checkout b1 341s - Switched to branch 'b1' 341s - $ commit_sha=$(git rev-parse HEAD) 341s - $ tree_sha=$(git rev-parse HEAD^{tree}) 341s - 341s -There's no way to create a Git repo with extra metadata via the CLI. Dulwich 341s -lets you do that, though. 341s - 341s - >>> from dulwich.objects import Commit 341s - >>> from dulwich.porcelain import open_repo 341s - >>> repo = open_repo('.') 341s - >>> c = Commit() 341s - >>> c.author = b'test ' 341s - >>> c.author_time = 0 341s - >>> c.author_timezone = 0 341s - >>> c.committer = c.author 341s - >>> c.commit_time = 0 341s - >>> c.commit_timezone = 0 341s - >>> c.parents = [b'$commit_sha'] 341s - >>> c.tree = b'$tree_sha' 341s - >>> c.message = b'extra commit\n' 341s - >>> c.extra.extend([(b'zzz:zzz', b'data:zzz'), (b'aaa:aaa', b'data:aaa'), 341s - ... (b'HG:extra', b'hgaaa:dataaaa'), 341s - ... (b'HG:extra', b'hgzzz:datazzz')]) 341s - >>> repo.object_store.add_object(c) 341s - >>> repo.refs.set_if_equals(b'refs/heads/master', None, c.id) 341s - True 341s - 341s - $ git cat-file commit master 341s - tree 1b773a2eb70f29397356f8069c285394835ff85a 341s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 341s - author test 0 +0000 341s - committer test 0 +0000 341s - zzz:zzz data:zzz 341s - aaa:aaa data:aaa 341s - HG:extra hgaaa:dataaaa 341s - HG:extra hgzzz:datazzz 341s - 341s - extra commit 341s - 341s - $ cd .. 341s - $ hg clone -qU gitrepo hgrepo2 341s - $ cd hgrepo2 341s - $ hg log -G -r :5 -T "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 341s - o 5 58f855ae26f4930ce857e648d3dd949901cce817 341s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 341s - | 341s - | o 4 90acc8c23fcfaeb0930c03c849923a696fd9013c extra commit 341s - |/ GIT0-zzz%3Azzz=data%3Azzz GIT1-aaa%3Aaaa=data%3Aaaa branch=default hgaaa=dataaaa hgzzz=datazzz 341s - | 341s - o 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 341s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 341s - | 341s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 341s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 341s - | 341s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 341s - | branch=default 341s - | 341s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 341s - branch=default hg-git-rename-source=git 341s - 341s 341s ERROR: test-extra.t output changed 352s ! 352s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-bookmark-workflow.t 352s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-bookmark-workflow.t.err 352s @@ -42,13 +42,21 @@ 352s 352s Initialize remote hg and git repos with equivalent initial contents 352s $ hg init hgremoterepo 352s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 352s $ cd hgremoterepo 352s $ hg bookmark master 352s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 352s $ for f in alpha beta gamma delta; do 352s > echo $f > $f; hg add $f; hgcommit -m "add $f" 352s > done 352s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 352s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 352s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 352s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 352s $ hg bookmark -r 1 b1 352s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 352s $ hgstate 352s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 352s 3 fc2664cac217 "add delta" bookmarks: [master] 352s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 352s 1 7bcd915dc873 "add beta" bookmarks: [b1] 352s @@ -69,157 +77,19 @@ 352s 352s Cloning transfers all bookmarks from remote to local 352s $ hg clone -q hgremoterepo purehglocalrepo 352s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 352s $ cd purehglocalrepo 352s $ hgstate 352s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 352s 3 fc2664cac217 "add delta" bookmarks: [master] 352s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 352s 1 7bcd915dc873 "add beta" bookmarks: [b1] 352s 0 3442585be8a6 "add alpha" bookmarks: [] 352s $ cd .. 352s $ hg clone -q gitremoterepo hggitlocalrepo --config hggit.usephases=True 352s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 352s + abort: repository gitremoterepo not found 352s + [255] 352s $ cd hggitlocalrepo 352s + $TESTTMP.sh: 78: cd: can't cd to hggitlocalrepo 352s $ hggitstate 352s - 3 03769a650ded 55b133e1d558 "add delta" bookmarks: [master] 352s - 2 ca33a262eb46 d338971a96e2 "add gamma" bookmarks: [] 352s - 1 7fe02317c63d 9497a4ee62e1 "add beta" bookmarks: [b1] 352s - 0 ff7a2f2d8d70 7eeab2ea75ec "add alpha" bookmarks: [] 352s - 352s -Make sure that master is public 352s - $ hg phase -r master 352s - 3: public 352s - $ cd .. 352s - 352s -No changes 352s - $ cd purehglocalrepo 352s - $ hg incoming -B 352s - comparing with $TESTTMP/hgremoterepo 352s - searching for changed bookmarks 352s - no changed bookmarks found 352s - [1] 352s - $ hg outgoing 352s - comparing with $TESTTMP/hgremoterepo 352s - searching for changes 352s - no changes found 352s - [1] 352s - $ hg outgoing -B 352s - comparing with $TESTTMP/hgremoterepo 352s - searching for changed bookmarks 352s - no changed bookmarks found 352s - [1] 352s - $ hg push 352s - pushing to $TESTTMP/hgremoterepo 352s - searching for changes 352s - no changes found 352s - [1] 352s - $ cd .. 352s - $ cd hggitlocalrepo 352s - $ hg incoming -B 352s - comparing with $TESTTMP/gitremoterepo 352s - searching for changed bookmarks 352s - no changed bookmarks found 352s - [1] 352s - $ hg outgoing 352s - comparing with $TESTTMP/gitremoterepo 352s - searching for changes 352s - no changes found 352s - [1] 352s - $ hg outgoing -B 352s - comparing with $TESTTMP/gitremoterepo 352s - searching for changed bookmarks 352s - no changed bookmarks found 352s - [1] 352s - $ hg push 352s - pushing to $TESTTMP/gitremoterepo 352s - searching for changes 352s - no changes found 352s - [1] 352s - $ cd .. 352s - 352s -Bookmarks on existing revs: 352s -- change b1 on local repo 352s -- introduce b2 on local repo 352s -- introduce b3 on remote repo 352s -Bookmarks on new revs 352s -- introduce b4 on a new rev on the remote 352s - $ cd hgremoterepo 352s - $ hg bookmark -r master b3 352s - $ hg bookmark -r master b4 352s - $ hg update -q b4 352s - $ echo epsilon > epsilon; hg add epsilon; hgcommit -m 'add epsilon' 352s - $ hgstate 352s - 4 d979bb8e0fbb "add epsilon" bookmarks: [b4] 352s - 3 fc2664cac217 "add delta" bookmarks: [b3 master] 352s - 2 d85ced7ae9d6 "add gamma" bookmarks: [] 352s - 1 7bcd915dc873 "add beta" bookmarks: [b1] 352s - 0 3442585be8a6 "add alpha" bookmarks: [] 352s - $ cd .. 352s - $ cd purehglocalrepo 352s - $ hg bookmark -fr 2 b1 352s - $ hg bookmark -r 0 b2 352s - $ hgstate 352s - 3 fc2664cac217 "add delta" bookmarks: [master] 352s - 2 d85ced7ae9d6 "add gamma" bookmarks: [b1] 352s - 1 7bcd915dc873 "add beta" bookmarks: [] 352s - 0 3442585be8a6 "add alpha" bookmarks: [b2] 352s - $ hg incoming -B 352s - comparing with $TESTTMP/hgremoterepo 352s - searching for changed bookmarks 352s - b3 fc2664cac217 352s - b4 d979bb8e0fbb 352s - $ hg outgoing 352s - comparing with $TESTTMP/hgremoterepo 352s - searching for changes 352s - no changes found 352s - [1] 352s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 352s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 352s -This changed in 3.4 to start showing changed and deleted bookmarks again. 352s - $ hg outgoing -B | grep -v -E -w 'b1|b3|b4' 352s - comparing with $TESTTMP/hgremoterepo 352s - searching for changed bookmarks 352s - b2 3442585be8a6 352s - $ cd .. 352s - 352s - $ cd gitremoterepo 352s - $ git branch b3 master 352s - $ git checkout -b b4 master 352s - Switched to a new branch 'b4' 352s - $ echo epsilon > epsilon 352s - $ git add epsilon 352s - $ gitcommit -m 'add epsilon' 352s - $ gitstate 352s - fcfd2c0 "add epsilon" refs: (*b4) (glob) 352s - 55b133e "add delta" refs: (master, b3) 352s - d338971 "add gamma" refs: 352s - 9497a4e "add beta" refs: (b1) 352s - 7eeab2e "add alpha" refs: 352s - $ cd .. 352s - $ cd hggitlocalrepo 352s - $ hg bookmark -fr 2 b1 352s - $ hg bookmark -r 0 b2 352s - $ hgstate 352s - 3 03769a650ded "add delta" bookmarks: [master] 352s - 2 ca33a262eb46 "add gamma" bookmarks: [b1] 352s - 1 7fe02317c63d "add beta" bookmarks: [] 352s - 0 ff7a2f2d8d70 "add alpha" bookmarks: [b2] 352s - $ hg incoming -B 352s - comparing with $TESTTMP/gitremoterepo 352s - searching for changed bookmarks 352s - b3 03769a650ded 352s - b4 fcfd2c0262db 352s - $ hg outgoing 352s - comparing with $TESTTMP/gitremoterepo 352s - searching for changes 352s - no changes found 352s - [1] 352s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 352s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 352s -This changed in 3.4 to start showing changed and deleted bookmarks again. 352s - $ hg outgoing -B 352s - comparing with $TESTTMP/gitremoterepo 352s - searching for changed bookmarks 352s - b1 ca33a262eb46 352s - b2 ff7a2f2d8d70 352s - b3 352s - b4 352s - $ cd .. 352s 352s ERROR: test-bookmark-workflow.t output changed 390s ! 390s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-illegal-contents.t 390s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-illegal-contents.t.err 390s @@ -5,6 +5,7 @@ 390s $ . "$TESTDIR/testutil" 390s 390s $ hg init hg 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s $ cd hg 390s $ mkdir -p .git/hooks 390s $ cat > .git/hooks/post-update < EOF 390s $ fn_touch_escaped foo/git~100/wat bar/.gi\\u200ct/wut this/is/safe 390s $ hg addremove 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s adding .git/hooks/post-update 390s adding bar/.gi\xe2\x80\x8ct/wut (esc) 390s adding foo/git~100/wat 390s adding this/is/safe 390s $ hg ci -m "we should refuse to export this" 390s - $ hg book master 390s - $ hg gexport 390s - warning: skipping invalid path '.git/hooks/post-update' 390s - warning: skipping invalid path 'bar/.gi\xe2\x80\x8ct/wut' 390s - warning: skipping invalid path 'foo/git~100/wat' 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + $ hg book master 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + $ hg gexport 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + hg: unknown command 'gexport' 390s + (did you mean one of export, import?) 390s + [10] 390s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 390s - this/is/safe 390s + fatal: not a git repository: '.hg/git' 390s + [128] 390s $ hg debug-remove-hggit-state 390s - clearing out the git cache data 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + hg: unknown command 'debug-remove-hggit-state' 390s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 390s + [10] 390s $ hg gexport --config hggit.invalidpaths=keep 390s - warning: path '.git/hooks/post-update' contains an invalid path component 390s - warning: path 'bar/.gi\xe2\x80\x8ct/wut' contains an invalid path component 390s - warning: path 'foo/git~100/wat' contains an invalid path component 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + hg: unknown command 'gexport' 390s + (did you mean one of export, import?) 390s + [10] 390s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 390s - .git/hooks/post-update 390s - "bar/.gi\342\200\214t/wut" 390s - foo/git~100/wat 390s - this/is/safe 390s - $ cd .. 390s - 390s - $ rm -rf hg 390s - $ hg init hg 390s + fatal: not a git repository: '.hg/git' 390s + [128] 390s + $ cd .. 390s + 390s + $ rm -rf hg 390s + $ hg init hg 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s $ cd hg 390s $ mkdir -p nested/.git/hooks/ 390s $ cat > nested/.git/hooks/post-update < EOF 390s $ chmod +x nested/.git/hooks/post-update 390s $ hg addremove 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s adding nested/.git/hooks/post-update 390s $ hg ci -m "also refuse to export this" 390s - $ hg book master 390s - $ hg gexport 390s - warning: skipping invalid path 'nested/.git/hooks/post-update' 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + $ hg book master 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + $ hg gexport 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + hg: unknown command 'gexport' 390s + (did you mean one of export, import?) 390s + [10] 390s $ git clone .hg/git git 390s - Cloning into 'git'... 390s - done. 390s + fatal: repository '.hg/git' does not exist 390s + [128] 390s $ rm -rf git 390s 390s We can trigger an error: 390s 390s $ hg -q debug-remove-hggit-state 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + hg: unknown command 'debug-remove-hggit-state' 390s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 390s + [10] 390s $ hg --config hggit.invalidpaths=abort gexport 390s - abort: invalid path 'nested/.git/hooks/post-update' rejected by configuration 390s - (see 'hg help config.hggit.invalidpaths for details) 390s - [255] 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + hg: unknown command 'gexport' 390s + (did you mean one of export, import?) 390s + [10] 390s 390s We can override if needed: 390s 390s $ hg --config hggit.invalidpaths=keep gexport 390s - warning: path 'nested/.git/hooks/post-update' contains an invalid path component 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + hg: unknown command 'gexport' 390s + (did you mean one of export, import?) 390s + [10] 390s $ cd .. 390s $ # different git versions give different return codes 390s $ git clone hg/.hg/git git || true 390s - Cloning into 'git'... 390s - done. 390s - error: [Ii]nvalid path 'nested/\.git/hooks/post-update' (re) 390s + fatal: repository 'hg/.hg/git' does not exist 390s fatal: unable to checkout working tree (?) 390s warning: Clone succeeded, but checkout failed. (?) 390s You can inspect what was checked out with 'git status' (?) 390s @@ -88,6 +109,7 @@ 390s $ cd .. 390s $ rm -rf hg 390s $ hg init hg 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s $ cd hg 390s $ mkdir -p .GIT/hooks/ 390s $ cat > .GIT/hooks/post-checkout < EOF 390s $ chmod +x .GIT/hooks/post-checkout 390s $ hg addremove 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s adding .GIT/hooks/post-checkout 390s $ hg ci -m "also refuse to export this" 390s - $ hg book master 390s - $ hg gexport 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + $ hg book master 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + $ hg gexport 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + hg: unknown command 'gexport' 390s + (did you mean one of export, import?) 390s + [10] 390s $ cd .. 390s 390s And the NTFS case: 390s $ cd .. 390s $ rm -rf hg 390s $ hg init hg 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s $ cd hg 390s $ mkdir -p GIT~1/hooks/ 390s $ cat > GIT~1/hooks/post-checkout < EOF 390s $ chmod +x GIT~1/hooks/post-checkout 390s $ hg addremove 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s adding GIT~1/hooks/post-checkout 390s $ hg ci -m "also refuse to export this" 390s - $ hg book master 390s - $ hg gexport 390s - warning: skipping invalid path 'GIT~1/hooks/post-checkout' 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + $ hg book master 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + $ hg gexport 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + hg: unknown command 'gexport' 390s + (did you mean one of export, import?) 390s + [10] 390s $ cd .. 390s 390s Now check a Git repository containing a Mercurial repository, which 390s @@ -127,36 +163,29 @@ 390s $ rm -rf hg git nested 390s $ git init -q git 390s $ hg init nested 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s $ mv nested git 390s $ cd git 390s $ git add nested 390s $ fn_git_commit -m 'add a Mercurial repository' 390s $ cd .. 390s $ hg clone --config hggit.invalidpaths=abort git hg 390s - importing 1 git commits 390s - abort: invalid path 'nested/.hg/00changelog.i' rejected by configuration 390s - (see 'hg help config.hggit.invalidpaths for details) 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + abort: repository git not found 390s [255] 390s $ rm -rf hg 390s $ hg clone --config hggit.invalidpaths=keep git hg 390s - importing 1 git commits 390s - warning: path 'nested/.hg/00changelog.i' contains an invalid path component 390s - warning: path 'nested/.hg/requires' contains an invalid path component 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + abort: repository git not found 390s warning: path 'nested/.hg/store/requires' contains an invalid path component (?) 390s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 390s warning: path 'nested/.hg/store/requires' is within a nested repository, which Mercurial cannot check out. (?) 390s - updating to bookmark master 390s - abort: path 'nested/.hg/00changelog.i' is inside nested repo 'nested' 390s - [10] 390s + [255] 390s $ rm -rf hg 390s $ hg clone git hg 390s - importing 1 git commits 390s - warning: skipping invalid path 'nested/.hg/00changelog.i' 390s - warning: skipping invalid path 'nested/.hg/requires' 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + abort: repository git not found 390s warning: skipping invalid path 'nested/.hg/store/requires' (?) 390s - new changesets 3ea18a67c0e6 (1 drafts) 390s - updating to bookmark master 390s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 390s + [255] 390s $ cd .. 390s 390s Now check a Git repository containing paths with carriage return and 390s @@ -171,23 +200,16 @@ 390s $ fn_git_commit -m 'add files disallowed by mercurial' 390s $ cd .. 390s $ hg clone --config hggit.invalidpaths=abort git hg 390s - importing 1 git commits 390s - abort: invalid path 'Icon\r' rejected by configuration 390s - (see 'hg help config.hggit.invalidpaths for details) 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + abort: repository git not found 390s [255] 390s $ hg clone --config hggit.invalidpaths=keep git hg 390s - importing 1 git commits 390s - warning: skipping invalid path 'Icon\r' 390s - warning: skipping invalid path 'the\nfile' 390s - new changesets 8354c06a5842 (1 drafts) 390s - updating to bookmark master 390s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + abort: repository git not found 390s + [255] 390s $ rm -rf hg 390s $ hg clone git hg 390s - importing 1 git commits 390s - warning: skipping invalid path 'Icon\r' 390s - warning: skipping invalid path 'the\nfile' 390s - new changesets 8354c06a5842 (1 drafts) 390s - updating to bookmark master 390s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 390s - 390s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 390s + abort: repository git not found 390s + [255] 390s + 390s 390s ERROR: test-illegal-contents.t output changed 392s ! 392s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-phases-remote.t 392s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-phases-remote.t.err 392s @@ -26,193 +26,10 @@ 392s $ cd .. 392s 392s $ hg clone --config hggit.usephases=True -U gitrepo hgrepo 392s - importing 4 git commits 392s - new changesets ff7a2f2d8d70:25eed24f5e8f (1 drafts) 392s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 392s + abort: repository gitrepo not found 392s + [255] 392s 392s $ cd hgrepo 392s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 392s $ hg log -G -T '{rev}|{phase}|{bookmarks}|{tags}\n' 392s - o 3|public||thetag tip 392s - | 392s - | o 2|draft|not-master|default/not-master 392s - |/ 392s - | o 1|public|master|default/master 392s - |/ 392s - o 0|public|| 392s - 392s - $ hg phase -r 'all()' | tee $TESTTMP/after-clone 392s - 0: public 392s - 1: public 392s - 2: draft 392s - 3: public 392s - $ cat >> .hg/hgrc < [paths] 392s - > other = $TESTTMP/gitrepo/.git 392s - > other:hg-git.publish = no 392s - > EOF 392s - $ cd .. 392s - 392s -that disables publishing from that remote 392s - 392s - $ cd hgrepo 392s - $ hg phase -fd 'all()' 392s - $ hg pull other 392s - pulling from $TESTTMP/gitrepo/.git 392s - no changes found 392s - $ hg log -qr 'public()' 392s - $ hg pull -v --config hggit.usephases=True other 392s - pulling from $TESTTMP/gitrepo/.git 392s - no changes found 392s - processing commits in batches of 1000 392s - bookmark master is up-to-date 392s - bookmark not-master is up-to-date 392s - $ hg log -qr 'public()' 392s - $ cd .. 392s - 392s -but not default when enable by the global setting 392s - 392s - $ cd hgrepo 392s - $ hg phase -fd 'all()' 392s - no phases changed 392s - $ hg pull -v --config hggit.usephases=True 392s - pulling from $TESTTMP/gitrepo 392s - publishing remote HEAD 392s - publishing tag thetag 392s - no changes found 392s - processing commits in batches of 1000 392s - bookmark master is up-to-date 392s - bookmark not-master is up-to-date 392s - publishing remote HEAD 392s - publishing tag thetag 392s - 3 local changesets published 392s - $ hg phase -r 'all()' > $TESTTMP/after-pull 392s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 392s - $ cd .. 392s - 392s -or the path option 392s - 392s - $ cd hgrepo 392s - $ hg phase -fd 'all()' 392s - $ hg pull -v --config paths.default:hg-git.publish=yes 392s - pulling from $TESTTMP/gitrepo 392s - publishing remote HEAD 392s - publishing tag thetag 392s - no changes found 392s - processing commits in batches of 1000 392s - bookmark master is up-to-date 392s - bookmark not-master is up-to-date 392s - publishing remote HEAD 392s - publishing tag thetag 392s - 3 local changesets published 392s - $ hg phase -r 'all()' > $TESTTMP/after-pull 392s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 392s - $ cd .. 392s - 392s -but we can specify individual branches 392s - 392s - $ cd hgrepo 392s - $ hg phase -fd 'all()' 392s - $ hg pull -v --config paths.default:hg-git.publish=not-master 392s - pulling from $TESTTMP/gitrepo 392s - publishing branch not-master 392s - no changes found 392s - processing commits in batches of 1000 392s - bookmark master is up-to-date 392s - bookmark not-master is up-to-date 392s - publishing branch not-master 392s - 2 local changesets published 392s - $ hg phase -r master -r not-master -r thetag 392s - 1: draft 392s - 2: public 392s - 3: draft 392s - $ cd .. 392s - 392s -and we can also specify the tag 392s - 392s - $ cd hgrepo 392s - $ hg phase -fd 'all()' 392s - $ hg pull -v --config paths.default:hg-git.publish=thetag 392s - pulling from $TESTTMP/gitrepo 392s - publishing tag thetag 392s - no changes found 392s - processing commits in batches of 1000 392s - bookmark master is up-to-date 392s - bookmark not-master is up-to-date 392s - publishing tag thetag 392s - 2 local changesets published 392s - $ hg phase -r master -r not-master -r thetag 392s - 1: draft 392s - 2: draft 392s - 3: public 392s - $ cd .. 392s - 392s - 392s -Check multiple paths behavior 392s -============================= 392s - 392s - 392s - $ cd hgrepo 392s - $ cat >> .hg/hgrc < [paths] 392s - > multi:multi-urls = yes 392s - > multi = path://other, path://default 392s - > recursive:multi-urls = yes 392s - > recursive = path://multi, default 392s - > EOF 392s - 392s -Using multiple path works fine: 392s - 392s - 392s - $ hg pull multi --config paths.default:hg-git.publish=yes 392s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 392s - [255] 392s - 392s -Recursive multiple path are tricker, but Mercurial don't work with them either. 392s -This test exist to make sure we bail out on our own. 392s - 392s - 392s -`yes` should abort (until we implement it) 392s - 392s - $ hg pull multi --config paths.default:hg-git.publish=yes 392s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 392s - [255] 392s - 392s -`some-value` should abort (until we implement it) 392s - 392s - $ hg pull multi --config paths.default:hg-git.publish=thetag 392s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 392s - [255] 392s - 392s -`no` is fine 392s - 392s - $ hg pull multi --config paths.default:hg-git.publish=no 392s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 392s - [255] 392s - 392s - $ cd .. 392s - 392s -Check conflicting paths behavior 392s -================================ 392s - 392s - $ cd hgrepo 392s - $ cat > .hg/hgrc < [paths] 392s - > default = $TESTTMP/gitrepo 392s - > default:hg-git.publish = yes 392s - > also-default = $TESTTMP/gitrepo 392s - > EOF 392s - $ hg pull also-default 392s - pulling from $TESTTMP/gitrepo 392s - abort: different publishing configurations for the same remote location 392s - (conflicting paths: also-default, default) 392s - [255] 392s - $ hg pull --config paths.also-default:hg-git.publish=no 392s - pulling from $TESTTMP/gitrepo 392s - abort: different publishing configurations for the same remote location 392s - (conflicting paths: also-default, default) 392s - [255] 392s - $ hg pull --config paths.also-default:hg-git.publish=true 392s - pulling from $TESTTMP/gitrepo 392s - no changes found 392s - 1 local changesets published 392s - $ cd .. 392s - 392s 392s ERROR: test-phases-remote.t output changed 408s ! 408s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-serve-hg-static.t 408s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-serve-hg-static.t.err 408s @@ -6,6 +6,7 @@ 408s $ . "$TESTDIR/testutil" 408s 408s $ hg clone http://localhost:$HGPORT/ copy 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s abort: * (glob) 408s [100] 408s $ test -d copy 408s @@ -18,14 +19,18 @@ 408s > --logfile server.log 408s $ cat dumb.pid >> $DAEMON_PIDS 408s $ hg init remote 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s $ cd remote 408s $ echo foo > bar 408s $ echo c2 > '.dotfile with spaces' 408s $ hg add 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s adding .dotfile with spaces 408s adding bar 408s $ hg commit -m"test" 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s $ hg tip 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s changeset: 0:02770d679fb8 408s tag: tip 408s user: test 408s @@ -34,6 +39,7 @@ 408s 408s $ cd .. 408s $ hg clone static-http://localhost:$HGPORT/remote local 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s requesting all changes 408s adding changesets 408s adding manifests 408s @@ -44,17 +50,20 @@ 408s 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 408s $ cd local 408s $ hg verify 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s checking changesets 408s checking manifests 408s crosschecking files in changesets and manifests 408s + checking dirstate (?) 408s checking files 408s - checking dirstate (?) 408s + checking dirstate 408s checked 1 changesets with 2 changes to 2 files 408s $ cat bar 408s foo 408s $ cd ../remote 408s $ echo baz > quux 408s $ hg commit -A -mtest2 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s adding quux 408s 408s check for HTTP opener failures when cachefile does not exist 408s @@ -62,6 +71,7 @@ 408s $ rm .hg/cache/* 408s $ cd ../local 408s $ hg pull 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s pulling from static-http://localhost:$HGPORT/remote 408s searching for changes 408s adding changesets 408s @@ -74,10 +84,13 @@ 408s trying to push 408s 408s $ hg update 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 408s $ echo more foo >> bar 408s $ hg commit -m"test" 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s $ hg push 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s pushing to static-http://localhost:$HGPORT/remote 408s abort: destination does not support push 408s [255] 408s @@ -86,9 +99,11 @@ 408s 408s $ cd .. 408s $ hg clone -r doesnotexist static-http://localhost:$HGPORT/remote local0 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s abort: unknown revision 'doesnotexist'!? (re) 408s [10] 408s $ hg clone -r 0 static-http://localhost:$HGPORT/remote local0 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s adding changesets 408s adding manifests 408s adding file changes 408s @@ -100,16 +115,23 @@ 408s test with "/" URI (issue747) and subrepo 408s 408s $ hg init 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s $ hg init sub 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s $ touch sub/test 408s $ hg -R sub commit -A -m "test" 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s adding test 408s $ hg -R sub tag not-empty 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s $ echo sub=sub > .hgsub 408s $ echo a > a 408s $ hg add a .hgsub 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s $ hg -q ci -ma 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s $ hg clone static-http://localhost:$HGPORT/ local2 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s requesting all changes 408s adding changesets 408s adding manifests 408s @@ -127,58 +149,75 @@ 408s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 408s $ cd local2 408s $ hg verify 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s checking changesets 408s checking manifests 408s crosschecking files in changesets and manifests 408s + checking dirstate (?) 408s checking files 408s - checking dirstate (?) 408s + checking dirstate 408s checked 1 changesets with 3 changes to 3 files 408s checking subrepo links 408s $ cat a 408s a 408s $ hg paths 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s default = static-http://localhost:$HGPORT/ 408s 408s test with empty repo (issue965) 408s 408s $ cd .. 408s $ hg init remotempty 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s $ hg clone static-http://localhost:$HGPORT/remotempty local3 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s no changes found 408s updating to branch default 408s 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 408s $ cd local3 408s $ hg verify 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s checking changesets 408s checking manifests 408s crosschecking files in changesets and manifests 408s + checking dirstate (?) 408s checking files 408s - checking dirstate (?) 408s + checking dirstate 408s checked 0 changesets with 0 changes to 0 files 408s $ hg paths 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s default = static-http://localhost:$HGPORT/remotempty 408s $ cd .. 408s 408s Clone with tags and branches works 408s 408s $ hg init remote-with-names 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s $ cd remote-with-names 408s $ echo 0 > foo 408s $ hg -q commit -A -m initial 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s $ echo 1 > foo 408s $ hg commit -m 'commit 1' 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s $ hg -q up 0 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s $ hg branch mybranch 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s marked working directory as branch mybranch 408s (branches are permanent and global, did you want a bookmark?) 408s $ echo 2 > foo 408s $ hg commit -m 'commit 2 (mybranch)' 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s $ hg tag -r 1 'default-tag' 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s $ hg tag -r 2 'branch-tag' 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s 408s $ cd .. 408s 408s $ hg clone static-http://localhost:$HGPORT/remote-with-names local-with-names 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s requesting all changes 408s adding changesets 408s adding manifests 408s @@ -191,6 +230,7 @@ 408s Clone a specific branch works 408s 408s $ hg clone -r mybranch static-http://localhost:$HGPORT/remote-with-names local-with-names-branch 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s adding changesets 408s adding manifests 408s adding file changes 408s @@ -202,6 +242,7 @@ 408s Clone a specific tag works 408s 408s $ hg clone -r default-tag static-http://localhost:$HGPORT/remote-with-names local-with-names-tag 408s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 408s adding changesets 408s adding manifests 408s adding file changes 408s 408s ERROR: test-serve-hg-static.t output changed 411s ! 411s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-octopus.t 411s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-octopus.t.err 411s @@ -62,111 +62,9 @@ 411s $ git init -q --bare repo.git 411s 411s $ hg clone gitrepo hgrepo 411s - importing 8 git commits 411s - new changesets ff7a2f2d8d70:307506d6ae8a (10 drafts) 411s - updating to bookmark master 411s - 6 files updated, 0 files merged, 0 files removed, 0 files unresolved 411s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 411s + abort: repository gitrepo not found 411s + [255] 411s $ cd hgrepo 411s + $TESTTMP.sh: 64: cd: can't cd to hgrepo 411s $ hg log --graph --style compact | sed 's/\[.*\]//g' 411s - @ 9:7,8 307506d6ae8a 2007-01-01 00:00 +0000 test 411s - |\ Merge branches 'branch3' and 'branch4' 411s - | | 411s - | o 8:3,4 2b07220e422e 2007-01-01 00:00 +0000 test 411s - | |\ Merge branches 'branch3' and 'branch4' 411s - | | | 411s - o | | 7:5,6 ccf2d65d982c 2007-01-01 00:00 +0000 test 411s - |\ \ \ Merge branches 'branch1' and 'branch2' 411s - | | | | 411s - | o | | 6:1,2 690b40256117 2007-01-01 00:00 +0000 test 411s - | |\ \ \ Merge branches 'branch1' and 'branch2' 411s - | | | | | 411s - o | | | | 5:0 e459c0629ca4 2007-01-01 00:00 +0000 test 411s - | | | | | add delta 411s - | | | | | 411s - +-------o 4:0 e857c9a04474 2007-01-01 00:00 +0000 test 411s - | | | | add zeta 411s - | | | | 411s - +-----o 3:0 0071dec0de0e 2007-01-01 00:00 +0000 test 411s - | | | add epsilon 411s - | | | 411s - +---o 2:0 205a004356ef 2007-01-01 00:00 +0000 test 411s - | | add gamma 411s - | | 411s - | o 1 7fe02317c63d 2007-01-01 00:00 +0000 test 411s - |/ add beta 411s - | 411s - o 0 ff7a2f2d8d70 2007-01-01 00:00 +0000 test 411s - add alpha 411s - 411s - $ hg gverify -r 9 411s - verifying rev 307506d6ae8a against git commit b32ff845df61df998206b630e4370a44f9b36845 411s - $ hg gverify -r 8 411s - abort: no git commit found for rev 2b07220e422e 411s - (if this is an octopus merge, verify against the last rev) 411s - [255] 411s - 411s - $ hg debug-remove-hggit-state 411s - clearing out the git cache data 411s - $ hg push ../repo.git 411s - pushing to ../repo.git 411s - searching for changes 411s - adding objects 411s - remote: found 0 deltas to reuse 411s - added 8 commits with 8 trees and 6 blobs 411s - adding reference refs/heads/branch1 411s - adding reference refs/heads/branch2 411s - adding reference refs/heads/branch3 411s - adding reference refs/heads/branch4 411s - adding reference refs/heads/master 411s - $ cd .. 411s - 411s - $ git --git-dir=repo.git log --pretty=medium | sed s/\\.\\.\\.//g 411s - commit b32ff845df61df998206b630e4370a44f9b36845 411s - Merge: 9ac68f9 7e9cd9f e695849 411s - Author: test 411s - Date: Mon Jan 1 00:00:15 2007 +0000 411s - 411s - Merge branches 'branch3' and 'branch4' 411s - 411s - commit 9ac68f982ae7426d9597ff16c74afb4e6053c582 411s - Merge: d40f375 9497a4e e5023f9 411s - Author: test 411s - Date: Mon Jan 1 00:00:15 2007 +0000 411s - 411s - Merge branches 'branch1' and 'branch2' 411s - 411s - commit d40f375a81b7d033e92cbad89487115fe2dd472f 411s - Author: test 411s - Date: Mon Jan 1 00:00:15 2007 +0000 411s - 411s - add delta 411s - 411s - commit e695849087f6c320c1a447620492b29a82ca41b1 411s - Author: test 411s - Date: Mon Jan 1 00:00:14 2007 +0000 411s - 411s - add zeta 411s - 411s - commit 7e9cd9f90b6d2c60579375eb796ce706d2d8bbe6 411s - Author: test 411s - Date: Mon Jan 1 00:00:13 2007 +0000 411s - 411s - add epsilon 411s - 411s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 411s - Author: test 411s - Date: Mon Jan 1 00:00:12 2007 +0000 411s - 411s - add gamma 411s - 411s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 411s - Author: test 411s - Date: Mon Jan 1 00:00:11 2007 +0000 411s - 411s - add beta 411s - 411s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 411s - Author: test 411s - Date: Mon Jan 1 00:00:10 2007 +0000 411s - 411s - add alpha 411s 411s ERROR: test-octopus.t output changed 424s ! 424s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-hook.t 424s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-hook.t.err 424s @@ -10,6 +10,7 @@ 424s > fn_${1}_commit -m $2 424s > } 424s $ hg init hgrepo 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ cd hgrepo 424s $ cat > .hg/hgrc < [hooks] 424s @@ -22,7 +23,10 @@ 424s > incoming = python:testlib.hooks.showargs 424s > EOF 424s $ fn_commit hg a 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ hg book master 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s 424s $ git init -q --bare ../repo.git 424s $ cat >> .hg/hgrc < master 424s + * [new branch] master -> master 424s $ cd ../hgrepo 424s 424s Hooks on pull? 424s 424s $ hg pull -u 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s pulling from $TESTTMP/repo.git 424s - | gitimport.source=pull 424s - | gitimport.git=True 424s - | gitimport.names=[b'default'] 424s - | gitimport.refs={b'HEAD': b'1dab31e7bc9691ba42a2fe7b14680694770bc527', b'refs/heads/master': b'1dab31e7bc9691ba42a2fe7b14680694770bc527'} 424s - | gitimport.heads=None 424s - importing 2 git commits 424s - : pretxncommit 424s - | incoming.git=True 424s - | incoming.source=pull 424s - | incoming.node=382ad5fa1d7727210384d40fa1539af52ca632c5 424s - | incoming.git_node=92150d1529ccaea34a6b36fe4144993193080499 424s - : pretxncommit 424s - | incoming.git=True 424s - | incoming.source=pull 424s - | incoming.node=892115eea5c32152e09ae4013c9a119d7b534049 424s - | incoming.git_node=1dab31e7bc9691ba42a2fe7b14680694770bc527 424s - updating bookmark master 424s - | changegroup.source=push 424s - | changegroup.git=True 424s - | changegroup.node=382ad5fa1d7727210384d40fa1539af52ca632c5 424s - | changegroup.node_last=892115eea5c32152e09ae4013c9a119d7b534049 424s - new changesets 382ad5fa1d77:892115eea5c3 (2 drafts) 424s - updating to active bookmark master 424s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 424s + abort: repository $TESTTMP/repo.git not found 424s + [255] 424s 424s Hooks on push? 424s 424s $ fn_commit hg d 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ fn_commit hg e 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ hg push 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s pushing to $TESTTMP/repo.git 424s - | preoutgoing.git=True 424s - | preoutgoing.source=push 424s - | preoutgoing.url=$TESTTMP/repo.git 424s - | gitexport.nodes=[b'cc6164a17449d58d7811ff3918f33f89c2c83fa5', b'46737f6a4c9d8307b681cbb2e9e2e5419cc87f82'] 424s - | gitexport.git=True 424s - searching for changes 424s - | prechangegroup.source=push 424s - | prechangegroup.git=True 424s - | prechangegroup.url=$TESTTMP/repo.git 424s - adding objects 424s - remote: found 0 deltas to reuse 424s - added 2 commits with 2 trees and 2 blobs 424s - updating reference refs/heads/master 424s + abort: repository $TESTTMP/repo.git not found 424s + [255] 424s 424s 424s And what does Mercurial do? 424s @@ -124,7 +87,9 @@ 424s On push: 424s 424s $ hg init ../hgrepo-copy 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ hg push ../hgrepo-copy 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s pushing to ../hgrepo-copy 424s searching for changes 424s | preoutgoing.source=push 424s @@ -133,19 +98,29 @@ 424s adding changesets 424s adding manifests 424s adding file changes 424s - added 5 changesets with 5 changes to 5 files 424s + added 3 changesets with 3 changes to 3 files 424s 424s With more than one head: 424s 424s $ rm -r ../hgrepo-copy 424s $ hg init ../hgrepo-copy 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ hg book -i 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ hg branch -q abranch 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ fn_commit hg x 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ hg up -q default 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ hg branch -q alsoabranch 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ fn_commit hg y 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s $ hg push ../hgrepo-copy 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s pushing to ../hgrepo-copy 424s searching for changes 424s | preoutgoing.source=push 424s @@ -154,13 +129,15 @@ 424s adding changesets 424s adding manifests 424s adding file changes 424s - added 7 changesets with 7 changes to 7 files (+1 heads) 424s + added 5 changesets with 5 changes to 5 files (+1 heads) 424s 424s On pull: 424s 424s $ hg debugstrip --no-backup tip 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 424s $ hg pull ../hgrepo-copy 424s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 424s pulling from ../hgrepo-copy 424s searching for changes 424s | prechangegroup.txnname=pull 424s @@ -171,16 +148,16 @@ 424s adding manifests 424s adding file changes 424s added 1 changesets with 1 changes to 1 files (+1 heads) 424s - new changesets d4097d98a390 424s + new changesets 11a693974ec5 424s | changegroup.txnname=pull 424s file://$TESTTMP/hgrepo-copy 424s | changegroup.source=pull 424s | changegroup.url=file:$TESTTMP/hgrepo-copy 424s - | changegroup.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 424s - | changegroup.node_last=d4097d98a3905be88e8a566039b1fdcca06e0d2e 424s + | changegroup.node=11a693974ec530e32672629628dde90793335199 424s + | changegroup.node_last=11a693974ec530e32672629628dde90793335199 424s | incoming.txnname=pull 424s file://$TESTTMP/hgrepo-copy 424s | incoming.source=pull 424s | incoming.url=file:$TESTTMP/hgrepo-copy 424s - | incoming.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 424s + | incoming.node=11a693974ec530e32672629628dde90793335199 424s (run 'hg heads' to see heads) 424s 424s ERROR: test-hook.t output changed 442s ! 442s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-transactions.t 442s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-transactions.t.err 442s @@ -42,19 +42,29 @@ 442s 442s $ hg clone gitrepo hgrepo --config hggit.mapsavefrequency=10 --debug \ 442s > | grep -c saving 442s - 1 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s + abort: repository gitrepo not found 442s + 0 442s + [1] 442s $ rm -rf hgrepo 442s 442s pull with mapsavefreq set 442s 442s $ hg init hgrepo 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s $ cat >> hgrepo/.hg/hgrc < [paths] 442s > default = $TESTTMP/gitrepo 442s > EOF 442s $ hg -R hgrepo --config hggit.mapsavefrequency=10 pull --debug \ 442s > | grep -c saving 442s - 10 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s + abort: repository $TESTTMP/gitrepo not found 442s + 0 442s + [1] 442s $ rm -rf hgrepo 442s 442s The user experience 442s @@ -66,6 +76,8 @@ 442s First, create a repository, set up to pull from git, and where we can interrupt the conversion. 442s 442s $ hg init hgrepo 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s $ cat >> hgrepo/.hg/hgrc < [paths] 442s > default = $TESTTMP/gitrepo 442s @@ -75,39 +87,49 @@ 442s A low save interval causes a lot of reports: 442s 442s $ hg --config hggit.mapsavefrequency=25 pull 442s - pulling from $TESTTMP/gitrepo 442s - importing 100 git commits 442s - new changesets 1c8407413fa3:abc468b9e51b (25 drafts) 442s - new changesets 217c308baf47:d5d14eeedd08 (25 drafts) 442s - new changesets d9807ef6abcb:4678067bd500 (25 drafts) 442s - adding bookmark master 442s - new changesets c31a154888bb:eda59117ba04 (25 drafts) 442s - (run 'hg update' to get a working copy) 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s + pulling from $TESTTMP/gitrepo 442s + abort: repository $TESTTMP/gitrepo not found 442s + [255] 442s 442s Reset the repository 442s 442s $ hg debugstrip --no-backup 'all()' 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s + abort: empty revision set 442s + [255] 442s $ hg debug-remove-hggit-state 442s - clearing out the git cache data 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s + hg: unknown command 'debug-remove-hggit-state' 442s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 442s + [10] 442s 442s And with phases? No mention of draft changesets, as we publish changes 442s during the conversion: 442s 442s $ hg --config hggit.mapsavefrequency=25 --config hggit.usephases=yes pull 442s - pulling from $TESTTMP/gitrepo 442s - importing 100 git commits 442s - new changesets 1c8407413fa3:abc468b9e51b 442s - new changesets 217c308baf47:d5d14eeedd08 442s - new changesets d9807ef6abcb:4678067bd500 442s - updating bookmark master 442s - new changesets c31a154888bb:eda59117ba04 442s - (run 'hg update' to get a working copy) 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s + pulling from $TESTTMP/gitrepo 442s + abort: repository $TESTTMP/gitrepo not found 442s + [255] 442s 442s Reset the repository 442s 442s $ hg debugstrip --no-backup 'all()' 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s + abort: empty revision set 442s + [255] 442s $ hg debug-remove-hggit-state 442s - clearing out the git cache data 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s + hg: unknown command 'debug-remove-hggit-state' 442s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 442s + [10] 442s 442s Interruptions 442s ------------- 442s @@ -121,54 +143,51 @@ 442s Test an error in a pull: 442s 442s $ ABORT_AFTER=99 hg pull 442s - pulling from $TESTTMP/gitrepo 442s - importing 100 git commits 442s - transaction abort! 442s - rollback completed 442s - abort: aborted after 99 commits! 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s + pulling from $TESTTMP/gitrepo 442s + abort: repository $TESTTMP/gitrepo not found 442s [255] 442s $ hg log -l 10 -T '{rev} {gitnode}\n' 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s 442s Test the user exiting in the first transaction: 442s 442s $ EXIT_AFTER=5 hg --config hggit.mapsavefrequency=10 pull 442s - pulling from $TESTTMP/gitrepo 442s - importing 100 git commits 442s - transaction abort! 442s - rollback completed 442s - interrupted! 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s + pulling from $TESTTMP/gitrepo 442s + abort: repository $TESTTMP/gitrepo not found 442s [255] 442s $ hg log -l 10 -T '{rev} {gitnode}\n' 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s 442s Check that we have no state, but clear it just in case 442s 442s $ ls -d .hg/git* 442s - .hg/git 442s + ls: cannot access '.hg/git*': No such file or directory 442s + [2] 442s $ hg debug-remove-hggit-state 442s - clearing out the git cache data 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s + hg: unknown command 'debug-remove-hggit-state' 442s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 442s + [10] 442s 442s Test the user exiting in the middle of a conversion, after the first 442s transaction: 442s 442s $ EXIT_AFTER=15 hg --config hggit.mapsavefrequency=10 pull 442s - pulling from $TESTTMP/gitrepo 442s - importing 100 git commits 442s - new changesets 1c8407413fa3:7c8c534a5fbe (10 drafts) 442s - transaction abort! 442s - rollback completed 442s - interrupted! 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s + pulling from $TESTTMP/gitrepo 442s + abort: repository $TESTTMP/gitrepo not found 442s [255] 442s $ hg log -l 10 -T '{rev} {gitnode}\n' 442s - 9 7cbb16ec981b308e1e2b181f8e1f22c8f409f44e 442s - 8 42da70ed92bbecf9f348ba59c93646be723d0bf2 442s - 7 17e841146e5744b81af9959634d82c20a5d7df52 442s - 6 c31065bf97bf014815e37cdfbdef2c32c687f314 442s - 5 fcf21b8e0520ec1cced1d7593d13f9ee54721269 442s - 4 46acd02d0352e4b92bd6a099bb0490305d847a18 442s - 3 61eeda444b37b8aa3892d5f04c66c5441d21dd66 442s - 2 e55db11bb0472791c7af3fc636772174cdea4a36 442s - 1 17a2672b3c24c02d568f99d8d55ccae2bf362d5c 442s - 0 4e195b4c6e77604b70a8ad3b01306adbb9b1c7e7 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s $ cd .. 442s $ rm -rf hgrepo 442s 442s @@ -183,12 +202,10 @@ 442s > hg --config hggit.mapsavefrequency=10 --config git.intree=yes \ 442s > --cwd hgrepo \ 442s > clone -U $TESTTMP/gitrepo . 442s - importing 100 git commits 442s - transaction abort! 442s - rollback completed 442s - interrupted! 442s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 442s + *** failed to import extension "breakage" from /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/testlib/ext-break-git-import.py: b'hggit' 442s + abort: repository $TESTTMP/gitrepo not found 442s [255] 442s the leftover below appeared in Mercurial 5.9+; it is unintentional 442s $ ls -A hgrepo 442s - .git 442s - $ rm -rf hgrepo 442s + $ rm -rf hgrepo 442s 442s ERROR: test-transactions.t output changed 445s ! 445s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-outgoing.t 445s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-outgoing.t.err 445s @@ -14,166 +14,10 @@ 445s 445s $ cd .. 445s $ hg clone gitrepo hgrepo 445s - importing 1 git commits 445s - new changesets ff7a2f2d8d70 (1 drafts) 445s - updating to bookmark master 445s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 445s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 445s + abort: repository gitrepo not found 445s + [255] 445s 445s $ cd hgrepo 445s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 445s $ hg book 445s - alpha 0:ff7a2f2d8d70 445s - * master 0:ff7a2f2d8d70 445s - $ hg update -q master 445s - $ echo beta > beta 445s - $ hg add beta 445s - $ fn_hg_commit -m 'add beta' 445s - 445s - 445s - $ echo gamma > gamma 445s - $ hg add gamma 445s - $ fn_hg_commit -m 'add gamma' 445s - 445s - $ hg book -r 1 beta 445s - 445s - $ hg outgoing | grep -v 'searching for changes' 445s - comparing with $TESTTMP/gitrepo 445s - changeset: 1:47580592d3d6 445s - bookmark: beta 445s - user: test 445s - date: Mon Jan 01 00:00:11 2007 +0000 445s - summary: add beta 445s - 445s - changeset: 2:953796e1cfd8 445s - bookmark: master 445s - tag: tip 445s - user: test 445s - date: Mon Jan 01 00:00:12 2007 +0000 445s - summary: add gamma 445s - 445s - $ hg outgoing -r beta 445s - comparing with $TESTTMP/gitrepo 445s - searching for changes 445s - changeset: 1:47580592d3d6 445s - bookmark: beta 445s - user: test 445s - date: Mon Jan 01 00:00:11 2007 +0000 445s - summary: add beta 445s - 445s - $ hg outgoing -r master 445s - comparing with $TESTTMP/gitrepo 445s - searching for changes 445s - changeset: 1:47580592d3d6 445s - bookmark: beta 445s - user: test 445s - date: Mon Jan 01 00:00:11 2007 +0000 445s - summary: add beta 445s - 445s - changeset: 2:953796e1cfd8 445s - bookmark: master 445s - tag: tip 445s - user: test 445s - date: Mon Jan 01 00:00:12 2007 +0000 445s - summary: add gamma 445s - 445s - 445s - $ cd .. 445s - 445s -some more work on master from git 445s - $ cd gitrepo 445s - 445s -Check state of refs after outgoing 445s - $ git show-ref 445s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/alpha 445s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/master 445s - 445s - $ git checkout master 2>&1 | sed s/\'/\"/g 445s - Already on "master" 445s - $ echo delta > delta 445s - $ git add delta 445s - $ fn_git_commit -m "add delta" 445s - 445s - $ cd .. 445s - 445s - $ cd hgrepo 445s -this will fail # maybe we should try to make it work 445s - $ hg outgoing 445s - comparing with $TESTTMP/gitrepo 445s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 445s - [255] 445s -let's pull and try again 445s - $ hg pull 445s - pulling from */gitrepo (glob) 445s - importing 1 git commits 445s - not updating diverged bookmark master 445s - new changesets 25eed24f5e8f (1 drafts) 445s - (run 'hg heads' to see heads, 'hg merge' to merge) 445s - $ hg log --graph 445s - o changeset: 3:25eed24f5e8f 445s - | tag: default/master 445s - | tag: tip 445s - | parent: 0:ff7a2f2d8d70 445s - | user: test 445s - | date: Mon Jan 01 00:00:13 2007 +0000 445s - | summary: add delta 445s - | 445s - | @ changeset: 2:953796e1cfd8 445s - | | bookmark: master 445s - | | user: test 445s - | | date: Mon Jan 01 00:00:12 2007 +0000 445s - | | summary: add gamma 445s - | | 445s - | o changeset: 1:47580592d3d6 445s - |/ bookmark: beta 445s - | user: test 445s - | date: Mon Jan 01 00:00:11 2007 +0000 445s - | summary: add beta 445s - | 445s - o changeset: 0:ff7a2f2d8d70 445s - bookmark: alpha 445s - tag: default/alpha 445s - user: test 445s - date: Mon Jan 01 00:00:10 2007 +0000 445s - summary: add alpha 445s - 445s - $ hg outgoing 445s - comparing with $TESTTMP/gitrepo 445s - searching for changes 445s - changeset: 1:47580592d3d6 445s - bookmark: beta 445s - user: test 445s - date: Mon Jan 01 00:00:11 2007 +0000 445s - summary: add beta 445s - 445s - changeset: 2:953796e1cfd8 445s - bookmark: master 445s - user: test 445s - date: Mon Jan 01 00:00:12 2007 +0000 445s - summary: add gamma 445s - 445s - $ hg outgoing -r beta 445s - comparing with $TESTTMP/gitrepo 445s - searching for changes 445s - changeset: 1:47580592d3d6 445s - bookmark: beta 445s - user: test 445s - date: Mon Jan 01 00:00:11 2007 +0000 445s - summary: add beta 445s - 445s - $ hg outgoing -r master 445s - comparing with $TESTTMP/gitrepo 445s - searching for changes 445s - changeset: 1:47580592d3d6 445s - bookmark: beta 445s - user: test 445s - date: Mon Jan 01 00:00:11 2007 +0000 445s - summary: add beta 445s - 445s - changeset: 2:953796e1cfd8 445s - bookmark: master 445s - user: test 445s - date: Mon Jan 01 00:00:12 2007 +0000 445s - summary: add gamma 445s - 445s - 445s - 445s - $ cd .. 445s 445s ERROR: test-outgoing.t output changed 455s ! 455s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-gc.t 455s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-gc.t.err 455s @@ -25,188 +25,9 @@ 455s > done 455s $ cd .. 455s $ hg clone -U gitrepo hgrepo 455s - importing 100 git commits 455s - new changesets 1c8407413fa3:eda59117ba04 (100 drafts) 455s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 455s + abort: repository gitrepo not found 455s + [255] 455s $ cd hgrepo 455s + $TESTTMP.sh: 24: cd: can't cd to hgrepo 455s $ hg debug-remove-hggit-state 455s - clearing out the git cache data 455s - 455s ------------ 455s - 455s -Test garbage collection of loose objects into packs. We first test 455s -this with two threads, which is closest to the expected usage 455s -scenario, as almost all computers have at least two cores these days. 455s -The main downside is that this makes the output order unreliable, so 455s -we just sort it. 455s - 455s - $ hg gexport --config hggit.mapsavefrequency=33 --config hggit.threads=2 --debug | grep pack | sort 455s - packed 3 loose objects! 455s - packed 75 loose objects! 455s - packed 78 loose objects! 455s - packed 86 loose objects! 455s - packing 3 loose objects... 455s - packing 75 loose objects... 455s - packing 78 loose objects... 455s - packing 86 loose objects... 455s - $ hg debug-remove-hggit-state 455s - clearing out the git cache data 455s - 455s -Test the actual order of operations -- this uses a single thread, 455s -which means that the packing happens synchronously in the main thread, 455s -giving us a reliable output order. 455s - 455s -In addition, the transaction size is set up such that we happen to do 455s -nothing in the final, synchronous packing that happens on every pull. 455s -Lots of other tests have a map save frequency higher than the total 455s -amount of commits pulled, but let's just trigger that other odd 455s -occurence here. 455s - 455s - $ hg gexport --debug \ 455s - > --config hggit.mapsavefrequency=10 --config hggit.threads=1 | \ 455s - > sed 's/^converting revision.*/./' 455s - finding unexported changesets 455s - exporting 100 changesets 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 455s - packing 30 loose objects... 455s - packed 30 loose objects! 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 455s - packing 25 loose objects... 455s - packed 25 loose objects! 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 455s - packing 25 loose objects... 455s - packed 25 loose objects! 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 455s - packing 24 loose objects... 455s - packed 24 loose objects! 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 455s - packing 24 loose objects... 455s - packed 24 loose objects! 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 455s - packing 24 loose objects... 455s - packed 24 loose objects! 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 455s - packing 24 loose objects... 455s - packed 24 loose objects! 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 455s - packing 23 loose objects... 455s - packed 23 loose objects! 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 455s - packing 22 loose objects... 455s - packed 22 loose objects! 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - . 455s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 455s - packing 21 loose objects... 455s - packed 21 loose objects! 455s - packing 0 loose objects... 455s - packed 0 loose objects! 455s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 455s - $ find .hg/git/objects -type f | grep -Fv .idx | sort 455s - .hg/git/objects/pack/pack-33903607b479000b976a29a349fe0f4dffb0aaac.pack 455s - .hg/git/objects/pack/pack-40d9440e392d9eab62fa38a2ed66cc763d77aca3.pack 455s - .hg/git/objects/pack/pack-4ab2dac268f94e407788d52d6ba087b626c41651.pack 455s - .hg/git/objects/pack/pack-543e3b37bd36218a4dc6611a96d7c218afb78429.pack 455s - .hg/git/objects/pack/pack-5fc80292253ee10d1b86b5c4d9c51b29d2b4ba47.pack 455s - .hg/git/objects/pack/pack-9c636f5f16302fc5fadf0cc4ed42aeb67fc51f6a.pack 455s - .hg/git/objects/pack/pack-ae74b1f0197dfb45cfb13889453860a40103969a.pack 455s - .hg/git/objects/pack/pack-b432e2f477cb765fc0aeaa850d56e04b10392e6c.pack 455s - .hg/git/objects/pack/pack-cf7023660ce10ede2896d1be117f6ba93a261ff9.pack 455s - .hg/git/objects/pack/pack-e601b2af6a91a9cf6817d71f4eb660d2218d4094.pack 455s 455s ERROR: test-gc.t output changed 458s ! 458s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-phases-public.t 458s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-phases-public.t#publish-defaults.err 458s @@ -24,149 +24,10 @@ 458s 458s cloning with hggit.usephases publishes cloned HEAD 458s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 458s - importing 1 git commits 458s - new changesets ff7a2f2d8d70 458s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 458s + abort: repository gitrepo not found 458s + [255] 458s 458s $ cd hgrepo 458s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 458s $ hg phase -r master 458s - 0: public 458s - $ cd .. 458s - 458s -pulled changesets are public 458s - $ cd gitrepo 458s - $ git checkout -q master 458s - $ echo beta > beta 458s - $ git add beta 458s - $ fn_git_commit -m 'add beta' 458s - $ git checkout -b not-master 458s - Switched to a new branch 'not-master' 458s - $ echo gamma > gamma 458s - $ git add gamma 458s - $ fn_git_commit -m 'add gamma' 458s - $ git tag thetag 458s - $ echo delta > delta 458s - $ git add delta 458s - $ fn_git_commit -m 'add delta' 458s - $ git checkout master 458s - Switched to branch 'master' 458s - $ cd .. 458s - 458s - $ cd hgrepo 458s - $ cat >>$HGRCPATH < [paths] 458s - > other = $TESTTMP/gitrepo/.git 458s - > [hggit] 458s - > usephases = True 458s - > EOF 458s - 458s - $ hg phase -fd 'all()' 458s - 458s -we can restrict publishing to the remote HEAD and that tag, which 458s -happens to be the same thing here 458s - 458s -#if publish-specific 458s - $ cat >>$HGRCPATH < [git] 458s - > public = default/master, thetag 458s - > EOF 458s -#endif 458s - 458s -pulling publishes the branch 458s - 458s - $ hg phase -r master 458s - 0: draft 458s -#if publish-defaults 458s - $ hg pull -r master other 458s - pulling from $TESTTMP/gitrepo/.git 458s - importing 1 git commits 458s - updating bookmark master 458s - new changesets 7fe02317c63d 458s - 1 local changesets published 458s - (run 'hg update' to get a working copy) 458s -#else 458s - $ hg pull -r master other 458s - pulling from $TESTTMP/gitrepo/.git 458s - importing 1 git commits 458s - updating bookmark master 458s - new changesets 7fe02317c63d (1 drafts) 458s - (run 'hg update' to get a working copy) 458s -#endif 458s - $ hg phase -r master 458s - 1: draft (publish-specific !) 458s - 1: public (publish-defaults !) 458s -#if publish-defaults 458s - $ hg phase -fd master 458s - $ hg pull 458s - pulling from $TESTTMP/gitrepo 458s - importing 2 git commits 458s - adding bookmark not-master 458s - new changesets ca33a262eb46:03769a650ded (1 drafts) 458s - 1 local changesets published 458s - (run 'hg update' to get a working copy) 458s -#else 458s - $ hg pull 458s - pulling from $TESTTMP/gitrepo 458s - importing 2 git commits 458s - adding bookmark not-master 458s - new changesets ca33a262eb46:03769a650ded (1 drafts) 458s - 2 local changesets published 458s - (run 'hg update' to get a working copy) 458s -#endif 458s - $ hg phase -r master -r not-master -r thetag 458s - 1: public 458s - 3: draft 458s - 2: public 458s - 458s -public bookmark not pushed is not published after pull 458s - 458s - $ hg update 0 458s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 458s - $ echo delta > delta 458s - $ hg bookmark not-pushed 458s - $ hg add delta 458s - $ hg commit -m 'add delta' 458s - created new head 458s - $ hg phase -r 'all()' > $TESTTMP/before 458s - $ hg pull --config git.public=master,not-pushed 458s - pulling from $TESTTMP/gitrepo 458s - no changes found 458s - $ hg phase -r 'all()' > $TESTTMP/after 458s - $ cmp -s $TESTTMP/before $TESTTMP/after 458s - $ hg phase -r not-pushed 458s - 4: draft 458s - $ rm $TESTTMP/before $TESTTMP/after 458s - 458s -pushing public bookmark publishes local changesets, but only those 458s -actually pushed 458s - 458s - $ hg update master 458s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 458s - (activating bookmark master) 458s - $ echo epsilon > epsilon 458s - $ hg add epsilon 458s - $ hg commit -m 'add epsilon' 458s - created new head 458s - $ hg phase -r 'all() - master' > $TESTTMP/before 458s - $ hg push -B not-pushed 458s - pushing to $TESTTMP/gitrepo 458s - searching for changes 458s - adding objects 458s - remote: found 0 deltas to reuse 458s - added 1 commits with 1 trees and 1 blobs 458s - adding reference refs/heads/not-pushed 458s - $ hg phase -r 'all() - master' > $TESTTMP/after 458s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 458s - $ hg phase -r not-pushed -r master 458s - 4: draft 458s - 5: draft 458s - $ hg push -B master 458s - pushing to $TESTTMP/gitrepo 458s - searching for changes 458s - adding objects 458s - remote: found 0 deltas to reuse 458s - added 1 commits with 1 trees and 1 blobs 458s - updating reference refs/heads/master 458s - $ hg phase -r 'all() - master' > $TESTTMP/after 458s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 458s - $ hg phase -r master 458s - 5: public 458s 458s ERROR: test-phases-public.t#publish-defaults output changed 462s ! 462s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-phases-public.t 462s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-phases-public.t#publish-specific.err 462s @@ -24,149 +24,10 @@ 462s 462s cloning with hggit.usephases publishes cloned HEAD 462s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 462s - importing 1 git commits 462s - new changesets ff7a2f2d8d70 462s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 462s + abort: repository gitrepo not found 462s + [255] 462s 462s $ cd hgrepo 462s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 462s $ hg phase -r master 462s - 0: public 462s - $ cd .. 462s - 462s -pulled changesets are public 462s - $ cd gitrepo 462s - $ git checkout -q master 462s - $ echo beta > beta 462s - $ git add beta 462s - $ fn_git_commit -m 'add beta' 462s - $ git checkout -b not-master 462s - Switched to a new branch 'not-master' 462s - $ echo gamma > gamma 462s - $ git add gamma 462s - $ fn_git_commit -m 'add gamma' 462s - $ git tag thetag 462s - $ echo delta > delta 462s - $ git add delta 462s - $ fn_git_commit -m 'add delta' 462s - $ git checkout master 462s - Switched to branch 'master' 462s - $ cd .. 462s - 462s - $ cd hgrepo 462s - $ cat >>$HGRCPATH < [paths] 462s - > other = $TESTTMP/gitrepo/.git 462s - > [hggit] 462s - > usephases = True 462s - > EOF 462s - 462s - $ hg phase -fd 'all()' 462s - 462s -we can restrict publishing to the remote HEAD and that tag, which 462s -happens to be the same thing here 462s - 462s -#if publish-specific 462s - $ cat >>$HGRCPATH < [git] 462s - > public = default/master, thetag 462s - > EOF 462s -#endif 462s - 462s -pulling publishes the branch 462s - 462s - $ hg phase -r master 462s - 0: draft 462s -#if publish-defaults 462s - $ hg pull -r master other 462s - pulling from $TESTTMP/gitrepo/.git 462s - importing 1 git commits 462s - updating bookmark master 462s - new changesets 7fe02317c63d 462s - 1 local changesets published 462s - (run 'hg update' to get a working copy) 462s -#else 462s - $ hg pull -r master other 462s - pulling from $TESTTMP/gitrepo/.git 462s - importing 1 git commits 462s - updating bookmark master 462s - new changesets 7fe02317c63d (1 drafts) 462s - (run 'hg update' to get a working copy) 462s -#endif 462s - $ hg phase -r master 462s - 1: draft (publish-specific !) 462s - 1: public (publish-defaults !) 462s -#if publish-defaults 462s - $ hg phase -fd master 462s - $ hg pull 462s - pulling from $TESTTMP/gitrepo 462s - importing 2 git commits 462s - adding bookmark not-master 462s - new changesets ca33a262eb46:03769a650ded (1 drafts) 462s - 1 local changesets published 462s - (run 'hg update' to get a working copy) 462s -#else 462s - $ hg pull 462s - pulling from $TESTTMP/gitrepo 462s - importing 2 git commits 462s - adding bookmark not-master 462s - new changesets ca33a262eb46:03769a650ded (1 drafts) 462s - 2 local changesets published 462s - (run 'hg update' to get a working copy) 462s -#endif 462s - $ hg phase -r master -r not-master -r thetag 462s - 1: public 462s - 3: draft 462s - 2: public 462s - 462s -public bookmark not pushed is not published after pull 462s - 462s - $ hg update 0 462s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 462s - $ echo delta > delta 462s - $ hg bookmark not-pushed 462s - $ hg add delta 462s - $ hg commit -m 'add delta' 462s - created new head 462s - $ hg phase -r 'all()' > $TESTTMP/before 462s - $ hg pull --config git.public=master,not-pushed 462s - pulling from $TESTTMP/gitrepo 462s - no changes found 462s - $ hg phase -r 'all()' > $TESTTMP/after 462s - $ cmp -s $TESTTMP/before $TESTTMP/after 462s - $ hg phase -r not-pushed 462s - 4: draft 462s - $ rm $TESTTMP/before $TESTTMP/after 462s - 462s -pushing public bookmark publishes local changesets, but only those 462s -actually pushed 462s - 462s - $ hg update master 462s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 462s - (activating bookmark master) 462s - $ echo epsilon > epsilon 462s - $ hg add epsilon 462s - $ hg commit -m 'add epsilon' 462s - created new head 462s - $ hg phase -r 'all() - master' > $TESTTMP/before 462s - $ hg push -B not-pushed 462s - pushing to $TESTTMP/gitrepo 462s - searching for changes 462s - adding objects 462s - remote: found 0 deltas to reuse 462s - added 1 commits with 1 trees and 1 blobs 462s - adding reference refs/heads/not-pushed 462s - $ hg phase -r 'all() - master' > $TESTTMP/after 462s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 462s - $ hg phase -r not-pushed -r master 462s - 4: draft 462s - 5: draft 462s - $ hg push -B master 462s - pushing to $TESTTMP/gitrepo 462s - searching for changes 462s - adding objects 462s - remote: found 0 deltas to reuse 462s - added 1 commits with 1 trees and 1 blobs 462s - updating reference refs/heads/master 462s - $ hg phase -r 'all() - master' > $TESTTMP/after 462s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 462s - $ hg phase -r master 462s - 5: public 462s 462s ERROR: test-phases-public.t#publish-specific output changed 475s ! 475s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-push-r.t 475s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-push-r.t.err 475s @@ -2,34 +2,43 @@ 475s $ . "$TESTDIR/testutil" 475s 475s $ hg init test 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s $ cd test 475s $ cat >>afile < 0 475s > EOF 475s $ hg add afile 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s $ fn_hg_commit -m "0.0" 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s $ cat >>afile < 1 475s > EOF 475s $ fn_hg_commit -m "0.1" 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s $ cat >>afile < 2 475s > EOF 475s $ fn_hg_commit -m "0.2" 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s $ cat >>afile < 3 475s > EOF 475s $ fn_hg_commit -m "0.3" 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s $ hg update -C 0 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 475s $ cat >>afile < 1 475s > EOF 475s $ fn_hg_commit -m "1.1" 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s $ cat >>afile < 2 475s > EOF 475s $ fn_hg_commit -m "1.2" 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s $ cat >fred < a line 475s > EOF 475s @@ -37,13 +46,20 @@ 475s > 3 475s > EOF 475s $ hg add fred 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s $ fn_hg_commit -m "1.3" 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s $ hg mv afile adifferentfile 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s $ fn_hg_commit -m "1.3m" 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s $ hg update -C 3 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 475s $ hg mv afile anotherfile 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s $ fn_hg_commit -m "0.3m" 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s $ cd .. 475s $ for i in 0 1 2 3 4 5 6 7 8; do 475s > mkdir test-"$i" 475s @@ -53,128 +69,166 @@ 475s > hg verify 475s > cd .. 475s > done 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s pushing to test-0 475s searching for changes 475s adding changesets 475s adding manifests 475s adding file changes 475s added 1 changesets with 1 changes to 1 files 475s - checking changesets 475s - checking manifests 475s - crosschecking files in changesets and manifests 475s - checking files 475s - checking dirstate (?) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + checking changesets 475s + checking dirstate (?) 475s + checking manifests 475s + crosschecking files in changesets and manifests 475s + checking files 475s + checking dirstate 475s checked 1 changesets with 1 changes to 1 files 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s pushing to test-1 475s searching for changes 475s adding changesets 475s adding manifests 475s + checking dirstate (?) 475s adding file changes 475s added 2 changesets with 2 changes to 1 files 475s - checking changesets 475s - checking manifests 475s - crosschecking files in changesets and manifests 475s - checking files 475s - checking dirstate (?) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + checking changesets 475s + checking manifests 475s + crosschecking files in changesets and manifests 475s + checking files 475s + checking dirstate 475s checked 2 changesets with 2 changes to 1 files 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + checking dirstate (?) 475s pushing to test-2 475s searching for changes 475s adding changesets 475s adding manifests 475s adding file changes 475s added 3 changesets with 3 changes to 1 files 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s checking changesets 475s checking manifests 475s crosschecking files in changesets and manifests 475s checking files 475s checking dirstate (?) 475s checked 3 changesets with 3 changes to 1 files 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s pushing to test-3 475s searching for changes 475s adding changesets 475s adding manifests 475s adding file changes 475s added 4 changesets with 4 changes to 1 files 475s - checking changesets 475s - checking manifests 475s - crosschecking files in changesets and manifests 475s - checking files 475s - checking dirstate (?) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + checking changesets 475s + checking dirstate (?) 475s + checking manifests 475s + crosschecking files in changesets and manifests 475s + checking files 475s + checking dirstate 475s checked 4 changesets with 4 changes to 1 files 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s pushing to test-4 475s searching for changes 475s adding changesets 475s adding manifests 475s + checking dirstate (?) 475s adding file changes 475s added 2 changesets with 2 changes to 1 files 475s - checking changesets 475s - checking manifests 475s - crosschecking files in changesets and manifests 475s - checking files 475s - checking dirstate (?) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + checking changesets 475s + checking manifests 475s + crosschecking files in changesets and manifests 475s + checking files 475s + checking dirstate 475s checked 2 changesets with 2 changes to 1 files 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + checking dirstate (?) 475s pushing to test-5 475s searching for changes 475s adding changesets 475s adding manifests 475s adding file changes 475s added 3 changesets with 3 changes to 1 files 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s checking changesets 475s checking manifests 475s crosschecking files in changesets and manifests 475s checking files 475s checking dirstate (?) 475s checked 3 changesets with 3 changes to 1 files 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s pushing to test-6 475s searching for changes 475s adding changesets 475s adding manifests 475s adding file changes 475s added 4 changesets with 5 changes to 2 files 475s - checking changesets 475s - checking manifests 475s - crosschecking files in changesets and manifests 475s - checking files 475s - checking dirstate (?) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + checking changesets 475s + checking dirstate (?) 475s + checking manifests 475s + crosschecking files in changesets and manifests 475s + checking files 475s + checking dirstate 475s checked 4 changesets with 5 changes to 2 files 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s pushing to test-7 475s searching for changes 475s adding changesets 475s adding manifests 475s adding file changes 475s added 5 changesets with 6 changes to 3 files 475s - checking changesets 475s - checking manifests 475s - crosschecking files in changesets and manifests 475s - checking files 475s - checking dirstate (?) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + checking changesets 475s + checking manifests 475s + crosschecking files in changesets and manifests 475s + checking files 475s + checking dirstate 475s checked 5 changesets with 6 changes to 3 files 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s pushing to test-8 475s searching for changes 475s adding changesets 475s adding manifests 475s adding file changes 475s added 5 changesets with 5 changes to 2 files 475s - checking changesets 475s - checking manifests 475s - crosschecking files in changesets and manifests 475s - checking files 475s - checking dirstate (?) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + checking changesets 475s + checking manifests 475s + crosschecking files in changesets and manifests 475s + checking files 475s + checking dirstate 475s checked 5 changesets with 5 changes to 2 files 475s $ cd test-8 475s $ hg pull ../test-7 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s pulling from ../test-7 475s searching for changes 475s adding changesets 475s adding manifests 475s adding file changes 475s + new changesets c29287bce33f:e70c8671c3d4 (?) 475s added 4 changesets with 2 changes to 3 files (+1 heads) 475s - new changesets c29287bce33f:e70c8671c3d4 (?) 475s + new changesets c29287bce33f:e70c8671c3d4 475s (run 'hg heads' to see heads, 'hg merge' to merge) 475s $ hg verify 475s - checking changesets 475s - checking manifests 475s - crosschecking files in changesets and manifests 475s - checking files 475s - checking dirstate (?) 475s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 475s + checking changesets 475s + checking manifests 475s + crosschecking files in changesets and manifests 475s + checking dirstate (?) 475s + checking files 475s + checking dirstate 475s checked 9 changesets with 7 changes to 4 files 475s 475s ERROR: test-push-r.t output changed 479s !s 479s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-invalid-refs.t 479s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-invalid-refs.t.err 479s @@ -12,115 +12,10 @@ 479s 479s $ cd .. 479s $ hg clone -U gitrepo hgrepo 479s - importing 1 git commits 479s - new changesets ff7a2f2d8d70 (1 drafts) 479s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 479s + abort: repository gitrepo not found 479s + [255] 479s 479s $ cd hgrepo 479s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 479s $ hg up master 479s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 479s - (activating bookmark master) 479s - $ fn_hg_tag alph#a 479s - $ fn_hg_tag bet*a 479s - $ fn_hg_tag 'gamm a' 479s - $ hg book -r . delt#a 479s - $ hg book -r . epsil*on 479s - 479s - $ hg gexport 479s - warning: not exporting tag 'bet*a' due to invalid name 479s - warning: not exporting bookmark 'epsil*on' due to invalid name 479s - 479s - $ hg push 479s - pushing to $TESTTMP/gitrepo 479s - warning: not exporting tag 'bet*a' due to invalid name 479s - warning: not exporting bookmark 'epsil*on' due to invalid name 479s - searching for changes 479s - adding objects 479s - remote: found 0 deltas to reuse 479s - added 3 commits with 3 trees and 3 blobs 479s - adding reference refs/heads/delt#a 479s - updating reference refs/heads/master 479s - adding reference refs/tags/alph#a 479s - adding reference refs/tags/gamm_a 479s - 479s - $ hg log --graph 479s - @ changeset: 3:0950ab44ea23 479s - | bookmark: delt#a 479s - | bookmark: epsil*on 479s - | bookmark: master 479s - | tag: default/delt#a 479s - | tag: default/master 479s - | tag: tip 479s - | user: test 479s - | date: Mon Jan 01 00:00:13 2007 +0000 479s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 479s - | 479s - o changeset: 2:0b27ab2b3df6 479s - | tag: gamm a 479s - | user: test 479s - | date: Mon Jan 01 00:00:12 2007 +0000 479s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 479s - | 479s - o changeset: 1:491ceeb1b0f1 479s - | tag: bet*a 479s - | user: test 479s - | date: Mon Jan 01 00:00:11 2007 +0000 479s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 479s - | 479s - o changeset: 0:ff7a2f2d8d70 479s - bookmark: not-master 479s - tag: alph#a 479s - tag: default/not-master 479s - user: test 479s - date: Mon Jan 01 00:00:10 2007 +0000 479s - summary: add alpha 479s - 479s - 479s - $ cd .. 479s - $ cd gitrepo 479s -git should have only the valid tag alph#a but have full commit log including the missing invalid bet*a tag commit 479s - $ git tag -l 479s - alph#a 479s - gamm_a 479s - 479s - $ cd .. 479s - $ hg clone -U gitrepo hgrepo2 479s - importing 4 git commits 479s - new changesets ff7a2f2d8d70:0950ab44ea23 (4 drafts) 479s - $ hg -R hgrepo2 log --graph 479s - o changeset: 3:0950ab44ea23 479s - | bookmark: delt#a 479s - | bookmark: master 479s - | tag: default/delt#a 479s - | tag: default/master 479s - | tag: tip 479s - | user: test 479s - | date: Mon Jan 01 00:00:13 2007 +0000 479s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 479s - | 479s - o changeset: 2:0b27ab2b3df6 479s - | tag: gamm a 479s - | tag: gamm_a 479s - | user: test 479s - | date: Mon Jan 01 00:00:12 2007 +0000 479s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 479s - | 479s - o changeset: 1:491ceeb1b0f1 479s - | tag: bet*a 479s - | user: test 479s - | date: Mon Jan 01 00:00:11 2007 +0000 479s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 479s - | 479s - o changeset: 0:ff7a2f2d8d70 479s - bookmark: not-master 479s - tag: alph#a 479s - tag: default/not-master 479s - user: test 479s - date: Mon Jan 01 00:00:10 2007 +0000 479s - summary: add alpha 479s - 479s - 479s -the tag should be in .hgtags 479s - $ hg cat -r master hgrepo2/.hgtags 479s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alph#a 479s - 491ceeb1b0f10d65d956dfcdd3470ac2bc2c96a8 bet*a 479s - 0b27ab2b3df69c6f7defd7040b93e539136db5be gamm a 479s 479s ERROR: test-invalid-refs.t output changed 486s ! 486s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-serve-hg.t 486s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-serve-hg.t#with-hggit.err 486s @@ -31,11 +31,11 @@ 486s $ cd .. 486s 486s $ hg clone gitrepo hgrepo 486s - importing 2 git commits 486s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 486s - updating to bookmark master 486s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 486s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 486s + abort: repository gitrepo not found 486s + [255] 486s $ cd hgrepo 486s + $TESTTMP.sh: 41: cd: can't cd to hgrepo 486s $ cat >> .hg/hgrc < [push] 486s > pushvars.server = true 486s @@ -45,81 +45,3 @@ 486s > [hooks] 486s > pretxnchangegroup = env | grep HG_USERVAR_ || true 486s > EOF 486s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 486s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 486s - 486s -Test server address cannot be reused 486s - 486s -#if windows 486s - $ hg serve -p $HGPORT1 2>&1 486s - abort: cannot start server at '*:$HGPORT1': * (glob) 486s - [255] 486s -#else 486s - $ hg serve -p $HGPORT1 2>&1 486s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 486s - [255] 486s -#endif 486s - $ cd .. 486s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 486s - 486s -Make sure that clone regular mercurial repos over http doesn't break, 486s -and that we can transfer the hg-git metadata 486s - 486s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 486s - requesting all changes 486s - adding changesets 486s - adding manifests 486s - adding file changes 486s - added 2 changesets with 4 changes to 4 files 486s - new changesets f488b65fa424:c61c38c3d614 (?) 486s - updating to branch default 486s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 486s - 486s -And it shouldn't create a Git repository needlessly: 486s - $ test -e copy/git 486s - [1] 486s - $ cd copy 486s - 486s -#if without-hggit 486s - $ hg tags 486s - tip 1:c61c38c3d614 486s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 486s - 1:c61c38c3d614 | master | | 486s - 0:f488b65fa424 | | | 486s - $ hg pull -u ../gitrepo 486s - pulling from ../gitrepo 486s - importing 2 git commits 486s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 486s -#else 486s - $ hg tags 486s - tip 1:c61c38c3d614 486s - thetag 0:f488b65fa424 486s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 486s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 486s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 486s - $ hg pull -u ../gitrepo 486s - pulling from ../gitrepo 486s - warning: created new git repository at $TESTTMP/copy/.hg/git 486s - no changes found 486s -#endif 486s - 486s - $ hg tags 486s - tip 1:c61c38c3d614 486s - thetag 0:f488b65fa424 486s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 486s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 486s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 486s - 486s -Furthermore, make sure that we pass all arguments when pushing: 486s - 486s - $ echo baz > baz 486s - $ fn_hg_commit -A -m baz 486s - $ hg push --pushvars FOO=BAR 486s - pushing to http://localhost:$HGPORT/ 486s - searching for changes 486s - remote: adding changesets 486s - remote: adding manifests 486s - remote: adding file changes 486s - remote: HG_USERVAR_FOO=BAR 486s - remote: added 1 changesets with 1 changes to 1 files 486s - $ cd .. 486s 486s ERROR: test-serve-hg.t#with-hggit output changed 487s ! 487s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-git-workflow.t 487s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-git-workflow.t.err 487s @@ -2,13 +2,20 @@ 487s $ . "$TESTDIR/testutil" 487s 487s $ hg init hgrepo 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s $ cd hgrepo 487s $ hg debuggitdir 487s - $TESTTMP/hgrepo/.hg/git 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s + hg: unknown command 'debuggitdir' 487s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 487s + [10] 487s $ echo alpha > alpha 487s $ hg add alpha 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s $ fn_hg_commit -m "add alpha" 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s $ hg log --graph --debug | grep -v phase: 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s @ changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 487s tag: tip 487s parent: -1:0000000000000000000000000000000000000000 487s @@ -27,49 +34,54 @@ 487s 487s configure for use from git 487s $ hg clone hgrepo gitrepo 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s updating to branch default 487s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 487s $ cd gitrepo 487s $ hg book master 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s $ hg up null 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 487s (leaving bookmark master) 487s $ echo "[git]" >> .hg/hgrc 487s $ echo "intree = True" >> .hg/hgrc 487s $ hg debuggitdir 487s - $TESTTMP/gitrepo/.git 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s + hg: unknown command 'debuggitdir' 487s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 487s + [10] 487s $ hg gexport 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s + hg: unknown command 'gexport' 487s + (did you mean one of export, import?) 487s + [10] 487s 487s do some work 487s $ git config core.bare false 487s + fatal: not in a git directory 487s + [128] 487s $ git checkout master 2>&1 | sed s/\'/\"/g 487s - Already on "master" 487s + fatal: not a git repository (or any of the parent directories): .git 487s $ echo beta > beta 487s $ git add beta 487s + fatal: not a git repository (or any of the parent directories): .git 487s + [128] 487s $ fn_git_commit -m 'add beta' 487s + fatal: not a git repository (or any of the parent directories): .git 487s + git commit error 487s 487s get things back to hg 487s $ hg gimport 487s - importing 1 git commits 487s - updating bookmark master 487s - new changesets 9f124f3c1fc2 (1 drafts) 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s + hg: unknown command 'gimport' 487s + (did you mean one of export, import?) 487s + [10] 487s $ hg log --graph --debug | grep -v phase: 487s - o changeset: 1:9f124f3c1fc29a14f5eb027c24811b0ac9d5ff10 487s - | bookmark: master 487s - | tag: tip 487s - | parent: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 487s - | parent: -1:0000000000000000000000000000000000000000 487s - | manifest: 1:f0bd6fbafbaebe4bb59c35108428f6fce152431d 487s - | user: test 487s - | date: Mon Jan 01 00:00:11 2007 +0000 487s - | files+: beta 487s - | extra: branch=default 487s - | extra: hg-git-rename-source=git 487s - | description: 487s - | add beta 487s - | 487s - | 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s o changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 487s + bookmark: master 487s + tag: tip 487s parent: -1:0000000000000000000000000000000000000000 487s parent: -1:0000000000000000000000000000000000000000 487s manifest: 0:8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0 487s @@ -83,7 +95,8 @@ 487s 487s gimport should have updated the bookmarks as well 487s $ hg bookmarks 487s - master 1:9f124f3c1fc2 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s + master 0:0221c246a567 487s 487s gimport support for git.mindate 487s $ cat >> .hg/hgrc << EOF 487s @@ -92,20 +105,23 @@ 487s > EOF 487s $ echo oldcommit > oldcommit 487s $ git add oldcommit 487s + fatal: not a git repository (or any of the parent directories): .git 487s + [128] 487s $ GIT_AUTHOR_DATE="2014-03-01 00:00:00 +0000" \ 487s > GIT_COMMITTER_DATE="2009-01-01 00:00:00 +0000" \ 487s > git commit -m oldcommit > /dev/null || echo "git commit error" 487s + fatal: not a git repository (or any of the parent directories): .git 487s + git commit error 487s $ hg gimport 487s - no changes found 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s + hg: unknown command 'gimport' 487s + (did you mean one of export, import?) 487s + [10] 487s $ hg log --graph 487s - o changeset: 1:9f124f3c1fc2 487s - | bookmark: master 487s - | tag: tip 487s - | user: test 487s - | date: Mon Jan 01 00:00:11 2007 +0000 487s - | summary: add beta 487s - | 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s o changeset: 0:0221c246a567 487s + bookmark: master 487s + tag: tip 487s user: test 487s date: Mon Jan 01 00:00:10 2007 +0000 487s summary: add alpha 487s @@ -113,32 +129,23 @@ 487s 487s $ echo newcommit > newcommit 487s $ git add newcommit 487s + fatal: not a git repository (or any of the parent directories): .git 487s + [128] 487s $ GIT_AUTHOR_DATE="2014-01-01 00:00:00 +0000" \ 487s > GIT_COMMITTER_DATE="2014-01-02 00:00:00 +0000" \ 487s > git commit -m newcommit > /dev/null || echo "git commit error" 487s + fatal: not a git repository (or any of the parent directories): .git 487s + git commit error 487s $ hg gimport 487s - importing 2 git commits 487s - updating bookmark master 487s - new changesets befdecd14df5:3d10b7289d79 (2 drafts) 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s + hg: unknown command 'gimport' 487s + (did you mean one of export, import?) 487s + [10] 487s $ hg log --graph 487s - o changeset: 3:3d10b7289d79 487s - | bookmark: master 487s - | tag: tip 487s - | user: test 487s - | date: Wed Jan 01 00:00:00 2014 +0000 487s - | summary: newcommit 487s - | 487s - o changeset: 2:befdecd14df5 487s - | user: test 487s - | date: Sat Mar 01 00:00:00 2014 +0000 487s - | summary: oldcommit 487s - | 487s - o changeset: 1:9f124f3c1fc2 487s - | user: test 487s - | date: Mon Jan 01 00:00:11 2007 +0000 487s - | summary: add beta 487s - | 487s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 487s o changeset: 0:0221c246a567 487s + bookmark: master 487s + tag: tip 487s user: test 487s date: Mon Jan 01 00:00:10 2007 +0000 487s summary: add alpha 487s 487s ERROR: test-git-workflow.t output changed 492s ! 492s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-serve-hg.t 492s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-serve-hg.t#without-hggit.err 492s @@ -31,11 +31,11 @@ 492s $ cd .. 492s 492s $ hg clone gitrepo hgrepo 492s - importing 2 git commits 492s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 492s - updating to bookmark master 492s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 492s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 492s + abort: repository gitrepo not found 492s + [255] 492s $ cd hgrepo 492s + $TESTTMP.sh: 36: cd: can't cd to hgrepo 492s $ cat >> .hg/hgrc < [push] 492s > pushvars.server = true 492s @@ -45,81 +45,3 @@ 492s > [hooks] 492s > pretxnchangegroup = env | grep HG_USERVAR_ || true 492s > EOF 492s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 492s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 492s - 492s -Test server address cannot be reused 492s - 492s -#if windows 492s - $ hg serve -p $HGPORT1 2>&1 492s - abort: cannot start server at '*:$HGPORT1': * (glob) 492s - [255] 492s -#else 492s - $ hg serve -p $HGPORT1 2>&1 492s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 492s - [255] 492s -#endif 492s - $ cd .. 492s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 492s - 492s -Make sure that clone regular mercurial repos over http doesn't break, 492s -and that we can transfer the hg-git metadata 492s - 492s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 492s - requesting all changes 492s - adding changesets 492s - adding manifests 492s - adding file changes 492s - added 2 changesets with 4 changes to 4 files 492s - new changesets f488b65fa424:c61c38c3d614 (?) 492s - updating to branch default 492s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 492s - 492s -And it shouldn't create a Git repository needlessly: 492s - $ test -e copy/git 492s - [1] 492s - $ cd copy 492s - 492s -#if without-hggit 492s - $ hg tags 492s - tip 1:c61c38c3d614 492s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 492s - 1:c61c38c3d614 | master | | 492s - 0:f488b65fa424 | | | 492s - $ hg pull -u ../gitrepo 492s - pulling from ../gitrepo 492s - importing 2 git commits 492s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 492s -#else 492s - $ hg tags 492s - tip 1:c61c38c3d614 492s - thetag 0:f488b65fa424 492s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 492s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 492s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 492s - $ hg pull -u ../gitrepo 492s - pulling from ../gitrepo 492s - warning: created new git repository at $TESTTMP/copy/.hg/git 492s - no changes found 492s -#endif 492s - 492s - $ hg tags 492s - tip 1:c61c38c3d614 492s - thetag 0:f488b65fa424 492s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 492s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 492s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 492s - 492s -Furthermore, make sure that we pass all arguments when pushing: 492s - 492s - $ echo baz > baz 492s - $ fn_hg_commit -A -m baz 492s - $ hg push --pushvars FOO=BAR 492s - pushing to http://localhost:$HGPORT/ 492s - searching for changes 492s - remote: adding changesets 492s - remote: adding manifests 492s - remote: adding file changes 492s - remote: HG_USERVAR_FOO=BAR 492s - remote: added 1 changesets with 1 changes to 1 files 492s - $ cd .. 492s 492s ERROR: test-serve-hg.t#without-hggit output changed 495s ! 495s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-push-authors.t 495s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-push-authors.t.err 495s @@ -8,127 +8,9 @@ 495s Create a Mercurial repository 495s 495s $ hg clone repo.git hgrepo 495s - updating to branch default 495s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 495s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 495s + abort: repository repo.git not found 495s + [255] 495s $ cd hgrepo 495s + $TESTTMP.sh: 8: cd: can't cd to hgrepo 495s $ hg book master 495s - 495s -Configure an author map 495s - 495s - $ touch authors.txt 495s - $ cat >> $HGRCPATH < [git] 495s - > authors = $TESTTMP/authors.txt 495s - > EOF 495s - 495s -Create a commit user that maps to a fully valid user 495s - 495s - $ cat >> $TESTTMP/authors.txt < user1 = User no. 1 495s - > EOF 495s - $ touch alpha 495s - $ hg add alpha 495s - $ fn_hg_commit -m alpha -u user1 495s - 495s -And one that maps to an email address 495s - 495s - $ cat >> $TESTTMP/authors.txt < user2@example.com = user2 495s - > EOF 495s - $ touch beta 495s - $ hg add beta 495s - $ fn_hg_commit -m beta -u user2@example.com 495s - 495s -And one that maps to a "simple" user 495s - 495s - $ cat >> $TESTTMP/authors.txt < User #3 = user3@example.com 495s - > EOF 495s - $ touch gamma 495s - $ hg add gamma 495s - $ fn_hg_commit -m gamma -u "User #3 " 495s - 495s -And one that maps to nothing 495s - 495s - $ cat >> $TESTTMP/authors.txt < user4 = 495s - > EOF 495s - $ touch delta 495s - $ hg add delta 495s - $ fn_hg_commit -m delta -u user4 495s - 495s -And one that doesn't map 495s - 495s - $ touch epsilon 495s - $ hg add epsilon 495s - $ fn_hg_commit -m epsilon -u "User #5 " 495s - 495s -Check the test default 495s - 495s - $ touch zeta 495s - $ hg add zeta 495s - $ fn_hg_commit -m zeta 495s - 495s -Push it! 495s - 495s - $ hg push 495s - pushing to $TESTTMP/repo.git 495s - searching for changes 495s - adding objects 495s - remote: found 0 deltas to reuse 495s - added 6 commits with 6 trees and 1 blobs 495s - adding reference refs/heads/master 495s - 495s -Check the results: 495s - 495s - $ hg log --template='Commit: {gitnode}\nAuthor: {author}\n---\n' 495s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 495s - Author: test 495s - --- 495s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 495s - Author: User #5 495s - --- 495s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 495s - Author: user4 495s - --- 495s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 495s - Author: User #3 495s - --- 495s - Commit: eba936dd13172a2f17936785e3604845aed9170d 495s - Author: user2@example.com 495s - --- 495s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 495s - Author: user1 495s - --- 495s - $ cd ../repo.git 495s - $ cat $TESTTMP/authors.txt 495s - user1 = User no. 1 495s - user2@example.com = user2 495s - User #3 = user3@example.com 495s - user4 = 495s - $ git log --pretty='tformat:Commit: %H%nAuthor: %an <%ae>%nCommitter: %cn <%ce>%n---' 495s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 495s - Author: test 495s - Committer: test 495s - --- 495s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 495s - Author: User #5 495s - Committer: User #5 495s - --- 495s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 495s - Author: 495s - Committer: 495s - --- 495s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 495s - Author: user3@example.com 495s - Committer: user3@example.com 495s - --- 495s - Commit: eba936dd13172a2f17936785e3604845aed9170d 495s - Author: user2 495s - Committer: user2 495s - --- 495s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 495s - Author: User no. 1 495s - Committer: User no. 1 495s - --- 495s - $ cd .. 495s 495s ERROR: test-push-authors.t output changed 497s ! 497s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-push-to-head.t 497s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-push-to-head.t.err 497s @@ -14,65 +14,9 @@ 497s Clone it, and push back to master: 497s 497s $ hg clone gitrepo hgrepo 497s - importing 1 git commits 497s - new changesets ff7a2f2d8d70 (1 drafts) 497s - updating to bookmark master 497s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 497s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 497s + abort: repository gitrepo not found 497s + [255] 497s $ cd hgrepo 497s + $TESTTMP.sh: 18: cd: can't cd to hgrepo 497s $ echo beta > beta 497s - $ fn_hg_commit -A -m "add beta" 497s - 497s -The output is confusing, and this even more-so: 497s - 497s - $ hg push 497s - pushing to $TESTTMP/gitrepo 497s - searching for changes 497s - adding objects 497s - remote: found 0 deltas to reuse 497s - remote: error: refusing to update checked out branch: refs/heads/master 497s - remote: error: By default, updating the current branch in a non-bare repository 497s - remote: is denied, because it will make the index and work tree inconsistent 497s - remote: with what you pushed, and will require 'git reset --hard' to match 497s - remote: the work tree to HEAD. 497s - remote: 497s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 497s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 497s - remote: its current branch; however, this is not recommended unless you 497s - remote: arranged to update its work tree to match what you pushed in some 497s - remote: other way. 497s - remote: 497s - remote: To squelch this message and still keep the default behaviour, set 497s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 497s - added 1 commits with 1 trees and 1 blobs 497s - warning: failed to update refs/heads/master; branch is currently checked out 497s - 497s - $ hg push 497s - pushing to $TESTTMP/gitrepo 497s - searching for changes 497s - adding objects 497s - remote: found 0 deltas to reuse 497s - remote: error: refusing to update checked out branch: refs/heads/master 497s - remote: error: By default, updating the current branch in a non-bare repository 497s - remote: is denied, because it will make the index and work tree inconsistent 497s - remote: with what you pushed, and will require 'git reset --hard' to match 497s - remote: the work tree to HEAD. 497s - remote: 497s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 497s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 497s - remote: its current branch; however, this is not recommended unless you 497s - remote: arranged to update its work tree to match what you pushed in some 497s - remote: other way. 497s - remote: 497s - remote: To squelch this message and still keep the default behaviour, set 497s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 497s - added 1 commits with 1 trees and 1 blobs 497s - warning: failed to update refs/heads/master; branch is currently checked out 497s - 497s -Show that it really didn't get pushed: 497s - 497s - $ hg tags 497s - tip 1:47580592d3d6 497s - default/master 0:ff7a2f2d8d70 497s - $ cd ../gitrepo 497s - $ git log --all --oneline --decorate 497s - 7eeab2e (HEAD -> master) add alpha 497s 497s ERROR: test-push-to-head.t output changed 503s ! 503s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-orphan-tags.t 503s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-orphan-tags.t.err 503s @@ -61,17 +61,17 @@ 503s Create a Mercurial clone 503s 503s $ hg clone -U repo.git hgrepo 503s - importing 4 git commits 503s - new changesets b8e77484829b:387d03400596 (4 drafts) 503s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 503s + abort: repository repo.git not found 503s + [255] 503s $ hg outgoing -R hgrepo 503s - comparing with $TESTTMP/repo.git 503s - searching for changes 503s - no changes found 503s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 503s + abort: repository hgrepo not found 503s + [255] 503s + $ hg push --debug -R hgrepo | grep -e reference -e found 503s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 503s + abort: repository hgrepo not found 503s [1] 503s - $ hg push --debug -R hgrepo | grep -e reference -e found 503s - unchanged reference default::refs/heads/master => GIT:996e5084 503s - unchanged reference default::refs/tags/the_tag => GIT:e4338156 503s - no changes found 503s 503s Verify that we can push this tag, and that outgoing doesn't report 503s them (#358) 503s @@ -83,33 +83,5 @@ 503s To $TESTTMP/repo.git 503s - [deleted] the_tag 503s $ cd ../hgrepo 503s + $TESTTMP.sh: 72: cd: can't cd to ../hgrepo 503s $ hg outgoing 503s - comparing with $TESTTMP/repo.git 503s - searching for changes 503s - changeset: 2:7b35eb0afb3f 503s - tag: the_tag 503s - user: test 503s - date: Mon Jan 01 00:00:12 2007 +0000 503s - summary: add foo3 503s - 503s - $ hg push --debug 503s - pushing to $TESTTMP/repo.git 503s - finding unexported changesets 503s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 503s - searching for changes 503s - remote: counting objects: 5, done. 503s - 1 commits found 503s - list of commits: 503s - e12852326ef72772e9696b008ad6546b5266ff13 503s - adding objects 503s - remote: counting objects: 5, done. 503s - remote: found 0 deltas to reuse 503s - added 1 commits with 1 trees and 0 blobs 503s - unchanged reference default::refs/heads/master => GIT:996e5084 503s - adding reference default::refs/tags/the_tag => GIT:e4338156 503s - $ cd ../gitrepo 503s - $ git fetch 503s - From $TESTTMP/repo 503s - * [new tag] the_tag -> the_tag 503s - $ git tag -ln 503s - the_tag Tag message 503s 503s ERROR: test-orphan-tags.t output changed 517s ! 517s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-verify-fail.t 517s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-verify-fail.t.err 517s @@ -25,6 +25,7 @@ 517s $ cd .. 517s 517s $ hg init hgrepo 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s $ cd hgrepo 517s $ echo normalf > normalf 517s $ echo differentf2 > differentf 517s @@ -32,63 +33,93 @@ 517s $ echo exef > exef 517s $ ln -s foo linkf 517s $ hg add normalf differentf unexpectedf exef linkf 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s $ fn_hg_commit -m 'add files' 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s $ git clone --mirror ../gitrepo .hg/git 517s Cloning into bare repository '.hg/git'... 517s done. 517s $ echo "$(cd ../gitrepo && git rev-parse HEAD) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s $ hg gverify 517s - verifying rev 3f1601c3cf54 against git commit 039c1cd9fdda382c9d1e8ec85de6b5b59518ca80 517s - difference in: differentf 517s - file has different flags: exef (hg '', git 'x') 517s - file has different flags: linkf (hg 'l', git '') 517s - file found in git but not hg: missingf 517s - file found in hg but not git: unexpectedf 517s - [1] 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s + hg: unknown command 'gverify' 517s + (did you mean verify?) 517s + [10] 517s 517s $ echo newf > newf 517s $ hg add newf 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s $ fn_hg_commit -m 'new hg commit' 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s $ hg gverify 517s - abort: no git commit found for rev 4e582b4eb862 517s - (if this is an octopus merge, verify against the last rev) 517s - [255] 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s + hg: unknown command 'gverify' 517s + (did you mean verify?) 517s + [10] 517s 517s invalid git SHA 517s $ echo "ffffffffffffffffffffffffffffffffffffffff $(hg log -r . --template '{node}')" >> .hg/git-mapfile 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s $ hg gverify 517s - abort: git equivalent ffffffffffffffffffffffffffffffffffffffff for rev 4e582b4eb862 not found! 517s - [255] 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s + hg: unknown command 'gverify' 517s + (did you mean verify?) 517s + [10] 517s 517s git SHA is not a commit 517s $ echo new2 >> newf 517s $ fn_hg_commit -m 'new hg commit 2' 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s this gets the tree pointed to by the commit at HEAD 517s $ echo "$(cd ../gitrepo && git show --format=%T HEAD | head -n 1) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s $ hg gverify 517s - abort: git equivalent f477b00e4a9907617f346a529cc0fe9ba5d6f6d3 for rev 5c2eb98af3e2 is not a commit! 517s - [255] 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s + hg: unknown command 'gverify' 517s + (did you mean verify?) 517s + [10] 517s 517s corrupt git repository 517s 517s $ hg debug-remove-hggit-state 517s - clearing out the git cache data 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s + hg: unknown command 'debug-remove-hggit-state' 517s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 517s + [10] 517s $ hg gexport 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s + hg: unknown command 'gexport' 517s + (did you mean one of export, import?) 517s + [10] 517s $ mv .hg/git/objects/pack $TESTTMP/pack-old 517s $ for packfile in $TESTTMP/pack-old/*.pack 517s > do 517s > git --git-dir .hg/git unpack-objects < $packfile 517s > done 517s + $TESTTMP.sh: 78: cannot open $TESTTMP/pack-old/*.pack: No such file 517s + [2] 517s $ mv -f .hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 517s + mv: cannot stat '.hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e': No such file or directory 517s + [1] 517s $ hg gverify --fsck 517s - abort: git repository is corrupt! 517s - [255] 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s + hg: unknown command 'gverify' 517s + (did you mean verify?) 517s + [10] 517s $ hg gverify 517s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is not a commit! 517s - [255] 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s + hg: unknown command 'gverify' 517s + (did you mean verify?) 517s + [10] 517s $ chmod +w .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 517s + chmod: cannot access '.hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74': No such file or directory 517s + [1] 517s $ echo 42 > .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 517s + $TESTTMP.sh: 89: cannot create .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74: Directory nonexistent 517s + [2] 517s $ hg gverify 517s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is corrupt! 517s - (re-run with --traceback for details) 517s - [255] 517s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 517s + hg: unknown command 'gverify' 517s + (did you mean verify?) 517s + [10] 517s 517s ERROR: test-verify-fail.t output changed 519s ! 519s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-push-missing-commit.t 519s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-push-missing-commit.t.err 519s @@ -22,75 +22,9 @@ 519s clone it and create a commit building on the git history 519s 519s $ hg clone -U repo.git hgrepo 519s - importing 1 git commits 519s - new changesets fb68c5a534ce (1 drafts) 519s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 519s + abort: repository repo.git not found 519s + [255] 519s $ cd hgrepo 519s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 519s $ hg up -q master 519s - $ echo other > thefile 519s - $ fn_hg_commit -m 'change thefile' 519s - $ cd .. 519s - 519s -now remove the git commit from the cache repository used internally by 519s -hg-git — actually, changing `git.intree` is equivalent to this, and how 519s -a user noticed it in #376. 519s - 519s - $ rm -rf hgrepo/.hg/git 519s - 519s -what happens when we push it? 519s - 519s - $ hg -R hgrepo push 519s - pushing to $TESTTMP/repo.git 519s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 519s - abort: cannot push git commit 533d4e670a8b as it is not present locally 519s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 519s - [255] 519s - 519s -try to follow the hint: 519s - 519s -(and just to see that the warning is useful, try re-resetting first) 519s - 519s - $ rm -rf hgrepo/.hg/git hgrepo/.git 519s - $ hg -R hgrepo pull 519s - pulling from $TESTTMP/repo.git 519s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 519s - no changes found 519s - not updating diverged bookmark master 519s - $ hg -R hgrepo push 519s - pushing to $TESTTMP/repo.git 519s - searching for changes 519s - adding objects 519s - remote: found 0 deltas to reuse 519s - added 1 commits with 1 trees and 1 blobs 519s - updating reference refs/heads/master 519s - 519s -and as an extra test, what if we want to push a commit that's 519s -converted, but gone? 519s - 519s -simply pushing doesn't suffice: 519s - 519s - $ cd hgrepo 519s - $ rm -rf .hg/git 519s - $ hg push 519s - pushing to $TESTTMP/repo.git 519s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 519s - searching for changes 519s - no changes found 519s - [1] 519s - $ cd .. 519s - 519s -but we can't create another commit building on the git history, export 519s -it, and push: 519s - 519s - $ cd hgrepo 519s - $ echo not that > thefile 519s - $ fn_hg_commit -m 'change thefile again' 519s - $ hg gexport 519s - $ rm -rf .hg/git 519s - $ hg push 519s - pushing to $TESTTMP/repo.git 519s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 519s - searching for changes 519s - abort: cannot push git commit 61619410916a as it is not present locally 519s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 519s - [255] 519s - $ cd .. 519s 519s ERROR: test-push-missing-commit.t output changed 521s ! 521s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-hg-branch.t 521s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-hg-branch.t.err 521s @@ -12,82 +12,10 @@ 521s 521s $ cd .. 521s $ hg clone gitrepo hgrepo 521s - importing 1 git commits 521s - new changesets ff7a2f2d8d70 (1 drafts) 521s - updating to bookmark not-master 521s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 521s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 521s + abort: repository gitrepo not found 521s + [255] 521s 521s $ cd hgrepo 521s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 521s $ hg co master 521s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 521s - (activating bookmark master) 521s - $ hg mv alpha beta 521s - $ fn_hg_commit -m 'rename alpha to beta' 521s - $ hg push 521s - pushing to $TESTTMP/gitrepo 521s - searching for changes 521s - adding objects 521s - remote: found 0 deltas to reuse 521s - added 1 commits with 1 trees and 0 blobs 521s - updating reference refs/heads/master 521s - 521s - $ hg branch gamma | grep -v 'permanent and global' 521s - marked working directory as branch gamma 521s - $ fn_hg_commit -m 'started branch gamma' 521s - $ hg push 521s - pushing to $TESTTMP/gitrepo 521s - searching for changes 521s - adding objects 521s - remote: found 0 deltas to reuse 521s - added 1 commits with 1 trees and 0 blobs 521s - updating reference refs/heads/master 521s - 521s - $ hg log --graph 521s - @ changeset: 2:400db38f4f64 521s - | branch: gamma 521s - | bookmark: master 521s - | tag: default/master 521s - | tag: tip 521s - | user: test 521s - | date: Mon Jan 01 00:00:12 2007 +0000 521s - | summary: started branch gamma 521s - | 521s - o changeset: 1:3baa67317a4d 521s - | user: test 521s - | date: Mon Jan 01 00:00:11 2007 +0000 521s - | summary: rename alpha to beta 521s - | 521s - o changeset: 0:ff7a2f2d8d70 521s - bookmark: not-master 521s - tag: default/not-master 521s - user: test 521s - date: Mon Jan 01 00:00:10 2007 +0000 521s - summary: add alpha 521s - 521s - 521s - $ cd .. 521s - $ hg clone -U gitrepo hgrepo2 521s - importing 3 git commits 521s - new changesets ff7a2f2d8d70:400db38f4f64 (3 drafts) 521s - $ hg -R hgrepo2 log --graph 521s - o changeset: 2:400db38f4f64 521s - | branch: gamma 521s - | bookmark: master 521s - | tag: default/master 521s - | tag: tip 521s - | user: test 521s - | date: Mon Jan 01 00:00:12 2007 +0000 521s - | summary: started branch gamma 521s - | 521s - o changeset: 1:3baa67317a4d 521s - | user: test 521s - | date: Mon Jan 01 00:00:11 2007 +0000 521s - | summary: rename alpha to beta 521s - | 521s - o changeset: 0:ff7a2f2d8d70 521s - bookmark: not-master 521s - tag: default/not-master 521s - user: test 521s - date: Mon Jan 01 00:00:10 2007 +0000 521s - summary: add alpha 521s - 521s 521s ERROR: test-hg-branch.t output changed 524s ! 524s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-pull-after-strip.t 524s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-pull-after-strip.t.err 524s @@ -15,82 +15,9 @@ 524s 524s $ cd .. 524s $ hg clone -U gitrepo hgrepo 524s - importing 2 git commits 524s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 524s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 524s + abort: repository gitrepo not found 524s + [255] 524s $ cd hgrepo 524s + $TESTTMP.sh: 26: cd: can't cd to hgrepo 524s $ hg up master 524s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 524s - (activating bookmark master) 524s - $ hg log --graph 524s - @ changeset: 1:7fe02317c63d 524s - | bookmark: master 524s - | tag: default/master 524s - | tag: thetag 524s - | tag: tip 524s - | user: test 524s - | date: Mon Jan 01 00:00:11 2007 +0000 524s - | summary: add beta 524s - | 524s - o changeset: 0:ff7a2f2d8d70 524s - user: test 524s - date: Mon Jan 01 00:00:10 2007 +0000 524s - summary: add alpha 524s - 524s - $ cd ../gitrepo 524s - $ echo beta line 2 >> beta 524s - $ git add beta 524s - $ fn_git_commit -m 'add to beta' 524s - 524s - $ cd .. 524s - $ cd hgrepo 524s - $ hg debugstrip --no-backup tip 524s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 524s - $ hg pull 524s - pulling from $TESTTMP/gitrepo 524s - importing 1 git commits 524s - abort: you appear to have run strip - please run hg git-cleanup 524s - [255] 524s - $ hg tags 524s - tip 0:ff7a2f2d8d70 524s - $ hg git-cleanup 524s - git commit map cleaned 524s - 524s -pull works after 'hg git-cleanup' 524s - 524s - $ hg pull 524s - pulling from $TESTTMP/gitrepo 524s - importing 2 git commits 524s - updating bookmark master 524s - new changesets 7fe02317c63d:cc1e605d90db (2 drafts) 524s - (run 'hg update' to get a working copy) 524s - $ hg log --graph 524s - o changeset: 2:cc1e605d90db 524s - | bookmark: master 524s - | tag: default/master 524s - | tag: tip 524s - | user: test 524s - | date: Mon Jan 01 00:00:12 2007 +0000 524s - | summary: add to beta 524s - | 524s - o changeset: 1:7fe02317c63d 524s - | tag: thetag 524s - | user: test 524s - | date: Mon Jan 01 00:00:11 2007 +0000 524s - | summary: add beta 524s - | 524s - @ changeset: 0:ff7a2f2d8d70 524s - user: test 524s - date: Mon Jan 01 00:00:10 2007 +0000 524s - summary: add alpha 524s - 524s - 524s - $ cd .. 524s - 524s -Check that we also remove bad refs: 524s - 524s - $ cd hgrepo 524s - $ echo e93b671cb24bff41779187edff99178e2597c2 > .hg/git/refs/tags/bad-tag 524s - $ hg git-cleanup 524s - git commit map cleaned 524s - $ test -e .hg/git/refs/tags/bad-tag 524s - [1] 524s 524s ERROR: test-pull-after-strip.t output changed 527s ! 527s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-subrepos-syntax.t 527s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-subrepos-syntax.t.err 527s @@ -38,54 +38,9 @@ 527s $ cd .. 527s 527s $ hg clone -U repo.git hgrepo 527s - importing 3 git commits 527s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 527s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 527s + abort: repository repo.git not found 527s + [255] 527s $ cd hgrepo 527s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 527s $ hg up master 527s - Cloning into '$TESTTMP/hgrepo/subrepo1'... 527s - done. 527s - Cloning into '$TESTTMP/hgrepo/xyz/subrepo2'... 527s - done. 527s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 527s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 527s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 527s - (activating bookmark master) 527s - $ cat >> .hgsub < # this is a comment 527s - > [subpaths] 527s - > flaf = blyf 527s - > EOF 527s - $ fn_hg_commit -m 'add comment & subsection' 527s - $ hg push 527s - pushing to $TESTTMP/repo.git 527s - searching for changes 527s - adding objects 527s - remote: found 0 deltas to reuse 527s - added 1 commits with 1 trees and 0 blobs 527s - updating reference refs/heads/master 527s - $ cd .. 527s - 527s - $ cd gitrepo 527s - $ git pull --ff-only 527s - From $TESTTMP/repo 527s - 89c22d7..106b34e master -> origin/master 527s - Updating 89c22d7..106b34e 527s - Fast-forward 527s - $ cat .gitmodules 527s - [submodule "subrepo1"] 527s - path = subrepo1 527s - url = ../gitsubrepo 527s - [submodule "xyz/subrepo2"] 527s - path = xyz/subrepo2 527s - url = ../gitsubrepo 527s - $ cd .. 527s - 527s -We broke bidirectionality: 527s - 527s - $ hg clone -U repo.git hgrepo2 527s - importing 4 git commits 527s - new changesets e532b2bfda10:cbf584fe001b (4 drafts) 527s - $ hg id -r tip hgrepo 527s - c58a542b18bc default/master/tip master 527s - $ hg id -r tip hgrepo2 527s - cbf584fe001b default/master/tip master 527s 527s ERROR: test-subrepos-syntax.t output changed 531s ! 531s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-gitignore.t 531s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-gitignore.t.err 531s @@ -2,12 +2,14 @@ 531s $ . "$TESTDIR/testutil" 531s 531s $ hg init repo 531s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 531s $ cd repo 531s 532s Create a commit that we can export later on 532s 532s $ touch thefile 532s $ hg commit -A -m "initial commit" 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s adding thefile 532s 532s We should only read .gitignore files in a hg-git repo (i.e. one with .hg/git 532s @@ -18,6 +20,7 @@ 532s $ touch bar 532s $ echo 'foo*' > .gitignore 532s $ hg status 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s ? .gitignore 532s ? bar 532s ? foo 532s @@ -27,103 +30,140 @@ 532s it's gone: 532s 532s $ hg gexport 532s - $ hg status 532s - ? .gitignore 532s - ? bar 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s + hg: unknown command 'gexport' 532s + (did you mean one of export, import?) 532s + [10] 532s + $ hg status 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s + ? .gitignore 532s + ? bar 532s + ? foo 532s + ? foobar 532s 532s $ echo '*bar' > .gitignore 532s $ hg status 532s - ? .gitignore 532s - ? foo 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s + ? .gitignore 532s + ? bar 532s + ? foo 532s + ? foobar 532s 532s $ mkdir dir 532s $ touch dir/foo 532s $ echo 'foo' > .gitignore 532s $ hg status 532s - ? .gitignore 532s - ? bar 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s + ? .gitignore 532s + ? bar 532s + ? dir/foo 532s + ? foo 532s ? foobar 532s 532s $ echo '/foo' > .gitignore 532s $ hg status 532s - ? .gitignore 532s - ? bar 532s - ? dir/foo 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s + ? .gitignore 532s + ? bar 532s + ? dir/foo 532s + ? foo 532s ? foobar 532s 532s $ rm .gitignore 532s $ echo 'foo' > dir/.gitignore 532s $ hg status 532s - ? bar 532s - ? dir/.gitignore 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s + ? bar 532s + ? dir/.gitignore 532s + ? dir/foo 532s ? foo 532s ? foobar 532s 532s $ touch dir/bar 532s $ echo 'bar' > .gitignore 532s $ hg status 532s - ? .gitignore 532s - ? dir/.gitignore 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s + ? .gitignore 532s + ? bar 532s + ? dir/.gitignore 532s + ? dir/bar 532s + ? dir/foo 532s ? foo 532s ? foobar 532s 532s $ echo '/bar' > .gitignore 532s $ hg status 532s - ? .gitignore 532s - ? dir/.gitignore 532s - ? dir/bar 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s + ? .gitignore 532s + ? bar 532s + ? dir/.gitignore 532s + ? dir/bar 532s + ? dir/foo 532s ? foo 532s ? foobar 532s 532s $ echo 'foo*' > .gitignore 532s $ echo '!*bar' >> .gitignore 532s $ hg status 532s - .gitignore: unsupported ignore pattern '!*bar' 532s - ? .gitignore 532s - ? bar 532s - ? dir/.gitignore 532s - ? dir/bar 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s + ? .gitignore 532s + ? bar 532s + ? dir/.gitignore 532s + ? dir/bar 532s + ? dir/foo 532s + ? foo 532s + ? foobar 532s 532s $ echo '.hg/' > .gitignore 532s $ hg status 532s - ? .gitignore 532s - ? bar 532s - ? dir/.gitignore 532s - ? dir/bar 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s + ? .gitignore 532s + ? bar 532s + ? dir/.gitignore 532s + ? dir/bar 532s + ? dir/foo 532s ? foo 532s ? foobar 532s 532s $ echo 'dir/.hg/' > .gitignore 532s $ hg status 532s - ? .gitignore 532s - ? bar 532s - ? dir/.gitignore 532s - ? dir/bar 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s + ? .gitignore 532s + ? bar 532s + ? dir/.gitignore 532s + ? dir/bar 532s + ? dir/foo 532s ? foo 532s ? foobar 532s 532s $ echo '.hg/foo' > .gitignore 532s $ hg status 532s - ? .gitignore 532s - ? bar 532s - ? dir/.gitignore 532s - ? dir/bar 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s + ? .gitignore 532s + ? bar 532s + ? dir/.gitignore 532s + ? dir/bar 532s + ? dir/foo 532s ? foo 532s ? foobar 532s 532s $ touch foo.hg 532s $ echo 'foo.hg' > .gitignore 532s $ hg status 532s - ? .gitignore 532s - ? bar 532s - ? dir/.gitignore 532s - ? dir/bar 532s - ? foo 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s + ? .gitignore 532s + ? bar 532s + ? dir/.gitignore 532s + ? dir/bar 532s + ? dir/foo 532s + ? foo 532s + ? foo.hg 532s ? foobar 532s $ rm foo.hg 532s 532s $ touch .hgignore 532s $ hg status 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s ? .gitignore 532s ? .hgignore 532s ? bar 532s @@ -137,6 +177,7 @@ 532s $ echo 'foo.*$(?> .hgignore 532s $ echo 'dir/foo' >> .hgignore 532s $ hg status 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s ? .gitignore 532s ? .hgignore 532s ? bar 532s @@ -145,14 +186,18 @@ 532s ? foobar 532s 532s $ hg add .gitignore 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s $ hg commit -m "add and commit .gitignore" 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s $ rm .gitignore 532s $ rm .hgignore 532s $ hg status 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s ! .gitignore 532s ? bar 532s ? dir/.gitignore 532s ? dir/bar 532s + ? dir/foo 532s ? foo 532s ? foobar 532s 532s @@ -164,6 +209,7 @@ 532s > foo( 532s > EOF 532s $ hg status --config ui.ignore=$TESTTMP/invalidhgignore 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s abort: $TESTTMP/invalidhgignore: invalid pattern (relre): foo( 532s [255] 532s 532s @@ -172,5 +218,6 @@ 532s > foo( 532s > EOF 532s $ hg status 532s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 532s abort: $TESTTMP/repo/.hgignore: invalid pattern (relre): foo( 532s [255] 532s 532s ERROR: test-gitignore.t output changed 534s ! 534s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-merge.t 534s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-merge.t.err 534s @@ -30,60 +30,11 @@ 534s $ git init -q --bare repo.git 534s 534s $ hg clone gitrepo hgrepo 534s - importing 4 git commits 534s - new changesets ff7a2f2d8d70:89ca4a68d6b9 (4 drafts) 534s - updating to bookmark master 534s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 534s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 534s + abort: repository gitrepo not found 534s + [255] 534s $ cd hgrepo 534s + $TESTTMP.sh: 40: cd: can't cd to hgrepo 534s 534s clear the cache to be sure it is regenerated correctly 534s $ hg debug-remove-hggit-state 534s - clearing out the git cache data 534s - $ hg push ../repo.git 534s - pushing to ../repo.git 534s - searching for changes 534s - adding objects 534s - remote: found 0 deltas to reuse 534s - added 4 commits with 4 trees and 3 blobs 534s - adding reference refs/heads/beta 534s - adding reference refs/heads/master 534s - 534s - $ cd .. 534s -git log in repo pushed from hg 534s - $ git --git-dir=repo.git log --pretty=medium master | sed 's/\.\.\.//g' 534s - commit 5806851511aaf3bfe813ae3a86c5027165fa9b96 534s - Merge: e5023f9 9497a4e 534s - Author: test 534s - Date: Mon Jan 1 00:00:12 2007 +0000 534s - 534s - Merge branch 'beta' 534s - 534s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 534s - Author: test 534s - Date: Mon Jan 1 00:00:12 2007 +0000 534s - 534s - add gamma 534s - 534s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 534s - Author: test 534s - Date: Mon Jan 1 00:00:11 2007 +0000 534s - 534s - add beta 534s - 534s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 534s - Author: test 534s - Date: Mon Jan 1 00:00:10 2007 +0000 534s - 534s - add alpha 534s - $ git --git-dir=repo.git log --pretty=medium beta | sed 's/\.\.\.//g' 534s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 534s - Author: test 534s - Date: Mon Jan 1 00:00:11 2007 +0000 534s - 534s - add beta 534s - 534s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 534s - Author: test 534s - Date: Mon Jan 1 00:00:10 2007 +0000 534s - 534s - add alpha 534s 534s ERROR: test-merge.t output changed 537s ! 537s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-multiple-remotes.t 537s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-multiple-remotes.t.err 537s @@ -14,6 +14,7 @@ 537s $ git clone --bare --quiet gitrepo repo.git 537s 537s $ hg init hgrepo 537s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 537s $ cd hgrepo 537s $ cat > .hg/hgrc < [paths] 537s @@ -26,52 +27,28 @@ 537s > EOF 537s 537s $ hg pull 537s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 537s pulling from $TESTTMP/gitrepo 537s - importing 1 git commits 537s - adding bookmark master 537s - adding bookmark not-master 537s - new changesets ff7a2f2d8d70 (1 drafts) 537s - (run 'hg update' to get a working copy) 537s - pulling from $TESTTMP/repo.git 537s - no changes found 537s + abort: repository $TESTTMP/gitrepo not found 537s + [255] 537s $ hg tags 537s - tip 0:ff7a2f2d8d70 537s - git/not-master 0:ff7a2f2d8d70 537s - git/master 0:ff7a2f2d8d70 537s - bare/not-master 0:ff7a2f2d8d70 537s - bare/master 0:ff7a2f2d8d70 537s - also-git/not-master 0:ff7a2f2d8d70 537s - also-git/master 0:ff7a2f2d8d70 537s - also-bare/not-master 0:ff7a2f2d8d70 537s - also-bare/master 0:ff7a2f2d8d70 537s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 537s + tip -1:000000000000 537s 537s $ hg up master 537s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 537s - (activating bookmark master) 537s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 537s + abort: unknown revision 'master' 537s + [10] 537s $ echo beta > beta 537s $ fn_hg_commit -A -m "add beta" 537s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 537s $ hg push 537s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 537s pushing to $TESTTMP/gitrepo 537s - searching for changes 537s - adding objects 537s - remote: found 0 deltas to reuse 537s - added 1 commits with 1 trees and 1 blobs 537s - updating reference refs/heads/master 537s - pushing to $TESTTMP/repo.git 537s - searching for changes 537s - adding objects 537s - remote: found 0 deltas to reuse 537s - added 1 commits with 1 trees and 1 blobs 537s - updating reference refs/heads/master 537s + abort: repository $TESTTMP/gitrepo not found 537s + [255] 537s 537s $ hg tags 537s - tip 1:47580592d3d6 537s - git/master 1:47580592d3d6 537s - bare/master 1:47580592d3d6 537s - also-git/master 1:47580592d3d6 537s - also-bare/master 1:47580592d3d6 537s - git/not-master 0:ff7a2f2d8d70 537s - bare/not-master 0:ff7a2f2d8d70 537s - also-git/not-master 0:ff7a2f2d8d70 537s - also-bare/not-master 0:ff7a2f2d8d70 537s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 537s + tip 0:59e1f63242de 537s 537s 537s ERROR: test-multiple-remotes.t output changed 538s ! 538s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-hg-tags.t 538s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-hg-tags.t.err 538s @@ -16,69 +16,10 @@ 538s 538s $ cd .. 538s $ hg clone -U repo.git hgrepo 538s - importing 1 git commits 538s - new changesets ff7a2f2d8d70 (1 drafts) 538s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 538s + abort: repository repo.git not found 538s + [255] 538s 538s $ cd hgrepo 538s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 538s $ hg co master 538s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 538s - (activating bookmark master) 538s - $ fn_hg_tag alpha 538s - $ hg push 538s - pushing to $TESTTMP/repo.git 538s - searching for changes 538s - adding objects 538s - remote: found 0 deltas to reuse 538s - added 1 commits with 1 trees and 1 blobs 538s - updating reference refs/heads/master 538s - adding reference refs/tags/alpha 538s - 538s - $ hg log --graph 538s - @ changeset: 1:e8b150f84560 538s - | bookmark: master 538s - | tag: default/master 538s - | tag: tip 538s - | user: test 538s - | date: Mon Jan 01 00:00:11 2007 +0000 538s - | summary: Added tag alpha for changeset ff7a2f2d8d70 538s - | 538s - o changeset: 0:ff7a2f2d8d70 538s - tag: alpha 538s - user: test 538s - date: Mon Jan 01 00:00:10 2007 +0000 538s - summary: add alpha 538s - 538s - 538s - $ cd .. 538s - $ cd gitrepo 538s -git should have the tag alpha 538s - $ git fetch origin 538s - From $TESTTMP/repo 538s - 7eeab2e..bbae830 master -> origin/master 538s - * [new tag] alpha -> alpha 538s - $ cd .. 538s - 538s - $ hg clone repo.git hgrepo2 538s - importing 2 git commits 538s - new changesets ff7a2f2d8d70:e8b150f84560 (2 drafts) 538s - updating to bookmark master 538s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 538s - $ hg -R hgrepo2 log --graph 538s - @ changeset: 1:e8b150f84560 538s - | bookmark: master 538s - | tag: default/master 538s - | tag: tip 538s - | user: test 538s - | date: Mon Jan 01 00:00:11 2007 +0000 538s - | summary: Added tag alpha for changeset ff7a2f2d8d70 538s - | 538s - o changeset: 0:ff7a2f2d8d70 538s - tag: alpha 538s - user: test 538s - date: Mon Jan 01 00:00:10 2007 +0000 538s - summary: add alpha 538s - 538s - 538s -the tag should be in .hgtags 538s - $ cat hgrepo2/.hgtags 538s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alpha 538s 538s ERROR: test-hg-tags.t output changed 541s ! 541s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-hg-clone.t 541s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-hg-clone.t.err 541s @@ -11,88 +11,17 @@ 541s $ cd .. 541s 541s $ hg clone -U gitrepo hgrepo 541s - importing 1 git commits 541s - new changesets ff7a2f2d8d70 (1 drafts) 541s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 541s + abort: repository gitrepo not found 541s + [255] 541s 541s By default, the Git state isn't preserved across a copying/linking 541s clone 541s 541s $ hg clone -U hgrepo otherhgrepo 541s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 541s + abort: repository hgrepo not found 541s + [255] 541s $ cd otherhgrepo 541s + $TESTTMP.sh: 22: cd: can't cd to otherhgrepo 541s $ find .hg -name 'git*' | sort 541s - $ hg tags -v 541s - tip 0:ff7a2f2d8d70 541s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 541s - $ cd .. 541s - $ rm -r otherhgrepo 541s - 541s -Nor using a pull clone 541s - 541s - $ hg clone -U --pull hgrepo otherhgrepo 541s - requesting all changes 541s - adding changesets 541s - adding manifests 541s - adding file changes 541s - added 1 changesets with 1 changes to 1 files 541s - new changesets ff7a2f2d8d70 541s - $ cd otherhgrepo 541s - $ find .hg -name 'git*' | sort 541s - $ hg tags -v 541s - tip 0:ff7a2f2d8d70 541s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 541s - $ cd .. 541s - $ rm -r otherhgrepo 541s - 541s -But we can enable it! 541s - 541s - $ cat >> $HGRCPATH < [experimental] 541s - > hg-git-serve = yes 541s - > EOF 541s - 541s -Check transferring between Mercurial repositories using a 541s -copying/linking clone 541s - 541s - $ hg clone -U hgrepo otherhgrepo 541s - $ cd otherhgrepo 541s - $ find .hg -name 'git*' | sort 541s - $ hg tags -q 541s - tip 541s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 541s - $ cd .. 541s - 541s -Checking using a pull clone 541s - 541s - $ rm -rf otherhgrepo 541s - $ hg clone -U --pull hgrepo otherhgrepo 541s - requesting all changes 541s - adding changesets 541s - adding manifests 541s - adding file changes 541s - added 1 changesets with 1 changes to 1 files 541s - new changesets ff7a2f2d8d70 541s - $ cd otherhgrepo 541s - $ hg tags -q 541s - tip 541s - alpha 541s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 541s - 0:ff7a2f2d8d70 7eeab2ea75ec 541s - $ cd .. 541s - 541s -Can we repopulate the state from a Mercurial repository? 541s - 541s - $ cd otherhgrepo 541s - $ hg debug-remove-hggit-state 541s - clearing out the git cache data 541s - $ hg log -qr 'fromgit()' 541s - $ hg tags 541s - tip 0:ff7a2f2d8d70 541s - $ hg pull 541s - pulling from $TESTTMP/hgrepo 541s - searching for changes 541s - no changes found 541s - $ hg log -qr 'fromgit()' 541s - $ hg tags 541s - tip 0:ff7a2f2d8d70 541s - 541s -Sadly, no. 541s 541s ERROR: test-hg-clone.t output changed 542s ! 542s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-push-detached.t 542s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-push-detached.t.err 542s @@ -40,37 +40,9 @@ 542s in this case continues to work. 542s 542s $ hg clone gitrepo hgrepo 542s - importing 1 git commits 542s - new changesets ff7a2f2d8d70 (1 drafts) 542s - updating to bookmark master 542s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 542s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 542s + abort: repository gitrepo not found 542s + [255] 542s $ cd hgrepo 542s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 542s $ echo beta > beta 542s - $ hg add beta 542s - $ fn_hg_commit -m "add beta" 542s - 542s -Pushing that changeset, with phases, publishes the detached HEAD. 542s -Whether this should happen is debatable, but it's a side effect from 542s -the fact that pushing to the remote HEAD, with HEAD being the usual 542s -symref, should publish it. 542s - 542s - $ hg push -v --config hggit.usephases=yes 542s - pushing to $TESTTMP/gitrepo 542s - finding unexported changesets 542s - exporting 1 changesets 542s - converting revision 47580592d3d6492421a1e6cebc5c2d701a2e858b 542s - packing 3 loose objects... 542s - searching for changes 542s - remote: counting objects: 5, done. 542s - 1 commits found 542s - adding objects 542s - remote: counting objects: 5, done. 542s - remote: found 0 deltas to reuse 542s - added 1 commits with 1 trees and 1 blobs 542s - updating reference default::refs/heads/master => GIT:0f378ab6 542s - publishing remote HEAD 542s - $ hg phase 'all()' 542s - 0: public 542s - 1: draft 542s - $ cd .. 542s - 542s 542s ERROR: test-push-detached.t output changed 547s ! 547s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-serve-git.t 547s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-serve-git.t.err 547s @@ -33,28 +33,14 @@ 547s Make sure that clone over the old git protocol doesn't break 547s 547s $ hg clone -U git://localhost:$HGPORT/test copy 2>&1 547s - \r (no-eol) (esc) 547s - Counting objects 1/6 [=====> ]\r (no-eol) (esc) 547s - Counting objects 2/6 [===========> ]\r (no-eol) (esc) 547s - Counting objects 3/6 [=================> ]\r (no-eol) (esc) 547s - Counting objects 4/6 [=======================> ]\r (no-eol) (esc) 547s - Counting objects 5/6 [=============================> ]\r (no-eol) (esc) 547s - Counting objects 6/6 [===================================>]\r (no-eol) (esc) 547s - \r (no-eol) (esc) 547s - \r (no-eol) (esc) 547s - Compressing objects 1/3 [==========> ]\r (no-eol) (esc) 547s - Compressing objects 2/3 [=====================> ]\r (no-eol) (esc) 547s - Compressing objects 3/3 [================================>]\r (no-eol) (esc) 547s - \r (no-eol) (esc) 547s - \r (no-eol) (esc) 547s - importing commits 1/2 b23744d34f97 [======> ]\r (no-eol) (esc) 547s - importing commits 2/2 3af9773036a9 [=============>]\r (no-eol) (esc) 547s - \r (no-eol) (esc) 547s - importing 2 git commits 547s - new changesets c4d188f6e13d:221dd250e933 547s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 547s + abort: repository git://localhost:$HGPORT/test not found 547s + [255] 547s $ hg log -T 'HG:{node|short} GIT:{gitnode|short}\n' -R copy 547s - HG:221dd250e933 GIT:3af9773036a9 547s - HG:c4d188f6e13d GIT:b23744d34f97 547s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 547s + abort: repository copy not found 547s + [255] 547s $ hg tags -v -R copy 547s - tip 1:221dd250e933 547s - default/master 1:221dd250e933 git-remote 547s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 547s + abort: repository copy not found 547s + [255] 547s 547s ERROR: test-serve-git.t output changed 564s ! 564s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-convergedmerge.t 564s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-convergedmerge.t.err 564s @@ -2,29 +2,39 @@ 564s $ . "$TESTDIR/testutil" 564s 564s $ hg init hgrepo1 564s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 564s $ cd hgrepo1 564s $ echo A > afile 564s $ hg add afile 564s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 564s $ hg ci -m "origin" 564s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 564s 564s $ echo B > afile 564s $ hg ci -m "A->B" 564s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 564s 564s $ echo C > afile 564s $ hg ci -m "B->C" 564s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 564s 564s $ hg up -r0 564s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 564s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 564s $ echo C > afile 564s $ hg ci -m "A->C" 564s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 564s created new head 564s 564s $ hg merge -r2 564s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 564s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 564s (branch merge, don't forget to commit) 564s $ hg ci -m "merge" 564s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 564s 564s $ hg log --graph --style compact | sed 's/\[.*\]//g' 564s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 564s @ 4:3,2 eaa21d002113 1970-01-01 00:00 +0000 test 564s |\ merge 564s | | 564s @@ -47,36 +57,23 @@ 564s 564s $ cd hgrepo1 564s $ hg bookmark -r4 master 564s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 564s $ hg push -r master ../repo.git 564s - pushing to ../repo.git 564s - searching for changes 564s - adding objects 564s - remote: found 0 deltas to reuse 564s - added 5 commits with 3 trees and 3 blobs 564s - adding reference refs/heads/master 564s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 564s + abort: repository ../repo.git does not exist 564s + [255] 564s $ cd .. 564s 564s $ hg clone repo.git hgrepo2 564s - importing 5 git commits 564s - new changesets 5d1a6b64f9d0:eaa21d002113 (5 drafts) 564s - updating to bookmark master 564s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 564s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 564s + abort: repository repo.git not found 564s + [255] 564s expect the same revision ids as above 564s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 564s - @ 4:1,3 eaa21d002113 1970-01-01 00:00 +0000 test 564s - |\ merge 564s - | | 564s - | o 3 0dbe4ac1a758 1970-01-01 00:00 +0000 test 564s - | | B->C 564s - | | 564s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 564s - | | A->B 564s - | | 564s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 564s - |/ A->C 564s - | 564s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 564s - origin 564s - 564s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 564s + abort: repository hgrepo2 not found 564s $ hg -R hgrepo2 gverify 564s - verifying rev eaa21d002113 against git commit fb8c9e2afe5418cfff337eeed79fad5dd58826f0 564s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 564s + hg: unknown command 'gverify' 564s + (did you mean verify?) 564s + [10] 564s 564s ERROR: test-convergedmerge.t output changed 565s ! 566s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-conflict-2.t 566s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-conflict-2.t.err 566s @@ -2,30 +2,40 @@ 566s $ . "$TESTDIR/testutil" 566s 566s $ hg init hgrepo1 566s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 566s $ cd hgrepo1 566s $ echo A > afile 566s $ hg add afile 566s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 566s $ hg ci -m "origin" 566s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 566s 566s $ echo B > afile 566s $ hg ci -m "A->B" 566s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 566s 566s $ hg up -r0 566s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 566s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 566s $ echo C > afile 566s $ hg ci -m "A->C" 566s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 566s created new head 566s 566s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 566s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 566s warning: conflicts.* (re) 566s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 566s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 566s resolve using second parent 566s $ echo B > afile 566s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 566s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 566s $ hg ci -m "merge to B" 566s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 566s 566s $ hg log --graph --style compact | sed 's/\[.*\]//g' 566s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 566s @ 3:2,1 120385945d08 1970-01-01 00:00 +0000 test 566s |\ merge to B 566s | | 566s @@ -45,31 +55,18 @@ 566s 566s $ cd hgrepo1 566s $ hg bookmark -r tip master 566s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 566s $ hg push -r master ../repo.git 566s - pushing to ../repo.git 566s - searching for changes 566s - adding objects 566s - remote: found 0 deltas to reuse 566s - added 4 commits with 3 trees and 3 blobs 566s - adding reference refs/heads/master 566s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 566s + abort: repository ../repo.git does not exist 566s + [255] 566s $ cd .. 566s 566s $ hg clone repo.git hgrepo2 566s - importing 4 git commits 566s - new changesets 5d1a6b64f9d0:120385945d08 (4 drafts) 566s - updating to bookmark master 566s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 566s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 566s + abort: repository repo.git not found 566s + [255] 566s expect the same revision ids as above 566s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 566s - @ 3:1,2 120385945d08 1970-01-01 00:00 +0000 test 566s - |\ merge to B 566s - | | 566s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 566s - | | A->B 566s - | | 566s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 566s - |/ A->C 566s - | 566s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 566s - origin 566s - 566s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 566s + abort: repository hgrepo2 not found 566s 566s ERROR: test-conflict-2.t output changed 568s ! 568s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-phases-draft.t 568s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-phases-draft.t.err 568s @@ -12,73 +12,10 @@ 568s cloning without hggit.usephases does not publish local changesets 568s $ cd .. 568s $ hg clone gitrepo hgrepo | grep -v '^updating' 568s - importing 1 git commits 568s - new changesets ff7a2f2d8d70 (1 drafts) 568s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 568s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 568s + abort: repository gitrepo not found 568s + [1] 568s 568s $ cd hgrepo 568s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 568s $ hg phase -r master 568s - 0: draft 568s - 568s -pulling advances the draft phase, though 568s - 568s - $ hg phase -fs 0 568s - $ hg pull 568s - pulling from $TESTTMP/gitrepo 568s - no changes found 568s - $ hg phase tip 568s - 0: draft 568s - 568s -even if we don't have a name? 568s - 568s - $ hg phase -fs 0 568s - $ mv .hg/hgrc .hg/hgrc.bak 568s - $ hg pull ../gitrepo 568s - pulling from ../gitrepo 568s - no changes found 568s - $ hg phase tip 568s - 0: draft 568s - $ mv .hg/hgrc.bak .hg/hgrc 568s - $ cd .. 568s - 568s - 568s -pulling without hggit.usephases does not publish local changesets 568s - $ cd gitrepo 568s - $ git checkout -q master 568s - $ echo beta > beta 568s - $ git add beta 568s - $ fn_git_commit -m 'add beta' 568s - $ cd .. 568s - 568s - $ cd hgrepo 568s - $ hg pull 568s - pulling from $TESTTMP/gitrepo 568s - importing 1 git commits 568s - updating bookmark master 568s - new changesets 7fe02317c63d (1 drafts) 568s - (run 'hg update' to get a working copy) 568s - $ hg phase -r master 568s - 1: draft 568s - 568s -pulling with git.public does not publish local changesets 568s - $ hg --config git.public=master pull 568s - pulling from $TESTTMP/gitrepo 568s - no changes found 568s - $ hg phase -r master 568s - 1: draft 568s - 568s -pushing without hggit.usephases does not publish local changesets 568s - $ hg update master 568s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 568s - $ echo gamma > gamma 568s - $ hg add gamma 568s - $ hg commit -m 'gamma' 568s - $ hg push 568s - pushing to $TESTTMP/gitrepo 568s - searching for changes 568s - adding objects 568s - remote: found 0 deltas to reuse 568s - added 1 commits with 1 trees and 1 blobs 568s - updating reference refs/heads/master 568s - $ hg phase -r master 568s - 2: draft 568s 568s ERROR: test-phases-draft.t output changed 575s ! 575s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-subrepos-push.t 575s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-subrepos-push.t.err 575s @@ -5,10 +5,13 @@ 575s Initialized empty Git repository in $TESTTMP/repo.git/ 575s 575s $ hg init hgsubrepo 575s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 575s $ cd hgsubrepo 575s $ echo thefile > thefile 575s $ hg add thefile 575s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 575s $ fn_hg_commit -m 'add thefile' 575s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 575s $ cd .. 575s 575s $ git init gitsubrepo 575s @@ -20,59 +23,9 @@ 575s $ cd .. 575s 575s $ hg clone repo.git hgrepo 575s - updating to branch default 575s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 575s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 575s + abort: repository repo.git not found 575s + [255] 575s $ cd hgrepo 575s + $TESTTMP.sh: 32: cd: can't cd to hgrepo 575s $ hg book master 575s - $ echo alpha > alpha 575s - $ hg add alpha 575s - $ fn_hg_commit -m 'add alpha' 575s - $ touch .hgsub 575s - $ hg add .hgsub 575s - $ fn_hg_commit -m "add .hgsub" 575s - $ hg clone -q ../hgsubrepo hg 575s - $ echo "hg = ../hgsubrepo" >> .hgsub 575s - $ fn_hg_commit -m 'add hg subrepo' 575s - $ git clone --quiet ../gitsubrepo git 575s - $ echo "git = [git]../gitsubrepo" >> .hgsub 575s - $ fn_hg_commit -m 'add git subrepo' 575s - $ hg push 575s - pushing to $TESTTMP/repo.git 575s - pushing subrepo hg to $TESTTMP/hgsubrepo 575s - searching for changes 575s - no changes found 575s - searching for changes 575s - adding objects 575s - remote: found 0 deltas to reuse 575s - added 4 commits with 2 trees and 2 blobs 575s - adding reference refs/heads/master 575s - $ cat .hgsub 575s - hg = ../hgsubrepo 575s - git = [git]../gitsubrepo 575s - $ cat .hgsubstate 575s - aaae5224095dca7403147c0e20cbac1f450b0e95 git 575s - df643c539c7541d48eacc76745581e00cbaf3d45 hg 575s - $ cd .. 575s - 575s -Now clone it. Note that no Mercurial state persists: 575s - 575s - $ git clone --recurse-submodules repo.git gitrepo 575s - Cloning into 'gitrepo'... 575s - done. 575s - Submodule 'git' ($TESTTMP/gitsubrepo) registered for path 'git' 575s - Cloning into '$TESTTMP/gitrepo/git'... 575s - done. 575s - Submodule path 'git': checked out 'aaae5224095dca7403147c0e20cbac1f450b0e95' 575s - $ cd gitrepo 575s - $ ls -A 575s - .git 575s - .gitmodules 575s - alpha 575s - git 575s - $ cat .gitmodules 575s - [submodule "git"] 575s - path = git 575s - url = ../gitsubrepo 575s - $ ls -A git 575s - .git 575s - thefile 575s 575s ERROR: test-subrepos-push.t output changed 583s ! 583s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-conflict-1.t 583s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-conflict-1.t.err 583s @@ -2,30 +2,40 @@ 583s $ . "$TESTDIR/testutil" 583s 583s $ hg init hgrepo1 583s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 583s $ cd hgrepo1 583s $ echo A > afile 583s $ hg add afile 583s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 583s $ hg ci -m "origin" 583s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 583s 583s $ echo B > afile 583s $ hg ci -m "A->B" 583s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 583s 583s $ hg up -r0 583s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 583s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 583s $ echo C > afile 583s $ hg ci -m "A->C" 583s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 583s created new head 583s 583s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 583s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 583s warning: conflicts.* (re) 583s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 583s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 583s resolve using first parent 583s $ echo C > afile 583s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 583s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 583s $ hg ci -m "merge to C" 583s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 583s 583s $ hg log --graph --style compact | sed 's/\[.*\]//g' 583s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 583s @ 3:2,1 6c53bc0f062f 1970-01-01 00:00 +0000 test 583s |\ merge to C 583s | | 583s @@ -45,31 +55,18 @@ 583s 583s $ cd hgrepo1 583s $ hg bookmark -r tip master 583s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 583s $ hg push -r master ../repo.git 583s - pushing to ../repo.git 583s - searching for changes 583s - adding objects 583s - remote: found 0 deltas to reuse 583s - added 4 commits with 3 trees and 3 blobs 583s - adding reference refs/heads/master 583s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 583s + abort: repository ../repo.git does not exist 583s + [255] 583s $ cd .. 583s 583s $ hg clone repo.git hgrepo2 583s - importing 4 git commits 583s - new changesets 5d1a6b64f9d0:6c53bc0f062f (4 drafts) 583s - updating to bookmark master 583s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 583s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 583s + abort: repository repo.git not found 583s + [255] 583s expect the same revision ids as above 583s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 583s - @ 3:1,2 6c53bc0f062f 1970-01-01 00:00 +0000 test 583s - |\ merge to C 583s - | | 583s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 583s - | | A->B 583s - | | 583s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 583s - |/ A->C 583s - | 583s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 583s - origin 583s - 583s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 583s + abort: repository hgrepo2 not found 583s 583s ERROR: test-conflict-1.t output changed 586s ! 586s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-git-clone.t 586s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-git-clone.t.err 586s @@ -14,30 +14,24 @@ 586s $ cd .. 586s 586s $ hg clone gitrepo hgrepo 586s - importing 2 git commits 586s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 586s - updating to bookmark master 586s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 586s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 586s + abort: repository gitrepo not found 586s + [255] 586s $ hg -R hgrepo log --graph 586s - @ changeset: 1:7fe02317c63d 586s - | bookmark: master 586s - | tag: default/master 586s - | tag: tip 586s - | user: test 586s - | date: Mon Jan 01 00:00:11 2007 +0000 586s - | summary: add beta 586s - | 586s - o changeset: 0:ff7a2f2d8d70 586s - user: test 586s - date: Mon Jan 01 00:00:10 2007 +0000 586s - summary: add alpha 586s - 586s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 586s + abort: repository hgrepo not found 586s + [255] 586s 586s we should have some bookmarks 586s $ hg -R hgrepo book 586s - * master 1:7fe02317c63d 586s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 586s + abort: repository hgrepo not found 586s + [255] 586s $ hg -R hgrepo gverify 586s - verifying rev 7fe02317c63d against git commit 9497a4ee62e16ee641860d7677cdb2589ea15554 586s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 586s + hg: unknown command 'gverify' 586s + (did you mean verify?) 586s + [10] 586s 586s test for ssh vulnerability 586s 586s @@ -47,16 +41,18 @@ 586s > EOF 586s 586s $ hg clone -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 586s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 586s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 586s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 586s [255] 586s $ hg clone -q 'git+ssh://%2DoProxyCommand=rm${IFS}nonexistent/path' 586s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 586s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 586s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 586s [255] 586s $ hg clone -q 'git+ssh://fakehost|rm${IFS}nonexistent/path' 586s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 586s - abort: git remote error: The remote server unexpectedly closed the connection. 586s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 586s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 586s [255] 586s $ hg clone -q 'git+ssh://fakehost%7Crm${IFS}nonexistent/path' 586s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 586s - abort: git remote error: The remote server unexpectedly closed the connection. 586s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 586s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 586s [255] 586s 586s ERROR: test-git-clone.t output changed 587s ! 587s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-pull-after-obsolete.t 587s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-pull-after-obsolete.t.err 587s @@ -20,52 +20,9 @@ 587s 587s $ cd .. 587s $ hg clone -U gitrepo hgrepo 587s - importing 2 git commits 587s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 587s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 587s + abort: repository gitrepo not found 587s + [255] 587s $ cd hgrepo 587s + $TESTTMP.sh: 31: cd: can't cd to hgrepo 587s $ hg up master 587s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 587s - (activating bookmark master) 587s - $ hg log --graph 587s - @ changeset: 1:7fe02317c63d 587s - | bookmark: master 587s - | tag: default/master 587s - | tag: thetag 587s - | tag: tip 587s - | user: test 587s - | date: Mon Jan 01 00:00:11 2007 +0000 587s - | summary: add beta 587s - | 587s - o changeset: 0:ff7a2f2d8d70 587s - user: test 587s - date: Mon Jan 01 00:00:10 2007 +0000 587s - summary: add alpha 587s - 587s - $ cd ../gitrepo 587s - $ echo beta line 2 >> beta 587s - $ git add beta 587s - $ fn_git_commit -m 'add to beta' 587s - 587s -Create a commit, obsolete it, and pull, to ensure that we can pull if 587s -the tipmost commit is hidden. 587s - 587s - $ cd ../hgrepo 587s - $ hg bookmark --inactive 587s - $ echo gamma > gamma 587s - $ hg add gamma 587s - $ fn_hg_commit -m 'add gamma' 587s - $ hg up master 587s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 587s - (activating bookmark master) 587s - $ hg log -T '{rev}:{node} {desc}\n' -r tip 587s - 2:4090a1266584bc1a47ce562e9349b1e0f1b44611 add gamma 587s - $ hg debugobsolete 4090a1266584bc1a47ce562e9349b1e0f1b44611 587s - 1 new obsolescence markers 587s - obsoleted 1 changesets 587s - 587s - $ hg pull 587s - pulling from $TESTTMP/gitrepo 587s - importing 1 git commits 587s - updating bookmark master 587s - new changesets cc1e605d90db (1 drafts) 587s - (run 'hg update' to get a working copy) 587s 587s ERROR: test-pull-after-obsolete.t output changed 591s ! 591s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-git-gpg.t 591s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-git-gpg.t.err 591s @@ -55,23 +55,10 @@ 591s Hg clone it 591s 591s $ hg clone gitrepo hgrepo 591s - importing 2 git commits 591s - new changesets ab60c5e55bd6:[0-9a-f]{12,12} \(2 drafts\) (re) 591s - updating to bookmark signed 591s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 591s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 591s + abort: repository gitrepo not found 591s + [255] 591s 591s $ cd hgrepo 591s + $TESTTMP.sh: 46: cd: can't cd to hgrepo 591s $ hg push ../gitrepo2 -B signed 591s - pushing to ../gitrepo2 591s - searching for changes 591s - adding objects 591s - remote: found 0 deltas to reuse 591s - added 1 commits with 1 trees and 0 blobs 591s - adding reference refs/heads/signed 591s - $ cd .. 591s - 591s -Verify the commit 591s - 591s - $ cd gitrepo2 591s - $ git show --show-signature signed | grep "Good signature from" 591s - gpg: Good signature from "hgtest" [ultimate] 591s 591s ERROR: test-git-gpg.t output changed 593s ! 593s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-push-phases.t 593s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-push-phases.t.err 593s @@ -9,68 +9,13 @@ 593s $ git init -q --bare repo.git 593s 593s $ hg clone repo.git hgrepo 593s - updating to branch default 593s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 593s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 593s + abort: repository repo.git not found 593s + [255] 593s 593s $ cd hgrepo 593s + $TESTTMP.sh: 13: cd: can't cd to hgrepo 593s 593s Create two commits, one secret: 593s 593s $ touch alpha 593s - $ hg add alpha 593s - $ fn_hg_commit -m alpha 593s - $ hg book -r . master 593s - $ touch beta 593s - $ hg add beta 593s - $ fn_hg_commit --secret -m beta 593s - $ hg book -r . secret 593s - $ hg push 593s - pushing to $TESTTMP/repo.git 593s - warning: not exporting secret bookmark 'secret' 593s - searching for changes 593s - adding objects 593s - remote: found 0 deltas to reuse 593s - added 1 commits with 1 trees and 1 blobs 593s - adding reference refs/heads/master 593s - $ cd .. 593s - $ hg -R hgrepo log --graph --template phases 593s - @ changeset: 1:62966756ea96 593s - | bookmark: secret 593s - | tag: tip 593s - | phase: secret 593s - | user: test 593s - | date: Mon Jan 01 00:00:11 2007 +0000 593s - | summary: beta 593s - | 593s - o changeset: 0:d4b83afc35d1 593s - bookmark: master 593s - tag: default/master 593s - phase: public 593s - user: test 593s - date: Mon Jan 01 00:00:10 2007 +0000 593s - summary: alpha 593s - 593s - 593s -What happens when we push the secret? 593s - 593s - $ hg -R hgrepo push -B secret 593s - pushing to $TESTTMP/repo.git 593s - warning: not exporting secret bookmark 'secret' 593s - searching for changes 593s - abort: revision 62966756ea96 cannot be pushed since it doesn't have a bookmark 593s - [255] 593s - 593s -Only one changeset was pushed: 593s - 593s - $ GIT_DIR=repo.git git log --graph --all --decorate=short 593s - * commit 2cc4e3d19551e459a0dd606f4cf890de571c7d33 (HEAD -> master) 593s - Author: test 593s - Date: Mon Jan 1 00:00:10 2007 +0000 593s - 593s - alpha 593s - 593s -And this published the remote head: 593s - 593s - $ hg -R hgrepo phase 'all()' 593s - 0: public 593s - 1: secret 593s 593s ERROR: test-push-phases.t output changed 597s ! 597s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-keywords.t 597s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-keywords.t.err 597s @@ -21,29 +21,9 @@ 597s $ cd .. 597s 597s $ hg clone gitrepo hgrepo 597s - importing 3 git commits 597s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 597s - updating to bookmark master 597s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 597s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 597s + abort: repository gitrepo not found 597s + [255] 597s $ cd hgrepo 597s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 597s $ echo gamma > gamma 597s - $ hg add gamma 597s - $ hg commit -m 'add gamma' 597s - 597s - $ hg log --template "{rev} {node} {node|short} {gitnode} {gitnode|short}\n" 597s - 3 965bf7d08d3ac847dd8eb9e72ee0bf547d1a65d9 965bf7d08d3a 597s - 2 8e3f0ecc9aefd4ea2fdf8e2d5299cac548762a1c 8e3f0ecc9aef 7e2a5465ff4e3b992c429bb87a392620a0ac97b7 7e2a5465ff4e 597s - 1 7fe02317c63d9ee324d4b5df7c9296085162da1b 7fe02317c63d 9497a4ee62e16ee641860d7677cdb2589ea15554 9497a4ee62e1 597s - 0 ff7a2f2d8d7099694ae1e8b03838d40575bebb63 ff7a2f2d8d70 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 7eeab2ea75ec 597s - $ hg log --template "fromgit {rev}\n" --rev "fromgit()" 597s - fromgit 0 597s - fromgit 1 597s - fromgit 2 597s - $ hg log --template "gitnode_existsA {rev}\n" --rev "gitnode(9497a4ee62e16ee641860d7677cdb2589ea15554)" 597s - gitnode_existsA 1 597s - $ hg log --template "gitnode_existsB {rev}\n" --rev "gitnode(7eeab)" 597s - gitnode_existsB 0 597s - $ hg log --rev "gitnode(7e)" 597s - abort: git-mapfile@7e: ambiguous identifier!? (re) 597s - [50] 597s - $ hg log --template "gitnode_notexists {rev}\n" --rev "gitnode(1234567890ab)" 597s 597s ERROR: test-keywords.t output changed 601s ! 601s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-subrepos-delete.t 601s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-subrepos-delete.t.err 601s @@ -52,22 +52,9 @@ 601s And there should be nothing in Mercurial either: 601s 601s $ hg clone -U repo.git hgrepo 601s - importing 3 git commits 601s - new changesets e532b2bfda10:cc611d35fb62 (3 drafts) 601s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 601s + abort: repository repo.git not found 601s + [255] 601s $ cd hgrepo 601s + $TESTTMP.sh: 50: cd: can't cd to hgrepo 601s $ hg log --graph --template info 601s - o 601s - | commit: 2:cc611d35fb62 delete subrepo 601s - | added: 601s - | removed: .hgsub .hgsubstate 601s - o 601s - | commit: 1:8d549bcc5179 add subrepo 601s - | added: .hgsub .hgsubstate 601s - | removed: 601s - o 601s - commit: 0:e532b2bfda10 add alpha 601s - added: alpha 601s - removed: 601s - $ hg manifest -r tip 601s - alpha 601s - $ cd .. 601s 601s ERROR: test-subrepos-delete.t output changed 604s ! 604s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-tree-decomposition.t 604s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-tree-decomposition.t.err 604s @@ -24,45 +24,9 @@ 604s $ git init -q --bare repo.git 604s 604s $ hg clone gitrepo hgrepo 604s - importing 3 git commits 604s - new changesets d4d3d2417141:541f27994b81 (3 drafts) 604s - updating to bookmark master 604s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 604s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 604s + abort: repository gitrepo not found 604s + [255] 604s $ cd hgrepo 604s + $TESTTMP.sh: 38: cd: can't cd to hgrepo 604s $ hg log --template 'adds: {file_adds}\ndels: {file_dels}\n' 604s - adds: d1 604s - dels: d1/f1 604s - adds: d2/f2 604s - dels: d1/f2 604s - adds: d1/f1 d1/f2 604s - dels: 604s - 604s - $ hg debug-remove-hggit-state 604s - clearing out the git cache data 604s - $ hg push ../repo.git 604s - pushing to ../repo.git 604s - searching for changes 604s - adding objects 604s - remote: found 0 deltas to reuse 604s - added 3 commits with 6 trees and 3 blobs 604s - adding reference refs/heads/master 604s - $ cd .. 604s - 604s - $ git --git-dir=repo.git log --pretty=medium 604s - commit 6e0dbd8cd92ed4823c69cb48d8a2b81f904e6e69 604s - Author: test 604s - Date: Mon Jan 1 00:00:12 2007 +0000 604s - 604s - replace a dir with a file 604s - 604s - commit a1874d5cd0b1549ed729e36f0da4a93ed36259ee 604s - Author: test 604s - Date: Mon Jan 1 00:00:11 2007 +0000 604s - 604s - rename 604s - 604s - commit 102c17a5deda49db3f10ec5573f9378867098b7c 604s - Author: test 604s - Date: Mon Jan 1 00:00:10 2007 +0000 604s - 604s - initial 604s 604s ERROR: test-tree-decomposition.t output changed 607s ! 607s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-subrepos-drop.t 607s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-subrepos-drop.t.err 607s @@ -17,52 +17,9 @@ 607s Create a Mercurial repository with a .gitmodules file: 607s 607s $ hg clone repo.git hgrepo 607s - updating to branch default 607s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 607s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 607s + abort: repository repo.git not found 607s + [255] 607s $ cd hgrepo 607s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 607s $ hg book master 607s - $ touch this 607s - $ fn_hg_commit -A -m 'add this' 607s - $ cat > .gitmodules < [submodule "subrepo"] 607s - > path = subrepo 607s - > url = ../gitsubrepo 607s - > EOF 607s - $ hg add .gitmodules 607s - $ fn_hg_commit -m "add .gitmodules file" 607s - $ cd .. 607s - 607s -What happens if we push that to Git? 607s - 607s - $ hg -R hgrepo push 607s - pushing to $TESTTMP/repo.git 607s - warning: ignoring modifications to '.gitmodules' file; please use '.hgsub' instead 607s - searching for changes 607s - adding objects 607s - remote: found 0 deltas to reuse 607s - added 2 commits with 1 trees and 1 blobs 607s - adding reference refs/heads/master 607s - 607s -But we don't get a warning if we don't touch .gitmodules: 607s - 607s - $ cd hgrepo 607s - $ touch that 607s - $ fn_hg_commit -A -m 'add that' 607s - $ hg push 607s - pushing to $TESTTMP/repo.git 607s - searching for changes 607s - adding objects 607s - remote: found 0 deltas to reuse 607s - added 1 commits with 1 trees and 0 blobs 607s - updating reference refs/heads/master 607s - $ cd .. 607s - 607s -Check that it didn't silenty come through, or something: 607s - 607s - $ git clone repo.git gitrepo 607s - Cloning into 'gitrepo'... 607s - done. 607s - $ ls -A gitrepo 607s - .git 607s - that 607s - this 607s 607s ERROR: test-subrepos-drop.t output changed 610s ! 610s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-annotate.t 610s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-annotate.t.err 610s @@ -10,6 +10,7 @@ 610s init 610s 610s $ hg init repo 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s $ cd repo 610s 610s commit 610s @@ -19,37 +20,48 @@ 610s > a 610s > EOF 610s $ hg add a 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s $ fn_hg_commit -m 1 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s $ cat < a 610s > a 610s > a 610s > a 610s > EOF 610s $ fn_hg_commit -m 2 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s $ cat < a 610s > a 610s > b 610s > a 610s > EOF 610s $ fn_hg_commit -m 3 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s 610s annotate multiple files 610s 610s $ hg annotate a 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s 0: a 610s 2: b 610s 1: a 610s 610s $ hg annotate --skip 1 a 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s 0: a 610s 2: b 610s 0* a 610s 610s $ hg gexport 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s + hg: unknown command 'gexport' 610s + (did you mean one of export, import?) 610s + [10] 610s $ hg log -T '{rev}:{node} {gitnode}\n' 610s - 2:beb139b96eec386addc02d48db524b7646ef1605 19388575d02e71e917e7013aa854d4a21c509819 610s - 1:a9a255d66663f9216bdcf8dda69211d7280f7278 debec50a14cc4830584dd4fa1507c51cce1c098f 610s - 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 88f28c06a1ede9a70852ab1bf9818150fabaaaa9 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s + 2:beb139b96eec386addc02d48db524b7646ef1605 610s + 1:a9a255d66663f9216bdcf8dda69211d7280f7278 610s + 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 610s 610s $ cat < .git-blame-ignore-revs 610s > # this is a comment, and the next line should be ignored 610s @@ -59,39 +71,43 @@ 610s > EOF 610s 610s $ hg annotate a 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s 0: a 610s 2: b 610s 1: a 610s $ hg annotate a \ 610s > --debug \ 610s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 610s - skipping debec50a14cc -> a9a255d66663 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s 0: a 610s 2: b 610s - 0* a 610s + 1: a 610s $ hg add .git-blame-ignore-revs 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s $ hg annotate a \ 610s > --debug \ 610s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 610s - skipping debec50a14cc -> a9a255d66663 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s 0: a 610s 2: b 610s - 0* a 610s + 1: a 610s $ hg annotate a \ 610s > --config git.blame.ignoreRevsFile=badfile 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s 0: a 610s 2: b 610s 1: a 610s $ hg annotate -T'{lines % "{rev}:{node|short} {gitnode|short}: {line}"}' a 610s - 0:8d4731bd0f4a 88f28c06a1ed: a 610s - 2:beb139b96eec 19388575d02e: b 610s - 1:a9a255d66663 debec50a14cc: a 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s + 0:8d4731bd0f4a : a 610s + 2:beb139b96eec : b 610s + 1:a9a255d66663 : a 610s 610s $ cd .. 610s $ hg -R repo annotate repo/a \ 610s > --debug \ 610s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 610s - skipping debec50a14cc -> a9a255d66663 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s 0: a 610s 2: b 610s - 0* a 610s + 1: a 610s 610s ERROR: test-annotate.t output changed 610s ! 610s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-push-anonymous.t 610s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-push-anonymous.t.err 610s @@ -25,28 +25,9 @@ 610s Clone it, deactivate the bookmark, add a commit, and push! 610s 610s $ hg clone -U gitrepo hgrepo 610s - importing 1 git commits 610s - new changesets ff7a2f2d8d70 (1 drafts) 610s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 610s + abort: repository gitrepo not found 610s + [255] 610s $ cd hgrepo 610s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 610s $ hg up tip 610s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 610s - $ echo beta > beta 610s - $ hg add beta 610s - $ fn_hg_commit -m "add beta" 610s - 610s -Pushing that changeset should print a helpful message: 610s - 610s - $ hg push 610s - pushing to $TESTTMP/gitrepo 610s - searching for changes 610s - no changes found (ignoring 1 changesets without bookmarks or tags) 610s - [1] 610s - 610s -But what about untagged, but secret changesets? 610s - 610s - $ hg phase -fs tip 610s - $ hg push 610s - pushing to $TESTTMP/gitrepo 610s - searching for changes 610s - no changes found 610s - [1] 610s 610s ERROR: test-push-anonymous.t output changed 612s ! 612s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-empty-working-tree.t 612s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-empty-working-tree.t.err 612s @@ -10,29 +10,9 @@ 612s $ git init -q --bare repo.git 612s 612s $ hg clone gitrepo hgrepo 612s - importing 1 git commits 612s - new changesets 01708ca54a8f (1 drafts) 612s - updating to bookmark master 612s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 612s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 612s + abort: repository gitrepo not found 612s + [255] 612s $ cd hgrepo 612s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 612s $ hg log -r tip --template 'files: {files}\n' 612s - files: 612s - $ hg gverify 612s - verifying rev 01708ca54a8f against git commit 678256865a8c85ae925bf834369264193c88f8de 612s - 612s - $ hg debug-remove-hggit-state 612s - clearing out the git cache data 612s - $ hg push ../repo.git 612s - pushing to ../repo.git 612s - searching for changes 612s - adding objects 612s - remote: found 0 deltas to reuse 612s - added 1 commits with 1 trees and 0 blobs 612s - adding reference refs/heads/master 612s - $ cd .. 612s - $ git --git-dir=repo.git log --pretty=medium 612s - commit 678256865a8c85ae925bf834369264193c88f8de 612s - Author: test 612s - Date: Mon Jan 1 00:00:00 2007 +0000 612s - 612s - empty 612s 612s ERROR: test-empty-working-tree.t output changed 620s ! 620s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-gitignore-permissions.t 620s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-gitignore-permissions.t.err 620s @@ -4,6 +4,7 @@ 620s $ . "$TESTDIR/testutil" 620s 620s $ hg init repo 620s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 620s $ cd repo 620s 620s $ if test `whoami` = root 620s @@ -16,8 +17,14 @@ 620s 620s $ touch thefile 620s $ hg add thefile 620s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 620s $ hg ci -A -m commit 620s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 620s $ hg gexport 620s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 620s + hg: unknown command 'gexport' 620s + (did you mean one of export, import?) 620s + [10] 620s 620s Create a file that we can ignore 620s 620s @@ -33,9 +40,10 @@ 620s 620s $ echo nothingtoseehere > .gitignore 620s $ hg status 620s - not_readable: Permission denied 620s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 620s not_readable: Permission denied 620s ? .gitignore 620s + ? nothingtoseehere 620s 620s And notice that we really did ignore it! 620s 620s 620s ERROR: test-gitignore-permissions.t output changed 623s ! 623s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-ambiguousprefix.t 623s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-ambiguousprefix.t.err 623s @@ -21,13 +21,11 @@ 623s $ cd .. 623s 623s $ hg clone gitrepo hgrepo 623s - importing 3 git commits 623s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 623s - updating to bookmark master 623s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 623s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 623s + abort: repository gitrepo not found 623s + [255] 623s 623s $ cd hgrepo 623s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 623s 623s $ hg log -r 'gitnode(7e)' 623s - abort: git-mapfile@7e: ambiguous identifier!? (re) 623s - [50] 623s 623s ERROR: test-ambiguousprefix.t output changed 625s ! 625s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-gitignore-share.t 625s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-gitignore-share.t.err 625s @@ -9,6 +9,7 @@ 625s $ git init --quiet --bare repo.git 625s 625s $ hg init hgrepo 625s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 625s $ cd hgrepo 625s $ cat > .hg/hgrc < [paths] 625s @@ -16,26 +17,31 @@ 625s > EOF 625s $ echo ignored > .gitignore 625s $ hg add .gitignore 625s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 625s $ hg ci -m ignore 625s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 625s $ hg book master 625s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 625s $ hg push 625s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 625s pushing to $TESTTMP/repo.git 625s - searching for changes 625s - adding objects 625s - remote: found 0 deltas to reuse 625s - added 1 commits with 1 trees and 1 blobs 625s - adding reference refs/heads/master 625s + abort: repository $TESTTMP/repo.git not found 625s + [255] 625s $ cd .. 625s 625s We should also ignore the file in a shared repository: 625s 625s $ hg share hgrepo sharerepo 625s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 625s updating working directory 625s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 625s $ cd sharerepo 625s $ hg paths 625s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 625s default = $TESTTMP/repo.git 625s $ cat .gitignore 625s ignored 625s $ touch ignored 625s $ hg status 625s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 625s + ? ignored 625s 625s ERROR: test-gitignore-share.t output changed 632s ! 632s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-timezone.t 632s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-timezone.t.err 632s @@ -8,10 +8,13 @@ 632s $ . "$TESTDIR/testutil" 632s 632s $ hg init hgrepo 632s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 632s $ cd hgrepo 632s $ touch beta 632s $ hg add beta 632s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 632s $ fn_hg_commit -m "test commit" 632s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 632s $ cat >patch2 < # HG changeset patch 632s > # User J. User 632s @@ -28,5 +31,10 @@ 632s > +alpha 632s > EOF 632s $ hg import patch2 632s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 632s applying patch2 632s $ hg gexport 632s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 632s + hg: unknown command 'gexport' 632s + (did you mean one of export, import?) 632s + [10] 632s 632s ERROR: test-timezone.t output changed 639s ! 639s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-transplant.t 639s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-transplant.t.err 639s @@ -11,12 +11,20 @@ 639s > EOF 639s 639s $ hg init baserepo 639s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 639s $ cd baserepo 639s $ for c in A B C 639s > do 639s > echo $c > $c && hg add $c && fn_hg_commit -m $c 639s > done 639s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 639s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 639s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 639s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 639s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 639s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 639s $ hg clone -r 2 . ../otherrepo 639s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 639s adding changesets 639s adding manifests 639s adding file changes 639s @@ -26,6 +34,8 @@ 639s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 639s $ cd ../otherrepo 639s $ hg up 1 639s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 639s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 639s $ hg transplant -s ../baserepo tip 639s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 639s no changes found 639s 639s ERROR: test-transplant.t output changed 642s !s 642s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-url-parsing.py.out 642s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-url-parsing.py.err 642s @@ -1,46 +1,14 @@ 642s -% expect '/webjam/webjam.git' 642s -/webjam/webjam.git 642s -% expect 'github.com' 642s -github.com 642s -% expect '/webjam/webjam.git' 642s -/webjam/webjam.git 642s -% expect 'github.com' 642s -github.com 642s -% expect '19418' 642s -19418 642s -% expect 'webjam.git' 642s -webjam.git 642s -% expect 'git@heroku.com' 642s -git@heroku.com 642s -% expect '999' 642s -999 642s -% expect 'webjam/webjam.git' 642s -webjam/webjam.git 642s -% expect 'git@github.com' 642s -git@github.com 642s -% expect '42qu/vps.git' 642s -42qu/vps.git 642s -% expect 'git@github.com' 642s -git@github.com 642s -% expect '/webjam/webjam.git' 642s -/webjam/webjam.git 642s -% expect 'git@github.com' 642s -git@github.com 642s -% expect '/webjam/webjam.git' 642s -/webjam/webjam.git 642s -% expect 'git@github.com' 642s -git@github.com 642s -% expect '10022' 642s -10022 642s -% expect 'webjam.git' 642s -webjam.git 642s -% expect 'git@heroku.com' 642s -git@heroku.com 642s -% expect 'webjam.git' 642s -webjam.git 642s -% expect 'git@compatible.com' 642s -git@compatible.com 642s -% expect 'webjam.git' 642s -webjam.git 642s -% expect 'git@heroku.com' 642s -git@heroku.com 642s +Traceback (most recent call last): 642s + File "/tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-url-parsing.py", line 14, in 642s + from hggit.git_handler import GitHandler 642s + File "/usr/lib/python3/dist-packages/hggit/__init__.py", line 160, in 642s + from . import commands 642s + File "/usr/lib/python3/dist-packages/hggit/commands.py", line 26, in 642s + from . import verify 642s + File "/usr/lib/python3/dist-packages/hggit/verify.py", line 16, in 642s + from . import git2hg 642s + File "/usr/lib/python3/dist-packages/hggit/git2hg.py", line 8, in 642s + from dulwich.refs import ( 642s + ...<3 lines>... 642s + ) 642s +ImportError: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 642s 642s ERROR: test-url-parsing.py output changed 643s !. 643s --- /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-addbranchrevs.t 643s +++ /tmp/autopkgtest.XGDgyD/build.lIf/src/tests/test-addbranchrevs.t.err 643s @@ -7,14 +7,23 @@ 643s caused the pull to not update to the passed revision. 643s 643s $ hg init orig 643s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 643s $ cd orig 643s $ echo a > a; hg add a; hg ci -m a 643s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 643s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 643s $ hg branch foo -q 643s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 643s $ echo b > b; hg add b; hg ci -m b 643s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 643s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 643s 643s $ cd .. 643s $ hg clone orig clone -r 0 -q 643s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 643s $ cd clone 643s $ hg pull -u -r 1 -q 643s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 643s $ hg id -n 643s + *** failed to import extension "hggit" from /tmp/autopkgtest.XGDgyD/build.lIf/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 643s 1 643s 643s ERROR: test-addbranchrevs.t output changed 643s ! 643s Skipped test-check-black.t: missing feature: the black formatter for python (>= 22.3) 643s Skipped test-check-commit.t: missing feature: running tests from repository 643s Skipped test-check-pyflakes.t: missing feature: Pyflakes python linter 643s Skipped test-check-pylint.t: missing feature: Pylint python linter 643s Skipped test-encoding.t: blacklisted 643s Skipped test-gitignore-windows.t: missing feature: Windows 643s Skipped test-incoming.t: blacklisted 643s Skipped test-serve-ci.t: skipped 643s Skipped test-serve-dulwich.t: blacklisted 643s Failed test-addbranchrevs.t: output changed 643s Failed test-ambiguousprefix.t: output changed and returned error code 1 643s Failed test-annotate.t: output changed 643s Failed test-bookmark-workflow.t: output changed and returned error code 1 643s Failed test-branch-bookmark-suffix.t#with-path: output changed and returned error code 1 643s Failed test-branch-bookmark-suffix.t#without-path: output changed and returned error code 1 643s Failed test-bundle.t: output changed and returned error code 1 643s Failed test-clone.t#draft: output changed 643s Failed test-clone.t#secret: output changed 643s Failed test-conflict-1.t: output changed 643s Failed test-conflict-2.t: output changed 643s Failed test-convergedmerge.t: output changed 643s Failed test-empty-working-tree.t: output changed and returned error code 1 643s Failed test-extra.t: output changed and returned error code 1 643s Failed test-file-removal.t: output changed and returned error code 1 643s Failed test-gc.t: output changed and returned error code 1 643s Failed test-git-clone.t: output changed 643s Failed test-git-gpg.t: output changed and returned error code 1 643s Failed test-git-submodules.t: output changed and returned error code 1 643s Failed test-git-tags.t#draft: output changed and returned error code 1 643s Failed test-git-tags.t#secret: output changed and returned error code 1 643s Failed test-git-workflow.t: output changed 643s Failed test-gitignore-permissions.t: output changed 643s Failed test-gitignore-share.t: output changed 643s Failed test-gitignore.t: output changed 643s Failed test-help.t: output changed 643s Failed test-hg-author.t: output changed and returned error code 1 643s Failed test-hg-branch.t: output changed and returned error code 1 643s Failed test-hg-clone.t: output changed and returned error code 1 643s Failed test-hg-tags.t: output changed and returned error code 1 643s Failed test-hook.t: output changed 643s Failed test-illegal-contents.t: output changed 643s Failed test-invalid-refs.t: output changed and returned error code 1 643s Failed test-keywords.t: output changed and returned error code 1 643s Failed test-merge.t: output changed and returned error code 1 643s Failed test-multiple-remotes.t: output changed 643s Failed test-octopus.t: output changed and returned error code 1 643s Failed test-orphan-tags.t: output changed and returned error code 1 643s Failed test-outgoing.t: output changed and returned error code 1 643s Failed test-phases-draft.t: output changed and returned error code 1 643s Failed test-phases-public.t#publish-defaults: output changed and returned error code 1 643s Failed test-phases-public.t#publish-specific: output changed and returned error code 1 643s Failed test-phases-remote.t: output changed and returned error code 1 643s Failed test-pull-after-obsolete.t: output changed and returned error code 1 643s Failed test-pull-after-rebase.t: output changed and returned error code 1 643s Failed test-pull-after-strip.t: output changed and returned error code 1 643s Failed test-pull.t#draft: output changed 643s Failed test-pull.t#secret: output changed 643s Failed test-push-anonymous.t: output changed and returned error code 1 643s Failed test-push-authors.t: output changed and returned error code 1 643s Failed test-push-detached.t: output changed and returned error code 1 643s Failed test-push-missing-commit.t: output changed and returned error code 1 643s Failed test-push-phases.t: output changed and returned error code 1 643s Failed test-push-r.t: output changed 643s Failed test-push-to-head.t: output changed and returned error code 1 643s Failed test-push.t: output changed and returned error code 1 643s Failed test-renames.t: output changed and returned error code 1 643s Failed test-serve-git.t: output changed 643s Failed test-serve-hg-static.t: output changed 643s Failed test-serve-hg.t#with-hggit: output changed and returned error code 1 643s Failed test-serve-hg.t#without-hggit: output changed and returned error code 1 643s Failed test-subrepos-delete.t: output changed and returned error code 1 643s Failed test-subrepos-drop.t: output changed and returned error code 1 643s Failed test-subrepos-push.t: output changed and returned error code 1 643s Failed test-subrepos-syntax.t: output changed and returned error code 1 643s Failed test-subrepos.t: output changed and returned error code 1 643s Failed test-timezone.t: output changed 643s Failed test-transactions.t: output changed 643s Failed test-transplant.t: output changed 643s Failed test-tree-decomposition.t: output changed and returned error code 1 643s Failed test-url-parsing.py: output changed and returned error code 1 643s Failed test-verify-fail.t: output changed 643s # Ran 73 tests, 9 skipped, 72 failed. 643s python hash seed: 1213674982 643s make: *** [Makefile:15: tests] Error 1 644s autopkgtest [00:45:04]: test testsuite: -----------------------] 645s testsuite FAIL non-zero exit status 2 645s autopkgtest [00:45:05]: test testsuite: - - - - - - - - - - results - - - - - - - - - - 645s autopkgtest [00:45:05]: test mercurial-git: preparing testbed 663s Creating nova instance adt-resolute-s390x-hg-git-20260203-003420-juju-7f2275-prod-proposed-migration-environment-15-04d8ecaa-b23d-4b98-9d7b-5473c83d2cb8 from image adt/ubuntu-resolute-s390x-server-20260202.img (UUID 2cf7d089-99a1-4704-af48-01d74c62f797)... 734s autopkgtest [00:46:34]: testbed dpkg architecture: s390x 734s autopkgtest [00:46:34]: testbed apt version: 3.1.14 735s autopkgtest [00:46:35]: @@@@@@@@@@@@@@@@@@@@ test bed setup 735s autopkgtest [00:46:35]: testbed release detected to be: resolute 736s autopkgtest [00:46:36]: updating testbed package index (apt update) 736s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 736s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 736s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 736s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 736s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1278 kB] 737s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [105 kB] 737s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/restricted Sources [5256 B] 737s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [28.4 kB] 737s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main s390x Packages [123 kB] 737s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/universe s390x Packages [1002 kB] 737s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse s390x Packages [7312 B] 738s Fetched 2672 kB in 1s (1850 kB/s) 741s Reading package lists... 743s Hit:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease 743s Hit:2 http://ftpmaster.internal/ubuntu resolute InRelease 743s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 743s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 746s Reading package lists... 746s Reading package lists... 747s Building dependency tree... 747s Reading state information... 747s Calculating upgrade... 748s The following packages will be upgraded: 748s libexpat1 liblocale-gettext-perl 748s 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 748s Need to get 116 kB of archives. 748s After this operation, 1024 B of additional disk space will be used. 748s Get:1 http://ftpmaster.internal/ubuntu resolute/main s390x libexpat1 s390x 2.7.4-1 [99.7 kB] 748s Get:2 http://ftpmaster.internal/ubuntu resolute/main s390x liblocale-gettext-perl s390x 1.07-8 [15.9 kB] 749s dpkg-preconfigure: unable to re-open stdin: No such file or directory 749s Fetched 116 kB in 0s (2091 kB/s) 749s (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 ... 61953 files and directories currently installed.) 749s Preparing to unpack .../libexpat1_2.7.4-1_s390x.deb ... 749s Unpacking libexpat1:s390x (2.7.4-1) over (2.7.3-1) ... 749s Preparing to unpack .../liblocale-gettext-perl_1.07-8_s390x.deb ... 749s Unpacking liblocale-gettext-perl (1.07-8) over (1.07-7build1) ... 749s Setting up libexpat1:s390x (2.7.4-1) ... 749s Setting up liblocale-gettext-perl (1.07-8) ... 749s Processing triggers for man-db (2.13.1-1) ... 750s Processing triggers for libc-bin (2.42-2ubuntu4) ... 751s autopkgtest [00:46:51]: upgrading testbed (apt dist-upgrade and autopurge) 751s Reading package lists... 751s Building dependency tree... 751s Reading state information... 751s Calculating upgrade... 752s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 752s Reading package lists... 753s Building dependency tree... 753s Reading state information... 753s Solving dependencies... 753s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 756s Reading package lists... 757s Building dependency tree... 757s Reading state information... 758s Solving dependencies... 758s The following NEW packages will be installed: 758s git git-man liberror-perl mercurial mercurial-common mercurial-git 758s python3-dulwich 758s 0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded. 758s Need to get 9631 kB of archives. 758s After this operation, 51.9 MB of additional disk space will be used. 758s Get:1 http://ftpmaster.internal/ubuntu resolute/main s390x liberror-perl all 0.17030-1 [23.5 kB] 758s Get:2 http://ftpmaster.internal/ubuntu resolute/main s390x git-man all 1:2.51.0-1ubuntu1 [1179 kB] 758s Get:3 http://ftpmaster.internal/ubuntu resolute/main s390x git s390x 1:2.51.0-1ubuntu1 [4290 kB] 758s Get:4 http://ftpmaster.internal/ubuntu resolute/universe s390x mercurial-common all 7.1.1-1ubuntu1 [2789 kB] 758s Get:5 http://ftpmaster.internal/ubuntu resolute/universe s390x mercurial s390x 7.1.1-1ubuntu1 [456 kB] 758s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/universe s390x python3-dulwich s390x 1.0.0-2 [833 kB] 758s Get:7 http://ftpmaster.internal/ubuntu resolute/universe s390x mercurial-git all 1.2.0-1 [60.9 kB] 760s Fetched 9631 kB in 1s (14.9 MB/s) 760s Selecting previously unselected package liberror-perl. 760s (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 ... 61953 files and directories currently installed.) 760s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 760s Unpacking liberror-perl (0.17030-1) ... 760s Selecting previously unselected package git-man. 760s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 760s Unpacking git-man (1:2.51.0-1ubuntu1) ... 760s Selecting previously unselected package git. 760s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_s390x.deb ... 760s Unpacking git (1:2.51.0-1ubuntu1) ... 761s Selecting previously unselected package mercurial-common. 761s Preparing to unpack .../3-mercurial-common_7.1.1-1ubuntu1_all.deb ... 761s Unpacking mercurial-common (7.1.1-1ubuntu1) ... 761s Selecting previously unselected package mercurial. 761s Preparing to unpack .../4-mercurial_7.1.1-1ubuntu1_s390x.deb ... 761s Unpacking mercurial (7.1.1-1ubuntu1) ... 761s Selecting previously unselected package python3-dulwich. 761s Preparing to unpack .../5-python3-dulwich_1.0.0-2_s390x.deb ... 761s Unpacking python3-dulwich (1.0.0-2) ... 762s Selecting previously unselected package mercurial-git. 762s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 762s Unpacking mercurial-git (1.2.0-1) ... 762s Setting up mercurial-common (7.1.1-1ubuntu1) ... 769s Setting up liberror-perl (0.17030-1) ... 769s Setting up python3-dulwich (1.0.0-2) ... 771s Setting up git-man (1:2.51.0-1ubuntu1) ... 771s Setting up mercurial (7.1.1-1ubuntu1) ... 771s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 771s Setting up mercurial-git (1.2.0-1) ... 771s mercurial-git extension is disabled by default. 771s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 772s Setting up git (1:2.51.0-1ubuntu1) ... 772s Processing triggers for man-db (2.13.1-1) ... 777s autopkgtest [00:47:17]: test mercurial-git: [----------------------- 777s Initialized empty Git repository in /tmp/autopkgtest.XGDgyD/build.lIf/src/git_server/ 777s Cloning into 'git_clone'... 777s warning: You appear to have cloned an empty repository. 777s done. 777s [master (root-commit) ff5055a] a 777s 1 file changed, 1 insertion(+) 777s create mode 100644 a 777s To /tmp/autopkgtest.XGDgyD/build.lIf/src/git_server 777s * [new branch] master -> master 777s *** failed to import extension "hggit": cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 777s abort: repository git_server not found 778s autopkgtest [00:47:18]: test mercurial-git: -----------------------] 779s autopkgtest [00:47:19]: test mercurial-git: - - - - - - - - - - results - - - - - - - - - - 779s mercurial-git FAIL non-zero exit status 253 779s autopkgtest [00:47:19]: test mercurial-git: - - - - - - - - - - stderr - - - - - - - - - - 779s *** failed to import extension "hggit": cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 779s abort: repository git_server not found 779s autopkgtest [00:47:19]: @@@@@@@@@@@@@@@@@@@@ summary 779s testsuite FAIL non-zero exit status 2 779s mercurial-git FAIL non-zero exit status 253