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
|
#!/usr/bin/python
# IVLE - Informatics Virtual Learning Environment
# Copyright (C) 2007-2008 The University of Melbourne
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Author: David Coles, Will Grant
'''
A script for generating a Subversion diff. It is intended to be run via
trampoline by ivle.webapp.filesystem.diff.DiffView.
'''
import os
import sys
import locale
import cjson
import pysvn
import ivle.conf
import ivle.svn
# Set locale to UTF-8
locale.setlocale(locale.LC_CTYPE, "en_US.UTF-8")
# Default revisions
revs = [pysvn.Revision(x) for x in [pysvn.opt_revision_kind.base,
pysvn.opt_revision_kind.working]]
# Override revisions from argv.
for ri in range(len(sys.argv[2:4])):
r = ivle.svn.revision_from_string(sys.argv[2 + ri])
if r is not None:
revs[ri] = r
# Attempt to get the diff for these revisons
try:
svnclient = ivle.svn.create_auth_svn_client(username=ivle.conf.login,
password=ivle.conf.svn_pass)
svnclient.exception_style = 1
diff = svnclient.diff
# pysvn's diff tempfile behaviour changes with Subversion 1.6.x.
# < 1.6 wants a filename, >= 1.6 wants a directory.
if pysvn.svn_version > (1, 6):
tmp_path = '/tmp'
else:
tmp_path = '/tmp/svndiff'
diff_text = diff(tmp_path,
os.path.join('/home', sys.argv[1]),
revision1=revs[0],
revision2=revs[1]
)
print cjson.encode({'diff': diff_text.decode('utf-8')})
except pysvn.ClientError, e:
error = e[0]
try:
code = e[1][0][1]
# See subversion/include/svn_error_codes.h.
# 150000: ERR_ENTRY_NOT_FOUND
# 155007: WC_NOT_DIRECTORY.
# 160013: FS_NOT_FOUND
# 200005: UNVERSIONED_RESOURCE
if code in (150000, 155007, 160013, 200005):
error = 'notfound'
else:
error = '%s (code %d)' % (error, code)
except IndexError:
pass
print cjson.encode({'error': error})
|