[Libreoffice-commits] dev-tools.git: git-hooks/contrib git-hooks/dictionaries.git git-hooks/help.git git-hooks/online.git git-hooks/translations.git

2019-06-03 Thread Libreoffice Gerrit user 
 git-hooks/contrib/dev-tools.git/hooks/update |3 ++-
 git-hooks/dictionaries.git/hooks/update  |3 ++-
 git-hooks/help.git/hooks/update  |3 ++-
 git-hooks/online.git/hooks/update|3 ++-
 git-hooks/translations.git/hooks/update  |3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit fc514a83d009b854b1aac233e45d4940dacd61f4
Author: Miklos Vajna 
AuthorDate: Mon Jun 3 09:13:17 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jun 3 13:35:33 2019 +0200

git-hooks mention author names in From field again

Sync dictionaries, help, translations, dev-tools and online with core in
this regard.

Change-Id: I962e239abf467d4f7a6987bf993ab9847f999af7
Reviewed-on: https://gerrit.libreoffice.org/73373
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/git-hooks/contrib/dev-tools.git/hooks/update 
b/git-hooks/contrib/dev-tools.git/hooks/update
index 181bb00..2e180b1 100755
--- a/git-hooks/contrib/dev-tools.git/hooks/update
+++ b/git-hooks/contrib/dev-tools.git/hooks/update
@@ -14,6 +14,7 @@ if [ "$(id -u -n )" != "logerrit" ] ; then
echo "*** The reference for this repo is gerrit. do not push directly 
to fdo" >&2
exit 1
 fi
+from="\"$(git show -s --pretty=format:'%an' $3^{}) (via logerrit)\" 
"
 
 project=$(cat $GIT_DIR/description)
 recipients="libreoffice-comm...@lists.freedesktop.org"
@@ -135,5 +136,5 @@ else
done
 fi |
 mail -s "$subject" -a "X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/contrib/dev-tools.git" \
- -a "List-Post: " $recipients
+ -a "List-Post: " -a "From: 
$from" $recipients
 exit 0
diff --git a/git-hooks/dictionaries.git/hooks/update 
b/git-hooks/dictionaries.git/hooks/update
index 395ed17..01434af 100755
--- a/git-hooks/dictionaries.git/hooks/update
+++ b/git-hooks/dictionaries.git/hooks/update
@@ -14,6 +14,7 @@ if [ "$(id -u -n )" != "logerrit" ] ; then
echo "*** The reference for this repo is gerrit. do not push directly 
to fdo" >&2
exit 1
 fi
+from="\"$(git show -s --pretty=format:'%an' $3^{}) (via logerrit)\" 
"
 
 project=$(cat $GIT_DIR/description)
 recipients="libreoffice-comm...@lists.freedesktop.org"
@@ -135,5 +136,5 @@ else
done
 fi |
 mail -s "$subject" -a "X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/core.git" \
- -a "List-Post: " $recipients
+ -a "List-Post: " -a "From: 
$from" $recipients
 exit 0
diff --git a/git-hooks/help.git/hooks/update b/git-hooks/help.git/hooks/update
index 395ed17..01434af 100755
--- a/git-hooks/help.git/hooks/update
+++ b/git-hooks/help.git/hooks/update
@@ -14,6 +14,7 @@ if [ "$(id -u -n )" != "logerrit" ] ; then
echo "*** The reference for this repo is gerrit. do not push directly 
to fdo" >&2
exit 1
 fi
+from="\"$(git show -s --pretty=format:'%an' $3^{}) (via logerrit)\" 
"
 
 project=$(cat $GIT_DIR/description)
 recipients="libreoffice-comm...@lists.freedesktop.org"
@@ -135,5 +136,5 @@ else
done
 fi |
 mail -s "$subject" -a "X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/core.git" \
- -a "List-Post: " $recipients
+ -a "List-Post: " -a "From: 
$from" $recipients
 exit 0
diff --git a/git-hooks/online.git/hooks/update 
b/git-hooks/online.git/hooks/update
index 81a6171..45ac5c5 100755
--- a/git-hooks/online.git/hooks/update
+++ b/git-hooks/online.git/hooks/update
@@ -14,6 +14,7 @@ if [ "$(id -u -n )" != "logerrit" ] ; then
echo "*** The reference for this repo is gerrit. do not push directly 
to fdo" >&2
exit 1
 fi
