← Back to branch summary

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

« back to all changes in this revision

Viewing changes to services/diffservice

  • Committer: Matt Giuca
  • Date: 2009-02-24 02:02:03 UTC
  • mto: This revision was merged to the branch mainline in revision 1119.
  • Revision ID: matt.giuca@gmail.com-20090224020203-aqdcjnsj6y7wl32o
Added a new look to the IVLE header bar. Mmmm... Web 2.0.
Added top-level directory image-source, containing SVG and script files for
    generating the images.
ivle/webapp/coremedia/images: Added 'chrome' directory containing the rendered
    images.
Modified ivle/webapp/base/ivle-headings.html and
    ivle/webapp/coremedia/ivle.css to support the new images.
    Note that the H1 and H2 at the top of the page are no longer displayed
    (and their custom styles have been removed). There is a heading image
    instead.

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/diffservice
48
48
    svnclient = pysvn.Client()
49
49
    svnclient.exception_style = 1
50
50
    diff = svnclient.diff
51
 
 
52
 
    # pysvn's diff tempfile behaviour changes with Subversion 1.6.x.
53
 
    # < 1.6 wants a filename, >= 1.6 wants a directory.
54
 
    if pysvn.svn_version > (1, 6):
55
 
        tmp_path = '/tmp'
56
 
    else:
57
 
        tmp_path = '/tmp/svndiff'
58
 
 
59
 
    diff_text = diff(tmp_path,
 
51
    diff_text = diff( '/tmp/svndiff',
60
52
        os.path.join('/home', sys.argv[1]),
61
53
        revision1=revs[0],
62
54
        revision2=revs[1]
68
60
    try:
69
61
        code = e[1][0][1]
70
62
        # See subversion/include/svn_error_codes.h.
71
 
        # 150000: ERR_ENTRY_NOT_FOUND
72
63
        # 155007: WC_NOT_DIRECTORY.
73
64
        # 160013: FS_NOT_FOUND
74
65
        # 200005: UNVERSIONED_RESOURCE
75
 
        if code in (150000, 155007, 160013, 200005):
 
66
        if code in (155007, 160013, 200005):
76
67
            error = 'notfound'
77
68
        else:
78
69
            error = '%s (code %d)' % (error, code)