abapgit-agent 1.17.3 → 1.17.5

package/README.md

@@ -55,6 +55,7 @@ See [Creating New ABAP Projects](docs/install.md#creating-new-abap-projects) to
 abapgit-agent init --package ZMY_PACKAGE   # Initialize local config
 abapgit-agent create                        # Create online repo in ABAP
 abapgit-agent import                        # Import objects from ABAP to git
+abapgit-agent import --branch main          # Import to specific branch
 abapgit-agent delete                        # Delete repo from ABAP
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abapgit-agent",
-  "version": "1.17.3",
+  "version": "1.17.5",
   "description": "ABAP Git Agent - Pull and activate ABAP code via abapGit from any git repository",
   "files": [
     "bin/",

package/src/commands/customize.js

@@ -17,6 +17,31 @@ module.exports = {
   async execute(args, context) {
     const { loadConfig, AbapHttp, getTransport, getTransportSettings } = context;
 
+    if (args.includes('--help') || args.includes('-h')) {
+      console.log(`
+Usage:
+  abapgit-agent customize <table> --set <field=value> [<field=value>...]
+                          [--transport <TRKORR>] [--no-transport] [--json]
+
+Description:
+  Write a single row to a SAP customizing table (delivery class C or E).
+  The row is identified by the key fields you provide via --set.
+
+Parameters:
+  <table>               Name of the customizing table (e.g. ZTABLE_CONFIG).
+  --set <field=value>   One or more field=value pairs (space-separated after --set).
+  --transport <TRKORR>  Record the change in this transport request.
+  --no-transport        Write without a transport request (local change).
+  --json                Output result as JSON.
+
+Examples:
+  abapgit-agent customize ZTABLE_CONFIG --set KEY=APP VALUE=active
+  abapgit-agent customize ZTABLE_CONFIG --set KEY=APP VALUE=active --transport DEVK900001
+  abapgit-agent customize ZTABLE_CONFIG --set KEY=APP VALUE=active --no-transport
+`);
+      return;
+    }
+
     const jsonOutput = args.includes('--json');
     const verbose    = args.includes('--verbose');
     const noTransport = args.includes('--no-transport');

package/src/commands/import.js

@@ -39,11 +39,14 @@ Prerequisites:
   - Package must have objects to import
 
 Options:
+  --branch     Branch to push to. Auto-detected from current git branch if omitted.
   --message    Commit message (default: "feat: initial import from ABAP package <package>")
 
 Examples:
   abapgit-agent import
   abapgit-agent import --message "Initial import from SAP"
+  abapgit-agent import --branch main
+  abapgit-agent import --branch feature/my-branch --message "Import objects"
 `);
       return;
     }
@@ -87,6 +90,9 @@ Examples:
       commitMessage = args[messageArgIndex + 1];
     }
 
+    const branchArgIndex = args.indexOf('--branch');
+    const branch = branchArgIndex !== -1 ? args[branchArgIndex + 1] : gitUtils.getBranch();
+
     if (safeguards.requireImportMessage && !commitMessage) {
       console.error('❌ Error: import requires a commit message for this project\n');
       console.error('Please provide one with:');
@@ -99,6 +105,7 @@ Examples:
 
     console.log(`\n📦 Starting import job`);
     console.log(`   URL: ${repoUrl}`);
+    console.log(`   Branch: ${branch}`);
     if (commitMessage) {
       console.log(`   Message: ${commitMessage}`);
     }
@@ -107,7 +114,8 @@ Examples:
     const csrfToken = await http.fetchCsrfToken();
 
     const data = {
-      url: repoUrl
+      url: repoUrl,
+      branch
     };
 
     if (commitMessage) {

package/src/commands/pull.js

@@ -525,11 +525,30 @@ Examples:
           // 3. Amend last commit
           execSync('git commit --amend --no-edit', { cwd: process.cwd() });
 
-          // 4. Push with force-with-lease; if no upstream, set it automatically
+          // 4. Push with force-with-lease; fetch first so tracking ref is current
+          //    (the remote may have been force-pushed by another process between our last
+          //    fetch and this push — a fetch makes --force-with-lease reliable)
           let pushed = false;
           try {
-            execSync('git push --force-with-lease', { cwd: process.cwd(), stdio: 'pipe' });
-            pushed = true;
+            try { execSync('git fetch origin', { cwd: process.cwd(), stdio: 'pipe' }); } catch (_) { /* no remote is fine */ }
+            // Retry the push up to 3 times on transient server errors (e.g. GitHub Enterprise 500)
+            let pushErr;
+            for (let attempt = 1; attempt <= 3; attempt++) {
+              try {
+                execSync('git push --force-with-lease', { cwd: process.cwd(), stdio: 'pipe' });
+                pushed = true;
+                break;
+              } catch (err) {
+                pushErr = err;
+                const msg = (err.stderr || err.stdout || err.message || '').toString();
+                const transient = /internal server error|remote rejected|\b5\d\d\b|connection reset|timed? ?out/i.test(msg);
+                if (attempt < 3 && transient) {
+                  execSync('sleep 2', { stdio: 'pipe' });
+                  continue;
+                }
+                throw err;
+              }
+            }
           } catch (pushErr) {
             const msg = (pushErr.stderr || pushErr.stdout || pushErr.message || '').toString();
             if (msg.includes('no upstream branch') || msg.includes('has no upstream')) {

package/src/commands/upgrade.js

@@ -109,7 +109,7 @@ Examples:
     if (flags.version && !flags.abapOnly) {
       const versionExists = await this.validateVersionExists(flags.version);
       if (!versionExists) {
-        console.error(`❌ Error: Version ${flags.version} not found in npm registry`);
+        console.error(`Error: Version ${flags.version} not found in npm registry`);
         console.error('   Please check available versions at: https://www.npmjs.com/package/abapgit-agent?activeTab=versions');
         process.exit(1);
       }