Mercurial > hg > trac > jungle > src > mercurial-plugin

changeset 12:c77621b0f6bb 1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Hm, somehow picked the wrong base for 1.0 and also forgot to push my workaround for #10719...
author Christian Boos <cboos@edgewall.org>
date Mon, 17 Sep 2012 12:08:19 +0200
parents 28d2535d682f (current diff) a0a40cb30265 (diff)
children 62e59cafa3de
files
diffstat 3 files changed, 164 insertions(+), 135 deletions(-) [+]
line wrap: on
line diff
--- a/tracext/hg/backend.py	Tue Sep 11 14:53:59 2012 +0200
+++ b/tracext/hg/backend.py	Mon Sep 17 12:08:19 2012 +0200
@@ -175,7 +175,8 @@
 
     def match_property(self, name, mode):
         return (name.startswith('hg-') and
-                name[3:] in ('Parents', 'Children', 'Tags', 'Branch') and
+                name[3:] in ('Parents', 'Children', 'Tags', 'Branch',
+                             'Bookmarks') and
                 mode == 'revprop') and 4 or 0
     
     def render_property(self, name, mode, context, props):
@@ -1067,7 +1068,7 @@
         if self.str_path:
             pats.append('path:' + self.str_path)
         opts = {'rev': ['%s:0' % self.changectx.hex()]}
-        if self.isfile:
+        if self.isfile and self.repos.version_info < (2, 1, 1):
             opts['follow'] = True
         if arity(cmdutil.walkchangerevs) == 4:
             return self._get_history_1_4(repo, pats, opts, limit)
@@ -1191,7 +1192,8 @@
         Changeset.__init__(self, repos, ctx.hex(), desc, user, time)
 
     hg_properties = [
-        N_("Parents:"), N_("Children:"), N_("Branch:"), N_("Tags:")
+        N_("Parents:"), N_("Children:"), N_("Branch:"), N_("Tags:"),
+        N_("Bookmarks:")
     ]
 
     def get_properties(self):
@@ -1209,6 +1211,9 @@
         tags = self.get_tags()
         if len(tags):
             properties['hg-Tags'] = (self.repos, tags) 
+        bookmarks = self.ctx.bookmarks()
+        if len(bookmarks):
+            properties['hg-Bookmarks'] = (self.repos, bookmarks) 
         for k, v in self.ctx.extra().iteritems():
             if k != 'branch':
                 properties['hg-' + k] = (self.repos, v)
--- a/tracext/hg/locale/fr/LC_MESSAGES/tracmercurial.po	Tue Sep 11 14:53:59 2012 +0200
+++ b/tracext/hg/locale/fr/LC_MESSAGES/tracmercurial.po	Mon Sep 17 12:08:19 2012 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: TracMercurial 0.12.0.4\n"
 "Report-Msgid-Bugs-To: cboos@edgewall.org\n"
-"POT-Creation-Date: 2008-11-13 12:33+0100\n"
+"POT-Creation-Date: 2012-06-11 23:08+0200\n"
 "PO-Revision-Date: 2009-11-19 16:22+0100\n"
 "Last-Translator: Christian Boos <cboos@edgewall.org>\n"
 "Language-Team: fr_FR <LL@li.org>\n"
@@ -16,19 +16,19 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.4\n"
+"Generated-By: Babel 0.9.6dev-r0\n"
 
-#: tracext/hg/backend.py:99
+#: tracext/hg/backend.py:183
 msgid ":"
-msgstr ""
+msgstr " :"
 
-#: tracext/hg/backend.py:114
+#: tracext/hg/backend.py:205
 msgid "Diff against this parent (show the changes merged from the other parents)"
 msgstr ""
 "Différences vis-à-vis de ce parent (montre les changements apportés par "
 "l'autre parent)"
 
-#: tracext/hg/backend.py:124
+#: tracext/hg/backend.py:215
 #, python-format
 msgid ""
 "Note: this is a %(merge)s changeset, the changes displayed below "
@@ -37,7 +37,7 @@
 "Note: ceci est un changeset de type %(merge)s, les modifications ci-"
 "dessous correspondent au merge lui-même."
 
-#: tracext/hg/backend.py:132
+#: tracext/hg/backend.py:223
 #, python-format
 msgid ""
 "Use the %(diff)s links above to see all the changes relative to each "
@@ -46,37 +46,46 @@
 "Utilisez les liens %(diff)s ci-dessus pour voir les modifications "
 "relatives à chaque parent."
 
-#: tracext/hg/backend.py:155
+#: tracext/hg/backend.py:248
 msgid "no such changeset"
-msgstr "pas de révisio"
+msgstr "pas de révision"
+
+#: tracext/hg/backend.py:249
+msgid "Transplant:"
+msgstr "Transplant :"
 
-#: tracext/hg/backend.py:156
-msgid "Transplant:"
-msgstr ""
+#: tracext/hg/backend.py:264
+msgid "Changeset in source repository"
+msgstr "Modification dans le dépôt d'origine"
 
-#: tracext/hg/backend.py:173
+#: tracext/hg/backend.py:266
+msgid "Convert:"
+msgstr "Conversion :"
+
+#: tracext/hg/backend.py:291
 msgid "(binary, size greater than 100 bytes)"
 msgstr "(binaire, taille supérieure à 100 octets)"
 
-#: tracext/hg/backend.py:285
+#: tracext/hg/backend.py:452
 #, python-format
 msgid "Repository '%(repo)s' not found"
-msgstr "Dépôt '%(repo)s' non trouvé"
+msgstr "Dépôt « %(repo)s »' non trouvé"
 
-#: tracext/hg/backend.py:344
+#: tracext/hg/backend.py:518
 #, python-format
-msgid "%(path)s does not appear to contain a Mercurial repository."
-msgstr "%(path)s ne semble pas contenir un dépôt Mercurial"
+msgid "Repository path '%(path)s' does not exist."
+msgstr "Chemin du dépôt « %(path)s » inexistant."
 
-#: tracext/hg/backend.py:566
-msgid "The Base for Diff is invalid"
+#: tracext/hg/backend.py:526
+#, python-format
+msgid ""
+"'%(path)s' does not appear to contain a repository (Mercurial %(version)s"
+" says %(error)s)"
 msgstr ""
+"%(path)s ne semble pas contenir un dépôt Mercurial (Mercurial %(version)s"
+" reporte l'erreur suivante : %(error)s)"
 
-#: tracext/hg/backend.py:571
-msgid "The Target for Diff is invalid"
-msgstr ""
-
-#: tracext/hg/backend.py:575
+#: tracext/hg/backend.py:755
 #, python-format
 msgid ""
 "Diff mismatch: Base is a %(okind)s (%(opath)s in revision %(orev)s) and "
@@ -86,24 +95,28 @@
 "révision %(orev)s) et Destination est un %(nkind)s (%(npath)s dans la "
 "révision %(nrev)s)."
 
-#: tracext/hg/backend.py:719
+#: tracext/hg/backend.py:1017
 #, python-format
 msgid "Can't read from directory %(path)s"
 msgstr "Lecture du répertoire %(path)s impossible"
 
-#: tracext/hg/backend.py:892
+#: tracext/hg/backend.py:1195
 msgid "Parents:"
 msgstr "Ascendants :"
 
-#: tracext/hg/backend.py:892
+#: tracext/hg/backend.py:1195
 msgid "Children:"
 msgstr "Descendants :"
 
-#: tracext/hg/backend.py:892
+#: tracext/hg/backend.py:1195
 msgid "Branch:"
 msgstr "Branche :"
 
-#: tracext/hg/backend.py:892
+#: tracext/hg/backend.py:1195
 msgid "Tags:"
 msgstr "Tags :"
 
