brch 0.0.2 → 0.0.3

package/dist/index.js

@@ -3135,7 +3135,7 @@ var shouldIgnore = (absPath, repoRoot, ignorePatterns) => {
   if (relPath === "") {
     return false;
   }
-  if (relPath === VCS_DIR || relPath.startsWith(`${VCS_DIR}/`)) {
+  if (relPath === VCS_DIR || relPath.startsWith(`${VCS_DIR}/`) || relPath === `./${VCS_DIR}` || relPath.startsWith(`./${VCS_DIR}/`)) {
     return true;
   }
   return matchesIgnorePattern(absPath, repoRoot, ignorePatterns);
@@ -3196,10 +3196,12 @@ commit will be skipped. Only files that exist and have been modified will be sta
       console.log(source_default.green("Staged:"));
       staged.forEach((path) => console.log(source_default.green(" - ") + path));
     }
+    console.log();
     if (skipped.length > 0) {
       console.log(source_default.yellow("Skipped (unchanged or not found):"));
       skipped.forEach((path) => console.log(source_default.yellow(" - ") + path));
     }
+    console.log();
     if (staged.length === 0 && skipped.length === 0) {
       console.log(source_default.yellow("Nothing to add."));
     }
@@ -3282,7 +3284,6 @@ var commitChanges = async (message) => {
     const branchRefPath = path2.join(repoRoot, REFS_HEAD_PATH, branchName);
     await mkdir4(path2.dirname(branchRefPath), { recursive: true });
     await writeFile4(branchRefPath, commitHash);
-    await writeFile4(INDEX_PATH, JSON.stringify([]));
     console.log(`Commit successfully created: ${commitHash}`);
   } catch (error) {
     const message2 = error instanceof Error ? error.message : String(error);
@@ -4826,7 +4827,15 @@ var log = async (options) => {
 };
 
 // src/commands/logCommand.ts
-var logCommand = new Command("log").description("Show commit history for the current repository in reverse chronological order").option("-L, --limit <number>", "Limit the number of commits to display").addHelpText("after", "Displays each commit with author, date, and message. Use -L or --limit to restrict output to a specific number of commits.").action(log);
+var logCommand = new Command("log").description("Show commit history for the current repository in reverse chronological order").option("-L, --limit <number>", "Limit the number of commits to display").addHelpText("after", `
+Examples:
+  $ brch log                      Show all commits
+  $ brch log -L 5                 Show the last 5 commits
+  $ brch log --limit 10           Show the last 10 commits
+
+Displays each commit with author, date, hash, and message.
+Commits are shown from newest to oldest.
+`).action(log);
 
 // src/services/statusService.ts
 import fs4 from "fs/promises";
@@ -4862,11 +4871,9 @@ var getTrackedFiles = async (commitHash) => {
   try {
     const commitPath = path4.join(OBJECTS_PATH, commitHash.substring(0, 2), commitHash.substring(2));
     const commitData = JSON.parse(await fs4.readFile(commitPath, "utf-8"));
-    if (commitData.tree) {
-      const treePath = path4.join(OBJECTS_PATH, commitData.tree.substring(0, 2), commitData.tree.substring(2));
-      const treeData = JSON.parse(await fs4.readFile(treePath, "utf-8"));
-      for (const [file, hash] of Object.entries(treeData)) {
-        trackedFiles.set(file, hash);
+    if (commitData.files && Array.isArray(commitData.files)) {
+      for (const entry of commitData.files) {
+        trackedFiles.set(entry.path, entry.hash);
       }
     }
   } catch (error) {}
@@ -4887,7 +4894,28 @@ var readIndex3 = async () => {
     return [];
   }
 };
-var stripLeadingDot = (p) => p.startsWith("./") ? p.slice(2) : p;
+var normalizeRelativePath3 = (pathValue) => {
+  const normalized = pathValue.split("\\").join("/");
+  if (normalized && !normalized.startsWith("./") && !normalized.startsWith("../") && !normalized.startsWith("/")) {
+    return "./" + normalized;
+  }
+  return normalized;
+};
+var walk = async (dir, repoRoot, ignorePatterns) => {
+  let files = [];
+  const entries = await fs4.readdir(dir, { withFileTypes: true });
+  for (const entry of entries) {
+    const res = path4.resolve(dir, entry.name);
+    if (entry.name === VCS_DIR || shouldIgnore2(entry.name, ignorePatterns))
+      continue;
+    if (entry.isDirectory()) {
+      files = files.concat(await walk(res, repoRoot, ignorePatterns));
+    } else {
+      files.push(normalizeRelativePath3(path4.relative(repoRoot, res)));
+    }
+  }
+  return files;
+};
 var status = async () => {
   try {
     const currentBranch = await getCurrentBranchName();
@@ -4895,65 +4923,88 @@ var status = async () => {
     const trackedFiles = await getTrackedFiles(currentHead);
     const ignorePatterns = await getIgnorePatterns();
     const indexEntries = await readIndex3();
-    const stagedSet = new Set(indexEntries.map((e) => stripLeadingDot(e.path)));
+    const indexMap = new Map;
+    for (const entry of indexEntries) {
+      indexMap.set(entry.path, entry.hash);
+    }
     console.log(`On branch ${source_default.cyan(currentBranch || "detached HEAD")}`);
-    const workdir = process.cwd();
-    const entries = await fs4.readdir(workdir, { withFileTypes: true });
-    const stagedFiles = [];
+    const repoRoot = process.cwd();
+    const allFiles = await walk(repoRoot, repoRoot, ignorePatterns);
+    const stagedAdditions = [];
+    const stagedModifications = [];
+    const stagedDeletions = [];
     const modifiedFiles = [];
-    const untrackedItems = [];
-    for (const entry of entries) {
-      if (entry.name === VCS_DIR) {
-        continue;
-      }
-      if (shouldIgnore2(entry.name, ignorePatterns)) {
-        continue;
-      }
-      if (entry.isFile()) {
-        if (stagedSet.has(entry.name)) {
-          stagedFiles.push(entry.name);
-          continue;
+    const deletedFiles = [];
+    const untrackedFiles = [];
+    const allKnownPaths = new Set([
+      ...allFiles,
+      ...indexMap.keys(),
+      ...trackedFiles.keys()
+    ]);
+    const worktreeSet = new Set(allFiles);
+    for (const relPath of allKnownPaths) {
+      const indexHash = indexMap.get(relPath);
+      const headHash = trackedFiles.get(relPath);
+      const isWorktree = worktreeSet.has(relPath);
+      if (indexHash !== headHash) {
+        if (!headHash && indexHash) {
+          stagedAdditions.push(relPath);
+        } else if (headHash && !indexHash) {
+          stagedDeletions.push(relPath);
+        } else if (headHash && indexHash && headHash !== indexHash) {
+          stagedModifications.push(relPath);
         }
-        const filePath = path4.join(workdir, entry.name);
-        const fileHash = hashContent(filePath);
-        const trackedHash = trackedFiles.get(entry.name);
-        if (trackedHash) {
-          if (fileHash !== trackedHash) {
-            modifiedFiles.push(entry.name);
+      }
+      if (isWorktree) {
+        const fileBuffer = await fs4.readFile(path4.join(repoRoot, relPath));
+        const fileHash = hashContent(fileBuffer);
+        const baseHash = indexHash || headHash;
+        if (baseHash) {
+          if (fileHash !== indexHash && indexHash) {
+            modifiedFiles.push(relPath);
+          } else if (fileHash !== headHash && !indexHash) {
+            modifiedFiles.push(relPath);
           }
         } else {
-          untrackedItems.push({ name: entry.name, type: "file" });
+          untrackedFiles.push(relPath);
+        }
+      } else {
+        if (indexHash || headHash) {
+          if (indexHash) {
+            deletedFiles.push(relPath);
+          }
         }
-      } else if (entry.isDirectory()) {
-        untrackedItems.push({ name: entry.name, type: "directory" });
       }
     }
-    if (stagedFiles.length > 0) {
+    if (stagedAdditions.length > 0 || stagedModifications.length > 0 || stagedDeletions.length > 0) {
       console.log(`
 ${source_default.green("Changes to be committed:")}`);
       console.log(`  (use "${source_default.cyan("brch reset")}" to unstage)`);
-      for (const file of stagedFiles) {
-        console.log(`	${source_default.green("new file:")} ${file}`);
-      }
-    }
-    if (modifiedFiles.length > 0) {
+      for (const file of stagedAdditions)
+        console.log(`	${source_default.green("new file:")}   ${file}`);
+      for (const file of stagedModifications)
+        console.log(`	${source_default.green("modified:")}   ${file}`);
+      for (const file of stagedDeletions)
+        console.log(`	${source_default.green("deleted:")}    ${file}`);
+    }
+    if (modifiedFiles.length > 0 || deletedFiles.length > 0) {
       console.log(`
 ${source_default.red("Changes not staged for commit:")}`);
       console.log(`  (use "${source_default.cyan("brch add")}" to stage changes)`);
-      for (const file of modifiedFiles) {
-        console.log(`	${source_default.red("modified:")} ${file}`);
-      }
+      for (const file of modifiedFiles)
+        console.log(`	${source_default.red("modified:")}   ${file}`);
+      for (const file of deletedFiles)
+        console.log(`	${source_default.red("deleted:")}    ${file}`);
     }
-    if (untrackedItems.length > 0) {
+    if (untrackedFiles.length > 0) {
       console.log(`
-${source_default.red("Untracked files and directories:")}`);
+${source_default.red("Untracked files:")}`);
       console.log(`  (use "${source_default.cyan("brch add")}" to include in what will be committed)`);
-      for (const item of untrackedItems) {
-        const suffix = item.type === "directory" ? "/" : "";
-        console.log(`	${item.name}${suffix}`);
+      for (const file of untrackedFiles) {
+        console.log(`	${file}`);
       }
     }
-    if (modifiedFiles.length === 0 && untrackedItems.length === 0) {
+    if (stagedAdditions.length === 0 && stagedModifications.length === 0 && stagedDeletions.length === 0 && modifiedFiles.length === 0 && deletedFiles.length === 0 && untrackedFiles.length === 0) {
       console.log(source_default.green("nothing to commit, working tree clean"));
     }
   } catch (error) {
@@ -4964,7 +5015,17 @@ ${source_default.red("Untracked files and directories:")}`);
 };
 
 // src/commands/statusCommand.ts
-var statusCommand = new Command("status").description("Show the working tree status").action(async () => {
+var statusCommand = new Command("status").description("Show the working tree status").addHelpText("after", `
+Examples:
+  $ brch status
+
+Displays:
+  - Changes to be committed (staged files)
+  - Changes not staged for commit (modified tracked files)
+  - Untracked files (new files not yet added)
+
+Use 'brch add <file>...' to stage files for commit.
+`).action(async () => {
   status();
 });
 
@@ -5789,11 +5850,9 @@ var getTrackedFiles2 = async (commitHash) => {
   try {
     const commitPath = path5.join(OBJECTS_PATH, commitHash.substring(0, 2), commitHash.substring(2));
     const commitData = JSON.parse(await fs5.readFile(commitPath, "utf-8"));
-    if (commitData.tree) {
-      const treePath = path5.join(OBJECTS_PATH, commitData.tree.substring(0, 2), commitData.tree.substring(2));
-      const treeData = JSON.parse(await fs5.readFile(treePath, "utf-8"));
-      for (const [file, hash] of Object.entries(treeData)) {
-        trackedFiles.set(file, hash);
+    if (commitData.files && Array.isArray(commitData.files)) {
+      for (const entry of commitData.files) {
+        trackedFiles.set(entry.path, entry.hash);
       }
     }
   } catch (error) {}
@@ -5819,7 +5878,29 @@ var colorDiffLine = (line) => {
   }
   return line;
 };
-var diff = async () => {
+var normalizeRelativePath4 = (pathValue) => {
+  const normalized = pathValue.split("\\").join("/");
+  if (normalized && !normalized.startsWith("./") && !normalized.startsWith("../") && !normalized.startsWith("/")) {
+    return "./" + normalized;
+  }
+  return normalized;
+};
+var walk2 = async (dir, repoRoot, ignorePatterns) => {
+  let files = [];
+  const entries = await fs5.readdir(dir, { withFileTypes: true });
+  for (const entry of entries) {
+    const res = path5.resolve(dir, entry.name);
+    if (entry.name === VCS_DIR || shouldIgnore3(entry.name, ignorePatterns))
+      continue;
+    if (entry.isDirectory()) {
+      files = files.concat(await walk2(res, repoRoot, ignorePatterns));
+    } else {
+      files.push(normalizeRelativePath4(path5.relative(repoRoot, res)));
+    }
+  }
+  return files;
+};
+var diff = async (filePaths) => {
   try {
     const currentHead = await getCurrentHead();
     const trackedFiles = await getTrackedFiles2(currentHead);
@@ -5828,24 +5909,40 @@ var diff = async () => {
       console.log(source_default.yellow("No commits yet. Nothing to diff."));
       return;
     }
-    const workdir = process.cwd();
-    const entries = await fs5.readdir(workdir, { withFileTypes: true });
-    let hasDiffs = false;
-    for (const entry of entries) {
-      if (entry.name === VCS_DIR) {
-        continue;
-      }
-      if (shouldIgnore3(entry.name, ignorePatterns)) {
-        continue;
+    const repoRoot = process.cwd();
+    let filesToCompare = [];
+    if (filePaths && filePaths.length > 0) {
+      for (const p of filePaths) {
+        const absolutePath = path5.resolve(repoRoot, p);
+        try {
+          const stats = await fs5.stat(absolutePath);
+          if (stats.isDirectory()) {
+            const dirFiles = await walk2(absolutePath, repoRoot, ignorePatterns);
+            filesToCompare.push(...dirFiles);
+          } else {
+            const relativeToRoot = path5.relative(repoRoot, absolutePath);
+            filesToCompare.push(normalizeRelativePath4(relativeToRoot));
+          }
+        } catch (error) {
+          const relativeToRoot = path5.relative(repoRoot, absolutePath);
+          filesToCompare.push(normalizeRelativePath4(relativeToRoot));
+        }
       }
-      if (entry.isFile()) {
-        const filePath = path5.join(workdir, entry.name);
-        const fileHash = hashContent(filePath);
-        const trackedHash = trackedFiles.get(entry.name);
+      filesToCompare = [...new Set(filesToCompare)];
+    } else {
+      filesToCompare = await walk2(repoRoot, repoRoot, ignorePatterns);
+    }
+    let hasDiffs = false;
+    for (const relPath of filesToCompare) {
+      try {
+        const fullPath = path5.join(repoRoot, relPath);
+        const fileBuffer = await fs5.readFile(fullPath);
+        const fileHash = hashContent(fileBuffer);
+        const trackedHash = trackedFiles.get(relPath);
         if (trackedHash && fileHash !== trackedHash) {
           const oldContent = await getFileContentFromHash(trackedHash);
-          const newContent = await fs5.readFile(filePath, "utf-8");
-          const patch = createTwoFilesPatch(`a/${entry.name}`, `b/${entry.name}`, oldContent, newContent, "HEAD", "Working Directory");
+          const newContent = fileBuffer.toString("utf-8");
+          const patch = createTwoFilesPatch(`a/${relPath}`, `b/${relPath}`, oldContent, newContent, "HEAD", "Working Directory");
           const lines = patch.split(`
 `);
           for (const line of lines) {
@@ -5854,7 +5951,7 @@ var diff = async () => {
           console.log("");
           hasDiffs = true;
         }
-      }
+      } catch (error) {}
     }
     if (!hasDiffs) {
       console.log(source_default.green("No changes detected."));
@@ -5867,8 +5964,16 @@ var diff = async () => {
 };
 
 // src/commands/diffCommand.ts
-var diffCommand = new Command("diff").description("Show changes between working directory and last commit").action(async () => {
-  await diff();
+var diffCommand = new Command("diff").description("Show changes between working directory and last commit").argument("[files...]", "Specific files to show differences for").addHelpText("after", `
+Examples:
+  $ brch diff                     Show changes for all modified files
+  $ brch diff file.txt            Show changes for a specific file
+  $ brch diff src/                Show changes for all files in a directory
+
+Displays line-by-line differences between your current files and the last committed version.
+Deleted lines are shown in red, and added lines are shown in green.
+`).action(async (files) => {
+  await diff(files);
 });
 
 // src/commands/index.ts
@@ -5887,10 +5992,11 @@ program.name(VCS_NAME).description("brch - A simple version control system for t
 Examples:
   $ brch init                    Initialize a new repository
   $ brch add .                   Stage all files in current directory
-  $ brch add file1.txt file2.js  Stage specific files
-  $ brch commit -m "Initial commit"  Commit staged changes
+  $ brch status                  Show current repository status
+  $ brch commit -m "Commit msg"  Commit staged changes
+  $ brch log                     Show commit history
+  $ brch diff                    Show changes in working tree
   $ brch config set user.name "John Doe"  Set configuration
-  $ brch config set user.email "john@example.com" --global  Set global configuration
 
 For more information about a specific command, use:
   $ brch <command> --help

package/dist/services/diffService.d.ts

@@ -1 +1 @@
-export declare const diff: () => Promise<void>;
+export declare const diff: (filePaths?: string[]) => Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "brch",
-  "version": "0.0.2",
-  "description": "A simple VCS",
+  "version": "0.0.3",
+  "description": "brch - A simple version control system for tracking changes in your project",
   "author": "vishalkrsharma",
   "license": "MIT",
   "repository": {

package/test/sample.txt

@@ -0,0 +1 @@
+vishal kumar sharma