##// END OF EJS Templates
Use lower level API from mercurial when doing a pull
marcink -
r3877:5070c840 beta
parent child Browse files
Show More
@@ -33,7 +33,7 b' from rhodecode.lib.vcs.utils.paths impor'
33 from rhodecode.lib.vcs.utils.hgcompat import (
33 from rhodecode.lib.vcs.utils.hgcompat import (
34 ui, nullid, match, patch, diffopts, clone, get_contact, pull,
34 ui, nullid, match, patch, diffopts, clone, get_contact, pull,
35 localrepository, RepoLookupError, Abort, RepoError, hex, scmutil, hg_url,
35 localrepository, RepoLookupError, Abort, RepoError, hex, scmutil, hg_url,
36 httpbasicauthhandler, httpdigestauthhandler
36 httpbasicauthhandler, httpdigestauthhandler, peer
37 )
37 )
38
38
39 from .changeset import MercurialChangeset
39 from .changeset import MercurialChangeset
@@ -515,7 +515,8 b' class MercurialRepository(BaseRepository'
515 """
515 """
516 url = self._get_url(url)
516 url = self._get_url(url)
517 try:
517 try:
518 pull(self.baseui, self._repo, url)
518 other = peer(self._repo, {}, url)
519 self._repo.pull(other, heads=None, force=None)
519 except Abort, err:
520 except Abort, err:
520 # Propagate error but with vcs's type
521 # Propagate error but with vcs's type
521 raise RepositoryError(str(err))
522 raise RepositoryError(str(err))
@@ -16,6 +16,7 b' from mercurial import discovery'
16 from mercurial import localrepo
16 from mercurial import localrepo
17 from mercurial import scmutil
17 from mercurial import scmutil
18 from mercurial.discovery import findcommonoutgoing
18 from mercurial.discovery import findcommonoutgoing
19 from mercurial.hg import peer
19
20
20 from mercurial.util import url as hg_url
21 from mercurial.util import url as hg_url
21
22
General Comments 0
You need to be logged in to leave comments. Login now