@@ -15,7 +15,7 @@ class LogController < ApplicationController def index params[:path] ||= git.make_local_path(git.paths.first) - params[:limit] ||= DEFAULT_LOG_LIMIT + params[:limit] ||= git.config["git-tmbundle.log.limit"] || DEFAULT_LOG_LIMIT path = params[:path] # Get the desired revision number if File.directory?(git.git_base + path) Support/app/controllers/log_controller.rb @@ -1,10 +1,11 @@ -<h1>Config</h1> -<form> - <table> +<h1>Git Config</h1> +<p>Values are saved when the form-field loses focus.</p> +<form onsubmit="return false"> + <table class="listing"> <thead> <tr> - <th>Global Config</th> -<!-- <th>Local Config Config</th>--> + <th>Global</th> + <th>Local</th> </tr> </thead> <tbody> @@ -12,8 +13,16 @@ <td> Name: <%= content_tag :input, :type => "text", :value => git.config[:global, "user.name"], :onchange => "dispatch({controller: 'config', action: 'set', scope: 'global', key: 'user.name', value: $F(this)})" %><br/> Email: <%= content_tag :input, :type => "text", :value => git.config[:global, "user.email"], :onchange => "dispatch({controller: 'config', action: 'set', scope: 'global', key: 'user.email', value: $F(this)})" %><br/> + Log limit: <%= content_tag :input, :type => "text", :value => git.config[:global, "log.limit"] || LogController::DEFAULT_LOG_LIMIT, :onchange => "dispatch({controller: 'config', action: 'set', scope: 'global', key: 'log.limit', value: $F(this)})" %><br/> </td> </tr> + <tr> + <td> + Log limit: <%= content_tag :input, :type => "text", :value => git.config[:global, "git-tmbundle.log.limit"], :onchange => "dispatch({controller: 'config', action: 'set', scope: 'global', key: 'git-tmbundle.log.limit', value: $F(this)})" %><br/> + </td> + <td> + Log limit: <%= content_tag :input, :type => "text", :value => git.config[:local, "git-tmbundle.log.limit"], :onchange => "dispatch({controller: 'config', action: 'set', scope: 'local', key: 'git-tmbundle.log.limit', value: $F(this)})" %><br/> + </td> </tbody> </table> </form> \ No newline at end of file Support/app/views/config/index.html.erb @@ -8,7 +8,13 @@ class SCM::Git::Config < SCM::Git::CommandProxyBase def []=(*params) value = params.pop scope, key = process_keys(params) - base.command(*(["config"] + config_args(scope) + [key, value])) + args = ["config"] + config_args(scope) + if value + args += [key, value] + else + args += ["--unset", key] + end + base.command(*args) end protected Support/lib/commands/config.rb @@ -32,6 +32,10 @@ describe SCM::Git do Git.commands_ran.first.should == ["config", "--file", "/base/.git/config", "remote.origin.url", "../origin"] end + it "should delete local values when assigning nil" do + @git.config[:local, "git-tmbundle.log.limit"] = nil + Git.commands_ran.first.should == ["config", "--file", "/base/.git/config", "--unset", "git-tmbundle.log.limit"] + end it "should allow reading global values" do Git.command_response["config", "--global", "remote.origin.url"] = "../origin" Support/spec/lib/commands/config_spec.rb eee924fa15e7e73a53aebe93cc1dd9349ee5b919 92585e874fcf5f455bdf934be57ed63f25ebd849 Thomas Aylott oblivious+git@subtlegradient.com http://github.com/subtleGradient/git.tmbundle/commit/d412b01401cbcef3609fe89f2843f1eb44f86db0 d412b01401cbcef3609fe89f2843f1eb44f86db0 2008-04-12T09:15:25-07:00 2008-04-12T09:15:25-07:00 Merge branch 'release' of git://gitorious.org/git-tmbundle/mainline cc62bff28145402da346c999f4cad2469f3ba00b Thomas Aylott oblivious+git@subtlegradient.com