Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/geekigeeki

diff --git a/geekigeeki.py b/geekigeeki.py
index 84cc9afa490ab574c859b4523ae124873b8e538a..44b5131bb1435a0e2781f56a8583e108b52b0b75 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -610,8 +610,8 @@ class WikiFormatter:
                     print('</p><p>')
                 else:
                     indent = indent_re.match(self.line)
-                    #3.0: print(self._indent_to(len(indent.group(0))), end=' ')
                     print(self._indent_to(len(indent.group(1)), indent.group(2)))
+                    # Stand back! Here we apply the monster regex that does all the parsing
                     print(re.sub(scan_re, self.replace, self.line))
 
         if self.in_pre: print('</pre>')
@@ -664,7 +664,7 @@ class Page:
         out = '== '
         pathname = ''
         for dirname in self.page_name.strip('/').split('/'):
-            pathname = (pathname + '/' + dirname) if pathname else dirname
+            pathname = (pathname and pathname + '/' ) + dirname
             out += '[[' + pathname + '|' + dirname + ']]/'
         out += ' ==\n'
  

diff --git a/git-bloat b/git-bloat
deleted file mode 100755 (executable)
index ef73cff..0000000
--- a/git-bloat
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-# Copyright 2009 Bernie Innocenti <bernie@codewiz.org>
-
-if [ $# -ne 1 ]; then
-       echo "Usage: $0 {path}"
-       exit 1
-fi
-
-git log --pretty=oneline "$1" | while read log; do
-       tree=($log)
-       rev=`git ls-tree ${tree[0]} "$1" | awk '{print $3}'`
-       git cat-file blob $rev | wc -l
-done | tac | graph -T X -a 1 -y 0 1000 -X revisions -Y LOCs

diff --git a/git-cat b/git-cat
deleted file mode 100755 (executable)
index 91c3eb9..0000000
--- a/git-cat
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-# Copyright 2009 Bernie Innocenti <bernie@codewiz.org>
-
-if [ $# -ne 1 ]; then
-       echo "Usage: $0 {path}"
-       exit 1
-fi
-
-info=(`git ls-tree HEAD $1`)
-git cat-file blob ${info[2]}