Skip to content

Commit

Permalink
Avoid recomputing remote branch
Browse files Browse the repository at this point in the history
  • Loading branch information
refactoringdr committed May 20, 2024
1 parent d135d04 commit 3402ac1
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/GToolkit4Git/GtGitRepository.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -798,28 +798,28 @@ GtGitRepository >> gtCommitButtonsFor: item withConflicts: conflicts inPane: con
GtGitRepository >> gtCommitsFor: aView [
<gtView>
<gtRepositoryView>
| conflicts |
| conflicts incomingCommits outgoingCommits |
self isMissing ifTrue: [ ^ aView empty ].

conflicts := self conflictingCommits.

incomingCommits := self incomingCommits.
outgoingCommits := self viewModel outgoingCommits.
^ aView columnedList
title: 'Commits' translated;
priority: 2;
items: [ (AsyncSequenceStream forCollection: self incomingCommits)
items: [ (AsyncSequenceStream forCollection: incomingCommits)
merge: self repository head commitStream ];
column: 'Status'
icon: [ :item |
((self incomingCommits contains: [ :aCommit | aCommit = item ])
((incomingCommits contains: [ :aCommit | aCommit = item ])
ifTrue: [ (conflicts contains: [ :aCommit | aCommit = item ])
ifTrue: [ self
statusElementColored: GtGitStatusConflicting color
withTooltip: 'Conflict' ]
ifFalse: [ self
statusElementColored: GtGitStatusIncoming color
withTooltip: 'Incoming' ] ]
ifFalse: [ (self viewModel outgoingCommits
contains: [ :aCommit | aCommit = item ])
ifFalse: [ (outgoingCommits contains: [ :aCommit | aCommit = item ])
ifTrue: [ self statusElementColored: GtGitStatusOutgoing color withTooltip: 'Outgoing' ]
ifFalse: [ BlElement new ] ])
size: 12 @ 12;
Expand Down

0 comments on commit 3402ac1

Please sign in to comment.