Opened 12 years ago

Last modified 2 years ago

#2837 new Feature request

Compare file contents with external program (File Diff)

Reported by: korneel Owned by:
Priority: normal Component: FileZilla Client
Keywords: File Diff Cc: korneel, Tim Kosse, Alexander Schuch, PhoneixSegovia@…, igitur@…
Component version: Operating system type:
Operating system version:

Description

I just thought of it, it would come rather handy in some occasions, to be able to compare online and local files, throu WinMerge or similar.
On downloading, the 'overwrite?' popup could give the option to compare, merge or the current options.

If compared, the online version could be stored in a temporary file for comparison.

Change History (20)

comment:1 in reply to:  description Changed 10 years ago by EagleOneRaptor

Replying to korneel:

I just thought of it, it would come rather handy in some occasions, to be able to compare online and local files, throu WinMerge or similar.
On downloading, the 'overwrite?' popup could give the option to compare, merge or the current options.

If compared, the online version could be stored in a temporary file for comparison.

I'm favor on this feature provide dynamism at work time, also, this option can be appear in the selected file menu if an online/local file with same name exists, and open for editing the selected file.

comment:2 Changed 9 years ago by jerone

I really like to see this feature too.
When I'm returning to an old project and find differences between the online and local version, I'm always wondering what's the difference. Now I have to download the files and compare manually. If support is added for WinMerge it could make things really easy.

comment:3 Changed 9 years ago by Javier Alfonso

It would be a very nice improvement.
It could be as the edit option but with two files selected. And I think the external program must be configurable (don't bind to one).

comment:4 Changed 9 years ago by Scott Richardson

Operating system type: Windows

Ideally the feature would allow you to define a default diffing program to use, but it would be nice if you could define a different program based on file extension. You might want a different differ for txt, PDF, binary, XML, etc.

comment:5 in reply to:  4 Changed 9 years ago by Javier Alfonso

Replying to scottri:

Ideally the feature would allow you to define a default diffing program to use, but it would be nice if you could define a different program based on file extension. You might want a different differ for txt, PDF, binary, XML, etc.

But don't bind it to windows only, I use it on mac os and linux.

comment:6 Changed 9 years ago by Javier Alfonso

Cc: PhoneixSegovia@… added
Operating system type: Windows

comment:7 Changed 9 years ago by Francois Botha

Cc: igitur@… added

It might be worth looking at how Total Commander (Windows client) does it. IMO, it is exactly the functionality that we'd want in FileZilla too.

It allows comparison of files in an external program.

Also, if the external program modifies the remote version of the file (which is kept in a temp directory), FileZilla should prompt if we want to upload the changed file back to the server.

Total Commander can also do an in-depth directory comparison (including subdirectories), but I think that's something for a separate ticket.

comment:8 Changed 8 years ago by Andy Ingham

Hi,

this feature would save me so much time! It would be great to be able to initiate a comparison of remote vs local file from within Filezilla, even if there wasn't the integration to allow the merged file to be saved back to local/remote version.

I think that Dreamweaver allows the user to specify the external compare tool, which woul dbe nice, but even if tied to WinMerge that would be absolutely great for me!

Andy

comment:9 Changed 8 years ago by Oriman

I would like this feature as well. It will make my work so much easier!!!

comment:10 Changed 8 years ago by Lorenzo Stanco

It will be a great feature. Used with navigation sync and file list comparing tools, it will be awesome.

You can just place a button in toolbar that is enabled when two file are selected in local and remote (or when one file is selected and navigation sync is enabled). When clicked:

  1. FileZilla download the remote file in a temporary location, just as it does now when editing a remote file.
  2. An external diff tool is opened (example, WinMerge for Windows) showing local file on the left and remote file (i.e. temporary downloaded file) on the right.
  3. FileZilla has not to worry about the changes we made in both directions using the diff tool: simply, when temporary file is changed by the diff tool, FileZilla will ask for upload, just as it does now when editing files!

Is that difficult to implement? I'm not familiar with C++ (I am more into C# and Java), otherwise I will help you!

comment:11 Changed 8 years ago by Chris

I'd also like to see this feature added... This is something that Adobe Dreamweaver can do and one of the only things I still use it for.

comment:12 Changed 7 years ago by Lars

Me too. I often develop code from multiple computers, and upload it to a single web site. It would be very handy to be able to launch a comparison tool to see which version of a file (local or remote) is newer, or if they even both have changes that I need to keep. I would probably launch WinMerge, which would then let me merge changes to the local file from the (local copy of) the remote file.

comment:13 Changed 7 years ago by Attila Fulop

+1 It would be very, very handy. And I think it would be easy to implement to pass the files to an external diff viewer (eg. meld on Linux) similarily to the remote editing functionality

comment:14 Changed 6 years ago by Fra

+1 please implement this, make this program better, I love it but it is becoming a bit outdated !

comment:15 Changed 5 years ago by Anthony van Orizande

+ 1 for this feature. Even basic support for this feature would be greatly appreciated. Just allowing a download with diff would really be great. This request is 7 years old.

https://forum.filezilla-project.org/viewtopic.php?t=10824

comment:16 Changed 5 years ago by Anthony van Orizande

Keywords: File Diff added
Summary: Compare file contents with external programCompare file contents with external program (File Diff)

comment:17 Changed 5 years ago by Anthony van Orizande

At least three other tickets that I could find were created and closed as duplicates of this...

http://trac.filezilla-project.org/ticket/5065
http://trac.filezilla-project.org/ticket/7159
http://trac.filezilla-project.org/ticket/10174

Thanks

comment:18 in reply to:  description Changed 5 years ago by Björn Ali Göransson

Has this been commenced by anyone? (I guess not?)

Btw, TortoiseSvn also has a nice solution for this.

comment:19 Changed 2 years ago by jan.zankowski

+1

comment:20 Changed 2 years ago by Jorge Ferreira

Anyone still looking at this? This would be a great addition. I use ForkLift on OSX and i'm moving to Ubuntu and have not found any FTP client that i can configure to do a diff of local and remote files.

Forlift allows me to create custom actions and one of the actions i use the most is file comparison.

Please, could someone let us know of dev plans? Do they include this?

Thanks, best regards!

Note: See TracTickets for help on using tickets.