Re: Test failures in contrib/remote-helpers
Felipe Contreras wrote: > On Sun, Nov 11, 2012 at 11:32 AM, Ramkumar Ramachandra > wrote: >> I'm experiencing test failures in contrib/remote-helpers. > > Which are your versions of hg, and bzr? Mercurial Distributed SCM (version 1.9.1) Bazaar (bzr) 2.4.1 Ram -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Test failures in contrib/remote-helpers
On Sun, Nov 11, 2012 at 1:48 PM, Ramkumar Ramachandra wrote: > Felipe Contreras wrote: >> On Sun, Nov 11, 2012 at 11:32 AM, Ramkumar Ramachandra >> wrote: >>> I'm experiencing test failures in contrib/remote-helpers. >> >> Which are your versions of hg, and bzr? > > Mercurial Distributed SCM (version 1.9.1) I can reproduce the issue, this fixes it for versions up to 1.8: --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -294,7 +294,7 @@ def export_ref(repo, name, kind, head): if tip and tip == head.rev(): # nothing to do return -revs = repo.revs('%u:%u' % (tip, head)) +revs = xrange(tip, head.rev() + 1) count = 0 revs = [rev for rev in revs if not marks.is_marked(rev)] I don't think it makes sense to aim anything lower. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Test failures in contrib/remote-helpers
On Sun, Nov 11, 2012 at 1:48 PM, Ramkumar Ramachandra wrote: > Felipe Contreras wrote: >> On Sun, Nov 11, 2012 at 11:32 AM, Ramkumar Ramachandra >> wrote: >>> I'm experiencing test failures in contrib/remote-helpers. >> >> Which are your versions of hg, and bzr? > > Mercurial Distributed SCM (version 1.9.1) > Bazaar (bzr) 2.4.1 And here's the one for bzr: --- a/contrib/remote-helpers/git-remote-bzr +++ b/contrib/remote-helpers/git-remote-bzr @@ -646,12 +646,12 @@ def get_repo(url, alias): global dirname, peer clone_path = os.path.join(dirname, 'clone') -origin = bzrlib.controldir.ControlDir.open(url) +origin = bzrlib.bzrdir.BzrDir.open(url) remote_branch = origin.open_branch() if os.path.exists(clone_path): # pull -d = bzrlib.controldir.ControlDir.open(clone_path) +d = bzrlib.bzrdir.BzrDir.open(clone_path) branch = d.open_branch() result = branch.pull(remote_branch, [], None, False) else: I have other fixes to run up to 2.0. Cheers. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Test failures in contrib/remote-helpers
Felipe Contreras wrote: > And here's the one for bzr: > > --- a/contrib/remote-helpers/git-remote-bzr > +++ b/contrib/remote-helpers/git-remote-bzr > @@ -646,12 +646,12 @@ def get_repo(url, alias): > global dirname, peer > > clone_path = os.path.join(dirname, 'clone') > -origin = bzrlib.controldir.ControlDir.open(url) > +origin = bzrlib.bzrdir.BzrDir.open(url) > remote_branch = origin.open_branch() > > if os.path.exists(clone_path): > # pull > -d = bzrlib.controldir.ControlDir.open(clone_path) > +d = bzrlib.bzrdir.BzrDir.open(clone_path) > branch = d.open_branch() > result = branch.pull(remote_branch, [], None, False) > else: > > I have other fixes to run up to 2.0. Works for me. All four tests pass now. Reported-by: Ramkumar Ramachandra Tested-by: Ramkumar Ramachandra Ram -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html