move default subversion aliases out of the user default configuration and apply them after applying user aliases

This commit is contained in:
Josh Holtrop 2012-05-10 17:21:13 -04:00
parent 70e1f4edb5
commit 1c8bbc40ae

69
jsvn
View File

@ -64,38 +64,6 @@ def get_config(svn):
'use_pager': True, 'use_pager': True,
'use_color': True, 'use_color': True,
'aliases': { 'aliases': {
# default Subversion aliases
'praise': 'blame',
'annotate': 'blame',
'ann': 'blame',
'cl': 'changelist',
'co': 'checkout',
'ci': 'commit',
'cp': 'copy',
'del': 'delete',
'remove': 'delete',
'rm': 'delete',
'di': 'diff',
'?': 'help',
'h': 'help',
'ls': 'list',
'mv': 'move',
'rename': 'move',
'ren': 'move',
'pdel': 'propdel',
'pd': 'propdel',
'pedit': 'propedit',
'pe': 'propedit',
'pget': 'propget',
'pg': 'propget',
'plist': 'proplist',
'pl': 'proplist',
'pset': 'propset',
'ps': 'propset',
'stat': 'status',
'st': 'status',
'sw': 'switch',
'up': 'update',
# default jsvn aliases # default jsvn aliases
'tags': 'tag', 'tags': 'tag',
'branches': 'branch'}, 'branches': 'branch'},
@ -1055,6 +1023,43 @@ def do_cmd(argv, realsvn, config, expand=True):
Popen(argv, shell=True).wait() Popen(argv, shell=True).wait()
return return
# after processing user aliases, apply default Subversion aliases
svn_aliases = {
'praise': 'blame',
'annotate': 'blame',
'ann': 'blame',
'cl': 'changelist',
'co': 'checkout',
'ci': 'commit',
'cp': 'copy',
'del': 'delete',
'remove': 'delete',
'rm': 'delete',
'di': 'diff',
'?': 'help',
'h': 'help',
'ls': 'list',
'mv': 'move',
'rename': 'move',
'ren': 'move',
'pdel': 'propdel',
'pd': 'propdel',
'pedit': 'propedit',
'pe': 'propedit',
'pget': 'propget',
'pg': 'propget',
'plist': 'proplist',
'pl': 'proplist',
'pset': 'propset',
'ps': 'propset',
'stat': 'status',
'st': 'status',
'sw': 'switch',
'up': 'update',
}
if argv[0] in svn_aliases:
argv[0] = svn_aliases[argv[0]]
out = sys.stdout out = sys.stdout
using_pager = False using_pager = False
using_color = sys.stdout.isatty() and config['use_color'] using_color = sys.stdout.isatty() and config['use_color']