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

stash: bugfix: respect options that follow operation (ex: --pop -k)

Browse Source
This commit is contained in:
Josh Holtrop 2013-03-15 15:42:42 -04:00
parent 122e16b697
commit 77f1965113
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jsvn
View File

@ -1539,15 +1539,16 @@ def stash_h(argv, svn, out, config):
keep = False keep = False
patch = False patch = False
externals = config['stash_externals'] externals = config['stash_externals']
operation = 'save'
for opt, arg in opts: for opt, arg in opts:
if opt == '--list': if opt == '--list':
return stash_list_h(args, svn, out, config) operation = 'list'
elif opt == '--pop': elif opt == '--pop':
return stash_pop_h(args, svn, out, config, keep) operation = 'pop'
elif opt == '--show': elif opt == '--show':
return stash_show_h(args, svn, out, config) operation = 'show'
elif opt == '--drop': elif opt == '--drop':
return stash_drop_h(args, svn, out, config) operation = 'drop'
elif opt in ('-k', '--keep'): elif opt in ('-k', '--keep'):
keep = True keep = True
elif opt in ('-p', '--patch'): elif opt in ('-p', '--patch'):
@ -1556,6 +1557,14 @@ def stash_h(argv, svn, out, config):
externals = True externals = True
elif opt == '--noexternals': elif opt == '--noexternals':
externals = False externals = False
if operation == 'list':
return stash_list_h(args, svn, out, config)
elif operation == 'pop':
return stash_pop_h(args, svn, out, config, keep)
elif operation == 'show':
return stash_show_h(args, svn, out, config)
elif operation == 'drop':
return stash_drop_h(args, svn, out, config)
return stash_save_h(args, svn, out, config, keep, patch, externals) return stash_save_h(args, svn, out, config, keep, patch, externals)
def root_h(argv, svn, out, config): def root_h(argv, svn, out, config):