Generate patch/diff for all commits

Author: timxx

qgitc/aichatwindow.py

@@ -553,8 +553,7 @@ def codeReview(self, commit, args):
             repoDir = commitRepoDir(subCommit)
             subData = Git.commitRawDiff(subCommit.sha1, gitArgs=args, repoDir=repoDir)
             if subData:
-                data += subData
-                data += b"\n"
+                data += b"\n" + subData
 
         diff = data.decode("utf-8", errors="replace")
         self._doRequest(diff, AiChatMode.CodeReview)

qgitc/gitutils.py

@@ -413,10 +413,13 @@ def generateDiff(sha1, filePath, repoDir=None):
         return True
 
     @staticmethod
-    def generatePatch(sha1, filePath, repoDir=None):
+    def commitRawPatch(sha1, repoDir=None):
         args = ["format-patch", "-1", "--stdout", sha1]
+        return Git.checkOutput(args, repoDir=repoDir)
 
-        data = Git.checkOutput(args, repoDir=repoDir)
+    @staticmethod
+    def generatePatch(sha1, filePath, repoDir=None):
+        data = Git.commitRawPatch(sha1, repoDir=repoDir)
         if not data:
             return False
 

qgitc/logview.py

@@ -958,9 +958,20 @@ def __onGeneratePatch(self):
             self,
             self.tr("Save Patch"))
         if f:
-           # TODO: generate with subCommits?
-           repoDir = commitRepoDir(commit)
-           Git.generatePatch(commit.sha1, f, repoDir)
+            repoDir = commitRepoDir(commit)
+            patch = Git.commitRawPatch(commit.sha1, repoDir)
+            if patch is None:
+                patch = b''
+
+            for subCommit in commit.subCommits:
+                repoDir = commitRepoDir(subCommit)
+                subPatch = Git.commitRawPatch(subCommit.sha1, repoDir)
+                if subPatch:
+                    patch += b'\n' + subPatch
+
+            if patch:
+                with open(f, "wb+") as h:
+                    h.write(patch)
 
     def __onGenerateDiff(self):
         if self.curIdx == -1:
@@ -973,9 +984,19 @@ def __onGenerateDiff(self):
             self,
             self.tr("Save Diff"))
         if f:
-            # TODO: generate with subCommits?
             repoDir = commitRepoDir(commit)
-            Git.generateDiff(commit.sha1, f, repoDir)
+            diff = Git.commitRawDiff(commit.sha1, repoDir=repoDir)
+            if diff is None:
+                diff = b''
+            for subCommit in commit.subCommits:
+                repoDir = commitRepoDir(subCommit)
+                subDiff = Git.commitRawDiff(subCommit.sha1, repoDir=repoDir)
+                if subDiff:
+                    diff += b'\n' + subDiff
+
+            if diff:
+                with open(f, "wb+") as h:
+                    h.write(diff)
 
     def __onRevertCommit(self):
         if self.curIdx == -1: