Changeset 199 in tracdarcs

Timestamp:

07/30/10 14:08:49 (22 months ago)

Author:

lele@…

Hash name:

20100730120849-7a6fb-6b7c92483ad8f00bbd506a3b70615b4d20432992

Message:

Added a way to group together different repositories, for the "MissingIn?" attribute on changesets

Files:

• README.rst (modified) (1 diff)
• tracdarcs/components.py (modified) (4 diffs)
• tracdarcs/repository.py (modified) (1 diff)

README.rst

@@ -110 +110 @@
 __ http://trac.edgewall.org/wiki/0.12/TracRepositoryAdmin#ExplicitSync
 __ http://darcs.net/manual/node7.html#SECTION00712000000000000000
+
+Related repositories
+--------------------
+
+When you manage multiple branches of the same darcs repository, you
+may find useful to inform trac+darcs about that, so that it will show
+additional properties on each changeset:
+
+* a list of other "instances" of the same patch, that is when the
+  changeset is present in other related repositories,
+
+* a list of related repositories where the changeset is *not* present.
+
+To do that, you simply group together the related repositories giving
+them a common ``identity``, an arbitrary string.
+
+You can see current identity of a repository with::
+
+  $ trac-admin . repository identity master
+  No identity set on repository master
+
+and you can set it with::
+
+  $ trac-admin . repository identity master ProjectFoo
+  Identity of repository master set to ProjectFoo
+
+You can adjust it with::
+
+  $ trac-admin . repository identity master ProjectBar
+  Identity of repository master set to ProjectBar (was ProjectFoo)
+
+or remove it::
+
+  $ trac-admin . repository identity master ""
+  Identity removed from repository oldgam

tracdarcs/components.py

@@ -16 +16 @@
 from genshi.builder import tag
 
+from trac.admin import IAdminCommandProvider
 from trac.config import BoolOption, Option
 from trac.core import Component, implements
 from trac.db import Column, DatabaseManager, Index, Table
 from trac.env import IEnvironmentSetupParticipant
-from trac.util.text import shorten_line, to_unicode
-from trac.versioncontrol import IRepositoryConnector, NoSuchChangeset
+from trac.util.text import printout, shorten_line, to_unicode
+from trac.versioncontrol import IRepositoryConnector, NoSuchChangeset, \
+                                RepositoryManager
 from trac.versioncontrol.web_ui import IPropertyRenderer, RenderedProperty
 
