0s autopkgtest [06:56:00]: starting date and time: 2026-02-10 06:56:00+0000 0s autopkgtest [06:56:00]: git checkout: 508d4a25 a-v-ssh wait_for_ssh: demote "ssh connection failed" to a debug message 0s autopkgtest [06:56:00]: host juju-7f2275-prod-proposed-migration-environment-9; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.2q8n46lw/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:mercurial,src:cmake,src:composer --apt-upgrade hg-git --timeout-short=300 --timeout-copy=20000 --timeout-build=20000 '--env=ADT_TEST_TRIGGERS=mercurial/7.2-2 cmake/4.2.3-1ubuntu1 composer/2.9.5-1' -- lxd -r lxd-armhf-10.145.243.52 lxd-armhf-10.145.243.52:autopkgtest/ubuntu/resolute/armhf 25s autopkgtest [06:56:25]: testbed dpkg architecture: armhf 29s autopkgtest [06:56:29]: testbed apt version: 3.1.15 33s autopkgtest [06:56:33]: @@@@@@@@@@@@@@@@@@@@ test bed setup 36s autopkgtest [06:56:36]: testbed release detected to be: None 44s autopkgtest [06:56:44]: updating testbed package index (apt update) 46s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 46s Get:2 http://ftpmaster.internal/ubuntu resolute InRelease [124 kB] 46s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 47s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 47s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [31.1 kB] 47s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1727 kB] 47s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [178 kB] 47s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/main armhf Packages [249 kB] 47s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/universe armhf Packages [1556 kB] 47s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse armhf Packages [8156 B] 47s Get:11 http://ftpmaster.internal/ubuntu resolute/main Sources [1404 kB] 47s Get:12 http://ftpmaster.internal/ubuntu resolute/universe Sources [21.3 MB] 47s Get:13 http://ftpmaster.internal/ubuntu resolute/main armhf Packages [1386 kB] 47s Get:14 http://ftpmaster.internal/ubuntu resolute/universe armhf Packages [15.1 MB] 51s Fetched 43.2 MB in 5s (8315 kB/s) 52s Reading package lists... 59s autopkgtest [06:56:59]: upgrading testbed (apt dist-upgrade and autopurge) 61s Reading package lists... 61s Building dependency tree... 61s Reading state information... 62s Calculating upgrade... 63s The following packages will be upgraded: 63s libbrotli1 63s 1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 63s Need to get 318 kB of archives. 63s After this operation, 0 B of additional disk space will be used. 63s Get:1 http://ftpmaster.internal/ubuntu resolute/main armhf libbrotli1 armhf 1.2.0-3 [318 kB] 64s Fetched 318 kB in 1s (417 kB/s) 64s (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 ... 68678 files and directories currently installed.) 64s Preparing to unpack .../libbrotli1_1.2.0-3_armhf.deb ... 64s Unpacking libbrotli1:armhf (1.2.0-3) over (1.1.0-2build6) ... 64s Setting up libbrotli1:armhf (1.2.0-3) ... 64s Processing triggers for libc-bin (2.42-2ubuntu4) ... 67s Reading package lists... 67s Building dependency tree... 67s Reading state information... 67s Solving dependencies... 68s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 70s autopkgtest [06:57:10]: rebooting testbed after setup commands that affected boot 116s autopkgtest [06:57:56]: 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 141s autopkgtest [06:58:21]: @@@@@@@@@@@@@@@@@@@@ apt-source hg-git 152s Get:1 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (dsc) [2142 B] 152s Get:2 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (tar) [222 kB] 152s Get:3 http://ftpmaster.internal/ubuntu resolute/universe hg-git 1.2.0-1 (diff) [6816 B] 152s gpgv: Signature made Sun Feb 16 14:22:41 2025 UTC 152s gpgv: using RSA key 8F6DE104377F3B11E741748731F3144544A1741A 152s gpgv: issuer "tchet@debian.org" 152s gpgv: Can't check signature: No public key 152s dpkg-source: warning: cannot verify inline signature for ./hg-git_1.2.0-1.dsc: no acceptable signature found 152s autopkgtest [06:58:32]: testing package hg-git version 1.2.0-1 154s autopkgtest [06:58:34]: build not needed 158s autopkgtest [06:58:38]: test testsuite: preparing testbed 160s Reading package lists... 160s Building dependency tree... 160s Reading state information... 160s Solving dependencies... 161s The following NEW packages will be installed: 161s git git-man liberror-perl mercurial mercurial-common mercurial-git 161s python3-dulwich unzip 162s 0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded. 162s Need to get 9608 kB of archives. 162s After this operation, 50.8 MB of additional disk space will be used. 162s Get:1 http://ftpmaster.internal/ubuntu resolute/main armhf liberror-perl all 0.17030-1 [23.5 kB] 162s Get:2 http://ftpmaster.internal/ubuntu resolute/main armhf git-man all 1:2.51.0-1ubuntu1 [1179 kB] 163s Get:3 http://ftpmaster.internal/ubuntu resolute/main armhf git armhf 1:2.51.0-1ubuntu1 [4649 kB] 165s Get:4 http://ftpmaster.internal/ubuntu resolute-proposed/universe armhf mercurial-common all 7.2-2 [2853 kB] 166s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe armhf mercurial armhf 7.2-2 [492 kB] 166s Get:6 http://ftpmaster.internal/ubuntu resolute/universe armhf python3-dulwich armhf 0.22.7-1 [183 kB] 166s Get:7 http://ftpmaster.internal/ubuntu resolute/universe armhf mercurial-git all 1.2.0-1 [60.9 kB] 166s Get:8 http://ftpmaster.internal/ubuntu resolute/main armhf unzip armhf 6.0-29ubuntu1 [167 kB] 167s Fetched 9608 kB in 5s (2039 kB/s) 167s Selecting previously unselected package liberror-perl. 167s (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 ... 68678 files and directories currently installed.) 167s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 167s Unpacking liberror-perl (0.17030-1) ... 167s Selecting previously unselected package git-man. 167s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 167s Unpacking git-man (1:2.51.0-1ubuntu1) ... 167s Selecting previously unselected package git. 167s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_armhf.deb ... 167s Unpacking git (1:2.51.0-1ubuntu1) ... 167s Selecting previously unselected package mercurial-common. 167s Preparing to unpack .../3-mercurial-common_7.2-2_all.deb ... 167s Unpacking mercurial-common (7.2-2) ... 168s Selecting previously unselected package mercurial. 168s Preparing to unpack .../4-mercurial_7.2-2_armhf.deb ... 168s Unpacking mercurial (7.2-2) ... 168s Selecting previously unselected package python3-dulwich. 168s Preparing to unpack .../5-python3-dulwich_0.22.7-1_armhf.deb ... 168s Unpacking python3-dulwich (0.22.7-1) ... 168s Selecting previously unselected package mercurial-git. 168s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 168s Unpacking mercurial-git (1.2.0-1) ... 168s Selecting previously unselected package unzip. 168s Preparing to unpack .../7-unzip_6.0-29ubuntu1_armhf.deb ... 168s Unpacking unzip (6.0-29ubuntu1) ... 168s Setting up mercurial-common (7.2-2) ... 171s Setting up unzip (6.0-29ubuntu1) ... 171s Setting up liberror-perl (0.17030-1) ... 171s Setting up python3-dulwich (0.22.7-1) ... 171s Setting up git-man (1:2.51.0-1ubuntu1) ... 171s Setting up mercurial (7.2-2) ... 171s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 172s Setting up mercurial-git (1.2.0-1) ... 172s mercurial-git extension is disabled by default. 172s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 172s Setting up git (1:2.51.0-1ubuntu1) ... 172s Processing triggers for man-db (2.13.1-1build1) ... 181s autopkgtest [06:59:01]: test testsuite: [----------------------- 184s no username found, using 'ubuntu@autopkgtest-lxd-uqzndj.lxd' instead 184s cd tests && /usr/bin/python3 run-tests.py --with-hg=/usr/bin/hg --blacklist=/tmp/autopkgtest.5lVNBh/build.fYl/src/debian/hg-git.test_blacklist 184s running 82 tests using 8 parallel processes 186s sssssss 186s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-git-tags.t 186s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-git-tags.t#draft.err 186s @@ -41,337 +41,13 @@ 186s Clone it: 186s 186s $ hg clone repo.git hgrepo 186s - importing 2 git commits 186s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 186s - updating to bookmark master 186s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 186s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 186s + abort: repository repo.git not found 186s + [255] 186s 186s $ cd hgrepo 186s + $TESTTMP.sh: 39: cd: can't cd to hgrepo 186s 186s Verify that annotated tags are unaffected by reexports: 186s 186s $ GIT_DIR=.hg/git git tag -ln 186s - beta added tag beta 186s - $ hg gexport 186s - $ GIT_DIR=.hg/git git tag -ln 186s - beta added tag beta 186s - 186s -Error checking on tag creation 186s - 186s - $ hg tag --git beta --remove 186s - abort: cannot remove git tags 186s - (the git documentation heavily discourages editing tags) 186s - [255] 186s - $ hg tag --git beta -r null 186s - abort: cannot remove git tags 186s - (the git documentation heavily discourages editing tags) 186s - [255] 186s - $ hg tag --git beta --remove -r 0 186s - abort: cannot specify both --rev and --remove 186s - [10] 186s - $ hg tag --git alpha 186s - abort: git tags require an explicit revision 186s - (please specify -r/--rev) 186s - [255] 186s - $ hg tag --git alpha alpha -r 0 186s - abort: tag names must be unique 186s - [255] 186s - $ hg tag --git alpha -r 0 -e 186s - abort: cannot specify both --git and --edit 186s - [10] 186s - $ hg tag --git alpha -r 0 -m 42 186s - abort: cannot specify both --git and --message 186s - [10] 186s - $ hg tag --git alpha -r 0 -d 42 186s - abort: cannot specify both --git and --date 186s - [10] 186s - $ hg tag --git alpha -r 0 -u user@example.com 186s - abort: cannot specify both --git and --user 186s - [10] 186s - $ hg tag --git 'with space' -r 0 186s - abort: the name 'with space' is not a valid git tag 186s - [255] 186s - $ hg tag --git ' beta' -r 0 186s - abort: the name 'beta' already exists 186s - [255] 186s - $ hg tag --git master -r 0 186s - abort: the name 'master' already exists 186s - [255] 186s - $ hg tag --git tip -r 0 186s - abort: the name 'tip' is reserved 186s - [10] 186s - 186s -Create a git tag from hg 186s - 186s - $ hg tag --git alpha --debug -r 0 186s - finding unexported changesets 186s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 186s - adding git tag alpha 186s - $ hg log --graph 186s - @ changeset: 1:7fe02317c63d 186s - | bookmark: master 186s - | tag: beta 186s - | tag: default/master 186s - | tag: tip 186s - | user: test 186s - | date: Mon Jan 01 00:00:11 2007 +0000 186s - | summary: add beta 186s - | 186s - o changeset: 0:ff7a2f2d8d70 186s - tag: alpha 186s - user: test 186s - date: Mon Jan 01 00:00:10 2007 +0000 186s - summary: add alpha 186s - 186s - $ echo beta-fix >> beta 186s - $ fn_hg_commit -m 'fix for beta' 186s -#if secret 186s - $ hg phase -d 186s -#endif 186s - $ hg push 186s - pushing to $TESTTMP/repo.git 186s - searching for changes 186s - adding objects 186s - remote: found 0 deltas to reuse 186s - added 1 commits with 1 trees and 1 blobs 186s - updating reference refs/heads/master 186s - adding reference refs/tags/alpha 186s - 186s -Verify that amending commits known to remotes doesn't break anything 186s - 186s - $ cat >> $HGRCPATH << EOF 186s - > [experimental] 186s - > evolution = createmarkers 186s - > evolution.createmarkers = yes 186s - > EOF 186s - $ hg tags 186s - tip 2:61175962e488 186s - default/master 2:61175962e488 186s - beta 1:7fe02317c63d 186s - alpha 0:ff7a2f2d8d70 186s - $ echo beta-fix-again >> beta 186s - $ fn_hg_commit --amend 186s - $ hg log -T shorttags 186s - 3:3094b9e8da41 draft tip 186s - 2:61175962e488 draft default/master X 186s - 1:7fe02317c63d draft beta 186s - 0:ff7a2f2d8d70 draft alpha 186s - $ hg tags 186s - tip 3:3094b9e8da41 186s - default/master 2:61175962e488 186s - beta 1:7fe02317c63d 186s - alpha 0:ff7a2f2d8d70 186s - $ hg push 186s - pushing to $TESTTMP/repo.git 186s - searching for changes 186s - abort: pushing refs/heads/master overwrites 3094b9e8da41 186s - [255] 186s - $ hg push -f 186s - pushing to $TESTTMP/repo.git 186s - searching for changes 186s - adding objects 186s - remote: found 0 deltas to reuse 186s - added 1 commits with 1 trees and 1 blobs 186s - updating reference refs/heads/master 186s - 186s -Now create a tag for the old, obsolete master 186s - 186s - $ cd ../repo.git 186s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 186s - $ git tag 186s - alpha 186s - beta 186s - detached 186s - $ cd ../hgrepo 186s - $ hg pull 186s - pulling from $TESTTMP/repo.git 186s - no changes found 186s - $ hg log -T shorttags 186s - 3:3094b9e8da41 draft default/master tip 186s - 2:61175962e488 draft detached X 186s - 1:7fe02317c63d draft beta 186s - 0:ff7a2f2d8d70 draft alpha 186s - $ hg tags 186s - tip 3:3094b9e8da41 186s - default/master 3:3094b9e8da41 186s - detached 2:61175962e488 186s - beta 1:7fe02317c63d 186s - alpha 0:ff7a2f2d8d70 186s - $ hg push 186s - pushing to $TESTTMP/repo.git 186s - searching for changes 186s - no changes found 186s - [1] 186s - 186s - $ cd .. 186s - 186s -Verify that revsets can point out git tags; for that we need an 186s -untagged commit. 186s - 186s - $ cd hgrepo 186s - $ touch gamma 186s - $ fn_hg_commit -A -m 'add gamma' 186s -#if secret 186s - $ hg phase -d 186s -#endif 186s - $ hg log -T shorttags -r 'gittag()' 186s - 0:ff7a2f2d8d70 draft alpha 186s - 1:7fe02317c63d draft beta 186s - 2:61175962e488 draft detached X 186s - $ hg log -T shorttags -r 'gittag(detached)' 186s - 2:61175962e488 draft detached X 186s - $ hg log -T shorttags -r 'gittag("re:a$")' 186s - 0:ff7a2f2d8d70 draft alpha 186s - 1:7fe02317c63d draft beta 186s - 186s -Create a git tag from hg, but pointing to a new commit: 186s - 186s - $ hg tag --git gamma --debug -r tip 186s - invalid branch cache (visible): tip differs (?) 186s - finding unexported changesets 186s - exporting 1 changesets 186s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 186s - packing 3 loose objects... 186s - packed 3 loose objects! 186s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 186s - adding git tag gamma 186s - $ hg push 186s - pushing to $TESTTMP/repo.git 186s - searching for changes 186s - adding objects 186s - remote: found 0 deltas to reuse 186s - added 1 commits with 1 trees and 1 blobs 186s - updating reference refs/heads/master 186s - adding reference refs/tags/gamma 186s - $ cd ../gitrepo 186s - $ git fetch --quiet --tags 186s - $ git tag 186s - alpha 186s - beta 186s - detached 186s - gamma 186s - $ cd .. 186s - 186s -Try to overwrite an annotated tag: 186s - 186s - $ cd hgrepo 186s - $ hg tags -v 186s - tip 4:0eb1ab0073a8 186s - gamma 4:0eb1ab0073a8 git 186s - default/master 4:0eb1ab0073a8 git-remote 186s - detached 2:61175962e488 git 186s - beta 1:7fe02317c63d git 186s - alpha 0:ff7a2f2d8d70 git 186s - $ hg book not-master 186s - $ hg tag beta 186s - abort: tag 'beta' already exists (use -f to force) 186s - [10] 186s - $ hg tag -f beta 186s -#if secret 186s - $ hg phase -d 186s -#endif 186s - $ hg push 186s - pushing to $TESTTMP/repo.git 186s - warning: not overwriting annotated tag 'beta' 186s - searching for changes 186s - adding objects 186s - remote: found 0 deltas to reuse 186s - added 1 commits with 1 trees and 1 blobs 186s - adding reference refs/heads/not-master 186s - $ hg tags 186s - tip 5:c49682c7cba4 186s - default/not-master 5:c49682c7cba4 186s - gamma 4:0eb1ab0073a8 186s - default/master 4:0eb1ab0073a8 186s - beta 4:0eb1ab0073a8 186s - detached 2:61175962e488 186s - alpha 0:ff7a2f2d8d70 186s - $ cd .. 186s - 186s -Check whether `gimport` handles tags 186s - 186s - $ cd hgrepo 186s - $ rm .hg/git-tags .hg/git-mapfile 186s - $ hg gimport 186s - importing 6 git commits 186s - $ hg tags -q 186s - tip 186s - default/not-master 186s - gamma 186s - default/master 186s - beta 186s - detached 186s - alpha 186s - $ cd .. 186s - 186s -Test how pulling an explicit branch with an annotated tag: 186s - 186s - $ hg clone -r master repo.git hgrepo-2 186s - importing 4 git commits 186s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 186s - updating to branch default 186s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 186s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 186s - 0:ff7a2f2d8d70 draft alpha 186s - 1:7fe02317c63d draft beta 186s - 3:0eb1ab0073a8 draft default/master gamma tip 186s - $ hg tags -v -R hgrepo-2 186s - tip 3:0eb1ab0073a8 186s - gamma 3:0eb1ab0073a8 git 186s - default/master 3:0eb1ab0073a8 git-remote 186s - beta 1:7fe02317c63d git 186s - alpha 0:ff7a2f2d8d70 git 186s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 186s - $ rm -rf hgrepo-2 186s - 186s - $ hg clone -r master repo.git hgrepo-2 186s - importing 4 git commits 186s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 186s - updating to branch default 186s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 186s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 186s - 0:ff7a2f2d8d70 draft alpha 186s - 1:7fe02317c63d draft beta 186s - 3:0eb1ab0073a8 draft default/master gamma tip 186s -This used to die: 186s - $ hg -R hgrepo-2 gexport 186s -This used to fail, since we didn't actually pull the annotated tag: 186s - $ hg -R hgrepo-2 push 186s - pushing to $TESTTMP/repo.git 186s - searching for changes 186s - no changes found 186s - [1] 186s - $ rm -rf hgrepo-2 186s - 186s -Check that pulling will update phases only: 186s - 186s - $ cd hgrepo 186s - $ hg phase -fs gamma detached 186s - $ hg pull 186s - pulling from $TESTTMP/repo.git 186s - no changes found 186s - $ hg log -T shorttags -r gamma -r detached 186s - 4:0eb1ab0073a8 draft beta default/master gamma 186s - 2:61175962e488 draft detached X 186s - $ cd .. 186s - 186s -Check that we pull new tags to existing commits: 186s - $ cd gitrepo 186s - $ git tag 186s - alpha 186s - beta 186s - detached 186s - gamma 186s - $ fn_git_tag extra-simple-tag 186s - $ fn_git_tag -m annotated extra-annotated-tag 186s - $ git push --tags 186s - To $TESTTMP/repo.git 186s - * [new tag] extra-annotated-tag -> extra-annotated-tag 186s - * [new tag] extra-simple-tag -> extra-simple-tag 186s - $ cd ../hgrepo 186s - $ hg pull -r master 186s - pulling from $TESTTMP/repo.git 186s - no changes found 186s - $ hg tags -v | grep extra 186s - extra-simple-tag 1:7fe02317c63d git 186s - extra-annotated-tag 1:7fe02317c63d git 186s 186s ERROR: test-git-tags.t#draft output changed 186s ! 186s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-renames.t 186s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-renames.t.err 186s @@ -95,494 +95,9 @@ 186s 186s $ cd .. 186s $ hg clone -q repo.git hgrepo 186s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 186s + abort: repository repo.git not found 186s + [255] 186s $ cd hgrepo 186s + $TESTTMP.sh: 115: cd: can't cd to hgrepo 186s $ hg book master -q 186s - $ hg log -p --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 186s - @ 8 497105ddbe119aa40af691eb2b1a029c29bf5247 remove submodule and rename back 186s - | branch=default hg-git-rename-source=git 186s - | 186s - | diff --git a/.hgsub b/.hgsub 186s - | --- a/.hgsub 186s - | +++ b/.hgsub 186s - | @@ -1,2 +1,1 @@ 186s - | gitsubmodule2 = [git]../gitsubmodule 186s - | -gamma = [git]../gitsubmodule 186s - | diff --git a/.hgsubstate b/.hgsubstate 186s - | --- a/.hgsubstate 186s - | +++ b/.hgsubstate 186s - | @@ -1,2 +1,1 @@ 186s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 186s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 186s - | diff --git a/gamma-new b/gamma 186s - | rename from gamma-new 186s - | rename to gamma 186s - | 186s - o 7 adfc1ce8461d3174dcf8425e112e2fa848de3913 rename and add submodule 186s - | branch=default hg-git-rename-source=git 186s - | 186s - | diff --git a/.hgsub b/.hgsub 186s - | --- a/.hgsub 186s - | +++ b/.hgsub 186s - | @@ -1,1 +1,2 @@ 186s - | gitsubmodule2 = [git]../gitsubmodule 186s - | +gamma = [git]../gitsubmodule 186s - | diff --git a/.hgsubstate b/.hgsubstate 186s - | --- a/.hgsubstate 186s - | +++ b/.hgsubstate 186s - | @@ -1,1 +1,2 @@ 186s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gamma 186s - | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 186s - | diff --git a/gamma b/gamma-new 186s - | rename from gamma 186s - | rename to gamma-new 186s - | 186s - o 6 62c1a4b07240b53a71be1b1a46e94e99132c5391 beta renamed back 186s - | branch=default hg-git-rename-source=git 186s - | 186s - | diff --git a/beta b/beta 186s - | old mode 120000 186s - | new mode 100644 186s - | --- a/beta 186s - | +++ b/beta 186s - | @@ -1,1 +1,12 @@ 186s - | -beta-new 186s - | \ No newline at end of file 186s - | +1 186s - | +2 186s - | +3 186s - | +4 186s - | +5 186s - | +6 186s - | +7 186s - | +8 186s - | +9 186s - | +10 186s - | +11 186s - | +12 186s - | diff --git a/beta-new b/beta-new 186s - | deleted file mode 100644 186s - | --- a/beta-new 186s - | +++ /dev/null 186s - | @@ -1,12 +0,0 @@ 186s - | -1 186s - | -2 186s - | -3 186s - | -4 186s - | -5 186s - | -6 186s - | -7 186s - | -8 186s - | -9 186s - | -10 186s - | -11 186s - | -12 186s - | 186s - o 5 f93fefed957cff2220d3f0d11182398350b5fa9a beta renamed 186s - | branch=default hg-git-rename-source=git 186s - | 186s - | diff --git a/beta b/beta 186s - | old mode 100644 186s - | new mode 120000 186s - | --- a/beta 186s - | +++ b/beta 186s - | @@ -1,12 +1,1 @@ 186s - | -1 186s - | -2 186s - | -3 186s - | -4 186s - | -5 186s - | -6 186s - | -7 186s - | -8 186s - | -9 186s - | -10 186s - | -11 186s - | -12 186s - | +beta-new 186s - | \ No newline at end of file 186s - | diff --git a/beta b/beta-new 186s - | copy from beta 186s - | copy to beta-new 186s - | 186s - o 4 b9e63d96abc2783afc59246e798a6936cf05a35e move submodule 186s - | branch=default hg-git-rename-source=git 186s - | 186s - | diff --git a/.hgsub b/.hgsub 186s - | --- a/.hgsub 186s - | +++ b/.hgsub 186s - | @@ -1,1 +1,1 @@ 186s - | -gitsubmodule = [git]../gitsubmodule 186s - | +gitsubmodule2 = [git]../gitsubmodule 186s - | diff --git a/.hgsubstate b/.hgsubstate 186s - | --- a/.hgsubstate 186s - | +++ b/.hgsubstate 186s - | @@ -1,1 +1,1 @@ 186s - | -5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 186s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 186s - | 186s - o 3 55537ea256c28be1b5637f4f93a601fdde8a9a7f add submodule 186s - | branch=default hg-git-rename-source=git 186s - | 186s - | diff --git a/.hgsub b/.hgsub 186s - | new file mode 100644 186s - | --- /dev/null 186s - | +++ b/.hgsub 186s - | @@ -0,0 +1,1 @@ 186s - | +gitsubmodule = [git]../gitsubmodule 186s - | diff --git a/.hgsubstate b/.hgsubstate 186s - | new file mode 100644 186s - | --- /dev/null 186s - | +++ b/.hgsubstate 186s - | @@ -0,0 +1,1 @@ 186s - | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule 186s - | 186s - o 2 20f9e56b6d006d0403f853245e483d0892b8ac48 gamma 186s - | branch=default hg-git-rename-source=git 186s - | 186s - | diff --git a/beta b/beta 186s - | --- a/beta 186s - | +++ b/beta 186s - | @@ -9,3 +9,4 @@ 186s - | 9 186s - | 10 186s - | 11 186s - | +12 186s - | diff --git a/beta b/gamma 186s - | copy from beta 186s - | copy to gamma 186s - | --- a/beta 186s - | +++ b/gamma 186s - | @@ -9,3 +9,4 @@ 186s - | 9 186s - | 10 186s - | 11 186s - | +13 186s - | 186s - o 1 9f7744e68def81da3b394f11352f602ca9c8ab68 beta 186s - | branch=default hg-git-rename-source=git 186s - | 186s - | diff --git a/alpha b/beta 186s - | rename from alpha 186s - | rename to beta 186s - | --- a/alpha 186s - | +++ b/beta 186s - | @@ -8,3 +8,4 @@ 186s - | 8 186s - | 9 186s - | 10 186s - | +11 186s - | 186s - o 0 7bc844166f76e49562f81eacd54ea954d01a9e42 alpha 186s - branch=default hg-git-rename-source=git 186s - 186s - diff --git a/alpha b/alpha 186s - new file mode 100644 186s - --- /dev/null 186s - +++ b/alpha 186s - @@ -0,0 +1,10 @@ 186s - +1 186s - +2 186s - +3 186s - +4 186s - +5 186s - +6 186s - +7 186s - +8 186s - +9 186s - +10 186s - 186s - 186s -Make a new ordinary commit in Mercurial (no extra metadata) 186s - $ echo 14 >> gamma 186s - $ hg ci -m "gamma2" 186s - 186s -Make a new commit with a copy and a rename in Mercurial 186s - $ hg cp gamma delta 186s - $ echo 15 >> delta 186s - $ hg mv beta epsilon 186s - $ echo 16 >> epsilon 186s - $ hg ci -m "delta/epsilon" 186s - $ hg export . 186s - # HG changeset patch 186s - # User test 186s - # Date 0 0 186s - # Thu Jan 01 00:00:00 1970 +0000 186s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 186s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 186s - delta/epsilon 186s - 186s - diff --git a/gamma b/delta 186s - copy from gamma 186s - copy to delta 186s - --- a/gamma 186s - +++ b/delta 186s - @@ -11,3 +11,4 @@ 186s - 11 186s - 13 186s - 14 186s - +15 186s - diff --git a/beta b/epsilon 186s - rename from beta 186s - rename to epsilon 186s - --- a/beta 186s - +++ b/epsilon 186s - @@ -10,3 +10,4 @@ 186s - 10 186s - 11 186s - 12 186s - +16 186s - $ hg push 186s - pushing to $TESTTMP/repo.git 186s - searching for changes 186s - adding objects 186s - remote: found 0 deltas to reuse 186s - added 2 commits with 2 trees and 3 blobs 186s - updating reference refs/heads/master 186s - 186s - $ cd ../repo.git 186s - $ git log master --pretty=oneline 186s - 5f2948d029693346043f320620af99a615930dc4 delta/epsilon 186s - bbd2ec050f7fbc64f772009844f7d58a556ec036 gamma2 186s - 50d116676a308b7c22935137d944e725d2296f2a remove submodule and rename back 186s - 59fb8e82ea18f79eab99196f588e8948089c134f rename and add submodule 186s - f95497455dfa891b4cd9b524007eb9514c3ab654 beta renamed back 186s - 055f482277da6cd3dd37c7093d06983bad68f782 beta renamed 186s - d7f31298f27df8a9226eddb1e4feb96922c46fa5 move submodule 186s - c610256cb6959852d9e70d01902a06726317affc add submodule 186s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 186s - cc83241f39927232f690d370894960b0d1943a0e beta 186s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 186s - 186s -Make sure the right metadata is stored 186s - $ git cat-file commit master^ 186s - tree 0adbde18545845f3b42ad1a18939ed60a9dec7a8 186s - parent 50d116676a308b7c22935137d944e725d2296f2a 186s - author test 0 +0000 186s - committer test 0 +0000 186s - HG:rename-source hg 186s - 186s - gamma2 186s - $ git cat-file commit master 186s - tree f8f32f4e20b56a5a74582c6a5952c175bf9ec155 186s - parent bbd2ec050f7fbc64f772009844f7d58a556ec036 186s - author test 0 +0000 186s - committer test 0 +0000 186s - HG:rename gamma:delta 186s - HG:rename beta:epsilon 186s - 186s - delta/epsilon 186s - 186s -Now make another clone and compare the hashes 186s - 186s - $ cd .. 186s - $ hg clone -q repo.git hgrepo2 186s - $ cd hgrepo2 186s - $ hg book master -qf 186s - $ hg export master 186s - # HG changeset patch 186s - # User test 186s - # Date 0 0 186s - # Thu Jan 01 00:00:00 1970 +0000 186s - # Node ID ea6414fab78622fd53679e0593eddad96ff4178d 186s - # Parent ee9ec792d5866c313a4cb7a2f8772f2cffa90df4 186s - delta/epsilon 186s - 186s - diff --git a/gamma b/delta 186s - copy from gamma 186s - copy to delta 186s - --- a/gamma 186s - +++ b/delta 186s - @@ -11,3 +11,4 @@ 186s - 11 186s - 13 186s - 14 186s - +15 186s - diff --git a/beta b/epsilon 186s - rename from beta 186s - rename to epsilon 186s - --- a/beta 186s - +++ b/epsilon 186s - @@ -10,3 +10,4 @@ 186s - 10 186s - 11 186s - 12 186s - +16 186s - 186s -Regenerate the Git metadata and compare the hashes 186s - $ hg debug-remove-hggit-state 186s - clearing out the git cache data 186s - $ hg gexport 186s - $ cd .hg/git 186s - $ git log master --pretty=oneline 186s - f3f6592447685566af9447c03ae262aa5432511d delta/epsilon (dulwich-rust !) 186s - c51ce14ec367c5ea72bf428dee3f8576f2fe1bb0 gamma2 (dulwich-rust !) 186s - df749cae534e3c7a0ad664cd0f214dd36e0ac259 remove submodule and rename back (dulwich-rust !) 186s - 8f9ec605ad0cc2532202f73cef8e35d3241797ee rename and add submodule (dulwich-rust !) 186s - 8a00d0fb75377c51c9a46e92ff154c919007f0e2 delta/epsilon (no-dulwich-rust !) 186s - dd7d4f1adb942a8d349dce585019f6949184bc64 gamma2 (no-dulwich-rust !) 186s - 3f1cdaf8b603816fcda02bd29e75198ae4cb13db remove submodule and rename back (no-dulwich-rust !) 186s - 2a4abf1178a999e2054158ceb0c7768079665d03 rename and add submodule (no-dulwich-rust !) 186s - 88c416e8d5e0e9dd1187d45ebafaa46111764196 beta renamed back 186s - 027d2a6e050705bf6f7e226e7e97f02ce5ae3200 beta renamed 186s - dc70e620634887e70ac5dd108bcc7ebd99c60ec3 move submodule 186s - c610256cb6959852d9e70d01902a06726317affc add submodule 186s - e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma 186s - cc83241f39927232f690d370894960b0d1943a0e beta 186s - 938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha 186s - 186s -Test findcopiesharder 186s - 186s - $ cd $TESTTMP 186s - $ git init -q gitcopyharder 186s - $ cd gitcopyharder 186s - $ cat >> file0 << EOF 186s - > 1 186s - > 2 186s - > 3 186s - > 4 186s - > 5 186s - > EOF 186s - $ git add file0 186s - $ fn_git_commit -m file0 186s - $ cp file0 file1 186s - $ git add file1 186s - $ fn_git_commit -m file1 186s - $ cp file0 file2 186s - $ echo 6 >> file2 186s - $ git add file2 186s - $ fn_git_commit -m file2 186s - 186s - $ cd .. 186s - 186s -Clone without findcopiesharder does not find copies from unmodified files 186s - 186s - $ hg clone gitcopyharder hgnocopyharder 186s - importing 3 git commits 186s - new changesets b45d023c6842:ec77ccdbefe0 (3 drafts) 186s - updating to bookmark master 186s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 186s - $ hg -R hgnocopyharder export 1::2 186s - # HG changeset patch 186s - # User test 186s - # Date 1167609621 0 186s - # Mon Jan 01 00:00:21 2007 +0000 186s - # Node ID 555831c93e2a250e5ba42efad45bf7ba71da13e4 186s - # Parent b45d023c6842337ffe694663a44aa672d311081c 186s - file1 186s - 186s - diff --git a/file1 b/file1 186s - new file mode 100644 186s - --- /dev/null 186s - +++ b/file1 186s - @@ -0,0 +1,5 @@ 186s - +1 186s - +2 186s - +3 186s - +4 186s - +5 186s - # HG changeset patch 186s - # User test 186s - # Date 1167609622 0 186s - # Mon Jan 01 00:00:22 2007 +0000 186s - # Node ID ec77ccdbefe023eb9898b0399f84f670c8c0f5fc 186s - # Parent 555831c93e2a250e5ba42efad45bf7ba71da13e4 186s - file2 186s - 186s - diff --git a/file2 b/file2 186s - new file mode 100644 186s - --- /dev/null 186s - +++ b/file2 186s - @@ -0,0 +1,6 @@ 186s - +1 186s - +2 186s - +3 186s - +4 186s - +5 186s - +6 186s - 186s -findcopiesharder finds copies from unmodified files if similarity is met 186s - 186s - $ hg --config git.findcopiesharder=true clone gitcopyharder hgcopyharder0 186s - importing 3 git commits 186s - new changesets b45d023c6842:9b3099834272 (3 drafts) 186s - updating to bookmark master 186s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 186s - $ hg -R hgcopyharder0 export 1::2 186s - # HG changeset patch 186s - # User test 186s - # Date 1167609621 0 186s - # Mon Jan 01 00:00:21 2007 +0000 186s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 186s - # Parent b45d023c6842337ffe694663a44aa672d311081c 186s - file1 186s - 186s - diff --git a/file0 b/file1 186s - copy from file0 186s - copy to file1 186s - # HG changeset patch 186s - # User test 186s - # Date 1167609622 0 186s - # Mon Jan 01 00:00:22 2007 +0000 186s - # Node ID 9b30998342729c7357d418bebed7399986cfe643 186s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 186s - file2 186s - 186s - diff --git a/file0 b/file2 186s - copy from file0 186s - copy to file2 186s - --- a/file0 186s - +++ b/file2 186s - @@ -3,3 +3,4 @@ 186s - 3 186s - 4 186s - 5 186s - +6 186s - 186s - $ hg --config git.findcopiesharder=true --config git.similarity=95 clone gitcopyharder hgcopyharder1 186s - importing 3 git commits 186s - new changesets b45d023c6842:d9d2e8cbf050 (3 drafts) 186s - updating to bookmark master 186s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 186s - $ hg -R hgcopyharder1 export 1::2 186s - # HG changeset patch 186s - # User test 186s - # Date 1167609621 0 186s - # Mon Jan 01 00:00:21 2007 +0000 186s - # Node ID cd05a87103eed9d270fc05b62b00f48e174ab960 186s - # Parent b45d023c6842337ffe694663a44aa672d311081c 186s - file1 186s - 186s - diff --git a/file0 b/file1 186s - copy from file0 186s - copy to file1 186s - # HG changeset patch 186s - # User test 186s - # Date 1167609622 0 186s - # Mon Jan 01 00:00:22 2007 +0000 186s - # Node ID d9d2e8cbf050772be31dccf78851f71dc547d139 186s - # Parent cd05a87103eed9d270fc05b62b00f48e174ab960 186s - file2 186s - 186s - diff --git a/file2 b/file2 186s - new file mode 100644 186s - --- /dev/null 186s - +++ b/file2 186s - @@ -0,0 +1,6 @@ 186s - +1 186s - +2 186s - +3 186s - +4 186s - +5 186s - +6 186s - 186s -Config values out of range 186s - $ hg --config git.similarity=999 clone gitcopyharder hgcopyharder2 186s - importing 3 git commits 186s - abort: git.similarity must be between 0 and 100 186s - [255] 186s -Left-over on Windows with some pack files 186s - $ rm -rf hgcopyharder2 186s - $ hg --config git.renamelimit=-5 clone gitcopyharder hgcopyharder2 186s - importing 3 git commits 186s - abort: git.renamelimit must be non-negative 186s - [255] 186s 186s ERROR: test-renames.t output changed 186s ! 186s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-pull-after-rebase.t 186s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-pull-after-rebase.t.err 186s @@ -38,275 +38,9 @@ 186s Clone it and rebase the branch 186s 186s $ hg clone -U repo.git hgrepo 186s - importing 3 git commits 186s - new changesets ff7a2f2d8d70:205a004356ef (3 drafts) 186s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 186s + abort: repository repo.git not found 186s + [255] 186s $ cd hgrepo 186s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 186s $ hg state 186s - o branch default/branch tip 2:205a004356ef32b8da782afb89d9179d12ca31e9 186s - | add gamma 186s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 186s - |/ add beta 186s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 186s - add alpha 186s - $ hg up branch 186s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 186s - (activating bookmark branch) 186s - $ hg rebase --quiet -d master 186s - $ hg state 186s - @ branch tip 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 186s - | add gamma 186s - | x default/branch 2:205a004356ef32b8da782afb89d9179d12ca31e9 186s - | | add gamma 186s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 186s - |/ add beta 186s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 186s - add alpha 186s - 186s - $ hg push -fr tip 186s - pushing to $TESTTMP/repo.git 186s - searching for changes 186s - adding objects 186s - remote: found 0 deltas to reuse 186s - added 1 commits with 1 trees and 1 blobs 186s - updating reference refs/heads/branch 186s - $ cd .. 186s - 186s -Now switch back to git and create a new commit based on what we just rebased 186s - 186s - $ cd gitrepo 186s - $ git checkout --quiet -b otherbranch branch 186s - $ git log --oneline --graph --all --decorate 186s - * e5023f9 (HEAD -> otherbranch, origin/branch, branch) add gamma 186s - | * 9497a4e (origin/master, master) add beta 186s - |/ 186s - * 7eeab2e add alpha 186s - $ echo delta > delta 186s - $ git add delta 186s - $ fn_git_commit -m 'add delta' 186s - $ git push --quiet --set-upstream origin otherbranch 186s - Branch 'otherbranch' set up to track remote branch 'otherbranch' from 'origin'. (?) 186s - $ git log --oneline --graph --all --decorate 186s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 186s - * e5023f9 (origin/branch, branch) add gamma 186s - | * 9497a4e (origin/master, master) add beta 186s - |/ 186s - * 7eeab2e add alpha 186s - $ cd .. 186s - 186s -Pull that 186s - 186s - $ cd hgrepo 186s - $ hg pull 186s - pulling from $TESTTMP/repo.git 186s - importing 1 git commits 186s - adding bookmark otherbranch 186s - 1 new orphan changesets 186s - new changesets 075302705298 (1 drafts) 186s - (run 'hg heads' to see heads, 'hg merge' to merge) 186s - $ hg state 186s - * otherbranch default/otherbranch tip 4:0753027052980aef9c9c37adb7d76d5719e8d818 186s - | add delta 186s - | @ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 186s - | | add gamma 186s - x | 2:205a004356ef32b8da782afb89d9179d12ca31e9 186s - | | add gamma 186s - | o master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 186s - |/ add beta 186s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 186s - add alpha 186s - 186s - $ cd .. 186s - 186s -To reproduce bug #386, do like github and save the old commit in a 186s -ref, and create a clone containing just the converted git commits: 186s - 186s - $ cd repo.git 186s - $ git update-ref refs/pr/1 otherbranch 186s - $ cd .. 186s - $ hg clone -U repo.git hgrepo-issue386 186s - importing 5 git commits 186s - new changesets ff7a2f2d8d70:075302705298 (5 drafts) 186s - 186s -Now try rebasing that branch, from the Git side of things 186s - 186s - $ cd gitrepo 186s - $ git checkout -q otherbranch 186s - $ git log --oneline --graph --all --decorate 186s - * bba0011 (HEAD -> otherbranch, origin/otherbranch) add delta 186s - * e5023f9 (origin/branch, branch) add gamma 186s - | * 9497a4e (origin/master, master) add beta 186s - |/ 186s - * 7eeab2e add alpha 186s - $ fn_git_rebase --onto master branch otherbranch 186s - $ git log --oneline --graph --all --decorate 186s - * 9c58139 (HEAD -> otherbranch) add delta 186s - * 9497a4e (origin/master, master) add beta 186s - | * bba0011 (origin/otherbranch) add delta 186s - | * e5023f9 (origin/branch, branch) add gamma 186s - |/ 186s - * 7eeab2e add alpha 186s - $ git push -f 186s - To $TESTTMP/repo.git 186s - + bba0011...9c58139 otherbranch -> otherbranch (forced update) 186s - $ git log --oneline --graph --all --decorate 186s - * 9c58139 (HEAD -> otherbranch, origin/otherbranch) add delta 186s - * 9497a4e (origin/master, master) add beta 186s - | * e5023f9 (origin/branch, branch) add gamma 186s - |/ 186s - * 7eeab2e add alpha 186s - $ cd .. 186s - 186s -Now strip the old commit 186s - 186s - $ cd hgrepo-issue386 186s - $ hg up null 186s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 186s - $ hg id -qr otherbranch 186s - 075302705298 186s - $ hg pull 186s - pulling from $TESTTMP/repo.git 186s - importing 1 git commits 186s - not updating diverged bookmark otherbranch 186s - new changesets d64bf0521af6 (1 drafts) 186s - (run 'hg heads .' to see heads, 'hg merge' to merge) 186s - $ hg debugstrip --hidden --no-backup otherbranch 186s - $ hg book -d otherbranch 186s - $ hg git-cleanup 186s - git commit map cleaned 186s - $ hg pull 186s - pulling from $TESTTMP/repo.git 186s - no changes found 186s - adding bookmark otherbranch 186s - $ cd .. 186s - 186s -And check that pulling something else doesn't delete that branch. 186s - 186s - $ cd hgrepo 186s - $ hg pull -r master 186s - pulling from $TESTTMP/repo.git 186s - no changes found 186s - $ cd .. 186s - 186s -A special case, is that we can pull into a repository, where a commit 186s -corresponding to the new branch exists, but that commit is obsolete. 186s -In order to avoid “pinning” the obsolete commit, and thereby making it 186s -visible, we first pull from Git as an unnamed remote. 186s - 186s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 186s - updating to branch default 186s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 186s - $ cd hgrepo-clone 186s - $ hg pull ../repo.git 186s - pulling from ../repo.git 186s - importing 4 git commits 186s - not updating diverged bookmark otherbranch 186s - new changesets d64bf0521af6 (1 drafts) 186s - (run 'hg heads .' to see heads, 'hg merge' to merge) 186s - $ hg debugobsolete d64bf0521af68fe2160791a1b4ab9baf282a3879 186s - 1 new obsolescence markers 186s - obsoleted 1 changesets 186s - $ cp ../hgrepo/.hg/hgrc .hg 186s - $ hg pull 186s - pulling from $TESTTMP/repo.git 186s - no changes found 186s - not updating diverged bookmark otherbranch 186s - $ cd .. 186s - $ rm -rf hgrepo-clone 186s - 186s -Another special case, is that we should update commits over obsolete boundaries: 186s - 186s - $ hg clone --config phases.publish=no hgrepo hgrepo-clone 186s - updating to branch default 186s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 186s - $ cd hgrepo-clone 186s - $ hg pull ../repo.git 186s - pulling from ../repo.git 186s - importing 4 git commits 186s - not updating diverged bookmark otherbranch 186s - new changesets d64bf0521af6 (1 drafts) 186s - (run 'hg heads .' to see heads, 'hg merge' to merge) 186s - $ hg debugobsolete 0753027052980aef9c9c37adb7d76d5719e8d818 d64bf0521af68fe2160791a1b4ab9baf282a3879 186s - 1 new obsolescence markers 186s - obsoleted 1 changesets 186s - $ hg book -r 075302705298 otherbranch 186s - $ cp ../hgrepo/.hg/hgrc .hg 186s - $ hg pull 186s - pulling from $TESTTMP/repo.git 186s - no changes found 186s - updating bookmark otherbranch 186s - $ cd .. 186s - $ rm -rf hgrepo-clone 186s - 186s -Now just pull it: 186s - 186s - $ cd hgrepo 186s - $ hg pull 186s - pulling from $TESTTMP/repo.git 186s - importing 1 git commits 186s - not updating diverged bookmark otherbranch 186s - new changesets d64bf0521af6 (1 drafts) 186s - (run 'hg heads .' to see heads, 'hg merge' to merge) 186s - $ hg state 186s - o default/otherbranch tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 186s - | add delta 186s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 186s - | | add delta 186s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 186s - | | add gamma 186s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 186s - | | add gamma 186s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 186s - |/ add beta 186s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 186s - add alpha 186s - $ cd .. 186s - 186s -And finally, delete it: 186s - 186s - $ cd gitrepo 186s - $ git push origin :otherbranch 186s - To $TESTTMP/repo.git 186s - - [deleted] otherbranch 186s - $ cd .. 186s - 186s -And pull that: 186s - 186s - $ cd hgrepo 186s - $ hg pull 186s - pulling from $TESTTMP/repo.git 186s - no changes found 186s - not deleting diverged bookmark otherbranch 186s - $ hg state 186s - o tip 5:d64bf0521af68fe2160791a1b4ab9baf282a3879 186s - | add delta 186s - | * otherbranch 4:0753027052980aef9c9c37adb7d76d5719e8d818 186s - | | add delta 186s - +---@ branch default/branch 3:52def9937d74e43b83dfded6ce0e5adf731b9d22 186s - | | add gamma 186s - | x 2:205a004356ef32b8da782afb89d9179d12ca31e9 186s - | | add gamma 186s - o | master default/master 1:7fe02317c63d9ee324d4b5df7c9296085162da1b 186s - |/ add beta 186s - o 0:ff7a2f2d8d7099694ae1e8b03838d40575bebb63 186s - add alpha 186s - $ cd .. 186s - 186s -We only get that message once: 186s - 186s - $ hg -R hgrepo pull 186s - pulling from $TESTTMP/repo.git 186s - no changes found 186s - 186s -Now try deleting one already gone locally, which shouldn't output 186s -anything: 186s - 186s - $ cd gitrepo 186s - $ git push origin :branch 186s - To $TESTTMP/repo.git 186s - - [deleted] branch 186s - $ cd ../hgrepo 186s - $ hg book -d branch 186s - $ hg pull 186s - pulling from $TESTTMP/repo.git 186s - no changes found 186s - $ cd .. 186s 186s ERROR: test-pull-after-rebase.t output changed 186s ! 186s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-git-tags.t 186s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-git-tags.t#secret.err 186s @@ -41,337 +41,13 @@ 186s Clone it: 186s 186s $ hg clone repo.git hgrepo 186s - importing 2 git commits 186s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 186s - updating to bookmark master 186s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 186s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 186s + abort: repository repo.git not found 186s + [255] 186s 186s $ cd hgrepo 186s + $TESTTMP.sh: 44: cd: can't cd to hgrepo 186s 186s Verify that annotated tags are unaffected by reexports: 186s 186s $ GIT_DIR=.hg/git git tag -ln 186s - beta added tag beta 186s - $ hg gexport 186s - $ GIT_DIR=.hg/git git tag -ln 186s - beta added tag beta 186s - 186s -Error checking on tag creation 186s - 186s - $ hg tag --git beta --remove 186s - abort: cannot remove git tags 186s - (the git documentation heavily discourages editing tags) 186s - [255] 186s - $ hg tag --git beta -r null 186s - abort: cannot remove git tags 186s - (the git documentation heavily discourages editing tags) 186s - [255] 186s - $ hg tag --git beta --remove -r 0 186s - abort: cannot specify both --rev and --remove 186s - [10] 186s - $ hg tag --git alpha 186s - abort: git tags require an explicit revision 186s - (please specify -r/--rev) 186s - [255] 186s - $ hg tag --git alpha alpha -r 0 186s - abort: tag names must be unique 186s - [255] 186s - $ hg tag --git alpha -r 0 -e 186s - abort: cannot specify both --git and --edit 186s - [10] 186s - $ hg tag --git alpha -r 0 -m 42 186s - abort: cannot specify both --git and --message 186s - [10] 186s - $ hg tag --git alpha -r 0 -d 42 186s - abort: cannot specify both --git and --date 186s - [10] 186s - $ hg tag --git alpha -r 0 -u user@example.com 186s - abort: cannot specify both --git and --user 186s - [10] 186s - $ hg tag --git 'with space' -r 0 186s - abort: the name 'with space' is not a valid git tag 186s - [255] 186s - $ hg tag --git ' beta' -r 0 186s - abort: the name 'beta' already exists 186s - [255] 186s - $ hg tag --git master -r 0 186s - abort: the name 'master' already exists 186s - [255] 186s - $ hg tag --git tip -r 0 186s - abort: the name 'tip' is reserved 186s - [10] 186s - 186s -Create a git tag from hg 186s - 186s - $ hg tag --git alpha --debug -r 0 186s - finding unexported changesets 186s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 186s - adding git tag alpha 186s - $ hg log --graph 186s - @ changeset: 1:7fe02317c63d 186s - | bookmark: master 186s - | tag: beta 186s - | tag: default/master 186s - | tag: tip 186s - | user: test 186s - | date: Mon Jan 01 00:00:11 2007 +0000 186s - | summary: add beta 186s - | 186s - o changeset: 0:ff7a2f2d8d70 186s - tag: alpha 186s - user: test 186s - date: Mon Jan 01 00:00:10 2007 +0000 186s - summary: add alpha 186s - 186s - $ echo beta-fix >> beta 186s - $ fn_hg_commit -m 'fix for beta' 186s -#if secret 186s - $ hg phase -d 186s -#endif 186s - $ hg push 186s - pushing to $TESTTMP/repo.git 186s - searching for changes 186s - adding objects 186s - remote: found 0 deltas to reuse 186s - added 1 commits with 1 trees and 1 blobs 186s - updating reference refs/heads/master 186s - adding reference refs/tags/alpha 186s - 186s -Verify that amending commits known to remotes doesn't break anything 186s - 186s - $ cat >> $HGRCPATH << EOF 186s - > [experimental] 186s - > evolution = createmarkers 186s - > evolution.createmarkers = yes 186s - > EOF 186s - $ hg tags 186s - tip 2:61175962e488 186s - default/master 2:61175962e488 186s - beta 1:7fe02317c63d 186s - alpha 0:ff7a2f2d8d70 186s - $ echo beta-fix-again >> beta 186s - $ fn_hg_commit --amend 186s - $ hg log -T shorttags 186s - 3:3094b9e8da41 draft tip 186s - 2:61175962e488 draft default/master X 186s - 1:7fe02317c63d draft beta 186s - 0:ff7a2f2d8d70 draft alpha 186s - $ hg tags 186s - tip 3:3094b9e8da41 186s - default/master 2:61175962e488 186s - beta 1:7fe02317c63d 186s - alpha 0:ff7a2f2d8d70 186s - $ hg push 186s - pushing to $TESTTMP/repo.git 186s - searching for changes 186s - abort: pushing refs/heads/master overwrites 3094b9e8da41 186s - [255] 186s - $ hg push -f 186s - pushing to $TESTTMP/repo.git 186s - searching for changes 186s - adding objects 186s - remote: found 0 deltas to reuse 186s - added 1 commits with 1 trees and 1 blobs 186s - updating reference refs/heads/master 186s - 186s -Now create a tag for the old, obsolete master 186s - 186s - $ cd ../repo.git 186s - $ git tag detached $(hg log -R ../hgrepo --hidden -r 2 -T '{gitnode}\n') 186s - $ git tag 186s - alpha 186s - beta 186s - detached 186s - $ cd ../hgrepo 186s - $ hg pull 186s - pulling from $TESTTMP/repo.git 186s - no changes found 186s - $ hg log -T shorttags 186s - 3:3094b9e8da41 draft default/master tip 186s - 2:61175962e488 draft detached X 186s - 1:7fe02317c63d draft beta 186s - 0:ff7a2f2d8d70 draft alpha 186s - $ hg tags 186s - tip 3:3094b9e8da41 186s - default/master 3:3094b9e8da41 186s - detached 2:61175962e488 186s - beta 1:7fe02317c63d 186s - alpha 0:ff7a2f2d8d70 186s - $ hg push 186s - pushing to $TESTTMP/repo.git 186s - searching for changes 186s - no changes found 186s - [1] 186s - 186s - $ cd .. 186s - 186s -Verify that revsets can point out git tags; for that we need an 186s -untagged commit. 186s - 186s - $ cd hgrepo 186s - $ touch gamma 186s - $ fn_hg_commit -A -m 'add gamma' 186s -#if secret 186s - $ hg phase -d 186s -#endif 186s - $ hg log -T shorttags -r 'gittag()' 186s - 0:ff7a2f2d8d70 draft alpha 186s - 1:7fe02317c63d draft beta 186s - 2:61175962e488 draft detached X 186s - $ hg log -T shorttags -r 'gittag(detached)' 186s - 2:61175962e488 draft detached X 186s - $ hg log -T shorttags -r 'gittag("re:a$")' 186s - 0:ff7a2f2d8d70 draft alpha 186s - 1:7fe02317c63d draft beta 186s - 186s -Create a git tag from hg, but pointing to a new commit: 186s - 186s - $ hg tag --git gamma --debug -r tip 186s - invalid branch cache (visible): tip differs (?) 186s - finding unexported changesets 186s - exporting 1 changesets 186s - converting revision 0eb1ab0073a885a498d4ae3dc5cf0c26e750fa3d 186s - packing 3 loose objects... 186s - packed 3 loose objects! 186s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 186s - adding git tag gamma 186s - $ hg push 186s - pushing to $TESTTMP/repo.git 186s - searching for changes 186s - adding objects 186s - remote: found 0 deltas to reuse 186s - added 1 commits with 1 trees and 1 blobs 186s - updating reference refs/heads/master 186s - adding reference refs/tags/gamma 186s - $ cd ../gitrepo 186s - $ git fetch --quiet --tags 186s - $ git tag 186s - alpha 186s - beta 186s - detached 186s - gamma 186s - $ cd .. 186s - 186s -Try to overwrite an annotated tag: 186s - 186s - $ cd hgrepo 186s - $ hg tags -v 186s - tip 4:0eb1ab0073a8 186s - gamma 4:0eb1ab0073a8 git 186s - default/master 4:0eb1ab0073a8 git-remote 186s - detached 2:61175962e488 git 186s - beta 1:7fe02317c63d git 186s - alpha 0:ff7a2f2d8d70 git 186s - $ hg book not-master 186s - $ hg tag beta 186s - abort: tag 'beta' already exists (use -f to force) 186s - [10] 186s - $ hg tag -f beta 186s -#if secret 186s - $ hg phase -d 186s -#endif 186s - $ hg push 186s - pushing to $TESTTMP/repo.git 186s - warning: not overwriting annotated tag 'beta' 186s - searching for changes 186s - adding objects 186s - remote: found 0 deltas to reuse 186s - added 1 commits with 1 trees and 1 blobs 186s - adding reference refs/heads/not-master 186s - $ hg tags 186s - tip 5:c49682c7cba4 186s - default/not-master 5:c49682c7cba4 186s - gamma 4:0eb1ab0073a8 186s - default/master 4:0eb1ab0073a8 186s - beta 4:0eb1ab0073a8 186s - detached 2:61175962e488 186s - alpha 0:ff7a2f2d8d70 186s - $ cd .. 186s - 186s -Check whether `gimport` handles tags 186s - 186s - $ cd hgrepo 186s - $ rm .hg/git-tags .hg/git-mapfile 186s - $ hg gimport 186s - importing 6 git commits 186s - $ hg tags -q 186s - tip 186s - default/not-master 186s - gamma 186s - default/master 186s - beta 186s - detached 186s - alpha 186s - $ cd .. 186s - 186s -Test how pulling an explicit branch with an annotated tag: 186s - 186s - $ hg clone -r master repo.git hgrepo-2 186s - importing 4 git commits 186s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 186s - updating to branch default 186s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 186s - $ hg log -r 'ancestors(master) and tagged()' -T shorttags -R hgrepo-2 186s - 0:ff7a2f2d8d70 draft alpha 186s - 1:7fe02317c63d draft beta 186s - 3:0eb1ab0073a8 draft default/master gamma tip 186s - $ hg tags -v -R hgrepo-2 186s - tip 3:0eb1ab0073a8 186s - gamma 3:0eb1ab0073a8 git 186s - default/master 3:0eb1ab0073a8 git-remote 186s - beta 1:7fe02317c63d git 186s - alpha 0:ff7a2f2d8d70 git 186s - $ GIT_DIR=hgrepo-2/.hg/git git fetch --quiet repo.git 186s - $ rm -rf hgrepo-2 186s - 186s - $ hg clone -r master repo.git hgrepo-2 186s - importing 4 git commits 186s - new changesets ff7a2f2d8d70:0eb1ab0073a8 (4 drafts) 186s - updating to branch default 186s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 186s - $ hg log -r 'tagged()' -T shorttags -R hgrepo-2 186s - 0:ff7a2f2d8d70 draft alpha 186s - 1:7fe02317c63d draft beta 186s - 3:0eb1ab0073a8 draft default/master gamma tip 186s -This used to die: 186s - $ hg -R hgrepo-2 gexport 186s -This used to fail, since we didn't actually pull the annotated tag: 186s - $ hg -R hgrepo-2 push 186s - pushing to $TESTTMP/repo.git 186s - searching for changes 186s - no changes found 186s - [1] 186s - $ rm -rf hgrepo-2 186s - 186s -Check that pulling will update phases only: 186s - 186s - $ cd hgrepo 186s - $ hg phase -fs gamma detached 186s - $ hg pull 186s - pulling from $TESTTMP/repo.git 186s - no changes found 186s - $ hg log -T shorttags -r gamma -r detached 186s - 4:0eb1ab0073a8 draft beta default/master gamma 186s - 2:61175962e488 draft detached X 186s - $ cd .. 186s - 186s -Check that we pull new tags to existing commits: 186s - $ cd gitrepo 186s - $ git tag 186s - alpha 186s - beta 186s - detached 186s - gamma 186s - $ fn_git_tag extra-simple-tag 186s - $ fn_git_tag -m annotated extra-annotated-tag 186s - $ git push --tags 186s - To $TESTTMP/repo.git 186s - * [new tag] extra-annotated-tag -> extra-annotated-tag 186s - * [new tag] extra-simple-tag -> extra-simple-tag 186s - $ cd ../hgrepo 186s - $ hg pull -r master 186s - pulling from $TESTTMP/repo.git 186s - no changes found 186s - $ hg tags -v | grep extra 186s - extra-simple-tag 1:7fe02317c63d git 186s - extra-annotated-tag 1:7fe02317c63d git 186s 186s ERROR: test-git-tags.t#secret output changed 186s ! 186s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-git-submodules.t 186s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-git-submodules.t.err 186s @@ -188,261 +188,9 @@ 186s $ cd .. 186s 186s $ hg clone gitrepo2 hgrepo 186s - importing 10 git commits 186s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 186s - updating to bookmark master 186s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 186s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 186s + abort: repository gitrepo2 not found 186s + [255] 186s $ cd hgrepo 186s + $TESTTMP.sh: 133: cd: can't cd to hgrepo 186s $ hg log --graph 186s - @ changeset: 9:0ad944b2c4d8 186s - | bookmark: master 186s - | tag: default/master 186s - | tag: tip 186s - | user: test 186s - | date: Mon Jan 01 00:00:12 2007 +0000 186s - | summary: remove all subrepos 186s - | 186s - o changeset: 8:33da452ef22f 186s - | user: test 186s - | date: Mon Jan 01 00:00:12 2007 +0000 186s - | summary: replace subrepo with symlink 186s - | 186s - o changeset: 7:acebec53c0fc 186s - | user: test 186s - | date: Mon Jan 01 00:00:12 2007 +0000 186s - | summary: replace symlink with subrepo 186s - | 186s - o changeset: 6:78c2ea52db4b 186s - | user: test 186s - | date: Mon Jan 01 00:00:12 2007 +0000 186s - | summary: add symlink 186s - | 186s - o changeset: 5:c0d52ffc59b8 186s - | user: test 186s - | date: Mon Jan 01 00:00:12 2007 +0000 186s - | summary: replace file with subrepo 186s - | 186s - o changeset: 4:73e078a178a0 186s - | user: test 186s - | date: Mon Jan 01 00:00:12 2007 +0000 186s - | summary: replace subrepo with file 186s - | 186s - o changeset: 3:29e236ba4c06 186s - | user: test 186s - | date: Mon Jan 01 00:00:12 2007 +0000 186s - | summary: add another subrepo 186s - | 186s - o changeset: 2:a6075a162f62 186s - | user: test 186s - | date: Mon Jan 01 00:00:12 2007 +0000 186s - | summary: change subrepo commit 186s - | 186s - o changeset: 1:a4036e758995 186s - | user: test 186s - | date: Mon Jan 01 00:00:11 2007 +0000 186s - | summary: add subrepo 186s - | 186s - o changeset: 0:ff7a2f2d8d70 186s - user: test 186s - date: Mon Jan 01 00:00:10 2007 +0000 186s - summary: add alpha 186s - 186s - $ hg book 186s - * master 9:0ad944b2c4d8 186s - 186s -(add subrepo) 186s - $ hg cat -r 1 .hgsubstate 186s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo 186s - $ hg cat -r 1 .hgsub 186s - subrepo = [git]../gitsubrepo 186s - $ hg gverify -r 1 186s - verifying rev a4036e758995 against git commit e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 186s - 186s -(change subrepo commit) 186s - $ hg cat -r 2 .hgsubstate 186s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 186s - $ hg cat -r 2 .hgsub 186s - subrepo = [git]../gitsubrepo 186s - $ hg gverify -r 2 186s - verifying rev a6075a162f62 against git commit a000567ceefbd9a2ce364e0dea6e298010b02b6d 186s - 186s -(add another subrepo) 186s - $ hg cat -r 3 .hgsubstate 186s - aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo 186s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 186s - $ hg cat -r 3 .hgsub 186s - subrepo = [git]../gitsubrepo 186s - subrepo2 = [git]../gitsubrepo 186s - $ hg gverify -r 3 186s - verifying rev 29e236ba4c06 against git commit 6e219527869fa40eb6ffbdd013cd86d576b26b01 186s - 186s -(replace subrepo with file) 186s - $ hg cat -r 4 .hgsubstate 186s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 186s - $ hg cat -r 4 .hgsub 186s - subrepo2 = [git]../gitsubrepo 186s - $ hg manifest -r 4 186s - .hgsub 186s - .hgsubstate 186s - alpha 186s - subrepo 186s - $ hg gverify -r 4 186s - verifying rev 73e078a178a0 against git commit f6436a472da00f581d8d257e9bbaf3c358a5e88c 186s - 186s -(replace file with subrepo) 186s - $ hg cat -r 5 .hgsubstate 186s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 186s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 186s - $ hg cat -r 5 .hgsub 186s - subrepo2 = [git]../gitsubrepo 186s - alpha = [git]../gitsubrepo 186s - $ hg manifest -r 5 186s - .hgsub 186s - .hgsubstate 186s - subrepo 186s - $ hg gverify -r 5 186s - verifying rev c0d52ffc59b8 against git commit 88171163bf4795b5570924e51d5f8ede33f8bc28 186s - 186s -(replace symlink with subrepo) 186s - $ hg cat -r 7 .hgsub 186s - subrepo2 = [git]../gitsubrepo 186s - alpha = [git]../gitsubrepo 186s - foolink = [git]../gitsubrepo 186s - $ hg cat -r 7 .hgsubstate 186s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 186s - 6e4ad8da50204560c00fa25e4987eb2e239029ba foolink 186s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 186s - $ hg gverify -r 7 186s - verifying rev acebec53c0fc against git commit e3288fa737d429a60637b3b6782cb25b8298bc00 186s - 186s -(replace subrepo with symlink) 186s - $ hg cat -r 8 .hgsub .hgsubstate 186s - subrepo2 = [git]../gitsubrepo 186s - alpha = [git]../gitsubrepo 186s - 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha 186s - 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2 186s - 186s - $ hg gverify -r 8 186s - verifying rev 33da452ef22f against git commit d28364013fe1a0fde56c0e1921e49ecdeee8571d 186s - 186s -(remove all subrepos) 186s - $ hg cat -r 9 .hgsub .hgsubstate 186s - .hgsub: no such file in rev 0ad944b2c4d8 186s - .hgsubstate: no such file in rev 0ad944b2c4d8 186s - [1] 186s - $ hg gverify -r 9 186s - verifying rev 0ad944b2c4d8 against git commit 15ba94929481c654814178aac1dbca06ae688718 186s - 186s - $ hg debug-remove-hggit-state 186s - clearing out the git cache data 186s - $ hg gexport 186s - $ cd .hg/git 186s - $ git log --pretty=oneline 186s - 73c15b74fb81fa0cc60e9c59c73787a9f26c778b remove all subrepos 186s - d28364013fe1a0fde56c0e1921e49ecdeee8571d replace subrepo with symlink 186s - e3288fa737d429a60637b3b6782cb25b8298bc00 replace symlink with subrepo 186s - 2d1c135447d11df4dfe96dd5d4f37926dc5c821d add symlink 186s - 88171163bf4795b5570924e51d5f8ede33f8bc28 replace file with subrepo 186s - f6436a472da00f581d8d257e9bbaf3c358a5e88c replace subrepo with file 186s - 6e219527869fa40eb6ffbdd013cd86d576b26b01 add another subrepo 186s - a000567ceefbd9a2ce364e0dea6e298010b02b6d change subrepo commit 186s - e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 add subrepo 186s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 add alpha 186s - 186s -test with rename detection enabled -- simply checking that the Mercurial hashes 186s -are the same is enough 186s - $ cd ../../.. 186s - $ hg --config git.similarity=100 clone gitrepo2 hgreporenames 186s - importing 10 git commits 186s - new changesets ff7a2f2d8d70:0ad944b2c4d8 (10 drafts) 186s - updating to bookmark master 186s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 186s - $ cd hgreporenames 186s - $ hg log --graph 186s - @ changeset: 9:0ad944b2c4d8 186s - | bookmark: master 186s - | tag: default/master 186s - | tag: tip 186s - | user: test 186s - | date: Mon Jan 01 00:00:12 2007 +0000 186s - | summary: remove all subrepos 186s - | 186s - o changeset: 8:33da452ef22f 186s - | user: test 186s - | date: Mon Jan 01 00:00:12 2007 +0000 186s - | summary: replace subrepo with symlink 186s - | 186s - o changeset: 7:acebec53c0fc 186s - | user: test 186s - | date: Mon Jan 01 00:00:12 2007 +0000 186s - | summary: replace symlink with subrepo 186s - | 186s - o changeset: 6:78c2ea52db4b 186s - | user: test 186s - | date: Mon Jan 01 00:00:12 2007 +0000 186s - | summary: add symlink 186s - | 186s - o changeset: 5:c0d52ffc59b8 186s - | user: test 186s - | date: Mon Jan 01 00:00:12 2007 +0000 186s - | summary: replace file with subrepo 186s - | 186s - o changeset: 4:73e078a178a0 186s - | user: test 186s - | date: Mon Jan 01 00:00:12 2007 +0000 186s - | summary: replace subrepo with file 186s - | 186s - o changeset: 3:29e236ba4c06 186s - | user: test 186s - | date: Mon Jan 01 00:00:12 2007 +0000 186s - | summary: add another subrepo 186s - | 186s - o changeset: 2:a6075a162f62 186s - | user: test 186s - | date: Mon Jan 01 00:00:12 2007 +0000 186s - | summary: change subrepo commit 186s - | 186s - o changeset: 1:a4036e758995 186s - | user: test 186s - | date: Mon Jan 01 00:00:11 2007 +0000 186s - | summary: add subrepo 186s - | 186s - o changeset: 0:ff7a2f2d8d70 186s - user: test 186s - date: Mon Jan 01 00:00:10 2007 +0000 186s - summary: add alpha 186s - 186s - $ cd .. 186s - 186s -test handling of an invalid .gitmodules file (#380) 186s - 186s - $ git init --quiet gitrepo-issue380 186s - $ cd gitrepo-issue380 186s - $ git submodule add ../gitsubrepo 186s - Cloning into '$TESTTMP/gitrepo-issue380/gitsubrepo'... 186s - done. 186s - $ fn_git_commit -m 'add a submodule' 186s - $ cat >> .gitmodules < <<<<<<< HEAD 186s - > EOF 186s - $ fn_git_commit -a -m 'b0rken .gitmodules' 186s - $ git status 186s - fatal: bad config line 4 in file $TESTTMP/gitrepo-issue380/.gitmodules 186s - [128] 186s - $ sed -i.orig /HEAD/d .gitmodules 186s - $ fn_git_commit -a -m 'fix .gitmodules' 186s - $ git status 186s - On branch master 186s - Untracked files: 186s - (use "git add ..." to include in what will be committed) 186s - .gitmodules.orig 186s - 186s - nothing added to commit but untracked files present (use "git add" to track) 186s - $ cd .. 186s - $ git clone gitrepo-issue380 gitrepo-issue380~ 186s - Cloning into 'gitrepo-issue380~'... 186s - done. 186s - $ hg clone -U gitrepo-issue380 hgrepo-issue380 186s - importing 3 git commits 186s - warning: failed to parse .gitmodules in 2e4ec4293822 186s - new changesets ed60e5fbc192:9dfc0cdf1787 (3 drafts) 186s 186s ERROR: test-git-submodules.t output changed 187s ! 187s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-help.t 187s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-help.t.err 187s @@ -5,250 +5,14 @@ 187s 187s $ hg help | grep 'git' | sed 's/ */ /g' 187s git-cleanup clean up Git commit map after history editing (?) 187s - git-verify verify that a Mercurial rev matches the corresponding Git rev 187s - hggit push and pull from a Git server 187s - hggit-config Configuring hg-git 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s 187s $ hg help hggit-config 187s - Configuring hg-git 187s - """""""""""""""""" 187s - 187s - "git" 187s - ----- 187s - 187s - Control how the Hg-Git extension interacts with Git. 187s - 187s - "authors" 187s - Git uses a strict convention for "author names" when representing 187s - changesets, using the form "[realname] [email address]". Mercurial 187s - encourages this convention as well but is not as strict, so it's not 187s - uncommon for a Mercurial repository to have authors listed as, for 187s - example, simple usernames. hg-git by default will attempt to translate 187s - Mercurial usernames using the following rules: 187s - 187s - - If the Mercurial username fits the pattern "NAME ", the Git 187s - name will be set to NAME and the email to EMAIL. 187s - - If the Mercurial username looks like an email (if it contains an 187s - "@"), the Git name and email will both be set to that email. 187s - - If the Mercurial username consists of only a name, the email will be 187s - set to "none@none". 187s - - Illegal characters (stray "<"\ s or ">"\ s) will be stripped out, and 187s - for "NAME " usernames, any content after the right-bracket (for 187s - example, a second ">") will be turned into a url-encoded sigil like 187s - "ext:(%3E)" in the Git author name. 187s - 187s - Since these default behaviors may not be what you want ("none@none", for 187s - example, shows up unpleasantly on GitHub as "illegal email address"), 187s - the "git.authors" option provides for an "authors translation file" that 187s - will be used during outgoing transfers from Mercurial to Git only, by 187s - modifying "hgrc" as such: 187s - 187s - [git] 187s - authors = authors.txt 187s - 187s - Where "authors.txt" is the name of a text file containing author name 187s - translations, one per each line, using the following format: 187s - 187s - johnny = John Smith 187s - dougie = Doug Johnson 187s - 187s - Empty lines and lines starting with a "#" are ignored. 187s - 187s - It should be noted that this translation is in *the Mercurial to Git 187s - direction only*. Changesets coming from Git back to Mercurial will not 187s - translate back into Mercurial usernames, so it's best that the same 187s - username/email combination be used on both the Mercurial and Git sides; 187s - the author file is mostly useful for translating legacy changesets. 187s - 187s - "branch_bookmark_suffix" 187s - Hg-Git does not convert between Mercurial named branches and git 187s - branches as the two are conceptually different; instead, it uses 187s - Mercurial bookmarks to represent the concept of a Git branch. Therefore, 187s - when translating a Mercurial repository over to Git, you typically need 187s - to create bookmarks to mirror all the named branches that you'd like to 187s - see transferred over to Git. The major caveat with this is that you 187s - can't use the same name for your bookmark as that of the named branch, 187s - and furthermore there's no feasible way to rename a branch in Mercurial. 187s - For the use case where one would like to transfer a Mercurial repository 187s - over to Git, and maintain the same named branches as are present on the 187s - hg side, the "branch_bookmark_suffix" might be all that's needed. This 187s - presents a string "suffix" that will be recognized on each bookmark 187s - name, and stripped off as the bookmark is translated to a Git branch: 187s - 187s - [git] 187s - branch_bookmark_suffix=_bookmark 187s - 187s - Above, if a Mercurial repository had a named branch called 187s - "release_6_maintenance", you could then link it to a bookmark called 187s - "release_6_maintenance_bookmark". hg-git will then strip off the 187s - "_bookmark" suffix from this bookmark name, and create a Git branch 187s - called "release_6_maintenance". When pulling back from Git to hg, the 187s - "_bookmark" suffix is then applied back, if and only if a Mercurial 187s - named branch of that name exists. E.g., when changes to the 187s - "release_6_maintenance" branch are checked into Git, these will be 187s - placed into the "release_6_maintenance_bookmark" bookmark on hg. But if 187s - a new branch called "release_7_maintenance" were pulled over to hg, and 187s - there was not a "release_7_maintenance" named branch already, the 187s - bookmark will be named "release_7_maintenance" with no usage of the 187s - suffix. 187s - 187s - The "branch_bookmark_suffix" option is, like the "authors" option, 187s - intended for migrating legacy hg named branches. Going forward, a 187s - Mercurial repository that is to be linked with a Git repository should 187s - only use bookmarks for named branching. 187s - 187s - "findcopiesharder" 187s - Whether to consider unmodified files as copy sources. This is a very 187s - expensive operation for large projects, so use it with caution. Similar 187s - to "git diff"'s --find-copies-harder option. 187s - 187s - "intree" 187s - Hg-Git keeps a Git repository clone for reading and updating. By 187s - default, the Git clone is the subdirectory "git" in your local Mercurial 187s - repository. If you would like this Git clone to be at the same level of 187s - your Mercurial repository instead (named ".git"), add the following to 187s - your "hgrc": 187s - 187s - [git] 187s - intree = True 187s - 187s - Please note that changing this setting in an existing repository doesn't 187s - move the local Git repository. You will either have to do so yourself, 187s - or issue an 'hg pull' after the fact to repopulate the new location. 187s - 187s - "mindate" 187s - If set, branches where the latest commit's commit time is older than 187s - this will not be imported. Accepts any date formats that Mercurial does 187s - -- see 'hg help dates' for more. 187s - 187s - "public" 187s - A list of Git branches that should be considered "published", and 187s - therefore converted to Mercurial in the 'public' phase. This is only 187s - used if "hggit.usephases" is set. 187s - 187s - "pull-prune-remote-branches" 187s - Before fetching, remove any remote-tracking references, or pseudo-tags, 187s - that no longer exist on the remote. This is equivalent to the "--prune" 187s - option to "git fetch", and means that pseudo-tags for remotes -- such as 187s - "default/master" -- always actually reflect what's on the remote. 187s - 187s - This option is enabled by default. 187s - 187s - "pull-prune-bookmarks" 187s - On pull, delete any unchanged bookmarks removed on the remote. In other 187s - words, if e.g. the "thebranch" bookmark remains at "default/thebranch", 187s - and the branch is deleted in Git, pulling deletes the bookmark. 187s - 187s - This option is enabled by default. 187s - 187s - "renamelimit" 187s - The number of files to consider when performing the copy/rename 187s - detection. Detection is disabled if the number of files modified in a 187s - commit is above the limit. Detection is O(N^2) in the number of files 187s - modified, so be sure not to set the limit too high. Similar to Git's 187s - "diff.renameLimit" config. The default is "400", the same as Git. 187s - 187s - "similarity" 187s - Specify how similar files modified in a Git commit must be to be 187s - imported as Mercurial renames or copies, as a percentage between "0" 187s - (disabled) and "100" (files must be identical). For example, "90" means 187s - that a delete/add pair will be imported as a rename if more than 90% of 187s - the file has stayed the same. The default is "0" (disabled). 187s - 187s - "blame.ignoreRevsFile" 187s - Specify a file that lists Git commits to ignore when invoking 'hg 187s - annotate'. 187s - 187s - "hggit" 187s - ------- 187s - 187s - Control behavior of the Hg-Git extension. 187s - 187s - "mapsavefrequency" 187s - By default, hg-git only saves the results of a conversion at the end. 187s - Use this option to enable resuming long-running pulls and pushes. Set 187s - this to a number greater than 0 to allow resuming after converting that 187s - many commits. This can help when the conversion encounters an error 187s - partway through a large batch of changes. Otherwise, an error or 187s - interruption will roll back the transaction, similar to regular 187s - Mercurial. 187s - 187s - Defaults to 1000. 187s - 187s - Please note that this is disregarded for an initial clone, as any error 187s - or interruption will delete the destination. So instead of cloning a 187s - large Git repository, you might want to pull instead: 187s - 187s - $ hg init linux 187s - $ cd linux 187s - $ echo "[paths]\ndefault = https://github.com/torvalds/linux" > .hg/hgrc 187s - $ hg pull 187s - 187s - ...and be extremely patient. Please note that converting very large 187s - repositories may take *days* rather than mere *hours*, and may run into 187s - issues with available memory for very long running clones. Even any 187s - small, undiscovered leak will build up when processing hundreds of 187s - thousands of files and commits. Cloning the Linux kernel is likely a 187s - pathological case, but other storied repositories such as CPython do 187s - work well, even if the initial clone requires a some patience. 187s - 187s - "threads" 187s - 187s - During a push to Git, hg-git will pack loose objects at regular 187s - intervals whenever it saves its map. As this is a rather expensive 187s - operation, it's done in separate threads. 187s - 187s - Defaults to the system CPU count or 4, whichever is lower. 187s - 187s - "usephases" 187s - When converting Git revisions to Mercurial, place them in the 'public' 187s - phase as appropriate. Namely, revisions that are reachable from the 187s - remote Git repository's default branch, or "HEAD", will be marked 187s - *public*. For most repositories, this means the remote "master" branch 187s - will be converted as public. The same applies to any commits tagged in 187s - the remote. 187s - 187s - To restrict publishing to specific branches or tags, use the 187s - "git.public" option. 187s - 187s - Publishing commits prevents their modification, and speeds up many local 187s - Mercurial operations, such as 'hg shelve'. 187s - 187s - "fetchbuffer" 187s - Data fetched from Git is buffered in memory, unless it exceeds the given 187s - limit, in megabytes. By default, flush the buffer to disk when it 187s - exceeds 100MB. 187s - 187s - "retries" 187s - Interacting with a remote Git repository may require authentication. 187s - Normally, this will trigger a prompt and a retry, and this option 187s - restricts the amount of retries. Defaults to 3. 187s - 187s - "invalidpaths" 187s - Both Mercurial and Git consider paths as just bytestrings internally, 187s - and allow almost anything. The difference, however, is in the _almost_ 187s - part. For example, many Git servers will reject a push for security 187s - reasons if it contains a nested Git repository. Similarly, Mercurial 187s - cannot checkout commits with a nested repository, and it cannot even 187s - store paths containing an embedded newline or carrage return character. 187s - 187s - The default is to issue a warning and skip these paths. You can change 187s - this by setting "hggit.invalidpaths" in ".hgrc": 187s - 187s - [hggit] 187s - invalidpaths = keep 187s - 187s - Possible values are "keep", "skip" or "abort". Prior to 1.0, the default 187s - was "abort". 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + abort: no such help topic: hggit-config 187s + (try 'hg help --keyword hggit-config') 187s + [10] 187s 187s $ hg help config.hggit | head -10 187s - "hggit" 187s - ------- 187s - 187s - Control behavior of the Hg-Git extension. 187s - 187s - "mapsavefrequency" 187s - By default, hg-git only saves the results of a conversion at the end. 187s - Use this option to enable resuming long-running pulls and pushes. Set 187s - this to a number greater than 0 to allow resuming after converting that 187s - many commits. This can help when the conversion encounters an error 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + abort: help section not found: config.hggit 187s 187s ERROR: test-help.t output changed 187s ! 187s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-push.t 187s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-push.t.err 187s @@ -12,287 +12,10 @@ 187s 187s $ cd .. 187s $ hg clone -u tip gitrepo hgrepo 187s - importing 1 git commits 187s - new changesets ff7a2f2d8d70 (1 drafts) 187s - updating to branch default 187s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 187s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 187s + abort: repository gitrepo not found 187s + [255] 187s 187s $ cd hgrepo 187s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 187s $ hg bookmark -q master 187s - $ echo beta > beta 187s - $ hg add beta 187s - $ fn_hg_commit -m 'add beta' 187s - 187s - 187s - $ echo gamma > gamma 187s - $ hg add gamma 187s - $ fn_hg_commit -m 'add gamma' 187s - 187s - $ hg book -r 1 beta 187s - $ hg push -r beta 187s - pushing to $TESTTMP/gitrepo 187s - searching for changes 187s - adding objects 187s - remote: found 0 deltas to reuse 187s - added 1 commits with 1 trees and 1 blobs 187s - adding reference refs/heads/beta 187s - 187s - $ cd .. 187s - 187s -should have two different branches 187s - $ cd gitrepo 187s - $ git branch -v 187s - beta 0f378ab add beta 187s - master 7eeab2e add alpha 187s - * not-master 7eeab2e add alpha 187s - 187s -some more work on master from git 187s - $ git checkout master 2>&1 | sed s/\'/\"/g 187s - Switched to branch "master" 187s - $ echo delta > delta 187s - $ git add delta 187s - $ fn_git_commit -m "add delta" 187s - $ git checkout not-master 2>&1 | sed s/\'/\"/g 187s - Switched to branch "not-master" 187s - 187s - $ cd .. 187s - 187s - $ cd hgrepo 187s -this should fail 187s - $ hg push -r master 187s - pushing to $TESTTMP/gitrepo 187s - searching for changes 187s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 187s - [255] 187s - 187s -... even with -f 187s - $ hg push -fr master 187s - pushing to $TESTTMP/gitrepo 187s - searching for changes 187s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 187s - [255] 187s - 187s - $ hg pull 2>&1 | grep -v 'divergent bookmark' 187s - pulling from $TESTTMP/gitrepo 187s - importing 1 git commits 187s - not updating diverged bookmark master 187s - new changesets 25eed24f5e8f (1 drafts) 187s - (run 'hg heads' to see heads, 'hg merge' to merge) 187s -TODO shouldn't need to do this since we're (in theory) pushing master explicitly, 187s -which should not implicitly also push the not-master ref. 187s - $ hg book not-master -r default/not-master --force 187s -master and default/master should be diferent 187s - $ hg log -r master 187s - changeset: 2:953796e1cfd8 187s - bookmark: master 187s - user: test 187s - date: Mon Jan 01 00:00:12 2007 +0000 187s - summary: add gamma 187s - 187s - $ hg log -r default/master 187s - changeset: 3:25eed24f5e8f 187s - tag: default/master 187s - tag: tip 187s - parent: 0:ff7a2f2d8d70 187s - user: test 187s - date: Mon Jan 01 00:00:13 2007 +0000 187s - summary: add delta 187s - 187s - 187s -this should also fail 187s - $ hg push -r master 187s - pushing to $TESTTMP/gitrepo 187s - searching for changes 187s - abort: pushing refs/heads/master overwrites 953796e1cfd8 187s - [255] 187s - 187s -... but succeed with -f 187s - $ hg push -fr master 187s - pushing to $TESTTMP/gitrepo 187s - searching for changes 187s - adding objects 187s - remote: found 0 deltas to reuse 187s - added 1 commits with 1 trees and 1 blobs 187s - updating reference refs/heads/master 187s - 187s -this should fail, no changes to push 187s - $ hg push -r master 187s - pushing to $TESTTMP/gitrepo 187s - searching for changes 187s - no changes found 187s - [1] 187s - 187s -hg-git issue103 -- directories can lose information at hg-git export time 187s - 187s - $ hg up master 187s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 187s - $ mkdir dir1 187s - $ echo alpha > dir1/alpha 187s - $ hg add dir1/alpha 187s - $ fn_hg_commit -m 'add dir1/alpha' 187s - $ hg push -r master 187s - pushing to $TESTTMP/gitrepo 187s - searching for changes 187s - adding objects 187s - remote: found 0 deltas to reuse 187s - added 1 commits with 2 trees and 0 blobs 187s - updating reference refs/heads/master 187s - 187s - $ echo beta > dir1/beta 187s - $ hg add dir1/beta 187s - $ fn_hg_commit -m 'add dir1/beta' 187s - $ hg push -r master 187s - pushing to $TESTTMP/gitrepo 187s - searching for changes 187s - adding objects 187s - remote: found 0 deltas to reuse 187s - added 1 commits with 2 trees and 0 blobs 187s - updating reference refs/heads/master 187s - $ hg log -r master 187s - changeset: 5:ba0476ff1899 187s - bookmark: master 187s - tag: default/master 187s - tag: tip 187s - user: test 187s - date: Mon Jan 01 00:00:15 2007 +0000 187s - summary: add dir1/beta 187s - 187s - 187s - $ cat >> .hg/hgrc << EOF 187s - > [paths] 187s - > default:pushurl = file:///$TESTTMP/gitrepo 187s - > EOF 187s -NB: the triple slashes are intentional, due to windows 187s - $ hg push -r master 187s - pushing to file:///$TESTTMP/gitrepo 187s - searching for changes 187s - no changes found 187s - [1] 187s - 187s - $ cd .. 187s - 187s - $ hg clone -u tip gitrepo hgrepo-test 187s - importing 5 git commits 187s - new changesets ff7a2f2d8d70:ba0476ff1899 (5 drafts) 187s - updating to branch default 187s - 5 files updated, 0 files merged, 0 files removed, 0 files unresolved 187s - $ hg -R hgrepo-test log -r master 187s - changeset: 4:ba0476ff1899 187s - bookmark: master 187s - tag: default/master 187s - tag: tip 187s - user: test 187s - date: Mon Jan 01 00:00:15 2007 +0000 187s - summary: add dir1/beta 187s - 187s - $ hg tags -R hgrepo-test | grep ^default/ 187s - default/master 4:ba0476ff1899 187s - default/beta 1:47580592d3d6 187s - default/not-master 0:ff7a2f2d8d70 187s - 187s -Push a fast-forward to a currently checked out branch, which sometimes 187s -fails: 187s - 187s - $ cd hgrepo 187s - $ hg book -r master not-master 187s - moving bookmark 'not-master' forward from ff7a2f2d8d70 187s - $ hg push 187s - pushing to file:///$TESTTMP/gitrepo 187s - searching for changes 187s - warning: failed to update HEAD; unable to set b'HEAD' to b'7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03' (?) 187s - updating reference refs/heads/not-master 187s -That should have updated the tag: 187s - $ hg tags | grep ^default/ 187s - default/not-master 5:ba0476ff1899 187s - default/master 5:ba0476ff1899 187s - default/beta 1:47580592d3d6 187s - $ cd .. 187s - 187s -We can push only one of two bookmarks on the same revision: 187s - 187s - $ cd hgrepo 187s - $ hg book -r 0 also-not-master really-not-master 187s - $ hg push -B also-not-master 187s - pushing to file:///$TESTTMP/gitrepo 187s - searching for changes 187s - adding reference refs/heads/also-not-master 187s - 187s -We can also push another bookmark to a path with another revision 187s -specified: 187s - 187s - $ hg book -r 3 also-not-master 187s - moving bookmark 'also-not-master' forward from ff7a2f2d8d70 187s - $ hg push -B also-not-master "file:///$TESTTMP/gitrepo#master" 187s - pushing to file:///$TESTTMP/gitrepo 187s - searching for changes 187s - adding objects 187s - remote: found 0 deltas to reuse 187s - added 1 commits with 1 trees and 1 blobs 187s - updating reference refs/heads/also-not-master 187s - 187s -And we can delete them again afterwards: 187s - 187s - $ hg book -d also-not-master really-not-master 187s - $ hg push -B also-not-master -B really-not-master 187s - pushing to file:///$TESTTMP/gitrepo 187s - searching for changes 187s - warning: unable to delete 'refs/heads/really-not-master' as it does not exist on the remote repository 187s - deleting reference refs/heads/also-not-master 187s - 187s -Push empty Hg repo to empty Git repo (issue #58) 187s - $ hg init hgrepo2 187s - $ git init -q --bare repo.git 187s - $ hg -R hgrepo2 push repo.git 187s - pushing to repo.git 187s - searching for changes 187s - abort: no bookmarks or tags to push to git 187s - (see "hg help bookmarks" for details on creating them) 187s - [255] 187s - 187s -The remote repo is empty and the local one doesn't have any bookmarks/tags 187s - $ cd hgrepo2 187s - $ echo init >> test.txt 187s - $ hg addremove 187s - adding test.txt 187s - $ fn_hg_commit -m init 187s - $ hg update null 187s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 187s - $ hg push ../repo.git 187s - pushing to ../repo.git 187s - searching for changes 187s - abort: no bookmarks or tags to push to git 187s - (see "hg help bookmarks" for details on creating them) 187s - [255] 187s - $ hg summary 187s - parent: -1:000000000000 (no revision checked out) 187s - branch: default 187s - commit: (clean) 187s - update: 1 new changesets (update) 187s - phases: 1 draft 187s -That should not create any bookmarks 187s - $ hg bookmarks 187s - no bookmarks set 187s -And no tags for the remotes either: 187s - $ hg tags 187s - tip 0:8aded40be5af 187s - 187s -test for ssh vulnerability 187s - 187s - $ cat >> $HGRCPATH << EOF 187s - > [ui] 187s - > ssh = ssh -o ConnectTimeout=1 187s - > EOF 187s - $ hg push -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 187s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 187s - [255] 187s - $ hg push -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 187s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 187s - [255] 187s - $ hg push -q 'git+ssh://fakehost|rm%20nonexistent/path' 187s - ssh: * fakehost%7?rm%20nonexistent* (glob) 187s - abort: git remote error: The remote server unexpectedly closed the connection. 187s - [255] 187s - $ hg push -q 'git+ssh://fakehost%7Crm%20nonexistent/path' 187s - ssh: * fakehost%7?rm%20nonexistent* (glob) 187s - abort: git remote error: The remote server unexpectedly closed the connection. 187s - [255] 187s 187s ERROR: test-push.t output changed 188s ! 188s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-branch-bookmark-suffix.t 188s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-branch-bookmark-suffix.t#without-path.err 188s @@ -9,287 +9,10 @@ 188s $ git init -q --bare repo.git 188s 188s $ hg clone repo.git hgrepo 188s - updating to branch default 188s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 188s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 188s + abort: repository repo.git not found 188s + [255] 188s $ cd hgrepo 188s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 188s #if without-path 188s $ rm .hg/hgrc 188s -#endif 188s - $ hg branch -q branch1 188s - $ hg bookmark branch1_bookmark 188s - $ echo f1 > f1 188s - $ hg add f1 188s - $ fn_hg_commit -m "add f1" 188s - $ hg branch -q branch2 188s - $ hg bookmark branch2_bookmark 188s - $ echo f2 > f2 188s - $ hg add f2 188s - $ fn_hg_commit -m "add f2" 188s - $ hg log --graph 188s - @ changeset: 1:600de9b6d498 188s - | branch: branch2 188s - | bookmark: branch2_bookmark 188s - | tag: tip 188s - | user: test 188s - | date: Mon Jan 01 00:00:11 2007 +0000 188s - | summary: add f2 188s - | 188s - o changeset: 0:40a840c1f8ae 188s - branch: branch1 188s - bookmark: branch1_bookmark 188s - user: test 188s - date: Mon Jan 01 00:00:10 2007 +0000 188s - summary: add f1 188s - 188s - 188s - $ hg push -B asdasd ../repo.git 188s - pushing to ../repo.git 188s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 188s - [255] 188s - 188s - $ hg push ../repo.git 188s - pushing to ../repo.git 188s - searching for changes 188s - adding objects 188s - remote: found 0 deltas to reuse 188s - added 2 commits with 2 trees and 2 blobs 188s - adding reference refs/heads/branch1 188s - adding reference refs/heads/branch2 188s - 188s - $ cd .. 188s - 188s - $ cd repo.git 188s - $ git symbolic-ref HEAD refs/heads/branch1 188s - $ git branch 188s - * branch1 188s - branch2 188s - $ cd .. 188s - 188s - $ git clone repo.git gitrepo 188s - Cloning into 'gitrepo'... 188s - done. 188s - $ cd gitrepo 188s - $ git checkout -q branch1 188s - $ echo g1 >> f1 188s - $ git add f1 188s - $ fn_git_commit -m "append f1" 188s - $ git checkout -q branch2 188s - $ echo g2 >> f2 188s - $ git add f2 188s - $ fn_git_commit -m "append f2" 188s - $ git checkout -b branch3 188s - Switched to a new branch 'branch3' 188s - $ echo g3 >> f3 188s - $ git add f3 188s - $ fn_git_commit -m "append f3" 188s - $ git push origin branch1 branch2 branch3 188s - To $TESTTMP/repo.git 188s - bbfe79a..d8aef79 branch1 -> branch1 188s - 288e92b..f8f8de5 branch2 -> branch2 188s - * [new branch] branch3 -> branch3 188s -make sure the commit doesn't have an HG:rename-source annotation 188s - $ git cat-file commit d8aef79 188s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 188s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 188s - author test 1167609612 +0000 188s - committer test 1167609612 +0000 188s - 188s - append f1 188s - $ cd .. 188s - 188s - $ cd hgrepo 188s - $ hg paths 188s - default = $TESTTMP/repo.git (with-path !) 188s - $ hg pull ../repo.git 188s - pulling from ../repo.git 188s - importing 3 git commits 188s - updating bookmark branch1_bookmark 188s - updating bookmark branch2_bookmark 188s - adding bookmark branch3_bookmark 188s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 188s - (run 'hg heads' to see heads) 188s - $ hg log --graph 188s - o changeset: 4:faf44fc3a4e8 188s - | bookmark: branch3_bookmark 188s - | tag: default/branch3 (with-path !) 188s - | tag: tip 188s - | user: test 188s - | date: Mon Jan 01 00:00:14 2007 +0000 188s - | summary: append f3 188s - | 188s - o changeset: 3:ae8eb55f7090 188s - | bookmark: branch2_bookmark 188s - | tag: default/branch2 (with-path !) 188s - | parent: 1:600de9b6d498 188s - | user: test 188s - | date: Mon Jan 01 00:00:13 2007 +0000 188s - | summary: append f2 188s - | 188s - | o changeset: 2:8211cade99e4 188s - | | bookmark: branch1_bookmark 188s - | | tag: default/branch1 (with-path !) 188s - | | parent: 0:40a840c1f8ae 188s - | | user: test 188s - | | date: Mon Jan 01 00:00:12 2007 +0000 188s - | | summary: append f1 188s - | | 188s - @ | changeset: 1:600de9b6d498 188s - |/ branch: branch2 188s - | user: test 188s - | date: Mon Jan 01 00:00:11 2007 +0000 188s - | summary: add f2 188s - | 188s - o changeset: 0:40a840c1f8ae 188s - branch: branch1 188s - user: test 188s - date: Mon Jan 01 00:00:10 2007 +0000 188s - summary: add f1 188s - 188s - $ cd .. 188s - 188s -Try cloning a bookmark, and make sure it gets checked out: 188s - 188s - $ rm -r hgrepo 188s - $ hg clone -r branch3 repo.git hgrepo 188s - importing 4 git commits 188s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 188s - updating to bookmark branch3_bookmark 188s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 188s - $ cd hgrepo 188s - $ hg bookmarks 188s - branch2_bookmark 2:ae8eb55f7090 188s - * branch3_bookmark 3:faf44fc3a4e8 188s - $ hg log --graph 188s - @ changeset: 3:faf44fc3a4e8 188s - | bookmark: branch3_bookmark 188s - | tag: default/branch3 188s - | tag: tip 188s - | user: test 188s - | date: Mon Jan 01 00:00:14 2007 +0000 188s - | summary: append f3 188s - | 188s - o changeset: 2:ae8eb55f7090 188s - | bookmark: branch2_bookmark 188s - | tag: default/branch2 188s - | user: test 188s - | date: Mon Jan 01 00:00:13 2007 +0000 188s - | summary: append f2 188s - | 188s - o changeset: 1:600de9b6d498 188s - | branch: branch2 188s - | user: test 188s - | date: Mon Jan 01 00:00:11 2007 +0000 188s - | summary: add f2 188s - | 188s - o changeset: 0:40a840c1f8ae 188s - branch: branch1 188s - user: test 188s - date: Mon Jan 01 00:00:10 2007 +0000 188s - summary: add f1 188s - 188s - $ cd .. 188s - 188s -Try cloning something that's both a bookmark and a branch, and see the 188s -results. They're a bit suprising as the bookmark does get activated, 188s -but the branch get checked out. Although this does seem a bit odd, so 188s -does the scenario. 188s - 188s - $ rm -r hgrepo 188s - $ hg clone -r branch1 repo.git hgrepo 188s - importing 2 git commits 188s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 188s - updating to branch branch1 188s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 188s - $ cd hgrepo 188s - $ hg bookmarks 188s - * branch1_bookmark 1:8211cade99e4 188s - $ hg log --graph 188s - o changeset: 1:8211cade99e4 188s - | bookmark: branch1_bookmark 188s - | tag: default/branch1 188s - | tag: tip 188s - | user: test 188s - | date: Mon Jan 01 00:00:12 2007 +0000 188s - | summary: append f1 188s - | 188s - @ changeset: 0:40a840c1f8ae 188s - branch: branch1 188s - user: test 188s - date: Mon Jan 01 00:00:10 2007 +0000 188s - summary: add f1 188s - 188s - 188s - $ cd .. 188s - 188s -Now try pulling a diverged bookmark: 188s - 188s - $ rm -r hgrepo 188s -#if with-path 188s - $ hg clone -U repo.git hgrepo 188s - importing 5 git commits 188s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 188s -#else 188s - $ hg init hgrepo 188s - $ hg -R hgrepo pull repo.git 188s - pulling from repo.git 188s - importing 5 git commits 188s - adding bookmark branch1_bookmark 188s - adding bookmark branch2_bookmark 188s - adding bookmark branch3_bookmark 188s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 188s - (run 'hg heads' to see heads, 'hg merge' to merge) 188s -#endif 188s - $ cd gitrepo 188s - $ git checkout -q branch1 188s - $ fn_git_rebase branch3 188s - $ git push -f 188s - To $TESTTMP/repo.git 188s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 188s - $ cd ../hgrepo 188s - $ hg pull ../repo.git 188s - pulling from ../repo.git 188s - importing 1 git commits 188s - not updating diverged bookmark branch1_bookmark 188s - new changesets 895d0307f8b7 (1 drafts) 188s - (run 'hg update' to get a working copy) 188s - $ hg log --graph 188s - o changeset: 5:895d0307f8b7 188s - | tag: default/branch1 (with-path !) 188s - | tag: tip 188s - | user: test 188s - | date: Mon Jan 01 00:00:12 2007 +0000 188s - | summary: append f1 188s - | 188s - o changeset: 4:faf44fc3a4e8 188s - | bookmark: branch3_bookmark 188s - | tag: default/branch3 (with-path !) 188s - | user: test 188s - | date: Mon Jan 01 00:00:14 2007 +0000 188s - | summary: append f3 188s - | 188s - o changeset: 3:ae8eb55f7090 188s - | bookmark: branch2_bookmark 188s - | tag: default/branch2 (with-path !) 188s - | user: test 188s - | date: Mon Jan 01 00:00:13 2007 +0000 188s - | summary: append f2 188s - | 188s - o changeset: 2:600de9b6d498 188s - | branch: branch2 188s - | parent: 0:40a840c1f8ae 188s - | user: test 188s - | date: Mon Jan 01 00:00:11 2007 +0000 188s - | summary: add f2 188s - | 188s - | o changeset: 1:8211cade99e4 188s - |/ bookmark: branch1_bookmark 188s - | user: test 188s - | date: Mon Jan 01 00:00:12 2007 +0000 188s - | summary: append f1 188s - | 188s - o changeset: 0:40a840c1f8ae 188s - branch: branch1 188s - user: test 188s - date: Mon Jan 01 00:00:10 2007 +0000 188s - summary: add f1 188s - 188s 188s ERROR: test-branch-bookmark-suffix.t#without-path output changed 188s ! 188s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-branch-bookmark-suffix.t 188s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-branch-bookmark-suffix.t#with-path.err 188s @@ -9,287 +9,12 @@ 188s $ git init -q --bare repo.git 188s 188s $ hg clone repo.git hgrepo 188s - updating to branch default 188s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 188s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 188s + abort: repository repo.git not found 188s + [255] 188s $ cd hgrepo 188s + $TESTTMP.sh: 14: cd: can't cd to hgrepo 188s #if without-path 188s $ rm .hg/hgrc 188s #endif 188s $ hg branch -q branch1 188s - $ hg bookmark branch1_bookmark 188s - $ echo f1 > f1 188s - $ hg add f1 188s - $ fn_hg_commit -m "add f1" 188s - $ hg branch -q branch2 188s - $ hg bookmark branch2_bookmark 188s - $ echo f2 > f2 188s - $ hg add f2 188s - $ fn_hg_commit -m "add f2" 188s - $ hg log --graph 188s - @ changeset: 1:600de9b6d498 188s - | branch: branch2 188s - | bookmark: branch2_bookmark 188s - | tag: tip 188s - | user: test 188s - | date: Mon Jan 01 00:00:11 2007 +0000 188s - | summary: add f2 188s - | 188s - o changeset: 0:40a840c1f8ae 188s - branch: branch1 188s - bookmark: branch1_bookmark 188s - user: test 188s - date: Mon Jan 01 00:00:10 2007 +0000 188s - summary: add f1 188s - 188s - 188s - $ hg push -B asdasd ../repo.git 188s - pushing to ../repo.git 188s - abort: the -B/--bookmarks option is not supported when branch_bookmark_suffix is set 188s - [255] 188s - 188s - $ hg push ../repo.git 188s - pushing to ../repo.git 188s - searching for changes 188s - adding objects 188s - remote: found 0 deltas to reuse 188s - added 2 commits with 2 trees and 2 blobs 188s - adding reference refs/heads/branch1 188s - adding reference refs/heads/branch2 188s - 188s - $ cd .. 188s - 188s - $ cd repo.git 188s - $ git symbolic-ref HEAD refs/heads/branch1 188s - $ git branch 188s - * branch1 188s - branch2 188s - $ cd .. 188s - 188s - $ git clone repo.git gitrepo 188s - Cloning into 'gitrepo'... 188s - done. 188s - $ cd gitrepo 188s - $ git checkout -q branch1 188s - $ echo g1 >> f1 188s - $ git add f1 188s - $ fn_git_commit -m "append f1" 188s - $ git checkout -q branch2 188s - $ echo g2 >> f2 188s - $ git add f2 188s - $ fn_git_commit -m "append f2" 188s - $ git checkout -b branch3 188s - Switched to a new branch 'branch3' 188s - $ echo g3 >> f3 188s - $ git add f3 188s - $ fn_git_commit -m "append f3" 188s - $ git push origin branch1 branch2 branch3 188s - To $TESTTMP/repo.git 188s - bbfe79a..d8aef79 branch1 -> branch1 188s - 288e92b..f8f8de5 branch2 -> branch2 188s - * [new branch] branch3 -> branch3 188s -make sure the commit doesn't have an HG:rename-source annotation 188s - $ git cat-file commit d8aef79 188s - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 188s - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 188s - author test 1167609612 +0000 188s - committer test 1167609612 +0000 188s - 188s - append f1 188s - $ cd .. 188s - 188s - $ cd hgrepo 188s - $ hg paths 188s - default = $TESTTMP/repo.git (with-path !) 188s - $ hg pull ../repo.git 188s - pulling from ../repo.git 188s - importing 3 git commits 188s - updating bookmark branch1_bookmark 188s - updating bookmark branch2_bookmark 188s - adding bookmark branch3_bookmark 188s - new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) 188s - (run 'hg heads' to see heads) 188s - $ hg log --graph 188s - o changeset: 4:faf44fc3a4e8 188s - | bookmark: branch3_bookmark 188s - | tag: default/branch3 (with-path !) 188s - | tag: tip 188s - | user: test 188s - | date: Mon Jan 01 00:00:14 2007 +0000 188s - | summary: append f3 188s - | 188s - o changeset: 3:ae8eb55f7090 188s - | bookmark: branch2_bookmark 188s - | tag: default/branch2 (with-path !) 188s - | parent: 1:600de9b6d498 188s - | user: test 188s - | date: Mon Jan 01 00:00:13 2007 +0000 188s - | summary: append f2 188s - | 188s - | o changeset: 2:8211cade99e4 188s - | | bookmark: branch1_bookmark 188s - | | tag: default/branch1 (with-path !) 188s - | | parent: 0:40a840c1f8ae 188s - | | user: test 188s - | | date: Mon Jan 01 00:00:12 2007 +0000 188s - | | summary: append f1 188s - | | 188s - @ | changeset: 1:600de9b6d498 188s - |/ branch: branch2 188s - | user: test 188s - | date: Mon Jan 01 00:00:11 2007 +0000 188s - | summary: add f2 188s - | 188s - o changeset: 0:40a840c1f8ae 188s - branch: branch1 188s - user: test 188s - date: Mon Jan 01 00:00:10 2007 +0000 188s - summary: add f1 188s - 188s - $ cd .. 188s - 188s -Try cloning a bookmark, and make sure it gets checked out: 188s - 188s - $ rm -r hgrepo 188s - $ hg clone -r branch3 repo.git hgrepo 188s - importing 4 git commits 188s - new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) 188s - updating to bookmark branch3_bookmark 188s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 188s - $ cd hgrepo 188s - $ hg bookmarks 188s - branch2_bookmark 2:ae8eb55f7090 188s - * branch3_bookmark 3:faf44fc3a4e8 188s - $ hg log --graph 188s - @ changeset: 3:faf44fc3a4e8 188s - | bookmark: branch3_bookmark 188s - | tag: default/branch3 188s - | tag: tip 188s - | user: test 188s - | date: Mon Jan 01 00:00:14 2007 +0000 188s - | summary: append f3 188s - | 188s - o changeset: 2:ae8eb55f7090 188s - | bookmark: branch2_bookmark 188s - | tag: default/branch2 188s - | user: test 188s - | date: Mon Jan 01 00:00:13 2007 +0000 188s - | summary: append f2 188s - | 188s - o changeset: 1:600de9b6d498 188s - | branch: branch2 188s - | user: test 188s - | date: Mon Jan 01 00:00:11 2007 +0000 188s - | summary: add f2 188s - | 188s - o changeset: 0:40a840c1f8ae 188s - branch: branch1 188s - user: test 188s - date: Mon Jan 01 00:00:10 2007 +0000 188s - summary: add f1 188s - 188s - $ cd .. 188s - 188s -Try cloning something that's both a bookmark and a branch, and see the 188s -results. They're a bit suprising as the bookmark does get activated, 188s -but the branch get checked out. Although this does seem a bit odd, so 188s -does the scenario. 188s - 188s - $ rm -r hgrepo 188s - $ hg clone -r branch1 repo.git hgrepo 188s - importing 2 git commits 188s - new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) 188s - updating to branch branch1 188s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 188s - $ cd hgrepo 188s - $ hg bookmarks 188s - * branch1_bookmark 1:8211cade99e4 188s - $ hg log --graph 188s - o changeset: 1:8211cade99e4 188s - | bookmark: branch1_bookmark 188s - | tag: default/branch1 188s - | tag: tip 188s - | user: test 188s - | date: Mon Jan 01 00:00:12 2007 +0000 188s - | summary: append f1 188s - | 188s - @ changeset: 0:40a840c1f8ae 188s - branch: branch1 188s - user: test 188s - date: Mon Jan 01 00:00:10 2007 +0000 188s - summary: add f1 188s - 188s - 188s - $ cd .. 188s - 188s -Now try pulling a diverged bookmark: 188s - 188s - $ rm -r hgrepo 188s -#if with-path 188s - $ hg clone -U repo.git hgrepo 188s - importing 5 git commits 188s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 188s -#else 188s - $ hg init hgrepo 188s - $ hg -R hgrepo pull repo.git 188s - pulling from repo.git 188s - importing 5 git commits 188s - adding bookmark branch1_bookmark 188s - adding bookmark branch2_bookmark 188s - adding bookmark branch3_bookmark 188s - new changesets 40a840c1f8ae:faf44fc3a4e8 (5 drafts) 188s - (run 'hg heads' to see heads, 'hg merge' to merge) 188s -#endif 188s - $ cd gitrepo 188s - $ git checkout -q branch1 188s - $ fn_git_rebase branch3 188s - $ git push -f 188s - To $TESTTMP/repo.git 188s - + d8aef79...ce1d1c5 branch1 -> branch1 (forced update) 188s - $ cd ../hgrepo 188s - $ hg pull ../repo.git 188s - pulling from ../repo.git 188s - importing 1 git commits 188s - not updating diverged bookmark branch1_bookmark 188s - new changesets 895d0307f8b7 (1 drafts) 188s - (run 'hg update' to get a working copy) 188s - $ hg log --graph 188s - o changeset: 5:895d0307f8b7 188s - | tag: default/branch1 (with-path !) 188s - | tag: tip 188s - | user: test 188s - | date: Mon Jan 01 00:00:12 2007 +0000 188s - | summary: append f1 188s - | 188s - o changeset: 4:faf44fc3a4e8 188s - | bookmark: branch3_bookmark 188s - | tag: default/branch3 (with-path !) 188s - | user: test 188s - | date: Mon Jan 01 00:00:14 2007 +0000 188s - | summary: append f3 188s - | 188s - o changeset: 3:ae8eb55f7090 188s - | bookmark: branch2_bookmark 188s - | tag: default/branch2 (with-path !) 188s - | user: test 188s - | date: Mon Jan 01 00:00:13 2007 +0000 188s - | summary: append f2 188s - | 188s - o changeset: 2:600de9b6d498 188s - | branch: branch2 188s - | parent: 0:40a840c1f8ae 188s - | user: test 188s - | date: Mon Jan 01 00:00:11 2007 +0000 188s - | summary: add f2 188s - | 188s - | o changeset: 1:8211cade99e4 188s - |/ bookmark: branch1_bookmark 188s - | user: test 188s - | date: Mon Jan 01 00:00:12 2007 +0000 188s - | summary: append f1 188s - | 188s - o changeset: 0:40a840c1f8ae 188s - branch: branch1 188s - user: test 188s - date: Mon Jan 01 00:00:10 2007 +0000 188s - summary: add f1 188s - 188s 188s ERROR: test-branch-bookmark-suffix.t#with-path output changed 188s ! 188s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-bundle.t 188s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-bundle.t.err 188s @@ -36,247 +36,12 @@ 188s Clone it! 188s 188s $ hg clone gitrepo hgrepo 188s - importing 3 git commits 188s - new changesets ff7a2f2d8d70:ca33a262eb46 (3 drafts) 188s - updating to bookmark master 188s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 188s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 188s + abort: repository gitrepo not found 188s + [255] 188s $ cd hgrepo 188s + $TESTTMP.sh: 45: cd: can't cd to hgrepo 188s 188s Create a bundle with our metadata, and inspect it: 188s 188s $ hg bundle --all ../bundle-w-git.hg 188s - 3 changesets found 188s - $ hg debugbundle --all ../bundle-w-git.hg | grep hg-git 188s - exp-hg-git-map -- {} (mandatory: False) 188s - exp-hg-git-tags -- {} (mandatory: False) 188s - $ hg debugbundle --all ../bundle-w-git.hg > bundle-w-git.out 188s - 188s -Create a bundle without our metadata, and inspect it: 188s - 188s - $ hg bundle --all ../bundle-wo-git.hg --config experimental.hg-git-bundle=no 188s - 3 changesets found 188s - $ hg debugbundle --all ../bundle-wo-git.hg | grep hg-git 188s - [1] 188s - 188s -Verify that those are different: 188s - 188s - $ hg debugbundle --all ../bundle-wo-git.hg > bundle-wo-git.out 188s - $ cmp -s bundle-w-git.out bundle-wo-git.out 188s - [1] 188s - 188s -Now create a bundle without hg-git enabled at all, which should be 188s -exactly similar to what you get when you disable metadata embedding; 188s -this verifies we don't accidentally pollute bundles. 188s - 188s - $ hg bundle --all --config extensions.hggit=! ../bundle-wo-hggit.hg 188s - 3 changesets found 188s - $ hg debugbundle --all ../bundle-wo-hggit.hg > bundle-wo-hggit.out 188s - $ cmp -s bundle-wo-git.hg bundle-wo-hggit.hg 188s - [2] 188s - $ cmp -s bundle-wo-git.out bundle-wo-hggit.out 188s - $ cd .. 188s - $ rm -r hgrepo 188s - 188s -Does unbundling transfer state? 188s - 188s - $ hg init hgrepo 188s - $ hg -R hgrepo unbundle bundle-w-git.hg 188s - adding changesets 188s - adding manifests 188s - adding file changes 188s - added 3 changesets with 3 changes to 3 files 188s - new changesets * (glob) 188s - (run 'hg update' to get a working copy) 188s - $ hg -R hgrepo log -T git 188s - 2:ca33a262eb46 | d338971a96e2 | tip | 188s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 188s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 188s - $ hg -R hgrepo pull gitrepo 188s - pulling from gitrepo 188s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 188s - no changes found 188s - adding bookmark master 188s - $ rm -r hgrepo 188s - 188s -Can we unbundle something without git state? 188s - 188s - $ hg init hgrepo 188s - $ hg -R hgrepo unbundle bundle-wo-git.hg 188s - adding changesets 188s - adding manifests 188s - adding file changes 188s - added 3 changesets with 3 changes to 3 files 188s - new changesets * (glob) 188s - (run 'hg update' to get a working copy) 188s - $ hg -R hgrepo log -T git 188s - 2:ca33a262eb46 | | tip | 188s - 1:7fe02317c63d | | | 188s - 0:ff7a2f2d8d70 | | | 188s - $ hg -R hgrepo pull gitrepo 188s - pulling from gitrepo 188s - importing 3 git commits 188s - adding bookmark master 188s - (run 'hg update' to get a working copy) 188s - $ rm -r hgrepo 188s - 188s -Regular mercurial shouldn't choke on our bundle 188s - 188s - $ hg init hgrepo 188s - $ cat >> hgrepo/.hg/hgrc < [extensions] 188s - > hggit = ! 188s - > EOF 188s - $ hg -R hgrepo unbundle bundle-wo-git.hg 188s - adding changesets 188s - adding manifests 188s - adding file changes 188s - added 3 changesets with 3 changes to 3 files 188s - new changesets * (glob) 188s - (run 'hg update' to get a working copy) 188s - $ hg -R hgrepo log -T git 188s - 2:ca33a262eb46 | | tip | 188s - 1:7fe02317c63d | | | 188s - 0:ff7a2f2d8d70 | | | 188s - $ hg -R hgrepo pull gitrepo 188s - pulling from gitrepo 188s - abort: repository gitrepo not found!? (re) 188s - [255] 188s - $ rm -r hgrepo 188s - 188s - 188s -What happens if we unbundle twice? 188s - 188s - $ hg init hgrepo 188s - $ hg -R hgrepo unbundle bundle-w-git.hg 188s - adding changesets 188s - adding manifests 188s - adding file changes 188s - added 3 changesets with 3 changes to 3 files 188s - new changesets * (glob) 188s - (run 'hg update' to get a working copy) 188s - $ hg -R hgrepo unbundle bundle-w-git.hg 188s - adding changesets 188s - adding manifests 188s - adding file changes 188s - added 0 changesets with 0 changes to 3 files 188s - (run 'hg update' to get a working copy) 188s - $ hg -R hgrepo log -T git 188s - 2:ca33a262eb46 | d338971a96e2 | tip | 188s - 1:7fe02317c63d | 9497a4ee62e1 | theothertag | 188s - 0:ff7a2f2d8d70 | 7eeab2ea75ec | thetag | 188s - $ hg -R hgrepo pull gitrepo 188s - pulling from gitrepo 188s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 188s - no changes found 188s - adding bookmark master 188s - $ rm -r hgrepo 188s - 188s -Alas, cloning a bundle doesn't work yet: 188s - 188s -(Mercurial is apparently quite dumb here, so we won't try to fix this 188s -for now, but this test mostly exists so that we notice if ever starts 188s -working, or breaks entirely.) 188s - 188s - $ hg clone bundle-w-git.hg hgrepo 188s - requesting all changes 188s - adding changesets 188s - adding manifests 188s - adding file changes 188s - added 3 changesets with 3 changes to 3 files 188s - new changesets * (glob) 188s - updating to branch default 188s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 188s - $ hg -R hgrepo log -T git 188s - 2:ca33a262eb46 | | tip | 188s - 1:7fe02317c63d | | | 188s - 0:ff7a2f2d8d70 | | | 188s - $ rm -r hgrepo 188s - 188s -Now, lets try to be a bit evil. How does pulling partial state work? 188s - 188s -First, more git happenings: 188s - 188s - $ cd gitrepo 188s - $ git checkout -b otherbranch thetag 188s - Switched to a new branch 'otherbranch' 188s - $ echo 42 > baz 188s - $ git add baz 188s - $ fn_git_commit -m 3 188s - $ cd .. 188s - 188s -Pull, 'em, and create a partial bundle: 188s - 188s - $ hg clone gitrepo hgrepo 188s - importing 4 git commits 188s - new changesets ff7a2f2d8d70:d87bf3ef6a53 (4 drafts) 188s - updating to bookmark otherbranch 188s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 188s - $ hg -R hgrepo bundle --base 'p1(tip)' -r tip bundle-w-git-2.hg 188s - 1 changesets found 188s - $ rm -r hgrepo 188s - 188s -Now, load only that bundle into a repository without any git state 188s - 188s - $ hg clone -r 1 bundle-w-git.hg hgrepo --config extensions.hggit=! 188s - adding changesets 188s - adding manifests 188s - adding file changes 188s - added 2 changesets with 2 changes to 2 files 188s - new changesets * (glob) 188s - updating to branch default 188s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 188s - $ cd hgrepo 188s - $ hg unbundle ../bundle-w-git-2.hg 188s - adding changesets 188s - adding manifests 188s - adding file changes 188s - added 1 changesets with 1 changes to 1 files (+1 heads) 188s - new changesets * (glob) 188s - (run 'hg heads' to see heads, 'hg merge' to merge) 188s - $ hg pull ../gitrepo 188s - pulling from ../gitrepo 188s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 188s - importing 3 git commits 188s - adding bookmark master 188s - adding bookmark otherbranch 188s - new changesets ca33a262eb46 (1 drafts) 188s - (run 'hg update' to get a working copy) 188s - $ cd .. 188s - $ rm -r hgrepo 188s - 188s -Now, try pushing with only the metadata: 188s - 188s - $ hg init hgrepo 188s - $ cd hgrepo 188s - $ hg unbundle -u ../bundle-w-git.hg 188s - adding changesets 188s - adding manifests 188s - adding file changes 188s - added 3 changesets with 3 changes to 3 files 188s - new changesets * (glob) 188s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 188s - $ echo kaflaflibob > bajizmo 188s - $ fn_hg_commit -A -m 4 188s - $ hg book -r tip master 188s - $ hg push ../gitrepo 188s - pushing to ../gitrepo 188s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 188s - abort: cannot push git commit d338971a96e2 as it is not present locally 188s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 188s - [255] 188s - 188s -Try to repopulate the git state from a bundle 188s - 188s - $ hg debug-remove-hggit-state 188s - clearing out the git cache data 188s - $ hg log -qr 'fromgit()' 188s - $ hg unbundle -u ../bundle-w-git.hg 188s - adding changesets 188s - adding manifests 188s - adding file changes 188s - added 0 changesets with 0 changes to 3 files 188s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 188s - $ hg log -qr 'fromgit()' 188s - 0:ff7a2f2d8d70 188s - 1:7fe02317c63d 188s - 2:ca33a262eb46 188s 188s ERROR: test-bundle.t output changed 189s ! 189s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-file-removal.t 189s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-file-removal.t.err 189s @@ -98,192 +98,9 @@ 189s $ git init -q --bare repo.git 189s 189s $ hg clone gitrepo hgrepo 189s - importing 9 git commits 189s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 189s - updating to bookmark master 189s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 189s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 189s + abort: repository gitrepo not found 189s + [255] 189s $ cd hgrepo 189s + $TESTTMP.sh: 72: cd: can't cd to hgrepo 189s $ hg log --graph 189s - @ changeset: 8:0995b8a0a943 189s - | bookmark: master 189s - | tag: default/master 189s - | tag: tip 189s - | user: test 189s - | date: Mon Jan 01 00:00:18 2007 +0000 189s - | summary: remove betalink 189s - | 189s - o changeset: 7:a316d3a96c89 189s - | user: test 189s - | date: Mon Jan 01 00:00:17 2007 +0000 189s - | summary: replace file with symlink 189s - | 189s - o changeset: 6:1804acb71f3e 189s - | user: test 189s - | date: Mon Jan 01 00:00:16 2007 +0000 189s - | summary: replace symlink with file 189s - | 189s - o changeset: 5:e19c85becc87 189s - | user: test 189s - | date: Mon Jan 01 00:00:15 2007 +0000 189s - | summary: add symlink to beta 189s - | 189s - o changeset: 4:0d3086c3f8c3 189s - | user: test 189s - | date: Mon Jan 01 00:00:14 2007 +0000 189s - | summary: remove foo/bar 189s - | 189s - o changeset: 3:b2406125ef5c 189s - | user: test 189s - | date: Mon Jan 01 00:00:13 2007 +0000 189s - | summary: remove alpha 189s - | 189s - o changeset: 2:8b3b2f4b4158 189s - | user: test 189s - | date: Mon Jan 01 00:00:12 2007 +0000 189s - | summary: add foo 189s - | 189s - o changeset: 1:7fe02317c63d 189s - | user: test 189s - | date: Mon Jan 01 00:00:11 2007 +0000 189s - | summary: add beta 189s - | 189s - o changeset: 0:ff7a2f2d8d70 189s - user: test 189s - date: Mon Jan 01 00:00:10 2007 +0000 189s - summary: add alpha 189s - 189s - 189s -make sure alpha is not in this manifest 189s - $ hg manifest -r 3 189s - beta 189s - foo/bar 189s - 189s -make sure that only beta is in the manifest 189s - $ hg manifest 189s - beta 189s - 189s - $ hg debug-remove-hggit-state 189s - clearing out the git cache data 189s - $ ls .hg | grep git 189s - [1] 189s - $ hg push ../repo.git 189s - pushing to ../repo.git 189s - searching for changes 189s - adding objects 189s - remote: found 0 deltas to reuse 189s - added 9 commits with 8 trees and 5 blobs 189s - adding reference refs/heads/master 189s - 189s - $ cd .. 189s - $ git --git-dir=repo.git log --pretty=medium 189s - commit 5ee11eeae239d6a99df5a99901ec00ffafbcc46b 189s - Author: test 189s - Date: Mon Jan 1 00:00:18 2007 +0000 189s - 189s - remove betalink 189s - 189s - commit 2c7b324faeccb1acf89c35b7ad38e7956f5705fa 189s - Author: test 189s - Date: Mon Jan 1 00:00:17 2007 +0000 189s - 189s - replace file with symlink 189s - 189s - commit ff0478d2ecc2571d01eb6d406ac29e4e63e5d3d5 189s - Author: test 189s - Date: Mon Jan 1 00:00:16 2007 +0000 189s - 189s - replace symlink with file 189s - 189s - commit 5492e6e410e42df527956be945286cd1ae45acb8 189s - Author: test 189s - Date: Mon Jan 1 00:00:15 2007 +0000 189s - 189s - add symlink to beta 189s - 189s - commit b991de8952c482a7cd51162674ffff8474862218 189s - Author: test 189s - Date: Mon Jan 1 00:00:14 2007 +0000 189s - 189s - remove foo/bar 189s - 189s - commit b0edaf0adac19392cf2867498b983bc5192b41dd 189s - Author: test 189s - Date: Mon Jan 1 00:00:13 2007 +0000 189s - 189s - remove alpha 189s - 189s - commit f2d0d5bfa905e12dee728b509b96cf265bb6ee43 189s - Author: test 189s - Date: Mon Jan 1 00:00:12 2007 +0000 189s - 189s - add foo 189s - 189s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 189s - Author: test 189s - Date: Mon Jan 1 00:00:11 2007 +0000 189s - 189s - add beta 189s - 189s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 189s - Author: test 189s - Date: Mon Jan 1 00:00:10 2007 +0000 189s - 189s - add alpha 189s - 189s -test with rename detection enabled 189s - $ hg --config git.similarity=100 clone gitrepo hgreporenames 189s - importing 9 git commits 189s - new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) 189s - updating to bookmark master 189s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 189s - 189s - $ cd hgreporenames 189s - $ hg log --graph 189s - @ changeset: 8:0995b8a0a943 189s - | bookmark: master 189s - | tag: default/master 189s - | tag: tip 189s - | user: test 189s - | date: Mon Jan 01 00:00:18 2007 +0000 189s - | summary: remove betalink 189s - | 189s - o changeset: 7:a316d3a96c89 189s - | user: test 189s - | date: Mon Jan 01 00:00:17 2007 +0000 189s - | summary: replace file with symlink 189s - | 189s - o changeset: 6:1804acb71f3e 189s - | user: test 189s - | date: Mon Jan 01 00:00:16 2007 +0000 189s - | summary: replace symlink with file 189s - | 189s - o changeset: 5:e19c85becc87 189s - | user: test 189s - | date: Mon Jan 01 00:00:15 2007 +0000 189s - | summary: add symlink to beta 189s - | 189s - o changeset: 4:0d3086c3f8c3 189s - | user: test 189s - | date: Mon Jan 01 00:00:14 2007 +0000 189s - | summary: remove foo/bar 189s - | 189s - o changeset: 3:b2406125ef5c 189s - | user: test 189s - | date: Mon Jan 01 00:00:13 2007 +0000 189s - | summary: remove alpha 189s - | 189s - o changeset: 2:8b3b2f4b4158 189s - | user: test 189s - | date: Mon Jan 01 00:00:12 2007 +0000 189s - | summary: add foo 189s - | 189s - o changeset: 1:7fe02317c63d 189s - | user: test 189s - | date: Mon Jan 01 00:00:11 2007 +0000 189s - | summary: add beta 189s - | 189s - o changeset: 0:ff7a2f2d8d70 189s - user: test 189s - date: Mon Jan 01 00:00:10 2007 +0000 189s - summary: add alpha 189s - 189s 189s ERROR: test-file-removal.t output changed 190s ! 190s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-hg-author.t 190s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-hg-author.t.err 190s @@ -16,256 +16,10 @@ 190s 190s $ cd .. 190s $ hg clone repo.git hgrepo 190s - importing 1 git commits 190s - new changesets ff7a2f2d8d70 (1 drafts) 190s - updating to bookmark master 190s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 190s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 190s + abort: repository repo.git not found 190s + [255] 190s 190s $ cd hgrepo 190s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 190s $ hg book master 190s - $ echo beta > beta 190s - $ hg add beta 190s - $ fn_hg_commit -u "test" -m 'add beta' 190s - $ hg push 190s - pushing to $TESTTMP/repo.git 190s - searching for changes 190s - adding objects 190s - remote: found 0 deltas to reuse 190s - added 1 commits with 1 trees and 1 blobs 190s - updating reference refs/heads/master 190s - 190s - $ echo gamma >> beta 190s - $ fn_hg_commit -u "test (comment)" -m 'modify beta' 190s - $ hg push 190s - pushing to $TESTTMP/repo.git 190s - searching for changes 190s - adding objects 190s - remote: found 0 deltas to reuse 190s - added 1 commits with 1 trees and 1 blobs 190s - updating reference refs/heads/master 190s - 190s - $ echo gamma > gamma 190s - $ hg add gamma 190s - $ fn_hg_commit -u "" -m 'add gamma' 190s - $ hg push 190s - pushing to $TESTTMP/repo.git 190s - searching for changes 190s - adding objects 190s - remote: found 0 deltas to reuse 190s - added 1 commits with 1 trees and 1 blobs 190s - updating reference refs/heads/master 190s - 190s - $ echo delta > delta 190s - $ hg add delta 190s - $ fn_hg_commit -u "name" -m 'add delta' 190s - $ hg push 190s - pushing to $TESTTMP/repo.git 190s - searching for changes 190s - adding objects 190s - remote: found 0 deltas to reuse 190s - added 1 commits with 1 trees and 1 blobs 190s - updating reference refs/heads/master 190s - 190s - $ echo epsilon > epsilon 190s - $ hg add epsilon 190s - $ fn_hg_commit -u "name zeta 190s - $ hg add zeta 190s - $ fn_hg_commit -u " test " -m 'add zeta' 190s - $ hg push 190s - pushing to $TESTTMP/repo.git 190s - searching for changes 190s - adding objects 190s - remote: found 0 deltas to reuse 190s - added 1 commits with 1 trees and 1 blobs 190s - updating reference refs/heads/master 190s - 190s - $ echo eta > eta 190s - $ hg add eta 190s - $ fn_hg_commit -u "test < test@example.com >" -m 'add eta' 190s - $ hg push 190s - pushing to $TESTTMP/repo.git 190s - searching for changes 190s - adding objects 190s - remote: found 0 deltas to reuse 190s - added 1 commits with 1 trees and 1 blobs 190s - updating reference refs/heads/master 190s - 190s - $ echo theta > theta 190s - $ hg add theta 190s - $ fn_hg_commit -u "test >test@example.com>" -m 'add theta' 190s - $ hg push 190s - pushing to $TESTTMP/repo.git 190s - searching for changes 190s - adding objects 190s - remote: found 0 deltas to reuse 190s - added 1 commits with 1 trees and 1 blobs 190s - updating reference refs/heads/master 190s - 190s - $ hg log --graph 190s - @ changeset: 8:c5d1976ab12c 190s - | bookmark: master 190s - | tag: default/master 190s - | tag: tip 190s - | user: test >test@example.com> 190s - | date: Mon Jan 01 00:00:18 2007 +0000 190s - | summary: add theta 190s - | 190s - o changeset: 7:0e2fb4d21667 190s - | user: test < test@example.com > 190s - | date: Mon Jan 01 00:00:17 2007 +0000 190s - | summary: add eta 190s - | 190s - o changeset: 6:faa3aae96199 190s - | user: test 190s - | date: Mon Jan 01 00:00:16 2007 +0000 190s - | summary: add zeta 190s - | 190s - o changeset: 5:2cf6ad5a1afc 190s - | user: name 190s - | date: Mon Jan 01 00:00:14 2007 +0000 190s - | summary: add delta 190s - | 190s - o changeset: 3:6b854d65d0d6 190s - | user: 190s - | date: Mon Jan 01 00:00:13 2007 +0000 190s - | summary: add gamma 190s - | 190s - o changeset: 2:46303c652e79 190s - | user: test (comment) 190s - | date: Mon Jan 01 00:00:12 2007 +0000 190s - | summary: modify beta 190s - | 190s - o changeset: 1:47580592d3d6 190s - | user: test 190s - | date: Mon Jan 01 00:00:11 2007 +0000 190s - | summary: add beta 190s - | 190s - o changeset: 0:ff7a2f2d8d70 190s - user: test 190s - date: Mon Jan 01 00:00:10 2007 +0000 190s - summary: add alpha 190s - 190s - 190s - $ cd .. 190s - $ hg clone repo.git hgrepo2 190s - importing 9 git commits 190s - new changesets ff7a2f2d8d70:1fbf3aa91221 (9 drafts) 190s - updating to bookmark master 190s - 8 files updated, 0 files merged, 0 files removed, 0 files unresolved 190s - $ hg -R hgrepo2 log --graph 190s - @ changeset: 8:1fbf3aa91221 190s - | bookmark: master 190s - | tag: default/master 190s - | tag: tip 190s - | user: test ?test@example.com 190s - | date: Mon Jan 01 00:00:18 2007 +0000 190s - | summary: add theta 190s - | 190s - o changeset: 7:20310508f06d 190s - | user: test 190s - | date: Mon Jan 01 00:00:17 2007 +0000 190s - | summary: add eta 190s - | 190s - o changeset: 6:e3d81af8a8c1 190s - | user: test 190s - | date: Mon Jan 01 00:00:16 2007 +0000 190s - | summary: add zeta 190s - | 190s - o changeset: 5:78f609fd208f 190s - | user: name 190s - | date: Mon Jan 01 00:00:15 2007 +0000 190s - | summary: add epsilon 190s - | 190s - o changeset: 4:42fa61d57718 190s - | user: name 190s - | date: Mon Jan 01 00:00:14 2007 +0000 190s - | summary: add delta 190s - | 190s - o changeset: 3:6b854d65d0d6 190s - | user: 190s - | date: Mon Jan 01 00:00:13 2007 +0000 190s - | summary: add gamma 190s - | 190s - o changeset: 2:46303c652e79 190s - | user: test (comment) 190s - | date: Mon Jan 01 00:00:12 2007 +0000 190s - | summary: modify beta 190s - | 190s - o changeset: 1:47580592d3d6 190s - | user: test 190s - | date: Mon Jan 01 00:00:11 2007 +0000 190s - | summary: add beta 190s - | 190s - o changeset: 0:ff7a2f2d8d70 190s - user: test 190s - date: Mon Jan 01 00:00:10 2007 +0000 190s - summary: add alpha 190s - 190s - $ git --git-dir=repo.git log --pretty=medium master 190s - commit 2fe60ba69727981e6ede78be70354c3a9e30e21d 190s - Author: test ?test@example.com 190s - Date: Mon Jan 1 00:00:18 2007 +0000 190s - 190s - add theta 190s - 190s - commit 9f2f7cafdbf2e467928db98de8275141001d3081 190s - Author: test 190s - Date: Mon Jan 1 00:00:17 2007 +0000 190s - 190s - add eta 190s - 190s - commit 172a6f8d8064d73dff7013e395a9fe3cfc3ff807 190s - Author: test 190s - Date: Mon Jan 1 00:00:16 2007 +0000 190s - 190s - add zeta 190s - 190s - commit 71badb8e343a7da391a9b5d98909fbd2ca7d78f2 190s - Author: name 190s - Date: Mon Jan 1 00:00:15 2007 +0000 190s - 190s - add epsilon 190s - 190s - commit 9a9ae7b7f310d4a1a3e732a747ca26f06934f8d8 190s - Author: name 190s - Date: Mon Jan 1 00:00:14 2007 +0000 190s - 190s - add delta 190s - 190s - commit e4149a32e81e380193f59aa8773349201b8ed7f7 190s - Author: 190s - Date: Mon Jan 1 00:00:13 2007 +0000 190s - 190s - add gamma 190s - 190s - commit fae95aef5889a80103c2fbd5d14ff6eb8c9daf93 190s - Author: test ext:(%20%28comment%29) 190s - Date: Mon Jan 1 00:00:12 2007 +0000 190s - 190s - modify beta 190s - 190s - commit 0f378ab6c2c6b5514bd873d3faf8ac4b8095b001 190s - Author: test 190s - Date: Mon Jan 1 00:00:11 2007 +0000 190s - 190s - add beta 190s - 190s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 190s - Author: test 190s - Date: Mon Jan 1 00:00:10 2007 +0000 190s - 190s - add alpha 190s 190s ERROR: test-hg-author.t output changed 190s ! 190s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-subrepos.t 190s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-subrepos.t.err 190s @@ -34,165 +34,8 @@ 190s $ cd .. 190s Ensure gitlinks are transformed to .hgsubstate on hg pull from git 190s $ hg clone -u tip repo.git hgrepo 2>&1 | grep -E -v '^(Cloning into|done)' 190s - importing 3 git commits 190s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 190s - updating to branch default 190s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 190s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 190s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 190s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 190s + abort: repository repo.git not found 190s $ cd hgrepo 190s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 190s $ hg bookmarks -f -r default master 190s -1. Ensure gitlinks are transformed to .hgsubstate on hg <- git pull 190s -.hgsub shall list two [git] subrepos 190s - $ cat .hgsub 190s - subrepo1 = [git]../gitsubrepo 190s - xyz/subrepo2 = [git]../gitsubrepo 190s -.hgsubstate shall list two idenitcal revisions 190s - $ cat .hgsubstate 190s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 190s - 56f0304c5250308f14cfbafdc27bd12d40154d17 xyz/subrepo2 190s -hg status shall NOT report .hgsub and .hgsubstate as untracked - either ignored or unmodified 190s - $ hg status --unknown .hgsub .hgsubstate 190s - $ hg status --modified .hgsub .hgsubstate 190s - $ cd .. 190s - 190s -2. Check gitmodules are preserved during hg -> git push 190s - $ cd gitsubrepo 190s - $ echo gamma > gamma 190s - $ git add gamma 190s - $ fn_git_commit -m 'add gamma' 190s - $ cd .. 190s - $ cd hgrepo 190s - $ cd xyz/subrepo2 190s - $ git pull --ff-only | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| */| /' 190s - From $TESTTMP/gitsubrepo 190s - 56f0304..aabf7cd master -> origin/master 190s - Updating 56f0304..aabf7cd 190s - Fast-forward 190s - gamma | 1 + 190s - 1 file changed, 1 insertion(+) 190s - create mode 100644 gamma 190s - $ cd ../.. 190s - $ echo xxx >> alpha 190s - $ fn_hg_commit -m 'Update subrepo2 from hg' | grep -v "committing subrepository" || true 190s - $ hg push 190s - pushing to $TESTTMP/repo.git 190s - searching for changes 190s - adding objects 190s - remote: found 0 deltas to reuse 190s - added 1 commits with 2 trees and 1 blobs 190s - updating reference refs/heads/master 190s - $ cd .. 190s - $ cd gitrepo 190s - $ git pull --ff-only 190s - From $TESTTMP/repo 190s - 89c22d7..275b0a5 master -> origin/master 190s - Fetching submodule xyz/subrepo2 190s - From $TESTTMP/gitsubrepo 190s - 56f0304..aabf7cd master -> origin/master 190s - Updating 89c22d7..275b0a5 190s - Fast-forward 190s - alpha | 1 + 190s - xyz/subrepo2 | 2 +- 190s - 2 files changed, 2 insertions(+), 1 deletion(-) 190s -there shall be two gitlink entries, with values matching that in .hgsubstate 190s - $ git ls-tree -r HEAD^{tree} | grep 'commit' 190s - 160000 commit 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 190s - 160000 commit aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 190s -bring working copy to HEAD state (it's not bare repo) 190s - $ git reset --hard 190s - HEAD is now at 275b0a5 Update subrepo2 from hg 190s - $ cd .. 190s - 190s -3. Check .hgsub and .hgsubstate from git repository are merged, not overwritten 190s - $ hg init hgsub 190s - $ cd hgsub 190s - $ echo delta > delta 190s - $ hg add delta 190s - $ fn_hg_commit -m "add delta" 190s - $ hg tip --template '{node} hgsub\n' > ../gitrepo/.hgsubstate 190s - $ cat > ../gitrepo/.hgsub < hgsub = ../hgsub 190s - > EOF 190s - $ cd ../gitrepo 190s - $ git add .hgsubstate .hgsub 190s - $ fn_git_commit -m "Test3. Prepare .hgsub and .hgsubstate sources" 190s - $ git push 190s - To $TESTTMP/repo.git 190s - 275b0a5..e31d576 master -> master 190s - 190s - $ cd ../hgrepo 190s - $ hg pull 190s - pulling from $TESTTMP/repo.git 190s - importing 1 git commits 190s - updating bookmark master 190s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 190s - (run 'hg update' to get a working copy) 190s - $ hg checkout -C 190s - updating to active bookmark master 190s - cloning subrepo hgsub from $TESTTMP/hgsub 190s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 190s - $ cd .. 190s -pull shall bring .hgsub entry which was added to the git repo 190s - $ cat hgrepo/.hgsub 190s - hgsub = ../hgsub 190s - subrepo1 = [git]../gitsubrepo 190s - xyz/subrepo2 = [git]../gitsubrepo 190s -.hgsubstate shall list revision of the subrepo added through git repo 190s - $ cat hgrepo/.hgsubstate 190s - 481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub 190s - 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 190s - aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 190s - 190s -4. Try changing the subrepos from the Mercurial side 190s - 190s - $ cd hgrepo 190s - $ cat >> .hgsub < subrepo2 = [git]../gitsubrepo 190s - > EOF 190s - $ git clone ../gitsubrepo subrepo2 190s - Cloning into 'subrepo2'... 190s - done. 190s - $ fn_hg_commit -m 'some stuff' 190s - $ hg push 190s - pushing to $TESTTMP/repo.git 190s - no changes made to subrepo hgsub since last push to $TESTTMP/hgsub 190s - searching for changes 190s - adding objects 190s - remote: found 0 deltas to reuse 190s - added 1 commits with 1 trees and 1 blobs 190s - updating reference refs/heads/master 190s - $ cd .. 190s - 190s -5. But we actually do something quite weird in this case: If a 190s -.gitmodules file exists in the repository, it always wins! In this 190s -case, we break the bidirectional convention, and modify the repository 190s -data. That's odd, so show it: 190s - 190s - $ hg id hgrepo 190s - 42c46c7eef3a default/master/tip master 190s - $ hg clone -U repo.git hgrepo2 190s - importing 6 git commits 190s - new changesets e532b2bfda10:42c46c7eef3a (6 drafts) 190s - $ hg -R hgrepo2 up :master 190s - Cloning into '$TESTTMP/hgrepo2/subrepo1'... 190s - done. 190s - cloning subrepo hgsub from $TESTTMP/hgsub 190s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 190s - checking out detached HEAD in subrepository "subrepo1" 190s - check out a git branch if you intend to make changes 190s - Cloning into '$TESTTMP/hgrepo2/subrepo2'... 190s - done. 190s - Cloning into '$TESTTMP/hgrepo2/xyz/subrepo2'... 190s - done. 190s - cloning subrepo subrepo2 from $TESTTMP/gitsubrepo 190s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 190s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 190s - 190s -We retained bidirectionality! 190s - 190s - $ git diff --stat hgrepo/.hgsub hgrepo2/.hgsub 190s - $ hg id hgrepo 190s - 42c46c7eef3a default/master/tip master 190s - $ hg id hgrepo2 190s - 42c46c7eef3a default/master/tip master 190s 190s ERROR: test-subrepos.t output changed 191s ! 191s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-extra.t 191s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-extra.t.err 191s @@ -12,190 +12,9 @@ 191s 191s $ cd .. 191s $ hg clone gitrepo hgrepo 191s - importing 1 git commits 191s - new changesets aa9eb6424386 (1 drafts) 191s - updating to bookmark not-master 191s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 191s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 191s + abort: repository gitrepo not found 191s + [255] 191s $ cd hgrepo 191s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 191s $ hg mv a b 191s - $ fn_hg_commit -mb 191s - $ hg up 0 191s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 191s - (leaving bookmark not-master) 191s - $ touch c 191s - $ hg add c 191s - $ fn_hg_commit -mc 191s - 191s -Rebase will add a rebase_source 191s - 191s - $ hg --config extensions.rebase= rebase -s 1 -d 2 191s - rebasing 1:4c7da7adf18b * (glob) 191s - saved backup bundle to $TESTTMP/*.hg (glob) 191s - $ hg up 2 191s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 191s - 191s -Add a commit with multiple extra fields 191s - $ hg bookmark b1 191s - $ touch d 191s - $ hg add d 191s - $ fn_hg_commitextra --field zzzzzzz=datazzz --field aaaaaaa=dataaaa 191s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 191s - @ 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 191s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 191s - | 191s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 191s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 191s - | 191s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 191s - | branch=default 191s - | 191s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 191s - branch=default hg-git-rename-source=git 191s - 191s - 191s - $ hg push -r b1 191s - pushing to $TESTTMP/gitrepo 191s - searching for changes 191s - adding objects 191s - remote: found 0 deltas to reuse 191s - added 3 commits with 3 trees and 0 blobs 191s - adding reference refs/heads/b1 191s - 191s - $ hg bookmark b2 191s - $ hg mv c c2 191s - $ hg mv d d2 191s - $ fn_hg_commitextra --field yyyyyyy=datayyy --field bbbbbbb=databbb 191s - 191s -Test some nutty filenames 191s - $ hg book b3 191s -#if windows 191s - $ hg mv c2 'c2 => c3' 191s - abort: filename contains '>', which is reserved on Windows: "c2 => c3" 191s - [255] 191s - $ hg mv c2 c3 191s - $ fn_hg_commit -m 'dummy commit' 191s - $ hg mv c3 c4 191s - $ fn_hg_commit -m 'dummy commit' 191s -#else 191s - $ hg mv c2 'c2 => c3' 191s - warning: filename contains '>', which is reserved on Windows: 'c2 => c3' 191s - $ fn_hg_commit -m 'test filename with arrow' 191s - $ hg mv 'c2 => c3' 'c3 => c4' 191s - warning: filename contains '>', which is reserved on Windows: 'c3 => c4' 191s - $ fn_hg_commit -m 'test filename with arrow 2' 191s - $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" -l 3 --config "experimental.graphstyle.missing=|" 191s - @ 6 bca4ba69a6844c133b069e227dfa043d41e3c197 test filename with arrow 2 191s - | branch=default 191s - | 191s - o 5 864caad1f3493032f8d06f44a89dc9f1c039b09f test filename with arrow 191s - | branch=default 191s - | 191s - o 4 58f855ae26f4930ce857e648d3dd949901cce817 191s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 191s - | 191s -#endif 191s - $ hg push -r b2 -r b3 191s - pushing to $TESTTMP/gitrepo 191s - searching for changes 191s - adding objects 191s - remote: found 0 deltas to reuse 191s - added 3 commits with 3 trees and 0 blobs 191s - adding reference refs/heads/b2 191s - adding reference refs/heads/b3 191s - 191s - $ cd ../gitrepo 191s - $ git cat-file commit b1 191s - tree 1b773a2eb70f29397356f8069c285394835ff85a 191s - parent 54776dace5849bdf273fb26737a48ef64804909d 191s - author test 1167609613 +0000 191s - committer test 1167609613 +0000 191s - HG:extra aaaaaaa:dataaaa 191s - HG:extra zzzzzzz:datazzz 191s - 191s - 191s - 191s - $ git cat-file commit b2 191s - tree 34ad62c6d6ad9464bfe62db5b3d2fa16aaa9fa9e 191s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 191s - author test 1167609614 +0000 191s - committer test 1167609614 +0000 191s - HG:rename c:c2 191s - HG:rename d:d2 191s - HG:extra bbbbbbb:databbb 191s - HG:extra yyyyyyy:datayyy 191s - 191s - 191s - 191s -#if no-windows 191s - $ git cat-file commit b3 191s - tree e63df52695f9b06e54b37e7ef60d0c43994de620 191s - parent 5cafe2555a0666fcf661a3943277a9812a694a98 191s - author test 1167609616 +0000 191s - committer test 1167609616 +0000 191s - HG:rename c2%20%3D%3E%20c3:c3%20%3D%3E%20c4 191s - 191s - test filename with arrow 2 191s -#endif 191s - $ cd ../gitrepo 191s - $ git checkout b1 191s - Switched to branch 'b1' 191s - $ commit_sha=$(git rev-parse HEAD) 191s - $ tree_sha=$(git rev-parse HEAD^{tree}) 191s - 191s -There's no way to create a Git repo with extra metadata via the CLI. Dulwich 191s -lets you do that, though. 191s - 191s - >>> from dulwich.objects import Commit 191s - >>> from dulwich.porcelain import open_repo 191s - >>> repo = open_repo('.') 191s - >>> c = Commit() 191s - >>> c.author = b'test ' 191s - >>> c.author_time = 0 191s - >>> c.author_timezone = 0 191s - >>> c.committer = c.author 191s - >>> c.commit_time = 0 191s - >>> c.commit_timezone = 0 191s - >>> c.parents = [b'$commit_sha'] 191s - >>> c.tree = b'$tree_sha' 191s - >>> c.message = b'extra commit\n' 191s - >>> c.extra.extend([(b'zzz:zzz', b'data:zzz'), (b'aaa:aaa', b'data:aaa'), 191s - ... (b'HG:extra', b'hgaaa:dataaaa'), 191s - ... (b'HG:extra', b'hgzzz:datazzz')]) 191s - >>> repo.object_store.add_object(c) 191s - >>> repo.refs.set_if_equals(b'refs/heads/master', None, c.id) 191s - True 191s - 191s - $ git cat-file commit master 191s - tree 1b773a2eb70f29397356f8069c285394835ff85a 191s - parent 15beadd92324c9b88060a4ec4ffb350f988d7075 191s - author test 0 +0000 191s - committer test 0 +0000 191s - zzz:zzz data:zzz 191s - aaa:aaa data:aaa 191s - HG:extra hgaaa:dataaaa 191s - HG:extra hgzzz:datazzz 191s - 191s - extra commit 191s - 191s - $ cd .. 191s - $ hg clone -qU gitrepo hgrepo2 191s - $ cd hgrepo2 191s - $ hg log -G -r :5 -T "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" 191s - o 5 58f855ae26f4930ce857e648d3dd949901cce817 191s - | bbbbbbb=databbb branch=default yyyyyyy=datayyy 191s - | 191s - | o 4 90acc8c23fcfaeb0930c03c849923a696fd9013c extra commit 191s - |/ GIT0-zzz%3Azzz=data%3Azzz GIT1-aaa%3Aaaa=data%3Aaaa branch=default hgaaa=dataaaa hgzzz=datazzz 191s - | 191s - o 3 f01651cfcc9337fbd9700d5018ca637a2911ed28 191s - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz 191s - | 191s - o 2 03f4cf3c429050e2204fb2bda3a0f93329bdf4fd b 191s - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d 191s - | 191s - o 1 a735dc0cd7cc0ccdbc16cfa4326b19c707c360f4 c 191s - | branch=default 191s - | 191s - o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a 191s - branch=default hg-git-rename-source=git 191s - 191s 191s ERROR: test-extra.t output changed 193s ! 193s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-phases-remote.t 193s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-phases-remote.t.err 193s @@ -26,193 +26,10 @@ 193s $ cd .. 193s 193s $ hg clone --config hggit.usephases=True -U gitrepo hgrepo 193s - importing 4 git commits 193s - new changesets ff7a2f2d8d70:25eed24f5e8f (1 drafts) 193s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 193s + abort: repository gitrepo not found 193s + [255] 193s 193s $ cd hgrepo 193s + $TESTTMP.sh: 48: cd: can't cd to hgrepo 193s $ hg log -G -T '{rev}|{phase}|{bookmarks}|{tags}\n' 193s - o 3|public||thetag tip 193s - | 193s - | o 2|draft|not-master|default/not-master 193s - |/ 193s - | o 1|public|master|default/master 193s - |/ 193s - o 0|public|| 193s - 193s - $ hg phase -r 'all()' | tee $TESTTMP/after-clone 193s - 0: public 193s - 1: public 193s - 2: draft 193s - 3: public 193s - $ cat >> .hg/hgrc < [paths] 193s - > other = $TESTTMP/gitrepo/.git 193s - > other:hg-git.publish = no 193s - > EOF 193s - $ cd .. 193s - 193s -that disables publishing from that remote 193s - 193s - $ cd hgrepo 193s - $ hg phase -fd 'all()' 193s - $ hg pull other 193s - pulling from $TESTTMP/gitrepo/.git 193s - no changes found 193s - $ hg log -qr 'public()' 193s - $ hg pull -v --config hggit.usephases=True other 193s - pulling from $TESTTMP/gitrepo/.git 193s - no changes found 193s - processing commits in batches of 1000 193s - bookmark master is up-to-date 193s - bookmark not-master is up-to-date 193s - $ hg log -qr 'public()' 193s - $ cd .. 193s - 193s -but not default when enable by the global setting 193s - 193s - $ cd hgrepo 193s - $ hg phase -fd 'all()' 193s - no phases changed 193s - $ hg pull -v --config hggit.usephases=True 193s - pulling from $TESTTMP/gitrepo 193s - publishing remote HEAD 193s - publishing tag thetag 193s - no changes found 193s - processing commits in batches of 1000 193s - bookmark master is up-to-date 193s - bookmark not-master is up-to-date 193s - publishing remote HEAD 193s - publishing tag thetag 193s - 3 local changesets published 193s - $ hg phase -r 'all()' > $TESTTMP/after-pull 193s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 193s - $ cd .. 193s - 193s -or the path option 193s - 193s - $ cd hgrepo 193s - $ hg phase -fd 'all()' 193s - $ hg pull -v --config paths.default:hg-git.publish=yes 193s - pulling from $TESTTMP/gitrepo 193s - publishing remote HEAD 193s - publishing tag thetag 193s - no changes found 193s - processing commits in batches of 1000 193s - bookmark master is up-to-date 193s - bookmark not-master is up-to-date 193s - publishing remote HEAD 193s - publishing tag thetag 193s - 3 local changesets published 193s - $ hg phase -r 'all()' > $TESTTMP/after-pull 193s - $ cmp $TESTTMP/after-clone $TESTTMP/after-pull 193s - $ cd .. 193s - 193s -but we can specify individual branches 193s - 193s - $ cd hgrepo 193s - $ hg phase -fd 'all()' 193s - $ hg pull -v --config paths.default:hg-git.publish=not-master 193s - pulling from $TESTTMP/gitrepo 193s - publishing branch not-master 193s - no changes found 193s - processing commits in batches of 1000 193s - bookmark master is up-to-date 193s - bookmark not-master is up-to-date 193s - publishing branch not-master 193s - 2 local changesets published 193s - $ hg phase -r master -r not-master -r thetag 193s - 1: draft 193s - 2: public 193s - 3: draft 193s - $ cd .. 193s - 193s -and we can also specify the tag 193s - 193s - $ cd hgrepo 193s - $ hg phase -fd 'all()' 193s - $ hg pull -v --config paths.default:hg-git.publish=thetag 193s - pulling from $TESTTMP/gitrepo 193s - publishing tag thetag 193s - no changes found 193s - processing commits in batches of 1000 193s - bookmark master is up-to-date 193s - bookmark not-master is up-to-date 193s - publishing tag thetag 193s - 2 local changesets published 193s - $ hg phase -r master -r not-master -r thetag 193s - 1: draft 193s - 2: draft 193s - 3: public 193s - $ cd .. 193s - 193s - 193s -Check multiple paths behavior 193s -============================= 193s - 193s - 193s - $ cd hgrepo 193s - $ cat >> .hg/hgrc < [paths] 193s - > multi:multi-urls = yes 193s - > multi = path://other, path://default 193s - > recursive:multi-urls = yes 193s - > recursive = path://multi, default 193s - > EOF 193s - 193s -Using multiple path works fine: 193s - 193s - 193s - $ hg pull multi --config paths.default:hg-git.publish=yes 193s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 193s - [255] 193s - 193s -Recursive multiple path are tricker, but Mercurial don't work with them either. 193s -This test exist to make sure we bail out on our own. 193s - 193s - 193s -`yes` should abort (until we implement it) 193s - 193s - $ hg pull multi --config paths.default:hg-git.publish=yes 193s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 193s - [255] 193s - 193s -`some-value` should abort (until we implement it) 193s - 193s - $ hg pull multi --config paths.default:hg-git.publish=thetag 193s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 193s - [255] 193s - 193s -`no` is fine 193s - 193s - $ hg pull multi --config paths.default:hg-git.publish=no 193s - abort: cannot use `path://multi`, "multi" is also defined as a `path://` 193s - [255] 193s - 193s - $ cd .. 193s - 193s -Check conflicting paths behavior 193s -================================ 193s - 193s - $ cd hgrepo 193s - $ cat > .hg/hgrc < [paths] 193s - > default = $TESTTMP/gitrepo 193s - > default:hg-git.publish = yes 193s - > also-default = $TESTTMP/gitrepo 193s - > EOF 193s - $ hg pull also-default 193s - pulling from $TESTTMP/gitrepo 193s - abort: different publishing configurations for the same remote location 193s - (conflicting paths: also-default, default) 193s - [255] 193s - $ hg pull --config paths.also-default:hg-git.publish=no 193s - pulling from $TESTTMP/gitrepo 193s - abort: different publishing configurations for the same remote location 193s - (conflicting paths: also-default, default) 193s - [255] 193s - $ hg pull --config paths.also-default:hg-git.publish=true 193s - pulling from $TESTTMP/gitrepo 193s - no changes found 193s - 1 local changesets published 193s - $ cd .. 193s - 193s 193s ERROR: test-phases-remote.t output changed 198s ! 198s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-bookmark-workflow.t 198s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-bookmark-workflow.t.err 198s @@ -42,13 +42,21 @@ 198s 198s Initialize remote hg and git repos with equivalent initial contents 198s $ hg init hgremoterepo 198s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 198s $ cd hgremoterepo 198s $ hg bookmark master 198s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 198s $ for f in alpha beta gamma delta; do 198s > echo $f > $f; hg add $f; hgcommit -m "add $f" 198s > done 198s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 198s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 198s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 198s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 198s $ hg bookmark -r 1 b1 198s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 198s $ hgstate 198s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 198s 3 fc2664cac217 "add delta" bookmarks: [master] 198s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 198s 1 7bcd915dc873 "add beta" bookmarks: [b1] 198s @@ -69,157 +77,19 @@ 198s 198s Cloning transfers all bookmarks from remote to local 198s $ hg clone -q hgremoterepo purehglocalrepo 198s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 198s $ cd purehglocalrepo 198s $ hgstate 198s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 198s 3 fc2664cac217 "add delta" bookmarks: [master] 198s 2 d85ced7ae9d6 "add gamma" bookmarks: [] 198s 1 7bcd915dc873 "add beta" bookmarks: [b1] 198s 0 3442585be8a6 "add alpha" bookmarks: [] 198s $ cd .. 198s $ hg clone -q gitremoterepo hggitlocalrepo --config hggit.usephases=True 198s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 198s + abort: repository gitremoterepo not found 198s + [255] 198s $ cd hggitlocalrepo 198s + $TESTTMP.sh: 78: cd: can't cd to hggitlocalrepo 198s $ hggitstate 198s - 3 03769a650ded 55b133e1d558 "add delta" bookmarks: [master] 198s - 2 ca33a262eb46 d338971a96e2 "add gamma" bookmarks: [] 198s - 1 7fe02317c63d 9497a4ee62e1 "add beta" bookmarks: [b1] 198s - 0 ff7a2f2d8d70 7eeab2ea75ec "add alpha" bookmarks: [] 198s - 198s -Make sure that master is public 198s - $ hg phase -r master 198s - 3: public 198s - $ cd .. 198s - 198s -No changes 198s - $ cd purehglocalrepo 198s - $ hg incoming -B 198s - comparing with $TESTTMP/hgremoterepo 198s - searching for changed bookmarks 198s - no changed bookmarks found 198s - [1] 198s - $ hg outgoing 198s - comparing with $TESTTMP/hgremoterepo 198s - searching for changes 198s - no changes found 198s - [1] 198s - $ hg outgoing -B 198s - comparing with $TESTTMP/hgremoterepo 198s - searching for changed bookmarks 198s - no changed bookmarks found 198s - [1] 198s - $ hg push 198s - pushing to $TESTTMP/hgremoterepo 198s - searching for changes 198s - no changes found 198s - [1] 198s - $ cd .. 198s - $ cd hggitlocalrepo 198s - $ hg incoming -B 198s - comparing with $TESTTMP/gitremoterepo 198s - searching for changed bookmarks 198s - no changed bookmarks found 198s - [1] 198s - $ hg outgoing 198s - comparing with $TESTTMP/gitremoterepo 198s - searching for changes 198s - no changes found 198s - [1] 198s - $ hg outgoing -B 198s - comparing with $TESTTMP/gitremoterepo 198s - searching for changed bookmarks 198s - no changed bookmarks found 198s - [1] 198s - $ hg push 198s - pushing to $TESTTMP/gitremoterepo 198s - searching for changes 198s - no changes found 198s - [1] 198s - $ cd .. 198s - 198s -Bookmarks on existing revs: 198s -- change b1 on local repo 198s -- introduce b2 on local repo 198s -- introduce b3 on remote repo 198s -Bookmarks on new revs 198s -- introduce b4 on a new rev on the remote 198s - $ cd hgremoterepo 198s - $ hg bookmark -r master b3 198s - $ hg bookmark -r master b4 198s - $ hg update -q b4 198s - $ echo epsilon > epsilon; hg add epsilon; hgcommit -m 'add epsilon' 198s - $ hgstate 198s - 4 d979bb8e0fbb "add epsilon" bookmarks: [b4] 198s - 3 fc2664cac217 "add delta" bookmarks: [b3 master] 198s - 2 d85ced7ae9d6 "add gamma" bookmarks: [] 198s - 1 7bcd915dc873 "add beta" bookmarks: [b1] 198s - 0 3442585be8a6 "add alpha" bookmarks: [] 198s - $ cd .. 198s - $ cd purehglocalrepo 198s - $ hg bookmark -fr 2 b1 198s - $ hg bookmark -r 0 b2 198s - $ hgstate 198s - 3 fc2664cac217 "add delta" bookmarks: [master] 198s - 2 d85ced7ae9d6 "add gamma" bookmarks: [b1] 198s - 1 7bcd915dc873 "add beta" bookmarks: [] 198s - 0 3442585be8a6 "add alpha" bookmarks: [b2] 198s - $ hg incoming -B 198s - comparing with $TESTTMP/hgremoterepo 198s - searching for changed bookmarks 198s - b3 fc2664cac217 198s - b4 d979bb8e0fbb 198s - $ hg outgoing 198s - comparing with $TESTTMP/hgremoterepo 198s - searching for changes 198s - no changes found 198s - [1] 198s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 198s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 198s -This changed in 3.4 to start showing changed and deleted bookmarks again. 198s - $ hg outgoing -B | grep -v -E -w 'b1|b3|b4' 198s - comparing with $TESTTMP/hgremoterepo 198s - searching for changed bookmarks 198s - b2 3442585be8a6 198s - $ cd .. 198s - 198s - $ cd gitremoterepo 198s - $ git branch b3 master 198s - $ git checkout -b b4 master 198s - Switched to a new branch 'b4' 198s - $ echo epsilon > epsilon 198s - $ git add epsilon 198s - $ gitcommit -m 'add epsilon' 198s - $ gitstate 198s - fcfd2c0 "add epsilon" refs: (*b4) (glob) 198s - 55b133e "add delta" refs: (master, b3) 198s - d338971 "add gamma" refs: 198s - 9497a4e "add beta" refs: (b1) 198s - 7eeab2e "add alpha" refs: 198s - $ cd .. 198s - $ cd hggitlocalrepo 198s - $ hg bookmark -fr 2 b1 198s - $ hg bookmark -r 0 b2 198s - $ hgstate 198s - 3 03769a650ded "add delta" bookmarks: [master] 198s - 2 ca33a262eb46 "add gamma" bookmarks: [b1] 198s - 1 7fe02317c63d "add beta" bookmarks: [] 198s - 0 ff7a2f2d8d70 "add alpha" bookmarks: [b2] 198s - $ hg incoming -B 198s - comparing with $TESTTMP/gitremoterepo 198s - searching for changed bookmarks 198s - b3 03769a650ded 198s - b4 fcfd2c0262db 198s - $ hg outgoing 198s - comparing with $TESTTMP/gitremoterepo 198s - searching for changes 198s - no changes found 198s - [1] 198s -As of 2.3, Mercurial's outgoing -B doesn't actually show changed bookmarks 198s -It only shows "new" bookmarks. Thus, b1 doesn't show up. 198s -This changed in 3.4 to start showing changed and deleted bookmarks again. 198s - $ hg outgoing -B 198s - comparing with $TESTTMP/gitremoterepo 198s - searching for changed bookmarks 198s - b1 ca33a262eb46 198s - b2 ff7a2f2d8d70 198s - b3 198s - b4 198s - $ cd .. 198s 198s ERROR: test-bookmark-workflow.t output changed 199s ! 199s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-octopus.t 199s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-octopus.t.err 199s @@ -62,111 +62,9 @@ 199s $ git init -q --bare repo.git 199s 199s $ hg clone gitrepo hgrepo 199s - importing 8 git commits 199s - new changesets ff7a2f2d8d70:307506d6ae8a (10 drafts) 199s - updating to bookmark master 199s - 6 files updated, 0 files merged, 0 files removed, 0 files unresolved 199s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 199s + abort: repository gitrepo not found 199s + [255] 199s $ cd hgrepo 199s + $TESTTMP.sh: 64: cd: can't cd to hgrepo 199s $ hg log --graph --style compact | sed 's/\[.*\]//g' 199s - @ 9:7,8 307506d6ae8a 2007-01-01 00:00 +0000 test 199s - |\ Merge branches 'branch3' and 'branch4' 199s - | | 199s - | o 8:3,4 2b07220e422e 2007-01-01 00:00 +0000 test 199s - | |\ Merge branches 'branch3' and 'branch4' 199s - | | | 199s - o | | 7:5,6 ccf2d65d982c 2007-01-01 00:00 +0000 test 199s - |\ \ \ Merge branches 'branch1' and 'branch2' 199s - | | | | 199s - | o | | 6:1,2 690b40256117 2007-01-01 00:00 +0000 test 199s - | |\ \ \ Merge branches 'branch1' and 'branch2' 199s - | | | | | 199s - o | | | | 5:0 e459c0629ca4 2007-01-01 00:00 +0000 test 199s - | | | | | add delta 199s - | | | | | 199s - +-------o 4:0 e857c9a04474 2007-01-01 00:00 +0000 test 199s - | | | | add zeta 199s - | | | | 199s - +-----o 3:0 0071dec0de0e 2007-01-01 00:00 +0000 test 199s - | | | add epsilon 199s - | | | 199s - +---o 2:0 205a004356ef 2007-01-01 00:00 +0000 test 199s - | | add gamma 199s - | | 199s - | o 1 7fe02317c63d 2007-01-01 00:00 +0000 test 199s - |/ add beta 199s - | 199s - o 0 ff7a2f2d8d70 2007-01-01 00:00 +0000 test 199s - add alpha 199s - 199s - $ hg gverify -r 9 199s - verifying rev 307506d6ae8a against git commit b32ff845df61df998206b630e4370a44f9b36845 199s - $ hg gverify -r 8 199s - abort: no git commit found for rev 2b07220e422e 199s - (if this is an octopus merge, verify against the last rev) 199s - [255] 199s - 199s - $ hg debug-remove-hggit-state 199s - clearing out the git cache data 199s - $ hg push ../repo.git 199s - pushing to ../repo.git 199s - searching for changes 199s - adding objects 199s - remote: found 0 deltas to reuse 199s - added 8 commits with 8 trees and 6 blobs 199s - adding reference refs/heads/branch1 199s - adding reference refs/heads/branch2 199s - adding reference refs/heads/branch3 199s - adding reference refs/heads/branch4 199s - adding reference refs/heads/master 199s - $ cd .. 199s - 199s - $ git --git-dir=repo.git log --pretty=medium | sed s/\\.\\.\\.//g 199s - commit b32ff845df61df998206b630e4370a44f9b36845 199s - Merge: 9ac68f9 7e9cd9f e695849 199s - Author: test 199s - Date: Mon Jan 1 00:00:15 2007 +0000 199s - 199s - Merge branches 'branch3' and 'branch4' 199s - 199s - commit 9ac68f982ae7426d9597ff16c74afb4e6053c582 199s - Merge: d40f375 9497a4e e5023f9 199s - Author: test 199s - Date: Mon Jan 1 00:00:15 2007 +0000 199s - 199s - Merge branches 'branch1' and 'branch2' 199s - 199s - commit d40f375a81b7d033e92cbad89487115fe2dd472f 199s - Author: test 199s - Date: Mon Jan 1 00:00:15 2007 +0000 199s - 199s - add delta 199s - 199s - commit e695849087f6c320c1a447620492b29a82ca41b1 199s - Author: test 199s - Date: Mon Jan 1 00:00:14 2007 +0000 199s - 199s - add zeta 199s - 199s - commit 7e9cd9f90b6d2c60579375eb796ce706d2d8bbe6 199s - Author: test 199s - Date: Mon Jan 1 00:00:13 2007 +0000 199s - 199s - add epsilon 199s - 199s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 199s - Author: test 199s - Date: Mon Jan 1 00:00:12 2007 +0000 199s - 199s - add gamma 199s - 199s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 199s - Author: test 199s - Date: Mon Jan 1 00:00:11 2007 +0000 199s - 199s - add beta 199s - 199s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 199s - Author: test 199s - Date: Mon Jan 1 00:00:10 2007 +0000 199s - 199s - add alpha 199s 199s ERROR: test-octopus.t output changed 201s ! 201s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-clone.t 201s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-clone.t#draft.err 201s @@ -38,60 +38,42 @@ 201s clone a tag 201s 201s $ hg clone -r alpha gitrepo hgrepo-a 201s - importing 1 git commits 201s - new changesets ff7a2f2d8d70 (1 drafts) 201s - updating to branch default 201s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository gitrepo not found 201s + [255] 201s $ hg -R hgrepo-a bookmarks 201s - master 0:ff7a2f2d8d70 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-a not found 201s + [255] 201s $ hg -R hgrepo-a log --graph --template=phases 201s - @ changeset: 0:ff7a2f2d8d70 201s - bookmark: master 201s - tag: alpha 201s - tag: default/master 201s - tag: tip 201s - phase: draft 201s - user: test 201s - date: Mon Jan 01 00:00:10 2007 +0000 201s - summary: add alpha 201s - 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-a not found 201s + [255] 201s $ git --git-dir hgrepo-a/.hg/git for-each-ref 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 201s + fatal: not a git repository: 'hgrepo-a/.hg/git' 201s + [128] 201s Make sure this is still draft since we didn't pull remote's HEAD 201s $ hg -R hgrepo-a phase -r alpha 201s - 0: draft 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-a not found 201s + [255] 201s 201s clone a branch 201s $ hg clone -r beta gitrepo hgrepo-b 201s - importing 2 git commits 201s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 201s - updating to branch default 201s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository gitrepo not found 201s + [255] 201s $ hg -R hgrepo-b bookmarks 201s - * beta 1:7fe02317c63d 201s - master 0:ff7a2f2d8d70 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-b not found 201s + [255] 201s $ hg -R hgrepo-b log --graph 201s - @ changeset: 1:7fe02317c63d 201s - | bookmark: beta 201s - | tag: default/beta 201s - | tag: tip 201s - | user: test 201s - | date: Mon Jan 01 00:00:11 2007 +0000 201s - | summary: add beta 201s - | 201s - o changeset: 0:ff7a2f2d8d70 201s - bookmark: master 201s - tag: alpha 201s - tag: default/master 201s - user: test 201s - date: Mon Jan 01 00:00:10 2007 +0000 201s - summary: add alpha 201s - 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-b not found 201s + [255] 201s $ git --git-dir hgrepo-b/.hg/git for-each-ref 201s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 201s + fatal: not a git repository: 'hgrepo-b/.hg/git' 201s + [128] 201s 201s Make sure that a deleted .hgsubstate does not confuse hg-git 201s 201s @@ -104,48 +86,50 @@ 201s $ cd .. 201s 201s $ hg clone -r beta gitrepo hgrepo-c 201s - importing 4 git commits 201s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 201s - updating to branch default 201s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository gitrepo not found 201s + [255] 201s $ hg -R hgrepo-c bookmarks 201s - * beta 3:47d12948785d 201s - master 0:ff7a2f2d8d70 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-c not found 201s + [255] 201s $ hg --cwd hgrepo-c status 201s + abort: No such file or directory: 'hgrepo-c' 201s + [255] 201s $ git --git-dir hgrepo-c/.hg/git for-each-ref 201s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 201s + fatal: not a git repository: 'hgrepo-c/.hg/git' 201s + [128] 201s 201s test shared repositories 201s 201s $ hg clone gitrepo hgrepo-base 201s - importing 5 git commits 201s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 201s - updating to bookmark beta 201s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository gitrepo not found 201s + [255] 201s $ hg -R hgrepo-base bookmarks 201s - * beta 4:47d12948785d 201s - gamma 2:ca33a262eb46 201s - master 0:ff7a2f2d8d70 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-base not found 201s + [255] 201s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 201s - updating working directory 201s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-base not found 201s + [255] 201s $ hg -R hgrepo-shared pull gitrepo 201s - pulling from gitrepo 201s - no changes found 201s - adding bookmark beta 201s - adding bookmark gamma 201s - adding bookmark master 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-shared not found 201s + [255] 201s $ hg -R hgrepo-shared push gitrepo 201s - pushing to gitrepo 201s - searching for changes 201s - no changes found 201s - [1] 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-shared not found 201s + [255] 201s $ ls hgrepo-shared/.hg | grep git 201s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 201s [1] 201s $ hg -R hgrepo-shared git-cleanup 201s - git commit map cleaned 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + hg: unknown command 'git-cleanup' 201s + (did you mean clean?) 201s + [10] 201s $ rm -rf hgrepo-base hgrepo-shared 201s 201s test cloning HEAD 201s @@ -154,23 +138,21 @@ 201s $ git checkout -q master 201s $ cd .. 201s $ hg clone gitrepo hgrepo-2 201s - importing 5 git commits 201s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 201s - updating to bookmark master 201s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository gitrepo not found 201s + [255] 201s $ git --git-dir hgrepo-2/.hg/git for-each-ref 201s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 201s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 201s + fatal: not a git repository: 'hgrepo-2/.hg/git' 201s + [128] 201s $ rm -rf hgrepo-2 201s 201s clone empty repo 201s $ git init empty 201s Initialized empty Git repository in $TESTTMP/empty/.git/ 201s $ hg clone empty emptyhg 201s - updating to branch default 201s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository empty not found 201s + [255] 201s $ rm -rf empty emptyhg 201s 201s test cloning detached HEAD, but pointing to a branch; we detect this 201s @@ -180,25 +162,20 @@ 201s $ git checkout -q -d master 201s $ cd .. 201s $ hg clone gitrepo hgrepo-2 201s - importing 5 git commits 201s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 201s - updating to bookmark master 201s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository gitrepo not found 201s + [255] 201s $ hg -R hgrepo-2 book 201s - beta 4:47d12948785d 201s - gamma 2:ca33a262eb46 201s - * master 0:ff7a2f2d8d70 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-2 not found 201s + [255] 201s $ hg -R hgrepo-2 tags -v 201s - tip 4:47d12948785d 201s - default/beta 4:47d12948785d git-remote 201s - default/gamma 2:ca33a262eb46 git-remote 201s - default/master 0:ff7a2f2d8d70 git-remote 201s - alpha 0:ff7a2f2d8d70 git 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-2 not found 201s + [255] 201s $ git --git-dir hgrepo-2/.hg/git for-each-ref 201s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 201s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 201s + fatal: not a git repository: 'hgrepo-2/.hg/git' 201s + [128] 201s $ rm -rf hgrepo-2 201s 201s test cloning fully detached HEAD; we don't convert the 201s @@ -212,44 +189,45 @@ 201s $ fn_git_commit -m 'add delta' 201s $ cd .. 201s $ hg clone gitrepo hgrepo-2 201s - importing 5 git commits 201s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 201s - warning: the git source repository has a detached head 201s - (you may want to update to a bookmark) 201s - updating to branch default 201s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository gitrepo not found 201s + [255] 201s $ hg -R hgrepo-2 book 201s - beta 4:47d12948785d 201s - gamma 2:ca33a262eb46 201s - master 0:ff7a2f2d8d70 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-2 not found 201s + [255] 201s $ hg -R hgrepo-2 id --tags 201s - default/beta tip 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-2 not found 201s + [255] 201s $ git --git-dir hgrepo-2/.hg/git for-each-ref 201s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 201s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 201s + fatal: not a git repository: 'hgrepo-2/.hg/git' 201s + [128] 201s $ rm -rf hgrepo-2 201s 201s test that cloning a regular mercurial repository does not introduce 201s git state 201s 201s $ hg init hgrepo-base 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s $ cd hgrepo-base 201s $ touch flaf 201s $ fn_hg_commit -A -m flaf 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s $ cd .. 201s $ hg clone -U hgrepo-base hgrepo-copy 201s requesting all changes (secret !) 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s $ ls hgrepo-copy/.hg | grep git 201s [1] 201s $ hg clone -U --pull hgrepo-base hgrepo-pull 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s requesting all changes 201s - adding changesets (draft !) 201s - adding manifests (draft !) 201s - adding file changes (draft !) 201s - added 1 changesets with 1 changes to 1 files (draft !) 201s - new changesets 76c919376257 (draft !) 201s + adding changesets 201s + adding manifests 201s + adding file changes 201s + added 1 changesets with 1 changes to 1 files 201s + new changesets 76c919376257 201s $ ls hgrepo-pull | grep git 201s [1] 201s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 201s 201s ERROR: test-clone.t#draft output changed 201s ! 201s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-clone.t 201s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-clone.t#secret.err 201s @@ -38,60 +38,42 @@ 201s clone a tag 201s 201s $ hg clone -r alpha gitrepo hgrepo-a 201s - importing 1 git commits 201s - new changesets ff7a2f2d8d70 (1 drafts) 201s - updating to branch default 201s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository gitrepo not found 201s + [255] 201s $ hg -R hgrepo-a bookmarks 201s - master 0:ff7a2f2d8d70 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-a not found 201s + [255] 201s $ hg -R hgrepo-a log --graph --template=phases 201s - @ changeset: 0:ff7a2f2d8d70 201s - bookmark: master 201s - tag: alpha 201s - tag: default/master 201s - tag: tip 201s - phase: draft 201s - user: test 201s - date: Mon Jan 01 00:00:10 2007 +0000 201s - summary: add alpha 201s - 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-a not found 201s + [255] 201s $ git --git-dir hgrepo-a/.hg/git for-each-ref 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 201s + fatal: not a git repository: 'hgrepo-a/.hg/git' 201s + [128] 201s Make sure this is still draft since we didn't pull remote's HEAD 201s $ hg -R hgrepo-a phase -r alpha 201s - 0: draft 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-a not found 201s + [255] 201s 201s clone a branch 201s $ hg clone -r beta gitrepo hgrepo-b 201s - importing 2 git commits 201s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 201s - updating to branch default 201s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository gitrepo not found 201s + [255] 201s $ hg -R hgrepo-b bookmarks 201s - * beta 1:7fe02317c63d 201s - master 0:ff7a2f2d8d70 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-b not found 201s + [255] 201s $ hg -R hgrepo-b log --graph 201s - @ changeset: 1:7fe02317c63d 201s - | bookmark: beta 201s - | tag: default/beta 201s - | tag: tip 201s - | user: test 201s - | date: Mon Jan 01 00:00:11 2007 +0000 201s - | summary: add beta 201s - | 201s - o changeset: 0:ff7a2f2d8d70 201s - bookmark: master 201s - tag: alpha 201s - tag: default/master 201s - user: test 201s - date: Mon Jan 01 00:00:10 2007 +0000 201s - summary: add alpha 201s - 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-b not found 201s + [255] 201s $ git --git-dir hgrepo-b/.hg/git for-each-ref 201s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 201s + fatal: not a git repository: 'hgrepo-b/.hg/git' 201s + [128] 201s 201s Make sure that a deleted .hgsubstate does not confuse hg-git 201s 201s @@ -104,48 +86,50 @@ 201s $ cd .. 201s 201s $ hg clone -r beta gitrepo hgrepo-c 201s - importing 4 git commits 201s - new changesets ff7a2f2d8d70:47d12948785d (4 drafts) 201s - updating to branch default 201s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository gitrepo not found 201s + [255] 201s $ hg -R hgrepo-c bookmarks 201s - * beta 3:47d12948785d 201s - master 0:ff7a2f2d8d70 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-c not found 201s + [255] 201s $ hg --cwd hgrepo-c status 201s + abort: No such file or directory: 'hgrepo-c' 201s + [255] 201s $ git --git-dir hgrepo-c/.hg/git for-each-ref 201s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 201s + fatal: not a git repository: 'hgrepo-c/.hg/git' 201s + [128] 201s 201s test shared repositories 201s 201s $ hg clone gitrepo hgrepo-base 201s - importing 5 git commits 201s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 201s - updating to bookmark beta 201s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository gitrepo not found 201s + [255] 201s $ hg -R hgrepo-base bookmarks 201s - * beta 4:47d12948785d 201s - gamma 2:ca33a262eb46 201s - master 0:ff7a2f2d8d70 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-base not found 201s + [255] 201s $ hg --config extensions.share= share hgrepo-base hgrepo-shared 201s - updating working directory 201s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-base not found 201s + [255] 201s $ hg -R hgrepo-shared pull gitrepo 201s - pulling from gitrepo 201s - no changes found 201s - adding bookmark beta 201s - adding bookmark gamma 201s - adding bookmark master 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-shared not found 201s + [255] 201s $ hg -R hgrepo-shared push gitrepo 201s - pushing to gitrepo 201s - searching for changes 201s - no changes found 201s - [1] 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-shared not found 201s + [255] 201s $ ls hgrepo-shared/.hg | grep git 201s + ls: cannot access 'hgrepo-shared/.hg': No such file or directory 201s [1] 201s $ hg -R hgrepo-shared git-cleanup 201s - git commit map cleaned 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + hg: unknown command 'git-cleanup' 201s + (did you mean clean?) 201s + [10] 201s $ rm -rf hgrepo-base hgrepo-shared 201s 201s test cloning HEAD 201s @@ -154,23 +138,21 @@ 201s $ git checkout -q master 201s $ cd .. 201s $ hg clone gitrepo hgrepo-2 201s - importing 5 git commits 201s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 201s - updating to bookmark master 201s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository gitrepo not found 201s + [255] 201s $ git --git-dir hgrepo-2/.hg/git for-each-ref 201s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 201s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 201s + fatal: not a git repository: 'hgrepo-2/.hg/git' 201s + [128] 201s $ rm -rf hgrepo-2 201s 201s clone empty repo 201s $ git init empty 201s Initialized empty Git repository in $TESTTMP/empty/.git/ 201s $ hg clone empty emptyhg 201s - updating to branch default 201s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository empty not found 201s + [255] 201s $ rm -rf empty emptyhg 201s 201s test cloning detached HEAD, but pointing to a branch; we detect this 201s @@ -180,25 +162,20 @@ 201s $ git checkout -q -d master 201s $ cd .. 201s $ hg clone gitrepo hgrepo-2 201s - importing 5 git commits 201s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 201s - updating to bookmark master 201s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository gitrepo not found 201s + [255] 201s $ hg -R hgrepo-2 book 201s - beta 4:47d12948785d 201s - gamma 2:ca33a262eb46 201s - * master 0:ff7a2f2d8d70 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-2 not found 201s + [255] 201s $ hg -R hgrepo-2 tags -v 201s - tip 4:47d12948785d 201s - default/beta 4:47d12948785d git-remote 201s - default/gamma 2:ca33a262eb46 git-remote 201s - default/master 0:ff7a2f2d8d70 git-remote 201s - alpha 0:ff7a2f2d8d70 git 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-2 not found 201s + [255] 201s $ git --git-dir hgrepo-2/.hg/git for-each-ref 201s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 201s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 201s + fatal: not a git repository: 'hgrepo-2/.hg/git' 201s + [128] 201s $ rm -rf hgrepo-2 201s 201s test cloning fully detached HEAD; we don't convert the 201s @@ -212,44 +189,45 @@ 201s $ fn_git_commit -m 'add delta' 201s $ cd .. 201s $ hg clone gitrepo hgrepo-2 201s - importing 5 git commits 201s - new changesets ff7a2f2d8d70:47d12948785d (5 drafts) 201s - warning: the git source repository has a detached head 201s - (you may want to update to a bookmark) 201s - updating to branch default 201s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository gitrepo not found 201s + [255] 201s $ hg -R hgrepo-2 book 201s - beta 4:47d12948785d 201s - gamma 2:ca33a262eb46 201s - master 0:ff7a2f2d8d70 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-2 not found 201s + [255] 201s $ hg -R hgrepo-2 id --tags 201s - default/beta tip 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + abort: repository hgrepo-2 not found 201s + [255] 201s $ git --git-dir hgrepo-2/.hg/git for-each-ref 201s - b5329119ed77cb37a31fe523621d684eb55779a4 commit refs/remotes/default/beta 201s - d338971a96e20113bb980a5dc4355ba77eed3714 commit refs/remotes/default/gamma 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 201s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/alpha 201s + fatal: not a git repository: 'hgrepo-2/.hg/git' 201s + [128] 201s $ rm -rf hgrepo-2 201s 201s test that cloning a regular mercurial repository does not introduce 201s git state 201s 201s $ hg init hgrepo-base 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s $ cd hgrepo-base 201s $ touch flaf 201s $ fn_hg_commit -A -m flaf 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s $ cd .. 201s $ hg clone -U hgrepo-base hgrepo-copy 201s - requesting all changes (secret !) 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s + requesting all changes 201s $ ls hgrepo-copy/.hg | grep git 201s [1] 201s $ hg clone -U --pull hgrepo-base hgrepo-pull 201s - requesting all changes 201s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 201s adding changesets (draft !) 201s adding manifests (draft !) 201s adding file changes (draft !) 201s added 1 changesets with 1 changes to 1 files (draft !) 201s new changesets 76c919376257 (draft !) 201s + requesting all changes 201s $ ls hgrepo-pull | grep git 201s [1] 201s $ rm -r hgrepo-base hgrepo-copy hgrepo-pull 201s 201s ERROR: test-clone.t#secret output changed 203s ! 203s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-outgoing.t 203s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-outgoing.t.err 203s @@ -14,166 +14,10 @@ 203s 203s $ cd .. 203s $ hg clone gitrepo hgrepo 203s - importing 1 git commits 203s - new changesets ff7a2f2d8d70 (1 drafts) 203s - updating to bookmark master 203s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 203s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 203s + abort: repository gitrepo not found 203s + [255] 203s 203s $ cd hgrepo 203s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 203s $ hg book 203s - alpha 0:ff7a2f2d8d70 203s - * master 0:ff7a2f2d8d70 203s - $ hg update -q master 203s - $ echo beta > beta 203s - $ hg add beta 203s - $ fn_hg_commit -m 'add beta' 203s - 203s - 203s - $ echo gamma > gamma 203s - $ hg add gamma 203s - $ fn_hg_commit -m 'add gamma' 203s - 203s - $ hg book -r 1 beta 203s - 203s - $ hg outgoing | grep -v 'searching for changes' 203s - comparing with $TESTTMP/gitrepo 203s - changeset: 1:47580592d3d6 203s - bookmark: beta 203s - user: test 203s - date: Mon Jan 01 00:00:11 2007 +0000 203s - summary: add beta 203s - 203s - changeset: 2:953796e1cfd8 203s - bookmark: master 203s - tag: tip 203s - user: test 203s - date: Mon Jan 01 00:00:12 2007 +0000 203s - summary: add gamma 203s - 203s - $ hg outgoing -r beta 203s - comparing with $TESTTMP/gitrepo 203s - searching for changes 203s - changeset: 1:47580592d3d6 203s - bookmark: beta 203s - user: test 203s - date: Mon Jan 01 00:00:11 2007 +0000 203s - summary: add beta 203s - 203s - $ hg outgoing -r master 203s - comparing with $TESTTMP/gitrepo 203s - searching for changes 203s - changeset: 1:47580592d3d6 203s - bookmark: beta 203s - user: test 203s - date: Mon Jan 01 00:00:11 2007 +0000 203s - summary: add beta 203s - 203s - changeset: 2:953796e1cfd8 203s - bookmark: master 203s - tag: tip 203s - user: test 203s - date: Mon Jan 01 00:00:12 2007 +0000 203s - summary: add gamma 203s - 203s - 203s - $ cd .. 203s - 203s -some more work on master from git 203s - $ cd gitrepo 203s - 203s -Check state of refs after outgoing 203s - $ git show-ref 203s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/alpha 203s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/master 203s - 203s - $ git checkout master 2>&1 | sed s/\'/\"/g 203s - Already on "master" 203s - $ echo delta > delta 203s - $ git add delta 203s - $ fn_git_commit -m "add delta" 203s - 203s - $ cd .. 203s - 203s - $ cd hgrepo 203s -this will fail # maybe we should try to make it work 203s - $ hg outgoing 203s - comparing with $TESTTMP/gitrepo 203s - abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing 203s - [255] 203s -let's pull and try again 203s - $ hg pull 203s - pulling from */gitrepo (glob) 203s - importing 1 git commits 203s - not updating diverged bookmark master 203s - new changesets 25eed24f5e8f (1 drafts) 203s - (run 'hg heads' to see heads, 'hg merge' to merge) 203s - $ hg log --graph 203s - o changeset: 3:25eed24f5e8f 203s - | tag: default/master 203s - | tag: tip 203s - | parent: 0:ff7a2f2d8d70 203s - | user: test 203s - | date: Mon Jan 01 00:00:13 2007 +0000 203s - | summary: add delta 203s - | 203s - | @ changeset: 2:953796e1cfd8 203s - | | bookmark: master 203s - | | user: test 203s - | | date: Mon Jan 01 00:00:12 2007 +0000 203s - | | summary: add gamma 203s - | | 203s - | o changeset: 1:47580592d3d6 203s - |/ bookmark: beta 203s - | user: test 203s - | date: Mon Jan 01 00:00:11 2007 +0000 203s - | summary: add beta 203s - | 203s - o changeset: 0:ff7a2f2d8d70 203s - bookmark: alpha 203s - tag: default/alpha 203s - user: test 203s - date: Mon Jan 01 00:00:10 2007 +0000 203s - summary: add alpha 203s - 203s - $ hg outgoing 203s - comparing with $TESTTMP/gitrepo 203s - searching for changes 203s - changeset: 1:47580592d3d6 203s - bookmark: beta 203s - user: test 203s - date: Mon Jan 01 00:00:11 2007 +0000 203s - summary: add beta 203s - 203s - changeset: 2:953796e1cfd8 203s - bookmark: master 203s - user: test 203s - date: Mon Jan 01 00:00:12 2007 +0000 203s - summary: add gamma 203s - 203s - $ hg outgoing -r beta 203s - comparing with $TESTTMP/gitrepo 203s - searching for changes 203s - changeset: 1:47580592d3d6 203s - bookmark: beta 203s - user: test 203s - date: Mon Jan 01 00:00:11 2007 +0000 203s - summary: add beta 203s - 203s - $ hg outgoing -r master 203s - comparing with $TESTTMP/gitrepo 203s - searching for changes 203s - changeset: 1:47580592d3d6 203s - bookmark: beta 203s - user: test 203s - date: Mon Jan 01 00:00:11 2007 +0000 203s - summary: add beta 203s - 203s - changeset: 2:953796e1cfd8 203s - bookmark: master 203s - user: test 203s - date: Mon Jan 01 00:00:12 2007 +0000 203s - summary: add gamma 203s - 203s - 203s - 203s - $ cd .. 203s 203s ERROR: test-outgoing.t output changed 206s ! 206s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-pull.t 206s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-pull.t#draft.err 206s @@ -35,153 +35,132 @@ 206s 206s pull without a name 206s $ hg init hgrepo 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s $ cd hgrepo 206s $ hg pull ../gitrepo 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s pulling from ../gitrepo 206s - importing 3 git commits 206s - adding bookmark beta 206s - adding bookmark delta 206s - adding bookmark master 206s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 206s - (run 'hg heads' to see heads, 'hg merge' to merge) 206s + abort: repository ../gitrepo not found 206s + [255] 206s $ git --git-dir .hg/git for-each-ref 206s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 206s + fatal: not a git repository: '.hg/git' 206s + [128] 206s $ hg log -Tp 206s - 2|draft|delta|tip 206s - 1|draft|beta| 206s - 0|draft|master|t_alpha 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s $ cd .. 206s $ rm -rf hgrepo 206s 206s pull with an implied name 206s $ hg init hgrepo 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s $ cd hgrepo 206s $ echo "[paths]" >> .hg/hgrc 206s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 206s $ hg pull ../gitrepo 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s pulling from ../gitrepo 206s - importing 3 git commits 206s - adding bookmark beta 206s - adding bookmark delta 206s - adding bookmark master 206s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 206s - (run 'hg heads' to see heads, 'hg merge' to merge) 206s + abort: repository ../gitrepo not found 206s + [255] 206s $ git --git-dir .hg/git for-each-ref 206s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 206s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 206s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 206s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 206s + fatal: not a git repository: '.hg/git' 206s + [128] 206s $ hg log -Tp 206s - 2|draft|delta|default/delta tip 206s - 1|draft|beta|default/beta 206s - 0|draft|master|default/master t_alpha 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s $ cd .. 206s $ rm -rf hgrepo 206s 206s pull with an explicit name 206s $ hg init hgrepo 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s $ cd hgrepo 206s $ echo "[paths]" >> .hg/hgrc 206s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 206s $ hg pull 206s - pulling from $TESTTMP/gitrepo 206s - importing 3 git commits 206s - adding bookmark beta 206s - adding bookmark delta 206s - adding bookmark master 206s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 206s - (run 'hg heads' to see heads, 'hg merge' to merge) 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + pulling from $TESTTMP/gitrepo 206s + abort: repository $TESTTMP/gitrepo not found 206s + [255] 206s $ git --git-dir .hg/git for-each-ref 206s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 206s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 206s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 206s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 206s + fatal: not a git repository: '.hg/git' 206s + [128] 206s $ hg log -Tp 206s - 2|draft|delta|default/delta tip 206s - 1|draft|beta|default/beta 206s - 0|draft|master|default/master t_alpha 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s $ cd .. 206s $ rm -rf hgrepo 206s 206s pull a tag 206s $ hg init hgrepo 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s $ echo "[paths]" >> hgrepo/.hg/hgrc 206s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 206s $ hg -R hgrepo pull -r t_alpha 206s - pulling from $TESTTMP/gitrepo 206s - importing 1 git commits 206s - adding bookmark master 206s - new changesets ff7a2f2d8d70 (1 drafts) 206s - (run 'hg update' to get a working copy) 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + pulling from $TESTTMP/gitrepo 206s + abort: repository $TESTTMP/gitrepo not found 206s + [255] 206s $ hg -R hgrepo update t_alpha 206s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + abort: unknown revision 't_alpha' 206s + [10] 206s $ hg log -Tp -R hgrepo 206s - 0|draft|master|default/master t_alpha tip 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s 206s no-op pull 206s $ hg -R hgrepo pull -r t_alpha 206s - pulling from $TESTTMP/gitrepo 206s - no changes found 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + pulling from $TESTTMP/gitrepo 206s + abort: repository $TESTTMP/gitrepo not found 206s + [255] 206s 206s no-op pull with added bookmark 206s $ cd gitrepo 206s $ git checkout -qb epsilon t_alpha 206s $ cd .. 206s $ hg -R hgrepo pull -r epsilon 206s - pulling from $TESTTMP/gitrepo 206s - no changes found 206s - adding bookmark epsilon 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + pulling from $TESTTMP/gitrepo 206s + abort: repository $TESTTMP/gitrepo not found 206s + [255] 206s 206s pull something that doesn't exist 206s $ hg -R hgrepo pull -r kaflaflibob 206s - pulling from $TESTTMP/gitrepo 206s - abort: unknown revision 'kaflaflibob'!? (re) 206s - [10] 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + pulling from $TESTTMP/gitrepo 206s + abort: repository $TESTTMP/gitrepo not found 206s + [255] 206s 206s pull an ambiguous reference 206s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 206s $ hg -R hgrepo pull -r t_alpha 206s - pulling from $TESTTMP/gitrepo 206s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 206s - [10] 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + pulling from $TESTTMP/gitrepo 206s + abort: repository $TESTTMP/gitrepo not found 206s + [255] 206s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 206s 206s pull a branch 206s $ hg -R hgrepo pull -r beta 206s - pulling from $TESTTMP/gitrepo 206s - importing 1 git commits 206s - adding bookmark beta 206s - new changesets 7fe02317c63d (1 drafts) 206s - (run 'hg update' to get a working copy) 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + pulling from $TESTTMP/gitrepo 206s + abort: repository $TESTTMP/gitrepo not found 206s + [255] 206s $ hg -R hgrepo log --graph --template=phases 206s - o changeset: 1:7fe02317c63d 206s - | bookmark: beta 206s - | tag: default/beta 206s - | tag: tip 206s - | phase: draft 206s - | user: test 206s - | date: Mon Jan 01 00:00:11 2007 +0000 206s - | summary: add beta 206s - | 206s - @ changeset: 0:ff7a2f2d8d70 206s - bookmark: epsilon 206s - bookmark: master 206s - tag: default/epsilon 206s - tag: default/master 206s - tag: t_alpha 206s - phase: draft 206s - user: test 206s - date: Mon Jan 01 00:00:10 2007 +0000 206s - summary: add alpha 206s - 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s 206s no-op pull should affect phases 206s $ hg -R hgrepo phase -fs beta 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + abort: unknown revision 'beta' 206s + [10] 206s $ hg -R hgrepo pull -r beta 206s - pulling from $TESTTMP/gitrepo 206s - no changes found 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + pulling from $TESTTMP/gitrepo 206s + abort: repository $TESTTMP/gitrepo not found 206s + [255] 206s $ hg -R hgrepo phase beta 206s - 1: draft 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + abort: unknown revision 'beta' 206s + [10] 206s 206s 206s add another commit and tag to the git repo 206s @@ -196,50 +175,12 @@ 206s 206s pull everything else 206s $ hg -R hgrepo pull 206s - pulling from $TESTTMP/gitrepo 206s - importing 2 git commits 206s - adding bookmark delta 206s - updating bookmark master 206s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 206s - (run 'hg heads' to see heads, 'hg merge' to merge) 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + pulling from $TESTTMP/gitrepo 206s + abort: repository $TESTTMP/gitrepo not found 206s + [255] 206s $ hg -R hgrepo log --graph --template=phases 206s - o changeset: 3:6f898ad1f3e1 206s - | bookmark: master 206s - | tag: default/master 206s - | tag: tip 206s - | phase: draft 206s - | parent: 0:ff7a2f2d8d70 206s - | user: test 206s - | date: Mon Jan 01 00:00:13 2007 +0000 206s - | summary: add gamma 206s - | 206s - | o changeset: 2:678ebee93e38 206s - |/ bookmark: delta 206s - | tag: default/delta 206s - | phase: draft 206s - | parent: 0:ff7a2f2d8d70 206s - | user: test 206s - | date: Mon Jan 01 00:00:12 2007 +0000 206s - | summary: add delta 206s - | 206s - | o changeset: 1:7fe02317c63d 206s - |/ bookmark: beta 206s - | tag: default/beta 206s - | tag: t_beta 206s - | phase: draft 206s - | user: test 206s - | date: Mon Jan 01 00:00:11 2007 +0000 206s - | summary: add beta 206s - | 206s - @ changeset: 0:ff7a2f2d8d70 206s - bookmark: epsilon 206s - tag: default/epsilon 206s - tag: t_alpha 206s - phase: draft 206s - user: test 206s - date: Mon Jan 01 00:00:10 2007 +0000 206s - summary: add alpha 206s - 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s add a merge to the git repo, and delete the branch 206s $ cd gitrepo 206s $ git merge -q -m "Merge branch 'beta'" beta 206s @@ -252,60 +193,26 @@ 206s 206s pull the merge 206s $ hg -R hgrepo tags | grep default/beta 206s - default/beta 1:7fe02317c63d 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + [1] 206s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 206s - pulling from $TESTTMP/gitrepo 206s - importing 1 git commits 206s - updating bookmark master 206s - deleting bookmark beta 206s - new changesets a02330f767a4 (1 drafts) 206s - (run 'hg update' to get a working copy) 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + pulling from $TESTTMP/gitrepo 206s + abort: repository $TESTTMP/gitrepo not found 206s + [255] 206s $ hg -R hgrepo tags | grep default/beta 206s - default/beta 1:7fe02317c63d 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + [1] 206s $ hg -R hgrepo pull 206s - pulling from $TESTTMP/gitrepo 206s - no changes found 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + pulling from $TESTTMP/gitrepo 206s + abort: repository $TESTTMP/gitrepo not found 206s + [255] 206s $ hg -R hgrepo tags | grep default/beta 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s [1] 206s $ hg -R hgrepo log --graph 206s - o changeset: 4:a02330f767a4 206s - |\ bookmark: master 206s - | | tag: default/master 206s - | | tag: tip 206s - | | parent: 3:6f898ad1f3e1 206s - | | parent: 1:7fe02317c63d 206s - | | user: test 206s - | | date: Mon Jan 01 00:00:13 2007 +0000 206s - | | summary: Merge branch 'beta' 206s - | | 206s - | o changeset: 3:6f898ad1f3e1 206s - | | parent: 0:ff7a2f2d8d70 206s - | | user: test 206s - | | date: Mon Jan 01 00:00:13 2007 +0000 206s - | | summary: add gamma 206s - | | 206s - | | o changeset: 2:678ebee93e38 206s - | |/ bookmark: delta 206s - | | tag: default/delta 206s - | | parent: 0:ff7a2f2d8d70 206s - | | user: test 206s - | | date: Mon Jan 01 00:00:12 2007 +0000 206s - | | summary: add delta 206s - | | 206s - o | changeset: 1:7fe02317c63d 206s - |/ tag: t_beta 206s - | user: test 206s - | date: Mon Jan 01 00:00:11 2007 +0000 206s - | summary: add beta 206s - | 206s - @ changeset: 0:ff7a2f2d8d70 206s - bookmark: epsilon 206s - tag: default/epsilon 206s - tag: t_alpha 206s - user: test 206s - date: Mon Jan 01 00:00:10 2007 +0000 206s - summary: add alpha 206s - 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s pull with wildcards 206s $ cd gitrepo 206s $ git checkout -qb releases/v1 master 206s @@ -324,66 +231,12 @@ 206s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 206s $ cd .. 206s $ hg -R hgrepo pull -r 'releases/*' 206s - pulling from $TESTTMP/gitrepo 206s - importing 2 git commits 206s - adding bookmark releases/v1 206s - adding bookmark releases/v2 206s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 206s - (run 'hg heads .' to see heads, 'hg merge' to merge) 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + pulling from $TESTTMP/gitrepo 206s + abort: repository $TESTTMP/gitrepo not found 206s + [255] 206s $ hg -R hgrepo log --graph 206s - o changeset: 6:a3f95e150b0a 206s - | bookmark: releases/v2 206s - | tag: default/releases/v2 206s - | tag: tip 206s - | parent: 4:a02330f767a4 206s - | user: test 206s - | date: Mon Jan 01 00:00:15 2007 +0000 206s - | summary: add eta 206s - | 206s - | o changeset: 5:218b2d0660d3 206s - |/ bookmark: releases/v1 206s - | tag: default/releases/v1 206s - | user: test 206s - | date: Mon Jan 01 00:00:14 2007 +0000 206s - | summary: add zeta 206s - | 206s - o changeset: 4:a02330f767a4 206s - |\ bookmark: master 206s - | | tag: default/master 206s - | | parent: 3:6f898ad1f3e1 206s - | | parent: 1:7fe02317c63d 206s - | | user: test 206s - | | date: Mon Jan 01 00:00:13 2007 +0000 206s - | | summary: Merge branch 'beta' 206s - | | 206s - | o changeset: 3:6f898ad1f3e1 206s - | | parent: 0:ff7a2f2d8d70 206s - | | user: test 206s - | | date: Mon Jan 01 00:00:13 2007 +0000 206s - | | summary: add gamma 206s - | | 206s - | | o changeset: 2:678ebee93e38 206s - | |/ bookmark: delta 206s - | | tag: default/delta 206s - | | parent: 0:ff7a2f2d8d70 206s - | | user: test 206s - | | date: Mon Jan 01 00:00:12 2007 +0000 206s - | | summary: add delta 206s - | | 206s - o | changeset: 1:7fe02317c63d 206s - |/ tag: t_beta 206s - | user: test 206s - | date: Mon Jan 01 00:00:11 2007 +0000 206s - | summary: add beta 206s - | 206s - @ changeset: 0:ff7a2f2d8d70 206s - bookmark: epsilon 206s - tag: default/epsilon 206s - tag: t_alpha 206s - user: test 206s - date: Mon Jan 01 00:00:10 2007 +0000 206s - summary: add alpha 206s - 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s 206s add old and new commits to the git repo -- make sure we're using the commit date 206s and not the author date 206s @@ -412,21 +265,19 @@ 206s Master is now filtered, so it's just stays there: 206s 206s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 206s - pulling from $TESTTMP/gitrepo 206s - no changes found 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + pulling from $TESTTMP/gitrepo 206s + abort: repository $TESTTMP/gitrepo not found 206s + [255] 206s $ hg -R hgrepo pull 206s - pulling from $TESTTMP/gitrepo 206s - no changes found 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + pulling from $TESTTMP/gitrepo 206s + abort: repository $TESTTMP/gitrepo not found 206s + [255] 206s $ hg -R hgrepo log -r master 206s - changeset: 4:a02330f767a4 206s - bookmark: master 206s - tag: default/master 206s - parent: 3:6f898ad1f3e1 206s - parent: 1:7fe02317c63d 206s - user: test 206s - date: Mon Jan 01 00:00:13 2007 +0000 206s - summary: Merge branch 'beta' 206s - 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + abort: unknown revision 'master' 206s + [10] 206s 206s $ cd gitrepo 206s $ git checkout -q master 206s @@ -440,51 +291,13 @@ 206s > git tag -a -m 'tagging newtag' newtag 206s $ cd .. 206s $ hg -R hgrepo pull 206s - pulling from $TESTTMP/gitrepo 206s - importing 3 git commits 206s - updating bookmark master 206s - new changesets 49713da8f665:e103a73f33be (3 drafts) 206s - (run 'hg heads .' to see heads, 'hg merge' to merge) 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + pulling from $TESTTMP/gitrepo 206s + abort: repository $TESTTMP/gitrepo not found 206s + [255] 206s $ hg -R hgrepo heads 206s - changeset: 9:e103a73f33be 206s - bookmark: master 206s - tag: default/master 206s - tag: tip 206s - user: test 206s - date: Wed Jan 01 00:00:00 2014 +0000 206s - summary: newcommit 206s - 206s - changeset: 7:49713da8f665 206s - tag: newtag 206s - tag: oldtag 206s - parent: 4:a02330f767a4 206s - user: test 206s - date: Sat Mar 01 00:00:00 2014 +0000 206s - summary: oldtag 206s - 206s - changeset: 6:a3f95e150b0a 206s - bookmark: releases/v2 206s - tag: default/releases/v2 206s - parent: 4:a02330f767a4 206s - user: test 206s - date: Mon Jan 01 00:00:15 2007 +0000 206s - summary: add eta 206s - 206s - changeset: 5:218b2d0660d3 206s - bookmark: releases/v1 206s - tag: default/releases/v1 206s - user: test 206s - date: Mon Jan 01 00:00:14 2007 +0000 206s - summary: add zeta 206s - 206s - changeset: 2:678ebee93e38 206s - bookmark: delta 206s - tag: default/delta 206s - parent: 0:ff7a2f2d8d70 206s - user: test 206s - date: Mon Jan 01 00:00:12 2007 +0000 206s - summary: add delta 206s - 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + [1] 206s 206s test for ssh vulnerability 206s 206s @@ -494,18 +307,21 @@ 206s > EOF 206s 206s $ hg init a 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s $ cd a 206s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 206s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 206s [255] 206s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 206s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 206s [255] 206s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 206s - ssh: * fakehost%7?shellcommand* (glob) 206s - abort: git remote error: The remote server unexpectedly closed the connection. 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 206s [255] 206s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 206s - ssh: * fakehost%7?shellcommand* (glob) 206s - abort: git remote error: The remote server unexpectedly closed the connection. 206s - [255] 206s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 206s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 206s + [255] 206s 206s ERROR: test-pull.t#draft output changed 207s ! 207s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-pull.t 207s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-pull.t#secret.err 207s @@ -35,153 +35,132 @@ 207s 207s pull without a name 207s $ hg init hgrepo 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s $ cd hgrepo 207s $ hg pull ../gitrepo 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s pulling from ../gitrepo 207s - importing 3 git commits 207s - adding bookmark beta 207s - adding bookmark delta 207s - adding bookmark master 207s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 207s - (run 'hg heads' to see heads, 'hg merge' to merge) 207s + abort: repository ../gitrepo not found 207s + [255] 207s $ git --git-dir .hg/git for-each-ref 207s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 207s + fatal: not a git repository: '.hg/git' 207s + [128] 207s $ hg log -Tp 207s - 2|draft|delta|tip 207s - 1|draft|beta| 207s - 0|draft|master|t_alpha 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s $ cd .. 207s $ rm -rf hgrepo 207s 207s pull with an implied name 207s $ hg init hgrepo 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s $ cd hgrepo 207s $ echo "[paths]" >> .hg/hgrc 207s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 207s $ hg pull ../gitrepo 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s pulling from ../gitrepo 207s - importing 3 git commits 207s - adding bookmark beta 207s - adding bookmark delta 207s - adding bookmark master 207s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 207s - (run 'hg heads' to see heads, 'hg merge' to merge) 207s + abort: repository ../gitrepo not found 207s + [255] 207s $ git --git-dir .hg/git for-each-ref 207s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 207s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 207s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 207s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 207s + fatal: not a git repository: '.hg/git' 207s + [128] 207s $ hg log -Tp 207s - 2|draft|delta|default/delta tip 207s - 1|draft|beta|default/beta 207s - 0|draft|master|default/master t_alpha 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s $ cd .. 207s $ rm -rf hgrepo 207s 207s pull with an explicit name 207s $ hg init hgrepo 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s $ cd hgrepo 207s $ echo "[paths]" >> .hg/hgrc 207s $ echo "default=$TESTTMP/gitrepo" >> .hg/hgrc 207s $ hg pull 207s - pulling from $TESTTMP/gitrepo 207s - importing 3 git commits 207s - adding bookmark beta 207s - adding bookmark delta 207s - adding bookmark master 207s - new changesets ff7a2f2d8d70:678ebee93e38 (3 drafts) 207s - (run 'hg heads' to see heads, 'hg merge' to merge) 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + pulling from $TESTTMP/gitrepo 207s + abort: repository $TESTTMP/gitrepo not found 207s + [255] 207s $ git --git-dir .hg/git for-each-ref 207s - 9497a4ee62e16ee641860d7677cdb2589ea15554 commit refs/remotes/default/beta 207s - 8cbeb817785fe2676ab0eda570534702b6b6f9cf commit refs/remotes/default/delta 207s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/remotes/default/master 207s - 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 commit refs/tags/t_alpha 207s + fatal: not a git repository: '.hg/git' 207s + [128] 207s $ hg log -Tp 207s - 2|draft|delta|default/delta tip 207s - 1|draft|beta|default/beta 207s - 0|draft|master|default/master t_alpha 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s $ cd .. 207s $ rm -rf hgrepo 207s 207s pull a tag 207s $ hg init hgrepo 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s $ echo "[paths]" >> hgrepo/.hg/hgrc 207s $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc 207s $ hg -R hgrepo pull -r t_alpha 207s - pulling from $TESTTMP/gitrepo 207s - importing 1 git commits 207s - adding bookmark master 207s - new changesets ff7a2f2d8d70 (1 drafts) 207s - (run 'hg update' to get a working copy) 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + pulling from $TESTTMP/gitrepo 207s + abort: repository $TESTTMP/gitrepo not found 207s + [255] 207s $ hg -R hgrepo update t_alpha 207s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + abort: unknown revision 't_alpha' 207s + [10] 207s $ hg log -Tp -R hgrepo 207s - 0|draft|master|default/master t_alpha tip 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s 207s no-op pull 207s $ hg -R hgrepo pull -r t_alpha 207s - pulling from $TESTTMP/gitrepo 207s - no changes found 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + pulling from $TESTTMP/gitrepo 207s + abort: repository $TESTTMP/gitrepo not found 207s + [255] 207s 207s no-op pull with added bookmark 207s $ cd gitrepo 207s $ git checkout -qb epsilon t_alpha 207s $ cd .. 207s $ hg -R hgrepo pull -r epsilon 207s - pulling from $TESTTMP/gitrepo 207s - no changes found 207s - adding bookmark epsilon 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + pulling from $TESTTMP/gitrepo 207s + abort: repository $TESTTMP/gitrepo not found 207s + [255] 207s 207s pull something that doesn't exist 207s $ hg -R hgrepo pull -r kaflaflibob 207s - pulling from $TESTTMP/gitrepo 207s - abort: unknown revision 'kaflaflibob'!? (re) 207s - [10] 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + pulling from $TESTTMP/gitrepo 207s + abort: repository $TESTTMP/gitrepo not found 207s + [255] 207s 207s pull an ambiguous reference 207s $ GIT_DIR=gitrepo/.git git branch t_alpha t_alpha 207s $ hg -R hgrepo pull -r t_alpha 207s - pulling from $TESTTMP/gitrepo 207s - abort: ambiguous reference t_alpha: refs/heads/t_alpha, refs/tags/t_alpha!? (re) 207s - [10] 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + pulling from $TESTTMP/gitrepo 207s + abort: repository $TESTTMP/gitrepo not found 207s + [255] 207s $ GIT_DIR=gitrepo/.git git branch -qD t_alpha 207s 207s pull a branch 207s $ hg -R hgrepo pull -r beta 207s - pulling from $TESTTMP/gitrepo 207s - importing 1 git commits 207s - adding bookmark beta 207s - new changesets 7fe02317c63d (1 drafts) 207s - (run 'hg update' to get a working copy) 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + pulling from $TESTTMP/gitrepo 207s + abort: repository $TESTTMP/gitrepo not found 207s + [255] 207s $ hg -R hgrepo log --graph --template=phases 207s - o changeset: 1:7fe02317c63d 207s - | bookmark: beta 207s - | tag: default/beta 207s - | tag: tip 207s - | phase: draft 207s - | user: test 207s - | date: Mon Jan 01 00:00:11 2007 +0000 207s - | summary: add beta 207s - | 207s - @ changeset: 0:ff7a2f2d8d70 207s - bookmark: epsilon 207s - bookmark: master 207s - tag: default/epsilon 207s - tag: default/master 207s - tag: t_alpha 207s - phase: draft 207s - user: test 207s - date: Mon Jan 01 00:00:10 2007 +0000 207s - summary: add alpha 207s - 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s 207s no-op pull should affect phases 207s $ hg -R hgrepo phase -fs beta 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + abort: unknown revision 'beta' 207s + [10] 207s $ hg -R hgrepo pull -r beta 207s - pulling from $TESTTMP/gitrepo 207s - no changes found 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + pulling from $TESTTMP/gitrepo 207s + abort: repository $TESTTMP/gitrepo not found 207s + [255] 207s $ hg -R hgrepo phase beta 207s - 1: draft 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + abort: unknown revision 'beta' 207s + [10] 207s 207s 207s add another commit and tag to the git repo 207s @@ -196,50 +175,12 @@ 207s 207s pull everything else 207s $ hg -R hgrepo pull 207s - pulling from $TESTTMP/gitrepo 207s - importing 2 git commits 207s - adding bookmark delta 207s - updating bookmark master 207s - new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) 207s - (run 'hg heads' to see heads, 'hg merge' to merge) 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + pulling from $TESTTMP/gitrepo 207s + abort: repository $TESTTMP/gitrepo not found 207s + [255] 207s $ hg -R hgrepo log --graph --template=phases 207s - o changeset: 3:6f898ad1f3e1 207s - | bookmark: master 207s - | tag: default/master 207s - | tag: tip 207s - | phase: draft 207s - | parent: 0:ff7a2f2d8d70 207s - | user: test 207s - | date: Mon Jan 01 00:00:13 2007 +0000 207s - | summary: add gamma 207s - | 207s - | o changeset: 2:678ebee93e38 207s - |/ bookmark: delta 207s - | tag: default/delta 207s - | phase: draft 207s - | parent: 0:ff7a2f2d8d70 207s - | user: test 207s - | date: Mon Jan 01 00:00:12 2007 +0000 207s - | summary: add delta 207s - | 207s - | o changeset: 1:7fe02317c63d 207s - |/ bookmark: beta 207s - | tag: default/beta 207s - | tag: t_beta 207s - | phase: draft 207s - | user: test 207s - | date: Mon Jan 01 00:00:11 2007 +0000 207s - | summary: add beta 207s - | 207s - @ changeset: 0:ff7a2f2d8d70 207s - bookmark: epsilon 207s - tag: default/epsilon 207s - tag: t_alpha 207s - phase: draft 207s - user: test 207s - date: Mon Jan 01 00:00:10 2007 +0000 207s - summary: add alpha 207s - 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s add a merge to the git repo, and delete the branch 207s $ cd gitrepo 207s $ git merge -q -m "Merge branch 'beta'" beta 207s @@ -252,60 +193,26 @@ 207s 207s pull the merge 207s $ hg -R hgrepo tags | grep default/beta 207s - default/beta 1:7fe02317c63d 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + [1] 207s $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false 207s - pulling from $TESTTMP/gitrepo 207s - importing 1 git commits 207s - updating bookmark master 207s - deleting bookmark beta 207s - new changesets a02330f767a4 (1 drafts) 207s - (run 'hg update' to get a working copy) 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + pulling from $TESTTMP/gitrepo 207s + abort: repository $TESTTMP/gitrepo not found 207s + [255] 207s $ hg -R hgrepo tags | grep default/beta 207s - default/beta 1:7fe02317c63d 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + [1] 207s $ hg -R hgrepo pull 207s - pulling from $TESTTMP/gitrepo 207s - no changes found 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + pulling from $TESTTMP/gitrepo 207s + abort: repository $TESTTMP/gitrepo not found 207s + [255] 207s $ hg -R hgrepo tags | grep default/beta 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s [1] 207s $ hg -R hgrepo log --graph 207s - o changeset: 4:a02330f767a4 207s - |\ bookmark: master 207s - | | tag: default/master 207s - | | tag: tip 207s - | | parent: 3:6f898ad1f3e1 207s - | | parent: 1:7fe02317c63d 207s - | | user: test 207s - | | date: Mon Jan 01 00:00:13 2007 +0000 207s - | | summary: Merge branch 'beta' 207s - | | 207s - | o changeset: 3:6f898ad1f3e1 207s - | | parent: 0:ff7a2f2d8d70 207s - | | user: test 207s - | | date: Mon Jan 01 00:00:13 2007 +0000 207s - | | summary: add gamma 207s - | | 207s - | | o changeset: 2:678ebee93e38 207s - | |/ bookmark: delta 207s - | | tag: default/delta 207s - | | parent: 0:ff7a2f2d8d70 207s - | | user: test 207s - | | date: Mon Jan 01 00:00:12 2007 +0000 207s - | | summary: add delta 207s - | | 207s - o | changeset: 1:7fe02317c63d 207s - |/ tag: t_beta 207s - | user: test 207s - | date: Mon Jan 01 00:00:11 2007 +0000 207s - | summary: add beta 207s - | 207s - @ changeset: 0:ff7a2f2d8d70 207s - bookmark: epsilon 207s - tag: default/epsilon 207s - tag: t_alpha 207s - user: test 207s - date: Mon Jan 01 00:00:10 2007 +0000 207s - summary: add alpha 207s - 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s pull with wildcards 207s $ cd gitrepo 207s $ git checkout -qb releases/v1 master 207s @@ -324,66 +231,12 @@ 207s ensure that releases/v1 and releases/v2 are pulled but not notreleases/v1 207s $ cd .. 207s $ hg -R hgrepo pull -r 'releases/*' 207s - pulling from $TESTTMP/gitrepo 207s - importing 2 git commits 207s - adding bookmark releases/v1 207s - adding bookmark releases/v2 207s - new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) 207s - (run 'hg heads .' to see heads, 'hg merge' to merge) 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + pulling from $TESTTMP/gitrepo 207s + abort: repository $TESTTMP/gitrepo not found 207s + [255] 207s $ hg -R hgrepo log --graph 207s - o changeset: 6:a3f95e150b0a 207s - | bookmark: releases/v2 207s - | tag: default/releases/v2 207s - | tag: tip 207s - | parent: 4:a02330f767a4 207s - | user: test 207s - | date: Mon Jan 01 00:00:15 2007 +0000 207s - | summary: add eta 207s - | 207s - | o changeset: 5:218b2d0660d3 207s - |/ bookmark: releases/v1 207s - | tag: default/releases/v1 207s - | user: test 207s - | date: Mon Jan 01 00:00:14 2007 +0000 207s - | summary: add zeta 207s - | 207s - o changeset: 4:a02330f767a4 207s - |\ bookmark: master 207s - | | tag: default/master 207s - | | parent: 3:6f898ad1f3e1 207s - | | parent: 1:7fe02317c63d 207s - | | user: test 207s - | | date: Mon Jan 01 00:00:13 2007 +0000 207s - | | summary: Merge branch 'beta' 207s - | | 207s - | o changeset: 3:6f898ad1f3e1 207s - | | parent: 0:ff7a2f2d8d70 207s - | | user: test 207s - | | date: Mon Jan 01 00:00:13 2007 +0000 207s - | | summary: add gamma 207s - | | 207s - | | o changeset: 2:678ebee93e38 207s - | |/ bookmark: delta 207s - | | tag: default/delta 207s - | | parent: 0:ff7a2f2d8d70 207s - | | user: test 207s - | | date: Mon Jan 01 00:00:12 2007 +0000 207s - | | summary: add delta 207s - | | 207s - o | changeset: 1:7fe02317c63d 207s - |/ tag: t_beta 207s - | user: test 207s - | date: Mon Jan 01 00:00:11 2007 +0000 207s - | summary: add beta 207s - | 207s - @ changeset: 0:ff7a2f2d8d70 207s - bookmark: epsilon 207s - tag: default/epsilon 207s - tag: t_alpha 207s - user: test 207s - date: Mon Jan 01 00:00:10 2007 +0000 207s - summary: add alpha 207s - 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s 207s add old and new commits to the git repo -- make sure we're using the commit date 207s and not the author date 207s @@ -412,21 +265,19 @@ 207s Master is now filtered, so it's just stays there: 207s 207s $ hg -R hgrepo pull --config git.pull-prune-bookmarks=no 207s - pulling from $TESTTMP/gitrepo 207s - no changes found 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + pulling from $TESTTMP/gitrepo 207s + abort: repository $TESTTMP/gitrepo not found 207s + [255] 207s $ hg -R hgrepo pull 207s - pulling from $TESTTMP/gitrepo 207s - no changes found 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + pulling from $TESTTMP/gitrepo 207s + abort: repository $TESTTMP/gitrepo not found 207s + [255] 207s $ hg -R hgrepo log -r master 207s - changeset: 4:a02330f767a4 207s - bookmark: master 207s - tag: default/master 207s - parent: 3:6f898ad1f3e1 207s - parent: 1:7fe02317c63d 207s - user: test 207s - date: Mon Jan 01 00:00:13 2007 +0000 207s - summary: Merge branch 'beta' 207s - 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + abort: unknown revision 'master' 207s + [10] 207s 207s $ cd gitrepo 207s $ git checkout -q master 207s @@ -440,51 +291,13 @@ 207s > git tag -a -m 'tagging newtag' newtag 207s $ cd .. 207s $ hg -R hgrepo pull 207s - pulling from $TESTTMP/gitrepo 207s - importing 3 git commits 207s - updating bookmark master 207s - new changesets 49713da8f665:e103a73f33be (3 drafts) 207s - (run 'hg heads .' to see heads, 'hg merge' to merge) 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + pulling from $TESTTMP/gitrepo 207s + abort: repository $TESTTMP/gitrepo not found 207s + [255] 207s $ hg -R hgrepo heads 207s - changeset: 9:e103a73f33be 207s - bookmark: master 207s - tag: default/master 207s - tag: tip 207s - user: test 207s - date: Wed Jan 01 00:00:00 2014 +0000 207s - summary: newcommit 207s - 207s - changeset: 7:49713da8f665 207s - tag: newtag 207s - tag: oldtag 207s - parent: 4:a02330f767a4 207s - user: test 207s - date: Sat Mar 01 00:00:00 2014 +0000 207s - summary: oldtag 207s - 207s - changeset: 6:a3f95e150b0a 207s - bookmark: releases/v2 207s - tag: default/releases/v2 207s - parent: 4:a02330f767a4 207s - user: test 207s - date: Mon Jan 01 00:00:15 2007 +0000 207s - summary: add eta 207s - 207s - changeset: 5:218b2d0660d3 207s - bookmark: releases/v1 207s - tag: default/releases/v1 207s - user: test 207s - date: Mon Jan 01 00:00:14 2007 +0000 207s - summary: add zeta 207s - 207s - changeset: 2:678ebee93e38 207s - bookmark: delta 207s - tag: default/delta 207s - parent: 0:ff7a2f2d8d70 207s - user: test 207s - date: Mon Jan 01 00:00:12 2007 +0000 207s - summary: add delta 207s - 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + [1] 207s 207s test for ssh vulnerability 207s 207s @@ -494,18 +307,21 @@ 207s > EOF 207s 207s $ hg init a 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s $ cd a 207s $ hg pull -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 207s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 207s [255] 207s $ hg pull -q 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 207s - abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + abort: repository git+ssh://-oProxyCommand%3Drm%20nonexistent/path not found 207s [255] 207s $ hg pull -q 'git+ssh://fakehost|shellcommand/path' 207s - ssh: * fakehost%7?shellcommand* (glob) 207s - abort: git remote error: The remote server unexpectedly closed the connection. 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 207s [255] 207s $ hg pull -q 'git+ssh://fakehost%7Cshellcommand/path' 207s - ssh: * fakehost%7?shellcommand* (glob) 207s - abort: git remote error: The remote server unexpectedly closed the connection. 207s - [255] 207s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 207s + abort: repository git+ssh://fakehost%7Cshellcommand/path not found 207s + [255] 207s 207s ERROR: test-pull.t#secret output changed 209s ! 209s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-hook.t 209s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-hook.t.err 209s @@ -10,6 +10,7 @@ 209s > fn_${1}_commit -m $2 209s > } 209s $ hg init hgrepo 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ cd hgrepo 209s $ cat > .hg/hgrc < [hooks] 209s @@ -22,7 +23,10 @@ 209s > incoming = python:testlib.hooks.showargs 209s > EOF 209s $ fn_commit hg a 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ hg book master 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s 209s $ git init -q --bare ../repo.git 209s $ cat >> .hg/hgrc < master 209s + * [new branch] master -> master 209s $ cd ../hgrepo 209s 209s Hooks on pull? 209s 209s $ hg pull -u 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s pulling from $TESTTMP/repo.git 209s - | gitimport.source=pull 209s - | gitimport.git=True 209s - | gitimport.names=[b'default'] 209s - | gitimport.refs={b'HEAD': b'1dab31e7bc9691ba42a2fe7b14680694770bc527', b'refs/heads/master': b'1dab31e7bc9691ba42a2fe7b14680694770bc527'} 209s - | gitimport.heads=None 209s - importing 2 git commits 209s - : pretxncommit 209s - | incoming.git=True 209s - | incoming.source=pull 209s - | incoming.node=382ad5fa1d7727210384d40fa1539af52ca632c5 209s - | incoming.git_node=92150d1529ccaea34a6b36fe4144993193080499 209s - : pretxncommit 209s - | incoming.git=True 209s - | incoming.source=pull 209s - | incoming.node=892115eea5c32152e09ae4013c9a119d7b534049 209s - | incoming.git_node=1dab31e7bc9691ba42a2fe7b14680694770bc527 209s - updating bookmark master 209s - | changegroup.source=push 209s - | changegroup.git=True 209s - | changegroup.node=382ad5fa1d7727210384d40fa1539af52ca632c5 209s - | changegroup.node_last=892115eea5c32152e09ae4013c9a119d7b534049 209s - new changesets 382ad5fa1d77:892115eea5c3 (2 drafts) 209s - updating to active bookmark master 209s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 209s + abort: repository $TESTTMP/repo.git not found 209s + [255] 209s 209s Hooks on push? 209s 209s $ fn_commit hg d 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ fn_commit hg e 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ hg push 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s pushing to $TESTTMP/repo.git 209s - | preoutgoing.git=True 209s - | preoutgoing.source=push 209s - | preoutgoing.url=$TESTTMP/repo.git 209s - | gitexport.nodes=[b'cc6164a17449d58d7811ff3918f33f89c2c83fa5', b'46737f6a4c9d8307b681cbb2e9e2e5419cc87f82'] 209s - | gitexport.git=True 209s - searching for changes 209s - | prechangegroup.source=push 209s - | prechangegroup.git=True 209s - | prechangegroup.url=$TESTTMP/repo.git 209s - adding objects 209s - remote: found 0 deltas to reuse 209s - added 2 commits with 2 trees and 2 blobs 209s - updating reference refs/heads/master 209s + abort: repository $TESTTMP/repo.git not found 209s + [255] 209s 209s 209s And what does Mercurial do? 209s @@ -124,7 +87,9 @@ 209s On push: 209s 209s $ hg init ../hgrepo-copy 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ hg push ../hgrepo-copy 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s pushing to ../hgrepo-copy 209s searching for changes 209s | preoutgoing.source=push 209s @@ -133,19 +98,29 @@ 209s adding changesets 209s adding manifests 209s adding file changes 209s - added 5 changesets with 5 changes to 5 files 209s + added 3 changesets with 3 changes to 3 files 209s 209s With more than one head: 209s 209s $ rm -r ../hgrepo-copy 209s $ hg init ../hgrepo-copy 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ hg book -i 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ hg branch -q abranch 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ fn_commit hg x 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ hg up -q default 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ hg branch -q alsoabranch 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ fn_commit hg y 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ hg push ../hgrepo-copy 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s pushing to ../hgrepo-copy 209s searching for changes 209s | preoutgoing.source=push 209s @@ -154,13 +129,15 @@ 209s adding changesets 209s adding manifests 209s adding file changes 209s - added 7 changesets with 7 changes to 7 files (+1 heads) 209s + added 5 changesets with 5 changes to 5 files (+1 heads) 209s 209s On pull: 209s 209s $ hg debugstrip --no-backup tip 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 209s $ hg pull ../hgrepo-copy 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s pulling from ../hgrepo-copy 209s searching for changes 209s | prechangegroup.txnname=pull 209s @@ -171,16 +148,16 @@ 209s adding manifests 209s adding file changes 209s added 1 changesets with 1 changes to 1 files (+1 heads) 209s - new changesets d4097d98a390 209s + new changesets 11a693974ec5 209s | changegroup.txnname=pull 209s file://$TESTTMP/hgrepo-copy 209s | changegroup.source=pull 209s | changegroup.url=file:$TESTTMP/hgrepo-copy 209s - | changegroup.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 209s - | changegroup.node_last=d4097d98a3905be88e8a566039b1fdcca06e0d2e 209s + | changegroup.node=11a693974ec530e32672629628dde90793335199 209s + | changegroup.node_last=11a693974ec530e32672629628dde90793335199 209s | incoming.txnname=pull 209s file://$TESTTMP/hgrepo-copy 209s | incoming.source=pull 209s | incoming.url=file:$TESTTMP/hgrepo-copy 209s - | incoming.node=d4097d98a3905be88e8a566039b1fdcca06e0d2e 209s + | incoming.node=11a693974ec530e32672629628dde90793335199 209s (run 'hg heads' to see heads) 209s 209s ERROR: test-hook.t output changed 209s ! 209s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-phases-public.t 209s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-phases-public.t#publish-defaults.err 209s @@ -24,149 +24,10 @@ 209s 209s cloning with hggit.usephases publishes cloned HEAD 209s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 209s - importing 1 git commits 209s - new changesets ff7a2f2d8d70 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + abort: repository gitrepo not found 209s + [255] 209s 209s $ cd hgrepo 209s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 209s $ hg phase -r master 209s - 0: public 209s - $ cd .. 209s - 209s -pulled changesets are public 209s - $ cd gitrepo 209s - $ git checkout -q master 209s - $ echo beta > beta 209s - $ git add beta 209s - $ fn_git_commit -m 'add beta' 209s - $ git checkout -b not-master 209s - Switched to a new branch 'not-master' 209s - $ echo gamma > gamma 209s - $ git add gamma 209s - $ fn_git_commit -m 'add gamma' 209s - $ git tag thetag 209s - $ echo delta > delta 209s - $ git add delta 209s - $ fn_git_commit -m 'add delta' 209s - $ git checkout master 209s - Switched to branch 'master' 209s - $ cd .. 209s - 209s - $ cd hgrepo 209s - $ cat >>$HGRCPATH < [paths] 209s - > other = $TESTTMP/gitrepo/.git 209s - > [hggit] 209s - > usephases = True 209s - > EOF 209s - 209s - $ hg phase -fd 'all()' 209s - 209s -we can restrict publishing to the remote HEAD and that tag, which 209s -happens to be the same thing here 209s - 209s -#if publish-specific 209s - $ cat >>$HGRCPATH < [git] 209s - > public = default/master, thetag 209s - > EOF 209s -#endif 209s - 209s -pulling publishes the branch 209s - 209s - $ hg phase -r master 209s - 0: draft 209s -#if publish-defaults 209s - $ hg pull -r master other 209s - pulling from $TESTTMP/gitrepo/.git 209s - importing 1 git commits 209s - updating bookmark master 209s - new changesets 7fe02317c63d 209s - 1 local changesets published 209s - (run 'hg update' to get a working copy) 209s -#else 209s - $ hg pull -r master other 209s - pulling from $TESTTMP/gitrepo/.git 209s - importing 1 git commits 209s - updating bookmark master 209s - new changesets 7fe02317c63d (1 drafts) 209s - (run 'hg update' to get a working copy) 209s -#endif 209s - $ hg phase -r master 209s - 1: draft (publish-specific !) 209s - 1: public (publish-defaults !) 209s -#if publish-defaults 209s - $ hg phase -fd master 209s - $ hg pull 209s - pulling from $TESTTMP/gitrepo 209s - importing 2 git commits 209s - adding bookmark not-master 209s - new changesets ca33a262eb46:03769a650ded (1 drafts) 209s - 1 local changesets published 209s - (run 'hg update' to get a working copy) 209s -#else 209s - $ hg pull 209s - pulling from $TESTTMP/gitrepo 209s - importing 2 git commits 209s - adding bookmark not-master 209s - new changesets ca33a262eb46:03769a650ded (1 drafts) 209s - 2 local changesets published 209s - (run 'hg update' to get a working copy) 209s -#endif 209s - $ hg phase -r master -r not-master -r thetag 209s - 1: public 209s - 3: draft 209s - 2: public 209s - 209s -public bookmark not pushed is not published after pull 209s - 209s - $ hg update 0 209s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 209s - $ echo delta > delta 209s - $ hg bookmark not-pushed 209s - $ hg add delta 209s - $ hg commit -m 'add delta' 209s - created new head 209s - $ hg phase -r 'all()' > $TESTTMP/before 209s - $ hg pull --config git.public=master,not-pushed 209s - pulling from $TESTTMP/gitrepo 209s - no changes found 209s - $ hg phase -r 'all()' > $TESTTMP/after 209s - $ cmp -s $TESTTMP/before $TESTTMP/after 209s - $ hg phase -r not-pushed 209s - 4: draft 209s - $ rm $TESTTMP/before $TESTTMP/after 209s - 209s -pushing public bookmark publishes local changesets, but only those 209s -actually pushed 209s - 209s - $ hg update master 209s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 209s - (activating bookmark master) 209s - $ echo epsilon > epsilon 209s - $ hg add epsilon 209s - $ hg commit -m 'add epsilon' 209s - created new head 209s - $ hg phase -r 'all() - master' > $TESTTMP/before 209s - $ hg push -B not-pushed 209s - pushing to $TESTTMP/gitrepo 209s - searching for changes 209s - adding objects 209s - remote: found 0 deltas to reuse 209s - added 1 commits with 1 trees and 1 blobs 209s - adding reference refs/heads/not-pushed 209s - $ hg phase -r 'all() - master' > $TESTTMP/after 209s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 209s - $ hg phase -r not-pushed -r master 209s - 4: draft 209s - 5: draft 209s - $ hg push -B master 209s - pushing to $TESTTMP/gitrepo 209s - searching for changes 209s - adding objects 209s - remote: found 0 deltas to reuse 209s - added 1 commits with 1 trees and 1 blobs 209s - updating reference refs/heads/master 209s - $ hg phase -r 'all() - master' > $TESTTMP/after 209s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 209s - $ hg phase -r master 209s - 5: public 209s 209s ERROR: test-phases-public.t#publish-defaults output changed 209s ! 209s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-phases-public.t 209s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-phases-public.t#publish-specific.err 209s @@ -24,149 +24,10 @@ 209s 209s cloning with hggit.usephases publishes cloned HEAD 209s $ hg --config hggit.usephases=True clone -U gitrepo hgrepo 209s - importing 1 git commits 209s - new changesets ff7a2f2d8d70 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + abort: repository gitrepo not found 209s + [255] 209s 209s $ cd hgrepo 209s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 209s $ hg phase -r master 209s - 0: public 209s - $ cd .. 209s - 209s -pulled changesets are public 209s - $ cd gitrepo 209s - $ git checkout -q master 209s - $ echo beta > beta 209s - $ git add beta 209s - $ fn_git_commit -m 'add beta' 209s - $ git checkout -b not-master 209s - Switched to a new branch 'not-master' 209s - $ echo gamma > gamma 209s - $ git add gamma 209s - $ fn_git_commit -m 'add gamma' 209s - $ git tag thetag 209s - $ echo delta > delta 209s - $ git add delta 209s - $ fn_git_commit -m 'add delta' 209s - $ git checkout master 209s - Switched to branch 'master' 209s - $ cd .. 209s - 209s - $ cd hgrepo 209s - $ cat >>$HGRCPATH < [paths] 209s - > other = $TESTTMP/gitrepo/.git 209s - > [hggit] 209s - > usephases = True 209s - > EOF 209s - 209s - $ hg phase -fd 'all()' 209s - 209s -we can restrict publishing to the remote HEAD and that tag, which 209s -happens to be the same thing here 209s - 209s -#if publish-specific 209s - $ cat >>$HGRCPATH < [git] 209s - > public = default/master, thetag 209s - > EOF 209s -#endif 209s - 209s -pulling publishes the branch 209s - 209s - $ hg phase -r master 209s - 0: draft 209s -#if publish-defaults 209s - $ hg pull -r master other 209s - pulling from $TESTTMP/gitrepo/.git 209s - importing 1 git commits 209s - updating bookmark master 209s - new changesets 7fe02317c63d 209s - 1 local changesets published 209s - (run 'hg update' to get a working copy) 209s -#else 209s - $ hg pull -r master other 209s - pulling from $TESTTMP/gitrepo/.git 209s - importing 1 git commits 209s - updating bookmark master 209s - new changesets 7fe02317c63d (1 drafts) 209s - (run 'hg update' to get a working copy) 209s -#endif 209s - $ hg phase -r master 209s - 1: draft (publish-specific !) 209s - 1: public (publish-defaults !) 209s -#if publish-defaults 209s - $ hg phase -fd master 209s - $ hg pull 209s - pulling from $TESTTMP/gitrepo 209s - importing 2 git commits 209s - adding bookmark not-master 209s - new changesets ca33a262eb46:03769a650ded (1 drafts) 209s - 1 local changesets published 209s - (run 'hg update' to get a working copy) 209s -#else 209s - $ hg pull 209s - pulling from $TESTTMP/gitrepo 209s - importing 2 git commits 209s - adding bookmark not-master 209s - new changesets ca33a262eb46:03769a650ded (1 drafts) 209s - 2 local changesets published 209s - (run 'hg update' to get a working copy) 209s -#endif 209s - $ hg phase -r master -r not-master -r thetag 209s - 1: public 209s - 3: draft 209s - 2: public 209s - 209s -public bookmark not pushed is not published after pull 209s - 209s - $ hg update 0 209s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 209s - $ echo delta > delta 209s - $ hg bookmark not-pushed 209s - $ hg add delta 209s - $ hg commit -m 'add delta' 209s - created new head 209s - $ hg phase -r 'all()' > $TESTTMP/before 209s - $ hg pull --config git.public=master,not-pushed 209s - pulling from $TESTTMP/gitrepo 209s - no changes found 209s - $ hg phase -r 'all()' > $TESTTMP/after 209s - $ cmp -s $TESTTMP/before $TESTTMP/after 209s - $ hg phase -r not-pushed 209s - 4: draft 209s - $ rm $TESTTMP/before $TESTTMP/after 209s - 209s -pushing public bookmark publishes local changesets, but only those 209s -actually pushed 209s - 209s - $ hg update master 209s - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 209s - (activating bookmark master) 209s - $ echo epsilon > epsilon 209s - $ hg add epsilon 209s - $ hg commit -m 'add epsilon' 209s - created new head 209s - $ hg phase -r 'all() - master' > $TESTTMP/before 209s - $ hg push -B not-pushed 209s - pushing to $TESTTMP/gitrepo 209s - searching for changes 209s - adding objects 209s - remote: found 0 deltas to reuse 209s - added 1 commits with 1 trees and 1 blobs 209s - adding reference refs/heads/not-pushed 209s - $ hg phase -r 'all() - master' > $TESTTMP/after 209s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 209s - $ hg phase -r not-pushed -r master 209s - 4: draft 209s - 5: draft 209s - $ hg push -B master 209s - pushing to $TESTTMP/gitrepo 209s - searching for changes 209s - adding objects 209s - remote: found 0 deltas to reuse 209s - added 1 commits with 1 trees and 1 blobs 209s - updating reference refs/heads/master 209s - $ hg phase -r 'all() - master' > $TESTTMP/after 209s - $ diff $TESTTMP/before $TESTTMP/after | tr '<>' '-+' 209s - $ hg phase -r master 209s - 5: public 209s 209s ERROR: test-phases-public.t#publish-specific output changed 209s !s 209s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-illegal-contents.t 209s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-illegal-contents.t.err 209s @@ -5,6 +5,7 @@ 209s $ . "$TESTDIR/testutil" 209s 209s $ hg init hg 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ cd hg 209s $ mkdir -p .git/hooks 209s $ cat > .git/hooks/post-update < EOF 209s $ fn_touch_escaped foo/git~100/wat bar/.gi\\u200ct/wut this/is/safe 209s $ hg addremove 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s adding .git/hooks/post-update 209s adding bar/.gi\xe2\x80\x8ct/wut (esc) 209s adding foo/git~100/wat 209s adding this/is/safe 209s $ hg ci -m "we should refuse to export this" 209s - $ hg book master 209s - $ hg gexport 209s - warning: skipping invalid path '.git/hooks/post-update' 209s - warning: skipping invalid path 'bar/.gi\xe2\x80\x8ct/wut' 209s - warning: skipping invalid path 'foo/git~100/wat' 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + $ hg book master 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + $ hg gexport 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + hg: unknown command 'gexport' 209s + (did you mean one of export, import?) 209s + [10] 209s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 209s - this/is/safe 209s + fatal: not a git repository: '.hg/git' 209s + [128] 209s $ hg debug-remove-hggit-state 209s - clearing out the git cache data 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + hg: unknown command 'debug-remove-hggit-state' 209s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 209s + [10] 209s $ hg gexport --config hggit.invalidpaths=keep 209s - warning: path '.git/hooks/post-update' contains an invalid path component 209s - warning: path 'bar/.gi\xe2\x80\x8ct/wut' contains an invalid path component 209s - warning: path 'foo/git~100/wat' contains an invalid path component 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + hg: unknown command 'gexport' 209s + (did you mean one of export, import?) 209s + [10] 209s $ GIT_DIR=.hg/git git ls-tree -r --name-only master 209s - .git/hooks/post-update 209s - "bar/.gi\342\200\214t/wut" 209s - foo/git~100/wat 209s - this/is/safe 209s - $ cd .. 209s - 209s - $ rm -rf hg 209s - $ hg init hg 209s + fatal: not a git repository: '.hg/git' 209s + [128] 209s + $ cd .. 209s + 209s + $ rm -rf hg 209s + $ hg init hg 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ cd hg 209s $ mkdir -p nested/.git/hooks/ 209s $ cat > nested/.git/hooks/post-update < EOF 209s $ chmod +x nested/.git/hooks/post-update 209s $ hg addremove 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s adding nested/.git/hooks/post-update 209s $ hg ci -m "also refuse to export this" 209s - $ hg book master 209s - $ hg gexport 209s - warning: skipping invalid path 'nested/.git/hooks/post-update' 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + $ hg book master 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + $ hg gexport 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + hg: unknown command 'gexport' 209s + (did you mean one of export, import?) 209s + [10] 209s $ git clone .hg/git git 209s - Cloning into 'git'... 209s - done. 209s + fatal: repository '.hg/git' does not exist 209s + [128] 209s $ rm -rf git 209s 209s We can trigger an error: 209s 209s $ hg -q debug-remove-hggit-state 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + hg: unknown command 'debug-remove-hggit-state' 209s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 209s + [10] 209s $ hg --config hggit.invalidpaths=abort gexport 209s - abort: invalid path 'nested/.git/hooks/post-update' rejected by configuration 209s - (see 'hg help config.hggit.invalidpaths for details) 209s - [255] 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + hg: unknown command 'gexport' 209s + (did you mean one of export, import?) 209s + [10] 209s 209s We can override if needed: 209s 209s $ hg --config hggit.invalidpaths=keep gexport 209s - warning: path 'nested/.git/hooks/post-update' contains an invalid path component 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + hg: unknown command 'gexport' 209s + (did you mean one of export, import?) 209s + [10] 209s $ cd .. 209s $ # different git versions give different return codes 209s $ git clone hg/.hg/git git || true 209s - Cloning into 'git'... 209s - done. 209s - error: [Ii]nvalid path 'nested/\.git/hooks/post-update' (re) 209s + fatal: repository 'hg/.hg/git' does not exist 209s fatal: unable to checkout working tree (?) 209s warning: Clone succeeded, but checkout failed. (?) 209s You can inspect what was checked out with 'git status' (?) 209s @@ -88,6 +109,7 @@ 209s $ cd .. 209s $ rm -rf hg 209s $ hg init hg 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ cd hg 209s $ mkdir -p .GIT/hooks/ 209s $ cat > .GIT/hooks/post-checkout < EOF 209s $ chmod +x .GIT/hooks/post-checkout 209s $ hg addremove 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s adding .GIT/hooks/post-checkout 209s $ hg ci -m "also refuse to export this" 209s - $ hg book master 209s - $ hg gexport 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + $ hg book master 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + $ hg gexport 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + hg: unknown command 'gexport' 209s + (did you mean one of export, import?) 209s + [10] 209s $ cd .. 209s 209s And the NTFS case: 209s $ cd .. 209s $ rm -rf hg 209s $ hg init hg 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ cd hg 209s $ mkdir -p GIT~1/hooks/ 209s $ cat > GIT~1/hooks/post-checkout < EOF 209s $ chmod +x GIT~1/hooks/post-checkout 209s $ hg addremove 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s adding GIT~1/hooks/post-checkout 209s $ hg ci -m "also refuse to export this" 209s - $ hg book master 209s - $ hg gexport 209s - warning: skipping invalid path 'GIT~1/hooks/post-checkout' 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + $ hg book master 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + $ hg gexport 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + hg: unknown command 'gexport' 209s + (did you mean one of export, import?) 209s + [10] 209s $ cd .. 209s 209s Now check a Git repository containing a Mercurial repository, which 209s @@ -127,36 +163,29 @@ 209s $ rm -rf hg git nested 209s $ git init -q git 209s $ hg init nested 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s $ mv nested git 209s $ cd git 209s $ git add nested 209s $ fn_git_commit -m 'add a Mercurial repository' 209s $ cd .. 209s $ hg clone --config hggit.invalidpaths=abort git hg 209s - importing 1 git commits 209s - abort: invalid path 'nested/.hg/00changelog.i' rejected by configuration 209s - (see 'hg help config.hggit.invalidpaths for details) 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + abort: repository git not found 209s [255] 209s $ rm -rf hg 209s $ hg clone --config hggit.invalidpaths=keep git hg 209s - importing 1 git commits 209s - warning: path 'nested/.hg/00changelog.i' contains an invalid path component 209s - warning: path 'nested/.hg/requires' contains an invalid path component 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + abort: repository git not found 209s warning: path 'nested/.hg/store/requires' contains an invalid path component (?) 209s - new changesets [0-9a-f]{12,12} \(1 drafts\) (re) 209s warning: path 'nested/.hg/store/requires' is within a nested repository, which Mercurial cannot check out. (?) 209s - updating to bookmark master 209s - abort: path 'nested/.hg/00changelog.i' is inside nested repo 'nested' 209s - [10] 209s + [255] 209s $ rm -rf hg 209s $ hg clone git hg 209s - importing 1 git commits 209s - warning: skipping invalid path 'nested/.hg/00changelog.i' 209s - warning: skipping invalid path 'nested/.hg/requires' 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + abort: repository git not found 209s warning: skipping invalid path 'nested/.hg/store/requires' (?) 209s - new changesets 3ea18a67c0e6 (1 drafts) 209s - updating to bookmark master 209s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 209s + [255] 209s $ cd .. 209s 209s Now check a Git repository containing paths with carriage return and 209s @@ -171,23 +200,16 @@ 209s $ fn_git_commit -m 'add files disallowed by mercurial' 209s $ cd .. 209s $ hg clone --config hggit.invalidpaths=abort git hg 209s - importing 1 git commits 209s - abort: invalid path 'Icon\r' rejected by configuration 209s - (see 'hg help config.hggit.invalidpaths for details) 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + abort: repository git not found 209s [255] 209s $ hg clone --config hggit.invalidpaths=keep git hg 209s - importing 1 git commits 209s - warning: skipping invalid path 'Icon\r' 209s - warning: skipping invalid path 'the\nfile' 209s - new changesets 8354c06a5842 (1 drafts) 209s - updating to bookmark master 209s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + abort: repository git not found 209s + [255] 209s $ rm -rf hg 209s $ hg clone git hg 209s - importing 1 git commits 209s - warning: skipping invalid path 'Icon\r' 209s - warning: skipping invalid path 'the\nfile' 209s - new changesets 8354c06a5842 (1 drafts) 209s - updating to bookmark master 209s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 209s - 209s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 209s + abort: repository git not found 209s + [255] 209s + 209s 209s ERROR: test-illegal-contents.t output changed 210s ! 210s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-invalid-refs.t 210s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-invalid-refs.t.err 210s @@ -12,115 +12,10 @@ 210s 210s $ cd .. 210s $ hg clone -U gitrepo hgrepo 210s - importing 1 git commits 210s - new changesets ff7a2f2d8d70 (1 drafts) 210s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 210s + abort: repository gitrepo not found 210s + [255] 210s 210s $ cd hgrepo 210s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 210s $ hg up master 210s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 210s - (activating bookmark master) 210s - $ fn_hg_tag alph#a 210s - $ fn_hg_tag bet*a 210s - $ fn_hg_tag 'gamm a' 210s - $ hg book -r . delt#a 210s - $ hg book -r . epsil*on 210s - 210s - $ hg gexport 210s - warning: not exporting tag 'bet*a' due to invalid name 210s - warning: not exporting bookmark 'epsil*on' due to invalid name 210s - 210s - $ hg push 210s - pushing to $TESTTMP/gitrepo 210s - warning: not exporting tag 'bet*a' due to invalid name 210s - warning: not exporting bookmark 'epsil*on' due to invalid name 210s - searching for changes 210s - adding objects 210s - remote: found 0 deltas to reuse 210s - added 3 commits with 3 trees and 3 blobs 210s - adding reference refs/heads/delt#a 210s - updating reference refs/heads/master 210s - adding reference refs/tags/alph#a 210s - adding reference refs/tags/gamm_a 210s - 210s - $ hg log --graph 210s - @ changeset: 3:0950ab44ea23 210s - | bookmark: delt#a 210s - | bookmark: epsil*on 210s - | bookmark: master 210s - | tag: default/delt#a 210s - | tag: default/master 210s - | tag: tip 210s - | user: test 210s - | date: Mon Jan 01 00:00:13 2007 +0000 210s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 210s - | 210s - o changeset: 2:0b27ab2b3df6 210s - | tag: gamm a 210s - | user: test 210s - | date: Mon Jan 01 00:00:12 2007 +0000 210s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 210s - | 210s - o changeset: 1:491ceeb1b0f1 210s - | tag: bet*a 210s - | user: test 210s - | date: Mon Jan 01 00:00:11 2007 +0000 210s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 210s - | 210s - o changeset: 0:ff7a2f2d8d70 210s - bookmark: not-master 210s - tag: alph#a 210s - tag: default/not-master 210s - user: test 210s - date: Mon Jan 01 00:00:10 2007 +0000 210s - summary: add alpha 210s - 210s - 210s - $ cd .. 210s - $ cd gitrepo 210s -git should have only the valid tag alph#a but have full commit log including the missing invalid bet*a tag commit 210s - $ git tag -l 210s - alph#a 210s - gamm_a 210s - 210s - $ cd .. 210s - $ hg clone -U gitrepo hgrepo2 210s - importing 4 git commits 210s - new changesets ff7a2f2d8d70:0950ab44ea23 (4 drafts) 210s - $ hg -R hgrepo2 log --graph 210s - o changeset: 3:0950ab44ea23 210s - | bookmark: delt#a 210s - | bookmark: master 210s - | tag: default/delt#a 210s - | tag: default/master 210s - | tag: tip 210s - | user: test 210s - | date: Mon Jan 01 00:00:13 2007 +0000 210s - | summary: Added tag gamm a for changeset 0b27ab2b3df6 210s - | 210s - o changeset: 2:0b27ab2b3df6 210s - | tag: gamm a 210s - | tag: gamm_a 210s - | user: test 210s - | date: Mon Jan 01 00:00:12 2007 +0000 210s - | summary: Added tag bet*a for changeset 491ceeb1b0f1 210s - | 210s - o changeset: 1:491ceeb1b0f1 210s - | tag: bet*a 210s - | user: test 210s - | date: Mon Jan 01 00:00:11 2007 +0000 210s - | summary: Added tag alph#a for changeset ff7a2f2d8d70 210s - | 210s - o changeset: 0:ff7a2f2d8d70 210s - bookmark: not-master 210s - tag: alph#a 210s - tag: default/not-master 210s - user: test 210s - date: Mon Jan 01 00:00:10 2007 +0000 210s - summary: add alpha 210s - 210s - 210s -the tag should be in .hgtags 210s - $ hg cat -r master hgrepo2/.hgtags 210s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alph#a 210s - 491ceeb1b0f10d65d956dfcdd3470ac2bc2c96a8 bet*a 210s - 0b27ab2b3df69c6f7defd7040b93e539136db5be gamm a 210s 210s ERROR: test-invalid-refs.t output changed 210s ! 210s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-gc.t 210s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-gc.t.err 210s @@ -25,188 +25,9 @@ 210s > done 210s $ cd .. 210s $ hg clone -U gitrepo hgrepo 210s - importing 100 git commits 210s - new changesets 1c8407413fa3:eda59117ba04 (100 drafts) 210s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 210s + abort: repository gitrepo not found 210s + [255] 210s $ cd hgrepo 210s + $TESTTMP.sh: 24: cd: can't cd to hgrepo 210s $ hg debug-remove-hggit-state 210s - clearing out the git cache data 210s - 210s ------------ 210s - 210s -Test garbage collection of loose objects into packs. We first test 210s -this with two threads, which is closest to the expected usage 210s -scenario, as almost all computers have at least two cores these days. 210s -The main downside is that this makes the output order unreliable, so 210s -we just sort it. 210s - 210s - $ hg gexport --config hggit.mapsavefrequency=33 --config hggit.threads=2 --debug | grep pack | sort 210s - packed 3 loose objects! 210s - packed 75 loose objects! 210s - packed 78 loose objects! 210s - packed 86 loose objects! 210s - packing 3 loose objects... 210s - packing 75 loose objects... 210s - packing 78 loose objects... 210s - packing 86 loose objects... 210s - $ hg debug-remove-hggit-state 210s - clearing out the git cache data 210s - 210s -Test the actual order of operations -- this uses a single thread, 210s -which means that the packing happens synchronously in the main thread, 210s -giving us a reliable output order. 210s - 210s -In addition, the transaction size is set up such that we happen to do 210s -nothing in the final, synchronous packing that happens on every pull. 210s -Lots of other tests have a map save frequency higher than the total 210s -amount of commits pulled, but let's just trigger that other odd 210s -occurence here. 210s - 210s - $ hg gexport --debug \ 210s - > --config hggit.mapsavefrequency=10 --config hggit.threads=1 | \ 210s - > sed 's/^converting revision.*/./' 210s - finding unexported changesets 210s - exporting 100 changesets 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 210s - packing 30 loose objects... 210s - packed 30 loose objects! 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 210s - packing 25 loose objects... 210s - packed 25 loose objects! 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 210s - packing 25 loose objects... 210s - packed 25 loose objects! 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 210s - packing 24 loose objects... 210s - packed 24 loose objects! 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 210s - packing 24 loose objects... 210s - packed 24 loose objects! 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 210s - packing 24 loose objects... 210s - packed 24 loose objects! 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 210s - packing 24 loose objects... 210s - packed 24 loose objects! 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 210s - packing 23 loose objects... 210s - packed 23 loose objects! 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 210s - packing 22 loose objects... 210s - packed 22 loose objects! 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - . 210s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 210s - packing 21 loose objects... 210s - packed 21 loose objects! 210s - packing 0 loose objects... 210s - packed 0 loose objects! 210s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 210s - $ find .hg/git/objects -type f | grep -Fv .idx | sort 210s - .hg/git/objects/pack/pack-33903607b479000b976a29a349fe0f4dffb0aaac.pack 210s - .hg/git/objects/pack/pack-40d9440e392d9eab62fa38a2ed66cc763d77aca3.pack 210s - .hg/git/objects/pack/pack-4ab2dac268f94e407788d52d6ba087b626c41651.pack 210s - .hg/git/objects/pack/pack-543e3b37bd36218a4dc6611a96d7c218afb78429.pack 210s - .hg/git/objects/pack/pack-5fc80292253ee10d1b86b5c4d9c51b29d2b4ba47.pack 210s - .hg/git/objects/pack/pack-9c636f5f16302fc5fadf0cc4ed42aeb67fc51f6a.pack 210s - .hg/git/objects/pack/pack-ae74b1f0197dfb45cfb13889453860a40103969a.pack 210s - .hg/git/objects/pack/pack-b432e2f477cb765fc0aeaa850d56e04b10392e6c.pack 210s - .hg/git/objects/pack/pack-cf7023660ce10ede2896d1be117f6ba93a261ff9.pack 210s - .hg/git/objects/pack/pack-e601b2af6a91a9cf6817d71f4eb660d2218d4094.pack 210s 210s ERROR: test-gc.t output changed 211s ! 211s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-push-authors.t 211s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-push-authors.t.err 211s @@ -8,127 +8,9 @@ 211s Create a Mercurial repository 211s 211s $ hg clone repo.git hgrepo 211s - updating to branch default 211s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 211s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 211s + abort: repository repo.git not found 211s + [255] 211s $ cd hgrepo 211s + $TESTTMP.sh: 8: cd: can't cd to hgrepo 211s $ hg book master 211s - 211s -Configure an author map 211s - 211s - $ touch authors.txt 211s - $ cat >> $HGRCPATH < [git] 211s - > authors = $TESTTMP/authors.txt 211s - > EOF 211s - 211s -Create a commit user that maps to a fully valid user 211s - 211s - $ cat >> $TESTTMP/authors.txt < user1 = User no. 1 211s - > EOF 211s - $ touch alpha 211s - $ hg add alpha 211s - $ fn_hg_commit -m alpha -u user1 211s - 211s -And one that maps to an email address 211s - 211s - $ cat >> $TESTTMP/authors.txt < user2@example.com = user2 211s - > EOF 211s - $ touch beta 211s - $ hg add beta 211s - $ fn_hg_commit -m beta -u user2@example.com 211s - 211s -And one that maps to a "simple" user 211s - 211s - $ cat >> $TESTTMP/authors.txt < User #3 = user3@example.com 211s - > EOF 211s - $ touch gamma 211s - $ hg add gamma 211s - $ fn_hg_commit -m gamma -u "User #3 " 211s - 211s -And one that maps to nothing 211s - 211s - $ cat >> $TESTTMP/authors.txt < user4 = 211s - > EOF 211s - $ touch delta 211s - $ hg add delta 211s - $ fn_hg_commit -m delta -u user4 211s - 211s -And one that doesn't map 211s - 211s - $ touch epsilon 211s - $ hg add epsilon 211s - $ fn_hg_commit -m epsilon -u "User #5 " 211s - 211s -Check the test default 211s - 211s - $ touch zeta 211s - $ hg add zeta 211s - $ fn_hg_commit -m zeta 211s - 211s -Push it! 211s - 211s - $ hg push 211s - pushing to $TESTTMP/repo.git 211s - searching for changes 211s - adding objects 211s - remote: found 0 deltas to reuse 211s - added 6 commits with 6 trees and 1 blobs 211s - adding reference refs/heads/master 211s - 211s -Check the results: 211s - 211s - $ hg log --template='Commit: {gitnode}\nAuthor: {author}\n---\n' 211s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 211s - Author: test 211s - --- 211s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 211s - Author: User #5 211s - --- 211s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 211s - Author: user4 211s - --- 211s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 211s - Author: User #3 211s - --- 211s - Commit: eba936dd13172a2f17936785e3604845aed9170d 211s - Author: user2@example.com 211s - --- 211s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 211s - Author: user1 211s - --- 211s - $ cd ../repo.git 211s - $ cat $TESTTMP/authors.txt 211s - user1 = User no. 1 211s - user2@example.com = user2 211s - User #3 = user3@example.com 211s - user4 = 211s - $ git log --pretty='tformat:Commit: %H%nAuthor: %an <%ae>%nCommitter: %cn <%ce>%n---' 211s - Commit: 869e310765d5d7ad92f83bf036e12b0341922a65 211s - Author: test 211s - Committer: test 211s - --- 211s - Commit: b5c0fcb75f876b158ece64859400d36b07570ce9 211s - Author: User #5 211s - Committer: User #5 211s - --- 211s - Commit: 2833824a870810915f7a7a27c05cccad0448bfd7 211s - Author: 211s - Committer: 211s - --- 211s - Commit: fe63bf29ef0bd4af50e85b8aec8d2fbeff255845 211s - Author: user3@example.com 211s - Committer: user3@example.com 211s - --- 211s - Commit: eba936dd13172a2f17936785e3604845aed9170d 211s - Author: user2 211s - Committer: user2 211s - --- 211s - Commit: 796162e5747a7ba57f31fb828b88319caf7b1f7b 211s - Author: User no. 1 211s - Committer: User no. 1 211s - --- 211s - $ cd .. 211s 211s ERROR: test-push-authors.t output changed 212s ! 212s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-serve-hg.t 212s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-serve-hg.t#with-hggit.err 212s @@ -31,11 +31,11 @@ 212s $ cd .. 212s 212s $ hg clone gitrepo hgrepo 212s - importing 2 git commits 212s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 212s - updating to bookmark master 212s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 212s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 212s + abort: repository gitrepo not found 212s + [255] 212s $ cd hgrepo 212s + $TESTTMP.sh: 41: cd: can't cd to hgrepo 212s $ cat >> .hg/hgrc < [push] 212s > pushvars.server = true 212s @@ -45,81 +45,3 @@ 212s > [hooks] 212s > pretxnchangegroup = env | grep HG_USERVAR_ || true 212s > EOF 212s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 212s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 212s - 212s -Test server address cannot be reused 212s - 212s -#if windows 212s - $ hg serve -p $HGPORT1 2>&1 212s - abort: cannot start server at '*:$HGPORT1': * (glob) 212s - [255] 212s -#else 212s - $ hg serve -p $HGPORT1 2>&1 212s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 212s - [255] 212s -#endif 212s - $ cd .. 212s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 212s - 212s -Make sure that clone regular mercurial repos over http doesn't break, 212s -and that we can transfer the hg-git metadata 212s - 212s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 212s - requesting all changes 212s - adding changesets 212s - adding manifests 212s - adding file changes 212s - added 2 changesets with 4 changes to 4 files 212s - new changesets f488b65fa424:c61c38c3d614 (?) 212s - updating to branch default 212s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 212s - 212s -And it shouldn't create a Git repository needlessly: 212s - $ test -e copy/git 212s - [1] 212s - $ cd copy 212s - 212s -#if without-hggit 212s - $ hg tags 212s - tip 1:c61c38c3d614 212s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 212s - 1:c61c38c3d614 | master | | 212s - 0:f488b65fa424 | | | 212s - $ hg pull -u ../gitrepo 212s - pulling from ../gitrepo 212s - importing 2 git commits 212s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 212s -#else 212s - $ hg tags 212s - tip 1:c61c38c3d614 212s - thetag 0:f488b65fa424 212s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 212s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 212s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 212s - $ hg pull -u ../gitrepo 212s - pulling from ../gitrepo 212s - warning: created new git repository at $TESTTMP/copy/.hg/git 212s - no changes found 212s -#endif 212s - 212s - $ hg tags 212s - tip 1:c61c38c3d614 212s - thetag 0:f488b65fa424 212s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 212s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 212s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 212s - 212s -Furthermore, make sure that we pass all arguments when pushing: 212s - 212s - $ echo baz > baz 212s - $ fn_hg_commit -A -m baz 212s - $ hg push --pushvars FOO=BAR 212s - pushing to http://localhost:$HGPORT/ 212s - searching for changes 212s - remote: adding changesets 212s - remote: adding manifests 212s - remote: adding file changes 212s - remote: HG_USERVAR_FOO=BAR 212s - remote: added 1 changesets with 1 changes to 1 files 212s - $ cd .. 212s 212s ERROR: test-serve-hg.t#with-hggit output changed 213s ! 213s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-serve-hg.t 213s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-serve-hg.t#without-hggit.err 213s @@ -31,11 +31,11 @@ 213s $ cd .. 213s 213s $ hg clone gitrepo hgrepo 213s - importing 2 git commits 213s - new changesets f488b65fa424:c61c38c3d614 (2 drafts) 213s - updating to bookmark master 213s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 213s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 213s + abort: repository gitrepo not found 213s + [255] 213s $ cd hgrepo 213s + $TESTTMP.sh: 36: cd: can't cd to hgrepo 213s $ cat >> .hg/hgrc < [push] 213s > pushvars.server = true 213s @@ -45,81 +45,3 @@ 213s > [hooks] 213s > pretxnchangegroup = env | grep HG_USERVAR_ || true 213s > EOF 213s - $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log 213s - $ hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid 213s - 213s -Test server address cannot be reused 213s - 213s -#if windows 213s - $ hg serve -p $HGPORT1 2>&1 213s - abort: cannot start server at '*:$HGPORT1': * (glob) 213s - [255] 213s -#else 213s - $ hg serve -p $HGPORT1 2>&1 213s - abort: cannot start server at '*:$HGPORT1': Address* in use (glob) 213s - [255] 213s -#endif 213s - $ cd .. 213s - $ cat hg1.pid hg2.pid >> $DAEMON_PIDS 213s - 213s -Make sure that clone regular mercurial repos over http doesn't break, 213s -and that we can transfer the hg-git metadata 213s - 213s - $ hg clone http://localhost:$HGPORT/ copy 2>&1 213s - requesting all changes 213s - adding changesets 213s - adding manifests 213s - adding file changes 213s - added 2 changesets with 4 changes to 4 files 213s - new changesets f488b65fa424:c61c38c3d614 (?) 213s - updating to branch default 213s - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 213s - 213s -And it shouldn't create a Git repository needlessly: 213s - $ test -e copy/git 213s - [1] 213s - $ cd copy 213s - 213s -#if without-hggit 213s - $ hg tags 213s - tip 1:c61c38c3d614 213s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 213s - 1:c61c38c3d614 | master | | 213s - 0:f488b65fa424 | | | 213s - $ hg pull -u ../gitrepo 213s - pulling from ../gitrepo 213s - importing 2 git commits 213s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 213s -#else 213s - $ hg tags 213s - tip 1:c61c38c3d614 213s - thetag 0:f488b65fa424 213s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 213s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 213s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 213s - $ hg pull -u ../gitrepo 213s - pulling from ../gitrepo 213s - warning: created new git repository at $TESTTMP/copy/.hg/git 213s - no changes found 213s -#endif 213s - 213s - $ hg tags 213s - tip 1:c61c38c3d614 213s - thetag 0:f488b65fa424 213s - $ hg log -T '{rev}:{node|short} | {bookmarks} | {gitnode} |\n' 213s - 1:c61c38c3d614 | master | 95bcbb72932335c132c10950b5e5dc1066138ea1 | 213s - 0:f488b65fa424 | | a874aa4c9506ed30ef2c2c7313abd2c518e9e71e | 213s - 213s -Furthermore, make sure that we pass all arguments when pushing: 213s - 213s - $ echo baz > baz 213s - $ fn_hg_commit -A -m baz 213s - $ hg push --pushvars FOO=BAR 213s - pushing to http://localhost:$HGPORT/ 213s - searching for changes 213s - remote: adding changesets 213s - remote: adding manifests 213s - remote: adding file changes 213s - remote: HG_USERVAR_FOO=BAR 213s - remote: added 1 changesets with 1 changes to 1 files 213s - $ cd .. 213s 213s ERROR: test-serve-hg.t#without-hggit output changed 213s ! 213s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-push-to-head.t 213s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-push-to-head.t.err 213s @@ -14,65 +14,9 @@ 213s Clone it, and push back to master: 213s 213s $ hg clone gitrepo hgrepo 213s - importing 1 git commits 213s - new changesets ff7a2f2d8d70 (1 drafts) 213s - updating to bookmark master 213s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 213s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 213s + abort: repository gitrepo not found 213s + [255] 213s $ cd hgrepo 213s + $TESTTMP.sh: 18: cd: can't cd to hgrepo 213s $ echo beta > beta 213s - $ fn_hg_commit -A -m "add beta" 213s - 213s -The output is confusing, and this even more-so: 213s - 213s - $ hg push 213s - pushing to $TESTTMP/gitrepo 213s - searching for changes 213s - adding objects 213s - remote: found 0 deltas to reuse 213s - remote: error: refusing to update checked out branch: refs/heads/master 213s - remote: error: By default, updating the current branch in a non-bare repository 213s - remote: is denied, because it will make the index and work tree inconsistent 213s - remote: with what you pushed, and will require 'git reset --hard' to match 213s - remote: the work tree to HEAD. 213s - remote: 213s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 213s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 213s - remote: its current branch; however, this is not recommended unless you 213s - remote: arranged to update its work tree to match what you pushed in some 213s - remote: other way. 213s - remote: 213s - remote: To squelch this message and still keep the default behaviour, set 213s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 213s - added 1 commits with 1 trees and 1 blobs 213s - warning: failed to update refs/heads/master; branch is currently checked out 213s - 213s - $ hg push 213s - pushing to $TESTTMP/gitrepo 213s - searching for changes 213s - adding objects 213s - remote: found 0 deltas to reuse 213s - remote: error: refusing to update checked out branch: refs/heads/master 213s - remote: error: By default, updating the current branch in a non-bare repository 213s - remote: is denied, because it will make the index and work tree inconsistent 213s - remote: with what you pushed, and will require 'git reset --hard' to match 213s - remote: the work tree to HEAD. 213s - remote: 213s - remote: You can set the 'receive.denyCurrentBranch' configuration variable 213s - remote: to 'ignore' or 'warn' in the remote repository to allow pushing into 213s - remote: its current branch; however, this is not recommended unless you 213s - remote: arranged to update its work tree to match what you pushed in some 213s - remote: other way. 213s - remote: 213s - remote: To squelch this message and still keep the default behaviour, set 213s - remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 213s - added 1 commits with 1 trees and 1 blobs 213s - warning: failed to update refs/heads/master; branch is currently checked out 213s - 213s -Show that it really didn't get pushed: 213s - 213s - $ hg tags 213s - tip 1:47580592d3d6 213s - default/master 0:ff7a2f2d8d70 213s - $ cd ../gitrepo 213s - $ git log --all --oneline --decorate 213s - 7eeab2e (HEAD -> master) add alpha 213s 213s ERROR: test-push-to-head.t output changed 214s ! 214s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-push-missing-commit.t 214s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-push-missing-commit.t.err 214s @@ -22,75 +22,9 @@ 214s clone it and create a commit building on the git history 214s 214s $ hg clone -U repo.git hgrepo 214s - importing 1 git commits 214s - new changesets fb68c5a534ce (1 drafts) 214s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 214s + abort: repository repo.git not found 214s + [255] 214s $ cd hgrepo 214s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 214s $ hg up -q master 214s - $ echo other > thefile 214s - $ fn_hg_commit -m 'change thefile' 214s - $ cd .. 214s - 214s -now remove the git commit from the cache repository used internally by 214s -hg-git — actually, changing `git.intree` is equivalent to this, and how 214s -a user noticed it in #376. 214s - 214s - $ rm -rf hgrepo/.hg/git 214s - 214s -what happens when we push it? 214s - 214s - $ hg -R hgrepo push 214s - pushing to $TESTTMP/repo.git 214s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 214s - abort: cannot push git commit 533d4e670a8b as it is not present locally 214s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 214s - [255] 214s - 214s -try to follow the hint: 214s - 214s -(and just to see that the warning is useful, try re-resetting first) 214s - 214s - $ rm -rf hgrepo/.hg/git hgrepo/.git 214s - $ hg -R hgrepo pull 214s - pulling from $TESTTMP/repo.git 214s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 214s - no changes found 214s - not updating diverged bookmark master 214s - $ hg -R hgrepo push 214s - pushing to $TESTTMP/repo.git 214s - searching for changes 214s - adding objects 214s - remote: found 0 deltas to reuse 214s - added 1 commits with 1 trees and 1 blobs 214s - updating reference refs/heads/master 214s - 214s -and as an extra test, what if we want to push a commit that's 214s -converted, but gone? 214s - 214s -simply pushing doesn't suffice: 214s - 214s - $ cd hgrepo 214s - $ rm -rf .hg/git 214s - $ hg push 214s - pushing to $TESTTMP/repo.git 214s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 214s - searching for changes 214s - no changes found 214s - [1] 214s - $ cd .. 214s - 214s -but we can't create another commit building on the git history, export 214s -it, and push: 214s - 214s - $ cd hgrepo 214s - $ echo not that > thefile 214s - $ fn_hg_commit -m 'change thefile again' 214s - $ hg gexport 214s - $ rm -rf .hg/git 214s - $ hg push 214s - pushing to $TESTTMP/repo.git 214s - warning: created new git repository at $TESTTMP/hgrepo/.hg/git 214s - searching for changes 214s - abort: cannot push git commit 61619410916a as it is not present locally 214s - (please try pulling first, or as a fallback run git-cleanup to re-export the missing commits) 214s - [255] 214s - $ cd .. 214s 214s ERROR: test-push-missing-commit.t output changed 215s ! 215s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-orphan-tags.t 215s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-orphan-tags.t.err 215s @@ -61,17 +61,17 @@ 215s Create a Mercurial clone 215s 215s $ hg clone -U repo.git hgrepo 215s - importing 4 git commits 215s - new changesets b8e77484829b:387d03400596 (4 drafts) 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + abort: repository repo.git not found 215s + [255] 215s $ hg outgoing -R hgrepo 215s - comparing with $TESTTMP/repo.git 215s - searching for changes 215s - no changes found 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + abort: repository hgrepo not found 215s + [255] 215s + $ hg push --debug -R hgrepo | grep -e reference -e found 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + abort: repository hgrepo not found 215s [1] 215s - $ hg push --debug -R hgrepo | grep -e reference -e found 215s - unchanged reference default::refs/heads/master => GIT:996e5084 215s - unchanged reference default::refs/tags/the_tag => GIT:e4338156 215s - no changes found 215s 215s Verify that we can push this tag, and that outgoing doesn't report 215s them (#358) 215s @@ -83,33 +83,5 @@ 215s To $TESTTMP/repo.git 215s - [deleted] the_tag 215s $ cd ../hgrepo 215s + $TESTTMP.sh: 72: cd: can't cd to ../hgrepo 215s $ hg outgoing 215s - comparing with $TESTTMP/repo.git 215s - searching for changes 215s - changeset: 2:7b35eb0afb3f 215s - tag: the_tag 215s - user: test 215s - date: Mon Jan 01 00:00:12 2007 +0000 215s - summary: add foo3 215s - 215s - $ hg push --debug 215s - pushing to $TESTTMP/repo.git 215s - finding unexported changesets 215s - saving git map to $TESTTMP/hgrepo/.hg/git-mapfile 215s - searching for changes 215s - remote: counting objects: 5, done. 215s - 1 commits found 215s - list of commits: 215s - e12852326ef72772e9696b008ad6546b5266ff13 215s - adding objects 215s - remote: counting objects: 5, done. 215s - remote: found 0 deltas to reuse 215s - added 1 commits with 1 trees and 0 blobs 215s - unchanged reference default::refs/heads/master => GIT:996e5084 215s - adding reference default::refs/tags/the_tag => GIT:e4338156 215s - $ cd ../gitrepo 215s - $ git fetch 215s - From $TESTTMP/repo 215s - * [new tag] the_tag -> the_tag 215s - $ git tag -ln 215s - the_tag Tag message 215s 215s ERROR: test-orphan-tags.t output changed 215s ! 215s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-transactions.t 215s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-transactions.t.err 215s @@ -42,19 +42,29 @@ 215s 215s $ hg clone gitrepo hgrepo --config hggit.mapsavefrequency=10 --debug \ 215s > | grep -c saving 215s - 1 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s + abort: repository gitrepo not found 215s + 0 215s + [1] 215s $ rm -rf hgrepo 215s 215s pull with mapsavefreq set 215s 215s $ hg init hgrepo 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s $ cat >> hgrepo/.hg/hgrc < [paths] 215s > default = $TESTTMP/gitrepo 215s > EOF 215s $ hg -R hgrepo --config hggit.mapsavefrequency=10 pull --debug \ 215s > | grep -c saving 215s - 10 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s + abort: repository $TESTTMP/gitrepo not found 215s + 0 215s + [1] 215s $ rm -rf hgrepo 215s 215s The user experience 215s @@ -66,6 +76,8 @@ 215s First, create a repository, set up to pull from git, and where we can interrupt the conversion. 215s 215s $ hg init hgrepo 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s $ cat >> hgrepo/.hg/hgrc < [paths] 215s > default = $TESTTMP/gitrepo 215s @@ -75,39 +87,45 @@ 215s A low save interval causes a lot of reports: 215s 215s $ hg --config hggit.mapsavefrequency=25 pull 215s - pulling from $TESTTMP/gitrepo 215s - importing 100 git commits 215s - new changesets 1c8407413fa3:abc468b9e51b (25 drafts) 215s - new changesets 217c308baf47:d5d14eeedd08 (25 drafts) 215s - new changesets d9807ef6abcb:4678067bd500 (25 drafts) 215s - adding bookmark master 215s - new changesets c31a154888bb:eda59117ba04 (25 drafts) 215s - (run 'hg update' to get a working copy) 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s + pulling from $TESTTMP/gitrepo 215s + abort: repository $TESTTMP/gitrepo not found 215s + [255] 215s 215s Reset the repository 215s 215s $ hg debugstrip --no-backup 'all()' 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s $ hg debug-remove-hggit-state 215s - clearing out the git cache data 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s + hg: unknown command 'debug-remove-hggit-state' 215s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 215s + [10] 215s 215s And with phases? No mention of draft changesets, as we publish changes 215s during the conversion: 215s 215s $ hg --config hggit.mapsavefrequency=25 --config hggit.usephases=yes pull 215s - pulling from $TESTTMP/gitrepo 215s - importing 100 git commits 215s - new changesets 1c8407413fa3:abc468b9e51b 215s - new changesets 217c308baf47:d5d14eeedd08 215s - new changesets d9807ef6abcb:4678067bd500 215s - updating bookmark master 215s - new changesets c31a154888bb:eda59117ba04 215s - (run 'hg update' to get a working copy) 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s + pulling from $TESTTMP/gitrepo 215s + abort: repository $TESTTMP/gitrepo not found 215s + [255] 215s 215s Reset the repository 215s 215s $ hg debugstrip --no-backup 'all()' 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s $ hg debug-remove-hggit-state 215s - clearing out the git cache data 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s + hg: unknown command 'debug-remove-hggit-state' 215s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 215s + [10] 215s 215s Interruptions 215s ------------- 215s @@ -121,54 +139,51 @@ 215s Test an error in a pull: 215s 215s $ ABORT_AFTER=99 hg pull 215s - pulling from $TESTTMP/gitrepo 215s - importing 100 git commits 215s - transaction abort! 215s - rollback completed 215s - abort: aborted after 99 commits! 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s + pulling from $TESTTMP/gitrepo 215s + abort: repository $TESTTMP/gitrepo not found 215s [255] 215s $ hg log -l 10 -T '{rev} {gitnode}\n' 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s 215s Test the user exiting in the first transaction: 215s 215s $ EXIT_AFTER=5 hg --config hggit.mapsavefrequency=10 pull 215s - pulling from $TESTTMP/gitrepo 215s - importing 100 git commits 215s - transaction abort! 215s - rollback completed 215s - interrupted! 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s + pulling from $TESTTMP/gitrepo 215s + abort: repository $TESTTMP/gitrepo not found 215s [255] 215s $ hg log -l 10 -T '{rev} {gitnode}\n' 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s 215s Check that we have no state, but clear it just in case 215s 215s $ ls -d .hg/git* 215s - .hg/git 215s + ls: cannot access '.hg/git*': No such file or directory 215s + [2] 215s $ hg debug-remove-hggit-state 215s - clearing out the git cache data 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s + hg: unknown command 'debug-remove-hggit-state' 215s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 215s + [10] 215s 215s Test the user exiting in the middle of a conversion, after the first 215s transaction: 215s 215s $ EXIT_AFTER=15 hg --config hggit.mapsavefrequency=10 pull 215s - pulling from $TESTTMP/gitrepo 215s - importing 100 git commits 215s - new changesets 1c8407413fa3:7c8c534a5fbe (10 drafts) 215s - transaction abort! 215s - rollback completed 215s - interrupted! 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s + pulling from $TESTTMP/gitrepo 215s + abort: repository $TESTTMP/gitrepo not found 215s [255] 215s $ hg log -l 10 -T '{rev} {gitnode}\n' 215s - 9 7cbb16ec981b308e1e2b181f8e1f22c8f409f44e 215s - 8 42da70ed92bbecf9f348ba59c93646be723d0bf2 215s - 7 17e841146e5744b81af9959634d82c20a5d7df52 215s - 6 c31065bf97bf014815e37cdfbdef2c32c687f314 215s - 5 fcf21b8e0520ec1cced1d7593d13f9ee54721269 215s - 4 46acd02d0352e4b92bd6a099bb0490305d847a18 215s - 3 61eeda444b37b8aa3892d5f04c66c5441d21dd66 215s - 2 e55db11bb0472791c7af3fc636772174cdea4a36 215s - 1 17a2672b3c24c02d568f99d8d55ccae2bf362d5c 215s - 0 4e195b4c6e77604b70a8ad3b01306adbb9b1c7e7 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s $ cd .. 215s $ rm -rf hgrepo 215s 215s @@ -183,12 +198,10 @@ 215s > hg --config hggit.mapsavefrequency=10 --config git.intree=yes \ 215s > --cwd hgrepo \ 215s > clone -U $TESTTMP/gitrepo . 215s - importing 100 git commits 215s - transaction abort! 215s - rollback completed 215s - interrupted! 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + *** failed to import extension "breakage" from /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/testlib/ext-break-git-import.py: b'hggit' 215s + abort: repository $TESTTMP/gitrepo not found 215s [255] 215s the leftover below appeared in Mercurial 5.9+; it is unintentional 215s $ ls -A hgrepo 215s - .git 215s - $ rm -rf hgrepo 215s + $ rm -rf hgrepo 215s 215s ERROR: test-transactions.t output changed 215s ! 215s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-hg-branch.t 215s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-hg-branch.t.err 215s @@ -12,82 +12,10 @@ 215s 215s $ cd .. 215s $ hg clone gitrepo hgrepo 215s - importing 1 git commits 215s - new changesets ff7a2f2d8d70 (1 drafts) 215s - updating to bookmark not-master 215s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s + abort: repository gitrepo not found 215s + [255] 215s 215s $ cd hgrepo 215s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 215s $ hg co master 215s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 215s - (activating bookmark master) 215s - $ hg mv alpha beta 215s - $ fn_hg_commit -m 'rename alpha to beta' 215s - $ hg push 215s - pushing to $TESTTMP/gitrepo 215s - searching for changes 215s - adding objects 215s - remote: found 0 deltas to reuse 215s - added 1 commits with 1 trees and 0 blobs 215s - updating reference refs/heads/master 215s - 215s - $ hg branch gamma | grep -v 'permanent and global' 215s - marked working directory as branch gamma 215s - $ fn_hg_commit -m 'started branch gamma' 215s - $ hg push 215s - pushing to $TESTTMP/gitrepo 215s - searching for changes 215s - adding objects 215s - remote: found 0 deltas to reuse 215s - added 1 commits with 1 trees and 0 blobs 215s - updating reference refs/heads/master 215s - 215s - $ hg log --graph 215s - @ changeset: 2:400db38f4f64 215s - | branch: gamma 215s - | bookmark: master 215s - | tag: default/master 215s - | tag: tip 215s - | user: test 215s - | date: Mon Jan 01 00:00:12 2007 +0000 215s - | summary: started branch gamma 215s - | 215s - o changeset: 1:3baa67317a4d 215s - | user: test 215s - | date: Mon Jan 01 00:00:11 2007 +0000 215s - | summary: rename alpha to beta 215s - | 215s - o changeset: 0:ff7a2f2d8d70 215s - bookmark: not-master 215s - tag: default/not-master 215s - user: test 215s - date: Mon Jan 01 00:00:10 2007 +0000 215s - summary: add alpha 215s - 215s - 215s - $ cd .. 215s - $ hg clone -U gitrepo hgrepo2 215s - importing 3 git commits 215s - new changesets ff7a2f2d8d70:400db38f4f64 (3 drafts) 215s - $ hg -R hgrepo2 log --graph 215s - o changeset: 2:400db38f4f64 215s - | branch: gamma 215s - | bookmark: master 215s - | tag: default/master 215s - | tag: tip 215s - | user: test 215s - | date: Mon Jan 01 00:00:12 2007 +0000 215s - | summary: started branch gamma 215s - | 215s - o changeset: 1:3baa67317a4d 215s - | user: test 215s - | date: Mon Jan 01 00:00:11 2007 +0000 215s - | summary: rename alpha to beta 215s - | 215s - o changeset: 0:ff7a2f2d8d70 215s - bookmark: not-master 215s - tag: default/not-master 215s - user: test 215s - date: Mon Jan 01 00:00:10 2007 +0000 215s - summary: add alpha 215s - 215s 215s ERROR: test-hg-branch.t output changed 215s ! 215s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-serve-hg-static.t 215s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-serve-hg-static.t.err 215s @@ -6,6 +6,7 @@ 215s $ . "$TESTDIR/testutil" 215s 215s $ hg clone http://localhost:$HGPORT/ copy 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s abort: * (glob) 215s [100] 215s $ test -d copy 215s @@ -18,14 +19,18 @@ 215s > --logfile server.log 215s $ cat dumb.pid >> $DAEMON_PIDS 215s $ hg init remote 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ cd remote 215s $ echo foo > bar 215s $ echo c2 > '.dotfile with spaces' 215s $ hg add 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s adding .dotfile with spaces 215s adding bar 215s $ hg commit -m"test" 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ hg tip 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s changeset: 0:02770d679fb8 215s tag: tip 215s user: test 215s @@ -34,6 +39,7 @@ 215s 215s $ cd .. 215s $ hg clone static-http://localhost:$HGPORT/remote local 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s requesting all changes 215s adding changesets 215s adding manifests 215s @@ -44,17 +50,20 @@ 215s 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 215s $ cd local 215s $ hg verify 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s checking changesets 215s checking manifests 215s crosschecking files in changesets and manifests 215s + checking dirstate (?) 215s checking files 215s - checking dirstate (?) 215s + checking dirstate 215s checked 1 changesets with 2 changes to 2 files 215s $ cat bar 215s foo 215s $ cd ../remote 215s $ echo baz > quux 215s $ hg commit -A -mtest2 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s adding quux 215s 215s check for HTTP opener failures when cachefile does not exist 215s @@ -62,6 +71,7 @@ 215s $ rm .hg/cache/* 215s $ cd ../local 215s $ hg pull 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s pulling from static-http://localhost:$HGPORT/remote 215s searching for changes 215s adding changesets 215s @@ -74,10 +84,13 @@ 215s trying to push 215s 215s $ hg update 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 215s $ echo more foo >> bar 215s $ hg commit -m"test" 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ hg push 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s pushing to static-http://localhost:$HGPORT/remote 215s abort: destination does not support push 215s [255] 215s @@ -86,9 +99,11 @@ 215s 215s $ cd .. 215s $ hg clone -r doesnotexist static-http://localhost:$HGPORT/remote local0 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s abort: unknown revision 'doesnotexist'!? (re) 215s [10] 215s $ hg clone -r 0 static-http://localhost:$HGPORT/remote local0 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s adding changesets 215s adding manifests 215s adding file changes 215s @@ -100,16 +115,23 @@ 215s test with "/" URI (issue747) and subrepo 215s 215s $ hg init 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ hg init sub 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ touch sub/test 215s $ hg -R sub commit -A -m "test" 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s adding test 215s $ hg -R sub tag not-empty 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ echo sub=sub > .hgsub 215s $ echo a > a 215s $ hg add a .hgsub 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ hg -q ci -ma 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ hg clone static-http://localhost:$HGPORT/ local2 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s requesting all changes 215s adding changesets 215s adding manifests 215s @@ -127,58 +149,75 @@ 215s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 215s $ cd local2 215s $ hg verify 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s checking changesets 215s checking manifests 215s crosschecking files in changesets and manifests 215s + checking dirstate (?) 215s checking files 215s - checking dirstate (?) 215s + checking dirstate 215s checked 1 changesets with 3 changes to 3 files 215s checking subrepo links 215s $ cat a 215s a 215s $ hg paths 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s default = static-http://localhost:$HGPORT/ 215s 215s test with empty repo (issue965) 215s 215s $ cd .. 215s $ hg init remotempty 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ hg clone static-http://localhost:$HGPORT/remotempty local3 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s no changes found 215s updating to branch default 215s 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 215s $ cd local3 215s $ hg verify 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s checking changesets 215s checking manifests 215s crosschecking files in changesets and manifests 215s + checking dirstate (?) 215s checking files 215s - checking dirstate (?) 215s + checking dirstate 215s checked 0 changesets with 0 changes to 0 files 215s $ hg paths 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s default = static-http://localhost:$HGPORT/remotempty 215s $ cd .. 215s 215s Clone with tags and branches works 215s 215s $ hg init remote-with-names 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ cd remote-with-names 215s $ echo 0 > foo 215s $ hg -q commit -A -m initial 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ echo 1 > foo 215s $ hg commit -m 'commit 1' 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ hg -q up 0 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ hg branch mybranch 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s marked working directory as branch mybranch 215s (branches are permanent and global, did you want a bookmark?) 215s $ echo 2 > foo 215s $ hg commit -m 'commit 2 (mybranch)' 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ hg tag -r 1 'default-tag' 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s $ hg tag -r 2 'branch-tag' 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s 215s $ cd .. 215s 215s $ hg clone static-http://localhost:$HGPORT/remote-with-names local-with-names 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s requesting all changes 215s adding changesets 215s adding manifests 215s @@ -191,6 +230,7 @@ 215s Clone a specific branch works 215s 215s $ hg clone -r mybranch static-http://localhost:$HGPORT/remote-with-names local-with-names-branch 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s adding changesets 215s adding manifests 215s adding file changes 215s @@ -202,6 +242,7 @@ 215s Clone a specific tag works 215s 215s $ hg clone -r default-tag static-http://localhost:$HGPORT/remote-with-names local-with-names-tag 215s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 215s adding changesets 215s adding manifests 215s adding file changes 215s 215s ERROR: test-serve-hg-static.t output changed 216s ! 216s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-pull-after-strip.t 216s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-pull-after-strip.t.err 216s @@ -15,82 +15,9 @@ 216s 216s $ cd .. 216s $ hg clone -U gitrepo hgrepo 216s - importing 2 git commits 216s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s + abort: repository gitrepo not found 216s + [255] 216s $ cd hgrepo 216s + $TESTTMP.sh: 26: cd: can't cd to hgrepo 216s $ hg up master 216s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 216s - (activating bookmark master) 216s - $ hg log --graph 216s - @ changeset: 1:7fe02317c63d 216s - | bookmark: master 216s - | tag: default/master 216s - | tag: thetag 216s - | tag: tip 216s - | user: test 216s - | date: Mon Jan 01 00:00:11 2007 +0000 216s - | summary: add beta 216s - | 216s - o changeset: 0:ff7a2f2d8d70 216s - user: test 216s - date: Mon Jan 01 00:00:10 2007 +0000 216s - summary: add alpha 216s - 216s - $ cd ../gitrepo 216s - $ echo beta line 2 >> beta 216s - $ git add beta 216s - $ fn_git_commit -m 'add to beta' 216s - 216s - $ cd .. 216s - $ cd hgrepo 216s - $ hg debugstrip --no-backup tip 216s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 216s - $ hg pull 216s - pulling from $TESTTMP/gitrepo 216s - importing 1 git commits 216s - abort: you appear to have run strip - please run hg git-cleanup 216s - [255] 216s - $ hg tags 216s - tip 0:ff7a2f2d8d70 216s - $ hg git-cleanup 216s - git commit map cleaned 216s - 216s -pull works after 'hg git-cleanup' 216s - 216s - $ hg pull 216s - pulling from $TESTTMP/gitrepo 216s - importing 2 git commits 216s - updating bookmark master 216s - new changesets 7fe02317c63d:cc1e605d90db (2 drafts) 216s - (run 'hg update' to get a working copy) 216s - $ hg log --graph 216s - o changeset: 2:cc1e605d90db 216s - | bookmark: master 216s - | tag: default/master 216s - | tag: tip 216s - | user: test 216s - | date: Mon Jan 01 00:00:12 2007 +0000 216s - | summary: add to beta 216s - | 216s - o changeset: 1:7fe02317c63d 216s - | tag: thetag 216s - | user: test 216s - | date: Mon Jan 01 00:00:11 2007 +0000 216s - | summary: add beta 216s - | 216s - @ changeset: 0:ff7a2f2d8d70 216s - user: test 216s - date: Mon Jan 01 00:00:10 2007 +0000 216s - summary: add alpha 216s - 216s - 216s - $ cd .. 216s - 216s -Check that we also remove bad refs: 216s - 216s - $ cd hgrepo 216s - $ echo e93b671cb24bff41779187edff99178e2597c2 > .hg/git/refs/tags/bad-tag 216s - $ hg git-cleanup 216s - git commit map cleaned 216s - $ test -e .hg/git/refs/tags/bad-tag 216s - [1] 216s 216s ERROR: test-pull-after-strip.t output changed 216s ! 216s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-subrepos-syntax.t 216s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-subrepos-syntax.t.err 216s @@ -38,54 +38,9 @@ 216s $ cd .. 216s 216s $ hg clone -U repo.git hgrepo 216s - importing 3 git commits 216s - new changesets e532b2bfda10:3c4fd561cbeb (3 drafts) 216s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 216s + abort: repository repo.git not found 216s + [255] 216s $ cd hgrepo 216s + $TESTTMP.sh: 42: cd: can't cd to hgrepo 216s $ hg up master 216s - Cloning into '$TESTTMP/hgrepo/subrepo1'... 216s - done. 216s - Cloning into '$TESTTMP/hgrepo/xyz/subrepo2'... 216s - done. 216s - cloning subrepo subrepo1 from $TESTTMP/gitsubrepo 216s - cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo 216s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 216s - (activating bookmark master) 216s - $ cat >> .hgsub < # this is a comment 216s - > [subpaths] 216s - > flaf = blyf 216s - > EOF 216s - $ fn_hg_commit -m 'add comment & subsection' 216s - $ hg push 216s - pushing to $TESTTMP/repo.git 216s - searching for changes 216s - adding objects 216s - remote: found 0 deltas to reuse 216s - added 1 commits with 1 trees and 0 blobs 216s - updating reference refs/heads/master 216s - $ cd .. 216s - 216s - $ cd gitrepo 216s - $ git pull --ff-only 216s - From $TESTTMP/repo 216s - 89c22d7..106b34e master -> origin/master 216s - Updating 89c22d7..106b34e 216s - Fast-forward 216s - $ cat .gitmodules 216s - [submodule "subrepo1"] 216s - path = subrepo1 216s - url = ../gitsubrepo 216s - [submodule "xyz/subrepo2"] 216s - path = xyz/subrepo2 216s - url = ../gitsubrepo 216s - $ cd .. 216s - 216s -We broke bidirectionality: 216s - 216s - $ hg clone -U repo.git hgrepo2 216s - importing 4 git commits 216s - new changesets e532b2bfda10:cbf584fe001b (4 drafts) 216s - $ hg id -r tip hgrepo 216s - c58a542b18bc default/master/tip master 216s - $ hg id -r tip hgrepo2 216s - cbf584fe001b default/master/tip master 216s 216s ERROR: test-subrepos-syntax.t output changed 217s ! 217s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-merge.t 217s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-merge.t.err 217s @@ -30,60 +30,11 @@ 217s $ git init -q --bare repo.git 217s 217s $ hg clone gitrepo hgrepo 217s - importing 4 git commits 217s - new changesets ff7a2f2d8d70:89ca4a68d6b9 (4 drafts) 217s - updating to bookmark master 217s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 217s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 217s + abort: repository gitrepo not found 217s + [255] 217s $ cd hgrepo 217s + $TESTTMP.sh: 40: cd: can't cd to hgrepo 217s 217s clear the cache to be sure it is regenerated correctly 217s $ hg debug-remove-hggit-state 217s - clearing out the git cache data 217s - $ hg push ../repo.git 217s - pushing to ../repo.git 217s - searching for changes 217s - adding objects 217s - remote: found 0 deltas to reuse 217s - added 4 commits with 4 trees and 3 blobs 217s - adding reference refs/heads/beta 217s - adding reference refs/heads/master 217s - 217s - $ cd .. 217s -git log in repo pushed from hg 217s - $ git --git-dir=repo.git log --pretty=medium master | sed 's/\.\.\.//g' 217s - commit 5806851511aaf3bfe813ae3a86c5027165fa9b96 217s - Merge: e5023f9 9497a4e 217s - Author: test 217s - Date: Mon Jan 1 00:00:12 2007 +0000 217s - 217s - Merge branch 'beta' 217s - 217s - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 217s - Author: test 217s - Date: Mon Jan 1 00:00:12 2007 +0000 217s - 217s - add gamma 217s - 217s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 217s - Author: test 217s - Date: Mon Jan 1 00:00:11 2007 +0000 217s - 217s - add beta 217s - 217s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 217s - Author: test 217s - Date: Mon Jan 1 00:00:10 2007 +0000 217s - 217s - add alpha 217s - $ git --git-dir=repo.git log --pretty=medium beta | sed 's/\.\.\.//g' 217s - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 217s - Author: test 217s - Date: Mon Jan 1 00:00:11 2007 +0000 217s - 217s - add beta 217s - 217s - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 217s - Author: test 217s - Date: Mon Jan 1 00:00:10 2007 +0000 217s - 217s - add alpha 217s 217s ERROR: test-merge.t output changed 217s ! 217s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-hg-tags.t 217s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-hg-tags.t.err 217s @@ -16,69 +16,10 @@ 217s 217s $ cd .. 217s $ hg clone -U repo.git hgrepo 217s - importing 1 git commits 217s - new changesets ff7a2f2d8d70 (1 drafts) 217s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 217s + abort: repository repo.git not found 217s + [255] 217s 217s $ cd hgrepo 217s + $TESTTMP.sh: 22: cd: can't cd to hgrepo 217s $ hg co master 217s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 217s - (activating bookmark master) 217s - $ fn_hg_tag alpha 217s - $ hg push 217s - pushing to $TESTTMP/repo.git 217s - searching for changes 217s - adding objects 217s - remote: found 0 deltas to reuse 217s - added 1 commits with 1 trees and 1 blobs 217s - updating reference refs/heads/master 217s - adding reference refs/tags/alpha 217s - 217s - $ hg log --graph 217s - @ changeset: 1:e8b150f84560 217s - | bookmark: master 217s - | tag: default/master 217s - | tag: tip 217s - | user: test 217s - | date: Mon Jan 01 00:00:11 2007 +0000 217s - | summary: Added tag alpha for changeset ff7a2f2d8d70 217s - | 217s - o changeset: 0:ff7a2f2d8d70 217s - tag: alpha 217s - user: test 217s - date: Mon Jan 01 00:00:10 2007 +0000 217s - summary: add alpha 217s - 217s - 217s - $ cd .. 217s - $ cd gitrepo 217s -git should have the tag alpha 217s - $ git fetch origin 217s - From $TESTTMP/repo 217s - 7eeab2e..bbae830 master -> origin/master 217s - * [new tag] alpha -> alpha 217s - $ cd .. 217s - 217s - $ hg clone repo.git hgrepo2 217s - importing 2 git commits 217s - new changesets ff7a2f2d8d70:e8b150f84560 (2 drafts) 217s - updating to bookmark master 217s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 217s - $ hg -R hgrepo2 log --graph 217s - @ changeset: 1:e8b150f84560 217s - | bookmark: master 217s - | tag: default/master 217s - | tag: tip 217s - | user: test 217s - | date: Mon Jan 01 00:00:11 2007 +0000 217s - | summary: Added tag alpha for changeset ff7a2f2d8d70 217s - | 217s - o changeset: 0:ff7a2f2d8d70 217s - tag: alpha 217s - user: test 217s - date: Mon Jan 01 00:00:10 2007 +0000 217s - summary: add alpha 217s - 217s - 217s -the tag should be in .hgtags 217s - $ cat hgrepo2/.hgtags 217s - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alpha 217s 217s ERROR: test-hg-tags.t output changed 218s ! 218s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-hg-clone.t 218s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-hg-clone.t.err 218s @@ -11,88 +11,17 @@ 218s $ cd .. 218s 218s $ hg clone -U gitrepo hgrepo 218s - importing 1 git commits 218s - new changesets ff7a2f2d8d70 (1 drafts) 218s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 218s + abort: repository gitrepo not found 218s + [255] 218s 218s By default, the Git state isn't preserved across a copying/linking 218s clone 218s 218s $ hg clone -U hgrepo otherhgrepo 218s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 218s + abort: repository hgrepo not found 218s + [255] 218s $ cd otherhgrepo 218s + $TESTTMP.sh: 22: cd: can't cd to otherhgrepo 218s $ find .hg -name 'git*' | sort 218s - $ hg tags -v 218s - tip 0:ff7a2f2d8d70 218s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 218s - $ cd .. 218s - $ rm -r otherhgrepo 218s - 218s -Nor using a pull clone 218s - 218s - $ hg clone -U --pull hgrepo otherhgrepo 218s - requesting all changes 218s - adding changesets 218s - adding manifests 218s - adding file changes 218s - added 1 changesets with 1 changes to 1 files 218s - new changesets ff7a2f2d8d70 218s - $ cd otherhgrepo 218s - $ find .hg -name 'git*' | sort 218s - $ hg tags -v 218s - tip 0:ff7a2f2d8d70 218s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 218s - $ cd .. 218s - $ rm -r otherhgrepo 218s - 218s -But we can enable it! 218s - 218s - $ cat >> $HGRCPATH < [experimental] 218s - > hg-git-serve = yes 218s - > EOF 218s - 218s -Check transferring between Mercurial repositories using a 218s -copying/linking clone 218s - 218s - $ hg clone -U hgrepo otherhgrepo 218s - $ cd otherhgrepo 218s - $ find .hg -name 'git*' | sort 218s - $ hg tags -q 218s - tip 218s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 218s - $ cd .. 218s - 218s -Checking using a pull clone 218s - 218s - $ rm -rf otherhgrepo 218s - $ hg clone -U --pull hgrepo otherhgrepo 218s - requesting all changes 218s - adding changesets 218s - adding manifests 218s - adding file changes 218s - added 1 changesets with 1 changes to 1 files 218s - new changesets ff7a2f2d8d70 218s - $ cd otherhgrepo 218s - $ hg tags -q 218s - tip 218s - alpha 218s - $ hg log -r 'fromgit()' -T '{rev}:{node|short} {gitnode|short}\n' 218s - 0:ff7a2f2d8d70 7eeab2ea75ec 218s - $ cd .. 218s - 218s -Can we repopulate the state from a Mercurial repository? 218s - 218s - $ cd otherhgrepo 218s - $ hg debug-remove-hggit-state 218s - clearing out the git cache data 218s - $ hg log -qr 'fromgit()' 218s - $ hg tags 218s - tip 0:ff7a2f2d8d70 218s - $ hg pull 218s - pulling from $TESTTMP/hgrepo 218s - searching for changes 218s - no changes found 218s - $ hg log -qr 'fromgit()' 218s - $ hg tags 218s - tip 0:ff7a2f2d8d70 218s - 218s -Sadly, no. 218s 218s ERROR: test-hg-clone.t output changed 218s ! 218s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-push-detached.t 218s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-push-detached.t.err 218s @@ -40,37 +40,9 @@ 218s in this case continues to work. 218s 218s $ hg clone gitrepo hgrepo 218s - importing 1 git commits 218s - new changesets ff7a2f2d8d70 (1 drafts) 218s - updating to bookmark master 218s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 218s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 218s + abort: repository gitrepo not found 218s + [255] 218s $ cd hgrepo 218s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 218s $ echo beta > beta 218s - $ hg add beta 218s - $ fn_hg_commit -m "add beta" 218s - 218s -Pushing that changeset, with phases, publishes the detached HEAD. 218s -Whether this should happen is debatable, but it's a side effect from 218s -the fact that pushing to the remote HEAD, with HEAD being the usual 218s -symref, should publish it. 218s - 218s - $ hg push -v --config hggit.usephases=yes 218s - pushing to $TESTTMP/gitrepo 218s - finding unexported changesets 218s - exporting 1 changesets 218s - converting revision 47580592d3d6492421a1e6cebc5c2d701a2e858b 218s - packing 3 loose objects... 218s - searching for changes 218s - remote: counting objects: 5, done. 218s - 1 commits found 218s - adding objects 218s - remote: counting objects: 5, done. 218s - remote: found 0 deltas to reuse 218s - added 1 commits with 1 trees and 1 blobs 218s - updating reference default::refs/heads/master => GIT:0f378ab6 218s - publishing remote HEAD 218s - $ hg phase 'all()' 218s - 0: public 218s - 1: draft 218s - $ cd .. 218s - 218s 218s ERROR: test-push-detached.t output changed 219s ! 219s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-git-workflow.t 219s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-git-workflow.t.err 219s @@ -2,13 +2,20 @@ 219s $ . "$TESTDIR/testutil" 219s 219s $ hg init hgrepo 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s $ cd hgrepo 219s $ hg debuggitdir 219s - $TESTTMP/hgrepo/.hg/git 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s + hg: unknown command 'debuggitdir' 219s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 219s + [10] 219s $ echo alpha > alpha 219s $ hg add alpha 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s $ fn_hg_commit -m "add alpha" 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s $ hg log --graph --debug | grep -v phase: 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s @ changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 219s tag: tip 219s parent: -1:0000000000000000000000000000000000000000 219s @@ -27,49 +34,54 @@ 219s 219s configure for use from git 219s $ hg clone hgrepo gitrepo 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s updating to branch default 219s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 219s $ cd gitrepo 219s $ hg book master 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s $ hg up null 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 219s (leaving bookmark master) 219s $ echo "[git]" >> .hg/hgrc 219s $ echo "intree = True" >> .hg/hgrc 219s $ hg debuggitdir 219s - $TESTTMP/gitrepo/.git 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s + hg: unknown command 'debuggitdir' 219s + (did you mean one of debugdag, debugdirstate, debugdiscovery, debugfileset, debuggetbundle, debugignore, debugindex, debuginstall?) 219s + [10] 219s $ hg gexport 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s + hg: unknown command 'gexport' 219s + (did you mean one of export, import?) 219s + [10] 219s 219s do some work 219s $ git config core.bare false 219s + fatal: not in a git directory 219s + [128] 219s $ git checkout master 2>&1 | sed s/\'/\"/g 219s - Already on "master" 219s + fatal: not a git repository (or any of the parent directories): .git 219s $ echo beta > beta 219s $ git add beta 219s + fatal: not a git repository (or any of the parent directories): .git 219s + [128] 219s $ fn_git_commit -m 'add beta' 219s + fatal: not a git repository (or any of the parent directories): .git 219s + git commit error 219s 219s get things back to hg 219s $ hg gimport 219s - importing 1 git commits 219s - updating bookmark master 219s - new changesets 9f124f3c1fc2 (1 drafts) 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s + hg: unknown command 'gimport' 219s + (did you mean one of export, import?) 219s + [10] 219s $ hg log --graph --debug | grep -v phase: 219s - o changeset: 1:9f124f3c1fc29a14f5eb027c24811b0ac9d5ff10 219s - | bookmark: master 219s - | tag: tip 219s - | parent: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 219s - | parent: -1:0000000000000000000000000000000000000000 219s - | manifest: 1:f0bd6fbafbaebe4bb59c35108428f6fce152431d 219s - | user: test 219s - | date: Mon Jan 01 00:00:11 2007 +0000 219s - | files+: beta 219s - | extra: branch=default 219s - | extra: hg-git-rename-source=git 219s - | description: 219s - | add beta 219s - | 219s - | 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s o changeset: 0:0221c246a56712c6aa64e5ee382244d8a471b1e2 219s + bookmark: master 219s + tag: tip 219s parent: -1:0000000000000000000000000000000000000000 219s parent: -1:0000000000000000000000000000000000000000 219s manifest: 0:8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0 219s @@ -83,7 +95,8 @@ 219s 219s gimport should have updated the bookmarks as well 219s $ hg bookmarks 219s - master 1:9f124f3c1fc2 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s + master 0:0221c246a567 219s 219s gimport support for git.mindate 219s $ cat >> .hg/hgrc << EOF 219s @@ -92,20 +105,23 @@ 219s > EOF 219s $ echo oldcommit > oldcommit 219s $ git add oldcommit 219s + fatal: not a git repository (or any of the parent directories): .git 219s + [128] 219s $ GIT_AUTHOR_DATE="2014-03-01 00:00:00 +0000" \ 219s > GIT_COMMITTER_DATE="2009-01-01 00:00:00 +0000" \ 219s > git commit -m oldcommit > /dev/null || echo "git commit error" 219s + fatal: not a git repository (or any of the parent directories): .git 219s + git commit error 219s $ hg gimport 219s - no changes found 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s + hg: unknown command 'gimport' 219s + (did you mean one of export, import?) 219s + [10] 219s $ hg log --graph 219s - o changeset: 1:9f124f3c1fc2 219s - | bookmark: master 219s - | tag: tip 219s - | user: test 219s - | date: Mon Jan 01 00:00:11 2007 +0000 219s - | summary: add beta 219s - | 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s o changeset: 0:0221c246a567 219s + bookmark: master 219s + tag: tip 219s user: test 219s date: Mon Jan 01 00:00:10 2007 +0000 219s summary: add alpha 219s @@ -113,32 +129,23 @@ 219s 219s $ echo newcommit > newcommit 219s $ git add newcommit 219s + fatal: not a git repository (or any of the parent directories): .git 219s + [128] 219s $ GIT_AUTHOR_DATE="2014-01-01 00:00:00 +0000" \ 219s > GIT_COMMITTER_DATE="2014-01-02 00:00:00 +0000" \ 219s > git commit -m newcommit > /dev/null || echo "git commit error" 219s + fatal: not a git repository (or any of the parent directories): .git 219s + git commit error 219s $ hg gimport 219s - importing 2 git commits 219s - updating bookmark master 219s - new changesets befdecd14df5:3d10b7289d79 (2 drafts) 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s + hg: unknown command 'gimport' 219s + (did you mean one of export, import?) 219s + [10] 219s $ hg log --graph 219s - o changeset: 3:3d10b7289d79 219s - | bookmark: master 219s - | tag: tip 219s - | user: test 219s - | date: Wed Jan 01 00:00:00 2014 +0000 219s - | summary: newcommit 219s - | 219s - o changeset: 2:befdecd14df5 219s - | user: test 219s - | date: Sat Mar 01 00:00:00 2014 +0000 219s - | summary: oldcommit 219s - | 219s - o changeset: 1:9f124f3c1fc2 219s - | user: test 219s - | date: Mon Jan 01 00:00:11 2007 +0000 219s - | summary: add beta 219s - | 219s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 219s o changeset: 0:0221c246a567 219s + bookmark: master 219s + tag: tip 219s user: test 219s date: Mon Jan 01 00:00:10 2007 +0000 219s summary: add alpha 219s 219s ERROR: test-git-workflow.t output changed 220s ! 220s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-multiple-remotes.t 220s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-multiple-remotes.t.err 220s @@ -14,6 +14,7 @@ 220s $ git clone --bare --quiet gitrepo repo.git 220s 220s $ hg init hgrepo 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s $ cd hgrepo 220s $ cat > .hg/hgrc < [paths] 220s @@ -26,52 +27,28 @@ 220s > EOF 220s 220s $ hg pull 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s pulling from $TESTTMP/gitrepo 220s - importing 1 git commits 220s - adding bookmark master 220s - adding bookmark not-master 220s - new changesets ff7a2f2d8d70 (1 drafts) 220s - (run 'hg update' to get a working copy) 220s - pulling from $TESTTMP/repo.git 220s - no changes found 220s + abort: repository $TESTTMP/gitrepo not found 220s + [255] 220s $ hg tags 220s - tip 0:ff7a2f2d8d70 220s - git/not-master 0:ff7a2f2d8d70 220s - git/master 0:ff7a2f2d8d70 220s - bare/not-master 0:ff7a2f2d8d70 220s - bare/master 0:ff7a2f2d8d70 220s - also-git/not-master 0:ff7a2f2d8d70 220s - also-git/master 0:ff7a2f2d8d70 220s - also-bare/not-master 0:ff7a2f2d8d70 220s - also-bare/master 0:ff7a2f2d8d70 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + tip -1:000000000000 220s 220s $ hg up master 220s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 220s - (activating bookmark master) 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + abort: unknown revision 'master' 220s + [10] 220s $ echo beta > beta 220s $ fn_hg_commit -A -m "add beta" 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s $ hg push 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s pushing to $TESTTMP/gitrepo 220s - searching for changes 220s - adding objects 220s - remote: found 0 deltas to reuse 220s - added 1 commits with 1 trees and 1 blobs 220s - updating reference refs/heads/master 220s - pushing to $TESTTMP/repo.git 220s - searching for changes 220s - adding objects 220s - remote: found 0 deltas to reuse 220s - added 1 commits with 1 trees and 1 blobs 220s - updating reference refs/heads/master 220s + abort: repository $TESTTMP/gitrepo not found 220s + [255] 220s 220s $ hg tags 220s - tip 1:47580592d3d6 220s - git/master 1:47580592d3d6 220s - bare/master 1:47580592d3d6 220s - also-git/master 1:47580592d3d6 220s - also-bare/master 1:47580592d3d6 220s - git/not-master 0:ff7a2f2d8d70 220s - bare/not-master 0:ff7a2f2d8d70 220s - also-git/not-master 0:ff7a2f2d8d70 220s - also-bare/not-master 0:ff7a2f2d8d70 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + tip 0:59e1f63242de 220s 220s 220s ERROR: test-multiple-remotes.t output changed 220s ! 220s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-serve-git.t 220s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-serve-git.t.err 220s @@ -33,28 +33,14 @@ 220s Make sure that clone over the old git protocol doesn't break 220s 220s $ hg clone -U git://localhost:$HGPORT/test copy 2>&1 220s - \r (no-eol) (esc) 220s - Counting objects 1/6 [=====> ]\r (no-eol) (esc) 220s - Counting objects 2/6 [===========> ]\r (no-eol) (esc) 220s - Counting objects 3/6 [=================> ]\r (no-eol) (esc) 220s - Counting objects 4/6 [=======================> ]\r (no-eol) (esc) 220s - Counting objects 5/6 [=============================> ]\r (no-eol) (esc) 220s - Counting objects 6/6 [===================================>]\r (no-eol) (esc) 220s - \r (no-eol) (esc) 220s - \r (no-eol) (esc) 220s - Compressing objects 1/3 [==========> ]\r (no-eol) (esc) 220s - Compressing objects 2/3 [=====================> ]\r (no-eol) (esc) 220s - Compressing objects 3/3 [================================>]\r (no-eol) (esc) 220s - \r (no-eol) (esc) 220s - \r (no-eol) (esc) 220s - importing commits 1/2 b23744d34f97 [======> ]\r (no-eol) (esc) 220s - importing commits 2/2 3af9773036a9 [=============>]\r (no-eol) (esc) 220s - \r (no-eol) (esc) 220s - importing 2 git commits 220s - new changesets c4d188f6e13d:221dd250e933 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + abort: repository git://localhost:$HGPORT/test not found 220s + [255] 220s $ hg log -T 'HG:{node|short} GIT:{gitnode|short}\n' -R copy 220s - HG:221dd250e933 GIT:3af9773036a9 220s - HG:c4d188f6e13d GIT:b23744d34f97 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + abort: repository copy not found 220s + [255] 220s $ hg tags -v -R copy 220s - tip 1:221dd250e933 220s - default/master 1:221dd250e933 git-remote 220s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 220s + abort: repository copy not found 220s + [255] 220s 220s ERROR: test-serve-git.t output changed 221s ! 221s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-phases-draft.t 221s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-phases-draft.t.err 221s @@ -12,73 +12,10 @@ 221s cloning without hggit.usephases does not publish local changesets 221s $ cd .. 221s $ hg clone gitrepo hgrepo | grep -v '^updating' 221s - importing 1 git commits 221s - new changesets ff7a2f2d8d70 (1 drafts) 221s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 221s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 221s + abort: repository gitrepo not found 221s + [1] 221s 221s $ cd hgrepo 221s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 221s $ hg phase -r master 221s - 0: draft 221s - 221s -pulling advances the draft phase, though 221s - 221s - $ hg phase -fs 0 221s - $ hg pull 221s - pulling from $TESTTMP/gitrepo 221s - no changes found 221s - $ hg phase tip 221s - 0: draft 221s - 221s -even if we don't have a name? 221s - 221s - $ hg phase -fs 0 221s - $ mv .hg/hgrc .hg/hgrc.bak 221s - $ hg pull ../gitrepo 221s - pulling from ../gitrepo 221s - no changes found 221s - $ hg phase tip 221s - 0: draft 221s - $ mv .hg/hgrc.bak .hg/hgrc 221s - $ cd .. 221s - 221s - 221s -pulling without hggit.usephases does not publish local changesets 221s - $ cd gitrepo 221s - $ git checkout -q master 221s - $ echo beta > beta 221s - $ git add beta 221s - $ fn_git_commit -m 'add beta' 221s - $ cd .. 221s - 221s - $ cd hgrepo 221s - $ hg pull 221s - pulling from $TESTTMP/gitrepo 221s - importing 1 git commits 221s - updating bookmark master 221s - new changesets 7fe02317c63d (1 drafts) 221s - (run 'hg update' to get a working copy) 221s - $ hg phase -r master 221s - 1: draft 221s - 221s -pulling with git.public does not publish local changesets 221s - $ hg --config git.public=master pull 221s - pulling from $TESTTMP/gitrepo 221s - no changes found 221s - $ hg phase -r master 221s - 1: draft 221s - 221s -pushing without hggit.usephases does not publish local changesets 221s - $ hg update master 221s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 221s - $ echo gamma > gamma 221s - $ hg add gamma 221s - $ hg commit -m 'gamma' 221s - $ hg push 221s - pushing to $TESTTMP/gitrepo 221s - searching for changes 221s - adding objects 221s - remote: found 0 deltas to reuse 221s - added 1 commits with 1 trees and 1 blobs 221s - updating reference refs/heads/master 221s - $ hg phase -r master 221s - 2: draft 221s 221s ERROR: test-phases-draft.t output changed 223s ! 223s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-subrepos-push.t 223s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-subrepos-push.t.err 223s @@ -5,10 +5,13 @@ 223s Initialized empty Git repository in $TESTTMP/repo.git/ 223s 223s $ hg init hgsubrepo 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s $ cd hgsubrepo 223s $ echo thefile > thefile 223s $ hg add thefile 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s $ fn_hg_commit -m 'add thefile' 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s $ cd .. 223s 223s $ git init gitsubrepo 223s @@ -20,59 +23,9 @@ 223s $ cd .. 223s 223s $ hg clone repo.git hgrepo 223s - updating to branch default 223s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s + abort: repository repo.git not found 223s + [255] 223s $ cd hgrepo 223s + $TESTTMP.sh: 32: cd: can't cd to hgrepo 223s $ hg book master 223s - $ echo alpha > alpha 223s - $ hg add alpha 223s - $ fn_hg_commit -m 'add alpha' 223s - $ touch .hgsub 223s - $ hg add .hgsub 223s - $ fn_hg_commit -m "add .hgsub" 223s - $ hg clone -q ../hgsubrepo hg 223s - $ echo "hg = ../hgsubrepo" >> .hgsub 223s - $ fn_hg_commit -m 'add hg subrepo' 223s - $ git clone --quiet ../gitsubrepo git 223s - $ echo "git = [git]../gitsubrepo" >> .hgsub 223s - $ fn_hg_commit -m 'add git subrepo' 223s - $ hg push 223s - pushing to $TESTTMP/repo.git 223s - pushing subrepo hg to $TESTTMP/hgsubrepo 223s - searching for changes 223s - no changes found 223s - searching for changes 223s - adding objects 223s - remote: found 0 deltas to reuse 223s - added 4 commits with 2 trees and 2 blobs 223s - adding reference refs/heads/master 223s - $ cat .hgsub 223s - hg = ../hgsubrepo 223s - git = [git]../gitsubrepo 223s - $ cat .hgsubstate 223s - aaae5224095dca7403147c0e20cbac1f450b0e95 git 223s - df643c539c7541d48eacc76745581e00cbaf3d45 hg 223s - $ cd .. 223s - 223s -Now clone it. Note that no Mercurial state persists: 223s - 223s - $ git clone --recurse-submodules repo.git gitrepo 223s - Cloning into 'gitrepo'... 223s - done. 223s - Submodule 'git' ($TESTTMP/gitsubrepo) registered for path 'git' 223s - Cloning into '$TESTTMP/gitrepo/git'... 223s - done. 223s - Submodule path 'git': checked out 'aaae5224095dca7403147c0e20cbac1f450b0e95' 223s - $ cd gitrepo 223s - $ ls -A 223s - .git 223s - .gitmodules 223s - alpha 223s - git 223s - $ cat .gitmodules 223s - [submodule "git"] 223s - path = git 223s - url = ../gitsubrepo 223s - $ ls -A git 223s - .git 223s - thefile 223s 223s ERROR: test-subrepos-push.t output changed 223s ! 223s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-verify-fail.t 223s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-verify-fail.t.err 223s @@ -25,6 +25,7 @@ 223s $ cd .. 223s 223s $ hg init hgrepo 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s $ cd hgrepo 223s $ echo normalf > normalf 223s $ echo differentf2 > differentf 223s @@ -32,63 +33,93 @@ 223s $ echo exef > exef 223s $ ln -s foo linkf 223s $ hg add normalf differentf unexpectedf exef linkf 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s $ fn_hg_commit -m 'add files' 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s $ git clone --mirror ../gitrepo .hg/git 223s Cloning into bare repository '.hg/git'... 223s done. 223s $ echo "$(cd ../gitrepo && git rev-parse HEAD) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s $ hg gverify 223s - verifying rev 3f1601c3cf54 against git commit 039c1cd9fdda382c9d1e8ec85de6b5b59518ca80 223s - difference in: differentf 223s - file has different flags: exef (hg '', git 'x') 223s - file has different flags: linkf (hg 'l', git '') 223s - file found in git but not hg: missingf 223s - file found in hg but not git: unexpectedf 223s - [1] 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s + hg: unknown command 'gverify' 223s + (did you mean verify?) 223s + [10] 223s 223s $ echo newf > newf 223s $ hg add newf 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s $ fn_hg_commit -m 'new hg commit' 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s $ hg gverify 223s - abort: no git commit found for rev 4e582b4eb862 223s - (if this is an octopus merge, verify against the last rev) 223s - [255] 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s + hg: unknown command 'gverify' 223s + (did you mean verify?) 223s + [10] 223s 223s invalid git SHA 223s $ echo "ffffffffffffffffffffffffffffffffffffffff $(hg log -r . --template '{node}')" >> .hg/git-mapfile 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s $ hg gverify 223s - abort: git equivalent ffffffffffffffffffffffffffffffffffffffff for rev 4e582b4eb862 not found! 223s - [255] 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s + hg: unknown command 'gverify' 223s + (did you mean verify?) 223s + [10] 223s 223s git SHA is not a commit 223s $ echo new2 >> newf 223s $ fn_hg_commit -m 'new hg commit 2' 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s this gets the tree pointed to by the commit at HEAD 223s $ echo "$(cd ../gitrepo && git show --format=%T HEAD | head -n 1) $(hg log -r . --template '{node}')" >> .hg/git-mapfile 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s $ hg gverify 223s - abort: git equivalent f477b00e4a9907617f346a529cc0fe9ba5d6f6d3 for rev 5c2eb98af3e2 is not a commit! 223s - [255] 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s + hg: unknown command 'gverify' 223s + (did you mean verify?) 223s + [10] 223s 223s corrupt git repository 223s 223s $ hg debug-remove-hggit-state 223s - clearing out the git cache data 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s + hg: unknown command 'debug-remove-hggit-state' 223s + (did you mean one of debug-revlog-stats, debugmergestate, debugrebuildstate, debugrevlogstats?) 223s + [10] 223s $ hg gexport 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s + hg: unknown command 'gexport' 223s + (did you mean one of export, import?) 223s + [10] 223s $ mv .hg/git/objects/pack $TESTTMP/pack-old 223s $ for packfile in $TESTTMP/pack-old/*.pack 223s > do 223s > git --git-dir .hg/git unpack-objects < $packfile 223s > done 223s + $TESTTMP.sh: 78: cannot open $TESTTMP/pack-old/*.pack: No such file 223s + [2] 223s $ mv -f .hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 223s + mv: cannot stat '.hg/git/objects/82/166b4cbde0f025d20aacb93fd085aa1462cd4e': No such file or directory 223s + [1] 223s $ hg gverify --fsck 223s - abort: git repository is corrupt! 223s - [255] 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s + hg: unknown command 'gverify' 223s + (did you mean verify?) 223s + [10] 223s $ hg gverify 223s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is not a commit! 223s - [255] 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s + hg: unknown command 'gverify' 223s + (did you mean verify?) 223s + [10] 223s $ chmod +w .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 223s + chmod: cannot access '.hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74': No such file or directory 223s + [1] 223s $ echo 42 > .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74 223s + $TESTTMP.sh: 89: cannot create .hg/git/objects/6d/ff77b710b6f0961ac0b6d91d85902195133d74: Directory nonexistent 223s + [2] 223s $ hg gverify 223s - abort: git equivalent 6dff77b710b6f0961ac0b6d91d85902195133d74 for rev 5c2eb98af3e2 is corrupt! 223s - (re-run with --traceback for details) 223s - [255] 223s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 223s + hg: unknown command 'gverify' 223s + (did you mean verify?) 223s + [10] 223s 223s ERROR: test-verify-fail.t output changed 224s ! 224s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-pull-after-obsolete.t 224s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-pull-after-obsolete.t.err 224s @@ -20,52 +20,9 @@ 224s 224s $ cd .. 224s $ hg clone -U gitrepo hgrepo 224s - importing 2 git commits 224s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 224s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 224s + abort: repository gitrepo not found 224s + [255] 224s $ cd hgrepo 224s + $TESTTMP.sh: 31: cd: can't cd to hgrepo 224s $ hg up master 224s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 224s - (activating bookmark master) 224s - $ hg log --graph 224s - @ changeset: 1:7fe02317c63d 224s - | bookmark: master 224s - | tag: default/master 224s - | tag: thetag 224s - | tag: tip 224s - | user: test 224s - | date: Mon Jan 01 00:00:11 2007 +0000 224s - | summary: add beta 224s - | 224s - o changeset: 0:ff7a2f2d8d70 224s - user: test 224s - date: Mon Jan 01 00:00:10 2007 +0000 224s - summary: add alpha 224s - 224s - $ cd ../gitrepo 224s - $ echo beta line 2 >> beta 224s - $ git add beta 224s - $ fn_git_commit -m 'add to beta' 224s - 224s -Create a commit, obsolete it, and pull, to ensure that we can pull if 224s -the tipmost commit is hidden. 224s - 224s - $ cd ../hgrepo 224s - $ hg bookmark --inactive 224s - $ echo gamma > gamma 224s - $ hg add gamma 224s - $ fn_hg_commit -m 'add gamma' 224s - $ hg up master 224s - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 224s - (activating bookmark master) 224s - $ hg log -T '{rev}:{node} {desc}\n' -r tip 224s - 2:4090a1266584bc1a47ce562e9349b1e0f1b44611 add gamma 224s - $ hg debugobsolete 4090a1266584bc1a47ce562e9349b1e0f1b44611 224s - 1 new obsolescence markers 224s - obsoleted 1 changesets 224s - 224s - $ hg pull 224s - pulling from $TESTTMP/gitrepo 224s - importing 1 git commits 224s - updating bookmark master 224s - new changesets cc1e605d90db (1 drafts) 224s - (run 'hg update' to get a working copy) 224s 224s ERROR: test-pull-after-obsolete.t output changed 225s ! 225s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-gitignore.t 225s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-gitignore.t.err 225s @@ -2,12 +2,14 @@ 225s $ . "$TESTDIR/testutil" 225s 225s $ hg init repo 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s $ cd repo 225s 225s Create a commit that we can export later on 225s 225s $ touch thefile 225s $ hg commit -A -m "initial commit" 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s adding thefile 225s 225s We should only read .gitignore files in a hg-git repo (i.e. one with .hg/git 225s @@ -18,6 +20,7 @@ 225s $ touch bar 225s $ echo 'foo*' > .gitignore 225s $ hg status 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s ? .gitignore 225s ? bar 225s ? foo 225s @@ -27,103 +30,140 @@ 225s it's gone: 225s 225s $ hg gexport 225s - $ hg status 225s - ? .gitignore 225s - ? bar 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + hg: unknown command 'gexport' 225s + (did you mean one of export, import?) 225s + [10] 225s + $ hg status 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + ? .gitignore 225s + ? bar 225s + ? foo 225s + ? foobar 225s 225s $ echo '*bar' > .gitignore 225s $ hg status 225s - ? .gitignore 225s - ? foo 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + ? .gitignore 225s + ? bar 225s + ? foo 225s + ? foobar 225s 225s $ mkdir dir 225s $ touch dir/foo 225s $ echo 'foo' > .gitignore 225s $ hg status 225s - ? .gitignore 225s - ? bar 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + ? .gitignore 225s + ? bar 225s + ? dir/foo 225s + ? foo 225s ? foobar 225s 225s $ echo '/foo' > .gitignore 225s $ hg status 225s - ? .gitignore 225s - ? bar 225s - ? dir/foo 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + ? .gitignore 225s + ? bar 225s + ? dir/foo 225s + ? foo 225s ? foobar 225s 225s $ rm .gitignore 225s $ echo 'foo' > dir/.gitignore 225s $ hg status 225s - ? bar 225s - ? dir/.gitignore 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + ? bar 225s + ? dir/.gitignore 225s + ? dir/foo 225s ? foo 225s ? foobar 225s 225s $ touch dir/bar 225s $ echo 'bar' > .gitignore 225s $ hg status 225s - ? .gitignore 225s - ? dir/.gitignore 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + ? .gitignore 225s + ? bar 225s + ? dir/.gitignore 225s + ? dir/bar 225s + ? dir/foo 225s ? foo 225s ? foobar 225s 225s $ echo '/bar' > .gitignore 225s $ hg status 225s - ? .gitignore 225s - ? dir/.gitignore 225s - ? dir/bar 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + ? .gitignore 225s + ? bar 225s + ? dir/.gitignore 225s + ? dir/bar 225s + ? dir/foo 225s ? foo 225s ? foobar 225s 225s $ echo 'foo*' > .gitignore 225s $ echo '!*bar' >> .gitignore 225s $ hg status 225s - .gitignore: unsupported ignore pattern '!*bar' 225s - ? .gitignore 225s - ? bar 225s - ? dir/.gitignore 225s - ? dir/bar 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + ? .gitignore 225s + ? bar 225s + ? dir/.gitignore 225s + ? dir/bar 225s + ? dir/foo 225s + ? foo 225s + ? foobar 225s 225s $ echo '.hg/' > .gitignore 225s $ hg status 225s - ? .gitignore 225s - ? bar 225s - ? dir/.gitignore 225s - ? dir/bar 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + ? .gitignore 225s + ? bar 225s + ? dir/.gitignore 225s + ? dir/bar 225s + ? dir/foo 225s ? foo 225s ? foobar 225s 225s $ echo 'dir/.hg/' > .gitignore 225s $ hg status 225s - ? .gitignore 225s - ? bar 225s - ? dir/.gitignore 225s - ? dir/bar 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + ? .gitignore 225s + ? bar 225s + ? dir/.gitignore 225s + ? dir/bar 225s + ? dir/foo 225s ? foo 225s ? foobar 225s 225s $ echo '.hg/foo' > .gitignore 225s $ hg status 225s - ? .gitignore 225s - ? bar 225s - ? dir/.gitignore 225s - ? dir/bar 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + ? .gitignore 225s + ? bar 225s + ? dir/.gitignore 225s + ? dir/bar 225s + ? dir/foo 225s ? foo 225s ? foobar 225s 225s $ touch foo.hg 225s $ echo 'foo.hg' > .gitignore 225s $ hg status 225s - ? .gitignore 225s - ? bar 225s - ? dir/.gitignore 225s - ? dir/bar 225s - ? foo 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s + ? .gitignore 225s + ? bar 225s + ? dir/.gitignore 225s + ? dir/bar 225s + ? dir/foo 225s + ? foo 225s + ? foo.hg 225s ? foobar 225s $ rm foo.hg 225s 225s $ touch .hgignore 225s $ hg status 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s ? .gitignore 225s ? .hgignore 225s ? bar 225s @@ -137,6 +177,7 @@ 225s $ echo 'foo.*$(?> .hgignore 225s $ echo 'dir/foo' >> .hgignore 225s $ hg status 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s ? .gitignore 225s ? .hgignore 225s ? bar 225s @@ -145,14 +186,18 @@ 225s ? foobar 225s 225s $ hg add .gitignore 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s $ hg commit -m "add and commit .gitignore" 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s $ rm .gitignore 225s $ rm .hgignore 225s $ hg status 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s ! .gitignore 225s ? bar 225s ? dir/.gitignore 225s ? dir/bar 225s + ? dir/foo 225s ? foo 225s ? foobar 225s 225s @@ -164,6 +209,7 @@ 225s > foo( 225s > EOF 225s $ hg status --config ui.ignore=$TESTTMP/invalidhgignore 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s abort: $TESTTMP/invalidhgignore: invalid pattern (relre): foo( 225s [255] 225s 225s @@ -172,5 +218,6 @@ 225s > foo( 225s > EOF 225s $ hg status 225s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 225s abort: $TESTTMP/repo/.hgignore: invalid pattern (relre): foo( 225s [255] 225s 225s ERROR: test-gitignore.t output changed 226s ! 226s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-git-clone.t 226s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-git-clone.t.err 226s @@ -14,30 +14,24 @@ 226s $ cd .. 226s 226s $ hg clone gitrepo hgrepo 226s - importing 2 git commits 226s - new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) 226s - updating to bookmark master 226s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s + abort: repository gitrepo not found 226s + [255] 226s $ hg -R hgrepo log --graph 226s - @ changeset: 1:7fe02317c63d 226s - | bookmark: master 226s - | tag: default/master 226s - | tag: tip 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 + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s + abort: repository hgrepo not found 226s + [255] 226s 226s we should have some bookmarks 226s $ hg -R hgrepo book 226s - * master 1:7fe02317c63d 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s + abort: repository hgrepo not found 226s + [255] 226s $ hg -R hgrepo gverify 226s - verifying rev 7fe02317c63d against git commit 9497a4ee62e16ee641860d7677cdb2589ea15554 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s + hg: unknown command 'gverify' 226s + (did you mean verify?) 226s + [10] 226s 226s test for ssh vulnerability 226s 226s @@ -47,16 +41,18 @@ 226s > EOF 226s 226s $ hg clone -q 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 226s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 226s [255] 226s $ hg clone -q 'git+ssh://%2DoProxyCommand=rm${IFS}nonexistent/path' 226s - abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s + abort: repository git+ssh://-oProxyCommand%3Drm%24%7BIFS%7Dnonexistent/path not found 226s [255] 226s $ hg clone -q 'git+ssh://fakehost|rm${IFS}nonexistent/path' 226s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 226s - abort: git remote error: The remote server unexpectedly closed the connection. 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 226s [255] 226s $ hg clone -q 'git+ssh://fakehost%7Crm${IFS}nonexistent/path' 226s - ssh: * fakehost%7?rm%24%7????%7?nonexistent* (glob) 226s - abort: git remote error: The remote server unexpectedly closed the connection. 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s + abort: repository git+ssh://fakehost%7Crm%24%7BIFS%7Dnonexistent/path not found 226s [255] 226s 226s ERROR: test-git-clone.t output changed 226s ! 226s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-conflict-2.t 226s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-conflict-2.t.err 226s @@ -2,30 +2,40 @@ 226s $ . "$TESTDIR/testutil" 226s 226s $ hg init hgrepo1 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s $ cd hgrepo1 226s $ echo A > afile 226s $ hg add afile 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s $ hg ci -m "origin" 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s 226s $ echo B > afile 226s $ hg ci -m "A->B" 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s 226s $ hg up -r0 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 226s $ echo C > afile 226s $ hg ci -m "A->C" 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s created new head 226s 226s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s warning: conflicts.* (re) 226s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 226s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 226s resolve using second parent 226s $ echo B > afile 226s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s $ hg ci -m "merge to B" 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s 226s $ hg log --graph --style compact | sed 's/\[.*\]//g' 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s @ 3:2,1 120385945d08 1970-01-01 00:00 +0000 test 226s |\ merge to B 226s | | 226s @@ -45,31 +55,18 @@ 226s 226s $ cd hgrepo1 226s $ hg bookmark -r tip master 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s $ hg push -r master ../repo.git 226s - pushing to ../repo.git 226s - searching for changes 226s - adding objects 226s - remote: found 0 deltas to reuse 226s - added 4 commits with 3 trees and 3 blobs 226s - adding reference refs/heads/master 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s + abort: repository ../repo.git does not exist 226s + [255] 226s $ cd .. 226s 226s $ hg clone repo.git hgrepo2 226s - importing 4 git commits 226s - new changesets 5d1a6b64f9d0:120385945d08 (4 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.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s + abort: repository repo.git not found 226s + [255] 226s expect the same revision ids as above 226s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 226s - @ 3:1,2 120385945d08 1970-01-01 00:00 +0000 test 226s - |\ merge to B 226s - | | 226s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 226s - | | A->B 226s - | | 226s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 226s - |/ A->C 226s - | 226s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 226s - origin 226s - 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s + abort: repository hgrepo2 not found 226s 226s ERROR: test-conflict-2.t output changed 226s ! 226s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-push-phases.t 226s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-push-phases.t.err 226s @@ -9,68 +9,13 @@ 226s $ git init -q --bare repo.git 226s 226s $ hg clone repo.git hgrepo 226s - updating to branch default 226s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 226s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 226s + abort: repository repo.git not found 226s + [255] 226s 226s $ cd hgrepo 226s + $TESTTMP.sh: 13: cd: can't cd to hgrepo 226s 226s Create two commits, one secret: 226s 226s $ touch alpha 226s - $ hg add alpha 226s - $ fn_hg_commit -m alpha 226s - $ hg book -r . master 226s - $ touch beta 226s - $ hg add beta 226s - $ fn_hg_commit --secret -m beta 226s - $ hg book -r . secret 226s - $ hg push 226s - pushing to $TESTTMP/repo.git 226s - warning: not exporting secret bookmark 'secret' 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 - adding reference refs/heads/master 226s - $ cd .. 226s - $ hg -R hgrepo log --graph --template phases 226s - @ changeset: 1:62966756ea96 226s - | bookmark: secret 226s - | tag: tip 226s - | phase: secret 226s - | user: test 226s - | date: Mon Jan 01 00:00:11 2007 +0000 226s - | summary: beta 226s - | 226s - o changeset: 0:d4b83afc35d1 226s - bookmark: master 226s - tag: default/master 226s - phase: public 226s - user: test 226s - date: Mon Jan 01 00:00:10 2007 +0000 226s - summary: alpha 226s - 226s - 226s -What happens when we push the secret? 226s - 226s - $ hg -R hgrepo push -B secret 226s - pushing to $TESTTMP/repo.git 226s - warning: not exporting secret bookmark 'secret' 226s - searching for changes 226s - abort: revision 62966756ea96 cannot be pushed since it doesn't have a bookmark 226s - [255] 226s - 226s -Only one changeset was pushed: 226s - 226s - $ GIT_DIR=repo.git git log --graph --all --decorate=short 226s - * commit 2cc4e3d19551e459a0dd606f4cf890de571c7d33 (HEAD -> master) 226s - Author: test 226s - Date: Mon Jan 1 00:00:10 2007 +0000 226s - 226s - alpha 226s - 226s -And this published the remote head: 226s - 226s - $ hg -R hgrepo phase 'all()' 226s - 0: public 226s - 1: secret 226s 226s ERROR: test-push-phases.t output changed 227s ! 227s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-conflict-1.t 227s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-conflict-1.t.err 227s @@ -2,30 +2,40 @@ 227s $ . "$TESTDIR/testutil" 227s 227s $ hg init hgrepo1 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s $ cd hgrepo1 227s $ echo A > afile 227s $ hg add afile 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s $ hg ci -m "origin" 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s 227s $ echo B > afile 227s $ hg ci -m "A->B" 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s 227s $ hg up -r0 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 227s $ echo C > afile 227s $ hg ci -m "A->C" 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s created new head 227s 227s $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/' 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s warning: conflicts.* (re) 227s 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 227s use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob) 227s resolve using first parent 227s $ echo C > afile 227s $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s $ hg ci -m "merge to C" 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s 227s $ hg log --graph --style compact | sed 's/\[.*\]//g' 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s @ 3:2,1 6c53bc0f062f 1970-01-01 00:00 +0000 test 227s |\ merge to C 227s | | 227s @@ -45,31 +55,18 @@ 227s 227s $ cd hgrepo1 227s $ hg bookmark -r tip master 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s $ hg push -r master ../repo.git 227s - pushing to ../repo.git 227s - searching for changes 227s - adding objects 227s - remote: found 0 deltas to reuse 227s - added 4 commits with 3 trees and 3 blobs 227s - adding reference refs/heads/master 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s + abort: repository ../repo.git does not exist 227s + [255] 227s $ cd .. 227s 227s $ hg clone repo.git hgrepo2 227s - importing 4 git commits 227s - new changesets 5d1a6b64f9d0:6c53bc0f062f (4 drafts) 227s - updating to bookmark master 227s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s + abort: repository repo.git not found 227s + [255] 227s expect the same revision ids as above 227s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 227s - @ 3:1,2 6c53bc0f062f 1970-01-01 00:00 +0000 test 227s - |\ merge to C 227s - | | 227s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 227s - | | A->B 227s - | | 227s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 227s - |/ A->C 227s - | 227s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 227s - origin 227s - 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s + abort: repository hgrepo2 not found 227s 227s ERROR: test-conflict-1.t output changed 227s ! 227s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-git-gpg.t 227s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-git-gpg.t.err 227s @@ -55,23 +55,10 @@ 227s Hg clone it 227s 227s $ hg clone gitrepo hgrepo 227s - importing 2 git commits 227s - new changesets ab60c5e55bd6:[0-9a-f]{12,12} \(2 drafts\) (re) 227s - updating to bookmark signed 227s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s + abort: repository gitrepo not found 227s + [255] 227s 227s $ cd hgrepo 227s + $TESTTMP.sh: 46: cd: can't cd to hgrepo 227s $ hg push ../gitrepo2 -B signed 227s - pushing to ../gitrepo2 227s - searching for changes 227s - adding objects 227s - remote: found 0 deltas to reuse 227s - added 1 commits with 1 trees and 0 blobs 227s - adding reference refs/heads/signed 227s - $ cd .. 227s - 227s -Verify the commit 227s - 227s - $ cd gitrepo2 227s - $ git show --show-signature signed | grep "Good signature from" 227s - gpg: Good signature from "hgtest" [ultimate] 227s 227s ERROR: test-git-gpg.t output changed 227s ! 227s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-convergedmerge.t 227s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-convergedmerge.t.err 227s @@ -2,29 +2,39 @@ 227s $ . "$TESTDIR/testutil" 227s 227s $ hg init hgrepo1 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s $ cd hgrepo1 227s $ echo A > afile 227s $ hg add afile 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s $ hg ci -m "origin" 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s 227s $ echo B > afile 227s $ hg ci -m "A->B" 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s 227s $ echo C > afile 227s $ hg ci -m "B->C" 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s 227s $ hg up -r0 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 227s $ echo C > afile 227s $ hg ci -m "A->C" 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s created new head 227s 227s $ hg merge -r2 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 227s (branch merge, don't forget to commit) 227s $ hg ci -m "merge" 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s 227s $ hg log --graph --style compact | sed 's/\[.*\]//g' 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s @ 4:3,2 eaa21d002113 1970-01-01 00:00 +0000 test 227s |\ merge 227s | | 227s @@ -47,36 +57,23 @@ 227s 227s $ cd hgrepo1 227s $ hg bookmark -r4 master 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s $ hg push -r master ../repo.git 227s - pushing to ../repo.git 227s - searching for changes 227s - adding objects 227s - remote: found 0 deltas to reuse 227s - added 5 commits with 3 trees and 3 blobs 227s - adding reference refs/heads/master 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s + abort: repository ../repo.git does not exist 227s + [255] 227s $ cd .. 227s 227s $ hg clone repo.git hgrepo2 227s - importing 5 git commits 227s - new changesets 5d1a6b64f9d0:eaa21d002113 (5 drafts) 227s - updating to bookmark master 227s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s + abort: repository repo.git not found 227s + [255] 227s expect the same revision ids as above 227s $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' 227s - @ 4:1,3 eaa21d002113 1970-01-01 00:00 +0000 test 227s - |\ merge 227s - | | 227s - | o 3 0dbe4ac1a758 1970-01-01 00:00 +0000 test 227s - | | B->C 227s - | | 227s - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test 227s - | | A->B 227s - | | 227s - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test 227s - |/ A->C 227s - | 227s - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test 227s - origin 227s - 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s + abort: repository hgrepo2 not found 227s $ hg -R hgrepo2 gverify 227s - verifying rev eaa21d002113 against git commit fb8c9e2afe5418cfff337eeed79fad5dd58826f0 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s + hg: unknown command 'gverify' 227s + (did you mean verify?) 227s + [10] 227s 227s ERROR: test-convergedmerge.t output changed 227s ! 227s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-keywords.t 227s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-keywords.t.err 227s @@ -21,29 +21,9 @@ 227s $ cd .. 227s 227s $ hg clone gitrepo hgrepo 227s - importing 3 git commits 227s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 227s - updating to bookmark master 227s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 227s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 227s + abort: repository gitrepo not found 227s + [255] 227s $ cd hgrepo 227s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 227s $ echo gamma > gamma 227s - $ hg add gamma 227s - $ hg commit -m 'add gamma' 227s - 227s - $ hg log --template "{rev} {node} {node|short} {gitnode} {gitnode|short}\n" 227s - 3 965bf7d08d3ac847dd8eb9e72ee0bf547d1a65d9 965bf7d08d3a 227s - 2 8e3f0ecc9aefd4ea2fdf8e2d5299cac548762a1c 8e3f0ecc9aef 7e2a5465ff4e3b992c429bb87a392620a0ac97b7 7e2a5465ff4e 227s - 1 7fe02317c63d9ee324d4b5df7c9296085162da1b 7fe02317c63d 9497a4ee62e16ee641860d7677cdb2589ea15554 9497a4ee62e1 227s - 0 ff7a2f2d8d7099694ae1e8b03838d40575bebb63 ff7a2f2d8d70 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 7eeab2ea75ec 227s - $ hg log --template "fromgit {rev}\n" --rev "fromgit()" 227s - fromgit 0 227s - fromgit 1 227s - fromgit 2 227s - $ hg log --template "gitnode_existsA {rev}\n" --rev "gitnode(9497a4ee62e16ee641860d7677cdb2589ea15554)" 227s - gitnode_existsA 1 227s - $ hg log --template "gitnode_existsB {rev}\n" --rev "gitnode(7eeab)" 227s - gitnode_existsB 0 227s - $ hg log --rev "gitnode(7e)" 227s - abort: git-mapfile@7e: ambiguous identifier!? (re) 227s - [50] 227s - $ hg log --template "gitnode_notexists {rev}\n" --rev "gitnode(1234567890ab)" 227s 227s ERROR: test-keywords.t output changed 228s ! 228s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-push-r.t 228s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-push-r.t.err 228s @@ -2,34 +2,43 @@ 228s $ . "$TESTDIR/testutil" 228s 228s $ hg init test 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ cd test 228s $ cat >>afile < 0 228s > EOF 228s $ hg add afile 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ fn_hg_commit -m "0.0" 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ cat >>afile < 1 228s > EOF 228s $ fn_hg_commit -m "0.1" 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ cat >>afile < 2 228s > EOF 228s $ fn_hg_commit -m "0.2" 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ cat >>afile < 3 228s > EOF 228s $ fn_hg_commit -m "0.3" 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ hg update -C 0 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 228s $ cat >>afile < 1 228s > EOF 228s $ fn_hg_commit -m "1.1" 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ cat >>afile < 2 228s > EOF 228s $ fn_hg_commit -m "1.2" 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ cat >fred < a line 228s > EOF 228s @@ -37,13 +46,20 @@ 228s > 3 228s > EOF 228s $ hg add fred 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ fn_hg_commit -m "1.3" 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ hg mv afile adifferentfile 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ fn_hg_commit -m "1.3m" 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ hg update -C 3 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 228s $ hg mv afile anotherfile 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ fn_hg_commit -m "0.3m" 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s $ cd .. 228s $ for i in 0 1 2 3 4 5 6 7 8; do 228s > mkdir test-"$i" 228s @@ -53,128 +69,166 @@ 228s > hg verify 228s > cd .. 228s > done 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s pushing to test-0 228s searching for changes 228s adding changesets 228s adding manifests 228s adding file changes 228s added 1 changesets with 1 changes to 1 files 228s - checking changesets 228s - checking manifests 228s - crosschecking files in changesets and manifests 228s - checking files 228s - checking dirstate (?) 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + checking changesets 228s + checking dirstate (?) 228s + checking manifests 228s + crosschecking files in changesets and manifests 228s + checking files 228s + checking dirstate 228s checked 1 changesets with 1 changes to 1 files 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s pushing to test-1 228s searching for changes 228s adding changesets 228s adding manifests 228s + checking dirstate (?) 228s adding file changes 228s added 2 changesets with 2 changes to 1 files 228s - checking changesets 228s - checking manifests 228s - crosschecking files in changesets and manifests 228s - checking files 228s - checking dirstate (?) 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + checking changesets 228s + checking manifests 228s + crosschecking files in changesets and manifests 228s + checking files 228s + checking dirstate 228s checked 2 changesets with 2 changes to 1 files 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + checking dirstate (?) 228s pushing to test-2 228s searching for changes 228s adding changesets 228s adding manifests 228s adding file changes 228s added 3 changesets with 3 changes to 1 files 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s checking changesets 228s checking manifests 228s crosschecking files in changesets and manifests 228s checking files 228s checking dirstate (?) 228s checked 3 changesets with 3 changes to 1 files 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s pushing to test-3 228s searching for changes 228s adding changesets 228s adding manifests 228s adding file changes 228s added 4 changesets with 4 changes to 1 files 228s - checking changesets 228s - checking manifests 228s - crosschecking files in changesets and manifests 228s - checking files 228s - checking dirstate (?) 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + checking changesets 228s + checking dirstate (?) 228s + checking manifests 228s + crosschecking files in changesets and manifests 228s + checking files 228s + checking dirstate 228s checked 4 changesets with 4 changes to 1 files 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s pushing to test-4 228s searching for changes 228s adding changesets 228s adding manifests 228s + checking dirstate (?) 228s adding file changes 228s added 2 changesets with 2 changes to 1 files 228s - checking changesets 228s - checking manifests 228s - crosschecking files in changesets and manifests 228s - checking files 228s - checking dirstate (?) 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + checking changesets 228s + checking manifests 228s + crosschecking files in changesets and manifests 228s + checking files 228s + checking dirstate 228s checked 2 changesets with 2 changes to 1 files 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + checking dirstate (?) 228s pushing to test-5 228s searching for changes 228s adding changesets 228s adding manifests 228s adding file changes 228s added 3 changesets with 3 changes to 1 files 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s checking changesets 228s checking manifests 228s crosschecking files in changesets and manifests 228s checking files 228s checking dirstate (?) 228s checked 3 changesets with 3 changes to 1 files 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s pushing to test-6 228s searching for changes 228s adding changesets 228s adding manifests 228s adding file changes 228s added 4 changesets with 5 changes to 2 files 228s - checking changesets 228s - checking manifests 228s - crosschecking files in changesets and manifests 228s - checking files 228s - checking dirstate (?) 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + checking changesets 228s + checking dirstate (?) 228s + checking manifests 228s + crosschecking files in changesets and manifests 228s + checking files 228s + checking dirstate 228s checked 4 changesets with 5 changes to 2 files 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s pushing to test-7 228s searching for changes 228s adding changesets 228s adding manifests 228s adding file changes 228s added 5 changesets with 6 changes to 3 files 228s - checking changesets 228s - checking manifests 228s - crosschecking files in changesets and manifests 228s - checking files 228s - checking dirstate (?) 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + checking changesets 228s + checking manifests 228s + crosschecking files in changesets and manifests 228s + checking files 228s + checking dirstate 228s checked 5 changesets with 6 changes to 3 files 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s pushing to test-8 228s searching for changes 228s adding changesets 228s adding manifests 228s adding file changes 228s added 5 changesets with 5 changes to 2 files 228s - checking changesets 228s - checking manifests 228s - crosschecking files in changesets and manifests 228s - checking files 228s - checking dirstate (?) 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + checking changesets 228s + checking manifests 228s + crosschecking files in changesets and manifests 228s + checking files 228s + checking dirstate 228s checked 5 changesets with 5 changes to 2 files 228s $ cd test-8 228s $ hg pull ../test-7 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s pulling from ../test-7 228s searching for changes 228s adding changesets 228s adding manifests 228s adding file changes 228s + new changesets c29287bce33f:e70c8671c3d4 (?) 228s added 4 changesets with 2 changes to 3 files (+1 heads) 228s - new changesets c29287bce33f:e70c8671c3d4 (?) 228s + new changesets c29287bce33f:e70c8671c3d4 228s (run 'hg heads' to see heads, 'hg merge' to merge) 228s $ hg verify 228s - checking changesets 228s - checking manifests 228s - crosschecking files in changesets and manifests 228s - checking files 228s - checking dirstate (?) 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + checking changesets 228s + checking manifests 228s + crosschecking files in changesets and manifests 228s + checking dirstate (?) 228s + checking files 228s + checking dirstate 228s checked 9 changesets with 7 changes to 4 files 228s 228s ERROR: test-push-r.t output changed 228s ! 228s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-subrepos-delete.t 228s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-subrepos-delete.t.err 228s @@ -52,22 +52,9 @@ 228s And there should be nothing in Mercurial either: 228s 228s $ hg clone -U repo.git hgrepo 228s - importing 3 git commits 228s - new changesets e532b2bfda10:cc611d35fb62 (3 drafts) 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + abort: repository repo.git not found 228s + [255] 228s $ cd hgrepo 228s + $TESTTMP.sh: 50: cd: can't cd to hgrepo 228s $ hg log --graph --template info 228s - o 228s - | commit: 2:cc611d35fb62 delete subrepo 228s - | added: 228s - | removed: .hgsub .hgsubstate 228s - o 228s - | commit: 1:8d549bcc5179 add subrepo 228s - | added: .hgsub .hgsubstate 228s - | removed: 228s - o 228s - commit: 0:e532b2bfda10 add alpha 228s - added: alpha 228s - removed: 228s - $ hg manifest -r tip 228s - alpha 228s - $ cd .. 228s 228s ERROR: test-subrepos-delete.t output changed 228s ! 228s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-tree-decomposition.t 228s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-tree-decomposition.t.err 228s @@ -24,45 +24,9 @@ 228s $ git init -q --bare repo.git 228s 228s $ hg clone gitrepo hgrepo 228s - importing 3 git commits 228s - new changesets d4d3d2417141:541f27994b81 (3 drafts) 228s - updating to bookmark master 228s - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + abort: repository gitrepo not found 228s + [255] 228s $ cd hgrepo 228s + $TESTTMP.sh: 38: cd: can't cd to hgrepo 228s $ hg log --template 'adds: {file_adds}\ndels: {file_dels}\n' 228s - adds: d1 228s - dels: d1/f1 228s - adds: d2/f2 228s - dels: d1/f2 228s - adds: d1/f1 d1/f2 228s - dels: 228s - 228s - $ hg debug-remove-hggit-state 228s - clearing out the git cache data 228s - $ hg push ../repo.git 228s - pushing to ../repo.git 228s - searching for changes 228s - adding objects 228s - remote: found 0 deltas to reuse 228s - added 3 commits with 6 trees and 3 blobs 228s - adding reference refs/heads/master 228s - $ cd .. 228s - 228s - $ git --git-dir=repo.git log --pretty=medium 228s - commit 6e0dbd8cd92ed4823c69cb48d8a2b81f904e6e69 228s - Author: test 228s - Date: Mon Jan 1 00:00:12 2007 +0000 228s - 228s - replace a dir with a file 228s - 228s - commit a1874d5cd0b1549ed729e36f0da4a93ed36259ee 228s - Author: test 228s - Date: Mon Jan 1 00:00:11 2007 +0000 228s - 228s - rename 228s - 228s - commit 102c17a5deda49db3f10ec5573f9378867098b7c 228s - Author: test 228s - Date: Mon Jan 1 00:00:10 2007 +0000 228s - 228s - initial 228s 228s ERROR: test-tree-decomposition.t output changed 228s ! 228s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-subrepos-drop.t 228s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-subrepos-drop.t.err 228s @@ -17,52 +17,9 @@ 228s Create a Mercurial repository with a .gitmodules file: 228s 228s $ hg clone repo.git hgrepo 228s - updating to branch default 228s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 228s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 228s + abort: repository repo.git not found 228s + [255] 228s $ cd hgrepo 228s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 228s $ hg book master 228s - $ touch this 228s - $ fn_hg_commit -A -m 'add this' 228s - $ cat > .gitmodules < [submodule "subrepo"] 228s - > path = subrepo 228s - > url = ../gitsubrepo 228s - > EOF 228s - $ hg add .gitmodules 228s - $ fn_hg_commit -m "add .gitmodules file" 228s - $ cd .. 228s - 228s -What happens if we push that to Git? 228s - 228s - $ hg -R hgrepo push 228s - pushing to $TESTTMP/repo.git 228s - warning: ignoring modifications to '.gitmodules' file; please use '.hgsub' instead 228s - searching for changes 228s - adding objects 228s - remote: found 0 deltas to reuse 228s - added 2 commits with 1 trees and 1 blobs 228s - adding reference refs/heads/master 228s - 228s -But we don't get a warning if we don't touch .gitmodules: 228s - 228s - $ cd hgrepo 228s - $ touch that 228s - $ fn_hg_commit -A -m 'add that' 228s - $ hg push 228s - pushing to $TESTTMP/repo.git 228s - searching for changes 228s - adding objects 228s - remote: found 0 deltas to reuse 228s - added 1 commits with 1 trees and 0 blobs 228s - updating reference refs/heads/master 228s - $ cd .. 228s - 228s -Check that it didn't silenty come through, or something: 228s - 228s - $ git clone repo.git gitrepo 228s - Cloning into 'gitrepo'... 228s - done. 228s - $ ls -A gitrepo 228s - .git 228s - that 228s - this 228s 228s ERROR: test-subrepos-drop.t output changed 229s ! 229s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-push-anonymous.t 229s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-push-anonymous.t.err 229s @@ -25,28 +25,9 @@ 229s Clone it, deactivate the bookmark, add a commit, and push! 229s 229s $ hg clone -U gitrepo hgrepo 229s - importing 1 git commits 229s - new changesets ff7a2f2d8d70 (1 drafts) 229s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 229s + abort: repository gitrepo not found 229s + [255] 229s $ cd hgrepo 229s + $TESTTMP.sh: 20: cd: can't cd to hgrepo 229s $ hg up tip 229s - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 229s - $ echo beta > beta 229s - $ hg add beta 229s - $ fn_hg_commit -m "add beta" 229s - 229s -Pushing that changeset should print a helpful message: 229s - 229s - $ hg push 229s - pushing to $TESTTMP/gitrepo 229s - searching for changes 229s - no changes found (ignoring 1 changesets without bookmarks or tags) 229s - [1] 229s - 229s -But what about untagged, but secret changesets? 229s - 229s - $ hg phase -fs tip 229s - $ hg push 229s - pushing to $TESTTMP/gitrepo 229s - searching for changes 229s - no changes found 229s - [1] 229s 229s ERROR: test-push-anonymous.t output changed 229s ! 229s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-empty-working-tree.t 229s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-empty-working-tree.t.err 229s @@ -10,29 +10,9 @@ 229s $ git init -q --bare repo.git 229s 229s $ hg clone gitrepo hgrepo 229s - importing 1 git commits 229s - new changesets 01708ca54a8f (1 drafts) 229s - updating to bookmark master 229s - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 229s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 229s + abort: repository gitrepo not found 229s + [255] 229s $ cd hgrepo 229s + $TESTTMP.sh: 16: cd: can't cd to hgrepo 229s $ hg log -r tip --template 'files: {files}\n' 229s - files: 229s - $ hg gverify 229s - verifying rev 01708ca54a8f against git commit 678256865a8c85ae925bf834369264193c88f8de 229s - 229s - $ hg debug-remove-hggit-state 229s - clearing out the git cache data 229s - $ hg push ../repo.git 229s - pushing to ../repo.git 229s - searching for changes 229s - adding objects 229s - remote: found 0 deltas to reuse 229s - added 1 commits with 1 trees and 0 blobs 229s - adding reference refs/heads/master 229s - $ cd .. 229s - $ git --git-dir=repo.git log --pretty=medium 229s - commit 678256865a8c85ae925bf834369264193c88f8de 229s - Author: test 229s - Date: Mon Jan 1 00:00:00 2007 +0000 229s - 229s - empty 229s 229s ERROR: test-empty-working-tree.t output changed 230s !s 230s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-ambiguousprefix.t 230s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-ambiguousprefix.t.err 230s @@ -21,13 +21,11 @@ 230s $ cd .. 230s 230s $ hg clone gitrepo hgrepo 230s - importing 3 git commits 230s - new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) 230s - updating to bookmark master 230s - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 230s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 230s + abort: repository gitrepo not found 230s + [255] 230s 230s $ cd hgrepo 230s + $TESTTMP.sh: 30: cd: can't cd to hgrepo 230s 230s $ hg log -r 'gitnode(7e)' 230s - abort: git-mapfile@7e: ambiguous identifier!? (re) 230s - [50] 230s 230s ERROR: test-ambiguousprefix.t output changed 230s !. 230s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-url-parsing.py.out 230s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-url-parsing.py.err 230s @@ -1,46 +1,11 @@ 230s -% expect '/webjam/webjam.git' 230s -/webjam/webjam.git 230s -% expect 'github.com' 230s -github.com 230s -% expect '/webjam/webjam.git' 230s -/webjam/webjam.git 230s -% expect 'github.com' 230s -github.com 230s -% expect '19418' 230s -19418 230s -% expect 'webjam.git' 230s -webjam.git 230s -% expect 'git@heroku.com' 230s -git@heroku.com 230s -% expect '999' 230s -999 230s -% expect 'webjam/webjam.git' 230s -webjam/webjam.git 230s -% expect 'git@github.com' 230s -git@github.com 230s -% expect '42qu/vps.git' 230s -42qu/vps.git 230s -% expect 'git@github.com' 230s -git@github.com 230s -% expect '/webjam/webjam.git' 230s -/webjam/webjam.git 230s -% expect 'git@github.com' 230s -git@github.com 230s -% expect '/webjam/webjam.git' 230s -/webjam/webjam.git 230s -% expect 'git@github.com' 230s -git@github.com 230s -% expect '10022' 230s -10022 230s -% expect 'webjam.git' 230s -webjam.git 230s -% expect 'git@heroku.com' 230s -git@heroku.com 230s -% expect 'webjam.git' 230s -webjam.git 230s -% expect 'git@compatible.com' 230s -git@compatible.com 230s -% expect 'webjam.git' 230s -webjam.git 230s -% expect 'git@heroku.com' 230s -git@heroku.com 230s +Traceback (most recent call last): 230s + File "/tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-url-parsing.py", line 14, in 230s + from hggit.git_handler import GitHandler 230s + File "/usr/lib/python3/dist-packages/hggit/__init__.py", line 163, in 230s + from . import gitdirstate 230s + File "/usr/lib/python3/dist-packages/hggit/gitdirstate.py", line 19, in 230s + from . import gitrepo 230s + File "/usr/lib/python3/dist-packages/hggit/gitrepo.py", line 20, in 230s + class gitrepo(repository.peer): 230s + ^^^^^^^^^^^^^^^ 230s +AttributeError: module 'mercurial.interfaces.repository' has no attribute 'peer'. Did you mean: 'IPeer'? 230s 230s ERROR: test-url-parsing.py output changed 232s ! 232s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-timezone.t 232s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-timezone.t.err 232s @@ -8,10 +8,13 @@ 232s $ . "$TESTDIR/testutil" 232s 232s $ hg init hgrepo 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s $ cd hgrepo 232s $ touch beta 232s $ hg add beta 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s $ fn_hg_commit -m "test commit" 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s $ cat >patch2 < # HG changeset patch 232s > # User J. User 232s @@ -28,5 +31,10 @@ 232s > +alpha 232s > EOF 232s $ hg import patch2 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s applying patch2 232s $ hg gexport 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s + hg: unknown command 'gexport' 232s + (did you mean one of export, import?) 232s + [10] 232s 232s ERROR: test-timezone.t output changed 232s ! 232s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-gitignore-permissions.t 232s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-gitignore-permissions.t.err 232s @@ -4,6 +4,7 @@ 232s $ . "$TESTDIR/testutil" 232s 232s $ hg init repo 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s $ cd repo 232s 232s $ if test `whoami` = root 232s @@ -16,8 +17,14 @@ 232s 232s $ touch thefile 232s $ hg add thefile 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s $ hg ci -A -m commit 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s $ hg gexport 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s + hg: unknown command 'gexport' 232s + (did you mean one of export, import?) 232s + [10] 232s 232s Create a file that we can ignore 232s 232s @@ -33,9 +40,10 @@ 232s 232s $ echo nothingtoseehere > .gitignore 232s $ hg status 232s - not_readable: Permission denied 232s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 232s not_readable: Permission denied 232s ? .gitignore 232s + ? nothingtoseehere 232s 232s And notice that we really did ignore it! 232s 232s 232s ERROR: test-gitignore-permissions.t output changed 233s ! 233s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-gitignore-share.t 233s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-gitignore-share.t.err 233s @@ -9,6 +9,7 @@ 233s $ git init --quiet --bare repo.git 233s 233s $ hg init hgrepo 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 233s $ cd hgrepo 233s $ cat > .hg/hgrc < [paths] 233s @@ -16,26 +17,31 @@ 233s > EOF 233s $ echo ignored > .gitignore 233s $ hg add .gitignore 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 233s $ hg ci -m ignore 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 233s $ hg book master 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 233s $ hg push 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 233s pushing to $TESTTMP/repo.git 233s - searching for changes 233s - adding objects 233s - remote: found 0 deltas to reuse 233s - added 1 commits with 1 trees and 1 blobs 233s - adding reference refs/heads/master 233s + abort: repository $TESTTMP/repo.git not found 233s + [255] 233s $ cd .. 233s 233s We should also ignore the file in a shared repository: 233s 233s $ hg share hgrepo sharerepo 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 233s updating working directory 233s 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 233s $ cd sharerepo 233s $ hg paths 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 233s default = $TESTTMP/repo.git 233s $ cat .gitignore 233s ignored 233s $ touch ignored 233s $ hg status 233s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 233s + ? ignored 233s 233s ERROR: test-gitignore-share.t output changed 234s ! 234s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-annotate.t 234s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-annotate.t.err 234s @@ -10,6 +10,7 @@ 234s init 234s 234s $ hg init repo 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s $ cd repo 234s 234s commit 234s @@ -19,37 +20,48 @@ 234s > a 234s > EOF 234s $ hg add a 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s $ fn_hg_commit -m 1 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s $ cat < a 234s > a 234s > a 234s > a 234s > EOF 234s $ fn_hg_commit -m 2 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s $ cat < a 234s > a 234s > b 234s > a 234s > EOF 234s $ fn_hg_commit -m 3 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s 234s annotate multiple files 234s 234s $ hg annotate a 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s 0: a 234s 2: b 234s 1: a 234s 234s $ hg annotate --skip 1 a 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s 0: a 234s 2: b 234s 0* a 234s 234s $ hg gexport 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s + hg: unknown command 'gexport' 234s + (did you mean one of export, import?) 234s + [10] 234s $ hg log -T '{rev}:{node} {gitnode}\n' 234s - 2:beb139b96eec386addc02d48db524b7646ef1605 19388575d02e71e917e7013aa854d4a21c509819 234s - 1:a9a255d66663f9216bdcf8dda69211d7280f7278 debec50a14cc4830584dd4fa1507c51cce1c098f 234s - 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 88f28c06a1ede9a70852ab1bf9818150fabaaaa9 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s + 2:beb139b96eec386addc02d48db524b7646ef1605 234s + 1:a9a255d66663f9216bdcf8dda69211d7280f7278 234s + 0:8d4731bd0f4a57e123a79463b5294325be6cf8f0 234s 234s $ cat < .git-blame-ignore-revs 234s > # this is a comment, and the next line should be ignored 234s @@ -59,39 +71,43 @@ 234s > EOF 234s 234s $ hg annotate a 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s 0: a 234s 2: b 234s 1: a 234s $ hg annotate a \ 234s > --debug \ 234s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 234s - skipping debec50a14cc -> a9a255d66663 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s 0: a 234s 2: b 234s - 0* a 234s + 1: a 234s $ hg add .git-blame-ignore-revs 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s $ hg annotate a \ 234s > --debug \ 234s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 234s - skipping debec50a14cc -> a9a255d66663 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s 0: a 234s 2: b 234s - 0* a 234s + 1: a 234s $ hg annotate a \ 234s > --config git.blame.ignoreRevsFile=badfile 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s 0: a 234s 2: b 234s 1: a 234s $ hg annotate -T'{lines % "{rev}:{node|short} {gitnode|short}: {line}"}' a 234s - 0:8d4731bd0f4a 88f28c06a1ed: a 234s - 2:beb139b96eec 19388575d02e: b 234s - 1:a9a255d66663 debec50a14cc: a 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s + 0:8d4731bd0f4a : a 234s + 2:beb139b96eec : b 234s + 1:a9a255d66663 : a 234s 234s $ cd .. 234s $ hg -R repo annotate repo/a \ 234s > --debug \ 234s > --config git.blame.ignoreRevsFile=.git-blame-ignore-revs 234s - skipping debec50a14cc -> a9a255d66663 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s 0: a 234s 2: b 234s - 0* a 234s + 1: a 234s 234s ERROR: test-annotate.t output changed 234s ! 234s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-addbranchrevs.t 234s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-addbranchrevs.t.err 234s @@ -7,14 +7,23 @@ 234s caused the pull to not update to the passed revision. 234s 234s $ hg init orig 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s $ cd orig 234s $ echo a > a; hg add a; hg ci -m a 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s $ hg branch foo -q 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s $ echo b > b; hg add b; hg ci -m b 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s 234s $ cd .. 234s $ hg clone orig clone -r 0 -q 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s $ cd clone 234s $ hg pull -u -r 1 -q 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s $ hg id -n 234s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 234s 1 234s 234s ERROR: test-addbranchrevs.t output changed 235s ! 235s --- /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-transplant.t 235s +++ /tmp/autopkgtest.5lVNBh/build.fYl/src/tests/test-transplant.t.err 235s @@ -11,12 +11,20 @@ 235s > EOF 235s 235s $ hg init baserepo 235s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 235s $ cd baserepo 235s $ for c in A B C 235s > do 235s > echo $c > $c && hg add $c && fn_hg_commit -m $c 235s > done 235s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 235s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 235s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 235s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 235s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 235s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 235s $ hg clone -r 2 . ../otherrepo 235s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 235s adding changesets 235s adding manifests 235s adding file changes 235s @@ -26,6 +34,8 @@ 235s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 235s $ cd ../otherrepo 235s $ hg up 1 235s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 235s 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 235s $ hg transplant -s ../baserepo tip 235s + *** failed to import extension "hggit" from /tmp/autopkgtest.5lVNBh/build.fYl/src/hggit: module 'mercurial.interfaces.repository' has no attribute 'peer' 235s no changes found 235s 235s ERROR: test-transplant.t output changed 235s ! 235s Skipped test-check-black.t: missing feature: the black formatter for python (>= 22.3) 235s Skipped test-check-commit.t: missing feature: running tests from repository 235s Skipped test-check-pyflakes.t: missing feature: Pyflakes python linter 235s Skipped test-check-pylint.t: missing feature: Pylint python linter 235s Skipped test-encoding.t: blacklisted 235s Skipped test-gitignore-windows.t: missing feature: Windows 235s Skipped test-incoming.t: blacklisted 235s Skipped test-serve-ci.t: skipped 235s Skipped test-serve-dulwich.t: blacklisted 235s Failed test-addbranchrevs.t: output changed 235s Failed test-ambiguousprefix.t: output changed and returned error code 1 235s Failed test-annotate.t: output changed 235s Failed test-bookmark-workflow.t: output changed and returned error code 1 235s Failed test-branch-bookmark-suffix.t#with-path: output changed and returned error code 1 235s Failed test-branch-bookmark-suffix.t#without-path: output changed and returned error code 1 235s Failed test-bundle.t: output changed and returned error code 1 235s Failed test-clone.t#draft: output changed 235s Failed test-clone.t#secret: output changed 235s Failed test-conflict-1.t: output changed 235s Failed test-conflict-2.t: output changed 235s Failed test-convergedmerge.t: output changed 235s Failed test-empty-working-tree.t: output changed and returned error code 1 235s Failed test-extra.t: output changed and returned error code 1 235s Failed test-file-removal.t: output changed and returned error code 1 235s Failed test-gc.t: output changed and returned error code 1 235s Failed test-git-clone.t: output changed 235s Failed test-git-gpg.t: output changed and returned error code 1 235s Failed test-git-submodules.t: output changed and returned error code 1 235s Failed test-git-tags.t#draft: output changed and returned error code 1 235s Failed test-git-tags.t#secret: output changed and returned error code 1 235s Failed test-git-workflow.t: output changed 235s Failed test-gitignore-permissions.t: output changed 235s Failed test-gitignore-share.t: output changed 235s Failed test-gitignore.t: output changed 235s Failed test-help.t: output changed 235s Failed test-hg-author.t: output changed and returned error code 1 235s Failed test-hg-branch.t: output changed and returned error code 1 235s Failed test-hg-clone.t: output changed and returned error code 1 235s Failed test-hg-tags.t: output changed and returned error code 1 235s Failed test-hook.t: output changed 235s Failed test-illegal-contents.t: output changed 235s Failed test-invalid-refs.t: output changed and returned error code 1 235s Failed test-keywords.t: output changed and returned error code 1 235s Failed test-merge.t: output changed and returned error code 1 235s Failed test-multiple-remotes.t: output changed 235s Failed test-octopus.t: output changed and returned error code 1 235s Failed test-orphan-tags.t: output changed and returned error code 1 235s Failed test-outgoing.t: output changed and returned error code 1 235s Failed test-phases-draft.t: output changed and returned error code 1 235s Failed test-phases-public.t#publish-defaults: output changed and returned error code 1 235s Failed test-phases-public.t#publish-specific: output changed and returned error code 1 235s Failed test-phases-remote.t: output changed and returned error code 1 235s Failed test-pull-after-obsolete.t: output changed and returned error code 1 235s Failed test-pull-after-rebase.t: output changed and returned error code 1 235s Failed test-pull-after-strip.t: output changed and returned error code 1 235s Failed test-pull.t#draft: output changed 235s Failed test-pull.t#secret: output changed 235s Failed test-push-anonymous.t: output changed and returned error code 1 235s Failed test-push-authors.t: output changed and returned error code 1 235s Failed test-push-detached.t: output changed and returned error code 1 235s Failed test-push-missing-commit.t: output changed and returned error code 1 235s Failed test-push-phases.t: output changed and returned error code 1 235s Failed test-push-r.t: output changed 235s Failed test-push-to-head.t: output changed and returned error code 1 235s Failed test-push.t: output changed and returned error code 1 235s Failed test-renames.t: output changed and returned error code 1 235s Failed test-serve-git.t: output changed 235s Failed test-serve-hg-static.t: output changed 235s Failed test-serve-hg.t#with-hggit: output changed and returned error code 1 235s Failed test-serve-hg.t#without-hggit: output changed and returned error code 1 235s Failed test-subrepos-delete.t: output changed and returned error code 1 235s Failed test-subrepos-drop.t: output changed and returned error code 1 235s Failed test-subrepos-push.t: output changed and returned error code 1 235s Failed test-subrepos-syntax.t: output changed and returned error code 1 235s Failed test-subrepos.t: output changed and returned error code 1 235s Failed test-timezone.t: output changed 235s Failed test-transactions.t: output changed 235s Failed test-transplant.t: output changed 235s Failed test-tree-decomposition.t: output changed and returned error code 1 235s Failed test-url-parsing.py: output changed and returned error code 1 235s Failed test-verify-fail.t: output changed 235s # Ran 73 tests, 9 skipped, 72 failed. 235s python hash seed: 3052126778 235s make: *** [Makefile:15: tests] Error 1 235s autopkgtest [06:59:55]: test testsuite: -----------------------] 240s testsuite FAIL non-zero exit status 2 240s autopkgtest [07:00:00]: test testsuite: - - - - - - - - - - results - - - - - - - - - - 244s autopkgtest [07:00:04]: test mercurial-git: preparing testbed 268s autopkgtest [07:00:28]: testbed dpkg architecture: armhf 269s autopkgtest [07:00:29]: testbed apt version: 3.1.15 273s autopkgtest [07:00:33]: @@@@@@@@@@@@@@@@@@@@ test bed setup 275s autopkgtest [07:00:35]: testbed release detected to be: resolute 283s autopkgtest [07:00:43]: updating testbed package index (apt update) 285s Get:1 http://ftpmaster.internal/ubuntu resolute-proposed InRelease [124 kB] 286s Get:2 http://ftpmaster.internal/ubuntu resolute InRelease [124 kB] 286s Hit:3 http://ftpmaster.internal/ubuntu resolute-updates InRelease 286s Hit:4 http://ftpmaster.internal/ubuntu resolute-security InRelease 286s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse Sources [31.1 kB] 286s Get:6 http://ftpmaster.internal/ubuntu resolute-proposed/universe Sources [1727 kB] 286s Get:7 http://ftpmaster.internal/ubuntu resolute-proposed/main Sources [178 kB] 286s Get:8 http://ftpmaster.internal/ubuntu resolute-proposed/main armhf Packages [249 kB] 286s Get:9 http://ftpmaster.internal/ubuntu resolute-proposed/universe armhf Packages [1556 kB] 286s Get:10 http://ftpmaster.internal/ubuntu resolute-proposed/multiverse armhf Packages [8156 B] 286s Get:11 http://ftpmaster.internal/ubuntu resolute/universe Sources [21.3 MB] 287s Get:12 http://ftpmaster.internal/ubuntu resolute/main Sources [1404 kB] 287s Get:13 http://ftpmaster.internal/ubuntu resolute/main armhf Packages [1386 kB] 287s Get:14 http://ftpmaster.internal/ubuntu resolute/universe armhf Packages [15.1 MB] 291s Fetched 43.2 MB in 6s (7639 kB/s) 292s Reading package lists... 298s autopkgtest [07:00:58]: upgrading testbed (apt dist-upgrade and autopurge) 300s Reading package lists... 300s Building dependency tree... 300s Reading state information... 301s Calculating upgrade... 302s The following packages will be upgraded: 302s libbrotli1 302s 1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 302s Need to get 318 kB of archives. 302s After this operation, 0 B of additional disk space will be used. 302s Get:1 http://ftpmaster.internal/ubuntu resolute/main armhf libbrotli1 armhf 1.2.0-3 [318 kB] 303s Fetched 318 kB in 0s (690 kB/s) 303s (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 ... 68678 files and directories currently installed.) 303s Preparing to unpack .../libbrotli1_1.2.0-3_armhf.deb ... 303s Unpacking libbrotli1:armhf (1.2.0-3) over (1.1.0-2build6) ... 303s Setting up libbrotli1:armhf (1.2.0-3) ... 303s Processing triggers for libc-bin (2.42-2ubuntu4) ... 306s Reading package lists... 306s Building dependency tree... 306s Reading state information... 306s Solving dependencies... 307s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 309s autopkgtest [07:01:09]: rebooting testbed after setup commands that affected boot 377s Reading package lists... 378s Building dependency tree... 378s Reading state information... 379s Solving dependencies... 380s The following NEW packages will be installed: 380s git git-man liberror-perl mercurial mercurial-common mercurial-git 380s python3-dulwich 380s 0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded. 380s Need to get 9441 kB of archives. 380s After this operation, 50.4 MB of additional disk space will be used. 380s Get:1 http://ftpmaster.internal/ubuntu resolute/main armhf liberror-perl all 0.17030-1 [23.5 kB] 380s Get:2 http://ftpmaster.internal/ubuntu resolute/main armhf git-man all 1:2.51.0-1ubuntu1 [1179 kB] 380s Get:3 http://ftpmaster.internal/ubuntu resolute/main armhf git armhf 1:2.51.0-1ubuntu1 [4649 kB] 382s Get:4 http://ftpmaster.internal/ubuntu resolute-proposed/universe armhf mercurial-common all 7.2-2 [2853 kB] 382s Get:5 http://ftpmaster.internal/ubuntu resolute-proposed/universe armhf mercurial armhf 7.2-2 [492 kB] 382s Get:6 http://ftpmaster.internal/ubuntu resolute/universe armhf python3-dulwich armhf 0.22.7-1 [183 kB] 382s Get:7 http://ftpmaster.internal/ubuntu resolute/universe armhf mercurial-git all 1.2.0-1 [60.9 kB] 383s Fetched 9441 kB in 3s (3664 kB/s) 383s Selecting previously unselected package liberror-perl. 383s (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 ... 68678 files and directories currently installed.) 383s Preparing to unpack .../0-liberror-perl_0.17030-1_all.deb ... 383s Unpacking liberror-perl (0.17030-1) ... 383s Selecting previously unselected package git-man. 383s Preparing to unpack .../1-git-man_1%3a2.51.0-1ubuntu1_all.deb ... 383s Unpacking git-man (1:2.51.0-1ubuntu1) ... 383s Selecting previously unselected package git. 383s Preparing to unpack .../2-git_1%3a2.51.0-1ubuntu1_armhf.deb ... 383s Unpacking git (1:2.51.0-1ubuntu1) ... 383s Selecting previously unselected package mercurial-common. 383s Preparing to unpack .../3-mercurial-common_7.2-2_all.deb ... 383s Unpacking mercurial-common (7.2-2) ... 384s Selecting previously unselected package mercurial. 384s Preparing to unpack .../4-mercurial_7.2-2_armhf.deb ... 384s Unpacking mercurial (7.2-2) ... 384s Selecting previously unselected package python3-dulwich. 384s Preparing to unpack .../5-python3-dulwich_0.22.7-1_armhf.deb ... 384s Unpacking python3-dulwich (0.22.7-1) ... 384s Selecting previously unselected package mercurial-git. 384s Preparing to unpack .../6-mercurial-git_1.2.0-1_all.deb ... 384s Unpacking mercurial-git (1.2.0-1) ... 384s Setting up mercurial-common (7.2-2) ... 387s Setting up liberror-perl (0.17030-1) ... 387s Setting up python3-dulwich (0.22.7-1) ... 387s Setting up git-man (1:2.51.0-1ubuntu1) ... 387s Setting up mercurial (7.2-2) ... 387s Creating config file /etc/mercurial/hgrc.d/hgext.rc with new version 387s Setting up mercurial-git (1.2.0-1) ... 387s mercurial-git extension is disabled by default. 387s You can follow the instructions in /usr/share/doc/mercurial-git/README.Debian to enable it. 388s Setting up git (1:2.51.0-1ubuntu1) ... 388s Processing triggers for man-db (2.13.1-1build1) ... 404s autopkgtest [07:02:44]: test mercurial-git: [----------------------- 406s Initialized empty Git repository in /tmp/autopkgtest.5lVNBh/build.fYl/src/git_server/ 406s Cloning into 'git_clone'... 406s warning: You appear to have cloned an empty repository. 406s done. 406s [master (root-commit) 9a6661b] a 406s 1 file changed, 1 insertion(+) 406s create mode 100644 a 406s To /tmp/autopkgtest.5lVNBh/build.fYl/src/git_server 406s * [new branch] master -> master 407s Traceback (most recent call last): 407s File "/usr/lib/python3/dist-packages/mercurial/extensions.py", line 291, in _runextsetup 407s extsetup(ui) 407s ~~~~~~~~^^^^ 407s File "/usr/lib/python3/dist-packages/mercurial/exthelper.py", line 227, in finalextsetup 407s c(ui) 407s ~^^^^ 407s File "/usr/lib/python3/dist-packages/hggit/bundle.py", line 76, in install_server_support 407s @bundle2.parthandler(BUNDLEPART_MAP) 407s ^^^^^^^^^^^^^^^^^^^ 407s AttributeError: module 'mercurial.bundle2' has no attribute 'parthandler' 407s *** failed to set up extension hggit: module 'mercurial.bundle2' has no attribute 'parthandler' 407s abort: repository git_server not found 407s autopkgtest [07:02:47]: test mercurial-git: -----------------------] 411s autopkgtest [07:02:51]: test mercurial-git: - - - - - - - - - - results - - - - - - - - - - 411s mercurial-git FAIL non-zero exit status 253 411s autopkgtest [07:02:51]: test mercurial-git: - - - - - - - - - - stderr - - - - - - - - - - 411s Traceback (most recent call last): 411s File "/usr/lib/python3/dist-packages/mercurial/extensions.py", line 291, in _runextsetup 411s extsetup(ui) 411s ~~~~~~~~^^^^ 411s File "/usr/lib/python3/dist-packages/mercurial/exthelper.py", line 227, in finalextsetup 411s c(ui) 411s ~^^^^ 411s File "/usr/lib/python3/dist-packages/hggit/bundle.py", line 76, in install_server_support 411s @bundle2.parthandler(BUNDLEPART_MAP) 411s ^^^^^^^^^^^^^^^^^^^ 411s AttributeError: module 'mercurial.bundle2' has no attribute 'parthandler' 411s *** failed to set up extension hggit: module 'mercurial.bundle2' has no attribute 'parthandler' 411s abort: repository git_server not found 417s autopkgtest [07:02:57]: @@@@@@@@@@@@@@@@@@@@ summary 417s testsuite FAIL non-zero exit status 2 417s mercurial-git FAIL non-zero exit status 253