codeowners-git 1.4.1 → 1.5.0

package/README.md

@@ -102,11 +102,16 @@ Options:
 - `--upstream, -u` Upstream branch name (defaults to local branch name)
 - `--force, -f` Force push to remote
 - `--keep-branch-on-failure, -k` Keep the created branch even if operation fails
+- `--append` Add commits to existing branch instead of creating a new one
 
 Example:
 
 ```bash
+# Create a new branch
 codeowners-git branch -o @myteam -b "feature/new-feature" -m "Add new feature" -p
+
+# Add more commits to the same branch later
+codeowners-git branch -o @myteam -b "feature/new-feature" -m "Add more changes" --append -p
 ```
 
 ### `multi-branch`
@@ -132,6 +137,7 @@ Options:
 - `--default-owner, -d` Default owner to use when no codeowners are found for changed files
 - `--ignore` Comma-separated patterns to exclude codeowners (e.g., 'team-a,team-b')
 - `--include` Comma-separated patterns to include codeowners (e.g., 'team-_,@org/_')
+- `--append` Add commits to existing branches instead of creating new ones
 
 > **Note:** You cannot use both `--ignore` and `--include` options at the same time.
 
@@ -149,6 +155,9 @@ codeowners-git multi-branch -b "feature/new-feature" -m "Add new feature" --incl
 
 # Use default owner when no codeowners found
 codeowners-git multi-branch -b "feature/new-feature" -m "Add new feature" -d "@default-team"
