Using external compare/merge tool

rogo · Post by **rogo** » 07 Mar 2006, 22:58

I would like to request two, somewhat related, features.

1. Would be nice to be able to specify an external comparator, the same way we can use external editor or viewer.
File Comparator plugin is nice for quick comparation, but I frequently need to merge changes, not just display them.

2. Instead of configuring external compare/merge application as a plugin, I could just add it to the User Menu. The problem is, there is no way to pass two or more selected filenames to a User Menu application. If I select two files, then click on app's icon, the application will be launched twice - once for each file.
Maybe it's possible to add something like "$(FullName)"1 "$(FullName)"2 to the configuration options?
It seems easier to implement than the first feature and can be of use in other scenarios as well.
Thanks!

Rogo

Post by **Jan Rysavy** » 08 Mar 2006, 07:16

Note: (Forum Rules)

4. Use subjects explaining the topic. Examples of bad subjects: "Help!", "I have a problem", "I found a bug". Examples of correct subjects: "Automatic refresh is not working on network drive", "Servant Salamander main window is always on top of all others.", etc.

rogo · Post by **rogo** » 08 Mar 2006, 08:05

Since I was requesting two different features, I couldn't find a subject that was describing both. On the other hand, I did want to put both requests in one post, since they are related. Hence the "2 features" subject.

I have modified the subject, hope it's better now.

Post by **Jan Rysavy** » 08 Mar 2006, 08:08

rogo wrote:I have modified the subject, hope it's better now.

Much better, thank you

Post by **Petr Solin** » 08 Mar 2006, 09:19

rogo wrote:2. Instead of configuring external compare/merge application as a plugin, I could just add it to the User Menu. The problem is, there is no way to pass two or more selected filenames to a User Menu application.

This is the way we want to support external compare/merge tools. We add parameters for two files or directories (e.g. $(CompareFileLeft), $(CompareFileRight), $(CompareDirLeft), and $(CompareDirRight)). We have many requests for this feature. I hope we add it to version 2.5.

rogo · Post by **rogo** » 08 Mar 2006, 09:31

This is great news, thanks!!!

A follow up question though:
Will it be possible to pass more than two files to a merge tool? For example, by selecting 3 files in one panel and launching the tool? Or at least using just two files, but in the same panel, as we can today with the internal File Comparator?

Post by **Petr Solin** » 08 Mar 2006, 09:45

It will work the same way as File Comparator plugin. It will have some window for entering two file/dir names, probably with some checkbox "do not display if both names are specified in panels".

What is the purpose of third name? It's result of merge or something else?

rogo · Post by **rogo** » 08 Mar 2006, 09:56

Some tools, for example Araxis, allow to compare and merge three files at once. Sometimes it comes very handy, for example to compare three versions or merge changes from two versions to one.

It's not critical though, we can always launch it with two files, then drag and drop the third file. After all, how lazy can we be

KNUT · Post by **KNUT** » 08 Mar 2006, 14:04

Same discussion already here?!

Post by **Petr Solin** » 08 Mar 2006, 14:22

Yes, you are right, thanks for note!

Post by **Petr Solin** » 08 Mar 2006, 14:33

KNUT wrote:This would be very nice! And in addition $(FullPathLeft) and $(FullPathRight)...?

Yes, it's planned too. Thanks for ideas!

Post by **Petr Solin** » 20 Mar 2006, 10:25

Well, I have just finished it. New parameters in User Menu: FullPathInactive, FullPathLeft, FullPathRight, FileToCompareLeft, FileToCompareRight, DirToCompareLeft, DirToCompareRight, FileToCompareActive, FileToCompareInactive, DirToCompareActive, DirToCompareInactive, and ListOfSelectedNames.

KNUT · Post by **KNUT** » 20 Mar 2006, 11:23

Petr Solin wrote:Well, I have just finished it. New parameters in User Menu: FullPathInactive, FullPathLeft, FullPathRight, FileToCompareLeft, FileToCompareRight, DirToCompareLeft, DirToCompareRight, FileToCompareActive, FileToCompareInactive, DirToCompareActive, DirToCompareInactive, and ListOfSelectedNames.

Wow - are these enough?

PetrSolinHasDoneIt

Know I await the next beta...

rogo · Post by **rogo** » 21 Mar 2006, 10:09

Wow!
Frankly, I didn't expect it to be so fast and so thorough!

Thanks a lot, looking forward for the new beta!

Mem · Post by **Mem** » 21 Mar 2006, 10:51

rogo wrote:The problem is, there is no way to pass two or more selected filenames to a User Menu application. If I select two files, then click on app's icon, the application will be launched twice - once for each file.

I just mention my use of external diff and SS - I select 2 files in SS panel and choose Send to / KDiff, and it opens both the files at once

Altap Salamander Support Forums

Using external compare/merge tool

Using external compare/merge tool

Re: Using external compare/merge tool

Re: Using external compare/merge tool