gx 1.0.0

data/.autotest

@@ -0,0 +1,23 @@
+# -*- ruby -*-
+
+require 'autotest/restart'
+
+# Autotest.add_hook :initialize do |at|
+#   at.extra_files << "../some/external/dependency.rb"
+#
+#   at.libs << ":../some/external"
+#
+#   at.add_exception 'vendor'
+#
+#   at.add_mapping(/dependency.rb/) do |f, _|
+#     at.files_matching(/test_.*rb$/)
+#   end
+#
+#   %w(TestA TestB).each do |klass|
+#     at.extra_class_map[klass] = "test/test_misc.rb"
+#   end
+# end
+
+# Autotest.add_hook :run_command do |at|
+#   system "rake build"
+# end

data/History.txt

@@ -0,0 +1,6 @@
+=== 1.0.0 / 2011-03-22
+
+* 1 major enhancement
+
+  * Birthday!
+

data/Manifest.txt

@@ -0,0 +1,10 @@
+.autotest
+History.txt
+Manifest.txt
+README.txt
+Rakefile
+bin/gx-publish
+bin/gx-update
+lib/gx.rb
+lib/gx/enhance.rb
+test/test_gx.rb

data/README.txt

@@ -0,0 +1,66 @@
+= gx
+
+* http://github.com/evanphx/gx
+
+== DESCRIPTION:
+
+Gx is 2 git related tools: gx-update and gx-publish.
+
+gx-update is a replacement for 'git pull' that includes an integrated
+conflict resolver.
+
+== FEATURES/PROBLEMS:
+
+* Birthday!
+
+== SYNOPSIS:
+
+  gx-update
+
+== REQUIREMENTS:
+
+* git
+* grit
+* ruby
+
+== INSTALL:
+
+* Edit your ~/.gitconfig and add:
+    update = !gx-update
+
+  to your [alias] section.
+
+
+== DEVELOPERS:
+
+After checking out the source, run:
+
+  $ rake newb
+
+This task will install any missing dependencies, run the tests/specs,
+and generate the RDoc.
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2011 FIX
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -0,0 +1,23 @@
+# -*- ruby -*-
+
+require 'rubygems'
+require 'hoe'
+
+# Hoe.plugin :compiler
+# Hoe.plugin :gem_prelude_sucks
+# Hoe.plugin :inline
+# Hoe.plugin :inline
+# Hoe.plugin :racc
+# Hoe.plugin :rubyforge
+
+Hoe.spec "gx" do
+  # HEY! If you fill these out in ~/.hoe_template/Rakefile.erb then
+  # you'll never have to touch them again!
+  # (delete this comment too, of course)
+
+  developer "Evan Phoenix", "evan@fallingsnow.net"
+
+  # self.rubyforge_name = 'gxx' # if different than 'gx'
+end
+
+# vim: syntax=ruby

data/bin/gx-publish

@@ -0,0 +1,94 @@
+#!/usr/bin/env ruby
+
+require 'pathname'
+
+require 'gx/enhance'
+require 'optparse'
+require 'ostruct'
+require 'fileutils'
+require 'readline'
+
+opts = OpenStruct.new
+
+op = OptionParser.new do |o|
+  o.on "-z", "--analyze", "Output information on what update would do" do
+    opts.analyze = true
+  end
+
+  o.on "-v", "--verbose", "Be verbose" do
+    opts.verbose = true
+  end
+
+  o.on "--debug", "Show all git commands run" do
+    Grit.debug = true
+  end
+
+  o.on "-q", "--quiet", "Show the minimal output" do
+    opts.quiet = true
+  end
+end
+
+op.parse!(ARGV)
+
+STDOUT.sync = true
+
+repo = Grit::Repo.current
+
+# Boost the timeout
+Grit::Git.git_timeout = 120
+
+current = repo.resolve_rev "HEAD"
+branch = repo.git.symbolic_ref({:q => true}, "HEAD").strip
+
+branch_name = branch.gsub %r!^refs/heads/!, ""
+
+origin_ref = repo.merge_ref branch_name
+
+unless origin_ref
+  puts "Sorry, it appears your current branch is not setup with merge info."
+  puts "Please set 'branch.#{branch_name}.remote' and 'branch.#{branch_name}.merge'"
+  puts "and try again."
+  exit 1
+end
+
+origin = repo.resolve_rev origin_ref
+
+# See if there are actually any commits to publish first.
+
+if current == origin
+  puts "Already up to date, no commits to publish."
+  exit 0
+end
+
+# ok, there are commits, now make sure our origin and
+# everything is update to date.
+
+common = repo.find_ancestor(origin, current)
+
+url = repo.merge_url branch_name
+
+push_repo, push_branch = repo.merge_info branch_name
+remote_hash = repo.remote_info push_repo, push_branch
+
+
+if common != origin or remote_hash != origin
+  puts "The upstream contains unmerged commits. Please update/pull first."
+  if opts.verbose
+    puts "Local branch:  #{current}"
+    puts "Local origin:  #{origin}"
+    puts "Remote origin: #{remote_hash}"
+  end
+  exit 1
+end
+
+print "Publishing local commits to #{url}... "
+
+out = repo.git.push({:v => true}, push_repo, "#{branch_name}:#{push_branch}")
+if $?.exitstatus != 0
+  puts "error!"
+  puts "Sorry, I'm not sure what happened. Here is what git said:"
+  puts out
+end
+
+puts "done!"
+

