0
@@ -0,0 +1,57 @@
0
+Sake-Git
0
+========
0
+
0
+Here are a few Sake tasks to make developing with Git easier (and some corresponding Git aliases to make invoking them easier). Install them with:
0
+
0
+$ rake install
0
+
0
+
0
+Common Commands
0
+---------------
0
+
0
+$ sake git:update
0
+
0
+Updates your current git repository, autodetecting whether you have a regular ol' git project or a git-svn project. Alias it to `git up' with this alias:
0
+
0
+[alias]
0
+  up = !sake git:update
0
+
0
+
0
+$ sake git:push
0
+
0
+Commits any changes in your current branch not yet pushed upstream AND ports 'em over to master. Another alias for ya:
0
+
0
+[alias]
0
+  ci = !sake git:push
0
+
0
+
0
+$ sake git:open [NAME=mynewbranch]
0
+
0
+Creates a new branch off master. Think of this as opening an issue, or a new path of development. Because of the way Rake handles (or _doesn't_ handle) arguments, the alias for this one is a little weird:
0
+
0
+[alias]
0
+  open = !sake git:open NAME= -- $1
0
+
0
+Allowing you to call it like so:
0
+
0
+$ git open mynewbranch
0
+
0
+You can even call it without the branch name and it'll ask you for it:
0
+
0
+$ git open
0
+* Name your branch: mynewbranch
0
+
0
+
0
+$ sake git:close [NAME=mynewbranch]
0
+
0
+This is open's brother, and should be used when you finish something and have already moved it to master or upstream. If you haven't yet, don't worry - this won't eat your data. Aliases for everyone:
0
+
0
+[alias]
0
+  close = !sake git:close NAME= -- $1
0
+
0
+
0
+
0
+Credits
0
+-------
0
+
0
+Thanks to Coda Hale and everyone else at Wesabe for trying these out when I first wrote them and contributing tasks of their own.

0
@@ -0,0 +1,11 @@
0
+desc "Install the sake-git tasks (use FORCE=yes to overwrite)"
0
+task :install do
0
+  if ENV['FORCE'] == 'yes'
0
+    tasks = `rake -f #{Dir.pwd}/git.rake -T`.to_a.grep(/^rake/).map {|l| l[/^rake (\S+)/, 1]}
0
+    `sake -u #{tasks.join(' ')} 2>/dev/null`
0
+  end
0
+  
0
+  exec("sake -i #{Dir.pwd}/git.rake")
0
+end
0
+
0
+task :default => :install
0
\ No newline at end of file

0
@@ -0,0 +1,195 @@
0
+desc "This is just here for the other tasks and isn't intended for your use"
0
+task 'git:helpers' do
0
+  def git_branch
0
+    `git-branch | grep \"*\"`.strip[(2..-1)]
0
+  end
0
+  def git_branches
0
+    `git-branch`.to_a.map { |b| b[(2..-1)].chomp }
0
+  end
0
+  def git?
0
+    `git-status`
0
+    (not ($?.exitstatus == 128))
0
+  end
0
+  def git_stash
0
+    `git-diff-files --quiet`
0
+    if ($?.exitstatus == 1) then
0
+      stash = true
0
+      clear = (`git-stash list`.scan("\n").size == 0)
0
+      puts("* Saving changes...")
0
+      `git-stash save`
0
+    else
0
+      stash = false
0
+    end
0
+    begin
0
+      yield rescue puts("* Encountered an error, backing out...")
0
+      ensure
0
+        if stash then
0
+          puts("* Applying changes...")
0
+          sh("git-stash apply")
0
+          `git-stash clear` if clear
0
+        end
0
+    end
0
+  end
0
+  def git_fetch
0
+    sh("git#{"-svn" if git_svn?} fetch")
0
+  end
0
+  def git_rebase(what = nil)
0
+    if git_svn? then
0
+      sh("git-rebase git-svn #{what}")
0
+    else
0
+      sh("git-rebase origin/master #{what}")
0
+    end
0
+  end
0
+  def git_push
0
+    git_svn? ? (sh("git-svn dcommit")) : (sh("git-push"))
0
+  end
0
+  def git_svn?
0
+    `git-branch -a` =~ /^\s*git-svn/
0
+  end
0
+  def argv
0
+    ARGV.inject([]) do |argv, arg|
0
+      if (argv.last and argv.last =~ /=$/) then
0
+        (argv.last << arg)
0
+      else
0
+        (argv << arg.dup)
0
+      end
0
+      argv
0
+    end
0
+  end
0
+  def correct_env_from_argv
0
+    argv.grep(/^[A-Z]+=/).each { |kv| ENV.send(:[]=, *kv.split("=", 2)) }
0
+  end
0
+  def env(name)
0
+    case val = ENV[name]
0
+    when "", nil then
0
+      nil
0
+    else
0
+      val
0
+    end
0
+  end
0
+  correct_env_from_argv
0
+end
0
+
0
+desc 'Pull new commits from the repository'
0
+task 'git:update' => [ 'git:helpers' ] do
0
+  git_stash do
0
+    branch = git_branch
0
+    if (branch == "master") then
0
+      switch = false
0
+    else
0
+      switch = true
0
+      `git-checkout master`
0
+      puts("* Switching back to master...")
0
+    end
0
+    puts("* Pulling in new commits...")
0
+    git_fetch
0
+    git_rebase
0
+    if switch then
0
+      puts("* Porting changes into #{branch}...")
0
+      `git-checkout #{branch}`
0
+      sh("git-rebase master")
0
+    end
0
+  end
0
+end
0
+
0
+desc 'Push local commits into the Wesabe repository'
0
+task 'git:push' => [ 'git:update' ] do
0
+  git_stash do
0
+    puts("* Pushing changes...")
0
+    git_push
0
+    branch = git_branch
0
+    unless (branch == "master") then
0
+      `git-checkout master`
0
+      puts("* Porting changes into master")
0
+      git_rebase
0
+      `git-checkout #{branch}`
0
+    end
0
+  end
0
+end
0
+
0
+desc 'Delete the current branch and switch back to master'
0
+task 'git:close' => [ 'git:helpers' ] do
0
+  branch = (env("NAME") or git_branch)
0
+  current = git_branch
0
+  if (branch == "master") then
0
+    $stderr.puts("* Cannot delete master branch")
0
+    exit(1)
0
+  end
0
+  if (current == branch) then
0
+    puts("* Switching to master")
0
+    `git-checkout master 2>/dev/null`
0
+  end
0
+  puts("* Deleting branch #{branch}")
0
+  `git-branch -d #{branch} 2>/dev/null`
0
+  if ($?.exitstatus == 1) then
0
+    $stderr.puts("* Branch #{branch} isn't a strict subset of master, quitting")
0
+    `git-checkout #{current} 2>/dev/null`
0
+    exit(1)
0
+  end
0
+  `git-checkout #{current} 2>/dev/null` unless (current == branch)
0
+  exit(0)
0
+end
0
+
0
+desc 'Create a new branch off master'
0
+task 'git:open' => [ 'git:helpers' ] do
0
+  newbranch = (env("NAME") or begin
0
+    (require("readline")
0
+    print("* Name your branch: ")
0
+    Readline.readline.chomp)
0
+  end)
0
+  branch = git_branch
0
+  unless (branch == "master") then
0
+    puts("* Switching to master")
0
+    `git-checkout master`
0
+  end
0
+  `git-checkout -b #{newbranch}`
0
+  unless $?.exitstatus.zero? then
0
+    puts("* Couldn't create branch #{newbranch}, switching back to #{branch}")
0
+    `git-checkout #{branch}`
0
+    exit(1)
0
+  end
0
+  exit(0)
0
+end
0
+
0
+desc 'Merge the current branch into the master branch.'
0
+task 'git:fold' => [ 'git:helpers' ] do
0
+  branch = git_branch
0
+  if (branch == "master") then
0
+    $stderr.puts("* Cannot fold master branch")
0
+    exit(1)
0
+  end
0
+  puts("* Switching to master")
0
+  `git-checkout master 2>/dev/null`
0
+  puts("* Merging #{branch}")
0
+  system("git-merge #{@merge_flags} #{branch}")
0
+  if ($?.exitstatus == 1) then
0
+    $stderr.puts("* Merge had errors -- see to your friend")
0
+    exit(1)
0
+  end
0
+  puts("* Switching to #{branch}")
0
+  `git-checkout #{branch} 2>/dev/null`
0
+end
0
+
0
+desc 'Squash the current branch into the master branch.'
0
+task 'git:squash' do
0
+  @merge_flags = "--squash"
0
+  Rake::Task["git:fold"].invoke
0
+end
0
+
0
+desc 'Update all branches'
0
+task 'git:update:all' => [ 'git:helpers' ] do
0
+  git_stash do
0
+    branch = git_branch
0
+    switch = true
0
+    git_branches.each do |b|
0
+      puts("* Updating branch #{b}")
0
+      git_rebase(b)
0
+      unless $?.exitstatus.zero? then
0
+        puts("* Couldn't rebase #{b}, aborting so you can clean it up")
0
+        switch = false
0
+        break
0
+      end
0
+    end
0
+    `git-checkout #{branch} 2>/dev/null` if switch
0
+  end
0
+end

0
@@ -0,0 +1,8 @@
0
+[alias]
0
+	ci = !sake git:push
0
+	up = !sake git:update
0
+	upa = !sake git:update:all
0
+	open = !sake git:open NAME= -- $1
0
+	close = !sake git:close NAME= -- $1
0
+	fold = !sake git:fold
0
+	sq = !sake git:squash