Fix for hg v4 api changes

Since hg(v4) -f returns entire log. The original intent of using this
flag was to limit log to current branch. This is now achieved by
introducing `branch_name_or_default`.

Since hg(v4) --follow-parent does not play well with `-r N:n`.

Author: notalex

lib/ohloh_scm/adapters/hg/commits.rb

@@ -14,6 +14,10 @@ def commit_tokens(opts={})
 			# 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_with_opts } --template='{node}\\n'").split("\n").reverse
 
+      # Since hg v4, --follow-first does not play well with -r N:n. Using them together always returns all commits.
+      # To find trunk commits since a given revision, we get all trunk commits and drop older commits before given revision.
+      tokens = tokens.drop(tokens.index(after)) if tokens.any? && after && after != 0
+
 			# Hg returns everything after *and including* after.
 			# We want to exclude it.
 			if tokens.any? && tokens.first == after
@@ -96,13 +100,13 @@ def hg_command_builder(opts)
       up_to = opts[:up_to] || :tip
 
       options = if opts[:trunk_only]
-        "--follow-first -r #{ up_to }:#{ after }"
+        '--follow-first'
       else
-        query = "and (branch(#{ branch_name }) or ancestors(#{ branch_name }))" if branch_name && branch_name != 'default'
+        query = "and (branch(#{ branch_name_or_default }) or ancestors(#{ branch_name_or_default }))"
         "-r '#{ up_to }:#{ after } #{ query }'"
       end
 
-      ["hg log -f -v #{ options }", after]
+      ["hg log -v #{ options }", after]
     end
 	end
 end

lib/ohloh_scm/adapters/hg/head.rb

@@ -3,7 +3,7 @@ class HgAdapter < AbstractAdapter
 		def head_token
 			# This only returns first 12 characters.
 			# How can we make it return the entire hash?
-      branch_opts = "--rev #{branch_name || :default}"
+      branch_opts = "--rev #{branch_name_or_default}"
 			token = run("hg id --debug -i -q #{url} #{branch_opts}").strip
 
 			# Recent versions of Hg now somtimes append a '+' char to the token.

lib/ohloh_scm/adapters/hg/misc.rb

@@ -30,5 +30,11 @@ def tags
         [tag_name, rev, Time.parse(time_string)]
       end
     end
+
+    protected
+
+    def branch_name_or_default
+      branch_name || :default
+    end
 	end
 end

test/unit/hg_commits_test.rb

@@ -29,6 +29,12 @@ def test_commit_tokens
                       '75532c1e1f1de55c2271f6fd29d98efbe35397c4',
 											'655f04cf6ad708ab58c7b941672dce09dd369a18'], hg.commit_tokens
 
+        assert_equal ['b14fa4692f949940bd1e28da6fb4617de2615484',
+                      '468336c6671cbc58237a259d1b7326866afc2817',
+                      '75532c1e1f1de55c2271f6fd29d98efbe35397c4',
+                      '655f04cf6ad708ab58c7b941672dce09dd369a18'],
+          hg.commit_tokens(after: '01101d8ef3cea7da9ac6e9a226d645f4418f05c9')
+
 				assert_equal ['655f04cf6ad708ab58c7b941672dce09dd369a18'],
 					hg.commit_tokens(:after => '75532c1e1f1de55c2271f6fd29d98efbe35397c4')
 

test/unit/hg_rev_list_test.rb

@@ -16,9 +16,9 @@ def test_rev_list
 				assert_equal [:A, :B],                     rev_list_helper(hg, nil, :B)
 				assert_equal [:A, :B, :G, :H, :C],         rev_list_helper(hg, nil, :C)
 				assert_equal [:A, :B, :G, :H, :C, :I, :D], rev_list_helper(hg, nil, :D)
-				assert_equal [:A, :G],                     rev_list_helper(hg, nil, :G)
-				assert_equal [:A, :G, :H],                 rev_list_helper(hg, nil, :H)
-				assert_equal [:A, :G, :H, :I],             rev_list_helper(hg, nil, :I)
+				assert_equal [:A, :B, :G],                 rev_list_helper(hg, nil, :G)
+				assert_equal [:A, :B, :G, :H],             rev_list_helper(hg, nil, :H)
+				assert_equal [:A, :B, :G, :H, :C, :I],     rev_list_helper(hg, nil, :I)
 
 				# Limited history from one commit to another
 				assert_equal [],                           rev_list_helper(hg, :A, :A)