admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Update references to masterbrew

Browse Source 
I left update_from_masterbrew! as a historical reference.
This commit is contained in:
Max Howell 2009-09-18 14:32:21 +01:00
parent a8d6a695bc
commit 3d421c8649
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/brew.h.rb
View File

@ -97,8 +97,8 @@ def info name
user=''
user=`git config --global github.user`.chomp if system "which git > /dev/null"
user='mxcl' if user.empty?
# FIXME it would be nice if we didn't assume the default branch is masterbrew
history="http://github.com/#{user}/homebrew/commits/masterbrew/Library/Formula/#{Formula.path(name).basename}"
# FIXME it would be nice if we didn't assume the default branch is master
history="http://github.com/#{user}/homebrew/commits/master/Library/Formula/#{Formula.path(name).basename}"
exec 'open', history if ARGV.flag? '--github'

16
Library/Homebrew/unittest.rb
View File

@ -514,8 +514,8 @@ class BeerTasting <Test::Unit::TestCase
def test_updater_update_homebrew_without_any_changes
outside_prefix do
updater = RefreshBrewMock.new
updater.in_prefix_expect("git checkout masterbrew")
updater.in_prefix_expect("git pull origin masterbrew", "Already up-to-date.\n")
updater.in_prefix_expect("git checkout master")
updater.in_prefix_expect("git pull origin master", "Already up-to-date.\n")
assert_equal false, updater.update_from_masterbrew!
assert updater.expectations_met?
@ -526,9 +526,9 @@ class BeerTasting <Test::Unit::TestCase
def test_updater_update_homebrew_without_formulae_changes
outside_prefix do
updater = RefreshBrewMock.new
updater.in_prefix_expect("git checkout masterbrew")
updater.in_prefix_expect("git checkout master")
output = fixture('update_git_pull_output_without_formulae_changes')
updater.in_prefix_expect("git pull origin masterbrew", output)
updater.in_prefix_expect("git pull origin master", output)
assert_equal true, updater.update_from_masterbrew!
assert !updater.pending_formulae_changes?
@ -539,9 +539,9 @@ class BeerTasting <Test::Unit::TestCase
def test_updater_update_homebrew_with_formulae_changes
outside_prefix do
updater = RefreshBrewMock.new
updater.in_prefix_expect("git checkout masterbrew")
updater.in_prefix_expect("git checkout master")
output = fixture('update_git_pull_output_with_formulae_changes')
updater.in_prefix_expect("git pull origin masterbrew", output)
updater.in_prefix_expect("git pull origin master", output)
assert_equal true, updater.update_from_masterbrew!
assert updater.pending_formulae_changes?
@ -584,7 +584,7 @@ update_git_pull_output_without_formulae_changes: |
remote: Total 39 (delta 20), reused 0 (delta 0)
Unpacking objects: 100% (39/39), done.
From git://github.com/mxcl/homebrew
* branch masterbrew -> FETCH_HEAD
* branch master -> FETCH_HEAD
Updating 14ef7f9..f414bc8
Fast forward
Library/Homebrew/ARGV+yeast.rb | 35 ++--
@ -604,7 +604,7 @@ update_git_pull_output_with_formulae_changes: |
remote: Total 39 (delta 20), reused 0 (delta 0)
Unpacking objects: 100% (39/39), done.
From git://github.com/mxcl/homebrew
* branch masterbrew -> FETCH_HEAD
* branch master -> FETCH_HEAD
Updating 14ef7f9..f414bc8
Fast forward
Library/Contributions/brew_bash_completion.sh | 6 +-

4
Library/Homebrew/update.rb
View File

@ -22,8 +22,8 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
class RefreshBrew
CHECKOUT_COMMAND = 'git checkout masterbrew'
UPDATE_COMMAND = 'git pull origin masterbrew'
CHECKOUT_COMMAND = 'git checkout master'
UPDATE_COMMAND = 'git pull origin master'
REVISION_COMMAND = 'git log -l -1 --pretty=format:%H'
GIT_UP_TO_DATE = 'Already up-to-date.'
UPDATED_FORMULA = %r{^\s+Library/Formula/(.+?)\.rb\s}

2
bin/brew
View File

@ -55,7 +55,7 @@ begin
# please improve it! :)
exec 'mate', *Dir["#{HOMEBREW_PREFIX}/Library/*"]<<
"#{HOMEBREW_PREFIX}/bin/brew"<<
"#{HOMEBREW_PREFIX}/README"
"#{HOMEBREW_PREFIX}/README*"
else
exec_editor *ARGV.formulae.collect {|f| f.path}
end