Permalink
Browse files

fix `browse` command for current repo and no tracking setup

  • Loading branch information...
1 parent 26d9c92 commit 15d26d5f2e7e2ff1a3a0aad73c540cf6af8c90da @mislav mislav committed Mar 29, 2011
Showing with 20 additions and 10 deletions.
  1. +1 −6 lib/hub/context.rb
  2. +19 −4 test/hub_test.rb
View
@@ -94,12 +94,7 @@ def remotes_group(name)
def current_remote
return if remotes.empty?
-
- if current_branch
- remote_for(current_branch)
- else
- default_remote
- end
+ (current_branch && remote_for(current_branch)) || default_remote
end
def default_remote
View
@@ -45,8 +45,6 @@ def setup
'config --get-all remote.mislav.url' => 'git://github.com/mislav/hub.git',
'config branch.master.remote' => 'origin',
'config branch.master.merge' => 'refs/heads/master',
- 'config branch.feature.remote' => 'mislav',
- 'config branch.feature.merge' => 'refs/heads/experimental',
'config --bool hub.http-clone' => 'false',
'config core.repositoryformatversion' => '0'
)
@@ -615,6 +613,7 @@ def test_hub_compare_tracking_nothing
def test_hub_compare_tracking_branch
stub_branch('refs/heads/feature')
+ stub_tracking('feature', 'mislav', 'refs/heads/experimental')
assert_command "compare",
"open https://github.com/mislav/hub/compare/experimental"
@@ -669,6 +668,7 @@ def test_hub_browse_subpage
def test_hub_browse_on_branch
stub_branch('refs/heads/feature')
+ stub_tracking('feature', 'mislav', 'refs/heads/experimental')
assert_command "browse resque", "open https://github.com/tpw/resque"
assert_command "browse resque commits",
@@ -687,6 +687,17 @@ def test_hub_browse_current
assert_command "browse --", "open https://github.com/defunkt/hub"
end
+ def test_hub_browse_no_tracking
+ stub_tracking_nothing
+ assert_command "browse", "open https://github.com/defunkt/hub"
+ end
+
+ def test_hub_browse_no_tracking_on_branch
+ stub_branch('refs/heads/feature')
+ stub_tracking('feature', nil, nil)
+ assert_command "browse", "open https://github.com/defunkt/hub"
+ end
+
def test_hub_browse_current_wiki
stub_repo_url 'git://github.com/defunkt/hub.wiki.git'
@@ -787,9 +798,13 @@ def stub_branch(value)
@git['symbolic-ref -q HEAD'] = value
end
+ def stub_tracking(from, remote_name, remote_branch)
+ @git["config branch.#{from}.remote"] = remote_name
+ @git["config branch.#{from}.merge"] = remote_branch
+ end
+
def stub_tracking_nothing
- @git['config branch.master.remote'] = nil
- @git['config branch.master.merge'] = nil
+ stub_tracking('master', nil, nil)
end
def stub_remotes_group(name, value)

0 comments on commit 15d26d5

Please sign in to comment.