Skip to content

Commit be6bd07

Browse files
committed
Updates logging
1 parent 1a4dafe commit be6bd07

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

src/git/models/repository.ts

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,9 @@ export class Repository implements Disposable {
267267

268268
if (Logger.willLog('debug')) {
269269
Logger.debug(
270-
`Repository[${this.name}(${
270+
`Repository(${
271271
this.id
272-
})] doesn't support file watching; path=${path}, workspaceFolders=${workspace.workspaceFolders
272+
}) doesn't support file watching; path=${path}, workspaceFolders=${workspace.workspaceFolders
273273
?.map(wf => wf.uri.fsPath)
274274
.join('; ')}`,
275275
);
@@ -1007,6 +1007,8 @@ export class Repository implements Disposable {
10071007

10081008
@debug()
10091009
private fireChange(...changes: RepositoryChange[]) {
1010+
const cc = Logger.getCorrelationContext();
1011+
10101012
this._updatedAt = Date.now();
10111013

10121014
if (this._fireChangeDebounced == null) {
@@ -1018,9 +1020,7 @@ export class Repository implements Disposable {
10181020
this.onAnyRepositoryChanged(this, new RepositoryChangeEvent(this, changes));
10191021

10201022
if (this._suspended) {
1021-
Logger.debug(
1022-
`Repository[${this.name}(${this.id})] queueing suspended ${this._pendingRepoChange.toString(true)}`,
1023-
);
1023+
Logger.debug(cc, `queueing suspended ${this._pendingRepoChange.toString(true)}`);
10241024

10251025
return;
10261026
}
@@ -1034,12 +1034,14 @@ export class Repository implements Disposable {
10341034

10351035
this._pendingRepoChange = undefined;
10361036

1037-
Logger.debug(`Repository[${this.name}(${this.id})] firing ${e.toString(true)}`);
1037+
Logger.debug(`Repository(${this.id}) firing ${e.toString(true)}`);
10381038
this._onDidChange.fire(e);
10391039
}
10401040

10411041
@debug()
10421042
private fireFileSystemChange(uri: Uri) {
1043+
const cc = Logger.getCorrelationContext();
1044+
10431045
this._updatedAt = Date.now();
10441046

10451047
if (this._fireFileSystemChangeDebounced == null) {
@@ -1054,11 +1056,7 @@ export class Repository implements Disposable {
10541056
e.uris.push(uri);
10551057

10561058
if (this._suspended) {
1057-
Logger.debug(
1058-
`Repository[${this.name}(${this.id})] queueing suspended fs changes=${e.uris
1059-
.map(u => u.fsPath)
1060-
.join(', ')}`,
1061-
);
1059+
Logger.debug(cc, `queueing suspended fs changes=${e.uris.map(u => u.fsPath).join(', ')}`);
10621060
return;
10631061
}
10641062

@@ -1078,7 +1076,7 @@ export class Repository implements Disposable {
10781076
e = { ...e, uris: uris };
10791077
}
10801078

1081-
Logger.debug(`Repository[${this.name}(${this.id})] firing fs changes=${e.uris.map(u => u.fsPath).join(', ')}`);
1079+
Logger.debug(`Repository(${this.id}) firing fs changes=${e.uris.map(u => u.fsPath).join(', ')}`);
10821080

10831081
this._onDidChangeFileSystem.fire(e);
10841082
}
@@ -1102,7 +1100,7 @@ export class Repository implements Disposable {
11021100
this._supportsChangeEvents = true;
11031101

11041102
if (Logger.willLog('debug')) {
1105-
Logger.debug(`Repository[${this.name}(${this.id})] is now using fallback file watching`);
1103+
Logger.debug(`Repository(${this.id}) is now using fallback file watching`);
11061104
}
11071105
} catch {}
11081106
}

0 commit comments

Comments
 (0)