← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to scripts/diffservice

  • Committer: wagrant
  • Date: 2008-07-24 04:45:12 UTC
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:trunk:945
specialhome: Rebrand personal to mywork (by majority), refactor a bit,
             and improve error handling.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/diffservice
25
25
# run from the trampoline by the Diff application.
26
26
 
27
27
from common import cgirequest
28
 
from cgi import parse_qs
29
 
from os import path
 
28
import common.svn
 
29
import cgi
 
30
import os.path
30
31
import pysvn
31
32
import re
32
 
import urlparse
33
33
 
34
34
def htmlfy_diff(difftext):
35
35
    """Adds HTML markup to a udiff string"""
36
 
    output = difftext
37
 
    match_file = re.compile(r'^([\+\-]{3})\s(\S+)\s\((.+)\)$',re.MULTILINE)
38
 
    match_range = re.compile(r'^\@\@ (.*) \@\@$',re.MULTILINE)
39
 
    match_add = re.compile(r'^\+(.*)$',re.MULTILINE)
40
 
    match_sub = re.compile(r'^\-(.*)$',re.MULTILINE)
41
 
    match_special = re.compile(r'^\\(.*)$',re.MULTILINE)
42
 
    output = match_file.sub(
43
 
        r'<span class="diff_files">\1 \2 <em>(\3)</em></span>', output)
44
 
    output = match_range.sub(
45
 
        r'<span class="diff_range">@@ \1 @@</span>', output)
46
 
    output = match_add.sub(
47
 
        r'<span class="diff_add">+\1</span>', output)
48
 
    output = match_sub.sub(
49
 
        r'<span class="diff_sub">-\1</span>', output)
50
 
    output = match_special.sub(
51
 
        r'<span class="diff_special">\\\1</span>', output)
 
36
    output = cgi.escape(difftext)
 
37
    subs = {
 
38
     r'^([\+\-]{3})\s(\S+)\s\((.+)\)$':
 
39
         r'<span class="diff-files">\1 \2 <em>(\3)</em></span>',
 
40
     r'^\@\@ (.*) \@\@$':
 
41
         r'<span class="diff-range">@@ \1 @@</span>',
 
42
     r'^\+(.*)$':
 
43
         r'<span class="diff-add">+\1</span>',
 
44
     r'^\-(.*)$':
 
45
         r'<span class="diff-sub">-\1</span>',
 
46
     r'^\\(.*)$':
 
47
         r'<span class="diff-special">\\\1</span>'
 
48
    }
 
49
 
 
50
    for match in subs:
 
51
        output = re.compile(match, re.MULTILINE).sub(subs[match], output)
 
52
 
52
53
    return output
53
54
 
54
 
def get_revision(r_str):
55
 
    """ Returns a Revison object for pysvn from a r query string """
56
 
    if r_str == "HEAD":
57
 
        return pysvn.Revision( pysvn.opt_revision_kind.head )
58
 
    elif r_str == "WORKING":
59
 
        return pysvn.Revision( pysvn.opt_revision_kind.working )
60
 
    elif r_str == "BASE":
61
 
        return pysvn.Revision( pysvn.opt_revision_kind.base )
62
 
    else:
63
 
        try:
64
 
            r = int(r_str)
65
 
            return pysvn.Revision( pysvn.opt_revision_kind.number, r)
66
 
        except:
67
 
            return None
68
 
        
69
55
# Use a CGIRequest object to make the CGI environment look like the normal
70
56
# IVLE handler environment.
71
57
 
72
58
req = cgirequest.CGIRequest()
73
 
 
74
 
# CGI Headers
75
 
print("Content-Type: text/html\n")
76
 
print("\n")
 
59
req.install_error_handler()
 
60
req.content_type = "text/html"
77
61
 
78
62
# Beginning of the page
79
 
print('<div id="ivle_padding">')
80
 
print('<h1>Diff</h1>')
 
63
req.write('<div id="ivle_padding">\n')
 
64
req.write('<h1>Diff</h1>\n')
81
65
 
82
 
# Work out the revisions from query
83
 
url = urlparse.urlparse(req.path)
84
 
querystr = url[4]
85
 
urlpath = url[2]
86
 
query = parse_qs(querystr)
87
66
# Default revisions
88
 
rev1=pysvn.Revision( pysvn.opt_revision_kind.base )
89
 
rev2=pysvn.Revision( pysvn.opt_revision_kind.working )
90
 
if 'r' in query:
91
 
    if len(query['r']) == 2:
92
 
        r2 = get_revision(query['r'][1])
93
 
        if r2 != None:
94
 
            rev2 = r2
95
 
    r1 = get_revision(query['r'][0])
96
 
    if r1 != None:
97
 
        rev1=r1
 
67
revs = [pysvn.Revision(x) for x in [pysvn.opt_revision_kind.base,
 
68
                                    pysvn.opt_revision_kind.working]]
 
69
# Override revisions from query string
 
70
fields = req.get_fieldstorage()
 
71
field_r = fields.getlist("r")
 
72
for ri in range(len(field_r)):
 
73
    r = common.svn.revision_from_string(field_r[ri])
 
74
    if r is not None:
 
75
        revs[ri] = r
98
76
 
99
77
# Attempt to get the diff for these revisons
100
78
try:
101
79
    svnclient = pysvn.Client()
102
80
    diff = svnclient.diff
103
81
    diff_text = diff( '/tmp/svndiff',
104
 
        path.join('/home/', urlpath),
105
 
        revision1=rev1,
106
 
        #revision1=pysvn.Revision( pysvn.opt_revision_kind.base ),
107
 
        #url_or_path2=url_or_path,
108
 
        revision2=rev2,
109
 
        #revision2=pysvn.Revision( opt_revision_kind.working ),
110
 
        #recurse=True,
111
 
        #ignore_ancestry=False,
112
 
        #diff_deleted=True,
113
 
        #ignore_content_type=False,
114
 
        #header_encoding="",
115
 
        #diff_options=[]
 
82
        os.path.join('/home', req.path),
 
83
        revision1=revs[0],
 
84
        revision2=revs[1]
116
85
    )
117
86
 
118
87
    # Split up the udiff into individual files
122
91
    split_diff = diff_matcher.findall(diff_text)
123
92
 
124
93
    # Prints output
125
 
    print("<dl>")
126
94
    for filediff in split_diff:
127
95
        filename = filediff[0]
128
96
        diffbody = htmlfy_diff(filediff[1])
129
 
        print("<dt><strong>File:</strong> " + filename + "</dt>")
130
 
        print("<dd><code><pre>" + diffbody + "</pre></code></dd>")
131
 
    print("</dl>")
 
97
        req.write('<p><b>File:</b> %s</p>\n'
 
98
            % cgi.escape(filename))
 
99
        req.write('<pre class="diff">%s</pre>\n' % diffbody)
132
100
 
133
101
except pysvn._pysvn_2_5.ClientError, e:
134
 
    print("<dl><dt><strong>Error:</strong></dt><dd>")
135
 
    print(e)
136
 
    print("</dd></dl>")
 
102
    req.write('<p><b>Error:</b></p>\n')
 
103
    req.write('<pre class="diff">%s</pre>\n' % cgi.escape(str(e)))
137
104
 
138
 
print('</div>')
 
105
req.write('</div>\n')