Merge pull request #92 from MichaelCurrin/feat-support-multiple-repos

feat: Support multiple repos

Author: MichaelCurrin

docs/development/advanced/sandbox.md

@@ -17,8 +17,8 @@ Follow these steps:
 1. Go to the _Debug_ tab.
 1. Select one of two tasks:
     - _Run Extension_ task.
-        - This will start in a default directory such as your user's home directory.
-        - You might want to use File / Open to change the sandbox window to a repo what has more content to play with. This will be remembered on later runs. Unfortunately if you changed your VS Code settings to open in a new window on Open, then the extension setup will be undone.
+        - This will start in a default directory - such as your user's home directory.
+        - You might want to use _File_ / _Open_ to change the sandbox window to a repo what has more content to play with. This will be _remembered_ on later runs. Unfortunately if you changed your VS Code settings to open in a new window on Open, then the extension setup will be undone.
     - _Start in Sandbox repo_ task.
         - For more reliable and consistent behavior.
         - This will run against `sandbox` directory in the project, which is a Git repo where you can make files and commits as you like. 

docs/features.md

@@ -15,7 +15,7 @@ A roadmap of features and whether done or not.
     - Handle **staged** files if there are any, so you can change a few files and then generate messages for those. But if there are zero staged changes, the extension will fall back to the working tree of unstaged changes.
     - Note that **new** files (including when doing a rename) should **always** be staged so that the extension can pick them up and so git can see that two paths for a renamed file are the same file.
 - [x] Generate a single-line commit message for a file to be committed, using action verbs (e.g. `Create`, `Update`, `Delete`)
-- [x] Handle changes from a single changed file
+- [x] Handle changes from a single changed file.
 - [ ] Handle changes from two or more files.
     - [x] As a list of the same nature e.g. `update foo.txt and fizz/bar.txt`, `feat: create foo.txt, fizz/bar.txt and buzz.js` (including prefix) and `Various changes to foo.txt and fizz/bar.txt` (for one updated and one new file). See [#29](https://github.com/MichaelCurrin/auto-commit-msg/pull/29).
     - [x] As a count. e.g. `update 3 files`. See [#38](https://github.com/MichaelCurrin/auto-commit-msg/issues/38).
@@ -24,6 +24,7 @@ A roadmap of features and whether done or not.
     - [ ] As a count with a conventional commit message. See [#51](https://github.com/MichaelCurrin/auto-commit-msg/issues/51).
     - [ ] As a count with a label. e.g. `update 3 config files`. See [#13](https://github.com/MichaelCurrin/auto-commit-msg/issues/13).
     - [ ] As count that uses the old message. See [#55](https://github.com/MichaelCurrin/auto-commit-msg/issues/55)
+- [x] Support using multiple repos in one VS Code window.
 - [x] Keep user-entered value as a prefix e.g. Keep `docs:` (or ticket number) so message becomes `docs: Update README.md`
 - [x] Use conventional commits e.g. `chore: Update package.json`
 - [x] Support directories or filenames with spaces in them by adding quotes. e.g. `chore: rename foo.txt to 'foo bar.txt'`

src/autofill.ts

@@ -17,14 +17,14 @@ Try saving your files or stage any new (untracked) files.\
  *
  * Steps:
  *
- *   1. Read git command output and the message in the Git Extension commit message box.
+ *   1. Read Git command output and the message in the Git Extension commit message box.
  *   2. Generate a message.
  *   3. Push message value to the commit message box.
  *
  * This is based on `prefixCommit` from the `git-prefix` extension.
  */
 export async function makeAndFillCommitMsg(repository: Repository) {
-  const fileChanges = await getChanges();
+  const fileChanges = await getChanges(repository);
 
   console.debug("diff-index:", fileChanges);
 

src/extension.ts

@@ -30,16 +30,15 @@ function _validateFoundRepos(git: API) {
  * Run autofill against one of multiples in the workspace or when using GitLens on a single repo.
  */
 async function _handleRepos(git: API, sourceControl: vscode.SourceControl) {
-  // FIXME: Unfortunately this seems to only pick up the first repo and not find
-  // second, etc. If you repository through to makeAndFillCommitMsg, getChanges
-  // and diffIndex etc. and replace "getWorkspaceFolder" usage then that will work.
   const selectedRepo = git.repositories.find(repository => {
     const uri = sourceControl.rootUri;
     if (!uri) {
       console.warn("rootUri not set for current repo");
       return false;
     }
-    return repository.rootUri.path === uri.path;
+    const repoPath = repository.rootUri.path;
+
+    return repoPath === uri.path;
   });
 
   if (selectedRepo) {

src/git/cli.ts

@@ -5,20 +5,19 @@
  */
 import util = require("util");
 import childProcess = require("child_process");
-
-import { getWorkspaceFolder } from "../workspace";
+import { Repository } from "../api/git";
 
 const exec = util.promisify(childProcess.exec);
 
 /**
- * Run a `git` subcommand with options and return output.
+ * Run a `git` subcommand and return output.
  */
 function _execute(cwd: string, subcommand: string, options: string[] = []) {
   const command = `git ${subcommand} ${options.join(" ")}`;
 
-  const result = exec(command, { cwd });
+  console.debug(`Running command: ${command}, cwd: ${cwd}`);
 
-  return result;
+  return exec(command, { cwd });
 }
 
 /**
@@ -33,9 +32,12 @@ function _execute(cwd: string, subcommand: string, options: string[] = []) {
  * The output already seems to never have color info, from my testing, but the
  * no-color flagged is added still to be safe.
  */
-async function _diffIndex(options: string[] = []): Promise<Array<string>> {
+async function _diffIndex(
+  repository: Repository,
+  options: string[] = []
+): Promise<Array<string>> {
+  const cwd = repository.rootUri.path;
   const cmd = "diff-index";
-
   const fullOptions = [
     "--name-status",
     "--find-renames",
@@ -44,11 +46,8 @@ async function _diffIndex(options: string[] = []): Promise<Array<string>> {
     ...options,
     "HEAD",
   ];
-  const { stdout, stderr } = await _execute(
-    getWorkspaceFolder(),
-    cmd,
-    fullOptions
-  );
+
+  const { stdout, stderr } = await _execute(cwd, cmd, fullOptions);
 
   if (stderr) {
     console.debug(`stderr for 'git ${cmd}' command:`, stderr);
@@ -68,8 +67,8 @@ async function _diffIndex(options: string[] = []): Promise<Array<string>> {
  *
  * Returns an array of strings.
  */
-export async function getChanges() {
-  const stagedChanges = await _diffIndex(["--cached"]);
+export async function getChanges(repository: Repository) {
+  const stagedChanges = await _diffIndex(repository, ["--cached"]);
 
   if (stagedChanges.length) {
     console.debug("Found staged changes");
@@ -81,7 +80,7 @@ export async function getChanges() {
     "Staging area is empty. Using unstaged files (tracked files only still)."
   );
 
-  const allChanges = await _diffIndex();
+  const allChanges = await _diffIndex(repository);
 
   if (!allChanges.length) {
     console.debug("No changes found");