git-object-browser 0.0.2

data/lib/git-object-browser/server/main.rb

@@ -0,0 +1,31 @@
+require 'webrick'
+
+module GitObjectBrowser
+
+  module Server
+
+    class Main
+
+      def initialize(target)
+        @target = target
+      end
+
+      def start(host, port)
+        root = File.dirname(File.dirname(File.dirname(File.dirname(__FILE__))))
+        root = File.expand_path(File.join(root, "htdocs"))
+        opts = { :BindAddress => host, :Port => port, :DocumentRoot => root }
+        server = WEBrick::HTTPServer.new(opts)
+        server.mount('/.git', GitServlet, @target)
+        trap 'INT' do
+          server.shutdown
+        end
+        server.start
+      end
+
+      def self.execute(target, host, port)
+        self.new(target).start(host, port)
+      end
+
+    end
+  end
+end

data/lib/git-object-browser/version.rb

@@ -0,0 +1,3 @@
+module GitObjectBrowser
+  VERSION = "0.0.2"
+end

data/spec/fixtures/generate_worktree.sh

@@ -0,0 +1,103 @@
+#! /bin/sh
+
+ROOT=`dirname $0`
+
+DIR=$ROOT/worktree
+rm -rf $DIR
+
+mkdir $DIR
+cd $DIR
+
+export GIT_WORK_TREE=.
+export GIT_DIR=_git
+
+git init
+
+cat > _git/config <<EOF
+[user]
+    name = git sample
+    email = git@example.com
+
+[core]
+    repositoryformatversion = 0
+    filemode = true
+    bare = false
+    logallrefupdates = true
+    ignorecase = true
+    excludesfile = _git/ignore
+EOF
+
+cat > _git/ignore <<EOF
+*~
+.DS_Store
+_git
+EOF
+
+setdate() {
+  export GIT_AUTHOR_DATE=2001-02-03T04:${1}Z
+  export GIT_COMMITTER_DATE=$GIT_AUTHOR_DATE
+}
+
+echo test > sample.txt
+git add sample.txt
+setdate "00:00"
+git commit -m 'commit 0'
+
+echo test1 > sample.txt
+git add sample.txt
+setdate "00:01"
+git commit -m 'commit 1'
+
+echo test2 > sample.txt
+git add sample.txt
+setdate "00:02"
+git commit -m 'commit 2'
+
+git gc
+
+echo test3 > sample.txt
+git add sample.txt
+setdate "00:03"
+git commit -m 'commit 3'
+
+git tag -a test3-tag -m 'tag for commit 3'
+
+echo test4 > sample.txt
+git add sample.txt
+setdate "00:04"
+git commit -m 'commit 4'
+
+git tag simple-tag
+
+git branch branch-a
+git branch branch-b
+
+git checkout branch-a
+
+echo test4a-1 > sample-a.txt
+git add sample-a.txt
+setdate "00:05"
+git commit -m 'commit 4a-1'
+
+echo test4a-2 > sample-a.txt
+git add sample-a.txt
+setdate "00:06"
+git commit -m 'commit 4a-2'
+
+git checkout branch-b
+
+echo test4b-1 > sample-b.txt
+git add sample-b.txt
+setdate "00:07"
+git commit -m 'commit 4b-1'
+
+git checkout master
+
+setdate "00:08"
+git merge --no-ff branch-a -m 'merge a'
+
+setdate "00:09"
+mkdir subdir
+touch subdir/sample-sub.txt
+git add subdir/sample-sub.txt
+git commit -m 'add subdir'

data/spec/fixtures/git/plain_file

@@ -0,0 +1 @@
+sample

data/spec/fixtures/json/blob.json

@@ -0,0 +1,9 @@
+{
+  "type": "blob",
+  "sha1": "d234c5e057fe32c676ea67e8cb38f4625ddaeb54",
+  "size": "6",
+  "entries": null,
+  "content": "test4\n",
+  "properties": null,
+  "message": null
+}

data/spec/fixtures/json/merge-a.json

