Compare and Merge

External Compare and Merge Applications

Xversion allows you to use your own external applications for comparing and merging by way of scripts.
Due to sandboxing restrictions only scripts created by you are able to launch external applications.
These scripts need to be placed by you in either:

~/Library/Application Scripts/com.ikoder.Xversion/Compare
or
~/Library/Application Scripts/com.ikoder.Xversion/Merge

The two folders “Compare” and “Merge” will need to be created by you. The parent folder should already exits.
In Xversion the scripts will be identified by their filenames (minus any extension) and can be any unix style script.

Creating Scripts for Comparing

Xversion will look in the “Compare” folder for scripts it can use to perform compare operations. When executed they will be passed four arguments:

1. mine path
2. mine title

3. theirs path
4. theirs title

For example, a shell script to perform a compare using FileMerge would be created at:

~/Library/Application Scripts/com.ikoder.Xversion/Compare/FileMerge.sh

and would read:

#!/bin/bash

opendiff “$3” “$1”

Creating Scripts for Merging

Xversion will look in the “Merge” folder for scripts it can use to perform merge operations. When executed they will be passed eight arguments:

1. base path
2. base title

3. mine path
4. mine title

5. theirs path
6. theirs title

7. save path
8. save title

For example a shell script to perform a merge using FileMerge would be created at:

~/Library/Application Scripts/com.ikoder.Xversion/Merge/FileMerge.sh

and would read

#!/bin/bash

opendiff “$3” “$5” -ancestor “$1” -merge “$7”

Adding Script Attributes

You can add attributes to a script by way of shell style variables which provide Xversion with more insight into your script.
These attributes can be commented or otherwise.

1. AppBundleID If your script uses an external application then somewhere in your script you should include a reference to that applications bundleID in the form:

AppBundleID=”my.apps.bundleID”

Xversion will detect this and display the icon for the application next to the script. It will also be used to determine if your script is enabled depending on whether an application matching the bundle identifier can be found. The identifier must be double quoted.

2. CanCompareImages If your script is capable of comparing image files then somewhere in your script you should include the line:

CanCompareImages=yes

This indicates to Xversion your script is capable of comparing image files.

To install all the example scripts below download the “Xversion Scripts Installer”

Xversion Scripts Installer.dmg

Example Scripts for Comparing

Listed below are scripts you can use for various applications that are able to compare files.
These should be placed in ~/Library/Application Scripts/com.ikoder.Xversion/Compare

Araxis Merge

#!/bin/bash

#AppBundleID=”com.araxis.merge”
#CanCompareImages=yes

osascript<<END
tell application “Araxis Merge”
    launch
    set doc to compare(“$3”, “$1”)
    tell doc
        set the (first compared item’s title) to “$4”
        set the (second compared item’s title) to “$2”
    end tell
    activate
end tell
END
AraxisMerge.zip

BBEdit

Beyond Compare

#!/bin/bash

AppBundleID=”com.ScooterSoftware.BeyondCompare”

APP_PATH=`osascript<<END
tell application “Finder”
    try
        set executablePath to get application file id “$AppBundleID” as string
    on error
        return
    end try
    set executablePath to executablePath & “:Contents:MacOS:bcomp”
    set executablePath to POSIX path of executablePath
    return executablePath
end tell
END`

if [ -f “$APP_PATH” ]; then
“$APP_PATH” -ro1 -ro2 “$3” “$1” &
fi
BeyondCompare.zip

Changes

DeltaWalker

#!/bin/bash

AppBundleID=”com.deltopia.deltawalker”

APP_PATH=`osascript<<END
tell application “Finder”
    try
        set executablePath to get application file id “$AppBundleID” as string
    on error
        return
    end try
    set executablePath to executablePath & “:Contents:MacOS:DeltaWalker”
    set executablePath to POSIX path of executablePath
    return executablePath
end tell
END`

if [ -f “$APP_PATH” ]; then
“$APP_PATH” “$3” “$1” -nosplash -mi &
fi
DeltaWalker.zip

DiffMerge

#!/bin/bash

AppBundleID=”com.sourcegear.DiffMerge”

APP_PATH=`osascript<<END
tell application “Finder”
    try
        set executablePath to get application file id “$AppBundleID” as string
    on error
        return
    end try
    set executablePath to executablePath & “:Contents:MacOS:DiffMerge”
    set executablePath to POSIX path of executablePath
    return executablePath
end tell
END`

if [ -f “$APP_PATH” ]; then
“$APP_PATH” -nosplash –title1=”$4″ –title2=”$2″ “$3” “$1” &
fi
DiffMerge.zip

FileMerge

Kaleidoscope

#!/bin/bash