@@ -131 +133 @@
     """
 
-    implements(IEnvironmentSetupParticipant)
+    implements(IAdminCommandProvider, IEnvironmentSetupParticipant)
 
     def environment_created(self):
@@ -221 +223 @@
                 c.execute(stmt)
 
+    # IAdminCommandProvider methods
+
+    def get_admin_commands(self):
+        yield ('repository identity', '<repos> [identity]',
+               'Get or set the identity tag of a repository',
+               self._complete_repos, self._do_repository_identity)
+
+    def _get_reponames(self):
+        rm = RepositoryManager(self.env)
+        return [reponame or '(default)' for reponame
+                in rm.get_all_repositories()]
+
+    def _complete_repos(self, args):
+        if len(args) == 1:
+            return self._get_reponames()
+
+    def _do_repository_identity(self, reponame, identity=None):
+        rm = RepositoryManager(self.env)
+        repo = rm.get_repository(reponame)
+        if repo is None:
+            printout("Invalid repository!")
+            return
+
+        repoid = repo.id
+
+        db = self.env.get_db_cnx()
+        cursor = db.cursor()
+
+        cursor.execute("SELECT value FROM repository "
+                       "WHERE id=%s AND name='identity'", (repoid,))
+        row = cursor.fetchone()
+
+        if identity is None:
+            if row is not None:
+                printout("Identity of repository %s: %s" %
+                         (reponame, row[0]))
+            else:
+                printout("No identity set on repository %s" %
+                         reponame)
+        else:
+            @self.env.with_transaction()
+            def set_identity(db):
+                if row is None and identity:
+                    cursor.execute("INSERT INTO repository (id, name, value) "
+                                   "VALUES (%s, 'identity', %s)", (repoid, identity))
+                    printout("Identity of repository %s set to %s" %
+                             (reponame, identity))
+                elif not identity:
+                    if row is not None:
+                        cursor.execute("DELETE FROM repository "
+                                       "WHERE id=%s AND name='identity'", (repoid,))
+                    printout("Identity removed from repository %s" %
+                             reponame)
+                elif identity != row[0]:
+                    cursor.execute("UPDATE repository SET value=%s "
+                                   "WHERE id=%s AND name='identity'",
+                                   (identity, repoid))
+                    printout("Identity of repository %s set to %s "
+                             "(was %s)" % (reponame, identity, row[0]))
+                else:
+                    printout("Identity of repository %s is already set to %s"
+                             % (reponame, identity))
+
 class EquivalentChangesetsRenderer(Component):
     implements(IPropertyRenderer)
 
     def match_property(self, name, mode):
-        return (mode == 'revprop' and name == 'EqChangesets') and 5 or 0
+        return (mode == 'revprop' and name == 'PresentIn') and 5 or 0
 
     def render_property(self, name, mode, context, props):
@@ -238 +303 @@
                                 content=tag([(link, ', ') for link in eqlinks[:-1]],
                                             eqlinks[-1]))
+
+class MissingInReposRenderer(Component):
+    implements(IPropertyRenderer)
+
+    def match_property(self, name, mode):
+        return (mode == 'revprop' and name == 'MissingIn') and 5 or 0
+
+    def render_property(self, name, mode, context, props):
+        mir = props[name]
+        return RenderedProperty(name='Missing in:',
+                                name_attributes=[("class", "property")],
+                                content=tag([(repo, ', ') for repo in mir[:-1]],
+                                            mir[-1]))

tracdarcs/repository.py

@@ -617 +617 @@
         props = dict(Hashname=self.__hash)
 
+        # See if there are any "related repository", with a common "identity"
+        # property.
+
+        c = self.repos.db.cursor()
+        c.execute("SELECT rep2.id "
+                  "FROM repository rep, repository rep2 "
+                  "WHERE rep.id=%s"
+                  "  AND rep.name='identity'"
+                  "  AND rep2.id<>rep.id"
+                  "  AND rep2.name='identity'"
+                  "  AND rep2.value=rep.value", (self.repos.id,))
+        other_rids = [r[0] for r in c.fetchall()]
+
+        if not other_rids:
+            return props
+
         # Compute a list of "equivalent changesets", when the same
-        # changeset is present in other repositories.
-
-        c = self.repos.db.cursor()
-        c.execute('SELECT rep.value, dcs.rev '
-                  'FROM darcs_changesets dcs, darcs_changesets dcs2, repository rep '
-                  'WHERE dcs2.repo_id = %s AND dcs2.rev = %s '
-                  '  AND dcs.hash = dcs2.hash '
-                  '  AND dcs.repo_id <> dcs2.repo_id'
-                  '  AND rep.id = dcs.repo_id AND rep.name = \'name\''
-                  'ORDER BY rep.value', (self.repos.id, self.rev))
+        # changeset is present in other related repositories.
+
+        other_rids = ','.join(str(rid) for rid in other_rids),
+
+        c.execute("SELECT rep.value, dcs.rev "
+                  "FROM darcs_changesets dcs, repository rep "
+                  "WHERE dcs.hash = %%s"
+                  "  AND dcs.repo_id IN (%s)"
+                  "  AND rep.id = dcs.repo_id AND rep.name = 'name'"
+                  "ORDER BY rep.value" % other_rids,
+                  (self.__hash,))
         eqcsets = [(repo, rev) for repo,rev in c.fetchall()]
-        if eqcsets:
-            props['EqChangesets'] = eqcsets
+        props['PresentIn'] = eqcsets
+
+        # Compute the opposite list, that is the repositories where
+        # the changeset is missing.
+
+        c.execute("SELECT rep.value "
+                  "FROM repository rep "
+                  "WHERE rep.name='name'"
+                  "  AND rep.id IN (%s)"
+                  "  AND NOT EXISTS ("
+                  "SELECT dcs.rev "
+                  "FROM darcs_changesets dcs "
+                  "WHERE dcs.repo_id=rep.id"
+                  "  AND dcs.hash=%%s) "
+                  "ORDER BY rep.value" % other_rids,
+                  (self.__hash,))
+        mir = [r[0] for r in c.fetchall()]
+        props['MissingIn'] = mir
 
         return props