Changeset 197 in tracdarcs

Timestamp:

07/29/10 19:27:16 (3 years ago)

Author:

lele@…

Hash name:

20100729172716-7a6fb-eb85926b77037d31a97317f23f659b72cd9606f1

Message:

Corrected the generation of equivalent changesets property

Location:

tracdarcs

Files:

• components.py (modified) (1 diff)
• repository.py (modified) (1 diff)

tracdarcs/components.py

@@ -229 +229 @@
     def render_property(self, name, mode, context, props):
         eqcsets = props[name]
-        eqlinks = [tag.a(repos or '(default)', class_="changeset",
+        eqlinks = [(tag.a(repos or '(default)', class_="changeset",
                          title="Equivalent patch %s in repository %s" % (
                              rev, repos or '(default)'),
-                         href=context.href.changeset(rev, repos))
+                         href=context.href.changeset(rev, repos)),)
                    for repos, rev in eqcsets]
         return RenderedProperty(name='Present in:',
                                 name_attributes=[("class", "property")],
-                                content=tag([eqlinks]))
+                                content=tag([(link, ', ') for link in eqlinks[:-1]],
+                                            eqlinks[-1]))

tracdarcs/repository.py

@@ -622 +622 @@
         props = dict(Hashname=self.__hash)
 
-        c = self.repos.db.cursor()
-        c.execute('SELECT dcs.repo_id, dcs.rev '
-                  'FROM darcs_changesets dcs, darcs_changesets dcs2 '
+        # 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', (self.repos.id, self.rev))
+                  '  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))
         eqcsets = [(repo, rev) for repo,rev in c.fetchall()]
         if eqcsets: