@@ -45,8 +45,12 @@ module SourceControl Git::LogParser.new.parse(git_output).first end - def update(revision) - git("reset", ["--hard", revision.number]) + def update(revision = nil) + if revision + git("reset", ["--hard", revision.number]) + else + git("reset", ["--hard"]) + end end def up_to_date?(reasons = []) lib/source_control/git.rb @@ -35,9 +35,13 @@ module SourceControl Mercurial::LogParser.new.parse(hg_output).first end - def update(revision) + def update(revision = nil) pull_new_changesets - hg("update", ['-r', revision.number]) + if revision + hg("update", ['-r', revision.number]) + else + hg("update") + end end def up_to_date?(reasons = []) lib/source_control/mercurial.rb @@ -23,6 +23,14 @@ class SourceControl::GitTest < Test::Unit::TestCase end end + def test_update_with_no_revision + in_sandbox do + git = new_git + git.expects(:git).with("reset", ["--hard"]) + git.update + end + end + def test_up_to_date?_should_return_false_if_there_are_new_revisions in_sandbox do git = new_git test/unit/source_control/git_test.rb @@ -30,6 +30,23 @@ module SourceControl end end + def test_update + in_sandbox do + stub_revision = stub('revision', :number => '12345') + @mercurial.expects(:hg).with('pull') + @mercurial.expects(:hg).with('update', ['-r', '12345']) + assert_nothing_raised { @mercurial.update(stub_revision) } + end + end + + def test_update_with_no_revision_specified + in_sandbox do + @mercurial.expects(:hg).with('pull') + @mercurial.expects(:hg).with('update') + assert_nothing_raised { @mercurial.update } + end + end + # TODO tests for other public methods of this class end test/unit/source_control/mercurial_test.rb 916f9060d2ee2ef8a753aafda16baf306dd33fd7 Alexey Verkhovsky alexey.verkhovsky@gmail.com http://github.com/willbryant/cruisecontrolrb/commit/363b8ba5496777da8f60c7223a28115a68b9e345 363b8ba5496777da8f60c7223a28115a68b9e345 2008-06-05T10:24:31-07:00 2008-06-05T10:24:31-07:00 update() without revision for Git and Mercurial (used by Project to recover from a failure after reloading cruise_config.rb) 9c29c45f1317f51f92ba4a1c52d4fa7e5716b1bd Alexey Verkhovsky alexey.verkhovsky@gmail.com