svn-wrapper.sh

   1 #! /bin/sh
   2 # Simple wrapper around SVN and Git featuring auto-ChangeLog entries and
   3 # emailing.
   4 # $Id$
   5 # Copyright (C) 2006, 2007  Benoit Sigoure.
   6 #
   7 # This program is free software: you can redistribute it and/or modify
   8 # it under the terms of the GNU General Public License as published by
   9 # the Free Software Foundation, either version 3 of the License, or
  10 # (at your option) any later version.
  11 #
  12 # This program is distributed in the hope that it will be useful,
  13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
  14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  15 # GNU General Public License for more details.
  16 #
  17 # You should have received a copy of the GNU General Public License
  18 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  19
  20 # Quick install: alias svn=path/to/svn-wrapper.sh -- that's all.
  21
  22  # ------ #
  23  # README #
  24  # ------ #
  25
  26 # This script is a wrapper around the SVN and Git command-line clients for
  27 # UNIX.  It has been designed mainly to automagically generate GNU-style
  28 # ChangeLog entries when committing and mail them along with a diff and an
  29 # optional comment from the author to a list of persons or a mailing list.
  30 # Although this script was originally written for SVN (hence the name), it
  31 # also works with Git and tries to detect whether the current repository is a
  32 # Git or SVN repository.
  33 # This script has been written to be as much portable as possible and cover as
  34 # many use-case as reasonably possible.  It won't work with Solaris'
  35 # brain-damaged stock /bin/sh.
  36 #
  37 # HOWEVER, there will be bugs, there will be cases in which the script doesn't
  38 # wrap properly the svn-cli, etc.  In this case, you can try to mail me at
  39 # <tsuna at lrde dot epita dot fr>.  Include the revision of the svn-wrapper
  40 # you're using, and full description of what's wrong etc. so I can reproduce
  41 # your problem.
  42 #
  43 # If you feel like, you can try to fix/enhance the script yourself. It only
  44 # requires some basic Shell-scripting skills.  Knowing sed will prove useful :)
  45
  46  # ------------- #
  47  # DOCUMENTATION #
  48  # ------------- #
  49
  50 # If you're simply looking for the usage, run `svn-wrapper.sh help' (or
  51 # `svn help' if you aliased `svn' on svn-wrapper.sh) as usual.
  52 #
  53 # This script is (hopefully) portable, widely commented and self-contained. Do
  54 # not hesitate to hack it. It might look rather long (because it does a lot of
  55 # things :P) but you should be able to easily locate which part of the code
  56 # you're looking for.
  57 #
  58 # The script begins by defining several functions. Then it really starts where
  59 # the comment "# `main' starts here. #" is placed.
  60 # Some svn commands are hooked (eg, `svn st' displays colors).  Hooks and
  61 # extra commands are defined in functions named `svn_<command-name>'.
  62
  63  # ---- #
  64  # TODO #
  65  # ---- #
  66
  67 #  * Write a real testsuite.  :/
  68 #  * Automatic proxy configuration depending on the IP in ifconfig?
  69 #  * Customizable behavior/colors via some ~/.<config>rc file (?)
  70 #  * Handle things such as svn ci --force foobar.
  71 #
  72 #  * svn automerge + automatic fill in branches/README.branches.
  73 #    => won't do (SVN is too borken WRT merges, I use Git now so I don't feel
  74 #       like dealing with this sort of SVN issue)
  75 #  * Automatically recognize svn cp and svn mv instead of writing "New" and
  76 #    "Remove" in the template ChangeLog entry (hard). Pair the and new/remove
  77 #    to prepare a good ChangeLog entry (move to X, copy from X) [even harder].
  78 #    => won't do (Git does this fine, can't be bothered to deal with this for
  79 #       SVN)
  80
  81
  82
  83 # Default values (the user can export them to override them).
  84 use_changelog=:
  85 git_mode=false
  86 using_git_svn=false
  87 case $SVN in
  88   git*) git_mode=:;;
  89   '')
  90     if [ -d .git ] || [ -d ../.git ]; then
  91       SVN=git
  92       git_mode=:
  93     else
  94       SVN=svn
  95     fi
  96     ;;
  97 esac
  98
  99 : ${EDITOR=missing}
 100 export EDITOR
 101 : ${GPG=gpg}
 102 : ${TMPDIR=/tmp}
 103 export TMPDIR
 104 : ${PAGER=missing}
 105 export PAGER
 106 # Override the locale.
 107 LC_ALL='C'
 108 export LC_ALL
 109 : ${AWK=missing}
 110 : ${DIFF=missing}
 111 : ${COLORDIFF=missing}
 112
 113 # Signal number for traps (using plain signal names is not portable and breaks
 114 # on recent Debians that use ash as their default shell).
 115 SIGINT=2
 116
 117 # Whether we're diffing interactively or not
 118 diff_interactive=no
 119
 120 me=$0
 121 bme=`basename "$0"`
 122
 123 # Pitfall: some users might be tempted to export SVN=svn-wrapper.sh for some
 124 # reason. This is just *wrong*. The following is an attempt to save them from
 125 # some troubles.
 126 if [ x`basename "$SVN"` = x"$bme" ]; then
 127   echo "warning: setting SVN to $bme is wrong"
 128   SVN='svn'
 129 fi
 130
 131 # This code comes (mostly) from Autoconf.
 132 # The user is always right.
 133 if test "${PATH_SEPARATOR+set}" != set; then
 134   PATH_SEPARATOR=:
 135   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
 136     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
 137       PATH_SEPARATOR=';'
 138   }
 139 fi
 140
 141 version='0.4'
 142 full_rev='$Id$'
 143 # Get the first 6 digits (without forking)
 144 revision=${full_rev#'$'Id': '}
 145 revision=${revision%??????????????????????????????????' $'}
 146
 147 # The `main' really starts after the functions definitions.
 148
 149   # ---------------- #
 150   # Helper functions #
 151   # ---------------- #
 152
 153 set_colors()
 154 {
 155   red='\e[0;31m';    lred='\e[1;31m'
 156   green='\e[0;32m';  lgreen='\e[1;32m'
 157   yellow='\e[0;33m'; lyellow='\e[1;33m'
 158   blue='\e[0;34m';   lblue='\e[1;34m'
 159   purple='\e[0;35m'; lpurple='\e[1;35m'
 160   cyan='\e[0;36m';   lcyan='\e[1;36m'
 161   grey='\e[0;37m';   lgrey='\e[1;37m'
 162   white='\e[0;38m';  lwhite='\e[1;38m'
 163   std='\e[m'
 164 }
 165
 166 set_nocolors()
 167 {
 168   red=;    lred=
 169   green=;  lgreen=
 170   yellow=; lyellow=
 171   blue=;   lblue=
 172   purple=; lpurple=
 173   cyan=;   lcyan=
 174   grey=;   lgrey=
 175   white=;  lwhite=
 176   std=
 177 }
 178
 179 # abort err-msg
 180 abort()
 181 {
 182   echo "svn-wrapper: ${lred}abort${std}: $@" \
 183   | sed '1!s/^[         ]*/             /' >&2
 184   exit 1
 185 }
 186
 187 # warn msg
 188 warn()
 189 {
 190   echo "svn-wrapper: ${lred}warning${std}: $@" \
 191   | sed '1!s/^[         ]*/             /' >&2
 192 }
 193
 194 # notice msg
 195 notice()
 196 {
 197   echo "svn-wrapper: ${lyellow}notice${std}: $@" \
 198   | sed '1!s/^[         ]*/              /' >&2
 199 }
 200
 201 # yesno question
 202 yesno()
 203 {
 204   printf "$@ [y/N] "
 205   read answer || return 1
 206   case $answer in
 207     y* | Y*) return 0;;
 208     *)       return 1;;
 209   esac
 210   return 42 # should never happen...
 211 }
 212
 213 # yesnewproceed what
 214 # returns true if `yes' or `proceed', false if `new'.
 215 # the answer is stored in $yesnoproceed_res which is /yes|new|proceed/
 216 yesnewproceed()
 217 {
 218   printf "$@ [(y)es/(p)roceed/(u)p+proceed/(N)ew] "
 219   read answer || return 1
 220   case $answer in
 221     y* | Y*) yesnoproceed_res=yes;     return 0;;
 222     p* | P*) yesnoproceed_res=proceed; return 0;;
 223     u* | U*) yesnoproceed_res=upproceed; return 0;;
 224     *)       yesnoproceed_res=new;      return 1;;
 225   esac
 226   return 42 # should never happen...
 227 }
 228
 229 # warn_env env-var
 230 warn_env()
 231 {
 232   warn "cannot find the environment variable $1
 233         You might consider using \`export $1='<FIXME>'\`"
 234 }
 235
 236 # get_unique_file_name file-name
 237 get_unique_file_name()
 238 {
 239   test -e "$1" || {
 240     echo "$1" && return 0
 241   }
 242   gufn=$1; i=1
 243   while test -e "$gufn.$i"; do
 244     i=$(($i + 1))
 245   done
 246   echo "$gufn.$i"
 247 }
 248
 249 # ensure_not_empty description value
 250 ensure_not_empty()
 251 {
 252   case $2 in #(
 253     # `value' has at least one non-space character.
 254     *[-a-zA-Z0-9_!@*{}|,./:]*)
 255       return;;
 256   esac
 257   ene_val=`echo "$2" | tr -d ' \t\n'`
 258   test -z "$ene_val" && abort "$1: empty value"
 259 }
 260
 261 # find_prog prog-name
 262 # return true if prog-name is in the PATH
 263 # echo the full path to prog-name on stdout.
 264 # Based on a code from texi2dvi
 265 find_prog()
 266 {
 267   save_IFS=$IFS
 268   IFS=$PATH_SEPARATOR
 269   for dir in $PATH; do
 270     IFS=$save_IFS
 271     test -z "$dir" && continue
 272     # The basic test for an executable is `test -f $f && test -x $f'.
 273     # (`test -x' is not enough, because it can also be true for directories.)
 274     # We have to try this both for $1 and $1.exe.
 275     #
 276     # Note: On Cygwin and DJGPP, `test -x' also looks for .exe. On Cygwin,
 277     # also `test -f' has this enhancement, bot not on DJGPP. (Both are
 278     # design decisions, so there is little chance to make them consistent.)
 279     # Thusly, it seems to be difficult to make use of these enhancements.
 280     #
 281     if test -f "$dir/$1" && test -x "$dir/$1"; then
 282       echo "$dir/$1"
 283       return 0
 284     elif test -f "$dir/$1.exe" && test -x "$dir/$1.exe"; then
 285       echo "$dir/$1.exe"
 286       return 0
 287     fi
 288   done
 289   return 1
 290 }
 291
 292 # find_progs prog [progs...]
 293 # Look in PATH for one of the programs given in argument.
 294 # If none of the progs can be found, the string "exit 2" is "returned".
 295 find_progs()
 296 {
 297   # This code comes mostly from Autoconf.
 298   for fp_prog in "$@"; do
 299     fp_res=`find_prog $fp_prog`
 300     if [ $? -eq 0 ]; then
 301       echo "$fp_res"
 302       return 0
 303     fi
 304   done
 305   echo "exit 2"
 306   return 1
 307 }
 308
 309 test x"$EDITOR" = xmissing && EDITOR=`find_progs vim vi emacs nano`
 310 test x"$PAGER" = xmissing && PAGER=`find_progs less more`
 311 test x"$AWK" = xmissing && AWK=`find_progs gawk mawk nawk awk`
 312 test x"$DIFF" = xmissing && DIFF=`find_progs diff`
 313 if test x"$COLORDIFF" = xmissing; then
 314   if test -t 1; then
 315     COLORDIFF=`find_progs colordiff diff`
 316   else
 317     COLORDIFF=$DIFF
 318   fi
 319 fi
 320
 321 # If `less' is the $PAGER, turn on some useful options: -R to let it interpret
 322 # some terminal codes (turns on colors and accentuated characters), -i to
 323 # allow case-insensitive search if the pattern doesn't contain upper case
 324 # letters.
 325 case $PAGER in #(
 326   less | 'less '*) PAGER="$PAGER -R -i";;
 327 esac
 328
 329 # require_diffstat
 330 # return true if diffstat is in the PATH
 331 require_diffstat()
 332 {
 333   if [ x"$require_diffstat_cache" != x ]; then
 334     return $require_diffstat_cache
 335   fi
 336   if (echo | diffstat) >/dev/null 2>/dev/null; then :; else
 337     warn 'diffstat is not installed on your system or not in your PATH.'
 338     test -f /etc/debian_version \
 339     && notice 'you might want to `apt-get install diffstat`.'
 340     require_diffstat_cache=1
 341     return 1
 342   fi
 343   require_diffstat_cache=0
 344   return 0
 345 }
 346
 347 # require_mail
 348 # return 0 -> found a mailer
 349 # return !0 -> no mailer found
 350 # The full path to the program found is echo'ed on stdout.
 351 require_mail()
 352 {
 353   save_PATH=$PATH
 354   PATH="${PATH}${PATH_SEPARATOR}/sbin${PATH_SEPARATOR}/usr/sbin${PATH_SEPARATOR}/usr/libexec"
 355   export PATH
 356   find_progs sendEmail sendmail mail
 357   rv=$?
 358   PATH=$save_PATH
 359   export PATH
 360   return $rv
 361 }
 362
 363 # my_sendmail mail-file mail-subject mail-to [extra-headers]
 364 # mail-to is a comma-separated list of email addresses.
 365 # extra-headers is an optionnal argument and will be prepended at the
 366 # beginning of the mail headers if the tool used to send mails supports it.
 367 # The mail-file may also contain headers. They must be separated from the body
 368 # of the mail by a blank line.
 369 my_sendmail()
 370 {
 371   test -f "$1" || abort "my_sendmail: Cannot find the mail file: $1"
 372   test -z "$2" && warn 'my_sendmail: Empty subject.'
 373   test -z "$3" && abort 'my_sendmail: No recipient specified.'
 374
 375   content_type='Content-type: text/plain'
 376   extra_headers="X-Mailer: svn-wrapper v$version (g$revision)
 377 Mime-Version: 1.0
 378 Content-Transfer-Encoding: 7bit"
 379   if test x"$4" != x; then
 380     extra_headers="$4
 381 $extra_headers"
 382     # Remove empty lines.
 383     extra_headers=`echo "$extra_headers" | sed '/^[     ]*$/d;s/^[      ]*//'`
 384   fi
 385
 386   # If we have a signature, add it.
 387   if test -f ~/.signature; then
 388     # But don't add it if it is already in the mail.
 389     if grep -Fe "`cat ~/.signature`" "$1" >/dev/null; then :; else
 390       echo '-- ' >>"$1" && cat ~/.signature >>"$1"
 391     fi
 392   fi
 393   # VCS-compat: handle user option 'sign'.
 394   if (grep '^sign: false' ~/.vcs) >/dev/null 2>/dev/null; then :; else
 395     ($GPG -h) >/dev/null 2>/dev/null
 396     gpg_rv=$?
 397     if [ -e ~/.gnupg ] || [ -e ~/.gpg ] || [ -e ~/.pgp ] && [ $gpg_rv -lt 42 ]
 398     then
 399       if grep 'BEGIN PGP SIGNATURE' "$1" >/dev/null; then
 400         notice 'message is already GPG-signed'
 401       elif yesno "Sign the mail using $GPG ?"; then
 402         # Strip the headers
 403         sed '1,/^$/d' "$1" >"$1.msg"
 404         sed '1,/^$/!d' "$1" >"$1.hdr"
 405         # Sign the message, keep only the PGP signature.
 406         $GPG --clearsign <"$1.msg" >"$1.tmp" || {
 407           rm -f "$1.msg" "$1.hdr" "$1.tmp"
 408           abort "\`$GPG' failed (r=$?)"
 409         }
 410         sed '/^--*BEGIN PGP SIGNATURE--*$/,/^--*END PGP SIGNATURE--*$/!d' \
 411             "$1.tmp" >"$1.sig"
 412
 413         boundary="svn-wrapper-2-$RANDOM"
 414         boundary="$boundary$RANDOM"
 415         # Prepend some stuff before the PGP signature.
 416         echo "
 417 --$boundary
 418 content-type: application/pgp-signature; x-mac-type=70674453;
 419         name=PGP.sig
 420 content-description: This is a digitally signed message part
 421 content-disposition: inline; filename=PGP.sig
 422 content-transfer-encoding: 7bit" | cat - "$1.sig" >"$1.tmp"
 423         mv -f "$1.tmp" "$1.sig"
 424
 425         # Append some stuff after the PGP signature.
 426         echo "
 427 --$boundary--" >>"$1.sig"
 428         # Re-paste the headers before the signed body and prepend some stuff.
 429         echo "This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
 430 --$boundary
 431 Content-Transfer-Encoding: 8bit
 432 Content-Type: text/plain; charset=iso-8859-1; format=flowed
 433 " \
 434         | cat "$1.hdr" - "$1.msg" "$1.sig" >"$1.tmp" \
 435         && mv -f "$1.tmp" "$1"
 436         content_type="Content-Type: multipart/signed;\
 437  protocol=\"application/pgp-signature\"; micalg=pgp-sha1;\
 438  boundary=\"$boundary\""
 439         # Cleanup.
 440         rm -f "$1.tmp" "$1.sig" "$1.msg" "$1.hdr"
 441         extra_headers="$extra_headers
 442 X-Pgp-Agent: `$GPG --version | sed q`"
 443       fi
 444     fi
 445   fi
 446   extra_headers="$extra_headers
 447 $content_type"
 448
 449   mailer=`require_mail`
 450   if [ $? -ne 0 ]; then
 451     warn 'my_sendmail: No suitable mailer found.'
 452     return 1
 453   fi
 454   case $mailer in
 455     */sendmail)
 456        to=`echo "$3" | sed 's/,//g'`
 457        echo "$extra_headers" | cat - "$1" | $mailer $to;;
 458     */mail)
 459        cat "$1" | $mailer -s "$2" "$3";;
 460     */sendEmail)
 461        if [ x"$SMTP" = x ]; then
 462          warn 'my_sendmail: (sendEmail) please tell me the SMTP server to use'
 463          printf 'STMP server: '
 464          read SMTP || abort 'could not read the SMTP server'
 465          notice "hint: you can export SMTP=$SMTP if you don't want to be asked"
 466        fi
 467        sendEmail -f "$FULLNAME <$EMAIL>" -t "$3" -u "$2" \
 468                  -s "$SMTP" -o message-file="$1";;
 469     *) # wtf
 470        abort 'my_sendmail: Internal error.';;
 471   esac
 472 }
 473
 474 # selfupdate
 475 selfupdate()
 476 {
 477   my_url='http://www.lrde.epita.fr/~sigoure/svn-wrapper'
 478   # You can use https if you feel paranoiac.
 479
 480   echo ">>> Fetching svn-wrapper.sh from $my_url/svn-wrapper.sh"
 481
 482   # --------------------- #
 483   # Fetch the new version #
 484   # --------------------- #
 485
 486   tmp_me=`get_unique_file_name "$TMPDIR/svn-wrapper.sh"`
 487   if (wget --help) >/dev/null 2>/dev/null; then
 488     wget --no-check-certificate "$my_url/svn-wrapper.sh" -O "$tmp_me"
 489     my_wget='wget'
 490   else
 491     curl --help >/dev/null 2>/dev/null
 492     if [ $? -gt 42 ]; then
 493       abort 'Cannot find wget or curl.
 494              How can I download any update without them?'
 495     fi
 496     my_wget='curl'
 497     curl --insecure "$my_url/svn-wrapper.sh" >"$tmp_me"
 498   fi
 499
 500   test -r $tmp_me \
 501     || abort "Cannot find the copy of myself I downloaded in $tmp_me"
 502
 503   # ---------------------------------------- #
 504   # Compare versions and update if necessary #
 505   # ---------------------------------------- #
 506
 507   my_ver=$revision
 508   tmp_ver=`sed '/^# $Id[:].*$/!d;
 509                 s/.*$Id[:] *\([a-f0-9]\{6\}\).*/\1/' "$tmp_me"`
 510   test -z "$tmp_ver" && abort "Cannot find the revision of $tmp_me"
 511   if [ x"$my_ver" != x"$tmp_ver" ]; then # There IS an update...
 512     echo "An update is available, r$tmp_ver (your version is r$my_ver)"
 513
 514     # Wanna see the diff?
 515     if yesno 'Do you want to see the diff?'
 516     then
 517       (require_diffstat && diff -uw "$me" "$tmp_me" | diffstat;
 518        echo
 519        $COLORDIFF -uw "$me" "$tmp_me") | $PAGER
 520     fi
 521
 522     # Let's go :)
 523     if yesno "Overwrite $me (r$my_ver) with $tmp_me (r$tmp_ver)?"; then
 524       chmod a+x "$tmp_me"
 525       cp -p "$me" "$me.r$my_ver"
 526       mv "$tmp_me" "$me" && exit 0
 527     fi
 528     rm -f "$tmp_me"
 529     return 1
 530   else
 531     echo "You're already up to date [r$my_ver] :)"
 532   fi
 533   rm -f "$tmp_me"
 534 }
 535
 536 # get_svn_diff_and_diffstat [files to diff]
 537 # Helper for svn_commit
 538 get_svn_diff_and_diffstat()
 539 {
 540   if $git_mode; then
 541     svn_diff=`git diff --ignore-all-space --no-color -B -C --cached`
 542     svn_diff_stat=`git diff --stat --ignore-all-space --no-color -B -C --cached`
 543   else
 544     # Ignore white spaces. Can't svn diff -x -w: svn 1.4 only.
 545     svn_diff=`svn_diffw "$@"`
 546     test -z "$svn_diff" && svn_diff=`$SVN diff "$@"`
 547     if require_diffstat; then
 548       svn_diff_stat=`echo "$svn_diff" | diffstat`
 549     else
 550       svn_diff_stat='diffstat not available'
 551     fi
 552   fi
 553 }
 554
 555 # Helper.  Sets the variables repos_url, git_branch, git_head, repos_root,
 556 # extra_repos_info and using_git_svn properly.
 557 git_get_repos_info_()
 558 {
 559   # FIXME: 1st commit: "fatal: bad default revision 'HEAD'" on stderr
 560   git_config_list=`git config -l`
 561   using_git_svn=false
 562   case $git_config_list in #(
 563     *svn-remote.*.url=*)
 564       repos_url=`echo "$git_config_list" \
 565                  | sed '/^svn-remote.svn.url=\(.*\)$/!d;s//\1/'`
 566       using_git_svn=:
 567       ;; #(
 568     *remote.origin.url=*)
 569       repos_url=`echo "$git_config_list" \
 570                  | sed '/^remote.origin.url=\(.*\)$/!d;s//\1/'`
 571       ;;
 572   esac
 573   test -z "$repos_url" && repos_url='(git:unknown)'
 574   git_branch=`git branch | awk '/^\*/ { print substr($0, 3) }'`
 575   if [ x"$git_branch" = x'(no branch)' ]; then
 576     yesno 'You are on a detached HEAD, do you really want to continue?' \
 577       || return 1
 578   fi
 579   git_head=`git rev-list --pretty=format:%h HEAD --max-count=1 | sed '1d;q'`
 580   extra_repos_info="Git branch: $git_branch (HEAD: $git_head)"
 581   repos_root=$repos_url
 582 }
 583
 584 # git_warn_missing_prop(PROP-NAME, SAMPLE-VALUE)
 585 git_warn_missing_prop()
 586 {
 587   if $using_git_svn; then
 588     warn "No $1 property set for this repository.
 589 This is a git-svn repository, so you can set it in an SVN working copy:
 590   svn propset $1 $2 .
 591 Otherwise you can just set the property in your git-svn repository:
 592   git config svnw.$1 $2"
 593   else
 594     warn "No $1 property set for this repository.
 595 You can set it like this:
 596   git config svnw.$1 $2"
 597   fi
 598 }
 599
 600 # Helper.  Find the `mailto' property, be it an SVN property or a git-config
 601 # option.  Relies on the value of $change_log_dir and sets the values of
 602 # $mailto (the value of the `mailto' property) and $to (a string to append in
 603 # templates that contains the `To:' line, or an empty string if no mail must
 604 # be sent).
 605 get_mailto_property()
 606 {
 607   test -d "$change_log_dir" || abort 'Internal error in get_mailto_property:
 608     $change_log_dir not pointing to a directory'
 609   if $git_mode; then
 610     mailto=`git config svnw.mailto`
 611     if [ x"$mailto" = x ] \
 612       && [ -f "$change_log_dir/.git/svn/git-svn/unhandled.log" ]
 613     then
 614       mailto=`grep mailto "$change_log_dir/.git/svn/git-svn/unhandled.log"`
 615       sed_tmp='$!d;s/^.*+dir_prop: . mailto //;s/%40/@/g;s/%2C/,/g;s/%20/ /g;'
 616       mailto=`echo "$mailto" | sed "$sed_tmp"`
 617     fi
 618     if [ x"$mailto" = x ]; then
 619       git_warn_missing_prop 'mailto' 'maintainer1@foo.com,maint2@bar.com'
 620     fi
 621   else
 622     mailto=`$SVN propget mailto "$change_log_dir"`
 623   fi
 624
 625   if [ x"$mailto" = x ]; then
 626     test x$new_user = xyes \
 627     && warn "no svn property mailto found in $change_log_dir
 628              You might want to set default email adresses using:
 629              svn propset mailto 'somebody@mail.com, foobar@example.com'\
 630              $change_log_dir" >&2
 631     # Try to be VCS-compatible and find a list of mails in a *.rb.
 632     if [ -d "$change_log_dir/vcs" ]; then
 633       mailto=`grep '.@.*\..*' "$change_log_dir"/vcs/*.rb \
 634               | tr '\n' ' ' \
 635               | sed 's/^.*[["]\([^["]*@[^]"]*\)[]"].*$/\1/' | xargs`
 636       test x"$mailto" != x && test x$new_user = xyes \
 637       && notice "VCS-compat: found mailto: $mailto
 638                  in " "$change_log_dir"/vcs/*.rb
 639     fi # end VCS compat
 640   fi # end guess mailto
 641
 642   # Ensure that emails are comma-separated.
 643   mailto=`echo "$mailto" | sed 's/[ ;]/,/g' | tr -s ',' | sed 's/,/, /g'`
 644
 645   to=
 646   if [ x"$mailto" != xdont_send_mails ] && [ x"$mailto" != xnothx ]; then
 647     to="
 648 To: $mailto"
 649   fi
 650 }
 651
 652
 653
 654   # ------------------------------- #
 655   # Hooks for standard SVN commands #
 656   # ------------------------------- #
 657
 658 # svn_commit [args...]
 659 # Here is how the commit process goes:
 660 #
 661 # First we look in the arguments passed to commit:
 662 #   If there are some files or paths, the user wants to commit these only. In
 663 #   this case, we must search for ChangeLogs from these paths. We might find
 664 #   more than one ChangeLog, in this case the user will be prompted to pick up
 665 #   one.
 666 #   Otherwise (no path passed in the command line) the user just wants to
 667 #   commit the current working directory.
 668 # In any case, we schedule "ChangeLog" for commit.
 669 #
 670 # Alright now that we know which ChangeLog to use, we look in the ChangeLog's
 671 # directory if there is a ",svn-log" file which would mean that a previous
 672 # commit didn't finish successfully. If there is such a file, the user is
 673 # prompted to know whether they want to resume that commit or simply start a
 674 # new one.
 675 # When the user wants to resume a commit, the ",svn-log" file is loaded and we
 676 # retrieve the value of "$@" that was saved in the file.
 677 # Otherwise we build a template ChangeLog entry.
 678 # Then we open the template ChangeLog entry with $EDITOR so that the user
 679 # fills it properly.
 680 # Finally, we commit.
 681 # Once the commit is sent, we ask the server to know which revision was
 682 # commited and we also retrieve the diff. We then send a mail with these.
 683 svn_commit()
 684 {
 685   here=`pwd -P`
 686   dry_run=false
 687   git_commit_all=false
 688   use_log_message_from_file=false
 689   log_message_to_use=
 690
 691   # Check if the user passed some paths to commit explicitly
 692   # because in this case we must add the ChangeLog to the commit and search
 693   # the ChangeLog from the dirname of that file.
 694   i=0; search_from=; add_changelog=false; extra_files=
 695   while [ $i -lt $# ]; do
 696     arg=$1
 697     case $arg in
 698       --dry-run)
 699         dry_run=:
 700         shift
 701         i=$(($i + 1))
 702         continue
 703         ;;
 704       -a|--all)
 705         git_commit_all=:
 706         ;;
 707       --use-log-file)
 708         shift
 709         test -z "$1" && abort "$arg needs an argument"
 710         test -r "$1" || abort "'$1' does not seem to be readable"
 711         test -w "$1" || abort "'$1' does not seem to be writable"
 712         test -d "$1" && abort "'$1' seems to be a directory"
 713         use_log_message_from_file=:
 714         log_message_to_use=$1
 715         shift
 716         continue
 717         ;;
 718     esac
 719     # If the argument is a valid path: add the ChangeLog in the list of
 720     # files to commit
 721     if test -e "$arg"; then
 722       add_changelog=:
 723       if test -d "$arg"; then
 724         search_from_add=$arg
 725       else
 726         search_from_add=`dirname "$arg"`
 727       fi
 728       search_from="$search_from:$search_from_add"
 729     fi
 730     shift
 731     set dummy "$@" "$arg"
 732     shift
 733     i=$(($i + 1))
 734   done
 735   if $add_changelog; then :; else
 736     # There is no path/file in the command line: the user wants to commit the
 737     # current directory. Make it explicit now:
 738     extra_files=$here
 739   fi
 740   search_from=`echo "$search_from" | sed 's/^://; s/^$/./'`
 741
 742   # ----------------- #
 743   # Find ChangeLog(s) #
 744   # ----------------- #
 745
 746   nb_chlogs=0; change_log_dirs=
 747   save_IFS=$IFS; IFS=':'
 748   for dir in $search_from; do
 749     IFS=$save_IFS
 750     $use_changelog || break
 751     test -z "$dir" && dir='.'
 752     # First: come back to the original place
 753     cd "$here" || abort "Cannot cd to $here"
 754     cd "$dir"  || continue # Then: Enter $dir (which can be a relative path)
 755     found=0
 756     while [ $found -eq 0 ]; do
 757       this_chlog_dir=`pwd -P`
 758       if [ -f ./ChangeLog ]; then
 759         found=1
 760         nb_chlogs=$(($nb_chlogs + 1))
 761         change_log_dirs="$change_log_dirs:$this_chlog_dir"
 762       else
 763         cd ..
 764       fi
 765       # Stop searching when in / ... hmz :P
 766       test x"$this_chlog_dir" = x/ && break
 767     done # end while: did we find a ChangeLog
 768   done # end for: find ChangeLogs in $search_from
 769   if [ $nb_chlogs -gt 0 ]; then
 770     change_log_dirs=`echo "$change_log_dirs" | sed 's/^://' | tr ':' '\n' \
 771                      | sort -u`
 772     nb_chlogs=`echo "$change_log_dirs" | wc -l`
 773   fi
 774
 775   # Did we find a ChangeLog? More than one?
 776   if [ $nb_chlogs -eq 0 ] && $use_changelog; then
 777     if yesno 'svn-wrapper: Error: Cannot find a ChangeLog file!
 778 You might want to create an empty one (eg: `touch ChangeLog` where appropriate)
 779 Do you want to proceed without using a ChangeLog?'; then
 780       cd "$here"
 781       $SVN commit "$@"
 782       return $?
 783     else
 784       return 1
 785     fi
 786   elif [ $nb_chlogs -gt 1 ]; then
 787     notice "$nb_chlogs ChangeLogs were found, pick up one:"
 788
 789     IFS=':'; i=0
 790     for a_chlog_dir in $change_log_dirs; do
 791       i=$(($i + 1))
 792       echo "$i. $a_chlog_dir/ChangeLog"
 793     done
 794     printf "Which ChangeLog do you want to use? [1-$i] "
 795     read chlog_no || abort 'Cannot read answer on stdin.'
 796
 797     case $chlog_no in
 798       *[^0-9]*) abort "Invalid ChangeLog number: $chlog_no"
 799     esac
 800     test "$chlog_no" -le $i || abort "Invalid ChangeLog number: $chlog_no
 801                                       max value was: $i"
 802     test "$chlog_no" -ge 1 || abort "Invalid ChangeLog number: $chlog_no
 803                                      min value was: 1"
 804     change_log_dir=`echo "$change_log_dirs" | tr ':' '\n' | sed "${chlog_no}!d"`
 805   else # Only one ChangeLog found
 806     if $use_changelog; then
 807       change_log_dir=$change_log_dirs
 808       notice "using $change_log_dir/ChangeLog"
 809     fi
 810   fi
 811
 812   if $use_changelog; then
 813     test -f "$change_log_dir/ChangeLog" \
 814       || abort "No such file or directory: $change_log_dir/ChangeLog"
 815     # Now we can safely schedule the ChangeLog for the commit.
 816     extra_files="$extra_files:$change_log_dir/ChangeLog"
 817   else
 818     change_log_dir='.' # Hack.  FIXME: Does this work in all cases?
 819   fi
 820
 821   if [ -d "$change_log_dir/.git" ] || $git_mode; then
 822     SVN=git
 823     git_mode=:
 824     git_get_repos_info_
 825   else
 826     svn_st_tmp=`$SVN status "$change_log_dir"`
 827
 828     # Warn for files that are not added in the repos.
 829     conflicts=`echo "$svn_st_tmp" | sed '/^ *$/d;
 830                                          /^[^?]/d;
 831                                          /^?.......*\/[,+]/d;
 832                                          /^?......[,+]/d'`
 833     if test x"$conflicts" != x; then
 834       warn "make sure you don't want to \`svn add'
 835             any of the following files before committing:"
 836       echo "$conflicts" | sed "$sed_svn_st_color"
 837       printf 'Type [ENTER] to continue :)' && read chiche_is_gay
 838     fi
 839
 840     # If there are changes in an svn:externals, advise the user to commit that
 841     # first.
 842     changed_externals=`echo "$svn_st_tmp" | $AWK \
 843                        'function printext()
 844                         {
 845                           if (ext && !printed)
 846                           {
 847                             print this_ext "\n";
 848                             printed = 1;
 849                           }
 850                         }
 851                         BEGIN     { this_ext = ""; ext = 0; ext_modified = 0; }
 852                         /^Performing status on external/ {
 853                           ext = 1;
 854                           sub(/.* at ./, ""); sub(/.$/, ""); this_ext = $0;
 855                           printed = 0;
 856                         }
 857                         /^[ADMR]/ { ext_modified = ext; printext(); }
 858                         /^.[M]/   { ext_modified = ext; printext(); }
 859                         END       { exit ext_modified; }'`
 860     if [ $? -ne 0 ]; then
 861       warn "the following external items have local modifications:
 862 $changed_externals"
 863       yesno "You are advised to commit them separately first. Continue anyway?" \
 864       || return 1
 865     fi
 866
 867     # Detect unresolved conflicts / missing files.
 868     conflicts=`echo "$svn_st_tmp" | sed '/^[C!]/!d'`
 869     test x"$conflicts" != x && abort "there are unresolved conflicts (\`C')
 870                                       and/or missing files (\`!'):
 871                                       $conflicts"
 872
 873     svn_info_tmp=`$SVN info "$change_log_dir"`
 874     test $? -ne 0 && abort "Failed to get svn info on $change_log_dir"
 875     repos_root=`echo "$svn_info_tmp" | sed '/^Repository Root: /!d;s///'`
 876     repos_url=`echo "$svn_info_tmp" | sed '/^URL: /!d;s///'`
 877     # It looks like svn <1.3 didn't display a "Repository Root" entry.
 878     test -z "$repos_root" && repos_root=$repos_url
 879   fi
 880
 881   cd "$here"
 882
 883   YYYY=`date '+%Y'`
 884   MM=`date '+%m'`
 885   DD=`date '+%d'`
 886
 887   # VCS-compat: handle user option 'new_user'
 888   new_user='yes'
 889   grep '^new_user: false' ~/.vcs >/dev/null 2>/dev/null && new_user='no'
 890
 891   edit_changelog=:
 892   tmp_log="$change_log_dir/,svn-log"
 893   $use_log_message_from_file \
 894     && tmp_log=$log_message_to_use \
 895     && edit_changelog=false
 896
 897   if [ -f "$tmp_log" ] \
 898       && { $use_log_message_from_file \
 899            || yesnewproceed "It looks like the last commit did not\
 900  terminate successfully.
 901 Would you like to resume it or proceed immediately?"; }; then
 902     case $yesnoproceed_res in
 903       *proceed)   edit_changelog=false;;
 904     esac
 905     if test x"$yesnoproceed_res" = xupproceed; then
 906       svn_update "$@" || abort 'update failed'
 907     fi
 908     echo 'Resuming ...'
 909     internal_tags=`sed '/^--- Internal stuff, DO NOT change please ---$/,$!d' \
 910                      "$tmp_log"`
 911     saved_args=`echo "$internal_tags" | sed '/^args: */!d;s///'`
 912     extra_files=`echo "$internal_tags" | sed '/^extra_files: */!d;s///'`
 913     if [ x"$saved_args" != x ]; then
 914       if [ x"$*" != x ] && [ x"$saved_args" != x"$*" ]; then
 915         warn "overriding arguments:
 916               you invoked $me with the following arguments: $@
 917               they have been replaced by these: $saved_args"
 918         set dummy $saved_args
 919         shift
 920       else
 921         notice "setting the following arguments: $saved_args"
 922         set dummy $saved_args
 923         shift
 924       fi
 925     elif [ x"$*" != x ]; then
 926         warn "overriding arguments:
 927               you invoked $me with the following arguments: $@
 928               they have been dropped"
 929     fi
 930
 931     for i; do
 932       case $i in
 933         -a|--all)
 934           git_commit_all=:
 935           if [ $git_mode ]; then
 936             (cd $change_log_dir && git add -v -u) || abort '`git add -v -u` failed'
 937           fi
 938           ;;
 939       esac
 940     done
 941
 942     get_svn_diff_and_diffstat "$@"
 943
 944     # Update the file with the new diff/diffstat in case it changed.
 945     $AWK 'BEGIN {
 946             tlatbwbi_seen = 0;
 947             ycewah_seen = 0;
 948           }
 949           /^--This line, and those below, will be ignored--$/ {
 950             tlatbwbi_seen = 1;
 951           }
 952           /^    Your ChangeLog entry will appear here\.$/ {
 953             if (tlatbwbi_seen) ycewah_seen = 1;
 954           }
 955           {
 956             if (ycewah_seen != 2) print;
 957             if (ycewah_seen == 1) ycewah_seen = 2;
 958           }
 959           END {
 960             if (tlatbwbi_seen == 0)
 961             {
 962               print "--This line, and those below, will be ignored--\n\n" \
 963                     "   Your ChangeLog entry will appear here.";
 964             }
 965           }' "$tmp_log" >"$tmp_log.tmp"
 966     echo "
 967 ---
 968 $svn_diff_stat
 969
 970 $svn_diff
 971
 972 $internal_tags" >>"$tmp_log.tmp"
 973     mv -f "$tmp_log.tmp" "$tmp_log" || abort "failed to write '$tmp_log'"
 974
 975   else # Build the template message.
 976
 977     # ------------------------------------ #
 978     # Gather info for the template message #
 979     # ------------------------------------ #
 980
 981     if $git_mode; then
 982       projname=`git config svnw.project`
 983       if [ x"$projname" = x ] \
 984         && [ -f "$change_log_dir/.git/svn/git-svn/unhandled.log" ]
 985       then
 986         projname=`grep project "$change_log_dir/.git/svn/git-svn/unhandled.log"`
 987         sed_tmp='$!d;s/^.*+dir_prop: . project //'
 988         projname=`echo "$projname" | sed "$sed_tmp"`
 989       fi
 990       if [ x"$projname" = x ]; then
 991         git_warn_missing_prop 'project' 'myproj'
 992       fi
 993     else
 994       projname=`$SVN propget project "$change_log_dir"`
 995     fi
 996     # Try to be VCS-compatible and find a project name in a *.rb.
 997     if [ x"$projname" = x ] && [ -d "$change_log_dir/vcs" ]; then
 998       projname=`sed '/common_commit/!d;s/.*"\(.*\)<%= rev.*/\1/' \
 999                     "$change_log_dir"/vcs/*.rb`
1000       test x"$projname" != x && test x$new_user = xyes \
1001       && notice "VCS-compat: found project name: $projname
1002                  in " "$change_log_dir"/vcs/*.rb
1003     fi
1004     test x"$projname" != x && projname=`echo "$projname" | sed '/[^ ]$/s/$/ /'`
1005
1006     get_mailto_property
1007
1008     test -z "$FULLNAME" && FULLNAME='Type Your Name Here' \
1009     && warn_env FULLNAME
1010     test -z "$EMAIL" && EMAIL='your.mail.here@FIXME.com' && warn_env EMAIL
1011
1012     if $git_mode; then
1013       if $git_commit_all; then
1014         (cd $change_log_dir && git add -v -u) || abort '`git add -v -u` failed'
1015       fi
1016       my_git_st=`git diff -C --raw --cached`
1017       test $? -eq 0 || abort 'git diff failed'
1018       # Format: ":<old_mode> <new_mode> <old_sha1> <new_sha1> <status>[
1019       #          <similarity score>]\t<file-name>"
1020       change_log_files=`echo "$my_git_st" | sed '
1021         t dummy_sed_1
1022         : dummy_sed_1
1023         s/^:[0-7 ]* [0-9a-f. ]* M[^     ]*      \(.*\)$/        * \1: ./;         t
1024         s/^:[0-7 ]* [0-9a-f. ]* A[^     ]*      \(.*\)$/        * \1: New./;      t
1025         s/^:[0-7 ]* [0-9a-f. ]* D[^     ]*      \(.*\)$/        * \1: Remove./;   t
1026         s/^:[0-7 ]* [0-9a-f. ]* R[^     ]*      \([^    ]*\)    \(.*\)$/        * \2: Rename from \1./;t
1027         s/^:[0-7 ]* [0-9a-f. ]* C[^     ]*      \([^    ]*\)    \(.*\)$/        * \2: Copy from \1./;t
1028         s/^:[0-7 ]* [0-9a-f. ]* T[^     ]*      \(.*\)$/        * \1: ./;         t
1029         s/^:[0-7 ]* [0-9a-f. ]* X[^     ]*      \(.*\)$/        * \1: ???./;      t
1030         s/^:[0-7 ]* [0-9a-f. ]* U[^     ]*      \(.*\)$/        * \1: UNMERGED./; t
1031       '`
1032     else
1033       # --ignore-externals appeared after svn 1.1.1
1034       my_svn_st=`$SVN status --ignore-externals "$@" \
1035                  || $SVN status "$@" | sed '/^Performing status on external/ {
1036                                               d;q
1037                                             }'`
1038
1039       # Files to put in the ChangeLog entry.
1040       change_log_files=`echo "$my_svn_st" | sed '
1041         t dummy_sed_1
1042         : dummy_sed_1
1043         s/^M......\(.*\)$/      * \1: ./;       t
1044         s/^A......\(.*\)$/      * \1: New./;    t
1045         s/^D......\(.*\)$/      * \1: Remove./; t
1046         d
1047       '`
1048     fi
1049     if [ x"$change_log_files" = x ]; then
1050       yesno 'Nothing to commit, continue anyway?' || return 1
1051     fi
1052
1053     change_log_files=`echo "$change_log_files" | sort -u`
1054
1055     get_svn_diff_and_diffstat "$@"
1056
1057     # Get any older svn-log out of the way.
1058     test -f "$tmp_log" && mv "$tmp_log" `get_unique_file_name "$tmp_log"`
1059     # If we can't get an older svn-log out of the way, find a new name...
1060     test -f "$tmp_log" && tmp_log=`get_unique_file_name "$tmp_log"`
1061     if [ x$new_user = no ]; then
1062       commit_instructions='
1063 Instructions:
1064  - Fill the ChangeLog entry.
1065  - If you feel like, write a comment in the "Comment:" section.
1066    This comment will only appear in the email, not in the ChangeLog.
1067    By default only the location of the repository is in the comment.
1068  - Some tags will be replaced. Tags are of the form: <TAG>. Unknown
1069    tags will be left unchanged.
1070  - The tag <REV> may only be used in the Subject.
1071  - Your ChangeLog entry will be used as commit message for svn.'
1072     else
1073       commit_instructions=
1074     fi
1075     r_before_rev=r
1076     $git_mode && r_before_rev=
1077     test -z "$extra_repos_info" || extra_repos_info="
1078   $extra_repos_info"
1079     echo "\
1080 --You must fill this file correctly to continue--           -*- vcs -*-
1081 Title:
1082 Subject: ${projname}$r_before_rev<REV>: <TITLE>
1083 From: $FULLNAME <$EMAIL>$to
1084
1085 Comment:
1086   URL: $repos_url$extra_repos_info
1087
1088 ChangeLog:
1089
1090 <YYYY>-<MM>-<DD>  $FULLNAME  <$EMAIL>
1091
1092         <TITLE>
1093 $change_log_files
1094
1095 --This line, and those below, will be ignored--
1096 $commit_instructions
1097 --Preview of the message that will be sent--
1098
1099 URL: $repos_url$extra_repos_info
1100 Your comments (if any) will appear here.
1101
1102 ChangeLog:
1103 $YYYY-$MM-$DD  $FULLNAME  <$EMAIL>
1104
1105         Your ChangeLog entry will appear here.
1106
1107 ---
1108 $svn_diff_stat
1109
1110 $svn_diff" >"$tmp_log"
1111
1112     echo "
1113 --- Internal stuff, DO NOT change please ---
1114 args: $@" >>"$tmp_log"
1115     echo "extra_files: $extra_files
1116 vi: ft=diff:noet:tw=76:" >>"$tmp_log"
1117
1118   fi # end: if svn-log; then resume? else create template
1119   $edit_changelog && $EDITOR "$tmp_log"
1120
1121   # ------------------ #
1122   # Re-"parse" the log #
1123   # ------------------ #
1124
1125   # hmz this section is a bit messy...
1126   # helper string... !@#$%* escaping \\\\\\...
1127   sed_escape='s/\\/\\\\/g;s/@/\\@/g;s/&/\\\&/g'
1128   sed_eval_tags="s/<MM>/$MM/g; s/<DD>/$DD/g; s/<YYYY>/$YYYY/g"
1129   full_log=`sed '/^--*This line, and those below, will be ignored--*$/,$d;
1130                  /^--You must fill this/d' "$tmp_log"`
1131   chlog_entry=`echo "$full_log" | sed '/^ChangeLog:$/,$!d; //d'`
1132   ensure_not_empty 'ChangeLog entry' "$chlog_entry"
1133   full_log=`echo "$full_log" | sed '/^ChangeLog:$/,$d'`
1134   mail_comment=`echo "$full_log" | sed '/^Comment:$/,$!d; //d'`
1135   full_log=`echo "$full_log" | sed '/^Comment:$/,$d'`
1136   mail_title=`echo "$full_log" | sed '/^Title: */!d;s///;'`
1137   ensure_not_empty 'commit title' "$mail_title"
1138   # Add a period at the end of the title.
1139   mail_title=`echo "$mail_title" | sed -e '/ *[.!?]$/!s/ *$/./' \
1140                                        -e "$sed_eval_tags; $sed_escape"`
1141   sed_eval_tags="$sed_eval_tags; s@<TITLE>\\.*@$mail_title@g"
1142   mail_comment=`echo "$mail_comment" | sed "$sed_eval_tags"`
1143   raw_chlog_entry=$chlog_entry # ChangeLog entry without tags expanded
1144   chlog_entry=`echo "$chlog_entry" | sed "$sed_eval_tags; 1{
1145   /^ *$/d
1146   }"`
1147   mail_subject=`echo "$full_log" | sed '/^Subject: */!d;s///'`
1148   ensure_not_empty 'mail subject' "$mail_subject"
1149   mail_to=`echo "$full_log" | sed '/^To:/!d'`
1150   send_a_mail=:
1151   if test x"$mail_to" = x; then
1152     send_a_mail=false
1153   else
1154     mail_to=`echo "$mail_to" | sed 's/^To: *//;s///'`
1155     # If there is a <MAILTO> in the 'To:' line, we must expand it.
1156     case $mail_to in #(
1157       *'<MAILTO>'*)
1158         get_mailto_property
1159         # Are we meant to send a mail?
1160         case $to in #(
1161           '') # No, don't send a mail.
1162             mail_to=
1163             send_a_mail=false
1164             ;; #(
1165           *) # Yes, send a mail.
1166             mail_to=`echo "$mail_to" | sed "s#<MAILTO>#$mailto#g"`
1167             ;;
1168         esac
1169     esac
1170     $send_a_mail && ensure_not_empty '"To:" field of the mail' "$mail_to"
1171   fi
1172
1173   test -z "$FULLNAME" && warn_env FULLNAME && FULLNAME=$USER
1174   test -z "$EMAIL" && warn_env EMAIL && EMAIL=$USER
1175   myself=`echo "$FULLNAME <$EMAIL>" | sed "$sed_escape"`
1176   mail_from=`echo "$full_log" | sed "/^From: */!d;s///;s@<MYSELF>@$myself@g"`
1177   ensure_not_empty '"From:" field of the mail' "$mail_from"
1178
1179   # ------------------------------------ #
1180   # Sanity checks on the ChangeLog entry #
1181   # ------------------------------------ #
1182
1183   if echo "$chlog_entry" | grep '<REV>' >/dev/null; then
1184     warn 'Using the tag <REV> anywhere else than in the Subject is deprecated.'
1185     yesno 'Continue anyway?' || return 1
1186   fi
1187
1188   if echo "$chlog_entry" | grep ': \.$' >/dev/null; then
1189     warn 'It looks like you did not fill all entries in the ChangeLog:'
1190     echo "$chlog_entry" | grep ': \.$'
1191     yesno 'Continue anyway?' || return 1
1192   fi
1193
1194   if echo "$chlog_entry" | grep '^--* Internal stuff' >/dev/null; then
1195     warn "It looks like you messed up the delimiters and I did not properly
1196     find your ChangeLog entry.  Here it is, make sure it is correct:"
1197     echo "$chlog_entry"
1198     yesno 'Continue anyway?' || return 1
1199   fi
1200
1201   if echo "$chlog_entry" | grep -i 'dont[^a-z0-9]' >/dev/null; then
1202     warn "Please avoid typos such as ${lred}dont$std instead of\
1203  ${lgreen}don't$std:"
1204     echo "$chlog_entry" | grep -n -i 'dont[^a-z0-9]' \
1205       | sed "s/[dD][oO][nN][tT]/$lred&$std/g"
1206     yesno 'Continue anyway?' || return 1
1207   fi
1208
1209   if echo "$chlog_entry" | grep -i 'cant[^a-z0-9]' >/dev/null; then
1210     warn "Please avoid typos such as ${lred}cant$std instead of\
1211  ${lgreen}can't$std:"
1212     echo "$chlog_entry" | grep -n -i 'cant[^a-z0-9]' \
1213       | sed "s/[cC][aA][nN][tT]/$lred&$std/g"
1214     yesno 'Continue anyway?' || return 1
1215   fi
1216
1217   if echo "$chlog_entry" | grep '^.\{80,\}' >/dev/null; then
1218     warn 'Please avoid long lines in your ChangeLog entry (80 columns max):'
1219     echo "$chlog_entry" | grep '^.\{80,\}'
1220     yesno 'Continue anyway?' || return 1
1221   fi
1222
1223   if echo "$mail_title" | grep -i '^[a-z][a-z]*ed[^a-z]' >/dev/null; then
1224     warn 'ChangeLog entries should be written in imperative form:'
1225     echo "$mail_title" | grep -i '^[a-z][a-z]*ed[^a-z]' \
1226       | sed "s/^\\([a-zA-Z][a-zA-Z]*ed\\)\\([^a-zA-Z]\\)/$lred\\1$std\\2/"
1227     yesno 'Continue anyway?' || return 1
1228   fi
1229
1230   # Check whether the user passed -m | --message
1231   i=0
1232   while [ $i -lt $# ]; do
1233     arg=$1
1234     # This is not really a reliable way of knowing whether -m | --message was
1235     # passed but hum... Let's assume it'll do :s
1236     if [ x"$arg" = 'x-m' ] || [ x"$arg" = 'x--message' ]; then
1237       my_message=$2
1238     fi
1239     shift
1240     set dummy "$@" "$arg"
1241     shift
1242     i=$(($i + 1))
1243   done
1244   if [ x"$my_message" = x ]; then
1245     # The title must not be indented in the commit message and must be
1246     # followed by a blank line.  This yields much better results with most
1247     # VC-viewer (especially for Git but including for SVN, such as Trac for
1248     # instance).  We assume that the title will always be on the 1st line.
1249     sed_git_title="1s@^[         ]*<TITLE>\\.*@$mail_title\\
1250 @g; $sed_eval_tags"
1251     # First, remove empty lines at the beginning, if any.
1252     # Remove also the date information (useless in commit messages)
1253     my_message=`echo "$raw_chlog_entry" \
1254                 | sed -e '1,4 {
1255                             /^<YYYY>-<[MD][MD]>-<[DM][DM]>/d
1256                             /^[1-9][0-9][0-9][0-9]-[0-9][0-9]*-[0-9][0-9]*/d
1257                             /^  and .*<.*@.*>$/d
1258                             /^ *$/d
1259                           }' \
1260                 | sed -e "$sed_git_title" \
1261                       -e "$sed_eval_tags; 1{
1262                             /^ *$/d
1263                           }"`
1264   else
1265     notice 'you are overriding the commit message.'
1266   fi
1267
1268   # Show suspicious whitespace additions with Git.
1269   $git_mode && git diff --cached --check
1270
1271   if $dry_run; then
1272     proposal_file=',proposal'
1273     test -f "$proposal_file" \
1274       && proposal_file=`get_unique_file_name "$proposal_file"`
1275     sed_tmp='s/<REV>/???/g;s/\([^.]\) *\.$/\1/'
1276     mail_subject=`echo "$mail_subject" | sed "$sed_eval_tags; $sed_tmp"`
1277     to=
1278     if [ x"$mailto" != xdont_send_mails ] && [ x"$mailto" != xnothx ]; then
1279       to="
1280 To: $mailto"
1281     fi
1282     echo "\
1283 From: $mail_from$to
1284 Subject: $mail_subject
1285
1286 $mail_comment
1287
1288 ChangeLog:
1289 $chlog_entry
1290
1291 ---
1292 $svn_diff_stat
1293
1294 $svn_diff" >"$proposal_file"
1295     notice "A proposal of your commit was left in '$proposal_file'"
1296     return 0
1297   fi
1298
1299   # Are you sure?
1300   if $git_mode; then
1301     $git_commit_all \
1302     || notice 'You are using git, unlike SVN, do not forget to git add your
1303             changes'
1304   fi
1305
1306   # Change edit_changelog so that we're asking the confirmation below.
1307   $use_log_message_from_file && edit_changelog=: \
1308     && notice "You are about to commit the following change:
1309 $mail_title"
1310
1311   $edit_changelog \
1312     && {
1313       yesno 'Are you sure you want to commit?' \
1314         || return 1
1315     }
1316
1317   # Add the ChangeLog entry
1318   old_chlog=`get_unique_file_name "$change_log_dir/ChangeLog.old"`
1319   mv "$change_log_dir/ChangeLog" "$old_chlog" || \
1320     abort 'Could not backup ChangeLog'
1321   trap "echo SIGINT; mv \"$old_chlog\" \"$change_log_dir/ChangeLog\";
1322         exit 130" $SIGINT
1323   echo "$chlog_entry" >"$change_log_dir/ChangeLog"
1324   echo >>"$change_log_dir/ChangeLog"
1325   cat "$old_chlog" >>"$change_log_dir/ChangeLog"
1326
1327   # Add extra files such as cwd or ChangeLog to the commit.
1328   tmp_sed='s/ /\\ /g' # Escape spaces for the shell.
1329   if $git_mode && $use_changelog; then
1330     # Schedule the ChangeLog for the next commit
1331     (cd "$change_log_dir" && git add ChangeLog) \
1332       || abort 'failed to git add the ChangeLog'
1333     extra_files=
1334   else
1335     extra_files=`echo "$extra_files" | sed "$tmp_sed" | tr ':' '\n'`
1336   fi
1337
1338   # Always sign the commits with Git (but not with git-svn).
1339   $using_git_svn || $git_mode && set dummy --signoff "$@" && shift
1340
1341   # Update the Git index if necessary (just in case the user changed his
1342   # working copy in the mean time)
1343   if $git_mode && $git_commit_all; then
1344     (cd $change_log_dir && git add -v -u) || abort '`git add -v -u` failed'
1345   fi
1346
1347   # --Commit-- finally! :D
1348   $SVN commit -m "$my_message" "$@" $extra_files || {
1349     svn_commit_rv=$?
1350     mv "$old_chlog" "$change_log_dir/ChangeLog"
1351     abort "Commit failed, $SVN returned $svn_commit_rv"
1352   }
1353
1354   printf 'Getting the revision number... '
1355   if $git_mode; then
1356     REV=`git rev-list --pretty=format:%h HEAD --max-count=1 | sed '1d;q'`
1357   else
1358     svn_info_tmp=`$SVN info "$change_log_dir/ChangeLog"`
1359     REV=`echo "$svn_info_tmp" | sed '/^Revision: /!d;s///'`
1360     test -z "$REV" && REV=`echo "$svn_info_tmp" \
1361                              | sed '/^Last Changed Rev: /!d;s///'`
1362   fi
1363   test -z "$REV" && abort 'Cannot detect the current revision.'
1364   echo "$REV"
1365
1366   # Let's make sure we have the real diff by asking the ChangeSet we've just
1367   # committed to the server.
1368
1369   # Backup the old stuff in case we fail to get the real diff from the server
1370   # for some reason...
1371   save_svn_diff=$svn_diff
1372   save_svn_diff_stat=$svn_diff_stat
1373
1374   if $git_mode; then
1375     svn_diff=`git diff --ignore-all-space --no-color -C 'HEAD^' HEAD`
1376     svn_diff_stat=`git diff --stat --ignore-all-space --no-color -C 'HEAD^' HEAD`
1377     $using_git_svn &&
1378       notice 'Do not forget to use `git-svn dcommit` to push your commits in SVN'
1379   else
1380     # Fetch the ChangeSet and filter out the ChangeLog entry. We don't use
1381     # svn diff -c because this option is not portable to older svn versions.
1382     REV_MINUS_ONE=$(($REV - 1))
1383     svn_diff=`svn_diffw -r"$REV_MINUS_ONE:$REV" "$repos_root" \
1384              | $AWK '/^Index: / { if (in_chlog) in_chlog = 0; }
1385                     /^Index: .*ChangeLog$/ { in_chlog = 1 }
1386                     { if (!in_chlog) print }'`
1387     if [ x"$svn_diff" = x ]; then
1388       svn_diff=$save_svn_diff
1389       svn_diff_stat=$save_svn_diff_stat
1390     else
1391       if require_diffstat; then
1392         svn_diff_stat=`echo "$svn_diff" | diffstat`
1393       else
1394         svn_diff_stat='diffstat not available'
1395       fi
1396     fi
1397   fi
1398
1399   # Expand <REV> and remove the final period from the mail subject if there is
1400   # only one period.
1401   sed_tmp="s/<REV>/$REV/g;"'s/\([^.]\) *\.$/\1/'
1402   mail_subject=`echo "$mail_subject" | sed "$sed_eval_tags; $sed_tmp"`
1403
1404   mail_file=`get_unique_file_name "$change_log_dir/+mail"`
1405   echo "\
1406 From: $mail_from
1407 To: $mail_to
1408 Subject: $mail_subject
1409
1410 $mail_comment
1411
1412 ChangeLog:
1413 $chlog_entry
1414
1415 ---
1416 $svn_diff_stat
1417
1418 $svn_diff" | sed 's/^\.$/ ./' >"$mail_file"
1419     # We change lines with only a `.' because they could mean "end-of-mail"
1420
1421   # Send the mail
1422   if $send_a_mail; then
1423     trap 'echo SIGINT; exec < /dev/null' $SIGINT
1424     # FIXME: Move the mail to the +committed right now, in case the user
1425     # CTLR+C the mail-sending-thing, so that the mail will be properly saved
1426     # their.
1427     my_sendmail "$mail_file" "$mail_subject" "$mail_to" \
1428                 "X-svn-url: $repos_root
1429                  X-svn-revision: $REV"
1430   fi # end do we have to send a mail?
1431   rm -f "$tmp_log"
1432   rm -f "$old_chlog"
1433   save_mail_file=`echo "$mail_file" | sed 's/+//'`
1434   mkdir -p "$change_log_dir/+committed" \
1435     || warn "Couldn't mkdir -p $change_log_dir/+committed"
1436   if [ -d "$change_log_dir/vcs" ] \
1437      || [ -d "$change_log_dir/+committed" ]
1438   then
1439     mkdir -p "$change_log_dir/+committed/$REV" \
1440       && mv "$mail_file" "$change_log_dir/+committed/$REV/mail"
1441   fi
1442   return $svn_commit_rv
1443 }
1444
1445 # svn_diffw [args...]
1446 svn_diff()
1447 {
1448   # Ignore white spaces.
1449   if $git_mode; then
1450     git diff -C "$@"
1451   else
1452     diffarg='-u'
1453     # Can't svn diff -x -w: svn 1.4 only.
1454     # Moreover we *MUST* use -x -uw, not -x -u -w or -x -u -x -w ...
1455     # Hence the hack to stick both diff arguments together...
1456     # No comment :)
1457     test x"$1" = x'--SVNW-HACK-w' && shift && diffarg='-uw'
1458
1459     # If $PAGER contains -R, it most likely understand colors and stuff, so we
1460     # can use it to show the colored diff.
1461     diff_cmd_='$SVN diff --no-diff-deleted --diff-cmd $DIFF -x $diffarg "$@"'
1462     case $diff_interactive:$PAGER in #(
1463       yes:*-R*) eval "$diff_cmd_" | $PAGER;;
1464       *) eval "$diff_cmd_"
1465     esac
1466   fi
1467 }
1468
1469 # svn_diffw [args...]
1470 svn_diffw()
1471 {
1472   # Ignore white spaces.
1473   if $git_mode; then
1474     svn_diff --ignore-all-space "$@"
1475   else
1476     svn_diff --SVNW-HACK-w "$@"
1477   fi
1478 }
1479
1480 # svn_mail REV [mails...]
1481 svn_mail()
1482 {
1483   test $# -lt 1 && abort "Not enough arguments provided;
1484                           Try 'svn help mail' for more info."
1485   case $1 in
1486     PREV)
1487       if $git_mode; then
1488         REV=`git rev-list --pretty=format:%h 'HEAD^' --max-count=1 | sed '1d;q'`
1489       else
1490         REV=`svn_revision || abort 'Cannot get current revision number'`
1491         test -z "$REV" && abort 'Cannot get current revision number'
1492         if [ "$REV" -lt 1 ]; then
1493           abort 'No previous revision.'
1494         fi
1495         REV=$(($REV - 1))
1496       fi
1497       ;;
1498     HEAD)
1499       REV=`svn_revision || abort 'Cannot get current revision number'`
1500       test -z "$REV" && abort 'Cannot get current revision number'
1501       ;;
1502     *) REV=$1;;
1503   esac
1504   shift
1505
1506   found_committed=0; found=0
1507   while [ $found -eq 0 ]; do
1508     this_chlog_dir=`pwd -P`
1509     if [ -d ./+committed ]; then
1510       found_committed=1
1511       if [ -d ./+committed/$REV ]; then
1512         found=1
1513       else
1514         cd ..
1515       fi
1516     else
1517       cd ..
1518     fi
1519     # Stop searching when in / ... hmz :P
1520     test x`pwd` = x/ && break
1521   done
1522   if [ $found -eq 0 ]; then
1523     if [ $found_committed -eq 0 ]; then
1524       abort 'Could not find the +committed directory.'
1525     else
1526       abort "Could not find the revision $REV in +committed."
1527     fi
1528     abort 'Internal error (should never be here).'
1529   fi
1530
1531   mail_file=; subject=; to=
1532   if [ -f ./+committed/$REV/mail ]; then
1533     # svn-wrapper generated file
1534     mail_file="./+committed/$REV/mail"
1535     subject=`sed '/^Subject: /!d;s///' $mail_file | sed '1q'`
1536     to=`sed '/^To: /!d;s///' $mail_file | sed '1q'`
1537   elif [ -f ./+committed/$REV/,iform ] && [ -f ./+committed/$REV/,message ]
1538   then
1539     # VCS-generated file
1540     subject=`sed '/^Subject: /!d;s///;s/^"//;s/"$//' ./+committed/$REV/,iform \
1541              | sed "s/<%= *rev *%>/$REV/g"`
1542     to=`sed '/^To:/,/^[^-]/!d' ./+committed/$REV/,iform | sed '1d;s/^- //;$d' \
1543         | xargs | sed 's/  */, /g'`
1544     mail_file=`get_unique_file_name "$TMPDIR/mail.r$REV"`
1545     echo "From: $FULLNAME <$EMAIL>
1546 To: $to
1547 Subject: $subject
1548 " >"$mail_file" || abort "Cannot create $mail_file"
1549     cat ./+committed/$REV/,message >>"$mail_file" \
1550     || abort "Cannot copy ./+committed/$REV/,message in $mail_file"
1551   else
1552     abort "Couldn't find the mail to re-send in `pwd`/+committed/$REV"
1553   fi
1554   if [ $# -gt 0 ]; then
1555     to=`echo "$*" | sed 's/  */, /g'`
1556   fi
1557
1558   test -z "$to" && abort 'Cannot find the list of recipients.
1559                             Please report this bug.'
1560   test -z "$subject" && abort 'Cannot find the subject of the mail.
1561                                  Please report this bug.'
1562
1563   if yesno "Re-sending the mail of r$REV
1564 Subject: $subject
1565 To: $to
1566 Are you sure?"; then :; else
1567     return 1
1568   fi
1569
1570   if $git_mode; then
1571     git_get_repos_info_
1572   else
1573     svn_info_tmp=`$SVN info`
1574     test $? -ne 0 && abort "Failed to get svn info on `pwd`"
1575     repos_root=`echo "$svn_info_tmp" | sed '/^Repository Root: /!d;s///'`
1576     repos_url=`echo "$svn_info_tmp" | sed '/^URL: /!d;s///'`
1577     # It looks like svn <1.3 didn't display a "Repository Root" entry.
1578     test -z "$repos_root" && repos_root=$repos_url
1579   fi
1580
1581   my_sendmail "$mail_file" "$subject" "$to" \
1582               "X-svn-url: $repos_url
1583                X-svn-revision: $REV"
1584 }
1585
1586 # svn_version
1587 svn_version()
1588 {
1589   echo "Using svn-wrapper v$version-g$revision (C) SIGOURE Benoit [GPL]"
1590 }
1591
1592 # has_prop prop-name [path]
1593 # return value: 0 -> path has the property prop-name set.
1594 #               1 -> path has no property prop-name.
1595 #               2 -> svn error.
1596 has_prop()
1597 {
1598   hp_plist=`$SVN proplist "$2"`
1599   test $? -ne 0 && return 2
1600   hp_res=`echo "$hp_plist" | sed "/^ *$1\$/!d"`
1601   test -z "$hp_res" && return 1
1602   return 0
1603 }
1604
1605 # svn_propadd prop-name prop-val [path]
1606 svn_propadd()
1607 {
1608   if $git_mode; then
1609     abort 'propadd is only for SVN, not for Git.'
1610   fi
1611   test $# -lt 2 \
1612   && abort 'Not enough arguments provided;
1613             try `svn help propadd` for more info'
1614   test $# -gt 3 \
1615   && abort 'Too many arguments provided;
1616             try `svn help propadd` for more info'
1617
1618   path=$3
1619   test -z "$path" && path='.' && set dummy "$@" '.' && shift
1620   has_prop "$1" "$3" || {
1621     test $? -eq 2 && return 1 # svn error
1622     # no property found:
1623     yesno "'$path' has no property named '$1', do you want to add it?" \
1624     && $SVN propset "$@"
1625     return $?
1626   }
1627
1628   current_prop_val=`$SVN propget "$1" "$3"`
1629   test $? -ne 0 && abort "Failed to get the current value of property '$1'."
1630
1631   $SVN propset "$1" "$current_prop_val
1632 $2" "$3" >/dev/null || abort "Failed to add '$3' in the property '$1'."
1633
1634   current_prop_val=`$SVN propget "$1" "$3" || echo "$current_prop_val
1635 $2"`
1636   echo "property '$1' updated on '$path', new value:
1637 $current_prop_val"
1638 }
1639
1640 # svn_propsed prop-name sed-script [path]
1641 svn_propsed()
1642 {
1643   if $git_mode; then
1644     abort 'propsed is only for SVN, not for Git.'
1645   fi
1646   test $# -lt 2 \
1647   && abort 'Not enough arguments provided;
1648             try `svn help propsed` for more info'
1649   test $# -gt 3 \
1650   && abort 'Too many arguments provided;
1651             try `svn help propsed` for more info'
1652
1653   path=$3
1654   test -z "$path" && path='.'
1655   has_prop "$1" "$3" || {
1656     test $? -eq 2 && return 1 # svn error
1657     # no property found:
1658     abort "'$path' has no property named '$1'."
1659   }
1660
1661   prop_val=`$SVN propget "$1" "$3"`
1662   test $? -ne 0 && abort "Failed to get the current value of property '$1'."
1663
1664   prop_val=`echo "$prop_val" | sed "$2"`
1665   test $? -ne 0 && abort "Failed to run the sed script '$2'."
1666
1667   $SVN propset "$1" "$prop_val" "$3" >/dev/null \
1668   || abort "Failed to update the property '$1' with value '$prop_val'."
1669
1670   new_prop_val=`$SVN propget "$1" "$3" || echo "$prop_val"`
1671   echo "property '$1' updated on '$path', new value:
1672 $new_prop_val"
1673 }
1674
1675 # svn_revision [args...]
1676 svn_revision()
1677 {
1678   if $git_mode; then
1679     short=`git rev-list --pretty=format:%h HEAD --max-count=1 | sed '1d;q'`
1680     long=`git rev-list --pretty=format:%H HEAD --max-count=1 | sed '1d;q'`
1681     echo "$short ($long)"
1682   else
1683     svn_revision_info_out=`$SVN info "$@"`
1684     svn_revision_rv=$?
1685     echo "$svn_revision_info_out" | sed '/^Revision: /!d;s///'
1686     return $svn_revision_rv
1687   fi
1688 }
1689
1690 # svn_ignore [paths]
1691 svn_ignore()
1692 {
1693   if [ $# -eq 0 ]; then  # Simply display ignore-list.
1694     if $git_mode; then
1695       test -f .gitignore && cat .gitignore
1696     else
1697       $SVN propget 'svn:ignore'
1698     fi
1699   elif [ $# -eq 1 ]; then
1700     b=`basename "$1"`
1701     d=`dirname "$1"`
1702     if $git_mode; then
1703       echo "$b" >>"$d/.gitignore"
1704       git add "$d/.gitignore"
1705       notice 'files ignored in this directory:'
1706       cat "$d/.gitignore"
1707     else
1708       svn_propadd 'svn:ignore' "$b" "$d"
1709     fi
1710   else                   # Add arguments in svn:ignore.
1711     # This part is a bit tricky:
1712     # For each argument, we find all the other arguments with the same dirname
1713     # $dname and we svn:ignore them all in $dname.
1714     while [ $# -ne 0 ]; do
1715       arg=$1
1716       dname=`dirname "$1"`
1717       files=`basename "$1"`
1718       shift
1719       j=0; argc=$#
1720       while [ $j -lt $argc ] && [ $# -ne 0 ]; do
1721         this_arg=$1
1722         shift
1723         this_dname=`dirname "$this_arg"`
1724         this_file=`basename "$this_arg"`
1725         if [ x"$dname" = x"$this_dname" ]; then
1726           files="$files
1727 $this_file"
1728         else
1729           set dummy "$@" "$this_arg"
1730           shift
1731         fi
1732         j=$(($j + 1))
1733       done
1734       if $git_mode; then
1735         echo "$files" >>"$dname"/.gitignore
1736         git add "$dname"/.gitignore
1737         notice "files ignored in $dname:"
1738         cat "$dname"/.gitignore
1739       else
1740         svn_propadd 'svn:ignore' "$files" "$dname"
1741       fi
1742     done
1743   fi
1744 }
1745
1746 # svn_help
1747 svn_help()
1748 {
1749   if [ $# -eq 0 ]; then
1750     svn_version
1751     $SVN help
1752     rv=$?
1753     echo '
1754 Additionnal commands provided by svn-wrapper:
1755   diffstat (ds)
1756   diffw (dw)
1757   ignore
1758   mail
1759   propadd (padd, pa) -- SVN only
1760   proposal
1761   propsed (psed) -- SVN only
1762   revision (rev)
1763   touch
1764   selfupdate (selfup)
1765   version'
1766     return $rv
1767   else
1768     case $1 in
1769       commit | ci)
1770         $SVN help commit | sed '/^Valid options:/i\
1771 Extra options provided by svn-wrapper:\
1772 \  --dry-run                : do not commit, simply generate a patch with what\
1773 \                             would have been comitted.\
1774 \  --use-log-file FILE      : extract the ChangeLog entry from FILE.  This\
1775 \                             entry must be formated in a similar fashion to\
1776 \                             what svn-wrapper usually asks you to fill in.\
1777 \                             The FILE needs to be writable and will be\
1778 \                             removed by svn-wrapper upon success.\
1779
1780 '
1781         ;;
1782       diffstat | ds)
1783         require_diffstat
1784         echo 'diffstat (ds): Display the histogram from svn diff-output.'
1785         $SVN help diff | sed '1d;
1786                               s/differences*/histogram/;
1787                               2,35 s/diff/diffstat/g'
1788         ;;
1789       diffw | dw)
1790         echo "diffw (dw): Display the differences without taking whitespaces\
1791  into account."
1792  $SVN help diff | sed '1d;
1793                        2,35 s/diff\([^a-z]\)/diffw\1/g;
1794                        /--diff-cmd/,/--no-diff-deleted/d'
1795         ;;
1796       ignore)
1797         what='svn:ignore property'
1798         $git_mode && what='.gitignore file'
1799         cat <<EOF
1800 ignore: Add some files in the $what.
1801 usage: 1. ignore [PATH]
1802        2. ignore FILE [FILES...]
1803
1804  1. Display the value of $what on [PATH].
1805  2. Add some files in the $what of the directory containing them.
1806
1807 When adding ignores, each pattern is ignored in its own directory, e.g.:
1808   $bme ignore dir/file "d2/*.o"
1809 Will put 'file' in the $what of 'dir' and '*.o' in the
1810 $what of 'd2'
1811
1812 Valid options:
1813   None.
1814 EOF
1815         ;;
1816       mail)
1817         echo 'mail: Resend the mail of a given commit.
1818 usage: mail REV [emails]
1819
1820 REV must have an email file associated in +committed/REV.
1821 REV can also be PREV or HEAD.
1822
1823 By default the mail is sent to same email addresses as during the original
1824 commit unless more arguments are given.'
1825         ;;
1826       propadd | padd | pa)
1827         echo 'propadd (padd, pa): Add something in the value of a property.
1828 usage: propadd PROPNAME PROPVAL PATH
1829 This command only works in SVN mode.
1830
1831 PROPVAL will be appended at the end of the property PROPNAME.
1832
1833 Valid options:
1834   None.'
1835         ;;
1836       proposal)
1837         echo 'proposal: Alias for: commit --dry-run.
1838 See: svn help commit.'
1839         ;;
1840       propsed | psed)
1841         echo 'propsed (psed): Edit a property with sed.
1842 usage: propsed PROPNAME SED-ARGS PATH
1843 This command only works in SVN mode.
1844
1845 eg: svn propsed svn:externals "s/http/https/" .
1846
1847 Valid options:
1848   None.'
1849         ;;
1850       revision | rev)
1851         echo 'revision (rev): Display the revision number of a local or remote item.'
1852         $SVN help info | sed '1d;
1853                               s/information/revision/g;
1854                               s/revision about/the revision of/g;
1855                               2,35 s/info/revision/g;
1856                               /-xml/d'
1857         ;;
1858       touch)
1859         echo 'touch: Touch a file and svn add it.
1860 usage: touch FILE [FILES]...
1861
1862 Valid options:
1863   None.'
1864         ;;
1865       selfupdate | selfup | self-update | self-up)
1866         echo 'selfupdate (selfup): Attempt to update svn-wrapper.sh
1867 usage: selfupdate
1868
1869 Valid options:
1870   None.'
1871         ;;
1872       version)
1873         echo 'version: Display the version info of svn and svn-wrapper.
1874 usage: version
1875
1876 Valid options:
1877   None.'
1878         ;;
1879       *) $SVN help "$@";;
1880     esac
1881   fi
1882 }
1883
1884 # svn_status [args...]
1885 svn_status()
1886 {
1887   if $git_mode; then
1888     git status "$@"
1889     return $?
1890   fi
1891   svn_status_out=`$SVN status "$@"`
1892   svn_status_rv=$?
1893   test -z "$svn_status_out" && return $svn_status_rv
1894   echo "$svn_status_out" | sed "$sed_svn_st_color"
1895   return $svn_status_rv
1896 }
1897
1898 # svn_update [args...]
1899 svn_update()
1900 {
1901   svn_update_out=`$SVN update "$@"`
1902   svn_update_rv=$?
1903   echo "$svn_update_out" | sed "$sed_svn_up_colors"
1904   return $svn_update_rv
1905 }
1906
1907   # ------------------- #
1908   # `main' starts here. #
1909   # ------------------- #
1910
1911 # Define colors if stdout is a tty.
1912 if test -t 1; then
1913   set_colors
1914 else # stdout isn't a tty => don't print colors.
1915   set_nocolors
1916 fi
1917
1918 # Consider this as a sed function :P.
1919 sed_svn_st_color="
1920     t dummy_sed_1
1921     : dummy_sed_1
1922     s@^?\\(......\\)+@+\\1+@
1923     s@^?\\(......\\)\\(.*/\\)+@+\\1\\2+@
1924     s@^?\\(......\\),@,\\1,@
1925     s@^?\\(......\\)\\(.*/\\),@,\\1\\2,@
1926     s/^\\(.\\)C/\\1${lred}C${std}/
1927     t dummy_sed_2
1928     : dummy_sed_2
1929     s/^?/${lred}?${std}/;  t
1930     s/^M/${lgreen}M${std}/;  t
1931     s/^A/${lgreen}A${std}/;  t
1932     s/^X/${lblue}X${std}/;   t
1933     s/^+/${lyellow}+${std}/; t
1934     s/^D/${lyellow}D${std}/; t
1935     s/^,/${lred},${std}/;    t
1936     s/^C/${lred}C${std}/;    t
1937     s/^I/${purple}I${std}/;  t
1938     s/^R/${lblue}R${std}/;   t
1939     s/^!/${lred}!${std}/;    t
1940     s/^~/${lwhite}~${std}/;  t"
1941
1942 sed_svn_up_colors="
1943     t dummy_sed_1
1944     : dummy_sed_1
1945     $           q
1946     /^Updated/  t
1947     /^Fetching/ t
1948     /^External/ t
1949     s/^\\(.\\)C/\\1${lred}C${std}/
1950     s/^\\(.\\)U/\\1${lgreen}U${std}/
1951     s/^\\(.\\)D/\\1${lred}D${std}/
1952     t dummy_sed_2
1953     : dummy_sed_2
1954     s/^A/${lgreen}A${std}/;  t
1955     s/^U/${lgreen}U${std}/;  t
1956     s/^D/${lyellow}D${std}/; t
1957     s/^G/${purple}G${std}/;  t
1958     s/^C/${lred}C${std}/;    t"
1959
1960 # For dev's:
1961 test "x$1" = x--debug && shift && set -x
1962
1963 test "x$1" = x--git && shift && git_mode=: && SVN=git
1964
1965 test "x$1" = x--no-changelog && shift && use_changelog=false
1966
1967 case $1 in
1968   # ------------------------------- #
1969   # Hooks for standard SVN commands #
1970   # ------------------------------- #
1971   commit | ci)
1972     shift
1973     svn_commit "$@"
1974     ;;
1975   help | \? | h)
1976     shift
1977     svn_help "$@"
1978     ;;
1979   status | stat | st)
1980     shift
1981     svn_status "$@"
1982     ;;
1983   update | up)
1984     shift
1985     svn_update "$@"
1986     ;;
1987   # -------------------- #
1988   # Custom SVN commands  #
1989   # -------------------- #
1990   diffstat | ds)
1991     shift
1992     if [ -d .git ]; then
1993       git diff --stat -C
1994     else
1995       require_diffstat && $SVN diff --no-diff-deleted "$@" | diffstat
1996     fi
1997     ;;
1998   diff | di)
1999     shift
2000     DIFF=$COLORDIFF
2001     diff_interactive=yes
2002     svn_diff "$@"
2003     ;;
2004   diffw | dw)
2005     shift
2006     DIFF=$COLORDIFF
2007     diff_interactive=yes
2008     svn_diffw "$@"
2009     ;;
2010   ignore)
2011     shift
2012     svn_ignore "$@"
2013     ;;
2014   log)
2015     if $git_mode; then # let Git handle log
2016       exec $SVN "$@"
2017     else # pipe svn log through PAGER by default
2018       exec $SVN "$@" | $PAGER
2019     fi
2020     ;;
2021   mail)
2022     shift
2023     svn_mail "$@"
2024     ;;
2025   propadd | padd | pa)
2026     shift
2027     svn_propadd "$@"
2028     ;;
2029   proposal)
2030     shift
2031     svn_commit --dry-run "$@"
2032     ;;
2033   propsed | psed)
2034     shift
2035     svn_propsed "$@"
2036     ;;
2037   revision | rev)
2038     shift
2039     svn_revision "$@"
2040     ;;
2041   touch)
2042     shift
2043     touch "$@" && $SVN add "$@"
2044     ;;
2045   selfupdate | selfup | self-update | self-up)
2046     shift
2047     selfupdate "$@"
2048     ;;
2049   version | -version | --version)
2050     shift
2051     set dummy '--version' "$@"
2052     shift
2053     svn_version
2054     exec $SVN "$@"
2055     ;;
2056   *) exec $SVN "$@"
2057     ;;
2058 esac