gent-cli 1.7.0 → 1.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gent-cli",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "A modern, Git-like version control CLI with built-in cloud authentication and global user identity management.",
   "main": "src/index.js",
   "bin": {

package/src/commands/commit.js

@@ -82,21 +82,22 @@ async function commit(options) {
 
         // Create commit object
         const commit = {
-            hash: generateCommitHash(),
+            sha: generateCommitHash(),
             message: message,
             author: {
                 name: authorName,
                 email: authorEmail
             },
             timestamp: new Date().toISOString(),
-            parent: repository.branches[repository.currentBranch] || null,
+            parent: repository.branches[repository.currentBranch] ? [repository.branches[repository.currentBranch]] : [],
             files: []
         };
 
         // Create a map of parent files for quick lookup
         const parentFilesMap = new Map();
-        if (commit.parent) {
-            const parentCommit = repository.commits.find(c => c.hash === commit.parent);
+        if (commit.parent && commit.parent.length > 0) {
+            const parentSha = commit.parent[0];
+            const parentCommit = repository.commits.find(c => c.sha === parentSha);
             if (parentCommit) {
                 parentCommit.files.forEach(f => parentFilesMap.set(f.path, f.hash));
             }
@@ -140,7 +141,7 @@ async function commit(options) {
         // Add commit to repository
         repository.commits = repository.commits || [];
         repository.commits.push(commit);
-        repository.branches[repository.currentBranch] = commit.hash;
+        repository.branches[repository.currentBranch] = commit.sha;
 
         // Save repository and clear staging
         await writeJSON(path.join(gentPath, COMMITS_FILE), repository);
@@ -150,7 +151,7 @@ async function commit(options) {
         spinner.succeed(chalk.green('✓ Changes committed successfully!'));
 
         // Display commit info
-        console.log(chalk.cyan(`\n[${repository.currentBranch} ${commit.hash.substring(0, 7)}] ${message}`));
+        console.log(chalk.cyan(`\n[${repository.currentBranch} ${commit.sha.substring(0, 7)}] ${message}`));
         console.log(chalk.gray(`Author: ${commit.author.name} <${commit.author.email}>`));
         console.log(chalk.gray(`Date: ${new Date(commit.timestamp).toLocaleString()}`));
         console.log(chalk.gray(`\n${commit.files.length} file(s) changed`));

package/src/commands/log.js

@@ -55,10 +55,10 @@ function displayDetailedLog(commits, currentCommitHash, currentBranch) {
     console.log(chalk.bold.cyan(`\nCommit History (${currentBranch} branch):\n`));
 
     commits.forEach((commit, index) => {
-        const isHead = commit.hash === currentCommitHash;
+        const isHead = commit.sha === currentCommitHash;
         const headLabel = isHead ? chalk.yellow.bold(' (HEAD)') : '';
 
-        console.log(chalk.yellow(`commit ${commit.hash}`) + headLabel);
+        console.log(chalk.yellow(`commit ${commit.sha}`) + headLabel);
         console.log(chalk.white(`Author: ${commit.author.name} <${commit.author.email}>`));
         console.log(chalk.white(`Date:   ${new Date(commit.timestamp).toLocaleString()}`));
         console.log(chalk.gray(`        (${formatDistanceToNow(new Date(commit.timestamp), { addSuffix: true })})`));
@@ -79,9 +79,9 @@ function displayDetailedLog(commits, currentCommitHash, currentBranch) {
  */
 function displayOnelineLog(commits, currentCommitHash) {
     commits.forEach(commit => {
-        const isHead = commit.hash === currentCommitHash;
+        const isHead = commit.sha === currentCommitHash;
         const headLabel = isHead ? chalk.yellow(' (HEAD)') : '';
-        const shortHash = chalk.yellow(commit.hash.substring(0, 7));
+        const shortHash = chalk.yellow(commit.sha.substring(0, 7));
         const message = chalk.white(commit.message);
         const timeAgo = chalk.gray(`(${formatDistanceToNow(new Date(commit.timestamp), { addSuffix: true })})`);
 

package/src/commands/pull.js

@@ -92,7 +92,7 @@ async function pull(remoteName, branchName, options) {
                     },
                     timestamp: cloudCommit.committed_at,
                     parent: cloudCommit.parent_shas || [],
-                    files: {} // Files are stored in objects directory
+                    files: cloudCommit.files || []
                 });
             }
         }

package/src/utils/cloud-sync.js

@@ -212,6 +212,12 @@ async function syncCommitsFromCloud(ownerId, repoName, cwd) {
             // Download tree
             const tree = await repoService.getTree(ownerId, repoName, commit.tree_sha);
 
+            // Store entries for local metadata
+            commit.files = tree.entries.map(entry => ({
+                path: entry.path,
+                hash: entry.sha
+            }));
+
             // Download blobs from tree entries
             const blobShas = tree.entries.map(entry => entry.sha);
             const blobMap = await downloadBlobs(blobShas, ownerId, repoName);

package/src/utils/fileSystem.js

@@ -170,7 +170,7 @@ async function getTrackedFiles(gentPath, commitHash) {
     }
 
     const repository = await readJSON(path.join(gentPath, 'commits.json'));
-    const commit = repository.commits.find(c => c.hash === commitHash);
+    const commit = repository.commits.find(c => c.sha === commitHash);
 
     return commit ? commit.files : [];
 }