+from="\"$(git show -s --pretty=format:'%an' $3^{}) (via logerrit)\" 
"
 
 project=$(cat $GIT_DIR/description)
 recipients="libreoffice-comm...@lists.freedesktop.org"
@@ -135,5 +136,5 @@ else
done
 fi |
 mail -s "$subject" -a "X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/online.git" \
- -a "List-Post: " $recipients
+ -a "List-Post: " -a "From: 
$from" $recipients
 exit 0
diff --git a/git-hooks/translations.git/hooks/update 
b/git-hooks/translations.git/hooks/update
index 395ed17..01434af 100755
--- a/git-hooks/translations.git/hooks/update
+++ b/git-hooks/translations.git/hooks/update
@@ -14,6 +14,7 @@ if [ "$(id -u -n )" != "logerrit" ] ; then
echo "*** The reference for this repo is gerrit. do not push directly 
to fdo" >&2
exit 1
 fi
+from="\"$(git show -s --pretty=format:'%an' $3^{}) (via logerrit)\" 
"
 
 project=$(cat $GIT_DIR/description)
 recipients="libreoffice-comm...@lists.freedesktop.org"
@@ -135,5 +136,5 @@ else

[Libreoffice-commits] dev-tools.git: git-hooks/contrib git-hooks/cppunit.git git-hooks/dictionaries.git git-hooks/help.git git-hooks/libcdr.git git-hooks/libexttextcat.git git-hooks/libmspub.git git-h

2018-07-13 Thread Miklos Vajna 
 git-hooks/contrib/buildbot.git/hooks/update |5 ++---
 git-hooks/contrib/dev-tools.git/hooks/update|5 ++---
 git-hooks/contrib/gitdm-config.git/hooks/update |5 ++---
 git-hooks/contrib/mso-dumper.git/hooks/update   |5 ++---
 git-hooks/contrib/test-files.git/hooks/update   |5 ++---
 git-hooks/cppunit.git/hooks/update  |5 ++---
 git-hooks/dictionaries.git/hooks/update |5 ++---
 git-hooks/help.git/hooks/update |5 ++---
 git-hooks/libcdr.git/hooks/update   |5 ++---
 git-hooks/libexttextcat.git/hooks/update|5 ++---
 git-hooks/libmspub.git/hooks/update |5 ++---
 git-hooks/libvisio.git/hooks/update |5 ++---
 git-hooks/online.git/hooks/update   |5 ++---
 git-hooks/translations.git/hooks/update |5 ++---
 git-hooks/voting.git/hooks/update   |5 ++---
 git-hooks/website.git/hooks/update  |5 ++---
 16 files changed, 32 insertions(+), 48 deletions(-)

New commits:
commit d6fc06573a116a149f06e3eedd1457aababedc06
Author: Miklos Vajna 
Date:   Fri Jul 13 17:09:40 2018 +0200

git-hooks: port core.git changes to other repos

Change-Id: I45450e8e8210d273729812c66c6ac50a86862b85

diff --git a/git-hooks/contrib/buildbot.git/hooks/update 
b/git-hooks/contrib/buildbot.git/hooks/update
index ac84fcf..601a46f 100755
--- a/git-hooks/contrib/buildbot.git/hooks/update
+++ b/git-hooks/contrib/buildbot.git/hooks/update
@@ -14,7 +14,6 @@ if [ "$(id -u -n )" != "logerrit" ] ; then
echo "*** The reference for this repo is gerrit. do not push directly 
to fdo" >&2
exit 1
 fi
-from="$(git show -s --pretty=format:'%an <%ae>' $3^{})"
 
 project=$(cat $GIT_DIR/description)
 recipients="libreoffice-comm...@lists.freedesktop.org"
@@ -114,7 +113,7 @@ else
esac
bytes=0
IFS="$(echo)"
-   git-rev-list "$3" "^$base" | while read rev; do git-show -M $rev; done 
| sed 's#\\##g' |
+   git-rev-list "$3" "^$base" | while read rev; do git-show -M 
--pretty=fuller $rev; done | sed 's#\\##g' |
while read line
do
if [ "$bytes" -ge "0" ] ; then
@@ -129,5 +128,5 @@ else
done
 fi |
 mail -s "$subject" -a "X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/contrib/buildbot.git" \
