├── Support
    └── bin
    │   └── filemerge.sh
├── info.plist
├── README.mdown
└── Commands
    ├── Working Copy (BASE).plist
    ├── Latest Revision (HEAD).plist
    ├── Previous Revision (PREV).plist
    ├── Revision....plist
    └── Revisions....plist


/Support/bin/filemerge.sh:
--------------------------------------------------------------------------------
 1 | #!/bin/sh
 2 | #
 3 | # $1 = svn old revision
 4 | # $2 = svn new revision ('-' for working copy)
 5 | #
 6 | # $Id$
 7 | #
 8 | 
 9 | # Build the revision spec
10 | REVS="$1"
11 | 
12 | if [ "$2" != "-" ]; then
13 | 	REVS="${REVS}:$2"
14 | fi
15 | 
16 | # See if there is any difference between the revisions
17 | FILE=`basename "$TM_FILEPATH"`
18 | SIZE=`${TM_SVN:-svn} diff -r "$REVS" "$FILE" | wc -m`
19 | 
20 | if [ $SIZE -eq 0 ]; then
21 | 	echo "No difference"
22 | 	exit 206
23 | fi
24 | 
25 | # Get a random number
26 | RAND=`awk 'BEGIN {srand(); print rand()}' | cut -d . -f 2`
27 | 
28 | # Save a temporary copy of the old revision
29 | OLDPATH="/tmp/tm-opendiff-$RAND.tmp"
30 | svn cat -r "$1" "$FILE" > "$OLDPATH"
31 | 
32 | # If the new revision is not the working copy, save a temporary copy
33 | # of it with which to compare.
34 | if [ "$2" != "-" ]; then
35 | 	NEWPATH=${OLDPATH}.2
36 | 	${TM_SVN:-svn} cat -r "$2" "$FILE" > "$NEWPATH"
37 | else
38 | 	NEWPATH="$TM_FILEPATH"
39 | fi
40 | 
41 | ${TM_OPENDIFF:-opendiff} "$OLDPATH" "$NEWPATH" &>/dev/null &


--------------------------------------------------------------------------------
/info.plist:
--------------------------------------------------------------------------------
 1 | <?xml version="1.0" encoding="UTF-8"?>
 2 | <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 3 | <plist version="1.0">
 4 | <dict>
 5 | 	<key>contactEmailRot13</key>
 6 | 	<string>ncnenwvgn@ncnenwvgnjbeyq.pbz</string>
 7 | 	<key>contactName</key>
 8 | 	<string>Aparajita Fishman</string>
 9 | 	<key>description</key>
10 | 	<string>Subversion diff commands that use &lt;a href="http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeUserGuide/Contents/Resources/en.lproj/04_03_SCMManagingFiles/chapter_28_section_8.html#//apple_ref/doc/uid/TP40002687-CJBHDBJD"&gt;FileMerge&lt;/a&gt;.</string>
11 | 	<key>name</key>
12 | 	<string>FileMerge</string>
13 | 	<key>ordering</key>
14 | 	<array>
15 | 		<string>9F8B60D0-0535-4B92-8A02-A5AF47BE5306</string>
16 | 		<string>BA930D7C-7B5E-4BFE-9293-6B8FAF962990</string>
17 | 		<string>3FA49AEC-79AA-4E3A-BFDA-FD7E4EF8D0FE</string>
18 | 		<string>F0B1A94F-3FC5-47B8-8771-FFF4EF230156</string>
19 | 		<string>9029E141-4526-4ED8-95B2-2A4E19BAD402</string>
20 | 	</array>
21 | 	<key>uuid</key>
22 | 	<string>95761F74-1A3D-4B51-BA03-41537C38C792</string>
23 | </dict>
24 | </plist>
25 | 


