Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

branch
5_5_x
changeset 3717
7e3c0ffa307d
parent 3591
2f2a4a76dd22
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sun Jul 20 13:05:58 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)

eric ide

mercurial