git ssb - Simplify getting repo ids · cel/git-ssb@a09b2ebd

Use getRemote only, and pass it a falsy value to get the default remote

cel committed on 11/21/2016, 11:07:14 PM
Parent: a9b72303067dfe180cdc0931c8297bcfad4ad5c1

lib/fork.jsView
		@@ -3,9 +3,9 @@
3	3 …	module.exports = function (argv) {
4	4 …	if (argv.help \|\| argv._.length < 1 \|\| argv._.length > 2) return require('./help')('fork')
5	5 …
6	6 …	var repo
7		- if (argv._.length == 1) repo = u.getDefaultRemote()
	7 …	+ if (argv._.length == 1) repo = u.getRemote()
8	8 …	else if (argv._.length == 2) repo = u.getRemote(argv._.shift())
9	9 …	if (!repo) throw 'unable to find git-ssb upstream repo'
10	10 …	var name = argv._[0]
11	11 …	if (!name) throw 'missing remote name'

lib/forks.jsView
		@@ -26,9 +26,9 @@
26	26 …	module.exports = function repoForks(argv) {
27	27 …	if (argv.help \|\| argv._.length > 1) return require('./help')('forks')
28	28 …
29	29 …	process.stderr.write('Loading forks...\r')
30		- var id = u.repoId(u.getRemoteUrl(argv._[0])) \|\| u.getDefaultRemote()
	30 …	+ var id = u.getRemote(argv._[0])
31	31 …	if (!id) throw 'unable to find git-ssb repo'
32	32 …
33	33 …	u.getSbot(argv, function (err, sbot) {
34	34 …	if (err) throw err

lib/issues.jsView
		@@ -7,9 +7,9 @@
7	7 …	module.exports = function (argv) {
8	8 …	if (argv.help \|\| argv._.length > 1) return require('./help')('issues')
9	9 …
10	10 …	process.stderr.write('Loading issues...\r')
11		- var id = u.repoId(u.getRemoteUrl(argv._[0])) \|\| u.getDefaultRemote()
	11 …	+ var id = u.getRemote(argv._[0])
12	12 …	if (!id) throw 'unable to find git-ssb repo'
13	13 …
14	14 …	var open = u.issueStateBool(argv)
15	15 …

lib/name.jsView
		@@ -3,9 +3,9 @@
3	3 …	module.exports = function (argv) {
4	4 …	if (argv.help \|\| argv._.length < 1 \|\| argv._.length > 2) return require('./help')('name')
5	5 …
6	6 …	var repo
7		- if (argv._.length == 1) repo = u.getDefaultRemote()
	7 …	+ if (argv._.length == 1) repo = u.getRemote()
8	8 …	else if (argv._.length == 2) repo = u.getRemote(argv._.shift())
9	9 …	if (!repo) throw 'unable to find git-ssb repo'
10	10 …	var name = argv._[0]
11	11 …	if (!name) throw 'missing name'

lib/pull-request.jsView
		@@ -33,9 +33,9 @@
33	33 …	module.exports = function pullRequest(argv) {
34	34 …	if (argv.help \|\| argv._.length > 0) return require('./help')('pull-requests')
35	35 …
36	36 …	var head = splitEnd(argv.head \|\| argv.h)
37		- var headRepoId = u.getRemote(head[0] \|\| u.getDefaultRemote())
	37 …	+ var headRepoId = u.getRemote(head[0])
38	38 …	var headBranch = head[1] \|\| u.getCurrentBranch()
39	39 …	if (!headRepoId \|\| !headBranch) throw 'unable to find head'
40	40 …
41	41 …	var text = argv.message \|\| argv.m

lib/pull-requests.jsView
		@@ -7,9 +7,9 @@
7	7 …	module.exports = function (argv) {
8	8 …	if (argv.help \|\| argv._.length > 1) return require('./help')('pull-requests')
9	9 …
10	10 …	process.stderr.write('Loading pull requests...\r')
11		- var headRepo = u.repoId(u.getRemoteUrl(argv._[0])) \|\| u.getDefaultRemote()
	11 …	+ var headRepo = u.getRemote(argv._[0])
12	12 …	if (!headRepo) throw 'unable to find git-ssb head repo'
13	13 …
14	14 …	var open = u.issueStateBool(argv)
15	15 …

lib/util.jsView
		@@ -12,32 +12,29 @@
12	12 …	var args = [].concat.apply([], arguments)
13	13 …	return proc.spawnSync('git', args, {encoding: 'utf8'}).stdout.trim()
14	14 …	}
15	15 …
16		-u.getRemoteUrl = function (name) {
17		- if (!name) return
18		- return u.gitSync('ls-remote', '--get-url', name)
19		-}
20		-
21	16 …	u.getCurrentBranch = function () {
22	17 …	return u.gitSync('symbolic-ref', '--short', 'HEAD')
23	18 …	}
24	19 …
25		-u.getRemote = function (name) {
26		- return u.repoId(name) \|\| u.repoId(u.getRemoteUrl(name))
	20 …	+function getRemoteUrl(name) {
	21 …	+ if (!name) return null
	22 …	+ return u.gitSync('ls-remote', '--get-url', name)
27	23 …	}
28	24 …
29		-u.getDefaultRemote = function (name) {
30		- return u.repoId(u.getRemoteUrl('origin'))
31		- \|\| u.repoId(u.getRemoteUrl('ssb'))
32		-}
33		-
34		-u.repoId = function (id) {
35		- if (!id) return
	25 …	+function repoId(id) {
	26 …	+ if (!id) return null
36	27 …	id = String(id).replace(/^ssb:\/*/, '')
37	28 …	return ssbRef.isMsg(id) ? id : null
38	29 …	}
39	30 …
	31 …	+u.getRemote = function (name) {
	32 …	+ return name
	33 …	+ ? repoId(name) \|\| repoId(getRemoteUrl(name))
	34 …	+ : repoId(getRemoteUrl('origin')) \|\| repoId(getRemoteUrl('ssb'))
	35 …	+}
	36 …	+
40	37 …	u.getSbot = function (config, cb) {
41	38 …	var keys = require('ssb-keys')
42	39 …	.loadOrCreateSync(path.join(config.path, 'secret'))
43	40 …	require('ssb-client')(keys, config, cb)

cel / git-ssb