@@ -0,0 +1,48 @@
+{
+  "type": "commit",
+  "sha1": "37d1632d3f1159dad9cfb58e6c34312ab4355c49",
+  "size": "258",
+  "entries": null,
+  "content": "tree c36491256978d26c08cd7aa97eee0f5631f96659\nparent 93b714995d24c52180195876058a49c7d7fea0ad\nparent bee0d26d33c284ee065e38bd7e81ae4bdc870f89\nauthor git sample <git@example.com> 981172808 +0000\ncommitter git sample <git@example.com> 981172808 +0000\n\nmerge a\n",
+  "properties": [
+    {
+      "key": "tree",
+      "value": "c36491256978d26c08cd7aa97eee0f5631f96659",
+      "type": "sha1",
+      "path": "objects/c3/6491256978d26c08cd7aa97eee0f5631f96659"
+    },
+    {
+      "key": "parent",
+      "value": "93b714995d24c52180195876058a49c7d7fea0ad",
+      "type": "sha1",
+      "path": "objects/93/b714995d24c52180195876058a49c7d7fea0ad"
+    },
+    {
+      "key": "parent",
+      "value": "bee0d26d33c284ee065e38bd7e81ae4bdc870f89",
+      "type": "sha1",
+      "path": "objects/be/e0d26d33c284ee065e38bd7e81ae4bdc870f89"
+    },
+    {
+      "key": "author",
+      "value": "git sample <git@example.com> 981172808 +0000",
+      "type": "user",
+      "name": "git sample",
+      "email": "git@example.com",
+      "unixtime": "981172808",
+      "timezone": "+0000",
+      "date": "2001-02-03T04:00:08+00:00"
+    },
+    {
+      "key": "committer",
+      "value": "git sample <git@example.com> 981172808 +0000",
+      "type": "user",
+      "name": "git sample",
+      "email": "git@example.com",
+      "unixtime": "981172808",
+      "timezone": "+0000",
+      "date": "2001-02-03T04:00:08+00:00"
+    }
+  ],
+  "message": "merge a"
+}

data/spec/fixtures/json/test3-tag.json

@@ -0,0 +1,36 @@
+{
+  "type": "tag",
+  "sha1": "00cb8bfeb5b8ce906d39698e4e33b38341f5448f",
+  "size": "144",
+  "entries": null,
+  "content": "object 532a1874c26cd19bd4d66e03218ab73e63de4357\ntype commit\ntag test3-tag\ntagger git sample <git@example.com> 981172803 +0000\n\ntag for commit 3\n",
+  "properties": [
+    {
+      "key": "object",
+      "value": "532a1874c26cd19bd4d66e03218ab73e63de4357",
+      "type": "sha1",
+      "path": "objects/53/2a1874c26cd19bd4d66e03218ab73e63de4357"
+    },
+    {
+      "key": "type",
+      "value": "commit",
+      "type": "text"
+    },
+    {
+      "key": "tag",
+      "value": "test3-tag",
+      "type": "text"
+    },
+    {
+      "key": "tagger",
+      "value": "git sample <git@example.com> 981172803 +0000",
+      "type": "user",
+      "name": "git sample",
+      "email": "git@example.com",
+      "unixtime": "981172803",
+      "timezone": "+0000",
+      "date": "2001-02-03T04:00:03+00:00"
+    }
+  ],
+  "message": "tag for commit 3"
+}

data/spec/fixtures/json/tree.json

@@ -0,0 +1,20 @@
+{
+  "type": "tree",
+  "sha1": "c36491256978d26c08cd7aa97eee0f5631f96659",
+  "size": "78",
+  "entries": [
+    {
+      "mode": "100644",
+      "filename": "sample-a.txt",
+      "sha1": "1d3dc60b5a117054e43741d51e599ff31bb15f9f"
+    },
+    {
+      "mode": "100644",
+      "filename": "sample.txt",
+      "sha1": "d234c5e057fe32c676ea67e8cb38f4625ddaeb54"
+    }
+  ],
+  "content": null,
+  "properties": null,
+  "message": null
+}

data/spec/fixtures/worktree/_git/COMMIT_EDITMSG

@@ -0,0 +1 @@
+add subdir

data/spec/fixtures/worktree/_git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

data/spec/fixtures/worktree/_git/ORIG_HEAD

@@ -0,0 +1 @@
+93b714995d24c52180195876058a49c7d7fea0ad

data/spec/fixtures/worktree/_git/config

@@ -0,0 +1,11 @@
+[user]
+    name = git sample
+    email = git@example.com
+
+[core]
+    repositoryformatversion = 0
+    filemode = true
+    bare = false
+    logallrefupdates = true
+    ignorecase = true
+    excludesfile = _git/ignore

data/spec/fixtures/worktree/_git/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

data/spec/fixtures/worktree/_git/hooks/applypatch-msg.sample

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:

data/spec/fixtures/worktree/_git/hooks/commit-msg.sample

@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}

data/spec/fixtures/worktree/_git/hooks/post-update.sample

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info

data/spec/fixtures/worktree/_git/hooks/pre-applypatch.sample

@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+	exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:

data/spec/fixtures/worktree/_git/hooks/pre-commit.sample

@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ascii filenames set this variable to true.
+allownonascii=$(git config hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ascii filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	echo "Error: Attempt to add a non-ascii file name."
+	echo
+	echo "This can cause problems if you want to work"
+	echo "with people on other platforms."
+	echo
+	echo "To be portable it is advisable to rename the file ..."
+	echo
+	echo "If you know what you are doing you can disable this"
+	echo "check using:"
+	echo
+	echo "  git config hooks.allownonascii true"
+	echo
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

data/spec/fixtures/worktree/_git/hooks/pre-rebase.sample

@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up-to-date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+exit 0
+
+################################################################
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".