capillary 0.2.0 → 0.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capillary (0.1.3)
+    capillary (0.2.1)
       json (~> 1.5.1)
 
 GEM

data/README

@@ -7,37 +7,146 @@ gitk and `git log --graph`, except beautiful.
 
 Capillary consists of two parts:
 
-* capillary.rb: which parses the output from Git log data and
-  generates a JSON representation of it, usable from
+* capillary.rb: which parses the output from Git log data and generates a
+  JSON representation of it, usable from:
 * capillary.js: the javascript library doing the presentation
 
 The emitted JSON
 ----------------
 
 Capillary.rb emits a JSON array consisting of JSON objects in the
-following form (starting with id=0):
+following form (starting with seqId=0):
 
 	[[{
-	    sha: "251367a",
-	    refnames: ["HEAD", "origin/master", "origin/HEAD", "master"],
-	    message: "Whitespace fix",
-	    id: 1
-	}, {
-	    sha: "854e061",
-	    refnames: ["origin/unified-messaging-api", "unified-messaging-api"],
-	    message: "Resolve merge conflict from master",
-	    id: 2
-	}]];
+            "refNames": ["HEAD", "origin/production", "production"],
+            "seqId": 0,
+            "committedAt": "Fri Jul 15 07:23:44 +0200 2011",
+            "parentIds": ["8f38426b1641a20511f6eeb6878f2e1e00712df2", "ce7de03fc2cb6114d2f859fefc996e7fffa2d7f6"],
+            "id": "a490db7b450e6c58bb69ac64dfe725b188bfe5b3",
+            "committerEmail": "christian@gitorious.org",
+            "message": "Merge branch 'master' into production"
+        }, {
+            "refNames": [],
+            "seqId": 1,
+            "committedAt": "Thu Jun 16 10:20:03 +0200 2011",
+            "parentIds": ["0443fcdf66df410993441b617d14dab121245ff7"],
+            "id": "909d42da14d186e4580995f24b56aa4223f7965f",
+            "committerEmail": "christian@gitorious.org",
+            "message":"Don't allow destructive actions via GET etc"
+        }]]
+
+* seqId: The relative sequence id of the commit. This is used to order commits,
+  and seqId == 0 is given to the newest commit, because Capillary looks at the
+  commit graph top-down (newest-oldest).
+* committedAt: The commit date.
+* committerEmail: The committer email.
+* id: The commit sha
+* parentIds: The commit sha of all parent commits of this commit
+* message: The commit message
+* Ref names: Relevant names of branches that concern the commit
+  in question
+
+Note that the JSON emitted is a nested array - an array of "paths", where each
+path is an array of commits.
+
+What is a path? If you look at a log graph from the "top" (newest commit),
+each merge point is considered the start of a new path through the graph. The
+commit where the branch was originally created marks the end of the path.
+
+Consider the following graph (the numbers to the left indicate each commit's
+assigned seqId):
+
+0  0
+   |\
+1  0 |
+   | |
+2  | 0
+   | |
+3  | 0
+   | |\
+4  | 0 |
+   | | |
+5  | 0 |
+   | | |
+6  | | 0
+   | |/
+7  | 0
+   |/
+8  0
+   |
+
+Capillary parses this log into three paths:
+
+Path #1: [{ seqId: 0 }, { seqId: 1 }, { seqId: 8 }]
+0  0
+   |
+1  0
+   |
+2  |
+   |
+3  |
+   |
+4  |
+   |
+5  |
+   |
+6  |
+   |
+7  |
+   |
+8  0
+   |
+
+Path #2: [{ seqId: 0 }, { seqId: 2 }, { seqId: 3 }, { seqId: 4 },
+          { seqId: 5 }, { seqId: 7 }, { seqId: 8 }]
+0  0
+    \
+1    |
+     |
+2    0
+     |
+3    0
+     |
+4    0
+     |
+5    0
+     |
+6    |
+     |
+7    0
+    /
+8  0
+   |
+
+Path #3: [{ seqId: 3 }, { seqId: 6 }, { seqId: 7 }]
+3    0
+      \
+4      |
+       |
+5      |
+       |
+6      0
+      /
+7    0
+
+This output can be further processed by capillary.js.
 
 Input to capillary.rb
 ---------------------
 
