From 53605facf821a7d1e79e9b45a452689e7ca222fc Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Tue, 31 May 2011 09:14:18 -0400 Subject: [PATCH 1/5] add git_gvimdiff wrapper script and "gdiff" git alias --- bash_aliases | 1 + git_gvimdiff | 5 +++++ 2 files changed, 6 insertions(+) create mode 100755 git_gvimdiff diff --git a/bash_aliases b/bash_aliases index 1481ead..7e6b271 100755 --- a/bash_aliases +++ b/bash_aliases @@ -90,6 +90,7 @@ function git-config-joshs() git config --global core.excludesfile ${HOME}/.gitignore git config --global core.pager 'less -FRXi' git config --global alias.dc 'diff --cached' + git config --global alias.gdiff '!f() { GIT_EXTERNAL_DIFF=git_gvimdiff git --no-pager diff $1; }; f' } alias git-find-lost-commit='git fsck --lost-found' if [[ "$(which jsvn 2>/dev/null)" != "" ]]; then diff --git a/git_gvimdiff b/git_gvimdiff new file mode 100755 index 0000000..0b59713 --- /dev/null +++ b/git_gvimdiff @@ -0,0 +1,5 @@ +#!/bin/sh + +gvimdiff "$2" "$5" +# give gvimdiff a chance to read the file before exiting +sleep 1 From 980283313dc68af62a0f57ed1f385e897456fe0a Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 1 Jun 2011 12:17:26 -0400 Subject: [PATCH 2/5] bash_aliases: add jindent alias to remind me of indent options --- bash_aliases | 1 + 1 file changed, 1 insertion(+) diff --git a/bash_aliases b/bash_aliases index 7e6b271..7726d5b 100755 --- a/bash_aliases +++ b/bash_aliases @@ -96,6 +96,7 @@ alias git-find-lost-commit='git fsck --lost-found' if [[ "$(which jsvn 2>/dev/null)" != "" ]]; then alias svn='jsvn' fi +alias jindent='indent -bbo -bl -blf -bli0 -bls -i4 -npcs -nut -ts8' # source any machine-local aliases # this way ~/.bash_aliases can be a symlink to a version-controlled From 47635b2b60e5f3342c815304b60ff3d9e786d1f1 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Thu, 2 Jun 2011 09:40:19 -0400 Subject: [PATCH 3/5] update git aliases for gdiff/bcdiff --- bash_aliases | 6 +++++- git_bc2diff | 5 +++++ git_gvimdiff | 5 ----- 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100755 git_bc2diff delete mode 100755 git_gvimdiff diff --git a/bash_aliases b/bash_aliases index 7726d5b..4f5369b 100755 --- a/bash_aliases +++ b/bash_aliases @@ -90,7 +90,11 @@ function git-config-joshs() git config --global core.excludesfile ${HOME}/.gitignore git config --global core.pager 'less -FRXi' git config --global alias.dc 'diff --cached' - git config --global alias.gdiff '!f() { GIT_EXTERNAL_DIFF=git_gvimdiff git --no-pager diff $1; }; f' + git config --global alias.gdiff 'difftool -y -t gvimdiff' + git config --global alias.gdiffc 'difftool -y -t gvimdiff --cached' + git config --global alias.bcdiff 'difftool -y -t bc2' + git config --global alias.bcdiffc 'difftool -y -t bc2 --cached' + git config --global difftool.bc2.cmd 'git_bc2diff "$LOCAL" "$REMOTE"' } alias git-find-lost-commit='git fsck --lost-found' if [[ "$(which jsvn 2>/dev/null)" != "" ]]; then diff --git a/git_bc2diff b/git_bc2diff new file mode 100755 index 0000000..9b5ac04 --- /dev/null +++ b/git_bc2diff @@ -0,0 +1,5 @@ +#!/bin/sh + +path1=$(cygpath -w "$1") +path2=$(cygpath -w "$2") +/cygdrive/c/apps/Beyond\ Compare\ 2/BC2.exe "$path1" "$path2" /title1=Base /leftreadonly diff --git a/git_gvimdiff b/git_gvimdiff deleted file mode 100755 index 0b59713..0000000 --- a/git_gvimdiff +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -gvimdiff "$2" "$5" -# give gvimdiff a chance to read the file before exiting -sleep 1 From 7fad671291b70ba8ef8318e04a467010938c63ed Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Thu, 2 Jun 2011 09:55:38 -0400 Subject: [PATCH 4/5] added BC2 git mergetool --- bash_aliases | 12 +++++++++--- git_bc2merge | 6 ++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100755 git_bc2merge diff --git a/bash_aliases b/bash_aliases index 4f5369b..4e07d82 100755 --- a/bash_aliases +++ b/bash_aliases @@ -92,9 +92,15 @@ function git-config-joshs() git config --global alias.dc 'diff --cached' git config --global alias.gdiff 'difftool -y -t gvimdiff' git config --global alias.gdiffc 'difftool -y -t gvimdiff --cached' - git config --global alias.bcdiff 'difftool -y -t bc2' - git config --global alias.bcdiffc 'difftool -y -t bc2 --cached' - git config --global difftool.bc2.cmd 'git_bc2diff "$LOCAL" "$REMOTE"' + if [ -e /bin/cygwin1.dll ]; then + git config --global alias.bcdiff 'difftool -y -t bc2' + git config --global alias.bcdiffc 'difftool -y -t bc2 --cached' + git config --global difftool.bc2.cmd 'git_bc2diff "$LOCAL" "$REMOTE"' + git config --global alias.bcmerge 'mergetool -y -t bc2' + git config --global mergetool.bc2.cmd \ + 'git_bc2merge "$LOCAL" "$REMOTE" "$MERGED"' + git config --global mergetool.bc2.trustExitCode false + fi } alias git-find-lost-commit='git fsck --lost-found' if [[ "$(which jsvn 2>/dev/null)" != "" ]]; then diff --git a/git_bc2merge b/git_bc2merge new file mode 100755 index 0000000..6d17f2b --- /dev/null +++ b/git_bc2merge @@ -0,0 +1,6 @@ +#!/bin/sh + +local=$(cygpath -w "$1") +remote=$(cygpath -w "$2") +merged=$(cygpath -w "$3") +/cygdrive/c/apps/Beyond\ Compare\ 2/BC2.exe "$local" "$remote" /title1=Local /title2=Remote /savetarget="$merged" From f23561b4eec9a8d810e36d77b7a572eb7baf155d Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Thu, 9 Jun 2011 13:46:11 -0400 Subject: [PATCH 5/5] update detection of binary files --- jsvn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsvn b/jsvn index dd8de0f..f05632c 100755 --- a/jsvn +++ b/jsvn @@ -276,7 +276,7 @@ def binaries(argv, svn, base_path = '.'): ent_path = os.sep.join([base_path, ent]) if os.path.isfile(ent_path): mime_type = getSVNProperty(svn, 'svn:mime-type', ent_path) - if re.match(r'application/octet-stream', mime_type): + if mime_type != '' and not re.match(r'text/.*', mime_type): # we found a binary file needs_lock = getSVNProperty(svn, 'svn:needs-lock', ent_path) if needs_lock: