← Back to branch summary

~mcfletch/eric/update-to-4.5.13

« back to all changes in this revision

Viewing changes to eric/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py

Tags: 4.5.0-1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
eric/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
1
1
# -*- coding: utf-8 -*-
2
2
 
3
 
# Copyright (c) 2003 - 2011 Detlev Offenbach <detlev@die-offenbachs.de>
 
3
# Copyright (c) 2003 - 2012 Detlev Offenbach <detlev@die-offenbachs.de>
4
4
#
5
5
 
6
6
"""
187
187
        cwd = os.getcwd()
188
188
        os.chdir(dname)
189
189
        try:
190
 
            ppath = e4App().getObject('Project').getProjectPath()
191
 
            dname = dname.replace(ppath, '')
 
190
            dname = e4App().getObject('Project').getRelativePath(dname)
192
191
            if dname:
193
192
                dname += "/"
194
193
            for name in fnames:
354
353
            KQMessageBox.critical(self, self.trUtf8('Save Diff'),
355
354
                self.trUtf8('<p>The patch file <b>%1</b> could not be saved.'
356
355
                    '<br>Reason: %2</p>')
357
 
                    .arg(unicode(fname)).arg(unicode(why)))
 
356
                    .arg(unicode(fname)).arg(str(why)))
358
357
        
359
358
    def __showError(self, msg):
360
359
        """