kallithea Changeset - 5f1af779bddf

Changeset - 5f1af779bddf

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 8 years ago 2017-09-14 02:08:06
mads@kiilerich.com

hg: prepare for Mercurial 4.2 or later where tagging moved from localrepo to the tags module

2 files changed with 12 insertions and 4 deletions:

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

kallithea/lib/vcs/utils/hgcompat.py

0 comments (0 inline, 0 general)

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

➞

Show inline comments

@@ @@ -28,13 +28,13 @@ from kallithea.lib.vcs.utils import ( @@
 from kallithea.lib.vcs.utils.lazy import LazyProperty
 from kallithea.lib.vcs.utils.ordered_dict import OrderedDict
 from kallithea.lib.vcs.utils.paths import abspath
 from kallithea.lib.vcs.utils.hgcompat import (
     ui, nullid, match, patch, diffopts, clone, get_contact,
     localrepository, RepoLookupError, Abort, RepoError, hex, scmutil, hg_url,
     httpbasicauthhandler, httpdigestauthhandler, peer, httppeer, sshpeer
+    httpbasicauthhandler, httpdigestauthhandler, peer, httppeer, sshpeer, tag
+)
 from .changeset import MercurialChangeset
 from .inmemory import MercurialInMemoryChangeset
 from .workdir import MercurialWorkdir
@@ @@ -172,14 +172,13 @@ class MercurialRepository(BaseRepository @@
                 changeset.short_id)
         if date is None:
             date = datetime.datetime.now().strftime('%a, %d %b %Y %H:%M:%S')
         try:
             self._repo.tag(name, changeset._ctx.node(), message, local, user,
                 date)
             tag(self._repo, name, changeset._ctx.node(), message, local, user, date)
         except Abort as e:
             raise RepositoryError(e.message)
         # Reinitialize tags
         self.tags = self._get_tags()
         tag_id = self.tags[name]
@@ @@ -203,13 +202,13 @@ class MercurialRepository(BaseRepository @@
             message = "Removed tag %s" % name
         if date is None:
             date = datetime.datetime.now().strftime('%a, %d %b %Y %H:%M:%S')
         local = False
         try:
-            self._repo.tag(name, nullid, message, local, user, date)
+            tag(self._repo, name, nullid, message, local, user, date)
             self.tags = self._get_tags()
         except Abort as e:
             raise RepositoryError(e.message)
     @LazyProperty
     def bookmarks(self):

kallithea/lib/vcs/utils/hgcompat.py

➞

Show inline comments

@@ @@ -9,12 +9,13 @@ mercurial.demandimport.enable = lambda * @@
 from mercurial import archival, merge as hg_merge, patch, ui
 from mercurial import discovery
 from mercurial import localrepo
 from mercurial import unionrepo
 from mercurial import scmutil
 from mercurial import config
 from mercurial import tags as tagsmod
 from mercurial.commands import clone, nullid, pull
 from mercurial.context import memctx, memfilectx
 from mercurial.error import RepoError, RepoLookupError, Abort
 from mercurial.hgweb import hgweb_mod
 from mercurial.hgweb.common import get_contact
 from mercurial.localrepo import localrepository
@@ @@ -44,6 +45,14 @@ if inspect.getargspec(memfilectx.__init_ @@
     memfilectx.__init__ = _memfilectx__init__
 # workaround for 3.3 94ac64bcf6fe and not calling largefiles reposetup correctly
 localrepository._lfstatuswriters = [lambda *msg, **opts: None]
 # 3.5 7699d3212994 added the invariant that repo.lfstatus must exist before hitting overridearchive
 localrepository.lfstatus = False
 # Mercurial 4.2 moved tag from localrepo to the tags module
 def tag(repo, *args):
     try:
         tag_f  = tagsmod.tag
     except AttributeError:
         return repo.tag(*args)
     tag_f(repo, *args)

0 comments (0 inline, 0 general)