data/bin/gx-update

@@ -0,0 +1,370 @@
+#!/usr/bin/env ruby
+
+# TODO:
+# * Handle a conflict in a remote commit that is in a renamed file.
+
+require 'pathname'
+require 'gx/enhance'
+require 'optparse'
+require 'ostruct'
+require 'fileutils'
+require 'readline'
+
+opts = OpenStruct.new
+
+op = OptionParser.new do |o|
+  o.on "-z", "--analyze", "Output information on what update would do" do
+    opts.analyze = true
+  end
+
+  o.on "-v", "--verbose", "Be verbose" do
+    opts.verbose = true
+  end
+
+  o.on "--debug", "Show all git commands run" do
+    Grit.debug = true
+  end
+
+  o.on "-q", "--quiet", "Show the minimal output" do
+    opts.quiet = true
+  end
+end
+
+op.parse!(ARGV)
+
+STDOUT.sync = true
+
+# Boost the timeout
+Grit::Git.git_timeout = 240
+
+class Update
+    HELP = <<-TXT
+You're currently inside the conflict resolver. The following commands
+are available to help you.
+
+When the conflict resolver is first started, the contents of the file
+will contain the file populated with conflict markers for you to edit.
+
+[D]iff       View the diffs between the (original version and local version)
+                and (original version and remote version).
+[E]dit       Launch your editor to edit the file.
+[T]ool       Run git-mergetool on the file.
+[O]riginal   Set the contents of the file to the original version. This is
+                version from the common ancestor of your commit and the remote
+                commit.
+[M]ine       Set the contents of the file to be your version.
+[R]emote     Set the contents of the file to be the remote version.
+co[N]flict   Set the contents of the file to contain the merged between the
+                local version and remote version, with conflict markers.
+[P]rompt     Launch a subshell to deal with the conflict. Simply exit
+                from the shell to continue with conflict resolution.
+[I]nfo       View information about the commit and the current file.
+[A]bort      Cancel the update altogether, restore everything to before
+                the update was started.
+[C]ontinue   You're done dealing with this conflict, move on to the next one.
+[H]elp       Detail all available options, you're looking at it now.
+    TXT
+
+
+  def initialize(opts)
+    @opts = opts
+    @repo = Grit::Repo.current
+
+    @current = @repo.resolve_rev "HEAD"
+    @branch = @repo.git.symbolic_ref({:q => true}, "HEAD").strip
+
+    @branch_name = @branch.gsub %r!^refs/heads/!, ""
+
+    @origin_ref = @repo.merge_ref @branch_name
+
+    unless @origin_ref
+      puts "Sorry, it appears your current branch is not setup with merge info."
+      puts "Please set 'branch.#{@branch_name}.remote' and 'branch.#{@branch_name}.merge'"
+      puts "and try again."
+      exit 1
+    end
+  end
+
+  def fetch
+    print "Fetching new commits: "
+    out = @repo.git.fetch :timeout => false
+    puts "done."
+
+    # TODO parse +out+ for details to show the user.
+  end
+
+  def includes_conflict_markers?(path)
+    /^<<<<<<< HEAD/.match(File.read(path))
+  end
+
+  def cat_file(ref, file)
+    File.open(file, "w") do |f|
+      f << @repo.git.cat_file({}, ref)
+    end
+  end
+
+  def handle_unmerged(patch_info, files)
+    files.each do |name, info|
+      system "cp #{name} .git/with_markers"
+
+      puts
+      puts "Conflict discovered in '#{name}'"
+
+      loop do
+
+        # If there are conflict markers, default is edit.
+        if includes_conflict_markers?(name)
+          default = "E"
+
+          # otherwise it's continue.
+        else
+          default = "C"
+        end
+
+        ans = Readline.readline "Select: [D]iff, [E]dit, [C]ontinue, [H]elp: [#{default}] "
+        ans = default if ans.empty?
+        want = ans.downcase[0]
+        case want
+        when ?d
+          orig = ".git/diff/original/#{name}"
+          FileUtils.mkdir_p File.dirname(orig)
+          cat_file info.original, orig
+
+          mine = ".git/diff/mine/#{name}"
+          FileUtils.mkdir_p File.dirname(mine)
+          cat_file info.mine, mine
+
+          remote = ".git/diff/remote/#{name}"
+          FileUtils.mkdir_p File.dirname(remote)
+          cat_file info.yours, remote
+
+          system "cd .git/diff; diff -u original/#{name} mine/#{name}"
+          system "cd .git/diff; diff -u original/#{name} remote/#{name}"
+          system "rm -rf .git/diff"
+        when ?e
+          system "#{ENV['EDITOR']} #{name}"
+        when ?t
+          system "git mergetool #{name}"
+        when ?o
+          cat_file info.original, name
+        when ?m
+          cat_file info.mine, name
+        when ?r
+          cat_file info.yours, name
+        when ?n
+          system "cp .git/with_markers #{name}"
+        when ?p
+          puts "Starting a sub-shell to handle conflicts for #{name}."
+          puts "Exit the shell to continue resolution."
+          system "$SHELL"
+        when ?i
+          puts "Current file: #{name}"
+          puts "Current commit:"
+          puts "  Subject: #{patch_info[:subject]}"
+          puts "  Date:    #{patch_info[:date]}"
+          puts "  Author:  #{patch_info[:author]} (#{patch_info[:email]})"
+        when ?a
+          raise "abort!"
+        when ?h
+          puts HELP
+        when ?c
+          if includes_conflict_markers?(name)
+            puts
+            puts "It looks like this file still contains conflict markers."
+            a = Readline.readline "Are you sure that you want to commit it? [Y/N]: "
+            break if a.downcase[0] == ?y
+          else
+            break
+          end
+        else
+          puts "Unknown option. Try again."
+        end
+      end
+
+      File.unlink ".git/with_markers" rescue nil
+      @repo.git.add({}, name)
+    end
+  end
+
+  def analyze
+    puts "Automatically merging in refs from: #{@origin_ref} / #{@origin[0,7]}"
+    puts "Closest ancestor between HEAD and origin: #{@common[0,7]}"
+    puts
+
+    if @to_receive.empty?
+      puts "Current history is up to date."
+      exit 0
+    end
+
+    puts "#{@to_receive.size} new commits."
+    if @opts.verbose
+      system "git log --pretty=oneline #{@common}..#{@origin_ref}"
+      puts
+    end
+
+    puts "#{@to_replay.size} commits to adapt."
+    if @opts.verbose
+      system "git log --pretty=oneline #{@common}..HEAD"
+      puts
+    end
+  end
+
+  def run
+
+    fetch
+
+    @origin = @repo.resolve_rev @origin_ref
+
+    @common = @repo.find_ancestor(@origin, @current)
+
+    @to_replay = @repo.revs_between(@common, @current)
+    @to_receive = @repo.revs_between(@common, @origin)
+
+    if @opts.analyze
+      analyze
+      exit 0
+    end
+
+    if @to_receive.empty?
+      puts "Up to date."
+      exit 0
+    end
+
+    if @opts.verbose
+      puts "Extracting commits between #{@common[0,7]} and HEAD..."
+    end
+
+    # DANGER. Before here, we can abort anytime, after here, we're making
+    # changes, so we need to be able to recover.
+    #
+    begin
+      port_changes
+    rescue Exception => e
+      puts "Error detected, aborting update: #{e.message} (#{e.class})"
+      puts e.backtrace
+      recover
+      exit 1
+    end
+  end
+
+  def recover
+    @repo.git.reset({:hard => true}, @current)
+    @repo.git.checkout({}, @branch.gsub(%r!^refs/heads/!, ""))
+
+    if @used_wip
+      @repo.git.reset({:mixed => true}, "HEAD^")
+    end
+
+    system "rm -rf #{Grit.rebase_dir}" rescue nil
+  end
+
+  def sh(cmd)
+    Grit.log cmd if Grit.debug
+    out = `#{cmd}`
+    Grit.log out if Grit.debug
+    return out
+  end
+
+  def port_changes
+    # Switch back in time so we can re-apply commits. checkout
+    # will return non-zero if there it can't be done. In that case
+    # we perform a WIP commit, and unwind that WIP commit later,
+    # leaving the working copy the same way it was.
+
+    @used_wip = false
+
+    list = @repo.git.ls_files(:m => true).split("\n")
+    if list.size > 0
+      @repo.git.commit({:m => "++WIP++", :a => true})
+      @used_wip = true
+
+      # Because we've introduced a new commit, we need to repoint current.
+      @current = @repo.resolve_rev "HEAD"
+
+      # And the list of commits to replay.
+      @to_replay = @repo.revs_between(@common, @current)
+
+      # Ok, try again.
+      # Use sh, since the git proxy seems to fuck up $?
+      error = sh "git checkout -q #{@origin} 2>&1"
+      if $?.exitstatus != 0
+        # Ok, give up.
+        recover
+
+        # Now tell the user what happened.
+        puts "ERROR: Sorry, 'git checkout' can't figure out how to properly switch"
+        puts "the working copy. Please fix this and run 'git update' again."
+        puts "Here is the error that 'git checkout' reported:"
+        puts
+        puts error
+        puts
+        exit 1
+      end
+    else
+      error = sh "git checkout -q #{@origin} 2>&1"
+
+      if $?.exitstatus != 0
+        # Ok, give up.
+        recover
+
+        # Now tell the user what happened.
+        puts "ERROR: Sorry, 'git checkout' can't figure out how to properly switch"
+        puts "the working copy. Please fix this and run 'git update' again."
+        puts "Here is the error that 'git checkout' reported:"
+        puts
+        puts error
+        puts
+        exit 1
+      end
+    end
+
+    sh "git format-patch --full-index --stdout #{@common}..#{@current} > .git/update-patch"
+    out = sh "git am --rebasing < .git/update-patch 2> /dev/null"
+    while $?.exitstatus != 0
+      info = @repo.am_info
+      if @opts.verbose
+        if info[:subject] == "++WIP++"
+          puts "Conflict detected in working copy."
+        else
+          puts "Conflict detected applying: #{info[:subject]}"
+        end
+      end
+
+      unmerged = @repo.unmerged_files
+      handle_unmerged info, unmerged
+
+      if @repo.to_be_committed.empty?
+        out = @repo.git.am({:skip => true, "3" => true})
+      else
+        out = @repo.git.am({:resolved => true, "3" => true})
+      end
+    end
+
+    # Remove the patch we created contain all the rebased commits
+    File.unlink ".git/update-patch" rescue nil
+
+    rev = @repo.resolve_rev "HEAD"
+
+    # Update the branch ref to point to our new commit
+
+    @repo.git.update_ref({:m => "updated"}, @branch, rev, @current)
+    @repo.git.symbolic_ref({}, "HEAD", @branch)
+
+    # If we inserted a WIP commit on the top, remove the commit, but leave
+    # the work.
+    if @used_wip
+      @repo.git.reset({:mixed => true}, "HEAD^")
+    end
+
+    puts
+    puts "Updated. Imported #{@to_receive.size} commits, HEAD now pointed to #{rev[0,7]}."
+    puts
+
+    unless @opts.quiet
+      system "git diff --stat #{@common}..#{@origin}"
+    end
+
+  end
+end
+
+Update.new(opts).run

