Merge backout of f9733bec1b30.

This commit is contained in:
Augie Fackler 2011-01-16 22:50:51 -06:00
commit 82438b9e5f

View File

@ -439,9 +439,7 @@ def clone(orig, ui, source, dest=None, **opts):
data['branches'] = branches data['branches'] = branches
ui.setconfig('hgsubversion', 'branch', branches[-1]) ui.setconfig('hgsubversion', 'branch', branches[-1])
# NOTE: this breaks on Mercurial 1.6, where passing a repository data['srcrepo'], data['dstrepo'] = orig(ui, origsource, dest, **opts)
# object to hg.clone() will abort. Mercurial 1.6.1 fixed it.
data['srcrepo'], data['dstrepo'] = orig(ui, srcrepo, dest, **opts)
for opt, (section, name) in optionmap.iteritems(): for opt, (section, name) in optionmap.iteritems():
if opt in opts and opts[opt]: if opt in opts and opts[opt]: