Mercurial Repositories > eric / changeset

--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sun Jul 20 13:08:49 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sun Jul 20 16:27:59 2014 +0200
@@ -739,15 +739,21 @@
             args.append('--follow')
         if self.commandMode == "log":
             args.append('--copies')
-        args.append('--style')
-        if self.vcs.version >= (2, 1):
+        if self.vcs.version >= (3, 0):
+            args.append('--template')
             args.append(os.path.join(os.path.dirname(__file__),
-                                     "styles",
-                                     "logBrowserBookmarkPhase.style"))
+                                     "templates",
+                                     "logBrowserBookmarkPhase.tmpl"))
         else:
-            args.append(os.path.join(os.path.dirname(__file__),
-                                     "styles",
-                                     "logBrowserBookmark.style"))
+            args.append('--style')
+            if self.vcs.version >= (2, 1):
+                args.append(os.path.join(os.path.dirname(__file__),
+                                         "styles",
+                                         "logBrowserBookmarkPhase.style"))
+            else:
+                args.append(os.path.join(os.path.dirname(__file__),
+                                         "styles",
+                                         "logBrowserBookmark.style"))
         if self.commandMode == "incoming":
             if self.__bundle:
                 args.append(self.__bundle)

--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sun Jul 20 13:08:49 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sun Jul 20 16:27:59 2014 +0200
@@ -140,13 +140,21 @@
                 args.append("--subrepos")
         if self.mode == "log":
             args.append('--copies')
-        args.append('--style')
-        if self.vcs.version >= (2, 1):
+        if self.vcs.version >= (3, 0):
+            args.append('--template')
             args.append(os.path.join(os.path.dirname(__file__),
-                                     "styles", "logDialogBookmarkPhase.style"))
+                                     "templates",
+                                     "logDialogBookmarkPhase.tmpl"))
         else:
-            args.append(os.path.join(os.path.dirname(__file__),
-                                     "styles", "logDialogBookmark.style"))
+            args.append('--style')
+            if self.vcs.version >= (2, 1):
+                args.append(os.path.join(os.path.dirname(__file__),
+                                         "styles",
+                                         "logDialogBookmarkPhase.style"))
+            else:
+                args.append(os.path.join(os.path.dirname(__file__),
+                                         "styles",
+                                         "logDialogBookmark.style"))
         if self.mode == "incoming":
             if self.bundle:
                 args.append(self.bundle)
@@ -345,7 +353,7 @@
                 html += self.tr("Phase: {0}<br />\n")\
                     .format(entry["phase"])
             
-            html += self.tr("Branches: {0}<br />\n")\
+            html += self.tr("Branch: {0}<br />\n")\
                 .format(entry["branches"])
             
             html += self.tr("Tags: {0}<br />\n").format(entry["tags"])
@@ -358,7 +366,7 @@
                 .format(entry["parents"])
             
             html += self.tr('<i>Author: {0}</i><br />\n')\
-                .format(entry["user"])
+                .format(Utilities.html_encode(entry["user"]))
             
             date, time = entry["date"].split()[:2]
             html += self.tr('<i>Date: {0}, {1}</i><br />\n')\

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Plugins/VcsPlugins/vcsMercurial/templates/logBrowserBookmarkPhase.tmpl	Sun Jul 20 16:27:59 2014 +0200
@@ -0,0 +1,14 @@
+change|{rev}:{node|short}
+user|{author|email}
+parents|{parents}
+date|{date|isodate}
+description|{desc}
+file_copies|{join(file_copies,', ')}
+file_adds|{join(file_adds,', ')}
+files_mods|{join(file_mods,', ')}
+file_dels|{join(file_dels,', ')}
+branches|{branch}
+tags|{join(tags,', ')}
+bookmarks|{join(bookmarks,', ')}
+phase|{phase}
+@@@

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Plugins/VcsPlugins/vcsMercurial/templates/logDialogBookmarkPhase.tmpl	Sun Jul 20 16:27:59 2014 +0200
@@ -0,0 +1,14 @@
+change|{rev}:{node|short}
+branches|{branch}
+tags|{join(tags,', ')}
+parents|{parents}
+user|{author}
+date|{date|isodate}
+description|{desc}
+file_copies|{join(file_copies,', ')}
+file_adds|{join(file_adds,', ')}
+files_mods|{join(file_mods,', ')}
+file_dels|{join(file_dels,', ')}
+bookmarks|{join(bookmarks,', ')}
+phase|{phase}
+@@@

--- a/eric6.e4p	Sun Jul 20 13:08:49 2014 +0200
+++ b/eric6.e4p	Sun Jul 20 16:27:59 2014 +0200
@@ -1623,6 +1623,8 @@
     <Other>Documentation/Source</Other>
     <Other>APIs/Python3/PyQt5.bas</Other>
     <Other>APIs/Python3/PyQt4.bas</Other>
+    <Other>Plugins/VcsPlugins/vcsMercurial/templates/logBrowserBookmarkPhase.tmpl</Other>
+    <Other>Plugins/VcsPlugins/vcsMercurial/templates/logDialogBookmarkPhase.tmpl</Other>
   </Others>
   <MainScript>eric6.py</MainScript>
   <Vcs>