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

@@ @@ -24,25 +24,25 @@ from rhodecode.lib.vcs.exceptions import @@
     BranchDoesNotExistError, ChangesetDoesNotExistError, EmptyRepositoryError,
     RepositoryError, VCSError, TagAlreadyExistError, TagDoesNotExistError
+)
 from rhodecode.lib.vcs.utils import (
     author_email, author_name, date_fromtimestamp, makedate, safe_unicode
+)
 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
 log = logging.getLogger(__name__)
 class MercurialRepository(BaseRepository):
     """
     Mercurial repository backend
@@ @@ -506,25 +506,26 @@ class MercurialRepository(BaseRepository @@
         revs = revisions[start_pos:end_pos]
         if reverse:
             revs = reversed(revs)
         return CollectionGenerator(self, revs)
     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):
         """
         Returns ``Workdir`` instance for this repository.
         """
         return MercurialWorkdir(self)
     def get_config_value(self, section, name=None, config_file=None):

rhodecode/lib/vcs/utils/hgcompat.py

➞

Show inline comments

@@ @@ -7,18 +7,19 @@ from mercurial.commands import clone, nu @@
 from mercurial.context import memctx, memfilectx
 from mercurial.error import RepoError, RepoLookupError, Abort
 from mercurial.hgweb.common import get_contact
 from mercurial.localrepo import localrepository
 from mercurial.match import match
 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)