versionius 0.0.1
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +17 -0
- data/.rspec +1 -0
- data/.rvmrc +1 -0
- data/Gemfile +17 -0
- data/Guardfile +7 -0
- data/LICENSE +22 -0
- data/README.md +36 -0
- data/Rakefile +2 -0
- data/lib/tasks/versionius.rake +11 -0
- data/lib/versionius/builder.rb +42 -0
- data/lib/versionius/railtie.rb +12 -0
- data/lib/versionius/tasks.rb +1 -0
- data/lib/versionius/versionius.rb +3 -0
- data/lib/versionius.rb +11 -0
- data/spec/builder_spec.rb +72 -0
- data/spec/fixtures/commits_repo/README +2 -0
- data/spec/fixtures/commits_repo/dot_git/COMMIT_EDITMSG +1 -0
- data/spec/fixtures/commits_repo/dot_git/HEAD +1 -0
- data/spec/fixtures/commits_repo/dot_git/config +6 -0
- data/spec/fixtures/commits_repo/dot_git/description +1 -0
- data/spec/fixtures/commits_repo/dot_git/hooks/applypatch-msg.sample +15 -0
- data/spec/fixtures/commits_repo/dot_git/hooks/commit-msg.sample +24 -0
- data/spec/fixtures/commits_repo/dot_git/hooks/post-commit.sample +8 -0
- data/spec/fixtures/commits_repo/dot_git/hooks/post-receive.sample +15 -0
- data/spec/fixtures/commits_repo/dot_git/hooks/post-update.sample +8 -0
- data/spec/fixtures/commits_repo/dot_git/hooks/pre-applypatch.sample +14 -0
- data/spec/fixtures/commits_repo/dot_git/hooks/pre-commit.sample +46 -0
- data/spec/fixtures/commits_repo/dot_git/hooks/pre-rebase.sample +169 -0
- data/spec/fixtures/commits_repo/dot_git/hooks/prepare-commit-msg.sample +36 -0
- data/spec/fixtures/commits_repo/dot_git/hooks/update.sample +128 -0
- data/spec/fixtures/commits_repo/dot_git/index +0 -0
- data/spec/fixtures/commits_repo/dot_git/info/exclude +6 -0
- data/spec/fixtures/commits_repo/dot_git/logs/HEAD +2 -0
- data/spec/fixtures/commits_repo/dot_git/logs/refs/heads/master +2 -0
- data/spec/fixtures/commits_repo/dot_git/objects/11/6caa12788c74a8f521b41ebc67e03af44d5db1 +0 -0
- data/spec/fixtures/commits_repo/dot_git/objects/21/9b98b822f7dc238c14eed9678f01ed1a4ac2c0 +0 -0
- data/spec/fixtures/commits_repo/dot_git/objects/5a/57d5291e6a7fb50321235b4e00422a023aedba +0 -0
- data/spec/fixtures/commits_repo/dot_git/objects/b3/e2aa7d8f17d8d5cf5af59bf9029b5c41c9723a +3 -0
- data/spec/fixtures/commits_repo/dot_git/objects/bb/c5f4c901813580b123174a1ba7cf617bde0fd1 +0 -0
- data/spec/fixtures/commits_repo/dot_git/objects/f2/a5ce4d8ba3452d28c1f0de7d81fb688ed07d0e +0 -0
- data/spec/fixtures/commits_repo/dot_git/refs/heads/master +1 -0
- data/spec/fixtures/tag_repo/README +1 -0
- data/spec/fixtures/tag_repo/dot_git/COMMIT_EDITMSG +1 -0
- data/spec/fixtures/tag_repo/dot_git/HEAD +1 -0
- data/spec/fixtures/tag_repo/dot_git/config +6 -0
- data/spec/fixtures/tag_repo/dot_git/description +1 -0
- data/spec/fixtures/tag_repo/dot_git/hooks/applypatch-msg.sample +15 -0
- data/spec/fixtures/tag_repo/dot_git/hooks/commit-msg.sample +24 -0
- data/spec/fixtures/tag_repo/dot_git/hooks/post-commit.sample +8 -0
- data/spec/fixtures/tag_repo/dot_git/hooks/post-receive.sample +15 -0
- data/spec/fixtures/tag_repo/dot_git/hooks/post-update.sample +8 -0
- data/spec/fixtures/tag_repo/dot_git/hooks/pre-applypatch.sample +14 -0
- data/spec/fixtures/tag_repo/dot_git/hooks/pre-commit.sample +46 -0
- data/spec/fixtures/tag_repo/dot_git/hooks/pre-rebase.sample +169 -0
- data/spec/fixtures/tag_repo/dot_git/hooks/prepare-commit-msg.sample +36 -0
- data/spec/fixtures/tag_repo/dot_git/hooks/update.sample +128 -0
- data/spec/fixtures/tag_repo/dot_git/index +0 -0
- data/spec/fixtures/tag_repo/dot_git/info/exclude +6 -0
- data/spec/fixtures/tag_repo/dot_git/logs/HEAD +2 -0
- data/spec/fixtures/tag_repo/dot_git/logs/refs/heads/master +2 -0
- data/spec/fixtures/tag_repo/dot_git/objects/49/f8dddc270f8bf0d39e0dc6f3d84188db7343cb +0 -0
- data/spec/fixtures/tag_repo/dot_git/objects/8b/137891791fe96927ad78e64b0aad7bded08bdc +0 -0
- data/spec/fixtures/tag_repo/dot_git/objects/a0/4003030a87a007b552236071032c8ccb76399b +2 -0
- data/spec/fixtures/tag_repo/dot_git/objects/a4/aa715d01435ebabdc1975b62413eab5d40e225 +0 -0
- data/spec/fixtures/tag_repo/dot_git/objects/bd/25373941e8fc60fb4f0b1ef48a101653d178e0 +0 -0
- data/spec/fixtures/tag_repo/dot_git/objects/ed/21ad539cc81e48bc014dc95336cde6b437743e +0 -0
- data/spec/fixtures/tag_repo/dot_git/refs/heads/master +1 -0
- data/spec/fixtures/tag_repo/dot_git/refs/tags/0.0.1 +1 -0
- data/spec/fixtures/tags_repo/README +2 -0
- data/spec/fixtures/tags_repo/dot_git/COMMIT_EDITMSG +1 -0
- data/spec/fixtures/tags_repo/dot_git/HEAD +1 -0
- data/spec/fixtures/tags_repo/dot_git/config +6 -0
- data/spec/fixtures/tags_repo/dot_git/description +1 -0
- data/spec/fixtures/tags_repo/dot_git/hooks/applypatch-msg.sample +15 -0
- data/spec/fixtures/tags_repo/dot_git/hooks/commit-msg.sample +24 -0
- data/spec/fixtures/tags_repo/dot_git/hooks/post-commit.sample +8 -0
- data/spec/fixtures/tags_repo/dot_git/hooks/post-receive.sample +15 -0
- data/spec/fixtures/tags_repo/dot_git/hooks/post-update.sample +8 -0
- data/spec/fixtures/tags_repo/dot_git/hooks/pre-applypatch.sample +14 -0
- data/spec/fixtures/tags_repo/dot_git/hooks/pre-commit.sample +46 -0
- data/spec/fixtures/tags_repo/dot_git/hooks/pre-rebase.sample +169 -0
- data/spec/fixtures/tags_repo/dot_git/hooks/prepare-commit-msg.sample +36 -0
- data/spec/fixtures/tags_repo/dot_git/hooks/update.sample +128 -0
- data/spec/fixtures/tags_repo/dot_git/index +0 -0
- data/spec/fixtures/tags_repo/dot_git/info/exclude +6 -0
- data/spec/fixtures/tags_repo/dot_git/logs/HEAD +3 -0
- data/spec/fixtures/tags_repo/dot_git/logs/refs/heads/master +3 -0
- data/spec/fixtures/tags_repo/dot_git/objects/54/3b9bebdc6bd5c4b22136034a95dd097a57d3dd +0 -0
- data/spec/fixtures/tags_repo/dot_git/objects/92/f68537cb61a9cbae3d8582949066c1754adc0e +0 -0
- data/spec/fixtures/tags_repo/dot_git/objects/96/bbf6ea8c3c79114319436223c2730ead5def9e +0 -0
- data/spec/fixtures/tags_repo/dot_git/objects/a2/fd6ad405a7f46b65361ffbbc14dc6646484887 +1 -0
- data/spec/fixtures/tags_repo/dot_git/objects/bd/25373941e8fc60fb4f0b1ef48a101653d178e0 +0 -0
- data/spec/fixtures/tags_repo/dot_git/objects/c3/6db5db7e3347f5210973b523fdbd371edb43b0 +1 -0
- data/spec/fixtures/tags_repo/dot_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
- data/spec/fixtures/tags_repo/dot_git/objects/ed/21ad539cc81e48bc014dc95336cde6b437743e +0 -0
- data/spec/fixtures/tags_repo/dot_git/objects/fc/2e18b5f3ef42a5eadde8985906c1c9a824d017 +2 -0
- data/spec/fixtures/tags_repo/dot_git/refs/heads/master +1 -0
- data/spec/fixtures/tags_repo/dot_git/refs/tags/0.0.1 +1 -0
- data/spec/fixtures/tags_repo/dot_git/refs/tags/0.0.2 +1 -0
- data/spec/spec_helper.rb +6 -0
- data/versionius.gemspec +19 -0
- metadata +248 -0
data/.gitignore
ADDED
data/.rspec
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
--colour
|
data/.rvmrc
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
rvm use --create 1.9.3@version
|
data/Gemfile
ADDED
data/Guardfile
ADDED
@@ -0,0 +1,7 @@
|
|
1
|
+
guard 'rspec', :cli => '--format documentation', :version => 2, :all_after_pass => false, :all_on_start => false, :keep_failed => false do
|
2
|
+
watch(%r{^spec/.+_spec\.rb$})
|
3
|
+
watch(%r{^spec/.+\.rb$})
|
4
|
+
watch(%r{^lib/(.+)\.rb$}) { "spec" }
|
5
|
+
watch(%r{^lib/messaging_app/(.+)\.rb$}) { "spec" }
|
6
|
+
watch('spec/spec_helper.rb') { "spec" }
|
7
|
+
end
|
data/LICENSE
ADDED
@@ -0,0 +1,22 @@
|
|
1
|
+
Copyright (c) 2012 Alexander Korsak
|
2
|
+
|
3
|
+
MIT License
|
4
|
+
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining
|
6
|
+
a copy of this software and associated documentation files (the
|
7
|
+
"Software"), to deal in the Software without restriction, including
|
8
|
+
without limitation the rights to use, copy, modify, merge, publish,
|
9
|
+
distribute, sublicense, and/or sell copies of the Software, and to
|
10
|
+
permit persons to whom the Software is furnished to do so, subject to
|
11
|
+
the following conditions:
|
12
|
+
|
13
|
+
The above copyright notice and this permission notice shall be
|
14
|
+
included in all copies or substantial portions of the Software.
|
15
|
+
|
16
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
17
|
+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
18
|
+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
19
|
+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
20
|
+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
21
|
+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
22
|
+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
data/README.md
ADDED
@@ -0,0 +1,36 @@
|
|
1
|
+
# Versionius
|
2
|
+
|
3
|
+
Library for generating version file for the project. For example if you have
|
4
|
+
several clients with standalone installation of your project and you are
|
5
|
+
planning to check versions of the app and make deployments. You can add to the
|
6
|
+
deployment hooks tasks version file builder and then access to this file
|
7
|
+
through public folder.
|
8
|
+
|
9
|
+
|
10
|
+
## Installation
|
11
|
+
|
12
|
+
Add this line to your application's Gemfile:
|
13
|
+
|
14
|
+
gem 'versionius'
|
15
|
+
|
16
|
+
And then execute:
|
17
|
+
|
18
|
+
$ bundle
|
19
|
+
|
20
|
+
Or install it yourself as:
|
21
|
+
|
22
|
+
$ gem install versionius
|
23
|
+
|
24
|
+
## Usage
|
25
|
+
|
26
|
+
If you are using Rails 2 you can add to your deploy.rb or Rakefile
|
27
|
+
|
28
|
+
require 'versionius/tasks'
|
29
|
+
|
30
|
+
## Contributing
|
31
|
+
|
32
|
+
1. Fork it
|
33
|
+
2. Create your feature branch (`git checkout -b my-new-feature`)
|
34
|
+
3. Commit your changes (`git commit -am 'Added some feature'`)
|
35
|
+
4. Push to the branch (`git push origin my-new-feature`)
|
36
|
+
5. Create new Pull Request
|
data/Rakefile
ADDED
@@ -0,0 +1,42 @@
|
|
1
|
+
require 'grit'
|
2
|
+
|
3
|
+
module Versionius
|
4
|
+
|
5
|
+
class Builder
|
6
|
+
def initialize(repository_path, version_file_path)
|
7
|
+
@repository_path = repository_path
|
8
|
+
@version_file_path = version_file_path
|
9
|
+
end
|
10
|
+
|
11
|
+
def run
|
12
|
+
repo = Grit::Repo.new(@repository_path)
|
13
|
+
|
14
|
+
File.open(File.join(@version_file_path, Versionius::FILE_NAME), "w+") do |file|
|
15
|
+
tag = repo.tags.last
|
16
|
+
unless tag.nil?
|
17
|
+
file.puts "#{Versionius::TAG_TITLE} #{tag.name}"
|
18
|
+
|
19
|
+
commits = between_tags(repo) if repo.tags.size > 1
|
20
|
+
end
|
21
|
+
|
22
|
+
(commits || repo.commits).each do |commit|
|
23
|
+
file.puts commit.message
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
29
|
+
def between_tags(repo)
|
30
|
+
commits = []
|
31
|
+
previous = repo.tags[repo.tags.size - 2]
|
32
|
+
|
33
|
+
for commit in repo.commits
|
34
|
+
break if commit.id == previous.commit.id
|
35
|
+
|
36
|
+
commits << commit
|
37
|
+
end
|
38
|
+
|
39
|
+
commits
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
@@ -0,0 +1 @@
|
|
1
|
+
load 'tasks/versionius.rake'
|
data/lib/versionius.rb
ADDED
@@ -0,0 +1,72 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
include Versionius
|
4
|
+
|
5
|
+
describe Builder do
|
6
|
+
|
7
|
+
before do
|
8
|
+
@builder = Builder.new(repository_path, './tmp/')
|
9
|
+
end
|
10
|
+
|
11
|
+
context "when build version file" do
|
12
|
+
before do
|
13
|
+
@repo = Grit::Repo.new(repository_path, :is_bare => true)
|
14
|
+
Grit::Repo.should_receive(:new).and_return(@repo)
|
15
|
+
end
|
16
|
+
|
17
|
+
context "with only commits" do
|
18
|
+
let(:repository_path) { './spec/fixtures/commits_repo/dot_git' }
|
19
|
+
|
20
|
+
it "should be possible to build version file" do
|
21
|
+
@builder.run
|
22
|
+
|
23
|
+
File.exists?('./tmp/version.txt').should be_true
|
24
|
+
end
|
25
|
+
|
26
|
+
it "should build version file with commits information" do
|
27
|
+
@builder.run
|
28
|
+
|
29
|
+
content = read_file
|
30
|
+
|
31
|
+
content.should include("Add README")
|
32
|
+
content.should include("Change README")
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
context "with tag and commits" do
|
37
|
+
let(:repository_path) { './spec/fixtures/tag_repo/dot_git' }
|
38
|
+
|
39
|
+
it "should build version file with tag and commits information" do
|
40
|
+
@builder.run
|
41
|
+
|
42
|
+
content = read_file
|
43
|
+
|
44
|
+
content.should include("Version: 0.0.1")
|
45
|
+
content.should include("The first commit")
|
46
|
+
content.should include("The second commit")
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
context "with several tag and commits" do
|
51
|
+
let(:repository_path) { './spec/fixtures/tags_repo/dot_git' }
|
52
|
+
|
53
|
+
it "should build version file with the latest tag and commits between tags" do
|
54
|
+
@builder.run
|
55
|
+
|
56
|
+
content = read_file
|
57
|
+
|
58
|
+
content.should include("Version: 0.0.2")
|
59
|
+
content.should include("Bump gem version to 0.0.2")
|
60
|
+
content.should include("Minor changes for version 0.0.2")
|
61
|
+
|
62
|
+
content.should_not include("Version 0.0.1")
|
63
|
+
content.should_not include("Bump gem version to 0.0.1")
|
64
|
+
end
|
65
|
+
end
|
66
|
+
end
|
67
|
+
|
68
|
+
def read_file
|
69
|
+
File.open("./tmp/#{Versionius::FILE_NAME}").read
|
70
|
+
end
|
71
|
+
end
|
72
|
+
|
@@ -0,0 +1 @@
|
|
1
|
+
Change README
|
@@ -0,0 +1 @@
|
|
1
|
+
ref: refs/heads/master
|
@@ -0,0 +1 @@
|
|
1
|
+
Unnamed repository; edit this file 'description' to name the repository.
|
@@ -0,0 +1,15 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to check the commit log message taken by
|
4
|
+
# applypatch from an e-mail message.
|
5
|
+
#
|
6
|
+
# The hook should exit with non-zero status after issuing an
|
7
|
+
# appropriate message if it wants to stop the commit. The hook is
|
8
|
+
# allowed to edit the commit message file.
|
9
|
+
#
|
10
|
+
# To enable this hook, rename this file to "applypatch-msg".
|
11
|
+
|
12
|
+
. git-sh-setup
|
13
|
+
test -x "$GIT_DIR/hooks/commit-msg" &&
|
14
|
+
exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
|
15
|
+
:
|
@@ -0,0 +1,24 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to check the commit log message.
|
4
|
+
# Called by "git commit" with one argument, the name of the file
|
5
|
+
# that has the commit message. The hook should exit with non-zero
|
6
|
+
# status after issuing an appropriate message if it wants to stop the
|
7
|
+
# commit. The hook is allowed to edit the commit message file.
|
8
|
+
#
|
9
|
+
# To enable this hook, rename this file to "commit-msg".
|
10
|
+
|
11
|
+
# Uncomment the below to add a Signed-off-by line to the message.
|
12
|
+
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
|
13
|
+
# hook is more suited to it.
|
14
|
+
#
|
15
|
+
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
16
|
+
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
|
17
|
+
|
18
|
+
# This example catches duplicate Signed-off-by lines.
|
19
|
+
|
20
|
+
test "" = "$(grep '^Signed-off-by: ' "$1" |
|
21
|
+
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
|
22
|
+
echo >&2 Duplicate Signed-off-by lines.
|
23
|
+
exit 1
|
24
|
+
}
|
@@ -0,0 +1,15 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script for the "post-receive" event.
|
4
|
+
#
|
5
|
+
# The "post-receive" script is run after receive-pack has accepted a pack
|
6
|
+
# and the repository has been updated. It is passed arguments in through
|
7
|
+
# stdin in the form
|
8
|
+
# <oldrev> <newrev> <refname>
|
9
|
+
# For example:
|
10
|
+
# aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master
|
11
|
+
#
|
12
|
+
# see contrib/hooks/ for a sample, or uncomment the next line and
|
13
|
+
# rename the file to "post-receive".
|
14
|
+
|
15
|
+
#. /usr/share/doc/git-core/contrib/hooks/post-receive-email
|
@@ -0,0 +1,14 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to verify what is about to be committed
|
4
|
+
# by applypatch from an e-mail message.
|
5
|
+
#
|
6
|
+
# The hook should exit with non-zero status after issuing an
|
7
|
+
# appropriate message if it wants to stop the commit.
|
8
|
+
#
|
9
|
+
# To enable this hook, rename this file to "pre-applypatch".
|
10
|
+
|
11
|
+
. git-sh-setup
|
12
|
+
test -x "$GIT_DIR/hooks/pre-commit" &&
|
13
|
+
exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
|
14
|
+
:
|
@@ -0,0 +1,46 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to verify what is about to be committed.
|
4
|
+
# Called by "git commit" with no arguments. The hook should
|
5
|
+
# exit with non-zero status after issuing an appropriate message if
|
6
|
+
# it wants to stop the commit.
|
7
|
+
#
|
8
|
+
# To enable this hook, rename this file to "pre-commit".
|
9
|
+
|
10
|
+
if git rev-parse --verify HEAD >/dev/null 2>&1
|
11
|
+
then
|
12
|
+
against=HEAD
|
13
|
+
else
|
14
|
+
# Initial commit: diff against an empty tree object
|
15
|
+
against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
|
16
|
+
fi
|
17
|
+
|
18
|
+
# If you want to allow non-ascii filenames set this variable to true.
|
19
|
+
allownonascii=$(git config hooks.allownonascii)
|
20
|
+
|
21
|
+
# Cross platform projects tend to avoid non-ascii filenames; prevent
|
22
|
+
# them from being added to the repository. We exploit the fact that the
|
23
|
+
# printable range starts at the space character and ends with tilde.
|
24
|
+
if [ "$allownonascii" != "true" ] &&
|
25
|
+
# Note that the use of brackets around a tr range is ok here, (it's
|
26
|
+
# even required, for portability to Solaris 10's /usr/bin/tr), since
|
27
|
+
# the square bracket bytes happen to fall in the designated range.
|
28
|
+
test "$(git diff --cached --name-only --diff-filter=A -z $against |
|
29
|
+
LC_ALL=C tr -d '[ -~]\0')"
|
30
|
+
then
|
31
|
+
echo "Error: Attempt to add a non-ascii file name."
|
32
|
+
echo
|
33
|
+
echo "This can cause problems if you want to work"
|
34
|
+
echo "with people on other platforms."
|
35
|
+
echo
|
36
|
+
echo "To be portable it is advisable to rename the file ..."
|
37
|
+
echo
|
38
|
+
echo "If you know what you are doing you can disable this"
|
39
|
+
echo "check using:"
|
40
|
+
echo
|
41
|
+
echo " git config hooks.allownonascii true"
|
42
|
+
echo
|
43
|
+
exit 1
|
44
|
+
fi
|
45
|
+
|
46
|
+
exec git diff-index --check --cached $against --
|
@@ -0,0 +1,169 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# Copyright (c) 2006, 2008 Junio C Hamano
|
4
|
+
#
|
5
|
+
# The "pre-rebase" hook is run just before "git rebase" starts doing
|
6
|
+
# its job, and can prevent the command from running by exiting with
|
7
|
+
# non-zero status.
|
8
|
+
#
|
9
|
+
# The hook is called with the following parameters:
|
10
|
+
#
|
11
|
+
# $1 -- the upstream the series was forked from.
|
12
|
+
# $2 -- the branch being rebased (or empty when rebasing the current branch).
|
13
|
+
#
|
14
|
+
# This sample shows how to prevent topic branches that are already
|
15
|
+
# merged to 'next' branch from getting rebased, because allowing it
|
16
|
+
# would result in rebasing already published history.
|
17
|
+
|
18
|
+
publish=next
|
19
|
+
basebranch="$1"
|
20
|
+
if test "$#" = 2
|
21
|
+
then
|
22
|
+
topic="refs/heads/$2"
|
23
|
+
else
|
24
|
+
topic=`git symbolic-ref HEAD` ||
|
25
|
+
exit 0 ;# we do not interrupt rebasing detached HEAD
|
26
|
+
fi
|
27
|
+
|
28
|
+
case "$topic" in
|
29
|
+
refs/heads/??/*)
|
30
|
+
;;
|
31
|
+
*)
|
32
|
+
exit 0 ;# we do not interrupt others.
|
33
|
+
;;
|
34
|
+
esac
|
35
|
+
|
36
|
+
# Now we are dealing with a topic branch being rebased
|
37
|
+
# on top of master. Is it OK to rebase it?
|
38
|
+
|
39
|
+
# Does the topic really exist?
|
40
|
+
git show-ref -q "$topic" || {
|
41
|
+
echo >&2 "No such branch $topic"
|
42
|
+
exit 1
|
43
|
+
}
|
44
|
+
|
45
|
+
# Is topic fully merged to master?
|
46
|
+
not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
|
47
|
+
if test -z "$not_in_master"
|
48
|
+
then
|
49
|
+
echo >&2 "$topic is fully merged to master; better remove it."
|
50
|
+
exit 1 ;# we could allow it, but there is no point.
|
51
|
+
fi
|
52
|
+
|
53
|
+
# Is topic ever merged to next? If so you should not be rebasing it.
|
54
|
+
only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
|
55
|
+
only_next_2=`git rev-list ^master ${publish} | sort`
|
56
|
+
if test "$only_next_1" = "$only_next_2"
|
57
|
+
then
|
58
|
+
not_in_topic=`git rev-list "^$topic" master`
|
59
|
+
if test -z "$not_in_topic"
|
60
|
+
then
|
61
|
+
echo >&2 "$topic is already up-to-date with master"
|
62
|
+
exit 1 ;# we could allow it, but there is no point.
|
63
|
+
else
|
64
|
+
exit 0
|
65
|
+
fi
|
66
|
+
else
|
67
|
+
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
|
68
|
+
/usr/bin/perl -e '
|
69
|
+
my $topic = $ARGV[0];
|
70
|
+
my $msg = "* $topic has commits already merged to public branch:\n";
|
71
|
+
my (%not_in_next) = map {
|
72
|
+
/^([0-9a-f]+) /;
|
73
|
+
($1 => 1);
|
74
|
+
} split(/\n/, $ARGV[1]);
|
75
|
+
for my $elem (map {
|
76
|
+
/^([0-9a-f]+) (.*)$/;
|
77
|
+
[$1 => $2];
|
78
|
+
} split(/\n/, $ARGV[2])) {
|
79
|
+
if (!exists $not_in_next{$elem->[0]}) {
|
80
|
+
if ($msg) {
|
81
|
+
print STDERR $msg;
|
82
|
+
undef $msg;
|
83
|
+
}
|
84
|
+
print STDERR " $elem->[1]\n";
|
85
|
+
}
|
86
|
+
}
|
87
|
+
' "$topic" "$not_in_next" "$not_in_master"
|
88
|
+
exit 1
|
89
|
+
fi
|
90
|
+
|
91
|
+
exit 0
|
92
|
+
|
93
|
+
################################################################
|
94
|
+
|
95
|
+
This sample hook safeguards topic branches that have been
|
96
|
+
published from being rewound.
|
97
|
+
|
98
|
+
The workflow assumed here is:
|
99
|
+
|
100
|
+
* Once a topic branch forks from "master", "master" is never
|
101
|
+
merged into it again (either directly or indirectly).
|
102
|
+
|
103
|
+
* Once a topic branch is fully cooked and merged into "master",
|
104
|
+
it is deleted. If you need to build on top of it to correct
|
105
|
+
earlier mistakes, a new topic branch is created by forking at
|
106
|
+
the tip of the "master". This is not strictly necessary, but
|
107
|
+
it makes it easier to keep your history simple.
|
108
|
+
|
109
|
+
* Whenever you need to test or publish your changes to topic
|
110
|
+
branches, merge them into "next" branch.
|
111
|
+
|
112
|
+
The script, being an example, hardcodes the publish branch name
|
113
|
+
to be "next", but it is trivial to make it configurable via
|
114
|
+
$GIT_DIR/config mechanism.
|
115
|
+
|
116
|
+
With this workflow, you would want to know:
|
117
|
+
|
118
|
+
(1) ... if a topic branch has ever been merged to "next". Young
|
119
|
+
topic branches can have stupid mistakes you would rather
|
120
|
+
clean up before publishing, and things that have not been
|
121
|
+
merged into other branches can be easily rebased without
|
122
|
+
affecting other people. But once it is published, you would
|
123
|
+
not want to rewind it.
|
124
|
+
|
125
|
+
(2) ... if a topic branch has been fully merged to "master".
|
126
|
+
Then you can delete it. More importantly, you should not
|
127
|
+
build on top of it -- other people may already want to
|
128
|
+
change things related to the topic as patches against your
|
129
|
+
"master", so if you need further changes, it is better to
|
130
|
+
fork the topic (perhaps with the same name) afresh from the
|
131
|
+
tip of "master".
|
132
|
+
|
133
|
+
Let's look at this example:
|
134
|
+
|
135
|
+
o---o---o---o---o---o---o---o---o---o "next"
|
136
|
+
/ / / /
|
137
|
+
/ a---a---b A / /
|
138
|
+
/ / / /
|
139
|
+
/ / c---c---c---c B /
|
140
|
+
/ / / \ /
|
141
|
+
/ / / b---b C \ /
|
142
|
+
/ / / / \ /
|
143
|
+
---o---o---o---o---o---o---o---o---o---o---o "master"
|
144
|
+
|
145
|
+
|
146
|
+
A, B and C are topic branches.
|
147
|
+
|
148
|
+
* A has one fix since it was merged up to "next".
|
149
|
+
|
150
|
+
* B has finished. It has been fully merged up to "master" and "next",
|
151
|
+
and is ready to be deleted.
|
152
|
+
|
153
|
+
* C has not merged to "next" at all.
|
154
|
+
|
155
|
+
We would want to allow C to be rebased, refuse A, and encourage
|
156
|
+
B to be deleted.
|
157
|
+
|
158
|
+
To compute (1):
|
159
|
+
|
160
|
+
git rev-list ^master ^topic next
|
161
|
+
git rev-list ^master next
|
162
|
+
|
163
|
+
if these match, topic has not merged in next at all.
|
164
|
+
|
165
|
+
To compute (2):
|
166
|
+
|
167
|
+
git rev-list master..topic
|
168
|
+
|
169
|
+
if this is empty, it is fully merged to "master".
|
@@ -0,0 +1,36 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to prepare the commit log message.
|
4
|
+
# Called by "git commit" with the name of the file that has the
|
5
|
+
# commit message, followed by the description of the commit
|
6
|
+
# message's source. The hook's purpose is to edit the commit
|
7
|
+
# message file. If the hook fails with a non-zero status,
|
8
|
+
# the commit is aborted.
|
9
|
+
#
|
10
|
+
# To enable this hook, rename this file to "prepare-commit-msg".
|
11
|
+
|
12
|
+
# This hook includes three examples. The first comments out the
|
13
|
+
# "Conflicts:" part of a merge commit.
|
14
|
+
#
|
15
|
+
# The second includes the output of "git diff --name-status -r"
|
16
|
+
# into the message, just before the "git status" output. It is
|
17
|
+
# commented because it doesn't cope with --amend or with squashed
|
18
|
+
# commits.
|
19
|
+
#
|
20
|
+
# The third example adds a Signed-off-by line to the message, that can
|
21
|
+
# still be edited. This is rarely a good idea.
|
22
|
+
|
23
|
+
case "$2,$3" in
|
24
|
+
merge,)
|
25
|
+
/usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
|
26
|
+
|
27
|
+
# ,|template,)
|
28
|
+
# /usr/bin/perl -i.bak -pe '
|
29
|
+
# print "\n" . `git diff --cached --name-status -r`
|
30
|
+
# if /^#/ && $first++ == 0' "$1" ;;
|
31
|
+
|
32
|
+
*) ;;
|
33
|
+
esac
|
34
|
+
|
35
|
+
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
36
|
+
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
|