fix(dev-infra): remove getBaseDir method from GitClient (#41898)
Remove the getBaseDir method from GitClient as the baseDir is determined once during construction and does not need to be rediscovered. The property access should always be used. PR Close #41898
This commit is contained in:
parent
f0696cdcfa
commit
c0694bf538
|
@ -365,19 +365,6 @@ var GitClient = /** @class */ (function () {
|
||||||
}
|
}
|
||||||
return new semver.SemVer(latestTag, semVerOptions);
|
return new semver.SemVer(latestTag, semVerOptions);
|
||||||
};
|
};
|
||||||
/** Gets the path of the directory for the repository base. */
|
|
||||||
GitClient.prototype.getBaseDir = function () {
|
|
||||||
var previousVerboseLoggingState = this.verboseLogging;
|
|
||||||
this.setVerboseLoggingState(false);
|
|
||||||
var _a = this.runGraceful(['rev-parse', '--show-toplevel']), stdout = _a.stdout, stderr = _a.stderr, status = _a.status;
|
|
||||||
this.setVerboseLoggingState(previousVerboseLoggingState);
|
|
||||||
if (status !== 0) {
|
|
||||||
throw Error("Unable to find the path to the base directory of the repository.\n" +
|
|
||||||
"Was the command run from inside of the repo?\n\n" +
|
|
||||||
("ERROR:\n " + stderr));
|
|
||||||
}
|
|
||||||
return stdout.trim();
|
|
||||||
};
|
|
||||||
/** Retrieve a list of all files in the repostitory changed since the provided shaOrRef. */
|
/** Retrieve a list of all files in the repostitory changed since the provided shaOrRef. */
|
||||||
GitClient.prototype.allChangesFilesSince = function (shaOrRef) {
|
GitClient.prototype.allChangesFilesSince = function (shaOrRef) {
|
||||||
if (shaOrRef === void 0) { shaOrRef = 'HEAD'; }
|
if (shaOrRef === void 0) { shaOrRef = 'HEAD'; }
|
||||||
|
@ -599,7 +586,7 @@ var cachedConfig = null;
|
||||||
function getConfig(baseDir) {
|
function getConfig(baseDir) {
|
||||||
// If the global config is not defined, load it from the file system.
|
// If the global config is not defined, load it from the file system.
|
||||||
if (cachedConfig === null) {
|
if (cachedConfig === null) {
|
||||||
baseDir = baseDir || GitClient.getInstance().getBaseDir();
|
baseDir = baseDir || GitClient.getInstance().baseDir;
|
||||||
// The full path to the configuration file.
|
// The full path to the configuration file.
|
||||||
var configPath = path.join(baseDir, CONFIG_FILE_PATH);
|
var configPath = path.join(baseDir, CONFIG_FILE_PATH);
|
||||||
// Read the configuration and validate it before caching it for the future.
|
// Read the configuration and validate it before caching it for the future.
|
||||||
|
|
|
@ -71,7 +71,7 @@ var userConfig = null;
|
||||||
function getConfig(baseDir) {
|
function getConfig(baseDir) {
|
||||||
// If the global config is not defined, load it from the file system.
|
// If the global config is not defined, load it from the file system.
|
||||||
if (cachedConfig === null) {
|
if (cachedConfig === null) {
|
||||||
baseDir = baseDir || GitClient.getInstance().getBaseDir();
|
baseDir = baseDir || GitClient.getInstance().baseDir;
|
||||||
// The full path to the configuration file.
|
// The full path to the configuration file.
|
||||||
var configPath = path.join(baseDir, CONFIG_FILE_PATH);
|
var configPath = path.join(baseDir, CONFIG_FILE_PATH);
|
||||||
// Read the configuration and validate it before caching it for the future.
|
// Read the configuration and validate it before caching it for the future.
|
||||||
|
@ -533,19 +533,6 @@ var GitClient = /** @class */ (function () {
|
||||||
}
|
}
|
||||||
return new semver.SemVer(latestTag, semVerOptions);
|
return new semver.SemVer(latestTag, semVerOptions);
|
||||||
};
|
};
|
||||||
/** Gets the path of the directory for the repository base. */
|
|
||||||
GitClient.prototype.getBaseDir = function () {
|
|
||||||
var previousVerboseLoggingState = this.verboseLogging;
|
|
||||||
this.setVerboseLoggingState(false);
|
|
||||||
var _a = this.runGraceful(['rev-parse', '--show-toplevel']), stdout = _a.stdout, stderr = _a.stderr, status = _a.status;
|
|
||||||
this.setVerboseLoggingState(previousVerboseLoggingState);
|
|
||||||
if (status !== 0) {
|
|
||||||
throw Error("Unable to find the path to the base directory of the repository.\n" +
|
|
||||||
"Was the command run from inside of the repo?\n\n" +
|
|
||||||
("ERROR:\n " + stderr));
|
|
||||||
}
|
|
||||||
return stdout.trim();
|
|
||||||
};
|
|
||||||
/** Retrieve a list of all files in the repostitory changed since the provided shaOrRef. */
|
/** Retrieve a list of all files in the repostitory changed since the provided shaOrRef. */
|
||||||
GitClient.prototype.allChangesFilesSince = function (shaOrRef) {
|
GitClient.prototype.allChangesFilesSince = function (shaOrRef) {
|
||||||
if (shaOrRef === void 0) { shaOrRef = 'HEAD'; }
|
if (shaOrRef === void 0) { shaOrRef = 'HEAD'; }
|
||||||
|
|
|
@ -69,7 +69,7 @@ export function getConfig(baseDir?: string): NgDevConfig;
|
||||||
export function getConfig(baseDir?: string): NgDevConfig {
|
export function getConfig(baseDir?: string): NgDevConfig {
|
||||||
// If the global config is not defined, load it from the file system.
|
// If the global config is not defined, load it from the file system.
|
||||||
if (cachedConfig === null) {
|
if (cachedConfig === null) {
|
||||||
baseDir = baseDir || GitClient.getInstance().getBaseDir();
|
baseDir = baseDir || GitClient.getInstance().baseDir;
|
||||||
// The full path to the configuration file.
|
// The full path to the configuration file.
|
||||||
const configPath = join(baseDir, CONFIG_FILE_PATH);
|
const configPath = join(baseDir, CONFIG_FILE_PATH);
|
||||||
// Read the configuration and validate it before caching it for the future.
|
// Read the configuration and validate it before caching it for the future.
|
||||||
|
|
|
@ -256,21 +256,6 @@ export class GitClient<Authenticated extends boolean> {
|
||||||
return new SemVer(latestTag, semVerOptions);
|
return new SemVer(latestTag, semVerOptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Gets the path of the directory for the repository base. */
|
|
||||||
getBaseDir(): string {
|
|
||||||
const previousVerboseLoggingState = this.verboseLogging;
|
|
||||||
this.setVerboseLoggingState(false);
|
|
||||||
const {stdout, stderr, status} = this.runGraceful(['rev-parse', '--show-toplevel']);
|
|
||||||
this.setVerboseLoggingState(previousVerboseLoggingState);
|
|
||||||
if (status !== 0) {
|
|
||||||
throw Error(
|
|
||||||
`Unable to find the path to the base directory of the repository.\n` +
|
|
||||||
`Was the command run from inside of the repo?\n\n` +
|
|
||||||
`ERROR:\n ${stderr}`);
|
|
||||||
}
|
|
||||||
return stdout.trim();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Retrieve a list of all files in the repostitory changed since the provided shaOrRef. */
|
/** Retrieve a list of all files in the repostitory changed since the provided shaOrRef. */
|
||||||
allChangesFilesSince(shaOrRef = 'HEAD'): string[] {
|
allChangesFilesSince(shaOrRef = 'HEAD'): string[] {
|
||||||
return Array.from(new Set([
|
return Array.from(new Set([
|
||||||
|
|
Loading…
Reference in New Issue