refactor(dev-infra): move getRepoBaseDir() to GitClient (angular#41527)

As `getRepoBaseDir()` relies on git, it should be a method on `GitClient` for retrieval
rather than its own utility outside of the common GitClient used for all git ineractions.

PR Close angular#41527

Author: josephperrott

dev-infra/build-worker.js

@@ -9,7 +9,7 @@
 import {SpawnSyncReturns} from 'child_process';
 
 import * as console from '../../utils/console';
-import {GitClient} from '../../utils/git';
+import {GitClient} from '../../utils/git/index';
 import {installVirtualGitClientSpies, mockNgDevConfig} from '../../utils/testing';
 
 import {G3Module, G3StatsData} from './g3';

dev-infra/caretaker/check/g3.spec.ts

@@ -10,7 +10,6 @@ import {existsSync, readFileSync} from 'fs';
 import * as multimatch from 'multimatch';
 import {join} from 'path';
 import {parse as parseYaml} from 'yaml';
-import {getRepoBaseDir} from '../../utils/config';
 import {bold, debug, error, info} from '../../utils/console';
 
 import {BaseModule} from './base';
@@ -121,7 +120,7 @@ export class G3Module extends BaseModule<G3StatsData|void> {
 
 
   private getG3FileIncludeAndExcludeLists() {
-    const angularRobotFilePath = join(getRepoBaseDir(), '.github/angular-robot.yml');
+    const angularRobotFilePath = join(this.git.baseDir, '.github/angular-robot.yml');
     if (!existsSync(angularRobotFilePath)) {
       debug('No angular robot configuration file exists, skipping.');
       return null;

dev-infra/caretaker/check/g3.ts

@@ -8,15 +8,16 @@
 import {readFileSync} from 'fs';
 import {resolve} from 'path';
 
-import {getRepoBaseDir} from '../../utils/config';
 import {error, green, info, log, red, yellow} from '../../utils/console';
+import {GitClient} from '../../utils/git/index';
 
 import {deleteCommitMessageDraft, saveCommitMessageDraft} from '../restore-commit-message/commit-message-draft';
 import {printValidationErrors, validateCommitMessage} from '../validate';
 
 /** Validate commit message at the provided file path. */
 export function validateFile(filePath: string, isErrorMode: boolean) {
-  const commitMessage = readFileSync(resolve(getRepoBaseDir(), filePath), 'utf8');
+  const git = GitClient.getInstance();
+  const commitMessage = readFileSync(resolve(git.baseDir, filePath), 'utf8');
   const {valid, errors} = validateCommitMessage(commitMessage);
   if (valid) {
     info(`${green('√')}  Valid commit message`);

dev-infra/commit-message/validate-file/validate-file.ts

@@ -6,8 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as yargs from 'yargs';
-
-import {allChangedFilesSince, allFiles, allStagedFiles} from '../utils/repo-files';
+import {GitClient} from '../utils/git/index';
 
 import {checkFiles, formatFiles} from './format';
 
@@ -25,21 +24,24 @@ export function buildFormatParser(localYargs: yargs.Argv) {
           'all', 'Run the formatter on all files in the repository', args => args,
           ({check}) => {
             const executionCmd = check ? checkFiles : formatFiles;
-            executionCmd(allFiles());
+            const allFiles = GitClient.getInstance().allFiles();
+            executionCmd(allFiles);
           })
       .command(
           'changed [shaOrRef]', 'Run the formatter on files changed since the provided sha/ref',
           args => args.positional('shaOrRef', {type: 'string'}),
           ({shaOrRef, check}) => {
             const sha = shaOrRef || 'master';
             const executionCmd = check ? checkFiles : formatFiles;
-            executionCmd(allChangedFilesSince(sha));
+            const allChangedFilesSince = GitClient.getInstance().allChangesFilesSince(sha);
+            executionCmd(allChangedFilesSince);
           })
       .command(
           'staged', 'Run the formatter on all staged files', args => args,
           ({check}) => {
             const executionCmd = check ? checkFiles : formatFiles;
-            executionCmd(allStagedFiles());
+            const allStagedFiles = GitClient.getInstance().allStagedFiles();
+            executionCmd(allStagedFiles);
           })
       .command(
           'files <files..>', 'Run the formatter on provided files',

dev-infra/format/cli.ts

@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {GitClient} from '../../utils/git/index';
 import {FormatConfig} from '../config';
 
 // A callback to determine if the formatter run found a failure in formatting.
@@ -24,6 +25,7 @@ interface FormatterActionMetadata {
  * The base class for formatters to run against provided files.
  */
 export abstract class Formatter {
+  protected git = GitClient.getInstance();
   /**
    * The name of the formatter, this is used for identification in logging and for enabling and
    * configuring the formatter in the config.

dev-infra/format/formatters/base-formatter.ts

@@ -8,7 +8,6 @@
 
 import {join} from 'path';
 
-import {getRepoBaseDir} from '../../utils/config';
 import {error} from '../../utils/console';
 
 import {Formatter} from './base-formatter';
@@ -19,7 +18,7 @@ import {Formatter} from './base-formatter';
 export class Buildifier extends Formatter {
   name = 'buildifier';
 
-  binaryFilePath = join(getRepoBaseDir(), 'node_modules/.bin/buildifier');
+  binaryFilePath = join(this.git.baseDir, 'node_modules/.bin/buildifier');
 
   defaultFileMatcher = ['**/*.bzl', '**/BUILD.bazel', '**/WORKSPACE', '**/BUILD'];
 

dev-infra/format/formatters/buildifier.ts

@@ -8,7 +8,6 @@
 
 import {join} from 'path';
 
-import {getRepoBaseDir} from '../../utils/config';
 import {error} from '../../utils/console';
 
 import {Formatter} from './base-formatter';
@@ -19,7 +18,7 @@ import {Formatter} from './base-formatter';
 export class ClangFormat extends Formatter {
   name = 'clang-format';
 
-  binaryFilePath = join(getRepoBaseDir(), 'node_modules/.bin/clang-format');
+  binaryFilePath = join(this.git.baseDir, 'node_modules/.bin/clang-format');
 
   defaultFileMatcher = ['**/*.{t,j}s'];