data/lib/gx.rb

@@ -0,0 +1,3 @@
+class Gx
+  VERSION = '1.0.0'
+end

data/lib/gx/enhance.rb

@@ -0,0 +1,144 @@
+require 'rubygems'
+require 'grit'
+
+module Grit
+  class Repo
+
+    def self.current(goto=true)
+      # cd to the top of this git tree. If run via git's alias
+      # infrastructure, this is done for us. We do it again, just
+      # to be sure.
+
+      top = `git rev-parse --show-cdup 2>&1`.strip
+      if goto
+        Dir.chdir top unless top.empty?
+        return Grit::Repo.new(".")
+      else
+        return Grit::Repo.new(top)
+      end
+    end
+
+    # Given +hashish+, parse it and return the hash
+    # it refers to.
+    #
+    def resolve_rev(hashish)
+      hash = @git.rev_parse({:verify => true}, hashish)
+      return nil if $?.exitstatus != 0
+      return hash.strip
+    end
+
+    # Given +left+ and +right+, detect and return their
+    # closest common ancestor. Used to find the point to perform
+    # merges from.
+    #
+    # +right+ defaults to the current HEAD.
+    #
+    def find_ancestor(left, right=nil)
+      right ||= resolve_rev "HEAD"
+      hash = @git.merge_base({}, left, right)
+      return nil if $?.exitstatus != 0
+      return hash.strip
+    end
+
+    def revs_between(left, right)
+      @git.rev_list({}, "#{left}..#{right}").split("\n")
+    end
+
+    class UnmergedFile
+      def initialize(name)
+        @name = name
+      end
+
+      attr_accessor :original, :mine, :yours
+    end
+
+    def unmerged_files
+      files = Hash.new { |h,k| h[k] = UnmergedFile.new(k) }
+      @git.ls_files({:u => true}).split("\n").each do |line|
+        mode, hash, stage, name = line.split(/\s+/, 4)
+        case stage
+        when "1"
+          files[name].original = hash
+        when "2"
+          files[name].yours = hash
+        when "3"
+          files[name].mine = hash
+        end
+      end
+
+      return files
+    end
+
+    def Grit.rebase_dir
+      if File.directory? ".dotest"
+        return ".dotest"
+      elsif File.directory? ".git/rebase"
+        return ".git/rebase"
+      elsif File.directory? ".git/rebase-apply"
+        return ".git/rebase-apply"
+      else
+        raise "No rebase info found."
+      end
+    end
+
+    def am_info
+      info = {}
+      File.open("#{Grit.rebase_dir}/info") do |f|
+        f.readlines.each do |line|
+          line.strip!
+          break if line.empty?
+          key, val = line.split(": ")
+          info[key.downcase.to_sym] = val
+        end
+      end
+
+      if subject = info[:subject]
+        subject.gsub!(/^\[PATCH\] /,"")
+      end
+
+      return info
+    end
+
+    def to_be_committed
+      @git.diff_index({:cached => true, :name_only => true}, "HEAD").split("\n")
+    end
+
+    def path2ref(name)
+      name.gsub %r!^refs/heads/!, ""
+    end
+
+    def merge_info(branch)
+      repo = @git.config({}, "branch.#{branch}.remote").strip
+      ref =  @git.config({}, "branch.#{branch}.merge").strip
+      return [repo, ref]
+    end
+
+    def merge_ref(branch)
+      repo, ref = merge_info(branch)
+      return nil if repo.empty?
+      path = "#{repo}/#{path2ref(ref)}"
+      return path
+    end
+
+    def merge_url(branch)
+      repo = @git.config({}, "branch.#{branch}.remote").strip
+      return "local" if repo == "."
+      
+      @git.config({}, "remote.#{repo}.url").strip
+    end
+
+    def remote_info(who, which=nil)
+      if which
+        hash, name = @git.ls_remote({:timeout => false}, who, which).split(/\s+/, 2)
+        return hash
+      else
+        ret = {}
+        @git.ls_remote({:timeout => false}, who).split("\n").each do |line|
+          hash, name = line.split(/\s+/, 2)
+          ret[name] = hash
+        end
+        return ret
+      end
+    end
+  end
+end

