Commitdf3b07d

committed

feat: make Git::Log support the git log --merges option

1 parenta832259 commitdf3b07dCopy full SHA for df3b07d

File tree

+15

-3

lines changed

+15

-3

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,7 @@ def log_commits(opts = {})`
`294`	`294`	`# * 'tree' [String] the tree sha`
`295`	`295`	`# * 'author' [String] the author of the commit and timestamp of when the changes were created`
`296`	`296`	`# * 'committer' [String] the committer of the commit and timestamp of when the commit was applied`
	`297`	`+# * 'merges' [Boolean] if truthy, only include merge commits (aka commits with 2 or more parents)`
`297`	`298`	`#`
`298`	`299`	`# @raise [ArgumentError] if the revision range (specified with :between or :object) is a string starting with a hyphen`
`299`	`300`	`#`
`@@ -305,6 +306,7 @@ def full_log_commits(opts = {})`
`305`	`306`
`306`	`307`	`arr_opts <<'--pretty=raw'`
`307`	`308`	`arr_opts <<"--skip=#{opts[:skip]}"ifopts[:skip]`
	`309`	`+arr_opts <<'--merges'ifopts[:merges]`
`308`	`310`
`309`	`311`	`arr_opts +=log_path_options(opts)`
`310`	`312`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -133,11 +133,16 @@ def cherry`
`133`	`133`	`returnself`
`134`	`134`	`end`
`135`	`135`
	`136`	`+defmerges`
	`137`	`+dirty_log`
	`138`	`+@merges=true`
	`139`	`+returnself`
	`140`	`+end`
	`141`	`+`
`136`	`142`	`defto_s`
`137`	`143`	`self.map{ \|c\|c.to_s}.join("\n")`
`138`	`144`	`end`
`139`	`145`
`140`		`-`
`141`	`146`	`# forces git log to run`
`142`	`147`
`143`	`148`	`defsize`
`@@ -184,7 +189,7 @@ def run_log`
`184`	`189`	`log=@base.lib.full_log_commits(`
`185`	`190`	`count:@max_count,all:@all,object:@object,path_limiter:@path,since:@since,`
`186`	`191`	`author:@author,grep:@grep,skip:@skip,until:@until,between:@between,`
`187`		`-cherry:@cherry`
	`192`	`+cherry:@cherry,merges:@merges`
`188`	`193`	`)`
`189`	`194`	`@commits=log.map{ \|c\|Git::Object::Commit.new(@base,c['sha'],c)}`
`190`	`195`	`end`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ def append_file(name, contents)`
`131`	`131`	`#`
`132`	`132`	`# @return [void]`
`133`	`133`	`#`
`134`		`-defassert_command_line_eq(expected_command_line,method::command,mocked_output:nil,include_env:false)`
	`134`	`+defassert_command_line_eq(expected_command_line,method::command,mocked_output:'',include_env:false)`
`135`	`135`	`actual_command_line=nil`
`136`	`136`
`137`	`137`	`command_output=''`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -128,4 +128,9 @@ def test_log_cherry`
`128`	`128`	`l=@git.log.between('master','cherry').cherry`
`129`	`129`	`assert_equal(1,l.size)`
`130`	`130`	`end`
	`131`	`+`
	`132`	`+deftest_log_merges`
	`133`	`+expected_command_line=['log','--max-count=30','--no-color','--pretty=raw','--merges',{:chdir=>nil}]`
	`134`	`+assert_command_line_eq(expected_command_line){ \|git\|git.log.merges.size}`
	`135`	`+end`
`131`	`136`	`end`

Comments

(0)