cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [3/3] git commit: Add a message about needing to run again with --push
Date Wed, 19 Jun 2013 00:22:37 GMT
Add a message about needing to run again with --push


Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/6b27f3f8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/6b27f3f8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/6b27f3f8

Branch: refs/heads/master
Commit: 6b27f3f8dac36655f0a05a5f7ea50e284e407793
Parents: 710b8dd
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Tue Jun 18 20:22:29 2013 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Tue Jun 18 20:22:29 2013 -0400

----------------------------------------------------------------------
 coho | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/6b27f3f8/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index c96747d..36f6688 100755
--- a/coho
+++ b/coho
@@ -651,6 +651,7 @@ function createReleaseBranchCommand() {
     var repos = computeReposFromFlag(argv);
     var version = argv.version;
     var performGitPush = argv.push;
+    var needsGitPush = false;
     var branchName = version.replace(/\d+(rc\d)?$/, 'x');
 
     // First - perform precondition checks.
@@ -674,8 +675,8 @@ function createReleaseBranchCommand() {
     // Ensure cordova-js comes first.
     var repoIndex = repos.indexOf(cordovaJsRepo);
     if (repoIndex != -1) {
-      repos.splice(repoIndex, 1);
-      repos.unshift(cordovaJsRepo);
+        repos.splice(repoIndex, 1);
+        repos.unshift(cordovaJsRepo);
     }
 
     forEachRepo(repos, function(repo) {
@@ -693,7 +694,9 @@ function createReleaseBranchCommand() {
                     if (pendingChangesExist()) {
                         execHelper('git commit -am "Update JS snapshot to version ' + version
+ ' (via coho)"');
                         if (performGitPush) {
-                          execHelper('git push ' + repo.remoteName + ' master');
+                            execHelper('git push ' + repo.remoteName + ' master');
+                        } else {
+                            needsGitPush = true;
                         }
                     }
                 } else if (allRepos.indexOf(repo) != -1) {
@@ -709,7 +712,9 @@ function createReleaseBranchCommand() {
             } else {
                 execHelper('git checkout -b ' + branchName);
                 if (performGitPush) {
-                  execHelper('git push --set-upstream ' + repo.remoteName + ' ' + branchName);
+                    execHelper('git push --set-upstream ' + repo.remoteName + ' ' + branchName);
+                } else {
+                    needsGitPush = true;
                 }
             }
             // Update the VERSION files.
@@ -739,11 +744,19 @@ function createReleaseBranchCommand() {
             if (pendingChangesExist()) {
                 execHelper('git commit -am "Set VERSION to ' + version + ' (via coho)"');
                 if (performGitPush) {
-                  execHelper('git push ' + repo.remoteName + ' ' + branchName);
+                    execHelper('git push ' + repo.remoteName + ' ' + branchName);
+                } else {
+                    needsGitPush = true;
                 }
             }
         });
     });
+
+    console.log('');
+    console.log('All work is complete.');
+    if (needsGitPush) {
+        console.log('Run again with --push to push changes.');
+    }
 }
 
 function tagReleaseBranchCommand(argv) {
@@ -755,6 +768,7 @@ function tagReleaseBranchCommand(argv) {
     var repos = computeReposFromFlag(argv);
     var version = argv.version;
     var performGitPush = argv.push;
+    var needsGitPush = false;
     var branchName = version.replace(/\d+(rc\d)?$/, 'x');
 
     // First - perform precondition checks.
@@ -785,13 +799,21 @@ function tagReleaseBranchCommand(argv) {
                     execHelper('git tag ' + version);
                 }
                 if (performGitPush) {
-                  execHelper('git push --tags ' + repo.remoteName + ' ' + branchName);
+                    execHelper('git push --tags ' + repo.remoteName + ' ' + branchName);
+                } else {
+                    needsGitPush = true;
                 }
             } else {
                 console.log('Repo ' + repo.repoName + ' is already tagged.');
             }
         });
     });
+
+    console.log('');
+    console.log('All work is complete.');
+    if (needsGitPush) {
+        console.log('Run again with --push to push changes.');
+    }
 }
 
 function ratCommand() {


Mime
View raw message