git-up 0.5.5 → 0.5.7

data/README.md

@@ -36,4 +36,16 @@ If you're even lazier, you can tell `git-up` to run `bundle install` for you if
 
 ### `git-up.fetch.prune [true|false]`
 
-By default, `git-up` will append the `--prune` flag to the `git fetch` command if your git version supports it (1.6.6 or greater), telling it to [delete any branches which no longer exist on the remote](http://linux.die.net/man/1/git-fetch). Set this option to `false` to disable it.
+By default, `git-up` will append the `--prune` flag to the `git fetch` command if your git version supports it (1.6.6 or greater), telling it to [remove any remote tracking branches which no longer exist on the remote](http://linux.die.net/man/1/git-fetch). Set this option to `false` to disable it.
+
+### `git-up.fetch.all [true|false]`
+
+Normally, `git-up` will only fetch remotes for which there is at least one local tracking branch. Setting this option will it `git-up` always fetch from all remotes, which is useful if e.g. you use a remote to push to your CI system but never check those branches out.
+
+### `git-up.rebase.arguments [string]`
+
+If this option is set, its contents will be used by `git-up` as additional arguments when it calls `git rebase`. For example, setting this to `--preserve-merges` will recreate your merge commits in the rebased branch.
+
+### `git-up.rebase.log-hook "COMMAND"`
+
+Runs COMMAND every time a branch is rebased or fast-forwarded, with the old head as $1 and the new head as $2. This can be used to view logs or diffs of incoming changes. For example: `'echo "changes on $1:"; git log --oneline --decorate $1..$2'`

data/lib/git-up.rb

@@ -5,7 +5,7 @@ class GitUp
   def run
     command = ['git', 'fetch', '--multiple']
     command << '--prune' if prune?
-    command += remotes
+    command += config("fetch.all") ? ['--all'] : remotes
 
     # puts command.join(" ") # TODO: implement a 'debug' config option
     system(*command)
@@ -29,6 +29,11 @@ class GitUp
   def rebase_all_branches
     col_width = branches.map { |b| b.name.length }.max + 1
 
+    branches.sort_by! do |b|
+      # perhaps add some way to customize sorting?
+      b.name
+    end
+
     branches.each do |branch|
       remote = remote_map[branch.name]
 
@@ -52,6 +57,7 @@ class GitUp
         puts "rebasing...".yellow
       end
 
+      log(branch, remote)
       checkout(branch.name)
       rebase(remote)
     end
@@ -138,10 +144,17 @@ class GitUp
     end
   end
 
+  def log(branch, remote)
+    if log_hook = config("rebase.log-hook")
+      system('sh', '-c', log_hook, 'git-up', branch.name, remote.name)
+    end
+  end
+
   def rebase(target_branch)
     current_branch = repo.head
+    arguments = config("rebase.arguments")
 
-    output, err = repo.git.sh("#{Grit::Git.git_binary} rebase #{target_branch.name}")
+    output, err = repo.git.sh("#{Grit::Git.git_binary} rebase #{arguments} #{target_branch.name}")
 
     unless on_branch?(current_branch.name) and is_fast_forward?(current_branch, target_branch)
       raise GitError.new("Failed to rebase #{current_branch.name} onto #{target_branch.name}", output+err)
@@ -243,14 +256,7 @@ EOS
 
   def change_count
     @change_count ||= begin
-      diff_status   = repo.status
-      actual_status = repo.git.status(:porcelain => true).split("\n").map {|l| l[3..-1]}
-    
-      added         = diff_status.added.select { |(x,y)| actual_status.include? x }
-      changed       = diff_status.changed.select { |(x,y)| actual_status.include? x }
-      deleted       = diff_status.deleted.select { |(x,y)| actual_status.include? x }
-    
-      added.length + changed.length + deleted.length
+      repo.git.status(:porcelain => true, :'untracked-files' => 'no').split("\n").count
     end
   end
 

data/lib/git-up/version.rb

@@ -1,3 +1,3 @@
 class GitUp
-  VERSION = "0.5.5"
+  VERSION = "0.5.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-up
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  requirement: &70332208938180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70332208938180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70332208937240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +40,15 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70332208937240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70332208936000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,7 +56,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70332208936000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - aanand.prasad@gmail.com
@@ -81,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: git command to fetch and rebase all branches