Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py

branch
5_4_x
changeset 3561
1a14a490c0a2
parent 3160
209a07d7e401
diff -r 13324c5b2353 -r 1a14a490c0a2 Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py	Sun May 11 13:02:40 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py	Mon May 12 17:50:17 2014 +0200
@@ -208,13 +208,18 @@
         @param name name of the bookmark (string)
         """
         itm = QTreeWidgetItem(self.bookmarksList)
-        itm.setData(0, Qt.DisplayRole, int(revision))
-        itm.setData(1, Qt.DisplayRole, changeset)
-        itm.setData(2, Qt.DisplayRole, status)
-        itm.setData(3, Qt.DisplayRole, name)
-        itm.setTextAlignment(0, Qt.AlignRight)
-        itm.setTextAlignment(1, Qt.AlignRight)
-        itm.setTextAlignment(2, Qt.AlignHCenter)
+        if revision[0].isdecimal():
+            # valid bookmark entry
+            itm.setData(0, Qt.DisplayRole, int(revision))
+            itm.setData(1, Qt.DisplayRole, changeset)
+            itm.setData(2, Qt.DisplayRole, status)
+            itm.setData(3, Qt.DisplayRole, name)
+            itm.setTextAlignment(0, Qt.AlignRight)
+            itm.setTextAlignment(1, Qt.AlignRight)
+            itm.setTextAlignment(2, Qt.AlignHCenter)
+        else:
+            # error message
+            itm.setData(0, Qt.DisplayRole, revision)
     
     def __readStdout(self):
         """

eric ide

mercurial