-Capillary parses output from Git, in the format as specified in
+Capillary parses output from Git log, in the format as specified in
 test/fixtures/single_commit.txt. This output was generated from Git using the
 following command:
 
     git log --pretty=format:"%H§%P§%ad§%ae§%d§%s§"
 
+You may also use the following command, which orders commits slightly
+differently, and is perhaps more suitable for graph generation. Note that this
+command outputs an extra line per commit, which may be an issue if I/O is a
+concern:
+
+    git rev-list --pretty=format:"%H§%P§%ad§%ae§%d§%s§" --topo-order -50 master
+
 The name
 --------
 

data/lib/capillary/commit.rb

@@ -25,6 +25,9 @@ module Capillary
 
     # Creates an instance from Git output
     def self.parse(git_line)
+      git_line = git_line.gsub(/^[^a-f0-9]+/, "")
+      return nil if git_line == ""
+
       parts = git_line.split(LOG_SEPARATOR)
       result = new
       result.id = parts[0]

data/lib/capillary/log_parser.rb

@@ -27,10 +27,13 @@ module Capillary
       @branches = []
       @seq_ids = {}
       @commit_positions = {}
+      @relationships = {}
     end
 
     def <<(commit)
       commit = Capillary::Commit.parse(commit) if String === commit
+      return if commit.nil?
+
       seq_id = @commit_count
       @commit_count += 1
 
@@ -55,16 +58,7 @@ module Capillary
 
       placed = branches.inject(false) do |was_placed, branch|
         if !branch.last.closed? && branch.last.parent_id == commit.id
-          pos = @commit_positions[branch.last.parent_id]
-
-          if pos
-            diff = (pos.first - col).abs
-            next true if diff > 1
-          else
-            @commit_positions[commit.id] = [col, branch.length]
-          end
-
-          branch << commit
+          save_commit_pos(col, commit)
           was_placed = true
         end
 
@@ -73,9 +67,29 @@ module Capillary
       end
 
       unless placed
-        @commit_positions[commit.id] = [col, 0]
-        branches << [commit]
+        save_commit_pos(col, commit)
+      end
+    end
+
+    def save_commit_pos(col, commit)
+      branch = branches[col]
+      prev_commit = branch && branch.last
+      pos = prev_commit && @commit_positions[prev_commit.parent_id]
+
+      if !pos
+        branches << [] if branches.length <= col
+        @commit_positions[commit.id] = [col, branches[col].length]
       end
+
+      if branches[col].length > 0
+        pid = branches[col].last.commit.id
+        relationship = "#{commit.id}:#{pid}"
+        return if @relationships[relationship]
+        @relationships[relationship] = true
+      end
+
+      parent = commit.parent_id ? " (#{commit.parent_id[0...7]})" : ""
+      branches[col] << commit
     end
   end
 

data/lib/capillary/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Capillary
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/test/capillary/log_parser_test.rb

@@ -20,6 +20,27 @@ require "test_helper"
 require "capillary/log_parser"
 
 class LogParserTest < MiniTest::Spec
+  attr_reader :log_parser, :lines
+
+  def commits_for_branch(num)
+    branches[num].collect { |c| c.id[0...7] }
+  end
+
+  def load_fixture(fixture)
+    fixtures = fixture(fixture).split("\n")
+    @log_parser = Capillary::LogParser.new
+    @lines = []
+
+    fixtures.reject { |f| f.strip == "" }.each do |fixture|
+      @lines << Capillary::Commit.parse(fixture)
+      @log_parser << @lines.last
+    end
+  end
+
+  def branches
+    log_parser.branches
+  end
+
   # * a7cf78bfff06d52b5b0aa021508b44c00cad067a
   # * db75ad82d678d51b29709d26af64d4a85b6f8071
   context "A linear graph" do
@@ -265,6 +286,316 @@ class LogParserTest < MiniTest::Spec
     end
   end
 
