Source: hg-git Version: 0.8.11-1 Severity: serious Tags: buster sid User: debian...@lists.debian.org Usertags: qa-ftbfs-20180502 qa-ftbfs Justification: FTBFS on amd64
Hi, During a rebuild of all packages in sid, your package failed to build on amd64. Relevant part (hopefully): > make[2]: Entering directory '/<<PKGBUILDDIR>>' > cd tests && python run-tests.py --with-hg=`which hg` --blacklist > /<<PKGBUILDDIR>>/debian/hg-git.test_blacklist > s > --- /<<PKGBUILDDIR>>/tests/test-renames.t > +++ /<<PKGBUILDDIR>>/tests/test-renames.t.err > @@ -368,14 +368,59 @@ > $ hg push > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 2 commits with 2 trees and 3 blobs > - updating reference refs/heads/master > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ cd ../gitrepo > $ git log master --pretty=oneline > - 5f2948d029693346043f320620af99a615930dc4 delta/epsilon > - bbd2ec050f7fbc64f772009844f7d58a556ec036 gamma2 > 50d116676a308b7c22935137d944e725d2296f2a remove submodule and rename back > 59fb8e82ea18f79eab99196f588e8948089c134f rename and add submodule > f95497455dfa891b4cd9b524007eb9514c3ab654 beta renamed back > @@ -388,22 +433,19 @@ > > Make sure the right metadata is stored > $ git cat-file commit master^ > - tree 0adbde18545845f3b42ad1a18939ed60a9dec7a8 > - parent 50d116676a308b7c22935137d944e725d2296f2a > - author test <none@none> 0 +0000 > - committer test <none@none> 0 +0000 > - HG:rename-source hg > - > - gamma2 > + tree b03c9418098659700363ea42165637a69d91c93d > + parent f95497455dfa891b4cd9b524007eb9514c3ab654 > + author test <t...@example.org> 1167609618 +0000 > + committer test <t...@example.org> 1167609618 +0000 > + > + rename and add submodule > $ git cat-file commit master > - tree f8f32f4e20b56a5a74582c6a5952c175bf9ec155 > - parent bbd2ec050f7fbc64f772009844f7d58a556ec036 > - author test <none@none> 0 +0000 > - committer test <none@none> 0 +0000 > - HG:rename gamma:delta > - HG:rename beta:epsilon > - > - delta/epsilon > + tree 4080ea6f1c40fdb741857f94adc6ff25bcfc04b4 > + parent 59fb8e82ea18f79eab99196f588e8948089c134f > + author test <t...@example.org> 1167609619 +0000 > + committer test <t...@example.org> 1167609619 +0000 > + > + remove submodule and rename back > > Now make another clone and compare the hashes > > @@ -413,33 +455,38 @@ > $ hg book master -qf > $ hg export master > # HG changeset patch > - # User test > - # Date 0 0 > - # Thu Jan 01 00:00:00 1970 +0000 > - # Node ID a725f9bdefe29f1a1db89ad030d9f1ee36b3a440 > - # Parent 814ed6aa5bd2867ce5ab80f3c2602155d89027b1 > - delta/epsilon > - > - diff --git a/gamma b/delta > - copy from gamma > - copy to delta > - --- a/gamma > - +++ b/delta > - @@ -11,3 +11,4 @@ > - 11 > - 13 > - 14 > - +15 > - diff --git a/beta b/epsilon > - rename from beta > - rename to epsilon > - --- a/beta > - +++ b/epsilon > - @@ -10,3 +10,4 @@ > - 10 > - 11 > - 12 > - +16 > + # User test <t...@example.org> > + # Date 1167609619 0 > + # Mon Jan 01 00:00:19 2007 +0000 > + # Node ID a26f94023ab2ea40c9e4c4dbb753c9a4e572fefe > + # Parent a7c65d466ee1f33540695666c2e65dcbe3fbe388 > + remove submodule and rename back > + > + diff --git a/.gitmodules b/.gitmodules > + --- a/.gitmodules > + +++ b/.gitmodules > + @@ -1,6 +1,3 @@ > + [submodule "gitsubmodule"] > + path = gitsubmodule2 > + url = ../gitsubmodule > + -[submodule "gamma"] > + - path = gamma > + - url = ../gitsubmodule > + diff --git a/.hgsub b/.hgsub > + --- a/.hgsub > + +++ b/.hgsub > + @@ -1,2 +1,1 @@ > + gitsubmodule2 = [git]../gitsubmodule > + -gamma = [git]../gitsubmodule > + diff --git a/.hgsubstate b/.hgsubstate > + --- a/.hgsubstate > + +++ b/.hgsubstate > + @@ -1,2 +1,1 @@ > + -5944b31ff85b415573d1a43eb942e2dea30ab8be gamma > + 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2 > + diff --git a/gamma-new b/gamma > + rename from gamma-new > + rename to gamma > > Regenerate the Git metadata and compare the hashes > $ hg gclear > @@ -447,8 +494,6 @@ > $ hg gexport > $ cd .hg/git > $ git log master --pretty=oneline > - 5f2948d029693346043f320620af99a615930dc4 delta/epsilon > - bbd2ec050f7fbc64f772009844f7d58a556ec036 gamma2 > 50d116676a308b7c22935137d944e725d2296f2a remove submodule and rename back > 59fb8e82ea18f79eab99196f588e8948089c134f rename and add submodule > f95497455dfa891b4cd9b524007eb9514c3ab654 beta renamed back > > ERROR: test-renames.t output changed > !. > --- /<<PKGBUILDDIR>>/tests/test-pull.t > +++ /<<PKGBUILDDIR>>/tests/test-pull.t.err > @@ -366,8 +366,8 @@ > abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' > [255] > $ hg pull 'git+ssh://fakehost|shellcommand/path' 2>&1 >/dev/null | grep -v > ^devel-warn: > - ssh: * fakehost%7cshellcommand* (glob) > + ssh: Could not resolve hostname fakehost%7Cshellcommand: Name or service > not known\r (esc) > abort: git remote error: The remote server unexpectedly closed the > connection. > $ hg pull 'git+ssh://fakehost%7Cshellcommand/path' 2>&1 >/dev/null | grep > -v ^devel-warn: > - ssh: * fakehost%7cshellcommand* (glob) > + ssh: Could not resolve hostname fakehost%7Cshellcommand: Name or service > not known\r (esc) > abort: git remote error: The remote server unexpectedly closed the > connection. > > ERROR: test-pull.t output changed > ! > --- /<<PKGBUILDDIR>>/tests/test-file-removal.t > +++ /<<PKGBUILDDIR>>/tests/test-file-removal.t.err > @@ -166,64 +166,61 @@ > $ hg push ../gitrepo2 > pushing to ../gitrepo2 > searching for changes > - adding objects > - added 9 commits with 8 trees and 5 blobs > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ cd .. > $ git --git-dir=gitrepo2 log --pretty=medium > - commit 5ee11eeae239d6a99df5a99901ec00ffafbcc46b > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:18 2007 +0000 > - > - remove betalink > - > - commit 2c7b324faeccb1acf89c35b7ad38e7956f5705fa > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:17 2007 +0000 > - > - replace file with symlink > - > - commit ff0478d2ecc2571d01eb6d406ac29e4e63e5d3d5 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:16 2007 +0000 > - > - replace symlink with file > - > - commit 5492e6e410e42df527956be945286cd1ae45acb8 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:15 2007 +0000 > - > - add symlink to beta > - > - commit b991de8952c482a7cd51162674ffff8474862218 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:14 2007 +0000 > - > - remove foo/bar > - > - commit b0edaf0adac19392cf2867498b983bc5192b41dd > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:13 2007 +0000 > - > - remove alpha > - > - commit f2d0d5bfa905e12dee728b509b96cf265bb6ee43 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:12 2007 +0000 > - > - add foo > - > - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:11 2007 +0000 > - > - add beta > - > - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:10 2007 +0000 > - > - add alpha > + fatal: your current branch 'master' does not have any commits yet > + [128] > > test with rename detection enabled > $ hg --config git.similarity=100 clone gitrepo hgreporenames | grep -v > '^updating' > > ERROR: test-file-removal.t output changed > ! > --- /<<PKGBUILDDIR>>/tests/test-hg-author.t > +++ /<<PKGBUILDDIR>>/tests/test-hg-author.t.err > @@ -23,18 +23,112 @@ > $ hg push > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 1 commits with 1 trees and 1 blobs > - updating reference refs/heads/master > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ echo gamma >> beta > $ fn_hg_commit -u "test <t...@example.com> (comment)" -m 'modify beta' > $ hg push > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 1 commits with 1 trees and 1 blobs > - updating reference refs/heads/master > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ echo gamma > gamma > $ hg add gamma > @@ -42,9 +136,56 @@ > $ hg push > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 1 commits with 1 trees and 1 blobs > - updating reference refs/heads/master > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ echo delta > delta > $ hg add delta > @@ -52,9 +193,56 @@ > $ hg push > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 1 commits with 1 trees and 1 blobs > - updating reference refs/heads/master > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ echo epsilon > epsilon > $ hg add epsilon > @@ -62,9 +250,56 @@ > $ hg push > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 1 commits with 1 trees and 1 blobs > - updating reference refs/heads/master > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ echo zeta > zeta > $ hg add zeta > @@ -72,9 +307,56 @@ > $ hg push > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 1 commits with 1 trees and 1 blobs > - updating reference refs/heads/master > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ echo eta > eta > $ hg add eta > @@ -82,9 +364,56 @@ > $ hg push > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 1 commits with 1 trees and 1 blobs > - updating reference refs/heads/master > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ echo theta > theta > $ hg add theta > @@ -92,14 +421,60 @@ > $ hg push > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 1 commits with 1 trees and 1 blobs > - updating reference refs/heads/master > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ hg log --graph > @ changeset: 8:c5d1976ab12c > | bookmark: master > - | tag: default/master > | tag: tip > | user: test >t...@example.com> > | date: Mon Jan 01 00:00:18 2007 +0000 > @@ -142,6 +517,7 @@ > | > o changeset: 0:ff7a2f2d8d70 > bookmark: not-master > + tag: default/master > tag: default/not-master > user: test <t...@example.org> > date: Mon Jan 01 00:00:10 2007 +0000 > @@ -151,107 +527,19 @@ > $ cd .. > $ hg clone gitrepo hgrepo2 | grep -v '^updating' > importing git objects into hg > - 8 files updated, 0 files merged, 0 files removed, 0 files unresolved > + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ hg -R hgrepo2 log --graph > - @ changeset: 8:1fbf3aa91221 > - | bookmark: master > - | tag: default/master > - | tag: tip > - | user: test ?t...@example.com <test ?t...@example.com> > - | date: Mon Jan 01 00:00:18 2007 +0000 > - | summary: add theta > - | > - o changeset: 7:20310508f06d > - | user: test <t...@example.com> > - | date: Mon Jan 01 00:00:17 2007 +0000 > - | summary: add eta > - | > - o changeset: 6:e3d81af8a8c1 > - | user: test > - | date: Mon Jan 01 00:00:16 2007 +0000 > - | summary: add zeta > - | > - o changeset: 5:78f609fd208f > - | user: name <t...@example.com> > - | date: Mon Jan 01 00:00:15 2007 +0000 > - | summary: add epsilon > - | > - o changeset: 4:42fa61d57718 > - | user: name <t...@example.com> > - | date: Mon Jan 01 00:00:14 2007 +0000 > - | summary: add delta > - | > - o changeset: 3:6b854d65d0d6 > - | user: <t...@example.com> > - | date: Mon Jan 01 00:00:13 2007 +0000 > - | summary: add gamma > - | > - o changeset: 2:46303c652e79 > - | user: test <t...@example.com> (comment) > - | date: Mon Jan 01 00:00:12 2007 +0000 > - | summary: modify beta > - | > - o changeset: 1:47580592d3d6 > - | user: test > - | date: Mon Jan 01 00:00:11 2007 +0000 > - | summary: add beta > - | > - o changeset: 0:ff7a2f2d8d70 > + @ changeset: 0:ff7a2f2d8d70 > + bookmark: master > bookmark: not-master > + tag: default/master > tag: default/not-master > + tag: tip > user: test <t...@example.org> > date: Mon Jan 01 00:00:10 2007 +0000 > summary: add alpha > > $ git --git-dir=gitrepo/.git log --pretty=medium master > - commit 2fe60ba69727981e6ede78be70354c3a9e30e21d > - Author: test ?t...@example.com <test ?t...@example.com> > - Date: Mon Jan 1 00:00:18 2007 +0000 > - > - add theta > - > - commit 9f2f7cafdbf2e467928db98de8275141001d3081 > - Author: test <t...@example.com> > - Date: Mon Jan 1 00:00:17 2007 +0000 > - > - add eta > - > - commit 172a6f8d8064d73dff7013e395a9fe3cfc3ff807 > - Author: test <none@none> > - Date: Mon Jan 1 00:00:16 2007 +0000 > - > - add zeta > - > - commit 71badb8e343a7da391a9b5d98909fbd2ca7d78f2 > - Author: name <t...@example.com> > - Date: Mon Jan 1 00:00:15 2007 +0000 > - > - add epsilon > - > - commit 9a9ae7b7f310d4a1a3e732a747ca26f06934f8d8 > - Author: name <t...@example.com> > - Date: Mon Jan 1 00:00:14 2007 +0000 > - > - add delta > - > - commit e4149a32e81e380193f59aa8773349201b8ed7f7 > - Author: <t...@example.com> > - Date: Mon Jan 1 00:00:13 2007 +0000 > - > - add gamma > - > - commit fae95aef5889a80103c2fbd5d14ff6eb8c9daf93 > - Author: test ext:(%20%28comment%29) <t...@example.com> > - Date: Mon Jan 1 00:00:12 2007 +0000 > - > - modify beta > - > - commit 0f378ab6c2c6b5514bd873d3faf8ac4b8095b001 > - Author: test <none@none> > - Date: Mon Jan 1 00:00:11 2007 +0000 > - > - add beta > - > commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 > Author: test <t...@example.org> > Date: Mon Jan 1 00:00:10 2007 +0000 > > ERROR: test-hg-author.t output changed > !. > --- /<<PKGBUILDDIR>>/tests/test-push.t > +++ /<<PKGBUILDDIR>>/tests/test-push.t.err > @@ -30,16 +30,62 @@ > $ hg push -r beta > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 1 commits with 1 trees and 1 blobs > - adding reference refs/heads/beta > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ cd .. > > should have two different branches > $ cd gitrepo > $ git branch -v > - beta 0f378ab add beta > master 7eeab2e add alpha > * not-master 7eeab2e add alpha > > @@ -105,16 +151,63 @@ > $ hg push -fr master > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 1 commits with 1 trees and 1 blobs > - updating reference refs/heads/master > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > this should fail, no changes to push > $ hg push -r master > pushing to $TESTTMP/gitrepo > searching for changes > - no changes found > - [1] > + abort: pushing refs/heads/master overwrites 953796e1cfd8 > + [255] > > hg-git issue103 -- directories can lose information at hg-git export time > > @@ -127,9 +220,8 @@ > $ hg push -r master > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 1 commits with 2 trees and 0 blobs > - updating reference refs/heads/master > + abort: pushing refs/heads/master overwrites 17c3b8f0f096 > + [255] > > $ echo beta > dir1/beta > $ hg add dir1/beta > @@ -137,13 +229,11 @@ > $ hg push -r master > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 1 commits with 2 trees and 0 blobs > - updating reference refs/heads/master > + abort: pushing refs/heads/master overwrites ba0476ff1899 > + [255] > $ hg log -r master > changeset: 5:ba0476ff1899 > bookmark: master > - tag: default/master > tag: tip > user: test > date: Mon Jan 01 00:00:15 2007 +0000 > @@ -155,15 +245,15 @@ > $ hg clone gitrepo hgrepo-test > importing git objects into hg > updating to branch default > - 5 files updated, 0 files merged, 0 files removed, 0 files unresolved > + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ hg -R hgrepo-test log -r master > - changeset: 4:ba0476ff1899 > + changeset: 1:25eed24f5e8f > bookmark: master > tag: default/master > tag: tip > - user: test > - date: Mon Jan 01 00:00:15 2007 +0000 > - summary: add dir1/beta > + user: test <t...@example.org> > + date: Mon Jan 01 00:00:13 2007 +0000 > + summary: add delta > > > Push empty Hg repo to empty Git repo (issue #58) > @@ -186,8 +276,56 @@ > $ hg push ../gitrepo2 > pushing to ../gitrepo2 > searching for changes > - adding objects > - added 1 commits with 1 trees and 1 blobs > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > (the phases line was added in Mercurial 3.5) > $ hg summary | grep -Ev '^phases:' > parent: -1:000000000000 (no revision checked out) > @@ -211,8 +349,8 @@ > abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' > [255] > $ hg push 'git+ssh://fakehost|rm%20nonexistent/path' 2>&1 >/dev/null | > grep -v ^devel-warn: > - ssh: * fakehost%7crm%20nonexistent* (glob) > + ssh: Could not resolve hostname fakehost%7Crm%20nonexistent: Name or > service not known\r (esc) > abort: git remote error: The remote server unexpectedly closed the > connection. > $ hg push 'git+ssh://fakehost%7Crm%20nonexistent/path' 2>&1 >/dev/null | > grep -v ^devel-warn: > - ssh: * fakehost%7crm%20nonexistent* (glob) > + ssh: Could not resolve hostname fakehost%7Crm%20nonexistent: Name or > service not known\r (esc) > abort: git remote error: The remote server unexpectedly closed the > connection. > > ERROR: test-push.t output changed > ! > --- /<<PKGBUILDDIR>>/tests/test-extra.t > +++ /<<PKGBUILDDIR>>/tests/test-extra.t.err > @@ -51,9 +51,56 @@ > $ hg push -r b1 --config git.debugextrainmessage=1 > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 3 commits with 3 trees and 0 blobs > - adding reference refs/heads/b1 > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ hg bookmark b2 > $ hg mv c c2 > @@ -81,47 +128,73 @@ > $ hg push -r b2 -r b3 > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 3 commits with 3 trees and 0 blobs > - adding reference refs/heads/b2 > - adding reference refs/heads/b3 > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ cd ../gitrepo > $ git cat-file commit b1 > - tree 1b773a2eb70f29397356f8069c285394835ff85a > - parent 202f271eb3dcb7b767ce2af6cdad4114df62ff3f > - author test <none@none> 1167609613 +0000 > - committer test <none@none> 1167609613 +0000 > - > - > - > - --HG-- > - extra : aaaaaaa : dataaaa > - extra : zzzzzzz : datazzz > + fatal: Not a valid object name b1 > + [128] > > $ git cat-file commit b2 > - tree 34ad62c6d6ad9464bfe62db5b3d2fa16aaa9fa9e > - parent 66fe706f6f4f08f0020323e6c49548d41bb00ff6 > - author test <none@none> 1167609614 +0000 > - committer test <none@none> 1167609614 +0000 > - HG:rename c:c2 > - HG:rename d:d2 > - HG:extra bbbbbbb:databbb > - HG:extra yyyyyyy:datayyy > - > - > + fatal: Not a valid object name b2 > + [128] > > $ git cat-file commit b3 > - tree e63df52695f9b06e54b37e7ef60d0c43994de620 > - parent 6a66c937dea689a8bb2aa053bd91667fe4a7bfe8 > - author test <none@none> 1167609616 +0000 > - committer test <none@none> 1167609616 +0000 > - HG:rename c2%20%3D%3E%20c3:c3%20%3D%3E%20c4 > - > - test filename with arrow 2 > + fatal: Not a valid object name b3 > + [128] > $ cd ../gitrepo > $ git checkout b1 > - Switched to branch 'b1' > + error: pathspec 'b1' did not match any file(s) known to git. > + [1] > $ commit_sha=$(git rev-parse HEAD) > $ tree_sha=$(git rev-parse HEAD^{tree}) > > @@ -149,8 +222,8 @@ > True > > $ git cat-file commit master > - tree 1b773a2eb70f29397356f8069c285394835ff85a > - parent 66fe706f6f4f08f0020323e6c49548d41bb00ff6 > + tree 496d6428b9cf92981dc9495211e6e1120fb6f2ba > + parent ad4fd0de4cb839a7d2d1c2497f8a2c230a2726e9 > author test <t...@example.org> 0 +0000 > committer test <t...@example.org> 0 +0000 > zzz:zzz data:zzz > @@ -164,26 +237,8 @@ > $ hg clone -q gitrepo hgrepo2 > $ cd hgrepo2 > $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, > ' ')}\n\n" > - @ 7 e003ec989aaae23b3eb30d4423419fb4dc346089 test filename with arrow 2 > - | branch=default > - | > - o 6 a2e276bd9458cb7dc309230ec8064d544e4f0c68 test filename with arrow > - | branch=default > - | > - o 5 524e82e66b589f8b56bdd0679ad457a162ba16cd > - | bbbbbbb=databbb branch=default yyyyyyy=datayyy > - | > - | o 4 741081daa02c9023c8c5117771f59ef2308a575c extra commit > - |/ GIT0-zzz%3Azzz=data%3Azzz GIT1-aaa%3Aaaa=data%3Aaaa branch=default > hgaaa=dataaaa hgzzz=datazzz > - | > - o 3 73fa4063c4b0f386fd6b59da693617dedb340b02 > - | aaaaaaa=dataaaa branch=default zzzzzzz=datazzz > - | > - o 2 98337758089f6efd29f48bcaf00d14184ed0771b b > - | branch=default rebase_source=4c7da7adf18b785726a7421ef0d585bb5762990d > - | > - o 1 92a46c8588a7cd504c369259ef631b2c14ef4e91 c > - | branch=default hg-git-rename-source=git > + @ 1 5a6d13774926ae515c2cbf7e7943d004120e589c extra commit > + | GIT0-zzz%3Azzz=data%3Azzz GIT1-aaa%3Aaaa=data%3Aaaa branch=default > hgaaa=dataaaa hgzzz=datazzz > | > o 0 aa9eb6424386df2b0638fe6f480c3767fdd0e6fd a > branch=default hg-git-rename-source=git > > ERROR: test-extra.t output changed > ! > --- /<<PKGBUILDDIR>>/tests/test-octopus.t > +++ /<<PKGBUILDDIR>>/tests/test-octopus.t.err > @@ -109,57 +109,57 @@ > $ hg push ../gitrepo2 > pushing to ../gitrepo2 > searching for changes > - adding objects > - added 8 commits with 8 trees and 6 blobs > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > $ cd .. > > $ git --git-dir=gitrepo2 log --pretty=medium | sed s/\\.\\.\\.//g > - commit b32ff845df61df998206b630e4370a44f9b36845 > - Merge: 9ac68f9 7e9cd9f e695849 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:15 2007 +0000 > - > - Merge branches 'branch3' and 'branch4' > - > - commit 9ac68f982ae7426d9597ff16c74afb4e6053c582 > - Merge: d40f375 9497a4e e5023f9 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:15 2007 +0000 > - > - Merge branches 'branch1' and 'branch2' > - > - commit d40f375a81b7d033e92cbad89487115fe2dd472f > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:15 2007 +0000 > - > - add delta > - > - commit e695849087f6c320c1a447620492b29a82ca41b1 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:14 2007 +0000 > - > - add zeta > - > - commit 7e9cd9f90b6d2c60579375eb796ce706d2d8bbe6 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:13 2007 +0000 > - > - add epsilon > - > - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:12 2007 +0000 > - > - add gamma > - > - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:11 2007 +0000 > - > - add beta > - > - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:10 2007 +0000 > - > - add alpha > + fatal: your current branch 'master' does not have any commits yet > > ERROR: test-octopus.t output changed > !. > --- /<<PKGBUILDDIR>>/tests/test-subrepos.t > +++ /<<PKGBUILDDIR>>/tests/test-subrepos.t.err > @@ -72,18 +72,65 @@ > $ hg push > pushing to $TESTTMP/gitrepo1 > searching for changes > - adding objects > - added 1 commits with 2 trees and 1 blobs > - updating reference refs/heads/master > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > $ cd .. > $ cd gitrepo1 > there shall be two gitlink entries, with values matching that in .hgsubstate > $ git ls-tree -r HEAD^{tree} | grep 'commit' > 160000 commit 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 > - 160000 commit aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 > + 160000 commit 56f0304c5250308f14cfbafdc27bd12d40154d17 xyz/subrepo2 > bring working copy to HEAD state (it's not bare repo) > $ git reset --hard > - HEAD is now at ae335e3 Update subrepo2 from hg > + HEAD is now at 89c22d7 add subrepo2 > $ cd .. > > 3. Check .hgsub and .hgsubstate from git repository are merged, not > overwritten > @@ -101,19 +148,15 @@ > $ hg pull > pulling from $TESTTMP/gitrepo1 > importing git objects into hg > - (run 'hg update' to get a working copy) > + (run 'hg heads' to see heads, 'hg merge' to merge) > $ hg checkout -C | egrep -v '^\(activating bookmark master\)$' > - updating to active bookmark master > - cloning subrepo hgsub from $TESTTMP/hgsub > - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ cd .. > pull shall bring .hgsub entry which was added to the git repo > $ cat hgrepo/.hgsub | sort > - hgsub = $TESTTMP/hgsub > subrepo1 = [git]../gitsubrepo > xyz/subrepo2 = [git]../gitsubrepo > .hgsubstate shall list revision of the subrepo added through git repo > $ cat hgrepo/.hgsubstate > - 481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub > 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1 > aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2 > > ERROR: test-subrepos.t output changed > ! > --- /<<PKGBUILDDIR>>/tests/test-branch-bookmark-suffix.t > +++ /<<PKGBUILDDIR>>/tests/test-branch-bookmark-suffix.t.err > @@ -66,79 +66,102 @@ > $ hg push ../gitrepo1 > pushing to ../gitrepo1 > searching for changes > - adding objects > - added 2 commits with 2 trees and 2 blobs > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, graphlog > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ cd .. > > $ cd gitrepo1 > $ git symbolic-ref HEAD refs/heads/branch1 > $ git branch > - * branch1 > - branch2 > $ cd .. > > $ git clone gitrepo1 gitrepo2 > Cloning into 'gitrepo2'... > + warning: You appear to have cloned an empty repository. > done. > $ cd gitrepo2 > $ git checkout branch1 2>&1 | grep -v 'up-to-date' > - Already on 'branch1' > Your branch is up to date with 'origin/branch1'. (?) > + error: pathspec 'branch1' did not match any file(s) known to git. > $ echo g1 >> f1 > $ git add f1 > $ commit -m "append f1" > $ git checkout branch2 > - Switched to a new branch 'branch2' > - Branch '?branch2'? set up to track remote branch '?branch2'? from > '?origin'?. (re) > + error: pathspec 'branch2' did not match any file(s) known to git. > + [1] > $ echo g2 >> f2 > $ git add f2 > $ commit -m "append f2" > $ git push origin > - To $TESTTMP/gitrepo1 > - bbfe79a..d8aef79 branch1 -> branch1 > - 288e92b..f8f8de5 branch2 -> branch2 > + No refs in common and none specified; doing nothing. > + Perhaps you should specify a branch such as 'master'. > + fatal: The remote end hung up unexpectedly > + error: failed to push some refs to '$TESTTMP/gitrepo1' > + [1] > make sure the commit doesn't have an HG:rename-source annotation > $ git cat-file commit d8aef79 > - tree b5644d8071b8a5963b8d1fd089fb3fdfb14b1203 > - parent bbfe79acf62dcd6a97763e2a67424a6de8a96941 > - author test <t...@example.org> 1167609612 +0000 > - committer test <t...@example.org> 1167609612 +0000 > - > - append f1 > + fatal: Not a valid object name d8aef79 > + [128] > $ cd .. > > $ cd hgrepo > $ hg pull ../gitrepo1 > pulling from ../gitrepo1 > - importing git objects into hg > - (run 'hg heads' to see heads) > $ hg log --graph > - o changeset: 3:ae8eb55f7090 > + @ changeset: 1:600de9b6d498 > + | branch: branch2 > | bookmark: branch2_bookmark > - | tag: default/branch2 > | tag: tip > - | parent: 1:600de9b6d498 > - | user: test <t...@example.org> > - | date: Mon Jan 01 00:00:13 2007 +0000 > - | summary: append f2 > - | > - | o changeset: 2:8211cade99e4 > - | | bookmark: branch1_bookmark > - | | tag: default/branch1 > - | | parent: 0:40a840c1f8ae > - | | user: test <t...@example.org> > - | | date: Mon Jan 01 00:00:12 2007 +0000 > - | | summary: append f1 > - | | > - @ | changeset: 1:600de9b6d498 > - |/ branch: branch2 > - | user: test > - | date: Mon Jan 01 00:00:11 2007 +0000 > - | summary: add f2 > + | user: test > + | date: Mon Jan 01 00:00:11 2007 +0000 > + | summary: add f2 > | > o changeset: 0:40a840c1f8ae > branch: branch1 > + bookmark: branch1_bookmark > user: test > date: Mon Jan 01 00:00:10 2007 +0000 > summary: add f1 > > ERROR: test-branch-bookmark-suffix.t output changed > !.... > --- /<<PKGBUILDDIR>>/tests/test-hg-tags-invalid.t > +++ /<<PKGBUILDDIR>>/tests/test-hg-tags-invalid.t.err > @@ -25,16 +25,60 @@ > pushing to $TESTTMP/gitrepo > Skipping export of tag bet*a because it has invalid name as a git refname. > searching for changes > - adding objects > - added 3 commits with 3 trees and 3 blobs > - updating reference refs/heads/master > - adding reference refs/tags/alph#a > - adding reference refs/tags/gamm_a > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ hg log --graph > @ changeset: 3:0950ab44ea23 > | bookmark: master > - | tag: default/master > | tag: tip > | user: test > | date: Mon Jan 01 00:00:13 2007 +0000 > @@ -55,6 +99,7 @@ > o changeset: 0:ff7a2f2d8d70 > bookmark: not-master > tag: alph#a > + tag: default/master > tag: default/not-master > user: test <t...@example.org> > date: Mon Jan 01 00:00:10 2007 +0000 > @@ -65,39 +110,18 @@ > $ cd gitrepo > git should have only the valid tag alph#a but have full commit log including > the missing invalid bet*a tag commit > $ git tag -l > - alph#a > - gamm_a > > $ cd .. > $ hg clone gitrepo hgrepo2 | grep -v '^updating' > importing git objects into hg > - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ hg -R hgrepo2 log --graph > - @ changeset: 3:0950ab44ea23 > - | bookmark: master > - | tag: default/master > - | tag: tip > - | user: test > - | date: Mon Jan 01 00:00:13 2007 +0000 > - | summary: Added tag gamm a for changeset 0b27ab2b3df6 > - | > - o changeset: 2:0b27ab2b3df6 > - | tag: gamm a > - | tag: gamm_a > - | user: test > - | date: Mon Jan 01 00:00:12 2007 +0000 > - | summary: Added tag bet*a for changeset 491ceeb1b0f1 > - | > - o changeset: 1:491ceeb1b0f1 > - | tag: bet*a > - | user: test > - | date: Mon Jan 01 00:00:11 2007 +0000 > - | summary: Added tag alph#a for changeset ff7a2f2d8d70 > - | > - o changeset: 0:ff7a2f2d8d70 > + @ changeset: 0:ff7a2f2d8d70 > + bookmark: master > bookmark: not-master > - tag: alph#a > + tag: default/master > tag: default/not-master > + tag: tip > user: test <t...@example.org> > date: Mon Jan 01 00:00:10 2007 +0000 > summary: add alpha > @@ -105,6 +129,5 @@ > > the tag should be in .hgtags > $ cat hgrepo2/.hgtags > - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alph#a > - 491ceeb1b0f10d65d956dfcdd3470ac2bc2c96a8 bet*a > - 0b27ab2b3df69c6f7defd7040b93e539136db5be gamm a > + cat: hgrepo2/.hgtags: No such file or directory > + [1] > > ERROR: test-hg-tags-invalid.t output changed > !... > --- /<<PKGBUILDDIR>>/tests/test-hg-branch.t > +++ /<<PKGBUILDDIR>>/tests/test-hg-branch.t.err > @@ -23,9 +23,56 @@ > $ hg push > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 1 commits with 1 trees and 0 blobs > - updating reference refs/heads/master > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ hg branch gamma | grep -v 'permanent and global' > marked working directory as branch gamma > @@ -33,15 +80,61 @@ > $ hg push > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 1 commits with 1 trees and 0 blobs > - updating reference refs/heads/master > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ hg log --graph > @ changeset: 2:400db38f4f64 > | branch: gamma > | bookmark: master > - | tag: default/master > | tag: tip > | user: test > | date: Mon Jan 01 00:00:12 2007 +0000 > @@ -54,6 +147,7 @@ > | > o changeset: 0:ff7a2f2d8d70 > bookmark: not-master > + tag: default/master > tag: default/not-master > user: test <t...@example.org> > date: Mon Jan 01 00:00:10 2007 +0000 > @@ -65,23 +159,12 @@ > importing git objects into hg > 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ hg -R hgrepo2 log --graph > - o changeset: 2:400db38f4f64 > - | branch: gamma > - | bookmark: master > - | tag: default/master > - | tag: tip > - | user: test > - | date: Mon Jan 01 00:00:12 2007 +0000 > - | summary: started branch gamma > - | > - @ changeset: 1:3baa67317a4d > - | user: test > - | date: Mon Jan 01 00:00:11 2007 +0000 > - | summary: rename alpha to beta > - | > - o changeset: 0:ff7a2f2d8d70 > + @ changeset: 0:ff7a2f2d8d70 > + bookmark: master > bookmark: not-master > + tag: default/master > tag: default/not-master > + tag: tip > user: test <t...@example.org> > date: Mon Jan 01 00:00:10 2007 +0000 > summary: add alpha > > ERROR: test-hg-branch.t output changed > ! > --- /<<PKGBUILDDIR>>/tests/test-merge.t > +++ /<<PKGBUILDDIR>>/tests/test-merge.t.err > @@ -42,45 +42,64 @@ > $ hg push ../gitrepo2 > pushing to ../gitrepo2 > searching for changes > - adding objects > - added 4 commits with 4 trees and 3 blobs > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ cd .. > git log in repo pushed from hg > $ git --git-dir=gitrepo2 log --pretty=medium master | sed 's/\.\.\.//g' > - commit 5806851511aaf3bfe813ae3a86c5027165fa9b96 > - Merge: e5023f9 9497a4e > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:12 2007 +0000 > - > - Merge branch 'beta' > - > - commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:12 2007 +0000 > - > - add gamma > - > - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:11 2007 +0000 > - > - add beta > - > - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:10 2007 +0000 > - > - add alpha > + fatal: ambiguous argument 'master': unknown revision or path not in the > working tree. > + Use '--' to separate paths from revisions, like this: > + 'git <command> [<revision>...] -- [<file>...]' > $ git --git-dir=gitrepo2 log --pretty=medium beta | sed 's/\.\.\.//g' > - commit 9497a4ee62e16ee641860d7677cdb2589ea15554 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:11 2007 +0000 > - > - add beta > - > - commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:10 2007 +0000 > - > - add alpha > + fatal: ambiguous argument 'beta': unknown revision or path not in the > working tree. > + Use '--' to separate paths from revisions, like this: > + 'git <command> [<revision>...] -- [<file>...]' > > ERROR: test-merge.t output changed > !. > --- /<<PKGBUILDDIR>>/tests/test-hg-tags.t > +++ /<<PKGBUILDDIR>>/tests/test-hg-tags.t.err > @@ -22,15 +22,60 @@ > $ hg push > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 1 commits with 1 trees and 1 blobs > - updating reference refs/heads/master > - adding reference refs/tags/alpha > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ hg log --graph > @ changeset: 1:e8b150f84560 > | bookmark: master > - | tag: default/master > | tag: tip > | user: test > | date: Mon Jan 01 00:00:11 2007 +0000 > @@ -39,6 +84,7 @@ > o changeset: 0:ff7a2f2d8d70 > bookmark: not-master > tag: alpha > + tag: default/master > tag: default/not-master > user: test <t...@example.org> > date: Mon Jan 01 00:00:10 2007 +0000 > @@ -49,25 +95,18 @@ > $ cd gitrepo > git should have the tag alpha > $ git tag -l > - alpha > > $ cd .. > $ hg clone gitrepo hgrepo2 | grep -v '^updating' > importing git objects into hg > - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ hg -R hgrepo2 log --graph > - @ changeset: 1:e8b150f84560 > - | bookmark: master > - | tag: default/master > - | tag: tip > - | user: test > - | date: Mon Jan 01 00:00:11 2007 +0000 > - | summary: Added tag alpha for changeset ff7a2f2d8d70 > - | > - o changeset: 0:ff7a2f2d8d70 > + @ changeset: 0:ff7a2f2d8d70 > + bookmark: master > bookmark: not-master > - tag: alpha > + tag: default/master > tag: default/not-master > + tag: tip > user: test <t...@example.org> > date: Mon Jan 01 00:00:10 2007 +0000 > summary: add alpha > @@ -75,4 +114,5 @@ > > the tag should be in .hgtags > $ cat hgrepo2/.hgtags > - ff7a2f2d8d7099694ae1e8b03838d40575bebb63 alpha > + cat: hgrepo2/.hgtags: No such file or directory > + [1] > > ERROR: test-hg-tags.t output changed > ! > --- /<<PKGBUILDDIR>>/tests/test-convergedmerge.t > +++ /<<PKGBUILDDIR>>/tests/test-convergedmerge.t.err > @@ -51,29 +51,63 @@ > $ hg push -r master ../gitrepo > pushing to ../gitrepo > searching for changes > - adding objects > - added 5 commits with 3 trees and 3 blobs > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > $ cd .. > > $ hg clone gitrepo hgrepo2 | grep -v '^updating' > - importing git objects into hg > - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved > expect the same revision ids as above > $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' > - @ 4:1,3 eaa21d002113 1970-01-01 00:00 +0000 test > - |\ merge > - | | > - | o 3 0dbe4ac1a758 1970-01-01 00:00 +0000 test > - | | B->C > - | | > - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test > - | | A->B > - | | > - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test > - |/ A->C > - | > - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test > - origin > - > $ hg -R hgrepo2 gverify > - verifying rev eaa21d002113 against git commit > fb8c9e2afe5418cfff337eeed79fad5dd58826f0 > + abort: no git commit found for rev 000000000000 > + (if this is an octopus merge, verify against the last rev) > + [255] > > ERROR: test-convergedmerge.t output changed > ! > --- /<<PKGBUILDDIR>>/tests/test-git-clone.t > +++ /<<PKGBUILDDIR>>/tests/test-git-clone.t.err > @@ -51,8 +51,8 @@ > abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' > [255] > $ hg clone 'git+ssh://fakehost|rm${IFS}nonexistent/path' 2>&1 >/dev/null | > grep -v ^devel-warn: > - ssh: * fakehost%7crm%24%7bifs%7dnonexistent* (glob) > + ssh: Could not resolve hostname fakehost%7Crm%24%7BIFS%7Dnonexistent: Name > or service not known\r (esc) > abort: git remote error: The remote server unexpectedly closed the > connection. > $ hg clone 'git+ssh://fakehost%7Crm${IFS}nonexistent/path' 2>&1 >/dev/null > | grep -v ^devel-warn: > - ssh: * fakehost%7crm%24%7bifs%7dnonexistent* (glob) > + ssh: Could not resolve hostname fakehost%7Crm%24%7BIFS%7Dnonexistent: Name > or service not known\r (esc) > abort: git remote error: The remote server unexpectedly closed the > connection. > > ERROR: test-git-clone.t output changed > ! > --- /<<PKGBUILDDIR>>/tests/test-conflict-2.t > +++ /<<PKGBUILDDIR>>/tests/test-conflict-2.t.err > @@ -49,24 +49,59 @@ > $ hg push -r master ../gitrepo > pushing to ../gitrepo > searching for changes > - adding objects > - added 4 commits with 3 trees and 3 blobs > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > $ cd .. > > $ hg clone gitrepo hgrepo2 | grep -v '^updating' > - importing git objects into hg > - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved > expect the same revision ids as above > $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' > - @ 3:1,2 120385945d08 1970-01-01 00:00 +0000 test > - |\ merge to B > - | | > - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test > - | | A->B > - | | > - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test > - |/ A->C > - | > - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test > - origin > - > > ERROR: test-conflict-2.t output changed > ! > --- /<<PKGBUILDDIR>>/tests/test-conflict-1.t > +++ /<<PKGBUILDDIR>>/tests/test-conflict-1.t.err > @@ -49,24 +49,59 @@ > $ hg push -r master ../gitrepo > pushing to ../gitrepo > searching for changes > - adding objects > - added 4 commits with 3 trees and 3 blobs > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > $ cd .. > > $ hg clone gitrepo hgrepo2 | grep -v '^updating' > - importing git objects into hg > - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved > expect the same revision ids as above > $ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g' > - @ 3:1,2 6c53bc0f062f 1970-01-01 00:00 +0000 test > - |\ merge to C > - | | > - | o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test > - | | A->B > - | | > - o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test > - |/ A->C > - | > - o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test > - origin > - > > ERROR: test-conflict-1.t output changed > !. > --- /<<PKGBUILDDIR>>/tests/test-tree-decomposition.t > +++ /<<PKGBUILDDIR>>/tests/test-tree-decomposition.t.err > @@ -41,25 +41,58 @@ > $ hg push ../gitrepo2 > pushing to ../gitrepo2 > searching for changes > - adding objects > - added 3 commits with 6 trees and 3 blobs > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > $ cd .. > > $ git --git-dir=gitrepo2 log --pretty=medium > - commit 6e0dbd8cd92ed4823c69cb48d8a2b81f904e6e69 > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:12 2007 +0000 > - > - replace a dir with a file > - > - commit a1874d5cd0b1549ed729e36f0da4a93ed36259ee > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:11 2007 +0000 > - > - rename > - > - commit 102c17a5deda49db3f10ec5573f9378867098b7c > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:10 2007 +0000 > - > - initial > + fatal: your current branch 'master' does not have any commits yet > + [128] > > ERROR: test-tree-decomposition.t output changed > ! > --- /<<PKGBUILDDIR>>/tests/test-git-tags.t > +++ /<<PKGBUILDDIR>>/tests/test-git-tags.t.err > @@ -42,8 +42,55 @@ > $ hg push > pushing to $TESTTMP/gitrepo > searching for changes > - adding objects > - added 1 commits with 1 trees and 1 blobs > - updating reference refs/heads/master > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > > $ cd .. > > ERROR: test-git-tags.t output changed > !. > --- /<<PKGBUILDDIR>>/tests/test-empty-working-tree.t > +++ /<<PKGBUILDDIR>>/tests/test-empty-working-tree.t.err > @@ -24,12 +24,57 @@ > $ hg push ../gitrepo2 > pushing to ../gitrepo2 > searching for changes > - adding objects > - added 1 commits with 1 trees and 0 blobs > + ** unknown exception encountered, please report by visiting > + ** https://mercurial-scm.org/wiki/BugTracker > + ** Python 2.7.15 (default, May 1 2018, 05:55:50) [GCC 7.3.0] > + ** Mercurial Distributed SCM (version 4.5.3) > + ** Extensions loaded: hggit, strip, mq > + Traceback (most recent call last): > + File "/usr/bin/hg", line 41, in <module> > + dispatch.run() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 88, > in run > + status = (dispatch(req) or 0) & 255 > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 183, > in dispatch > + ret = _runcatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 324, > in _runcatch > + return _callcatch(ui, _runcatchfunc) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 332, > in _callcatch > + return scmutil.callcatch(ui, func) > + File "/usr/lib/python2.7/dist-packages/mercurial/scmutil.py", line 154, > in callcatch > + return func() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 314, > in _runcatchfunc > + return _dispatch(req) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 918, > in _dispatch > + cmdpats, cmdoptions) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 673, > in runcommand > + ret = _runcommand(ui, options, cmd, d) > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 926, > in _runcommand > + return cmdfunc() > + File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 915, > in <lambda> > + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/hgext/mq.py", line 3583, in > mqcommand > + return orig(ui, repo, *args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 1197, in > check > + return func(*args, **kwargs) > + File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line > 4194, in push > + opargs=opargs) > + File "/<<PKGBUILDDIR>>/hggit/util.py", line 56, in inner > + return f(*args, **kwargs) > + File "/<<PKGBUILDDIR>>/hggit/__init__.py", line 384, in exchangepush > + pushop.cgresult = repo.githandler.push(remote.path, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 404, in push > + old_refs, new_refs = self.upload_pack(remote, revs, force) > + File "/<<PKGBUILDDIR>>/hggit/git_handler.py", line 1113, in upload_pack > + progress=callback) > + File "/usr/lib/python2.7/dist-packages/dulwich/client.py", line 704, in > send_pack > + ofs_delta=(CAPABILITY_OFS_DELTA in negotiated_capabilities)) > + TypeError: genpack() got an unexpected keyword argument 'ofs_delta' > + [1] > $ cd .. > $ git --git-dir=gitrepo2 log --pretty=medium > - commit 678256865a8c85ae925bf834369264193c88f8de > - Author: test <t...@example.org> > - Date: Mon Jan 1 00:00:00 2007 +0000 > - > - empty > + fatal: your current branch 'master' does not have any commits yet > + [128] > > ERROR: test-empty-working-tree.t output changed > !.... > Skipped test-encoding.t: blacklisted > Failed test-renames.t: output changed > Failed test-pull.t: output changed > Failed test-file-removal.t: output changed > Failed test-hg-author.t: output changed > Failed test-push.t: output changed > Failed test-extra.t: output changed > Failed test-octopus.t: output changed > Failed test-subrepos.t: output changed > Failed test-branch-bookmark-suffix.t: output changed > Failed test-hg-tags-invalid.t: output changed > Failed test-hg-branch.t: output changed > Failed test-merge.t: output changed > Failed test-hg-tags.t: output changed > Failed test-convergedmerge.t: output changed > Failed test-git-clone.t: output changed > Failed test-conflict-2.t: output changed > Failed test-conflict-1.t: output changed > Failed test-tree-decomposition.t: output changed > Failed test-git-tags.t: output changed > Failed test-empty-working-tree.t: output changed > # Ran 37 tests, 1 skipped, 20 failed. > python hash seed: 4193299082 > make[2]: *** [Makefile:13: tests] Error 1 The full build log is available from: http://aws-logs.debian.net/2018/05/02/hg-git_0.8.11-1_unstable.log A list of current common problems and possible solutions is available at http://wiki.debian.org/qa.debian.org/FTBFS . You're welcome to contribute! About the archive rebuild: The rebuild was done on EC2 VM instances from Amazon Web Services, using a clean, minimal and up-to-date chroot. Every failed build was retried once to eliminate random failures.
