mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2025-12-26 02:12:33 +01:00
b9e76ce057
Minor improvements on the svnsafeup function: - use last line of diffstat as header - add 2nd level folds to diff sections, folding each file's diff - require "y" to continue to `svn up`
87 lines
2.2 KiB
Bash
87 lines
2.2 KiB
Bash
function svn_prompt_info {
|
|
if [[ -d .svn ]]; then
|
|
echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
|
|
$ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
|
|
fi
|
|
}
|
|
|
|
|
|
function in_svn() {
|
|
if [[ -d .svn ]]; then
|
|
echo 1
|
|
fi
|
|
}
|
|
|
|
function svn_get_repo_name {
|
|
if [ is_svn ]; then
|
|
svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
|
|
|
|
svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
|
|
fi
|
|
}
|
|
|
|
function svn_get_rev_nr {
|
|
if [ is_svn ]; then
|
|
svn info 2> /dev/null | sed -n s/Revision:\ //p
|
|
fi
|
|
}
|
|
|
|
function svn_dirty_choose {
|
|
if [ is_svn ]; then
|
|
s=$(svn status 2>/dev/null)
|
|
if [ $s ]; then
|
|
echo $1
|
|
else
|
|
echo $2
|
|
fi
|
|
fi
|
|
}
|
|
|
|
function svn_dirty {
|
|
svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
|
|
}
|
|
|
|
# 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`.
|
|
# Optional args: $to $from (default: HEAD BASE)
|
|
function svnsafeup() {
|
|
if [[ "$(in_svn)" != "1" ]]; then
|
|
echo "Not in a SVN repository." 1>&2 ; return 1
|
|
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"
|
|
|
|
local diff="$($=diffcmd)"
|
|
if [[ $diff == '' ]] ; then
|
|
echo "No changes for $repo_id in range $range."
|
|
return
|
|
fi
|
|
|
|
{
|
|
echo "Diff for: $repo_id, range: $range"
|
|
echo
|
|
if [ $commands[diffstat] ] ; then
|
|
diffstat=$(echo $diff | diffstat)
|
|
echo -n "diffstat: "
|
|
echo $diffstat | tail -n1
|
|
echo $marker_o
|
|
echo $diffstat
|
|
echo $marker_c
|
|
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 -
|
|
read "answer?continue to 'svn up'? (ctrl-c to abort, y to continue) " || return 1
|
|
[[ $answer == "y" ]] || return 1
|
|
svn up -r $to
|
|
}
|