Changes in plugins/0.12/mercurial-plugin [9128:9953] in trac.svn

Location:

plugins/0.12/mercurial-plugin

Files:

• setup.py (modified) (3 diffs)
• tracext/hg/backend.py (modified) (23 diffs)
• tracext/hg/locale/fr (added)
• tracext/hg/locale/fr/LC_MESSAGES (added)
• tracext/hg/locale/fr/LC_MESSAGES/tracmercurial.po (added)
• tracext/hg/locale/fr_FR (deleted)

plugins/0.12/mercurial-plugin/setup.py

@@ -7 +7 @@
 try:
     import babel
+
     extra['message_extractors'] = {
         'tracext': [
@@ -12 +13 @@
         ],
     }
+
+    from trac.util.dist import get_l10n_cmdclass
+    extra['cmdclass'] = get_l10n_cmdclass()
+
 except ImportError:
     pass
@@ -18 +23 @@
 
 setup(name='TracMercurial',
-      install_requires='Trac >=0.12multirepos',
+      install_requires='Trac >=0.12dev-r9125',
       description='Mercurial plugin for Trac multirepos branch',
       keywords='trac scm plugin mercurial hg',
-      version='0.12.0.21',
+      version='0.12.0.23',
       url=TracMercurial,
       license='GPL',

plugins/0.12/mercurial-plugin/tracext/hg/backend.py

@@ -22 +22 @@
 from trac.core import *
 from trac.config import _TRUE_VALUES as TRUE
+from trac.env import ISystemInfoProvider
 from trac.util import arity
 from trac.util.datefmt import utc
 from trac.util.text import shorten_line, to_unicode
 from trac.versioncontrol.api import Changeset, Node, Repository, \
-                                    IRepositoryConnector, \
+                                    IRepositoryConnector, RepositoryManager, \
                                     NoSuchChangeset, NoSuchNode
 from trac.versioncontrol.web_ui import IPropertyRenderer, RenderedProperty
@@ -33 +34 @@
 try:
     from trac.util.translation import domain_functions
-    gettext, _, tag_, N_, add_domain = domain_functions('tracmercurial', 
-    'gettext', '_', 'tag_', 'N_', 'add_domain')
+    gettext, _, tag_, N_, add_domain = \
+             domain_functions('tracmercurial',
+                              ('gettext', '_', 'tag_', 'N_', 'add_domain'))
 except ImportError:
     from trac.util.translation import _, tag_, N_, gettext
@@ -103 +105 @@
     def _render_property(self, name, mode, context, props):
         repos, revs = props[name]
+        
+        if name in ('Parents', 'Children'):
+            label = repos.display_rev
+        else:
+            label = lambda rev: rev
+        
         def link(rev):
             chgset = repos.get_changeset(rev)
-            return tag.a(rev, class_="changeset",
+            return tag.a(label(rev), class_="changeset",
                          title=shorten_line(chgset.message),
                          href=context.href.changeset(rev, repos.reponame))
+        
         if name == 'Parents' and len(revs) == 2: # merge
             new = context.resource.id
@@ -135 +144 @@
                    link(revs[-1]))
 
+
 class HgExtPropertyRenderer(Component):
     implements(IPropertyRenderer)
 
     def match_property(self, name, mode):
-       return name in ('transplant_source') and \
+       return name in ('transplant_source', 'convert_revision') and \
                 mode == 'revprop' and 4 or 0
     
@@ -147 +157 @@
             try:
                 chgset = MercurialChangeset(repos, value)
-                link = tag.a(chgset.rev, class_="changeset",
+                link = tag.a(repos.display_rev(chgset.rev), class_="changeset",
                              title=shorten_line(chgset.message),
-                             href=context.href.changeset(short(value),
+                             href=context.href.changeset(hex(value),
                                                          repos.reponame))
             except LookupError:
@@ -156 +166 @@
             return RenderedProperty(name=_("Transplant:"), content=link,
                                     name_attributes=[("class", "property")])
+        
+        elif name == 'convert_revision':
+            text = value
+            if value.startswith('svn:'):
+                # svn:af82e41b-90c4-0310-8c96-b1721e28e2e2/trunk@9517
+                uuid = value[:40]
+                rev = value.rsplit('@', 1)[-1]
+                for r in RepositoryManager(self.env).get_real_repositories():
+                    if r.name.startswith(uuid + ':'):
+                        path = r.reponame
+                        href = context.href.changeset(rev, path or None)
+                        text = tag.a('[%s%s]' % (rev, path and '/' + path),
+                                     class_='changeset', href=href,
+                                     title=_('Changeset in source repository'))
+                        break
+            return RenderedProperty(name=_('Convert:'), content=text,
+                                    name_attributes=[("class", "property")])
+
 
 class HgDefaultPropertyRenderer(Component):
@@ -176 +204 @@
 class MercurialConnector(Component):
 
-    implements(IRepositoryConnector, IWikiSyntaxProvider)
+    implements(ISystemInfoProvider, IRepositoryConnector, IWikiSyntaxProvider)
 
     def __init__(self):
-        self._version = self._version_info = None
         self.ui = None
         locale_dir = pkg_resources.resource_filename(__name__, 'locale')
         add_domain(self.env.path, locale_dir)
-
-    def _setup_ui(self, hgrc_path):
-        self.ui = trac_ui(self.log)
-        # (code below adapted from mercurial.dispatch._dispatch)
-
-        # read the local repository .hgrc into a local ui object
-        if hgrc_path:
-            if not os.path.isabs(hgrc_path):
-                hgrc_path = os.path.join(self.env.path, 'conf', hgrc_path)
-            if not os.path.exists(hgrc_path):
-                self.log.warn("[hg] hgrc file (%s) doesn't exist.", hgrc_path) 
-            try:
-                self.ui = trac_ui(self.log, parentui=self.ui)
-                self.ui.check_trusted = False
-                self.ui.readconfig(hgrc_path)
-            except IOError, e:
-                self.log.warn("[hg] hgrc file (%s) can't be read: %s", 
-                              hgrc_path, e)
-
-        extensions.loadall(self.ui)
-        if hasattr(extensions, 'extensions'):
-            for name, module in extensions.extensions():
-                # setup extensions
-                extsetup = getattr(module, 'extsetup', None)
-                if extsetup:
-                    if arity(extsetup) == 1:
-                        extsetup(self.ui)
-                    else:
-                        extsetup()
-
-    def get_supported_types(self):
-        """Support for `repository_type = hg`"""
-        global hg_import_error
-        if hg_import_error:
-            self.error = hg_import_error
-            yield ("hg", -1)
-        else:
-            yield ("hg", 8)
-
-    def get_repository(self, type, dir, params):
-        """Return a `MercurialRepository`"""
-        if not self._version:
+        self._version = self._version_info = None
+        if not hg_import_error:
             try:
                 from mercurial.version import get_version
@@ -237 +224 @@
             if m:
                 self._version_info = tuple([int(n or 0) for n in m.groups()])
-            self.env.systeminfo.append(('Mercurial', self._version))
+
+    def _setup_ui(self, hgrc_path):
+        self.ui = trac_ui(log=self.log)
+        # (code below adapted from mercurial.dispatch._dispatch)
+
+        # read the local repository .hgrc into a local ui object
+        if hgrc_path:
+            if not os.path.isabs(hgrc_path):
+                hgrc_path = os.path.join(self.env.path, 'conf', hgrc_path)
+            if not os.path.exists(hgrc_path):
+                self.log.warn("[hg] hgrc file (%s) doesn't exist.", hgrc_path)
+            try:
+                self.ui = trac_ui(self.ui, log=self.log)
+                self.ui.check_trusted = False
+                self.ui.readconfig(hgrc_path)
+            except IOError, e:
+                self.log.warn("[hg] hgrc file (%s) can't be read: %s", 
+                              hgrc_path, e)
+
+        extensions.loadall(self.ui)
+        if hasattr(extensions, 'extensions'):
+            for name, module in extensions.extensions():
+                # setup extensions
+                extsetup = getattr(module, 'extsetup', None)
+                if extsetup:
+                    if arity(extsetup) == 1:
+                        extsetup(self.ui)
+                    else:
+                        extsetup()
+
+    # ISystemInfoProvider methods
+
+    def get_system_info(self):
+        if self._version is not None:
+            yield 'Mercurial', self._version
+
+    # IRepositoryConnector methods
+    
+    def get_supported_types(self):
+        """Support for `repository_type = hg`"""
+        if hg_import_error:
+            self.error = hg_import_error
+            yield ("hg", -1)
+        else:
+            yield ("hg", 8)
+
+    def get_repository(self, type, dir, params):
+        """Return a `MercurialRepository`"""
         options = {}
         for key, val in self.config.options(type):
@@ -247 +281 @@
         repos.version_info = self._version_info
         return repos
-
 
     # IWikiSyntaxProvider methods
@@ -293 +326 @@
         
 class trac_ui(ui):
-    def __init__(self, log, *args, **kwargs):
+    def __init__(self, *args, **kwargs):
         ui.__init__(self, *args)
         self.setconfig('ui', 'interactive', 'off')
-        self.log = log
+        self.log = kwargs.get('log', args and args[0].log or None)
         
-    def write(self, *args):
+    def write(self, *args, **opts):
         for a in args:
             self.log.info('(mercurial status) %s', a)
 
-    def write_err(self, *args):
+    def write_err(self, *args, **opts):
         for a in args:
             self.log.warn('(mercurial warning) %s', a)
 
-    def isatty(self): 
+    def plain(self):
+        return True
+
+    def interactive(self): 
         return False
 
@@ -394 +430 @@
 
     def normalize_path(self, path):
-        """Remove leading "/", except for the root"""
+        """Remove leading "/", except for the root."""
         return path and path.strip('/') or ''
 
     def normalize_rev(self, rev):
-        """Return the changelog node for the specified rev"""
+        """Return the full hash for the specified rev."""
         if rev is not None: 
             rev = str(rev) 
-        return self.hg_display(self.hg_node(rev)) 
+        return hex(self.hg_node(rev))
 
     def short_rev(self, rev):
@@ -416 +452 @@
                 return rev # it was already a short rev
         return self.repo.changelog.rev(self.hg_node(rev))
+
+    def display_rev(self, rev):
+        return self.hg_display(self.hg_node(rev))
 
     def get_quickjump_entries(self, rev):
@@ -519 +558 @@
 
     def get_oldest_rev(self):
-        return self.hg_display(nullid)
+        return hex(nullid)
 
     def get_youngest_rev(self):
-        return self.hg_display(self.repo.changelog.tip())
+        return hex(self.repo.changelog.tip())
 
     def previous_rev(self, rev, path=''): # FIXME: path ignored for now
@@ -529 +568 @@
         for p in log.parents(n):
             if p != nullid:
-                return self.hg_display(p) # always follow first parent
+                return hex(p) # always follow first parent
     
     def next_rev(self, rev, path=''):
@@ -537 +576 @@
             if fc: # it is a file
                 for child_fc in fc.children():
-                    return self.hg_display(child_fc.node())
+                    return hex(child_fc.node())
                 else:
                     return None
@@ -543 +582 @@
         log = self.repo.changelog
         for c in log.children(n):
-            return self.hg_display(c) # always follow first child
+            return hex(c) # always follow first child
     
     def rev_older_than(self, rev1, rev2):
@@ -699 +738 @@
                 node = log.tip()
             else:
-                raise NoSuchNode(path, self.repos.hg_display(self.n))
+                raise NoSuchNode(path, hex(self.n))
         self.time = self.repos.hg_time(log.read(node)[2])
-        rev = self.repos.hg_display(node)
+        rev = hex(node)
         Node.__init__(self, self.repos, path, rev, kind)
         self.created_path = path
@@ -795 +834 @@
                 count += 1
                 yield entry
-            entry = (path, self.repos.hg_display(ctx.node()), Changeset.EDIT)
+            entry = (path, hex(ctx.node()), Changeset.EDIT)
         if entry:
             if count < limit:
@@ -827 +866 @@
                     yield entry
                 n = repo.changelog.node(rev)
-                entry = (path, self.repos.hg_display(n), Changeset.EDIT)
+                entry = (path, hex(n), Changeset.EDIT)
         if entry:
             if count < limit:
@@ -879 +918 @@
             extra = log_data[5]
         time = repos.hg_time(timeinfo)
-        Changeset.__init__(self, repos, repos.hg_display(n), to_unicode(desc),
+        Changeset.__init__(self, repos, hex(n), to_unicode(desc),
                            to_unicode(user), time)
         self.repos = repos
@@ -885 +924 @@
         self.manifest_n = manifest
         self.files = files
-        self.parents = [repos.hg_display(p) for p in log.parents(n) \
-                        if p != nullid]
-        self.children = [repos.hg_display(c) for c in log.children(n)]
+        self.parents = [hex(p) for p in log.parents(n) if p != nullid]
+        self.children = [hex(c) for c in log.children(n)]
         self.tags = [t for t in repos.repo.nodetags(n)]
         self.branch = extra.pop("branch", None) 
@@ -953 +991 @@
                     base_path, base_filenode = rename_info
                     base_ctx = repo.filectx(base_path, fileid=base_filenode)
-                    base_rev = self.repos.hg_display(base_ctx.node())
+                    base_rev = hex(base_ctx.node())
                     if base_path in deletions:
                         action = Changeset.MOVE
@@ -972 +1010 @@
             yield change
 
+    def get_branches(self):
+        """Yield branch names to which this changeset belong."""
+        return self.branch and [(self.branch, len(self.children) == 0)] or []
+