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

stash: rework bugfixes

Browse Source
This commit is contained in:
Josh Holtrop 2013-03-11 21:22:03 -04:00
parent 6f4a88737d
commit e8fe0efcdb
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jsvn
View File

@ -1322,6 +1322,8 @@ q: quit and abort stash
svars['hunk_buildup'] = '' svars['hunk_buildup'] = ''
svars['index_fname'] = new_file_name svars['index_fname'] = new_file_name
svars['binary_file'] = False svars['binary_file'] = False
svars['wrote_index_sf'] = False
svars['wrote_index_rf'] = False
diff_proc = Popen([svn, 'diff'] + targets, stdout=PIPE) diff_proc = Popen([svn, 'diff'] + targets, stdout=PIPE)
for line in iter(diff_proc.stdout.readline, ''): for line in iter(diff_proc.stdout.readline, ''):
@ -1342,7 +1344,8 @@ q: quit and abort stash
svars['hunk_buildup'] += line svars['hunk_buildup'] += line
if svars['quit']: if svars['quit']:
break break
flush_file('') if not svars['quit']:
flush_file('')
s_fh.close() s_fh.close()
r_fh.close() r_fh.close()