Skip to content

Commit 12f4f88

Browse files
committed
Fix code review
1 parent bc15716 commit 12f4f88

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

qgitc/aichatwindow.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import threading
3535
import requests
3636

37+
from .common import commitRepoDir
3738
from .gitutils import Git
3839
from .llm import AiChatMode, AiModelBase, AiParameters, AiResponse, LocalLLM
3940
from .statewindow import StateWindow
@@ -542,10 +543,18 @@ def currentChatThread(self):
542543
def isLocalLLM(self):
543544
return self.cbBots.currentIndex() == 0
544545

545-
def codeReview(self, sha1, args):
546-
data: bytes = Git.commitRawDiff(sha1, gitArgs=args)
546+
def codeReview(self, commit, args):
547+
repoDir = commitRepoDir(commit)
548+
data: bytes = Git.commitRawDiff(commit.sha1, gitArgs=args, repoDir=repoDir)
547549
if not data:
548550
return
551+
552+
for subCommit in commit.subCommits:
553+
repoDir = commitRepoDir(subCommit)
554+
subData = Git.commitRawDiff(subCommit.sha1, gitArgs=args, repoDir=repoDir)
555+
if subData:
556+
data += subData
557+
data += b"\n"
549558

550559
diff = data.decode("utf-8", errors="replace")
551560
self._doRequest(diff, AiChatMode.CodeReview)
@@ -560,5 +569,5 @@ def __init__(self, parent=None):
560569
centralWidget = AiChatWidget(self)
561570
self.setCentralWidget(centralWidget)
562571

563-
def codeReview(self, sha1, args=None):
564-
self.centralWidget().codeReview(sha1, args)
572+
def codeReview(self, commit, args=None):
573+
self.centralWidget().codeReview(commit, args)

qgitc/application.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def event(self, event):
153153
elif type == CodeReviewEvent.Type:
154154
window = self.getWindow(Application.AiAssistant)
155155
self._ensureVisible(window)
156-
window.codeReview(event.sha1, event.args)
156+
window.codeReview(event.commit, event.args)
157157

158158
return super().event(event)
159159

qgitc/events.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def __init__(self):
5353
class CodeReviewEvent(QEvent):
5454
Type = QEvent.User + 6
5555

56-
def __init__(self, sha1, args=None):
56+
def __init__(self, commit, args=None):
5757
super().__init__(QEvent.Type(CodeReviewEvent.Type))
58-
self.sha1 = sha1
58+
self.commit = commit
5959
self.args = args

qgitc/logview.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ def __onCodeReview(self):
10381038
if not commit:
10391039
return
10401040

1041-
event = CodeReviewEvent(commit.sha1, self.window().getFilterArgs())
1041+
event = CodeReviewEvent(commit, self.window().getFilterArgs())
10421042
qApp.postEvent(qApp, event)
10431043

10441044
def __onFindDataAvailable(self):

0 commit comments

Comments
 (0)