Permalink
Browse files

Merge branch 'master' into gitfactor

Conflicts:
	scraper
  • Loading branch information...
2 parents 67cccfb + d1aea34 commit 77910de3f134a839e2b4f838db04e1d823145bce @bronson bronson committed Nov 2, 2011
Showing with 5 additions and 19 deletions.
  1. +1 −1 Gemfile.lock
  2. +2 −3 lib/gitrepo.rb
  3. +2 −15 scraper
View
@@ -7,7 +7,7 @@ GIT
GIT
remote: git://github.com/bronson/retryable.git
- revision: 5a10ec299969275847580ed5369c88323912e4cd
+ revision: 6bf1a505c8a8d03d486b713e606e5f920aa01b39
specs:
retryable (0.9.0)
View
@@ -93,15 +93,14 @@ def push *args
end
- # todo: get rid of branch since we should only ever produce commits on master.
- def create_tag name, message, committer, branch='master'
+ def create_tag name, message, committer
# gitrb doesn't handle annotated tags so we call git directly
# todo: this blows away the environment, should set env after forking & before execing
ENV['GIT_COMMITTER_NAME'] = committer[:name]
ENV['GIT_COMMITTER_EMAIL'] = committer[:email]
ENV['GIT_COMMITTER_DATE'] = (committer[:date] || Time.now).strftime("%s %z")
- result = git :tag, '-a', name, '-m', message, branch
+ result = git :tag, '-a', name, '-m', message
ENV.delete 'GIT_COMMITTER_NAME'
ENV.delete 'GIT_COMMITTER_EMAIL'
View
@@ -159,10 +159,6 @@ $file_location_fixes = {
3027 => { /^root\/\.vim\/(.*)$/ => '\1' }, # grsecurity balled up his entire root dir
}
-# at least one script is actually multiple scripts -- 790 has python.vim and python3.0.vim
-# this forces package names matching the regex out to a different branch
-$branch_versions = { 790 => { :branch => 'python3', :regex => /^python3\.0\.vim$/ } }
-
# Version nazi
raise "Must run under Ruby 1.9.2" unless RUBY_VERSION == "1.9.2"
@@ -1247,15 +1243,6 @@ def store_versions_in_repo repo, script
count = 0
script['versions'].reverse.each do |version|
- # todo: get rid of this... we only mirror the master branch. and branch below
- branch = 'master'
- matcher = $branch_versions[script['script_id'].to_i]
- if matcher && version['filename'] =~ matcher[:regex]
- branch = matcher[:branch]
- end
- repo.branch = branch unless repo.branch == branch
- # endtodo
-
# todo: rather than bailing, we should bit-for-bit verify
tagname = gittagify(script_version(version))
next if repo.find_tag(tagname)
@@ -1267,7 +1254,7 @@ def store_versions_in_repo repo, script
:date => Time.new(*version['date'].split('-'), 0, 0, 0, 0) }
catch :corrupt do
- puts " adding #{version['filename']} #{version['date']} #{script_version(version)} to branch #{branch}"
+ puts " adding #{version['filename']} #{version['date']} #{script_version(version)}"
repo.commit(fix_release_notes(version), author, committer) do |commit|
commit.empty_index
add_version commit, version, script
@@ -1277,7 +1264,7 @@ def store_versions_in_repo repo, script
end
sver = script_version(version)
puts " tagging with #{gittagify(sver)} from #{sver}"
- repo.create_tag gittagify(sver), "tag #{sver}", committer, branch
+ repo.create_tag gittagify(sver), "tag #{sver}", committer
count += 1
end
end

0 comments on commit 77910de

Please sign in to comment.