diff -r 4080395e3426 -r eabefe4e41a4 Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
--- 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')\
