Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Sun Apr 13 15:45:57 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Tue Apr 15 22:41:08 2014 +0200
@@ -14,6 +14,7 @@
     pass
 
 import os
+import re
 
 from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, Qt, QCoreApplication
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, QLineEdit, \
@@ -46,6 +47,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 = Preferences.getEditorOtherFonts("MonospacedFont")
@@ -238,8 +242,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):
         """