git-bro 0.1.0 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/LICENSE +7 -0
- data/README.rdoc +37 -0
- data/bin/git-bro +85 -85
- data/docs/created.rid +1 -0
- data/docs/files/LICENSE.html +129 -0
- data/docs/files/README_rdoc.html +178 -0
- data/docs/fr_class_index.html +26 -0
- data/docs/fr_file_index.html +28 -0
- data/docs/fr_method_index.html +26 -0
- data/docs/index.html +24 -0
- data/docs/rdoc-style.css +208 -0
- data/lib/git-bro.rb +2 -1
- data/lib/git-bro/commands/serve.rb +2 -2
- data/lib/git-bro/core_extensions.rb +22 -0
- data/lib/git-bro/repository.rb +74 -40
- data/lib/git-bro/sinatra/helpers.rb +11 -0
- data/sinatra/app.rb +113 -0
- data/{bin → sinatra}/public/images/file.png +0 -0
- data/{bin → sinatra}/public/images/folder.png +0 -0
- data/sinatra/public/js/application.js +10 -0
- data/sinatra/public/js/jquery-1.4.2.js +6240 -0
- data/sinatra/views/application.sass +180 -0
- data/sinatra/views/coderay.sass +42 -0
- data/sinatra/views/commit.haml +5 -0
- data/sinatra/views/commit_details.haml +13 -0
- data/sinatra/views/commits.haml +31 -0
- data/sinatra/views/dir.haml +40 -0
- data/sinatra/views/file_content.haml +5 -0
- data/{bin → sinatra}/views/index.haml +0 -0
- data/{bin → sinatra}/views/layout.haml +5 -1
- data/sinatra/views/menu.haml +23 -0
- data/sinatra/views/tree.haml +5 -0
- data/test/git-bro.git/HEAD +1 -0
- data/test/git-bro.git/config +4 -0
- data/test/git-bro.git/description +1 -0
- data/test/git-bro.git/hooks/applypatch-msg.sample +15 -0
- data/test/git-bro.git/hooks/commit-msg.sample +24 -0
- data/test/git-bro.git/hooks/post-commit.sample +8 -0
- data/test/git-bro.git/hooks/post-receive.sample +15 -0
- data/test/git-bro.git/hooks/post-update.sample +8 -0
- data/test/git-bro.git/hooks/pre-applypatch.sample +14 -0
- data/test/git-bro.git/hooks/pre-commit.sample +18 -0
- data/test/git-bro.git/hooks/pre-rebase.sample +169 -0
- data/test/git-bro.git/hooks/prepare-commit-msg.sample +36 -0
- data/test/git-bro.git/hooks/update.sample +118 -0
- data/test/git-bro.git/info/exclude +6 -0
- data/test/git-bro.git/objects/pack/pack-668e7a3976d53d070420e5877925f8472aaf569d.idx +0 -0
- data/test/git-bro.git/objects/pack/pack-668e7a3976d53d070420e5877925f8472aaf569d.pack +0 -0
- data/test/git-bro.git/objects/pack/pack-6f8375d1e612aff7cf5777d6fb1d0ca463f8e49d.idx +0 -0
- data/test/git-bro.git/objects/pack/pack-6f8375d1e612aff7cf5777d6fb1d0ca463f8e49d.pack +0 -0
- data/test/git-bro.git/refs/heads/develop +1 -0
- data/test/git-bro.git/refs/heads/master +1 -0
- data/test/git-bro/test_repository.rb +46 -0
- data/test/helper.rb +6 -0
- metadata +113 -30
- data/README +0 -18
- data/bin/server.rb +0 -52
- data/bin/short_help.txt +0 -4
- data/bin/views/application.sass +0 -69
- data/bin/views/dir.haml +0 -23
- data/bin/views/dir_listing.haml +0 -3
- data/bin/views/file_content.haml +0 -3
- data/git-bro-0.0.1.gem +0 -0
- data/git-bro.gemspec +0 -65
- data/lib/git-bro/process.rb +0 -28
- data/rakefile.rb +0 -29
@@ -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,18 @@
|
|
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
|
+
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
|
+
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
|
+
perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
|
26
|
+
|
27
|
+
# ,|template,)
|
28
|
+
# 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"
|
@@ -0,0 +1,118 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to blocks unannotated tags from entering.
|
4
|
+
# Called by git-receive-pack with arguments: refname sha1-old sha1-new
|
5
|
+
#
|
6
|
+
# To enable this hook, rename this file to "update".
|
7
|
+
#
|
8
|
+
# Config
|
9
|
+
# ------
|
10
|
+
# hooks.allowunannotated
|
11
|
+
# This boolean sets whether unannotated tags will be allowed into the
|
12
|
+
# repository. By default they won't be.
|
13
|
+
# hooks.allowdeletetag
|
14
|
+
# This boolean sets whether deleting tags will be allowed in the
|
15
|
+
# repository. By default they won't be.
|
16
|
+
# hooks.allowdeletebranch
|
17
|
+
# This boolean sets whether deleting branches will be allowed in the
|
18
|
+
# repository. By default they won't be.
|
19
|
+
# hooks.denycreatebranch
|
20
|
+
# This boolean sets whether remotely creating branches will be denied
|
21
|
+
# in the repository. By default this is allowed.
|
22
|
+
#
|
23
|
+
|
24
|
+
# --- Command line
|
25
|
+
refname="$1"
|
26
|
+
oldrev="$2"
|
27
|
+
newrev="$3"
|
28
|
+
|
29
|
+
# --- Safety check
|
30
|
+
if [ -z "$GIT_DIR" ]; then
|
31
|
+
echo "Don't run this script from the command line." >&2
|
32
|
+
echo " (if you want, you could supply GIT_DIR then run" >&2
|
33
|
+
echo " $0 <ref> <oldrev> <newrev>)" >&2
|
34
|
+
exit 1
|
35
|
+
fi
|
36
|
+
|
37
|
+
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
|
38
|
+
echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
|
39
|
+
exit 1
|
40
|
+
fi
|
41
|
+
|
42
|
+
# --- Config
|
43
|
+
allowunannotated=$(git config --bool hooks.allowunannotated)
|
44
|
+
allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
|
45
|
+
denycreatebranch=$(git config --bool hooks.denycreatebranch)
|
46
|
+
allowdeletetag=$(git config --bool hooks.allowdeletetag)
|
47
|
+
|
48
|
+
# check for no description
|
49
|
+
projectdesc=$(sed -e '1q' "$GIT_DIR/description")
|
50
|
+
case "$projectdesc" in
|
51
|
+
"Unnamed repository"* | "")
|
52
|
+
echo "*** Project description file hasn't been set" >&2
|
53
|
+
exit 1
|
54
|
+
;;
|
55
|
+
esac
|
56
|
+
|
57
|
+
# --- Check types
|
58
|
+
# if $newrev is 0000...0000, it's a commit to delete a ref.
|
59
|
+
zero="0000000000000000000000000000000000000000"
|
60
|
+
if [ "$newrev" = "$zero" ]; then
|
61
|
+
newrev_type=delete
|
62
|
+
else
|
63
|
+
newrev_type=$(git-cat-file -t $newrev)
|
64
|
+
fi
|
65
|
+
|
66
|
+
case "$refname","$newrev_type" in
|
67
|
+
refs/tags/*,commit)
|
68
|
+
# un-annotated tag
|
69
|
+
short_refname=${refname##refs/tags/}
|
70
|
+
if [ "$allowunannotated" != "true" ]; then
|
71
|
+
echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
|
72
|
+
echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
|
73
|
+
exit 1
|
74
|
+
fi
|
75
|
+
;;
|
76
|
+
refs/tags/*,delete)
|
77
|
+
# delete tag
|
78
|
+
if [ "$allowdeletetag" != "true" ]; then
|
79
|
+
echo "*** Deleting a tag is not allowed in this repository" >&2
|
80
|
+
exit 1
|
81
|
+
fi
|
82
|
+
;;
|
83
|
+
refs/tags/*,tag)
|
84
|
+
# annotated tag
|
85
|
+
;;
|
86
|
+
refs/heads/*,commit)
|
87
|
+
# branch
|
88
|
+
if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
|
89
|
+
echo "*** Creating a branch is not allowed in this repository" >&2
|
90
|
+
exit 1
|
91
|
+
fi
|
92
|
+
;;
|
93
|
+
refs/heads/*,delete)
|
94
|
+
# delete branch
|
95
|
+
if [ "$allowdeletebranch" != "true" ]; then
|
96
|
+
echo "*** Deleting a branch is not allowed in this repository" >&2
|
97
|
+
exit 1
|
98
|
+
fi
|
99
|
+
;;
|
100
|
+
refs/remotes/*,commit)
|
101
|
+
# tracking branch
|
102
|
+
;;
|
103
|
+
refs/remotes/*,delete)
|
104
|
+
# delete tracking branch
|
105
|
+
if [ "$allowdeletebranch" != "true" ]; then
|
106
|
+
echo "*** Deleting a tracking branch is not allowed in this repository" >&2
|
107
|
+
exit 1
|
108
|
+
fi
|
109
|
+
;;
|
110
|
+
*)
|
111
|
+
# Anything else (is there anything else?)
|
112
|
+
echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
|
113
|
+
exit 1
|
114
|
+
;;
|
115
|
+
esac
|
116
|
+
|
117
|
+
# --- Finished
|
118
|
+
exit 0
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
@@ -0,0 +1 @@
|
|
1
|
+
6bb05c2411e738bf404dd2d609048bb8e1c1c581
|
@@ -0,0 +1 @@
|
|
1
|
+
71a7d5d54b18ef43f9ab8f1211cc0791a16532ec
|
@@ -0,0 +1,46 @@
|
|
1
|
+
require File.dirname(__FILE__) + '/../helper'
|
2
|
+
|
3
|
+
class TestRepository < Test::Unit::TestCase
|
4
|
+
def setup
|
5
|
+
@r = GitBro::Repository.new(File.join(File.dirname(__FILE__), %w[.. git-bro.git]), :is_bare => true)
|
6
|
+
end
|
7
|
+
|
8
|
+
def test_not_nil
|
9
|
+
assert !@r.nil?
|
10
|
+
end
|
11
|
+
|
12
|
+
def test_path
|
13
|
+
assert_equal File.expand_path(File.dirname(__FILE__) + '/../git-bro'), @r.path
|
14
|
+
end
|
15
|
+
|
16
|
+
def test_tree_with_empty_path
|
17
|
+
tree = @r.tree('develop',[])
|
18
|
+
assert_equal 7, tree.size
|
19
|
+
assert_equal 4, tree.collect{|i| i if i[:type] == 'dir'}.nitems
|
20
|
+
assert_equal 3, tree.collect{|i| i if i[:type] == 'file'}.nitems
|
21
|
+
end
|
22
|
+
|
23
|
+
def test_tree_with_non_empty_path
|
24
|
+
tree = @r.tree('develop',['sinatra/'])
|
25
|
+
assert_equal 3, tree.size
|
26
|
+
assert_equal 2, tree.collect{|i| i if i[:type] == 'dir'}.nitems
|
27
|
+
assert_equal 1, tree.collect{|i| i if i[:type] == 'file'}.nitems
|
28
|
+
end
|
29
|
+
|
30
|
+
def test_branches
|
31
|
+
branches = @r.branches
|
32
|
+
assert_equal 2, branches.size
|
33
|
+
assert_equal Grit::Head, branches[0].class
|
34
|
+
assert_equal Grit::Head, branches[1].class
|
35
|
+
end
|
36
|
+
|
37
|
+
def test_file_content_with_valid_path
|
38
|
+
content = @r.file_content('develop','sinatra/app.rb')
|
39
|
+
assert_equal 2312, content.size
|
40
|
+
end
|
41
|
+
|
42
|
+
def test_file_content_with_invalid_path
|
43
|
+
content = @r.file_content('develop', 'sinatra/git-bro')
|
44
|
+
assert_equal 'FILE NOT FOUND', content
|
45
|
+
end
|
46
|
+
end
|