+  # 0
+  # |
+  # 0
+  # |
+  # 0
+  # |\
+  # | 0
+  # | |
+  # | 0
+  # | |
+  # | 0
+  # | |
+  # | 0
+  # | |
+  # | 0
+  # | |
+  # | 0
+  # | |
+  # | 0
+  # | |
+  context "Parsing log --graph output" do
+    setup do
+      fixtures = fixture("log_graph.txt").split("\n")
+      @log_parser = Capillary::LogParser.new
+      @lines = []
+
+      fixtures.reject { |f| f.strip == "" }.each do |fixture|
+        @lines << Capillary::Commit.parse(fixture)
+        @log_parser << @lines.last
+      end
+    end
+
+    should "have two branches" do
+      assert_equal 2, @log_parser.branches.length
+    end
+  end
+
+  # 0
+  # |
+  # 0
+  # |
+  # 0
+  # |\
+  # | 0
+  # | |
+  # | 0
+  # | |
+  # | 0
+  # | |
+  # | 0
+  # | |
+  # | 0
+  # | |
+  # | 0
+  # | |
+  # | 0
+  # | |
+  # | 0
+  # | |
+  # 0--
+  # | |\
+  # | | 0
+  # | | |
+  # | | 0
+  # | | |
+  # | | 0
+  # | | |
+  # | | 0
+  # | | |
+  # | | 0
+  # | | |
+  # | | 0
+  # |/ /
+  # 0--
+  # |
+  # 0
+  # |
+  context "Two branches forked from same commit" do
+    setup do
+      fixtures = fixture("double_fork.txt").split("\n")
+      @log_parser = Capillary::LogParser.new
+      @lines = []
+
+      fixtures.reject { |f| f.strip == "" }.each do |fixture|
+        @lines << Capillary::Commit.parse(fixture)
+        @log_parser << @lines.last
+      end
+    end
+
+    should "have three branches" do
+       assert_equal 3, @log_parser.branches.length
+    end
+
+    should "have the six commits in the first branch" do
+      commits = @log_parser.branches[0].collect { |c| c.id[0...7] }
+
+      assert_equal 6, commits.length
+      assert_equal %w[0f54800 5bdf304 2477a17 ea4d6ce fdc39f6 9002b5b], commits
+    end
+
+    should "have the ten commits in the second branch" do
+      commits = @log_parser.branches[1].collect { |c| c.id[0...7] }
+
+      assert_equal 10, commits.length
+      assert_equal %w[2477a17 13c727b bd73540 6fb3997 9266f54 a5f9deb 1551dfe 16d2ac1 1e69972 fdc39f6], commits
+    end
+
+    should "have the eight commits in the third branch" do
+      commits = @log_parser.branches[2].collect { |c| c.id[0...7] }
+
+      assert_equal 8, commits.length
+      assert_equal %w[ea4d6ce 74510fd 09b2486 4f0eaf7 fe57cfc cbdfa12 81febec fdc39f6], commits
+    end
+  end
+
+  # 0
+  # |\
+  # | 0
+  # | |
+  context "Two dangling branches" do
+    setup do
+      log = <<-GIT
+ca2d07e0172565c9e0f18d41e49b70d7d75fced6§3370cb3615b3368be97c0f39b86f5dc2f9fa3650 c4e7446e2a98f1bf28da51fc57bb42b532222942§Tue May 10 12:47:08 2011 +0200§christian@gitorious.org§§Merge branch 'merge-requests/2230'§
+c4e7446e2a98f1bf28da51fc57bb42b532222942§c3e1d675667939e64ced1bb5b541c9042a1d60f8§Tue May 10 12:41:19 2011 +0200§christian@gitorious.org§§Merge commit 'refs/merge-requests/2230' of gitorious.org:gitorious/mainline into merge-requests/2230§
+      GIT
+
+      @log_parser = Capillary::LogParser.new
+      log.split("\n").each { |l| @log_parser << l }
+    end
+
+    should "have two branches" do
+      assert_equal 2, branches.length
+    end
+
+    should "have one commit in first branch" do
+      assert_equal %w[ca2d07e], commits_for_branch(0)
+    end
+
+    should "have two commits in second branch" do
+      assert_equal %w[ca2d07e c4e7446], commits_for_branch(1)
+    end
+  end
+
+  # 0
+  # |
+  # 0
+  # |\
+  # | 0
+  # | |
+  context "Two dangling branches with leading commit" do
+    setup do
+      log = <<-GIT
+1f2b8a4e3f61ffedf9908e28b280de8c6bf38a16§ca2d07e0172565c9e0f18d41e49b70d7d75fced6§Tue May 10 13:04:10 2011 +0200§christian@gitorious.org§§Some commit§
+ca2d07e0172565c9e0f18d41e49b70d7d75fced6§3370cb3615b3368be97c0f39b86f5dc2f9fa3650 c4e7446e2a98f1bf28da51fc57bb42b532222942§Tue May 10 12:47:08 2011 +0200§christian@gitorious.org§§Merge branch 'merge-requests/2230'§
+c4e7446e2a98f1bf28da51fc57bb42b532222942§c3e1d675667939e64ced1bb5b541c9042a1d60f8§Tue May 10 12:41:19 2011 +0200§christian@gitorious.org§§Merge commit 'refs/merge-requests/2230' of gitorious.org:gitorious/mainline into merge-requests/2230§
+      GIT
+
+      @log_parser = Capillary::LogParser.new
+      log.split("\n").each { |l| @log_parser << l }
+    end
+
+    should "have two branches" do
+      assert_equal 2, branches.length
+    end
+
+    should "have two commits in first branch" do
+      assert_equal %w[1f2b8a4 ca2d07e], commits_for_branch(0)
+    end
+
+    should "have two commits in second branch" do
+      assert_equal %w[ca2d07e c4e7446], commits_for_branch(1)
+    end
+  end
+
+  # 0
+  # |\
+  # 0-|
+  # | |\
+  # | | 0
+  # | | |
+  context "Three dangling branches" do
+    setup do
+      log = <<-GIT
+1f2b8a4e3f61ffedf9908e28b280de8c6bf38a16§ca2d07e0172565c9e0f18d41e49b70d7d75fced6 275932ab0995a11fcebeb0af7f19a7b8df5dea3f§Tue May 10 13:04:10 2011 +0200§christian@gitorious.org§§Some commit§
+ca2d07e0172565c9e0f18d41e49b70d7d75fced6§3370cb3615b3368be97c0f39b86f5dc2f9fa3650 c4e7446e2a98f1bf28da51fc57bb42b532222942§Tue May 10 12:47:08 2011 +0200§christian@gitorious.org§§Merge branch 'merge-requests/2230'§
+c4e7446e2a98f1bf28da51fc57bb42b532222942§c3e1d675667939e64ced1bb5b541c9042a1d60f8§Tue May 10 12:41:19 2011 +0200§christian@gitorious.org§§Merge commit 'refs/merge-requests/2230' of gitorious.org:gitorious/mainline into merge-requests/2230§
+      GIT
+
+      @log_parser = Capillary::LogParser.new
+      log.split("\n").each { |l| @log_parser << l }
+    end
+
+    should "have three branches" do
+      assert_equal 3, branches.length
+    end
+
+    should "have two commits in first branch" do
+      assert_equal %w[1f2b8a4 ca2d07e], commits_for_branch(0)
+    end
+
+    should "have one commit in second branch" do
+      assert_equal %w[1f2b8a4], commits_for_branch(1)
+    end
+
+    should "have two commits in third branch" do
+      assert_equal %w[ca2d07e c4e7446], commits_for_branch(2)
+    end
+  end
+
+  # 0--
+  # |  \
+  # 0   |
+  # |\  |
+  # | 0 |
+  # | | 0
+  # |/  |
+  # 0   |
+  # |\  |
+  # | 0 |
+  # | | |
+  context "Three dangling branches with closed branch" do
+    setup do
+      log = <<-GIT
+0000000000000000000000000000000000000000§1111111111111111111111111111111111111111 3333333333333333333333333333333333333333§Tue May 10 13:00:00 2011 +0200§christian@gitorious.org§§Message§
+1111111111111111111111111111111111111111§4444444444444444444444444444444444444444 2222222222222222222222222222222222222222§Tue May 10 12:00:00 2011 +0200§christian@gitorious.org§§Message§
+2222222222222222222222222222222222222222§4444444444444444444444444444444444444444§Tue May 10 11:00:00 2011 +0200§christian@gitorious.org§§Message§
+3333333333333333333333333333333333333333§6666666666666666666666666666666666666666§Tue May 10 10:00:00 2011 +0200§christian@gitorious.org§§Message§
+4444444444444444444444444444444444444444§7777777777777777777777777777777777777777 5555555555555555555555555555555555555555§Tue May 10 09:00:00 2011 +0200§christian@gitorious.org§§Message§
+5555555555555555555555555555555555555555§8888888888888888888888888888888888888888§Tue May 10 08:00:00 2011 +0200§christian@gitorious.org§§Message§
+      GIT
+
+      @log_parser = Capillary::LogParser.new
+      log.split("\n").each { |l| @log_parser << l }
+    end
+
+    should "have four branches" do
+      assert_equal 4, branches.length
+    end
+
+    should "have three commits in first branch" do
+      assert_equal %w[0000000 1111111 4444444], commits_for_branch(0)
+    end
+
+    should "two commits in second branch" do
+      assert_equal %w[0000000 3333333], commits_for_branch(1)
+    end
+
+    should "have three commits in third branch" do
+      assert_equal %w[1111111 2222222 4444444], commits_for_branch(2)
+    end
+
+    should "have two commits in fourth branch" do
+      assert_equal %w[4444444 5555555], commits_for_branch(3)
+    end
+  end
+
+  # 0
+  # |\
+  # | 0
+  # | |\
+  # | | 0
+  # |/  |
+  # 0   |
+  # |\  |
+  # | 0 |
+  # | | |
+  # | 0 |
+  # | | |
+  # | 0-|
+  # | | |\
+  # | | | 0
+  # |/  | |
+  # 0   | |
+  # |\  | |
+  # | 0 | |
+  # | | | |
+  context "Four dangling branches" do
+    setup do
+      load_fixture("4x_dangling_branches.txt")
+    end
+
+    should "have seven branches" do
+      assert_equal 6, branches.length
+    end
+
+    should "have 3 commits in the first branch" do
+      assert_equal %w[44c5c1d 1f2b8a4 ca2d07e], commits_for_branch(0)
+    end
+
+    should "have 3 commits in the second branch" do
+      assert_equal %w[44c5c1d e81d019 1f2b8a4], commits_for_branch(1)
+    end
+
+    should "have 2 commits in the third branch" do
+      assert_equal %w[e81d019 bbbd502], commits_for_branch(2)
+    end
+
+    should "have 5 commits in the fourth branch" do
+      assert_equal %w[1f2b8a4 275932a 7487183 a2f271b ca2d07e], commits_for_branch(3)
+    end
+
+    should "have 2 commits in the fifth branch" do
+      assert_equal %w[a2f271b 3ec0ec6], commits_for_branch(4)
+    end
+
+    should "have 2 commits in the sixth branch" do
+      assert_equal %w[ca2d07e c4e7446], commits_for_branch(5)
+    end
+  end
+
   context "Streaming parser" do
     setup do
       @lines = fixture("complex_graph_no_ff.txt").split("\n")

data/test/fixtures/4x_dangling_branches.txt

@@ -0,0 +1,18 @@
+*   44c5c1d3726701942e684f1197c8f0d23c132e3e§1f2b8a4e3f61ffedf9908e28b280de8c6bf38a16 e81d019a466d135ea37dba95284af15bb0e12ed0§Tue May 10 13:51:23 2011 +0200§christian@gitorious.org§§Merge branch 'merge-requests/2222'§
+|\  
+| *   e81d019a466d135ea37dba95284af15bb0e12ed0§1f2b8a4e3f61ffedf9908e28b280de8c6bf38a16 bbbd50287162c64401d610d26634767c8b6fbba2§Tue May 10 13:38:18 2011 +0200§christian@gitorious.org§§Merge commit 'refs/merge-requests/2222' of gitorious.org:gitorious/mainline into merge-requests/2222§
+| |\  
+|/ /  
+| * bbbd50287162c64401d610d26634767c8b6fbba2§a28894f12d2dbb28b7e1ba9ed7b751200b4758e8§Thu Dec 16 13:28:23 2010 +0100§pkj@axis.com§§Allow raw blobs to be retrieved using a blob SHA-1§
+* |   1f2b8a4e3f61ffedf9908e28b280de8c6bf38a16§ca2d07e0172565c9e0f18d41e49b70d7d75fced6 275932ab0995a11fcebeb0af7f19a7b8df5dea3f§Tue May 10 13:04:10 2011 +0200§christian@gitorious.org§§Merge branch 'merge-requests/147'§
+|\ \  
+| * | 275932ab0995a11fcebeb0af7f19a7b8df5dea3f§74871838e08fc666e9006cae35cdc67a5dcea258§Tue May 10 13:03:58 2011 +0200§christian@gitorious.org§§Add test for redirect from openid creation to dashboard§
+| * | 74871838e08fc666e9006cae35cdc67a5dcea258§a2f271b1aa55e52ba848779c62a6fa02cbc5ea0c§Tue May 10 13:01:00 2011 +0200§christian@gitorious.org§§Formatting§
+| * |   a2f271b1aa55e52ba848779c62a6fa02cbc5ea0c§ca2d07e0172565c9e0f18d41e49b70d7d75fced6 3ec0ec68ac9ae2db3f222dfe1842cd2c6812cf97§Tue May 10 12:50:35 2011 +0200§christian@gitorious.org§§Merge commit 'refs/merge-requests/147' of gitorious.org:gitorious/mainline into merge-requests/147§
+| |\ \  
+|/ / /  
+| * | 3ec0ec68ac9ae2db3f222dfe1842cd2c6812cf97§0685c52dd27dba8eaa6ec6f6bfacf014d37a6a1b§Tue Apr 12 10:04:20 2011 +1000§openid@obfusc8.org§§Bug: Do not redirect_back_or_default on new OpenID§
+* | |   ca2d07e0172565c9e0f18d41e49b70d7d75fced6§3370cb3615b3368be97c0f39b86f5dc2f9fa3650 c4e7446e2a98f1bf28da51fc57bb42b532222942§Tue May 10 12:47:08 2011 +0200§christian@gitorious.org§§Merge branch 'merge-requests/2230'§
+|\ \ \  
+| * \ \   c4e7446e2a98f1bf28da51fc57bb42b532222942§c3e1d675667939e64ced1bb5b541c9042a1d60f8 c1e52fba9e7c88f1146bb6df1f8b58dff006f45e§Tue May 10 12:41:19 2011 +0200§christian@gitorious.org§§Merge commit 'refs/merge-requests/2230' of gitorious.org:gitorious/mainline into merge-requests/2230§
+| |\ \ \  

