Mercurial > kallithea
changeset 3877:5070c840dc23 beta
Use lower level API from mercurial when doing a pull
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 20 May 2013 02:24:16 +0200 |
| parents | c5dd289ca96e |
| children | 7d29355db6f4 |
| files | rhodecode/lib/vcs/backends/hg/repository.py rhodecode/lib/vcs/utils/hgcompat.py |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/vcs/backends/hg/repository.py Sun May 19 20:55:40 2013 +0200 +++ b/rhodecode/lib/vcs/backends/hg/repository.py Mon May 20 02:24:16 2013 +0200 @@ -33,7 +33,7 @@ from rhodecode.lib.vcs.utils.hgcompat import ( ui, nullid, match, patch, diffopts, clone, get_contact, pull, localrepository, RepoLookupError, Abort, RepoError, hex, scmutil, hg_url, - httpbasicauthhandler, httpdigestauthhandler + httpbasicauthhandler, httpdigestauthhandler, peer ) from .changeset import MercurialChangeset @@ -515,7 +515,8 @@ """ url = self._get_url(url) try: - pull(self.baseui, self._repo, url) + other = peer(self._repo, {}, url) + self._repo.pull(other, heads=None, force=None) except Abort, err: # Propagate error but with vcs's type raise RepositoryError(str(err))
--- a/rhodecode/lib/vcs/utils/hgcompat.py Sun May 19 20:55:40 2013 +0200 +++ b/rhodecode/lib/vcs/utils/hgcompat.py Mon May 20 02:24:16 2013 +0200 @@ -16,6 +16,7 @@ from mercurial import localrepo from mercurial import scmutil from mercurial.discovery import findcommonoutgoing +from mercurial.hg import peer from mercurial.util import url as hg_url