-
Notifications
You must be signed in to change notification settings - Fork 1
/
svn-vimdifftab.py
executable file
·134 lines (110 loc) · 4.96 KB
/
svn-vimdifftab.py
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
#!/usr/bin/python
# Use vimdiff with svn, diffing each file in its own tab.
# @author Chris Pick <[email protected]>
# @section LICENSE
#
# Copyright 2012 Chris Pick. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY CHRIS PICK ``AS IS'' AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL CHRIS PICK OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# The views and conclusions contained in the software and documentation are
# those of the authors and should not be interpreted as representing official
# policies, either expressed or implied, of Chris Pick.
import sys, re, subprocess, os, os.path, tempfile, shutil
def sanitize(file_description):
file_description = re.sub(r'\s+', r'\ ', file_description)
file_description = re.sub(r'/', r'\\\\', file_description)
return file_description
def copy_if_tmp(file_dir, file_name, file_description):
# TODO handle spaces and tabs in filenames
file_name_original = file_description.split('\t')[0]
file_name_ext = os.path.splitext(file_name_original)[1]
# files without the right extension or that look like temp files need to be
# copied
file_name_base = os.path.basename(file_name)
if file_name_ext not in ('', os.path.splitext(file_name)[1]):
file_name_base = file_name_base + file_name_ext
elif not os.path.isabs(file_name): return file_name
file_name_out = os.path.join(file_dir, file_name_base)
shutil.copy(file_name, file_name_out)
return file_name_out
# if this is a child
manifest_file_name = os.getenv('SVN_VIMDIFFTAB')
if manifest_file_name != None:
# TODO use lockfile
file_dir = os.path.dirname(manifest_file_name)
file_description1 = sys.argv[3]
file_description2 = sys.argv[5]
file_name1 = copy_if_tmp(file_dir, sys.argv[6], file_description1)
file_name2 = copy_if_tmp(file_dir, sys.argv[7], file_description2)
file_description1 = sanitize(file_description1)
file_description2 = sanitize(file_description2)
manifest_file = open(manifest_file_name, 'a')
manifest_file.write(file_description1 + '\n' + file_description2 + '\n'
+ file_name1 + '\n' + file_name2 + '\n');
sys.exit(0)
# create the dir and pass it to the children
temp_dir = tempfile.mkdtemp('', 'svn-vimdifftab-' + str(os.getpid()) + '-')
manifest_file_fd, manifest_file_name = tempfile.mkstemp('.manifest', '',
temp_dir, True)
os.putenv('SVN_VIMDIFFTAB', manifest_file_name)
script_name = sys.argv[0]
if script_name == '-c':
sys.exit('Script must be called dirctly, not run from interpreter')
svn_diff_rc = subprocess.call(
['svn', 'diff', '--diff-cmd', script_name] + sys.argv[1:])
if svn_diff_rc != os.EX_OK:
sys.exit('svn diff failed: ' + str(svn_diff_rc))
vim_file_fd, vim_file_name = tempfile.mkstemp('.vim', '', temp_dir, True)
vim_file = os.fdopen(vim_file_fd, 'a')
# TODO handle newlines in filenames
manifest_file = os.fdopen(manifest_file_fd, 'r')
line_list = []
changed_file = False
for line in manifest_file:
# remove trailing newline and add to list
line = line[:-1]
line_list.append(line)
# wait for full record to be read
if len(line_list) < 4: continue
file_description1, file_description2, file_name1, file_name2 = line_list
line_list = []
changed_file = True
vim_file.write('tabnew\n'
'silent edit ' + file_name2 + '\n'
'filetype detect\n'
'silent file ' + file_description2 + '\n'
'silent vertical diffsplit ' + file_name1 + '\n'
'filetype detect\n'
'silent file ' + file_description1 + '\n')
vim_file.write('tabfirst\n')
vim_file.write('bd\n')
vim_file.close()
# if there was an incomplete record
if len(line_list):
sys.exit('Unexpected line(s):\n' + '\n'.join(line_list))
vim_rc = os.EX_OK
if changed_file:
vim_rc = subprocess.call(['vim', '-R', '--cmd',
'au VimEnter * so ' + vim_file_name])
shutil.rmtree(temp_dir)
sys.exit(vim_rc)