josh/jsvn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

support working-copy-local jsvn configuration files - close #12

Browse Source
This commit is contained in:
Josh Holtrop 2012-05-10 13:54:45 -04:00
parent eb735d60a1
commit ee49bfe4dd
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
jsvn
View File

@ -40,7 +40,24 @@ using_color = False
########################################################################### ###########################################################################
# Configuration # # Configuration #
########################################################################### ###########################################################################
def get_config(): def read_config_file(config, path):
if os.path.exists(path):
fh = open(path, 'r')
script = fh.read()
fh.close()
try:
exec(script, config)
except:
sys.stderr.write('Configuration file error in "%s":\n' % path)
traceback.print_exception(sys.exc_info()[0], sys.exc_info()[1],
None)
tb = traceback.extract_tb(sys.exc_info()[2])
for ent in tb[1:]:
lineno, fn = ent[1:3]
sys.stderr.write(' File "%s", line %d, in %s\n'
% (path, lineno, fn))
def get_config(svn):
config = { config = {
'pager': 'less -FRX', 'pager': 'less -FRX',
'use_pager': True, 'use_pager': True,
@ -83,22 +100,13 @@ def get_config():
'branches': 'branch'}, 'branches': 'branch'},
'svn': '', 'svn': '',
} }
pth = os.path.expanduser('~/.jsvn')
if os.path.exists(pth): global_user_config_fname = os.path.expanduser('~/.jsvn')
fh = open(pth, 'r') read_config_file(config, global_user_config_fname)
script = fh.read()
fh.close() wc_user_config_fname = get_svn_wc_root(svn) + '/.svn/jsvn'
try: read_config_file(config, wc_user_config_fname)
exec(script, config)
except:
sys.stderr.write('Configuration file error in "%s":\n' % pth)
traceback.print_exception(sys.exc_info()[0], sys.exc_info()[1],
None)
tb = traceback.extract_tb(sys.exc_info()[2])
for ent in tb[1:]:
lineno, fn = ent[1:3]
sys.stderr.write(' File "%s", line %d, in %s\n'
% (pth, lineno, fn))
return config return config
def apply_aliases(config, argv): def apply_aliases(config, argv):
@ -1028,8 +1036,10 @@ def url(argv, svn, out):
def main(argv): def main(argv):
global using_color global using_color
config = get_config() realsvn = findInPath('svn')
realsvn = config['svn'] if config['svn'] != '' else findInPath('svn') config = get_config(realsvn)
if config['svn']:
realsvn = config['svn']
out = sys.stdout out = sys.stdout
orig_subcommand = argv[0] if len(argv) > 0 else '' orig_subcommand = argv[0] if len(argv) > 0 else ''
if len(argv) > 0: if len(argv) > 0: