On 24.07.2012 00:41, Junio C Hamano wrote:
> + if test -f $(dirname "$(type --path compare)")/AraxisMerge
We would need additional quotes around the whole path here as the Windows
installation path is usually something like "C:\Program Files\Araxis\Araxis
Merge" and contains spaces.
Junio C Hamano writes:
> If we limit the problem space by special casing Windows installation
> (e.g. check "uname -s" or something), would it make the problem
> easier to solve? Perhaps it is much more likely that the path the
> program is installed in can be safely identified with a call to
>
On Tue, Jul 24, 2012 at 12:22 AM, Junio C Hamano wrote:
> On the other hand, if the user has bought and installed Araxis, but
> we incorrectly identify it as unusable, the user has wasted good
> money and there is no easy recourse as far as I can see in your
> patch.
Agreed.
> If we limit the p
Sebastian Schuberth writes:
> Personally, I've valued the gain of
> the patch to not list araxis as an available diff tool by "git
> difftool --tool-help" when in fact just ImageMagick is in PATH higher
> than the loss to support araxis installations that are in a path not
> containung "araxis" b
On Mon, Jul 23, 2012 at 11:34 PM, David Aguilar wrote:
> Sebastian, are you testing on Windows? The araxis "compare" I used is
> OS X. Does "compare version" open a GUI window for you? For me it
> does not.
> What about "compare -h", or just "compare" ?
Yes, I'm testing on Windows, and unfort
On Mon, Jul 23, 2012 at 2:24 PM, Junio C Hamano wrote:
> Sebastian Schuberth writes:
>
>> We have no such assurance. That's why you correctly call it a
>> heuristics after all
>
> ImageMagick "compare" takes "--version" and says something like
> this to its standard output:
>
> $ compare --ve
On Mon, Jul 23, 2012 at 11:24 PM, Junio C Hamano wrote:
> Does Araxis compare take "--version" and behave in a way that is
> cheaply controllable? If it opens a GUI window and pops up a dialog
> that says "Option not understood", then it is not "controllable",
Araxis opens up a GUI dialog with
Sebastian Schuberth writes:
> Please feel free to ignore the patch if you feel the heuristics is not
> sufficiently safe. I'm currently unable to come up with a safer
> solution while maintaining portability, i.e. not use "which" or doing
> rather laborious string parsing on the output of "type".
Sebastian Schuberth writes:
> We have no such assurance. That's why you correctly call it a
> heuristics after all
ImageMagick "compare" takes "--version" and says something like
this to its standard output:
$ compare --version
Version: ImageMagick 6.6.0-4 2012-05-02 Q16
http://www.
On Mon, Jul 23, 2012 at 10:47 PM, Junio C Hamano wrote:
> For example, when the user tells it to install in "/home/ss/bin", if
> it installs its "compare" program in "/home/ss/bin/araxis/compare"
> without allowing the "/araxis/" part to be stripped away, the above
> heuristics is sufficiently sa
Sebastian Schuberth writes:
> Signed-off-by: Sebastian Schuberth
> ---
> mergetools/araxis | 9 -
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/mergetools/araxis b/mergetools/araxis
> index 64f97c5..f8899f8 100644
> --- a/mergetools/araxis
> +++ b/mergetools/araxis
>
Signed-off-by: Sebastian Schuberth
---
mergetools/araxis | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/mergetools/araxis b/mergetools/araxis
index 64f97c5..f8899f8 100644
--- a/mergetools/araxis
+++ b/mergetools/araxis
@@ -16,5 +16,12 @@ merge_cmd () {
}
translat
12 matches
Mail list logo
