hub 1.10.6 → 1.11.0

data/README.md

@@ -31,16 +31,21 @@ Installing on OS X is easiest with Homebrew:
 $ brew install hub
 ~~~
 
-### Standalone
+### `rake install` from source
 
-`hub` is easily installed as a standalone script:
+This is the preferred installation method when no package manager that
+supports hub is available:
 
 ~~~ sh
-$ curl http://defunkt.io/hub/standalone -sLo ~/bin/hub &&
-  chmod +x ~/bin/hub
+# Download or clone the project from GitHub:
+$ git clone git://github.com/github/hub.git
+$ cd hub
+$ rake install
 ~~~
 
-Assuming "~/bin/" is in your `$PATH`, you're ready to roll:
+On a Unix-based OS, this installs under `PREFIX`, which is `/usr/local` by default.
+
+Now you should be ready to roll:
 
 ~~~ sh
 $ hub version
@@ -48,12 +53,9 @@ git version 1.7.6
 hub version 1.8.3
 ~~~
 
-#### On Windows
+#### Windows "Git Bash" (msysGit) note
 
-If you have mysysgit, open "Git Bash" and follow the steps above but put the
-`hub` executable in `/bin` instead of `~/bin`.
-
-Avoid aliasing hub as `git` due to the fact that mysysgit automatically
+Avoid aliasing hub as `git` due to the fact that msysGit automatically
 configures your prompt to include git information, and you want to avoid slowing
 that down. See [Is your shell prompt slow?](#is-your-shell-prompt-slow)
 
@@ -78,16 +80,6 @@ $ hub hub standalone > ~/bin/hub && chmod +x ~/bin/hub
 This installs a standalone version which doesn't require RubyGems to
 run, so it's faster.
 
-### Source
-
-You can also install from source:
-
-~~~ sh
-$ git clone git://github.com/defunkt/hub.git
-$ cd hub
-$ rake install prefix=/usr/local
-~~~
-
 ### Help! It's slow!
 
 #### Is `hub` noticeably slower than plain git?
@@ -153,8 +145,8 @@ eval "$(hub alias -s)"
 hub repository contains tab-completion scripts for bash and zsh. These scripts
 complement existing completion scripts that ship with git.
 
-* [hub bash completion](https://github.com/defunkt/hub/blob/master/etc/hub.bash_completion.sh)
-* [hub zsh completion](https://github.com/defunkt/hub/blob/master/etc/hub.zsh_completion)
+* [hub bash completion](https://github.com/github/hub/blob/master/etc/hub.bash_completion.sh)
+* [hub zsh completion](https://github.com/github/hub/blob/master/etc/hub.zsh_completion)
 
 
 Commands
@@ -213,15 +205,15 @@ superpowers:
 ### git am, git apply
 
     $ git am https://github.com/defunkt/hub/pull/55
-    > curl https://github.com/defunkt/hub/pull/55.patch -o /tmp/55.patch
+    [ downloads patch via API ]
     > git am /tmp/55.patch
 
     $ git am --ignore-whitespace https://github.com/davidbalbert/hub/commit/fdb9921
-    > curl https://github.com/davidbalbert/hub/commit/fdb9921.patch -o /tmp/fdb9921.patch
+    [ downloads patch via API ]
     > git am --ignore-whitespace /tmp/fdb9921.patch
 
     $ git apply https://gist.github.com/8da7fb575debd88c54cf
-    > curl https://gist.github.com/8da7fb575debd88c54cf.txt -o /tmp/gist-8da7fb575debd88c54cf.txt
+    [ downloads patch via API ]
     > git apply /tmp/gist-8da7fb575debd88c54cf.txt
 
 ### git fork
@@ -238,10 +230,7 @@ superpowers:
     [ opened pull request on GitHub for "YOUR_USER:feature" ]
 
     # explicit title, pull base & head:
-    $ git pull-request "I've implemented feature X" -b defunkt:master -h mislav:feature
-
-    $ git pull-request -i 123
-    [ attached pull request to issue #123 ]
+    $ git pull-request -m "Implemented feature X" -b defunkt:master -h mislav:feature
 
 ### git checkout
 
@@ -326,15 +315,21 @@ superpowers:
 
 ### git submodule
 
-    $ hub submodule add wycats/bundler vendor/bundler
+    $ git submodule add wycats/bundler vendor/bundler
     > git submodule add git://github.com/wycats/bundler.git vendor/bundler
 
-    $ hub submodule add -p wycats/bundler vendor/bundler
+    $ git submodule add -p wycats/bundler vendor/bundler
     > git submodule add git@github.com:wycats/bundler.git vendor/bundler
 
-    $ hub submodule add -b ryppl --name pip ryppl/pip vendor/pip
+    $ git submodule add -b ryppl --name pip ryppl/pip vendor/pip
     > git submodule add -b ryppl --name pip git://github.com/ryppl/pip.git vendor/pip
 
+### git ci-status
+
+    $ git ci-status [commit]
+    > (prints CI state of commit and exits with appropriate code)
+    > One of: success (0), error (1), failure (1), pending (2), no status (3)
+
 
 ### git help
 
@@ -369,40 +364,13 @@ $ git clone defunkt/repl
 ~~~
 
 
-Contributing
-------------
-
-These instructions assume that _you already have hub installed_ and aliased as
-`git` (see "Aliasing").
-
-1. Clone hub:  
-    `git clone defunkt/hub && cd hub`
-1. Ensure Bundler is installed:  
-    `which bundle || gem install bundler`
-1. Install development dependencies:  
-    `bundle install`
-2. Verify that existing tests pass:  
-    `bundle exec rake`
-3. Create a topic branch:  
-    `git checkout -b feature`
-4. **Make your changes.** (It helps a lot if you write tests first.)
-5. Verify that tests still pass:  
-    `bundle exec rake`
-6. Fork hub on GitHub (adds a remote named "YOUR_USER"):  
-    `git fork`
-7. Push to your fork:  
-    `git push -u YOUR_USER feature`
-8. Open a pull request describing your changes:  
-    `git pull-request`
-
-
 Meta
 ----
 
-* Home: <https://github.com/defunkt/hub>
-* Bugs: <https://github.com/defunkt/hub/issues>
+* Home: <https://github.com/github/hub>
+* Bugs: <https://github.com/github/hub/issues>
 * Gem: <https://rubygems.org/gems/hub>
-* Authors: <https://github.com/defunkt/hub/contributors>
+* Authors: <https://github.com/github/hub/contributors>
 
 ### Prior art
 

data/Rakefile

@@ -7,6 +7,7 @@ require 'rake/testtask'
 def command?(util)
   Rake::Task[:load_path].invoke
   context = Object.new
+  require 'uri'
   require 'hub/context'
   context.extend Hub::Context
   context.send(:command?, util)
@@ -31,9 +32,7 @@ task :default => [:test, :features]
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
-  t.ruby_opts << '-rubygems'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
 end
 
 task :features do
@@ -71,7 +70,7 @@ if command? :ronn
 
   # generate man page with ronn
   compile_ronn = lambda { |destination, type, contents|
-    File.popen("ronn --pipe --#{type} --organization=DEFUNKT --manual='Git Manual'", 'w+') { |io|
+    File.popen("ronn --pipe --#{type} --organization=GITHUB --manual='Hub Manual'", 'w+') { |io|
       io.write contents
       io.close_write
       File.open(destination, 'w') { |f| f << io.read }
@@ -97,6 +96,7 @@ end
 
 file "hub" => FileList.new("lib/hub.rb", "lib/hub/*.rb", "man/hub.1") do |task|
   Rake::Task[:load_path].invoke
+  require 'hub/version'
   require 'hub/standalone'
   Hub::Standalone.save(task.name)
 end
@@ -104,15 +104,24 @@ end
 desc "Build standalone script"
 task :standalone => "hub"
 
-desc "Install standalone script and man pages"
+desc %{Install standalone script and man page.
+On Unix-based OS, installs into PREFIX (default: `/usr/local`).
+On Windows, installs into Ruby's main bin directory.}
 task :install => "hub" do
-  prefix = ENV['PREFIX'] || ENV['prefix'] || '/usr/local'
-
-  FileUtils.mkdir_p "#{prefix}/bin"
-  FileUtils.cp "hub", "#{prefix}/bin", :preserve => true
-
-  FileUtils.mkdir_p "#{prefix}/share/man/man1"
-  FileUtils.cp "man/hub.1", "#{prefix}/share/man/man1"
+  require 'rbconfig'
+  if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+    bindir = RbConfig::CONFIG['bindir']
+    File.open(File.join(bindir, 'hub.bat'), 'w') { |f| f.write('@"ruby.exe" "%~dpn0" %*') }
+    FileUtils.cp 'hub', bindir
+  else
+    prefix = ENV['PREFIX'] || ENV['prefix'] || '/usr/local'
+
+    FileUtils.mkdir_p "#{prefix}/bin"
+    FileUtils.cp "hub", "#{prefix}/bin", :preserve => true
+
+    FileUtils.mkdir_p "#{prefix}/share/man/man1"
+    FileUtils.cp "man/hub.1", "#{prefix}/share/man/man1"
+  end
 end
 
 #
@@ -152,17 +161,17 @@ task :homebrew do
     sh 'git pull -q origin master'
 
     formula_file = 'Library/Formula/hub.rb'
-    sha = `curl -#L https://github.com/defunkt/hub/tarball/v#{Hub::VERSION} | shasum`.split(/\s+/).first
+    sha = `curl -fsSL https://github.com/github/hub/archive/v#{Hub::VERSION}.tar.gz | shasum`.split(/\s+/).first
     abort unless $?.success? and sha.length == 40
 
     formula = File.read formula_file
-    formula.sub! /\bv\d+(\.\d+)*/, "v#{Hub::VERSION}"
-    formula.sub! /\b[0-9a-f]{40}\b/, sha
+    formula.sub!(/\bv\d+(\.\d+)*/, "v#{Hub::VERSION}")
+    formula.sub!(/\b[0-9a-f]{40}\b/, sha)
     File.open(formula_file, 'w') {|f| f << formula }
 
     branch = "hub-v#{Hub::VERSION}"
     sh "git checkout -q -B #{branch}"
-    sh "git commit -m 'upgrade hub to v#{Hub::VERSION}' -- #{formula_file}"
+    sh "git commit -m 'hub v#{Hub::VERSION}' -- #{formula_file}"
     sh "git push -u mislav #{branch}"
     sh "hub pull-request 'upgrade hub to v#{Hub::VERSION}'"
 

data/bin/bench

@@ -0,0 +1,37 @@
+#!/bin/bash
+set -e
+
+iterations=20
+
+ruby="$(rbenv which ruby)"
+ruby_args="--disable-gems"
+
+unset RUBYLIB
+unset RUBYOPT
+
+export TIMEFORMAT='%3R'
+
+time_ruby() {
+  (time "$ruby" $ruby_args "$@" >/dev/null) 2>&1
+}
+
+time_plain() {
+  (time "$@" >/dev/null) 2>&1
+}
+
+measure() {
+  local count="$iterations"
+  echo "$@"
+  { while [ "$count" -gt 0 ]; do
+      # time_ruby "$@"
+      time_plain "$@"
+      count=$((count - 1))
+    done
+  } | stdev
+}
+
+/usr/bin/ruby -v
+measure tmp/hub-slow version
+measure tmp/hub-slow browse -u
+measure tmp/hub-fast version
+measure tmp/hub-fast browse -u

data/lib/hub.rb

@@ -1,4 +1,5 @@
 require 'hub/version' unless defined?(Hub::VERSION)
+require 'hub/speedy_stdlib'
 require 'hub/args'
 require 'hub/ssh_config'
 require 'hub/github_api'

data/lib/hub/commands.rb

@@ -38,7 +38,7 @@ module Hub
     OWNER_RE = /[a-zA-Z0-9][a-zA-Z0-9-]*/
     NAME_WITH_OWNER_RE = /^(?:#{NAME_RE}|#{OWNER_RE}\/#{NAME_RE})$/
 
-    CUSTOM_COMMANDS = %w[alias create browse compare fork pull-request]
+    CUSTOM_COMMANDS = %w[alias create browse compare fork pull-request ci-status]
 
     def run(args)
       slurp_global_flags(args)
@@ -70,16 +70,58 @@ module Hub
       abort "fatal: #{err.message}"
     end
 
+
+    # $ hub ci-status
+    # $ hub ci-status 6f6d9797f9d6e56c3da623a97cfc3f45daf9ae5f
+    # $ hub ci-status master
+    # $ hub ci-status origin/master
+    def ci_status(args)
+      args.shift
+      ref = args.words.first || 'HEAD'
+      verbose = args.include?('-v')
+
+      unless project = local_repo.main_project
+        abort "Aborted: the origin remote doesn't point to a GitHub repository."
+      end
+
+      unless sha = local_repo.git_command("rev-parse -q #{ref}")
+        abort "Aborted: no revision could be determined from '#{ref}'"
+      end
+
+      statuses = api_client.statuses(project, sha)
+      status = statuses.first
+      if status
+        ref_state = status['state']
+        ref_target_url = status['target_url']
+      else
+        ref_state = 'no status'
+        ref_target_url = nil
+      end
+
+      exit_code = case ref_state
+        when 'success'          then 0
+        when 'failure', 'error' then 1
+        when 'pending'          then 2
+        else 3
+        end
+
+      if verbose and ref_target_url
+        $stdout.puts "%s: %s" % [ref_state, ref_target_url]
+      else
+        $stdout.puts ref_state
+      end
+      exit exit_code
+    end
+
     # $ hub pull-request
     # $ hub pull-request "My humble contribution"
-    # $ hub pull-request -i 92
     # $ hub pull-request https://github.com/rtomayko/tilt/issues/92
     def pull_request(args)
       args.shift
       options = { }
       force = explicit_owner = false
       base_project = local_repo.main_project
-      head_project = local_repo.current_project
+      tracked_branch, head_project = remote_branch_and_project(method(:github_user))
 
       unless current_branch
         abort "Aborted: not currently on any branch."
@@ -101,6 +143,13 @@ module Hub
         case arg
         when '-f'
           force = true
+        when '-F', '--file'
+          file = args.shift
+          text = file == '-' ? $stdin.read : File.read(file)
+          options[:title], options[:body] = read_msg(text)
+        when '-m', '--message'
+          text = args.shift
+          options[:title], options[:body] = read_msg(text)
         when '-b'
           base_project, options[:base] = from_github_ref.call(args.shift, base_project)
         when '-h'
@@ -113,17 +162,24 @@ module Hub
           if url = resolve_github_url(arg) and url.project_path =~ /^issues\/(\d+)/
             options[:issue] = $1
             base_project = url.project
-          elsif !options[:title] then options[:title] = arg
+          elsif !options[:title]
+            options[:title] = arg
+            warn "hub: Specifying pull request title without a flag is deprecated."
+            warn "Please use one of `-m' or `-F' options."
           else
             abort "invalid argument: #{arg}"
           end
         end
       end
 
+      if options[:issue]
+        warn "Warning: Issue to pull request conversion is deprecated and might not work in the future."
+      end
+
       options[:project] = base_project
       options[:base] ||= master_branch.short_name
 
-      if tracked_branch = options[:head].nil? && current_branch.upstream
+      if options[:head].nil? && tracked_branch
         if !tracked_branch.remote?
           # The current branch is tracking another local branch. Pretend there is
           # no upstream configuration at all.
@@ -136,12 +192,6 @@ module Hub
       end
       options[:head] ||= (tracked_branch || current_branch).short_name
 
-      # when no tracking, assume remote branch is published under active user's fork
-      user = github_user(head_project.host)
-      if head_project.owner != user and !tracked_branch and !explicit_owner
-        head_project = head_project.owned_by(user)
-      end
-
       remote_branch = "#{head_project.remote}/#{options[:head]}"
       options[:head] = "#{head_project.owner}:#{options[:head]}"
 
@@ -174,8 +224,9 @@ module Hub
             [format, base_branch, remote_branch]
         end
 
-        options[:title], options[:body] = pullrequest_editmsg(commit_summary) { |msg|
-          msg.puts default_message if default_message
+        options[:title], options[:body] = pullrequest_editmsg(commit_summary) { |msg, initial_message|
+          initial_message ||= default_message
+          msg.puts initial_message if initial_message
           msg.puts ""
           msg.puts "# Requesting a pull to #{base_project.owner}:#{options[:base]} from #{options[:head]}"
           msg.puts "#"
@@ -196,8 +247,16 @@ module Hub
         warn "Are you sure that #{base_url} exists?"
       end
       exit 1
+    else
+      delete_editmsg
     end
 
+    # $ hub e-note
+    # $ hub e-note "My humble contribution"
+    # $ hub e-note -i 92
+    # $ hub e-note https://github.com/rtomayko/tilt/issues/92
+    alias_method :e_note, :pull_request
+
     # $ hub clone rtomayko/tilt
     # > git clone git://github.com/rtomayko/tilt.
     #
@@ -225,7 +284,10 @@ module Hub
             name, owner = arg, nil
             owner, name = name.split('/', 2) if name.index('/')
             project = github_project(name, owner || github_user)
-            ssh ||= args[0] != 'submodule' && project.owner == github_user(project.host) { }
+            unless ssh || args[0] == 'submodule' || args.noop? || https_protocol?
+              repo_info = api_client.repo_info(project)
+              ssh = repo_info.success? && (repo_info.data['private'] || repo_info.data['permissions']['push'])
+            end
             args[idx] = project.git_url(:private => ssh, :https => https_protocol?)
           end
           break
@@ -381,8 +443,9 @@ module Hub
 
         idx = args.index url_arg
         args.delete_at idx
-        args.insert idx, merge_head, '--no-ff', '-m',
-                    "Merge pull request ##{pull_id} from #{merge_head}\n\n#{pull_data['title']}"
+        args.insert idx, merge_head, '-m', "Merge pull request ##{pull_id} from #{merge_head}\n\n#{pull_data['title']}"
+        idx = args.index '-m'
+        args.insert idx, '--no-ff' unless args.include?('--ff-only')
       end
     end
 
@@ -421,27 +484,40 @@ module Hub
     end
 
     # $ hub am https://github.com/defunkt/hub/pull/55
-    # > curl https://github.com/defunkt/hub/pull/55.patch -o /tmp/55.patch
+    # ... downloads patch via API ...
     # > git am /tmp/55.patch
     def am(args)
       if url = args.find { |a| a =~ %r{^https?://(gist\.)?github\.com/} }
         idx = args.index(url)
-        gist = $1 == 'gist.'
-        # strip the fragment part of the url
-        url = url.sub(/#.+/, '')
-        # strip extra path from "pull/42/files", "pull/42/commits"
-        url = url.sub(%r{(/pull/\d+)/\w*$}, '\1') unless gist
-        ext = gist ? '.txt' : '.patch'
-        url += ext unless File.extname(url) == ext
-        patch_file = File.join(tmp_dir, "#{gist ? 'gist-' : ''}#{File.basename(url)}")
-        # TODO: remove dependency on curl
-        args.before 'curl', ['-#LA', "hub #{Hub::Version}", url, '-o', patch_file]
+        if $1 == 'gist.'
+          path_parts = $'.sub(/#.*/, '').split('/')
+          gist_id = path_parts.last
+          patch_name = "gist-#{gist_id}.txt"
+          patch = api_client.gist_raw(gist_id)
+        else
+          gh_url = resolve_github_url(url)
+          case gh_url.project_path
+          when /^pull\/(\d+)/
+            pull_id = $1.to_i
+            patch_name = "#{pull_id}.patch"
+            patch = api_client.pullrequest_patch(gh_url.project, pull_id)
+          when /^commit\/([a-f0-9]{7,40})/
+            commit_sha = $1
+            patch_name = "#{commit_sha}.patch"
+            patch = api_client.commit_patch(gh_url.project, commit_sha)
+          else
+            raise ArgumentError, url
+          end
+        end
+
+        patch_file = File.join(tmp_dir, patch_name)
+        File.open(patch_file, 'w') { |file| file.write(patch) }
         args[idx] = patch_file
       end
     end
 
     # $ hub apply https://github.com/defunkt/hub/pull/55
-    # > curl https://github.com/defunkt/hub/pull/55.patch -o /tmp/55.patch
+    # ... downloads patch via API ...
     # > git apply /tmp/55.patch
     alias_method :apply, :am
 
@@ -594,8 +670,8 @@ module Hub
           branch = master_branch
         else
           # $ hub browse
-          project = current_project
-          branch = current_branch && current_branch.upstream || master_branch
+          branch, project = remote_branch_and_project(method(:github_user))
+          branch ||= master_branch
         end
 
         abort "Usage: hub browse [<USER>/]<REPOSITORY>" unless project
@@ -603,9 +679,9 @@ module Hub
         # $ hub browse -- wiki
         path = case subpage = args.shift
         when 'commits'
-          "/commits/#{branch.short_name}"
+          "/commits/#{branch_in_url(branch)}"
         when 'tree', NilClass
-          "/tree/#{branch.short_name}" if branch and !branch.master?
+          "/tree/#{branch_in_url(branch)}" if branch and !branch.master?
         else
           "/#{subpage}"
         end
@@ -625,11 +701,10 @@ module Hub
     def compare(args)
       args.shift
       browse_command(args) do
+        branch, project = remote_branch_and_project(method(:github_user))
         if args.empty?
-          branch = current_branch.upstream
           if branch and not branch.master?
             range = branch.short_name
-            project = current_project
           else
             abort "Usage: hub compare [USER] [<START>...]<END>"
           end
@@ -637,9 +712,9 @@ module Hub
           sha_or_tag = /((?:#{OWNER_RE}:)?\w[\w.-]+\w)/
           # replaces two dots with three: "sha1...sha2"
           range = args.pop.sub(/^#{sha_or_tag}\.\.#{sha_or_tag}$/, '\1...\2')
-          project = if owner = args.pop then github_project(nil, owner)
-                    else current_project
-                    end
+          if owner = args.pop
+            project = project.owned_by(owner)
+          end
         end
 
         project.web_url "/compare/#{range}"
@@ -680,23 +755,23 @@ module Hub
 
       if script
         puts "alias git=hub"
-        if 'zsh' == shell
-          puts "if type compdef >/dev/null; then"
-          puts "   compdef hub=git"
-          puts "fi"
-        end
       else
         profile = case shell
           when 'bash' then '~/.bash_profile'
           when 'zsh'  then '~/.zshrc'
           when 'ksh'  then '~/.profile'
+          when 'fish' then '~/.config/fish/config.fish'
           else
             'your profile'
           end
 
         puts "# Wrap git automatically by adding the following to #{profile}:"
         puts
-        puts 'eval "$(hub alias -s)"'
+        if shell == 'fish'
+          puts 'eval (hub alias -s)'
+        else
+          puts 'eval "$(hub alias -s)"'
+        end
       end
 
       exit
@@ -715,13 +790,19 @@ module Hub
     def help(args)
       command = args.words[1]
 
-      if command == 'hub'
+      if command == 'hub' || custom_command?(command)
         puts hub_manpage
         exit
-      elsif command.nil? && !args.has_flag?('-a', '--all')
-        ENV['GIT_PAGER'] = '' unless args.has_flag?('-p', '--paginate') # Use `cat`.
-        puts improved_help_text
-        exit
+      elsif command.nil?
+        if args.has_flag?('-a', '--all')
+          # Add the special hub commands to the end of "git help -a" output.
+          args.after 'echo', ["\nhub custom commands\n"]
+          args.after 'echo', CUSTOM_COMMANDS.map {|cmd| "  #{cmd}" }
+        else
+          ENV['GIT_PAGER'] = '' unless args.has_flag?('-p', '--paginate') # Use `cat`.
+          puts improved_help_text
+          exit
+        end
       end
     end
     alias_method "--help", :help
@@ -732,18 +813,22 @@ module Hub
     # from the command line.
     #
 
+    def branch_in_url(branch)
+      CGI.escape(branch.short_name).gsub("%2F", "/")
+    end
+
     def api_client
       @api_client ||= begin
         config_file = ENV['HUB_CONFIG'] || '~/.config/hub'
         file_store = GitHubAPI::FileStore.new File.expand_path(config_file)
         file_config = GitHubAPI::Configuration.new file_store
-        GitHubAPI.new file_config, :app_url => 'http://defunkt.io/hub/'
+        GitHubAPI.new file_config, :app_url => 'http://hub.github.com/'
       end
     end
 
     def github_user host = nil, &block
       host ||= (local_repo(false) || Context::LocalRepo).default_host
-      api_client.config.username(host, &block)
+      api_client.username_via_auth_dance(host, &block)
     end
 
     def custom_command? cmd
@@ -818,6 +903,7 @@ GitHub Commands:
    create         Create this repository on GitHub and add GitHub as origin
    browse         Open a GitHub page in the default browser
    compare        Open a compare page on GitHub
+   ci-status      Show the CI status of a commit
 
 See 'git help <command>' for more information on a specific command.
 help
@@ -900,7 +986,8 @@ help
     # in order to turn our raw roff (manpage markup) into something
     # readable on the terminal.
     def groff_command
-      "groff -Wall -mtty-char -mandoc -Tascii"
+      cols = terminal_width
+      "groff -Wall -mtty-char -mandoc -Tascii -rLL=#{cols}n -rLT=#{cols}n"
     end
 
     # Returns the raw hub manpage. If we're not running in standalone
@@ -944,7 +1031,8 @@ help
         Kernel.select [STDIN]
 
         pager = ENV['GIT_PAGER'] ||
-          `git config --get-all core.pager`.split.first || ENV['PAGER'] ||
+          `git config --get-all core.pager`.split("\n").first ||
+          ENV['PAGER'] ||
           'less -isr'
 
         pager = 'cat' if pager.empty?
@@ -962,24 +1050,53 @@ help
     end
 
     def pullrequest_editmsg(changes)
-      message_file = File.join(git_dir, 'PULLREQ_EDITMSG')
+      message_file = pullrequest_editmsg_file
+
+      if valid_editmsg_file?(message_file)
+        title, body = read_editmsg(message_file)
+        previous_message = [title, body].compact.join("\n\n") if title
+      end
+
       File.open(message_file, 'w') { |msg|
-        yield msg
+        yield msg, previous_message
         if changes
           msg.puts "#\n# Changes:\n#"
           msg.puts changes.gsub(/^/, '# ').gsub(/ +$/, '')
         end
       }
+
       edit_cmd = Array(git_editor).dup
-      edit_cmd << '-c' << 'set ft=gitcommit' if edit_cmd[0] =~ /^[mg]?vim$/
+      edit_cmd << '-c' << 'set ft=gitcommit tw=0 wrap lbr' if edit_cmd[0] =~ /^[mg]?vim$/
       edit_cmd << message_file
       system(*edit_cmd)
-      abort "can't open text editor for pull request message" unless $?.success?
+
+      unless $?.success?
+        # writing was cancelled, or the editor never opened in the first place
+        delete_editmsg(message_file)
+        abort "error using text editor for pull request message"
+      end
+
       title, body = read_editmsg(message_file)
       abort "Aborting due to empty pull request title" unless title
       [title, body]
     end
 
+    # This unfortunate hack is because older versions of hub never cleaned up
+    # the pullrequest_editmsg_file, which newer hub would pick up and
+    # misinterpret as a message which should be reused after a failed PR.
+    def valid_editmsg_file?(message_file)
+      File.exists?(message_file) &&
+        File.mtime(message_file) > File.mtime(__FILE__)
+    end
+
+    def read_msg(message)
+      message.split("\n\n", 2).each {|s| s.strip! }.reject {|s| s.empty? }
+    end
+
+    def pullrequest_editmsg_file
+      File.join(git_dir, 'PULLREQ_EDITMSG')
+    end
+
     def read_editmsg(file)
       title, body = '', ''
       File.open(file, 'r') { |msg|
@@ -995,6 +1112,10 @@ help
       [title =~ /\S/ ? title : nil, body =~ /\S/ ? body : nil]
     end
 
+    def delete_editmsg(file = pullrequest_editmsg_file)
+      File.delete(file) if File.exist?(file)
+    end
+
     def expand_alias(cmd)
       if expanded = git_alias_for(cmd)
         if expanded.index('!') != 0
@@ -1003,7 +1124,7 @@ help
         end
       end
     end
-    
+
     def display_api_exception(action, response)
       $stderr.puts "Error #{action}: #{response.message.strip} (HTTP #{response.status})"
       if 422 == response.status and response.error_message?