Contents

module Braid
  module Commands
    class Add < Command
      def run(remote, options = {})
        in_work_branch do
          mirror, params = config.add_from_options(remote, options)
          local_branch = get_local_branch_name(mirror, params)

          config.update(mirror, { "local_branch" => local_branch })
          params["local_branch"] = local_branch # TODO check

          msg "Adding #{params["type"]} mirror of '#{params["remote"]}'" + (params["type"] == "git" ? ", branch '#{params["branch"]}'" : "") + "."

          # these commands are explained in the subtree merge guide
          # http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html

          setup_remote(mirror)
          fetch_remote(params["type"], local_branch)

          validate_revision_option(params, options)
          target = determine_target_commit(params, options)

          msg "Merging code into '#{mirror}/'."

          unless params["squash"]
            invoke(:git_merge_ours, target)
          end
          invoke(:git_read_tree, target, mirror)

          config.update(mirror, { "revision" => options["revision"] })
          add_config_file

          revision_message = options["revision"] ? " at #{display_revision(params["type"], options["revision"])}" : ""
          commit_message = "Add mirror '#{mirror}/'#{revision_message}."
          invoke(:git_commit, commit_message)
        end
      end

      protected
        def setup_remote(mirror)
          Braid::Command.run(:setup, mirror)
        end

      private
        def get_local_branch_name(mirror, params)
          res = "braid/#{params["type"]}/#{mirror}"
          res << "/#{params["branch"]}" if params["type"] == "git"
          res.gsub!("_", '-') # stupid git svn changes all _ to ., weird
          res
        end
    end
  end
end

Version data entries

3 entries across 3 versions & 1 rubygems

Version	Path
evilchelu-braid-0.3.5	lib/braid/commands/add.rb
evilchelu-braid-0.3.6	lib/braid/commands/add.rb
evilchelu-braid-0.3.7	lib/braid/commands/add.rb