From: Eric S. Raymond <esr@thyrsus.com>
Date: Wed, 3 Oct 2012 07:13:34 +0000 (-0400)
Subject: Merge commit 'refs/merge-requests/10' of git://gitorious.org/irker/irker into merge... 
X-Git-Tag: 1.6~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a9597796de743416942939a04996178880e1451b;p=irker.git

Merge commit 'refs/merge-requests/10' of git://gitorious.org/irker/irker into merge-requests/10
---

a9597796de743416942939a04996178880e1451b
diff --cc irkerhook.py
index 53d5e09,6b3aacc..a7d24d5
--- a/irkerhook.py
+++ b/irkerhook.py
@@@ -349,12 -349,9 +349,12 @@@ def hg_hook(ui, repo, **kwds)
      # [hooks]
      # incoming.irker = python:/path/to/irkerhook.py:hg_hook
      extractor = HgExtractor([(ui, repo)])
-     ship(extractor, node, False)
+     ship(extractor, kwds['node'], False)
  
 -extractors = [GitExtractor, SvnExtractor, HgExtractor]
 +# The files we use to identify a Subversion repo might occur as content
 +# in a git or hg repo, but the special subdirectories for those are more
 +# reliable indicators.  So test for Subversion last.
 +extractors = [GitExtractor, HgExtractor, SvnExtractor]
  
  # VCS-dependent code ends here