Merge branch homebrew/master into linuxbrew/master

Conflicts:
	.github/CONTRIBUTING.md
	.github/ISSUE_TEMPLATE.md
	.github/PULL_REQUEST_TEMPLATE.md
	Library/Homebrew/cmd/pull.rb
	Library/Homebrew/cmd/test-bot.rb
	Library/Homebrew/cmd/update.sh
	Library/Homebrew/global.rb
	Library/Homebrew/tap.rb
	README.md
	share/doc/homebrew/Troubleshooting.md

Author: sjackman

.github/CONTRIBUTING.md

@@ -1,44 +1,6 @@
-# Contributing to Linuxbrew
-[Linuxbrew](https://github.com/Linuxbrew/linuxbrew) is a fork of [Homebrew](https://github.com/Homebrew/homebrew). Homebrew is merged into Linuxbrew roughly once per week. To contribute a new formula or a new version of an existing formula, please submit your pull request to Homebrew rather than to Linuxbrew. Patches to fix issues that you have reproduced on both Linuxbrew and Homebrew should be sent to Homebrew. Please send your pull request to Linuxbrew if you are in doubt.
+**DO NOT CREATE NEW ISSUES OR PULL REQUESTS ON THIS REPOSITORY!**
 
-Patches to fix issues particular to Linux should not affect the behaviour of the formula on Mac. Use `if OS.mac?` and `if OS.linux?` as necessary to preserve the existing behaviour on Mac.
-
-# Contributing to Homebrew
-First time contributing to Homebrew? Read our [Code of Conduct](https://github.com/Homebrew/homebrew/blob/master/CODEOFCONDUCT.md#code-of-conduct).
-
-### Report a bug
-
-* run `brew update` (twice)
-* run and read `brew doctor`
-* read [the Troubleshooting Checklist](https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/Troubleshooting.md#troubleshooting)
-* open an issue on the formula's repository
-
-### Submit a `1.2.3` version upgrade for the `foo` formula
-
-* check if the same upgrade has been already submitted by [searching the open pull requests for `foo`](https://github.com/Homebrew/homebrew/pulls?utf8=✓&q=is%3Apr+is%3Aopen+foo).
-* `brew edit foo`
-* edit [`url`](http://www.rubydoc.info/github/Homebrew/homebrew/master/Formula#url-class_method) and [`sha256`](http://www.rubydoc.info/github/Homebrew/homebrew/master/Formula#sha256%3D-class_method)/[`tag`](http://www.rubydoc.info/github/Homebrew/homebrew/master/Formula#url-class_method), leave the [`bottle`](http://www.rubydoc.info/github/Homebrew/homebrew/master/Formula#bottle-class_method) as-is
-* `brew install foo`
-* run `brew audit foo` and fix any issues
-* `git commit` with commit subject `foo 1.2.3`
-* [open a pull request](https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/How-To-Open-a-Homebrew-Pull-Request-(and-get-it-merged).md#how-to-open-a-homebrew-pull-request-and-get-it-merged) and fix any failing tests
-
-### Add a new formula for `foo` version `2.3.4` from `$URL`
-
-* read [the Formula Cookbook](https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/Formula-Cookbook.md#formula-cookbook) or: `brew create $URL` and make edits
-* `brew install foo`
-* `brew audit --online --strict foo`
-* `git commit` with message formatted `foo 2.3.4 (new formula)`
-* [open a pull request](https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/How-To-Open-a-Homebrew-Pull-Request-(and-get-it-merged).md#how-to-open-a-homebrew-pull-request-and-get-it-merged) and fix any failing tests
-
-### Contribute a fix to the `foo` formula
-
-* `brew edit foo` and make edits
-* leave the [`bottle`](http://www.rubydoc.info/github/Homebrew/homebrew/master/Formula#bottle-class_method) as-is
-* `brew install foo`, `brew test foo`, and `brew audit foo`
-* `git commit` with summary formatted `foo: fix <insert details>`
-* if it is a portability fix, format it as `foo: Fix for Linuxbrew`
-* format the rest of the commit message according to [Chris Beams' guidelines](http://chris.beams.io/posts/git-commit/)
-* [open a pull request](https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/How-To-Open-a-Homebrew-Pull-Request-(and-get-it-merged).md#how-to-open-a-homebrew-pull-request-and-get-it-merged) and fix any failing tests
-
-Thanks!
+- Please create all issues found when running `brew install` at https://github.com/Linuxbrew/homebrew-core/issues/new
+- Please create all issues found when running any other `brew` command at https://github.com/Linuxbrew/brew/issues/new
+- Please create formula pull requests at https://github.com/Linuxbrew/homebrew-core
+- Please create core code pull requests at https://github.com/Linuxbrew/brew

.github/ISSUE_TEMPLATE.md

@@ -1,20 +1,5 @@
-# Please follow the general troubleshooting steps first:
+DO NOT CREATE NEW ISSUES ON THIS REPOSITORY!
 
-- [ ] Ran `brew update` and retried your prior step?
-- [ ] Ran `brew doctor`, fixed as many issues as possible and retried your prior step?
-- [ ] If you're seeing permission errors tried running `sudo chown -R $(whoami) $(brew --prefix)`?
+Please create all issues found when running `brew install` at https://github.com/Linuxbrew/homebrew-core/issues/new
 
-_You can erase any parts of this template not applicable to your Issue._
-
-### Bug reports:
-
-Please replace this line with a brief summary of your issue **AND** if reporting a build issue include the link from:
-
-`brew gist-logs <formula>`
-(where `<formula>` is the name of the formula that failed to build).
-
-### Feature/Formula Requests:
-
-**Please note by far the quickest way to get a new feature or formula into Linuxbrew is to file a [Pull Request](https://github.com/Linuxbrew/linuxbrew/blob/master/.github/CONTRIBUTING.md).**
-
-We will consider your request but it may be closed if it's something we're not actively planning to work on.
+Please create all issues found when running any other `brew` command at https://github.com/Linuxbrew/brew/issues/new

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,26 +1,5 @@
-# Contributing to Linuxbrew:
+DO NOT CREATE NEW PULL REQUESTS ON THIS REPOSITORY!
 
-To contribute a new formula or a new version of an existing formula, please submit your pull request to [Homebrew](https://github.com/Homebrew/homebrew) rather than to Linuxbrew. Patches to fix issues that you have reproduced on both Linuxbrew and Homebrew should be sent to Homebrew. Please send your pull request to Linuxbrew if you are in doubt.
+Please create formula pull requests at https://github.com/Linuxbrew/homebrew-core
 
-Patches to fix issues particular to Linux should not affect the behaviour of the formula on Mac. Use `if OS.mac?` and `if OS.linux?` as necessary to preserve the existing behaviour on Mac. For example, to add a new dependency that is not necessary on Mac:
-
-```ruby
-depends_on "zlib" unless OS.mac?
-```
-
-### All Submissions:
-
-_You can erase any parts of this template not applicable to your Pull Request._
-
-- [ ] Have you followed the guidelines in our [Contributing](https://github.com/Linuxbrew/linuxbrew/blob/master/.github/CONTRIBUTING.md) document?
-- [ ] Have you checked to ensure there aren't other open [Pull Requests](https://github.com/Linuxbrew/linuxbrew/pulls) for the same update/change?
-- [ ] Have you included a log of the failed build without your patch using `brew gist-logs <formula>`?
-- [ ] Does your submission pass
-`brew audit --strict <formula>` (where `<formula>` is the name of the formula you're submitting)?
-- [ ] Have you built your formula locally prior to submission with `brew install <formula>`?
-
-### Changes to Linuxbrew's Core:
-
-- [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
-- [ ] Have you written new tests for your core changes, as applicable? [Here's an example](https://github.com/Homebrew/homebrew/pull/49031) if you'd like one.
-- [ ] Have you successfully ran `brew tests` with your changes locally?
+Please create core code pull requests at https://github.com/Linuxbrew/brew

CODEOFCONDUCT.md

@@ -1,25 +1 @@
-# Code of Conduct
-The Homebrew community is made up of members from around the globe with a diverse set of skills, personalities, and experiences. It is through these differences that our community experiences great successes and continued growth. When you're working with members of the community, we encourage you to follow these guidelines which help steer our interactions and strive to keep Homebrew a positive, successful, and growing community.
-
-A member of the Homebrew community is:
-
-## Open
-Members of the community are open to collaboration, whether it's on GitHub, email, IRC or otherwise. We're receptive to constructive comment and criticism, as the experiences and skill sets of other members contribute to the whole of our efforts. We're accepting of all who wish to take part in our activities, fostering an environment where anyone can participate and everyone can make a difference.
-
-## Considerate
-Members of the community are considerate of their peers - other Homebrew users. We're thoughtful when addressing the efforts of others, keeping in mind that oftentimes their labor was completed simply for the good of the community. We're attentive in our communications, whether in person or online, and we're tactful when approaching differing views.
-
-## Respectful
-Members of the community are respectful. We're respectful of others, their positions, their skills, their commitments, and their efforts. We're respectful of the volunteer efforts that permeate the Homebrew community. We're respectful of the processes set forth in the community, and we work within them. When we disagree, we are courteous in raising our issues.
-
-Overall, we're good to each other. We contribute to this community not because we have to, but because we want to. If we remember that, these guidelines will come naturally.
-
-# Diversity
-The Homebrew community welcomes and encourages participation by everyone. Our community is based on mutual respect, tolerance, and encouragement, and we are working to help each other live up to these principles. We want our community to be more diverse: whoever you are, and whatever your background, we welcome you.
-
-We have created this diversity statement because we believe that a diverse Homebrew community is stronger and more vibrant. A diverse community where people treat each other with respect has more potential contributors and more sources for ideas.
-
-Although we have phrased the formal diversity statement generically to make it all-inclusive, we recognise that there are specific attributes that are used to discriminate against people. In alphabetical order, some of these attributes include (but are not limited to): age, culture, ethnicity, gender identity or expression, national origin, physical or mental difference, politics, race, religion, sex, sexual orientation, socio-economic status, and subculture. We welcome people regardless of the values of these or other attributes.
-
-# Attribution
-This code of conduct is heavily based on the [Python Community Code of Conduct](https://www.python.org/psf/codeofconduct/) and the [Python Diversity Statement](https://www.python.org/community/diversity/).
+Moved to https://github.com/Homebrew/brew/blob/master/CODEOFCONDUCT.md.

Library/Formula/nesc.rb

@@ -7,7 +7,7 @@ class Nesc < Formula
   depends_on "automake" => :build
   depends_on "autoconf" => :build
   depends_on :java => :build
-  depends_on :emacs => :build
+  depends_on :emacs => ["21.1", :build]
 
   bottle do
     cellar :any_skip_relocation

Library/Homebrew/cmd/audit.rb

@@ -904,8 +904,8 @@ def audit_reverse_migration
 
     if formula.tap.tap_migrations.key?(formula.name)
       problem <<-EOS.undent
-       #{formula.name} seems to be listed in tap_migrations.rb!
-       Please remove #{formula.name} from present tap & tap_migrations.rb
+       #{formula.name} seems to be listed in tap_migrations.json!
+       Please remove #{formula.name} from present tap & tap_migrations.json
        before submitting it to Homebrew/homebrew.
       EOS
     end

Library/Homebrew/cmd/config.rb

@@ -1,6 +1,7 @@
 require "hardware"
 require "software_spec"
 require "rexml/document"
+require "tap"
 
 module Homebrew
   def config
@@ -75,6 +76,18 @@ def origin
     Homebrew.git_origin || "(none)"
   end
 
+  def core_tap_head
+    CoreTap.instance.git_head || "(none)"
+  end
+
+  def core_tap_last_commit
+    CoreTap.instance.git_last_commit || "never"
+  end
+
+  def core_tap_origin
+    CoreTap.instance.remote || "(none)"
+  end
+
   def describe_path(path)
     return "N/A" if path.nil?
     realpath = path.realpath
@@ -167,6 +180,13 @@ def dump_verbose_config(f = $stdout)
     f.puts "ORIGIN: #{origin}"
     f.puts "HEAD: #{head}"
     f.puts "Last commit: #{last_commit}"
+    if CoreTap.instance.installed?
+      f.puts "Core tap ORIGIN: #{core_tap_origin}"
+      f.puts "Core tap HEAD: #{core_tap_head}"
+      f.puts "Core tap last commit: #{core_tap_last_commit}"
+    else
+      f.puts "Core tap: N/A"
+    end
     f.puts "HOMEBREW_PREFIX: #{HOMEBREW_PREFIX}"
     f.puts "HOMEBREW_REPOSITORY: #{HOMEBREW_REPOSITORY}"
     f.puts "HOMEBREW_CELLAR: #{HOMEBREW_CELLAR}"

Library/Homebrew/cmd/prune.rb

@@ -37,8 +37,6 @@ def prune
       end
     end
 
-    migrate_taps :force => true unless ARGV.dry_run?
-
     if ObserverPathnameExtension.total.zero?
       puts "Nothing pruned" if ARGV.verbose?
     else

Library/Homebrew/cmd/pull.rb

@@ -18,6 +18,8 @@
 #   --resolve:   When a patch fails to apply, leave in progress and allow user to
 #                 resolve, instead of aborting
 #   --branch-okay: Do not warn if pulling to a branch besides master (useful for testing)
+#   --legacy:    Pull legacy formula PR from Homebrew/homebrew
+#                (TODO remove it when it's not longer necessary)
 
 require "utils"
 require "utils/json"
@@ -37,12 +39,17 @@ def pull
     github_repo = ""
     bintray_project = "homebrew"
     bintray_fetch_formulae = []
+    tap = nil
 
     ARGV.named.each do |arg|
       if arg.to_i > 0
         issue = arg
         if OS.mac?
-          url = "https://github.com/Homebrew/homebrew/pull/#{arg}"
+          if ARGV.include? "--legacy"
+            url = "https://github.com/Homebrew/homebrew/pull/#{arg}"
+          else
+            url = "https://github.com/Homebrew/homebrew-core/pull/#{arg}"
+          end
         elsif OS.linux?
           url = "https://github.com/Linuxbrew/linuxbrew/pull/#{arg}"
           bintray_project = "linuxbrew"
@@ -51,7 +58,7 @@ def pull
         tap = CoreTap.instance
       elsif (testing_match = arg.match %r{brew.sh/job/Homebrew.*Testing/(\d+)/})
         _, testing_job = *testing_match
-        url = "https://github.com/Homebrew/homebrew/compare/master...BrewTestBot:testing-#{testing_job}"
+        url = "https://github.com/Homebrew/homebrew-core/compare/master...BrewTestBot:testing-#{testing_job}"
         tap = CoreTap.instance
         odie "Testing URLs require `--bottle`!" unless ARGV.include?("--bottle")
       elsif (url_match = arg.match %r[https://github\.com/Linuxbrew/linuxbrew/pull/(\d+)\?([\w-]+):([\w-]+)])
@@ -67,21 +74,29 @@ def pull
         github_repo = "Linuxbrew/linuxbrew"
       elsif (api_match = arg.match HOMEBREW_PULL_API_REGEX)
         _, user, repo, issue = *api_match
-        url = "https://github.com/#{user}/homebrew#{repo}/pull/#{issue}"
-        tap = Tap.fetch(user, "homebrew#{repo}")
+        url = "https://github.com/#{user}/#{repo}/pull/#{issue}"
+        tap = Tap.fetch(user, repo) if repo.start_with?("homebrew-") || ARGV.include?("--legacy")
       elsif (url_match = arg.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX)
         url, user, repo, issue = *url_match
-        tap = Tap.fetch(user, "homebrew#{repo}")
+        tap = Tap.fetch(user, repo) if repo.start_with?("homebrew-") || ARGV.include?("--legacy")
       else
         odie "Not a GitHub pull request or commit: #{arg}"
       end
 
       if !testing_job && ARGV.include?("--bottle") && issue.nil?
-        raise "No pull request detected!"
+        odie "No pull request detected!"
       end
 
-      tap.install unless tap.installed?
-      Dir.chdir tap.path
+      if ARGV.include?("--legacy") && !tap.core_tap?
+        odie "--legacy can only be used for CoreTap!"
+      end
+
+      if tap
+        tap.install unless tap.installed?
+        Dir.chdir tap.path
+      else
+        Dir.chdir HOMEBREW_REPOSITORY
+      end
 
       # The cache directory seems like a good place to put patches.
       HOMEBREW_CACHE.mkpath
@@ -97,6 +112,11 @@ def pull
       patch_puller = PatchPuller.new(url)
       patch_puller.fetch_patch
       patch_changes = files_changed_in_patch(patch_puller.patchpath, tap)
+
+      if ARGV.include?("--legacy") && patch_changes[:others].reject { |f| f.start_with? "Library/Aliases" }.any?
+        odie "Cannot merge legacy PR!"
+      end
+
       is_bumpable = patch_changes[:formulae].length == 1 && patch_changes[:others].empty?
       if do_bump
         odie "No changed formulae found to bump" if patch_changes[:formulae].empty?
@@ -112,16 +132,18 @@ def pull
 
       changed_formulae = []
 
-      Utils.popen_read(
-        "git", "diff-tree", "-r", "--name-only",
-        "--diff-filter=AM", revision, "HEAD", "--", tap.formula_dir.to_s
-      ).each_line do |line|
-        name = "#{tap.name}/#{File.basename(line.chomp, ".rb")}"
-        begin
-          changed_formulae << Formula[name]
-        # Make sure we catch syntax errors.
-        rescue Exception
-          next
+      if tap
+        Utils.popen_read(
+          "git", "diff-tree", "-r", "--name-only",
+          "--diff-filter=AM", revision, "HEAD", "--", tap.formula_dir.to_s
+        ).each_line do |line|
+          name = "#{tap.name}/#{File.basename(line.chomp, ".rb")}"
+          begin
+            changed_formulae << Formula[name]
+          # Make sure we catch syntax errors.
+          rescue Exception
+            next
+          end
         end
       end
 
@@ -144,11 +166,13 @@ def pull
       orig_message = message = `git log HEAD^.. --format=%B`
       if issue && !ARGV.include?("--clean")
         ohai "Patch closes issue ##{issue}"
-        # If this is a pull request, append a close message.
-        closes = "Closes #{github_repo}##{issue}."
-        unless message.include? closes
-          message += "\n#{closes}"
+        if ARGV.include?("--legacy")
+          close_message = "Closes Homebrew/homebrew##{issue}."
+        else
+          close_message = "Closes #{github_repo}##{issue}."
         end
+        # If this is a pull request, append a close message.
+        message += "\n#{close_message}" unless message.include? close_message
       end
 
       if changed_formulae.empty?
@@ -198,7 +222,16 @@ def pull
             "https://github.com/BrewTestBot/homebrew-#{tap.repo}/compare/homebrew:master...pr-#{issue}"
           end
         end
-        curl "--silent", "--fail", "-o", "/dev/null", "-I", bottle_commit_url
+
+        bottle_commit_fallbacked = false
+        begin
+          curl "--silent", "--fail", "-o", "/dev/null", "-I", bottle_commit_url
+        rescue ErrorDuringExecution
+          raise if !ARGV.include?("--legacy") || bottle_commit_fallbacked
+          bottle_commit_url = "https://github.com/BrewTestBot/homebrew/compare/homebrew:master...pr-#{issue}"
+          bottle_commit_fallbacked = true
+          retry
+        end
 
         safe_system "git", "checkout", "-B", bottle_branch, revision
         pull_patch bottle_commit_url
@@ -303,10 +336,18 @@ def apply_patch
 
       # Fall back to three-way merge if patch does not apply cleanly
       patch_args << "-3"
+      patch_args << "-p2" if ARGV.include?("--legacy") && !base_url.include?("BrewTestBot/homebrew-core")
       patch_args << patchpath
 
+      start_revision = `git rev-parse HEAD`.strip
+
       begin
         safe_system "git", "am", *patch_args
+        if ARGV.include?("--legacy")
+          safe_system "git", "filter-branch", "-f", "--msg-filter",
+                             "sed -E -e \"s/ (#[0-9]+)/ Homebrew\\/homebrew\\1/g\"",
+                             "#{start_revision}..HEAD"
+        end
       rescue ErrorDuringExecution
         if ARGV.include? "--resolve"
           odie "Patch failed to apply: try to resolve it."
@@ -331,7 +372,7 @@ def files_changed_in_patch(patchfile, tap)
       files << $1 if line =~ %r{^\+\+\+ b/(.*)}
     end
     files.each do |file|
-      if tap.formula_file?(file)
+      if (tap && tap.formula_file?(file)) || (ARGV.include?("--legacy") && file.start_with?("Library/Formula/"))
         formula_name = File.basename(file, ".rb")
         formulae << formula_name unless formulae.include?(formula_name)
       else

Library/Homebrew/cmd/readall.rb

@@ -38,7 +38,6 @@ def readall
     if ARGV.named.empty?
       formulae = Formula.files
       alias_dirs = Tap.map(&:alias_dir)
-      alias_dirs.unshift CoreTap.instance.alias_dir
     else
       tap = Tap.fetch(ARGV.named.first)
       raise TapUnavailableError, tap.name unless tap.installed?

Library/Homebrew/cmd/tap-info.rb

@@ -10,8 +10,6 @@ def tap_info
       end
     end
 
-    raise "#{tap} is not allowed" if taps.any?(&:core_tap?)
-
     if ARGV.json == "v1"
       print_tap_json(taps)
     else