← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/webapp/filesystem/diff/__init__.py

merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/filesystem/diff/__init__.py
26
26
import cjson
27
27
import genshi
28
28
 
29
 
import ivle.conf
30
29
import ivle.interpret
31
30
from ivle.webapp.base.xhtml import XHTMLView
32
31
from ivle.webapp.base.plugins import ViewPlugin, MediaPlugin
51
50
 
52
51
        revs = [revfield.value for revfield in revfields]
53
52
 
54
 
        jail_dir = os.path.join(ivle.conf.jail_base, req.user.login)
 
53
        jail_dir = os.path.join(req.config['paths']['jails']['mounts'],
 
54
                                req.user.login)
55
55
        (out, err) = ivle.interpret.execute_raw(req.user, jail_dir, '/home',
56
 
                    os.path.join(ivle.conf.share_path, 'services/diffservice'),
57
 
                    [self.path] + revs)
 
56
                                    os.path.join(req.config['paths']['share'],
 
57
                                                 'services/diffservice'),
 
58
                                    [self.path] + revs)
58
59
        assert not err
59
60
 
60
61
        response = cjson.decode(out)
73
74
            r'^Index: (.*)\n\=+\n((?:[^I].*\n)*)',re.MULTILINE
74
75
        )
75
76
 
 
77
        ctx['title'] = self.path.rsplit('/', 1)[-1]
 
78
 
76
79
        # Create a dict with (name, HTMLdiff) pairs for each non-empty diff.
77
80
        ctx['files'] = dict([(fd[0], genshi.XML(htmlfy_diff(fd[1])))
78
81
                             for fd in diff_matcher.findall(diff)