- -a "List-Post: " -a "From: 
$from" $recipients
+ -a "List-Post: " $recipients
 exit 0
diff --git a/git-hooks/contrib/dev-tools.git/hooks/update 
b/git-hooks/contrib/dev-tools.git/hooks/update
index 58463dd..181bb00 100755
--- a/git-hooks/contrib/dev-tools.git/hooks/update
+++ b/git-hooks/contrib/dev-tools.git/hooks/update
@@ -14,7 +14,6 @@ if [ "$(id -u -n )" != "logerrit" ] ; then
echo "*** The reference for this repo is gerrit. do not push directly 
to fdo" >&2
exit 1
 fi
-from="$(git show -s --pretty=format:'%an <%ae>' $3^{})"
 
 project=$(cat $GIT_DIR/description)
 recipients="libreoffice-comm...@lists.freedesktop.org"
@@ -121,7 +120,7 @@ else
esac
bytes=0
IFS="$(echo)"
-   git-rev-list "$3" "^$base" | while read rev; do git-show $rev; done | 
sed 's#\\##g' |
+   git-rev-list "$3" "^$base" | while read rev; do git-show -M 
--pretty=fuller $rev; done | sed 's#\\##g' |
while read line
do
if [ "$bytes" -ge "0" ] ; then
@@ -136,5 +135,5 @@ else
done
 fi |
 mail -s "$subject" -a "X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/contrib/dev-tools.git" \
- -a "List-Post: " -a "From: 
$from" $recipients
+ -a "List-Post: " $recipients
 exit 0
diff --git a/git-hooks/contrib/gitdm-config.git/hooks/update 
b/git-hooks/contrib/gitdm-config.git/hooks/update
index 8581efc..394eb02 100644
--- a/git-hooks/contrib/gitdm-config.git/hooks/update
+++ b/git-hooks/contrib/gitdm-config.git/hooks/update
@@ -14,7 +14,6 @@ if [ "$(id -u -n )" != "logerrit" ] ; then
echo "*** The reference for this repo is gerrit. do not push directly 
to fdo" >&2
exit 1
 fi
-from="$(git show -s --pretty=format:'%an <%ae>' $3^{})"
 
 project=$(cat $GIT_DIR/description)
 recipients="libreoffice-comm...@lists.freedesktop.org"
@@ -121,7 +120,7 @@ else
esac
bytes=0
IFS="$(echo)"
-   git-rev-list "$3" "^$base" | while read rev; do git-show $rev; done | 
sed 's#\\##g' |
+   git-rev-list "$3" "^$base" | while read rev; do git-show -M 
--pretty=fuller $rev; done | sed 's#\\##g' |
while read line
do
if [ "$bytes" -ge "0" ] ; then
@@ -136,5 +135,5 @@ else
done
 fi |
 mail -s "$subject" -a "X-Git-Repository:

[Libreoffice-commits] dev-tools.git: git-hooks/contrib

2017-01-02 Thread Miklos Vajna 
 git-hooks/contrib/gitdm-config.git/hooks/update |  199 +---
 1 file changed, 116 insertions(+), 83 deletions(-)

New commits:
commit d7533593795b7c607b380296e0c5e97cf59d0ff9
Author: Miklos Vajna 
Date:   Mon Jan 2 09:18:44 2017 +0100

git-hooks: update contrib/gitdm-config to match contrib/dev-tools

Change-Id: Id3c3110a14ed74365bcdc4148d5a103802a1648a

diff --git a/git-hooks/contrib/gitdm-config.git/hooks/update 
b/git-hooks/contrib/gitdm-config.git/hooks/update
index 4b69268..8581efc 100644
--- a/git-hooks/contrib/gitdm-config.git/hooks/update
+++ b/git-hooks/contrib/gitdm-config.git/hooks/update
@@ -1,107 +1,140 @@
 #!/bin/sh
 #
-# An example hook script to blocks unannotated tags from entering.
+# An example hook script to mail out commit update information.
+# It also blocks tags that aren't annotated.
 # Called by git-receive-pack with arguments: refname sha1-old sha1-new
 #