AppBundleID=”com.blackpixel.kaleidoscope”
#CanCompareImages=yes

APP_PATH=`osascript<<END
tell application “Finder”
    try
        set executablePath to get application file id “$AppBundleID” as string
    on error
        return
    end try
    set executablePath to executablePath & “:Contents:Resources:bin:ksdiff”
    set executablePath to POSIX path of executablePath
    return executablePath
end tell
END`

if [ -f “$APP_PATH” ]; then
“$APP_PATH” “$3” “$1” &
fi
Kaleidoscope.zip

P4Merge

#!/bin/bash

AppBundleID=”com.perforce.p4merge”

APP_PATH=`osascript<<END
tell application “Finder”
    try
        set executablePath to get application file id “$AppBundleID” as string
    on error
        return
    end try
    set executablePath to executablePath & “:Contents:Resources:launchp4merge”
    set executablePath to POSIX path of executablePath
    return executablePath
end tell
END`

if [ -f “$APP_PATH” ]; then
“$APP_PATH” “$3” “$1” &
fi
P4Merge.zip

TextMate

#!/bin/bash

AppBundleID=”com.macromates.textmate”

APP_PATH=`osascript<<END
tell application “Finder”
    try
        set executablePath to get application file id “$AppBundleID” as string
    on error
        return
    end try
    set executablePath to executablePath & “:Contents:Resources:mate”
    set executablePath to POSIX path of executablePath
    return executablePath
end tell
END`

if [ -f “$APP_PATH” ]; then
diff -u “$3” “$1” | “$APP_PATH” “$1” “$3”
fi
TextMate.zip

TextWrangler

Example Scripts for Merging

Listed below are scripts you can use for various applications that are able to merge files.
These should be placed in ~/Library/Application Scripts/com.ikoder.Xversion/Merge

Araxis Merge

#!/bin/bash

#AppBundleID=”com.araxis.merge”

osascript<<END
tell application “Araxis Merge”
    launch
    set doc to compare {“$3”, “$1”, “$5”}
    tell doc
        set the (first compared item’s title) to “$4”
        set the (second compared item’s title) to “$8”
        set the (second compared item’s save path) to “$7”
        set the (third compared item’s title) to “$6”
    end tell
    merge into common ancestor doc
    activate
end tell
END
AraxisMerge.zip

DeltaWalker

#!/bin/bash

AppBundleID=”com.deltopia.deltawalker”

APP_PATH=`osascript<<END
tell application “Finder”
    try
        set executablePath to get application file id “$AppBundleID” as string
    on error
        return
    end try
    set executablePath to executablePath & “:Contents:MacOS:DeltaWalker”
    set executablePath to POSIX path of executablePath
    return executablePath
end tell
END`

if [ -f “$APP_PATH” ]; then
“$APP_PATH” “$3” “$5” “$1″ -merged=”$7” -nosplash -mi &
fi
DeltaWalker.zip

DiffMerge

#!/bin/bash

AppBundleID=”com.sourcegear.DiffMerge”

APP_PATH=`osascript<<END
tell application “Finder”
    try
        set executablePath to get application file id “$AppBundleID” as string
    on error
        return
    end try
    set executablePath to executablePath & “:Contents:MacOS:DiffMerge”
    set executablePath to POSIX path of executablePath
    return executablePath
end tell
END`

if [ -f “$APP_PATH” ]; then
“$APP_PATH” -merge -nosplash -result=”$7″ -t1=”My Version” -t2=”Saved Output” -t3=”Repository Version” “$3” “$1” “$5” &
fi
DiffMerge.zip

FileMerge

Kaleidoscope

#!/bin/bash

AppBundleID=”com.blackpixel.kaleidoscope”

APP_PATH=`osascript<<END
tell application “Finder”
    try
        set executablePath to get application file id “$AppBundleID” as string
    on error
        return
    end try
    set executablePath to executablePath & “:Contents:Resources:bin:ksdiff”
    set executablePath to POSIX path of executablePath
    return executablePath
end tell
END`

if [ -f “$APP_PATH” ]; then
“$APP_PATH” –merge –base “$1” –output “$7” “$3” –snapshot “$5” –snapshot &
fi
Kaleidoscope.zip

P4Merge

#!/bin/bash

AppBundleID=”com.perforce.p4merge”

APP_PATH=`osascript<<END
tell application “Finder”
    try
        set executablePath to get application file id “$AppBundleID” as string
    on error
        return
    end try
    set executablePath to executablePath & “:Contents:Resources:launchp4merge”
    set executablePath to POSIX path of executablePath
    return executablePath
end tell
END`

if [ -f “$APP_PATH” ]; then
“$APP_PATH” “$1” “$3” “$5” “$7” &
fi
P4Merge.zip