From b9599227082884c87f47a322ed256a9cdcddee39 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 12 Apr 2011 21:51:18 +0200
Subject: [PATCH] svnsafeup: improve presentation (fold-indent).

Use indent folding: indent lines instead of adding fold markers. This
fixes display of large Javascript blobs which might contain a closing
fold marker. It looks probably better with folding enabled, too.

Then, pass '-c "set ..."' to `view` (assuming it's linked to `vim`),
instead of using a modeline. The latter will be disabled for root, at
least by default.
---
 plugins/svn/svn.plugin.zsh | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 390049393..9880d8d1f 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -42,8 +42,8 @@ function svn_dirty {
 }
 
 # Function to update an SVN repository in a safe manner: first display
-# diffstat (if installed), log and diff, then ask about continuing with
-# `svn up`.
+# diffstat (if installed), log and diff (folded), then ask about continuing
+# with `svn up`.
 # Optional args: $to $from (default: HEAD BASE)
 function svnsafeup() {
   if [[ "$(in_svn)" != "1" ]]; then
@@ -51,7 +51,6 @@ function svnsafeup() {
   fi
   local from=${2:-BASE} to=${1:-HEAD}
   local range="$from:$to"
-  local marker_o='{{{' marker_c="}}}\n" # fold markers
   local repo_id="$(svn_get_repo_name)@$(svn_get_rev_nr)"
   local diffcmd="svn diff -r $range"
 
@@ -68,19 +67,13 @@ function svnsafeup() {
       diffstat=$(echo $diff | diffstat)
       echo -n "diffstat: "
       echo $diffstat | tail -n1
-      echo $marker_o
-      echo $diffstat
-      echo $marker_c
+      echo $diffstat | sed 's/^/  /'
     fi
-    echo "svn log -r $range: $marker_o"
-    svn log -r $range
-    echo "$marker_c"
-    echo "$diffcmd: $marker_o"
-    echo $diff | sed "s/^Index: .*/\0 ${marker_o}2/"
-    echo "${marker_c}2"
-    # add modeline for vim
-    echo " vim:fdm=marker:fdl=1:"
-  } | view -
+    echo "svn log -r $range:"
+    svn log -r $range | sed 's/^/  /'
+    echo "$diffcmd:"
+    echo $diff | sed 's/^/  /' | sed '/^  Index: / !s/^/  /'
+  } | view -c 'set foldnestmax=2 foldlevel=0 shiftwidth=2 foldmethod=indent'  -
   read "answer?continue to 'svn up'? (ctrl-c to abort, y to continue) " || return 1
   [[ $answer == "y" ]] || return 1
   svn up -r $to