From 2a13d010f3e05ecda5aa8ff1309a36be021d8826 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Wed, 30 Nov 2016 10:30:41 +0100
Subject: [PATCH] ExtHostSCMShape.$getOriginalResource

---
 src/vs/workbench/api/node/extHost.protocol.ts | 2 +-
 src/vs/workbench/api/node/extHostSCM.ts       | 2 +-
 src/vs/workbench/api/node/mainThreadSCM.ts    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index a487fc4267e..08719aad9bc 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -361,7 +361,7 @@ export abstract class ExtHostTerminalServiceShape {
 }
 
 export abstract class ExtHostSCMShape {
-	$getBaselineResource(id: string, uri: URI): TPromise<URI> { throw ni(); }
+	$getOriginalResource(id: string, uri: URI): TPromise<URI> { throw ni(); }
 }
 
 // --- proxy identifiers
diff --git a/src/vs/workbench/api/node/extHostSCM.ts b/src/vs/workbench/api/node/extHostSCM.ts
index 2afcae7a5f7..285ea4e7c1d 100644
--- a/src/vs/workbench/api/node/extHostSCM.ts
+++ b/src/vs/workbench/api/node/extHostSCM.ts
@@ -43,7 +43,7 @@ export class ExtHostSCM {
 		});
 	}
 
-	$getBaselineResource(id: string, uri: URI): TPromise<URI> {
+	$getOriginalResource(id: string, uri: URI): TPromise<URI> {
 		const provider = this._providers[id];
 
 		if (!provider) {
diff --git a/src/vs/workbench/api/node/mainThreadSCM.ts b/src/vs/workbench/api/node/mainThreadSCM.ts
index f63894d5b20..f3bb6cb8a84 100644
--- a/src/vs/workbench/api/node/mainThreadSCM.ts
+++ b/src/vs/workbench/api/node/mainThreadSCM.ts
@@ -53,7 +53,7 @@ class MainThreadSCMProvider implements ISCMProvider {
 			return TPromise.as(null);
 		}
 
-		return this.proxy.$getBaselineResource(this.id, uri);
+		return this.proxy.$getOriginalResource(this.id, uri);
 	}
 
 	dispose(): void {
-- 
GitLab