--------------------------------------------------------------------------------
/README.mdown:
--------------------------------------------------------------------------------
 1 | # Installation
 2 | 
 3 | You can install this bundle in TextMate by opening the preferences and going to the bundles tab. After installation it will be automatically updated for you.
 4 | 
 5 | # General
 6 | 
 7 | * [Bundle Styleguide](http://kb.textmate.org/bundle_styleguide) — _before you make changes_
 8 | * [Commit Styleguide](http://kb.textmate.org/commit_styleguide) — _before you send a pull request_
 9 | * [Writing Bug Reports](http://kb.textmate.org/writing_bug_reports) — _before you report an issue_
10 | 
11 | # License
12 | 
13 | If not otherwise specified (see below), files in this repository fall under the following license:
14 | 
15 | 	Permission to copy, use, modify, sell and distribute this
16 | 	software is granted. This software is provided "as is" without
17 | 	express or implied warranty, and with no claim as to its
18 | 	suitability for any purpose.
19 | 
20 | An exception is made for files in readable text which contain their own license information, or files where an accompanying file exists (in the same directory) with a “-license” suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example “tidy” is accompanied by “tidy-license.txt”.


--------------------------------------------------------------------------------
/Commands/Working Copy (BASE).plist:
--------------------------------------------------------------------------------
 1 | <?xml version="1.0" encoding="UTF-8"?>
 2 | <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 3 | <plist version="1.0">
 4 | <dict>
 5 | 	<key>beforeRunningCommand</key>
 6 | 	<string>saveActiveFile</string>
 7 | 	<key>command</key>
 8 | 	<string>#!/usr/bin/env bash
 9 | [[ -f "${TM_SUPPORT_PATH}/lib/bash_init.sh" ]] &amp;&amp; . "${TM_SUPPORT_PATH}/lib/bash_init.sh"
10 | 
11 | # See if the current file is under svn control
12 | FILE=`basename "$TM_FILEPATH"`
13 | INFO_LINES=`${TM_SVN:-svn} info "$FILE" 2&gt;&amp;1 | grep "^Path\: .*\$" | wc -l`
14 | 
15 | if [ $INFO_LINES -eq 0 ]; then
16 | 	echo "The current file is not under subversion control"
17 | 	exit_show_tool_tip
18 | fi
19 | 
20 | "$TM_BUNDLE_SUPPORT/bin/filemerge.sh" BASE -
21 | </string>
22 | 	<key>input</key>
23 | 	<string>none</string>
24 | 	<key>inputFormat</key>
25 | 	<string>text</string>
26 | 	<key>keyEquivalent</key>
27 | 	<string>^@A</string>
28 | 	<key>name</key>
29 | 	<string>Working Copy (BASE)</string>
30 | 	<key>outputCaret</key>
31 | 	<string>afterOutput</string>
32 | 	<key>outputFormat</key>
33 | 	<string>text</string>
34 | 	<key>outputLocation</key>
35 | 	<string>discard</string>
36 | 	<key>requiredCommands</key>
37 | 	<array>
38 | 		<dict>
39 | 			<key>command</key>
40 | 			<string>opendiff</string>
41 | 			<key>locations</key>
42 | 			<array>
43 | 				<string>/usr/bin/opendiff</string>
44 | 			</array>
45 | 			<key>variable</key>
46 | 			<string>TM_OPENDIFF</string>
47 | 		</dict>
48 | 		<dict>
49 | 			<key>command</key>
50 | 			<string>svn</string>
51 | 			<key>locations</key>
52 | 			<array>
53 | 				<string>/usr/local/bin/svn</string>
54 | 				<string>/opt/local/bin/svn</string>
55 | 			</array>
56 | 			<key>variable</key>
57 | 			<string>TM_SVN</string>
58 | 		</dict>
59 | 	</array>
60 | 	<key>uuid</key>
61 | 	<string>9F8B60D0-0535-4B92-8A02-A5AF47BE5306</string>
62 | 	<key>version</key>
63 | 	<integer>2</integer>
64 | </dict>
65 | </plist>
66 | 


--------------------------------------------------------------------------------
/Commands/Latest Revision (HEAD).plist:
--------------------------------------------------------------------------------
 1 | <?xml version="1.0" encoding="UTF-8"?>
 2 | <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 3 | <plist version="1.0">
 4 | <dict>
 5 | 	<key>beforeRunningCommand</key>
 6 | 	<string>saveActiveFile</string>
 7 | 	<key>command</key>
 8 | 	<string>#!/usr/bin/env bash
 9 | [[ -f "${TM_SUPPORT_PATH}/lib/bash_init.sh" ]] &amp;&amp; . "${TM_SUPPORT_PATH}/lib/bash_init.sh"
10 | 
11 | # See if the current file is under svn control
12 | FILE=`basename "$TM_FILEPATH"`
13 | INFO_LINES=`${TM_SVN:-svn} info "$FILE" 2&gt;&amp;1 | grep "^Path\: .*\$" | wc -l`
14 | 
15 | if [ $INFO_LINES -eq 0 ]; then
16 | 	echo "The current file is not under subversion control"
17 | 	exit_show_tool_tip
18 | fi
19 | 
20 | "$TM_BUNDLE_SUPPORT/bin/filemerge.sh" HEAD -
21 | </string>
22 | 	<key>input</key>
23 | 	<string>none</string>
24 | 	<key>inputFormat</key>
25 | 	<string>text</string>
26 | 	<key>keyEquivalent</key>
27 | 	<string>^@A</string>
28 | 	<key>name</key>
29 | 	<string>Latest Revision (HEAD)</string>
30 | 	<key>outputCaret</key>
31 | 	<string>afterOutput</string>
32 | 	<key>outputFormat</key>
33 | 	<string>text</string>
34 | 	<key>outputLocation</key>
35 | 	<string>discard</string>
36 | 	<key>requiredCommands</key>
37 | 	<array>
38 | 		<dict>
39 | 			<key>command</key>
40 | 			<string>opendiff</string>
41 | 			<key>locations</key>
42 | 			<array>
43 | 				<string>/usr/bin/opendiff</string>
44 | 			</array>
45 | 			<key>variable</key>
46 | 			<string>TM_OPENDIFF</string>
47 | 		</dict>
48 | 		<dict>
49 | 			<key>command</key>
50 | 			<string>svn</string>
51 | 			<key>locations</key>
52 | 			<array>
53 | 				<string>/usr/local/bin/svn</string>
54 | 				<string>/opt/local/bin/svn</string>
55 | 			</array>
56 | 			<key>variable</key>
57 | 			<string>TM_SVN</string>
58 | 		</dict>
59 | 	</array>
60 | 	<key>uuid</key>
61 | 	<string>BA930D7C-7B5E-4BFE-9293-6B8FAF962990</string>
62 | 	<key>version</key>
63 | 	<integer>2</integer>
64 | </dict>
65 | </plist>
66 | 


--------------------------------------------------------------------------------
/Commands/Previous Revision (PREV).plist:
--------------------------------------------------------------------------------
 1 | <?xml version="1.0" encoding="UTF-8"?>
 2 | <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 3 | <plist version="1.0">
 4 | <dict>
 5 | 	<key>beforeRunningCommand</key>
 6 | 	<string>saveActiveFile</string>
 7 | 	<key>command</key>
 8 | 	<string>#!/usr/bin/env bash
 9 | [[ -f "${TM_SUPPORT_PATH}/lib/bash_init.sh" ]] &amp;&amp; . "${TM_SUPPORT_PATH}/lib/bash_init.sh"
10 | 
11 | # See if the current file is under svn control
12 | FILE=`basename "$TM_FILEPATH"`
13 | INFO_LINES=`${TM_SVN:-svn} info "$FILE" 2&gt;&amp;1 | grep "^Path\: .*\$" | wc -l`
14 | 
15 | if [ $INFO_LINES -eq 0 ]; then
16 | 	echo "The current file is not under subversion control"
17 | 	exit_show_tool_tip
18 | fi
19 | 
20 | "$TM_BUNDLE_SUPPORT/bin/filemerge.sh" PREV -
21 | </string>
22 | 	<key>input</key>
23 | 	<string>none</string>
24 | 	<key>inputFormat</key>
25 | 	<string>text</string>
26 | 	<key>keyEquivalent</key>
27 | 	<string>^@A</string>
28 | 	<key>name</key>
29 | 	<string>Previous Revision (PREV)</string>
30 | 	<key>outputCaret</key>
31 | 	<string>afterOutput</string>
32 | 	<key>outputFormat</key>
33 | 	<string>text</string>
34 | 	<key>outputLocation</key>
35 | 	<string>discard</string>
36 | 	<key>requiredCommands</key>
37 | 	<array>
38 | 		<dict>
39 | 			<key>command</key>
40 | 			<string>opendiff</string>
41 | 			<key>locations</key>
42 | 			<array>
43 | 				<string>/usr/bin/opendiff</string>
44 | 			</array>
45 | 			<key>variable</key>
46 | 			<string>TM_OPENDIFF</string>
47 | 		</dict>
48 | 		<dict>
49 | 			<key>command</key>
50 | 			<string>svn</string>
51 | 			<key>locations</key>
52 | 			<array>
53 | 				<string>/usr/local/bin/svn</string>
54 | 				<string>/opt/local/bin/svn</string>
55 | 			</array>
56 | 			<key>variable</key>
57 | 			<string>TM_SVN</string>
58 | 		</dict>
59 | 	</array>
60 | 	<key>uuid</key>
61 | 	<string>3FA49AEC-79AA-4E3A-BFDA-FD7E4EF8D0FE</string>
62 | 	<key>version</key>
63 | 	<integer>2</integer>
64 | </dict>
65 | </plist>
66 | 


--------------------------------------------------------------------------------
/Commands/Revision....plist:
--------------------------------------------------------------------------------
 1 | <?xml version="1.0" encoding="UTF-8"?>
 2 | <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 3 | <plist version="1.0">
 4 | <dict>
 5 | 	<key>beforeRunningCommand</key>
 6 | 	<string>saveActiveFile</string>
 7 | 	<key>command</key>
 8 | 	<string>#!/usr/bin/env bash
 9 | [[ -f "${TM_SUPPORT_PATH}/lib/bash_init.sh" ]] &amp;&amp; . "${TM_SUPPORT_PATH}/lib/bash_init.sh"
10 | 
11 | # See if the current file is under svn control
12 | FILE=`basename "$TM_FILEPATH"`
13 | INFO_LINES=`${TM_SVN:-svn} info "$FILE" 2&gt;&amp;1 | grep "^Path\: .*\$" | wc -l`
14 | 
15 | if [ $INFO_LINES -eq 0 ]; then
16 | 	echo "The current file is not under subversion control"
17 | 	exit_show_tool_tip
18 | fi
19 | 
20 | revs=$("$TM_SVN" log -q "$TM_FILEPATH"|grep -v '^-*$' \
21 | 	2&gt; &gt;(CocoaDialog progressbar --indeterminate \
22 | 		--title "Diff Revision…" \
23 | 		--text "Retrieving List of Revisions…" \
24 | 	))
25 | 
26 | revs=`osascript&lt;&lt;END
27 | 	set AppleScript's text item delimiters to {"\n","\r"}
28 | 	tell app "SystemUIServer"
29 | 		activate
30 | 		set ourList to (every text item of "$revs")
31 | 		if the count of items in ourList is 0 then
32 | 			display dialog "No older revisions of file '$(basename "$TM_FILEPATH")' found" buttons ("OK")
33 | 			set the result to false
34 | 		else
35 | 			choose from list ourList with prompt "Diff '$(basename "$TM_FILEPATH")' with older revision:"
36 | 		end if
37 | 	end tell
38 | END`
39 | 
40 | # exit if user canceled
41 | if [[ $revs = "false" ]]; then
42 | 	osascript -e 'tell app "TextMate" to activate' &amp;&gt;/dev/null &amp;	exit_discard
43 | fi
44 | 
45 | REV=`echo "$revs" | tr '\r' '\n' | awk -F '|' '{ print substr($1, 2) }'`
46 | "$TM_BUNDLE_SUPPORT/bin/filemerge.sh" $REV -</string>
47 | 	<key>input</key>
48 | 	<string>none</string>
49 | 	<key>inputFormat</key>
50 | 	<string>text</string>
51 | 	<key>keyEquivalent</key>
52 | 	<string>^@A</string>
53 | 	<key>name</key>
54 | 	<string>Revision...</string>
55 | 	<key>outputCaret</key>
56 | 	<string>afterOutput</string>
57 | 	<key>outputFormat</key>
58 | 	<string>text</string>
59 | 	<key>outputLocation</key>
60 | 	<string>discard</string>
61 | 	<key>requiredCommands</key>
62 | 	<array>
63 | 		<dict>
64 | 			<key>command</key>
65 | 			<string>opendiff</string>
66 | 			<key>locations</key>
67 | 			<array>
68 | 				<string>/usr/bin/opendiff</string>
69 | 			</array>
70 | 			<key>variable</key>
71 | 			<string>TM_OPENDIFF</string>
72 | 		</dict>
73 | 		<dict>
74 | 			<key>command</key>
75 | 			<string>svn</string>
76 | 			<key>locations</key>
77 | 			<array>
78 | 				<string>/usr/local/bin/svn</string>
79 | 				<string>/opt/local/bin/svn</string>
80 | 			</array>
81 | 			<key>variable</key>
82 | 			<string>TM_SVN</string>
83 | 		</dict>
84 | 	</array>
85 | 	<key>uuid</key>
86 | 	<string>F0B1A94F-3FC5-47B8-8771-FFF4EF230156</string>
87 | 	<key>version</key>
88 | 	<integer>2</integer>
89 | </dict>
90 | </plist>
91 | 


--------------------------------------------------------------------------------
/Commands/Revisions....plist:
--------------------------------------------------------------------------------
  1 | <?xml version="1.0" encoding="UTF-8"?>
  2 | <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
  3 | <plist version="1.0">
  4 | <dict>
  5 | 	<key>beforeRunningCommand</key>
  6 | 	<string>saveActiveFile</string>
  7 | 	<key>command</key>
  8 | 	<string>#!/usr/bin/env bash
  9 | [[ -f "${TM_SUPPORT_PATH}/lib/bash_init.sh" ]] &amp;&amp; . "${TM_SUPPORT_PATH}/lib/bash_init.sh"
 10 | 
 11 | # See if the current file is under svn control
 12 | FILE=`basename "$TM_FILEPATH"`
 13 | INFO_LINES=`${TM_SVN:-svn} info "$FILE" 2&gt;&amp;1 | grep "^Path\: .*\$" | wc -l`
 14 | 
 15 | if [ $INFO_LINES -eq 0 ]; then
 16 | 	echo "The current file is not under subversion control"
 17 | 	exit_show_tool_tip
 18 | fi
 19 | 
 20 | revs=$("$TM_SVN" log -q "$TM_FILEPATH"|grep -v '^-*$' \
 21 | 	2&gt; &gt;(CocoaDialog progressbar --indeterminate \
 22 | 		--title "Diff Revisions…" \
 23 | 		--text "Retrieving List of Revisions…" \
 24 | 	))
 25 | 
 26 | revs=`osascript &lt;&lt;END
 27 | 	set theResult to false
 28 | 	set AppleScript's text item delimiters to {"\n","\r"}
 29 | 	tell app "SystemUIServer"
 30 | 		activate
 31 | 		set ourList to (every text item of "$revs")
 32 | 		if the count of items in ourList is 0 then
 33 | 			display dialog "No revisions of file '$TM_FILENAME' found" buttons ("Continue") default button 1
 34 | 		else
 35 | 			tell app "SystemUIServer" to choose from list (every text item of "$revs") with prompt "Please choose two revisions of '$TM_FILENAME':" with multiple selections allowed
 36 | 
 37 | 			set theitems to the result
 38 | 			if theitems is not false then
 39 | 				if the count of items in the theitems is not 2 then
 40 | 					display dialog "Please select exactly two revisions (hold down the Apple key to select multiple revisions)." buttons ("Continue") default button 1
 41 | 				else
 42 | 					set theResult to (item 1 of theitems) &amp; return &amp; (item 2 of theitems)
 43 | 				end if
 44 | 			end if 
 45 | 		end if
 46 | 		set the result to theResult
 47 | 	end tell
 48 | END`
 49 | 
 50 | # exit if user canceled
 51 | if [[ $revs = "false" ]]; then
 52 | 	osascript -e 'tell app "TextMate" to activate' &amp;&gt;/dev/null &amp;	exit_discard
 53 | fi
 54 | 
 55 | revs=`echo -n "$revs" | awk -F '|' 'BEGIN { RS="\r"} { print substr($1, 2) }'`
 56 | revs=( $revs )
 57 | "$TM_BUNDLE_SUPPORT/bin/filemerge.sh" ${revs[1]} ${revs[0]}
 58 | </string>
 59 | 	<key>input</key>
 60 | 	<string>none</string>
 61 | 	<key>inputFormat</key>
 62 | 	<string>text</string>
 63 | 	<key>keyEquivalent</key>
 64 | 	<string>^@A</string>
 65 | 	<key>name</key>
 66 | 	<string>Revisions...</string>
 67 | 	<key>outputCaret</key>
 68 | 	<string>afterOutput</string>
 69 | 	<key>outputFormat</key>
 70 | 	<string>text</string>
 71 | 	<key>outputLocation</key>
 72 | 	<string>discard</string>
 73 | 	<key>requiredCommands</key>
 74 | 	<array>
 75 | 		<dict>
 76 | 			<key>command</key>
 77 | 			<string>opendiff</string>
 78 | 			<key>locations</key>
 79 | 			<array>
 80 | 				<string>/usr/bin/opendiff</string>
 81 | 			</array>
 82 | 			<key>variable</key>
 83 | 			<string>TM_OPENDIFF</string>
 84 | 		</dict>
 85 | 		<dict>
 86 | 			<key>command</key>
 87 | 			<string>svn</string>
 88 | 			<key>locations</key>
 89 | 			<array>
 90 | 				<string>/usr/local/bin/svn</string>
 91 | 				<string>/opt/local/bin/svn</string>
 92 | 			</array>
 93 | 			<key>variable</key>
 94 | 			<string>TM_SVN</string>
 95 | 		</dict>
 96 | 	</array>
 97 | 	<key>uuid</key>
 98 | 	<string>9029E141-4526-4ED8-95B2-2A4E19BAD402</string>
 99 | 	<key>version</key>
100 | 	<integer>2</integer>
101 | </dict>
102 | </plist>
103 | 


--------------------------------------------------------------------------------