Support local changes for composite mode

Author: timxx

qgitc/commitsource.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from .common import Commit
+
+
+class CommitSource:
+
+    def findCommitIndex(self, sha1: str, begin=0, findNext=True) -> int:
+        raise NotImplemented
+
+    def getCommit(self, index: int) -> Commit:
+        raise NotImplemented
+
+    def getCount(self) -> int:
+        raise NotImplemented

qgitc/common.py

@@ -59,6 +59,9 @@ def fromRawString(cls, string):
 
         return commit
 
+    def isValid(self):
+        return len(self.sha1) > 0
+
 
 class MyProfile():
 

qgitc/diffview.py

@@ -37,6 +37,7 @@
     QPointF,
     QMimeData)
 
+from .commitsource import CommitSource
 from .common import *
 from .gitutils import Git, GitProcess
 from .findwidget import FindWidget
@@ -150,6 +151,8 @@ def __init__(self, parent=None):
         # sub commit to fetch
         self._commitList: List[Commit] = []
 
+        self._commitSource: CommitSource = None
+
         self.twMenu.addAction(self.tr("External &diff"),
                               self.__onExternalDiff)
         self.twMenu.addSeparator()
@@ -478,7 +481,8 @@ def __commitDesc(self, sha1, repoDir=None):
         return " (" + subject + ")"
 
     def __commitToTextLines(self, commit: Commit):
-        if not commit.sha1 in [Git.LUC_SHA1, Git.LCC_SHA1]:
+        isLocalChanges = commit.sha1 in [Git.LUC_SHA1, Git.LCC_SHA1]
+        if not isLocalChanges:
             content = self.tr("Author: ") + commit.author + \
                 " " + commit.authorDate
             self.viewer.addAuthorLine(content)
@@ -489,7 +493,14 @@ def __commitToTextLines(self, commit: Commit):
 
         for parent in commit.parents:
             content = self.tr("Parent: ") + parent
-            content += self.__commitDesc(parent, commit.repoDir)
+            repoDir = commit.repoDir
+            if isLocalChanges and repoDir:
+                index = self.commitSource.findCommitIndex(parent)
+                if index != -1:
+                    parentCommit = self.commitSource.getCommit(index)
+                    repoDir = parentCommit.repoDir
+
+            content += self.__commitDesc(parent, repoDir)
             self.viewer.addSHA1Line(content, True)
 
         for child in commit.children:
@@ -606,6 +617,9 @@ def queryClose(self):
         self.fetcher.cancel()
         return True
 
+    def setCommitSource(self, source: CommitSource):
+        self.commitSource = source
+
 
 class DiffTextLine(SourceTextLineBase):
 

qgitc/gitutils.py

@@ -351,12 +351,12 @@ def undoMerge(path):
         return process.returncode == 0
 
     @staticmethod
-    def hasLocalChanges(branch, cached=False):
+    def hasLocalChanges(branch, cached=False, repoDir=None):
         # A remote branch should never have local changes
         if branch.startswith("remotes/"):
             return False
 
-        dir = Git.branchDir(branch)
+        dir = Git.branchDir(branch, repoDir)
         # only branch checked out can have local changes
         if not dir:
             return False
@@ -371,7 +371,7 @@ def hasLocalChanges(branch, cached=False):
         return process.returncode == 1
 
     @staticmethod
-    def branchDir(branch):
+    def branchDir(branch, repoDir=None):
         """returned the branch directory if it checked out
         otherwise returned an empty string"""
 
@@ -384,7 +384,7 @@ def branchDir(branch):
             return Git.REPO_DIR
 
         args = ["worktree", "list"]
-        data = Git.checkOutput(args)
+        data = Git.checkOutput(args, repoDir=repoDir)
         if not data:
             return ""
 

qgitc/gitview.py

@@ -62,6 +62,8 @@ def __init__(self, parent=None):
         self._delayTimer = QTimer(self)
         self._delayTimer.setSingleShot(True)
 
+        self.ui.diffView.setCommitSource(self.ui.logView)
+
         self.__setupSignals()
 
     def __setupSignals(self):

qgitc/logview.py

@@ -32,6 +32,7 @@
     QObject,
     SIGNAL)
 
+from .commitsource import CommitSource
 from .common import *
 from .gitutils import *
 from .logsfetcher import LogsFetcher
@@ -455,23 +456,55 @@ def nextResult(self):
 
 class CheckLocalChangesThread(QThread):
 
-    checkFinished = Signal(bool, bool)
+    checkFinished = Signal(Commit, Commit)
 
-    def __init__(self, branch, parent=None):
+    def __init__(self, branch, submodules, parent=None):
         super().__init__(parent)
         self._branch = branch
+        self._submodules = submodules or [None]
 
     def run(self):
         if self.isInterruptionRequested():
             return
-        hasLCC = Git.hasLocalChanges(self._branch, True)
 
