From 50a29ad9e0b93983d5aa5c3509414f345d37cb71 Mon Sep 17 00:00:00 2001 From: Augie Fackler Date: Sun, 16 Jan 2011 22:49:16 -0600 Subject: [PATCH] Backed out changeset f9733bec1b30 This was causing breakage with hg-git installed, and I'm more tired of user gripes that hg-git and hgsubversion are incompatible than of hearing complaints about doubled authentication prompts. Hopefully at some point we can do better than this. --- hgsubversion/wrappers.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py index bba5af03ae..03d168644d 100644 --- a/hgsubversion/wrappers.py +++ b/hgsubversion/wrappers.py @@ -439,9 +439,7 @@ def clone(orig, ui, source, dest=None, **opts): data['branches'] = branches ui.setconfig('hgsubversion', 'branch', branches[-1]) - # NOTE: this breaks on Mercurial 1.6, where passing a repository - # object to hg.clone() will abort. Mercurial 1.6.1 fixed it. - data['srcrepo'], data['dstrepo'] = orig(ui, srcrepo, dest, **opts) + data['srcrepo'], data['dstrepo'] = orig(ui, origsource, dest, **opts) for opt, (section, name) in optionmap.iteritems(): if opt in opts and opts[opt]: