Adds rename detection on status

gitkraken · May 4, 2019 · 4c79d0f · 4c79d0f
1 parent 2130072
commit 4c79d0f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/src/git/git.ts b/src/git/git.ts
@@ -978,25 +978,37 @@ export class Git {
         return git<string>({ cwd: repoPath }, ...params);
     }
 
-    static status(repoPath: string, porcelainVersion: number = 1): Promise<string> {
+    static status(
+        repoPath: string,
+        porcelainVersion: number = 1,
+        { similarityThreshold }: { similarityThreshold?: number } = {}
+    ): Promise<string> {
         const porcelain = porcelainVersion >= 2 ? `--porcelain=v${porcelainVersion}` : '--porcelain';
         return git<string>(
             { cwd: repoPath, configs: ['-c', 'color.status=false'], env: { GIT_OPTIONAL_LOCKS: '0' } },
             'status',
             porcelain,
             '--branch',
-            '-u'
+            '-u',
+            `-M${similarityThreshold == null ? '' : `${similarityThreshold}%`}`,
+            '--'
         );
     }
 
-    static status__file(repoPath: string, fileName: string, porcelainVersion: number = 1): Promise<string> {
+    static status__file(
+        repoPath: string,
+        fileName: string,
+        porcelainVersion: number = 1,
+        { similarityThreshold }: { similarityThreshold?: number } = {}
+    ): Promise<string> {
         const [file, root] = Git.splitPath(fileName, repoPath);
 
         const porcelain = porcelainVersion >= 2 ? `--porcelain=v${porcelainVersion}` : '--porcelain';
         return git<string>(
             { cwd: root, configs: ['-c', 'color.status=false'], env: { GIT_OPTIONAL_LOCKS: '0' } },
             'status',
             porcelain,
+            `-M${similarityThreshold == null ? '' : `${similarityThreshold}%`}`,
             '--',
             file
         );

diff --git a/src/git/gitService.ts b/src/git/gitService.ts
@@ -2044,7 +2044,9 @@ export class GitService implements Disposable {
     async getStatusForFile(repoPath: string, fileName: string): Promise<GitStatusFile | undefined> {
         const porcelainVersion = Git.validateVersion(2, 11) ? 2 : 1;
 
-        const data = await Git.status__file(repoPath, fileName, porcelainVersion);
+        const data = await Git.status__file(repoPath, fileName, porcelainVersion, {
+            similarityThreshold: Container.config.advanced.similarityThreshold
+        });
         const status = GitStatusParser.parse(data, repoPath, porcelainVersion);
         if (status === undefined || !status.files.length) return undefined;
 
@@ -2057,7 +2059,9 @@ export class GitService implements Disposable {
 
         const porcelainVersion = Git.validateVersion(2, 11) ? 2 : 1;
 
-        const data = await Git.status(repoPath, porcelainVersion);
+        const data = await Git.status(repoPath, porcelainVersion, {
+            similarityThreshold: Container.config.advanced.similarityThreshold
+        });
         const status = GitStatusParser.parse(data, repoPath, porcelainVersion);
         return status;
     }