KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-12-08 12:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding linguist_vendored? and linguist_generated? to include overrides from .gitattributes

Browse Source
This commit is contained in:
Arfon Smith
2014-09-24 19:57:30 -05:00
parent 178d4756ef
commit f87436d499
3 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/linguist/lazy_blob.rb
View File

@@ -4,7 +4,7 @@ require 'rugged'
module Linguist
class LazyBlob
GIT_ATTR = ['linguist-ignore', 'linguist-lang']
GIT_ATTR = ['linguist-language', 'linguist-vendored', 'linguist-generated']
GIT_ATTR_OPTS = { :priority => [:index], :skip_system => true }
GIT_ATTR_FLAGS = Rugged::Repository::Attributes.parse_opts(GIT_ATTR_OPTS)
@@ -29,12 +29,16 @@ module Linguist
name, GIT_ATTR, GIT_ATTR_FLAGS)
end
def ignored?
!!git_attributes['linguist-ignore']
def linguist_vendored?
vendored? || !!git_attributes['linguist-vendored']
end
def linguist_generated?
generated? || !!git_attributes['linguist-generated']
end
def overriden_language
if lang = git_attributes['linguist-lang']
if lang = git_attributes['linguist-language']
Language.find_by_name(lang)
end
end

2
lib/linguist/repository.rb
View File

@@ -142,7 +142,7 @@ module Linguist
blob = Linguist::LazyBlob.new(repository, delta.new_file[:oid], new, mode.to_s(8))
# Skip vendored or generated blobs
next if blob.ignored? || blob.vendored? || blob.generated? || blob.language.nil?
next if blob.linguist_vendored? || blob.linguist_generated? || blob.language.nil?
# Only include programming languages and acceptable markup languages
if blob.language.type == :programming || Language.detectable_markup.include?(blob.language.name)