data/test/test_gx.rb

@@ -0,0 +1,8 @@
+require "test/unit"
+require "gx"
+
+class TestGx < Test::Unit::TestCase
+  def test_sanity
+    flunk "write tests or I will kneecap you"
+  end
+end

metadata

@@ -0,0 +1,101 @@
+--- !ruby/object:Gem::Specification 
+name: gx
+version: !ruby/object:Gem::Version 
+  hash: 23
+  prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
+platform: ruby
+authors: 
+- Evan Phoenix
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2011-03-22 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 2
+        - 9
+        - 1
+        version: 2.9.1
+  type: :development
+  version_requirements: *id001
+description: |-
+  Gx is 2 git related tools: gx-update and gx-publish.
+  
+  gx-update is a replacement for 'git pull' that includes an integrated
+  conflict resolver.
+email: 
+- evan@fallingsnow.net
+executables: 
+- gx-publish
+- gx-update
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
+files: 
+- .autotest
+- History.txt
+- Manifest.txt
+- README.txt
+- Rakefile
+- bin/gx-publish
+- bin/gx-update
+- lib/gx.rb
+- lib/gx/enhance.rb
+- test/test_gx.rb
+- .gemtest
+has_rdoc: true
+homepage: http://github.com/evanphx/gx
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --main
+- README.txt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: []
+
+rubyforge_project: gx
+rubygems_version: 1.6.2
+signing_key: 
+specification_version: 3
+summary: "Gx is 2 git related tools: gx-update and gx-publish"
+test_files: 
+- test/test_gx.rb