Attachment 649442 Details for Bug 864805 – Git formatted patch

[patch] Git formatted patch

0001-Saving-backup-file-during-git-mergetool-fails-bz-864.patch (text/plain), 5.05 KB, created by Johan Cwiklinski on 2012-11-21 21:50:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johan Cwiklinski

Created: 2012-11-21 21:50:55 UTC

Size: 5.05 KB

patch

obsolete

>From 87bb8282fd96e1b17a36ea911c65bb6f842cfe15 Mon Sep 17 00:00:00 2001
>From: Johan Cwiklinski <johan@x-tnd.be>
>Date: Wed, 21 Nov 2012 22:50:42 +0100
>Subject: [PATCH] Saving backup file during git mergetool fails, bz #864805
>
>---
> kdiff3-0.9.97-saving_files.patch | 63 ++++++++++++++++++++++++++++++++++++++++
> kdiff3.spec                      | 13 +++++++--
> 2 files changed, 73 insertions(+), 3 deletions(-)
> create mode 100644 kdiff3-0.9.97-saving_files.patch
>
>diff --git a/kdiff3-0.9.97-saving_files.patch b/kdiff3-0.9.97-saving_files.patch
>new file mode 100644
>index 0000000..0b2531d
>--- /dev/null
>+++ b/kdiff3-0.9.97-saving_files.patch
>@@ -0,0 +1,63 @@
>+diff --git a/kdiff3/src-QT4/fileaccess.cpp b/kdiff3/src-QT4/fileaccess.cpp
>+index 134fc26..b6e01f0 100644
>+--- a/kdiff3/src-QT4/fileaccess.cpp
>++++ b/kdiff3/src-QT4/fileaccess.cpp
>+@@ -183,7 +183,8 @@ static QString nicePath( const QFileInfo& fi )
>+ 
>+ void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent )
>+ {
>+-   m_filePath   = nicePath( fi.filePath() ); // remove "./" at start   
>++   m_filePath   = pParent == 0 ? fi.absoluteFilePath() : 
>++                                 nicePath( fi.filePath() ); // remove "./" at start   
>+ 
>+    m_bSymLink   = fi.isSymLink();
>+    if ( m_bSymLink || (!m_bExists  && m_filePath.contains("@@") ) )
>+@@ -566,7 +567,16 @@ QString FileAccess::absoluteFilePath() const
>+    if ( parent() != 0 )
>+       return parent()->absoluteFilePath() + "/" + m_filePath;
>+    else
>+-      return m_filePath;
>++   {
>++      if ( m_filePath.isEmpty() )
>++	 return QString();
>++      
>++      QFileInfo fi( m_filePath );
>++      if ( fi.isAbsolute() )
>++	 return m_filePath;
>++      else
>++	 return fi.absoluteFilePath(); // Probably never reached
>++   }
>+ }  // Full abs path
>+ 
>+ // Just the name-part of the path, without parent directories
>+@@ -1184,7 +1194,7 @@ bool FileAccessJobHandler::rename( const QString& dest )
>+       m_bSuccess = false;
>+       KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->url(), kurl, permissions, KIO::HideProgressInfo );
>+       connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*)));
>+-      connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long)));
>++      connect( pJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long)));
>+ 
>+       ProgressProxy::enterEventLoop( pJob,
>+          i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest) );
>+@@ -1673,7 +1683,7 @@ bool FileAccessJobHandler::listDir( t_DirectoryList* pDirList, bool bRecursive,
>+                   &pp,      SLOT( slotListDirInfoMessage(KJob*, const QString&) ));
>+ 
>+          // This line makes the transfer via fish unreliable.:-(
>+-         //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long)));
>++         //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long)));
>+ 
>+          ProgressProxy::enterEventLoop( pListJob,
>+             i18n("Listing directory: %1",m_pFileAccess->prettyAbsPath()) );
>+diff --git a/kdiff3/src-QT4/kdiff3.cpp b/kdiff3/src-QT4/kdiff3.cpp
>+index 165602f..de7cc9c 100644
>+--- a/kdiff3/src-QT4/kdiff3.cpp
>++++ b/kdiff3/src-QT4/kdiff3.cpp
>+@@ -211,6 +211,8 @@ KDiff3App::KDiff3App(QWidget* pParent, const char* /*name*/, KDiff3Part* pKDiff3
>+       m_outputFilename = args->getOption("output");
>+       if ( m_outputFilename.isEmpty() )
>+          m_outputFilename = args->getOption("out");
>++      if ( ! m_outputFilename.isEmpty() )
>++         m_outputFilename = FileAccess( m_outputFilename, true ).absoluteFilePath();
>+    }
>+ 
>+    m_bAutoFlag = args!=0  && args->isSet("auto");
>diff --git a/kdiff3.spec b/kdiff3.spec
>index 3438d91..acfeb97 100644
>--- a/kdiff3.spec
>+++ b/kdiff3.spec
>@@ -1,6 +1,6 @@
> Name:           kdiff3
> Version:        0.9.97
>-Release: 	3%{?dist}
>+Release:        4%{?dist}
> Summary:        Compare + merge 2 or 3 files or directories
> 
> Group:          Development/Tools
>@@ -14,10 +14,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> # Patch0:         kdiff3part.desktop.diff
> # No longer needed for 0.9.96
> # Install kdiff3_part.rc into correct location
>-# Patch1:		kdiff3part.rc.diff
>+# Patch1:        kdiff3part.rc.diff
> # No longer needed for 0.9.96
> # fix build against kde-4.5 (pre)releases
>-# Patch2:		kdiff3-0.9.95-docbook_fixes.patch     
>+# Patch2:        kdiff3-0.9.95-docbook_fixes.patch
>+
>+Patch0:         kdiff3-0.9.97-saving_files.patch
> 
> BuildRequires:  desktop-file-utils
> BuildRequires:  gettext
>@@ -37,6 +39,7 @@ KDiff3 is a program that
> 
> %prep
> %setup -q -n %{name}-%{version}
>+%patch0 -p2
> 
> %build
> mkdir -p %{_target_platform}
>@@ -102,6 +105,10 @@ update-desktop-database -q &> /dev/null
> %{_kde4_datadir}/kde4/services/kdiff3*.desktop
> 
> %changelog
>+* Wed Nov 21 2012 Johan Cwiklinski <johan AT x-tnd DOT be> - 0.9.97-4.trashy
>+- Fix for saving files on KDE with relative path specified
>+  via command line option -o.
>+
> * Mon Aug 13 2012 Neal Becker <ndbecker2@gmail.com> - 0.9.97-3
> - Remove libkdiff3*.so
> 
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 864805: 649442