data/test/fixtures/double_fork.txt

@@ -0,0 +1,20 @@
+0f5480086cb66c10759334aa4f2bb803a074dc99§5bdf304b3fb6ecddf89c855c7509c0e6bb2fd7fc§Mon Jul 11 13:44:29 2011 +0200§christian@gitorious.org§ (HEAD, master)§Readme noise§
+5bdf304b3fb6ecddf89c855c7509c0e6bb2fd7fc§2477a17e05dedcc101bddd94d836a892a3b330c1§Fri May 27 14:23:48 2011 +0200§christian@gitorious.org§ (zero, whateverss, whatever, topic, retsamz, retsamFsdfks, retsamFsdfkj, retsamFsdfk, retsamF, retsam, ohfuck, noness, nones, none, newbie, mutt-baby2, mutt-baby, fuckyeah22131, fuckyeah2213, fuckyeah22, fuckyeah2, chomba5, authfuckup9, authfuckup8, authfuckup7, authfuckup6, authfuckup5, authfuckup4, authfuckup3, authfuckup2, authfuckup10, authfuckup, 00000)§Updated acts as taggable has renamed the tag class§
+2477a17e05dedcc101bddd94d836a892a3b330c1§ea4d6ce31bff83a64f6c0f76def8f9431cc344ed 13c727b96b4040bc7932d1fbb8bc7d91497a6cc7§Fri May 27 10:45:35 2011 +0200§christian@gitorious.org§§Resolve merge conflict§
+13c727b96b4040bc7932d1fbb8bc7d91497a6cc7§bd73540d175c48ab48311d88d52c63493faa33bd§Tue May 24 15:53:33 2011 +0200§marius@gitorious.org§§Prevent Messages#index from choking on senders being removed.§
+bd73540d175c48ab48311d88d52c63493faa33bd§6fb3997a0385b015147f2d4a92caf78ccd22421e§Mon May 23 16:13:59 2011 +0200§marius@gitorious.org§§Revert "Fix a bug in Grit that causes rev_list to show commits in the wrong order."§
+6fb3997a0385b015147f2d4a92caf78ccd22421e§9266f54dd9669eae5c18d24ec2edc5262d7e4896§Mon May 23 16:10:49 2011 +0200§marius@gitorious.org§§Fix a bug in Grit that causes rev_list to show commits in the wrong order.§
+9266f54dd9669eae5c18d24ec2edc5262d7e4896§a5f9deb5cdc87e1e350a0e8a20b24b416bde1d3b§Thu May 19 15:33:23 2011 +0200§marius@gitorious.org§§Taking a stab at making a solr adapter for Gitorious::Search§
+a5f9deb5cdc87e1e350a0e8a20b24b416bde1d3b§1551dfe855f6351c6d8376ea857a307c239e6c2c§Wed May 18 15:56:28 2011 +0200§marius@gitorious.org§§Moving search components into separate files/modules§
+1551dfe855f6351c6d8376ea857a307c239e6c2c§16d2ac1cd6bedb231a4c0c85d313c8ffaac4debf§Wed May 18 15:04:28 2011 +0200§marius@gitorious.org§§Wrapped the various calls to the Sphinx wrapper§
+16d2ac1cd6bedb231a4c0c85d313c8ffaac4debf§1e69972be452c595987e832e7b974647f58a9258§Wed May 18 09:14:02 2011 +0200§marius@gitorious.org§§Models that should be searchable should include Gitorious::Search§
+1e69972be452c595987e832e7b974647f58a9258§fdc39f6f7af5961b1ca592dfbc5dff28dfe71d69§Mon May 16 17:27:17 2011 +0200§marius@gitorious.org§§Adding a wrapper around Ultrasphinx: Gitorious::Search§
+ea4d6ce31bff83a64f6c0f76def8f9431cc344ed§fdc39f6f7af5961b1ca592dfbc5dff28dfe71d69 74510fd077bb0dd686fff77c239218c17bf00073§Mon May 16 08:22:19 2011 +0200§christian@gitorious.org§§Merge branch 'merge-requests/153'§
+74510fd077bb0dd686fff77c239218c17bf00073§09b24865534f8e29d6cd1b0012852806b384a32f§Sun May 15 19:48:48 2011 -0300§rr.rosas@gmail.com§§Remove deprecation warnings from Paperclip usage§
+09b24865534f8e29d6cd1b0012852806b384a32f§4f0eaf7a3e98a446574a6418dbb91c86fd74ae62§Sun May 15 19:48:08 2011 -0300§rr.rosas@gmail.com§§refactoring: remove vendored paperclip plugin as it was already in Gemfile§
+4f0eaf7a3e98a446574a6418dbb91c86fd74ae62§fe57cfc4018635299f99bdf4fdd1976a2f7af40e§Sat May 14 11:13:41 2011 -0300§rr.rosas@gmail.com§§refactoring: Replaces vendored will_paginate plugin with its gem§
+fe57cfc4018635299f99bdf4fdd1976a2f7af40e§cbdfa124bef64a45bfc0b4b2ba928ad2b9bf4030§Sat May 14 11:01:34 2011 -0300§rr.rosas@gmail.com§§refactoring: Replaces vendored ssl_requirement plugin with its gem§
+cbdfa124bef64a45bfc0b4b2ba928ad2b9bf4030§81febec6cea77d5304f3b9efaf7bc7f53fda850a§Sat May 14 10:40:36 2011 -0300§rr.rosas@gmail.com§§refactoring: Replaces vendored exception_notifier plugin its gem§
+81febec6cea77d5304f3b9efaf7bc7f53fda850a§fdc39f6f7af5961b1ca592dfbc5dff28dfe71d69§Sat May 14 09:45:00 2011 -0300§rr.rosas@gmail.com§§refactoring: Replaces vendored acts_as_taggable_on_steroids plugin with acts-as-taggable-on gem§
+fdc39f6f7af5961b1ca592dfbc5dff28dfe71d69§9002b5b37bb5a56decb16bcf8b9079988669ac27§Thu May 12 22:08:09 2011 -0300§rr.rosas@gmail.com§§Remove deprecation warnings from Shoulda§
+9002b5b37bb5a56decb16bcf8b9079988669ac27§5866405b13eee4a558c16b2e6feacf53982ff2f1§Thu May 12 21:57:23 2011 -0300§rr.rosas@gmail.com§§Fix indenting in unit/repository_test.rb§

