You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/06/21 21:10:13 UTC
[2/2] git commit: jake->grunt.
jake->grunt.
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/46c5d79f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/46c5d79f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/46c5d79f
Branch: refs/heads/master
Commit: 46c5d79f9ff75baa92c18a9243661b0e058cd2ed
Parents: 7725f1c
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Jun 21 15:09:53 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Jun 21 15:09:53 2013 -0400
----------------------------------------------------------------------
coho | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/46c5d79f/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index 663353b..8d4fa50 100755
--- a/coho
+++ b/coho
@@ -213,6 +213,10 @@ function fatal() {
process.exit(1);
}
+function getVersionBranchName(version) {
+ return version.replace(/\d+(rc\d)?$/, 'x');
+}
+
function registerRepoFlag(opt) {
return opt.options('r', {
alias: 'repo',
@@ -838,6 +842,7 @@ function updateJsSnapshot(repo, version, branchName) {
var cordovaJsRepo = getRepoById('js');
if (!hasBuiltJs) {
forEachRepo([cordovaJsRepo], function() {
+ gitCheckout(getVersionBranchName(version));
var actualCurTag = retrieveCurrentTagName();
if (actualCurTag != version) {
fatal('Not preparing branches since cordova-js is not at the version tag. (it\'s at ' + actualCurTag + ')');
@@ -887,7 +892,7 @@ function prepareReleaseBranchCommand() {
);
var repos = computeReposFromFlag(argv);
var version = argv.version;
- var branchName = version.replace(/\d+(rc\d)?$/, 'x');
+ var branchName = getVersionBranchName(version);
// First - perform precondition checks.
updateRepos(repos, [], true);
@@ -954,7 +959,7 @@ function tagReleaseBranchCommand(argv) {
);
var repos = computeReposFromFlag(argv);
var version = argv.version;
- var branchName = version.replace(/\d+(rc\d)?$/, 'x');
+ var branchName = getVersionBranchName(version);
// First - perform precondition checks.
updateRepos(repos, [], true);