Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (47c2a2adfb70f417eacb5b58d818a8ba26848ac5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (47c2a2adfb70f417eacb5b58d818a8ba26848ac5)
  • Date: Mon, 26 Jan 2009 10:18:15 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

smgl/guru-tools/DETAILS | 5 -
smgl/guru-tools/HISTORY | 3 +
smgl/guru-tools/INSTALL | 1
smgl/guru-tools/smgl-cherry-pick | 109
---------------------------------------
4 files changed, 5 insertions(+), 113 deletions(-)

New commits:
commit 47c2a2adfb70f417eacb5b58d818a8ba26848ac5
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

guru-tools: 2.0

diff --git a/smgl/guru-tools/DETAILS b/smgl/guru-tools/DETAILS
index 8405dec..d94272f 100755
--- a/smgl/guru-tools/DETAILS
+++ b/smgl/guru-tools/DETAILS
@@ -1,11 +1,10 @@
SPELL=guru-tools
- VERSION=1.9
+ VERSION=2.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
SOURCE_URL[0]=http://download.sourcemage.org/distro/misc/$SOURCE
-
SOURCE_HASH=sha512:69ad77d49c3a9f1f58fff98792c624f8f5f55592a6346c9297e7ba05ff91a50433b7832fe8eccd31e18ce6a797d09a1cc420c779a2ebaf40d4e38846d3b67aa9
+
SOURCE_HASH=sha512:20531502c96a7992c67f4cea944ea2ccc049e6c32e587298ef67f497956d9d82660f0597655e854fb677f93787c0ffd2d1d8704108bc8777548b2dfda4de43b7
WEB_SITE=http://www.sourcemage.org
- PATCHLEVEL=2
ENTERED=20030602
LICENSE=GPL
KEYWORDS="smgl"
diff --git a/smgl/guru-tools/HISTORY b/smgl/guru-tools/HISTORY
index 6a96e22..7462a1f 100644
--- a/smgl/guru-tools/HISTORY
+++ b/smgl/guru-tools/HISTORY
@@ -1,3 +1,6 @@
+2009-01-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 2.0
+
2008-03-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* smgl-cherry-pick: fixed omission of new files
diff --git a/smgl/guru-tools/INSTALL b/smgl/guru-tools/INSTALL
index e39bdf2..c43a42e 100755
--- a/smgl/guru-tools/INSTALL
+++ b/smgl/guru-tools/INSTALL
@@ -1,7 +1,6 @@
rm -rf $SOURCE_DIRECTORY/old.libraries || true
#prepare install likes to leave $SCRIPT_DIRECTORY/old.libraries around
#this breaks the cp line below
-cp $SPELL_DIRECTORY/smgl-cherry-pick $SOURCE_DIRECTORY/ &&
chmod 755 $SOURCE_DIRECTORY/* &&
# omit the old.binaries dir
for file in $SOURCE_DIRECTORY/*; do
diff --git a/smgl/guru-tools/smgl-cherry-pick
b/smgl/guru-tools/smgl-cherry-pick
deleted file mode 100755
index 52f19a9..0000000
--- a/smgl/guru-tools/smgl-cherry-pick
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/bash
-#
-# This script is a wrapper around git-cherry-pick, which enables
-# good "merging" of HISTORY, ChangeLog and binary files.
-# Conflicts in those files are now rare, but the script has
-# room for improvement.
-rc=0
-commit=$1
-[[ -z $commit ]] && echo no commit specified && exit 100
-[[ -f ChangeLog ]] || { echo run me from the top dir; exit 99; }
-
-# check if commit diff does not contain a HISTORY/ChangeLog header
-# it also must contain diff changes (this enables merging of bins)
-if ! git show $commit | grep -q "^+++.*\(HISTORY\|ChangeLog\)" && git show
$commit | grep -q "^+++"; then
- # just do it
- git-cherry-pick $commit
- exit 0
-else
- git reset -q --hard # you need a clean checkout for gcp anyway
- # split the diff into parts
- git show $commit | csplit -s -n5 - '/^diff --git/' '{*}'
-
- rm xx00000 # commit info
- # extract history/cl or apply directly
- for diff in xx*; do
- if ! grep -q "+++.*\(HISTORY\|ChangeLog\)" $diff; then
- if ! grep -q "^Binary file" $diff; then
- file=$(sed -n '/^+++ / s,^[^/]*/,,p' $diff)
- patch -p1 < $diff
- new_rc=$?
- git add "$file"
- [[ $rc == 0 ]] && rc=$new_rc
- else
- file=$(sed -n '/^diff --git/ { s,^[^/]*/,,; s, .*$,,p} ' $diff)
- if grep -q "^deleted file" $diff; then
- git-rm "$file" ||
- echo "Warning, nonexsitent file: $file"
- else # new or updated file
- git show $commit:"$file" > "$file"
- git add "$file"
- fi
- fi
- echo
- else
- file=$(sed -n '/^+++ / s,^[^/]*/,,p' $diff)
-
- # maybe we're lucky and it will apply cleanly
- patch --dry-run -p1 -s < $diff &>/dev/null &&
- patch -p1 < $diff &&
- echo luckily patched $file &&
- echo &&
- continue
-
- echo Handling diff $diff for $file specially
- # does it have more than one chunk?
- if [[ $(grep -c "@@.*@@" $diff) != 1 ]]; then
- echo multiple history chunks - not supported
- rm -f xx*
- exit 111
- fi
-
- # check if it removes any lines
- if grep -q "^- " $diff; then
- echo this diff removes lines too - not supported
- rm -f xx*
- exit 112
- fi
-
- # numb the diff into what will be cat into the file
- # we want only the lines with +
- sed -i -e '/^+/!d' -e '/^+++/d' -e 's/^+//' $diff
-
- # add a date header if it is missing (multiple changes in the same day)
- # or remove it and readd it so it is in the right spot:
- # changes in the same day with individual titles can result in diff
- # picking up the old one as the new - the title would be on the last
line
- #FIXME multiple titles per commit aren't supported: should delete only
the first title
- sed -i '/^20/d' $diff
- CDATE=$(git show $commit --pretty=format:%ai | sed -n '1 s/ .*$//p')
- TITLE="$CDATE $(git show $commit | sed -n 's/^Author: //p')"
- sed -i "1 s,^,$TITLE\n," $diff
-
- # make sure the addition contains a blank last line
- sed -i "$ s,^..*$,&\n," $diff
-
- cat $diff $file > $file.new
- mv $file.new $file
- git add $file # needed when cherrypicking new spells
- echo
- fi
- done
-fi
-if [[ $rc == 0 ]]; then
- git show $commit --pretty=format:"%s%n%b%n(cherry-picked from commit %H)"
| sed '/^diff --git/,$ d' |
- git commit -a -F -
-else
-cat << KUKU
-##########################################################################
-A chunk failed! Resolve the conflict manually and then commit the result.
-Use this:
-git show $commit \\
- --pretty=format:"%s%n%b%n(cherry-picked from commit %H)" |
-sed '/^diff --git/,$ d' |
-git commit -a -F -
-KUKU
-fi
-rm -f xx*
-exit $rc
-



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (47c2a2adfb70f417eacb5b58d818a8ba26848ac5), Jaka Kranjc, 01/26/2009

Archive powered by MHonArc 2.6.24.

Top of Page