src/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py

branch
eric7
changeset 9421
989ee2535d59
parent 9413
80c06d472826
child 9473
3f23dbf37dbe
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py	Tue Oct 18 17:48:03 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py	Wed Oct 19 13:39:16 2022 +0200
@@ -157,6 +157,7 @@
         self.__detailsTemplate = self.tr(
             "<table>"
             "<tr><td><b>Commit ID</b></td><td>{0}</td></tr>"
+            "<tr><td colspan='2'>{10}</td></tr>"
             "<tr><td><b>Date</b></td><td>{1}</td></tr>"
             "<tr><td><b>Author</b></td><td>{2} &lt;{3}&gt;</td></tr>"
             "<tr><td><b>Commit Date</b></td><td>{4}</td></tr>"
@@ -179,6 +180,7 @@
         self.__formatTemplate = (
             "format:recordstart%n"
             "commit|%h%n"
+            "fullcommit|%H%n"
             "parents|%p%n"
             "author|%an%n"
             "authormail|%ae%n"
@@ -213,6 +215,7 @@
         self.__branchesRole = Qt.ItemDataRole.UserRole + 5
         self.__authorMailRole = Qt.ItemDataRole.UserRole + 6
         self.__committerMailRole = Qt.ItemDataRole.UserRole + 7
+        self.__fullCommitIdRole = Qt.ItemDataRole.UserRole + 8
 
         # roles used in the file tree
         self.__diffFileLineRole = Qt.ItemDataRole.UserRole
@@ -681,6 +684,7 @@
         subject,
         message,
         commitId,
+        fullCommitId,
         changedPaths,
         parents,
         refnames,
@@ -697,6 +701,7 @@
         @param subject subject of the log entry (string)
         @param message text of the log message (list of strings)
         @param commitId commit id info (string)
+        @param fullCommitId unabbreviated commit id info (string)
         @param changedPaths list of dictionary objects containing
             info about the changed files/directories
         @param parents list of parent revisions (list of integers)
@@ -755,6 +760,7 @@
         itm.setData(0, self.__branchesRole, allBranches)
         itm.setData(0, self.__authorMailRole, authorMail)
         itm.setData(0, self.__committerMailRole, committerMail)
+        itm.setData(0, self.__fullCommitIdRole, fullCommitId)
         if not parents:
             itm.setData(0, self.__parentsRole, [])
         else:
@@ -960,6 +966,7 @@
             logEntry["subject"],
             logEntry["body"],
             logEntry["commit"],
+            logEntry["fullcommit"],
             logEntry["changed_files"],
             logEntry["parents"],
             logEntry["refnames"],
@@ -1049,6 +1056,7 @@
                     value = line
                 if key in (
                     "commit",
+                    "fullcommit",
                     "parents",
                     "author",
                     "authormail",
@@ -1479,6 +1487,7 @@
                 parentsStr + childrenStr + branchesStr + tagsStr,
                 itm.data(0, self.__subjectRole),
                 messageStr,
+                itm.data(0, self.__fullCommitIdRole).strip(),
             )
         else:
             html = ""

eric ide

mercurial