-# To enable this hook, make this file executable by "chmod +x update".
+# To enable this hook:
+# (1) change the recipient e-mail address
+# (2) make this file executable by "chmod +x update".
 #
-# Config
-# --
-# hooks.allowunannotated
-#   This boolean sets whether unannotated tags will be allowed into the
-#   repository.  By default they won't be.
-# hooks.allowdeletetag
-#   This boolean sets whether deleting tags will be allowed in the
-#   repository.  By default they won't be.
-# hooks.allowdeletebranch
-#   This boolean sets whether deleting branches will be allowed in the
-#   repository.  By default they won't be.
-#
-
-# --- Command line
-refname="$1"
-oldrev="$2"
-newrev="$3"
 
-# --- Safety check
-if [ -z "$GIT_DIR" ]; then
-   echo "Don't run this script from the command line." >&2
-   echo " (if you want, you could supply GIT_DIR then run" >&2
-   echo "  $0   )" >&2
-   exit 1
+# prevent pushing from anyone but the logerrit user
+if [ "$(id -u -n )" != "logerrit" ] ; then
+   echo "*** The reference for this repo is gerrit. do not push directly 
to fdo" >&2
+   exit 1
 fi
+from="$(git show -s --pretty=format:'%an <%ae>' $3^{})"
 
-if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
-   echo "Usage: $0   " >&2
-   exit 1
-fi
+project=$(cat $GIT_DIR/description)
+recipients="libreoffice-comm...@lists.freedesktop.org"
 
-# --- Config
-allowunannotated=$(git config --bool hooks.allowunannotated)
-allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
-allowdeletetag=$(git config --bool hooks.allowdeletetag)
+ref_type=$(git cat-file -t "$3")
 
