Mercurial > hg
diff hgext/transplant.py @ 11301:3d0591a66118
move discovery methods from localrepo into new discovery module
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Mon, 07 Jun 2010 18:35:54 +0200 |
parents | 687c7d395f20 |
children | 40c06bbf58be |
line wrap: on
line diff
--- a/hgext/transplant.py Mon Jun 07 16:29:06 2010 +0200 +++ b/hgext/transplant.py Mon Jun 07 18:35:54 2010 +0200 @@ -16,7 +16,7 @@ from mercurial.i18n import _ import os, tempfile from mercurial import bundlerepo, changegroup, cmdutil, hg, merge, match -from mercurial import patch, revlog, util, error +from mercurial import patch, revlog, util, error, discovery class transplantentry(object): def __init__(self, lnode, rnode): @@ -472,7 +472,8 @@ def getremotechanges(repo, url): sourcerepo = ui.expandpath(url) source = hg.repository(ui, sourcerepo) - common, incoming, rheads = repo.findcommonincoming(source, force=True) + tmp = discovery.findcommonincoming(repo, source, force=True) + common, incoming, rheads = tmp if not incoming: return (source, None, None)