Bug 76904 - bug with saving a diff, cannot upload file
Summary: bug with saving a diff, cannot upload file
Status: RESOLVED FIXED
Alias: None
Product: kompare
Classification: Applications
Component: general (show other bugs)
Version: unspecified
Platform: unspecified Linux
: NOR normal
Target Milestone: ---
Assignee: Kompare developers
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-03-06 23:42 UTC by Otto Bruggeman
Modified: 2009-02-24 03:03 UTC (History)
3 users (show)

See Also:
Latest Commit:
Version Fixed In:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Otto Bruggeman 2004-03-06 23:42:20 UTC
Version:           3.2.90 (using KDE 3.2.90 (CVS >= 20040117), compiled sources)
Compiler:          gcc version 3.3.2 20031216 (prerelease) (SuSE Linux)
OS:          Linux (i686) release 2.4.21-192-default

[23:37:30] [McCabe] it gave an error that it couldnt copy the temporary file, but the tempfile seems right at least
[23:37:43] [McCabe] i think im just haunted today :)
[23:38:21] >BruggieHD< ah, right i have had that error as well... cant find out why though
[23:38:25] >BruggieHD< hehe
[23:38:31] [McCabe] kompare: KompareModelList::saveDestination:
[23:38:32] [McCabe] kompare (libs): Tempfilename   : /tmp/kde-linus/kompareQHy5Sa.tmp
[23:38:32] [McCabe] kompare (libs): DestinationURL :
[23:38:48] >BruggieHD< hmm  destination url is empty...
[23:39:03] [McCabe] yeah.. do you usually use absolute paths ?
[23:39:13] [McCabe] when i diffed, i used relative
[23:39:40] >BruggieHD< it should work with relative as well, i'll check
[23:39:52] >BruggieHD< (but not now, got kompare in an unworking state atm)
[23:40:02] >BruggieHD< i'll file areport for it so i wont forget
[23:40:14] [McCabe] my difffile has the lines:
[23:40:16] [McCabe] diff -r -u3 kdewebdevpatched/quanta/data/dtep/html/description.rc kdewebdev/quanta/data/dtep/html/description.rc
[23:40:17] [McCabe] --- kdewebdevpatched/quanta/data/dtep/html/description.rc       2004-03-06 23:21:44.000000000 +0100
[23:40:18] [McCabe] +++ kdewebdev/quanta/data/dtep/html/description.rc      2004-03-05 23:59:07.000000000 +0100
[
Comment 1 Otto Bruggeman 2004-09-12 01:33:36 UTC
I fixed a similar bug where file could not be uploaded, namely bug 89105. Can you test if this makes it work for you as well ?
Comment 2 marazm 2005-01-12 14:58:14 UTC
Looks like I have smimilar problem with Kompare 3.3 (KDE 3.3.2 on Gentoo). I have 2 files - original and patch. After applying changes I'm unable to save results. Source and destiantion folders are named as "Unknown", but at windows bottom are both file names shown (in status bar). 
Err. message: "Could not upload the temporary file to the destination location <b></b>. The temporary file is still available under: <b>/tmp/kde-maris/kompareoFUHsb.tmp</b>. You can manually copy it to the right place"
Temp file is OK, but, as can see from err msg., destination is unknown. 


Oh, yeah, and those formating bold tags as plaintext look ugly.
Comment 3 Jeff Snyder 2005-06-06 21:43:25 UTC
This is gonna be a little spammy... I'm reassigning everything that's currently 
assigned to bruggie (who's been the default assignee for bugs since time began) 
to the new list address. 
 
Bruggie: if you're working on one or more of these atm, please snatch 'em 
back.. 
 
Everyone, esp. Joshua and Bruggie: if this genrates 33 mails, my sincere 
apologies.. 
Comment 4 Otto Bruggeman 2009-02-24 02:22:55 UTC
SVN commit 930684 by bruggie:

Many changes related to passing filename information from the part to
the modellist. The Kompare::Infostruct was already in place to update
everyone about changes but it was not used to communicate between the
part and model this commit fixes that. 

The real reason for this commit is that it fixes saving remote files. 
Do not give a local URL and pretend it is a remote URL, does not work. 
KIO::NetAccess::upload then simply does nothing because the file 
already exists.  

Refresh is fixed now. Refetch the files and dont reuse the local files
to determine the differences. Now that saving remote works it showed the
old result again. Some had already seen this, now it was easy to figure
out where it came from.

Fixed a silly copy and paste error where for the destination directory
source was used. Always fun these bugs.

Updated the caption in the titlebar to now have a " -- " to separate the
files so it is more clear which files/directories are compared. I read
somewhere in a bugreport people did not like this so fixed as well.

BUG:76904
BUG:81088
CCBUG:126870 Patch applied, second hunk not since this is not related



 M  +58 -29    komparepart/kompare_part.cpp  
 M  +74 -71    libdiff2/komparemodellist.cpp  
 M  +12 -15    libdiff2/komparemodellist.h  


WebSVN link: http://websvn.kde.org/?view=rev&revision=930684
Comment 5 Kevin Kofler 2009-02-24 03:03:16 UTC
SVN commit 930700 by kkofler:

Many changes related to passing filename information from the part to
the modellist. The Kompare::Infostruct was already in place to update
everyone about changes but it was not used to communicate between the
part and model this commit fixes that. 

The real reason for this commit is that it fixes saving remote files. 
Do not give a local URL and pretend it is a remote URL, does not work. 
KIO::NetAccess::upload then simply does nothing because the file 
already exists.  

Refresh is fixed now. Refetch the files and dont reuse the local files
to determine the differences. Now that saving remote works it showed the
old result again. Some had already seen this, now it was easy to figure
out where it came from.

Fixed a silly copy and paste error where for the destination directory
source was used. Always fun these bugs.

Updated the caption in the titlebar to now have a " -- " to separate the
files so it is more clear which files/directories are compared. I read
somewhere in a bugreport people did not like this so fixed as well.

CCBUG:76904
CCBUG:81088
CCBUG:126870 Patch applied, second hunk not since this is not related

backport revision 930684 by bruggie from trunk

 M  +57 -28    komparepart/kompare_part.cpp  
 M  +74 -71    libdiff2/komparemodellist.cpp  
 M  +12 -15    libdiff2/komparemodellist.h  


WebSVN link: http://websvn.kde.org/?view=rev&revision=930700