-# check for no description
-projectdesc=$(sed -e '1q' "$GIT_DIR/description")
-if [ -z "$projectdesc" -o "$projectdesc" = "Unnamed repository; edit this file 
to name it for gitweb." ]; then
-   echo "*** Project description file hasn't been set" >&2
+# Avoid re-introducing obsolete tags
+if grep -q "^$1$" hooks/obsolete-tags; then
+   echo "*** Re-introducing an obsolete tag ($1) is not allowed in this 
repo" >&2
+   echo "*** Use corereleasebranches/killtagslocal.sh from 
contrib/dev-tools.git to get rid of them." >&2
exit 1
 fi
 
-# --- Check types
-# if $newrev is ..., it's a commit to delete a ref.
-if [ "$newrev" = "" ]; then
-   newrev_type=delete
+# Only allow annotated tags in a shared repo
+# Remove this code to treat dumb tags the same as everything else
+case "$1","$ref_type" in
+refs/tags/*,commit)
+   echo "*** Un-annotated tags are not allowed in this repo" >&2
+   echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate."
+   exit 1;;
+refs/tags/*,tag)
+   echo "### Pushing version '${1##refs/tags/}' to the masses" >&2
+   # recipients="release-annou...@somwehere.com annou...@somewhereelse.com"
+   ;;
+esac
+
+# set this  to 'cat' to get a very detailed listing.
+# short only kicks in when an annotated tag is added
+short='git shortlog'
+
+# see 'date --help' for info on how to write this
+# The default is a human-readable iso8601-like format with minute
+# precision ('2006-01-25 15:58 +0100' for example)
+date_format="%F %R %z"
+
+# Set to the number of pathname components you want in the subject line to
+# indicate which components of a project changed.
+num_path_components=2
+
+# Set subject
+if expr "$2" : '0*$' >/dev/null ; then
+   subject="Changes to '${1##refs/heads/}'"
 else
-   newrev_type=$(git-cat-file -t $newrev)
+   base=$(git-merge-base "$2" "$3")
+   subject=$(git-diff-tree -r --name-only "$base" "$3" |
+ cut -d/ -f-$num_path_components | sort -u | xargs echo -n)
+commits=$(git-rev-list "$3" "^$base" | wc -l)
+   if [ "$commits" -ne 1 ] ; then
+   subject="$commits commits - $subject"
+   fi
+   branch="${1##refs/heads/}"
+   if [ "$branch" != "master" ] ; then
+   subject="Branch '$branch' - $subject"
+   fi
+   repo=$(basename $(cd $GIT_DIR ;

[Libreoffice-commits] dev-tools.git: git-hooks/contrib

2013-12-13 Thread Miklos Vajna 
 git-hooks/contrib/test-files.git/hooks/update |   35 +-
 1 file changed, 29 insertions(+), 6 deletions(-)

New commits:
commit 977f96ba1c1e5857d47feaf23921d40e2c6d3ef0
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Dec 13 11:33:35 2013 +0100

git-hooks: bring test-files in sync with core

Change-Id: I5e04395dac45b34f10fc99e95e3cc111fb456447

diff --git a/git-hooks/contrib/test-files.git/hooks/update 
b/git-hooks/contrib/test-files.git/hooks/update
index e58517f..9dcbb0b 100755
--- a/git-hooks/contrib/test-files.git/hooks/update
+++ b/git-hooks/contrib/test-files.git/hooks/update
@@ -14,14 +14,20 @@ if [ $(id -u -n ) != logerrit ] ; then
echo *** The reference for this repo is gerrit. do not push directly 
to fdo 2
exit 1
 fi
+from=$(git show -s --pretty=format:'%an %ae' $3^{})
 
-
-project=LibreOffice test files
+project=$(cat $GIT_DIR/description)
 recipients=libreoffice-comm...@lists.freedesktop.org
 
-
 ref_type=$(git cat-file -t $3)
 
+# Avoid re-introducing obsolete tags
+if grep -q ^$1$ hooks/obsolete-tags; then
+   echo *** Re-introducing an obsolete tag ($1) is not allowed in this 
repo 2
+   echo *** Use corereleasebranches/killtagslocal.sh from 
contrib/dev-tools.git to get rid of them. 2
+   exit 1
+fi
+
 # Only allow annotated tags in a shared repo
 # Remove this code to treat dumb tags the same as everything else
 case $1,$ref_type in
@@ -49,8 +55,9 @@ date_format=%F %R %z
 num_path_components=2
 
 # Set subject
+repo=$(basename $(cd $GIT_DIR ; pwd))
 if expr $2 : '0*$' /dev/null ; then
-   subject=Changes to '${1##refs/heads/}'
+   subject=$repo: Changes to '${1##refs/heads/}'
 else
base=$(git-merge-base $2 $3)
subject=$(git-diff-tree -r --name-only $base $3 |
@@ -63,6 +70,7 @@ else
if [ $branch != master ] ; then
subject=Branch '$branch' - $subject
fi
+   subject=$repo: $subject
 fi
 
 if expr $2 : '0*$' /dev/null
@@ -111,7 +119,22 @@ else
echo Rebased ref, commits from common ancestor:
;;
esac
-   git-rev-list $3 ^$base | while read rev; do git-show $rev; done
+   bytes=0
+   IFS=$(echo)
+   git-rev-list $3 ^$base | while read rev; do git-show -M $rev; done 
| sed 's#\\##g' |
+   while read line
+   do
+   if [ $bytes -ge 0 ] ; then
+   bytes=$(( $bytes + ${#line} + 1 ))
+   if [ $bytes -gt 10 ] ; then
+   bytes=-1
+   echo -e \n... etc. - the rest is 
truncated
+   else
+   echo $line
+   fi
+   fi
+   done
 fi |
-mail -s $subject -a X-Git-Repository: 
git://git.cairographics.org/git/cairo $recipients
+mail -s $subject -a X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/contrib/test-files.git \
+ -a List-Post: mailto:libreoffice@lists.freedesktop.org -a From: 
$from $recipients
 exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: git-hooks/contrib

2013-11-27 Thread Miklos Vajna 
 git-hooks/contrib/mso-dumper.git/hooks/update |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit cbddd8325c50eab71792838706dc6acfc8db6083
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Nov 27 09:17:11 2013 +0100

git-hooks: mso-dumper is now on gerrit

Change-Id: I7aed2559c122c384673e27d5533e4b546f0a21b1

diff --git a/git-hooks/contrib/mso-dumper.git/hooks/update 
b/git-hooks/contrib/mso-dumper.git/hooks/update
index 5abf97c..4308a20 100755
--- a/git-hooks/contrib/mso-dumper.git/hooks/update
+++ b/git-hooks/contrib/mso-dumper.git/hooks/update
@@ -9,11 +9,25 @@
 # (2) make this file executable by chmod +x update.
 #
 
+# prevent pushing from anyone but the logerrit user
+if [ $(id -u -n ) != logerrit ] ; then
+   echo *** The reference for this repo is gerrit. do not push directly 
to fdo 2
+   exit 1
+fi
+from=$(git show -s --pretty=format:'%an %ae' $3^{})
+
 project=$(cat $GIT_DIR/description)
 recipients=libreoffice-comm...@lists.freedesktop.org
 
 ref_type=$(git cat-file -t $3)
 
+# Avoid re-introducing obsolete tags
+if grep -q ^$1$ hooks/obsolete-tags; then
+   echo *** Re-introducing an obsolete tag ($1) is not allowed in this 
repo 2
+   echo *** Use corereleasebranches/killtagslocal.sh from 
contrib/dev-tools.git to get rid of them. 2
+   exit 1
+fi
+
 # Only allow annotated tags in a shared repo
 # Remove this code to treat dumb tags the same as everything else
 case $1,$ref_type in
@@ -122,5 +136,5 @@ else
done
 fi |
 mail -s $subject -a X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/contrib/mso-dumper.git \
- -a List-Post: mailto:libreoffice@lists.freedesktop.org $recipients
+ -a List-Post: mailto:libreoffice@lists.freedesktop.org -a From: 
$from $recipients
 exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: git-hooks/contrib

2013-05-15 Thread Miklos Vajna 
 git-hooks/contrib/buildbot.git/hooks/update |   24 +---
 1 file changed, 21 insertions(+), 3 deletions(-)

New commits:
commit c0545eff5f50cb2932c9b34ed00e6aaf09740d67
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed May 15 11:06:46 2013 +0200

git-hooks: sync core - buildbot hook

Change-Id: If9481f340fad1263b00b4a467b265fdabeae9c7c

diff --git a/git-hooks/contrib/buildbot.git/hooks/update 
b/git-hooks/contrib/buildbot.git/hooks/update
index c935005..ac84fcf 100755
--- a/git-hooks/contrib/buildbot.git/hooks/update
+++ b/git-hooks/contrib/buildbot.git/hooks/update
@@ -14,6 +14,7 @@ if [ $(id -u -n ) != logerrit ] ; then
echo *** The reference for this repo is gerrit. do not push directly 
to fdo 2
exit 1
 fi
+from=$(git show -s --pretty=format:'%an %ae' $3^{})
 
 project=$(cat $GIT_DIR/description)
 recipients=libreoffice-comm...@lists.freedesktop.org
@@ -47,8 +48,9 @@ date_format=%F %R %z
 num_path_components=2
 
 # Set subject
+repo=$(basename $(cd $GIT_DIR ; pwd))
 if expr $2 : '0*$' /dev/null ; then
-   subject=Changes to '${1##refs/heads/}'
+   subject=$repo: Changes to '${1##refs/heads/}'
 else
base=$(git-merge-base $2 $3)
subject=$(git-diff-tree -r --name-only $base $3 |
@@ -61,6 +63,7 @@ else
if [ $branch != master ] ; then
subject=Branch '$branch' - $subject
fi
+   subject=$repo: $subject
 fi
 
 if expr $2 : '0*$' /dev/null
@@ -109,7 +112,22 @@ else
echo Rebased ref, commits from common ancestor:
;;
esac
-   git-rev-list $3 ^$base | while read rev; do git-show $rev; done
+   bytes=0
+   IFS=$(echo)
+   git-rev-list $3 ^$base | while read rev; do git-show -M $rev; done 
| sed 's#\\##g' |
+   while read line
+   do
+   if [ $bytes -ge 0 ] ; then
+   bytes=$(( $bytes + ${#line} + 1 ))
+   if [ $bytes -gt 10 ] ; then
+   bytes=-1
+   echo -e \n... etc. - the rest is 
truncated
+   else
+   echo $line
+   fi
+   fi
+   done
 fi |
-mail -s $subject -a X-Git-Repository: 
git://anongit.freedesktop.org/git/ooo-build/ooo-build $recipients
+mail -s $subject -a X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/contrib/buildbot.git \
+ -a List-Post: mailto:libreoffice@lists.freedesktop.org -a From: 
$from $recipients
 exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: git-hooks/contrib

2013-05-07 Thread Miklos Vajna 
 git-hooks/contrib/mso-dumper.git/hooks/update |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit efefd6998c46d3066a71c11785f21ecf79bbee70
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue May 7 10:47:53 2013 +0200

git-hooks: sync core - mso-dumper

Change-Id: I5b3b57ae223ef9aa150c27de6281b0836b42e77d

diff --git a/git-hooks/contrib/mso-dumper.git/hooks/update 
b/git-hooks/contrib/mso-dumper.git/hooks/update
index c0a47ab..5abf97c 100755
--- a/git-hooks/contrib/mso-dumper.git/hooks/update
+++ b/git-hooks/contrib/mso-dumper.git/hooks/update
@@ -41,8 +41,9 @@ date_format=%F %R %z
 num_path_components=2
 
 # Set subject
+repo=$(basename $(cd $GIT_DIR ; pwd))
 if expr $2 : '0*$' /dev/null ; then
-   subject=Changes to '${1##refs/heads/}'
+   subject=$repo: Changes to '${1##refs/heads/}'
 else
base=$(git-merge-base $2 $3)
subject=$(git-diff-tree -r --name-only $base $3 |
@@ -55,7 +56,6 @@ else
if [ $branch != master ] ; then
subject=Branch '$branch' - $subject
fi
-   repo=$(basename $GIT_DIR)
subject=$repo: $subject
 fi
 
@@ -107,7 +107,7 @@ else
esac
bytes=0
IFS=$(echo)
-   git-rev-list $3 ^$base | while read rev; do git-show $rev; done | 
sed 's#\\##g' |
+   git-rev-list $3 ^$base | while read rev; do git-show -M $rev; done 
| sed 's#\\##g' |
while read line
do
if [ $bytes -ge 0 ] ; then
@@ -121,5 +121,6 @@ else
fi
done
 fi |
-mail -s $subject -a X-Git-Repository: 
git://anongit.freedesktop.org/git/ooo-build/ooo-build $recipients
+mail -s $subject -a X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/contrib/mso-dumper.git \
+ -a List-Post: mailto:libreoffice@lists.freedesktop.org $recipients
 exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: git-hooks/contrib

2013-03-22 Thread Miklos Vajna 
 git-hooks/contrib/libvisio.git/hooks/update |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 21f2873914ed25f6efa55c687dded9a73683846a
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Mar 22 12:39:10 2013 +0100

git-hooks: sync libvisio with core

Change-Id: I844bf0378c7bd659938d3324034eb8233a0d28ed

diff --git a/git-hooks/contrib/libvisio.git/hooks/update 
b/git-hooks/contrib/libvisio.git/hooks/update
index 336996a..2966fb8 100755
--- a/git-hooks/contrib/libvisio.git/hooks/update
+++ b/git-hooks/contrib/libvisio.git/hooks/update
@@ -14,6 +14,7 @@ if [ $(id -u -n ) != logerrit ] ; then
echo *** The reference for this repo is gerrit. do not push directly 
to fdo 2
exit 1
 fi
+from=$(git show -s --pretty=format:'%an %ae' $3^{})
 
 project=$(cat $GIT_DIR/description)
 recipients=libreoffice-comm...@lists.freedesktop.org
@@ -54,8 +55,9 @@ date_format=%F %R %z
 num_path_components=2
 
 # Set subject
+repo=$(basename $(cd $GIT_DIR ; pwd))
 if expr $2 : '0*$' /dev/null ; then
-   subject=Changes to '${1##refs/heads/}'
+   subject=$repo: Changes to '${1##refs/heads/}'
 else
base=$(git-merge-base $2 $3)
subject=$(git-diff-tree -r --name-only $base $3 |
@@ -68,7 +70,6 @@ else
if [ $branch != master ] ; then
subject=Branch '$branch' - $subject
fi
-   repo=$(basename $GIT_DIR)
subject=$repo: $subject
 fi
 
@@ -135,5 +136,5 @@ else
done
 fi |
 mail -s $subject -a X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/contrib/libvisio.git \
- -a List-Post: mailto:libreoffice@lists.freedesktop.org $recipients
+ -a List-Post: mailto:libreoffice@lists.freedesktop.org -a From: 
$from $recipients
 exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits