tapajos-braid 0.4.9.1

data/README.rdoc

@@ -0,0 +1,27 @@
+= braid
+A simple tool for tracking vendor branches in git.
+
+http://evil.che.lu/projects/braid/
+
+== Requirements
+
+You will need git 1.5.4.5 or higher to run this version.
+
+== Installation
+
+  git clone git://github.com/evilchelu/braid.git
+  cd braid
+  gem build braid.gemspec
+  sudo gem install braid-x.y.z.gem
+
+== Usage
+
+  braid help
+  braid help COMMANDNAME
+
+For more usage examples and documentation check the project wiki at http://github.com/evilchelu/braid/wikis.
+Also see the bug tracker at http://evilchelu.lighthouseapp.com/projects/10600-braid for current issues and future plans.
+
+== Contributing
+
+If you want to send a patch please fork the project on GitHub and send a pull request.

data/Rakefile

@@ -0,0 +1,13 @@
+require "date"
+require "fileutils"
+require "rubygems"
+require "rake/gempackagetask"
+require "lib/braid"
+
+Dir['tasks/**/*.rake'].each { |rake| load rake }
+
+task :test do
+  Dir[File.dirname(__FILE__) + '/test/**/*_spec.rb'].each do |file|
+    load file
+  end
+end

data/bin/braid

@@ -0,0 +1,223 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+require 'braid'
+
+require 'rubygems'
+require 'main'
+
+Home = File.expand_path(ENV['HOME'] || '~')
+
+# mostly blantantly stolen from ara's punch script
+# main kicks ass!
+Main {
+  description <<-TXT
+    braid is a simple tool to help track git or svn repositories inside a git repository.
+
+    Run 'braid help commandname' for more details.
+
+    All operations will be executed in the braid/track branch.
+    You can then merge back or cherry-pick changes.
+  TXT
+
+  mode(:add) {
+    description <<-TXT
+      Add a new mirror to be tracked.
+
+        * adds metadata about the mirror to .braids
+        * adds the git or git svn remotes to .git/config
+        * fetches and merges remote code into given directory
+
+      --type defaults:
+
+        * svn://path          # => svn
+        * git://path          # => git
+        * http://path/trunk   # => svn
+        * http://path.git     # => git
+
+      Name defaults:
+
+        * remote/path         # => path
+        * remote/path/trunk   # => path
+        * remote/path.git     # => path
+    TXT
+
+    examples <<-TXT
+      . braid add svn://remote/path
+      . braid add svn://remote/path local/dir
+      . braid add git://remote/path local/dir
+      . braid add http://remote/path.git local/dir
+      . braid add http://remote/path --type git local/dir
+      . braid add svn://remote/path --branch notmaster
+    TXT
+
+    mixin :argument_url, :option_type, :optional_path, :option_branch, :option_rails_plugin, :option_revision, :option_full
+
+    run {
+      Braid::Command.run(:add, url, { "type" => type, "path" => path, "branch" => branch, "rails_plugin" => rails_plugin, "revision" => revision, "full" => full })
+    }
+  }
+
+  mode(:update) {
+    description <<-TXT
+      Update a braid mirror.
+
+        * get new changes from remote
+        * always creates a merge commit
+        * updates metadata in .braids when revisions are changed
+
+      Defaults to updating all unlocked mirrors if none is specified.
+    TXT
+
+    examples <<-TXT
+      . braid update
+      . braid update local/dir
+    TXT
+
+    mixin :optional_path, :option_revision, :option_head, :option_break
+
+    run {
+      Braid::Command.run(:update, path, { "revision" => revision, "head" => head , "break" => break? })
+    }
+  }
+
+  mode(:remove) {
+    description <<-TXT
+      Remove a mirror.
+
+        * removes metadata from .braids
+        * removes the local directory and commits the removal
+        * does NOT remove the git and git svn remotes in case you still need them around
+    TXT
+
+    examples <<-TXT
+      . braid remove local/dir
+    TXT
+
+    mixin :argument_path
+
+    run {
+      Braid::Command.run(:remove, path)
+    }
+  }
+
+  mode(:setup) {
+    description <<-TXT
+      Set up git and git-svn remotes.
+    TXT
+
+    examples <<-TXT
+      . braid setup local/dir
+    TXT
+
+    mixin :optional_path
+
+    run {
+      Braid::Command.run(:setup, path)
+    }
+  }
+
+  mode(:diff) {
+    description <<-TXT
+      Show diff of local changes to mirror.
+    TXT
+
+    examples <<-TXT
+      . braid diff local/dir
+    TXT
+
+    mixin :argument_path
+
+    run {
+      Braid::Command.run(:diff, path)
+    }
+  }
+
+  mode(:version) {
+    description 'Show braid version.'
+
+    run {
+      puts "braid #{Braid::VERSION}"
+    }
+  }
+
+  mixin(:argument_path) {
+    argument(:path) {
+      attr
+    }
+  }
+
+  mixin(:optional_path) {
+    argument(:path) {
+      optional
+      attr
+    }
+  }
+
+  mixin(:argument_url) {
+    argument(:url) {
+      attr
+    }
+  }
+
+  mixin(:option_type) {
+    option(:type, :t) {
+      optional
+      argument :required
+      desc 'mirror type'
+      attr
+    }
+  }
+
+  mixin(:option_branch) {
+    option(:branch, :b) {
+      optional
+      argument :required
+      desc 'remote branch name'
+      attr
+    }
+  }
+
+  mixin(:option_rails_plugin) {
+    option(:rails_plugin, :p) {
+      optional
+      desc 'added mirror is a Rails plugin'
+      attr
+    }
+  }
+
+  mixin(:option_revision) {
+    option(:revision, :r) {
+      optional
+      argument :required
+      desc 'revision to track'
+      attr
+    }
+  }
+
+  mixin(:option_head) {
+    option(:head) {
+      optional
+      desc 'mirror head'
+      attr
+    }
+  }
+
+  mixin(:option_full) {
+    option(:full) {
+      optional
+      desc 'include mirror history' # FIXME
+      attr
+    }
+  }
+
+  mixin(:option_break) {
+    option(:break) {
+      optional
+      desc 'break on merge errors'
+      attr
+    }
+  }
+
+  run { help! }
+}

data/lib/braid.rb

@@ -0,0 +1,16 @@
+$:.unshift File.dirname(__FILE__)
+
+module Braid
+  CONFIG_FILE = ".braids"
+  REQUIRED_GIT_VERSION = "1.5.4.5"
+end
+
+require 'braid/version'
+require 'braid/error'
+require 'braid/operations'
+require 'braid/mirror'
+require 'braid/config'
+require 'braid/command'
+Dir[File.dirname(__FILE__) + '/braid/commands/*'].each do |file|
+  require file
+end

data/lib/braid/command.rb

@@ -0,0 +1,119 @@
+module Braid
+  class Command
+    class InvalidRevision < BraidError
+    end
+
+    extend Operations::VersionControl
+    include Operations::VersionControl
+
+    def self.run(command, *args)
+      verify_git_version!
+
+      klass = Commands.const_get(command.to_s.capitalize)
+      klass.new.run(*args)
+
+    rescue BraidError => error
+      case error
+      when Operations::ShellExecutionError
+        msg "Shell error: #{error.message}"
+      else
+        msg "Error: #{error.message}"
+      end
+      exit(1)
+    end
+
+    def self.msg(str)
+      puts str
+    end
+
+    def msg(str)
+      self.class.msg(str)
+    end
+
+    def config
+      @config ||= load_and_migrate_config
+    end
+
+    private
+      def self.verify_git_version!
+        git.require_version!(REQUIRED_GIT_VERSION)
+      end
+
+      def bail_on_local_changes!
+        git.ensure_clean!
+      end
+
+      def with_reset_on_error
+        work_head = git.head
+
+        begin
+          yield
+        rescue => error
+          msg "Resetting to '#{work_head[0, 7]}'."
+          git.reset_hard(work_head)
+          raise error
+        end
+      end
+
+      def load_and_migrate_config
+        config = Config.new
+        unless config.valid?
+          msg "Configuration is outdated. Migrating."
+          bail_on_local_changes!
+          config.migrate!
+          git.commit("Upgrade .braids", "-- .braids")
+        end
+        config
+      end
+
+      def add_config_file
+        git.add(CONFIG_FILE)
+      end
+
+      def display_revision(mirror, revision = nil)
+        revision ||= mirror.revision
+        mirror.type == "svn" ? "r#{revision}" : "'#{revision[0, 7]}'"
+      end
+
+      def validate_new_revision(mirror, new_revision)
+        unless new_revision
+          unless mirror.type == "svn"
+            return git.rev_parse(mirror.remote)
+          else
+            return svn.head_revision(mirror.url)
+          end
+        end
+
+        unless mirror.type == "svn"
+          new_revision = git.rev_parse(new_revision)
+        else
+          new_revision = svn.clean_revision(new_revision)
+        end
+        old_revision = mirror.revision
+
+        if new_revision == old_revision
+          raise InvalidRevision, "mirror is already at requested revision"
+        end
+
+        if mirror.type == "svn"
+          if old_revision && new_revision < old_revision
+            raise InvalidRevision, "local revision is higher than request revision"
+          end
+
+          if svn.head_revision(mirror.url) < new_revision
+            raise InvalidRevision, "requested revision is higher than remote revision"
+          end
+        end
+
+        new_revision
+      end
+
+      def determine_target_commit(mirror, new_revision)
+        unless mirror.type == "svn"
+          git.rev_parse(new_revision)
+        else
+          git_svn.commit_hash(mirror.remote, new_revision)
+        end
+      end
+  end
+end

