filter unchanged objects in transports

Author: marcellourbani

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [1.7.2] 2023-10-31
+
+### Added
+
+- filter changes in transport revisions
+
 ## [1.7.1] 2023-10-25
 
 ### Added

client/images/dark/icon-delete.svg

@@ -58,7 +58,7 @@
     "webpack-cli": "^5.0.1"
   },
   "dependencies": {
-    "@abaplint/core": "^2.95.18",
+    "@abaplint/core": "^2.102.65",
     "@types/tmp": "0.2.3",
     "abap_cloud_platform": "^1.1.3",
     "abap-adt-api": "^5.0.6",

client/images/light/icon-delete.svg

@@ -39,6 +39,7 @@ export const AbapFsCommands = {
   runClass: "abapfs.runClass",
   // revisions
   clearScmGroup: "abapfs.clearScmGroup",
+  filterScmGroup: "abapfs.filterScmGroup",
   openrevstate: "abapfs.openrevstate",
   opendiff: "abapfs.opendiff",
   opendiffNormalized: "abapfs.opendiffNormalized",

client/package-lock.json

@@ -69,6 +69,10 @@ export class AbapScm {
     return this.emitter.event
   }
 
+  public async getGroup(label: string) {
+    return this.groups.get(label)
+  }
+
   public async addRecentDocument(uri: Uri) {
     const recent = this.groups.get(RECENT)
     const state = findState(recent, uri)

client/package.json

@@ -1,8 +1,8 @@
 import { command, AbapFsCommands } from "../../commands"
-import { Uri, QuickPickItem, window, commands, workspace } from "vscode"
-import { abapUri, uriRoot, getOrCreateRoot } from "../../adt/conections"
+import { Uri, QuickPickItem, window, commands, workspace, ProgressLocation } from "vscode"
+import { abapUri, uriRoot, getOrCreateRoot, getClient } from "../../adt/conections"
 import { AbapRevisionService, revLabel } from "./abaprevisionservice"
-import { Revision } from "abap-adt-api"
+import { ADTClient, Revision } from "abap-adt-api"
 import { AbapQuickDiff } from "./quickdiff"
 import { revisionUri } from "./documentprovider"
 import { RemoteManager, formatKey } from "../../config"
@@ -58,6 +58,17 @@ const pickCommonAncestor = (locals: Revision[], localVer: Revision, remotes: Rev
   return pickRevision(possibleLocals, "Unable to determine common ancestor, please select base for comparison")
 }
 
+const wasChanged = async (client: ADTClient, state: AState): Promise<boolean> => {
+  try {
+    if (!state.refRevision) return false
+    const ref = await client.getObjectSource(state.refRevision.uri)
+    const rev = await client.getObjectSource(state.mainRevision.uri)
+    if (ref !== rev) return true
+  } catch (error) {
+    return true // safer to assume it was changed
+  }
+  return false
+}
 
 export const displayRevDiff = (
   rightRev: Revision | undefined,
@@ -184,6 +195,37 @@ export class AbapRevisionCommands {
   private static clearGroup(group: AGroup) {
     group.resourceStates = []
   }
+  @command(AbapFsCommands.filterScmGroup)
+  private static filterGroup(group: AGroup) {
+    window.withProgress({ location: ProgressLocation.Notification, cancellable: true, title: "checking diffs" }, async (prog, tok) => {
+      const nextState: AState[] = []
+      const unchanged: AState[] = []
+      let count = 0
+      const scm = group.resourceStates[0]?.ascm
+      if (!scm) return
+      const client = getClient(scm.connId)
+      for (const s of group.resourceStates) {
+        if (tok.isCancellationRequested) return
+        const increment = count * 100 / group.resourceStates.length
+        const message = s.resourceUri.path.replace(/.*\//, "")
+        prog.report({ message, increment })
+        const found = await wasChanged(client, s)
+        if (found) nextState.push(s)
+        else unchanged.push(s)
+        count++
+      }
+
+      group.resourceStates = nextState
+      if (unchanged.length) {
+        const label = `unchanged ${group.label}`
+        const ugroup = await scm.getGroup(label)
+        const toAdd = unchanged.filter(s => !ugroup.resourceStates.includes(s))
+        ugroup.resourceStates = [...ugroup.resourceStates, ...toAdd]
+      }
+
+    })
+  }
+
   @command(AbapFsCommands.opendiff)
   private static async openDiff(state: AState, select = true) {
     const uri = state.resourceUri

client/src/commands/registry.ts

@@ -234,10 +234,7 @@
       {
         "command": "abapfs.deletefavourite",
         "title": "AbapFs delete favourite",
-        "icon": {
-          "dark": "client/images/dark/icon-delete.svg",
-          "light": "client/images/light/icon-delete.svg"
-        }
+        "icon": "$(trash)"
       },
       {
         "command": "abapfs.activate",
@@ -282,10 +279,7 @@
       {
         "command": "abapfs.unlinkRepo",
         "title": "Unlink abapGit Repo",
-        "icon": {
-          "dark": "client/images/dark/icon-delete.svg",
-          "light": "client/images/light/icon-delete.svg"
-        }
+        "icon": "$(trash)"
       },
       {
         "command": "abapfs.registerSCM",
@@ -383,10 +377,7 @@
       {
         "command": "abapfs.deleteTransport",
         "title": "Delete transport",
-        "icon": {
-          "dark": "client/images/dark/icon-delete.svg",
-          "light": "client/images/light/icon-delete.svg"
-        }
+        "icon": "$(trash)"
       },
       {
         "command": "abapfs.revealPackage",
@@ -467,18 +458,17 @@
       {
         "command": "abapfs.transportRevision",
         "title": "Add transport to source control",
-        "icon": {
-          "dark": "client/images/dark/icon-repo.svg",
-          "light": "client/images/light/icon-repo.svg"
-        }
+        "icon": "$(versions)"
       },
       {
         "command": "abapfs.clearScmGroup",
         "title": "Clear",
-        "icon": {
-          "dark": "client/images/dark/icon-delete.svg",
-          "light": "client/images/light/icon-delete.svg"
-        }
+        "icon": "$(trash)"
+      },
+      {
+        "command": "abapfs.filterScmGroup",
+        "title": "Filter unchanged",
+        "icon": "$(filter)"
       },
       {
         "command": "abapfs.showdocu",
@@ -1020,6 +1010,11 @@
         }
       ],
       "scm/resourceGroup/context": [
+        {
+          "command": "abapfs.filterScmGroup",
+          "group": "inline",
+          "when": "scmProvider =~ /^ABAP/ && scmResourceGroup != recent && scmResourceGroup =~ /^(?!unchanged)/"
+        },
         {
           "command": "abapfs.clearScmGroup",
           "group": "inline",
@@ -1298,4 +1293,4 @@
       }
     }
   }
-}
+}