X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=origdiff;h=bb2eb6503acebc7b8994de44598ab93e9e863621;hp=ca45bad13551a00dcdfc50c521558b9a5ed1bb25;hb=d9954aaf2f1529cc557db1e8d7338ffa5a4b2404;hpb=860fec43c1c4e568f43e64ec7e5c6e69d8266d01
diff --git a/origdiff b/origdiff
index ca45bad1..bb2eb650 100755
--- a/origdiff
+++ b/origdiff
@@ -1,20 +1,25 @@
#!/bin/sh
-HG_COMM_DIR=/mnt/mozilla/hg/comm-central
-HG_MOZ_DIR=/mnt/mozilla/hg/comm-central/mozilla
-
RUN_DIR=$(pwd)
cd $(dirname "$0")
SCRIPT_DIR=$(pwd)
if [ -n "$1" ]; then
SRC_DATE="$1"
- DST_DATE=`TZ=PST8PDT date +%Y-%m-%d`
+ DST_DATE=`TZ=America/Los_Angeles date +%Y-%m-%d`
+
+ HG_COMM_DIR=/mnt/mozilla/hg/comm-central
COMM_DIR=suite/themes/classic/
- MOZ_DIR=toolkit/themes/winstripe/
COMM_LOG=$RUN_DIR/themelog-suitedefault.$SRC_DATE.$DST_DATE.log
+
+ HG_MOZ_DIR=/mnt/mozilla/hg/comm-central/mozilla
+ MOZ_DIR=toolkit/themes/winstripe/
MOZ_LOG=$RUN_DIR/themelog-tkwinstripe.$SRC_DATE.$DST_DATE.log
+ HG_DOMI_DIR=/mnt/mozilla/hg/comm-central/mozilla/extensions/inspector
+ DOMI_DIR=resources/skin/classic/
+ DOMI_LOG=$RUN_DIR/themelog-domiclassic.$SRC_DATE.$DST_DATE.log
+
if [ ! -e $COMM_LOG ]; then
echo "Getting $COMM_LOG..."
cd $HG_COMM_DIR
@@ -25,19 +30,24 @@ if [ -n "$1" ]; then
cd $HG_MOZ_DIR
hg log -d ">$SRC_DATE" $MOZ_DIR > $MOZ_LOG
fi
+ if [ ! -e $DOMI_LOG ]; then
+ echo "Getting $DOMI_LOG..."
+ cd $HG_DOMI_DIR
+ hg log -d ">$SRC_DATE" $DOMI_DIR > $DOMI_LOG
+ fi
cd $RUN_DIR
else
echo "You must specify a start date."
exit 1
fi
-for repo in "COMM" "MOZ"; do
+for repo in "COMM" "MOZ" "DOMI"; do
HG_DIR_VAR="HG_${repo}_DIR"
LOG_VAR="${repo}_LOG"
HG_URL=`awk -F ' *= *' '/default *=/ { print $2 }' ${!HG_DIR_VAR}/.hg/hgrc`
REPO_NAME=`basename $HG_URL`
LOG_NAME=${!LOG_VAR}
- HTML_NAME=${DIFF_NAME/.diff/.html}
+ HTML_NAME=${LOG_NAME/.log/.html}
echo "Writing $HTML_NAME..."
echo '' > $HTML_NAME
echo "" >> $HTML_NAME
@@ -48,7 +58,7 @@ for repo in "COMM" "MOZ"; do
echo " $REPO_NAME Theme Changes
" >> $HTML_NAME
echo " $SRC_DATE to $DST_DATE
" >> $HTML_NAME
echo " " >> $HTML_NAME
- sed -e "s/user:\(.*\)<\(.*\)>/user:\1\<\2\>/" \
+ sed -e "s/&/\&/g" -e "s//\>/g" \
-e "s|\(changeset: *[0-9]*\):\([0-9a-f]*\)|\1:\2|" \
$LOG_NAME >> $HTML_NAME
echo " " >> $HTML_NAME