main/repo: add support for subcommand aliases

This supports [alias] sections with repo subcommands just like git.

Change-Id: Ie9235b5d4449414e6a745814f0110bd6af74ea93
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/255833
Reviewed-by: David Pursehouse <dpursehouse@collab.net>
Tested-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Mike Frysinger
2020-02-18 21:37:00 -05:00
parent f841ca48c1
commit 949bc34267
2 changed files with 69 additions and 1 deletions

43
repo
View File

@@ -13,6 +13,7 @@ from __future__ import print_function
import datetime
import os
import platform
import shlex
import subprocess
import sys
@@ -693,6 +694,24 @@ def _SetConfig(cwd, name, value):
run_git('config', name, value, cwd=cwd)
def _GetRepoConfig(name):
"""Read a repo configuration option."""
config = os.path.join(home_dot_repo, 'config')
if not os.path.exists(config):
return None
cmd = ['config', '--file', config, '--get', name]
ret = run_git(*cmd, check=False)
if ret.returncode == 0:
return ret.stdout
elif ret.returncode == 1:
return None
else:
print('repo: error: git %s failed:\n%s' % (' '.join(cmd), ret.stderr),
file=sys.stderr)
raise RunError()
def _InitHttp():
handlers = []
@@ -876,6 +895,25 @@ class _Options(object):
version = False
def _ExpandAlias(name):
"""Look up user registered aliases."""
# We don't resolve aliases for existing subcommands. This matches git.
if name in {'gitc-init', 'help', 'init'}:
return name, []
alias = _GetRepoConfig('alias.%s' % (name,))
if alias is None:
return name, []
args = alias.strip().split(' ', 1)
name = args[0]
if len(args) == 2:
args = shlex.split(args[1])
else:
args = []
return name, args
def _ParseArguments(args):
cmd = None
opt = _Options()
@@ -1004,6 +1042,11 @@ def main(orig_args):
file=sys.stderr)
sys.exit(1)
if not repo_main:
# Only expand aliases here since we'll be parsing the CLI ourselves.
# If we had repo_main, alias expansion would happen in main.py.
cmd, alias_args = _ExpandAlias(cmd)
args = alias_args + args
if opt.help:
_Usage()
if cmd == 'help':