Fix for #65 (thanks to KristjanTammekivi)

mrcrowl · Feb 11, 2019 · 6bee184 · 6bee184
1 parent 8d080b3
commit 6bee184
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -9,5 +9,8 @@
         "**/.DS_Store": true,
         "*.vsix": true,
         "images/production": true
-    }
+    },
+    "editor.codeActionsOnSave": {
+        "source.organizeImports": false
+	}
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,17 @@
+**v1.3.0**
+=============================================
 
+## Bug fix
+  - Fixed bug caused by API change in vscode v1.31 [#65](https://github.com/mrcrowl/vscode-hg/issues/65)
 
-**v1.2.2**
+**v1.2.2-3**
 =============================================
 
+## Bug fix
+  - Fixed slow multi-file Hg operations (such as stage/add file)
+
 ## What's New
-  - Added "multi-root ready" keyword, as requested by VS Code Team [#29]((https://github.com/mrcrowl/vscode-hg/issues/29)
+  - Added "multi-root ready" keyword, as requested by VS Code Team [#29](https://github.com/mrcrowl/vscode-hg/issues/29)
 
 **v1.2.1**
 =============================================

diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
   "bugs": {
     "url": "https://github.com/mrcrowl/vscode-hg/issues"
   },
-  "version": "1.2.2",
+  "version": "1.3.0",
   "engines": {
     "vscode": "^1.17.0"
   },

diff --git a/src/repository.ts b/src/repository.ts
@@ -995,11 +995,23 @@ export class Repository implements IDisposable {
             }
         });
     }
-
+    
     private async unlocked<T>(): Promise<void> {
         let attempt = 1;
 
-        while (attempt <= 10 && await exists(path.join(this.repository.root, '.hg', 'index.lock'))) {
+        const existsLocal = (path: string) => new Promise((resolve, reject) => {
+            fs.stat(path, (err) => {
+                if (err) {
+                    if (err.code === 'ENOENT') {
+                        return resolve(false);
+                    }
+                    reject(err);
+                }
+                return resolve(true);
+            });
+        });
+
+        while (attempt <= 10 && await existsLocal(path.join(this.repository.root, '.hg', 'index.lock'))) {
             await timeout(Math.pow(attempt, 2) * 50);
             attempt++;
         }