hub 1.8.1 → 1.8.2

data/README.md

@@ -201,7 +201,7 @@ superpowers:
 
     # $ git checkout https://github.com/defunkt/hub/pull/73
     # > git remote add -f -t feature git://github:com/mislav/hub.git
-    # > git checkout -b mislav-feature mislav/feature
+    # > git checkout --track -B mislav-feature mislav/feature
 
     # $ git checkout https://github.com/defunkt/hub/pull/73 custom-branch-name
 

data/lib/hub/commands.rb

@@ -34,7 +34,7 @@ module Hub
     # provides git interrogation methods
     extend Context
 
-    NAME_RE = /[\w.-]+/
+    NAME_RE = /\w[\w.-]*/
     OWNER_RE = /[a-zA-Z0-9-]+/
     NAME_WITH_OWNER_RE = /^(?:#{NAME_RE}|#{OWNER_RE}\/#{NAME_RE})$/
 
@@ -125,7 +125,7 @@ module Hub
       remote_branch = "#{head_project.remote}/#{options[:head]}"
       options[:head] = "#{head_project.owner}:#{options[:head]}"
 
-      if !force and tracked_branch and local_commits = git_command("rev-list --cherry #{remote_branch}...")
+      if !force and tracked_branch and local_commits = rev_list(remote_branch, nil)
         $stderr.puts "Aborted: #{local_commits.split("\n").size} commits are not yet pushed to #{remote_branch}"
         warn "(use `-f` to force submit a pull request anyway)"
         abort
@@ -138,10 +138,25 @@ module Hub
 
       unless options[:title] or options[:issue]
         base_branch = "#{base_project.remote}/#{options[:base]}"
-        changes = git_command "log --no-color --pretty=medium --cherry %s...%s" %
-          [base_branch, remote_branch]
+        commits = rev_list(base_branch, remote_branch).to_s.split("\n")
+
+        case commits.size
+        when 0
+          default_message = commit_summary = nil
+        when 1
+          format = '%w(78,0,0)%s%n%+b'
+          default_message = git_command "show -s --format='#{format}' #{commits.first}"
+          commit_summary = nil
+        else
+          format = '%h (%aN, %ar)%n%w(78,3,3)%s%n%+b'
+          default_message = nil
+          commit_summary = git_command "log --no-color --format='%s' --cherry %s...%s" %
+            [format, base_branch, remote_branch]
+        end
 
-        options[:title], options[:body] = pullrequest_editmsg(changes) { |msg|
+        options[:title], options[:body] = pullrequest_editmsg(commit_summary) { |msg|
+          msg.puts default_message if default_message
+          msg.puts ""
           msg.puts "# Requesting a pull to #{base_project.owner}:#{options[:base]} from #{options[:head]}"
           msg.puts "#"
           msg.puts "# Write a message for this pull request. The first block"
@@ -181,7 +196,7 @@ module Hub
         else
           # $ hub clone rtomayko/tilt
           # $ hub clone tilt
-          if arg =~ NAME_WITH_OWNER_RE
+          if arg =~ NAME_WITH_OWNER_RE and !File.directory?(arg)
             # FIXME: this logic shouldn't be duplicated here!
             name, owner = arg, nil
             owner, name = name.split('/', 2) if name.index('/')
@@ -303,17 +318,20 @@ module Hub
 
     # $ git checkout https://github.com/defunkt/hub/pull/73
     # > git remote add -f -t feature git://github:com/mislav/hub.git
-    # > git checkout -b mislav-feature mislav/feature
+    # > git checkout --track -B mislav-feature mislav/feature
     def checkout(args)
-      if (2..3) === args.length and url = resolve_github_url(args[1]) and url.project_path =~ /^pull\/(\d+)/
+      _, url_arg, new_branch_name = args.words
+      if url = resolve_github_url(url_arg) and url.project_path =~ /^pull\/(\d+)/
         pull_id = $1
 
         load_net_http
         response = http_request(url.project.api_pullrequest_url(pull_id, 'json'))
         pull_data = JSON.parse(response.body)['pull']
 
+        args.delete new_branch_name
         user, branch = pull_data['head']['label'].split(':', 2)
-        new_branch_name = args[2] || "#{user}-#{branch}"
+        abort "Error: #{user}'s fork is not available anymore" unless pull_data['head']['repository']
+        new_branch_name ||= "#{user}-#{branch}"
 
         if remotes.include? user
           args.before ['remote', 'set-branches', '--add', user, branch]
@@ -323,7 +341,9 @@ module Hub
                                                                :https => https_protocol?)
           args.before ['remote', 'add', '-f', '-t', branch, user, url]
         end
-        args[1..-1] = ['-b', new_branch_name, "#{user}/#{branch}"]
+        idx = args.index url_arg
+        args.delete_at idx
+        args.insert idx, '--track', '-B', new_branch_name, "#{user}/#{branch}"
       end
     end
 
@@ -353,7 +373,7 @@ module Hub
           args[args.index(ref)] = sha
 
           if remote = project.remote and remotes.include? remote
-            args.before ['fetch', remote]
+            args.before ['fetch', remote.to_s]
           else
             args.before ['remote', 'add', '-f', project.owner, project.git_url(:https => https_protocol?)]
           end
@@ -368,6 +388,8 @@ module Hub
       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'
@@ -891,14 +913,15 @@ help
     def pullrequest_editmsg(changes)
       message_file = File.join(git_dir, 'PULLREQ_EDITMSG')
       File.open(message_file, 'w') { |msg|
-        msg.puts
         yield msg
         if changes
           msg.puts "#\n# Changes:\n#"
           msg.puts changes.gsub(/^/, '# ').gsub(/ +$/, '')
         end
       }
-      edit_cmd = Array(git_editor).dup << message_file
+      edit_cmd = Array(git_editor).dup
+      edit_cmd << '-c' << 'set ft=gitcommit' 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?
       title, body = read_editmsg(message_file)

data/lib/hub/context.rb

@@ -431,6 +431,10 @@ module Hub
       git_config "alias.#{name}"
     end
 
+    def rev_list(a, b)
+      git_command("rev-list --cherry-pick --right-only --no-merges #{a}...#{b}")
+    end
+
     PWD = Dir.pwd
 
     def current_dir

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.8.1'
+  Version = VERSION = '1.8.2'
 end

data/test/helper.rb

@@ -16,7 +16,13 @@ class Test::Unit::TestCase
   # shell: hub clone rtomayko/tilt
   #  test: Hub("clone rtomayko/tilt")
   def Hub(args)
-    Hub::Runner.new(*args.split(' '))
+    runner = Hub::Runner.new(*args.split(' ').map {|a| a.freeze })
+    runner.args.commands.each do |cmd|
+      if Array === cmd and invalid = cmd.find {|c| !c.respond_to? :to_str }
+        raise "#{invalid.inspect} is not a string (in #{cmd.join(' ').inspect})"
+      end
+    end
+    runner
   end
 
   # Shortcut for running the `hub` command in a subprocess. Returns

data/test/hub_test.rb

@@ -160,6 +160,16 @@ class HubTest < Test::Unit::TestCase
     assert_forwarded "clone ./test"
   end
 
+  def test_unchanged_clone_from_existing_directory
+    stub_no_git_repo
+    assert_forwarded "clone test"
+  end
+
+  def test_local_clone_with_destination
+    stub_no_git_repo
+    assert_forwarded "clone -l . ../copy"
+  end
+
   def test_clone_with_host_alias
     stub_no_git_repo
     assert_forwarded "clone server:git/repo.git"
@@ -461,7 +471,7 @@ class HubTest < Test::Unit::TestCase
     with_tmpdir('/tmp/') do
       assert_commands "curl -#LA 'hub #{Hub::Version}' https://github.com/defunkt/hub/pull/55.patch -o /tmp/55.patch",
                       "git am --signoff /tmp/55.patch -p2",
-                      "am --signoff https://github.com/defunkt/hub/pull/55 -p2"
+                      "am --signoff https://github.com/defunkt/hub/pull/55#comment_123 -p2"
 
       cmd = Hub("am https://github.com/defunkt/hub/pull/55/files").command
       assert_includes '/pull/55.patch', cmd
@@ -806,7 +816,7 @@ class HubTest < Test::Unit::TestCase
 
   def test_pullrequest_with_unpushed_commits
     stub_tracking('master', 'mislav', 'master')
-    stub_command_output "rev-list --cherry mislav/master...", "+abcd1234\n+bcde2345"
+    stub_command_output "rev-list --cherry-pick --right-only --no-merges mislav/master...", "+abcd1234\n+bcde2345"
 
     expected = "Aborted: 2 commits are not yet pushed to mislav/master\n" <<
       "(use `-f` to force submit a pull request anyway)\n"
@@ -829,7 +839,7 @@ class HubTest < Test::Unit::TestCase
   def test_pullrequest_from_tracking_branch
     stub_branch('refs/heads/feature')
     stub_tracking('feature', 'mislav', 'yay-feature')
-    stub_command_output "rev-list --cherry mislav/master...", nil
+    stub_command_output "rev-list --cherry-pick --right-only --no-merges mislav/master...", nil
 
     stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
       with(:body => { 'pull' => {'base' => "master", 'head' => "mislav:yay-feature", 'title' => "hereyougo"} }).
@@ -846,7 +856,7 @@ class HubTest < Test::Unit::TestCase
     stub_github_token('789xyz', 'git.my.org')
     stub_branch('refs/heads/feature')
     stub_tracking_nothing('feature')
-    stub_command_output "rev-list --cherry origin/feature...", nil
+    stub_command_output "rev-list --cherry-pick --right-only --no-merges origin/feature...", nil
 
     stub_request(:post, "https://#{auth('myfiname', '789xyz')}git.my.org/api/v2/json/pulls/defunkt/hub").
       with(:body => { 'pull' => {'base' => "master", 'head' => "myfiname:feature", 'title' => "hereyougo"} }).
@@ -904,7 +914,7 @@ class HubTest < Test::Unit::TestCase
   def test_pullrequest_existing_issue
     stub_branch('refs/heads/myfix')
     stub_tracking('myfix', 'mislav', 'awesomefix')
-    stub_command_output "rev-list --cherry mislav/awesomefix...", nil
+    stub_command_output "rev-list --cherry-pick --right-only --no-merges mislav/awesomefix...", nil
 
     stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
       with(:body => { 'pull' => {'base' => "master", 'head' => "mislav:awesomefix", 'issue' => '92'} }).
@@ -917,7 +927,7 @@ class HubTest < Test::Unit::TestCase
   def test_pullrequest_existing_issue_url
     stub_branch('refs/heads/myfix')
     stub_tracking('myfix', 'mislav', 'awesomefix')
-    stub_command_output "rev-list --cherry mislav/awesomefix...", nil
+    stub_command_output "rev-list --cherry-pick --right-only --no-merges mislav/awesomefix...", nil
 
     stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/mojombo/hub").
       with(:body => { 'pull' => {'base' => "master", 'head' => "mislav:awesomefix", 'issue' => '92'} }).
@@ -947,8 +957,8 @@ class HubTest < Test::Unit::TestCase
       to_return(:body => mock_pull_response('blueyed:feature'))
 
     assert_commands 'git remote add -f -t feature blueyed git://github.com/blueyed/hub.git',
-      'git checkout -b blueyed-feature blueyed/feature',
-      "checkout https://github.com/defunkt/hub/pull/73/files"
+      'git checkout -f --track -B blueyed-feature blueyed/feature -q',
+      "checkout -f https://github.com/defunkt/hub/pull/73/files -q"
   end
 
   def test_checkout_private_pullrequest
@@ -956,7 +966,7 @@ class HubTest < Test::Unit::TestCase
       to_return(:body => mock_pull_response('blueyed:feature', :private))
 
     assert_commands 'git remote add -f -t feature blueyed git@github.com:blueyed/hub.git',
-      'git checkout -b blueyed-feature blueyed/feature',
+      'git checkout --track -B blueyed-feature blueyed/feature',
       "checkout https://github.com/defunkt/hub/pull/73/files"
   end
 
@@ -965,7 +975,7 @@ class HubTest < Test::Unit::TestCase
       to_return(:body => mock_pull_response('blueyed:feature'))
 
     assert_commands 'git remote add -f -t feature blueyed git://github.com/blueyed/hub.git',
-      'git checkout -b review blueyed/feature',
+      'git checkout --track -B review blueyed/feature',
       "checkout https://github.com/defunkt/hub/pull/73/files review"
   end
 
@@ -977,7 +987,7 @@ class HubTest < Test::Unit::TestCase
 
     assert_commands 'git remote set-branches --add blueyed feature',
       'git fetch blueyed +refs/heads/feature:refs/remotes/blueyed/feature',
-      'git checkout -b blueyed-feature blueyed/feature',
+      'git checkout --track -B blueyed-feature blueyed/feature',
       "checkout https://github.com/defunkt/hub/pull/73/files"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hub
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-02-07 00:00:00.000000000 Z
 dependencies: []
 description: ! "  `hub` is a command line utility which adds GitHub knowledge to `git`.\n\n
   \ It can used on its own or as a `git` wrapper.\n\n  Normal:\n\n      $ hub clone