@@ -252,8 +252,27 @@ class GitJaspr(
252252 if (navState != null ) refSpec.copy(localRef = navState.headBeforeDetach) else refSpec
253253
254254 val remoteBranches = queries.getRemoteBranches()
255- val stack = queries.getCommitStack(effectiveRefSpec.localRef, effectiveRefSpec.remoteRef)
256- if (stack.isEmpty()) return theme.muted(" Stack is empty." ) + " \n "
255+ val rawStack = queries.getCommitStack(effectiveRefSpec.localRef, effectiveRefSpec.remoteRef)
256+ if (rawStack.isEmpty()) {
257+ return theme.muted(" Stack is empty." ) + " \n "
258+ }
259+
260+ val upstream = " $remoteName /${effectiveRefSpec.remoteRef} "
261+ val stack = filterAlreadyApplied(rawStack, upstream, effectiveRefSpec.localRef)
262+ val numAlreadyMerged = rawStack.size - stack.size
263+
264+ if (stack.isEmpty()) {
265+ val mergedDescription =
266+ if (numAlreadyMerged == 1 ) {
267+ " The commit in your stack has"
268+ } else {
269+ " All $numAlreadyMerged commits in your stack have"
270+ }
271+ return theme.warning(
272+ " $mergedDescription been merged into ${effectiveRefSpec.remoteRef} . " +
273+ " Run `jaspr rebase` to clean up."
274+ ) + " \n "
275+ }
257276
258277 val statuses = getRemoteCommitStatuses(stack, remoteBranches, queries)
259278 val commitsWithDuplicateIds =
@@ -271,6 +290,7 @@ class GitJaspr(
271290 statuses,
272291 commitsWithDuplicateIds,
273292 numCommitsBehindBase,
293+ numAlreadyMerged,
274294 effectiveRefSpec,
275295 stack,
276296 remoteBranches,
@@ -284,6 +304,7 @@ class GitJaspr(
284304 statuses : List <RemoteCommitStatus >,
285305 commitsWithDuplicateIds : Map <String , List <RemoteCommitStatus >>,
286306 numCommitsBehindBase : Int ,
307+ numAlreadyMerged : Int ,
287308 refSpec : RefSpec ,
288309 stack : List <Commit >,
289310 remoteBranches : List <RemoteBranch >,
@@ -344,6 +365,16 @@ class GitJaspr(
344365
345366 appendNamedStackInfo(stack, remoteBranches, theme, queries)
346367
368+ if (numAlreadyMerged > 0 ) {
369+ appendLine()
370+ appendLine(
371+ theme.warning(
372+ " $numAlreadyMerged ${commitOrCommits(numAlreadyMerged)} already merged " +
373+ " into ${refSpec.remoteRef} (not shown). " +
374+ " Run `jaspr rebase` to clean up."
375+ )
376+ )
377+ }
347378 if (numCommitsBehindBase > 0 ) {
348379 appendLine()
349380 appendLine(
@@ -460,14 +491,17 @@ class GitJaspr(
460491 val targetRef =
461492 RemoteNamedStackRef .parse(stackName, config.remoteNamedStackBranchPrefix)?.targetRef
462493 ? : return
494+ val upstream = " $remoteName /$targetRef "
463495 val remoteStack =
464496 try {
465- queries.getCommitStack(" $remoteName /$stackName " , targetRef)
497+ val raw = queries.getCommitStack(" $remoteName /$stackName " , targetRef)
498+ filterAlreadyApplied(raw, upstream, " $remoteName /$stackName " )
466499 } catch (e: Exception ) {
467500 logger.debug(" Failed to walk remote stack '{}': {}" , stackName, e.message)
468501 return
469502 }
470- val localIds = localStack.mapNotNull(Commit ::id).toSet()
503+ val filteredLocal = filterAlreadyApplied(localStack, upstream, localStack.last().hash)
504+ val localIds = filteredLocal.mapNotNull(Commit ::id).toSet()
471505 val remoteIds = remoteStack.mapNotNull(Commit ::id).toSet()
472506 val remoteOnly = (remoteIds - localIds).size
473507 val localOnly = (localIds - remoteIds).size
@@ -668,11 +702,14 @@ class GitJaspr(
668702 val effectiveLocalRef = navState?.headBeforeDetach ? : refSpec.localRef
669703 val cursorSha = navState?.stack?.getOrNull(navState.cursorIndex)?.sha
670704
671- val localStack = gitClient.getCommitStack(remoteName, effectiveLocalRef, refSpec.remoteRef)
672- if (localStack.isEmpty()) return theme.muted(" Stack is empty." ) + " \n "
705+ val rawLocalStack =
706+ gitClient.getCommitStack(remoteName, effectiveLocalRef, refSpec.remoteRef)
707+ if (rawLocalStack.isEmpty()) {
708+ return theme.muted(" Stack is empty." ) + " \n "
709+ }
673710
674711 val stackName =
675- when (val result = getExistingStackName(localStack , remoteBranches)) {
712+ when (val result = getExistingStackName(rawLocalStack , remoteBranches)) {
676713 is Found -> result.name
677714 is MultipleStacksContainCommit ->
678715 throw GitJasprException (
@@ -686,14 +723,51 @@ class GitJaspr(
686723 }
687724 val namedStackRef =
688725 checkNotNull(RemoteNamedStackRef .parse(stackName, config.remoteNamedStackBranchPrefix))
689- val remoteStack =
690- gitClient.getCommitStack(remoteName, " $remoteName /$stackName " , namedStackRef.targetRef)
726+ val upstream = " $remoteName /${namedStackRef.targetRef} "
727+ val rawRemoteStack =
728+ gitClient.getCommitStack(
729+ remoteName,
730+ " $remoteName /$stackName " ,
731+ namedStackRef.targetRef,
732+ )
733+ val localStack = filterAlreadyApplied(rawLocalStack, upstream, effectiveLocalRef)
734+ val remoteStack = filterAlreadyApplied(rawRemoteStack, upstream, " $remoteName /$stackName " )
735+
736+ val mergedLocalIds =
737+ rawLocalStack.mapNotNull(Commit ::id).toSet() - localStack.mapNotNull(Commit ::id).toSet()
738+ val mergedRemoteIds =
739+ rawRemoteStack.mapNotNull(Commit ::id).toSet() -
740+ remoteStack.mapNotNull(Commit ::id).toSet()
741+ val numAlreadyMerged = (mergedLocalIds + mergedRemoteIds).size
742+
743+ if (localStack.isEmpty() && remoteStack.isEmpty() && numAlreadyMerged > 0 ) {
744+ val mergedDescription =
745+ if (numAlreadyMerged == 1 ) {
746+ " The commit has"
747+ } else {
748+ " All $numAlreadyMerged commits have"
749+ }
750+ return theme.warning(
751+ " $mergedDescription been merged into ${namedStackRef.targetRef} . " +
752+ " Nothing to compare. Run `jaspr rebase` to clean up."
753+ ) + " \n "
754+ }
691755
692756 return DivergenceClassifier (getJasprDir(), gitClient).use { classifier ->
693757 val rows = alignStacks(localStack, remoteStack, classifier)
694758 buildString {
695759 if (navState != null ) appendLine(navBanner(navState, theme))
696760 append(renderCompare(rows, " $remoteName /$stackName " , theme, cursorSha = cursorSha))
761+ if (numAlreadyMerged > 0 ) {
762+ appendLine()
763+ appendLine(
764+ theme.warning(
765+ " $numAlreadyMerged ${commitOrCommits(numAlreadyMerged)} already " +
766+ " merged into ${namedStackRef.targetRef} (not shown). " +
767+ " Run `jaspr rebase` to clean up."
768+ )
769+ )
770+ }
697771 }
698772 }
699773 }
@@ -2775,6 +2849,23 @@ class GitJaspr(
27752849
27762850 private fun commitOrCommits (count : Int ) = if (count == 1 ) " commit" else " commits"
27772851
2852+ /* *
2853+ * Removes commits from [commits] whose patches are already present in [upstream], as determined
2854+ * by `git cherry`. Full SHAs from `git cherry` are matched against abbreviated [Commit.hash]
2855+ * values via prefix comparison.
2856+ */
2857+ private fun filterAlreadyApplied (
2858+ commits : List <Commit >,
2859+ upstream : String ,
2860+ head : String ,
2861+ ): List <Commit > {
2862+ val appliedShas = gitClient.getAlreadyAppliedShas(upstream, head)
2863+ if (appliedShas.isEmpty()) return commits
2864+ return commits.filter { commit ->
2865+ appliedShas.none { sha -> sha.startsWith(commit.hash) }
2866+ }
2867+ }
2868+
27782869 private fun prOrPrs (count : Int ) = if (count == 1 ) " pr" else " prs"
27792870
27802871 /* *
0 commit comments