data/lib/braid/commands/add.rb

@@ -0,0 +1,44 @@
+module Braid
+  module Commands
+    class Add < Command
+      def run(url, options = {})
+        bail_on_local_changes!
+
+        with_reset_on_error do
+          mirror = config.add_from_options(url, options)
+
+          branch_message = (mirror.type == "svn" || mirror.branch == "master") ? "" : " branch '#{mirror.branch}'"
+          revision_message = options["revision"] ? " at #{display_revision(mirror)}" : ""
+          msg "Adding #{mirror.type} mirror of '#{mirror.url}'#{branch_message}#{revision_message}."
+
+          # 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)
+          mirror.fetch
+
+          new_revision = validate_new_revision(mirror, options["revision"])
+          target_hash = determine_target_commit(mirror, new_revision)
+
+          unless mirror.squashed?
+            git.merge_ours(target_hash)
+          end
+          git.read_tree(target_hash, mirror.path)
+
+          mirror.revision = new_revision
+          mirror.lock = new_revision if options["revision"]
+          config.update(mirror)
+          add_config_file
+
+          commit_message = "Add mirror '#{mirror.path}/'#{revision_message}"
+          git.commit(commit_message)
+        end
+      end
+
+      private
+        def setup_remote(mirror)
+          Command.run(:setup, mirror.path)
+        end
+    end
+  end
+end

data/lib/braid/commands/diff.rb

@@ -0,0 +1,11 @@
+module Braid
+  module Commands
+    class Diff < Command
+      def run(path)
+        mirror = config.get!(path)
+        diff = mirror.diff
+        puts diff unless diff.empty?
+      end
+    end
+  end
+end

data/lib/braid/commands/remove.rb

@@ -0,0 +1,23 @@
+module Braid
+  module Commands
+    class Remove < Command
+      def run(path)
+        mirror = config.get!(path)
+
+        bail_on_local_changes!
+
+        with_reset_on_error do
+          msg "Removing mirror from '#{mirror.path}/'."
+
+          git.rm_r(mirror.path)
+
+          config.remove(mirror)
+          add_config_file
+
+          commit_message = "Remove mirror '#{mirror.path}/'"
+          git.commit(commit_message)
+        end
+      end
+    end
+  end
+end

