Initial attempt to migrate all references to the old svn repo to the new git repo
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/3f607216 Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/3f607216 Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/3f607216 Branch: refs/heads/master Commit: 3f607216e35626b092875184fdbd97068043a067 Parents: 52c3b03 Author: Peter Donald <[email protected]> Authored: Sun Feb 23 10:12:23 2014 +1100 Committer: Peter Donald <[email protected]> Committed: Sun Feb 23 10:12:23 2014 +1100 ---------------------------------------------------------------------- README.rdoc | 9 +++------ buildr.buildfile | 2 +- buildr.gemspec | 2 +- doap.rdf | 4 ++-- doc/contributing.textile | 22 ++++------------------ doc/download.textile | 2 +- rakelib/release.rake | 21 +++++++++------------ rakelib/stage.rake | 4 +--- 8 files changed, 22 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/3f607216/README.rdoc ---------------------------------------------------------------------- diff --git a/README.rdoc b/README.rdoc index db52ad1..79e487c 100644 --- a/README.rdoc +++ b/README.rdoc @@ -94,14 +94,11 @@ When prompted for a platform, select ruby. == Living On the Edge -You can check the latest sources from SVN: +You can check the latest sources from GIT: - svn co http://svn.apache.org/repos/asf/buildr/trunk + git clone http://git.apache.org/buildr.git -Or browse the SVN repository online: -http://svn.apache.org/repos/asf/buildr - -If you prefer Git, a Git mirror is available from http://github.com/apache/buildr: +If you prefer GitHub, a mirror is available from http://github.com/apache/buildr: git clone git://github.com/apache/buildr.git http://git-wip-us.apache.org/repos/asf/buildr/blob/3f607216/buildr.buildfile ---------------------------------------------------------------------- diff --git a/buildr.buildfile b/buildr.buildfile index 16f4d01..a0f64cb 100644 --- a/buildr.buildfile +++ b/buildr.buildfile @@ -44,7 +44,7 @@ define 'buildr' do spec.homepage = "http://buildr.apache.org"; spec.rubyforge_project = 'buildr' spec.extra_rdoc_files = legal - spec.rdoc_options << '--webcvs' << 'http://svn.apache.org/repos/asf/buildr/trunk/' + spec.rdoc_options << '--webcvs' << 'https://github.com/apache/buildr' spec.add_dependency 'buildr', '~> 1.3' end http://git-wip-us.apache.org/repos/asf/buildr/blob/3f607216/buildr.gemspec ---------------------------------------------------------------------- diff --git a/buildr.gemspec b/buildr.gemspec index 562fb5f..7fd63db 100644 --- a/buildr.gemspec +++ b/buildr.gemspec @@ -48,7 +48,7 @@ for those one-off tasks, with a language that's a joy to use. spec.extra_rdoc_files = 'README.rdoc', 'CHANGELOG', 'LICENSE', 'NOTICE' spec.rdoc_options = '--title', 'Buildr', '--main', 'README.rdoc', - '--webcvs', 'http://svn.apache.org/repos/asf/buildr/trunk/' + '--webcvs', 'https://github.com/apache/buildr' spec.post_install_message = "To get started run buildr --help" spec.required_rubygems_version = ">= 1.8.6" http://git-wip-us.apache.org/repos/asf/buildr/blob/3f607216/doap.rdf ---------------------------------------------------------------------- diff --git a/doap.rdf b/doap.rdf index 1828e6f..3ff0da2 100644 --- a/doap.rdf +++ b/doap.rdf @@ -292,8 +292,8 @@ </release> <repository> <SVNRepository> - <location rdf:resource="http://svn.apache.org/repos/asf/buildr"/> - <browse rdf:resource="http://svn.apache.org/viewvc/buildr"/> + <location rdf:resource="http://git.apache.org/buildr.git"/> + <browse rdf:resource="https://github.com/apache/buildr"/> </SVNRepository> </repository> <maintainer> http://git-wip-us.apache.org/repos/asf/buildr/blob/3f607216/doc/contributing.textile ---------------------------------------------------------------------- diff --git a/doc/contributing.textile b/doc/contributing.textile index 9e6658b..8a7b20e 100644 --- a/doc/contributing.textile +++ b/doc/contributing.textile @@ -76,19 +76,9 @@ h2(#edge). Living on the edge Did we mention Buildr is an open source project? In fact, when you install Buildr you get all the source code, documentation, test case and everything you need to use it, extend it and patch it. Have a look in your Gem directory. -h3(#svn). SVN +h3(#git). GIT -But if you want to work with the latest and greatest, you'll want to check out "Buildr from SVN":http://svn.apache.org/repos/asf/buildr: - -{% highlight sh %} -$ svn co http://svn.apache.org/repos/asf/buildr/trunk buildr -{% endhighlight %} - -You can also browse the "Buildr repository":http://svn.apache.org/repos/asf/buildr. - -h3(#git). Git - -Not a fan of SVN? We understand. You can also use the "official Apache Git clone.":http://git.apache.org This clone is maintained by the ASF and kept in sync with the SVN repository (though, in practice there may be some delay in cloning recent commits). Apache's Git hosting supports both git:// and http:// protocols (you should use git:// if at all possible as it is faster than http://): +But if you want to work with the latest and greatest, you'll want to check out Buildr from source control. You can use the "official Apache Git clone.":http://git.apache.org This clone is maintained by the ASF and kept in sync with the SVN repository (though, in practice there may be some delay in cloning recent commits). Apache's Git hosting supports both git:// and http:// protocols (you should use git:// if at all possible as it is faster than http://): {% highlight sh %} $ git clone git://git.apache.org/buildr.git @@ -102,11 +92,7 @@ And keep this "Git cheat sheet":http://ktown.kde.org/~zrusin/git/git-cheat-sheet h4. GitHub -You are also welcome to fork or clone the "Buildr repository on GitHub":http://github.com/apache/buildr. This repository is just an exact mirror of the official Apache Git clone referenced above (updated every 30 minutes). Some of the core committers also maintain their own forks of Buildr on GitHub, often containing experimental and in-progress development slated for eventual inclusion into the SVN. For reference, they are listed below: - -* "Assaf Arkin":http://github.com/assaf/buildr -* "Victor Hugo Borja":http://github.com/vic/buildr -* "Daniel Spiewak":http://github.com/djspiewak/buildr +You are also welcome to fork or clone the "Buildr repository on GitHub":http://github.com/apache/buildr. This repository is just an exact mirror of the official Apache Git clone referenced above (updated every 30 minutes). h3. Working with Source Code @@ -193,7 +179,7 @@ Yes, we do make typos, spelling errors and sometimes we write things that don't For simple typos and quick fixes, just send a message to the mailing list or log an issue in JIRA. -If you end up rewriting a significant piece of text, or add new documentation (you rock!), send a patch. Making documentation patches is fairly easy. All the documentation is generated from text files in the @doc/pages@ directory, so all you need to do is check it out from Git/SVN, edit, and @svn diff@ to create a patch. +If you end up rewriting a significant piece of text, or add new documentation (you rock!), send a patch. Making documentation patches is fairly easy. All the documentation is generated from text files in the @doc/pages@ directory, so all you need to do is check it out from Git, edit, and @git diff@ to create a patch. We use "Textile":http://www.textism.com/tools/textile/ as the markup language, it takes all of a few minutes to learn, it's intuitive to use, and produces clean HTML. You can learn it all in a few minutes from the "Textile Reference Manual":http://redcloth.org/textile. Also check out the "Textile Quick Reference":http://hobix.com/textile/quick.html. http://git-wip-us.apache.org/repos/asf/buildr/blob/3f607216/doc/download.textile ---------------------------------------------------------------------- diff --git a/doc/download.textile b/doc/download.textile index 4d62ca4..2aaf101 100644 --- a/doc/download.textile +++ b/doc/download.textile @@ -15,7 +15,7 @@ The official Apache distribution consists of the digitally signed binaries (gems In addition, contributors to this project maintain a separate distribution over on "RubyForge":http://rubyforge.org/projects/buildr. Using this distribution, you're able to install Buildr directly from the remote gem repository and to automatically upgrade when a new release comes out. The RubyForge distribution is *not* an official Apache distribution. -The source code is included in both source and binary distribution, the Gem distribution expands the source code into your local Gem repository. That's in addition to getting the source code directly from "SVN":http://svn.apache.org/repos/asf/buildr or "GitHub":http://github.com/buildr/buildr/tree/master. Learn more about working with source code and "living on the edge":contributing.html#edge. +The source code is included in both source and binary distribution, the Gem distribution expands the source code into your local Gem repository. That's in addition to getting the source code directly. Learn more about working with source code and "living on the edge":contributing.html#edge. h2(#dist). Binaries and Source Code http://git-wip-us.apache.org/repos/asf/buildr/blob/3f607216/rakelib/release.rake ---------------------------------------------------------------------- diff --git a/rakelib/release.rake b/rakelib/release.rake index 0c07b31..ab68fe1 100644 --- a/rakelib/release.rake +++ b/rakelib/release.rake @@ -76,19 +76,16 @@ task 'release' => %w{setup-local-site-svn} do puts '[X] Pushed gems to Rubyforge.org' end.call - # Create an SVN tag for this release. + # Create an tag for this release. lambda do - info = `svn info` + `git svn info` # Using either svn or git-svn - if url = info[/^URL:/] && info.scan(/^URL: (.*)/)[0][0] - new_url = url.sub(/(trunk$)|(branches\/\w*)$/, "tags/#{spec.version}") - unless url == new_url - sh 'svn', 'copy', url, new_url, '-m', "Release #{spec.version}" do |ok, res| - if ok - puts "[X] Tagged this release as tags/#{spec.version} ... " - else - puts 'Could not create tag, please do it yourself!' - puts %{ svn copy #{url} #{new_url} -m "Release #{spec.version}"} - end + version = `git describe --tags --always`.strip + unless version == spec.version + sh 'git', 'tag', '-a', '-m', "Release #{spec.version}" do |ok, res| + if ok + puts "[X] Tagged this release as #{spec.version} ... " + else + puts 'Could not create tag, please do it yourself!' + puts %{ git tag -a -m "Release #{spec.version}" } end end end http://git-wip-us.apache.org/repos/asf/buildr/blob/3f607216/rakelib/stage.rake ---------------------------------------------------------------------- diff --git a/rakelib/stage.rake b/rakelib/stage.rake index 3082158..742e0c1 100644 --- a/rakelib/stage.rake +++ b/rakelib/stage.rake @@ -42,10 +42,8 @@ task 'prepare' do |task, args| # Make sure we're doing a release from checked code. lambda do puts 'Checking there are no local changes ... ' - svn = `svn status` - fail "Cannot release unless all local changes are in SVN:\n#{svn}" unless svn.empty? git = `git status -s` - fail "Cannot release unless all local changes are in Git:\n#{git}" if git[/^ M/] && ENV["IGNORE_GIT"].nil? + fail "Cannot release unless all local changes are in Git:\n#{git}" puts '[X] There are no local changes, everything is in source control' end.call
