@cplace/cli - npm Package Compare versions

Comparing version 0.3.2 to 0.3.3

dist/src/commands/repos/UpdateRepos.js

@@ -28,3 +28,10 @@ "use strict";
                 .then(() => repo.checkoutBranch(branch))
-                .then(() => repo.checkoutCommit(commit))
+                .then(() => {
+                if (commit) {
+                    return repo.checkoutCommit(commit);
+                }
+                else {
+                    return repo.pullOnlyFastForward();
+                }
+            })
                 .then(() => repo.resetHard())
@@ -31,0 +38,0 @@ .then(() => {

dist/src/git/Repository.d.ts

@@ -18,4 +18,5 @@ /**
     checkoutCommit(commit: string): Promise<void>;
+    pullOnlyFastForward(): Promise<void>;
     resetHard(): Promise<void>;
     getCurrentCommitHash(): Promise<string>;
 }

dist/src/git/Repository.js

@@ -120,2 +120,24 @@ "use strict";
     }
+    pullOnlyFastForward() {
+        return this.status()
+            .then(({ tracking }) => {
+            const i = tracking.indexOf('/');
+            if (i < 0) {
+                return Promise.reject(`cannot determine remote and branch for ${tracking}`);
+            }
+            const remote = tracking.substring(0, i);
+            const branch = tracking.substr(i + 1);
+            Global_1.Global.isVerbose() && console.log(`pulling branch ${branch} from remote ${remote}`);
+            return new Promise((resolve, reject) => {
+                this.git.pull(remote, branch, { '--ff-only': true }, (err) => {
+                    if (err) {
+                        reject(err);
+                    }
+                    else {
+                        resolve();
+                    }
+                });
+            });
+        });
+    }
     resetHard() {
@@ -128,3 +150,3 @@ return new Promise((resolve, reject) => {
                 else {
-                    Global_1.Global.isVerbose() && console.log(`repo ${this.repoName} has been resetted`);
+                    Global_1.Global.isVerbose() && console.log(`repo ${this.repoName} has been reset`);
                     resolve();
@@ -131,0 +153,0 @@ }

package.json

 {
   "name": "@cplace/cli",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "",
@@ -5,0 +5,0 @@ "main": "dist/src/index.js",

src/commands/repos/UpdateRepos.ts

@@ -36,3 +36,9 @@ /**
                     .then(() => repo.checkoutBranch(branch))
-                    .then(() => repo.checkoutCommit(commit))
+                    .then(() => {
+                        if (commit) {
+                            return repo.checkoutCommit(commit);
+                        } else {
+                            return repo.pullOnlyFastForward();
+                        }
+                    })
                     .then(() => repo.resetHard())
@@ -39,0 +45,0 @@ .then(() => {

src/git/Repository.ts

@@ -130,2 +130,26 @@ /**
 
+    public pullOnlyFastForward(): Promise<void> {
+        return this.status()
+            .then(({tracking}) => {
+                const i = tracking.indexOf('/');
+                if (i < 0) {
+                    return Promise.reject(`cannot determine remote and branch for ${tracking}`);
+                }
+
+                const remote = tracking.substring(0, i);
+                const branch = tracking.substr(i + 1);
+
+                Global.isVerbose() && console.log(`pulling branch ${branch} from remote ${remote}`);
+                return new Promise((resolve, reject) => {
+                    this.git.pull(remote, branch, {'--ff-only': true}, (err) => {
+                        if (err) {
+                            reject(err);
+                        } else {
+                            resolve();
+                        }
+                    });
+                });
+            });
+    }
+
     public resetHard(): Promise<void> {
@@ -137,3 +161,3 @@ return new Promise<void>((resolve, reject) => {
                 } else {
-                    Global.isVerbose() && console.log(`repo ${this.repoName} has been resetted`);
+                    Global.isVerbose() && console.log(`repo ${this.repoName} has been reset`);
                     resolve();
@@ -140,0 +164,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Number of package files

115

increased by0.88%

Lines of code

2608

increased by2.23%

Worsened metrics

Total package byte prevSize

179646

decreased by-16.96%

No dependency changes