data/test/fixtures/log_graph.txt

@@ -0,0 +1,11 @@
+* 0f5480086cb66c10759334aa4f2bb803a074dc99§5bdf304b3fb6ecddf89c855c7509c0e6bb2fd7fc§Mon Jul 11 13:44:29 2011 +0200§christian@gitorious.org§ (HEAD, master)§Readme noise§
+* 5bdf304b3fb6ecddf89c855c7509c0e6bb2fd7fc§2477a17e05dedcc101bddd94d836a892a3b330c1§Fri May 27 14:23:48 2011 +0200§christian@gitorious.org§ (zero, topic, retsamz, newbie, mutt-baby2, mutt-baby, chomba5)§Updated acts as taggable has renamed the tag class§
+*   2477a17e05dedcc101bddd94d836a892a3b330c1§ea4d6ce31bff83a64f6c0f76def8f9431cc344ed 13c727b96b4040bc7932d1fbb8bc7d91497a6cc7§Fri May 27 10:45:35 2011 +0200§christian@gitorious.org§§Resolve merge conflict§
+|\
+| * 13c727b96b4040bc7932d1fbb8bc7d91497a6cc7§bd73540d175c48ab48311d88d52c63493faa33bd§Tue May 24 15:53:33 2011 +0200§marius@gitorious.org§§Prevent Messages#index from choking on senders being removed.§
+| * bd73540d175c48ab48311d88d52c63493faa33bd§6fb3997a0385b015147f2d4a92caf78ccd22421e§Mon May 23 16:13:59 2011 +0200§marius@gitorious.org§§Revert "Fix a bug in Grit that causes rev_list to show commits in the wrong order."§
+| * 6fb3997a0385b015147f2d4a92caf78ccd22421e§9266f54dd9669eae5c18d24ec2edc5262d7e4896§Mon May 23 16:10:49 2011 +0200§marius@gitorious.org§§Fix a bug in Grit that causes rev_list to show commits in the wrong order.§
+| * 9266f54dd9669eae5c18d24ec2edc5262d7e4896§a5f9deb5cdc87e1e350a0e8a20b24b416bde1d3b§Thu May 19 15:33:23 2011 +0200§marius@gitorious.org§§Taking a stab at making a solr adapter for Gitorious::Search§
+| * a5f9deb5cdc87e1e350a0e8a20b24b416bde1d3b§1551dfe855f6351c6d8376ea857a307c239e6c2c§Wed May 18 15:56:28 2011 +0200§marius@gitorious.org§§Moving search components into separate files/modules§
+| * 1551dfe855f6351c6d8376ea857a307c239e6c2c§16d2ac1cd6bedb231a4c0c85d313c8ffaac4debf§Wed May 18 15:04:28 2011 +0200§marius@gitorious.org§§Wrapped the various calls to the Sphinx wrapper§
+| * 16d2ac1cd6bedb231a4c0c85d313c8ffaac4debf§1e69972be452c595987e832e7b974647f58a9258§Wed May 18 09:14:02 2011 +0200§marius@gitorious.org§§Models that should be searchable should include Gitorious::Search§

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capillary
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Marius Mathiesen
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 +02:00
+date: 2011-08-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,9 +89,12 @@ files:
 - lib/capillary/version.rb
 - test/capillary/commit_test.rb
 - test/capillary/log_parser_test.rb
+- test/fixtures/4x_dangling_branches.txt
 - test/fixtures/complex_graph.txt
 - test/fixtures/complex_graph_no_ff.txt
+- test/fixtures/double_fork.txt
 - test/fixtures/first_commit.txt
+- test/fixtures/log_graph.txt
 - test/fixtures/parent_commit.txt
 - test/fixtures/simple_graph_no_ff.txt
 - test/fixtures/third_commit.txt