Async await

Gruntfile.js

@@ -67,7 +67,7 @@ module.exports = (grunt) => {
       options: {
         undef: true, // check for usage of undefined constiables
         indent: 2,
-        esversion: 6,
+        esversion: 8,
         laxbreak: true,
         '-W033': true, // ignore Missing semicolon
         '-W041': true, // ignore Use '===' to compare with '0'
@@ -258,20 +258,19 @@ module.exports = (grunt) => {
     ).then(this.async());
   });
 
-  const bumpDependency = (packageJson, packageName) => {
+  const bumpDependency = async (packageJson, packageName) => {
     const dependencyType = packageJson['dependencies'][packageName]
       ? 'dependencies'
       : 'devDependencies';
     let currentVersion = packageJson[dependencyType][packageName];
     if (currentVersion[0] == '~' || currentVersion[0] == '^')
       currentVersion = currentVersion.slice(1);
-    return pkgVersions(packageName).then((versionSet) => {
-      const versions = Array.from(versionSet);
-      const latestVersion = semver.maxSatisfying(versions, '*');
-      if (semver.gt(latestVersion, currentVersion)) {
-        packageJson[dependencyType][packageName] = '~' + latestVersion;
-      }
-    });
+    const versionSet = await pkgVersions(packageName);
+    const versions = Array.from(versionSet);
+    const latestVersion = semver.maxSatisfying(versions, '*');
+    if (semver.gt(latestVersion, currentVersion)) {
+      packageJson[dependencyType][packageName] = '~' + latestVersion;
+    }
   };
 
   grunt.registerTask(
@@ -332,32 +331,33 @@ module.exports = (grunt) => {
       .then((tests) => {
         grunt.log.writeln('Running click tests in parallel... (this will take a while...)');
         return Promise.all(
-          tests.map((file) => {
+          tests.map(async (file) => {
             let output = '';
             const outStream = (data) => (output += data);
 
             grunt.log.writeln(cliColor.set(`Clicktest started! \t${file}`, 'blue'));
-            return new Promise((resolve, reject) => {
-              const child = childProcess.execFile(
-                './node_modules/mocha/bin/mocha',
-                [path.join(__dirname, 'clicktests', file), '--timeout=35000', '-b'],
-                { maxBuffer: 10 * 1024 * 1024 }
-              );
-              child.stdout.on('data', outStream);
-              child.stderr.on('data', outStream);
-              child.on('exit', (code) => {
-                if (code == 0) resolve(file);
-                else reject();
-              });
-            })
-              .then(() => {
-                grunt.log.writeln(cliColor.set(`'Clicktest success! \t${file}`, 'green'));
-                return { name: file, output: output, isSuccess: true };
-              })
-              .catch(() => {
-                grunt.log.writeln(cliColor.set(`'Clicktest fail! \t'${file}`, 'red'));
-                return { name: file, output: output, isSuccess: false };
+
+            try {
+              await new Promise((resolve, reject) => {
+                const child = childProcess.execFile(
+                  './node_modules/mocha/bin/mocha',
+                  [path.join(__dirname, 'clicktests', file), '--timeout=35000', '-b'],
+                  { maxBuffer: 10 * 1024 * 1024 }
+                );
+                child.stdout.on('data', outStream);
+                child.stderr.on('data', outStream);
+                child.on('exit', (code) => {
+                  if (code == 0) resolve(file);
+                  else reject();
+                });
               });
+
+              grunt.log.writeln(cliColor.set(`'Clicktest success! \t${file}`, 'green'));
+              return { name: file, output: output, isSuccess: true };
+            } catch (error) {
+              grunt.log.writeln(cliColor.set(`'Clicktest fail! \t'${file}`, 'red'));
+              return { name: file, output: output, isSuccess: false };
+            }
           })
         );
       })

components/app/app.js

@@ -133,11 +133,10 @@ class AppViewModel {
     );
   }
   gitSetUserConfig(bugTracking) {
-    this.server.getPromise('/userconfig').then((userConfig) => {
+    this.server.getPromise('/userconfig').then(async (userConfig) => {
       userConfig.bugtracking = bugTracking;
-      return this.server.postPromise('/userconfig', userConfig).then(() => {
-        this.bugtrackingEnabled(bugTracking);
-      });
+      await this.server.postPromise('/userconfig', userConfig);
+      this.bugtrackingEnabled(bugTracking);
     });
   }
   enableBugtracking() {

components/branches/branches.js

@@ -129,17 +129,21 @@ class BranchesViewModel {
         details: 'Deleting ' + details + ' branch cannot be undone with ungit.',
       })
       .show()
-      .closeThen((diag) => {
+      .closeThen(async (diag) => {
         if (!diag.result()) return;
         const url = `${branch.isRemote ? '/remote' : ''}/branches`;
-        return this.server
-          .delPromise(url, {
+
+        try {
+          await this.server.delPromise(url, {
             path: this.graph.repoPath(),
             remote: branch.isRemote ? branch.remote : null,
             name: branch.refName,
-          })
-          .then(() => programEvents.dispatch({ event: 'working-tree-changed' }))
-          .catch((e) => this.server.unhandledRejection(e));
+          });
+
+          return programEvents.dispatch({ event: 'working-tree-changed' });
+        } catch (e) {
+          return this.server.unhandledRejection(e);
+        }
       });
   }
 }

components/graph/git-graph-actions.js

@@ -117,13 +117,16 @@ class Reset extends ActionBase {
         details: 'Resetting to ref: ' + remoteRef.name + ' cannot be undone with ungit.',
       })
       .show()
-      .closeThen((diag) => {
+      .closeThen(async (diag) => {
         if (!diag.result()) return;
-        return this.server
-          .postPromise('/reset', { path: this.graph.repoPath(), to: remoteRef.name, mode: 'hard' })
-          .then(() => {
-            context.node(remoteRef.node());
-          });
+
+        await this.server.postPromise('/reset', {
+          path: this.graph.repoPath(),
+          to: remoteRef.name,
+          mode: 'hard',
+        });
+
+        context.node(remoteRef.node());
       }).closePromise;
   }
 }
@@ -316,17 +319,19 @@ class Uncommit extends ActionBase {
     });
   }
 
-  perform() {
-    return this.server
-      .postPromise('/reset', { path: this.graph.repoPath(), to: 'HEAD^', mode: 'mixed' })
-      .then(() => {
-        let targetNode = this.node.belowNode;
-        while (targetNode && !targetNode.ancestorOfHEAD()) {
-          targetNode = targetNode.belowNode;
-        }
-        this.graph.HEADref().node(targetNode ? targetNode : null);
-        this.graph.checkedOutRef().node(targetNode ? targetNode : null);
-      });
+  async perform() {
+    await this.server.postPromise('/reset', {
+      path: this.graph.repoPath(),
+      to: 'HEAD^',
+      mode: 'mixed',
+    });
+
+    let targetNode = this.node.belowNode;
+    while (targetNode && !targetNode.ancestorOfHEAD()) {
+      targetNode = targetNode.belowNode;
+    }
+    this.graph.HEADref().node(targetNode ? targetNode : null);
+    this.graph.checkedOutRef().node(targetNode ? targetNode : null);
   }
 }
 

components/graph/git-ref.js

@@ -99,7 +99,7 @@ class RefViewModel extends Selectable {
     this.isDragging(false);
   }
 
-  moveTo(target, rewindWarnOverride) {
+  async moveTo(target, rewindWarnOverride) {
     let promise;
     if (this.isLocal) {
       const toNode = this.graph.nodesById[target];
@@ -161,45 +161,44 @@ class RefViewModel extends Selectable {
       });
     }
 
-    return promise
-      .then((res) => {
-        if (!res) return;
-        const targetNode = this.graph.getNode(target);
-        if (this.graph.checkedOutBranch() == this.refName) {
-          this.graph.HEADref().node(targetNode);
-        }
-        this.node(targetNode);
-      })
-      .catch((e) => this.server.unhandledRejection(e));
+    try {
+      const res = await promise;
+      if (!res) return;
+      const targetNode = this.graph.getNode(target);
+      if (this.graph.checkedOutBranch() == this.refName) {
+        this.graph.HEADref().node(targetNode);
+      }
+      this.node(targetNode);
+    } catch (e) {
+      return this.server.unhandledRejection(e);
+    }
   }
 
-  remove(isClientOnly) {
+  async remove(isClientOnly) {
     let url = this.isTag ? '/tags' : '/branches';
     if (this.isRemote) url = `/remote${url}`;
-
-    return (isClientOnly
-      ? Promise.resolve()
-      : this.server.delPromise(url, {
+    try {
+      if (!isClientOnly)
+        await this.server.delPromise(url, {
           path: this.graph.repoPath(),
           remote: this.isRemote ? this.remote : null,
           name: this.refName,
-        })
-    )
-      .then(() => {
-        if (this.node()) this.node().removeRef(this);
-        this.graph.refs.remove(this);
-        delete this.graph.refsByRefName[this.name];
-      })
-      .catch((e) => this.server.unhandledRejection(e))
-      .finally(() => {
-        if (!isClientOnly) {
-          if (url == '/remote/tags') {
-            programEvents.dispatch({ event: 'request-fetch-tags' });
-          } else {
-            programEvents.dispatch({ event: 'branch-updated' });
-          }
+        });
+
+      if (this.node()) this.node().removeRef(this);
+      this.graph.refs.remove(this);
+      delete this.graph.refsByRefName[this.name];
+    } catch (e) {
+      this.server.unhandledRejection(e);
+    } finally {
+      if (!isClientOnly) {
+        if (url == '/remote/tags') {
+          programEvents.dispatch({ event: 'request-fetch-tags' });
+        } else {
+          programEvents.dispatch({ event: 'branch-updated' });
         }
-      });
+      }
+    }
   }
 
   getLocalRef() {
@@ -241,39 +240,35 @@ class RefViewModel extends Selectable {
       .catch((e) => this.server.unhandledRejection(e));
   }
 
-  checkout() {
+  async checkout() {
     const isRemote = this.isRemoteBranch;
     const isLocalCurrent = this.getLocalRef() && this.getLocalRef().current();
 
-    return Promise.resolve()
-      .then(() => {
-        if (isRemote && !isLocalCurrent) {
-          return this.server.postPromise('/branches', {
-            path: this.graph.repoPath(),
-            name: this.refName,
-            sha1: this.name,
-            force: true,
-          });
-        }
-      })
-      .then(() =>
-        this.server.postPromise('/checkout', { path: this.graph.repoPath(), name: this.refName })
-      )
-      .then(() => {
-        if (isRemote && isLocalCurrent) {
-          return this.server.postPromise('/reset', {
-            path: this.graph.repoPath(),
-            to: this.name,
-            mode: 'hard',
-          });
-        }
-      })
-      .then(() => {
-        this.graph.HEADref().node(this.node());
-      })
-      .catch((err) => {
-        if (err.errorCode != 'merge-failed') this.server.unhandledRejection(err);
+    try {
+      if (isRemote && !isLocalCurrent) {
+        return this.server.postPromise('/branches', {
+          path: this.graph.repoPath(),
+          name: this.refName,
+          sha1: this.name,
+          force: true,
+        });
+      }
+      await this.server.postPromise('/checkout', {
+        path: this.graph.repoPath(),
+        name: this.refName,
       });
+      if (isRemote && isLocalCurrent) {
+        return this.server.postPromise('/reset', {
+          path: this.graph.repoPath(),
+          to: this.name,
+          mode: 'hard',
+        });
+      }
+
+      this.graph.HEADref().node(this.node());
+    } catch (err) {
+      if (err.errorCode != 'merge-failed') this.server.unhandledRejection(err);
+    }
   }
 }