Source Mage code commit list

[Jaka Kranjc <scm AT sourcemage.org>]

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

 .mailmap                           |   13 +++++++++++++
 ChangeLog                          |    6 ++++++
 usr/sbin/gaze                      |   13 +++++++++----
 usr/share/man/man1/gaze.1          |    4 +++-
 var/lib/sorcery/modules/libdepends |    6 ++++--
 5 files changed, 35 insertions(+), 7 deletions(-)

New commits:
commit 610accc71e02bea3d65bcca709cc2b703d5b54c0
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    libdepends, gaze: made show_up_depends and gaze also display runtime
          dependencies by default

commit 2ad84b83383a4f06187eb31837d3423f2b0e7254
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    libdepends: fixed show_up_depends not printing matches that are also
          providers

commit 7510bb9c50656829967765568484ae1f330abeca
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    .mailmap: Added mail mapping

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..a343888
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,13 @@
+Andrew Stitt <astitt AT sourcemage.org> astitt <astitt AT fawkes.sourcemage.org>
+Andrew Stitt <astitt AT sourcemage.org> Andrew Stitt 
<afrayedknot@thefrayedknot.(none)>
+Andrew Stitt <astitt AT sourcemage.org> Andrew Stitt <a AT t.armory.com>
+Andrew Stitt <astitt AT sourcemage.org> Andrew Stitt <afrayedknot@thefrayedknot>
+Andrew Stitt <astitt AT sourcemage.org> root <root@courier>
+David Michael Leo Brown Jr <dmlb2000 AT gmail.com> David Brown 
<dmlb2000@dmlb2004>
+David Michael Leo Brown Jr <dmlb2000 AT gmail.com> David Brown 
<dmlb2000@dmlb2000.(none)>
+David Michael Leo Brown Jr <dmlb2000 AT gmail.com> David Brown 
<dmlb2000 AT gmail.com>
+David Michael Leo Brown Jr <dmlb2000 AT gmail.com> David Brown 
<dmlb2000@kajit-master.(none)>
+David Michael Leo Brown Jr <dmlb2000 AT gmail.com> root 
<root@kajit-master.(none)>
+David Michael Leo Brown Jr <dmlb2000 AT gmail.com> root <root@dmlb2004>
+Paul Mahon <dufflebunk AT gmail.com> paul_mahon <pmahon AT sourcemage.org>
+Paul Mahon <dufflebunk AT gmail.com> Paul Mahon <pmahon AT sourcemage.org>
diff --git a/ChangeLog b/ChangeLog
index 241eadb..bf0fb81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-20 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * libdepends: fixed show_up_depends not printing matches that are also
+         providers
+       * libdepends, gaze: made show_up_depends and gaze also display runtime
+         dependencies by default
+
 2009-03-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * delve: fixed typo in help
        * url: changed the main fallback url #10799
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index 60adfec..c27b279 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -91,11 +91,12 @@ voyeur         [delay or spell]
 orphans        <empty>          Displays installed spells that no installed
                                  spells explicitly depend on.
 
-depends [--fast] spell [level]
+depends [--fast] [--required] spell [level]
                                  Displays the spells that explicitly or
                                  recursively depend on this spell,
                                  up to \$level levels (infinity if omitted)
                                  --fast omits some information but runs 
faster
+                                 --required omits runtime dependencies
                                  NOTE: the target spell must be installed and
                                  only enabled dependencies are shown
 
@@ -1585,21 +1586,25 @@ function gaze_show_where() {
 ##
 #-----
 function gaze_show_depends() {
-    local fast
+    local fast all=yes
     while true; do
         if [[ $1 == --fast ]] ; then
             fast=yes
             shift
             continue
+        elif [[ $1 == --required ]]; then
+          unset all
+          shift
+          continue
         fi
         break
     done
     local spell=$1
     codex_does_spell_exist "$spell"  &&
     if [[ "$GAZE_VERBOSE" == false ]] || [[ "$fast" ]]; then
-      show_up_depends "$1" "$2" "$fast"
+      show_up_depends "$1" "$2" "$fast" "$all"
     else
-      show_up_depends  "$1" "$2" "verbose"|
+      show_up_depends  "$1" "$2" "verbose" "$all"|
       awk -F: '{ printf("%s depends on %s (%s)\n",$1,$2,$4);}'
     fi
 
diff --git a/usr/share/man/man1/gaze.1 b/usr/share/man/man1/gaze.1
index c4e677c..adef844 100644
--- a/usr/share/man/man1/gaze.1
+++ b/usr/share/man/man1/gaze.1
@@ -247,7 +247,7 @@ show history for a spell (alias for
 .IP
 computes the md5sum on spell sources based on passed spell(s), section(s) or 
entire grimoire(s) if left blank.
 .PP
-.SS depends [--fast] <spell> [<level>]
+.SS depends [--fast] [--required] <spell> [<level>]
 .IP
 shows the spells that explicitly or recursively depend on this
 .I installed
@@ -255,6 +255,8 @@ spell.
 Up to level $level if specified. Only enabled dependencies are shown.
 
 If --fast is specified more limited output is produced, but it runs much 
faster.
+If --required is specified only the required dependencies are shown and the
+runtime ones are skipped.
 .PP
 .SS dependencies [-c ] [--no-optionals ] <spell> [<level>]
 .IP
diff --git a/var/lib/sorcery/modules/libdepends 
b/var/lib/sorcery/modules/libdepends
index 86dfd09..7ad7af8 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -1778,12 +1778,14 @@ function run_spell_config()
 ## @Param spell
 ## @Param depth (optional)
 ## @Param fast -- if set only show spells, not full depends db entries
+## @Param all - if set returns also runtime dependencies
 #---------------------------------------------------------------------
 function real_show_up_depends()
 {
     local i=0
     local MAX_DEPTH=$2
     local type=$3
+    local all=$4
     function show_up_depends_sub() {
         local each dependencies checked
         let i++
@@ -1802,11 +1804,11 @@ function real_show_up_depends()
     }
     hash_reset foo
     hash_reset done
-    compute_reverse_installed_depends foo
+    compute_reverse_installed_depends foo $all
     if [[ "$type" == "verbose" ]] ; then
       lock_file "$DEPENDS_STATUS"
       show_up_depends_sub "$1"|while read line; do
-        grep "$line:" "$DEPENDS_STATUS"
+        grep -E "$line(\(.*\))*:" "$DEPENDS_STATUS"
       done
       unlock_file "$DEPENDS_STATUS"
     else