kallithea Changeset - 5070c840dc23

Changeset - 5070c840dc23

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 12 years ago 2013-05-20 02:24:16
marcin@python-works.com

Use lower level API from mercurial when doing a pull

2 files changed with 4 insertions and 2 deletions:

rhodecode/lib/vcs/backends/hg/repository.py

rhodecode/lib/vcs/utils/hgcompat.py

0 comments (0 inline, 0 general)

rhodecode/lib/vcs/backends/hg/repository.py

➞

Show inline comments

@@ @@ -30,13 +30,13 @@ from rhodecode.lib.vcs.utils import ( @@
 from rhodecode.lib.vcs.utils.lazy import LazyProperty
 from rhodecode.lib.vcs.utils.ordered_dict import OrderedDict
 from rhodecode.lib.vcs.utils.paths import abspath
 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
 from .inmemory import MercurialInMemoryChangeset
 from .workdir import MercurialWorkdir
@@ @@ -512,13 +512,14 @@ class MercurialRepository(BaseRepository @@
     def pull(self, url):
         """
         Tries to pull changes from external location.
         """
         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))
     @LazyProperty
     def workdir(self):

rhodecode/lib/vcs/utils/hgcompat.py

➞

Show inline comments

@@ @@ -13,12 +13,13 @@ from mercurial.mdiff import diffopts @@
 from mercurial.node import hex
 from mercurial.encoding import tolocal
 from mercurial import discovery
 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
 # those authnadlers are patched for python 2.6.5 bug an
 # infinit looping when given invalid resources
 from mercurial.url import httpbasicauthhandler, httpdigestauthhandler

0 comments (0 inline, 0 general)