resulgit 1.0.10 → 1.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resulgit",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "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

@@ -1379,11 +1379,16 @@ async function cmdPush(opts) {
         const line = firstDiffLine(l || '', r || '')
         conflicts.push({ path: p, line })
       } else if (changedLocal && !changedRemote) {
+        // Local changed, use local version
         if (l !== null) merged[p] = l
       } else if (!changedLocal && changedRemote) {
+        // Remote changed, use remote version
         if (r !== null) merged[p] = r
       } else {
-        if (b !== null) merged[p] = b
+        // No changes - include the file from whatever source has it
+        if (l !== null) merged[p] = l
+        else if (r !== null) merged[p] = r
+        else if (b !== null) merged[p] = b
       }
     }
     if (conflicts.length > 0) {
@@ -1399,6 +1404,18 @@ async function cmdPush(opts) {
       }
       return
     }
+
+    // Check if there are any files to push
+    if (Object.keys(merged).length === 0) {
+      spinnerFail(spinner, 'Nothing to push')
+      if (opts.json === 'true') {
+        print({ error: 'No files to push' }, true)
+      } else {
+        process.stdout.write('No files to push. Add some files first.\n')
+      }
+      return
+    }
+
     // Execute pre-push hook
     spinnerUpdate(spinner, 'Running pre-push hook...')
     try {
@@ -1413,7 +1430,7 @@ async function cmdPush(opts) {
     }
 
     const body = { message: localMeta.pendingCommit?.message || (opts.message || 'Push'), files: merged, branchName: remoteMeta.branch }
-    spinnerUpdate(spinner, `Pushing to '${remoteMeta.branch}'...`)
+    spinnerUpdate(spinner, `Pushing ${Object.keys(merged).length} file(s) to '${remoteMeta.branch}'...`)
     const url = new URL(`/api/repositories/${remoteMeta.repoId}/commits`, server).toString()
     const data = await request('POST', url, body, token)
     localMeta.baseCommitId = data.id || remote.commitId || ''
@@ -2403,9 +2420,32 @@ async function cmdInit(opts) {
     `\ttoken = ${opts.token || token || ''}`
   ].join('\n')
   await fs.promises.writeFile(path.join(gitDir, 'config'), gitConfig, 'utf8')
-  const remoteMeta = { repoId: repoId, branch, commitId: '', server: opts.server || server || '', token: opts.token || token || '' }
+
+  let remoteCommitId = ''
+  let baseFiles = {}
+
+  // If remote was created, fetch the initial snapshot to sync baseFiles
+  if (remoteCreated && repoId && server) {
+    try {
+      spinnerUpdate(spinner, 'Syncing with remote...')
+      const snapshot = await fetchRemoteSnapshot(server, repoId, branch, token)
+      remoteCommitId = snapshot.commitId || ''
+      baseFiles = snapshot.files || {}
+
+      // Write the remote files to the local directory (like a clone)
+      for (const [filePath, content] of Object.entries(baseFiles)) {
+        const fullPath = path.join(targetDir, filePath)
+        await fs.promises.mkdir(path.dirname(fullPath), { recursive: true })
+        await fs.promises.writeFile(fullPath, String(content), 'utf8')
+      }
+    } catch (err) {
+      // Ignore sync errors - the repo might be truly empty
+    }
+  }
+
+  const remoteMeta = { repoId: repoId, branch, commitId: remoteCommitId, server: opts.server || server || '', token: opts.token || token || '' }
   await fs.promises.writeFile(path.join(metaDir, 'remote.json'), JSON.stringify(remoteMeta, null, 2))
-  const localMeta = { baseCommitId: '', baseFiles: {}, pendingCommit: null }
+  const localMeta = { baseCommitId: remoteCommitId, baseFiles: baseFiles, pendingCommit: null }
   await fs.promises.writeFile(path.join(metaDir, 'local.json'), JSON.stringify(localMeta, null, 2))
 
   if (remoteCreated) {