+#: tracext/hg/backend.py:1196
+msgid "Bookmarks:"
+msgstr "Signets :"
+
--- a/tracext/hg/locale/messages.pot	Tue Sep 11 14:53:59 2012 +0200
+++ b/tracext/hg/locale/messages.pot	Mon Sep 17 12:08:19 2012 +0200
@@ -1,102 +1,113 @@
-# Translations template for TracMercurial.
-# Copyright (C) 2009 ORGANIZATION
-# This file is distributed under the same license as the TracMercurial
-# project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: TracMercurial 0.12.0.9\n"
-"Report-Msgid-Bugs-To: cboos@edgewall.org\n"
-"POT-Creation-Date: 2009-11-19 16:21+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.4\n"
-
-#: tracext/hg/backend.py:99
-msgid ":"
-msgstr ""
-
-#: tracext/hg/backend.py:114
-msgid ""
-"Diff against this parent (show the changes merged from the other "
-"parents)"
-msgstr ""
-
-#: tracext/hg/backend.py:124
-#, python-format
-msgid ""
-"Note: this is a %(merge)s changeset, the changes displayed below "
-"correspond to the merge itself."
-msgstr ""
-
-#: tracext/hg/backend.py:132
-#, python-format
-msgid ""
-"Use the %(diff)s links above to see all the changes relative to each "
-"parent."
-msgstr ""
-
-#: tracext/hg/backend.py:155
-msgid "no such changeset"
-msgstr ""
-
-#: tracext/hg/backend.py:156
-msgid "Transplant:"
-msgstr ""
-
-#: tracext/hg/backend.py:173
-msgid "(binary, size greater than 100 bytes)"
-msgstr ""
-
-#: tracext/hg/backend.py:285
-#, python-format
-msgid "Repository '%(repo)s' not found"
-msgstr ""
-
-#: tracext/hg/backend.py:344
-#, python-format
-msgid "%(path)s does not appear to contain a Mercurial repository."
-msgstr ""
-
-#: tracext/hg/backend.py:566
-msgid "The Base for Diff is invalid"
-msgstr ""
-
-#: tracext/hg/backend.py:571
-msgid "The Target for Diff is invalid"
-msgstr ""
-
-#: tracext/hg/backend.py:575
-#, python-format
-msgid ""
-"Diff mismatch: Base is a %(okind)s (%(opath)s in revision %(orev)s) "
-"and Target is a %(nkind)s (%(npath)s in revision %(nrev)s)."
-msgstr ""
-
-#: tracext/hg/backend.py:719
-#, python-format
-msgid "Can't read from directory %(path)s"
-msgstr ""
-
-#: tracext/hg/backend.py:892
-msgid "Parents:"
-msgstr ""
-
-#: tracext/hg/backend.py:892
-msgid "Children:"
-msgstr ""
-
-#: tracext/hg/backend.py:892
-msgid "Branch:"
-msgstr ""
-
-#: tracext/hg/backend.py:892
-msgid "Tags:"
-msgstr ""
-
+# Translations template for TracMercurial.
+# Copyright (C) 2012 ORGANIZATION
+# This file is distributed under the same license as the TracMercurial
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: TracMercurial 0.13.0.5\n"
+"Report-Msgid-Bugs-To: cboos@edgewall.org\n"
+"POT-Creation-Date: 2012-06-11 23:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6dev-r0\n"
+
+#: tracext/hg/backend.py:183
+msgid ":"
+msgstr ""
+
+#: tracext/hg/backend.py:205
+msgid ""
+"Diff against this parent (show the changes merged from the other "
+"parents)"
+msgstr ""
+
+#: tracext/hg/backend.py:215
+#, python-format
+msgid ""
+"Note: this is a %(merge)s changeset, the changes displayed below "
+"correspond to the merge itself."
+msgstr ""
+
+#: tracext/hg/backend.py:223
+#, python-format
+msgid ""
+"Use the %(diff)s links above to see all the changes relative to each "
+"parent."
+msgstr ""
+
+#: tracext/hg/backend.py:248
+msgid "no such changeset"
+msgstr ""
+
+#: tracext/hg/backend.py:249
+msgid "Transplant:"
+msgstr ""
+
+#: tracext/hg/backend.py:264
+msgid "Changeset in source repository"
+msgstr ""
+
+#: tracext/hg/backend.py:266
+msgid "Convert:"
+msgstr ""
+
+#: tracext/hg/backend.py:291
+msgid "(binary, size greater than 100 bytes)"
+msgstr ""
+
+#: tracext/hg/backend.py:452
+#, python-format
+msgid "Repository '%(repo)s' not found"
+msgstr ""
+
+#: tracext/hg/backend.py:518
+#, python-format
+msgid "Repository path '%(path)s' does not exist."
+msgstr ""
+
+#: tracext/hg/backend.py:526
+#, python-format
+msgid ""
+"'%(path)s' does not appear to contain a repository (Mercurial "
+"%(version)s says %(error)s)"
+msgstr ""
+
+#: tracext/hg/backend.py:755
+#, python-format
+msgid ""
+"Diff mismatch: Base is a %(okind)s (%(opath)s in revision %(orev)s) "
+"and Target is a %(nkind)s (%(npath)s in revision %(nrev)s)."
+msgstr ""
+
+#: tracext/hg/backend.py:1017
+#, python-format
+msgid "Can't read from directory %(path)s"
+msgstr ""
+
+#: tracext/hg/backend.py:1195
+msgid "Parents:"
+msgstr ""
+
+#: tracext/hg/backend.py:1195
+msgid "Children:"
+msgstr ""
+
+#: tracext/hg/backend.py:1195
+msgid "Branch:"
+msgstr ""
+
+#: tracext/hg/backend.py:1195
+msgid "Tags:"
+msgstr ""
+
+#: tracext/hg/backend.py:1196
+msgid "Bookmarks:"
+msgstr ""
+