data/lib/braid/commands/setup.rb

@@ -0,0 +1,34 @@
+module Braid
+  module Commands
+    class Setup < Command
+      def run(path = nil)
+        path ? setup_one(path) : setup_all
+      end
+
+      protected
+        def setup_all
+          msg "Setting up all mirrors."
+          config.mirrors.each do |path|
+            setup_one(path)
+          end
+        end
+
+        def setup_one(path)
+          mirror = config.get!(path)
+
+          if git.remote_exists?(mirror.remote)
+            msg "Mirror '#{mirror.path}/' already has a remote. Skipping."
+            return
+          end
+
+          msg "Setting up remote for '#{mirror.path}/'."
+          unless mirror.type == "svn"
+            git.remote_add(mirror.remote, mirror.url, mirror.branch)
+          else
+            git_svn.init(mirror.remote, mirror.url)
+          end
+          mirror.fetch
+        end
+    end
+  end
+end

data/lib/braid/commands/update.rb

@@ -0,0 +1,78 @@
+module Braid
+  module Commands
+    class Update < Command
+      def run(path, options = {})
+        bail_on_local_changes!
+
+        with_reset_on_error do
+          path ? update_one(path, options) : update_all(options)
+        end
+      end
+
+      protected
+        def update_all(options = {})
+          options.reject! { |k,v| %w(revision head).include?(k) }
+          msg "Updating all mirrors."
+          config.mirrors.each do |path|
+            update_one(path, options)
+          end
+        end
+
+        def update_one(path, options = {})
+          mirror = config.get!(path)
+
+          # check options for lock modification
+          if mirror.locked?
+            if options["head"]
+              msg "Unlocking mirror '#{mirror.path}/'."
+              mirror.lock = nil
+            elsif !options["revision"]
+              msg "Mirror '#{mirror.path}/' is locked to #{display_revision(mirror, mirror.lock)}. Skipping."
+              return
+            end
+          end
+
+          mirror.fetch
+
+          new_revision = validate_new_revision(mirror, options["revision"])
+          target_hash = determine_target_commit(mirror, new_revision)
+
+          if mirror.merged?(target_hash)
+            msg "Mirror '#{mirror.path}/' is already up to date. Skipping."
+            return
+          end
+
+          diff = mirror.diff if mirror.squashed? # get diff before setting revision
+
+          mirror.revision = new_revision
+          mirror.lock = new_revision if options["revision"]
+          config.update(mirror)
+
+          msg "Updating mirror '#{mirror.path}/'."
+          if mirror.squashed?
+            git.rm_r(mirror.path)
+            git.read_tree(target_hash, mirror.path)
+            unless diff.empty?
+              git.apply(diff, *(options["break"] ? ["--reject"] : []))
+            end
+          else
+            git.merge_subtree(target_hash)
+          end
+
+          add_config_file
+
+          revision_message = " to " + (options["revision"] ? display_revision(mirror) : "HEAD")
+          commit_message = "Update mirror '#{mirror.path}/'#{revision_message}"
+          git.commit(commit_message)
+
+        rescue Operations::ShellExecutionError => error
+          if options["break"]
+            msg "Caught shell error. Breaking."
+            exit(0)
+          else
+            raise error
+          end
+        end
+    end
+  end
+end

data/lib/braid/config.rb

