commits.rb in ohloh_scm-2.2.0

- old
+ new

@@ -6,17 +6,15 @@
 			commit_tokens(opts).size
 		end
 
 		# Return the list of commit tokens following +after+.
 		def commit_tokens(opts={})
-			after = opts[:after] || 0
-			up_to = opts[:up_to] || 'tip'
-
+      hg_log_with_opts, after = hg_command_builder(opts)
 			# We reverse the final result in Ruby, rather than passing the --reverse flag to hg.
 			# That's because the -f (follow) flag doesn't behave the same in both directions.
 			# Basically, we're trying very hard to make this act just like Git. The hg_rev_list_test checks this.
-			tokens = run("cd '#{self.url}' && hg log -f #{trunk_only(opts)} -r #{up_to || 'tip'}:#{after || 0} --template='{node}\\n'").split("\n").reverse
+			tokens = run("cd '#{self.url}' && #{ hg_log_with_opts } --template='{node}\\n'").split("\n").reverse
 
 			# Hg returns everything after *and including* after.
 			# We want to exclude it.
 			if tokens.any? && tokens.first == after
 				tokens[1..-1]
@@ -28,13 +26,13 @@
 		# Returns a list of shallow commits (i.e., the diffs are not populated).
 		# Not including the diffs is meant to be a memory savings when we encounter massive repositories.
 		# If you need all commits including diffs, you should use the each_commit() iterator, which only holds one commit
 		# in memory at a time.
 		def commits(opts={})
-			after = opts[:after] || 0
+      hg_log_with_opts, after = hg_command_builder(opts)
 
-			log = run("cd '#{self.url}' && hg log -f #{trunk_only(opts)} -v -r tip:#{after} --style #{OhlohScm::Parsers::HgStyledParser.style_path}")
+			log = run("cd '#{self.url}' && #{ hg_log_with_opts } --style #{OhlohScm::Parsers::HgStyledParser.style_path}")
 			a = OhlohScm::Parsers::HgStyledParser.parse(log).reverse
 
 			if a.any? && a.first.token == after
 				a[1..-1]
 			else
@@ -53,34 +51,35 @@
 		# This is designed to prevent excessive RAM usage when we encounter a massive repository.
 		# Only a single commit is ever held in memory at once.
 		def each_commit(opts={})
 			after = opts[:after] || 0
 			open_log_file(opts) do |io|
-				OhlohScm::Parsers::HgStyledParser.parse(io) do |commit|
+        commits = OhlohScm::Parsers::HgStyledParser.parse(io)
+        commits.reverse.each do |commit|
 					yield commit if block_given? && commit.token != after
 				end
 			end
 		end
 
 		# Not used by Ohloh proper, but handy for debugging and testing
 		def log(opts={})
-			after = opts[:after] || 0
-			run "cd '#{url}' && hg log -f #{trunk_only(opts)} -v -r tip:#{after} | #{ string_encoder }"
+      hg_log_with_opts = hg_command_builder(opts)
+			run "cd '#{url}' && #{ hg_log_with_opts } | #{ string_encoder }"
 		end
 
 		# Returns a file handle to the log.
 		# In our standard, the log should include everything AFTER +after+. However, hg doesn't work that way;
 		# it returns everything after and INCLUDING +after+. Therefore, consumers of this file should check for
 		# and reject the duplicate commit.
 		def open_log_file(opts={})
-			after = opts[:after] || 0
+      hg_log_with_opts, after = hg_command_builder(opts)
 			begin
 				if after == head_token # There are no new commits
 					# As a time optimization, just create an empty file rather than fetch a log we know will be empty.
 					File.open(log_filename, 'w') { }
 				else
-					run "cd '#{url}' && hg log --verbose #{trunk_only(opts)} -r #{after || 0}:tip --style #{OhlohScm::Parsers::HgStyledParser.verbose_style_path} | #{ string_encoder } > #{log_filename}"
+					run "cd '#{url}' && #{ hg_log_with_opts } --style #{OhlohScm::Parsers::HgStyledParser.verbose_style_path} | #{ string_encoder } > #{log_filename}"
 				end
 				File.open(log_filename, 'r') { |io| yield io }
 			ensure
 				File.delete(log_filename) if FileTest.exist?(log_filename)
 			end
@@ -88,15 +87,22 @@
 
 		def log_filename
 		  File.join('/tmp', (self.url).gsub(/\W/,'') + '.log')
 		end
 
-		def trunk_only(opts={})
-			if opts[:trunk_only]
-				'--follow-first'
-			else
-				''
-			end
-		end
+    private
 
+    def hg_command_builder(opts)
+      after = opts[:after] || 0
+      up_to = opts[:up_to] || :tip
+
+      options = if opts[:trunk_only]
+        "--follow-first -r #{ up_to }:#{ after }"
+      else
+        query = "and (branch(#{ branch_name }) or ancestors(#{ branch_name }))" if branch_name && branch_name != 'default'
+        "-r '#{ up_to }:#{ after } #{ query }'"
+      end
+
+      ["hg log -f -v #{ options }", after]
+    end
 	end
 end