resulgit 1.0.19 → 1.0.20

package/README.md

@@ -0,0 +1,143 @@
+# resulgit
+
+A powerful command-line interface (CLI) tool for version control system operations.
+
+## Installation
+
+```bash
+npm install -g resulgit
+```
+
+Or install locally:
+
+```bash
+npm install resulgit
+```
+
+## Usage
+
+```bash
+resulgit <command> [options]
+```
+
+## Commands
+
+### Authentication
+
+- `resulgit auth set-token --token <token>` - Set authentication token
+- `resulgit auth set-server --server <url>` - Set server URL
+- `resulgit auth login --email <email> --password <password>` - Login to server
+- `resulgit auth register --username <name> --email <email> --password <password>` - Register new account
+
+### Repository Management
+
+- `resulgit repo list` - List all repositories
+- `resulgit repo create --name <name> [--description <text>] [--visibility <private|public>]` - Create new repository
+- `resulgit repo log --repo <id> [--branch <name>]` - View commit log
+- `resulgit repo head --repo <id> [--branch <name>]` - Get HEAD commit
+- `resulgit repo select` - Interactive repository selection
+
+### Clone & Workspace
+
+- `resulgit clone --repo <id> --branch <name> [--dest <dir>]` - Clone a repository
+- `resulgit workspace set-root --path <dir>` - Set workspace root directory
+
+### Branch Operations
+
+- `resulgit branch list` - List all branches
+- `resulgit branch create --name <branch> [--base <branch>]` - Create new branch
+- `resulgit branch delete --name <branch>` - Delete a branch
+- `resulgit switch --branch <name>` - Switch to a branch
+- `resulgit checkout --branch <name>` - Checkout a branch
+
+### File Operations
+
+- `resulgit status` - Show working directory status
+- `resulgit diff [--path <file>] [--commit <id>]` - Show differences
+- `resulgit add <file> [--content <text>] [--all]` - Add files
+- `resulgit rm --path <file>` - Remove files
+- `resulgit mv --from <old> --to <new>` - Move/rename files
+- `resulgit restore --path <file> [--source <commit>]` - Restore file from commit
+
+### Version Control
+
+- `resulgit commit --message <text>` - Create a commit
+- `resulgit push` - Push changes to remote
+- `resulgit pull` - Pull changes from remote
+- `resulgit merge --branch <name> [--squash] [--no-push]` - Merge branches
+- `resulgit cherry-pick --commit <id> [--branch <name>] [--no-push]` - Cherry-pick a commit
+- `resulgit revert --commit <id> [--no-push]` - Revert a commit
+- `resulgit reset [--commit <id>] [--mode <soft|mixed|hard>]` - Reset to commit
+
+### Stash Operations
+
+- `resulgit stash` or `resulgit stash save [--message <msg>]` - Save changes to stash
+- `resulgit stash list` - List all stashes
+- `resulgit stash pop [--index <n>]` - Apply and remove stash
+- `resulgit stash apply [--index <n>]` - Apply stash without removing
+- `resulgit stash drop [--index <n>]` - Delete a stash
+- `resulgit stash clear` - Clear all stashes
+
+### Tags
+
+- `resulgit tag list` - List all tags
+- `resulgit tag create --name <tag> [--branch <name>]` - Create a tag
+- `resulgit tag delete --name <tag>` - Delete a tag
+
+### Pull Requests
+
+- `resulgit pr list` - List pull requests
+- `resulgit pr create --title <title> [--source <branch>] [--target <branch>]` - Create pull request
+- `resulgit pr merge --id <id>` - Merge a pull request
+
+### Information
+
+- `resulgit current` - Show current repository and branch
+- `resulgit head` - Show HEAD commit ID
+- `resulgit show --commit <id>` - Show commit details
+
+## Global Options
+
+- `--server <url>` - Override default server
+- `--token <token>` - Override stored token
+- `--json` - Output in JSON format
+- `--dir <path>` - Specify working directory
+
+## Examples
+
+```bash
+# Login to server
+resulgit auth login --email user@example.com --password mypassword
+
+# List repositories
+resulgit repo list
+
+# Clone a repository
+resulgit clone --repo 123 --branch main
+
+# Check status
+resulgit status
+
+# Create and commit changes
+resulgit add file.txt --content "Hello World"
+resulgit commit --message "Add file.txt"
+resulgit push
+
+# Create a branch
+resulgit branch create --name feature-branch
+
+# Merge branches
+resulgit merge --branch feature-branch
+```
+
+## Configuration
+
+Configuration is stored in `~/.resulgit/config.json`. You can set:
+- `server`: Default server URL
+- `token`: Authentication token
+- `workspaceRoot`: Default workspace directory
+
+## License
+
+MIT
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resulgit",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "A powerful CLI tool for version control system operations - clone, commit, push, pull, merge, branch management, and more",
   "main": "resulgit.js",
   "bin": {

package/resulgit.js

@@ -339,15 +339,134 @@ function hashContent(buf) {
   return crypto.createHash('sha1').update(buf).digest('hex')
 }
 
+// LCS-based diff: computes edit script (list of equal/insert/delete operations)
+function computeDiff(oldLines, newLines) {
+  const m = oldLines.length
+  const n = newLines.length
+  // Build LCS table
+  const dp = Array.from({ length: m + 1 }, () => new Uint16Array(n + 1))
+  for (let i = 1; i <= m; i++) {
+    for (let j = 1; j <= n; j++) {
+      if (oldLines[i - 1] === newLines[j - 1]) {
+        dp[i][j] = dp[i - 1][j - 1] + 1
+      } else {
+        dp[i][j] = Math.max(dp[i - 1][j], dp[i][j - 1])
+      }
+    }
+  }
+  // Backtrack to produce edit operations
+  const ops = [] // { type: 'equal'|'delete'|'insert', oldIdx, newIdx, line }
+  let i = m, j = n
+  while (i > 0 || j > 0) {
+    if (i > 0 && j > 0 && oldLines[i - 1] === newLines[j - 1]) {
+      ops.push({ type: 'equal', oldIdx: i - 1, newIdx: j - 1, line: oldLines[i - 1] })
+      i--; j--
+    } else if (j > 0 && (i === 0 || dp[i][j - 1] >= dp[i - 1][j])) {
+      ops.push({ type: 'insert', newIdx: j - 1, line: newLines[j - 1] })
+      j--
+    } else {
+      ops.push({ type: 'delete', oldIdx: i - 1, line: oldLines[i - 1] })
+      i--
+    }
+  }
+  ops.reverse()
+  return ops
+}
+
+// Print unified diff with context lines and @@ hunk headers
+function printUnifiedDiff(oldLines, newLines, contextLines) {
+  const ctx = contextLines !== undefined ? contextLines : 3
+  const ops = computeDiff(oldLines, newLines)
+  // Group ops into hunks (runs of changes with context)
+  const hunks = []
+  let hunk = null
+  let lastChangeEnd = -1
+  for (let k = 0; k < ops.length; k++) {
+    const op = ops[k]
+    if (op.type !== 'equal') {
+      // Start or extend a hunk
+      const contextStart = Math.max(0, k - ctx)
+      if (hunk && contextStart <= lastChangeEnd + ctx) {
+        // Extend current hunk
+      } else {
+        // Save previous hunk and start new
+        if (hunk) hunks.push(hunk)
+        hunk = { startIdx: Math.max(0, k - ctx), endIdx: k }
+      }
+      hunk.endIdx = k
+      lastChangeEnd = k
+    }
+  }
+  if (hunk) {
+    hunk.endIdx = Math.min(ops.length - 1, hunk.endIdx + ctx)
+    hunks.push(hunk)
+  }
+  // Print each hunk
+  for (const h of hunks) {
+    const start = h.startIdx
+    const end = Math.min(ops.length - 1, h.endIdx)
+    // Compute line numbers for header
+    let oldStart = 1, newStart = 1
+    for (let k = 0; k < start; k++) {
+      if (ops[k].type === 'equal' || ops[k].type === 'delete') oldStart++
+      if (ops[k].type === 'equal' || ops[k].type === 'insert') newStart++
+    }
+    let oldCount = 0, newCount = 0
+    for (let k = start; k <= end; k++) {
+      if (ops[k].type === 'equal' || ops[k].type === 'delete') oldCount++
+      if (ops[k].type === 'equal' || ops[k].type === 'insert') newCount++
+    }
+    process.stdout.write(color(`@@ -${oldStart},${oldCount} +${newStart},${newCount} @@\n`, 'cyan'))
+    for (let k = start; k <= end; k++) {
+      const op = ops[k]
+      if (op.type === 'equal') {
+        process.stdout.write(` ${op.line}\n`)
+      } else if (op.type === 'delete') {
+        process.stdout.write(color(`-${op.line}\n`, 'red'))
+      } else if (op.type === 'insert') {
+        process.stdout.write(color(`+${op.line}\n`, 'green'))
+      }
+    }
+  }
+}
+
+function loadIgnorePatterns(dir) {
+  const patterns = ['.git', '.vcs-next', 'node_modules', '.DS_Store', 'dist', 'build']
+  const tryFiles = ['.vcs-ignore', '.gitignore']
+  for (const f of tryFiles) {
+    try {
+      const content = fs.readFileSync(path.join(dir, f), 'utf8')
+      const lines = content.split(/\r?\n/).map(l => l.trim()).filter(l => l && !l.startsWith('#'))
+      patterns.push(...lines)
+    } catch {}
+  }
+  return [...new Set(patterns)]
+}
+
+function shouldIgnore(p, patterns) {
+  const segments = p.split('/')
+  for (const pat of patterns) {
+    if (segments.includes(pat)) return true
+    if (p === pat || p.startsWith(pat + '/')) return true
+    // Basic glob-like support for simple cases
+    if (pat.startsWith('**/')) {
+      const sub = pat.slice(3)
+      if (p.endsWith('/' + sub) || p === sub) return true
+    }
+  }
+  return false
+}
+
 async function collectLocal(dir) {
   const out = {}
   const base = path.resolve(dir)
+  const patterns = loadIgnorePatterns(base)
   async function walk(cur, rel) {
     const entries = await fs.promises.readdir(cur, { withFileTypes: true })
     for (const e of entries) {
-      if (e.name === '.git' || e.name === '.vcs-next') continue
-      const abs = path.join(cur, e.name)
       const rp = rel ? rel + '/' + e.name : e.name
+      if (shouldIgnore(rp, patterns)) continue
+      const abs = path.join(cur, e.name)
       if (e.isDirectory()) {
         await walk(abs, rp)
       } else if (e.isFile()) {
@@ -392,25 +511,98 @@ async function fetchRemoteFilesMap(server, repo, branch, token) {
 async function cmdStatus(opts) {
   const dir = path.resolve(opts.dir || '.')
   const meta = readRemoteMeta(dir)
-  const cfg = loadConfig()
-  const server = getServer(opts, cfg) || meta.server
-  const token = getToken(opts, cfg) || meta.token
+  const metaDir = path.join(dir, '.vcs-next')
+  const localPath = path.join(metaDir, 'local.json')
+  let localMeta = { baseCommitId: '', baseFiles: {}, pendingCommit: null }
+  try {
+    const s = fs.readFileSync(localPath, 'utf8')
+    localMeta = JSON.parse(s)
+  } catch {}
+
   const local = await collectLocal(dir)
-  const remote = await fetchRemoteFilesMap(server, meta.repoId, meta.branch, token)
-  const added = []
-  const modified = []
-  const deleted = []
-  const remotePaths = new Set(Object.keys(remote.map))
-  const localPaths = new Set(Object.keys(local))
-  for (const p of localPaths) {
-    if (!remotePaths.has(p)) added.push(p)
-    else if (remote.map[p] !== local[p].id) modified.push(p)
+  const baseFiles = localMeta.baseFiles || {}
+  const pendingFiles = localMeta.pendingCommit ? localMeta.pendingCommit.files : null
+
+  const untracked = []
+  const modifiedUnstaged = []
+  const deletedUnstaged = []
+  const modifiedStaged = []
+  const deletedStaged = []
+  const newStaged = []
+
+  // If there's a pending commit, that's our "staged" area
+  if (pendingFiles) {
+    // staged changes: pendingFiles vs baseFiles
+    const allStagedPaths = new Set([...Object.keys(baseFiles), ...Object.keys(pendingFiles)])
+    for (const p of allStagedPaths) {
+      const b = baseFiles[p]
+      const s = pendingFiles[p]
+      if (b === undefined && s !== undefined) newStaged.push(p)
+      else if (b !== undefined && s === undefined) deletedStaged.push(p)
+      else if (b !== s) modifiedStaged.push(p)
+    }
+
+    // unstaged changes: local vs pendingFiles
+    const localPaths = new Set(Object.keys(local))
+    const stagedPaths = new Set(Object.keys(pendingFiles))
+    for (const p of localPaths) {
+      if (!stagedPaths.has(p)) untracked.push(p)
+      else if (pendingFiles[p] !== local[p].content) modifiedUnstaged.push(p)
+    }
+    for (const p of stagedPaths) {
+      if (!localPaths.has(p)) deletedUnstaged.push(p)
+    }
+  } else {
+    // No pending commit: just local vs baseFiles
+    const localPaths = new Set(Object.keys(local))
+    const basePaths = new Set(Object.keys(baseFiles))
+    for (const p of localPaths) {
+      if (!basePaths.has(p)) untracked.push(p)
+      else if (baseFiles[p] !== local[p].content) modifiedUnstaged.push(p)
+    }
+    for (const p of basePaths) {
+      if (!localPaths.has(p)) deletedUnstaged.push(p)
+    }
   }
-  for (const p of remotePaths) {
-    if (!localPaths.has(p)) deleted.push(p)
+
+  if (opts.json === 'true') {
+    print({
+      branch: meta.branch,
+      ahead: localMeta.pendingCommit ? 1 : 0,
+      staged: { modified: modifiedStaged, deleted: deletedStaged, new: newStaged },
+      unstaged: { modified: modifiedUnstaged, deleted: deletedUnstaged },
+      untracked
+    }, true)
+    return
+  }
+
+  process.stdout.write(`On branch ${color(meta.branch, 'cyan')}\n`)
+  if (localMeta.pendingCommit) {
+    process.stdout.write(`Your branch is ahead of 'origin/${meta.branch}' by 1 commit.\n`)
+  }
+
+  if (modifiedStaged.length > 0 || deletedStaged.length > 0 || newStaged.length > 0) {
+    process.stdout.write('\nChanges to be committed:\n')
+    for (const p of newStaged) process.stdout.write(color(`  new file:   ${p}\n`, 'green'))
+    for (const p of modifiedStaged) process.stdout.write(color(`  modified:   ${p}\n`, 'green'))
+    for (const p of deletedStaged) process.stdout.write(color(`  deleted:    ${p}\n`, 'green'))
+  }
+
+  if (modifiedUnstaged.length > 0 || deletedUnstaged.length > 0) {
+    process.stdout.write('\nChanges not staged for commit:\n')
+    for (const p of modifiedUnstaged) process.stdout.write(color(`  modified:   ${p}\n`, 'red'))
+    for (const p of deletedUnstaged) process.stdout.write(color(`  deleted:    ${p}\n`, 'red'))
+  }
+
+  if (untracked.length > 0) {
+    process.stdout.write('\nUntracked files:\n')
+    for (const p of untracked) process.stdout.write(color(`  ${p}\n`, 'red'))
+  }
+
+  if (modifiedStaged.length === 0 && deletedStaged.length === 0 && newStaged.length === 0 &&
+      modifiedUnstaged.length === 0 && deletedUnstaged.length === 0 && untracked.length === 0) {
+    process.stdout.write('nothing to commit, working tree clean\n')
   }
-  const out = { branch: meta.branch, head: remote.headCommitId, added, modified, deleted }
-  print(out, opts.json === 'true')
 }
 
 async function cmdRestore(opts) {
@@ -475,7 +667,7 @@ async function cmdDiff(opts) {
     const commitSnap = await fetchSnapshotByCommit(server, meta.repoId, commitId, token)
     const parentSnap = parentId ? await fetchSnapshotByCommit(server, meta.repoId, parentId, token) : { files: {}, commitId: '' }
 
-    const files = filePath ? [filePath] : Object.keys(new Set([...Object.keys(parentSnap.files), ...Object.keys(commitSnap.files)]))
+    const files = filePath ? [filePath] : [...new Set([...Object.keys(parentSnap.files), ...Object.keys(commitSnap.files)])]
     for (const p of files) {
       const oldContent = parentSnap.files[p] !== undefined ? String(parentSnap.files[p]) : null
       const newContent = commitSnap.files[p] !== undefined ? String(commitSnap.files[p]) : null
@@ -483,27 +675,17 @@ async function cmdDiff(opts) {
         if (opts.json === 'true') {
           print({ path: p, old: oldContent, new: newContent }, true)
         } else {
-          process.stdout.write(color(`diff --git a/${p} b/${p}\n`, 'dim'))
+          process.stdout.write(color(`diff --git a/${p} b/${p}\n`, 'bold'))
           if (oldContent === null) {
             process.stdout.write(color(`+++ b/${p}\n`, 'green'))
-            process.stdout.write(color(`+${newContent}\n`, 'green'))
+            const lines = newContent.split(/\r?\n/)
+            for (const line of lines) process.stdout.write(color(`+${line}\n`, 'green'))
           } else if (newContent === null) {
             process.stdout.write(color(`--- a/${p}\n`, 'red'))
-            process.stdout.write(color(`-${oldContent}\n`, 'red'))
+            const lines = oldContent.split(/\r?\n/)
+            for (const line of lines) process.stdout.write(color(`-${line}\n`, 'red'))
           } else {
-            const oldLines = oldContent.split(/\r?\n/)
-            const newLines = newContent.split(/\r?\n/)
-            const maxLen = Math.max(oldLines.length, newLines.length)
-            for (let i = 0; i < maxLen; i++) {
-              const oldLine = oldLines[i]
-              const newLine = newLines[i]
-              if (oldLine !== newLine) {
-                if (oldLine !== undefined) process.stdout.write(color(`-${oldLine}\n`, 'red'))
-                if (newLine !== undefined) process.stdout.write(color(`+${newLine}\n`, 'green'))
-              } else if (oldLine !== undefined) {
-                process.stdout.write(` ${oldLine}\n`)
-              }
-            }
+            printUnifiedDiff(oldContent.split(/\r?\n/), newContent.split(/\r?\n/))
           }
         }
       }
@@ -512,41 +694,37 @@ async function cmdDiff(opts) {
   }
 
   // Show diff for working directory
-  const remoteSnap = await fetchRemoteSnapshot(server, meta.repoId, meta.branch, token)
+  const metaDir = path.join(dir, '.vcs-next')
+  const localPath = path.join(metaDir, 'local.json')
+  let localMeta = { baseFiles: {} }
+  try {
+    const s = fs.readFileSync(localPath, 'utf8')
+    localMeta = JSON.parse(s)
+  } catch {}
+
+  const baseFiles = localMeta.pendingCommit ? localMeta.pendingCommit.files : localMeta.baseFiles
   const local = await collectLocal(dir)
-  const files = filePath ? [filePath] : Object.keys(new Set([...Object.keys(remoteSnap.files), ...Object.keys(local)]))
+  const files = filePath ? [filePath] : [...new Set([...Object.keys(baseFiles), ...Object.keys(local)])]
 
   for (const p of files) {
-    const remoteContent = remoteSnap.files[p] !== undefined ? String(remoteSnap.files[p]) : null
+    const baseContent = baseFiles[p] !== undefined ? String(baseFiles[p]) : null
     const localContent = local[p]?.content || null
-    const remoteId = remoteSnap.files[p] !== undefined ? hashContent(Buffer.from(String(remoteSnap.files[p]))) : null
-    const localId = local[p]?.id
 
-    if (remoteId !== localId) {
+    if (baseContent !== localContent) {
       if (opts.json === 'true') {
-        print({ path: p, remote: remoteContent, local: localContent }, true)
+        print({ path: p, base: baseContent, local: localContent }, true)
       } else {
-        process.stdout.write(color(`diff --git a/${p} b/${p}\n`, 'dim'))
+        process.stdout.write(color(`diff --git a/${p} b/${p}\n`, 'bold'))
         if (localContent === null) {
           process.stdout.write(color(`--- a/${p}\n`, 'red'))
-          process.stdout.write(color(`-${remoteContent || ''}\n`, 'red'))
-        } else if (remoteContent === null) {
+          const lines = (baseContent || '').split(/\r?\n/)
+          for (const line of lines) process.stdout.write(color(`-${line}\n`, 'red'))
+        } else if (baseContent === null) {
           process.stdout.write(color(`+++ b/${p}\n`, 'green'))
-          process.stdout.write(color(`+${localContent}\n`, 'green'))
+          const lines = localContent.split(/\r?\n/)
+          for (const line of lines) process.stdout.write(color(`+${line}\n`, 'green'))
         } else {
-          const remoteLines = String(remoteContent).split(/\r?\n/)
-          const localLines = String(localContent).split(/\r?\n/)
-          const maxLen = Math.max(remoteLines.length, localLines.length)
-          for (let i = 0; i < maxLen; i++) {
-            const remoteLine = remoteLines[i]
-            const localLine = localLines[i]
-            if (remoteLine !== localLine) {
-              if (remoteLine !== undefined) process.stdout.write(color(`-${remoteLine}\n`, 'red'))
-              if (localLine !== undefined) process.stdout.write(color(`+${localLine}\n`, 'green'))
-            } else if (remoteLine !== undefined) {
-              process.stdout.write(` ${remoteLine}\n`)
-            }
-          }
+          printUnifiedDiff(baseContent.split(/\r?\n/), localContent.split(/\r?\n/))
         }
       }
     }