@@ -0,0 +1,101 @@
+require 'yaml'
+require 'yaml/store'
+
+module Braid
+  class Config
+    class PathAlreadyInUse < BraidError
+      def message
+        "path already in use: #{super}"
+      end
+    end
+    class MirrorDoesNotExist < BraidError
+      def message
+        "mirror does not exist: #{super}"
+      end
+    end
+
+    def initialize(config_file = CONFIG_FILE)
+      @db = YAML::Store.new(config_file)
+    end
+
+    def add_from_options(url, options)
+      mirror = Mirror.new_from_options(url, options)
+
+      add(mirror)
+      mirror
+    end
+
+    def mirrors
+      @db.transaction(true) do
+        @db.roots
+      end
+    end
+
+    def get(path)
+      @db.transaction(true) do
+        if attributes = @db[path.to_s.sub(/\/$/, '')]
+          Mirror.new(path, attributes)
+        end
+      end
+    end
+
+    def get!(path)
+      mirror = get(path)
+      raise MirrorDoesNotExist, path unless mirror
+      mirror
+    end
+
+    def add(mirror)
+      @db.transaction do
+        raise PathAlreadyInUse, mirror.path if @db[mirror.path]
+        write_mirror(mirror)
+      end
+    end
+
+    def remove(mirror)
+      @db.transaction do
+        @db.delete(mirror.path)
+      end
+    end
+
+    def update(mirror)
+      @db.transaction do
+        raise MirrorDoesNotExist, mirror.path unless @db[mirror.path]
+        @db.delete(mirror.path)
+        write_mirror(mirror)
+      end
+    end
+
+    def valid?
+      @db.transaction(true) do
+        !@db.roots.any? do |path|
+          @db[path]["url"].nil?
+        end
+      end
+    end
+
+    def migrate!
+      @db.transaction do
+        @db.roots.each do |path|
+          attributes = @db[path]
+          if attributes["local_branch"]
+            attributes["url"] = attributes.delete("remote")
+            attributes["remote"] = attributes.delete("local_branch")
+            attributes["squashed"] = attributes.delete("squash")
+            attributes["lock"] = attributes["revision"] # so far this has always been true
+          end
+          @db[path] = clean_attributes(attributes)
+        end
+      end
+    end
+
+    private
+      def write_mirror(mirror)
+        @db[mirror.path] = clean_attributes(mirror.attributes)
+      end
+
+      def clean_attributes(hash)
+        hash.reject { |k,v| v.nil? }
+      end
+  end
+end

data/lib/braid/error.rb

@@ -0,0 +1,8 @@
+module Braid
+  class BraidError < StandardError
+    def message
+      value = super
+      value if value != self.class.name
+    end
+  end
+end

data/lib/braid/mirror.rb