-        if self.isInterruptionRequested():
-            return
-        hasLUC = Git.hasLocalChanges(self._branch)
+        lccCommit = Commit()
+        lucCommit = Commit()
+
+        for submodule in self._submodules:
+            if self.isInterruptionRequested():
+                return
+            hasLCC, hasLUC = self.fetchLocalChanges(submodule)
+            if hasLCC:
+                lccCommit.sha1 = Git.LCC_SHA1
+                if not lccCommit.repoDir:
+                    lccCommit.repoDir = submodule
+                else:
+                    subCommit = Commit()
+                    subCommit.sha1 = Git.LCC_SHA1
+                    subCommit.repoDir = submodule
+                    lccCommit.subCommits.append(subCommit)
+
+            if hasLUC:
+                lucCommit.sha1 = Git.LUC_SHA1
+                if not lucCommit.repoDir:
+                    lucCommit.repoDir = submodule
+                else:
+                    subCommit = Commit()
+                    subCommit.sha1 = Git.LUC_SHA1
+                    subCommit.repoDir = submodule
+                    lucCommit.subCommits.append(subCommit)
 
         if not self.isInterruptionRequested():
-            self.checkFinished.emit(hasLCC, hasLUC)
+            self.checkFinished.emit(lccCommit, lucCommit)
+
+    def fetchLocalChanges(self, repoDir=None):
+            hasLCC = Git.hasLocalChanges(self._branch, True, repoDir)
+            if self.isInterruptionRequested():
+                return False, False
+            hasLUC = Git.hasLocalChanges(self._branch, repoDir=repoDir)
+            if self.isInterruptionRequested():
+                return False, False
+            return hasLCC, hasLUC
 
 
 class LogGraph(QWidget):
@@ -498,7 +531,7 @@ def paintEvent(self, event):
             painter.drawPixmap(0, 0, self._graphImage)
 
 
-class LogView(QAbstractScrollArea):
+class LogView(QAbstractScrollArea, CommitSource):
     currentIndexChanged = Signal(int)
     findFinished = Signal(int)
     findProgress = Signal(int)
@@ -638,24 +671,22 @@ def showLogs(self, branch, args=None):
         self.curBranch = branch
         self.args = args
 
+        submodules = []
         if qApp.settings().isCompositeMode():
             submodules = self.window().submodules()
-            self.fetcher.setSubmodules(submodules)
-        else:
-            self.fetcher.setSubmodules([])
+        self.fetcher.setSubmodules(submodules)
 
         self.fetcher.fetch(branch, args)
         self.beginFetch.emit()
 
-        # TODO:
         if self.checkThread:
             self.checkThread.disconnect(self)
             self.checkThread.requestInterruption()
             self.checkThread.wait()
             self.checkThread = None
 
         if not args:
-            self.checkThread = CheckLocalChangesThread(self.curBranch, self)
+            self.checkThread = CheckLocalChangesThread(self.curBranch, submodules, self)
             self.checkThread.checkFinished.connect(self.__onCheckFinished)
             self.checkThread.start()
 
@@ -1028,47 +1059,46 @@ def __onFetchFinished(self, exitCode):
         else:
             self.viewport().update()
 
-    def __onCheckFinished(self, hasLCC, hasLUC):
+    def __onCheckFinished(self, lccCommit: Commit, lucCommit: Commit):
         parent_sha1 = self.data[0].sha1 if self.data else None
 
         self.delayUpdateParents = False
+        hasLCC = lccCommit.isValid()
+        hasLUC = lucCommit.isValid()
+
         if hasLCC:
-            lcc_cmit = Commit()
-            lcc_cmit.sha1 = Git.LCC_SHA1
-            lcc_cmit.comments = self.tr(
+            lccCommit.comments = self.tr(
                 "Local changes checked in to index but not committed")
-            lcc_cmit.parents = [parent_sha1] if parent_sha1 else []
-            lcc_cmit.children = [Git.LUC_SHA1] if hasLUC else []
+            lccCommit.parents = [parent_sha1] if parent_sha1 else []
+            lccCommit.children = [Git.LUC_SHA1] if hasLUC else []
 
-            self.data.insert(0, lcc_cmit)
-            parent_sha1 = lcc_cmit.sha1
-            self.delayUpdateParents = len(lcc_cmit.parents) == 0
+            self.data.insert(0, lccCommit)
+            parent_sha1 = lccCommit.sha1
+            self.delayUpdateParents = len(lccCommit.parents) == 0
 
             if not self.delayUpdateParents:
                 if self.data[1].children is None:
                     self.data[1].children = []
 
-                self.data[1].children.append(lcc_cmit.sha1)
+                self.data[1].children.append(lccCommit.sha1)
 
             if self.curIdx > 0:
                 self.curIdx += 1
 
         if hasLUC:
-            luc_cmit = Commit()
-            luc_cmit.sha1 = Git.LUC_SHA1
-            luc_cmit.comments = self.tr(
+            lucCommit.comments = self.tr(
                 "Local uncommitted changes, not checked in to index")
-            luc_cmit.parents = [parent_sha1] if parent_sha1 else []
-            luc_cmit.children = []
+            lucCommit.parents = [parent_sha1] if parent_sha1 else []
+            lucCommit.children = []
 
-            self.data.insert(0, luc_cmit)
+            self.data.insert(0, lucCommit)
             self.delayUpdateParents = self.delayUpdateParents or len(
-                luc_cmit.parents) == 0
+                lucCommit.parents) == 0
 
             if not self.delayUpdateParents and not hasLCC:
                 if self.data[1].children is None:
                     self.data[1].children = []
-                self.data[1].children.append(luc_cmit.sha1)
+                self.data[1].children.append(lucCommit.sha1)
 
             if self.curIdx > 0:
                 self.curIdx += 1