From: Eric S. Raymond <esr@thyrsus.com>
Date: Wed, 10 Oct 2012 21:19:04 +0000 (-0400)
Subject: Add the "cialike" option.  And a missing extraction of filtercmd from hg.
X-Git-Tag: 1.11~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c34fc3e41db0a37add667bf3a9427def4b4979d9;p=irker.git

Add the "cialike" option.  And a missing extraction of filtercmd from hg.
---

diff --git a/NEWS b/NEWS
index e710a9a..4e286bf 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
 
 1.11 @
   Code is now fully Unicode-safe.
+  A 'cialike' option emulates the file-summary behavior on the old CIA service.
 
 1.10 @ 2012-10-09
   Expire disconnected connections if they aren't needed or can't reconnect.
diff --git a/irkerhook.py b/irkerhook.py
index 33d3afd..ae60cf3 100755
--- a/irkerhook.py
+++ b/irkerhook.py
@@ -101,6 +101,7 @@ class GenericExtractor:
         self.template = None
         self.urlprefix = None
         self.host = socket.getfqdn()
+        self.cialike = None
         self.filtercmd = None
         # Color highlighting is disabled by default.
         self.color = None
@@ -211,6 +212,7 @@ class GitExtractor(GenericExtractor):
         self.tinyifier = do("git config --get irker.tinyifier") or default_tinyifier
         self.color = do("git config --get irker.color")
         self.urlprefix = do("git config --get irker.urlprefix") or "gitweb"
+        self.cialike = do("git config --get irker.cialike")
         self.filtercmd = do("git config --get irker.filtercmd")
         # These are git-specific
         self.refname = do("git symbolic-ref HEAD 2>/dev/null")
@@ -342,8 +344,10 @@ class HgExtractor(GenericExtractor):
         self.urlprefix = (ui.config('irker', 'urlprefix') or
                           ui.config('web', 'baseurl') or '')
         if self.urlprefix:
-            self.urlprefix = self.urlprefix.rstrip('/') + '/rev'
             # self.commit is appended to this by do_overrides
+            self.urlprefix = self.urlprefix.rstrip('/') + '/rev'
+        self.cialike = ui.config('irker', 'cialike')
+        self.filtercmd = ui.config('irker', 'filtercmd')
         if not self.project:
             self.project = os.path.basename(self.repository.root.rstrip('/'))
         self.do_overrides()
@@ -397,6 +401,17 @@ def ship(extractor, commit, debug):
             sys.stderr.write("irkerhook.py: could not decode JSON: %s\n" % data)
             raise SystemExit, 1
 
+    # Rewrite the file list if too long. The objective here is only
+    # to be easier on the eyes.
+    if extractor.cialike \
+           and extractor.cialike.lower() != "none" \
+           and len(metadata.files) > int(extractor.cialike):
+        files = metadata.files.split()
+        dirs = set([d.rpartition('/')[0] for d in files])
+        if len(dirs) == 1:
+            metadata.files = "(%s files)" % (len(files),)
+        else:
+            metadata.files = "(%s files in %s dirs)" % (len(files), len(dirs))
     # Message reduction.  The assumption here is that IRC can't handle
     # lines more than 510 characters long. If we exceed that length, we
     # try knocking out the file list, on the theory that for notification
diff --git a/irkerhook.xml b/irkerhook.xml
index 273ee00..60e0e16 100644
--- a/irkerhook.xml
+++ b/irkerhook.xml
@@ -147,6 +147,15 @@ to prevent shotgun spamming by malicious project owners.  Setting it to
 a value less than 2, however, would probably be unwise.</para>
 </listitem>
 </varlistentry>
+<varlistentry>
+<term>cialike</term>
+<listitem>
+<para>If not empty and not "None", this emulates the old CIA behavior
+of dropping long lists of files in favor of a summary of the form (N
+files in M directories). The value must be numeric giving a threshold
+value for the length of the file list in characters.</para>
+</listitem>
+</varlistentry>
 </variablelist>
 
 <refsect2 id="git"><title>git</title>