Merge branch 'master' into 790

JohnstonCode · web-flow · commit 3435905f51a7 · 2020-01-28T15:06:28.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [2.6.1](https://github.com/JohnstonCode/svn-scm/compare/v2.6.0...v2.6.1) (2020-01-28)
+
+
+### Bug Fixes
+
+* fix encoding when comparing file revisions [#788](https://github.com/JohnstonCode/svn-scm/issues/788) ([#789](https://github.com/JohnstonCode/svn-scm/issues/789)) ([f6d5a68](https://github.com/JohnstonCode/svn-scm/commit/f6d5a6807be291c654214d35c84cb101eaa0c57a))
+
 # [2.6.0](https://github.com/JohnstonCode/svn-scm/compare/v2.5.0...v2.6.0) (2020-01-27)
 
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "svn-scm",
   "displayName": "SVN",
   "description": "Integrated Subversion source control",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "publisher": "johnstoncode",
   "engines": {
     "vscode": "^1.41.0"
diff --git a/src/svnRepository.ts b/src/svnRepository.ts
@@ -341,6 +341,13 @@ export class Repository {
           encoding = detectedEncoding;
         }
       }
+    } else {
+      const svnEncoding: string | undefined = configuration.get<string>(
+        "default.encoding"
+      );
+      if (svnEncoding) {
+        encoding = svnEncoding;
+      }
     }
 
     const result = await this.exec(args, { encoding });

Original file line number	Diff line number	Diff line change
`@@ -341,6 +341,13 @@ export class Repository {`
`341`	`341`	`encoding = detectedEncoding;`
`342`	`342`	`}`
`343`	`343`	`}`
	`344`	`+ } else {`
	`345`	`+ const svnEncoding: string \| undefined = configuration.get<string>(`
	`346`	`+ "default.encoding"`
	`347`	`+ );`
	`348`	`+ if (svnEncoding) {`
	`349`	`+ encoding = svnEncoding;`
	`350`	`+ }`
`344`	`351`	`}`
`345`	`352`
`346`	`353`	`const result = await this.exec(args, { encoding });`