From 71812edd72a42c96a8b6c1a8b15e27fbce90c4ea Mon Sep 17 00:00:00 2001 From: Adrian Blasiak Date: Tue, 28 Jan 2020 15:35:34 +0100 Subject: [PATCH 1/2] fixes #788 --- src/svnRepository.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/svnRepository.ts b/src/svnRepository.ts index 0a62c1d1..b893f43f 100644 --- a/src/svnRepository.ts +++ b/src/svnRepository.ts @@ -342,6 +342,13 @@ export class Repository { } } } + else { + const svnEncoding: string | undefined = configuration.get("default.encoding"); + if (svnEncoding) { + encoding = svnEncoding; + } + } + const result = await this.exec(args, { encoding }); @@ -398,7 +405,7 @@ export class Repository { const filesMessage = `${sendedFiles} ${ sendedFiles === 1 ? "file" : "files" - } commited`; + } commited`; return `${filesMessage}: revision ${matches[1]}.`; } From 20d80eddaa1eb2e8a88ee8e05e8a61684bcc0d3f Mon Sep 17 00:00:00 2001 From: Chris Johnston Date: Tue, 28 Jan 2020 14:44:45 +0000 Subject: [PATCH 2/2] Fixed lint issue --- src/svnRepository.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/svnRepository.ts b/src/svnRepository.ts index b893f43f..e93130e3 100644 --- a/src/svnRepository.ts +++ b/src/svnRepository.ts @@ -341,15 +341,15 @@ export class Repository { encoding = detectedEncoding; } } - } - else { - const svnEncoding: string | undefined = configuration.get("default.encoding"); + } else { + const svnEncoding: string | undefined = configuration.get( + "default.encoding" + ); if (svnEncoding) { encoding = svnEncoding; } } - const result = await this.exec(args, { encoding }); return result.stdout; @@ -405,7 +405,7 @@ export class Repository { const filesMessage = `${sendedFiles} ${ sendedFiles === 1 ? "file" : "files" - } commited`; + } commited`; return `${filesMessage}: revision ${matches[1]}.`; }