[CHANGE] No need for separate a separate commit walk() method. Merge it into the existing commit_tokens().

Author: Robin Luckey

lib/scm/adapters/git/commits.rb

@@ -7,8 +7,8 @@ def commit_count(since=nil)
 		end
 
 		# Returns the SHA1 hash for every commit in the repository following the commit with SHA1 'since'.
-		def commit_tokens(since=nil)
-			run(rev_list_command(since)).split("\n")
+		def commit_tokens(since=nil, up_to=branch_name)
+			run(rev_list_command(since, up_to)).split("\n")
 		end
 
 		# Yields each commit following the commit with SHA1 'since'.
@@ -47,16 +47,9 @@ def log(since=nil)
 			end
 		end
 
-
-		def rev_list_command(since=nil)
-			rev_list_options = "--root --reverse --topo-order"
-
-			if since
-				"cd '#{self.url}' && git rev-list #{rev_list_options} #{since}..HEAD #{self.branch_name}"
-			else
-				"cd '#{self.url}' && git rev-list #{rev_list_options} #{self.branch_name}"
-			end
+		def rev_list_command(since=nil, up_to=branch_name)
+			range = since ? "#{since}..#{up_to}" : up_to
+			"cd '#{url}' && git rev-list --topo-order --reverse #{range}"
 		end
-
 	end
 end

lib/scm/adapters/git/head.rb

@@ -17,15 +17,5 @@ def parent_tokens(commit)
 		def parents(commit)
 			parent_tokens(commit).collect { |token| verbose_commit(token) }
 		end
-
-		# This method returns the list of commits you must fetch if you are
-		# current as of old_head, and wish to be current up to new_head.
-		def walk(old_head=nil, new_head=head_token)
-			if old_head
-				run("cd #{url} && git rev-list --reverse #{old_head.to_s}..#{new_head.to_s}").split("\n")
-			else
-				run("cd #{url} && git rev-list --reverse #{new_head.to_s}").split("\n")
-			end
-		end
 	end
 end

test/unit/commit_walk_test.rb

@@ -0,0 +1,66 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+module Scm::Adapters
+	# Repository graph.git has the following structure:
+	#
+	#      G -> H -> I -> J -> development
+	#     /      \    \
+	#    A -> B -> C -> D -> master
+	#
+	class GitRevListTest < Scm::Test
+
+		def test_rev_list
+			with_git_repository('git_walk') do |git|
+				# Full history to a commit
+				assert_equal [:A],                         rev_list_helper(git, nil, :A)
+				assert_equal [:A, :B],                     rev_list_helper(git, nil, :B)
+				assert_equal [:A, :B, :G, :H, :C],         rev_list_helper(git, nil, :C)
+				assert_equal [:A, :B, :G, :H, :C, :I, :D], rev_list_helper(git, nil, :D)
+				assert_equal [:A, :G],                     rev_list_helper(git, nil, :G)
+				assert_equal [:A, :G, :H],                 rev_list_helper(git, nil, :H)
+				assert_equal [:A, :G, :H, :I],             rev_list_helper(git, nil, :I)
+				assert_equal [:A, :G, :H, :I, :J],         rev_list_helper(git, nil, :J)
+
+				# Limited history from one commit to another
+				assert_equal [],                           rev_list_helper(git, :A, :A)
+				assert_equal [:B],                         rev_list_helper(git, :A, :B)
+				assert_equal [:B, :G, :H, :C],             rev_list_helper(git, :A, :C)
+				assert_equal [:B, :G, :H, :C, :I, :D],     rev_list_helper(git, :A, :D)
+				assert_equal [:G, :H, :C, :I, :D],         rev_list_helper(git, :B, :D)
+				assert_equal [:I, :D],                     rev_list_helper(git, :C, :D)
+				assert_equal [:H, :I, :J],                 rev_list_helper(git, :G, :J)
+			end
+		end
+
+		protected
+
+		def rev_list_helper(git, from, to)
+			to_labels(git.commit_tokens(from_label(from), from_label(to)))
+		end
+
+		def commit_labels
+			{ '886b62459ef1ffd01a908979d4d56776e0c5ecb2' => :A,
+				'db77c232f01f7a649dd3a2216199a29cf98389b7' => :B,
+				'f264fb40c340a415b305ac1f0b8f12502aa2788f' => :C,
+				'57fedf267adc31b1403f700cc568fe4ca7975a6b' => :D,
+				'97b80cb9743948cf302b6e21571ff40721a04c8d' => :G,
+				'b8291f0e89567de3f691afc9b87a5f1908a6f3ea' => :H,
+				'd067161caae2eeedbd74976aeff5c4d8f1ccc946' => :I,
+				'b49aeaec003cf8afb18152cd9e292816776eecd6' => :J
+			}
+		end
+
+		def to_label(sha1)
+			commit_labels[sha1.to_s]
+		end
+
+		def to_labels(sha1s)
+			sha1s.collect { |sha1| to_label(sha1) }
+		end
+
+		def from_label(l)
+			commit_labels.each_pair { |k,v| return k if v.to_s == l.to_s }
+			nil
+		end
+	end
+end