0s autopkgtest [00:05:49]: starting date and time: 2026-02-03 00:05:49+0000 0s autopkgtest [00:05:49]: git checkout: 508d4a25 a-v-ssh wait_for_ssh: demote "ssh connection failed" to a debug message 0s autopkgtest [00:05:49]: host juju-7f2275-prod-proposed-migration-environment-9; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.km9r2gbm/out --timeout-copy=6000 --setup-commands 'ln -s /dev/null /etc/systemd/system/bluetooth.service; printf "http_proxy=http://squid.internal:3128\nhttps_proxy=http://squid.internal:3128\nno_proxy=127.0.0.1,127.0.1.1,localhost,localdomain,internal,login.ubuntu.com,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com\n" >> /etc/environment' --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 -- lxd -r lxd-armhf-10.145.243.254 lxd-armhf-10.145.243.254:autopkgtest/ubuntu/resolute/armhf 27s autopkgtest [00:06:16]: testbed dpkg architecture: armhf 29s autopkgtest [00:06:18]: testbed apt version: 3.1.14 33s autopkgtest [00:06:22]: @@@@@@@@@@@@@@@@@@@@ test bed setup 35s autopkgtest [00:06:24]: testbed release detected to be: None 43s autopkgtest [00:06:32]: updating testbed package index (apt update) 45s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 46s Get:2 http://ftpmaster.internal/ubuntu resolute InRelease [124 kB] 46s Get:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease [124 kB] 46s Get:4 http://ftpmaster.internal/ubuntu resolute-security InRelease [124 kB] 46s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1278 kB] 47s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [28.4 kB] 47s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [105 kB] 47s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/restricted Sources [5256 B] 47s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main armhf Packages [123 kB] 47s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/universe armhf Packages [968 kB] 47s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse armhf Packages [6600 B] 47s Get:12 http://ftpmaster.internal/ubuntu resolute/main Sources [1409 kB] 47s Get:13 http://ftpmaster.internal/ubuntu resolute/universe Sources [21.3 MB] 50s Get:14 http://ftpmaster.internal/ubuntu resolute/multiverse Sources [310 kB] 50s Get:15 http://ftpmaster.internal/ubuntu resolute/main armhf Packages [1373 kB] 50s Get:16 http://ftpmaster.internal/ubuntu resolute/universe armhf Packages [14.8 MB] 50s Get:17 http://ftpmaster.internal/ubuntu resolute/multiverse armhf Packages [176 kB] 54s Fetched 42.4 MB in 9s (4985 kB/s) 55s Reading package lists... 62s autopkgtest [00:06:51]: upgrading testbed (apt dist-upgrade and autopurge) 64s Reading package lists... 64s Building dependency tree... 64s Reading state information... 65s Calculating upgrade... 66s The following packages will be upgraded: 66s libexpat1 libgpg-error-l10n libgpg-error0 liblocale-gettext-perl pci.ids 66s 5 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 66s Need to get 466 kB of archives. 66s After this operation, 70.7 kB of additional disk space will be used. 66s Get:1 http://ftpmaster.internal/ubuntu resolute/main armhf libexpat1 armhf 2.7.4-1 [72.9 kB] 66s Get:2 http://ftpmaster.internal/ubuntu resolute/main armhf liblocale-gettext-perl armhf 1.07-8 [14.9 kB] 66s Get:3 http://ftpmaster.internal/ubuntu resolute/main armhf libgpg-error-l10n all 1.58-2 [9244 B] 66s Get:4 http://ftpmaster.internal/ubuntu resolute/main armhf libgpg-error0 armhf 1.58-2 [69.8 kB] 66s Get:5 http://ftpmaster.internal/ubuntu resolute/main armhf pci.ids all 0.0~2026.01.31-1 [299 kB] 67s Fetched 466 kB in 0s (969 kB/s) 67s (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 ... 68394 files and directories currently installed.) 67s Preparing to unpack .../libexpat1_2.7.4-1_armhf.deb ... 67s Unpacking libexpat1:armhf (2.7.4-1) over (2.7.3-1) ... 67s Preparing to unpack .../liblocale-gettext-perl_1.07-8_armhf.deb ... 67s Unpacking liblocale-gettext-perl (1.07-8) over (1.07-7build1) ... 67s Preparing to unpack .../libgpg-error-l10n_1.58-2_all.deb ... 67s Unpacking libgpg-error-l10n (1.58-2) over (1.58-1build1) ... 67s Preparing to unpack .../libgpg-error0_1.58-2_armhf.deb ... 67s Unpacking libgpg-error0:armhf (1.58-2) over (1.58-1build1) ... 67s Setting up libgpg-error0:armhf (1.58-2) ... 67s (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 ... 68394 files and directories currently installed.) 67s Preparing to unpack .../pci.ids_0.0~2026.01.31-1_all.deb ... 67s Unpacking pci.ids (0.0~2026.01.31-1) over (0.0~2025.12.16-1) ... 68s Setting up libexpat1:armhf (2.7.4-1) ... 68s Setting up pci.ids (0.0~2026.01.31-1) ... 68s Setting up libgpg-error-l10n (1.58-2) ... 68s Setting up liblocale-gettext-perl (1.07-8) ... 68s Processing triggers for man-db (2.13.1-1) ... 68s Processing triggers for libc-bin (2.42-2ubuntu4) ... 72s Reading package lists... 72s Building dependency tree... 72s Reading state information... 73s Solving dependencies... 74s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 80s autopkgtest [00:07:09]: rebooting testbed after setup commands that affected boot 135s autopkgtest [00:08:04]: testbed running kernel: Linux 6.8.0-87-generic #88~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Tue Oct 14 14:00:09 UTC 2 166s autopkgtest [00:08:35]: @@@@@@@@@@@@@@@@@@@@ apt-source hg-git 183s Get:1 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (dsc) [2142 B] 183s Get:2 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (tar) [222 kB] 183s Get:3 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (diff) [6816 B] 183s gpgv: Signature made Sun Feb 16 14:22:41 2025 UTC 183s gpgv: using RSA key 8F6DE104377F3B11E741748731F3144544A1741A 183s gpgv: issuer "tchet@debian.org" 183s gpgv: Can't check signature: No public key 183s dpkg-source: warning: cannot verify inline signature for ./hg-git_1.2.0-1.dsc: no acceptable signature found 184s autopkgtest [00:08:53]: testing package hg-git version 1.2.0-1 186s autopkgtest [00:08:55]: build not needed 193s autopkgtest [00:09:02]: test testsuite: preparing testbed 195s Reading package lists... 195s Building dependency tree... 195s Reading state information... 195s Solving dependencies... 196s The following NEW packages will be installed: 196s git git-man liberror-perl mercurial mercurial-common mercurial-git 196s python3-dulwich unzip 197s 0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded. 197s Need to get 10.1 MB of archives. 197s After this operation, 53.8 MB of additional disk space will be used. 197s Get:1 http://ftpmaster.internal/ubuntu resolute/main armhf liberror-perl all 0.17030-1 [23.5 kB] 197s Get:2 http://ftpmaster.internal/ubuntu resolute/main armhf git-man all 1:2.51.0-1ubuntu1 [1179 kB] 197s Get:3 http://ftpmaster.internal/ubuntu resolute/main armhf git armhf 1:2.51.0-1ubuntu1 [4649 kB] 199s Get:4 http://ftpmaster.internal/ubuntu resolute/universe armhf mercurial-common all 7.1.1-1ubuntu1 [2789 kB] 199s Get:5 http://ftpmaster.internal/ubuntu resolute/universe armhf mercurial armhf 7.1.1-1ubuntu1 [440 kB] 199s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/universe armhf python3-dulwich armhf 1.0.0-2 [756 kB] 200s Get:7 http://ftpmaster.internal/ubuntu resolute/universe armhf mercurial-git all 1.2.0-1 [60.9 kB] 200s Get:8 http://ftpmaster.internal/ubuntu resolute/main armhf unzip armhf 6.0-29ubuntu1 [167 kB] 200s Fetched 10.1 MB in 3s (3130 kB/s) 200s Selecting previously unselected package liberror-perl. 200s (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 ... 68394 files and directories currently installed.) 200s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 200s Unpacking liberror-perl (0.17030-1) ... 200s Selecting previously unselected package git-man. 200s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 200s Unpacking git-man (1:2.51.0-1ubuntu1) ... 200s Selecting previously unselected package git. 200s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_armhf.deb ... 200s Unpacking git (1:2.51.0-1ubuntu1) ... 201s Selecting previously unselected package mercurial-common. 201s Preparing to unpack .../3-mercurial-common_7.1.1-1ubuntu1_all.deb ... 201s Unpacking mercurial-common (7.1.1-1ubuntu1) ... 201s Selecting previously unselected package mercurial. 201s Preparing to unpack .../4-mercurial_7.1.1-1ubuntu1_armhf.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_armhf.deb ... 201s Unpacking python3-dulwich (1.0.0-2) ... 201s Selecting previously unselected package mercurial-git. 201s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 201s Unpacking mercurial-git (1.2.0-1) ... 201s Selecting previously unselected package unzip. 201s Preparing to unpack .../7-unzip_6.0-29ubuntu1_armhf.deb ... 201s Unpacking unzip (6.0-29ubuntu1) ... 201s Setting up mercurial-common (7.1.1-1ubuntu1) ... 203s Setting up unzip (6.0-29ubuntu1) ... 203s Setting up liberror-perl (0.17030-1) ... 203s Setting up python3-dulwich (1.0.0-2) ... 204s Setting up git-man (1:2.51.0-1ubuntu1) ... 204s Setting up mercurial (7.1.1-1ubuntu1) ... 204s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 205s Setting up mercurial-git (1.2.0-1) ... 205s mercurial-git extension is disabled by default. 205s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 205s Setting up git (1:2.51.0-1ubuntu1) ... 205s Processing triggers for man-db (2.13.1-1) ... 218s autopkgtest [00:09:27]: test testsuite: [----------------------- 220s no username found, using 'ubuntu@autopkgtest-lxd-aglgne.lxd' instead 220s cd tests && /usr/bin/python3 run-tests.py --with-hg=/usr/bin/hg --blacklist=/tmp/autopkgtest.PkQBX0/build.PYp/src/debian/hg-git.test_blacklist 220s sssrunning 82 tests using 8 parallel processes 222s ssss 222s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-git-tags.t 222s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-git-tags.t#draft.err 222s @@ -41,337 +41,13 @@ 222s Clone it: 222s 222s $ hg clone repo.git hgrepo 222s - importing 2 git commits 222s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 222s - updating to bookmark master 222s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 222s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 222s + abort: repository repo.git not found 222s + [255] 222s 222s $ cd hgrepo 222s + $TESTTMP.sh: 39: cd: can't cd to hgrepo 222s 222s Verify that annotated tags are unaffected by reexports: 222s 222s $ GIT_DIR=.hg/git git tag -ln 222s - beta added tag beta 222s - $ hg gexport 222s - $ GIT_DIR=.hg/git git tag -ln 222s - beta added tag beta 222s - 222s -Error checking on tag creation 222s - 222s - $ hg tag --git beta --remove 222s - abort: cannot remove git tags 222s - (the git documentation heavily discourages editing tags) 222s - [255] 222s - $ hg tag --git beta -r null 222s - abort: cannot remove git tags 222s - (the git documentation heavily discourages editing tags) 222s - [255] 222s - $ hg tag --git beta --remove -r 0 222s - abort: cannot specify both --rev and --remove 222s - [10] 222s - $ hg tag --git alpha 222s - abort: git tags require an explicit revision 222s - (please specify -r/--rev) 222s - [255] 222s - $ hg tag --git alpha alpha -r 0 222s - abort: tag names must be unique 222s - [255] 222s - $ hg tag --git alpha -r 0 -e 222s - abort: cannot specify both --git and --edit 222s - [10] 222s - $ hg tag --git alpha -r 0 -m 42 222s - abort: cannot specify both --git and --message 222s - [10] 222s - $ hg tag --git alpha -r 0 -d 42 222s - abort: cannot specify both --git and --date 222s - [10] 222s - $ hg tag --git alpha -r 0 -u user@example.com 222s - abort: cannot specify both --git and --user 222s - [10] 222s - $ hg tag --git 'with space' -r 0 222s - abort: the name 'with space' is not a valid git tag 222s - [255] 222s - $ hg tag --git ' beta' -r 0 222s - abort: the name 'beta' already exists 222s - [255] 222s - $ hg tag --git master -r 0 222s - abort: the name 'master' already exists 222s - [255] 222s - $ hg tag --git tip -r 0 222s - abort: the name 'tip' is reserved 222s - [10] 222s - 222s -Create a git tag from hg 222s - 222s - $ hg tag --git alpha --debug -r 0 222s - finding unexported changesets 222s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 222s - adding git tag alpha 222s - $ hg log --graph 222s - @ changeset: 1:7fe02317c63d 222s - | bookmark: master 222s - | tag: beta 222s - | tag: default/master 222s - | tag: tip 222s - | user: test 222s - | date: Mon Jan 01 00:00:11 2007 +0000 222s - | summary: add beta 222s - | 222s - o changeset: 0:ff7a2f2d8d70 222s - tag: alpha 222s - user: test 222s - date: Mon Jan 01 00:00:10 2007 +0000 222s - summary: add alpha 222s - 222s - $ echo beta-fix >> beta 222s - $ fn_hg_commit -m 'fix for beta' 222s -#if secret 222s - $ hg phase -d 222s -#endif 222s - $ hg push 222s - pushing to $TESTTMP/repo.git 222s - searching for changes 222s - adding objects 222s - remote: found 0 deltas to reuse 222s - added 1 commits with 1 trees and 1 blobs 222s - updating reference refs/heads/master 222s - adding reference refs/tags/alpha 222s - 222s -Verify that amending commits known to remotes doesn't break anything 222s - 222s - $ cat >> $HGRCPATH << EOF 222s - > [experimental] 222s - > evolution = createmarkers 222s - > evolution.createmarkers = yes 222s - > EOF 222s - $ hg tags 222s - tip 2:61175962e488 222s - default/master 2:61175962e488 222s - beta 1:7fe02317c63d 222s - alpha 0:ff7a2f2d8d70 222s - $ echo beta-fix-again >> beta 222s - $ fn_hg_commit --amend 222s - $ hg log -T shorttags 222s - 3:3094b9e8da41 draft tip 222s - 2:61175962e488 draft default/master X 222s - 1:7fe02317c63d draft beta 222s - 0:ff7a2f2d8d70 draft alpha 222s - $ hg tags 222s - tip 3:3094b9e8da41 222s - default/master 2:61175962e488 222s - beta 1:7fe02317c63d 222s - alpha 0:ff7a2f2d8d70 222s - $ hg push 222s - pushing to $TESTTMP/repo.git 222s - searching for changes 222s - abort: pushing refs/heads/master overwrites 3094b9e8da41 222s - [255] 222s - $ hg push -f 222s - pushing to $TESTTMP/repo.git 222s - searching for changes 222s - adding objects 222s - remote: found 0 deltas to reuse 222s - added 1 commits with 1 trees and 1 blobs 222s - updating reference refs/heads/master 222s - 222s -Now create a tag for the old, obsolete master 222s - 222s - $ cd ../repo.git 222s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 222s - $ git tag 222s - alpha 222s - beta 222s - detached 222s - $ cd ../hgrepo 222s - $ hg pull 222s - pulling from $TESTTMP/repo.git 222s - no changes found 222s - $ hg log -T shorttags 222s - 3:3094b9e8da41 draft default/master tip 222s - 2:61175962e488 draft detached X 222s - 1:7fe02317c63d draft beta 222s - 0:ff7a2f2d8d70 draft alpha 222s - $ hg tags 222s - tip 3:3094b9e8da41 222s - default/master 3:3094b9e8da41 222s - detached 2:61175962e488 222s - beta 1:7fe02317c63d 222s - alpha 0:ff7a2f2d8d70 222s - $ hg push 222s - pushing to $TESTTMP/repo.git 222s - searching for changes 222s - no changes found 222s - [1] 222s - 222s - $ cd .. 222s - 222s -Verify that revsets can point out git tags; for that we need an 222s -untagged commit. 222s - 222s - $ cd hgrepo 222s - $ touch gamma 222s - $ fn_hg_commit -A -m 'add gamma' 222s -#if secret 222s - $ hg phase -d 222s -#endif 222s - $ hg log -T shorttags -r 'gittag()' 222s - 0:ff7a2f2d8d70 draft alpha 222s - 1:7fe02317c63d draft beta 222s - 2:61175962e488 draft detached X 222s - $ hg log -T shorttags -r 'gittag(detached)' 222s - 2:61175962e488 draft detached X 222s - $ hg log -T shorttags -r 'gittag("re:a$")' 222s - 0:ff7a2f2d8d70 draft alpha 222s - 1:7fe02317c63d draft beta 222s - 222s -Create a git tag from hg, but pointing to a new commit: 222s - 222s - $ hg tag --git gamma --debug -r tip 222s - invalid branch cache (visible): tip differs (?) 222s - finding unexported changesets 222s - exporting 1 changesets 222s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 222s - packing 3 loose objects... 222s - packed 3 loose objects! 222s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 222s - adding git tag gamma 222s - $ hg push 222s - pushing to $TESTTMP/repo.git 222s - searching for changes 222s - adding objects 222s - remote: found 0 deltas to reuse 222s - added 1 commits with 1 trees and 1 blobs 222s - updating reference refs/heads/master 222s - adding reference refs/tags/gamma 222s - $ cd ../gitrepo 222s - $ git fetch --quiet --tags 222s - $ git tag 222s - alpha 222s - beta 222s - detached 222s - gamma 222s - $ cd .. 222s - 222s -Try to overwrite an annotated tag: 222s - 222s - $ cd hgrepo 222s - $ hg tags -v 222s - tip 4:0eb1ab0073a8 222s - gamma 4:0eb1ab0073a8 git 222s - default/master 4:0eb1ab0073a8 git-remote 222s - detached 2:61175962e488 git 222s - beta 1:7fe02317c63d git 222s - alpha 0:ff7a2f2d8d70 git 222s - $ hg book not-master 222s - $ hg tag beta 222s - abort: tag 'beta' already exists (use -f to force) 222s - [10] 222s - $ hg tag -f beta 222s -#if secret 222s - $ hg phase -d 222s -#endif 222s - $ hg push 222s - pushing to $TESTTMP/repo.git 222s - warning: not overwriting annotated tag 'beta' 222s - searching for changes 222s - adding objects 222s - remote: found 0 deltas to reuse 222s - added 1 commits with 1 trees and 1 blobs 222s - adding reference refs/heads/not-master 222s - $ hg tags 222s - tip 5:c49682c7cba4 222s - default/not-master 5:c49682c7cba4 222s - gamma 4:0eb1ab0073a8 222s - default/master 4:0eb1ab0073a8 222s - beta 4:0eb1ab0073a8 222s - detached 2:61175962e488 222s - alpha 0:ff7a2f2d8d70 222s - $ cd .. 222s - 222s -Check whether `gimport` handles tags 222s - 222s - $ cd hgrepo 222s - $ rm .hg/git-tags .hg/git-mapfile 222s - $ hg gimport 222s - importing 6 git commits 222s - $ hg tags -q 222s - tip 222s - default/not-master 222s - gamma 222s - default/master 222s - beta 222s - detached 222s - alpha 222s - $ cd .. 222s - 222s -Test how pulling an explicit branch with an annotated tag: 222s - 222s - $ hg clone -r master repo.git hgrepo-2 222s - importing 4 git commits 222s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 222s - updating to branch default 222s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 222s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 222s - 0:ff7a2f2d8d70 draft alpha 222s - 1:7fe02317c63d draft beta 222s - 3:0eb1ab0073a8 draft default/master gamma tip 222s - $ hg tags -v -R hgrepo-2 222s - tip 3:0eb1ab0073a8 222s - gamma 3:0eb1ab0073a8 git 222s - default/master 3:0eb1ab0073a8 git-remote 222s - beta 1:7fe02317c63d git 222s - alpha 0:ff7a2f2d8d70 git 222s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 222s - $ rm -rf hgrepo-2 222s - 222s - $ hg clone -r master repo.git hgrepo-2 222s - importing 4 git commits 222s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 222s - updating to branch default 222s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 222s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 222s - 0:ff7a2f2d8d70 draft alpha 222s - 1:7fe02317c63d draft beta 222s - 3:0eb1ab0073a8 draft default/master gamma tip 222s -This used to die: 222s - $ hg -R hgrepo-2 gexport 222s -This used to fail, since we didn't actually pull the annotated tag: 222s - $ hg -R hgrepo-2 push 222s - pushing to $TESTTMP/repo.git 222s - searching for changes 222s - no changes found 222s - [1] 222s - $ rm -rf hgrepo-2 222s - 222s -Check that pulling will update phases only: 222s - 222s - $ cd hgrepo 222s - $ hg phase -fs gamma detached 222s - $ hg pull 222s - pulling from $TESTTMP/repo.git 222s - no changes found 222s - $ hg log -T shorttags -r gamma -r detached 222s - 4:0eb1ab0073a8 draft beta default/master gamma 222s - 2:61175962e488 draft detached X 222s - $ cd .. 222s - 222s -Check that we pull new tags to existing commits: 222s - $ cd gitrepo 222s - $ git tag 222s - alpha 222s - beta 222s - detached 222s - gamma 222s - $ fn_git_tag extra-simple-tag 222s - $ fn_git_tag -m annotated extra-annotated-tag 222s - $ git push --tags 222s - To $TESTTMP/repo.git 222s - * [new tag] extra-annotated-tag -> extra-annotated-tag 222s - * [new tag] extra-simple-tag -> extra-simple-tag 222s - $ cd ../hgrepo 222s - $ hg pull -r master 222s - pulling from $TESTTMP/repo.git 222s - no changes found 222s - $ hg tags -v | grep extra 222s - extra-simple-tag 1:7fe02317c63d git 222s - extra-annotated-tag 1:7fe02317c63d git 222s 222s ERROR: test-git-tags.t#draft output changed 222s ! 222s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-pull-after-rebase.t 222s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-pull-after-rebase.t.err 222s @@ -38,275 +38,9 @@ 222s Clone it and rebase the branch 222s 222s $ hg clone -U repo.git hgrepo 222s - importing 3 git commits 222s - new changesets ff7a2f2d8d70:205a004356ef (3 drafts) 222s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 222s + abort: repository repo.git not found 222s + [255] 222s $ cd hgrepo 222s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 222s $ hg state 222s - o branch default/branch tip 2:205a004356ef32b8da782afb89d9179d12ca31e9 222s - | add gamma 222s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 222s - |/ add beta 222s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 222s - add alpha 222s - $ hg up branch 222s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 222s - (activating bookmark branch) 222s - $ hg rebase --quiet -d master 222s - $ hg state 222s - @ branch tip 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 222s - | add gamma 222s - | x default/branch 2:205a004356ef32b8da782afb89d9179d12ca31e9 222s - | | add gamma 222s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 222s - |/ add beta 222s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 222s - add alpha 222s - 222s - $ hg push -fr tip 222s - pushing to $TESTTMP/repo.git 222s - searching for changes 222s - adding objects 222s - remote: found 0 deltas to reuse 222s - added 1 commits with 1 trees and 1 blobs 222s - updating reference refs/heads/branch 222s - $ cd .. 222s - 222s -Now switch back to git and create a new commit based on what we just rebased 222s - 222s - $ cd gitrepo 222s - $ git checkout --quiet -b otherbranch branch 222s - $ git log --oneline --graph --all --decorate 222s - * e5023f9 (HEAD -> otherbranch, origin/branch, branch) add gamma 222s - | * 9497a4e (origin/master, master) add beta 222s - |/ 222s - * 7eeab2e add alpha 222s - $ echo delta > delta 222s - $ git add delta 222s - $ fn_git_commit -m 'add delta' 222s - $ git push --quiet --set-upstream origin otherbranch 222s - Branch 'otherbranch' set up to track remote branch 'otherbranch' from 'origin'. (?) 222s - $ git log --oneline --graph --all --decorate 222s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 222s - * e5023f9 (origin/branch, branch) add gamma 222s - | * 9497a4e (origin/master, master) add beta 222s - |/ 222s - * 7eeab2e add alpha 222s - $ cd .. 222s - 222s -Pull that 222s - 222s - $ cd hgrepo 222s - $ hg pull 222s - pulling from $TESTTMP/repo.git 222s - importing 1 git commits 222s - adding bookmark otherbranch 222s - 1 new orphan changesets 222s - new changesets 075302705298 (1 drafts) 222s - (run 'hg heads' to see heads, 'hg merge' to merge) 222s - $ hg state 222s - * otherbranch default/otherbranch tip 4:0753027052980aef9c9c37adb7d76d5719e8d818 222s - | add delta 222s - | @ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 222s - | | add gamma 222s - x | 2:205a004356ef32b8da782afb89d9179d12ca31e9 222s - | | add gamma 222s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 222s - |/ add beta 222s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 222s - add alpha 222s - 222s - $ cd .. 222s - 222s -To reproduce bug #386, do like github and save the old commit in a 222s -ref, and create a clone containing just the converted git commits: 222s - 222s - $ cd repo.git 222s - $ git update-ref refs/pr/1 otherbranch 222s - $ cd .. 222s - $ hg clone -U repo.git hgrepo-issue386 222s - importing 5 git commits 222s - new changesets ff7a2f2d8d70:075302705298 (5 drafts) 222s - 222s -Now try rebasing that branch, from the Git side of things 222s - 222s - $ cd gitrepo 222s - $ git checkout -q otherbranch 222s - $ git log --oneline --graph --all --decorate 222s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 222s - * e5023f9 (origin/branch, branch) add gamma 222s - | * 9497a4e (origin/master, master) add beta 222s - |/ 222s - * 7eeab2e add alpha 222s - $ fn_git_rebase --onto master branch otherbranch 222s - $ git log --oneline --graph --all --decorate 222s - * 9c58139 (HEAD -> otherbranch) add delta 222s - * 9497a4e (origin/master, master) add beta 222s - | * bba0011 (origin/otherbranch) add delta 222s - | * e5023f9 (origin/branch, branch) add gamma 222s - |/ 222s - * 7eeab2e add alpha 222s - $ git push -f 222s - To $TESTTMP/repo.git 222s - + bba0011...9c58139 otherbranch -> otherbranch (forced update) 222s - $ git log --oneline --graph --all --decorate 222s - * 9c58139 (HEAD -> otherbranch, origin/otherbranch) add delta 222s - * 9497a4e (origin/master, master) add beta 222s - | * e5023f9 (origin/branch, branch) add gamma 222s - |/ 222s - * 7eeab2e add alpha 222s - $ cd .. 222s - 222s -Now strip the old commit 222s - 222s - $ cd hgrepo-issue386 222s - $ hg up null 222s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 222s - $ hg id -qr otherbranch 222s - 075302705298 222s - $ hg pull 222s - pulling from $TESTTMP/repo.git 222s - importing 1 git commits 222s - not updating diverged bookmark otherbranch 222s - new changesets d64bf0521af6 (1 drafts) 222s - (run 'hg heads .' to see heads, 'hg merge' to merge) 222s - $ hg debugstrip --hidden --no-backup otherbranch 222s - $ hg book -d otherbranch 222s - $ hg git-cleanup 222s - git commit map cleaned 222s - $ hg pull 222s - pulling from $TESTTMP/repo.git 222s - no changes found 222s - adding bookmark otherbranch 222s - $ cd .. 222s - 222s -And check that pulling something else doesn't delete that branch. 222s - 222s - $ cd hgrepo 222s - $ hg pull -r master 222s - pulling from $TESTTMP/repo.git 222s - no changes found 222s - $ cd .. 222s - 222s -A special case, is that we can pull into a repository, where a commit 222s -corresponding to the new branch exists, but that commit is obsolete. 222s -In order to avoid “pinning” the obsolete commit, and thereby making it 222s -visible, we first pull from Git as an unnamed remote. 222s - 222s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 222s - updating to branch default 222s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 222s - $ cd hgrepo-clone 222s - $ hg pull ../repo.git 222s - pulling from ../repo.git 222s - importing 4 git commits 222s - not updating diverged bookmark otherbranch 222s - new changesets d64bf0521af6 (1 drafts) 222s - (run 'hg heads .' to see heads, 'hg merge' to merge) 222s - $ hg debugobsolete d64bf0521af68fe2160791a1b4ab9baf282a3879 222s - 1 new obsolescence markers 222s - obsoleted 1 changesets 222s - $ cp ../hgrepo/.hg/hgrc .hg 222s - $ hg pull 222s - pulling from $TESTTMP/repo.git 222s - no changes found 222s - not updating diverged bookmark otherbranch 222s - $ cd .. 222s - $ rm -rf hgrepo-clone 222s - 222s -Another special case, is that we should update commits over obsolete boundaries: 222s - 222s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 222s - updating to branch default 222s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 222s - $ cd hgrepo-clone 222s - $ hg pull ../repo.git 222s - pulling from ../repo.git 222s - importing 4 git commits 222s - not updating diverged bookmark otherbranch 222s - new changesets d64bf0521af6 (1 drafts) 222s - (run 'hg heads .' to see heads, 'hg merge' to merge) 222s - $ hg debugobsolete 0753027052980aef9c9c37adb7d76d5719e8d818 d64bf0521af68fe2160791a1b4ab9baf282a3879 222s - 1 new obsolescence markers 222s - obsoleted 1 changesets 222s - $ hg book -r 075302705298 otherbranch 222s - $ cp ../hgrepo/.hg/hgrc .hg 222s - $ hg pull 222s - pulling from $TESTTMP/repo.git 222s - no changes found 222s - updating bookmark otherbranch 222s - $ cd .. 222s - $ rm -rf hgrepo-clone 222s - 222s -Now just pull it: 222s - 222s - $ cd hgrepo 222s - $ hg pull 222s - pulling from $TESTTMP/repo.git 222s - importing 1 git commits 222s - not updating diverged bookmark otherbranch 222s - new changesets d64bf0521af6 (1 drafts) 222s - (run 'hg heads .' to see heads, 'hg merge' to merge) 222s - $ hg state 222s - o default/otherbranch tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 222s - | add delta 222s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 222s - | | add delta 222s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 222s - | | add gamma 222s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 222s - | | add gamma 222s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 222s - |/ add beta 222s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 222s - add alpha 222s - $ cd .. 222s - 222s -And finally, delete it: 222s - 222s - $ cd gitrepo 222s - $ git push origin :otherbranch 222s - To $TESTTMP/repo.git 222s - - [deleted] otherbranch 222s - $ cd .. 222s - 222s -And pull that: 222s - 222s - $ cd hgrepo 222s - $ hg pull 222s - pulling from $TESTTMP/repo.git 222s - no changes found 222s - not deleting diverged bookmark otherbranch 222s - $ hg state 222s - o tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 222s - | add delta 222s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 222s - | | add delta 222s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 222s - | | add gamma 222s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 222s - | | add gamma 222s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 222s - |/ add beta 222s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 222s - add alpha 222s - $ cd .. 222s - 222s -We only get that message once: 222s - 222s - $ hg -R hgrepo pull 222s - pulling from $TESTTMP/repo.git 222s - no changes found 222s - 222s -Now try deleting one already gone locally, which shouldn't output 222s -anything: 222s - 222s - $ cd gitrepo 222s - $ git push origin :branch 222s - To $TESTTMP/repo.git 222s - - [deleted] branch 222s - $ cd ../hgrepo 222s - $ hg book -d branch 222s - $ hg pull 222s - pulling from $TESTTMP/repo.git 222s - no changes found 222s - $ cd .. 222s 222s ERROR: test-pull-after-rebase.t output changed 223s ! 223s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-renames.t 223s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-renames.t.err 223s @@ -95,494 +95,9 @@ 223s 223s $ cd .. 223s $ hg clone -q repo.git hgrepo 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 223s + abort: repository repo.git not found 223s + [255] 223s $ cd hgrepo 223s + $TESTTMP.sh: 115: cd: can't cd to hgrepo 223s $ hg book master -q 223s - $ hg log -p --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 223s - @ 8 497105ddbe119aa40af691eb2b1a029c29bf5247 remove submodule and rename back 223s - | branch=default hg-git-rename-source=git 223s - | 223s - | diff --git a/.hgsub b/.hgsub 223s - | --- a/.hgsub 223s - | +++ b/.hgsub 223s - | @@ -1,2 +1,1 @@ 223s - | gitsubmodule2 = [git]../gitsubmodule 223s - | -gamma = [git]../gitsubmodule 223s - | diff --git a/.hgsubstate b/.hgsubstate 223s - | --- a/.hgsubstate 223s - | +++ b/.hgsubstate 223s - | @@ -1,2 +1,1 @@ 223s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 223s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 223s - | diff --git a/gamma-new b/gamma 223s - | rename from gamma-new 223s - | rename to gamma 223s - | 223s - o 7 adfc1ce8461d3174dcf8425e112e2fa848de3913 rename and add submodule 223s - | branch=default hg-git-rename-source=git 223s - | 223s - | diff --git a/.hgsub b/.hgsub 223s - | --- a/.hgsub 223s - | +++ b/.hgsub 223s - | @@ -1,1 +1,2 @@ 223s - | gitsubmodule2 = [git]../gitsubmodule 223s - | +gamma = [git]../gitsubmodule 223s - | diff --git a/.hgsubstate b/.hgsubstate 223s - | --- a/.hgsubstate 223s - | +++ b/.hgsubstate 223s - | @@ -1,1 +1,2 @@ 223s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 223s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 223s - | diff --git a/gamma b/gamma-new 223s - | rename from gamma 223s - | rename to gamma-new 223s - | 223s - o 6 62c1a4b07240b53a71be1b1a46e94e99132c5391 beta renamed back 223s - | branch=default hg-git-rename-source=git 223s - | 223s - | diff --git a/beta b/beta 223s - | old mode 120000 223s - | new mode 100644 223s - | --- a/beta 223s - | +++ b/beta 223s - | @@ -1,1 +1,12 @@ 223s - | -beta-new 223s - | \ No newline at end of file 223s - | +1 223s - | +2 223s - | +3 223s - | +4 223s - | +5 223s - | +6 223s - | +7 223s - | +8 223s - | +9 223s - | +10 223s - | +11 223s - | +12 223s - | diff --git a/beta-new b/beta-new 223s - | deleted file mode 100644 223s - | --- a/beta-new 223s - | +++ /dev/null 223s - | @@ -1,12 +0,0 @@ 223s - | -1 223s - | -2 223s - | -3 223s - | -4 223s - | -5 223s - | -6 223s - | -7 223s - | -8 223s - | -9 223s - | -10 223s - | -11 223s - | -12 223s - | 223s - o 5 f93fefed957cff2220d3f0d11182398350b5fa9a beta renamed 223s - | branch=default hg-git-rename-source=git 223s - | 223s - | diff --git a/beta b/beta 223s - | old mode 100644 223s - | new mode 120000 223s - | --- a/beta 223s - | +++ b/beta 223s - | @@ -1,12 +1,1 @@ 223s - | -1 223s - | -2 223s - | -3 223s - | -4 223s - | -5 223s - | -6 223s - | -7 223s - | -8 223s - | -9 223s - | -10 223s - | -11 223s - | -12 223s - | +beta-new 223s - | \ No newline at end of file 223s - | diff --git a/beta b/beta-new 223s - | copy from beta 223s - | copy to beta-new 223s - | 223s - o 4 b9e63d96abc2783afc59246e798a6936cf05a35e move submodule 223s - | branch=default hg-git-rename-source=git 223s - | 223s - | diff --git a/.hgsub b/.hgsub 223s - | --- a/.hgsub 223s - | +++ b/.hgsub 223s - | @@ -1,1 +1,1 @@ 223s - | -gitsubmodule = [git]../gitsubmodule 223s - | +gitsubmodule2 = [git]../gitsubmodule 223s - | diff --git a/.hgsubstate b/.hgsubstate 223s - | --- a/.hgsubstate 223s - | +++ b/.hgsubstate 223s - | @@ -1,1 +1,1 @@ 223s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 223s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 223s - | 223s - o 3 55537ea256c28be1b5637f4f93a601fdde8a9a7f add submodule 223s - | branch=default hg-git-rename-source=git 223s - | 223s - | diff --git a/.hgsub b/.hgsub 223s - | new file mode 100644 223s - | --- /dev/null 223s - | +++ b/.hgsub 223s - | @@ -0,0 +1,1 @@ 223s - | +gitsubmodule = [git]../gitsubmodule 223s - | diff --git a/.hgsubstate b/.hgsubstate 223s - | new file mode 100644 223s - | --- /dev/null 223s - | +++ b/.hgsubstate 223s - | @@ -0,0 +1,1 @@ 223s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 223s - | 223s - o 2 20f9e56b6d006d0403f853245e483d0892b8ac48 gamma 223s - | branch=default hg-git-rename-source=git 223s - | 223s - | diff --git a/beta b/beta 223s - | --- a/beta 223s - | +++ b/beta 223s - | @@ -9,3 +9,4 @@ 223s - | 9 223s - | 10 223s - | 11 223s - | +12 223s - | diff --git a/beta b/gamma 223s - | copy from beta 223s - | copy to gamma 223s - | --- a/beta 223s - | +++ b/gamma 223s - | @@ -9,3 +9,4 @@ 223s - | 9 223s - | 10 223s - | 11 223s - | +13 223s - | 223s - o 1 9f7744e68def81da3b394f11352f602ca9c8ab68 beta 223s - | branch=default hg-git-rename-source=git 223s - | 223s - | diff --git a/alpha b/beta 223s - | rename from alpha 223s - | rename to beta 223s - | --- a/alpha 223s - | +++ b/beta 223s - | @@ -8,3 +8,4 @@ 223s - | 8 223s - | 9 223s - | 10 223s - | +11 223s - | 223s - o 0 7bc844166f76e49562f81eacd54ea954d01a9e42 alpha 223s - branch=default hg-git-rename-source=git 223s - 223s - diff --git a/alpha b/alpha 223s - new file mode 100644 223s - --- /dev/null 223s - +++ b/alpha 223s - @@ -0,0 +1,10 @@ 223s - +1 223s - +2 223s - +3 223s - +4 223s - +5 223s - +6 223s - +7 223s - +8 223s - +9 223s - +10 223s - 223s - 223s -Make a new ordinary commit in Mercurial (no extra metadata) 223s - $ echo 14 >> gamma 223s - $ hg ci -m "gamma2" 223s - 223s -Make a new commit with a copy and a rename in Mercurial 223s - $ hg cp gamma delta 223s - $ echo 15 >> delta 223s - $ hg mv beta epsilon 223s - $ echo 16 >> epsilon 223s - $ hg ci -m "delta/epsilon" 223s - $ hg export . 223s - # HG changeset patch 223s - # User test 223s - # Date 0 0 223s - # Thu Jan 01 00:00:00 1970 +0000 223s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 223s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 223s - delta/epsilon 223s - 223s - diff --git a/gamma b/delta 223s - copy from gamma 223s - copy to delta 223s - --- a/gamma 223s - +++ b/delta 223s - @@ -11,3 +11,4 @@ 223s - 11 223s - 13 223s - 14 223s - +15 223s - diff --git a/beta b/epsilon 223s - rename from beta 223s - rename to epsilon 223s - --- a/beta 223s - +++ b/epsilon 223s - @@ -10,3 +10,4 @@ 223s - 10 223s - 11 223s - 12 223s - +16 223s - $ hg push 223s - pushing to $TESTTMP/repo.git 223s - searching for changes 223s - adding objects 223s - remote: found 0 deltas to reuse 223s - added 2 commits with 2 trees and 3 blobs 223s - updating reference refs/heads/master 223s - 223s - $ cd ../repo.git 223s - $ git log master --pretty=oneline 223s - 5f2948d029693346043f320620af99a615930dc4 delta/epsilon 223s - bbd2ec050f7fbc64f772009844f7d58a556ec036 gamma2 223s - 50d116676a308b7c22935137d944e725d2296f2a remove submodule and rename back 223s - 59fb8e82ea18f79eab99196f588e8948089c134f rename and add submodule 223s - f95497455dfa891b4cd9b524007eb9514c3ab654 beta renamed back 223s - 055f482277da6cd3dd37c7093d06983bad68f782 beta renamed 223s - d7f31298f27df8a9226eddb1e4feb96922c46fa5 move submodule 223s - c610256cb6959852d9e70d01902a06726317affc add submodule 223s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 223s - cc83241f39927232f690d370894960b0d1943a0e beta 223s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 223s - 223s -Make sure the right metadata is stored 223s - $ git cat-file commit master^ 223s - tree 0adbde18545845f3b42ad1a18939ed60a9dec7a8 223s - parent 50d116676a308b7c22935137d944e725d2296f2a 223s - author test 0 +0000 223s - committer test 0 +0000 223s - HG:rename-source hg 223s - 223s - gamma2 223s - $ git cat-file commit master 223s - tree f8f32f4e20b56a5a74582c6a5952c175bf9ec155 223s - parent bbd2ec050f7fbc64f772009844f7d58a556ec036 223s - author test 0 +0000 223s - committer test 0 +0000 223s - HG:rename gamma:delta 223s - HG:rename beta:epsilon 223s - 223s - delta/epsilon 223s - 223s -Now make another clone and compare the hashes 223s - 223s - $ cd .. 223s - $ hg clone -q repo.git hgrepo2 223s - $ cd hgrepo2 223s - $ hg book master -qf 223s - $ hg export master 223s - # HG changeset patch 223s - # User test 223s - # Date 0 0 223s - # Thu Jan 01 00:00:00 1970 +0000 223s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 223s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 223s - delta/epsilon 223s - 223s - diff --git a/gamma b/delta 223s - copy from gamma 223s - copy to delta 223s - --- a/gamma 223s - +++ b/delta 223s - @@ -11,3 +11,4 @@ 223s - 11 223s - 13 223s - 14 223s - +15 223s - diff --git a/beta b/epsilon 223s - rename from beta 223s - rename to epsilon 223s - --- a/beta 223s - +++ b/epsilon 223s - @@ -10,3 +10,4 @@ 223s - 10 223s - 11 223s - 12 223s - +16 223s - 223s -Regenerate the Git metadata and compare the hashes 223s - $ hg debug-remove-hggit-state 223s - clearing out the git cache data 223s - $ hg gexport 223s - $ cd .hg/git 223s - $ git log master --pretty=oneline 223s - f3f6592447685566af9447c03ae262aa5432511d delta/epsilon (dulwich-rust !) 223s - c51ce14ec367c5ea72bf428dee3f8576f2fe1bb0 gamma2 (dulwich-rust !) 223s - df749cae534e3c7a0ad664cd0f214dd36e0ac259 remove submodule and rename back (dulwich-rust !) 223s - 8f9ec605ad0cc2532202f73cef8e35d3241797ee rename and add submodule (dulwich-rust !) 223s - 8a00d0fb75377c51c9a46e92ff154c919007f0e2 delta/epsilon (no-dulwich-rust !) 223s - dd7d4f1adb942a8d349dce585019f6949184bc64 gamma2 (no-dulwich-rust !) 223s - 3f1cdaf8b603816fcda02bd29e75198ae4cb13db remove submodule and rename back (no-dulwich-rust !) 223s - 2a4abf1178a999e2054158ceb0c7768079665d03 rename and add submodule (no-dulwich-rust !) 223s - 88c416e8d5e0e9dd1187d45ebafaa46111764196 beta renamed back 223s - 027d2a6e050705bf6f7e226e7e97f02ce5ae3200 beta renamed 223s - dc70e620634887e70ac5dd108bcc7ebd99c60ec3 move submodule 223s - c610256cb6959852d9e70d01902a06726317affc add submodule 223s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 223s - cc83241f39927232f690d370894960b0d1943a0e beta 223s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 223s - 223s -Test findcopiesharder 223s - 223s - $ cd $TESTTMP 223s - $ git init -q gitcopyharder 223s - $ cd gitcopyharder 223s - $ cat >> file0 << EOF 223s - > 1 223s - > 2 223s - > 3 223s - > 4 223s - > 5 223s - > EOF 223s - $ git add file0 223s - $ fn_git_commit -m file0 223s - $ cp file0 file1 223s - $ git add file1 223s - $ fn_git_commit -m file1 223s - $ cp file0 file2 223s - $ echo 6 >> file2 223s - $ git add file2 223s - $ fn_git_commit -m file2 223s - 223s - $ cd .. 223s - 223s -Clone without findcopiesharder does not find copies from unmodified files 223s - 223s - $ hg clone gitcopyharder hgnocopyharder 223s - importing 3 git commits 223s - new changesets b45d023c6842:ec77ccdbefe0 (3 drafts) 223s - updating to bookmark master 223s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 223s - $ hg -R hgnocopyharder export 1::2 223s - # HG changeset patch 223s - # User test 223s - # Date 1167609621 0 223s - # Mon Jan 01 00:00:21 2007 +0000 223s - # Node ID 555831c93e2a250e5ba42efad45bf7ba71da13e4 223s - # Parent b45d023c6842337ffe694663a44aa672d311081c 223s - file1 223s - 223s - diff --git a/file1 b/file1 223s - new file mode 100644 223s - --- /dev/null 223s - +++ b/file1 223s - @@ -0,0 +1,5 @@ 223s - +1 223s - +2 223s - +3 223s - +4 223s - +5 223s - # HG changeset patch 223s - # User test 223s - # Date 1167609622 0 223s - # Mon Jan 01 00:00:22 2007 +0000 223s - # Node ID ec77ccdbefe023eb9898b0399f84f670c8c0f5fc 223s - # Parent 555831c93e2a250e5ba42efad45bf7ba71da13e4 223s - file2 223s - 223s - diff --git a/file2 b/file2 223s - new file mode 100644 223s - --- /dev/null 223s - +++ b/file2 223s - @@ -0,0 +1,6 @@ 223s - +1 223s - +2 223s - +3 223s - +4 223s - +5 223s - +6 223s - 223s -findcopiesharder finds copies from unmodified files if similarity is met 223s - 223s - $ hg --config git.findcopiesharder=true clone gitcopyharder hgcopyharder0 223s - importing 3 git commits 223s - new changesets b45d023c6842:9b3099834272 (3 drafts) 223s - updating to bookmark master 223s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 223s - $ hg -R hgcopyharder0 export 1::2 223s - # HG changeset patch 223s - # User test 223s - # Date 1167609621 0 223s - # Mon Jan 01 00:00:21 2007 +0000 223s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 223s - # Parent b45d023c6842337ffe694663a44aa672d311081c 223s - file1 223s - 223s - diff --git a/file0 b/file1 223s - copy from file0 223s - copy to file1 223s - # HG changeset patch 223s - # User test 223s - # Date 1167609622 0 223s - # Mon Jan 01 00:00:22 2007 +0000 223s - # Node ID 9b30998342729c7357d418bebed7399986cfe643 223s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 223s - file2 223s - 223s - diff --git a/file0 b/file2 223s - copy from file0 223s - copy to file2 223s - --- a/file0 223s - +++ b/file2 223s - @@ -3,3 +3,4 @@ 223s - 3 223s - 4 223s - 5 223s - +6 223s - 223s - $ hg --config git.findcopiesharder=true --config git.similarity=95 clone gitcopyharder hgcopyharder1 223s - importing 3 git commits 223s - new changesets b45d023c6842:d9d2e8cbf050 (3 drafts) 223s - updating to bookmark master 223s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 223s - $ hg -R hgcopyharder1 export 1::2 223s - # HG changeset patch 223s - # User test 223s - # Date 1167609621 0 223s - # Mon Jan 01 00:00:21 2007 +0000 223s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 223s - # Parent b45d023c6842337ffe694663a44aa672d311081c 223s - file1 223s - 223s - diff --git a/file0 b/file1 223s - copy from file0 223s - copy to file1 223s - # HG changeset patch 223s - # User test 223s - # Date 1167609622 0 223s - # Mon Jan 01 00:00:22 2007 +0000 223s - # Node ID d9d2e8cbf050772be31dccf78851f71dc547d139 223s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 223s - file2 223s - 223s - diff --git a/file2 b/file2 223s - new file mode 100644 223s - --- /dev/null 223s - +++ b/file2 223s - @@ -0,0 +1,6 @@ 223s - +1 223s - +2 223s - +3 223s - +4 223s - +5 223s - +6 223s - 223s -Config values out of range 223s - $ hg --config git.similarity=999 clone gitcopyharder hgcopyharder2 223s - importing 3 git commits 223s - abort: git.similarity must be between 0 and 100 223s - [255] 223s -Left-over on Windows with some pack files 223s - $ rm -rf hgcopyharder2 223s - $ hg --config git.renamelimit=-5 clone gitcopyharder hgcopyharder2 223s - importing 3 git commits 223s - abort: git.renamelimit must be non-negative 223s - [255] 223s 223s ERROR: test-renames.t output changed 223s ! 223s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-git-submodules.t 223s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-git-submodules.t.err 223s @@ -188,261 +188,9 @@ 223s $ cd .. 223s 223s $ hg clone gitrepo2 hgrepo 223s - importing 10 git commits 223s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 223s - updating to bookmark master 223s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 223s + abort: repository gitrepo2 not found 223s + [255] 223s $ cd hgrepo 223s + $TESTTMP.sh: 133: cd: can't cd to hgrepo 223s $ hg log --graph 223s - @ changeset: 9:0ad944b2c4d8 223s - | bookmark: master 223s - | tag: default/master 223s - | tag: tip 223s - | user: test 223s - | date: Mon Jan 01 00:00:12 2007 +0000 223s - | summary: remove all subrepos 223s - | 223s - o changeset: 8:33da452ef22f 223s - | user: test 223s - | date: Mon Jan 01 00:00:12 2007 +0000 223s - | summary: replace subrepo with symlink 223s - | 223s - o changeset: 7:acebec53c0fc 223s - | user: test 223s - | date: Mon Jan 01 00:00:12 2007 +0000 223s - | summary: replace symlink with subrepo 223s - | 223s - o changeset: 6:78c2ea52db4b 223s - | user: test 223s - | date: Mon Jan 01 00:00:12 2007 +0000 223s - | summary: add symlink 223s - | 223s - o changeset: 5:c0d52ffc59b8 223s - | user: test 223s - | date: Mon Jan 01 00:00:12 2007 +0000 223s - | summary: replace file with subrepo 223s - | 223s - o changeset: 4:73e078a178a0 223s - | user: test 223s - | date: Mon Jan 01 00:00:12 2007 +0000 223s - | summary: replace subrepo with file 223s - | 223s - o changeset: 3:29e236ba4c06 223s - | user: test 223s - | date: Mon Jan 01 00:00:12 2007 +0000 223s - | summary: add another subrepo 223s - | 223s - o changeset: 2:a6075a162f62 223s - | user: test 223s - | date: Mon Jan 01 00:00:12 2007 +0000 223s - | summary: change subrepo commit 223s - | 223s - o changeset: 1:a4036e758995 223s - | user: test 223s - | date: Mon Jan 01 00:00:11 2007 +0000 223s - | summary: add subrepo 223s - | 223s - o changeset: 0:ff7a2f2d8d70 223s - user: test 223s - date: Mon Jan 01 00:00:10 2007 +0000 223s - summary: add alpha 223s - 223s - $ hg book 223s - * master 9:0ad944b2c4d8 223s - 223s -(add subrepo) 223s - $ hg cat -r 1 .hgsubstate 223s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo 223s - $ hg cat -r 1 .hgsub 223s - subrepo = [git]../gitsubrepo 223s - $ hg gverify -r 1 223s - verifying rev a4036e758995 against git commit e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 223s - 223s -(change subrepo commit) 223s - $ hg cat -r 2 .hgsubstate 223s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 223s - $ hg cat -r 2 .hgsub 223s - subrepo = [git]../gitsubrepo 223s - $ hg gverify -r 2 223s - verifying rev a6075a162f62 against git commit a000567ceefbd9a2ce364e0dea6e298010b02b6d 223s - 223s -(add another subrepo) 223s - $ hg cat -r 3 .hgsubstate 223s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 223s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 223s - $ hg cat -r 3 .hgsub 223s - subrepo = [git]../gitsubrepo 223s - subrepo2 = [git]../gitsubrepo 223s - $ hg gverify -r 3 223s - verifying rev 29e236ba4c06 against git commit 6e219527869fa40eb6ffbdd013cd86d576b26b01 223s - 223s -(replace subrepo with file) 223s - $ hg cat -r 4 .hgsubstate 223s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 223s - $ hg cat -r 4 .hgsub 223s - subrepo2 = [git]../gitsubrepo 223s - $ hg manifest -r 4 223s - .hgsub 223s - .hgsubstate 223s - alpha 223s - subrepo 223s - $ hg gverify -r 4 223s - verifying rev 73e078a178a0 against git commit f6436a472da00f581d8d257e9bbaf3c358a5e88c 223s - 223s -(replace file with subrepo) 223s - $ hg cat -r 5 .hgsubstate 223s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 223s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 223s - $ hg cat -r 5 .hgsub 223s - subrepo2 = [git]../gitsubrepo 223s - alpha = [git]../gitsubrepo 223s - $ hg manifest -r 5 223s - .hgsub 223s - .hgsubstate 223s - subrepo 223s - $ hg gverify -r 5 223s - verifying rev c0d52ffc59b8 against git commit 88171163bf4795b5570924e51d5f8ede33f8bc28 223s - 223s -(replace symlink with subrepo) 223s - $ hg cat -r 7 .hgsub 223s - subrepo2 = [git]../gitsubrepo 223s - alpha = [git]../gitsubrepo 223s - foolink = [git]../gitsubrepo 223s - $ hg cat -r 7 .hgsubstate 223s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 223s - 6e4ad8da50204560c00fa25e4987eb2e239029ba foolink 223s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 223s - $ hg gverify -r 7 223s - verifying rev acebec53c0fc against git commit e3288fa737d429a60637b3b6782cb25b8298bc00 223s - 223s -(replace subrepo with symlink) 223s - $ hg cat -r 8 .hgsub .hgsubstate 223s - subrepo2 = [git]../gitsubrepo 223s - alpha = [git]../gitsubrepo 223s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 223s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 223s - 223s - $ hg gverify -r 8 223s - verifying rev 33da452ef22f against git commit d28364013fe1a0fde56c0e1921e49ecdeee8571d 223s - 223s -(remove all subrepos) 223s - $ hg cat -r 9 .hgsub .hgsubstate 223s - .hgsub: no such file in rev 0ad944b2c4d8 223s - .hgsubstate: no such file in rev 0ad944b2c4d8 223s - [1] 223s - $ hg gverify -r 9 223s - verifying rev 0ad944b2c4d8 against git commit 15ba94929481c654814178aac1dbca06ae688718 223s - 223s - $ hg debug-remove-hggit-state 223s - clearing out the git cache data 223s - $ hg gexport 223s - $ cd .hg/git 223s - $ git log --pretty=oneline 223s - 73c15b74fb81fa0cc60e9c59c73787a9f26c778b remove all subrepos 223s - d28364013fe1a0fde56c0e1921e49ecdeee8571d replace subrepo with symlink 223s - e3288fa737d429a60637b3b6782cb25b8298bc00 replace symlink with subrepo 223s - 2d1c135447d11df4dfe96dd5d4f37926dc5c821d add symlink 223s - 88171163bf4795b5570924e51d5f8ede33f8bc28 replace file with subrepo 223s - f6436a472da00f581d8d257e9bbaf3c358a5e88c replace subrepo with file 223s - 6e219527869fa40eb6ffbdd013cd86d576b26b01 add another subrepo 223s - a000567ceefbd9a2ce364e0dea6e298010b02b6d change subrepo commit 223s - e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 add subrepo 223s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 add alpha 223s - 223s -test with rename detection enabled -- simply checking that the Mercurial hashes 223s -are the same is enough 223s - $ cd ../../.. 223s - $ hg --config git.similarity=100 clone gitrepo2 hgreporenames 223s - importing 10 git commits 223s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 223s - updating to bookmark master 223s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 223s - $ cd hgreporenames 223s - $ hg log --graph 223s - @ changeset: 9:0ad944b2c4d8 223s - | bookmark: master 223s - | tag: default/master 223s - | tag: tip 223s - | user: test 223s - | date: Mon Jan 01 00:00:12 2007 +0000 223s - | summary: remove all subrepos 223s - | 223s - o changeset: 8:33da452ef22f 223s - | user: test 223s - | date: Mon Jan 01 00:00:12 2007 +0000 223s - | summary: replace subrepo with symlink 223s - | 223s - o changeset: 7:acebec53c0fc 223s - | user: test 223s - | date: Mon Jan 01 00:00:12 2007 +0000 223s - | summary: replace symlink with subrepo 223s - | 223s - o changeset: 6:78c2ea52db4b 223s - | user: test 223s - | date: Mon Jan 01 00:00:12 2007 +0000 223s - | summary: add symlink 223s - | 223s - o changeset: 5:c0d52ffc59b8 223s - | user: test 223s - | date: Mon Jan 01 00:00:12 2007 +0000 223s - | summary: replace file with subrepo 223s - | 223s - o changeset: 4:73e078a178a0 223s - | user: test 223s - | date: Mon Jan 01 00:00:12 2007 +0000 223s - | summary: replace subrepo with file 223s - | 223s - o changeset: 3:29e236ba4c06 223s - | user: test 223s - | date: Mon Jan 01 00:00:12 2007 +0000 223s - | summary: add another subrepo 223s - | 223s - o changeset: 2:a6075a162f62 223s - | user: test 223s - | date: Mon Jan 01 00:00:12 2007 +0000 223s - | summary: change subrepo commit 223s - | 223s - o changeset: 1:a4036e758995 223s - | user: test 223s - | date: Mon Jan 01 00:00:11 2007 +0000 223s - | summary: add subrepo 223s - | 223s - o changeset: 0:ff7a2f2d8d70 223s - user: test 223s - date: Mon Jan 01 00:00:10 2007 +0000 223s - summary: add alpha 223s - 223s - $ cd .. 223s - 223s -test handling of an invalid .gitmodules file (#380) 223s - 223s - $ git init --quiet gitrepo-issue380 223s - $ cd gitrepo-issue380 223s - $ git submodule add ../gitsubrepo 223s - Cloning into '$TESTTMP/gitrepo-issue380/gitsubrepo'... 223s - done. 223s - $ fn_git_commit -m 'add a submodule' 223s - $ cat >> .gitmodules < <<<<<<< HEAD 223s - > EOF 223s - $ fn_git_commit -a -m 'b0rken .gitmodules' 223s - $ git status 223s - fatal: bad config line 4 in file $TESTTMP/gitrepo-issue380/.gitmodules 223s - [128] 223s - $ sed -i.orig /HEAD/d .gitmodules 223s - $ fn_git_commit -a -m 'fix .gitmodules' 223s - $ git status 223s - On branch master 223s - Untracked files: 223s - (use "git add ..." to include in what will be committed) 223s - .gitmodules.orig 223s - 223s - nothing added to commit but untracked files present (use "git add" to track) 223s - $ cd .. 223s - $ git clone gitrepo-issue380 gitrepo-issue380~ 223s - Cloning into 'gitrepo-issue380~'... 223s - done. 223s - $ hg clone -U gitrepo-issue380 hgrepo-issue380 223s - importing 3 git commits 223s - warning: failed to parse .gitmodules in 2e4ec4293822 223s - new changesets ed60e5fbc192:9dfc0cdf1787 (3 drafts) 223s 223s ERROR: test-git-submodules.t output changed 223s ! 223s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-git-tags.t 223s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-git-tags.t#secret.err 223s @@ -41,337 +41,13 @@ 223s Clone it: 223s 223s $ hg clone repo.git hgrepo 223s - importing 2 git commits 223s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 223s - updating to bookmark master 223s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 223s + abort: repository repo.git not found 223s + [255] 223s 223s $ cd hgrepo 223s + $TESTTMP.sh: 44: cd: can't cd to hgrepo 223s 223s Verify that annotated tags are unaffected by reexports: 223s 223s $ GIT_DIR=.hg/git git tag -ln 223s - beta added tag beta 223s - $ hg gexport 223s - $ GIT_DIR=.hg/git git tag -ln 223s - beta added tag beta 223s - 223s -Error checking on tag creation 223s - 223s - $ hg tag --git beta --remove 223s - abort: cannot remove git tags 223s - (the git documentation heavily discourages editing tags) 223s - [255] 223s - $ hg tag --git beta -r null 223s - abort: cannot remove git tags 223s - (the git documentation heavily discourages editing tags) 223s - [255] 223s - $ hg tag --git beta --remove -r 0 223s - abort: cannot specify both --rev and --remove 223s - [10] 223s - $ hg tag --git alpha 223s - abort: git tags require an explicit revision 223s - (please specify -r/--rev) 223s - [255] 223s - $ hg tag --git alpha alpha -r 0 223s - abort: tag names must be unique 223s - [255] 223s - $ hg tag --git alpha -r 0 -e 223s - abort: cannot specify both --git and --edit 223s - [10] 223s - $ hg tag --git alpha -r 0 -m 42 223s - abort: cannot specify both --git and --message 223s - [10] 223s - $ hg tag --git alpha -r 0 -d 42 223s - abort: cannot specify both --git and --date 223s - [10] 223s - $ hg tag --git alpha -r 0 -u user@example.com 223s - abort: cannot specify both --git and --user 223s - [10] 223s - $ hg tag --git 'with space' -r 0 223s - abort: the name 'with space' is not a valid git tag 223s - [255] 223s - $ hg tag --git ' beta' -r 0 223s - abort: the name 'beta' already exists 223s - [255] 223s - $ hg tag --git master -r 0 223s - abort: the name 'master' already exists 223s - [255] 223s - $ hg tag --git tip -r 0 223s - abort: the name 'tip' is reserved 223s - [10] 223s - 223s -Create a git tag from hg 223s - 223s - $ hg tag --git alpha --debug -r 0 223s - finding unexported changesets 223s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 223s - adding git tag alpha 223s - $ hg log --graph 223s - @ changeset: 1:7fe02317c63d 223s - | bookmark: master 223s - | tag: beta 223s - | tag: default/master 223s - | tag: tip 223s - | user: test 223s - | date: Mon Jan 01 00:00:11 2007 +0000 223s - | summary: add beta 223s - | 223s - o changeset: 0:ff7a2f2d8d70 223s - tag: alpha 223s - user: test 223s - date: Mon Jan 01 00:00:10 2007 +0000 223s - summary: add alpha 223s - 223s - $ echo beta-fix >> beta 223s - $ fn_hg_commit -m 'fix for beta' 223s -#if secret 223s - $ hg phase -d 223s -#endif 223s - $ hg push 223s - pushing to $TESTTMP/repo.git 223s - searching for changes 223s - adding objects 223s - remote: found 0 deltas to reuse 223s - added 1 commits with 1 trees and 1 blobs 223s - updating reference refs/heads/master 223s - adding reference refs/tags/alpha 223s - 223s -Verify that amending commits known to remotes doesn't break anything 223s - 223s - $ cat >> $HGRCPATH << EOF 223s - > [experimental] 223s - > evolution = createmarkers 223s - > evolution.createmarkers = yes 223s - > EOF 223s - $ hg tags 223s - tip 2:61175962e488 223s - default/master 2:61175962e488 223s - beta 1:7fe02317c63d 223s - alpha 0:ff7a2f2d8d70 223s - $ echo beta-fix-again >> beta 223s - $ fn_hg_commit --amend 223s - $ hg log -T shorttags 223s - 3:3094b9e8da41 draft tip 223s - 2:61175962e488 draft default/master X 223s - 1:7fe02317c63d draft beta 223s - 0:ff7a2f2d8d70 draft alpha 223s - $ hg tags 223s - tip 3:3094b9e8da41 223s - default/master 2:61175962e488 223s - beta 1:7fe02317c63d 223s - alpha 0:ff7a2f2d8d70 223s - $ hg push 223s - pushing to $TESTTMP/repo.git 223s - searching for changes 223s - abort: pushing refs/heads/master overwrites 3094b9e8da41 223s - [255] 223s - $ hg push -f 223s - pushing to $TESTTMP/repo.git 223s - searching for changes 223s - adding objects 223s - remote: found 0 deltas to reuse 223s - added 1 commits with 1 trees and 1 blobs 223s - updating reference refs/heads/master 223s - 223s -Now create a tag for the old, obsolete master 223s - 223s - $ cd ../repo.git 223s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 223s - $ git tag 223s - alpha 223s - beta 223s - detached 223s - $ cd ../hgrepo 223s - $ hg pull 223s - pulling from $TESTTMP/repo.git 223s - no changes found 223s - $ hg log -T shorttags 223s - 3:3094b9e8da41 draft default/master tip 223s - 2:61175962e488 draft detached X 223s - 1:7fe02317c63d draft beta 223s - 0:ff7a2f2d8d70 draft alpha 223s - $ hg tags 223s - tip 3:3094b9e8da41 223s - default/master 3:3094b9e8da41 223s - detached 2:61175962e488 223s - beta 1:7fe02317c63d 223s - alpha 0:ff7a2f2d8d70 223s - $ hg push 223s - pushing to $TESTTMP/repo.git 223s - searching for changes 223s - no changes found 223s - [1] 223s - 223s - $ cd .. 223s - 223s -Verify that revsets can point out git tags; for that we need an 223s -untagged commit. 223s - 223s - $ cd hgrepo 223s - $ touch gamma 223s - $ fn_hg_commit -A -m 'add gamma' 223s -#if secret 223s - $ hg phase -d 223s -#endif 223s - $ hg log -T shorttags -r 'gittag()' 223s - 0:ff7a2f2d8d70 draft alpha 223s - 1:7fe02317c63d draft beta 223s - 2:61175962e488 draft detached X 223s - $ hg log -T shorttags -r 'gittag(detached)' 223s - 2:61175962e488 draft detached X 223s - $ hg log -T shorttags -r 'gittag("re:a$")' 223s - 0:ff7a2f2d8d70 draft alpha 223s - 1:7fe02317c63d draft beta 223s - 223s -Create a git tag from hg, but pointing to a new commit: 223s - 223s - $ hg tag --git gamma --debug -r tip 223s - invalid branch cache (visible): tip differs (?) 223s - finding unexported changesets 223s - exporting 1 changesets 223s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 223s - packing 3 loose objects... 223s - packed 3 loose objects! 223s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 223s - adding git tag gamma 223s - $ hg push 223s - pushing to $TESTTMP/repo.git 223s - searching for changes 223s - adding objects 223s - remote: found 0 deltas to reuse 223s - added 1 commits with 1 trees and 1 blobs 223s - updating reference refs/heads/master 223s - adding reference refs/tags/gamma 223s - $ cd ../gitrepo 223s - $ git fetch --quiet --tags 223s - $ git tag 223s - alpha 223s - beta 223s - detached 223s - gamma 223s - $ cd .. 223s - 223s -Try to overwrite an annotated tag: 223s - 223s - $ cd hgrepo 223s - $ hg tags -v 223s - tip 4:0eb1ab0073a8 223s - gamma 4:0eb1ab0073a8 git 223s - default/master 4:0eb1ab0073a8 git-remote 223s - detached 2:61175962e488 git 223s - beta 1:7fe02317c63d git 223s - alpha 0:ff7a2f2d8d70 git 223s - $ hg book not-master 223s - $ hg tag beta 223s - abort: tag 'beta' already exists (use -f to force) 223s - [10] 223s - $ hg tag -f beta 223s -#if secret 223s - $ hg phase -d 223s -#endif 223s - $ hg push 223s - pushing to $TESTTMP/repo.git 223s - warning: not overwriting annotated tag 'beta' 223s - searching for changes 223s - adding objects 223s - remote: found 0 deltas to reuse 223s - added 1 commits with 1 trees and 1 blobs 223s - adding reference refs/heads/not-master 223s - $ hg tags 223s - tip 5:c49682c7cba4 223s - default/not-master 5:c49682c7cba4 223s - gamma 4:0eb1ab0073a8 223s - default/master 4:0eb1ab0073a8 223s - beta 4:0eb1ab0073a8 223s - detached 2:61175962e488 223s - alpha 0:ff7a2f2d8d70 223s - $ cd .. 223s - 223s -Check whether `gimport` handles tags 223s - 223s - $ cd hgrepo 223s - $ rm .hg/git-tags .hg/git-mapfile 223s - $ hg gimport 223s - importing 6 git commits 223s - $ hg tags -q 223s - tip 223s - default/not-master 223s - gamma 223s - default/master 223s - beta 223s - detached 223s - alpha 223s - $ cd .. 223s - 223s -Test how pulling an explicit branch with an annotated tag: 223s - 223s - $ hg clone -r master repo.git hgrepo-2 223s - importing 4 git commits 223s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 223s - updating to branch default 223s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 223s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 223s - 0:ff7a2f2d8d70 draft alpha 223s - 1:7fe02317c63d draft beta 223s - 3:0eb1ab0073a8 draft default/master gamma tip 223s - $ hg tags -v -R hgrepo-2 223s - tip 3:0eb1ab0073a8 223s - gamma 3:0eb1ab0073a8 git 223s - default/master 3:0eb1ab0073a8 git-remote 223s - beta 1:7fe02317c63d git 223s - alpha 0:ff7a2f2d8d70 git 223s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 223s - $ rm -rf hgrepo-2 223s - 223s - $ hg clone -r master repo.git hgrepo-2 223s - importing 4 git commits 223s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 223s - updating to branch default 223s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 223s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 223s - 0:ff7a2f2d8d70 draft alpha 223s - 1:7fe02317c63d draft beta 223s - 3:0eb1ab0073a8 draft default/master gamma tip 223s -This used to die: 223s - $ hg -R hgrepo-2 gexport 223s -This used to fail, since we didn't actually pull the annotated tag: 223s - $ hg -R hgrepo-2 push 223s - pushing to $TESTTMP/repo.git 223s - searching for changes 223s - no changes found 223s - [1] 223s - $ rm -rf hgrepo-2 223s - 223s -Check that pulling will update phases only: 223s - 223s - $ cd hgrepo 223s - $ hg phase -fs gamma detached 223s - $ hg pull 223s - pulling from $TESTTMP/repo.git 223s - no changes found 223s - $ hg log -T shorttags -r gamma -r detached 223s - 4:0eb1ab0073a8 draft beta default/master gamma 223s - 2:61175962e488 draft detached X 223s - $ cd .. 223s - 223s -Check that we pull new tags to existing commits: 223s - $ cd gitrepo 223s - $ git tag 223s - alpha 223s - beta 223s - detached 223s - gamma 223s - $ fn_git_tag extra-simple-tag 223s - $ fn_git_tag -m annotated extra-annotated-tag 223s - $ git push --tags 223s - To $TESTTMP/repo.git 223s - * [new tag] extra-annotated-tag -> extra-annotated-tag 223s - * [new tag] extra-simple-tag -> extra-simple-tag 223s - $ cd ../hgrepo 223s - $ hg pull -r master 223s - pulling from $TESTTMP/repo.git 223s - no changes found 223s - $ hg tags -v | grep extra 223s - extra-simple-tag 1:7fe02317c63d git 223s - extra-annotated-tag 1:7fe02317c63d git 223s 223s ERROR: test-git-tags.t#secret output changed 223s ! 223s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-help.t 223s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-help.t.err 223s @@ -5,250 +5,14 @@ 223s 223s $ hg help | grep 'git' | sed 's/ */ /g' 223s git-cleanup clean up Git commit map after history editing (?) 223s - git-verify verify that a Mercurial rev matches the corresponding Git rev 223s - hggit push and pull from a Git server 223s - hggit-config Configuring hg-git 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 223s 223s $ hg help hggit-config 223s - Configuring hg-git 223s - """""""""""""""""" 223s - 223s - "git" 223s - ----- 223s - 223s - Control how the Hg-Git extension interacts with Git. 223s - 223s - "authors" 223s - Git uses a strict convention for "author names" when representing 223s - changesets, using the form "[realname] [email address]". Mercurial 223s - encourages this convention as well but is not as strict, so it's not 223s - uncommon for a Mercurial repository to have authors listed as, for 223s - example, simple usernames. hg-git by default will attempt to translate 223s - Mercurial usernames using the following rules: 223s - 223s - - If the Mercurial username fits the pattern "NAME ", the Git 223s - name will be set to NAME and the email to EMAIL. 223s - - If the Mercurial username looks like an email (if it contains an 223s - "@"), the Git name and email will both be set to that email. 223s - - If the Mercurial username consists of only a name, the email will be 223s - set to "none@none". 223s - - Illegal characters (stray "<"\ s or ">"\ s) will be stripped out, and 223s - for "NAME " usernames, any content after the right-bracket (for 223s - example, a second ">") will be turned into a url-encoded sigil like 223s - "ext:(%3E)" in the Git author name. 223s - 223s - Since these default behaviors may not be what you want ("none@none", for 223s - example, shows up unpleasantly on GitHub as "illegal email address"), 223s - the "git.authors" option provides for an "authors translation file" that 223s - will be used during outgoing transfers from Mercurial to Git only, by 223s - modifying "hgrc" as such: 223s - 223s - [git] 223s - authors = authors.txt 223s - 223s - Where "authors.txt" is the name of a text file containing author name 223s - translations, one per each line, using the following format: 223s - 223s - johnny = John Smith 223s - dougie = Doug Johnson 223s - 223s - Empty lines and lines starting with a "#" are ignored. 223s - 223s - It should be noted that this translation is in *the Mercurial to Git 223s - direction only*. Changesets coming from Git back to Mercurial will not 223s - translate back into Mercurial usernames, so it's best that the same 223s - username/email combination be used on both the Mercurial and Git sides; 223s - the author file is mostly useful for translating legacy changesets. 223s - 223s - "branch_bookmark_suffix" 223s - Hg-Git does not convert between Mercurial named branches and git 223s - branches as the two are conceptually different; instead, it uses 223s - Mercurial bookmarks to represent the concept of a Git branch. Therefore, 223s - when translating a Mercurial repository over to Git, you typically need 223s - to create bookmarks to mirror all the named branches that you'd like to 223s - see transferred over to Git. The major caveat with this is that you 223s - can't use the same name for your bookmark as that of the named branch, 223s - and furthermore there's no feasible way to rename a branch in Mercurial. 223s - For the use case where one would like to transfer a Mercurial repository 223s - over to Git, and maintain the same named branches as are present on the 223s - hg side, the "branch_bookmark_suffix" might be all that's needed. This 223s - presents a string "suffix" that will be recognized on each bookmark 223s - name, and stripped off as the bookmark is translated to a Git branch: 223s - 223s - [git] 223s - branch_bookmark_suffix=_bookmark 223s - 223s - Above, if a Mercurial repository had a named branch called 223s - "release_6_maintenance", you could then link it to a bookmark called 223s - "release_6_maintenance_bookmark". hg-git will then strip off the 223s - "_bookmark" suffix from this bookmark name, and create a Git branch 223s - called "release_6_maintenance". When pulling back from Git to hg, the 223s - "_bookmark" suffix is then applied back, if and only if a Mercurial 223s - named branch of that name exists. E.g., when changes to the 223s - "release_6_maintenance" branch are checked into Git, these will be 223s - placed into the "release_6_maintenance_bookmark" bookmark on hg. But if 223s - a new branch called "release_7_maintenance" were pulled over to hg, and 223s - there was not a "release_7_maintenance" named branch already, the 223s - bookmark will be named "release_7_maintenance" with no usage of the 223s - suffix. 223s - 223s - The "branch_bookmark_suffix" option is, like the "authors" option, 223s - intended for migrating legacy hg named branches. Going forward, a 223s - Mercurial repository that is to be linked with a Git repository should 223s - only use bookmarks for named branching. 223s - 223s - "findcopiesharder" 223s - Whether to consider unmodified files as copy sources. This is a very 223s - expensive operation for large projects, so use it with caution. Similar 223s - to "git diff"'s --find-copies-harder option. 223s - 223s - "intree" 223s - Hg-Git keeps a Git repository clone for reading and updating. By 223s - default, the Git clone is the subdirectory "git" in your local Mercurial 223s - repository. If you would like this Git clone to be at the same level of 223s - your Mercurial repository instead (named ".git"), add the following to 223s - your "hgrc": 223s - 223s - [git] 223s - intree = True 223s - 223s - Please note that changing this setting in an existing repository doesn't 223s - move the local Git repository. You will either have to do so yourself, 223s - or issue an 'hg pull' after the fact to repopulate the new location. 223s - 223s - "mindate" 223s - If set, branches where the latest commit's commit time is older than 223s - this will not be imported. Accepts any date formats that Mercurial does 223s - -- see 'hg help dates' for more. 223s - 223s - "public" 223s - A list of Git branches that should be considered "published", and 223s - therefore converted to Mercurial in the 'public' phase. This is only 223s - used if "hggit.usephases" is set. 223s - 223s - "pull-prune-remote-branches" 223s - Before fetching, remove any remote-tracking references, or pseudo-tags, 223s - that no longer exist on the remote. This is equivalent to the "--prune" 223s - option to "git fetch", and means that pseudo-tags for remotes -- such as 223s - "default/master" -- always actually reflect what's on the remote. 223s - 223s - This option is enabled by default. 223s - 223s - "pull-prune-bookmarks" 223s - On pull, delete any unchanged bookmarks removed on the remote. In other 223s - words, if e.g. the "thebranch" bookmark remains at "default/thebranch", 223s - and the branch is deleted in Git, pulling deletes the bookmark. 223s - 223s - This option is enabled by default. 223s - 223s - "renamelimit" 223s - The number of files to consider when performing the copy/rename 223s - detection. Detection is disabled if the number of files modified in a 223s - commit is above the limit. Detection is O(N^2) in the number of files 223s - modified, so be sure not to set the limit too high. Similar to Git's 223s - "diff.renameLimit" config. The default is "400", the same as Git. 223s - 223s - "similarity" 223s - Specify how similar files modified in a Git commit must be to be 223s - imported as Mercurial renames or copies, as a percentage between "0" 223s - (disabled) and "100" (files must be identical). For example, "90" means 223s - that a delete/add pair will be imported as a rename if more than 90% of 223s - the file has stayed the same. The default is "0" (disabled). 223s - 223s - "blame.ignoreRevsFile" 223s - Specify a file that lists Git commits to ignore when invoking 'hg 223s - annotate'. 223s - 223s - "hggit" 223s - ------- 223s - 223s - Control behavior of the Hg-Git extension. 223s - 223s - "mapsavefrequency" 223s - By default, hg-git only saves the results of a conversion at the end. 223s - Use this option to enable resuming long-running pulls and pushes. Set 223s - this to a number greater than 0 to allow resuming after converting that 223s - many commits. This can help when the conversion encounters an error 223s - partway through a large batch of changes. Otherwise, an error or 223s - interruption will roll back the transaction, similar to regular 223s - Mercurial. 223s - 223s - Defaults to 1000. 223s - 223s - Please note that this is disregarded for an initial clone, as any error 223s - or interruption will delete the destination. So instead of cloning a 223s - large Git repository, you might want to pull instead: 223s - 223s - $ hg init linux 223s - $ cd linux 223s - $ echo "[paths]\ndefault = https://github.com/torvalds/linux" > .hg/hgrc 223s - $ hg pull 223s - 223s - ...and be extremely patient. Please note that converting very large 223s - repositories may take *days* rather than mere *hours*, and may run into 223s - issues with available memory for very long running clones. Even any 223s - small, undiscovered leak will build up when processing hundreds of 223s - thousands of files and commits. Cloning the Linux kernel is likely a 223s - pathological case, but other storied repositories such as CPython do 223s - work well, even if the initial clone requires a some patience. 223s - 223s - "threads" 223s - 223s - During a push to Git, hg-git will pack loose objects at regular 223s - intervals whenever it saves its map. As this is a rather expensive 223s - operation, it's done in separate threads. 223s - 223s - Defaults to the system CPU count or 4, whichever is lower. 223s - 223s - "usephases" 223s - When converting Git revisions to Mercurial, place them in the 'public' 223s - phase as appropriate. Namely, revisions that are reachable from the 223s - remote Git repository's default branch, or "HEAD", will be marked 223s - *public*. For most repositories, this means the remote "master" branch 223s - will be converted as public. The same applies to any commits tagged in 223s - the remote. 223s - 223s - To restrict publishing to specific branches or tags, use the 223s - "git.public" option. 223s - 223s - Publishing commits prevents their modification, and speeds up many local 223s - Mercurial operations, such as 'hg shelve'. 223s - 223s - "fetchbuffer" 223s - Data fetched from Git is buffered in memory, unless it exceeds the given 223s - limit, in megabytes. By default, flush the buffer to disk when it 223s - exceeds 100MB. 223s - 223s - "retries" 223s - Interacting with a remote Git repository may require authentication. 223s - Normally, this will trigger a prompt and a retry, and this option 223s - restricts the amount of retries. Defaults to 3. 223s - 223s - "invalidpaths" 223s - Both Mercurial and Git consider paths as just bytestrings internally, 223s - and allow almost anything. The difference, however, is in the _almost_ 223s - part. For example, many Git servers will reject a push for security 223s - reasons if it contains a nested Git repository. Similarly, Mercurial 223s - cannot checkout commits with a nested repository, and it cannot even 223s - store paths containing an embedded newline or carrage return character. 223s - 223s - The default is to issue a warning and skip these paths. You can change 223s - this by setting "hggit.invalidpaths" in ".hgrc": 223s - 223s - [hggit] 223s - invalidpaths = keep 223s - 223s - Possible values are "keep", "skip" or "abort". Prior to 1.0, the default 223s - was "abort". 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 223s + abort: no such help topic: hggit-config 223s + (try 'hg help --keyword hggit-config') 223s + [10] 223s 223s $ hg help config.hggit | head -10 223s - "hggit" 223s - ------- 223s - 223s - Control behavior of the Hg-Git extension. 223s - 223s - "mapsavefrequency" 223s - By default, hg-git only saves the results of a conversion at the end. 223s - Use this option to enable resuming long-running pulls and pushes. Set 223s - this to a number greater than 0 to allow resuming after converting that 223s - many commits. This can help when the conversion encounters an error 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 223s + abort: help section not found: config.hggit 223s 223s ERROR: test-help.t output changed 223s ! 223s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-push.t 223s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-push.t.err 223s @@ -12,287 +12,10 @@ 223s 223s $ cd .. 223s $ hg clone -u tip gitrepo hgrepo 223s - importing 1 git commits 223s - new changesets ff7a2f2d8d70 (1 drafts) 223s - updating to branch default 223s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 223s + abort: repository gitrepo not found 223s + [255] 223s 223s $ cd hgrepo 223s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 223s $ hg bookmark -q master 223s - $ echo beta > beta 223s - $ hg add beta 223s - $ fn_hg_commit -m 'add beta' 223s - 223s - 223s - $ echo gamma > gamma 223s - $ hg add gamma 223s - $ fn_hg_commit -m 'add gamma' 223s - 223s - $ hg book -r 1 beta 223s - $ hg push -r beta 223s - pushing to $TESTTMP/gitrepo 223s - searching for changes 223s - adding objects 223s - remote: found 0 deltas to reuse 223s - added 1 commits with 1 trees and 1 blobs 223s - adding reference refs/heads/beta 223s - 223s - $ cd .. 223s - 223s -should have two different branches 223s - $ cd gitrepo 223s - $ git branch -v 223s - beta 0f378ab add beta 223s - master 7eeab2e add alpha 223s - * not-master 7eeab2e add alpha 223s - 223s -some more work on master from git 223s - $ git checkout master 2>&1 | sed s/\'/\"/g 223s - Switched to branch "master" 223s - $ echo delta > delta 223s - $ git add delta 223s - $ fn_git_commit -m "add delta" 223s - $ git checkout not-master 2>&1 | sed s/\'/\"/g 223s - Switched to branch "not-master" 223s - 223s - $ cd .. 223s - 223s - $ cd hgrepo 223s -this should fail 223s - $ hg push -r master 223s - pushing to $TESTTMP/gitrepo 223s - searching for changes 223s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 223s - [255] 223s - 223s -... even with -f 223s - $ hg push -fr master 223s - pushing to $TESTTMP/gitrepo 223s - searching for changes 223s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 223s - [255] 223s - 223s - $ hg pull 2>&1 | grep -v 'divergent bookmark' 223s - pulling from $TESTTMP/gitrepo 223s - importing 1 git commits 223s - not updating diverged bookmark master 223s - new changesets 25eed24f5e8f (1 drafts) 223s - (run 'hg heads' to see heads, 'hg merge' to merge) 223s -TODO shouldn't need to do this since we're (in theory) pushing master explicitly, 223s -which should not implicitly also push the not-master ref. 223s - $ hg book not-master -r default/not-master --force 223s -master and default/master should be diferent 223s - $ hg log -r master 223s - changeset: 2:953796e1cfd8 223s - bookmark: master 223s - user: test 223s - date: Mon Jan 01 00:00:12 2007 +0000 223s - summary: add gamma 223s - 223s - $ hg log -r default/master 223s - changeset: 3:25eed24f5e8f 223s - tag: default/master 223s - tag: tip 223s - parent: 0:ff7a2f2d8d70 223s - user: test 223s - date: Mon Jan 01 00:00:13 2007 +0000 223s - summary: add delta 223s - 223s - 223s -this should also fail 223s - $ hg push -r master 223s - pushing to $TESTTMP/gitrepo 223s - searching for changes 223s - abort: pushing refs/heads/master overwrites 953796e1cfd8 223s - [255] 223s - 223s -... but succeed with -f 223s - $ hg push -fr master 223s - pushing to $TESTTMP/gitrepo 223s - searching for changes 223s - adding objects 223s - remote: found 0 deltas to reuse 223s - added 1 commits with 1 trees and 1 blobs 223s - updating reference refs/heads/master 223s - 223s -this should fail, no changes to push 223s - $ hg push -r master 223s - pushing to $TESTTMP/gitrepo 223s - searching for changes 223s - no changes found 223s - [1] 223s - 223s -hg-git issue103 -- directories can lose information at hg-git export time 223s - 223s - $ hg up master 223s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 223s - $ mkdir dir1 223s - $ echo alpha > dir1/alpha 223s - $ hg add dir1/alpha 223s - $ fn_hg_commit -m 'add dir1/alpha' 223s - $ hg push -r master 223s - pushing to $TESTTMP/gitrepo 223s - searching for changes 223s - adding objects 223s - remote: found 0 deltas to reuse 223s - added 1 commits with 2 trees and 0 blobs 223s - updating reference refs/heads/master 223s - 223s - $ echo beta > dir1/beta 223s - $ hg add dir1/beta 223s - $ fn_hg_commit -m 'add dir1/beta' 223s - $ hg push -r master 223s - pushing to $TESTTMP/gitrepo 223s - searching for changes 223s - adding objects 223s - remote: found 0 deltas to reuse 223s - added 1 commits with 2 trees and 0 blobs 223s - updating reference refs/heads/master 223s - $ hg log -r master 223s - changeset: 5:ba0476ff1899 223s - bookmark: master 223s - tag: default/master 223s - tag: tip 223s - user: test 223s - date: Mon Jan 01 00:00:15 2007 +0000 223s - summary: add dir1/beta 223s - 223s - 223s - $ cat >> .hg/hgrc << EOF 223s - > [paths] 223s - > default:pushurl = file:///$TESTTMP/gitrepo 223s - > EOF 223s -NB: the triple slashes are intentional, due to windows 223s - $ hg push -r master 223s - pushing to file:///$TESTTMP/gitrepo 223s - searching for changes 223s - no changes found 223s - [1] 223s - 223s - $ cd .. 223s - 223s - $ hg clone -u tip gitrepo hgrepo-test 223s - importing 5 git commits 223s - new changesets ff7a2f2d8d70:ba0476ff1899 (5 drafts) 223s - updating to branch default 223s - 5 files updated, 0 files merged, 0 files removed, 0 files unresolved 223s - $ hg -R hgrepo-test log -r master 223s - changeset: 4:ba0476ff1899 223s - bookmark: master 223s - tag: default/master 223s - tag: tip 223s - user: test 223s - date: Mon Jan 01 00:00:15 2007 +0000 223s - summary: add dir1/beta 223s - 223s - $ hg tags -R hgrepo-test | grep ^default/ 223s - default/master 4:ba0476ff1899 223s - default/beta 1:47580592d3d6 223s - default/not-master 0:ff7a2f2d8d70 223s - 223s -Push a fast-forward to a currently checked out branch, which sometimes 223s -fails: 223s - 223s - $ cd hgrepo 223s - $ hg book -r master not-master 223s - moving bookmark 'not-master' forward from ff7a2f2d8d70 223s - $ hg push 223s - pushing to file:///$TESTTMP/gitrepo 223s - searching for changes 223s - warning: failed to update HEAD; unable to set b'HEAD' to b'7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03' (?) 223s - updating reference refs/heads/not-master 223s -That should have updated the tag: 223s - $ hg tags | grep ^default/ 223s - default/not-master 5:ba0476ff1899 223s - default/master 5:ba0476ff1899 223s - default/beta 1:47580592d3d6 223s - $ cd .. 223s - 223s -We can push only one of two bookmarks on the same revision: 223s - 223s - $ cd hgrepo 223s - $ hg book -r 0 also-not-master really-not-master 223s - $ hg push -B also-not-master 223s - pushing to file:///$TESTTMP/gitrepo 223s - searching for changes 223s - adding reference refs/heads/also-not-master 223s - 223s -We can also push another bookmark to a path with another revision 223s -specified: 223s - 223s - $ hg book -r 3 also-not-master 223s - moving bookmark 'also-not-master' forward from ff7a2f2d8d70 223s - $ hg push -B also-not-master "file:///$TESTTMP/gitrepo#master" 223s - pushing to file:///$TESTTMP/gitrepo 223s - searching for changes 223s - adding objects 223s - remote: found 0 deltas to reuse 223s - added 1 commits with 1 trees and 1 blobs 223s - updating reference refs/heads/also-not-master 223s - 223s -And we can delete them again afterwards: 223s - 223s - $ hg book -d also-not-master really-not-master 223s - $ hg push -B also-not-master -B really-not-master 223s - pushing to file:///$TESTTMP/gitrepo 223s - searching for changes 223s - warning: unable to delete 'refs/heads/really-not-master' as it does not exist on the remote repository 223s - deleting reference refs/heads/also-not-master 223s - 223s -Push empty Hg repo to empty Git repo (issue #58) 223s - $ hg init hgrepo2 223s - $ git init -q --bare repo.git 223s - $ hg -R hgrepo2 push repo.git 223s - pushing to repo.git 223s - searching for changes 223s - abort: no bookmarks or tags to push to git 223s - (see "hg help bookmarks" for details on creating them) 223s - [255] 223s - 223s -The remote repo is empty and the local one doesn't have any bookmarks/tags 223s - $ cd hgrepo2 223s - $ echo init >> test.txt 223s - $ hg addremove 223s - adding test.txt 223s - $ fn_hg_commit -m init 223s - $ hg update null 223s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 223s - $ hg push ../repo.git 223s - pushing to ../repo.git 223s - searching for changes 223s - abort: no bookmarks or tags to push to git 223s - (see "hg help bookmarks" for details on creating them) 223s - [255] 223s - $ hg summary 223s - parent: -1:000000000000 (no revision checked out) 223s - branch: default 223s - commit: (clean) 223s - update: 1 new changesets (update) 223s - phases: 1 draft 223s -That should not create any bookmarks 223s - $ hg bookmarks 223s - no bookmarks set 223s -And no tags for the remotes either: 223s - $ hg tags 223s - tip 0:8aded40be5af 223s - 223s -test for ssh vulnerability 223s - 223s - $ cat >> $HGRCPATH << EOF 223s - > [ui] 223s - > ssh = ssh -o ConnectTimeout=1 223s - > EOF 223s - $ hg push -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 223s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 223s - [255] 223s - $ hg push -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 223s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 223s - [255] 223s - $ hg push -q 'git+ssh://fakehost|rm%20nonexistent/path' 223s - ssh: * fakehost%7?rm%20nonexistent* (glob) 223s - abort: git remote error: The remote server unexpectedly closed the connection. 223s - [255] 223s - $ hg push -q 'git+ssh://fakehost%7Crm%20nonexistent/path' 223s - ssh: * fakehost%7?rm%20nonexistent* (glob) 223s - abort: git remote error: The remote server unexpectedly closed the connection. 223s - [255] 223s 223s ERROR: test-push.t output changed 224s ! 224s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-branch-bookmark-suffix.t 224s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-branch-bookmark-suffix.t#without-path.err 224s @@ -9,287 +9,10 @@ 224s $ git init -q --bare repo.git 224s 224s $ hg clone repo.git hgrepo 224s - updating to branch default 224s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 224s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 224s + abort: repository repo.git not found 224s + [255] 224s $ cd hgrepo 224s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 224s #if without-path 224s $ rm .hg/hgrc 224s -#endif 224s - $ hg branch -q branch1 224s - $ hg bookmark branch1_bookmark 224s - $ echo f1 > f1 224s - $ hg add f1 224s - $ fn_hg_commit -m "add f1" 224s - $ hg branch -q branch2 224s - $ hg bookmark branch2_bookmark 224s - $ echo f2 > f2 224s - $ hg add f2 224s - $ fn_hg_commit -m "add f2" 224s - $ hg log --graph 224s - @ changeset: 1:600de9b6d498 224s - | branch: branch2 224s - | bookmark: branch2_bookmark 224s - | tag: tip 224s - | user: test 224s - | date: Mon Jan 01 00:00:11 2007 +0000 224s - | summary: add f2 224s - | 224s - o changeset: 0:40a840c1f8ae 224s - branch: branch1 224s - bookmark: branch1_bookmark 224s - user: test 224s - date: Mon Jan 01 00:00:10 2007 +0000 224s - summary: add f1 224s - 224s - 224s - $ hg push -B asdasd ../repo.git 224s - pushing to ../repo.git 224s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 224s - [255] 224s - 224s - $ hg push ../repo.git 224s - pushing to ../repo.git 224s - searching for changes 224s - adding objects 224s - remote: found 0 deltas to reuse 224s - added 2 commits with 2 trees and 2 blobs 224s - adding reference refs/heads/branch1 224s - adding reference refs/heads/branch2 224s - 224s - $ cd .. 224s - 224s - $ cd repo.git 224s - $ git symbolic-ref HEAD refs/heads/branch1 224s - $ git branch 224s - * branch1 224s - branch2 224s - $ cd .. 224s - 224s - $ git clone repo.git gitrepo 224s - Cloning into 'gitrepo'... 224s - done. 224s - $ cd gitrepo 224s - $ git checkout -q branch1 224s - $ echo g1 >> f1 224s - $ git add f1 224s - $ fn_git_commit -m "append f1" 224s - $ git checkout -q branch2 224s - $ echo g2 >> f2 224s - $ git add f2 224s - $ fn_git_commit -m "append f2" 224s - $ git checkout -b branch3 224s - Switched to a new branch 'branch3' 224s - $ echo g3 >> f3 224s - $ git add f3 224s - $ fn_git_commit -m "append f3" 224s - $ git push origin branch1 branch2 branch3 224s - To $TESTTMP/repo.git 224s - bbfe79a..d8aef79 branch1 -> branch1 224s - 288e92b..f8f8de5 branch2 -> branch2 224s - * [new branch] branch3 -> branch3 224s -make sure the commit doesn't have an HG:rename-source annotation 224s - $ git cat-file commit d8aef79 224s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 224s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 224s - author test 1167609612 +0000 224s - committer test 1167609612 +0000 224s - 224s - append f1 224s - $ cd .. 224s - 224s - $ cd hgrepo 224s - $ hg paths 224s - default = $TESTTMP/repo.git (with-path !) 224s - $ hg pull ../repo.git 224s - pulling from ../repo.git 224s - importing 3 git commits 224s - updating bookmark branch1_bookmark 224s - updating bookmark branch2_bookmark 224s - adding bookmark branch3_bookmark 224s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 224s - (run 'hg heads' to see heads) 224s - $ hg log --graph 224s - o changeset: 4:faf44fc3a4e8 224s - | bookmark: branch3_bookmark 224s - | tag: default/branch3 (with-path !) 224s - | tag: tip 224s - | user: test 224s - | date: Mon Jan 01 00:00:14 2007 +0000 224s - | summary: append f3 224s - | 224s - o changeset: 3:ae8eb55f7090 224s - | bookmark: branch2_bookmark 224s - | tag: default/branch2 (with-path !) 224s - | parent: 1:600de9b6d498 224s - | user: test 224s - | date: Mon Jan 01 00:00:13 2007 +0000 224s - | summary: append f2 224s - | 224s - | o changeset: 2:8211cade99e4 224s - | | bookmark: branch1_bookmark 224s - | | tag: default/branch1 (with-path !) 224s - | | parent: 0:40a840c1f8ae 224s - | | user: test 224s - | | date: Mon Jan 01 00:00:12 2007 +0000 224s - | | summary: append f1 224s - | | 224s - @ | changeset: 1:600de9b6d498 224s - |/ branch: branch2 224s - | user: test 224s - | date: Mon Jan 01 00:00:11 2007 +0000 224s - | summary: add f2 224s - | 224s - o changeset: 0:40a840c1f8ae 224s - branch: branch1 224s - user: test 224s - date: Mon Jan 01 00:00:10 2007 +0000 224s - summary: add f1 224s - 224s - $ cd .. 224s - 224s -Try cloning a bookmark, and make sure it gets checked out: 224s - 224s - $ rm -r hgrepo 224s - $ hg clone -r branch3 repo.git hgrepo 224s - importing 4 git commits 224s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 224s - updating to bookmark branch3_bookmark 224s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 224s - $ cd hgrepo 224s - $ hg bookmarks 224s - branch2_bookmark 2:ae8eb55f7090 224s - * branch3_bookmark 3:faf44fc3a4e8 224s - $ hg log --graph 224s - @ changeset: 3:faf44fc3a4e8 224s - | bookmark: branch3_bookmark 224s - | tag: default/branch3 224s - | tag: tip 224s - | user: test 224s - | date: Mon Jan 01 00:00:14 2007 +0000 224s - | summary: append f3 224s - | 224s - o changeset: 2:ae8eb55f7090 224s - | bookmark: branch2_bookmark 224s - | tag: default/branch2 224s - | user: test 224s - | date: Mon Jan 01 00:00:13 2007 +0000 224s - | summary: append f2 224s - | 224s - o changeset: 1:600de9b6d498 224s - | branch: branch2 224s - | user: test 224s - | date: Mon Jan 01 00:00:11 2007 +0000 224s - | summary: add f2 224s - | 224s - o changeset: 0:40a840c1f8ae 224s - branch: branch1 224s - user: test 224s - date: Mon Jan 01 00:00:10 2007 +0000 224s - summary: add f1 224s - 224s - $ cd .. 224s - 224s -Try cloning something that's both a bookmark and a branch, and see the 224s -results. They're a bit suprising as the bookmark does get activated, 224s -but the branch get checked out. Although this does seem a bit odd, so 224s -does the scenario. 224s - 224s - $ rm -r hgrepo 224s - $ hg clone -r branch1 repo.git hgrepo 224s - importing 2 git commits 224s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 224s - updating to branch branch1 224s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 224s - $ cd hgrepo 224s - $ hg bookmarks 224s - * branch1_bookmark 1:8211cade99e4 224s - $ hg log --graph 224s - o changeset: 1:8211cade99e4 224s - | bookmark: branch1_bookmark 224s - | tag: default/branch1 224s - | tag: tip 224s - | user: test 224s - | date: Mon Jan 01 00:00:12 2007 +0000 224s - | summary: append f1 224s - | 224s - @ changeset: 0:40a840c1f8ae 224s - branch: branch1 224s - user: test 224s - date: Mon Jan 01 00:00:10 2007 +0000 224s - summary: add f1 224s - 224s - 224s - $ cd .. 224s - 224s -Now try pulling a diverged bookmark: 224s - 224s - $ rm -r hgrepo 224s -#if with-path 224s - $ hg clone -U repo.git hgrepo 224s - importing 5 git commits 224s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 224s -#else 224s - $ hg init hgrepo 224s - $ hg -R hgrepo pull repo.git 224s - pulling from repo.git 224s - importing 5 git commits 224s - adding bookmark branch1_bookmark 224s - adding bookmark branch2_bookmark 224s - adding bookmark branch3_bookmark 224s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 224s - (run 'hg heads' to see heads, 'hg merge' to merge) 224s -#endif 224s - $ cd gitrepo 224s - $ git checkout -q branch1 224s - $ fn_git_rebase branch3 224s - $ git push -f 224s - To $TESTTMP/repo.git 224s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 224s - $ cd ../hgrepo 224s - $ hg pull ../repo.git 224s - pulling from ../repo.git 224s - importing 1 git commits 224s - not updating diverged bookmark branch1_bookmark 224s - new changesets 895d0307f8b7 (1 drafts) 224s - (run 'hg update' to get a working copy) 224s - $ hg log --graph 224s - o changeset: 5:895d0307f8b7 224s - | tag: default/branch1 (with-path !) 224s - | tag: tip 224s - | user: test 224s - | date: Mon Jan 01 00:00:12 2007 +0000 224s - | summary: append f1 224s - | 224s - o changeset: 4:faf44fc3a4e8 224s - | bookmark: branch3_bookmark 224s - | tag: default/branch3 (with-path !) 224s - | user: test 224s - | date: Mon Jan 01 00:00:14 2007 +0000 224s - | summary: append f3 224s - | 224s - o changeset: 3:ae8eb55f7090 224s - | bookmark: branch2_bookmark 224s - | tag: default/branch2 (with-path !) 224s - | user: test 224s - | date: Mon Jan 01 00:00:13 2007 +0000 224s - | summary: append f2 224s - | 224s - o changeset: 2:600de9b6d498 224s - | branch: branch2 224s - | parent: 0:40a840c1f8ae 224s - | user: test 224s - | date: Mon Jan 01 00:00:11 2007 +0000 224s - | summary: add f2 224s - | 224s - | o changeset: 1:8211cade99e4 224s - |/ bookmark: branch1_bookmark 224s - | user: test 224s - | date: Mon Jan 01 00:00:12 2007 +0000 224s - | summary: append f1 224s - | 224s - o changeset: 0:40a840c1f8ae 224s - branch: branch1 224s - user: test 224s - date: Mon Jan 01 00:00:10 2007 +0000 224s - summary: add f1 224s - 224s 224s ERROR: test-branch-bookmark-suffix.t#without-path output changed 224s ! 224s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-branch-bookmark-suffix.t 224s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-branch-bookmark-suffix.t#with-path.err 224s @@ -9,287 +9,12 @@ 224s $ git init -q --bare repo.git 224s 224s $ hg clone repo.git hgrepo 224s - updating to branch default 224s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 224s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 224s + abort: repository repo.git not found 224s + [255] 224s $ cd hgrepo 224s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 224s #if without-path 224s $ rm .hg/hgrc 224s #endif 224s $ hg branch -q branch1 224s - $ hg bookmark branch1_bookmark 224s - $ echo f1 > f1 224s - $ hg add f1 224s - $ fn_hg_commit -m "add f1" 224s - $ hg branch -q branch2 224s - $ hg bookmark branch2_bookmark 224s - $ echo f2 > f2 224s - $ hg add f2 224s - $ fn_hg_commit -m "add f2" 224s - $ hg log --graph 224s - @ changeset: 1:600de9b6d498 224s - | branch: branch2 224s - | bookmark: branch2_bookmark 224s - | tag: tip 224s - | user: test 224s - | date: Mon Jan 01 00:00:11 2007 +0000 224s - | summary: add f2 224s - | 224s - o changeset: 0:40a840c1f8ae 224s - branch: branch1 224s - bookmark: branch1_bookmark 224s - user: test 224s - date: Mon Jan 01 00:00:10 2007 +0000 224s - summary: add f1 224s - 224s - 224s - $ hg push -B asdasd ../repo.git 224s - pushing to ../repo.git 224s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 224s - [255] 224s - 224s - $ hg push ../repo.git 224s - pushing to ../repo.git 224s - searching for changes 224s - adding objects 224s - remote: found 0 deltas to reuse 224s - added 2 commits with 2 trees and 2 blobs 224s - adding reference refs/heads/branch1 224s - adding reference refs/heads/branch2 224s - 224s - $ cd .. 224s - 224s - $ cd repo.git 224s - $ git symbolic-ref HEAD refs/heads/branch1 224s - $ git branch 224s - * branch1 224s - branch2 224s - $ cd .. 224s - 224s - $ git clone repo.git gitrepo 224s - Cloning into 'gitrepo'... 224s - done. 224s - $ cd gitrepo 224s - $ git checkout -q branch1 224s - $ echo g1 >> f1 224s - $ git add f1 224s - $ fn_git_commit -m "append f1" 224s - $ git checkout -q branch2 224s - $ echo g2 >> f2 224s - $ git add f2 224s - $ fn_git_commit -m "append f2" 224s - $ git checkout -b branch3 224s - Switched to a new branch 'branch3' 224s - $ echo g3 >> f3 224s - $ git add f3 224s - $ fn_git_commit -m "append f3" 224s - $ git push origin branch1 branch2 branch3 224s - To $TESTTMP/repo.git 224s - bbfe79a..d8aef79 branch1 -> branch1 224s - 288e92b..f8f8de5 branch2 -> branch2 224s - * [new branch] branch3 -> branch3 224s -make sure the commit doesn't have an HG:rename-source annotation 224s - $ git cat-file commit d8aef79 224s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 224s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 224s - author test 1167609612 +0000 224s - committer test 1167609612 +0000 224s - 224s - append f1 224s - $ cd .. 224s - 224s - $ cd hgrepo 224s - $ hg paths 224s - default = $TESTTMP/repo.git (with-path !) 224s - $ hg pull ../repo.git 224s - pulling from ../repo.git 224s - importing 3 git commits 224s - updating bookmark branch1_bookmark 224s - updating bookmark branch2_bookmark 224s - adding bookmark branch3_bookmark 224s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 224s - (run 'hg heads' to see heads) 224s - $ hg log --graph 224s - o changeset: 4:faf44fc3a4e8 224s - | bookmark: branch3_bookmark 224s - | tag: default/branch3 (with-path !) 224s - | tag: tip 224s - | user: test 224s - | date: Mon Jan 01 00:00:14 2007 +0000 224s - | summary: append f3 224s - | 224s - o changeset: 3:ae8eb55f7090 224s - | bookmark: branch2_bookmark 224s - | tag: default/branch2 (with-path !) 224s - | parent: 1:600de9b6d498 224s - | user: test 224s - | date: Mon Jan 01 00:00:13 2007 +0000 224s - | summary: append f2 224s - | 224s - | o changeset: 2:8211cade99e4 224s - | | bookmark: branch1_bookmark 224s - | | tag: default/branch1 (with-path !) 224s - | | parent: 0:40a840c1f8ae 224s - | | user: test 224s - | | date: Mon Jan 01 00:00:12 2007 +0000 224s - | | summary: append f1 224s - | | 224s - @ | changeset: 1:600de9b6d498 224s - |/ branch: branch2 224s - | user: test 224s - | date: Mon Jan 01 00:00:11 2007 +0000 224s - | summary: add f2 224s - | 224s - o changeset: 0:40a840c1f8ae 224s - branch: branch1 224s - user: test 224s - date: Mon Jan 01 00:00:10 2007 +0000 224s - summary: add f1 224s - 224s - $ cd .. 224s - 224s -Try cloning a bookmark, and make sure it gets checked out: 224s - 224s - $ rm -r hgrepo 224s - $ hg clone -r branch3 repo.git hgrepo 224s - importing 4 git commits 224s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 224s - updating to bookmark branch3_bookmark 224s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 224s - $ cd hgrepo 224s - $ hg bookmarks 224s - branch2_bookmark 2:ae8eb55f7090 224s - * branch3_bookmark 3:faf44fc3a4e8 224s - $ hg log --graph 224s - @ changeset: 3:faf44fc3a4e8 224s - | bookmark: branch3_bookmark 224s - | tag: default/branch3 224s - | tag: tip 224s - | user: test 224s - | date: Mon Jan 01 00:00:14 2007 +0000 224s - | summary: append f3 224s - | 224s - o changeset: 2:ae8eb55f7090 224s - | bookmark: branch2_bookmark 224s - | tag: default/branch2 224s - | user: test 224s - | date: Mon Jan 01 00:00:13 2007 +0000 224s - | summary: append f2 224s - | 224s - o changeset: 1:600de9b6d498 224s - | branch: branch2 224s - | user: test 224s - | date: Mon Jan 01 00:00:11 2007 +0000 224s - | summary: add f2 224s - | 224s - o changeset: 0:40a840c1f8ae 224s - branch: branch1 224s - user: test 224s - date: Mon Jan 01 00:00:10 2007 +0000 224s - summary: add f1 224s - 224s - $ cd .. 224s - 224s -Try cloning something that's both a bookmark and a branch, and see the 224s -results. They're a bit suprising as the bookmark does get activated, 224s -but the branch get checked out. Although this does seem a bit odd, so 224s -does the scenario. 224s - 224s - $ rm -r hgrepo 224s - $ hg clone -r branch1 repo.git hgrepo 224s - importing 2 git commits 224s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 224s - updating to branch branch1 224s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 224s - $ cd hgrepo 224s - $ hg bookmarks 224s - * branch1_bookmark 1:8211cade99e4 224s - $ hg log --graph 224s - o changeset: 1:8211cade99e4 224s - | bookmark: branch1_bookmark 224s - | tag: default/branch1 224s - | tag: tip 224s - | user: test 224s - | date: Mon Jan 01 00:00:12 2007 +0000 224s - | summary: append f1 224s - | 224s - @ changeset: 0:40a840c1f8ae 224s - branch: branch1 224s - user: test 224s - date: Mon Jan 01 00:00:10 2007 +0000 224s - summary: add f1 224s - 224s - 224s - $ cd .. 224s - 224s -Now try pulling a diverged bookmark: 224s - 224s - $ rm -r hgrepo 224s -#if with-path 224s - $ hg clone -U repo.git hgrepo 224s - importing 5 git commits 224s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 224s -#else 224s - $ hg init hgrepo 224s - $ hg -R hgrepo pull repo.git 224s - pulling from repo.git 224s - importing 5 git commits 224s - adding bookmark branch1_bookmark 224s - adding bookmark branch2_bookmark 224s - adding bookmark branch3_bookmark 224s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 224s - (run 'hg heads' to see heads, 'hg merge' to merge) 224s -#endif 224s - $ cd gitrepo 224s - $ git checkout -q branch1 224s - $ fn_git_rebase branch3 224s - $ git push -f 224s - To $TESTTMP/repo.git 224s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 224s - $ cd ../hgrepo 224s - $ hg pull ../repo.git 224s - pulling from ../repo.git 224s - importing 1 git commits 224s - not updating diverged bookmark branch1_bookmark 224s - new changesets 895d0307f8b7 (1 drafts) 224s - (run 'hg update' to get a working copy) 224s - $ hg log --graph 224s - o changeset: 5:895d0307f8b7 224s - | tag: default/branch1 (with-path !) 224s - | tag: tip 224s - | user: test 224s - | date: Mon Jan 01 00:00:12 2007 +0000 224s - | summary: append f1 224s - | 224s - o changeset: 4:faf44fc3a4e8 224s - | bookmark: branch3_bookmark 224s - | tag: default/branch3 (with-path !) 224s - | user: test 224s - | date: Mon Jan 01 00:00:14 2007 +0000 224s - | summary: append f3 224s - | 224s - o changeset: 3:ae8eb55f7090 224s - | bookmark: branch2_bookmark 224s - | tag: default/branch2 (with-path !) 224s - | user: test 224s - | date: Mon Jan 01 00:00:13 2007 +0000 224s - | summary: append f2 224s - | 224s - o changeset: 2:600de9b6d498 224s - | branch: branch2 224s - | parent: 0:40a840c1f8ae 224s - | user: test 224s - | date: Mon Jan 01 00:00:11 2007 +0000 224s - | summary: add f2 224s - | 224s - | o changeset: 1:8211cade99e4 224s - |/ bookmark: branch1_bookmark 224s - | user: test 224s - | date: Mon Jan 01 00:00:12 2007 +0000 224s - | summary: append f1 224s - | 224s - o changeset: 0:40a840c1f8ae 224s - branch: branch1 224s - user: test 224s - date: Mon Jan 01 00:00:10 2007 +0000 224s - summary: add f1 224s - 224s 224s ERROR: test-branch-bookmark-suffix.t#with-path output changed 224s ! 224s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-bundle.t 224s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-bundle.t.err 224s @@ -36,247 +36,12 @@ 224s Clone it! 224s 224s $ hg clone gitrepo hgrepo 224s - importing 3 git commits 224s - new changesets ff7a2f2d8d70:ca33a262eb46 (3 drafts) 224s - updating to bookmark master 224s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 224s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 224s + abort: repository gitrepo not found 224s + [255] 224s $ cd hgrepo 224s + $TESTTMP.sh: 45: cd: can't cd to hgrepo 224s 224s Create a bundle with our metadata, and inspect it: 224s 224s $ hg bundle --all ../bundle-w-git.hg 224s - 3 changesets found 224s - $ hg debugbundle --all ../bundle-w-git.hg | grep hg-git 224s - exp-hg-git-map -- {} (mandatory: False) 224s - exp-hg-git-tags -- {} (mandatory: False) 224s - $ hg debugbundle --all ../bundle-w-git.hg > bundle-w-git.out 224s - 224s -Create a bundle without our metadata, and inspect it: 224s - 224s - $ hg bundle --all ../bundle-wo-git.hg --config experimental.hg-git-bundle=no 224s - 3 changesets found 224s - $ hg debugbundle --all ../bundle-wo-git.hg | grep hg-git 224s - [1] 224s - 224s -Verify that those are different: 224s - 224s - $ hg debugbundle --all ../bundle-wo-git.hg > bundle-wo-git.out 224s - $ cmp -s bundle-w-git.out bundle-wo-git.out 224s - [1] 224s - 224s -Now create a bundle without hg-git enabled at all, which should be 224s -exactly similar to what you get when you disable metadata embedding; 224s -this verifies we don't accidentally pollute bundles. 224s - 224s - $ hg bundle --all --config extensions.hggit=! ../bundle-wo-hggit.hg 224s - 3 changesets found 224s - $ hg debugbundle --all ../bundle-wo-hggit.hg > bundle-wo-hggit.out 224s - $ cmp -s bundle-wo-git.hg bundle-wo-hggit.hg 224s - [2] 224s - $ cmp -s bundle-wo-git.out bundle-wo-hggit.out 224s - $ cd .. 224s - $ rm -r hgrepo 224s - 224s -Does unbundling transfer state? 224s - 224s - $ hg init hgrepo 224s - $ hg -R hgrepo unbundle bundle-w-git.hg 224s - adding changesets 224s - adding manifests 224s - adding file changes 224s - added 3 changesets with 3 changes to 3 files 224s - new changesets * (glob) 224s - (run 'hg update' to get a working copy) 224s - $ hg -R hgrepo log -T git 224s - 2:ca33a262eb46 | d338971a96e2 | tip | 224s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 224s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 224s - $ hg -R hgrepo pull gitrepo 224s - pulling from gitrepo 224s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 224s - no changes found 224s - adding bookmark master 224s - $ rm -r hgrepo 224s - 224s -Can we unbundle something without git state? 224s - 224s - $ hg init hgrepo 224s - $ hg -R hgrepo unbundle bundle-wo-git.hg 224s - adding changesets 224s - adding manifests 224s - adding file changes 224s - added 3 changesets with 3 changes to 3 files 224s - new changesets * (glob) 224s - (run 'hg update' to get a working copy) 224s - $ hg -R hgrepo log -T git 224s - 2:ca33a262eb46 | | tip | 224s - 1:7fe02317c63d | | | 224s - 0:ff7a2f2d8d70 | | | 224s - $ hg -R hgrepo pull gitrepo 224s - pulling from gitrepo 224s - importing 3 git commits 224s - adding bookmark master 224s - (run 'hg update' to get a working copy) 224s - $ rm -r hgrepo 224s - 224s -Regular mercurial shouldn't choke on our bundle 224s - 224s - $ hg init hgrepo 224s - $ cat >> hgrepo/.hg/hgrc < [extensions] 224s - > hggit = ! 224s - > EOF 224s - $ hg -R hgrepo unbundle bundle-wo-git.hg 224s - adding changesets 224s - adding manifests 224s - adding file changes 224s - added 3 changesets with 3 changes to 3 files 224s - new changesets * (glob) 224s - (run 'hg update' to get a working copy) 224s - $ hg -R hgrepo log -T git 224s - 2:ca33a262eb46 | | tip | 224s - 1:7fe02317c63d | | | 224s - 0:ff7a2f2d8d70 | | | 224s - $ hg -R hgrepo pull gitrepo 224s - pulling from gitrepo 224s - abort: repository gitrepo not found!? (re) 224s - [255] 224s - $ rm -r hgrepo 224s - 224s - 224s -What happens if we unbundle twice? 224s - 224s - $ hg init hgrepo 224s - $ hg -R hgrepo unbundle bundle-w-git.hg 224s - adding changesets 224s - adding manifests 224s - adding file changes 224s - added 3 changesets with 3 changes to 3 files 224s - new changesets * (glob) 224s - (run 'hg update' to get a working copy) 224s - $ hg -R hgrepo unbundle bundle-w-git.hg 224s - adding changesets 224s - adding manifests 224s - adding file changes 224s - added 0 changesets with 0 changes to 3 files 224s - (run 'hg update' to get a working copy) 224s - $ hg -R hgrepo log -T git 224s - 2:ca33a262eb46 | d338971a96e2 | tip | 224s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 224s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 224s - $ hg -R hgrepo pull gitrepo 224s - pulling from gitrepo 224s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 224s - no changes found 224s - adding bookmark master 224s - $ rm -r hgrepo 224s - 224s -Alas, cloning a bundle doesn't work yet: 224s - 224s -(Mercurial is apparently quite dumb here, so we won't try to fix this 224s -for now, but this test mostly exists so that we notice if ever starts 224s -working, or breaks entirely.) 224s - 224s - $ hg clone bundle-w-git.hg hgrepo 224s - requesting all changes 224s - adding changesets 224s - adding manifests 224s - adding file changes 224s - added 3 changesets with 3 changes to 3 files 224s - new changesets * (glob) 224s - updating to branch default 224s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 224s - $ hg -R hgrepo log -T git 224s - 2:ca33a262eb46 | | tip | 224s - 1:7fe02317c63d | | | 224s - 0:ff7a2f2d8d70 | | | 224s - $ rm -r hgrepo 224s - 224s -Now, lets try to be a bit evil. How does pulling partial state work? 224s - 224s -First, more git happenings: 224s - 224s - $ cd gitrepo 224s - $ git checkout -b otherbranch thetag 224s - Switched to a new branch 'otherbranch' 224s - $ echo 42 > baz 224s - $ git add baz 224s - $ fn_git_commit -m 3 224s - $ cd .. 224s - 224s -Pull, 'em, and create a partial bundle: 224s - 224s - $ hg clone gitrepo hgrepo 224s - importing 4 git commits 224s - new changesets ff7a2f2d8d70:d87bf3ef6a53 (4 drafts) 224s - updating to bookmark otherbranch 224s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 224s - $ hg -R hgrepo bundle --base 'p1(tip)' -r tip bundle-w-git-2.hg 224s - 1 changesets found 224s - $ rm -r hgrepo 224s - 224s -Now, load only that bundle into a repository without any git state 224s - 224s - $ hg clone -r 1 bundle-w-git.hg hgrepo --config extensions.hggit=! 224s - adding changesets 224s - adding manifests 224s - adding file changes 224s - added 2 changesets with 2 changes to 2 files 224s - new changesets * (glob) 224s - updating to branch default 224s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 224s - $ cd hgrepo 224s - $ hg unbundle ../bundle-w-git-2.hg 224s - adding changesets 224s - adding manifests 224s - adding file changes 224s - added 1 changesets with 1 changes to 1 files (+1 heads) 224s - new changesets * (glob) 224s - (run 'hg heads' to see heads, 'hg merge' to merge) 224s - $ hg pull ../gitrepo 224s - pulling from ../gitrepo 224s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 224s - importing 3 git commits 224s - adding bookmark master 224s - adding bookmark otherbranch 224s - new changesets ca33a262eb46 (1 drafts) 224s - (run 'hg update' to get a working copy) 224s - $ cd .. 224s - $ rm -r hgrepo 224s - 224s -Now, try pushing with only the metadata: 224s - 224s - $ hg init hgrepo 224s - $ cd hgrepo 224s - $ hg unbundle -u ../bundle-w-git.hg 224s - adding changesets 224s - adding manifests 224s - adding file changes 224s - added 3 changesets with 3 changes to 3 files 224s - new changesets * (glob) 224s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 224s - $ echo kaflaflibob > bajizmo 224s - $ fn_hg_commit -A -m 4 224s - $ hg book -r tip master 224s - $ hg push ../gitrepo 224s - pushing to ../gitrepo 224s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 224s - abort: cannot push git commit d338971a96e2 as it is not present locally 224s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 224s - [255] 224s - 224s -Try to repopulate the git state from a bundle 224s - 224s - $ hg debug-remove-hggit-state 224s - clearing out the git cache data 224s - $ hg log -qr 'fromgit()' 224s - $ hg unbundle -u ../bundle-w-git.hg 224s - adding changesets 224s - adding manifests 224s - adding file changes 224s - added 0 changesets with 0 changes to 3 files 224s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 224s - $ hg log -qr 'fromgit()' 224s - 0:ff7a2f2d8d70 224s - 1:7fe02317c63d 224s - 2:ca33a262eb46 224s 224s ERROR: test-bundle.t output changed 225s ! 225s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-file-removal.t 225s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-file-removal.t.err 225s @@ -98,192 +98,9 @@ 225s $ git init -q --bare repo.git 225s 225s $ hg clone gitrepo hgrepo 225s - importing 9 git commits 225s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 225s - updating to bookmark master 225s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 225s + abort: repository gitrepo not found 225s + [255] 225s $ cd hgrepo 225s + $TESTTMP.sh: 72: cd: can't cd to hgrepo 225s $ hg log --graph 225s - @ changeset: 8:0995b8a0a943 225s - | bookmark: master 225s - | tag: default/master 225s - | tag: tip 225s - | user: test 225s - | date: Mon Jan 01 00:00:18 2007 +0000 225s - | summary: remove betalink 225s - | 225s - o changeset: 7:a316d3a96c89 225s - | user: test 225s - | date: Mon Jan 01 00:00:17 2007 +0000 225s - | summary: replace file with symlink 225s - | 225s - o changeset: 6:1804acb71f3e 225s - | user: test 225s - | date: Mon Jan 01 00:00:16 2007 +0000 225s - | summary: replace symlink with file 225s - | 225s - o changeset: 5:e19c85becc87 225s - | user: test 225s - | date: Mon Jan 01 00:00:15 2007 +0000 225s - | summary: add symlink to beta 225s - | 225s - o changeset: 4:0d3086c3f8c3 225s - | user: test 225s - | date: Mon Jan 01 00:00:14 2007 +0000 225s - | summary: remove foo/bar 225s - | 225s - o changeset: 3:b2406125ef5c 225s - | user: test 225s - | date: Mon Jan 01 00:00:13 2007 +0000 225s - | summary: remove alpha 225s - | 225s - o changeset: 2:8b3b2f4b4158 225s - | user: test 225s - | date: Mon Jan 01 00:00:12 2007 +0000 225s - | summary: add foo 225s - | 225s - o changeset: 1:7fe02317c63d 225s - | user: test 225s - | date: Mon Jan 01 00:00:11 2007 +0000 225s - | summary: add beta 225s - | 225s - o changeset: 0:ff7a2f2d8d70 225s - user: test 225s - date: Mon Jan 01 00:00:10 2007 +0000 225s - summary: add alpha 225s - 225s - 225s -make sure alpha is not in this manifest 225s - $ hg manifest -r 3 225s - beta 225s - foo/bar 225s - 225s -make sure that only beta is in the manifest 225s - $ hg manifest 225s - beta 225s - 225s - $ hg debug-remove-hggit-state 225s - clearing out the git cache data 225s - $ ls .hg | grep git 225s - [1] 225s - $ hg push ../repo.git 225s - pushing to ../repo.git 225s - searching for changes 225s - adding objects 225s - remote: found 0 deltas to reuse 225s - added 9 commits with 8 trees and 5 blobs 225s - adding reference refs/heads/master 225s - 225s - $ cd .. 225s - $ git --git-dir=repo.git log --pretty=medium 225s - commit 5ee11eeae239d6a99df5a99901ec00ffafbcc46b 225s - Author: test 225s - Date: Mon Jan 1 00:00:18 2007 +0000 225s - 225s - remove betalink 225s - 225s - commit 2c7b324faeccb1acf89c35b7ad38e7956f5705fa 225s - Author: test 225s - Date: Mon Jan 1 00:00:17 2007 +0000 225s - 225s - replace file with symlink 225s - 225s - commit ff0478d2ecc2571d01eb6d406ac29e4e63e5d3d5 225s - Author: test 225s - Date: Mon Jan 1 00:00:16 2007 +0000 225s - 225s - replace symlink with file 225s - 225s - commit 5492e6e410e42df527956be945286cd1ae45acb8 225s - Author: test 225s - Date: Mon Jan 1 00:00:15 2007 +0000 225s - 225s - add symlink to beta 225s - 225s - commit b991de8952c482a7cd51162674ffff8474862218 225s - Author: test 225s - Date: Mon Jan 1 00:00:14 2007 +0000 225s - 225s - remove foo/bar 225s - 225s - commit b0edaf0adac19392cf2867498b983bc5192b41dd 225s - Author: test 225s - Date: Mon Jan 1 00:00:13 2007 +0000 225s - 225s - remove alpha 225s - 225s - commit f2d0d5bfa905e12dee728b509b96cf265bb6ee43 225s - Author: test 225s - Date: Mon Jan 1 00:00:12 2007 +0000 225s - 225s - add foo 225s - 225s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 225s - Author: test 225s - Date: Mon Jan 1 00:00:11 2007 +0000 225s - 225s - add beta 225s - 225s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 225s - Author: test 225s - Date: Mon Jan 1 00:00:10 2007 +0000 225s - 225s - add alpha 225s - 225s -test with rename detection enabled 225s - $ hg --config git.similarity=100 clone gitrepo hgreporenames 225s - importing 9 git commits 225s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 225s - updating to bookmark master 225s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 225s - 225s - $ cd hgreporenames 225s - $ hg log --graph 225s - @ changeset: 8:0995b8a0a943 225s - | bookmark: master 225s - | tag: default/master 225s - | tag: tip 225s - | user: test 225s - | date: Mon Jan 01 00:00:18 2007 +0000 225s - | summary: remove betalink 225s - | 225s - o changeset: 7:a316d3a96c89 225s - | user: test 225s - | date: Mon Jan 01 00:00:17 2007 +0000 225s - | summary: replace file with symlink 225s - | 225s - o changeset: 6:1804acb71f3e 225s - | user: test 225s - | date: Mon Jan 01 00:00:16 2007 +0000 225s - | summary: replace symlink with file 225s - | 225s - o changeset: 5:e19c85becc87 225s - | user: test 225s - | date: Mon Jan 01 00:00:15 2007 +0000 225s - | summary: add symlink to beta 225s - | 225s - o changeset: 4:0d3086c3f8c3 225s - | user: test 225s - | date: Mon Jan 01 00:00:14 2007 +0000 225s - | summary: remove foo/bar 225s - | 225s - o changeset: 3:b2406125ef5c 225s - | user: test 225s - | date: Mon Jan 01 00:00:13 2007 +0000 225s - | summary: remove alpha 225s - | 225s - o changeset: 2:8b3b2f4b4158 225s - | user: test 225s - | date: Mon Jan 01 00:00:12 2007 +0000 225s - | summary: add foo 225s - | 225s - o changeset: 1:7fe02317c63d 225s - | user: test 225s - | date: Mon Jan 01 00:00:11 2007 +0000 225s - | summary: add beta 225s - | 225s - o changeset: 0:ff7a2f2d8d70 225s - user: test 225s - date: Mon Jan 01 00:00:10 2007 +0000 225s - summary: add alpha 225s - 225s 225s ERROR: test-file-removal.t output changed 226s ! 226s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-hg-author.t 226s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-hg-author.t.err 226s @@ -16,256 +16,10 @@ 226s 226s $ cd .. 226s $ hg clone repo.git hgrepo 226s - importing 1 git commits 226s - new changesets ff7a2f2d8d70 (1 drafts) 226s - updating to bookmark master 226s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 226s + abort: repository repo.git not found 226s + [255] 226s 226s $ cd hgrepo 226s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 226s $ hg book master 226s - $ echo beta > beta 226s - $ hg add beta 226s - $ fn_hg_commit -u "test" -m 'add beta' 226s - $ hg push 226s - pushing to $TESTTMP/repo.git 226s - searching for changes 226s - adding objects 226s - remote: found 0 deltas to reuse 226s - added 1 commits with 1 trees and 1 blobs 226s - updating reference refs/heads/master 226s - 226s - $ echo gamma >> beta 226s - $ fn_hg_commit -u "test (comment)" -m 'modify beta' 226s - $ hg push 226s - pushing to $TESTTMP/repo.git 226s - searching for changes 226s - adding objects 226s - remote: found 0 deltas to reuse 226s - added 1 commits with 1 trees and 1 blobs 226s - updating reference refs/heads/master 226s - 226s - $ echo gamma > gamma 226s - $ hg add gamma 226s - $ fn_hg_commit -u "" -m 'add gamma' 226s - $ hg push 226s - pushing to $TESTTMP/repo.git 226s - searching for changes 226s - adding objects 226s - remote: found 0 deltas to reuse 226s - added 1 commits with 1 trees and 1 blobs 226s - updating reference refs/heads/master 226s - 226s - $ echo delta > delta 226s - $ hg add delta 226s - $ fn_hg_commit -u "name" -m 'add delta' 226s - $ hg push 226s - pushing to $TESTTMP/repo.git 226s - searching for changes 226s - adding objects 226s - remote: found 0 deltas to reuse 226s - added 1 commits with 1 trees and 1 blobs 226s - updating reference refs/heads/master 226s - 226s - $ echo epsilon > epsilon 226s - $ hg add epsilon 226s - $ fn_hg_commit -u "name zeta 226s - $ hg add zeta 226s - $ fn_hg_commit -u " test " -m 'add zeta' 226s - $ hg push 226s - pushing to $TESTTMP/repo.git 226s - searching for changes 226s - adding objects 226s - remote: found 0 deltas to reuse 226s - added 1 commits with 1 trees and 1 blobs 226s - updating reference refs/heads/master 226s - 226s - $ echo eta > eta 226s - $ hg add eta 226s - $ fn_hg_commit -u "test < test@example.com >" -m 'add eta' 226s - $ hg push 226s - pushing to $TESTTMP/repo.git 226s - searching for changes 226s - adding objects 226s - remote: found 0 deltas to reuse 226s - added 1 commits with 1 trees and 1 blobs 226s - updating reference refs/heads/master 226s - 226s - $ echo theta > theta 226s - $ hg add theta 226s - $ fn_hg_commit -u "test >test@example.com>" -m 'add theta' 226s - $ hg push 226s - pushing to $TESTTMP/repo.git 226s - searching for changes 226s - adding objects 226s - remote: found 0 deltas to reuse 226s - added 1 commits with 1 trees and 1 blobs 226s - updating reference refs/heads/master 226s - 226s - $ hg log --graph 226s - @ changeset: 8:c5d1976ab12c 226s - | bookmark: master 226s - | tag: default/master 226s - | tag: tip 226s - | user: test >test@example.com> 226s - | date: Mon Jan 01 00:00:18 2007 +0000 226s - | summary: add theta 226s - | 226s - o changeset: 7:0e2fb4d21667 226s - | user: test < test@example.com > 226s - | date: Mon Jan 01 00:00:17 2007 +0000 226s - | summary: add eta 226s - | 226s - o changeset: 6:faa3aae96199 226s - | user: test 226s - | date: Mon Jan 01 00:00:16 2007 +0000 226s - | summary: add zeta 226s - | 226s - o changeset: 5:2cf6ad5a1afc 226s - | user: name 226s - | date: Mon Jan 01 00:00:14 2007 +0000 226s - | summary: add delta 226s - | 226s - o changeset: 3:6b854d65d0d6 226s - | user: 226s - | date: Mon Jan 01 00:00:13 2007 +0000 226s - | summary: add gamma 226s - | 226s - o changeset: 2:46303c652e79 226s - | user: test (comment) 226s - | date: Mon Jan 01 00:00:12 2007 +0000 226s - | summary: modify beta 226s - | 226s - o changeset: 1:47580592d3d6 226s - | user: test 226s - | date: Mon Jan 01 00:00:11 2007 +0000 226s - | summary: add beta 226s - | 226s - o changeset: 0:ff7a2f2d8d70 226s - user: test 226s - date: Mon Jan 01 00:00:10 2007 +0000 226s - summary: add alpha 226s - 226s - 226s - $ cd .. 226s - $ hg clone repo.git hgrepo2 226s - importing 9 git commits 226s - new changesets ff7a2f2d8d70:1fbf3aa91221 (9 drafts) 226s - updating to bookmark master 226s - 8 files updated, 0 files merged, 0 files removed, 0 files unresolved 226s - $ hg -R hgrepo2 log --graph 226s - @ changeset: 8:1fbf3aa91221 226s - | bookmark: master 226s - | tag: default/master 226s - | tag: tip 226s - | user: test ?test@example.com 226s - | date: Mon Jan 01 00:00:18 2007 +0000 226s - | summary: add theta 226s - | 226s - o changeset: 7:20310508f06d 226s - | user: test 226s - | date: Mon Jan 01 00:00:17 2007 +0000 226s - | summary: add eta 226s - | 226s - o changeset: 6:e3d81af8a8c1 226s - | user: test 226s - | date: Mon Jan 01 00:00:16 2007 +0000 226s - | summary: add zeta 226s - | 226s - o changeset: 5:78f609fd208f 226s - | user: name 226s - | date: Mon Jan 01 00:00:15 2007 +0000 226s - | summary: add epsilon 226s - | 226s - o changeset: 4:42fa61d57718 226s - | user: name 226s - | date: Mon Jan 01 00:00:14 2007 +0000 226s - | summary: add delta 226s - | 226s - o changeset: 3:6b854d65d0d6 226s - | user: 226s - | date: Mon Jan 01 00:00:13 2007 +0000 226s - | summary: add gamma 226s - | 226s - o changeset: 2:46303c652e79 226s - | user: test (comment) 226s - | date: Mon Jan 01 00:00:12 2007 +0000 226s - | summary: modify beta 226s - | 226s - o changeset: 1:47580592d3d6 226s - | user: test 226s - | date: Mon Jan 01 00:00:11 2007 +0000 226s - | summary: add beta 226s - | 226s - o changeset: 0:ff7a2f2d8d70 226s - user: test 226s - date: Mon Jan 01 00:00:10 2007 +0000 226s - summary: add alpha 226s - 226s - $ git --git-dir=repo.git log --pretty=medium master 226s - commit 2fe60ba69727981e6ede78be70354c3a9e30e21d 226s - Author: test ?test@example.com 226s - Date: Mon Jan 1 00:00:18 2007 +0000 226s - 226s - add theta 226s - 226s - commit 9f2f7cafdbf2e467928db98de8275141001d3081 226s - Author: test 226s - Date: Mon Jan 1 00:00:17 2007 +0000 226s - 226s - add eta 226s - 226s - commit 172a6f8d8064d73dff7013e395a9fe3cfc3ff807 226s - Author: test 226s - Date: Mon Jan 1 00:00:16 2007 +0000 226s - 226s - add zeta 226s - 226s - commit 71badb8e343a7da391a9b5d98909fbd2ca7d78f2 226s - Author: name 226s - Date: Mon Jan 1 00:00:15 2007 +0000 226s - 226s - add epsilon 226s - 226s - commit 9a9ae7b7f310d4a1a3e732a747ca26f06934f8d8 226s - Author: name 226s - Date: Mon Jan 1 00:00:14 2007 +0000 226s - 226s - add delta 226s - 226s - commit e4149a32e81e380193f59aa8773349201b8ed7f7 226s - Author: 226s - Date: Mon Jan 1 00:00:13 2007 +0000 226s - 226s - add gamma 226s - 226s - commit fae95aef5889a80103c2fbd5d14ff6eb8c9daf93 226s - Author: test ext:(%20%28comment%29) 226s - Date: Mon Jan 1 00:00:12 2007 +0000 226s - 226s - modify beta 226s - 226s - commit 0f378ab6c2c6b5514bd873d3faf8ac4b8095b001 226s - Author: test 226s - Date: Mon Jan 1 00:00:11 2007 +0000 226s - 226s - add beta 226s - 226s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 226s - Author: test 226s - Date: Mon Jan 1 00:00:10 2007 +0000 226s - 226s - add alpha 226s 226s ERROR: test-hg-author.t output changed 227s ! 227s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-subrepos.t 227s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-subrepos.t.err 227s @@ -34,165 +34,8 @@ 227s $ cd .. 227s Ensure gitlinks are transformed to .hgsubstate on hg pull from git 227s $ hg clone -u tip repo.git hgrepo 2>&1 | grep -E -v '^(Cloning into|done)' 227s - importing 3 git commits 227s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 227s - updating to branch default 227s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 227s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 227s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 227s + abort: repository repo.git not found 227s $ cd hgrepo 227s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 227s $ hg bookmarks -f -r default master 227s -1. Ensure gitlinks are transformed to .hgsubstate on hg <- git pull 227s -.hgsub shall list two [git] subrepos 227s - $ cat .hgsub 227s - subrepo1 = [git]../gitsubrepo 227s - xyz/subrepo2 = [git]../gitsubrepo 227s -.hgsubstate shall list two idenitcal revisions 227s - $ cat .hgsubstate 227s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 227s - 56f0304c5250308f14cfbafdc27bd12d40154d17 xyz/subrepo2 227s -hg status shall NOT report .hgsub and .hgsubstate as untracked - either ignored or unmodified 227s - $ hg status --unknown .hgsub .hgsubstate 227s - $ hg status --modified .hgsub .hgsubstate 227s - $ cd .. 227s - 227s -2. Check gitmodules are preserved during hg -> git push 227s - $ cd gitsubrepo 227s - $ echo gamma > gamma 227s - $ git add gamma 227s - $ fn_git_commit -m 'add gamma' 227s - $ cd .. 227s - $ cd hgrepo 227s - $ cd xyz/subrepo2 227s - $ git pull --ff-only | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| */| /' 227s - From $TESTTMP/gitsubrepo 227s - 56f0304..aabf7cd master -> origin/master 227s - Updating 56f0304..aabf7cd 227s - Fast-forward 227s - gamma | 1 + 227s - 1 file changed, 1 insertion(+) 227s - create mode 100644 gamma 227s - $ cd ../.. 227s - $ echo xxx >> alpha 227s - $ fn_hg_commit -m 'Update subrepo2 from hg' | grep -v "committing subrepository" || true 227s - $ hg push 227s - pushing to $TESTTMP/repo.git 227s - searching for changes 227s - adding objects 227s - remote: found 0 deltas to reuse 227s - added 1 commits with 2 trees and 1 blobs 227s - updating reference refs/heads/master 227s - $ cd .. 227s - $ cd gitrepo 227s - $ git pull --ff-only 227s - From $TESTTMP/repo 227s - 89c22d7..275b0a5 master -> origin/master 227s - Fetching submodule xyz/subrepo2 227s - From $TESTTMP/gitsubrepo 227s - 56f0304..aabf7cd master -> origin/master 227s - Updating 89c22d7..275b0a5 227s - Fast-forward 227s - alpha | 1 + 227s - xyz/subrepo2 | 2 +- 227s - 2 files changed, 2 insertions(+), 1 deletion(-) 227s -there shall be two gitlink entries, with values matching that in .hgsubstate 227s - $ git ls-tree -r HEAD^{tree} | grep 'commit' 227s - 160000 commit 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 227s - 160000 commit aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 227s -bring working copy to HEAD state (it's not bare repo) 227s - $ git reset --hard 227s - HEAD is now at 275b0a5 Update subrepo2 from hg 227s - $ cd .. 227s - 227s -3. Check .hgsub and .hgsubstate from git repository are merged, not overwritten 227s - $ hg init hgsub 227s - $ cd hgsub 227s - $ echo delta > delta 227s - $ hg add delta 227s - $ fn_hg_commit -m "add delta" 227s - $ hg tip --template '{node} hgsub\n' > ../gitrepo/.hgsubstate 227s - $ cat > ../gitrepo/.hgsub < hgsub = ../hgsub 227s - > EOF 227s - $ cd ../gitrepo 227s - $ git add .hgsubstate .hgsub 227s - $ fn_git_commit -m "Test3. Prepare .hgsub and .hgsubstate sources" 227s - $ git push 227s - To $TESTTMP/repo.git 227s - 275b0a5..e31d576 master -> master 227s - 227s - $ cd ../hgrepo 227s - $ hg pull 227s - pulling from $TESTTMP/repo.git 227s - importing 1 git commits 227s - updating bookmark master 227s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 227s - (run 'hg update' to get a working copy) 227s - $ hg checkout -C 227s - updating to active bookmark master 227s - cloning subrepo hgsub from $TESTTMP/hgsub 227s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 227s - $ cd .. 227s -pull shall bring .hgsub entry which was added to the git repo 227s - $ cat hgrepo/.hgsub 227s - hgsub = ../hgsub 227s - subrepo1 = [git]../gitsubrepo 227s - xyz/subrepo2 = [git]../gitsubrepo 227s -.hgsubstate shall list revision of the subrepo added through git repo 227s - $ cat hgrepo/.hgsubstate 227s - 481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub 227s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 227s - aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 227s - 227s -4. Try changing the subrepos from the Mercurial side 227s - 227s - $ cd hgrepo 227s - $ cat >> .hgsub < subrepo2 = [git]../gitsubrepo 227s - > EOF 227s - $ git clone ../gitsubrepo subrepo2 227s - Cloning into 'subrepo2'... 227s - done. 227s - $ fn_hg_commit -m 'some stuff' 227s - $ hg push 227s - pushing to $TESTTMP/repo.git 227s - no changes made to subrepo hgsub since last push to $TESTTMP/hgsub 227s - searching for changes 227s - adding objects 227s - remote: found 0 deltas to reuse 227s - added 1 commits with 1 trees and 1 blobs 227s - updating reference refs/heads/master 227s - $ cd .. 227s - 227s -5. But we actually do something quite weird in this case: If a 227s -.gitmodules file exists in the repository, it always wins! In this 227s -case, we break the bidirectional convention, and modify the repository 227s -data. That's odd, so show it: 227s - 227s - $ hg id hgrepo 227s - 42c46c7eef3a default/master/tip master 227s - $ hg clone -U repo.git hgrepo2 227s - importing 6 git commits 227s - new changesets e532b2bfda10:42c46c7eef3a (6 drafts) 227s - $ hg -R hgrepo2 up :master 227s - Cloning into '$TESTTMP/hgrepo2/subrepo1'... 227s - done. 227s - cloning subrepo hgsub from $TESTTMP/hgsub 227s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 227s - checking out detached HEAD in subrepository "subrepo1" 227s - check out a git branch if you intend to make changes 227s - Cloning into '$TESTTMP/hgrepo2/subrepo2'... 227s - done. 227s - Cloning into '$TESTTMP/hgrepo2/xyz/subrepo2'... 227s - done. 227s - cloning subrepo subrepo2 from $TESTTMP/gitsubrepo 227s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 227s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 227s - 227s -We retained bidirectionality! 227s - 227s - $ git diff --stat hgrepo/.hgsub hgrepo2/.hgsub 227s - $ hg id hgrepo 227s - 42c46c7eef3a default/master/tip master 227s - $ hg id hgrepo2 227s - 42c46c7eef3a default/master/tip master 227s 227s ERROR: test-subrepos.t output changed 227s ! 227s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-extra.t 227s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-extra.t.err 227s @@ -12,190 +12,9 @@ 227s 227s $ cd .. 227s $ hg clone gitrepo hgrepo 227s - importing 1 git commits 227s - new changesets aa9eb6424386 (1 drafts) 227s - updating to bookmark not-master 227s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 227s + abort: repository gitrepo not found 227s + [255] 227s $ cd hgrepo 227s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 227s $ hg mv a b 227s - $ fn_hg_commit -mb 227s - $ hg up 0 227s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 227s - (leaving bookmark not-master) 227s - $ touch c 227s - $ hg add c 227s - $ fn_hg_commit -mc 227s - 227s -Rebase will add a rebase_source 227s - 227s - $ hg --config extensions.rebase= rebase -s 1 -d 2 227s - rebasing 1:4c7da7adf18b * (glob) 227s - saved backup bundle to $TESTTMP/*.hg (glob) 227s - $ hg up 2 227s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 227s - 227s -Add a commit with multiple extra fields 227s - $ hg bookmark b1 227s - $ touch d 227s - $ hg add d 227s - $ fn_hg_commitextra --field zzzzzzz=datazzz --field aaaaaaa=dataaaa 227s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 227s - @ 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 227s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 227s - | 227s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 227s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 227s - | 227s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 227s - | branch=default 227s - | 227s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 227s - branch=default hg-git-rename-source=git 227s - 227s - 227s - $ hg push -r b1 227s - pushing to $TESTTMP/gitrepo 227s - searching for changes 227s - adding objects 227s - remote: found 0 deltas to reuse 227s - added 3 commits with 3 trees and 0 blobs 227s - adding reference refs/heads/b1 227s - 227s - $ hg bookmark b2 227s - $ hg mv c c2 227s - $ hg mv d d2 227s - $ fn_hg_commitextra --field yyyyyyy=datayyy --field bbbbbbb=databbb 227s - 227s -Test some nutty filenames 227s - $ hg book b3 227s -#if windows 227s - $ hg mv c2 'c2 => c3' 227s - abort: filename contains '>', which is reserved on Windows: "c2 => c3" 227s - [255] 227s - $ hg mv c2 c3 227s - $ fn_hg_commit -m 'dummy commit' 227s - $ hg mv c3 c4 227s - $ fn_hg_commit -m 'dummy commit' 227s -#else 227s - $ hg mv c2 'c2 => c3' 227s - warning: filename contains '>', which is reserved on Windows: 'c2 => c3' 227s - $ fn_hg_commit -m 'test filename with arrow' 227s - $ hg mv 'c2 => c3' 'c3 => c4' 227s - warning: filename contains '>', which is reserved on Windows: 'c3 => c4' 227s - $ fn_hg_commit -m 'test filename with arrow 2' 227s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" -l 3 --config "experimental.graphstyle.missing=|" 227s - @ 6 bca4ba69a6844c133b069e227dfa043d41e3c197 test filename with arrow 2 227s - | branch=default 227s - | 227s - o 5 864caad1f3493032f8d06f44a89dc9f1c039b09f test filename with arrow 227s - | branch=default 227s - | 227s - o 4 58f855ae26f4930ce857e648d3dd949901cce817 227s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 227s - | 227s -#endif 227s - $ hg push -r b2 -r b3 227s - pushing to $TESTTMP/gitrepo 227s - searching for changes 227s - adding objects 227s - remote: found 0 deltas to reuse 227s - added 3 commits with 3 trees and 0 blobs 227s - adding reference refs/heads/b2 227s - adding reference refs/heads/b3 227s - 227s - $ cd ../gitrepo 227s - $ git cat-file commit b1 227s - tree 1b773a2eb70f29397356f8069c285394835ff85a 227s - parent 54776dace5849bdf273fb26737a48ef64804909d 227s - author test 1167609613 +0000 227s - committer test 1167609613 +0000 227s - HG:extra aaaaaaa:dataaaa 227s - HG:extra zzzzzzz:datazzz 227s - 227s - 227s - 227s - $ git cat-file commit b2 227s - tree 34ad62c6d6ad9464bfe62db5b3d2fa16aaa9fa9e 227s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 227s - author test 1167609614 +0000 227s - committer test 1167609614 +0000 227s - HG:rename c:c2 227s - HG:rename d:d2 227s - HG:extra bbbbbbb:databbb 227s - HG:extra yyyyyyy:datayyy 227s - 227s - 227s - 227s -#if no-windows 227s - $ git cat-file commit b3 227s - tree e63df52695f9b06e54b37e7ef60d0c43994de620 227s - parent 5cafe2555a0666fcf661a3943277a9812a694a98 227s - author test 1167609616 +0000 227s - committer test 1167609616 +0000 227s - HG:rename c2%20%3D%3E%20c3:c3%20%3D%3E%20c4 227s - 227s - test filename with arrow 2 227s -#endif 227s - $ cd ../gitrepo 227s - $ git checkout b1 227s - Switched to branch 'b1' 227s - $ commit_sha=$(git rev-parse HEAD) 227s - $ tree_sha=$(git rev-parse HEAD^{tree}) 227s - 227s -There's no way to create a Git repo with extra metadata via the CLI. Dulwich 227s -lets you do that, though. 227s - 227s - >>> from dulwich.objects import Commit 227s - >>> from dulwich.porcelain import open_repo 227s - >>> repo = open_repo('.') 227s - >>> c = Commit() 227s - >>> c.author = b'test ' 227s - >>> c.author_time = 0 227s - >>> c.author_timezone = 0 227s - >>> c.committer = c.author 227s - >>> c.commit_time = 0 227s - >>> c.commit_timezone = 0 227s - >>> c.parents = [b'$commit_sha'] 227s - >>> c.tree = b'$tree_sha' 227s - >>> c.message = b'extra commit\n' 227s - >>> c.extra.extend([(b'zzz:zzz', b'data:zzz'), (b'aaa:aaa', b'data:aaa'), 227s - ... (b'HG:extra', b'hgaaa:dataaaa'), 227s - ... (b'HG:extra', b'hgzzz:datazzz')]) 227s - >>> repo.object_store.add_object(c) 227s - >>> repo.refs.set_if_equals(b'refs/heads/master', None, c.id) 227s - True 227s - 227s - $ git cat-file commit master 227s - tree 1b773a2eb70f29397356f8069c285394835ff85a 227s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 227s - author test 0 +0000 227s - committer test 0 +0000 227s - zzz:zzz data:zzz 227s - aaa:aaa data:aaa 227s - HG:extra hgaaa:dataaaa 227s - HG:extra hgzzz:datazzz 227s - 227s - extra commit 227s - 227s - $ cd .. 227s - $ hg clone -qU gitrepo hgrepo2 227s - $ cd hgrepo2 227s - $ hg log -G -r :5 -T "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 227s - o 5 58f855ae26f4930ce857e648d3dd949901cce817 227s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 227s - | 227s - | o 4 90acc8c23fcfaeb0930c03c849923a696fd9013c extra commit 227s - |/ GIT0-zzz%3Azzz=data%3Azzz GIT1-aaa%3Aaaa=data%3Aaaa branch=default hgaaa=dataaaa hgzzz=datazzz 227s - | 227s - o 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 227s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 227s - | 227s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 227s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 227s - | 227s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 227s - | branch=default 227s - | 227s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 227s - branch=default hg-git-rename-source=git 227s - 227s 227s ERROR: test-extra.t output changed 228s ! 228s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-phases-remote.t 228s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-phases-remote.t.err 228s @@ -26,193 +26,10 @@ 228s $ cd .. 228s 228s $ hg clone --config hggit.usephases=True -U gitrepo hgrepo 228s - importing 4 git commits 228s - new changesets ff7a2f2d8d70:25eed24f5e8f (1 drafts) 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 228s + abort: repository gitrepo not found 228s + [255] 228s 228s $ cd hgrepo 228s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 228s $ hg log -G -T '{rev}|{phase}|{bookmarks}|{tags}\n' 228s - o 3|public||thetag tip 228s - | 228s - | o 2|draft|not-master|default/not-master 228s - |/ 228s - | o 1|public|master|default/master 228s - |/ 228s - o 0|public|| 228s - 228s - $ hg phase -r 'all()' | tee $TESTTMP/after-clone 228s - 0: public 228s - 1: public 228s - 2: draft 228s - 3: public 228s - $ cat >> .hg/hgrc < [paths] 228s - > other = $TESTTMP/gitrepo/.git 228s - > other:hg-git.publish = no 228s - > EOF 228s - $ cd .. 228s - 228s -that disables publishing from that remote 228s - 228s - $ cd hgrepo 228s - $ hg phase -fd 'all()' 228s - $ hg pull other 228s - pulling from $TESTTMP/gitrepo/.git 228s - no changes found 228s - $ hg log -qr 'public()' 228s - $ hg pull -v --config hggit.usephases=True other 228s - pulling from $TESTTMP/gitrepo/.git 228s - no changes found 228s - processing commits in batches of 1000 228s - bookmark master is up-to-date 228s - bookmark not-master is up-to-date 228s - $ hg log -qr 'public()' 228s - $ cd .. 228s - 228s -but not default when enable by the global setting 228s - 228s - $ cd hgrepo 228s - $ hg phase -fd 'all()' 228s - no phases changed 228s - $ hg pull -v --config hggit.usephases=True 228s - pulling from $TESTTMP/gitrepo 228s - publishing remote HEAD 228s - publishing tag thetag 228s - no changes found 228s - processing commits in batches of 1000 228s - bookmark master is up-to-date 228s - bookmark not-master is up-to-date 228s - publishing remote HEAD 228s - publishing tag thetag 228s - 3 local changesets published 228s - $ hg phase -r 'all()' > $TESTTMP/after-pull 228s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 228s - $ cd .. 228s - 228s -or the path option 228s - 228s - $ cd hgrepo 228s - $ hg phase -fd 'all()' 228s - $ hg pull -v --config paths.default:hg-git.publish=yes 228s - pulling from $TESTTMP/gitrepo 228s - publishing remote HEAD 228s - publishing tag thetag 228s - no changes found 228s - processing commits in batches of 1000 228s - bookmark master is up-to-date 228s - bookmark not-master is up-to-date 228s - publishing remote HEAD 228s - publishing tag thetag 228s - 3 local changesets published 228s - $ hg phase -r 'all()' > $TESTTMP/after-pull 228s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 228s - $ cd .. 228s - 228s -but we can specify individual branches 228s - 228s - $ cd hgrepo 228s - $ hg phase -fd 'all()' 228s - $ hg pull -v --config paths.default:hg-git.publish=not-master 228s - pulling from $TESTTMP/gitrepo 228s - publishing branch not-master 228s - no changes found 228s - processing commits in batches of 1000 228s - bookmark master is up-to-date 228s - bookmark not-master is up-to-date 228s - publishing branch not-master 228s - 2 local changesets published 228s - $ hg phase -r master -r not-master -r thetag 228s - 1: draft 228s - 2: public 228s - 3: draft 228s - $ cd .. 228s - 228s -and we can also specify the tag 228s - 228s - $ cd hgrepo 228s - $ hg phase -fd 'all()' 228s - $ hg pull -v --config paths.default:hg-git.publish=thetag 228s - pulling from $TESTTMP/gitrepo 228s - publishing tag thetag 228s - no changes found 228s - processing commits in batches of 1000 228s - bookmark master is up-to-date 228s - bookmark not-master is up-to-date 228s - publishing tag thetag 228s - 2 local changesets published 228s - $ hg phase -r master -r not-master -r thetag 228s - 1: draft 228s - 2: draft 228s - 3: public 228s - $ cd .. 228s - 228s - 228s -Check multiple paths behavior 228s -============================= 228s - 228s - 228s - $ cd hgrepo 228s - $ cat >> .hg/hgrc < [paths] 228s - > multi:multi-urls = yes 228s - > multi = path://other, path://default 228s - > recursive:multi-urls = yes 228s - > recursive = path://multi, default 228s - > EOF 228s - 228s -Using multiple path works fine: 228s - 228s - 228s - $ hg pull multi --config paths.default:hg-git.publish=yes 228s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 228s - [255] 228s - 228s -Recursive multiple path are tricker, but Mercurial don't work with them either. 228s -This test exist to make sure we bail out on our own. 228s - 228s - 228s -`yes` should abort (until we implement it) 228s - 228s - $ hg pull multi --config paths.default:hg-git.publish=yes 228s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 228s - [255] 228s - 228s -`some-value` should abort (until we implement it) 228s - 228s - $ hg pull multi --config paths.default:hg-git.publish=thetag 228s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 228s - [255] 228s - 228s -`no` is fine 228s - 228s - $ hg pull multi --config paths.default:hg-git.publish=no 228s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 228s - [255] 228s - 228s - $ cd .. 228s - 228s -Check conflicting paths behavior 228s -================================ 228s - 228s - $ cd hgrepo 228s - $ cat > .hg/hgrc < [paths] 228s - > default = $TESTTMP/gitrepo 228s - > default:hg-git.publish = yes 228s - > also-default = $TESTTMP/gitrepo 228s - > EOF 228s - $ hg pull also-default 228s - pulling from $TESTTMP/gitrepo 228s - abort: different publishing configurations for the same remote location 228s - (conflicting paths: also-default, default) 228s - [255] 228s - $ hg pull --config paths.also-default:hg-git.publish=no 228s - pulling from $TESTTMP/gitrepo 228s - abort: different publishing configurations for the same remote location 228s - (conflicting paths: also-default, default) 228s - [255] 228s - $ hg pull --config paths.also-default:hg-git.publish=true 228s - pulling from $TESTTMP/gitrepo 228s - no changes found 228s - 1 local changesets published 228s - $ cd .. 228s - 228s 228s ERROR: test-phases-remote.t output changed 233s ! 233s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-bookmark-workflow.t 233s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-bookmark-workflow.t.err 233s @@ -42,13 +42,21 @@ 233s 233s Initialize remote hg and git repos with equivalent initial contents 233s $ hg init hgremoterepo 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 233s $ cd hgremoterepo 233s $ hg bookmark master 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 233s $ for f in alpha beta gamma delta; do 233s > echo $f > $f; hg add $f; hgcommit -m "add $f" 233s > done 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 233s $ hg bookmark -r 1 b1 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 233s $ hgstate 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 233s 3 fc2664cac217 "add delta" bookmarks: [master] 233s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 233s 1 7bcd915dc873 "add beta" bookmarks: [b1] 233s @@ -69,157 +77,19 @@ 233s 233s Cloning transfers all bookmarks from remote to local 233s $ hg clone -q hgremoterepo purehglocalrepo 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 233s $ cd purehglocalrepo 233s $ hgstate 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 233s 3 fc2664cac217 "add delta" bookmarks: [master] 233s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 233s 1 7bcd915dc873 "add beta" bookmarks: [b1] 233s 0 3442585be8a6 "add alpha" bookmarks: [] 233s $ cd .. 233s $ hg clone -q gitremoterepo hggitlocalrepo --config hggit.usephases=True 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 233s + abort: repository gitremoterepo not found 233s + [255] 233s $ cd hggitlocalrepo 233s + $TESTTMP.sh: 78: cd: can't cd to hggitlocalrepo 233s $ hggitstate 233s - 3 03769a650ded 55b133e1d558 "add delta" bookmarks: [master] 233s - 2 ca33a262eb46 d338971a96e2 "add gamma" bookmarks: [] 233s - 1 7fe02317c63d 9497a4ee62e1 "add beta" bookmarks: [b1] 233s - 0 ff7a2f2d8d70 7eeab2ea75ec "add alpha" bookmarks: [] 233s - 233s -Make sure that master is public 233s - $ hg phase -r master 233s - 3: public 233s - $ cd .. 233s - 233s -No changes 233s - $ cd purehglocalrepo 233s - $ hg incoming -B 233s - comparing with $TESTTMP/hgremoterepo 233s - searching for changed bookmarks 233s - no changed bookmarks found 233s - [1] 233s - $ hg outgoing 233s - comparing with $TESTTMP/hgremoterepo 233s - searching for changes 233s - no changes found 233s - [1] 233s - $ hg outgoing -B 233s - comparing with $TESTTMP/hgremoterepo 233s - searching for changed bookmarks 233s - no changed bookmarks found 233s - [1] 233s - $ hg push 233s - pushing to $TESTTMP/hgremoterepo 233s - searching for changes 233s - no changes found 233s - [1] 233s - $ cd .. 233s - $ cd hggitlocalrepo 233s - $ hg incoming -B 233s - comparing with $TESTTMP/gitremoterepo 233s - searching for changed bookmarks 233s - no changed bookmarks found 233s - [1] 233s - $ hg outgoing 233s - comparing with $TESTTMP/gitremoterepo 233s - searching for changes 233s - no changes found 233s - [1] 233s - $ hg outgoing -B 233s - comparing with $TESTTMP/gitremoterepo 233s - searching for changed bookmarks 233s - no changed bookmarks found 233s - [1] 233s - $ hg push 233s - pushing to $TESTTMP/gitremoterepo 233s - searching for changes 233s - no changes found 233s - [1] 233s - $ cd .. 233s - 233s -Bookmarks on existing revs: 233s -- change b1 on local repo 233s -- introduce b2 on local repo 233s -- introduce b3 on remote repo 233s -Bookmarks on new revs 233s -- introduce b4 on a new rev on the remote 233s - $ cd hgremoterepo 233s - $ hg bookmark -r master b3 233s - $ hg bookmark -r master b4 233s - $ hg update -q b4 233s - $ echo epsilon > epsilon; hg add epsilon; hgcommit -m 'add epsilon' 233s - $ hgstate 233s - 4 d979bb8e0fbb "add epsilon" bookmarks: [b4] 233s - 3 fc2664cac217 "add delta" bookmarks: [b3 master] 233s - 2 d85ced7ae9d6 "add gamma" bookmarks: [] 233s - 1 7bcd915dc873 "add beta" bookmarks: [b1] 233s - 0 3442585be8a6 "add alpha" bookmarks: [] 233s - $ cd .. 233s - $ cd purehglocalrepo 233s - $ hg bookmark -fr 2 b1 233s - $ hg bookmark -r 0 b2 233s - $ hgstate 233s - 3 fc2664cac217 "add delta" bookmarks: [master] 233s - 2 d85ced7ae9d6 "add gamma" bookmarks: [b1] 233s - 1 7bcd915dc873 "add beta" bookmarks: [] 233s - 0 3442585be8a6 "add alpha" bookmarks: [b2] 233s - $ hg incoming -B 233s - comparing with $TESTTMP/hgremoterepo 233s - searching for changed bookmarks 233s - b3 fc2664cac217 233s - b4 d979bb8e0fbb 233s - $ hg outgoing 233s - comparing with $TESTTMP/hgremoterepo 233s - searching for changes 233s - no changes found 233s - [1] 233s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 233s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 233s -This changed in 3.4 to start showing changed and deleted bookmarks again. 233s - $ hg outgoing -B | grep -v -E -w 'b1|b3|b4' 233s - comparing with $TESTTMP/hgremoterepo 233s - searching for changed bookmarks 233s - b2 3442585be8a6 233s - $ cd .. 233s - 233s - $ cd gitremoterepo 233s - $ git branch b3 master 233s - $ git checkout -b b4 master 233s - Switched to a new branch 'b4' 233s - $ echo epsilon > epsilon 233s - $ git add epsilon 233s - $ gitcommit -m 'add epsilon' 233s - $ gitstate 233s - fcfd2c0 "add epsilon" refs: (*b4) (glob) 233s - 55b133e "add delta" refs: (master, b3) 233s - d338971 "add gamma" refs: 233s - 9497a4e "add beta" refs: (b1) 233s - 7eeab2e "add alpha" refs: 233s - $ cd .. 233s - $ cd hggitlocalrepo 233s - $ hg bookmark -fr 2 b1 233s - $ hg bookmark -r 0 b2 233s - $ hgstate 233s - 3 03769a650ded "add delta" bookmarks: [master] 233s - 2 ca33a262eb46 "add gamma" bookmarks: [b1] 233s - 1 7fe02317c63d "add beta" bookmarks: [] 233s - 0 ff7a2f2d8d70 "add alpha" bookmarks: [b2] 233s - $ hg incoming -B 233s - comparing with $TESTTMP/gitremoterepo 233s - searching for changed bookmarks 233s - b3 03769a650ded 233s - b4 fcfd2c0262db 233s - $ hg outgoing 233s - comparing with $TESTTMP/gitremoterepo 233s - searching for changes 233s - no changes found 233s - [1] 233s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 233s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 233s -This changed in 3.4 to start showing changed and deleted bookmarks again. 233s - $ hg outgoing -B 233s - comparing with $TESTTMP/gitremoterepo 233s - searching for changed bookmarks 233s - b1 ca33a262eb46 233s - b2 ff7a2f2d8d70 233s - b3 233s - b4 233s - $ cd .. 233s 233s ERROR: test-bookmark-workflow.t output changed 235s ! 235s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-octopus.t 235s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-octopus.t.err 235s @@ -62,111 +62,9 @@ 235s $ git init -q --bare repo.git 235s 235s $ hg clone gitrepo hgrepo 235s - importing 8 git commits 235s - new changesets ff7a2f2d8d70:307506d6ae8a (10 drafts) 235s - updating to bookmark master 235s - 6 files updated, 0 files merged, 0 files removed, 0 files unresolved 235s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 235s + abort: repository gitrepo not found 235s + [255] 235s $ cd hgrepo 235s + $TESTTMP.sh: 64: cd: can't cd to hgrepo 235s $ hg log --graph --style compact | sed 's/\[.*\]//g' 235s - @ 9:7,8 307506d6ae8a 2007-01-01 00:00 +0000 test 235s - |\ Merge branches 'branch3' and 'branch4' 235s - | | 235s - | o 8:3,4 2b07220e422e 2007-01-01 00:00 +0000 test 235s - | |\ Merge branches 'branch3' and 'branch4' 235s - | | | 235s - o | | 7:5,6 ccf2d65d982c 2007-01-01 00:00 +0000 test 235s - |\ \ \ Merge branches 'branch1' and 'branch2' 235s - | | | | 235s - | o | | 6:1,2 690b40256117 2007-01-01 00:00 +0000 test 235s - | |\ \ \ Merge branches 'branch1' and 'branch2' 235s - | | | | | 235s - o | | | | 5:0 e459c0629ca4 2007-01-01 00:00 +0000 test 235s - | | | | | add delta 235s - | | | | | 235s - +-------o 4:0 e857c9a04474 2007-01-01 00:00 +0000 test 235s - | | | | add zeta 235s - | | | | 235s - +-----o 3:0 0071dec0de0e 2007-01-01 00:00 +0000 test 235s - | | | add epsilon 235s - | | | 235s - +---o 2:0 205a004356ef 2007-01-01 00:00 +0000 test 235s - | | add gamma 235s - | | 235s - | o 1 7fe02317c63d 2007-01-01 00:00 +0000 test 235s - |/ add beta 235s - | 235s - o 0 ff7a2f2d8d70 2007-01-01 00:00 +0000 test 235s - add alpha 235s - 235s - $ hg gverify -r 9 235s - verifying rev 307506d6ae8a against git commit b32ff845df61df998206b630e4370a44f9b36845 235s - $ hg gverify -r 8 235s - abort: no git commit found for rev 2b07220e422e 235s - (if this is an octopus merge, verify against the last rev) 235s - [255] 235s - 235s - $ hg debug-remove-hggit-state 235s - clearing out the git cache data 235s - $ hg push ../repo.git 235s - pushing to ../repo.git 235s - searching for changes 235s - adding objects 235s - remote: found 0 deltas to reuse 235s - added 8 commits with 8 trees and 6 blobs 235s - adding reference refs/heads/branch1 235s - adding reference refs/heads/branch2 235s - adding reference refs/heads/branch3 235s - adding reference refs/heads/branch4 235s - adding reference refs/heads/master 235s - $ cd .. 235s - 235s - $ git --git-dir=repo.git log --pretty=medium | sed s/\\.\\.\\.//g 235s - commit b32ff845df61df998206b630e4370a44f9b36845 235s - Merge: 9ac68f9 7e9cd9f e695849 235s - Author: test 235s - Date: Mon Jan 1 00:00:15 2007 +0000 235s - 235s - Merge branches 'branch3' and 'branch4' 235s - 235s - commit 9ac68f982ae7426d9597ff16c74afb4e6053c582 235s - Merge: d40f375 9497a4e e5023f9 235s - Author: test 235s - Date: Mon Jan 1 00:00:15 2007 +0000 235s - 235s - Merge branches 'branch1' and 'branch2' 235s - 235s - commit d40f375a81b7d033e92cbad89487115fe2dd472f 235s - Author: test 235s - Date: Mon Jan 1 00:00:15 2007 +0000 235s - 235s - add delta 235s - 235s - commit e695849087f6c320c1a447620492b29a82ca41b1 235s - Author: test 235s - Date: Mon Jan 1 00:00:14 2007 +0000 235s - 235s - add zeta 235s - 235s - commit 7e9cd9f90b6d2c60579375eb796ce706d2d8bbe6 235s - Author: test 235s - Date: Mon Jan 1 00:00:13 2007 +0000 235s - 235s - add epsilon 235s - 235s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 235s - Author: test 235s - Date: Mon Jan 1 00:00:12 2007 +0000 235s - 235s - add gamma 235s - 235s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 235s - Author: test 235s - Date: Mon Jan 1 00:00:11 2007 +0000 235s - 235s - add beta 235s - 235s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 235s - Author: test 235s - Date: Mon Jan 1 00:00:10 2007 +0000 235s - 235s - add alpha 235s 235s ERROR: test-octopus.t output changed 237s ! 237s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-clone.t 237s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-clone.t#draft.err 237s @@ -38,60 +38,42 @@ 237s clone a tag 237s 237s $ hg clone -r alpha gitrepo hgrepo-a 237s - importing 1 git commits 237s - new changesets ff7a2f2d8d70 (1 drafts) 237s - updating to branch default 237s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository gitrepo not found 237s + [255] 237s $ hg -R hgrepo-a bookmarks 237s - master 0:ff7a2f2d8d70 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-a not found 237s + [255] 237s $ hg -R hgrepo-a log --graph --template=phases 237s - @ changeset: 0:ff7a2f2d8d70 237s - bookmark: master 237s - tag: alpha 237s - tag: default/master 237s - tag: tip 237s - phase: draft 237s - user: test 237s - date: Mon Jan 01 00:00:10 2007 +0000 237s - summary: add alpha 237s - 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-a not found 237s + [255] 237s $ git --git-dir hgrepo-a/.hg/git for-each-ref 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 237s + fatal: not a git repository: 'hgrepo-a/.hg/git' 237s + [128] 237s Make sure this is still draft since we didn't pull remote's HEAD 237s $ hg -R hgrepo-a phase -r alpha 237s - 0: draft 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-a not found 237s + [255] 237s 237s clone a branch 237s $ hg clone -r beta gitrepo hgrepo-b 237s - importing 2 git commits 237s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 237s - updating to branch default 237s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository gitrepo not found 237s + [255] 237s $ hg -R hgrepo-b bookmarks 237s - * beta 1:7fe02317c63d 237s - master 0:ff7a2f2d8d70 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-b not found 237s + [255] 237s $ hg -R hgrepo-b log --graph 237s - @ changeset: 1:7fe02317c63d 237s - | bookmark: beta 237s - | tag: default/beta 237s - | tag: tip 237s - | user: test 237s - | date: Mon Jan 01 00:00:11 2007 +0000 237s - | summary: add beta 237s - | 237s - o changeset: 0:ff7a2f2d8d70 237s - bookmark: master 237s - tag: alpha 237s - tag: default/master 237s - user: test 237s - date: Mon Jan 01 00:00:10 2007 +0000 237s - summary: add alpha 237s - 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-b not found 237s + [255] 237s $ git --git-dir hgrepo-b/.hg/git for-each-ref 237s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 237s + fatal: not a git repository: 'hgrepo-b/.hg/git' 237s + [128] 237s 237s Make sure that a deleted .hgsubstate does not confuse hg-git 237s 237s @@ -104,48 +86,50 @@ 237s $ cd .. 237s 237s $ hg clone -r beta gitrepo hgrepo-c 237s - importing 4 git commits 237s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 237s - updating to branch default 237s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository gitrepo not found 237s + [255] 237s $ hg -R hgrepo-c bookmarks 237s - * beta 3:47d12948785d 237s - master 0:ff7a2f2d8d70 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-c not found 237s + [255] 237s $ hg --cwd hgrepo-c status 237s + abort: No such file or directory: 'hgrepo-c' 237s + [255] 237s $ git --git-dir hgrepo-c/.hg/git for-each-ref 237s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 237s + fatal: not a git repository: 'hgrepo-c/.hg/git' 237s + [128] 237s 237s test shared repositories 237s 237s $ hg clone gitrepo hgrepo-base 237s - importing 5 git commits 237s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 237s - updating to bookmark beta 237s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository gitrepo not found 237s + [255] 237s $ hg -R hgrepo-base bookmarks 237s - * beta 4:47d12948785d 237s - gamma 2:ca33a262eb46 237s - master 0:ff7a2f2d8d70 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-base not found 237s + [255] 237s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 237s - updating working directory 237s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-base not found 237s + [255] 237s $ hg -R hgrepo-shared pull gitrepo 237s - pulling from gitrepo 237s - no changes found 237s - adding bookmark beta 237s - adding bookmark gamma 237s - adding bookmark master 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-shared not found 237s + [255] 237s $ hg -R hgrepo-shared push gitrepo 237s - pushing to gitrepo 237s - searching for changes 237s - no changes found 237s - [1] 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-shared not found 237s + [255] 237s $ ls hgrepo-shared/.hg | grep git 237s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 237s [1] 237s $ hg -R hgrepo-shared git-cleanup 237s - git commit map cleaned 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + hg: unknown command 'git-cleanup' 237s + (did you mean clean?) 237s + [10] 237s $ rm -rf hgrepo-base hgrepo-shared 237s 237s test cloning HEAD 237s @@ -154,23 +138,21 @@ 237s $ git checkout -q master 237s $ cd .. 237s $ hg clone gitrepo hgrepo-2 237s - importing 5 git commits 237s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 237s - updating to bookmark master 237s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository gitrepo not found 237s + [255] 237s $ git --git-dir hgrepo-2/.hg/git for-each-ref 237s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 237s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 237s + fatal: not a git repository: 'hgrepo-2/.hg/git' 237s + [128] 237s $ rm -rf hgrepo-2 237s 237s clone empty repo 237s $ git init empty 237s Initialized empty Git repository in $TESTTMP/empty/.git/ 237s $ hg clone empty emptyhg 237s - updating to branch default 237s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository empty not found 237s + [255] 237s $ rm -rf empty emptyhg 237s 237s test cloning detached HEAD, but pointing to a branch; we detect this 237s @@ -180,25 +162,20 @@ 237s $ git checkout -q -d master 237s $ cd .. 237s $ hg clone gitrepo hgrepo-2 237s - importing 5 git commits 237s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 237s - updating to bookmark master 237s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository gitrepo not found 237s + [255] 237s $ hg -R hgrepo-2 book 237s - beta 4:47d12948785d 237s - gamma 2:ca33a262eb46 237s - * master 0:ff7a2f2d8d70 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-2 not found 237s + [255] 237s $ hg -R hgrepo-2 tags -v 237s - tip 4:47d12948785d 237s - default/beta 4:47d12948785d git-remote 237s - default/gamma 2:ca33a262eb46 git-remote 237s - default/master 0:ff7a2f2d8d70 git-remote 237s - alpha 0:ff7a2f2d8d70 git 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-2 not found 237s + [255] 237s $ git --git-dir hgrepo-2/.hg/git for-each-ref 237s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 237s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 237s + fatal: not a git repository: 'hgrepo-2/.hg/git' 237s + [128] 237s $ rm -rf hgrepo-2 237s 237s test cloning fully detached HEAD; we don't convert the 237s @@ -212,44 +189,45 @@ 237s $ fn_git_commit -m 'add delta' 237s $ cd .. 237s $ hg clone gitrepo hgrepo-2 237s - importing 5 git commits 237s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 237s - warning: the git source repository has a detached head 237s - (you may want to update to a bookmark) 237s - updating to branch default 237s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository gitrepo not found 237s + [255] 237s $ hg -R hgrepo-2 book 237s - beta 4:47d12948785d 237s - gamma 2:ca33a262eb46 237s - master 0:ff7a2f2d8d70 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-2 not found 237s + [255] 237s $ hg -R hgrepo-2 id --tags 237s - default/beta tip 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-2 not found 237s + [255] 237s $ git --git-dir hgrepo-2/.hg/git for-each-ref 237s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 237s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 237s + fatal: not a git repository: 'hgrepo-2/.hg/git' 237s + [128] 237s $ rm -rf hgrepo-2 237s 237s test that cloning a regular mercurial repository does not introduce 237s git state 237s 237s $ hg init hgrepo-base 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s $ cd hgrepo-base 237s $ touch flaf 237s $ fn_hg_commit -A -m flaf 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s $ cd .. 237s $ hg clone -U hgrepo-base hgrepo-copy 237s requesting all changes (secret !) 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s $ ls hgrepo-copy/.hg | grep git 237s [1] 237s $ hg clone -U --pull hgrepo-base hgrepo-pull 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s requesting all changes 237s - adding changesets (draft !) 237s - adding manifests (draft !) 237s - adding file changes (draft !) 237s - added 1 changesets with 1 changes to 1 files (draft !) 237s - new changesets 76c919376257 (draft !) 237s + adding changesets 237s + adding manifests 237s + adding file changes 237s + added 1 changesets with 1 changes to 1 files 237s + new changesets 76c919376257 237s $ ls hgrepo-pull | grep git 237s [1] 237s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 237s 237s ERROR: test-clone.t#draft output changed 237s ! 237s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-clone.t 237s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-clone.t#secret.err 237s @@ -38,60 +38,42 @@ 237s clone a tag 237s 237s $ hg clone -r alpha gitrepo hgrepo-a 237s - importing 1 git commits 237s - new changesets ff7a2f2d8d70 (1 drafts) 237s - updating to branch default 237s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository gitrepo not found 237s + [255] 237s $ hg -R hgrepo-a bookmarks 237s - master 0:ff7a2f2d8d70 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-a not found 237s + [255] 237s $ hg -R hgrepo-a log --graph --template=phases 237s - @ changeset: 0:ff7a2f2d8d70 237s - bookmark: master 237s - tag: alpha 237s - tag: default/master 237s - tag: tip 237s - phase: draft 237s - user: test 237s - date: Mon Jan 01 00:00:10 2007 +0000 237s - summary: add alpha 237s - 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-a not found 237s + [255] 237s $ git --git-dir hgrepo-a/.hg/git for-each-ref 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 237s + fatal: not a git repository: 'hgrepo-a/.hg/git' 237s + [128] 237s Make sure this is still draft since we didn't pull remote's HEAD 237s $ hg -R hgrepo-a phase -r alpha 237s - 0: draft 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-a not found 237s + [255] 237s 237s clone a branch 237s $ hg clone -r beta gitrepo hgrepo-b 237s - importing 2 git commits 237s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 237s - updating to branch default 237s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository gitrepo not found 237s + [255] 237s $ hg -R hgrepo-b bookmarks 237s - * beta 1:7fe02317c63d 237s - master 0:ff7a2f2d8d70 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-b not found 237s + [255] 237s $ hg -R hgrepo-b log --graph 237s - @ changeset: 1:7fe02317c63d 237s - | bookmark: beta 237s - | tag: default/beta 237s - | tag: tip 237s - | user: test 237s - | date: Mon Jan 01 00:00:11 2007 +0000 237s - | summary: add beta 237s - | 237s - o changeset: 0:ff7a2f2d8d70 237s - bookmark: master 237s - tag: alpha 237s - tag: default/master 237s - user: test 237s - date: Mon Jan 01 00:00:10 2007 +0000 237s - summary: add alpha 237s - 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-b not found 237s + [255] 237s $ git --git-dir hgrepo-b/.hg/git for-each-ref 237s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 237s + fatal: not a git repository: 'hgrepo-b/.hg/git' 237s + [128] 237s 237s Make sure that a deleted .hgsubstate does not confuse hg-git 237s 237s @@ -104,48 +86,50 @@ 237s $ cd .. 237s 237s $ hg clone -r beta gitrepo hgrepo-c 237s - importing 4 git commits 237s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 237s - updating to branch default 237s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository gitrepo not found 237s + [255] 237s $ hg -R hgrepo-c bookmarks 237s - * beta 3:47d12948785d 237s - master 0:ff7a2f2d8d70 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-c not found 237s + [255] 237s $ hg --cwd hgrepo-c status 237s + abort: No such file or directory: 'hgrepo-c' 237s + [255] 237s $ git --git-dir hgrepo-c/.hg/git for-each-ref 237s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 237s + fatal: not a git repository: 'hgrepo-c/.hg/git' 237s + [128] 237s 237s test shared repositories 237s 237s $ hg clone gitrepo hgrepo-base 237s - importing 5 git commits 237s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 237s - updating to bookmark beta 237s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository gitrepo not found 237s + [255] 237s $ hg -R hgrepo-base bookmarks 237s - * beta 4:47d12948785d 237s - gamma 2:ca33a262eb46 237s - master 0:ff7a2f2d8d70 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-base not found 237s + [255] 237s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 237s - updating working directory 237s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-base not found 237s + [255] 237s $ hg -R hgrepo-shared pull gitrepo 237s - pulling from gitrepo 237s - no changes found 237s - adding bookmark beta 237s - adding bookmark gamma 237s - adding bookmark master 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-shared not found 237s + [255] 237s $ hg -R hgrepo-shared push gitrepo 237s - pushing to gitrepo 237s - searching for changes 237s - no changes found 237s - [1] 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-shared not found 237s + [255] 237s $ ls hgrepo-shared/.hg | grep git 237s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 237s [1] 237s $ hg -R hgrepo-shared git-cleanup 237s - git commit map cleaned 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + hg: unknown command 'git-cleanup' 237s + (did you mean clean?) 237s + [10] 237s $ rm -rf hgrepo-base hgrepo-shared 237s 237s test cloning HEAD 237s @@ -154,23 +138,21 @@ 237s $ git checkout -q master 237s $ cd .. 237s $ hg clone gitrepo hgrepo-2 237s - importing 5 git commits 237s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 237s - updating to bookmark master 237s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository gitrepo not found 237s + [255] 237s $ git --git-dir hgrepo-2/.hg/git for-each-ref 237s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 237s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 237s + fatal: not a git repository: 'hgrepo-2/.hg/git' 237s + [128] 237s $ rm -rf hgrepo-2 237s 237s clone empty repo 237s $ git init empty 237s Initialized empty Git repository in $TESTTMP/empty/.git/ 237s $ hg clone empty emptyhg 237s - updating to branch default 237s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository empty not found 237s + [255] 237s $ rm -rf empty emptyhg 237s 237s test cloning detached HEAD, but pointing to a branch; we detect this 237s @@ -180,25 +162,20 @@ 237s $ git checkout -q -d master 237s $ cd .. 237s $ hg clone gitrepo hgrepo-2 237s - importing 5 git commits 237s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 237s - updating to bookmark master 237s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository gitrepo not found 237s + [255] 237s $ hg -R hgrepo-2 book 237s - beta 4:47d12948785d 237s - gamma 2:ca33a262eb46 237s - * master 0:ff7a2f2d8d70 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-2 not found 237s + [255] 237s $ hg -R hgrepo-2 tags -v 237s - tip 4:47d12948785d 237s - default/beta 4:47d12948785d git-remote 237s - default/gamma 2:ca33a262eb46 git-remote 237s - default/master 0:ff7a2f2d8d70 git-remote 237s - alpha 0:ff7a2f2d8d70 git 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-2 not found 237s + [255] 237s $ git --git-dir hgrepo-2/.hg/git for-each-ref 237s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 237s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 237s + fatal: not a git repository: 'hgrepo-2/.hg/git' 237s + [128] 237s $ rm -rf hgrepo-2 237s 237s test cloning fully detached HEAD; we don't convert the 237s @@ -212,44 +189,45 @@ 237s $ fn_git_commit -m 'add delta' 237s $ cd .. 237s $ hg clone gitrepo hgrepo-2 237s - importing 5 git commits 237s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 237s - warning: the git source repository has a detached head 237s - (you may want to update to a bookmark) 237s - updating to branch default 237s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository gitrepo not found 237s + [255] 237s $ hg -R hgrepo-2 book 237s - beta 4:47d12948785d 237s - gamma 2:ca33a262eb46 237s - master 0:ff7a2f2d8d70 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-2 not found 237s + [255] 237s $ hg -R hgrepo-2 id --tags 237s - default/beta tip 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + abort: repository hgrepo-2 not found 237s + [255] 237s $ git --git-dir hgrepo-2/.hg/git for-each-ref 237s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 237s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 237s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 237s + fatal: not a git repository: 'hgrepo-2/.hg/git' 237s + [128] 237s $ rm -rf hgrepo-2 237s 237s test that cloning a regular mercurial repository does not introduce 237s git state 237s 237s $ hg init hgrepo-base 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s $ cd hgrepo-base 237s $ touch flaf 237s $ fn_hg_commit -A -m flaf 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s $ cd .. 237s $ hg clone -U hgrepo-base hgrepo-copy 237s - requesting all changes (secret !) 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s + requesting all changes 237s $ ls hgrepo-copy/.hg | grep git 237s [1] 237s $ hg clone -U --pull hgrepo-base hgrepo-pull 237s - requesting all changes 237s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 237s adding changesets (draft !) 237s adding manifests (draft !) 237s adding file changes (draft !) 237s added 1 changesets with 1 changes to 1 files (draft !) 237s new changesets 76c919376257 (draft !) 237s + requesting all changes 237s $ ls hgrepo-pull | grep git 237s [1] 237s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 237s 237s ERROR: test-clone.t#secret output changed 238s ! 238s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-outgoing.t 238s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-outgoing.t.err 238s @@ -14,166 +14,10 @@ 238s 238s $ cd .. 238s $ hg clone gitrepo hgrepo 238s - importing 1 git commits 238s - new changesets ff7a2f2d8d70 (1 drafts) 238s - updating to bookmark master 238s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 238s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 238s + abort: repository gitrepo not found 238s + [255] 238s 238s $ cd hgrepo 238s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 238s $ hg book 238s - alpha 0:ff7a2f2d8d70 238s - * master 0:ff7a2f2d8d70 238s - $ hg update -q master 238s - $ echo beta > beta 238s - $ hg add beta 238s - $ fn_hg_commit -m 'add beta' 238s - 238s - 238s - $ echo gamma > gamma 238s - $ hg add gamma 238s - $ fn_hg_commit -m 'add gamma' 238s - 238s - $ hg book -r 1 beta 238s - 238s - $ hg outgoing | grep -v 'searching for changes' 238s - comparing with $TESTTMP/gitrepo 238s - changeset: 1:47580592d3d6 238s - bookmark: beta 238s - user: test 238s - date: Mon Jan 01 00:00:11 2007 +0000 238s - summary: add beta 238s - 238s - changeset: 2:953796e1cfd8 238s - bookmark: master 238s - tag: tip 238s - user: test 238s - date: Mon Jan 01 00:00:12 2007 +0000 238s - summary: add gamma 238s - 238s - $ hg outgoing -r beta 238s - comparing with $TESTTMP/gitrepo 238s - searching for changes 238s - changeset: 1:47580592d3d6 238s - bookmark: beta 238s - user: test 238s - date: Mon Jan 01 00:00:11 2007 +0000 238s - summary: add beta 238s - 238s - $ hg outgoing -r master 238s - comparing with $TESTTMP/gitrepo 238s - searching for changes 238s - changeset: 1:47580592d3d6 238s - bookmark: beta 238s - user: test 238s - date: Mon Jan 01 00:00:11 2007 +0000 238s - summary: add beta 238s - 238s - changeset: 2:953796e1cfd8 238s - bookmark: master 238s - tag: tip 238s - user: test 238s - date: Mon Jan 01 00:00:12 2007 +0000 238s - summary: add gamma 238s - 238s - 238s - $ cd .. 238s - 238s -some more work on master from git 238s - $ cd gitrepo 238s - 238s -Check state of refs after outgoing 238s - $ git show-ref 238s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/alpha 238s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/master 238s - 238s - $ git checkout master 2>&1 | sed s/\'/\"/g 238s - Already on "master" 238s - $ echo delta > delta 238s - $ git add delta 238s - $ fn_git_commit -m "add delta" 238s - 238s - $ cd .. 238s - 238s - $ cd hgrepo 238s -this will fail # maybe we should try to make it work 238s - $ hg outgoing 238s - comparing with $TESTTMP/gitrepo 238s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 238s - [255] 238s -let's pull and try again 238s - $ hg pull 238s - pulling from */gitrepo (glob) 238s - importing 1 git commits 238s - not updating diverged bookmark master 238s - new changesets 25eed24f5e8f (1 drafts) 238s - (run 'hg heads' to see heads, 'hg merge' to merge) 238s - $ hg log --graph 238s - o changeset: 3:25eed24f5e8f 238s - | tag: default/master 238s - | tag: tip 238s - | parent: 0:ff7a2f2d8d70 238s - | user: test 238s - | date: Mon Jan 01 00:00:13 2007 +0000 238s - | summary: add delta 238s - | 238s - | @ changeset: 2:953796e1cfd8 238s - | | bookmark: master 238s - | | user: test 238s - | | date: Mon Jan 01 00:00:12 2007 +0000 238s - | | summary: add gamma 238s - | | 238s - | o changeset: 1:47580592d3d6 238s - |/ bookmark: beta 238s - | user: test 238s - | date: Mon Jan 01 00:00:11 2007 +0000 238s - | summary: add beta 238s - | 238s - o changeset: 0:ff7a2f2d8d70 238s - bookmark: alpha 238s - tag: default/alpha 238s - user: test 238s - date: Mon Jan 01 00:00:10 2007 +0000 238s - summary: add alpha 238s - 238s - $ hg outgoing 238s - comparing with $TESTTMP/gitrepo 238s - searching for changes 238s - changeset: 1:47580592d3d6 238s - bookmark: beta 238s - user: test 238s - date: Mon Jan 01 00:00:11 2007 +0000 238s - summary: add beta 238s - 238s - changeset: 2:953796e1cfd8 238s - bookmark: master 238s - user: test 238s - date: Mon Jan 01 00:00:12 2007 +0000 238s - summary: add gamma 238s - 238s - $ hg outgoing -r beta 238s - comparing with $TESTTMP/gitrepo 238s - searching for changes 238s - changeset: 1:47580592d3d6 238s - bookmark: beta 238s - user: test 238s - date: Mon Jan 01 00:00:11 2007 +0000 238s - summary: add beta 238s - 238s - $ hg outgoing -r master 238s - comparing with $TESTTMP/gitrepo 238s - searching for changes 238s - changeset: 1:47580592d3d6 238s - bookmark: beta 238s - user: test 238s - date: Mon Jan 01 00:00:11 2007 +0000 238s - summary: add beta 238s - 238s - changeset: 2:953796e1cfd8 238s - bookmark: master 238s - user: test 238s - date: Mon Jan 01 00:00:12 2007 +0000 238s - summary: add gamma 238s - 238s - 238s - 238s - $ cd .. 238s 238s ERROR: test-outgoing.t output changed 242s ! 242s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-pull.t 242s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-pull.t#draft.err 242s @@ -35,153 +35,132 @@ 242s 242s pull without a name 242s $ hg init hgrepo 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s $ cd hgrepo 242s $ hg pull ../gitrepo 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s pulling from ../gitrepo 242s - importing 3 git commits 242s - adding bookmark beta 242s - adding bookmark delta 242s - adding bookmark master 242s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 242s - (run 'hg heads' to see heads, 'hg merge' to merge) 242s + abort: repository ../gitrepo not found 242s + [255] 242s $ git --git-dir .hg/git for-each-ref 242s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 242s + fatal: not a git repository: '.hg/git' 242s + [128] 242s $ hg log -Tp 242s - 2|draft|delta|tip 242s - 1|draft|beta| 242s - 0|draft|master|t_alpha 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s $ cd .. 242s $ rm -rf hgrepo 242s 242s pull with an implied name 242s $ hg init hgrepo 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s $ cd hgrepo 242s $ echo "[paths]" >> .hg/hgrc 242s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 242s $ hg pull ../gitrepo 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s pulling from ../gitrepo 242s - importing 3 git commits 242s - adding bookmark beta 242s - adding bookmark delta 242s - adding bookmark master 242s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 242s - (run 'hg heads' to see heads, 'hg merge' to merge) 242s + abort: repository ../gitrepo not found 242s + [255] 242s $ git --git-dir .hg/git for-each-ref 242s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 242s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 242s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 242s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 242s + fatal: not a git repository: '.hg/git' 242s + [128] 242s $ hg log -Tp 242s - 2|draft|delta|default/delta tip 242s - 1|draft|beta|default/beta 242s - 0|draft|master|default/master t_alpha 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s $ cd .. 242s $ rm -rf hgrepo 242s 242s pull with an explicit name 242s $ hg init hgrepo 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s $ cd hgrepo 242s $ echo "[paths]" >> .hg/hgrc 242s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 242s $ hg pull 242s - pulling from $TESTTMP/gitrepo 242s - importing 3 git commits 242s - adding bookmark beta 242s - adding bookmark delta 242s - adding bookmark master 242s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 242s - (run 'hg heads' to see heads, 'hg merge' to merge) 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s + pulling from $TESTTMP/gitrepo 242s + abort: repository $TESTTMP/gitrepo not found 242s + [255] 242s $ git --git-dir .hg/git for-each-ref 242s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 242s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 242s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 242s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 242s + fatal: not a git repository: '.hg/git' 242s + [128] 242s $ hg log -Tp 242s - 2|draft|delta|default/delta tip 242s - 1|draft|beta|default/beta 242s - 0|draft|master|default/master t_alpha 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s $ cd .. 242s $ rm -rf hgrepo 242s 242s pull a tag 242s $ hg init hgrepo 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s $ echo "[paths]" >> hgrepo/.hg/hgrc 242s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 242s $ hg -R hgrepo pull -r t_alpha 242s - pulling from $TESTTMP/gitrepo 242s - importing 1 git commits 242s - adding bookmark master 242s - new changesets ff7a2f2d8d70 (1 drafts) 242s - (run 'hg update' to get a working copy) 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s + pulling from $TESTTMP/gitrepo 242s + abort: repository $TESTTMP/gitrepo not found 242s + [255] 242s $ hg -R hgrepo update t_alpha 242s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s + abort: unknown revision 't_alpha' 242s + [10] 242s $ hg log -Tp -R hgrepo 242s - 0|draft|master|default/master t_alpha tip 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s 242s no-op pull 242s $ hg -R hgrepo pull -r t_alpha 242s - pulling from $TESTTMP/gitrepo 242s - no changes found 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s + pulling from $TESTTMP/gitrepo 242s + abort: repository $TESTTMP/gitrepo not found 242s + [255] 242s 242s no-op pull with added bookmark 242s $ cd gitrepo 242s $ git checkout -qb epsilon t_alpha 242s $ cd .. 242s $ hg -R hgrepo pull -r epsilon 242s - pulling from $TESTTMP/gitrepo 242s - no changes found 242s - adding bookmark epsilon 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s + pulling from $TESTTMP/gitrepo 242s + abort: repository $TESTTMP/gitrepo not found 242s + [255] 242s 242s pull something that doesn't exist 242s $ hg -R hgrepo pull -r kaflaflibob 242s - pulling from $TESTTMP/gitrepo 242s - abort: unknown revision 'kaflaflibob'!? (re) 242s - [10] 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s + pulling from $TESTTMP/gitrepo 242s + abort: repository $TESTTMP/gitrepo not found 242s + [255] 242s 242s pull an ambiguous reference 242s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 242s $ hg -R hgrepo pull -r t_alpha 242s - pulling from $TESTTMP/gitrepo 242s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 242s - [10] 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s + pulling from $TESTTMP/gitrepo 242s + abort: repository $TESTTMP/gitrepo not found 242s + [255] 242s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 242s 242s pull a branch 242s $ hg -R hgrepo pull -r beta 242s - pulling from $TESTTMP/gitrepo 242s - importing 1 git commits 242s - adding bookmark beta 242s - new changesets 7fe02317c63d (1 drafts) 242s - (run 'hg update' to get a working copy) 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s + pulling from $TESTTMP/gitrepo 242s + abort: repository $TESTTMP/gitrepo not found 242s + [255] 242s $ hg -R hgrepo log --graph --template=phases 242s - o changeset: 1:7fe02317c63d 242s - | bookmark: beta 242s - | tag: default/beta 242s - | tag: tip 242s - | phase: draft 242s - | user: test 242s - | date: Mon Jan 01 00:00:11 2007 +0000 242s - | summary: add beta 242s - | 242s - @ changeset: 0:ff7a2f2d8d70 242s - bookmark: epsilon 242s - bookmark: master 242s - tag: default/epsilon 242s - tag: default/master 242s - tag: t_alpha 242s - phase: draft 242s - user: test 242s - date: Mon Jan 01 00:00:10 2007 +0000 242s - summary: add alpha 242s - 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s 242s no-op pull should affect phases 242s $ hg -R hgrepo phase -fs beta 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s + abort: unknown revision 'beta' 242s + [10] 242s $ hg -R hgrepo pull -r beta 242s - pulling from $TESTTMP/gitrepo 242s - no changes found 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s + pulling from $TESTTMP/gitrepo 242s + abort: repository $TESTTMP/gitrepo not found 242s + [255] 242s $ hg -R hgrepo phase beta 242s - 1: draft 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s + abort: unknown revision 'beta' 242s + [10] 242s 242s 242s add another commit and tag to the git repo 242s @@ -196,50 +175,12 @@ 242s 242s pull everything else 242s $ hg -R hgrepo pull 242s - pulling from $TESTTMP/gitrepo 242s - importing 2 git commits 242s - adding bookmark delta 242s - updating bookmark master 242s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 242s - (run 'hg heads' to see heads, 'hg merge' to merge) 242s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 242s + pulling from $TESTTMP/gitrepo 242s + abort: repository $TESTTMP/gitrepo not found 242s + [255] 242s $ hg -R hgrepo log --graph --template=phases 242s - o changeset: 3:6f898ad1f3e1 242s - | bookmark: master 242s - | tag: default/master 242s - | tag: tip 242s - | phase: draft 242s - | parent: 0:ff7a2f2d8d70 242s - | user: test 242s - | date: Mon Jan 01 00:00:13 2007 +0000 242s - | summary: add gamma 242s - | 242s - | o changeset: 2:678ebee93e38 242s - |/ bookmark: delta 242s - | tag: default/delta 242s - | phase: draft 242s - | parent: 0:ff7a2f2d8d70 242s - | user: test 242s - | date: Mon Jan 01 00:00:12 2007 +0000 242s - | summary: add delta 242s - | 242s - | o changeset: 1:7fe02317c63d 242s - |/ bookmark: beta 242s - | tag: default/beta 242s - | tag: t_beta 242s - | phase: draft 242s - | user: test 242s - | date: Mon Jan 01 00:00:11 2007 +0000 242s - | summary: add beta 242s - | 242s - @ changeset: 0:ff7a2f2d8d70 242s - bookmark: epsilon 242s - tag: default/epsilon 242s - tag: t_alpha 242s - phase: draft 243s - user: test 243s - date: Mon Jan 01 00:00:10 2007 +0000 243s - summary: add alpha 243s - 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s add a merge to the git repo, and delete the branch 243s $ cd gitrepo 243s $ git merge -q -m "Merge branch 'beta'" beta 243s @@ -252,60 +193,26 @@ 243s 243s pull the merge 243s $ hg -R hgrepo tags | grep default/beta 243s - default/beta 1:7fe02317c63d 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + [1] 243s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 243s - pulling from $TESTTMP/gitrepo 243s - importing 1 git commits 243s - updating bookmark master 243s - deleting bookmark beta 243s - new changesets a02330f767a4 (1 drafts) 243s - (run 'hg update' to get a working copy) 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ hg -R hgrepo tags | grep default/beta 243s - default/beta 1:7fe02317c63d 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + [1] 243s $ hg -R hgrepo pull 243s - pulling from $TESTTMP/gitrepo 243s - no changes found 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ hg -R hgrepo tags | grep default/beta 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s [1] 243s $ hg -R hgrepo log --graph 243s - o changeset: 4:a02330f767a4 243s - |\ bookmark: master 243s - | | tag: default/master 243s - | | tag: tip 243s - | | parent: 3:6f898ad1f3e1 243s - | | parent: 1:7fe02317c63d 243s - | | user: test 243s - | | date: Mon Jan 01 00:00:13 2007 +0000 243s - | | summary: Merge branch 'beta' 243s - | | 243s - | o changeset: 3:6f898ad1f3e1 243s - | | parent: 0:ff7a2f2d8d70 243s - | | user: test 243s - | | date: Mon Jan 01 00:00:13 2007 +0000 243s - | | summary: add gamma 243s - | | 243s - | | o changeset: 2:678ebee93e38 243s - | |/ bookmark: delta 243s - | | tag: default/delta 243s - | | parent: 0:ff7a2f2d8d70 243s - | | user: test 243s - | | date: Mon Jan 01 00:00:12 2007 +0000 243s - | | summary: add delta 243s - | | 243s - o | changeset: 1:7fe02317c63d 243s - |/ tag: t_beta 243s - | user: test 243s - | date: Mon Jan 01 00:00:11 2007 +0000 243s - | summary: add beta 243s - | 243s - @ changeset: 0:ff7a2f2d8d70 243s - bookmark: epsilon 243s - tag: default/epsilon 243s - tag: t_alpha 243s - user: test 243s - date: Mon Jan 01 00:00:10 2007 +0000 243s - summary: add alpha 243s - 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s pull with wildcards 243s $ cd gitrepo 243s $ git checkout -qb releases/v1 master 243s @@ -324,66 +231,12 @@ 243s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 243s $ cd .. 243s $ hg -R hgrepo pull -r 'releases/*' 243s - pulling from $TESTTMP/gitrepo 243s - importing 2 git commits 243s - adding bookmark releases/v1 243s - adding bookmark releases/v2 243s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 243s - (run 'hg heads .' to see heads, 'hg merge' to merge) 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ hg -R hgrepo log --graph 243s - o changeset: 6:a3f95e150b0a 243s - | bookmark: releases/v2 243s - | tag: default/releases/v2 243s - | tag: tip 243s - | parent: 4:a02330f767a4 243s - | user: test 243s - | date: Mon Jan 01 00:00:15 2007 +0000 243s - | summary: add eta 243s - | 243s - | o changeset: 5:218b2d0660d3 243s - |/ bookmark: releases/v1 243s - | tag: default/releases/v1 243s - | user: test 243s - | date: Mon Jan 01 00:00:14 2007 +0000 243s - | summary: add zeta 243s - | 243s - o changeset: 4:a02330f767a4 243s - |\ bookmark: master 243s - | | tag: default/master 243s - | | parent: 3:6f898ad1f3e1 243s - | | parent: 1:7fe02317c63d 243s - | | user: test 243s - | | date: Mon Jan 01 00:00:13 2007 +0000 243s - | | summary: Merge branch 'beta' 243s - | | 243s - | o changeset: 3:6f898ad1f3e1 243s - | | parent: 0:ff7a2f2d8d70 243s - | | user: test 243s - | | date: Mon Jan 01 00:00:13 2007 +0000 243s - | | summary: add gamma 243s - | | 243s - | | o changeset: 2:678ebee93e38 243s - | |/ bookmark: delta 243s - | | tag: default/delta 243s - | | parent: 0:ff7a2f2d8d70 243s - | | user: test 243s - | | date: Mon Jan 01 00:00:12 2007 +0000 243s - | | summary: add delta 243s - | | 243s - o | changeset: 1:7fe02317c63d 243s - |/ tag: t_beta 243s - | user: test 243s - | date: Mon Jan 01 00:00:11 2007 +0000 243s - | summary: add beta 243s - | 243s - @ changeset: 0:ff7a2f2d8d70 243s - bookmark: epsilon 243s - tag: default/epsilon 243s - tag: t_alpha 243s - user: test 243s - date: Mon Jan 01 00:00:10 2007 +0000 243s - summary: add alpha 243s - 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s 243s add old and new commits to the git repo -- make sure we're using the commit date 243s and not the author date 243s @@ -412,21 +265,19 @@ 243s Master is now filtered, so it's just stays there: 243s 243s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 243s - pulling from $TESTTMP/gitrepo 243s - no changes found 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ hg -R hgrepo pull 243s - pulling from $TESTTMP/gitrepo 243s - no changes found 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ hg -R hgrepo log -r master 243s - changeset: 4:a02330f767a4 243s - bookmark: master 243s - tag: default/master 243s - parent: 3:6f898ad1f3e1 243s - parent: 1:7fe02317c63d 243s - user: test 243s - date: Mon Jan 01 00:00:13 2007 +0000 243s - summary: Merge branch 'beta' 243s - 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + abort: unknown revision 'master' 243s + [10] 243s 243s $ cd gitrepo 243s $ git checkout -q master 243s @@ -440,51 +291,13 @@ 243s > git tag -a -m 'tagging newtag' newtag 243s $ cd .. 243s $ hg -R hgrepo pull 243s - pulling from $TESTTMP/gitrepo 243s - importing 3 git commits 243s - updating bookmark master 243s - new changesets 49713da8f665:e103a73f33be (3 drafts) 243s - (run 'hg heads .' to see heads, 'hg merge' to merge) 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ hg -R hgrepo heads 243s - changeset: 9:e103a73f33be 243s - bookmark: master 243s - tag: default/master 243s - tag: tip 243s - user: test 243s - date: Wed Jan 01 00:00:00 2014 +0000 243s - summary: newcommit 243s - 243s - changeset: 7:49713da8f665 243s - tag: newtag 243s - tag: oldtag 243s - parent: 4:a02330f767a4 243s - user: test 243s - date: Sat Mar 01 00:00:00 2014 +0000 243s - summary: oldtag 243s - 243s - changeset: 6:a3f95e150b0a 243s - bookmark: releases/v2 243s - tag: default/releases/v2 243s - parent: 4:a02330f767a4 243s - user: test 243s - date: Mon Jan 01 00:00:15 2007 +0000 243s - summary: add eta 243s - 243s - changeset: 5:218b2d0660d3 243s - bookmark: releases/v1 243s - tag: default/releases/v1 243s - user: test 243s - date: Mon Jan 01 00:00:14 2007 +0000 243s - summary: add zeta 243s - 243s - changeset: 2:678ebee93e38 243s - bookmark: delta 243s - tag: default/delta 243s - parent: 0:ff7a2f2d8d70 243s - user: test 243s - date: Mon Jan 01 00:00:12 2007 +0000 243s - summary: add delta 243s - 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + [1] 243s 243s test for ssh vulnerability 243s 243s @@ -494,18 +307,21 @@ 243s > EOF 243s 243s $ hg init a 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ cd a 243s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 243s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 243s [255] 243s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 243s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 243s [255] 243s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 243s - ssh: * fakehost%7?shellcommand* (glob) 243s - abort: git remote error: The remote server unexpectedly closed the connection. 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 243s [255] 243s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 243s - ssh: * fakehost%7?shellcommand* (glob) 243s - abort: git remote error: The remote server unexpectedly closed the connection. 243s - [255] 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 243s + [255] 243s 243s ERROR: test-pull.t#draft output changed 243s ! 243s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-pull.t 243s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-pull.t#secret.err 243s @@ -35,153 +35,132 @@ 243s 243s pull without a name 243s $ hg init hgrepo 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ cd hgrepo 243s $ hg pull ../gitrepo 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s pulling from ../gitrepo 243s - importing 3 git commits 243s - adding bookmark beta 243s - adding bookmark delta 243s - adding bookmark master 243s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 243s - (run 'hg heads' to see heads, 'hg merge' to merge) 243s + abort: repository ../gitrepo not found 243s + [255] 243s $ git --git-dir .hg/git for-each-ref 243s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 243s + fatal: not a git repository: '.hg/git' 243s + [128] 243s $ hg log -Tp 243s - 2|draft|delta|tip 243s - 1|draft|beta| 243s - 0|draft|master|t_alpha 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ cd .. 243s $ rm -rf hgrepo 243s 243s pull with an implied name 243s $ hg init hgrepo 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ cd hgrepo 243s $ echo "[paths]" >> .hg/hgrc 243s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 243s $ hg pull ../gitrepo 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s pulling from ../gitrepo 243s - importing 3 git commits 243s - adding bookmark beta 243s - adding bookmark delta 243s - adding bookmark master 243s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 243s - (run 'hg heads' to see heads, 'hg merge' to merge) 243s + abort: repository ../gitrepo not found 243s + [255] 243s $ git --git-dir .hg/git for-each-ref 243s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 243s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 243s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 243s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 243s + fatal: not a git repository: '.hg/git' 243s + [128] 243s $ hg log -Tp 243s - 2|draft|delta|default/delta tip 243s - 1|draft|beta|default/beta 243s - 0|draft|master|default/master t_alpha 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ cd .. 243s $ rm -rf hgrepo 243s 243s pull with an explicit name 243s $ hg init hgrepo 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ cd hgrepo 243s $ echo "[paths]" >> .hg/hgrc 243s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 243s $ hg pull 243s - pulling from $TESTTMP/gitrepo 243s - importing 3 git commits 243s - adding bookmark beta 243s - adding bookmark delta 243s - adding bookmark master 243s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 243s - (run 'hg heads' to see heads, 'hg merge' to merge) 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ git --git-dir .hg/git for-each-ref 243s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 243s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 243s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 243s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 243s + fatal: not a git repository: '.hg/git' 243s + [128] 243s $ hg log -Tp 243s - 2|draft|delta|default/delta tip 243s - 1|draft|beta|default/beta 243s - 0|draft|master|default/master t_alpha 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ cd .. 243s $ rm -rf hgrepo 243s 243s pull a tag 243s $ hg init hgrepo 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ echo "[paths]" >> hgrepo/.hg/hgrc 243s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 243s $ hg -R hgrepo pull -r t_alpha 243s - pulling from $TESTTMP/gitrepo 243s - importing 1 git commits 243s - adding bookmark master 243s - new changesets ff7a2f2d8d70 (1 drafts) 243s - (run 'hg update' to get a working copy) 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ hg -R hgrepo update t_alpha 243s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + abort: unknown revision 't_alpha' 243s + [10] 243s $ hg log -Tp -R hgrepo 243s - 0|draft|master|default/master t_alpha tip 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s 243s no-op pull 243s $ hg -R hgrepo pull -r t_alpha 243s - pulling from $TESTTMP/gitrepo 243s - no changes found 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s 243s no-op pull with added bookmark 243s $ cd gitrepo 243s $ git checkout -qb epsilon t_alpha 243s $ cd .. 243s $ hg -R hgrepo pull -r epsilon 243s - pulling from $TESTTMP/gitrepo 243s - no changes found 243s - adding bookmark epsilon 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s 243s pull something that doesn't exist 243s $ hg -R hgrepo pull -r kaflaflibob 243s - pulling from $TESTTMP/gitrepo 243s - abort: unknown revision 'kaflaflibob'!? (re) 243s - [10] 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s 243s pull an ambiguous reference 243s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 243s $ hg -R hgrepo pull -r t_alpha 243s - pulling from $TESTTMP/gitrepo 243s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 243s - [10] 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 243s 243s pull a branch 243s $ hg -R hgrepo pull -r beta 243s - pulling from $TESTTMP/gitrepo 243s - importing 1 git commits 243s - adding bookmark beta 243s - new changesets 7fe02317c63d (1 drafts) 243s - (run 'hg update' to get a working copy) 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ hg -R hgrepo log --graph --template=phases 243s - o changeset: 1:7fe02317c63d 243s - | bookmark: beta 243s - | tag: default/beta 243s - | tag: tip 243s - | phase: draft 243s - | user: test 243s - | date: Mon Jan 01 00:00:11 2007 +0000 243s - | summary: add beta 243s - | 243s - @ changeset: 0:ff7a2f2d8d70 243s - bookmark: epsilon 243s - bookmark: master 243s - tag: default/epsilon 243s - tag: default/master 243s - tag: t_alpha 243s - phase: draft 243s - user: test 243s - date: Mon Jan 01 00:00:10 2007 +0000 243s - summary: add alpha 243s - 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s 243s no-op pull should affect phases 243s $ hg -R hgrepo phase -fs beta 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + abort: unknown revision 'beta' 243s + [10] 243s $ hg -R hgrepo pull -r beta 243s - pulling from $TESTTMP/gitrepo 243s - no changes found 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ hg -R hgrepo phase beta 243s - 1: draft 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + abort: unknown revision 'beta' 243s + [10] 243s 243s 243s add another commit and tag to the git repo 243s @@ -196,50 +175,12 @@ 243s 243s pull everything else 243s $ hg -R hgrepo pull 243s - pulling from $TESTTMP/gitrepo 243s - importing 2 git commits 243s - adding bookmark delta 243s - updating bookmark master 243s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 243s - (run 'hg heads' to see heads, 'hg merge' to merge) 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ hg -R hgrepo log --graph --template=phases 243s - o changeset: 3:6f898ad1f3e1 243s - | bookmark: master 243s - | tag: default/master 243s - | tag: tip 243s - | phase: draft 243s - | parent: 0:ff7a2f2d8d70 243s - | user: test 243s - | date: Mon Jan 01 00:00:13 2007 +0000 243s - | summary: add gamma 243s - | 243s - | o changeset: 2:678ebee93e38 243s - |/ bookmark: delta 243s - | tag: default/delta 243s - | phase: draft 243s - | parent: 0:ff7a2f2d8d70 243s - | user: test 243s - | date: Mon Jan 01 00:00:12 2007 +0000 243s - | summary: add delta 243s - | 243s - | o changeset: 1:7fe02317c63d 243s - |/ bookmark: beta 243s - | tag: default/beta 243s - | tag: t_beta 243s - | phase: draft 243s - | user: test 243s - | date: Mon Jan 01 00:00:11 2007 +0000 243s - | summary: add beta 243s - | 243s - @ changeset: 0:ff7a2f2d8d70 243s - bookmark: epsilon 243s - tag: default/epsilon 243s - tag: t_alpha 243s - phase: draft 243s - user: test 243s - date: Mon Jan 01 00:00:10 2007 +0000 243s - summary: add alpha 243s - 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s add a merge to the git repo, and delete the branch 243s $ cd gitrepo 243s $ git merge -q -m "Merge branch 'beta'" beta 243s @@ -252,60 +193,26 @@ 243s 243s pull the merge 243s $ hg -R hgrepo tags | grep default/beta 243s - default/beta 1:7fe02317c63d 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + [1] 243s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 243s - pulling from $TESTTMP/gitrepo 243s - importing 1 git commits 243s - updating bookmark master 243s - deleting bookmark beta 243s - new changesets a02330f767a4 (1 drafts) 243s - (run 'hg update' to get a working copy) 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ hg -R hgrepo tags | grep default/beta 243s - default/beta 1:7fe02317c63d 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + [1] 243s $ hg -R hgrepo pull 243s - pulling from $TESTTMP/gitrepo 243s - no changes found 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ hg -R hgrepo tags | grep default/beta 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s [1] 243s $ hg -R hgrepo log --graph 243s - o changeset: 4:a02330f767a4 243s - |\ bookmark: master 243s - | | tag: default/master 243s - | | tag: tip 243s - | | parent: 3:6f898ad1f3e1 243s - | | parent: 1:7fe02317c63d 243s - | | user: test 243s - | | date: Mon Jan 01 00:00:13 2007 +0000 243s - | | summary: Merge branch 'beta' 243s - | | 243s - | o changeset: 3:6f898ad1f3e1 243s - | | parent: 0:ff7a2f2d8d70 243s - | | user: test 243s - | | date: Mon Jan 01 00:00:13 2007 +0000 243s - | | summary: add gamma 243s - | | 243s - | | o changeset: 2:678ebee93e38 243s - | |/ bookmark: delta 243s - | | tag: default/delta 243s - | | parent: 0:ff7a2f2d8d70 243s - | | user: test 243s - | | date: Mon Jan 01 00:00:12 2007 +0000 243s - | | summary: add delta 243s - | | 243s - o | changeset: 1:7fe02317c63d 243s - |/ tag: t_beta 243s - | user: test 243s - | date: Mon Jan 01 00:00:11 2007 +0000 243s - | summary: add beta 243s - | 243s - @ changeset: 0:ff7a2f2d8d70 243s - bookmark: epsilon 243s - tag: default/epsilon 243s - tag: t_alpha 243s - user: test 243s - date: Mon Jan 01 00:00:10 2007 +0000 243s - summary: add alpha 243s - 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s pull with wildcards 243s $ cd gitrepo 243s $ git checkout -qb releases/v1 master 243s @@ -324,66 +231,12 @@ 243s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 243s $ cd .. 243s $ hg -R hgrepo pull -r 'releases/*' 243s - pulling from $TESTTMP/gitrepo 243s - importing 2 git commits 243s - adding bookmark releases/v1 243s - adding bookmark releases/v2 243s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 243s - (run 'hg heads .' to see heads, 'hg merge' to merge) 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ hg -R hgrepo log --graph 243s - o changeset: 6:a3f95e150b0a 243s - | bookmark: releases/v2 243s - | tag: default/releases/v2 243s - | tag: tip 243s - | parent: 4:a02330f767a4 243s - | user: test 243s - | date: Mon Jan 01 00:00:15 2007 +0000 243s - | summary: add eta 243s - | 243s - | o changeset: 5:218b2d0660d3 243s - |/ bookmark: releases/v1 243s - | tag: default/releases/v1 243s - | user: test 243s - | date: Mon Jan 01 00:00:14 2007 +0000 243s - | summary: add zeta 243s - | 243s - o changeset: 4:a02330f767a4 243s - |\ bookmark: master 243s - | | tag: default/master 243s - | | parent: 3:6f898ad1f3e1 243s - | | parent: 1:7fe02317c63d 243s - | | user: test 243s - | | date: Mon Jan 01 00:00:13 2007 +0000 243s - | | summary: Merge branch 'beta' 243s - | | 243s - | o changeset: 3:6f898ad1f3e1 243s - | | parent: 0:ff7a2f2d8d70 243s - | | user: test 243s - | | date: Mon Jan 01 00:00:13 2007 +0000 243s - | | summary: add gamma 243s - | | 243s - | | o changeset: 2:678ebee93e38 243s - | |/ bookmark: delta 243s - | | tag: default/delta 243s - | | parent: 0:ff7a2f2d8d70 243s - | | user: test 243s - | | date: Mon Jan 01 00:00:12 2007 +0000 243s - | | summary: add delta 243s - | | 243s - o | changeset: 1:7fe02317c63d 243s - |/ tag: t_beta 243s - | user: test 243s - | date: Mon Jan 01 00:00:11 2007 +0000 243s - | summary: add beta 243s - | 243s - @ changeset: 0:ff7a2f2d8d70 243s - bookmark: epsilon 243s - tag: default/epsilon 243s - tag: t_alpha 243s - user: test 243s - date: Mon Jan 01 00:00:10 2007 +0000 243s - summary: add alpha 243s - 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s 243s add old and new commits to the git repo -- make sure we're using the commit date 243s and not the author date 243s @@ -412,21 +265,19 @@ 243s Master is now filtered, so it's just stays there: 243s 243s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 243s - pulling from $TESTTMP/gitrepo 243s - no changes found 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ hg -R hgrepo pull 243s - pulling from $TESTTMP/gitrepo 243s - no changes found 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ hg -R hgrepo log -r master 243s - changeset: 4:a02330f767a4 243s - bookmark: master 243s - tag: default/master 243s - parent: 3:6f898ad1f3e1 243s - parent: 1:7fe02317c63d 243s - user: test 243s - date: Mon Jan 01 00:00:13 2007 +0000 243s - summary: Merge branch 'beta' 243s - 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + abort: unknown revision 'master' 243s + [10] 243s 243s $ cd gitrepo 243s $ git checkout -q master 243s @@ -440,51 +291,13 @@ 243s > git tag -a -m 'tagging newtag' newtag 243s $ cd .. 243s $ hg -R hgrepo pull 243s - pulling from $TESTTMP/gitrepo 243s - importing 3 git commits 243s - updating bookmark master 243s - new changesets 49713da8f665:e103a73f33be (3 drafts) 243s - (run 'hg heads .' to see heads, 'hg merge' to merge) 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + pulling from $TESTTMP/gitrepo 243s + abort: repository $TESTTMP/gitrepo not found 243s + [255] 243s $ hg -R hgrepo heads 243s - changeset: 9:e103a73f33be 243s - bookmark: master 243s - tag: default/master 243s - tag: tip 243s - user: test 243s - date: Wed Jan 01 00:00:00 2014 +0000 243s - summary: newcommit 243s - 243s - changeset: 7:49713da8f665 243s - tag: newtag 243s - tag: oldtag 243s - parent: 4:a02330f767a4 243s - user: test 243s - date: Sat Mar 01 00:00:00 2014 +0000 243s - summary: oldtag 243s - 243s - changeset: 6:a3f95e150b0a 243s - bookmark: releases/v2 243s - tag: default/releases/v2 243s - parent: 4:a02330f767a4 243s - user: test 243s - date: Mon Jan 01 00:00:15 2007 +0000 243s - summary: add eta 243s - 243s - changeset: 5:218b2d0660d3 243s - bookmark: releases/v1 243s - tag: default/releases/v1 243s - user: test 243s - date: Mon Jan 01 00:00:14 2007 +0000 243s - summary: add zeta 243s - 243s - changeset: 2:678ebee93e38 243s - bookmark: delta 243s - tag: default/delta 243s - parent: 0:ff7a2f2d8d70 243s - user: test 243s - date: Mon Jan 01 00:00:12 2007 +0000 243s - summary: add delta 243s - 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + [1] 243s 243s test for ssh vulnerability 243s 243s @@ -494,18 +307,21 @@ 243s > EOF 243s 243s $ hg init a 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ cd a 243s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 243s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 243s [255] 243s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 243s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 243s [255] 243s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 243s - ssh: * fakehost%7?shellcommand* (glob) 243s - abort: git remote error: The remote server unexpectedly closed the connection. 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 243s [255] 243s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 243s - ssh: * fakehost%7?shellcommand* (glob) 243s - abort: git remote error: The remote server unexpectedly closed the connection. 243s - [255] 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 243s + [255] 243s 243s ERROR: test-pull.t#secret output changed 243s ! 243s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-hook.t 243s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-hook.t.err 243s @@ -10,6 +10,7 @@ 243s > fn_${1}_commit -m $2 243s > } 243s $ hg init hgrepo 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ cd hgrepo 243s $ cat > .hg/hgrc < [hooks] 243s @@ -22,7 +23,10 @@ 243s > incoming = python:testlib.hooks.showargs 243s > EOF 243s $ fn_commit hg a 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ hg book master 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s 243s $ git init -q --bare ../repo.git 243s $ cat >> .hg/hgrc < master 243s + * [new branch] master -> master 243s $ cd ../hgrepo 243s 243s Hooks on pull? 243s 243s $ hg pull -u 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s pulling from $TESTTMP/repo.git 243s - | gitimport.source=pull 243s - | gitimport.git=True 243s - | gitimport.names=[b'default'] 243s - | gitimport.refs={b'HEAD': b'1dab31e7bc9691ba42a2fe7b14680694770bc527', b'refs/heads/master': b'1dab31e7bc9691ba42a2fe7b14680694770bc527'} 243s - | gitimport.heads=None 243s - importing 2 git commits 243s - : pretxncommit 243s - | incoming.git=True 243s - | incoming.source=pull 243s - | incoming.node=382ad5fa1d7727210384d40fa1539af52ca632c5 243s - | incoming.git_node=92150d1529ccaea34a6b36fe4144993193080499 243s - : pretxncommit 243s - | incoming.git=True 243s - | incoming.source=pull 243s - | incoming.node=892115eea5c32152e09ae4013c9a119d7b534049 243s - | incoming.git_node=1dab31e7bc9691ba42a2fe7b14680694770bc527 243s - updating bookmark master 243s - | changegroup.source=push 243s - | changegroup.git=True 243s - | changegroup.node=382ad5fa1d7727210384d40fa1539af52ca632c5 243s - | changegroup.node_last=892115eea5c32152e09ae4013c9a119d7b534049 243s - new changesets 382ad5fa1d77:892115eea5c3 (2 drafts) 243s - updating to active bookmark master 243s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 243s + abort: repository $TESTTMP/repo.git not found 243s + [255] 243s 243s Hooks on push? 243s 243s $ fn_commit hg d 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ fn_commit hg e 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ hg push 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s pushing to $TESTTMP/repo.git 243s - | preoutgoing.git=True 243s - | preoutgoing.source=push 243s - | preoutgoing.url=$TESTTMP/repo.git 243s - | gitexport.nodes=[b'cc6164a17449d58d7811ff3918f33f89c2c83fa5', b'46737f6a4c9d8307b681cbb2e9e2e5419cc87f82'] 243s - | gitexport.git=True 243s - searching for changes 243s - | prechangegroup.source=push 243s - | prechangegroup.git=True 243s - | prechangegroup.url=$TESTTMP/repo.git 243s - adding objects 243s - remote: found 0 deltas to reuse 243s - added 2 commits with 2 trees and 2 blobs 243s - updating reference refs/heads/master 243s + abort: repository $TESTTMP/repo.git not found 243s + [255] 243s 243s 243s And what does Mercurial do? 243s @@ -124,7 +87,9 @@ 243s On push: 243s 243s $ hg init ../hgrepo-copy 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ hg push ../hgrepo-copy 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s pushing to ../hgrepo-copy 243s searching for changes 243s | preoutgoing.source=push 243s @@ -133,19 +98,29 @@ 243s adding changesets 243s adding manifests 243s adding file changes 243s - added 5 changesets with 5 changes to 5 files 243s + added 3 changesets with 3 changes to 3 files 243s 243s With more than one head: 243s 243s $ rm -r ../hgrepo-copy 243s $ hg init ../hgrepo-copy 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ hg book -i 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ hg branch -q abranch 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ fn_commit hg x 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ hg up -q default 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ hg branch -q alsoabranch 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ fn_commit hg y 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s $ hg push ../hgrepo-copy 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s pushing to ../hgrepo-copy 243s searching for changes 243s | preoutgoing.source=push 243s @@ -154,13 +129,15 @@ 243s adding changesets 243s adding manifests 243s adding file changes 243s - added 7 changesets with 7 changes to 7 files (+1 heads) 243s + added 5 changesets with 5 changes to 5 files (+1 heads) 243s 243s On pull: 243s 243s $ hg debugstrip --no-backup tip 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 243s $ hg pull ../hgrepo-copy 243s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 243s pulling from ../hgrepo-copy 243s searching for changes 243s | prechangegroup.txnname=pull 243s @@ -171,16 +148,16 @@ 243s adding manifests 243s adding file changes 243s added 1 changesets with 1 changes to 1 files (+1 heads) 243s - new changesets d4097d98a390 243s + new changesets 11a693974ec5 243s | changegroup.txnname=pull 243s file://$TESTTMP/hgrepo-copy 243s | changegroup.source=pull 243s | changegroup.url=file:$TESTTMP/hgrepo-copy 243s - | changegroup.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 243s - | changegroup.node_last=d4097d98a3905be88e8a566039b1fdcca06e0d2e 243s + | changegroup.node=11a693974ec530e32672629628dde90793335199 243s + | changegroup.node_last=11a693974ec530e32672629628dde90793335199 243s | incoming.txnname=pull 243s file://$TESTTMP/hgrepo-copy 243s | incoming.source=pull 243s | incoming.url=file:$TESTTMP/hgrepo-copy 243s - | incoming.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 243s + | incoming.node=11a693974ec530e32672629628dde90793335199 243s (run 'hg heads' to see heads) 243s 243s ERROR: test-hook.t output changed 244s ! 244s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-phases-public.t 244s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-phases-public.t#publish-defaults.err 244s @@ -24,149 +24,10 @@ 244s 244s cloning with hggit.usephases publishes cloned HEAD 244s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 244s - importing 1 git commits 244s - new changesets ff7a2f2d8d70 244s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 244s + abort: repository gitrepo not found 244s + [255] 244s 244s $ cd hgrepo 244s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 244s $ hg phase -r master 244s - 0: public 244s - $ cd .. 244s - 244s -pulled changesets are public 244s - $ cd gitrepo 244s - $ git checkout -q master 244s - $ echo beta > beta 244s - $ git add beta 244s - $ fn_git_commit -m 'add beta' 244s - $ git checkout -b not-master 244s - Switched to a new branch 'not-master' 244s - $ echo gamma > gamma 244s - $ git add gamma 244s - $ fn_git_commit -m 'add gamma' 244s - $ git tag thetag 244s - $ echo delta > delta 244s - $ git add delta 244s - $ fn_git_commit -m 'add delta' 244s - $ git checkout master 244s - Switched to branch 'master' 244s - $ cd .. 244s - 244s - $ cd hgrepo 244s - $ cat >>$HGRCPATH < [paths] 244s - > other = $TESTTMP/gitrepo/.git 244s - > [hggit] 244s - > usephases = True 244s - > EOF 244s - 244s - $ hg phase -fd 'all()' 244s - 244s -we can restrict publishing to the remote HEAD and that tag, which 244s -happens to be the same thing here 244s - 244s -#if publish-specific 244s - $ cat >>$HGRCPATH < [git] 244s - > public = default/master, thetag 244s - > EOF 244s -#endif 244s - 244s -pulling publishes the branch 244s - 244s - $ hg phase -r master 244s - 0: draft 244s -#if publish-defaults 244s - $ hg pull -r master other 244s - pulling from $TESTTMP/gitrepo/.git 244s - importing 1 git commits 244s - updating bookmark master 244s - new changesets 7fe02317c63d 244s - 1 local changesets published 244s - (run 'hg update' to get a working copy) 244s -#else 244s - $ hg pull -r master other 244s - pulling from $TESTTMP/gitrepo/.git 244s - importing 1 git commits 244s - updating bookmark master 244s - new changesets 7fe02317c63d (1 drafts) 244s - (run 'hg update' to get a working copy) 244s -#endif 244s - $ hg phase -r master 244s - 1: draft (publish-specific !) 244s - 1: public (publish-defaults !) 244s -#if publish-defaults 244s - $ hg phase -fd master 244s - $ hg pull 244s - pulling from $TESTTMP/gitrepo 244s - importing 2 git commits 244s - adding bookmark not-master 244s - new changesets ca33a262eb46:03769a650ded (1 drafts) 244s - 1 local changesets published 244s - (run 'hg update' to get a working copy) 244s -#else 244s - $ hg pull 244s - pulling from $TESTTMP/gitrepo 244s - importing 2 git commits 244s - adding bookmark not-master 244s - new changesets ca33a262eb46:03769a650ded (1 drafts) 244s - 2 local changesets published 244s - (run 'hg update' to get a working copy) 244s -#endif 244s - $ hg phase -r master -r not-master -r thetag 244s - 1: public 244s - 3: draft 244s - 2: public 244s - 244s -public bookmark not pushed is not published after pull 244s - 244s - $ hg update 0 244s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 244s - $ echo delta > delta 244s - $ hg bookmark not-pushed 244s - $ hg add delta 244s - $ hg commit -m 'add delta' 244s - created new head 244s - $ hg phase -r 'all()' > $TESTTMP/before 244s - $ hg pull --config git.public=master,not-pushed 244s - pulling from $TESTTMP/gitrepo 244s - no changes found 244s - $ hg phase -r 'all()' > $TESTTMP/after 244s - $ cmp -s $TESTTMP/before $TESTTMP/after 244s - $ hg phase -r not-pushed 244s - 4: draft 244s - $ rm $TESTTMP/before $TESTTMP/after 244s - 244s -pushing public bookmark publishes local changesets, but only those 244s -actually pushed 244s - 244s - $ hg update master 244s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 244s - (activating bookmark master) 244s - $ echo epsilon > epsilon 244s - $ hg add epsilon 244s - $ hg commit -m 'add epsilon' 244s - created new head 244s - $ hg phase -r 'all() - master' > $TESTTMP/before 244s - $ hg push -B not-pushed 244s - pushing to $TESTTMP/gitrepo 244s - searching for changes 244s - adding objects 244s - remote: found 0 deltas to reuse 244s - added 1 commits with 1 trees and 1 blobs 244s - adding reference refs/heads/not-pushed 244s - $ hg phase -r 'all() - master' > $TESTTMP/after 244s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 244s - $ hg phase -r not-pushed -r master 244s - 4: draft 244s - 5: draft 244s - $ hg push -B master 244s - pushing to $TESTTMP/gitrepo 244s - searching for changes 244s - adding objects 244s - remote: found 0 deltas to reuse 244s - added 1 commits with 1 trees and 1 blobs 244s - updating reference refs/heads/master 244s - $ hg phase -r 'all() - master' > $TESTTMP/after 244s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 244s - $ hg phase -r master 244s - 5: public 244s 244s ERROR: test-phases-public.t#publish-defaults output changed 245s ! 245s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-phases-public.t 245s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-phases-public.t#publish-specific.err 245s @@ -24,149 +24,10 @@ 245s 245s cloning with hggit.usephases publishes cloned HEAD 245s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 245s - importing 1 git commits 245s - new changesets ff7a2f2d8d70 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + abort: repository gitrepo not found 245s + [255] 245s 245s $ cd hgrepo 245s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 245s $ hg phase -r master 245s - 0: public 245s - $ cd .. 245s - 245s -pulled changesets are public 245s - $ cd gitrepo 245s - $ git checkout -q master 245s - $ echo beta > beta 245s - $ git add beta 245s - $ fn_git_commit -m 'add beta' 245s - $ git checkout -b not-master 245s - Switched to a new branch 'not-master' 245s - $ echo gamma > gamma 245s - $ git add gamma 245s - $ fn_git_commit -m 'add gamma' 245s - $ git tag thetag 245s - $ echo delta > delta 245s - $ git add delta 245s - $ fn_git_commit -m 'add delta' 245s - $ git checkout master 245s - Switched to branch 'master' 245s - $ cd .. 245s - 245s - $ cd hgrepo 245s - $ cat >>$HGRCPATH < [paths] 245s - > other = $TESTTMP/gitrepo/.git 245s - > [hggit] 245s - > usephases = True 245s - > EOF 245s - 245s - $ hg phase -fd 'all()' 245s - 245s -we can restrict publishing to the remote HEAD and that tag, which 245s -happens to be the same thing here 245s - 245s -#if publish-specific 245s - $ cat >>$HGRCPATH < [git] 245s - > public = default/master, thetag 245s - > EOF 245s -#endif 245s - 245s -pulling publishes the branch 245s - 245s - $ hg phase -r master 245s - 0: draft 245s -#if publish-defaults 245s - $ hg pull -r master other 245s - pulling from $TESTTMP/gitrepo/.git 245s - importing 1 git commits 245s - updating bookmark master 245s - new changesets 7fe02317c63d 245s - 1 local changesets published 245s - (run 'hg update' to get a working copy) 245s -#else 245s - $ hg pull -r master other 245s - pulling from $TESTTMP/gitrepo/.git 245s - importing 1 git commits 245s - updating bookmark master 245s - new changesets 7fe02317c63d (1 drafts) 245s - (run 'hg update' to get a working copy) 245s -#endif 245s - $ hg phase -r master 245s - 1: draft (publish-specific !) 245s - 1: public (publish-defaults !) 245s -#if publish-defaults 245s - $ hg phase -fd master 245s - $ hg pull 245s - pulling from $TESTTMP/gitrepo 245s - importing 2 git commits 245s - adding bookmark not-master 245s - new changesets ca33a262eb46:03769a650ded (1 drafts) 245s - 1 local changesets published 245s - (run 'hg update' to get a working copy) 245s -#else 245s - $ hg pull 245s - pulling from $TESTTMP/gitrepo 245s - importing 2 git commits 245s - adding bookmark not-master 245s - new changesets ca33a262eb46:03769a650ded (1 drafts) 245s - 2 local changesets published 245s - (run 'hg update' to get a working copy) 245s -#endif 245s - $ hg phase -r master -r not-master -r thetag 245s - 1: public 245s - 3: draft 245s - 2: public 245s - 245s -public bookmark not pushed is not published after pull 245s - 245s - $ hg update 0 245s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 245s - $ echo delta > delta 245s - $ hg bookmark not-pushed 245s - $ hg add delta 245s - $ hg commit -m 'add delta' 245s - created new head 245s - $ hg phase -r 'all()' > $TESTTMP/before 245s - $ hg pull --config git.public=master,not-pushed 245s - pulling from $TESTTMP/gitrepo 245s - no changes found 245s - $ hg phase -r 'all()' > $TESTTMP/after 245s - $ cmp -s $TESTTMP/before $TESTTMP/after 245s - $ hg phase -r not-pushed 245s - 4: draft 245s - $ rm $TESTTMP/before $TESTTMP/after 245s - 245s -pushing public bookmark publishes local changesets, but only those 245s -actually pushed 245s - 245s - $ hg update master 245s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 245s - (activating bookmark master) 245s - $ echo epsilon > epsilon 245s - $ hg add epsilon 245s - $ hg commit -m 'add epsilon' 245s - created new head 245s - $ hg phase -r 'all() - master' > $TESTTMP/before 245s - $ hg push -B not-pushed 245s - pushing to $TESTTMP/gitrepo 245s - searching for changes 245s - adding objects 245s - remote: found 0 deltas to reuse 245s - added 1 commits with 1 trees and 1 blobs 245s - adding reference refs/heads/not-pushed 245s - $ hg phase -r 'all() - master' > $TESTTMP/after 245s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 245s - $ hg phase -r not-pushed -r master 245s - 4: draft 245s - 5: draft 245s - $ hg push -B master 245s - pushing to $TESTTMP/gitrepo 245s - searching for changes 245s - adding objects 245s - remote: found 0 deltas to reuse 245s - added 1 commits with 1 trees and 1 blobs 245s - updating reference refs/heads/master 245s - $ hg phase -r 'all() - master' > $TESTTMP/after 245s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 245s - $ hg phase -r master 245s - 5: public 245s 245s ERROR: test-phases-public.t#publish-specific output changed 245s !s 245s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-illegal-contents.t 245s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-illegal-contents.t.err 245s @@ -5,6 +5,7 @@ 245s $ . "$TESTDIR/testutil" 245s 245s $ hg init hg 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s $ cd hg 245s $ mkdir -p .git/hooks 245s $ cat > .git/hooks/post-update < EOF 245s $ fn_touch_escaped foo/git~100/wat bar/.gi\\u200ct/wut this/is/safe 245s $ hg addremove 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s adding .git/hooks/post-update 245s adding bar/.gi\xe2\x80\x8ct/wut (esc) 245s adding foo/git~100/wat 245s adding this/is/safe 245s $ hg ci -m "we should refuse to export this" 245s - $ hg book master 245s - $ hg gexport 245s - warning: skipping invalid path '.git/hooks/post-update' 245s - warning: skipping invalid path 'bar/.gi\xe2\x80\x8ct/wut' 245s - warning: skipping invalid path 'foo/git~100/wat' 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + $ hg book master 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + $ hg gexport 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + hg: unknown command 'gexport' 245s + (did you mean one of export, import?) 245s + [10] 245s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 245s - this/is/safe 245s + fatal: not a git repository: '.hg/git' 245s + [128] 245s $ hg debug-remove-hggit-state 245s - clearing out the git cache data 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + hg: unknown command 'debug-remove-hggit-state' 245s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 245s + [10] 245s $ hg gexport --config hggit.invalidpaths=keep 245s - warning: path '.git/hooks/post-update' contains an invalid path component 245s - warning: path 'bar/.gi\xe2\x80\x8ct/wut' contains an invalid path component 245s - warning: path 'foo/git~100/wat' contains an invalid path component 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + hg: unknown command 'gexport' 245s + (did you mean one of export, import?) 245s + [10] 245s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 245s - .git/hooks/post-update 245s - "bar/.gi\342\200\214t/wut" 245s - foo/git~100/wat 245s - this/is/safe 245s - $ cd .. 245s - 245s - $ rm -rf hg 245s - $ hg init hg 245s + fatal: not a git repository: '.hg/git' 245s + [128] 245s + $ cd .. 245s + 245s + $ rm -rf hg 245s + $ hg init hg 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s $ cd hg 245s $ mkdir -p nested/.git/hooks/ 245s $ cat > nested/.git/hooks/post-update < EOF 245s $ chmod +x nested/.git/hooks/post-update 245s $ hg addremove 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s adding nested/.git/hooks/post-update 245s $ hg ci -m "also refuse to export this" 245s - $ hg book master 245s - $ hg gexport 245s - warning: skipping invalid path 'nested/.git/hooks/post-update' 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + $ hg book master 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + $ hg gexport 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + hg: unknown command 'gexport' 245s + (did you mean one of export, import?) 245s + [10] 245s $ git clone .hg/git git 245s - Cloning into 'git'... 245s - done. 245s + fatal: repository '.hg/git' does not exist 245s + [128] 245s $ rm -rf git 245s 245s We can trigger an error: 245s 245s $ hg -q debug-remove-hggit-state 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + hg: unknown command 'debug-remove-hggit-state' 245s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 245s + [10] 245s $ hg --config hggit.invalidpaths=abort gexport 245s - abort: invalid path 'nested/.git/hooks/post-update' rejected by configuration 245s - (see 'hg help config.hggit.invalidpaths for details) 245s - [255] 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + hg: unknown command 'gexport' 245s + (did you mean one of export, import?) 245s + [10] 245s 245s We can override if needed: 245s 245s $ hg --config hggit.invalidpaths=keep gexport 245s - warning: path 'nested/.git/hooks/post-update' contains an invalid path component 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + hg: unknown command 'gexport' 245s + (did you mean one of export, import?) 245s + [10] 245s $ cd .. 245s $ # different git versions give different return codes 245s $ git clone hg/.hg/git git || true 245s - Cloning into 'git'... 245s - done. 245s - error: [Ii]nvalid path 'nested/\.git/hooks/post-update' (re) 245s + fatal: repository 'hg/.hg/git' does not exist 245s fatal: unable to checkout working tree (?) 245s warning: Clone succeeded, but checkout failed. (?) 245s You can inspect what was checked out with 'git status' (?) 245s @@ -88,6 +109,7 @@ 245s $ cd .. 245s $ rm -rf hg 245s $ hg init hg 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s $ cd hg 245s $ mkdir -p .GIT/hooks/ 245s $ cat > .GIT/hooks/post-checkout < EOF 245s $ chmod +x .GIT/hooks/post-checkout 245s $ hg addremove 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s adding .GIT/hooks/post-checkout 245s $ hg ci -m "also refuse to export this" 245s - $ hg book master 245s - $ hg gexport 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + $ hg book master 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + $ hg gexport 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + hg: unknown command 'gexport' 245s + (did you mean one of export, import?) 245s + [10] 245s $ cd .. 245s 245s And the NTFS case: 245s $ cd .. 245s $ rm -rf hg 245s $ hg init hg 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s $ cd hg 245s $ mkdir -p GIT~1/hooks/ 245s $ cat > GIT~1/hooks/post-checkout < EOF 245s $ chmod +x GIT~1/hooks/post-checkout 245s $ hg addremove 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s adding GIT~1/hooks/post-checkout 245s $ hg ci -m "also refuse to export this" 245s - $ hg book master 245s - $ hg gexport 245s - warning: skipping invalid path 'GIT~1/hooks/post-checkout' 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + $ hg book master 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + $ hg gexport 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + hg: unknown command 'gexport' 245s + (did you mean one of export, import?) 245s + [10] 245s $ cd .. 245s 245s Now check a Git repository containing a Mercurial repository, which 245s @@ -127,36 +163,29 @@ 245s $ rm -rf hg git nested 245s $ git init -q git 245s $ hg init nested 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s $ mv nested git 245s $ cd git 245s $ git add nested 245s $ fn_git_commit -m 'add a Mercurial repository' 245s $ cd .. 245s $ hg clone --config hggit.invalidpaths=abort git hg 245s - importing 1 git commits 245s - abort: invalid path 'nested/.hg/00changelog.i' rejected by configuration 245s - (see 'hg help config.hggit.invalidpaths for details) 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + abort: repository git not found 245s [255] 245s $ rm -rf hg 245s $ hg clone --config hggit.invalidpaths=keep git hg 245s - importing 1 git commits 245s - warning: path 'nested/.hg/00changelog.i' contains an invalid path component 245s - warning: path 'nested/.hg/requires' contains an invalid path component 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + abort: repository git not found 245s warning: path 'nested/.hg/store/requires' contains an invalid path component (?) 245s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 245s warning: path 'nested/.hg/store/requires' is within a nested repository, which Mercurial cannot check out. (?) 245s - updating to bookmark master 245s - abort: path 'nested/.hg/00changelog.i' is inside nested repo 'nested' 245s - [10] 245s + [255] 245s $ rm -rf hg 245s $ hg clone git hg 245s - importing 1 git commits 245s - warning: skipping invalid path 'nested/.hg/00changelog.i' 245s - warning: skipping invalid path 'nested/.hg/requires' 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + abort: repository git not found 245s warning: skipping invalid path 'nested/.hg/store/requires' (?) 245s - new changesets 3ea18a67c0e6 (1 drafts) 245s - updating to bookmark master 245s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 245s + [255] 245s $ cd .. 245s 245s Now check a Git repository containing paths with carriage return and 245s @@ -171,23 +200,16 @@ 245s $ fn_git_commit -m 'add files disallowed by mercurial' 245s $ cd .. 245s $ hg clone --config hggit.invalidpaths=abort git hg 245s - importing 1 git commits 245s - abort: invalid path 'Icon\r' rejected by configuration 245s - (see 'hg help config.hggit.invalidpaths for details) 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + abort: repository git not found 245s [255] 245s $ hg clone --config hggit.invalidpaths=keep git hg 245s - importing 1 git commits 245s - warning: skipping invalid path 'Icon\r' 245s - warning: skipping invalid path 'the\nfile' 245s - new changesets 8354c06a5842 (1 drafts) 245s - updating to bookmark master 245s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + abort: repository git not found 245s + [255] 245s $ rm -rf hg 245s $ hg clone git hg 245s - importing 1 git commits 245s - warning: skipping invalid path 'Icon\r' 245s - warning: skipping invalid path 'the\nfile' 245s - new changesets 8354c06a5842 (1 drafts) 245s - updating to bookmark master 245s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 245s - 245s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 245s + abort: repository git not found 245s + [255] 245s + 245s 245s ERROR: test-illegal-contents.t output changed 246s ! 246s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-invalid-refs.t 246s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-invalid-refs.t.err 246s @@ -12,115 +12,10 @@ 246s 246s $ cd .. 246s $ hg clone -U gitrepo hgrepo 246s - importing 1 git commits 246s - new changesets ff7a2f2d8d70 (1 drafts) 246s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 246s + abort: repository gitrepo not found 246s + [255] 246s 246s $ cd hgrepo 246s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 246s $ hg up master 246s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 246s - (activating bookmark master) 246s - $ fn_hg_tag alph#a 246s - $ fn_hg_tag bet*a 246s - $ fn_hg_tag 'gamm a' 246s - $ hg book -r . delt#a 246s - $ hg book -r . epsil*on 246s - 246s - $ hg gexport 246s - warning: not exporting tag 'bet*a' due to invalid name 246s - warning: not exporting bookmark 'epsil*on' due to invalid name 246s - 246s - $ hg push 246s - pushing to $TESTTMP/gitrepo 246s - warning: not exporting tag 'bet*a' due to invalid name 246s - warning: not exporting bookmark 'epsil*on' due to invalid name 246s - searching for changes 246s - adding objects 246s - remote: found 0 deltas to reuse 246s - added 3 commits with 3 trees and 3 blobs 246s - adding reference refs/heads/delt#a 246s - updating reference refs/heads/master 246s - adding reference refs/tags/alph#a 246s - adding reference refs/tags/gamm_a 246s - 246s - $ hg log --graph 246s - @ changeset: 3:0950ab44ea23 246s - | bookmark: delt#a 246s - | bookmark: epsil*on 246s - | bookmark: master 246s - | tag: default/delt#a 246s - | tag: default/master 246s - | tag: tip 246s - | user: test 246s - | date: Mon Jan 01 00:00:13 2007 +0000 246s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 246s - | 246s - o changeset: 2:0b27ab2b3df6 246s - | tag: gamm a 246s - | user: test 246s - | date: Mon Jan 01 00:00:12 2007 +0000 246s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 246s - | 246s - o changeset: 1:491ceeb1b0f1 246s - | tag: bet*a 246s - | user: test 246s - | date: Mon Jan 01 00:00:11 2007 +0000 246s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 246s - | 246s - o changeset: 0:ff7a2f2d8d70 246s - bookmark: not-master 246s - tag: alph#a 246s - tag: default/not-master 246s - user: test 246s - date: Mon Jan 01 00:00:10 2007 +0000 246s - summary: add alpha 246s - 246s - 246s - $ cd .. 246s - $ cd gitrepo 246s -git should have only the valid tag alph#a but have full commit log including the missing invalid bet*a tag commit 246s - $ git tag -l 246s - alph#a 246s - gamm_a 246s - 246s - $ cd .. 246s - $ hg clone -U gitrepo hgrepo2 246s - importing 4 git commits 246s - new changesets ff7a2f2d8d70:0950ab44ea23 (4 drafts) 246s - $ hg -R hgrepo2 log --graph 246s - o changeset: 3:0950ab44ea23 246s - | bookmark: delt#a 246s - | bookmark: master 246s - | tag: default/delt#a 246s - | tag: default/master 246s - | tag: tip 246s - | user: test 246s - | date: Mon Jan 01 00:00:13 2007 +0000 246s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 246s - | 246s - o changeset: 2:0b27ab2b3df6 246s - | tag: gamm a 246s - | tag: gamm_a 246s - | user: test 246s - | date: Mon Jan 01 00:00:12 2007 +0000 246s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 246s - | 246s - o changeset: 1:491ceeb1b0f1 246s - | tag: bet*a 246s - | user: test 246s - | date: Mon Jan 01 00:00:11 2007 +0000 246s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 246s - | 246s - o changeset: 0:ff7a2f2d8d70 246s - bookmark: not-master 246s - tag: alph#a 246s - tag: default/not-master 246s - user: test 246s - date: Mon Jan 01 00:00:10 2007 +0000 246s - summary: add alpha 246s - 246s - 246s -the tag should be in .hgtags 246s - $ hg cat -r master hgrepo2/.hgtags 246s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alph#a 246s - 491ceeb1b0f10d65d956dfcdd3470ac2bc2c96a8 bet*a 246s - 0b27ab2b3df69c6f7defd7040b93e539136db5be gamm a 246s 246s ERROR: test-invalid-refs.t output changed 247s ! 247s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-gc.t 247s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-gc.t.err 247s @@ -25,188 +25,9 @@ 247s > done 247s $ cd .. 247s $ hg clone -U gitrepo hgrepo 247s - importing 100 git commits 247s - new changesets 1c8407413fa3:eda59117ba04 (100 drafts) 247s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 247s + abort: repository gitrepo not found 247s + [255] 247s $ cd hgrepo 247s + $TESTTMP.sh: 24: cd: can't cd to hgrepo 247s $ hg debug-remove-hggit-state 247s - clearing out the git cache data 247s - 247s ------------ 247s - 247s -Test garbage collection of loose objects into packs. We first test 247s -this with two threads, which is closest to the expected usage 247s -scenario, as almost all computers have at least two cores these days. 247s -The main downside is that this makes the output order unreliable, so 247s -we just sort it. 247s - 247s - $ hg gexport --config hggit.mapsavefrequency=33 --config hggit.threads=2 --debug | grep pack | sort 247s - packed 3 loose objects! 247s - packed 75 loose objects! 247s - packed 78 loose objects! 247s - packed 86 loose objects! 247s - packing 3 loose objects... 247s - packing 75 loose objects... 247s - packing 78 loose objects... 247s - packing 86 loose objects... 247s - $ hg debug-remove-hggit-state 247s - clearing out the git cache data 247s - 247s -Test the actual order of operations -- this uses a single thread, 247s -which means that the packing happens synchronously in the main thread, 247s -giving us a reliable output order. 247s - 247s -In addition, the transaction size is set up such that we happen to do 247s -nothing in the final, synchronous packing that happens on every pull. 247s -Lots of other tests have a map save frequency higher than the total 247s -amount of commits pulled, but let's just trigger that other odd 247s -occurence here. 247s - 247s - $ hg gexport --debug \ 247s - > --config hggit.mapsavefrequency=10 --config hggit.threads=1 | \ 247s - > sed 's/^converting revision.*/./' 247s - finding unexported changesets 247s - exporting 100 changesets 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 247s - packing 30 loose objects... 247s - packed 30 loose objects! 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 247s - packing 25 loose objects... 247s - packed 25 loose objects! 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 247s - packing 25 loose objects... 247s - packed 25 loose objects! 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 247s - packing 24 loose objects... 247s - packed 24 loose objects! 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 247s - packing 24 loose objects... 247s - packed 24 loose objects! 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 247s - packing 24 loose objects... 247s - packed 24 loose objects! 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 247s - packing 24 loose objects... 247s - packed 24 loose objects! 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 247s - packing 23 loose objects... 247s - packed 23 loose objects! 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 247s - packing 22 loose objects... 247s - packed 22 loose objects! 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - . 247s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 247s - packing 21 loose objects... 247s - packed 21 loose objects! 247s - packing 0 loose objects... 247s - packed 0 loose objects! 247s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 247s - $ find .hg/git/objects -type f | grep -Fv .idx | sort 247s - .hg/git/objects/pack/pack-33903607b479000b976a29a349fe0f4dffb0aaac.pack 247s - .hg/git/objects/pack/pack-40d9440e392d9eab62fa38a2ed66cc763d77aca3.pack 247s - .hg/git/objects/pack/pack-4ab2dac268f94e407788d52d6ba087b626c41651.pack 247s - .hg/git/objects/pack/pack-543e3b37bd36218a4dc6611a96d7c218afb78429.pack 247s - .hg/git/objects/pack/pack-5fc80292253ee10d1b86b5c4d9c51b29d2b4ba47.pack 247s - .hg/git/objects/pack/pack-9c636f5f16302fc5fadf0cc4ed42aeb67fc51f6a.pack 247s - .hg/git/objects/pack/pack-ae74b1f0197dfb45cfb13889453860a40103969a.pack 247s - .hg/git/objects/pack/pack-b432e2f477cb765fc0aeaa850d56e04b10392e6c.pack 247s - .hg/git/objects/pack/pack-cf7023660ce10ede2896d1be117f6ba93a261ff9.pack 247s - .hg/git/objects/pack/pack-e601b2af6a91a9cf6817d71f4eb660d2218d4094.pack 247s 247s ERROR: test-gc.t output changed 248s ! 248s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-serve-hg.t 248s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-serve-hg.t#without-hggit.err 248s @@ -31,11 +31,11 @@ 248s $ cd .. 248s 248s $ hg clone gitrepo hgrepo 248s - importing 2 git commits 248s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 248s - updating to bookmark master 248s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 248s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 248s + abort: repository gitrepo not found 248s + [255] 248s $ cd hgrepo 248s + $TESTTMP.sh: 36: cd: can't cd to hgrepo 248s $ cat >> .hg/hgrc < [push] 248s > pushvars.server = true 248s @@ -45,81 +45,3 @@ 248s > [hooks] 248s > pretxnchangegroup = env | grep HG_USERVAR_ || true 248s > EOF 248s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 248s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 248s - 248s -Test server address cannot be reused 248s - 248s -#if windows 248s - $ hg serve -p $HGPORT1 2>&1 248s - abort: cannot start server at '*:$HGPORT1': * (glob) 248s - [255] 248s -#else 248s - $ hg serve -p $HGPORT1 2>&1 248s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 248s - [255] 248s -#endif 248s - $ cd .. 248s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 248s - 248s -Make sure that clone regular mercurial repos over http doesn't break, 248s -and that we can transfer the hg-git metadata 248s - 248s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 248s - requesting all changes 248s - adding changesets 248s - adding manifests 248s - adding file changes 248s - added 2 changesets with 4 changes to 4 files 248s - new changesets f488b65fa424:c61c38c3d614 (?) 248s - updating to branch default 248s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 248s - 248s -And it shouldn't create a Git repository needlessly: 248s - $ test -e copy/git 248s - [1] 248s - $ cd copy 248s - 248s -#if without-hggit 248s - $ hg tags 248s - tip 1:c61c38c3d614 248s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 248s - 1:c61c38c3d614 | master | | 248s - 0:f488b65fa424 | | | 248s - $ hg pull -u ../gitrepo 248s - pulling from ../gitrepo 248s - importing 2 git commits 248s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 248s -#else 248s - $ hg tags 248s - tip 1:c61c38c3d614 248s - thetag 0:f488b65fa424 248s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 248s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 248s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 248s - $ hg pull -u ../gitrepo 248s - pulling from ../gitrepo 248s - warning: created new git repository at $TESTTMP/copy/.hg/git 248s - no changes found 248s -#endif 248s - 248s - $ hg tags 248s - tip 1:c61c38c3d614 248s - thetag 0:f488b65fa424 248s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 248s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 248s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 248s - 248s -Furthermore, make sure that we pass all arguments when pushing: 248s - 248s - $ echo baz > baz 248s - $ fn_hg_commit -A -m baz 248s - $ hg push --pushvars FOO=BAR 248s - pushing to http://localhost:$HGPORT/ 248s - searching for changes 248s - remote: adding changesets 248s - remote: adding manifests 248s - remote: adding file changes 248s - remote: HG_USERVAR_FOO=BAR 248s - remote: added 1 changesets with 1 changes to 1 files 248s - $ cd .. 248s 248s ERROR: test-serve-hg.t#without-hggit output changed 249s ! 249s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-push-authors.t 249s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-push-authors.t.err 249s @@ -8,127 +8,9 @@ 249s Create a Mercurial repository 249s 249s $ hg clone repo.git hgrepo 249s - updating to branch default 249s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 249s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 249s + abort: repository repo.git not found 249s + [255] 249s $ cd hgrepo 249s + $TESTTMP.sh: 8: cd: can't cd to hgrepo 249s $ hg book master 249s - 249s -Configure an author map 249s - 249s - $ touch authors.txt 249s - $ cat >> $HGRCPATH < [git] 249s - > authors = $TESTTMP/authors.txt 249s - > EOF 249s - 249s -Create a commit user that maps to a fully valid user 249s - 249s - $ cat >> $TESTTMP/authors.txt < user1 = User no. 1 249s - > EOF 249s - $ touch alpha 249s - $ hg add alpha 249s - $ fn_hg_commit -m alpha -u user1 249s - 249s -And one that maps to an email address 249s - 249s - $ cat >> $TESTTMP/authors.txt < user2@example.com = user2 249s - > EOF 249s - $ touch beta 249s - $ hg add beta 249s - $ fn_hg_commit -m beta -u user2@example.com 249s - 249s -And one that maps to a "simple" user 249s - 249s - $ cat >> $TESTTMP/authors.txt < User #3 = user3@example.com 249s - > EOF 249s - $ touch gamma 249s - $ hg add gamma 249s - $ fn_hg_commit -m gamma -u "User #3 " 249s - 249s -And one that maps to nothing 249s - 249s - $ cat >> $TESTTMP/authors.txt < user4 = 249s - > EOF 249s - $ touch delta 249s - $ hg add delta 249s - $ fn_hg_commit -m delta -u user4 249s - 249s -And one that doesn't map 249s - 249s - $ touch epsilon 249s - $ hg add epsilon 249s - $ fn_hg_commit -m epsilon -u "User #5 " 249s - 249s -Check the test default 249s - 249s - $ touch zeta 249s - $ hg add zeta 249s - $ fn_hg_commit -m zeta 249s - 249s -Push it! 249s - 249s - $ hg push 249s - pushing to $TESTTMP/repo.git 249s - searching for changes 249s - adding objects 249s - remote: found 0 deltas to reuse 249s - added 6 commits with 6 trees and 1 blobs 249s - adding reference refs/heads/master 249s - 249s -Check the results: 249s - 249s - $ hg log --template='Commit: {gitnode}\nAuthor: {author}\n---\n' 249s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 249s - Author: test 249s - --- 249s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 249s - Author: User #5 249s - --- 249s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 249s - Author: user4 249s - --- 249s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 249s - Author: User #3 249s - --- 249s - Commit: eba936dd13172a2f17936785e3604845aed9170d 249s - Author: user2@example.com 249s - --- 249s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 249s - Author: user1 249s - --- 249s - $ cd ../repo.git 249s - $ cat $TESTTMP/authors.txt 249s - user1 = User no. 1 249s - user2@example.com = user2 249s - User #3 = user3@example.com 249s - user4 = 249s - $ git log --pretty='tformat:Commit: %H%nAuthor: %an <%ae>%nCommitter: %cn <%ce>%n---' 249s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 249s - Author: test 249s - Committer: test 249s - --- 249s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 249s - Author: User #5 249s - Committer: User #5 249s - --- 249s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 249s - Author: 249s - Committer: 249s - --- 249s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 249s - Author: user3@example.com 249s - Committer: user3@example.com 249s - --- 249s - Commit: eba936dd13172a2f17936785e3604845aed9170d 249s - Author: user2 249s - Committer: user2 249s - --- 249s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 249s - Author: User no. 1 249s - Committer: User no. 1 249s - --- 249s - $ cd .. 249s 249s ERROR: test-push-authors.t output changed 249s ! 249s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-serve-hg.t 249s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-serve-hg.t#with-hggit.err 249s @@ -31,11 +31,11 @@ 249s $ cd .. 249s 249s $ hg clone gitrepo hgrepo 249s - importing 2 git commits 249s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 249s - updating to bookmark master 249s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 249s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 249s + abort: repository gitrepo not found 249s + [255] 249s $ cd hgrepo 249s + $TESTTMP.sh: 41: cd: can't cd to hgrepo 249s $ cat >> .hg/hgrc < [push] 249s > pushvars.server = true 249s @@ -45,81 +45,3 @@ 249s > [hooks] 249s > pretxnchangegroup = env | grep HG_USERVAR_ || true 249s > EOF 249s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 249s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 249s - 249s -Test server address cannot be reused 249s - 249s -#if windows 249s - $ hg serve -p $HGPORT1 2>&1 249s - abort: cannot start server at '*:$HGPORT1': * (glob) 249s - [255] 249s -#else 249s - $ hg serve -p $HGPORT1 2>&1 249s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 249s - [255] 249s -#endif 249s - $ cd .. 249s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 249s - 249s -Make sure that clone regular mercurial repos over http doesn't break, 249s -and that we can transfer the hg-git metadata 249s - 249s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 249s - requesting all changes 249s - adding changesets 249s - adding manifests 249s - adding file changes 249s - added 2 changesets with 4 changes to 4 files 249s - new changesets f488b65fa424:c61c38c3d614 (?) 249s - updating to branch default 249s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 249s - 249s -And it shouldn't create a Git repository needlessly: 249s - $ test -e copy/git 249s - [1] 249s - $ cd copy 249s - 249s -#if without-hggit 249s - $ hg tags 249s - tip 1:c61c38c3d614 249s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 249s - 1:c61c38c3d614 | master | | 249s - 0:f488b65fa424 | | | 249s - $ hg pull -u ../gitrepo 249s - pulling from ../gitrepo 249s - importing 2 git commits 249s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 249s -#else 249s - $ hg tags 249s - tip 1:c61c38c3d614 249s - thetag 0:f488b65fa424 249s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 249s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 249s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 249s - $ hg pull -u ../gitrepo 249s - pulling from ../gitrepo 249s - warning: created new git repository at $TESTTMP/copy/.hg/git 249s - no changes found 249s -#endif 249s - 249s - $ hg tags 249s - tip 1:c61c38c3d614 249s - thetag 0:f488b65fa424 249s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 249s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 249s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 249s - 249s -Furthermore, make sure that we pass all arguments when pushing: 249s - 249s - $ echo baz > baz 249s - $ fn_hg_commit -A -m baz 249s - $ hg push --pushvars FOO=BAR 249s - pushing to http://localhost:$HGPORT/ 249s - searching for changes 249s - remote: adding changesets 249s - remote: adding manifests 249s - remote: adding file changes 249s - remote: HG_USERVAR_FOO=BAR 249s - remote: added 1 changesets with 1 changes to 1 files 249s - $ cd .. 249s 249s ERROR: test-serve-hg.t#with-hggit output changed 250s ! 250s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-push-to-head.t 250s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-push-to-head.t.err 250s @@ -14,65 +14,9 @@ 250s Clone it, and push back to master: 250s 250s $ hg clone gitrepo hgrepo 250s - importing 1 git commits 250s - new changesets ff7a2f2d8d70 (1 drafts) 250s - updating to bookmark master 250s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 250s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 250s + abort: repository gitrepo not found 250s + [255] 250s $ cd hgrepo 250s + $TESTTMP.sh: 18: cd: can't cd to hgrepo 250s $ echo beta > beta 250s - $ fn_hg_commit -A -m "add beta" 250s - 250s -The output is confusing, and this even more-so: 250s - 250s - $ hg push 250s - pushing to $TESTTMP/gitrepo 250s - searching for changes 250s - adding objects 250s - remote: found 0 deltas to reuse 250s - remote: error: refusing to update checked out branch: refs/heads/master 250s - remote: error: By default, updating the current branch in a non-bare repository 250s - remote: is denied, because it will make the index and work tree inconsistent 250s - remote: with what you pushed, and will require 'git reset --hard' to match 250s - remote: the work tree to HEAD. 250s - remote: 250s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 250s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 250s - remote: its current branch; however, this is not recommended unless you 250s - remote: arranged to update its work tree to match what you pushed in some 250s - remote: other way. 250s - remote: 250s - remote: To squelch this message and still keep the default behaviour, set 250s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 250s - added 1 commits with 1 trees and 1 blobs 250s - warning: failed to update refs/heads/master; branch is currently checked out 250s - 250s - $ hg push 250s - pushing to $TESTTMP/gitrepo 250s - searching for changes 250s - adding objects 250s - remote: found 0 deltas to reuse 250s - remote: error: refusing to update checked out branch: refs/heads/master 250s - remote: error: By default, updating the current branch in a non-bare repository 250s - remote: is denied, because it will make the index and work tree inconsistent 250s - remote: with what you pushed, and will require 'git reset --hard' to match 250s - remote: the work tree to HEAD. 250s - remote: 250s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 250s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 250s - remote: its current branch; however, this is not recommended unless you 250s - remote: arranged to update its work tree to match what you pushed in some 250s - remote: other way. 250s - remote: 250s - remote: To squelch this message and still keep the default behaviour, set 250s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 250s - added 1 commits with 1 trees and 1 blobs 250s - warning: failed to update refs/heads/master; branch is currently checked out 250s - 250s -Show that it really didn't get pushed: 250s - 250s - $ hg tags 250s - tip 1:47580592d3d6 250s - default/master 0:ff7a2f2d8d70 250s - $ cd ../gitrepo 250s - $ git log --all --oneline --decorate 250s - 7eeab2e (HEAD -> master) add alpha 250s 250s ERROR: test-push-to-head.t output changed 252s ! 252s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-push-missing-commit.t 252s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-push-missing-commit.t.err 252s @@ -22,75 +22,9 @@ 252s clone it and create a commit building on the git history 252s 252s $ hg clone -U repo.git hgrepo 252s - importing 1 git commits 252s - new changesets fb68c5a534ce (1 drafts) 252s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 252s + abort: repository repo.git not found 252s + [255] 252s $ cd hgrepo 252s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 252s $ hg up -q master 252s - $ echo other > thefile 252s - $ fn_hg_commit -m 'change thefile' 252s - $ cd .. 252s - 252s -now remove the git commit from the cache repository used internally by 252s -hg-git — actually, changing `git.intree` is equivalent to this, and how 252s -a user noticed it in #376. 252s - 252s - $ rm -rf hgrepo/.hg/git 252s - 252s -what happens when we push it? 252s - 252s - $ hg -R hgrepo push 252s - pushing to $TESTTMP/repo.git 252s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 252s - abort: cannot push git commit 533d4e670a8b as it is not present locally 252s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 252s - [255] 252s - 252s -try to follow the hint: 252s - 252s -(and just to see that the warning is useful, try re-resetting first) 252s - 252s - $ rm -rf hgrepo/.hg/git hgrepo/.git 252s - $ hg -R hgrepo pull 252s - pulling from $TESTTMP/repo.git 252s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 252s - no changes found 252s - not updating diverged bookmark master 252s - $ hg -R hgrepo push 252s - pushing to $TESTTMP/repo.git 252s - searching for changes 252s - adding objects 252s - remote: found 0 deltas to reuse 252s - added 1 commits with 1 trees and 1 blobs 252s - updating reference refs/heads/master 252s - 252s -and as an extra test, what if we want to push a commit that's 252s -converted, but gone? 252s - 252s -simply pushing doesn't suffice: 252s - 252s - $ cd hgrepo 252s - $ rm -rf .hg/git 252s - $ hg push 252s - pushing to $TESTTMP/repo.git 252s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 252s - searching for changes 252s - no changes found 252s - [1] 252s - $ cd .. 252s - 252s -but we can't create another commit building on the git history, export 252s -it, and push: 252s - 252s - $ cd hgrepo 252s - $ echo not that > thefile 252s - $ fn_hg_commit -m 'change thefile again' 252s - $ hg gexport 252s - $ rm -rf .hg/git 252s - $ hg push 252s - pushing to $TESTTMP/repo.git 252s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 252s - searching for changes 252s - abort: cannot push git commit 61619410916a as it is not present locally 252s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 252s - [255] 252s - $ cd .. 252s 252s ERROR: test-push-missing-commit.t output changed 252s ! 252s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-orphan-tags.t 252s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-orphan-tags.t.err 252s @@ -61,17 +61,17 @@ 252s Create a Mercurial clone 252s 252s $ hg clone -U repo.git hgrepo 252s - importing 4 git commits 252s - new changesets b8e77484829b:387d03400596 (4 drafts) 252s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 252s + abort: repository repo.git not found 252s + [255] 252s $ hg outgoing -R hgrepo 252s - comparing with $TESTTMP/repo.git 252s - searching for changes 252s - no changes found 252s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 252s + abort: repository hgrepo not found 252s + [255] 252s + $ hg push --debug -R hgrepo | grep -e reference -e found 252s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 252s + abort: repository hgrepo not found 252s [1] 252s - $ hg push --debug -R hgrepo | grep -e reference -e found 252s - unchanged reference default::refs/heads/master => GIT:996e5084 252s - unchanged reference default::refs/tags/the_tag => GIT:e4338156 252s - no changes found 252s 252s Verify that we can push this tag, and that outgoing doesn't report 252s them (#358) 252s @@ -83,33 +83,5 @@ 252s To $TESTTMP/repo.git 252s - [deleted] the_tag 252s $ cd ../hgrepo 252s + $TESTTMP.sh: 72: cd: can't cd to ../hgrepo 252s $ hg outgoing 252s - comparing with $TESTTMP/repo.git 252s - searching for changes 252s - changeset: 2:7b35eb0afb3f 252s - tag: the_tag 252s - user: test 252s - date: Mon Jan 01 00:00:12 2007 +0000 252s - summary: add foo3 252s - 252s - $ hg push --debug 252s - pushing to $TESTTMP/repo.git 252s - finding unexported changesets 252s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 252s - searching for changes 252s - remote: counting objects: 5, done. 252s - 1 commits found 252s - list of commits: 252s - e12852326ef72772e9696b008ad6546b5266ff13 252s - adding objects 252s - remote: counting objects: 5, done. 252s - remote: found 0 deltas to reuse 252s - added 1 commits with 1 trees and 0 blobs 252s - unchanged reference default::refs/heads/master => GIT:996e5084 252s - adding reference default::refs/tags/the_tag => GIT:e4338156 252s - $ cd ../gitrepo 252s - $ git fetch 252s - From $TESTTMP/repo 252s - * [new tag] the_tag -> the_tag 252s - $ git tag -ln 252s - the_tag Tag message 252s 252s ERROR: test-orphan-tags.t output changed 253s ! 253s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-serve-hg-static.t 253s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-serve-hg-static.t.err 253s @@ -6,6 +6,7 @@ 253s $ . "$TESTDIR/testutil" 253s 253s $ hg clone http://localhost:$HGPORT/ copy 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s abort: * (glob) 253s [100] 253s $ test -d copy 253s @@ -18,14 +19,18 @@ 253s > --logfile server.log 253s $ cat dumb.pid >> $DAEMON_PIDS 253s $ hg init remote 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s $ cd remote 253s $ echo foo > bar 253s $ echo c2 > '.dotfile with spaces' 253s $ hg add 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s adding .dotfile with spaces 253s adding bar 253s $ hg commit -m"test" 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s $ hg tip 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s changeset: 0:02770d679fb8 253s tag: tip 253s user: test 253s @@ -34,6 +39,7 @@ 253s 253s $ cd .. 253s $ hg clone static-http://localhost:$HGPORT/remote local 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s requesting all changes 253s adding changesets 253s adding manifests 253s @@ -44,17 +50,20 @@ 253s 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 253s $ cd local 253s $ hg verify 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s checking changesets 253s checking manifests 253s crosschecking files in changesets and manifests 253s + checking dirstate (?) 253s checking files 253s - checking dirstate (?) 253s + checking dirstate 253s checked 1 changesets with 2 changes to 2 files 253s $ cat bar 253s foo 253s $ cd ../remote 253s $ echo baz > quux 253s $ hg commit -A -mtest2 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s adding quux 253s 253s check for HTTP opener failures when cachefile does not exist 253s @@ -62,6 +71,7 @@ 253s $ rm .hg/cache/* 253s $ cd ../local 253s $ hg pull 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s pulling from static-http://localhost:$HGPORT/remote 253s searching for changes 253s adding changesets 253s @@ -74,10 +84,13 @@ 253s trying to push 253s 253s $ hg update 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 253s $ echo more foo >> bar 253s $ hg commit -m"test" 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s $ hg push 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s pushing to static-http://localhost:$HGPORT/remote 253s abort: destination does not support push 253s [255] 253s @@ -86,9 +99,11 @@ 253s 253s $ cd .. 253s $ hg clone -r doesnotexist static-http://localhost:$HGPORT/remote local0 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s abort: unknown revision 'doesnotexist'!? (re) 253s [10] 253s $ hg clone -r 0 static-http://localhost:$HGPORT/remote local0 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s adding changesets 253s adding manifests 253s adding file changes 253s @@ -100,16 +115,23 @@ 253s test with "/" URI (issue747) and subrepo 253s 253s $ hg init 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s $ hg init sub 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s $ touch sub/test 253s $ hg -R sub commit -A -m "test" 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s adding test 253s $ hg -R sub tag not-empty 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s $ echo sub=sub > .hgsub 253s $ echo a > a 253s $ hg add a .hgsub 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s $ hg -q ci -ma 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s $ hg clone static-http://localhost:$HGPORT/ local2 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s requesting all changes 253s adding changesets 253s adding manifests 253s @@ -127,58 +149,75 @@ 253s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 253s $ cd local2 253s $ hg verify 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s checking changesets 253s checking manifests 253s crosschecking files in changesets and manifests 253s + checking dirstate (?) 253s checking files 253s - checking dirstate (?) 253s + checking dirstate 253s checked 1 changesets with 3 changes to 3 files 253s checking subrepo links 253s $ cat a 253s a 253s $ hg paths 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s default = static-http://localhost:$HGPORT/ 253s 253s test with empty repo (issue965) 253s 253s $ cd .. 253s $ hg init remotempty 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s $ hg clone static-http://localhost:$HGPORT/remotempty local3 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s no changes found 253s updating to branch default 253s 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 253s $ cd local3 253s $ hg verify 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s checking changesets 253s checking manifests 253s crosschecking files in changesets and manifests 253s + checking dirstate (?) 253s checking files 253s - checking dirstate (?) 253s + checking dirstate 253s checked 0 changesets with 0 changes to 0 files 253s $ hg paths 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s default = static-http://localhost:$HGPORT/remotempty 253s $ cd .. 253s 253s Clone with tags and branches works 253s 253s $ hg init remote-with-names 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s $ cd remote-with-names 253s $ echo 0 > foo 253s $ hg -q commit -A -m initial 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s $ echo 1 > foo 253s $ hg commit -m 'commit 1' 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s $ hg -q up 0 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s $ hg branch mybranch 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s marked working directory as branch mybranch 253s (branches are permanent and global, did you want a bookmark?) 253s $ echo 2 > foo 253s $ hg commit -m 'commit 2 (mybranch)' 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s $ hg tag -r 1 'default-tag' 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s $ hg tag -r 2 'branch-tag' 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s 253s $ cd .. 253s 253s $ hg clone static-http://localhost:$HGPORT/remote-with-names local-with-names 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s requesting all changes 253s adding changesets 253s adding manifests 253s @@ -191,6 +230,7 @@ 253s Clone a specific branch works 253s 253s $ hg clone -r mybranch static-http://localhost:$HGPORT/remote-with-names local-with-names-branch 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s adding changesets 253s adding manifests 253s adding file changes 253s @@ -202,6 +242,7 @@ 253s Clone a specific tag works 253s 253s $ hg clone -r default-tag static-http://localhost:$HGPORT/remote-with-names local-with-names-tag 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s adding changesets 253s adding manifests 253s adding file changes 253s 253s ERROR: test-serve-hg-static.t output changed 253s ! 253s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-hg-branch.t 253s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-hg-branch.t.err 253s @@ -12,82 +12,10 @@ 253s 253s $ cd .. 253s $ hg clone gitrepo hgrepo 253s - importing 1 git commits 253s - new changesets ff7a2f2d8d70 (1 drafts) 253s - updating to bookmark not-master 253s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + abort: repository gitrepo not found 253s + [255] 253s 253s $ cd hgrepo 253s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 253s $ hg co master 253s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 253s - (activating bookmark master) 253s - $ hg mv alpha beta 253s - $ fn_hg_commit -m 'rename alpha to beta' 253s - $ hg push 253s - pushing to $TESTTMP/gitrepo 253s - searching for changes 253s - adding objects 253s - remote: found 0 deltas to reuse 253s - added 1 commits with 1 trees and 0 blobs 253s - updating reference refs/heads/master 253s - 253s - $ hg branch gamma | grep -v 'permanent and global' 253s - marked working directory as branch gamma 253s - $ fn_hg_commit -m 'started branch gamma' 253s - $ hg push 253s - pushing to $TESTTMP/gitrepo 253s - searching for changes 253s - adding objects 253s - remote: found 0 deltas to reuse 253s - added 1 commits with 1 trees and 0 blobs 253s - updating reference refs/heads/master 253s - 253s - $ hg log --graph 253s - @ changeset: 2:400db38f4f64 253s - | branch: gamma 253s - | bookmark: master 253s - | tag: default/master 253s - | tag: tip 253s - | user: test 253s - | date: Mon Jan 01 00:00:12 2007 +0000 253s - | summary: started branch gamma 253s - | 253s - o changeset: 1:3baa67317a4d 253s - | user: test 253s - | date: Mon Jan 01 00:00:11 2007 +0000 253s - | summary: rename alpha to beta 253s - | 253s - o changeset: 0:ff7a2f2d8d70 253s - bookmark: not-master 253s - tag: default/not-master 253s - user: test 253s - date: Mon Jan 01 00:00:10 2007 +0000 253s - summary: add alpha 253s - 253s - 253s - $ cd .. 253s - $ hg clone -U gitrepo hgrepo2 253s - importing 3 git commits 253s - new changesets ff7a2f2d8d70:400db38f4f64 (3 drafts) 253s - $ hg -R hgrepo2 log --graph 253s - o changeset: 2:400db38f4f64 253s - | branch: gamma 253s - | bookmark: master 253s - | tag: default/master 253s - | tag: tip 253s - | user: test 253s - | date: Mon Jan 01 00:00:12 2007 +0000 253s - | summary: started branch gamma 253s - | 253s - o changeset: 1:3baa67317a4d 253s - | user: test 253s - | date: Mon Jan 01 00:00:11 2007 +0000 253s - | summary: rename alpha to beta 253s - | 253s - o changeset: 0:ff7a2f2d8d70 253s - bookmark: not-master 253s - tag: default/not-master 253s - user: test 253s - date: Mon Jan 01 00:00:10 2007 +0000 253s - summary: add alpha 253s - 253s 253s ERROR: test-hg-branch.t output changed 253s ! 253s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-transactions.t 253s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-transactions.t.err 253s @@ -42,19 +42,29 @@ 253s 253s $ hg clone gitrepo hgrepo --config hggit.mapsavefrequency=10 --debug \ 253s > | grep -c saving 253s - 1 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s + abort: repository gitrepo not found 253s + 0 253s + [1] 253s $ rm -rf hgrepo 253s 253s pull with mapsavefreq set 253s 253s $ hg init hgrepo 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s $ cat >> hgrepo/.hg/hgrc < [paths] 253s > default = $TESTTMP/gitrepo 253s > EOF 253s $ hg -R hgrepo --config hggit.mapsavefrequency=10 pull --debug \ 253s > | grep -c saving 253s - 10 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s + abort: repository $TESTTMP/gitrepo not found 253s + 0 253s + [1] 253s $ rm -rf hgrepo 253s 253s The user experience 253s @@ -66,6 +76,8 @@ 253s First, create a repository, set up to pull from git, and where we can interrupt the conversion. 253s 253s $ hg init hgrepo 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s $ cat >> hgrepo/.hg/hgrc < [paths] 253s > default = $TESTTMP/gitrepo 253s @@ -75,39 +87,49 @@ 253s A low save interval causes a lot of reports: 253s 253s $ hg --config hggit.mapsavefrequency=25 pull 253s - pulling from $TESTTMP/gitrepo 253s - importing 100 git commits 253s - new changesets 1c8407413fa3:abc468b9e51b (25 drafts) 253s - new changesets 217c308baf47:d5d14eeedd08 (25 drafts) 253s - new changesets d9807ef6abcb:4678067bd500 (25 drafts) 253s - adding bookmark master 253s - new changesets c31a154888bb:eda59117ba04 (25 drafts) 253s - (run 'hg update' to get a working copy) 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s + pulling from $TESTTMP/gitrepo 253s + abort: repository $TESTTMP/gitrepo not found 253s + [255] 253s 253s Reset the repository 253s 253s $ hg debugstrip --no-backup 'all()' 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s + abort: empty revision set 253s + [255] 253s $ hg debug-remove-hggit-state 253s - clearing out the git cache data 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s + hg: unknown command 'debug-remove-hggit-state' 253s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 253s + [10] 253s 253s And with phases? No mention of draft changesets, as we publish changes 253s during the conversion: 253s 253s $ hg --config hggit.mapsavefrequency=25 --config hggit.usephases=yes pull 253s - pulling from $TESTTMP/gitrepo 253s - importing 100 git commits 253s - new changesets 1c8407413fa3:abc468b9e51b 253s - new changesets 217c308baf47:d5d14eeedd08 253s - new changesets d9807ef6abcb:4678067bd500 253s - updating bookmark master 253s - new changesets c31a154888bb:eda59117ba04 253s - (run 'hg update' to get a working copy) 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s + pulling from $TESTTMP/gitrepo 253s + abort: repository $TESTTMP/gitrepo not found 253s + [255] 253s 253s Reset the repository 253s 253s $ hg debugstrip --no-backup 'all()' 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s + abort: empty revision set 253s + [255] 253s $ hg debug-remove-hggit-state 253s - clearing out the git cache data 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s + hg: unknown command 'debug-remove-hggit-state' 253s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 253s + [10] 253s 253s Interruptions 253s ------------- 253s @@ -121,54 +143,51 @@ 253s Test an error in a pull: 253s 253s $ ABORT_AFTER=99 hg pull 253s - pulling from $TESTTMP/gitrepo 253s - importing 100 git commits 253s - transaction abort! 253s - rollback completed 253s - abort: aborted after 99 commits! 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s + pulling from $TESTTMP/gitrepo 253s + abort: repository $TESTTMP/gitrepo not found 253s [255] 253s $ hg log -l 10 -T '{rev} {gitnode}\n' 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s 253s Test the user exiting in the first transaction: 253s 253s $ EXIT_AFTER=5 hg --config hggit.mapsavefrequency=10 pull 253s - pulling from $TESTTMP/gitrepo 253s - importing 100 git commits 253s - transaction abort! 253s - rollback completed 253s - interrupted! 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s + pulling from $TESTTMP/gitrepo 253s + abort: repository $TESTTMP/gitrepo not found 253s [255] 253s $ hg log -l 10 -T '{rev} {gitnode}\n' 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s 253s Check that we have no state, but clear it just in case 253s 253s $ ls -d .hg/git* 253s - .hg/git 253s + ls: cannot access '.hg/git*': No such file or directory 253s + [2] 253s $ hg debug-remove-hggit-state 253s - clearing out the git cache data 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s + hg: unknown command 'debug-remove-hggit-state' 253s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 253s + [10] 253s 253s Test the user exiting in the middle of a conversion, after the first 253s transaction: 253s 253s $ EXIT_AFTER=15 hg --config hggit.mapsavefrequency=10 pull 253s - pulling from $TESTTMP/gitrepo 253s - importing 100 git commits 253s - new changesets 1c8407413fa3:7c8c534a5fbe (10 drafts) 253s - transaction abort! 253s - rollback completed 253s - interrupted! 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s + pulling from $TESTTMP/gitrepo 253s + abort: repository $TESTTMP/gitrepo not found 253s [255] 253s $ hg log -l 10 -T '{rev} {gitnode}\n' 253s - 9 7cbb16ec981b308e1e2b181f8e1f22c8f409f44e 253s - 8 42da70ed92bbecf9f348ba59c93646be723d0bf2 253s - 7 17e841146e5744b81af9959634d82c20a5d7df52 253s - 6 c31065bf97bf014815e37cdfbdef2c32c687f314 253s - 5 fcf21b8e0520ec1cced1d7593d13f9ee54721269 253s - 4 46acd02d0352e4b92bd6a099bb0490305d847a18 253s - 3 61eeda444b37b8aa3892d5f04c66c5441d21dd66 253s - 2 e55db11bb0472791c7af3fc636772174cdea4a36 253s - 1 17a2672b3c24c02d568f99d8d55ccae2bf362d5c 253s - 0 4e195b4c6e77604b70a8ad3b01306adbb9b1c7e7 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s $ cd .. 253s $ rm -rf hgrepo 253s 253s @@ -183,12 +202,10 @@ 253s > hg --config hggit.mapsavefrequency=10 --config git.intree=yes \ 253s > --cwd hgrepo \ 253s > clone -U $TESTTMP/gitrepo . 253s - importing 100 git commits 253s - transaction abort! 253s - rollback completed 253s - interrupted! 253s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 253s + *** failed to import extension "breakage" from /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/testlib/ext-break-git-import.py: b'hggit' 253s + abort: repository $TESTTMP/gitrepo not found 253s [255] 253s the leftover below appeared in Mercurial 5.9+; it is unintentional 253s $ ls -A hgrepo 253s - .git 253s - $ rm -rf hgrepo 253s + $ rm -rf hgrepo 253s 253s ERROR: test-transactions.t output changed 254s ! 254s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-pull-after-strip.t 254s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-pull-after-strip.t.err 254s @@ -15,82 +15,9 @@ 254s 254s $ cd .. 254s $ hg clone -U gitrepo hgrepo 254s - importing 2 git commits 254s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 254s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 254s + abort: repository gitrepo not found 254s + [255] 254s $ cd hgrepo 254s + $TESTTMP.sh: 26: cd: can't cd to hgrepo 254s $ hg up master 254s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 254s - (activating bookmark master) 254s - $ hg log --graph 254s - @ changeset: 1:7fe02317c63d 254s - | bookmark: master 254s - | tag: default/master 254s - | tag: thetag 254s - | tag: tip 254s - | user: test 254s - | date: Mon Jan 01 00:00:11 2007 +0000 254s - | summary: add beta 254s - | 254s - o changeset: 0:ff7a2f2d8d70 254s - user: test 254s - date: Mon Jan 01 00:00:10 2007 +0000 254s - summary: add alpha 254s - 254s - $ cd ../gitrepo 254s - $ echo beta line 2 >> beta 254s - $ git add beta 254s - $ fn_git_commit -m 'add to beta' 254s - 254s - $ cd .. 254s - $ cd hgrepo 254s - $ hg debugstrip --no-backup tip 254s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 254s - $ hg pull 254s - pulling from $TESTTMP/gitrepo 254s - importing 1 git commits 254s - abort: you appear to have run strip - please run hg git-cleanup 254s - [255] 254s - $ hg tags 254s - tip 0:ff7a2f2d8d70 254s - $ hg git-cleanup 254s - git commit map cleaned 254s - 254s -pull works after 'hg git-cleanup' 254s - 254s - $ hg pull 254s - pulling from $TESTTMP/gitrepo 254s - importing 2 git commits 254s - updating bookmark master 254s - new changesets 7fe02317c63d:cc1e605d90db (2 drafts) 254s - (run 'hg update' to get a working copy) 254s - $ hg log --graph 254s - o changeset: 2:cc1e605d90db 254s - | bookmark: master 254s - | tag: default/master 254s - | tag: tip 254s - | user: test 254s - | date: Mon Jan 01 00:00:12 2007 +0000 254s - | summary: add to beta 254s - | 254s - o changeset: 1:7fe02317c63d 254s - | tag: thetag 254s - | user: test 254s - | date: Mon Jan 01 00:00:11 2007 +0000 254s - | summary: add beta 254s - | 254s - @ changeset: 0:ff7a2f2d8d70 254s - user: test 254s - date: Mon Jan 01 00:00:10 2007 +0000 254s - summary: add alpha 254s - 254s - 254s - $ cd .. 254s - 254s -Check that we also remove bad refs: 254s - 254s - $ cd hgrepo 254s - $ echo e93b671cb24bff41779187edff99178e2597c2 > .hg/git/refs/tags/bad-tag 254s - $ hg git-cleanup 254s - git commit map cleaned 254s - $ test -e .hg/git/refs/tags/bad-tag 254s - [1] 254s 254s ERROR: test-pull-after-strip.t output changed 255s ! 255s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-merge.t 255s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-merge.t.err 255s @@ -30,60 +30,11 @@ 255s $ git init -q --bare repo.git 255s 255s $ hg clone gitrepo hgrepo 255s - importing 4 git commits 255s - new changesets ff7a2f2d8d70:89ca4a68d6b9 (4 drafts) 255s - updating to bookmark master 255s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 255s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 255s + abort: repository gitrepo not found 255s + [255] 255s $ cd hgrepo 255s + $TESTTMP.sh: 40: cd: can't cd to hgrepo 255s 255s clear the cache to be sure it is regenerated correctly 255s $ hg debug-remove-hggit-state 255s - clearing out the git cache data 255s - $ hg push ../repo.git 255s - pushing to ../repo.git 255s - searching for changes 255s - adding objects 255s - remote: found 0 deltas to reuse 255s - added 4 commits with 4 trees and 3 blobs 255s - adding reference refs/heads/beta 255s - adding reference refs/heads/master 255s - 255s - $ cd .. 255s -git log in repo pushed from hg 255s - $ git --git-dir=repo.git log --pretty=medium master | sed 's/\.\.\.//g' 255s - commit 5806851511aaf3bfe813ae3a86c5027165fa9b96 255s - Merge: e5023f9 9497a4e 255s - Author: test 255s - Date: Mon Jan 1 00:00:12 2007 +0000 255s - 255s - Merge branch 'beta' 255s - 255s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 255s - Author: test 255s - Date: Mon Jan 1 00:00:12 2007 +0000 255s - 255s - add gamma 255s - 255s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 255s - Author: test 255s - Date: Mon Jan 1 00:00:11 2007 +0000 255s - 255s - add beta 255s - 255s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 255s - Author: test 255s - Date: Mon Jan 1 00:00:10 2007 +0000 255s - 255s - add alpha 255s - $ git --git-dir=repo.git log --pretty=medium beta | sed 's/\.\.\.//g' 255s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 255s - Author: test 255s - Date: Mon Jan 1 00:00:11 2007 +0000 255s - 255s - add beta 255s - 255s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 255s - Author: test 255s - Date: Mon Jan 1 00:00:10 2007 +0000 255s - 255s - add alpha 255s 255s ERROR: test-merge.t output changed 255s ! 255s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-subrepos-syntax.t 255s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-subrepos-syntax.t.err 255s @@ -38,54 +38,9 @@ 255s $ cd .. 255s 255s $ hg clone -U repo.git hgrepo 255s - importing 3 git commits 255s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 255s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 255s + abort: repository repo.git not found 255s + [255] 255s $ cd hgrepo 255s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 255s $ hg up master 255s - Cloning into '$TESTTMP/hgrepo/subrepo1'... 255s - done. 255s - Cloning into '$TESTTMP/hgrepo/xyz/subrepo2'... 255s - done. 255s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 255s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 255s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 255s - (activating bookmark master) 255s - $ cat >> .hgsub < # this is a comment 255s - > [subpaths] 255s - > flaf = blyf 255s - > EOF 255s - $ fn_hg_commit -m 'add comment & subsection' 255s - $ hg push 255s - pushing to $TESTTMP/repo.git 255s - searching for changes 255s - adding objects 255s - remote: found 0 deltas to reuse 255s - added 1 commits with 1 trees and 0 blobs 255s - updating reference refs/heads/master 255s - $ cd .. 255s - 255s - $ cd gitrepo 255s - $ git pull --ff-only 255s - From $TESTTMP/repo 255s - 89c22d7..106b34e master -> origin/master 255s - Updating 89c22d7..106b34e 255s - Fast-forward 255s - $ cat .gitmodules 255s - [submodule "subrepo1"] 255s - path = subrepo1 255s - url = ../gitsubrepo 255s - [submodule "xyz/subrepo2"] 255s - path = xyz/subrepo2 255s - url = ../gitsubrepo 255s - $ cd .. 255s - 255s -We broke bidirectionality: 255s - 255s - $ hg clone -U repo.git hgrepo2 255s - importing 4 git commits 255s - new changesets e532b2bfda10:cbf584fe001b (4 drafts) 255s - $ hg id -r tip hgrepo 255s - c58a542b18bc default/master/tip master 255s - $ hg id -r tip hgrepo2 255s - cbf584fe001b default/master/tip master 255s 255s ERROR: test-subrepos-syntax.t output changed 255s ! 255s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-hg-tags.t 255s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-hg-tags.t.err 255s @@ -16,69 +16,10 @@ 255s 255s $ cd .. 255s $ hg clone -U repo.git hgrepo 255s - importing 1 git commits 255s - new changesets ff7a2f2d8d70 (1 drafts) 255s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 255s + abort: repository repo.git not found 255s + [255] 255s 255s $ cd hgrepo 255s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 255s $ hg co master 255s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 255s - (activating bookmark master) 255s - $ fn_hg_tag alpha 255s - $ hg push 255s - pushing to $TESTTMP/repo.git 255s - searching for changes 255s - adding objects 255s - remote: found 0 deltas to reuse 255s - added 1 commits with 1 trees and 1 blobs 255s - updating reference refs/heads/master 255s - adding reference refs/tags/alpha 255s - 255s - $ hg log --graph 255s - @ changeset: 1:e8b150f84560 255s - | bookmark: master 255s - | tag: default/master 255s - | tag: tip 255s - | user: test 255s - | date: Mon Jan 01 00:00:11 2007 +0000 255s - | summary: Added tag alpha for changeset ff7a2f2d8d70 255s - | 255s - o changeset: 0:ff7a2f2d8d70 255s - tag: alpha 255s - user: test 255s - date: Mon Jan 01 00:00:10 2007 +0000 255s - summary: add alpha 255s - 255s - 255s - $ cd .. 255s - $ cd gitrepo 255s -git should have the tag alpha 255s - $ git fetch origin 255s - From $TESTTMP/repo 255s - 7eeab2e..bbae830 master -> origin/master 255s - * [new tag] alpha -> alpha 255s - $ cd .. 255s - 255s - $ hg clone repo.git hgrepo2 255s - importing 2 git commits 255s - new changesets ff7a2f2d8d70:e8b150f84560 (2 drafts) 255s - updating to bookmark master 255s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 255s - $ hg -R hgrepo2 log --graph 255s - @ changeset: 1:e8b150f84560 255s - | bookmark: master 255s - | tag: default/master 255s - | tag: tip 255s - | user: test 255s - | date: Mon Jan 01 00:00:11 2007 +0000 255s - | summary: Added tag alpha for changeset ff7a2f2d8d70 255s - | 255s - o changeset: 0:ff7a2f2d8d70 255s - tag: alpha 255s - user: test 255s - date: Mon Jan 01 00:00:10 2007 +0000 255s - summary: add alpha 255s - 255s - 255s -the tag should be in .hgtags 255s - $ cat hgrepo2/.hgtags 255s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alpha 255s 255s ERROR: test-hg-tags.t output changed 256s ! 256s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-git-workflow.t 256s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-git-workflow.t.err 256s @@ -2,13 +2,20 @@ 256s $ . "$TESTDIR/testutil" 256s 256s $ hg init hgrepo 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s $ cd hgrepo 256s $ hg debuggitdir 256s - $TESTTMP/hgrepo/.hg/git 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s + hg: unknown command 'debuggitdir' 256s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 256s + [10] 256s $ echo alpha > alpha 256s $ hg add alpha 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s $ fn_hg_commit -m "add alpha" 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s $ hg log --graph --debug | grep -v phase: 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s @ changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 256s tag: tip 256s parent: -1:0000000000000000000000000000000000000000 256s @@ -27,49 +34,54 @@ 256s 256s configure for use from git 256s $ hg clone hgrepo gitrepo 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s updating to branch default 256s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 256s $ cd gitrepo 256s $ hg book master 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s $ hg up null 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 256s (leaving bookmark master) 256s $ echo "[git]" >> .hg/hgrc 256s $ echo "intree = True" >> .hg/hgrc 256s $ hg debuggitdir 256s - $TESTTMP/gitrepo/.git 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s + hg: unknown command 'debuggitdir' 256s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 256s + [10] 256s $ hg gexport 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s + hg: unknown command 'gexport' 256s + (did you mean one of export, import?) 256s + [10] 256s 256s do some work 256s $ git config core.bare false 256s + fatal: not in a git directory 256s + [128] 256s $ git checkout master 2>&1 | sed s/\'/\"/g 256s - Already on "master" 256s + fatal: not a git repository (or any of the parent directories): .git 256s $ echo beta > beta 256s $ git add beta 256s + fatal: not a git repository (or any of the parent directories): .git 256s + [128] 256s $ fn_git_commit -m 'add beta' 256s + fatal: not a git repository (or any of the parent directories): .git 256s + git commit error 256s 256s get things back to hg 256s $ hg gimport 256s - importing 1 git commits 256s - updating bookmark master 256s - new changesets 9f124f3c1fc2 (1 drafts) 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s + hg: unknown command 'gimport' 256s + (did you mean one of export, import?) 256s + [10] 256s $ hg log --graph --debug | grep -v phase: 256s - o changeset: 1:9f124f3c1fc29a14f5eb027c24811b0ac9d5ff10 256s - | bookmark: master 256s - | tag: tip 256s - | parent: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 256s - | parent: -1:0000000000000000000000000000000000000000 256s - | manifest: 1:f0bd6fbafbaebe4bb59c35108428f6fce152431d 256s - | user: test 256s - | date: Mon Jan 01 00:00:11 2007 +0000 256s - | files+: beta 256s - | extra: branch=default 256s - | extra: hg-git-rename-source=git 256s - | description: 256s - | add beta 256s - | 256s - | 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s o changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 256s + bookmark: master 256s + tag: tip 256s parent: -1:0000000000000000000000000000000000000000 256s parent: -1:0000000000000000000000000000000000000000 256s manifest: 0:8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0 256s @@ -83,7 +95,8 @@ 256s 256s gimport should have updated the bookmarks as well 256s $ hg bookmarks 256s - master 1:9f124f3c1fc2 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s + master 0:0221c246a567 256s 256s gimport support for git.mindate 256s $ cat >> .hg/hgrc << EOF 256s @@ -92,20 +105,23 @@ 256s > EOF 256s $ echo oldcommit > oldcommit 256s $ git add oldcommit 256s + fatal: not a git repository (or any of the parent directories): .git 256s + [128] 256s $ GIT_AUTHOR_DATE="2014-03-01 00:00:00 +0000" \ 256s > GIT_COMMITTER_DATE="2009-01-01 00:00:00 +0000" \ 256s > git commit -m oldcommit > /dev/null || echo "git commit error" 256s + fatal: not a git repository (or any of the parent directories): .git 256s + git commit error 256s $ hg gimport 256s - no changes found 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s + hg: unknown command 'gimport' 256s + (did you mean one of export, import?) 256s + [10] 256s $ hg log --graph 256s - o changeset: 1:9f124f3c1fc2 256s - | bookmark: master 256s - | tag: tip 256s - | user: test 256s - | date: Mon Jan 01 00:00:11 2007 +0000 256s - | summary: add beta 256s - | 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s o changeset: 0:0221c246a567 256s + bookmark: master 256s + tag: tip 256s user: test 256s date: Mon Jan 01 00:00:10 2007 +0000 256s summary: add alpha 256s @@ -113,32 +129,23 @@ 256s 256s $ echo newcommit > newcommit 256s $ git add newcommit 256s + fatal: not a git repository (or any of the parent directories): .git 256s + [128] 256s $ GIT_AUTHOR_DATE="2014-01-01 00:00:00 +0000" \ 256s > GIT_COMMITTER_DATE="2014-01-02 00:00:00 +0000" \ 256s > git commit -m newcommit > /dev/null || echo "git commit error" 256s + fatal: not a git repository (or any of the parent directories): .git 256s + git commit error 256s $ hg gimport 256s - importing 2 git commits 256s - updating bookmark master 256s - new changesets befdecd14df5:3d10b7289d79 (2 drafts) 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s + hg: unknown command 'gimport' 256s + (did you mean one of export, import?) 256s + [10] 256s $ hg log --graph 256s - o changeset: 3:3d10b7289d79 256s - | bookmark: master 256s - | tag: tip 256s - | user: test 256s - | date: Wed Jan 01 00:00:00 2014 +0000 256s - | summary: newcommit 256s - | 256s - o changeset: 2:befdecd14df5 256s - | user: test 256s - | date: Sat Mar 01 00:00:00 2014 +0000 256s - | summary: oldcommit 256s - | 256s - o changeset: 1:9f124f3c1fc2 256s - | user: test 256s - | date: Mon Jan 01 00:00:11 2007 +0000 256s - | summary: add beta 256s - | 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s o changeset: 0:0221c246a567 256s + bookmark: master 256s + tag: tip 256s user: test 256s date: Mon Jan 01 00:00:10 2007 +0000 256s summary: add alpha 256s 256s ERROR: test-git-workflow.t output changed 256s ! 256s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-push-detached.t 256s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-push-detached.t.err 256s @@ -40,37 +40,9 @@ 256s in this case continues to work. 256s 256s $ hg clone gitrepo hgrepo 256s - importing 1 git commits 256s - new changesets ff7a2f2d8d70 (1 drafts) 256s - updating to bookmark master 256s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 256s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 256s + abort: repository gitrepo not found 256s + [255] 256s $ cd hgrepo 256s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 256s $ echo beta > beta 256s - $ hg add beta 256s - $ fn_hg_commit -m "add beta" 256s - 256s -Pushing that changeset, with phases, publishes the detached HEAD. 256s -Whether this should happen is debatable, but it's a side effect from 256s -the fact that pushing to the remote HEAD, with HEAD being the usual 256s -symref, should publish it. 256s - 256s - $ hg push -v --config hggit.usephases=yes 256s - pushing to $TESTTMP/gitrepo 256s - finding unexported changesets 256s - exporting 1 changesets 256s - converting revision 47580592d3d6492421a1e6cebc5c2d701a2e858b 256s - packing 3 loose objects... 256s - searching for changes 256s - remote: counting objects: 5, done. 256s - 1 commits found 256s - adding objects 256s - remote: counting objects: 5, done. 256s - remote: found 0 deltas to reuse 256s - added 1 commits with 1 trees and 1 blobs 256s - updating reference default::refs/heads/master => GIT:0f378ab6 256s - publishing remote HEAD 256s - $ hg phase 'all()' 256s - 0: public 256s - 1: draft 256s - $ cd .. 256s - 256s 256s ERROR: test-push-detached.t output changed 257s ! 257s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-hg-clone.t 257s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-hg-clone.t.err 257s @@ -11,88 +11,17 @@ 257s $ cd .. 257s 257s $ hg clone -U gitrepo hgrepo 257s - importing 1 git commits 257s - new changesets ff7a2f2d8d70 (1 drafts) 257s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 257s + abort: repository gitrepo not found 257s + [255] 257s 257s By default, the Git state isn't preserved across a copying/linking 257s clone 257s 257s $ hg clone -U hgrepo otherhgrepo 257s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 257s + abort: repository hgrepo not found 257s + [255] 257s $ cd otherhgrepo 257s + $TESTTMP.sh: 22: cd: can't cd to otherhgrepo 257s $ find .hg -name 'git*' | sort 257s - $ hg tags -v 257s - tip 0:ff7a2f2d8d70 257s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 257s - $ cd .. 257s - $ rm -r otherhgrepo 257s - 257s -Nor using a pull clone 257s - 257s - $ hg clone -U --pull hgrepo otherhgrepo 257s - requesting all changes 257s - adding changesets 257s - adding manifests 257s - adding file changes 257s - added 1 changesets with 1 changes to 1 files 257s - new changesets ff7a2f2d8d70 257s - $ cd otherhgrepo 257s - $ find .hg -name 'git*' | sort 257s - $ hg tags -v 257s - tip 0:ff7a2f2d8d70 257s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 257s - $ cd .. 257s - $ rm -r otherhgrepo 257s - 257s -But we can enable it! 257s - 257s - $ cat >> $HGRCPATH < [experimental] 257s - > hg-git-serve = yes 257s - > EOF 257s - 257s -Check transferring between Mercurial repositories using a 257s -copying/linking clone 257s - 257s - $ hg clone -U hgrepo otherhgrepo 257s - $ cd otherhgrepo 257s - $ find .hg -name 'git*' | sort 257s - $ hg tags -q 257s - tip 257s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 257s - $ cd .. 257s - 257s -Checking using a pull clone 257s - 257s - $ rm -rf otherhgrepo 257s - $ hg clone -U --pull hgrepo otherhgrepo 257s - requesting all changes 257s - adding changesets 257s - adding manifests 257s - adding file changes 257s - added 1 changesets with 1 changes to 1 files 257s - new changesets ff7a2f2d8d70 257s - $ cd otherhgrepo 257s - $ hg tags -q 257s - tip 257s - alpha 257s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 257s - 0:ff7a2f2d8d70 7eeab2ea75ec 257s - $ cd .. 257s - 257s -Can we repopulate the state from a Mercurial repository? 257s - 257s - $ cd otherhgrepo 257s - $ hg debug-remove-hggit-state 257s - clearing out the git cache data 257s - $ hg log -qr 'fromgit()' 257s - $ hg tags 257s - tip 0:ff7a2f2d8d70 257s - $ hg pull 257s - pulling from $TESTTMP/hgrepo 257s - searching for changes 257s - no changes found 257s - $ hg log -qr 'fromgit()' 257s - $ hg tags 257s - tip 0:ff7a2f2d8d70 257s - 257s -Sadly, no. 257s 257s ERROR: test-hg-clone.t output changed 258s ! 258s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-multiple-remotes.t 258s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-multiple-remotes.t.err 258s @@ -14,6 +14,7 @@ 258s $ git clone --bare --quiet gitrepo repo.git 258s 258s $ hg init hgrepo 258s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 258s $ cd hgrepo 258s $ cat > .hg/hgrc < [paths] 258s @@ -26,52 +27,28 @@ 258s > EOF 258s 258s $ hg pull 258s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 258s pulling from $TESTTMP/gitrepo 258s - importing 1 git commits 258s - adding bookmark master 258s - adding bookmark not-master 258s - new changesets ff7a2f2d8d70 (1 drafts) 258s - (run 'hg update' to get a working copy) 258s - pulling from $TESTTMP/repo.git 258s - no changes found 258s + abort: repository $TESTTMP/gitrepo not found 258s + [255] 258s $ hg tags 258s - tip 0:ff7a2f2d8d70 258s - git/not-master 0:ff7a2f2d8d70 258s - git/master 0:ff7a2f2d8d70 258s - bare/not-master 0:ff7a2f2d8d70 258s - bare/master 0:ff7a2f2d8d70 258s - also-git/not-master 0:ff7a2f2d8d70 258s - also-git/master 0:ff7a2f2d8d70 258s - also-bare/not-master 0:ff7a2f2d8d70 258s - also-bare/master 0:ff7a2f2d8d70 258s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 258s + tip -1:000000000000 258s 258s $ hg up master 258s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 258s - (activating bookmark master) 258s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 258s + abort: unknown revision 'master' 258s + [10] 258s $ echo beta > beta 258s $ fn_hg_commit -A -m "add beta" 258s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 258s $ hg push 258s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 258s pushing to $TESTTMP/gitrepo 258s - searching for changes 258s - adding objects 258s - remote: found 0 deltas to reuse 258s - added 1 commits with 1 trees and 1 blobs 258s - updating reference refs/heads/master 258s - pushing to $TESTTMP/repo.git 258s - searching for changes 258s - adding objects 258s - remote: found 0 deltas to reuse 258s - added 1 commits with 1 trees and 1 blobs 258s - updating reference refs/heads/master 258s + abort: repository $TESTTMP/gitrepo not found 258s + [255] 258s 258s $ hg tags 258s - tip 1:47580592d3d6 258s - git/master 1:47580592d3d6 258s - bare/master 1:47580592d3d6 258s - also-git/master 1:47580592d3d6 258s - also-bare/master 1:47580592d3d6 258s - git/not-master 0:ff7a2f2d8d70 258s - bare/not-master 0:ff7a2f2d8d70 258s - also-git/not-master 0:ff7a2f2d8d70 258s - also-bare/not-master 0:ff7a2f2d8d70 258s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 258s + tip 0:59e1f63242de 258s 258s 258s ERROR: test-multiple-remotes.t output changed 258s ! 258s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-serve-git.t 258s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-serve-git.t.err 258s @@ -33,28 +33,14 @@ 258s Make sure that clone over the old git protocol doesn't break 258s 258s $ hg clone -U git://localhost:$HGPORT/test copy 2>&1 258s - \r (no-eol) (esc) 258s - Counting objects 1/6 [=====> ]\r (no-eol) (esc) 258s - Counting objects 2/6 [===========> ]\r (no-eol) (esc) 258s - Counting objects 3/6 [=================> ]\r (no-eol) (esc) 258s - Counting objects 4/6 [=======================> ]\r (no-eol) (esc) 258s - Counting objects 5/6 [=============================> ]\r (no-eol) (esc) 258s - Counting objects 6/6 [===================================>]\r (no-eol) (esc) 258s - \r (no-eol) (esc) 258s - \r (no-eol) (esc) 258s - Compressing objects 1/3 [==========> ]\r (no-eol) (esc) 258s - Compressing objects 2/3 [=====================> ]\r (no-eol) (esc) 258s - Compressing objects 3/3 [================================>]\r (no-eol) (esc) 258s - \r (no-eol) (esc) 258s - \r (no-eol) (esc) 258s - importing commits 1/2 b23744d34f97 [======> ]\r (no-eol) (esc) 258s - importing commits 2/2 3af9773036a9 [=============>]\r (no-eol) (esc) 258s - \r (no-eol) (esc) 258s - importing 2 git commits 258s - new changesets c4d188f6e13d:221dd250e933 258s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 258s + abort: repository git://localhost:$HGPORT/test not found 258s + [255] 258s $ hg log -T 'HG:{node|short} GIT:{gitnode|short}\n' -R copy 258s - HG:221dd250e933 GIT:3af9773036a9 258s - HG:c4d188f6e13d GIT:b23744d34f97 258s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 258s + abort: repository copy not found 258s + [255] 258s $ hg tags -v -R copy 258s - tip 1:221dd250e933 258s - default/master 1:221dd250e933 git-remote 258s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 258s + abort: repository copy not found 258s + [255] 258s 258s ERROR: test-serve-git.t output changed 259s ! 259s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-phases-draft.t 259s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-phases-draft.t.err 259s @@ -12,73 +12,10 @@ 259s cloning without hggit.usephases does not publish local changesets 259s $ cd .. 259s $ hg clone gitrepo hgrepo | grep -v '^updating' 259s - importing 1 git commits 259s - new changesets ff7a2f2d8d70 (1 drafts) 259s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 259s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 259s + abort: repository gitrepo not found 259s + [1] 259s 259s $ cd hgrepo 259s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 259s $ hg phase -r master 259s - 0: draft 259s - 259s -pulling advances the draft phase, though 259s - 259s - $ hg phase -fs 0 259s - $ hg pull 259s - pulling from $TESTTMP/gitrepo 259s - no changes found 259s - $ hg phase tip 259s - 0: draft 259s - 259s -even if we don't have a name? 259s - 259s - $ hg phase -fs 0 259s - $ mv .hg/hgrc .hg/hgrc.bak 259s - $ hg pull ../gitrepo 259s - pulling from ../gitrepo 259s - no changes found 259s - $ hg phase tip 259s - 0: draft 259s - $ mv .hg/hgrc.bak .hg/hgrc 259s - $ cd .. 259s - 259s - 259s -pulling without hggit.usephases does not publish local changesets 259s - $ cd gitrepo 259s - $ git checkout -q master 259s - $ echo beta > beta 259s - $ git add beta 259s - $ fn_git_commit -m 'add beta' 259s - $ cd .. 259s - 259s - $ cd hgrepo 259s - $ hg pull 259s - pulling from $TESTTMP/gitrepo 259s - importing 1 git commits 259s - updating bookmark master 259s - new changesets 7fe02317c63d (1 drafts) 259s - (run 'hg update' to get a working copy) 259s - $ hg phase -r master 259s - 1: draft 259s - 259s -pulling with git.public does not publish local changesets 259s - $ hg --config git.public=master pull 259s - pulling from $TESTTMP/gitrepo 259s - no changes found 259s - $ hg phase -r master 259s - 1: draft 259s - 259s -pushing without hggit.usephases does not publish local changesets 259s - $ hg update master 259s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 259s - $ echo gamma > gamma 259s - $ hg add gamma 259s - $ hg commit -m 'gamma' 259s - $ hg push 259s - pushing to $TESTTMP/gitrepo 259s - searching for changes 259s - adding objects 259s - remote: found 0 deltas to reuse 259s - added 1 commits with 1 trees and 1 blobs 259s - updating reference refs/heads/master 259s - $ hg phase -r master 259s - 2: draft 259s 259s ERROR: test-phases-draft.t output changed 260s ! 260s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-verify-fail.t 260s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-verify-fail.t.err 260s @@ -25,6 +25,7 @@ 260s $ cd .. 260s 260s $ hg init hgrepo 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s $ cd hgrepo 260s $ echo normalf > normalf 260s $ echo differentf2 > differentf 260s @@ -32,63 +33,93 @@ 260s $ echo exef > exef 260s $ ln -s foo linkf 260s $ hg add normalf differentf unexpectedf exef linkf 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s $ fn_hg_commit -m 'add files' 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s $ git clone --mirror ../gitrepo .hg/git 260s Cloning into bare repository '.hg/git'... 260s done. 260s $ echo "$(cd ../gitrepo && git rev-parse HEAD) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s $ hg gverify 260s - verifying rev 3f1601c3cf54 against git commit 039c1cd9fdda382c9d1e8ec85de6b5b59518ca80 260s - difference in: differentf 260s - file has different flags: exef (hg '', git 'x') 260s - file has different flags: linkf (hg 'l', git '') 260s - file found in git but not hg: missingf 260s - file found in hg but not git: unexpectedf 260s - [1] 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s + hg: unknown command 'gverify' 260s + (did you mean verify?) 260s + [10] 260s 260s $ echo newf > newf 260s $ hg add newf 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s $ fn_hg_commit -m 'new hg commit' 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s $ hg gverify 260s - abort: no git commit found for rev 4e582b4eb862 260s - (if this is an octopus merge, verify against the last rev) 260s - [255] 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s + hg: unknown command 'gverify' 260s + (did you mean verify?) 260s + [10] 260s 260s invalid git SHA 260s $ echo "ffffffffffffffffffffffffffffffffffffffff $(hg log -r . --template '{node}')" >> .hg/git-mapfile 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s $ hg gverify 260s - abort: git equivalent ffffffffffffffffffffffffffffffffffffffff for rev 4e582b4eb862 not found! 260s - [255] 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s + hg: unknown command 'gverify' 260s + (did you mean verify?) 260s + [10] 260s 260s git SHA is not a commit 260s $ echo new2 >> newf 260s $ fn_hg_commit -m 'new hg commit 2' 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s this gets the tree pointed to by the commit at HEAD 260s $ echo "$(cd ../gitrepo && git show --format=%T HEAD | head -n 1) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s $ hg gverify 260s - abort: git equivalent f477b00e4a9907617f346a529cc0fe9ba5d6f6d3 for rev 5c2eb98af3e2 is not a commit! 260s - [255] 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s + hg: unknown command 'gverify' 260s + (did you mean verify?) 260s + [10] 260s 260s corrupt git repository 260s 260s $ hg debug-remove-hggit-state 260s - clearing out the git cache data 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s + hg: unknown command 'debug-remove-hggit-state' 260s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 260s + [10] 260s $ hg gexport 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s + hg: unknown command 'gexport' 260s + (did you mean one of export, import?) 260s + [10] 260s $ mv .hg/git/objects/pack $TESTTMP/pack-old 260s $ for packfile in $TESTTMP/pack-old/*.pack 260s > do 260s > git --git-dir .hg/git unpack-objects < $packfile 260s > done 260s + $TESTTMP.sh: 78: cannot open $TESTTMP/pack-old/*.pack: No such file 260s + [2] 260s $ mv -f .hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 260s + mv: cannot stat '.hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e': No such file or directory 260s + [1] 260s $ hg gverify --fsck 260s - abort: git repository is corrupt! 260s - [255] 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s + hg: unknown command 'gverify' 260s + (did you mean verify?) 260s + [10] 260s $ hg gverify 260s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is not a commit! 260s - [255] 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s + hg: unknown command 'gverify' 260s + (did you mean verify?) 260s + [10] 260s $ chmod +w .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 260s + chmod: cannot access '.hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74': No such file or directory 260s + [1] 260s $ echo 42 > .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 260s + $TESTTMP.sh: 89: cannot create .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74: Directory nonexistent 260s + [2] 260s $ hg gverify 260s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is corrupt! 260s - (re-run with --traceback for details) 260s - [255] 260s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 260s + hg: unknown command 'gverify' 260s + (did you mean verify?) 260s + [10] 260s 260s ERROR: test-verify-fail.t output changed 261s ! 261s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-pull-after-obsolete.t 261s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-pull-after-obsolete.t.err 261s @@ -20,52 +20,9 @@ 261s 261s $ cd .. 261s $ hg clone -U gitrepo hgrepo 261s - importing 2 git commits 261s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s + abort: repository gitrepo not found 261s + [255] 261s $ cd hgrepo 261s + $TESTTMP.sh: 31: cd: can't cd to hgrepo 261s $ hg up master 261s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 261s - (activating bookmark master) 261s - $ hg log --graph 261s - @ changeset: 1:7fe02317c63d 261s - | bookmark: master 261s - | tag: default/master 261s - | tag: thetag 261s - | tag: tip 261s - | user: test 261s - | date: Mon Jan 01 00:00:11 2007 +0000 261s - | summary: add beta 261s - | 261s - o changeset: 0:ff7a2f2d8d70 261s - user: test 261s - date: Mon Jan 01 00:00:10 2007 +0000 261s - summary: add alpha 261s - 261s - $ cd ../gitrepo 261s - $ echo beta line 2 >> beta 261s - $ git add beta 261s - $ fn_git_commit -m 'add to beta' 261s - 261s -Create a commit, obsolete it, and pull, to ensure that we can pull if 261s -the tipmost commit is hidden. 261s - 261s - $ cd ../hgrepo 261s - $ hg bookmark --inactive 261s - $ echo gamma > gamma 261s - $ hg add gamma 261s - $ fn_hg_commit -m 'add gamma' 261s - $ hg up master 261s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 261s - (activating bookmark master) 261s - $ hg log -T '{rev}:{node} {desc}\n' -r tip 261s - 2:4090a1266584bc1a47ce562e9349b1e0f1b44611 add gamma 261s - $ hg debugobsolete 4090a1266584bc1a47ce562e9349b1e0f1b44611 261s - 1 new obsolescence markers 261s - obsoleted 1 changesets 261s - 261s - $ hg pull 261s - pulling from $TESTTMP/gitrepo 261s - importing 1 git commits 261s - updating bookmark master 261s - new changesets cc1e605d90db (1 drafts) 261s - (run 'hg update' to get a working copy) 261s 261s ERROR: test-pull-after-obsolete.t output changed 261s ! 261s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-subrepos-push.t 261s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-subrepos-push.t.err 261s @@ -5,10 +5,13 @@ 261s Initialized empty Git repository in $TESTTMP/repo.git/ 261s 261s $ hg init hgsubrepo 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s $ cd hgsubrepo 261s $ echo thefile > thefile 261s $ hg add thefile 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s $ fn_hg_commit -m 'add thefile' 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s $ cd .. 261s 261s $ git init gitsubrepo 261s @@ -20,59 +23,9 @@ 261s $ cd .. 261s 261s $ hg clone repo.git hgrepo 261s - updating to branch default 261s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s + abort: repository repo.git not found 261s + [255] 261s $ cd hgrepo 261s + $TESTTMP.sh: 32: cd: can't cd to hgrepo 261s $ hg book master 261s - $ echo alpha > alpha 261s - $ hg add alpha 261s - $ fn_hg_commit -m 'add alpha' 261s - $ touch .hgsub 261s - $ hg add .hgsub 261s - $ fn_hg_commit -m "add .hgsub" 261s - $ hg clone -q ../hgsubrepo hg 261s - $ echo "hg = ../hgsubrepo" >> .hgsub 261s - $ fn_hg_commit -m 'add hg subrepo' 261s - $ git clone --quiet ../gitsubrepo git 261s - $ echo "git = [git]../gitsubrepo" >> .hgsub 261s - $ fn_hg_commit -m 'add git subrepo' 261s - $ hg push 261s - pushing to $TESTTMP/repo.git 261s - pushing subrepo hg to $TESTTMP/hgsubrepo 261s - searching for changes 261s - no changes found 261s - searching for changes 261s - adding objects 261s - remote: found 0 deltas to reuse 261s - added 4 commits with 2 trees and 2 blobs 261s - adding reference refs/heads/master 261s - $ cat .hgsub 261s - hg = ../hgsubrepo 261s - git = [git]../gitsubrepo 261s - $ cat .hgsubstate 261s - aaae5224095dca7403147c0e20cbac1f450b0e95 git 261s - df643c539c7541d48eacc76745581e00cbaf3d45 hg 261s - $ cd .. 261s - 261s -Now clone it. Note that no Mercurial state persists: 261s - 261s - $ git clone --recurse-submodules repo.git gitrepo 261s - Cloning into 'gitrepo'... 261s - done. 261s - Submodule 'git' ($TESTTMP/gitsubrepo) registered for path 'git' 261s - Cloning into '$TESTTMP/gitrepo/git'... 261s - done. 261s - Submodule path 'git': checked out 'aaae5224095dca7403147c0e20cbac1f450b0e95' 261s - $ cd gitrepo 261s - $ ls -A 261s - .git 261s - .gitmodules 261s - alpha 261s - git 261s - $ cat .gitmodules 261s - [submodule "git"] 261s - path = git 261s - url = ../gitsubrepo 261s - $ ls -A git 261s - .git 261s - thefile 261s 261s ERROR: test-subrepos-push.t output changed 261s ! 261s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-gitignore.t 261s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-gitignore.t.err 261s @@ -2,12 +2,14 @@ 261s $ . "$TESTDIR/testutil" 261s 261s $ hg init repo 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s $ cd repo 261s 261s Create a commit that we can export later on 261s 261s $ touch thefile 261s $ hg commit -A -m "initial commit" 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s adding thefile 261s 261s We should only read .gitignore files in a hg-git repo (i.e. one with .hg/git 261s @@ -18,6 +20,7 @@ 261s $ touch bar 261s $ echo 'foo*' > .gitignore 261s $ hg status 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s ? .gitignore 261s ? bar 261s ? foo 261s @@ -27,103 +30,140 @@ 261s it's gone: 261s 261s $ hg gexport 261s - $ hg status 261s - ? .gitignore 261s - ? bar 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s + hg: unknown command 'gexport' 261s + (did you mean one of export, import?) 261s + [10] 261s + $ hg status 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s + ? .gitignore 261s + ? bar 261s + ? foo 261s + ? foobar 261s 261s $ echo '*bar' > .gitignore 261s $ hg status 261s - ? .gitignore 261s - ? foo 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s + ? .gitignore 261s + ? bar 261s + ? foo 261s + ? foobar 261s 261s $ mkdir dir 261s $ touch dir/foo 261s $ echo 'foo' > .gitignore 261s $ hg status 261s - ? .gitignore 261s - ? bar 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s + ? .gitignore 261s + ? bar 261s + ? dir/foo 261s + ? foo 261s ? foobar 261s 261s $ echo '/foo' > .gitignore 261s $ hg status 261s - ? .gitignore 261s - ? bar 261s - ? dir/foo 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s + ? .gitignore 261s + ? bar 261s + ? dir/foo 261s + ? foo 261s ? foobar 261s 261s $ rm .gitignore 261s $ echo 'foo' > dir/.gitignore 261s $ hg status 261s - ? bar 261s - ? dir/.gitignore 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s + ? bar 261s + ? dir/.gitignore 261s + ? dir/foo 261s ? foo 261s ? foobar 261s 261s $ touch dir/bar 261s $ echo 'bar' > .gitignore 261s $ hg status 261s - ? .gitignore 261s - ? dir/.gitignore 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s + ? .gitignore 261s + ? bar 261s + ? dir/.gitignore 261s + ? dir/bar 261s + ? dir/foo 261s ? foo 261s ? foobar 261s 261s $ echo '/bar' > .gitignore 261s $ hg status 261s - ? .gitignore 261s - ? dir/.gitignore 261s - ? dir/bar 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s + ? .gitignore 261s + ? bar 261s + ? dir/.gitignore 261s + ? dir/bar 261s + ? dir/foo 261s ? foo 261s ? foobar 261s 261s $ echo 'foo*' > .gitignore 261s $ echo '!*bar' >> .gitignore 261s $ hg status 261s - .gitignore: unsupported ignore pattern '!*bar' 261s - ? .gitignore 261s - ? bar 261s - ? dir/.gitignore 261s - ? dir/bar 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s + ? .gitignore 261s + ? bar 261s + ? dir/.gitignore 261s + ? dir/bar 261s + ? dir/foo 261s + ? foo 261s + ? foobar 261s 261s $ echo '.hg/' > .gitignore 261s $ hg status 261s - ? .gitignore 261s - ? bar 261s - ? dir/.gitignore 261s - ? dir/bar 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s + ? .gitignore 261s + ? bar 261s + ? dir/.gitignore 261s + ? dir/bar 261s + ? dir/foo 261s ? foo 261s ? foobar 261s 261s $ echo 'dir/.hg/' > .gitignore 261s $ hg status 261s - ? .gitignore 261s - ? bar 261s - ? dir/.gitignore 261s - ? dir/bar 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s + ? .gitignore 261s + ? bar 261s + ? dir/.gitignore 261s + ? dir/bar 261s + ? dir/foo 261s ? foo 261s ? foobar 261s 261s $ echo '.hg/foo' > .gitignore 261s $ hg status 261s - ? .gitignore 261s - ? bar 261s - ? dir/.gitignore 261s - ? dir/bar 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s + ? .gitignore 261s + ? bar 261s + ? dir/.gitignore 261s + ? dir/bar 261s + ? dir/foo 261s ? foo 261s ? foobar 261s 261s $ touch foo.hg 261s $ echo 'foo.hg' > .gitignore 261s $ hg status 261s - ? .gitignore 261s - ? bar 261s - ? dir/.gitignore 261s - ? dir/bar 261s - ? foo 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s + ? .gitignore 261s + ? bar 261s + ? dir/.gitignore 261s + ? dir/bar 261s + ? dir/foo 261s + ? foo 261s + ? foo.hg 261s ? foobar 261s $ rm foo.hg 261s 261s $ touch .hgignore 261s $ hg status 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s ? .gitignore 261s ? .hgignore 261s ? bar 261s @@ -137,6 +177,7 @@ 261s $ echo 'foo.*$(?> .hgignore 261s $ echo 'dir/foo' >> .hgignore 261s $ hg status 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s ? .gitignore 261s ? .hgignore 261s ? bar 261s @@ -145,14 +186,18 @@ 261s ? foobar 261s 261s $ hg add .gitignore 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s $ hg commit -m "add and commit .gitignore" 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s $ rm .gitignore 261s $ rm .hgignore 261s $ hg status 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s ! .gitignore 261s ? bar 261s ? dir/.gitignore 261s ? dir/bar 261s + ? dir/foo 261s ? foo 261s ? foobar 261s 261s @@ -164,6 +209,7 @@ 261s > foo( 261s > EOF 261s $ hg status --config ui.ignore=$TESTTMP/invalidhgignore 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s abort: $TESTTMP/invalidhgignore: invalid pattern (relre): foo( 261s [255] 261s 261s @@ -172,5 +218,6 @@ 261s > foo( 261s > EOF 261s $ hg status 261s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 261s abort: $TESTTMP/repo/.hgignore: invalid pattern (relre): foo( 261s [255] 261s 261s ERROR: test-gitignore.t output changed 263s ! 263s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-push-phases.t 263s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-push-phases.t.err 263s @@ -9,68 +9,13 @@ 263s $ git init -q --bare repo.git 263s 263s $ hg clone repo.git hgrepo 263s - updating to branch default 263s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 263s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 263s + abort: repository repo.git not found 263s + [255] 263s 263s $ cd hgrepo 263s + $TESTTMP.sh: 13: cd: can't cd to hgrepo 263s 263s Create two commits, one secret: 263s 263s $ touch alpha 263s - $ hg add alpha 263s - $ fn_hg_commit -m alpha 263s - $ hg book -r . master 263s - $ touch beta 263s - $ hg add beta 263s - $ fn_hg_commit --secret -m beta 263s - $ hg book -r . secret 263s - $ hg push 263s - pushing to $TESTTMP/repo.git 263s - warning: not exporting secret bookmark 'secret' 263s - searching for changes 263s - adding objects 263s - remote: found 0 deltas to reuse 263s - added 1 commits with 1 trees and 1 blobs 263s - adding reference refs/heads/master 263s - $ cd .. 263s - $ hg -R hgrepo log --graph --template phases 263s - @ changeset: 1:62966756ea96 263s - | bookmark: secret 263s - | tag: tip 263s - | phase: secret 263s - | user: test 263s - | date: Mon Jan 01 00:00:11 2007 +0000 263s - | summary: beta 263s - | 263s - o changeset: 0:d4b83afc35d1 263s - bookmark: master 263s - tag: default/master 263s - phase: public 263s - user: test 263s - date: Mon Jan 01 00:00:10 2007 +0000 263s - summary: alpha 263s - 263s - 263s -What happens when we push the secret? 263s - 263s - $ hg -R hgrepo push -B secret 263s - pushing to $TESTTMP/repo.git 263s - warning: not exporting secret bookmark 'secret' 263s - searching for changes 263s - abort: revision 62966756ea96 cannot be pushed since it doesn't have a bookmark 263s - [255] 263s - 263s -Only one changeset was pushed: 263s - 263s - $ GIT_DIR=repo.git git log --graph --all --decorate=short 263s - * commit 2cc4e3d19551e459a0dd606f4cf890de571c7d33 (HEAD -> master) 263s - Author: test 263s - Date: Mon Jan 1 00:00:10 2007 +0000 263s - 263s - alpha 263s - 263s -And this published the remote head: 263s - 263s - $ hg -R hgrepo phase 'all()' 263s - 0: public 263s - 1: secret 263s 263s ERROR: test-push-phases.t output changed 264s ! 264s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-git-clone.t 264s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-git-clone.t.err 264s @@ -14,30 +14,24 @@ 264s $ cd .. 264s 264s $ hg clone gitrepo hgrepo 264s - importing 2 git commits 264s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 264s - updating to bookmark master 264s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + abort: repository gitrepo not found 264s + [255] 264s $ hg -R hgrepo log --graph 264s - @ changeset: 1:7fe02317c63d 264s - | bookmark: master 264s - | tag: default/master 264s - | tag: tip 264s - | user: test 264s - | date: Mon Jan 01 00:00:11 2007 +0000 264s - | summary: add beta 264s - | 264s - o changeset: 0:ff7a2f2d8d70 264s - user: test 264s - date: Mon Jan 01 00:00:10 2007 +0000 264s - summary: add alpha 264s - 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + abort: repository hgrepo not found 264s + [255] 264s 264s we should have some bookmarks 264s $ hg -R hgrepo book 264s - * master 1:7fe02317c63d 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + abort: repository hgrepo not found 264s + [255] 264s $ hg -R hgrepo gverify 264s - verifying rev 7fe02317c63d against git commit 9497a4ee62e16ee641860d7677cdb2589ea15554 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + hg: unknown command 'gverify' 264s + (did you mean verify?) 264s + [10] 264s 264s test for ssh vulnerability 264s 264s @@ -47,16 +41,18 @@ 264s > EOF 264s 264s $ hg clone -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 264s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 264s [255] 264s $ hg clone -q 'git+ssh://%2DoProxyCommand=rm${IFS}nonexistent/path' 264s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 264s [255] 264s $ hg clone -q 'git+ssh://fakehost|rm${IFS}nonexistent/path' 264s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 264s - abort: git remote error: The remote server unexpectedly closed the connection. 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 264s [255] 264s $ hg clone -q 'git+ssh://fakehost%7Crm${IFS}nonexistent/path' 264s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 264s - abort: git remote error: The remote server unexpectedly closed the connection. 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 264s [255] 264s 264s ERROR: test-git-clone.t output changed 264s ! 264s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-git-gpg.t 264s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-git-gpg.t.err 264s @@ -55,23 +55,10 @@ 264s Hg clone it 264s 264s $ hg clone gitrepo hgrepo 264s - importing 2 git commits 264s - new changesets ab60c5e55bd6:[0-9a-f]{12,12} \(2 drafts\) (re) 264s - updating to bookmark signed 264s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + abort: repository gitrepo not found 264s + [255] 264s 264s $ cd hgrepo 264s + $TESTTMP.sh: 46: cd: can't cd to hgrepo 264s $ hg push ../gitrepo2 -B signed 264s - pushing to ../gitrepo2 264s - searching for changes 264s - adding objects 264s - remote: found 0 deltas to reuse 264s - added 1 commits with 1 trees and 0 blobs 264s - adding reference refs/heads/signed 264s - $ cd .. 264s - 264s -Verify the commit 264s - 264s - $ cd gitrepo2 264s - $ git show --show-signature signed | grep "Good signature from" 264s - gpg: Good signature from "hgtest" [ultimate] 264s 264s ERROR: test-git-gpg.t output changed 264s ! 264s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-keywords.t 264s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-keywords.t.err 264s @@ -21,29 +21,9 @@ 264s $ cd .. 264s 264s $ hg clone gitrepo hgrepo 264s - importing 3 git commits 264s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 264s - updating to bookmark master 264s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + abort: repository gitrepo not found 264s + [255] 264s $ cd hgrepo 264s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 264s $ echo gamma > gamma 264s - $ hg add gamma 264s - $ hg commit -m 'add gamma' 264s - 264s - $ hg log --template "{rev} {node} {node|short} {gitnode} {gitnode|short}\n" 264s - 3 965bf7d08d3ac847dd8eb9e72ee0bf547d1a65d9 965bf7d08d3a 264s - 2 8e3f0ecc9aefd4ea2fdf8e2d5299cac548762a1c 8e3f0ecc9aef 7e2a5465ff4e3b992c429bb87a392620a0ac97b7 7e2a5465ff4e 264s - 1 7fe02317c63d9ee324d4b5df7c9296085162da1b 7fe02317c63d 9497a4ee62e16ee641860d7677cdb2589ea15554 9497a4ee62e1 264s - 0 ff7a2f2d8d7099694ae1e8b03838d40575bebb63 ff7a2f2d8d70 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 7eeab2ea75ec 264s - $ hg log --template "fromgit {rev}\n" --rev "fromgit()" 264s - fromgit 0 264s - fromgit 1 264s - fromgit 2 264s - $ hg log --template "gitnode_existsA {rev}\n" --rev "gitnode(9497a4ee62e16ee641860d7677cdb2589ea15554)" 264s - gitnode_existsA 1 264s - $ hg log --template "gitnode_existsB {rev}\n" --rev "gitnode(7eeab)" 264s - gitnode_existsB 0 264s - $ hg log --rev "gitnode(7e)" 264s - abort: git-mapfile@7e: ambiguous identifier!? (re) 264s - [50] 264s - $ hg log --template "gitnode_notexists {rev}\n" --rev "gitnode(1234567890ab)" 264s 264s ERROR: test-keywords.t output changed 264s ! 264s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-push-r.t 264s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-push-r.t.err 264s @@ -2,34 +2,43 @@ 264s $ . "$TESTDIR/testutil" 264s 264s $ hg init test 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s $ cd test 264s $ cat >>afile < 0 264s > EOF 264s $ hg add afile 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s $ fn_hg_commit -m "0.0" 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s $ cat >>afile < 1 264s > EOF 264s $ fn_hg_commit -m "0.1" 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s $ cat >>afile < 2 264s > EOF 264s $ fn_hg_commit -m "0.2" 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s $ cat >>afile < 3 264s > EOF 264s $ fn_hg_commit -m "0.3" 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s $ hg update -C 0 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 264s $ cat >>afile < 1 264s > EOF 264s $ fn_hg_commit -m "1.1" 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s $ cat >>afile < 2 264s > EOF 264s $ fn_hg_commit -m "1.2" 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s $ cat >fred < a line 264s > EOF 264s @@ -37,13 +46,20 @@ 264s > 3 264s > EOF 264s $ hg add fred 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s $ fn_hg_commit -m "1.3" 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s $ hg mv afile adifferentfile 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s $ fn_hg_commit -m "1.3m" 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s $ hg update -C 3 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 264s $ hg mv afile anotherfile 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s $ fn_hg_commit -m "0.3m" 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s $ cd .. 264s $ for i in 0 1 2 3 4 5 6 7 8; do 264s > mkdir test-"$i" 264s @@ -53,128 +69,166 @@ 264s > hg verify 264s > cd .. 264s > done 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s pushing to test-0 264s searching for changes 264s adding changesets 264s adding manifests 264s adding file changes 264s added 1 changesets with 1 changes to 1 files 264s - checking changesets 264s - checking manifests 264s - crosschecking files in changesets and manifests 264s - checking files 264s - checking dirstate (?) 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + checking changesets 264s + checking dirstate (?) 264s + checking manifests 264s + crosschecking files in changesets and manifests 264s + checking files 264s + checking dirstate 264s checked 1 changesets with 1 changes to 1 files 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s pushing to test-1 264s searching for changes 264s adding changesets 264s adding manifests 264s + checking dirstate (?) 264s adding file changes 264s added 2 changesets with 2 changes to 1 files 264s - checking changesets 264s - checking manifests 264s - crosschecking files in changesets and manifests 264s - checking files 264s - checking dirstate (?) 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + checking changesets 264s + checking manifests 264s + crosschecking files in changesets and manifests 264s + checking files 264s + checking dirstate 264s checked 2 changesets with 2 changes to 1 files 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + checking dirstate (?) 264s pushing to test-2 264s searching for changes 264s adding changesets 264s adding manifests 264s adding file changes 264s added 3 changesets with 3 changes to 1 files 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s checking changesets 264s checking manifests 264s crosschecking files in changesets and manifests 264s checking files 264s checking dirstate (?) 264s checked 3 changesets with 3 changes to 1 files 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s pushing to test-3 264s searching for changes 264s adding changesets 264s adding manifests 264s adding file changes 264s added 4 changesets with 4 changes to 1 files 264s - checking changesets 264s - checking manifests 264s - crosschecking files in changesets and manifests 264s - checking files 264s - checking dirstate (?) 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + checking changesets 264s + checking dirstate (?) 264s + checking manifests 264s + crosschecking files in changesets and manifests 264s + checking files 264s + checking dirstate 264s checked 4 changesets with 4 changes to 1 files 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s pushing to test-4 264s searching for changes 264s adding changesets 264s adding manifests 264s + checking dirstate (?) 264s adding file changes 264s added 2 changesets with 2 changes to 1 files 264s - checking changesets 264s - checking manifests 264s - crosschecking files in changesets and manifests 264s - checking files 264s - checking dirstate (?) 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + checking changesets 264s + checking manifests 264s + crosschecking files in changesets and manifests 264s + checking files 264s + checking dirstate 264s checked 2 changesets with 2 changes to 1 files 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s + checking dirstate (?) 264s pushing to test-5 264s searching for changes 264s adding changesets 264s adding manifests 264s adding file changes 264s added 3 changesets with 3 changes to 1 files 264s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 264s checking changesets 264s checking manifests 264s crosschecking files in changesets and manifests 264s checking files 264s checking dirstate (?) 265s checked 3 changesets with 3 changes to 1 files 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s pushing to test-6 265s searching for changes 265s adding changesets 265s adding manifests 265s adding file changes 265s added 4 changesets with 5 changes to 2 files 265s - checking changesets 265s - checking manifests 265s - crosschecking files in changesets and manifests 265s - checking files 265s - checking dirstate (?) 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s + checking changesets 265s + checking dirstate (?) 265s + checking manifests 265s + crosschecking files in changesets and manifests 265s + checking files 265s + checking dirstate 265s checked 4 changesets with 5 changes to 2 files 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s pushing to test-7 265s searching for changes 265s adding changesets 265s adding manifests 265s adding file changes 265s added 5 changesets with 6 changes to 3 files 265s - checking changesets 265s - checking manifests 265s - crosschecking files in changesets and manifests 265s - checking files 265s - checking dirstate (?) 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s + checking changesets 265s + checking manifests 265s + crosschecking files in changesets and manifests 265s + checking files 265s + checking dirstate 265s checked 5 changesets with 6 changes to 3 files 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s pushing to test-8 265s searching for changes 265s adding changesets 265s adding manifests 265s adding file changes 265s added 5 changesets with 5 changes to 2 files 265s - checking changesets 265s - checking manifests 265s - crosschecking files in changesets and manifests 265s - checking files 265s - checking dirstate (?) 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s + checking changesets 265s + checking manifests 265s + crosschecking files in changesets and manifests 265s + checking files 265s + checking dirstate 265s checked 5 changesets with 5 changes to 2 files 265s $ cd test-8 265s $ hg pull ../test-7 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s pulling from ../test-7 265s searching for changes 265s adding changesets 265s adding manifests 265s adding file changes 265s + new changesets c29287bce33f:e70c8671c3d4 (?) 265s added 4 changesets with 2 changes to 3 files (+1 heads) 265s - new changesets c29287bce33f:e70c8671c3d4 (?) 265s + new changesets c29287bce33f:e70c8671c3d4 265s (run 'hg heads' to see heads, 'hg merge' to merge) 265s $ hg verify 265s - checking changesets 265s - checking manifests 265s - crosschecking files in changesets and manifests 265s - checking files 265s - checking dirstate (?) 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s + checking changesets 265s + checking manifests 265s + crosschecking files in changesets and manifests 265s + checking dirstate (?) 265s + checking files 265s + checking dirstate 265s checked 9 changesets with 7 changes to 4 files 265s 265s ERROR: test-push-r.t output changed 265s ! 265s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-conflict-2.t 265s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-conflict-2.t.err 265s @@ -2,30 +2,40 @@ 265s $ . "$TESTDIR/testutil" 265s 265s $ hg init hgrepo1 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s $ cd hgrepo1 265s $ echo A > afile 265s $ hg add afile 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s $ hg ci -m "origin" 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s 265s $ echo B > afile 265s $ hg ci -m "A->B" 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s 265s $ hg up -r0 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 265s $ echo C > afile 265s $ hg ci -m "A->C" 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s created new head 265s 265s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s warning: conflicts.* (re) 265s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 265s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 265s resolve using second parent 265s $ echo B > afile 265s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s $ hg ci -m "merge to B" 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s 265s $ hg log --graph --style compact | sed 's/\[.*\]//g' 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s @ 3:2,1 120385945d08 1970-01-01 00:00 +0000 test 265s |\ merge to B 265s | | 265s @@ -45,31 +55,18 @@ 265s 265s $ cd hgrepo1 265s $ hg bookmark -r tip master 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s $ hg push -r master ../repo.git 265s - pushing to ../repo.git 265s - searching for changes 265s - adding objects 265s - remote: found 0 deltas to reuse 265s - added 4 commits with 3 trees and 3 blobs 265s - adding reference refs/heads/master 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s + abort: repository ../repo.git does not exist 265s + [255] 265s $ cd .. 265s 265s $ hg clone repo.git hgrepo2 265s - importing 4 git commits 265s - new changesets 5d1a6b64f9d0:120385945d08 (4 drafts) 265s - updating to bookmark master 265s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s + abort: repository repo.git not found 265s + [255] 265s expect the same revision ids as above 265s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 265s - @ 3:1,2 120385945d08 1970-01-01 00:00 +0000 test 265s - |\ merge to B 265s - | | 265s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 265s - | | A->B 265s - | | 265s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 265s - |/ A->C 265s - | 265s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 265s - origin 265s - 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s + abort: repository hgrepo2 not found 265s 265s ERROR: test-conflict-2.t output changed 265s ! 265s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-convergedmerge.t 265s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-convergedmerge.t.err 265s @@ -2,29 +2,39 @@ 265s $ . "$TESTDIR/testutil" 265s 265s $ hg init hgrepo1 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s $ cd hgrepo1 265s $ echo A > afile 265s $ hg add afile 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s $ hg ci -m "origin" 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s 265s $ echo B > afile 265s $ hg ci -m "A->B" 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s 265s $ echo C > afile 265s $ hg ci -m "B->C" 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s 265s $ hg up -r0 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 265s $ echo C > afile 265s $ hg ci -m "A->C" 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s created new head 265s 265s $ hg merge -r2 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 265s (branch merge, don't forget to commit) 265s $ hg ci -m "merge" 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s 265s $ hg log --graph --style compact | sed 's/\[.*\]//g' 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s @ 4:3,2 eaa21d002113 1970-01-01 00:00 +0000 test 265s |\ merge 265s | | 265s @@ -47,36 +57,23 @@ 265s 265s $ cd hgrepo1 265s $ hg bookmark -r4 master 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s $ hg push -r master ../repo.git 265s - pushing to ../repo.git 265s - searching for changes 265s - adding objects 265s - remote: found 0 deltas to reuse 265s - added 5 commits with 3 trees and 3 blobs 265s - adding reference refs/heads/master 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s + abort: repository ../repo.git does not exist 265s + [255] 265s $ cd .. 265s 265s $ hg clone repo.git hgrepo2 265s - importing 5 git commits 265s - new changesets 5d1a6b64f9d0:eaa21d002113 (5 drafts) 265s - updating to bookmark master 265s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s + abort: repository repo.git not found 265s + [255] 265s expect the same revision ids as above 265s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 265s - @ 4:1,3 eaa21d002113 1970-01-01 00:00 +0000 test 265s - |\ merge 265s - | | 265s - | o 3 0dbe4ac1a758 1970-01-01 00:00 +0000 test 265s - | | B->C 265s - | | 265s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 265s - | | A->B 265s - | | 265s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 265s - |/ A->C 265s - | 265s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 265s - origin 265s - 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s + abort: repository hgrepo2 not found 265s $ hg -R hgrepo2 gverify 265s - verifying rev eaa21d002113 against git commit fb8c9e2afe5418cfff337eeed79fad5dd58826f0 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s + hg: unknown command 'gverify' 265s + (did you mean verify?) 265s + [10] 265s 265s ERROR: test-convergedmerge.t output changed 265s ! 265s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-tree-decomposition.t 265s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-tree-decomposition.t.err 265s @@ -24,45 +24,9 @@ 265s $ git init -q --bare repo.git 265s 265s $ hg clone gitrepo hgrepo 265s - importing 3 git commits 265s - new changesets d4d3d2417141:541f27994b81 (3 drafts) 265s - updating to bookmark master 265s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s + abort: repository gitrepo not found 265s + [255] 265s $ cd hgrepo 265s + $TESTTMP.sh: 38: cd: can't cd to hgrepo 265s $ hg log --template 'adds: {file_adds}\ndels: {file_dels}\n' 265s - adds: d1 265s - dels: d1/f1 265s - adds: d2/f2 265s - dels: d1/f2 265s - adds: d1/f1 d1/f2 265s - dels: 265s - 265s - $ hg debug-remove-hggit-state 265s - clearing out the git cache data 265s - $ hg push ../repo.git 265s - pushing to ../repo.git 265s - searching for changes 265s - adding objects 265s - remote: found 0 deltas to reuse 265s - added 3 commits with 6 trees and 3 blobs 265s - adding reference refs/heads/master 265s - $ cd .. 265s - 265s - $ git --git-dir=repo.git log --pretty=medium 265s - commit 6e0dbd8cd92ed4823c69cb48d8a2b81f904e6e69 265s - Author: test 265s - Date: Mon Jan 1 00:00:12 2007 +0000 265s - 265s - replace a dir with a file 265s - 265s - commit a1874d5cd0b1549ed729e36f0da4a93ed36259ee 265s - Author: test 265s - Date: Mon Jan 1 00:00:11 2007 +0000 265s - 265s - rename 265s - 265s - commit 102c17a5deda49db3f10ec5573f9378867098b7c 265s - Author: test 265s - Date: Mon Jan 1 00:00:10 2007 +0000 265s - 265s - initial 265s 265s ERROR: test-tree-decomposition.t output changed 265s ! 265s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-conflict-1.t 265s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-conflict-1.t.err 265s @@ -2,30 +2,40 @@ 265s $ . "$TESTDIR/testutil" 265s 265s $ hg init hgrepo1 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s $ cd hgrepo1 265s $ echo A > afile 265s $ hg add afile 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s $ hg ci -m "origin" 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s 265s $ echo B > afile 265s $ hg ci -m "A->B" 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s 265s $ hg up -r0 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 265s $ echo C > afile 265s $ hg ci -m "A->C" 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s created new head 265s 265s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s warning: conflicts.* (re) 265s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 265s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 265s resolve using first parent 265s $ echo C > afile 265s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s $ hg ci -m "merge to C" 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s 265s $ hg log --graph --style compact | sed 's/\[.*\]//g' 265s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 265s @ 3:2,1 6c53bc0f062f 1970-01-01 00:00 +0000 test 265s |\ merge to C 265s | | 265s @@ -45,31 +55,18 @@ 265s 265s $ cd hgrepo1 265s $ hg bookmark -r tip master 266s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 266s $ hg push -r master ../repo.git 266s - pushing to ../repo.git 266s - searching for changes 266s - adding objects 266s - remote: found 0 deltas to reuse 266s - added 4 commits with 3 trees and 3 blobs 266s - adding reference refs/heads/master 266s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 266s + abort: repository ../repo.git does not exist 266s + [255] 266s $ cd .. 266s 266s $ hg clone repo.git hgrepo2 266s - importing 4 git commits 266s - new changesets 5d1a6b64f9d0:6c53bc0f062f (4 drafts) 266s - updating to bookmark master 266s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 266s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 266s + abort: repository repo.git not found 266s + [255] 266s expect the same revision ids as above 266s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 266s - @ 3:1,2 6c53bc0f062f 1970-01-01 00:00 +0000 test 266s - |\ merge to C 266s - | | 266s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 266s - | | A->B 266s - | | 266s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 266s - |/ A->C 266s - | 266s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 266s - origin 266s - 266s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 266s + abort: repository hgrepo2 not found 266s 266s ERROR: test-conflict-1.t output changed 266s ! 266s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-subrepos-drop.t 266s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-subrepos-drop.t.err 266s @@ -17,52 +17,9 @@ 266s Create a Mercurial repository with a .gitmodules file: 266s 266s $ hg clone repo.git hgrepo 266s - updating to branch default 266s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 266s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 266s + abort: repository repo.git not found 266s + [255] 266s $ cd hgrepo 266s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 266s $ hg book master 266s - $ touch this 266s - $ fn_hg_commit -A -m 'add this' 266s - $ cat > .gitmodules < [submodule "subrepo"] 266s - > path = subrepo 266s - > url = ../gitsubrepo 266s - > EOF 266s - $ hg add .gitmodules 266s - $ fn_hg_commit -m "add .gitmodules file" 266s - $ cd .. 266s - 266s -What happens if we push that to Git? 266s - 266s - $ hg -R hgrepo push 266s - pushing to $TESTTMP/repo.git 266s - warning: ignoring modifications to '.gitmodules' file; please use '.hgsub' instead 266s - searching for changes 266s - adding objects 266s - remote: found 0 deltas to reuse 266s - added 2 commits with 1 trees and 1 blobs 266s - adding reference refs/heads/master 266s - 266s -But we don't get a warning if we don't touch .gitmodules: 266s - 266s - $ cd hgrepo 266s - $ touch that 266s - $ fn_hg_commit -A -m 'add that' 266s - $ hg push 266s - pushing to $TESTTMP/repo.git 266s - searching for changes 266s - adding objects 266s - remote: found 0 deltas to reuse 266s - added 1 commits with 1 trees and 0 blobs 266s - updating reference refs/heads/master 266s - $ cd .. 266s - 266s -Check that it didn't silenty come through, or something: 266s - 266s - $ git clone repo.git gitrepo 266s - Cloning into 'gitrepo'... 266s - done. 266s - $ ls -A gitrepo 266s - .git 266s - that 266s - this 266s 266s ERROR: test-subrepos-drop.t output changed 266s ! 266s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-empty-working-tree.t 266s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-empty-working-tree.t.err 266s @@ -10,29 +10,9 @@ 266s $ git init -q --bare repo.git 266s 266s $ hg clone gitrepo hgrepo 266s - importing 1 git commits 266s - new changesets 01708ca54a8f (1 drafts) 266s - updating to bookmark master 266s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 266s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 266s + abort: repository gitrepo not found 266s + [255] 266s $ cd hgrepo 266s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 266s $ hg log -r tip --template 'files: {files}\n' 266s - files: 266s - $ hg gverify 266s - verifying rev 01708ca54a8f against git commit 678256865a8c85ae925bf834369264193c88f8de 266s - 266s - $ hg debug-remove-hggit-state 266s - clearing out the git cache data 266s - $ hg push ../repo.git 266s - pushing to ../repo.git 266s - searching for changes 266s - adding objects 266s - remote: found 0 deltas to reuse 266s - added 1 commits with 1 trees and 0 blobs 266s - adding reference refs/heads/master 266s - $ cd .. 266s - $ git --git-dir=repo.git log --pretty=medium 266s - commit 678256865a8c85ae925bf834369264193c88f8de 266s - Author: test 266s - Date: Mon Jan 1 00:00:00 2007 +0000 266s - 266s - empty 266s 266s ERROR: test-empty-working-tree.t output changed 266s ! 266s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-subrepos-delete.t 266s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-subrepos-delete.t.err 266s @@ -52,22 +52,9 @@ 266s And there should be nothing in Mercurial either: 266s 266s $ hg clone -U repo.git hgrepo 266s - importing 3 git commits 266s - new changesets e532b2bfda10:cc611d35fb62 (3 drafts) 266s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 266s + abort: repository repo.git not found 266s + [255] 266s $ cd hgrepo 266s + $TESTTMP.sh: 50: cd: can't cd to hgrepo 266s $ hg log --graph --template info 266s - o 266s - | commit: 2:cc611d35fb62 delete subrepo 266s - | added: 266s - | removed: .hgsub .hgsubstate 266s - o 266s - | commit: 1:8d549bcc5179 add subrepo 266s - | added: .hgsub .hgsubstate 266s - | removed: 266s - o 266s - commit: 0:e532b2bfda10 add alpha 266s - added: alpha 266s - removed: 266s - $ hg manifest -r tip 266s - alpha 266s - $ cd .. 266s 266s ERROR: test-subrepos-delete.t output changed 266s ! 266s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-push-anonymous.t 266s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-push-anonymous.t.err 266s @@ -25,28 +25,9 @@ 266s Clone it, deactivate the bookmark, add a commit, and push! 266s 266s $ hg clone -U gitrepo hgrepo 266s - importing 1 git commits 266s - new changesets ff7a2f2d8d70 (1 drafts) 266s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 266s + abort: repository gitrepo not found 266s + [255] 266s $ cd hgrepo 266s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 266s $ hg up tip 266s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 266s - $ echo beta > beta 266s - $ hg add beta 266s - $ fn_hg_commit -m "add beta" 266s - 266s -Pushing that changeset should print a helpful message: 266s - 266s - $ hg push 266s - pushing to $TESTTMP/gitrepo 266s - searching for changes 266s - no changes found (ignoring 1 changesets without bookmarks or tags) 266s - [1] 266s - 266s -But what about untagged, but secret changesets? 266s - 266s - $ hg phase -fs tip 266s - $ hg push 266s - pushing to $TESTTMP/gitrepo 266s - searching for changes 266s - no changes found 266s - [1] 266s 266s ERROR: test-push-anonymous.t output changed 267s !s 267s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-ambiguousprefix.t 267s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-ambiguousprefix.t.err 267s @@ -21,13 +21,11 @@ 267s $ cd .. 267s 267s $ hg clone gitrepo hgrepo 267s - importing 3 git commits 267s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 267s - updating to bookmark master 267s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 267s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 267s + abort: repository gitrepo not found 267s + [255] 267s 267s $ cd hgrepo 267s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 267s 267s $ hg log -r 'gitnode(7e)' 267s - abort: git-mapfile@7e: ambiguous identifier!? (re) 267s - [50] 267s 267s ERROR: test-ambiguousprefix.t output changed 267s ! 267s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-url-parsing.py.out 267s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-url-parsing.py.err 267s @@ -1,46 +1,14 @@ 267s -% expect '/webjam/webjam.git' 267s -/webjam/webjam.git 267s -% expect 'github.com' 267s -github.com 267s -% expect '/webjam/webjam.git' 267s -/webjam/webjam.git 267s -% expect 'github.com' 267s -github.com 267s -% expect '19418' 267s -19418 267s -% expect 'webjam.git' 267s -webjam.git 267s -% expect 'git@heroku.com' 267s -git@heroku.com 267s -% expect '999' 267s -999 267s -% expect 'webjam/webjam.git' 267s -webjam/webjam.git 267s -% expect 'git@github.com' 267s -git@github.com 267s -% expect '42qu/vps.git' 267s -42qu/vps.git 267s -% expect 'git@github.com' 267s -git@github.com 267s -% expect '/webjam/webjam.git' 267s -/webjam/webjam.git 267s -% expect 'git@github.com' 267s -git@github.com 267s -% expect '/webjam/webjam.git' 267s -/webjam/webjam.git 267s -% expect 'git@github.com' 267s -git@github.com 267s -% expect '10022' 267s -10022 267s -% expect 'webjam.git' 267s -webjam.git 267s -% expect 'git@heroku.com' 267s -git@heroku.com 267s -% expect 'webjam.git' 267s -webjam.git 267s -% expect 'git@compatible.com' 267s -git@compatible.com 267s -% expect 'webjam.git' 267s -webjam.git 267s -% expect 'git@heroku.com' 267s -git@heroku.com 267s +Traceback (most recent call last): 267s + File "/tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-url-parsing.py", line 14, in 267s + from hggit.git_handler import GitHandler 267s + File "/usr/lib/python3/dist-packages/hggit/__init__.py", line 160, in 267s + from . import commands 267s + File "/usr/lib/python3/dist-packages/hggit/commands.py", line 26, in 267s + from . import verify 267s + File "/usr/lib/python3/dist-packages/hggit/verify.py", line 16, in 267s + from . import git2hg 267s + File "/usr/lib/python3/dist-packages/hggit/git2hg.py", line 8, in 267s + from dulwich.refs import ( 267s + ...<3 lines>... 267s + ) 267s +ImportError: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 267s 267s ERROR: test-url-parsing.py output changed 269s !. 269s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-timezone.t 269s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-timezone.t.err 269s @@ -8,10 +8,13 @@ 269s $ . "$TESTDIR/testutil" 269s 269s $ hg init hgrepo 269s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 269s $ cd hgrepo 269s $ touch beta 269s $ hg add beta 269s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 269s $ fn_hg_commit -m "test commit" 269s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 269s $ cat >patch2 < # HG changeset patch 269s > # User J. User 269s @@ -28,5 +31,10 @@ 269s > +alpha 269s > EOF 269s $ hg import patch2 269s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 269s applying patch2 269s $ hg gexport 269s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 269s + hg: unknown command 'gexport' 269s + (did you mean one of export, import?) 269s + [10] 269s 269s ERROR: test-timezone.t output changed 269s ! 269s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-gitignore-permissions.t 269s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-gitignore-permissions.t.err 269s @@ -4,6 +4,7 @@ 269s $ . "$TESTDIR/testutil" 269s 269s $ hg init repo 269s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 269s $ cd repo 269s 269s $ if test `whoami` = root 269s @@ -16,8 +17,14 @@ 269s 269s $ touch thefile 269s $ hg add thefile 269s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 269s $ hg ci -A -m commit 269s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 269s $ hg gexport 269s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 269s + hg: unknown command 'gexport' 269s + (did you mean one of export, import?) 269s + [10] 269s 269s Create a file that we can ignore 269s 269s @@ -33,9 +40,10 @@ 269s 269s $ echo nothingtoseehere > .gitignore 269s $ hg status 269s - not_readable: Permission denied 269s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 269s not_readable: Permission denied 269s ? .gitignore 269s + ? nothingtoseehere 269s 269s And notice that we really did ignore it! 269s 269s 269s ERROR: test-gitignore-permissions.t output changed 270s ! 270s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-gitignore-share.t 270s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-gitignore-share.t.err 270s @@ -9,6 +9,7 @@ 270s $ git init --quiet --bare repo.git 270s 270s $ hg init hgrepo 270s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 270s $ cd hgrepo 270s $ cat > .hg/hgrc < [paths] 270s @@ -16,26 +17,31 @@ 270s > EOF 270s $ echo ignored > .gitignore 270s $ hg add .gitignore 270s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 270s $ hg ci -m ignore 270s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 270s $ hg book master 270s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 270s $ hg push 270s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 270s pushing to $TESTTMP/repo.git 270s - searching for changes 270s - adding objects 270s - remote: found 0 deltas to reuse 270s - added 1 commits with 1 trees and 1 blobs 270s - adding reference refs/heads/master 270s + abort: repository $TESTTMP/repo.git not found 270s + [255] 270s $ cd .. 270s 270s We should also ignore the file in a shared repository: 270s 270s $ hg share hgrepo sharerepo 270s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 270s updating working directory 270s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 270s $ cd sharerepo 270s $ hg paths 270s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 270s default = $TESTTMP/repo.git 270s $ cat .gitignore 270s ignored 270s $ touch ignored 270s $ hg status 270s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 270s + ? ignored 270s 270s ERROR: test-gitignore-share.t output changed 271s ! 271s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-annotate.t 271s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-annotate.t.err 271s @@ -10,6 +10,7 @@ 271s init 271s 271s $ hg init repo 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s $ cd repo 271s 271s commit 271s @@ -19,37 +20,48 @@ 271s > a 271s > EOF 271s $ hg add a 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s $ fn_hg_commit -m 1 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s $ cat < a 271s > a 271s > a 271s > a 271s > EOF 271s $ fn_hg_commit -m 2 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s $ cat < a 271s > a 271s > b 271s > a 271s > EOF 271s $ fn_hg_commit -m 3 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s 271s annotate multiple files 271s 271s $ hg annotate a 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s 0: a 271s 2: b 271s 1: a 271s 271s $ hg annotate --skip 1 a 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s 0: a 271s 2: b 271s 0* a 271s 271s $ hg gexport 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s + hg: unknown command 'gexport' 271s + (did you mean one of export, import?) 271s + [10] 271s $ hg log -T '{rev}:{node} {gitnode}\n' 271s - 2:beb139b96eec386addc02d48db524b7646ef1605 19388575d02e71e917e7013aa854d4a21c509819 271s - 1:a9a255d66663f9216bdcf8dda69211d7280f7278 debec50a14cc4830584dd4fa1507c51cce1c098f 271s - 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 88f28c06a1ede9a70852ab1bf9818150fabaaaa9 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s + 2:beb139b96eec386addc02d48db524b7646ef1605 271s + 1:a9a255d66663f9216bdcf8dda69211d7280f7278 271s + 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 271s 271s $ cat < .git-blame-ignore-revs 271s > # this is a comment, and the next line should be ignored 271s @@ -59,39 +71,43 @@ 271s > EOF 271s 271s $ hg annotate a 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s 0: a 271s 2: b 271s 1: a 271s $ hg annotate a \ 271s > --debug \ 271s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 271s - skipping debec50a14cc -> a9a255d66663 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s 0: a 271s 2: b 271s - 0* a 271s + 1: a 271s $ hg add .git-blame-ignore-revs 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s $ hg annotate a \ 271s > --debug \ 271s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 271s - skipping debec50a14cc -> a9a255d66663 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s 0: a 271s 2: b 271s - 0* a 271s + 1: a 271s $ hg annotate a \ 271s > --config git.blame.ignoreRevsFile=badfile 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s 0: a 271s 2: b 271s 1: a 271s $ hg annotate -T'{lines % "{rev}:{node|short} {gitnode|short}: {line}"}' a 271s - 0:8d4731bd0f4a 88f28c06a1ed: a 271s - 2:beb139b96eec 19388575d02e: b 271s - 1:a9a255d66663 debec50a14cc: a 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s + 0:8d4731bd0f4a : a 271s + 2:beb139b96eec : b 271s + 1:a9a255d66663 : a 271s 271s $ cd .. 271s $ hg -R repo annotate repo/a \ 271s > --debug \ 271s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 271s - skipping debec50a14cc -> a9a255d66663 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s 0: a 271s 2: b 271s - 0* a 271s + 1: a 271s 271s ERROR: test-annotate.t output changed 271s ! 271s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-addbranchrevs.t 271s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-addbranchrevs.t.err 271s @@ -7,14 +7,23 @@ 271s caused the pull to not update to the passed revision. 271s 271s $ hg init orig 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s $ cd orig 271s $ echo a > a; hg add a; hg ci -m a 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s $ hg branch foo -q 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s $ echo b > b; hg add b; hg ci -m b 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s 271s $ cd .. 271s $ hg clone orig clone -r 0 -q 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s $ cd clone 271s $ hg pull -u -r 1 -q 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s $ hg id -n 271s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 271s 1 271s 271s ERROR: test-addbranchrevs.t output changed 272s ! 272s --- /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-transplant.t 272s +++ /tmp/autopkgtest.PkQBX0/build.PYp/src/tests/test-transplant.t.err 272s @@ -11,12 +11,20 @@ 272s > EOF 272s 272s $ hg init baserepo 272s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 272s $ cd baserepo 272s $ for c in A B C 272s > do 272s > echo $c > $c && hg add $c && fn_hg_commit -m $c 272s > done 272s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 272s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 272s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 272s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 272s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 272s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 272s $ hg clone -r 2 . ../otherrepo 272s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 272s adding changesets 272s adding manifests 272s adding file changes 272s @@ -26,6 +34,8 @@ 272s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 272s $ cd ../otherrepo 272s $ hg up 1 272s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 272s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 272s $ hg transplant -s ../baserepo tip 272s + *** failed to import extension "hggit" from /tmp/autopkgtest.PkQBX0/build.PYp/src/hggit: cannot import name 'ANNOTATED_TAG_SUFFIX' from 'dulwich.refs' (/usr/lib/python3/dist-packages/dulwich/refs.py) 272s no changes found 272s 272s ERROR: test-transplant.t output changed 272s ! 272s Skipped test-check-black.t: missing feature: the black formatter for python (>= 22.3) 272s Skipped test-check-commit.t: missing feature: running tests from repository 272s Skipped test-check-pyflakes.t: missing feature: Pyflakes python linter 272s Skipped test-check-pylint.t: missing feature: Pylint python linter 272s Skipped test-encoding.t: blacklisted 272s Skipped test-gitignore-windows.t: missing feature: Windows 272s Skipped test-incoming.t: blacklisted 272s Skipped test-serve-ci.t: skipped 272s Skipped test-serve-dulwich.t: blacklisted 272s Failed test-addbranchrevs.t: output changed 272s Failed test-ambiguousprefix.t: output changed and returned error code 1 272s Failed test-annotate.t: output changed 272s Failed test-bookmark-workflow.t: output changed and returned error code 1 272s Failed test-branch-bookmark-suffix.t#with-path: output changed and returned error code 1 272s Failed test-branch-bookmark-suffix.t#without-path: output changed and returned error code 1 272s Failed test-bundle.t: output changed and returned error code 1 272s Failed test-clone.t#draft: output changed 272s Failed test-clone.t#secret: output changed 272s Failed test-conflict-1.t: output changed 272s Failed test-conflict-2.t: output changed 272s Failed test-convergedmerge.t: output changed 272s Failed test-empty-working-tree.t: output changed and returned error code 1 272s Failed test-extra.t: output changed and returned error code 1 272s Failed test-file-removal.t: output changed and returned error code 1 272s Failed test-gc.t: output changed and returned error code 1 272s Failed test-git-clone.t: output changed 272s Failed test-git-gpg.t: output changed and returned error code 1 272s Failed test-git-submodules.t: output changed and returned error code 1 272s Failed test-git-tags.t#draft: output changed and returned error code 1 272s Failed test-git-tags.t#secret: output changed and returned error code 1 272s Failed test-git-workflow.t: output changed 272s Failed test-gitignore-permissions.t: output changed 272s Failed test-gitignore-share.t: output changed 272s Failed test-gitignore.t: output changed 272s Failed test-help.t: output changed 272s Failed test-hg-author.t: output changed and returned error code 1 272s Failed test-hg-branch.t: output changed and returned error code 1 272s Failed test-hg-clone.t: output changed and returned error code 1 272s Failed test-hg-tags.t: output changed and returned error code 1 272s Failed test-hook.t: output changed 272s Failed test-illegal-contents.t: output changed 272s Failed test-invalid-refs.t: output changed and returned error code 1 272s Failed test-keywords.t: output changed and returned error code 1 272s Failed test-merge.t: output changed and returned error code 1 272s Failed test-multiple-remotes.t: output changed 272s Failed test-octopus.t: output changed and returned error code 1 272s Failed test-orphan-tags.t: output changed and returned error code 1 272s Failed test-outgoing.t: output changed and returned error code 1 272s Failed test-phases-draft.t: output changed and returned error code 1 272s Failed test-phases-public.t#publish-defaults: output changed and returned error code 1 272s Failed test-phases-public.t#publish-specific: output changed and returned error code 1 272s Failed test-phases-remote.t: output changed and returned error code 1 272s Failed test-pull-after-obsolete.t: output changed and returned error code 1 272s Failed test-pull-after-rebase.t: output changed and returned error code 1 272s Failed test-pull-after-strip.t: output changed and returned error code 1 272s Failed test-pull.t#draft: output changed 272s Failed test-pull.t#secret: output changed 272s Failed test-push-anonymous.t: output changed and returned error code 1 272s Failed test-push-authors.t: output changed and returned error code 1 272s Failed test-push-detached.t: output changed and returned error code 1 272s Failed test-push-missing-commit.t: output changed and returned error code 1 272s Failed test-push-phases.t: output changed and returned error code 1 272s Failed test-push-r.t: output changed 272s Failed test-push-to-head.t: output changed and returned error code 1 272s Failed test-push.t: output changed and returned error code 1 272s Failed test-renames.t: output changed and returned error code 1 272s Failed test-serve-git.t: output changed 272s Failed test-serve-hg-static.t: output changed 272s Failed test-serve-hg.t#with-hggit: output changed and returned error code 1 272s Failed test-serve-hg.t#without-hggit: output changed and returned error code 1 272s Failed test-subrepos-delete.t: output changed and returned error code 1 272s Failed test-subrepos-drop.t: output changed and returned error code 1 272s Failed test-subrepos-push.t: output changed and returned error code 1 272s Failed test-subrepos-syntax.t: output changed and returned error code 1 272s Failed test-subrepos.t: output changed and returned error code 1 272s Failed test-timezone.t: output changed 272s Failed test-transactions.t: output changed 272s Failed test-transplant.t: output changed 272s Failed test-tree-decomposition.t: output changed and returned error code 1 272s Failed test-url-parsing.py: output changed and returned error code 1 272s Failed test-verify-fail.t: output changed 272s # Ran 73 tests, 9 skipped, 72 failed. 272s python hash seed: 692391846 272s make: *** [Makefile:15: tests] Error 1 272s autopkgtest [00:10:21]: test testsuite: -----------------------] 277s autopkgtest [00:10:26]: test testsuite: - - - - - - - - - - results - - - - - - - - - - 277s testsuite FAIL non-zero exit status 2 281s autopkgtest [00:10:30]: test mercurial-git: preparing testbed 306s autopkgtest [00:10:55]: testbed dpkg architecture: armhf 307s autopkgtest [00:10:56]: testbed apt version: 3.1.14 314s autopkgtest [00:11:03]: @@@@@@@@@@@@@@@@@@@@ test bed setup 316s autopkgtest [00:11:05]: testbed release detected to be: resolute 328s autopkgtest [00:11:17]: updating testbed package index (apt update) 330s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 331s Get:2 http://ftpmaster.internal/ubuntu resolute InRelease [124 kB] 332s Get:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease [124 kB] 332s Get:4 http://ftpmaster.internal/ubuntu resolute-security InRelease [124 kB] 332s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [28.4 kB] 332s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1278 kB] 332s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/restricted Sources [5256 B] 332s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [105 kB] 332s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/main armhf Packages [123 kB] 332s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/universe armhf Packages [968 kB] 333s Get:11 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse armhf Packages [6600 B] 333s Get:12 http://ftpmaster.internal/ubuntu resolute/universe Sources [21.3 MB] 338s Get:13 http://ftpmaster.internal/ubuntu resolute/multiverse Sources [310 kB] 338s Get:14 http://ftpmaster.internal/ubuntu resolute/main Sources [1409 kB] 338s Get:15 http://ftpmaster.internal/ubuntu resolute/main armhf Packages [1373 kB] 339s Get:16 http://ftpmaster.internal/ubuntu resolute/universe armhf Packages [14.8 MB] 343s Get:17 http://ftpmaster.internal/ubuntu resolute/multiverse armhf Packages [176 kB] 345s Fetched 42.4 MB in 15s (2924 kB/s) 346s Reading package lists... 352s autopkgtest [00:11:41]: upgrading testbed (apt dist-upgrade and autopurge) 354s Reading package lists... 355s Building dependency tree... 355s Reading state information... 355s Calculating upgrade... 356s The following packages will be upgraded: 356s libexpat1 libgpg-error-l10n libgpg-error0 liblocale-gettext-perl pci.ids 356s 5 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 356s Need to get 466 kB of archives. 356s After this operation, 70.7 kB of additional disk space will be used. 356s Get:1 http://ftpmaster.internal/ubuntu resolute/main armhf libexpat1 armhf 2.7.4-1 [72.9 kB] 356s Get:2 http://ftpmaster.internal/ubuntu resolute/main armhf liblocale-gettext-perl armhf 1.07-8 [14.9 kB] 356s Get:3 http://ftpmaster.internal/ubuntu resolute/main armhf libgpg-error-l10n all 1.58-2 [9244 B] 356s Get:4 http://ftpmaster.internal/ubuntu resolute/main armhf libgpg-error0 armhf 1.58-2 [69.8 kB] 356s Get:5 http://ftpmaster.internal/ubuntu resolute/main armhf pci.ids all 0.0~2026.01.31-1 [299 kB] 357s Fetched 466 kB in 1s (676 kB/s) 357s (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 ... 68394 files and directories currently installed.) 357s Preparing to unpack .../libexpat1_2.7.4-1_armhf.deb ... 357s Unpacking libexpat1:armhf (2.7.4-1) over (2.7.3-1) ... 357s Preparing to unpack .../liblocale-gettext-perl_1.07-8_armhf.deb ... 357s Unpacking liblocale-gettext-perl (1.07-8) over (1.07-7build1) ... 358s Preparing to unpack .../libgpg-error-l10n_1.58-2_all.deb ... 358s Unpacking libgpg-error-l10n (1.58-2) over (1.58-1build1) ... 358s Preparing to unpack .../libgpg-error0_1.58-2_armhf.deb ... 358s Unpacking libgpg-error0:armhf (1.58-2) over (1.58-1build1) ... 358s Setting up libgpg-error0:armhf (1.58-2) ... 358s (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 ... 68394 files and directories currently installed.) 358s Preparing to unpack .../pci.ids_0.0~2026.01.31-1_all.deb ... 358s Unpacking pci.ids (0.0~2026.01.31-1) over (0.0~2025.12.16-1) ... 358s Setting up libexpat1:armhf (2.7.4-1) ... 358s Setting up pci.ids (0.0~2026.01.31-1) ... 358s Setting up libgpg-error-l10n (1.58-2) ... 358s Setting up liblocale-gettext-perl (1.07-8) ... 358s Processing triggers for man-db (2.13.1-1) ... 358s Processing triggers for libc-bin (2.42-2ubuntu4) ... 361s Reading package lists... 361s Building dependency tree... 361s Reading state information... 361s Solving dependencies... 362s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 364s autopkgtest [00:11:53]: rebooting testbed after setup commands that affected boot 391s Error: read tcp 10.136.6.227:48302->10.145.243.254:8443: i/o timeout 449s Error: Only running operations can be connected 454s autopkgtest [00:13:23]: ERROR: "chmod -R 0755 -- /tmp/autopkgtest.PkQBX0/autopkgtest-reboot" failed with stderr "Error: read tcp 10.136.6.227:45462->10.145.243.254:8443: i/o timeout 454s "