From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 18 Mar 2012 20:23:30 +0000 (+0000)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/08352c7a02f057f6cbaf817ca7e53c53be590a62?hp=-c

Merge branch 'stable'
---

08352c7a02f057f6cbaf817ca7e53c53be590a62
diff --combined filters/syntax-highlighting.sh
index 6283ce9,0acdf12..5fcc9c9
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@@ -23,17 -23,6 +23,17 @@@
  # table.blob .kwb  { color:#830000; }
  # table.blob .kwc  { color:#000000; font-weight:bold; }
  # table.blob .kwd  { color:#010181; }
 +#
 +# The following environment variables can be used to retrieve the configuration
 +# of the repository for which this script is called:
 +# CGIT_REPO_URL        ( = repo.url       setting )
 +# CGIT_REPO_NAME       ( = repo.name      setting )
 +# CGIT_REPO_PATH       ( = repo.path      setting )
 +# CGIT_REPO_OWNER      ( = repo.owner     setting )
 +# CGIT_REPO_DEFBRANCH  ( = repo.defbranch setting )
 +# CGIT_REPO_SECTION    ( = section        setting )
 +# CGIT_REPO_CLONE_URL  ( = repo.clone-url setting )
 +#
  
  # store filename and extension in local vars
  BASENAME="$1"
@@@ -42,4 -31,32 +42,32 @@@ EXTENSION="${BASENAME##*.}
  # map Makefile and Makefile.* to .mk
  [ "${BASENAME%%.*}" == "Makefile" ] && EXTENSION=mk
  
+ # highlight versions 2 and 3 have different commandline options. Specifically,
+ # the -X option that is used for version 2 is replaced by the -O xhtml option
+ # for version 3.
+ #
+ # Version 2 can be found (for example) on EPEL 5, while version 3 can be
+ # found (for example) on EPEL 6.
+ #
+ # This is for version 2
  exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
+ 
+ # This is for version 3
+ #
+ # On CentOS 6.2 (using highlight from EPEL), when highlight doesn't know about
+ # an EXTENSION, it outputs a lua error and _no_ text, even when the --force
+ # option is used.
+ #
+ # Also see the bug reports at:
+ # http://sourceforge.net/tracker/?func=detail&aid=3490017&group_id=215618&atid=1034391
+ # https://bugzilla.redhat.com/show_bug.cgi?id=795567
+ #
+ # This workaround can be removed when the bug is fixed upstream and the new
+ # version is packaged in most distributions.
+ #
+ # The workaround is to set the extension to 'txt' (plain text) when highlight
+ # exits with an error (doesn't know the format).
+ #
+ #echo "test" | highlight -f -I -O xhtml -S $EXTENSION &>/dev/null
+ #[ ${?} -ne 0 ] && EXTENSION="txt"
+ #exec highlight --force -f -I -O xhtml -S $EXTENSION 2>/dev/null
diff --combined tests/setup.sh
index b21908d,651f940..e3c6c17
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@@ -22,7 -22,7 +22,7 @@@ mkrepo() 
  	count=$2
  	dir=$PWD
  	test -d "$name" && return
- 	printf "Creating testrepo %s\n" $name
+ 	printf "Creating testrepo %s\n" "$name"
  	mkdir -p "$name"
  	cd "$name"
  	git init
@@@ -41,7 -41,7 +41,7 @@@
  		git commit -m "add a+b"
  		git branch "1+2"
  	fi
- 	cd $dir
+ 	cd "$dir"
  }
  
  setup_repos()
@@@ -63,7 -63,6 +63,7 @@@ enable-log-linecount=
  summary-log=5
  summary-branches=5
  summary-tags=5
 +clone-url=git://example.org/\$CGIT_REPO_URL.git
  
  repo.url=foo
  repo.path=$PWD/trash/repos/foo/.git