← Back to branch summary

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

« back to all changes in this revision

Viewing changes to services/diffservice

  • Committer: William Grant
  • Date: 2010-02-04 01:51:17 UTC
  • Revision ID: grantw@unimelb.edu.au-20100204015117-ir9gstr8x297561n
Unbreak diffservice with Subversion >= 1.6

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
 
    diff_text = diff( '/tmp/svndiff',
 
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,
52
60
        os.path.join('/home', sys.argv[1]),
53
61
        revision1=revs[0],
54
62
        revision2=revs[1]