Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master quill by Jaka Kranjc (932019c132747586d9a5752ee73d7f3d7e24c839)

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 quill by Jaka Kranjc (932019c132747586d9a5752ee73d7f3d7e24c839)
  • Date: Sun, 30 Nov 2008 08:39:18 -0600

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

todo | 5 -----
var/lib/quill/ChangeLog | 4 ++++
var/lib/quill/modules/libhistory | 16 ++++++++++++----
var/lib/quill/version | 2 +-
4 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit 932019c132747586d9a5752ee73d7f3d7e24c839
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libhistory: wrap when the line is longer than 76 chars

diff --git a/todo b/todo
index 5c376c8..b897b03 100644
--- a/todo
+++ b/todo
@@ -1,9 +1,5 @@
things that would be cool to have:
new menu choices
- * 'Manage patches'
- add/remove them and their references in PRE_BUILD
- add/remove PRE_BUILD
-
* 'Add another version'
branches
SCM: wierd versions; also needs the autoupdate stuff; only for -w
@@ -34,7 +30,6 @@ modules:
overall:
* Improve scripting support to make it possible to write alternate
interfaces for it
* add quill mode to /quillrc to avoid the need to constantly pass it
- * wrapping for too long history additions

ads:
<p3pilot> i am a believer in using quill for updates...very few failures
and is just quicker for me
\ No newline at end of file
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index dbd43eb..cd5a935 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libhistory: wrap when the line is longer than 76 chars
+ * version: 0.3.0-rc6
+
2008-11-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libpre_build: support for managing PRE_BUILD and patches
made it more intelligent when downloading files from funny urls
diff --git a/var/lib/quill/modules/libhistory
b/var/lib/quill/modules/libhistory
index a414b4f..dcc6d3d 100644
--- a/var/lib/quill/modules/libhistory
+++ b/var/lib/quill/modules/libhistory
@@ -29,6 +29,7 @@ function add_history()
function add_history_entry()
{
local title="$HISTORY_DATE $GURU_NAME <$GURU_EMAIL>" file
+ local entry=$1
local history_file=${2:-HISTORY}

if [[ ! -e $history_file ]]; then
@@ -38,24 +39,31 @@ function add_history_entry()
[[ -e ../DETAILS.orig ]] && mv ../DETAILS.orig .
fi

+ # make the entry wrap nicely (74 == 80-tab-star-space)
+ if (( $(wc -c <<< "$entry") > 74 )); then
+ entry=$(fmt -w 74 <<< "$entry" | sed -e '1! s|^|\t |' -e '$! s|$|\\|')
+ fi
+
if grep -q "$title" $history_file;
then
# check if we already have an entry for the same file
file="${1%%:*}"
+
if [[ -z $(sed -n "1,/^\s*$/ s%\* $file:%&%p" $history_file) ]]
then # we don't
- sed -i "/$title/ a\\\t* $1" $history_file
+ sed -i "/$title/ a\\\t* $entry" $history_file
else
# we do, but first check that the new addition is unique
- if ! sed -n "1,/^\s*$/p" $history_file | grep -qF "* $1"
+ local first_entry_line=$(head -n1 <<< "$entry" | sed 's,\\,,')
+ if ! sed -n "1,/^\s*$/p" $history_file | grep -qF "* $first_entry_line"
then
sed -i "1,/^\s*$/ {
- /\* $file:/ a\\\t ${1#*:}
+ /\* $file:/ a\\\t ${entry#*:}
}" $history_file
fi
fi
else # first time today
- sed -i "1 s%^.*$%$title\n\t* $1\n\n&%" $history_file
+ sed -i "1 s%^.*$%$title\n\t* $entry\n\n&%" $history_file
fi
}

diff --git a/var/lib/quill/version b/var/lib/quill/version
index 9b3b7df..35a7d28 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.3.0-rc5
+0.3.0-rc6



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (932019c132747586d9a5752ee73d7f3d7e24c839), Jaka Kranjc, 11/30/2008

Archive powered by MHonArc 2.6.24.

Top of Page