diff -r 2bf0226c7501 -r 741ab2eecaf9 Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Wed Apr 02 19:01:16 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Wed Apr 02 19:08:31 2014 +0200
@@ -8,6 +8,7 @@
"""
import os
+import re
from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, Qt, QCoreApplication
from PyQt4.QtGui import QDialog, QDialogButtonBox, QFont, QHeaderView, \
@@ -41,6 +42,9 @@
self.vcs = vcs
self.__hgClient = vcs.getClient()
+ self.__annotateRe = re.compile(
+ r"""(.+)\s+(\d+)\s+([0-9a-fA-F]+)\s+([0-9-]+)\s+(.+)""")
+
self.annotateList.headerItem().setText(
self.annotateList.columnCount(), "")
font = QFont(self.annotateList.font())
@@ -240,8 +244,10 @@
except ValueError:
info = line[:-2]
text = ""
- author, rev, changeset, date, file = info.split()
- self.__generateItem(rev, changeset, author, date, text)
+ match = self.__annotateRe.match(info)
+ author, rev, changeset, date, file = match.groups()
+ self.__generateItem(rev.strip(), changeset.strip(), author.strip(),
+ date.strip(), text)
def __readStderr(self):
"""