+
+# Add more commits to existing branches
+codeowners-git multi-branch -b "feature/new-feature" -m "Add more changes" --append -p
 ```
 
 This will:

package/dist/cli.js

@@ -14706,10 +14706,13 @@ var getOwner = (filePath) => {
   const owner = instance.getOwner(filePath);
   return owner;
 };
-var getOwnerFiles = async (owner) => {
+var getOwnerFiles = async (owner, includeUnowned = false) => {
   const changedFiles = await getChangedFiles();
   return changedFiles.filter((file) => {
     const owners = getOwner(file);
+    if (includeUnowned && owners.length === 0) {
+      return true;
+    }
     return owners.includes(owner);
   });
 };
@@ -14783,10 +14786,10 @@ var branch = async (options) => {
     if (!options.branch || !options.message || !options.owner) {
       throw new Error("Missing required options for branch creation");
     }
-    log.info("Starting branch creation process...");
+    log.info(options.append ? "Starting branch update process..." : "Starting branch creation process...");
     originalBranch = await getCurrentBranch();
     log.info(`Currently on branch: ${originalBranch}`);
-    filesToCommit = await getOwnerFiles(options.owner);
+    filesToCommit = await getOwnerFiles(options.owner, options.isDefaultOwner || false);
     if (filesToCommit.length <= 0) {
       log.warn(`No files found for ${options.owner}. Skipping branch creation.`);
       return;
@@ -14794,13 +14797,19 @@ var branch = async (options) => {
     log.file(`Files to be committed:
   ${filesToCommit.join(`
   `)}`);
-    if (await branchExists(options.branch)) {
-      throw new Error(`Branch "${options.branch}" already exists. Use a different name or delete the existing branch first.`);
+    const branchAlreadyExists = await branchExists(options.branch);
+    if (branchAlreadyExists && !options.append) {
+      throw new Error(`Branch "${options.branch}" already exists. Use --append to add commits to it, or use a different name.`);
     }
     try {
-      log.info(`Creating new branch "${options.branch}"...`);
-      await createBranch(options.branch);
-      newBranchCreated = true;
+      if (branchAlreadyExists && options.append) {
+        log.info(`Checking out existing branch "${options.branch}"...`);
+        await checkout(options.branch);
+      } else {
+        log.info(`Creating new branch "${options.branch}"...`);
+        await createBranch(options.branch);
+        newBranchCreated = true;
+      }
       log.info(`Committing changes with message: "${options.message}" ${!options.verify ? "(no-verify)" : ""}...`);
       await commitChanges(filesToCommit, {
         message: options.message ?? "",
@@ -14816,7 +14825,11 @@ var branch = async (options) => {
       }
       log.info(`Checking out original branch "${originalBranch}"...`);
       await checkout(originalBranch);
-      log.success(options.push ? `Branch "${options.branch}" created, changes committed, and pushed to remote.` : `Branch "${options.branch}" created and changes committed.`);
+      if (branchAlreadyExists && options.append) {
+        log.success(options.push ? `Changes committed to existing branch "${options.branch}" and pushed to remote.` : `Changes committed to existing branch "${options.branch}".`);
+      } else {
+        log.success(options.push ? `Branch "${options.branch}" created, changes committed, and pushed to remote.` : `Branch "${options.branch}" created and changes committed.`);
+      }
     } catch (operationError) {
       log.error(`Operation failed: ${operationError}`);
       if (newBranchCreated) {
@@ -14863,28 +14876,32 @@ var multiBranch = async (options) => {
     if (options.ignore && options.include) {
       throw new Error("Cannot use both --ignore and --include options at the same time");
     }
-    log.info("Starting multi-branch creation process...");
+    log.info(options.append ? "Starting multi-branch update process..." : "Starting multi-branch creation process...");
     const changedFiles = await getChangedFiles();
     if (changedFiles.length === 0) {
       throw new Error("No changed files found in the repository");
     }
     const ownerSet = new Set;
+    const filesWithoutOwners = [];
     for (const file of changedFiles) {
       const owners = getOwner(file);
-      for (const owner of owners) {
-        ownerSet.add(owner);
+      if (owners.length === 0) {
+        filesWithoutOwners.push(file);
+      } else {
+        for (const owner of owners) {
+          ownerSet.add(owner);
+        }
       }
     }
     let codeowners2 = Array.from(ownerSet);
+    if (filesWithoutOwners.length > 0 && options.defaultOwner) {
+      log.info(`Found ${filesWithoutOwners.length} files without owners. Adding default owner: ${options.defaultOwner}`);
+      codeowners2.push(options.defaultOwner);
+    }
     if (codeowners2.length === 0) {
       log.warn("No codeowners found for the changed files");
-      if (options.defaultOwner) {
-        log.info(`Using default owner: ${options.defaultOwner}`);
-        codeowners2.push(options.defaultOwner);
-      } else {
-        log.info("Continuing without creating any branches (use --default-owner to specify a fallback)");
-        return;
-      }
+      log.info("Continuing without creating any branches (use --default-owner to specify a fallback)");
+      return;
     } else {
       log.info(`Found ${codeowners2.length} codeowners: ${codeowners2.join(", ")}`);
     }
@@ -14914,7 +14931,7 @@ var multiBranch = async (options) => {
         const sanitizedOwner = owner.replace(/[^a-zA-Z0-9-_@]/g, "-").replace(/^@/, "");
         const branchName = `${options.branch}/${sanitizedOwner}`;
         const commitMessage = `${options.message} - ${owner}`;
-        log.info(`Creating branch for ${owner}...`);
+        log.info(options.append ? `Updating branch for ${owner}...` : `Creating branch for ${owner}...`);
         await branch({
           owner,
           branch: branchName,
@@ -14924,16 +14941,18 @@ var multiBranch = async (options) => {
           remote: options.remote,
           upstream: options.upstream,
           force: options.force,
-          keepBranchOnFailure: options.keepBranchOnFailure
+          keepBranchOnFailure: options.keepBranchOnFailure,
+          isDefaultOwner: owner === options.defaultOwner,
+          append: options.append
         });
         results.success.push(owner);
       } catch (error) {
-        log.error(`Failed to create branch for ${owner}: ${error}`);
+        log.error(`Failed to ${options.append ? "update" : "create"} branch for ${owner}: ${error}`);
         results.failure.push(owner);
       }
     }
-    log.header("Multi-branch creation summary");
-    log.info(`Successfully created branches for ${results.success.length} of ${codeowners2.length} codeowners`);
+    log.header(options.append ? "Multi-branch update summary" : "Multi-branch creation summary");
+    log.info(options.append ? `Successfully updated branches for ${results.success.length} of ${codeowners2.length} codeowners` : `Successfully created branches for ${results.success.length} of ${codeowners2.length} codeowners`);
     if (results.success.length) {
       log.success(`Successful: ${results.success.join(", ")}`);
     }
@@ -14946,7 +14965,7 @@ var multiBranch = async (options) => {
   }
 };
 // package.json
-var version = "1.4.1";
+var version = "1.5.0";
 
 // src/commands/version.ts
 function getVersion() {
@@ -14957,6 +14976,6 @@ function getVersion() {
 var program2 = new Command;
 program2.name("codeowners").description("CLI tool for grouping and managing staged files by CODEOWNERS").version(getVersion());
 program2.command("list").description("Lists all git changed files by CODEOWNER").option("-o, --owner <owner>", "Filter by specific code owner").option("-i, --include <patterns>", "Filter by owner patterns").action(listCodeowners);
-program2.command("branch").description("Create new branch with codeowner changes").requiredOption("-o, --owner <owner>", "Code owner name").requiredOption("-b, --branch <branch>", "Branch name").requiredOption("-m, --message <message>", "Commit message").option("-n, --no-verify", "Skip lint-staged or any other ci checks").option("-p, --push", "Push branch to remote after commit").option("-r, --remote <remote>", "Remote name to push to", "origin").option("-u, --upstream <upstream>", "Upstream branch name (defaults to local branch name)").option("-f, --force", "Force push to remote").option("-k, --keep-branch-on-failure", "Keep the created branch even if operation fails").action(branch);
-program2.command("multi-branch").description("Create branches for all codeowners").requiredOption("-b, --branch <branch>", "Base branch name (will be suffixed with codeowner name)").requiredOption("-m, --message <message>", "Base commit message (will be suffixed with codeowner name)").option("-n, --no-verify", "Skip lint-staged or any other ci checks").option("-p, --push", "Push branches to remote after commit").option("-r, --remote <remote>", "Remote name to push to", "origin").option("-u, --upstream <upstream>", "Upstream branch name pattern (defaults to local branch name)").option("-f, --force", "Force push to remote").option("-k, --keep-branch-on-failure", "Keep created branches even if operation fails").option("-d, --default-owner <defaultOwner>", "Default owner to use when no codeowners are found for changed files").option("--ignore <patterns>", "Comma-separated patterns to exclude codeowners (e.g., 'team-a,team-b')").option("--include <patterns>", "Comma-separated patterns to include codeowners (e.g., 'team-*,@org/*')").action(multiBranch);
+program2.command("branch").description("Create new branch with codeowner changes").requiredOption("-o, --owner <owner>", "Code owner name").requiredOption("-b, --branch <branch>", "Branch name").requiredOption("-m, --message <message>", "Commit message").option("-n, --no-verify", "Skip lint-staged or any other ci checks").option("-p, --push", "Push branch to remote after commit").option("-r, --remote <remote>", "Remote name to push to", "origin").option("-u, --upstream <upstream>", "Upstream branch name (defaults to local branch name)").option("-f, --force", "Force push to remote").option("-k, --keep-branch-on-failure", "Keep the created branch even if operation fails").option("--append", "Add commits to existing branch instead of creating a new one").action(branch);
+program2.command("multi-branch").description("Create branches for all codeowners").requiredOption("-b, --branch <branch>", "Base branch name (will be suffixed with codeowner name)").requiredOption("-m, --message <message>", "Base commit message (will be suffixed with codeowner name)").option("-n, --no-verify", "Skip lint-staged or any other ci checks").option("-p, --push", "Push branches to remote after commit").option("-r, --remote <remote>", "Remote name to push to", "origin").option("-u, --upstream <upstream>", "Upstream branch name pattern (defaults to local branch name)").option("-f, --force", "Force push to remote").option("-k, --keep-branch-on-failure", "Keep created branches even if operation fails").option("-d, --default-owner <defaultOwner>", "Default owner to use when no codeowners are found for changed files").option("--ignore <patterns>", "Comma-separated patterns to exclude codeowners (e.g., 'team-a,team-b')").option("--include <patterns>", "Comma-separated patterns to include codeowners (e.g., 'team-*,@org/*')").option("--append", "Add commits to existing branches instead of creating new ones").action(multiBranch);
 program2.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeowners-git",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "module": "src/cli.ts",
   "type": "module",
   "private": false,