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

stash: always create and apply stash from WC root directory

Browse Source
This commit is contained in:
Josh Holtrop 2012-03-26 14:18:04 -04:00
parent 8723d0e74e
commit 8f3bfbbe3c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jsvn
View File

@ -799,19 +799,26 @@ def stash(argv, svn, out):
if not argv[1].startswith('-'): if not argv[1].startswith('-'):
action = argv[1] action = argv[1]
if action == 'save': if action == 'save':
owd = os.getcwd()
wc_dir = get_svn_wc_root(svn)
os.chdir(wc_dir)
stash_idx = get_next_stash_idx(svn) stash_idx = get_next_stash_idx(svn)
stash_fname = get_stash_fname(svn, stash_idx) stash_fname = get_stash_fname(svn, stash_idx)
fh = open(stash_fname, 'w') fh = open(stash_fname, 'w')
Popen([svn, 'diff'], stdout=fh).wait() Popen([svn, 'diff'], stdout=fh).wait()
fh.close() fh.close()
Popen([svn, 'revert', '--depth=infinity', get_svn_wc_root(svn)], Popen([svn, 'revert', '--depth=infinity', '.'],
stdout=PIPE).wait() stdout=PIPE).wait()
os.chdir(owd)
out.write('Created stash %d\n' % stash_idx) out.write('Created stash %d\n' % stash_idx)
elif action == 'list': elif action == 'list':
stash_ids = get_stash_ids(svn) stash_ids = get_stash_ids(svn)
for si in reversed(stash_ids): for si in reversed(stash_ids):
out.write('%d\n' % si) out.write('%d\n' % si)
elif action == 'pop': elif action == 'pop':
owd = os.getcwd()
wc_dir = get_svn_wc_root(svn)
os.chdir(wc_dir)
stash_ids = get_stash_ids(svn) stash_ids = get_stash_ids(svn)
if len(stash_ids) > 0: if len(stash_ids) > 0:
stash_idx = stash_ids[-1] stash_idx = stash_ids[-1]
@ -826,6 +833,7 @@ def stash(argv, svn, out):
out.write('Error popping stash %d\n' % stash_idx) out.write('Error popping stash %d\n' % stash_idx)
else: else:
out.write('No stashes to pop\n') out.write('No stashes to pop\n')
os.chdir(owd)
elif action == 'show': elif action == 'show':
if len(argv) >= 3: if len(argv) >= 3:
stash_id = int(argv[2]) stash_id = int(argv[2])