@@ -54,3 +54,17 @@ Feature: Import remote repository into a Git repository Then I should see a successful import message from Piston And I should find a vendor/libcalc folder And I should find a vendor/libcalc/libcalc.rb file + + Scenario: Import from a branch + Given a newly created Git project + And a remote Git project named rails + And a file named rails.rb with content "a\n" in remote rails project + And a branch on the rails project named "2-3-stable" + And a file named 2-3-README with content "Rails 2.3\n" in remote rails project + When I import the "2-3-stable" branch of rails + Then I should see "2-3-stable" + And I should see a successful import message from Piston + And I should find a rails folder + And I should find a rails/rails.rb file + And I should find a rails/2-3-README file + And I should find a rails/.piston.yml file features/import_to_git.feature @@ -211,3 +211,25 @@ Then /^I should see a successful update message from Piston$/ do @stdout.should =~ /Updated .*\/libcalc to revision \d+/ end end + +Given /^a branch on the ([^ ]+) project named "([^\"]*)"$/ do |project, branch| + Dir.chdir(@remotewcdir) do + if (@remotewcdir + ".git").directory? then + git :checkout, "-b", branch + @stdout = git :branch + @stdout.should =~ /^\*\s+#{branch}/ + else + pending + end + end +end + +When /^I import the "([^\"]+)" branch of ([^ ]+)(?: into ([\w\/]+))?$/ do |branch, project, into| + Dir.chdir(@wcdir) do + cmd = "#{Tmpdir.piston} import --verbose 5 --commit #{branch} file://#{@remotereposdir} 2>&1" + cmd << " #{into}" if into + STDERR.puts cmd.inspect if $DEBUG + @stdout = `#{cmd}` + STDERR.puts @stdout if $DEBUG + end +end features/step_definitions/repository.rb @@ -14,6 +14,7 @@ module Piston def initialize(repository, revision, recalled_values={}) super @revision = 'master' if @revision.upcase == 'HEAD' + @revision = "origin/#{@revision}" unless @revision.include?("/") end def client lib/piston/git/commit.rb 508fb8092ff684db62b19120dee49bd9cbca0447 François Beausoleil francois@teksol.info http://github.com/francois/piston/commit/f11983eb62bbc119329e18e6f51ffefdff149051 f11983eb62bbc119329e18e6f51ffefdff149051 2009-07-20T07:50:38-07:00 2009-07-20T07:17:49-07:00 When checking out a branch from Git, specify the remote so we work with more version of Git. http://groups.google.com/group/piston-discussion/browse_thread/thread/57560bd1963a9c48 f4984617f33b6d5a4f46bec6223467a8f294aa2b François Beausoleil francois@teksol.info