@@ -0,0 +1,174 @@
+module Braid
+  class Mirror
+    TYPES = %w(git svn)
+    ATTRIBUTES = %w(url remote type branch squashed revision lock)
+
+    class UnknownType < BraidError
+      def message
+        "unknown type: #{super}"
+      end
+    end
+    class CannotGuessType < BraidError
+      def message
+        "cannot guess type: #{super}"
+      end
+    end
+    class PathRequired < BraidError
+      def message
+        "path is required"
+      end
+    end
+
+    include Operations::VersionControl
+
+    attr_reader :path, :attributes
+
+    def initialize(path, attributes = {})
+      @path = path.sub(/\/$/, '')
+      @attributes = attributes
+    end
+
+    def self.new_from_options(url, options = {})
+      url.sub!(/\/$/, '')
+
+      branch = options["branch"] || "master"
+
+      if type = options["type"] || extract_type_from_url(url)
+        raise UnknownType, type unless TYPES.include?(type)
+      else
+        raise CannotGuessType, url
+      end
+
+      unless path = options["path"] || extract_path_from_url(url)
+        raise PathRequired
+      end
+
+      if options["rails_plugin"]
+        path = "vendor/plugins/#{path}"
+      end
+
+      remote = "braid/#{path}".gsub("_", '-') # stupid git svn changes all _ to ., weird
+      squashed = !options["full"]
+      branch = nil if type == "svn"
+
+      attributes = { "url" => url, "remote" => remote, "type" => type, "branch" => branch, "squashed" => squashed }
+      self.new(path, attributes)
+    end
+
+    def ==(comparison)
+      path == comparison.path && attributes == comparison.attributes
+    end
+
+    def type
+      # override Object#type
+      attributes["type"]
+    end
+
+    def locked?
+      !!lock
+    end
+
+    def squashed?
+      !!squashed
+    end
+
+    def merged?(commit)
+      # tip from spearce in #git:
+      # `test z$(git merge-base A B) = z$(git rev-parse --verify A)`
+      commit = git.rev_parse(commit)
+      if squashed?
+        !!base_revision && git.merge_base(commit, base_revision) == commit
+      else
+        git.merge_base(commit, "HEAD") == commit
+      end
+    end
+
+    def diff
+      remote_hash = git.rev_parse("#{base_revision}:")
+      local_hash = git.tree_hash(path)
+      remote_hash != local_hash ? git.diff_tree(remote_hash, local_hash, path) : ""
+    end
+
+    def fetch
+      unless type == "svn"
+        git.fetch(remote)
+      else
+        git_svn.fetch(remote)
+      end
+    end
+
+    private
+      def method_missing(name, *args)
+        if ATTRIBUTES.find { |attribute| name.to_s =~ /^(#{attribute})(=)?$/ }
+          unless $2
+            attributes[$1]
+          else
+            attributes[$1] = args[0]
+          end
+        else
+          raise NameError, "unknown attribute `#{name}'"
+        end
+      end
+
+      def base_revision
+        if revision
+          unless type == "svn"
+            git.rev_parse(revision)
+          else
+            git_svn.commit_hash(remote, revision)
+          end
+        else
+          inferred_revision
+        end
+      end
+
+      def inferred_revision
+        time = list_revisions("-E --grep='^(Add|Update) mirror'", "-1", "HEAD", "-- #{path}").first[0]
+        revs = list_revisions("--reverse", remote)
+        hash = nil
+        revs.each_with_index do |rev, idx|
+          if !revs[idx + 1] || revs[idx + 1][0] > time
+            hash = revs[idx][1]
+            break
+          end
+        end
+        hash
+      end
+
+      def list_revisions(*args)
+        out = git.rev_list("--timestamp", *args)
+        out.split("\n").map do |line|
+          parts = line.split(' ', 2)
+          parts[0] = parts[0].to_i
+          parts
+        end
+      end
+
+      def self.extract_type_from_url(url)
+        return nil unless url
+        url.sub!(/\/$/, '')
+
+        # check for git:// and svn:// URLs
+        url_scheme = url.split(":").first
+        return url_scheme if TYPES.include?(url_scheme)
+
+        return "svn" if url[-6..-1] == "/trunk"
+        return "git" if url[-4..-1] == ".git"
+      end
+
+      def self.extract_path_from_url(url)
+        return nil unless url
+        name = File.basename(url)
+
+        if File.extname(name) == ".git"
+          # strip .git
+          name[0..-5]
+        elsif name == "trunk"
+          # use parent
+          File.basename(File.dirname(url))
+        else
+          name
+        end
+      end
+  end
+end

data/lib/braid/operations.rb

@@ -0,0 +1,295 @@
+require 'singleton'
+require 'rubygems'
+require 'open4'
+
+module Braid
+  module Operations
+    class ShellExecutionError < BraidError
+      def initialize(err = nil)
+        @err = err
+      end
+
+      def message
+        @err.to_s.split("\n").first
+      end
+    end
+    class VersionTooLow < BraidError
+      def initialize(command, version)
+        @command = command
+        @version = version.to_s.split("\n").first
+      end
+
+      def message
+        "#{@command} version too low: #{@version}"
+      end
+    end
+    class UnknownRevision < BraidError
+      def message
+        "unknown revision: #{super}"
+      end
+    end
+    class LocalChangesPresent < BraidError
+      def message
+        "local changes are present"
+      end
+    end
+
+    # The command proxy is meant to encapsulate commands such as git, git-svn and svn, that work with subcommands.
+    class Proxy
+      include Singleton
+
+      def self.command; name.split('::').last.downcase; end # hax!
+
+      def version
+        status, out, err = exec!("#{self.class.command} --version")
+        out.sub(/^.* version/, "").strip
+      end
+
+      def require_version(required)
+        required = required.split(".")
+        actual = version.split(".")
+
+        actual.each_with_index do |actual_piece, idx|
+          required_piece = required[idx]
+
+          return true unless required_piece
+
+          case (actual_piece <=> required_piece)
+            when -1
+              return false
+            when 1
+              return true
+            when 0
+              next
+          end
+        end
+
+        return actual.length >= required.length
+      end
+
+      def require_version!(required)
+        require_version(required) || raise(VersionTooLow.new(self.class.command, version))
+      end
+
+      private
+        def command(name)
+          # stub
+          name
+        end
+
+        def invoke(arg, *args)
+          exec!("#{command(arg)} #{args.join(' ')}".strip)[1].strip # return stdout
+        end
+
+        def method_missing(name, *args)
+          invoke(name, *args)
+        end
+
+        def exec(cmd)
+          cmd.strip!
+
+          previous_lang = ENV['LANG']
+          ENV['LANG'] = 'C'
+
+          out, err = nil
+          status = Open4.popen4(cmd) do |pid, stdin, stdout, stderr|
+            out = stdout.read
+            err = stderr.read
+          end.exitstatus
+          [status, out, err]
+
+        ensure
+          ENV['LANG'] = previous_lang
+        end
+
+        def exec!(cmd)
+          status, out, err = exec(cmd)
+          raise ShellExecutionError, err unless status == 0
+          [status, out, err]
+        end
+    end
+
+    class Git < Proxy
+      def commit(message, *args)
+        status, out, err = exec("git commit -m #{message.inspect} --no-verify #{args.join(' ')}")
+
+        if status == 0
+          true
+        elsif out.match(/nothing.* to commit/)
+          false
+        else
+          raise ShellExecutionError, err
+        end
+      end
+
+      def fetch(remote)
+        # open4 messes with the pipes of index-pack
+        system("git fetch -n #{remote} &> /dev/null")
+        raise ShellExecutionError, "could not fetch" unless $? == 0
+        true
+      end
+
+      def checkout(treeish)
+        # TODO debug
+        msg "Checking out '#{treeish}'."
+        invoke(:checkout, treeish)
+        true
+      end
+
+      # Returns the base commit or nil.
+      def merge_base(target, source)
+        invoke(:merge_base, target, source)
+      rescue ShellExecutionError
+        nil
+      end
+
+      def rev_parse(opt)
+        invoke(:rev_parse, opt)
+      rescue ShellExecutionError
+        raise UnknownRevision, opt
+      end
+
+      # Implies tracking.
+      def remote_add(remote, path, branch)
+        invoke(:remote, "add", "-t #{branch} -m #{branch}", remote, path)
+        true
+      end
+
+      # Checks git and svn remotes.
+      def remote_exists?(remote)
+        # TODO clean up and maybe return more information
+        !!File.readlines(".git/config").find { |line| line =~ /^\[(svn-)?remote "#{Regexp.escape(remote)}"\]/ }
+      end
+
+      def reset_hard(target)
+        invoke(:reset, "--hard", target)
+        true
+      end
+
+      # Implies no commit.
+      def merge_ours(opt)
+        invoke(:merge, "-s ours --no-commit", opt)
+        true
+      end
+
+      # Implies no commit.
+      def merge_subtree(opt)
+        # TODO which options are needed?
+        invoke(:merge, "-s subtree --no-commit --no-ff", opt)
+        true
+      end
+
+      def read_tree(treeish, prefix)
+        invoke(:read_tree, "--prefix=#{prefix}/ -u", treeish)
+        true
+      end
+
+      def rm_r(path)
+        invoke(:rm, "-r", path)
+        true
+      end
+
+      def tree_hash(path, treeish = "HEAD")
+        out = invoke(:ls_tree, treeish, "-d", path)
+        out.split[2]
+      end
+
+      def diff_tree(src_tree, dst_tree, prefix = nil)
+        cmd = "git diff-tree -p --binary #{src_tree} #{dst_tree}"
+        cmd << " --src-prefix=a/#{prefix}/ --dst-prefix=b/#{prefix}/" if prefix
+        status, out, err = exec!(cmd)
+        out
+      end
+
+      def status_clean?
+        status, out, err = exec("git status")
+        !out.split("\n").grep(/nothing to commit/).empty?
+      end
+
+      def ensure_clean!
+        status_clean? || raise(LocalChangesPresent)
+      end
+
+      def head
+        rev_parse("HEAD")
+      end
+
+      def branch
+        status, out, err = exec!("git branch | grep '*'")
+        out[2..-1]
+      end
+
+      def apply(diff, *args)
+        err = nil
+        status = Open4.popen4("git apply --index --whitespace=nowarn #{args.join(' ')} -") do |pid, stdin, stdout, stderr|
+          stdin.puts(diff)
+          stdin.close
+
+          err = stderr.read
+        end.exitstatus
+        raise ShellExecutionError, err unless status == 0
+        true
+      end
+
+      private
+        def command(name)
+          "#{self.class.command} #{name.to_s.gsub('_', '-')}"
+        end
+    end
+
+    class GitSvn < Proxy
+      def self.command; "git svn"; end
+
+      def commit_hash(remote, revision)
+        out = invoke(:log, "--show-commit --oneline", "-r #{revision}", remote)
+        part = out.to_s.split(" | ")[1]
+        raise UnknownRevision, "r#{revision}" unless part
+        Git.instance.rev_parse(part) # FIXME ugly ugly ugly
+      end
+
+      def fetch(remote)
+        # open4 messes with the pipes of index-pack
+        system("git svn fetch #{remote} &> /dev/null")
+        raise ShellExecutionError, "could not fetch" unless $? == 0
+        true
+      end
+
+      def init(remote, path)
+        invoke(:init, "-R", remote, "--id=#{remote}", path)
+        true
+      end
+
+      private
+        def command(name)
+          "#{self.class.command} #{name}"
+        end
+    end
+
+    class Svn < Proxy
+      def clean_revision(revision)
+        revision.to_i if revision
+      end
+
+      def head_revision(path)
+        # not using svn info because it's retarded and doesn't show the actual last changed rev for the url
+        # git svn has no clue on how to get the actual HEAD revision number on it's own
+        status, out, err = exec!("svn log -q --limit 1 #{path}")
+        out.split(/\n/).find { |x| x.match /^r\d+/ }.split(" | ")[0][1..-1].to_i
+      end
+    end
+
+    module VersionControl
+      def git
+        Git.instance
+      end
+
+      def git_svn
+        GitSvn.instance
+      end
+
+      def svn
+        Svn.instance
+      end
+    end
+  end
+end

data/lib/braid/version.rb

@@ -0,0 +1,3 @@
+module Braid
+  VERSION = "0.4.9.1"
+end

metadata

@@ -0,0 +1,92 @@
+--- !ruby/object:Gem::Specification 
+name: tapajos-braid
+version: !ruby/object:Gem::Version 
+  version: 0.4.9.1
+platform: ruby
+authors: 
+- Cristi Balan
+- Norbert Crombach
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-08-21 00:00:00 -07:00
+default_executable: braid
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: main
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.8.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: open4
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.6
+    version: 
+description: A simple tool for tracking vendor branches in git.
+email: evil@che.lu
+executables: 
+- braid
+extensions: []
+
+extra_rdoc_files: 
+- README.rdoc
+files: 
+- README.rdoc
+- Rakefile
+- bin/braid
+- lib/braid
+- lib/braid/command.rb
+- lib/braid/commands
+- lib/braid/commands/add.rb
+- lib/braid/commands/diff.rb
+- lib/braid/commands/remove.rb
+- lib/braid/commands/setup.rb
+- lib/braid/commands/update.rb
+- lib/braid/config.rb
+- lib/braid/error.rb
+- lib/braid/mirror.rb
+- lib/braid/operations.rb
+- lib/braid/version.rb
+- lib/braid.rb
+has_rdoc: true
+homepage: http://evil.che.lu/projects/braid
+post_install_message: 
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- braid
+- --main
+- README.rdoc
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: braid
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: A simple tool for tracking vendor branches in git.
+test_files: []
+