You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2014/10/09 16:08:25 UTC
[1/4] git commit: [CB-7744] Add support for git-depth flag to coho
clone
Repository: cordova-coho
Updated Branches:
refs/heads/CB-7744 [created] 92223bbc8
[CB-7744] Add support for git-depth flag to coho clone
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/d464771b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/d464771b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/d464771b
Branch: refs/heads/CB-7744
Commit: d464771baab49d506dd5b697339854db81b26240
Parents: 365c4aa
Author: maria.bukharina <ma...@akvelon.com>
Authored: Thu Oct 9 15:58:57 2014 +0400
Committer: maria.bukharina <ma...@akvelon.com>
Committed: Thu Oct 9 15:58:57 2014 +0400
----------------------------------------------------------------------
src/flagutil.js | 7 +++++++
src/repo-clone.js | 15 ++++++++++++---
src/repo-update.js | 7 ++++++-
3 files changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/d464771b/src/flagutil.js
----------------------------------------------------------------------
diff --git a/src/flagutil.js b/src/flagutil.js
index 2c9e4b2..4e24a4d 100644
--- a/src/flagutil.js
+++ b/src/flagutil.js
@@ -35,6 +35,13 @@ exports.registerRepoFlag = function(opt) {
});
}
+exports.registerDepthFlag = function(opt) {
+ return opt.options('d', {
+ alias: 'depth',
+ desc: 'Value of --depth flag for git repos.'
+ });
+}
+
exports.computeReposFromFlag = function(flagValue) {
var values = flagValue === true ? [] : Array.isArray(flagValue) ? flagValue : [flagValue];
var ret = [];
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/d464771b/src/repo-clone.js
----------------------------------------------------------------------
diff --git a/src/repo-clone.js b/src/repo-clone.js
index 1086135..a052c11 100644
--- a/src/repo-clone.js
+++ b/src/repo-clone.js
@@ -36,15 +36,20 @@ module.exports = function*(argv) {
optimist.showHelp();
process.exit(1);
}
+
+ var depth = null;
+ if(argv.d) {
+ depth = argv.d;
+ }
var repos = flagutil.computeReposFromFlag(argv.r);
- yield cloneRepos(repos, false);
+ yield cloneRepos(repos, false, depth);
}
function createRepoUrl(repo) {
return 'https://git-wip-us.apache.org/repos/asf/' + repo.repoName + '.git';
}
-function *cloneRepos(repos, quiet) {
+function *cloneRepos(repos, quiet, depth) {
var failures = [];
var numSkipped = 0;
@@ -57,7 +62,11 @@ function *cloneRepos(repos, quiet) {
} else if (repo.svn) {
clonePromises.push(executil.execHelper(executil.ARGS('svn checkout ' + repo.svn + ' ' + repo.repoName)));
} else {
- clonePromises.push(executil.execHelper(executil.ARGS('git clone ' + createRepoUrl(repo))));
+ if(depth != null) {
+ clonePromises.push(executil.execHelper(executil.ARGS('git clone --depth ' + depth + ' ' + createRepoUrl(repo))));
+ } else {
+ clonePromises.push(executil.execHelper(executil.ARGS('git clone ' + createRepoUrl(repo))));
+ }
}
}
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/d464771b/src/repo-update.js
----------------------------------------------------------------------
diff --git a/src/repo-update.js b/src/repo-update.js
index 4e08a36..32c4b22 100644
--- a/src/repo-update.js
+++ b/src/repo-update.js
@@ -58,6 +58,11 @@ module.exports = function*(argv) {
optimist.showHelp();
process.exit(1);
}
+
+ var depth = null;
+ if(argv.d) {
+ depth = argv.d;
+ }
var branches = Array.isArray(argv.b) ? argv.b : [argv.b];
var repos = flagutil.computeReposFromFlag(argv.r);
apputil.prefixLength = Math.max.apply(null,
@@ -66,7 +71,7 @@ module.exports = function*(argv) {
);
// ensure that any missing repos are cloned
- yield require('./repo-clone').cloneRepos(repos,true);
+ yield require('./repo-clone').cloneRepos(repos,true,depth);
yield updateRepos(repos, branches, !argv.fetch);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/4] git commit: Added usage of --depth flag
Posted by an...@apache.org.
Added usage of --depth flag
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/5e867f2c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/5e867f2c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/5e867f2c
Branch: refs/heads/CB-7744
Commit: 5e867f2c7a567ea4a79d9230f8aa9eeed7fe88ee
Parents: d464771
Author: maria.bukharina <ma...@akvelon.com>
Authored: Thu Oct 9 16:54:48 2014 +0400
Committer: maria.bukharina <ma...@akvelon.com>
Committed: Thu Oct 9 16:54:48 2014 +0400
----------------------------------------------------------------------
src/repo-clone.js | 1 +
src/repo-update.js | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/5e867f2c/src/repo-clone.js
----------------------------------------------------------------------
diff --git a/src/repo-clone.js b/src/repo-clone.js
index a052c11..ffc4e9e 100644
--- a/src/repo-clone.js
+++ b/src/repo-clone.js
@@ -27,6 +27,7 @@ var print = apputil.print;
module.exports = function*(argv) {
var opt = flagutil.registerRepoFlag(optimist)
opt = flagutil.registerHelpFlag(opt);
+ opt = flagutil.registerDepthFlag(opt);
var argv = opt
.usage('Clones git repositories into the current working directory. If the repositories are already cloned, then this is a no-op.\n\n' +
'Usage: $0 clone --repo=name [--repo=othername]')
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/5e867f2c/src/repo-update.js
----------------------------------------------------------------------
diff --git a/src/repo-update.js b/src/repo-update.js
index 32c4b22..e6c8e03 100644
--- a/src/repo-update.js
+++ b/src/repo-update.js
@@ -27,6 +27,7 @@ var print = apputil.print;
module.exports = function*(argv) {
var opt = flagutil.registerRepoFlag(optimist)
+ opt = flagutil.registerDepthFlag(opt);
var opt = opt
.options('b', {
alias: 'branch',
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/4] git commit: Code improvements
Posted by an...@apache.org.
Code improvements
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/27062cca
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/27062cca
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/27062cca
Branch: refs/heads/CB-7744
Commit: 27062ccaf9d2dd99d1ff5f7973c06b5171ca56b5
Parents: 5e867f2
Author: maria.bukharina <ma...@akvelon.com>
Authored: Thu Oct 9 17:42:49 2014 +0400
Committer: maria.bukharina <ma...@akvelon.com>
Committed: Thu Oct 9 17:42:49 2014 +0400
----------------------------------------------------------------------
src/repo-clone.js | 13 ++++---------
src/repo-update.js | 6 ++----
2 files changed, 6 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/27062cca/src/repo-clone.js
----------------------------------------------------------------------
diff --git a/src/repo-clone.js b/src/repo-clone.js
index ffc4e9e..362510c 100644
--- a/src/repo-clone.js
+++ b/src/repo-clone.js
@@ -38,10 +38,8 @@ module.exports = function*(argv) {
process.exit(1);
}
- var depth = null;
- if(argv.d) {
- depth = argv.d;
- }
+ var depth = argv.d ? argv.d: null;
+
var repos = flagutil.computeReposFromFlag(argv.r);
yield cloneRepos(repos, false, depth);
}
@@ -63,11 +61,8 @@ function *cloneRepos(repos, quiet, depth) {
} else if (repo.svn) {
clonePromises.push(executil.execHelper(executil.ARGS('svn checkout ' + repo.svn + ' ' + repo.repoName)));
} else {
- if(depth != null) {
- clonePromises.push(executil.execHelper(executil.ARGS('git clone --depth ' + depth + ' ' + createRepoUrl(repo))));
- } else {
- clonePromises.push(executil.execHelper(executil.ARGS('git clone ' + createRepoUrl(repo))));
- }
+ var depthArg = depth == null ? '' : '--depth ' + depth + ' ';
+ clonePromises.push(executil.execHelper(executil.ARGS('git clone ' + depthArg + createRepoUrl(repo))));
}
}
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/27062cca/src/repo-update.js
----------------------------------------------------------------------
diff --git a/src/repo-update.js b/src/repo-update.js
index e6c8e03..2c54839 100644
--- a/src/repo-update.js
+++ b/src/repo-update.js
@@ -60,10 +60,8 @@ module.exports = function*(argv) {
process.exit(1);
}
- var depth = null;
- if(argv.d) {
- depth = argv.d;
- }
+ var depth = argv.d ? argv.d: null;
+
var branches = Array.isArray(argv.b) ? argv.b : [argv.b];
var repos = flagutil.computeReposFromFlag(argv.r);
apputil.prefixLength = Math.max.apply(null,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[4/4] git commit: Fixes tabs vs. spaces
Posted by an...@apache.org.
Fixes tabs vs. spaces
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/92223bbc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/92223bbc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/92223bbc
Branch: refs/heads/CB-7744
Commit: 92223bbc88930a7779165b2522b4c3475f5b6bac
Parents: 27062cc
Author: Vladimir Kotikov <v-...@microsoft.com>
Authored: Thu Oct 9 18:07:41 2014 +0400
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Thu Oct 9 18:07:41 2014 +0400
----------------------------------------------------------------------
src/flagutil.js | 8 ++++----
src/repo-clone.js | 6 +++---
src/repo-update.js | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/92223bbc/src/flagutil.js
----------------------------------------------------------------------
diff --git a/src/flagutil.js b/src/flagutil.js
index 4e24a4d..3c4bf1e 100644
--- a/src/flagutil.js
+++ b/src/flagutil.js
@@ -36,10 +36,10 @@ exports.registerRepoFlag = function(opt) {
}
exports.registerDepthFlag = function(opt) {
- return opt.options('d', {
- alias: 'depth',
- desc: 'Value of --depth flag for git repos.'
- });
+ return opt.options('d', {
+ alias: 'depth',
+ desc: 'Value of --depth flag for git repos.'
+ });
}
exports.computeReposFromFlag = function(flagValue) {
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/92223bbc/src/repo-clone.js
----------------------------------------------------------------------
diff --git a/src/repo-clone.js b/src/repo-clone.js
index 362510c..d615a6c 100644
--- a/src/repo-clone.js
+++ b/src/repo-clone.js
@@ -38,7 +38,7 @@ module.exports = function*(argv) {
process.exit(1);
}
- var depth = argv.d ? argv.d: null;
+ var depth = argv.d ? argv.d: null;
var repos = flagutil.computeReposFromFlag(argv.r);
yield cloneRepos(repos, false, depth);
@@ -61,8 +61,8 @@ function *cloneRepos(repos, quiet, depth) {
} else if (repo.svn) {
clonePromises.push(executil.execHelper(executil.ARGS('svn checkout ' + repo.svn + ' ' + repo.repoName)));
} else {
- var depthArg = depth == null ? '' : '--depth ' + depth + ' ';
- clonePromises.push(executil.execHelper(executil.ARGS('git clone ' + depthArg + createRepoUrl(repo))));
+ var depthArg = depth === null ? '' : '--depth ' + depth + ' ';
+ clonePromises.push(executil.execHelper(executil.ARGS('git clone ' + depthArg + createRepoUrl(repo))));
}
}
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/92223bbc/src/repo-update.js
----------------------------------------------------------------------
diff --git a/src/repo-update.js b/src/repo-update.js
index 2c54839..4ce7d81 100644
--- a/src/repo-update.js
+++ b/src/repo-update.js
@@ -60,7 +60,7 @@ module.exports = function*(argv) {
process.exit(1);
}
- var depth = argv.d ? argv.d: null;
+ var depth = argv.d ? argv.d: null;
var branches = Array.isArray(argv.b) ? argv.b : [argv.b];
var repos = flagutil.computeReposFromFlag(argv.r);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org