allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [2/3] git commit: [#7207] ticket:552 set default branch for git repos without master branch
Date Tue, 01 Apr 2014 14:03:10 GMT
[#7207] ticket:552 set default branch for git repos without master branch


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/6d1d1e42
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/6d1d1e42
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/6d1d1e42

Branch: refs/heads/master
Commit: 6d1d1e42a41e4ed9b5b4b33f5c9f612b3b802000
Parents: 2ea41b1
Author: Yuriy Arhipov <yuriyarhipovua@yandex.ru>
Authored: Mon Mar 10 12:01:26 2014 +0400
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Mon Mar 31 18:27:01 2014 +0000

----------------------------------------------------------------------
 Allura/allura/model/repository.py               |  16 ++
 ForgeGit/forgegit/git_main.py                   |   6 +-
 .../forgegit/tests/data/test_branch.git/HEAD    |   1 +
 .../forgegit/tests/data/test_branch.git/config  |   4 +
 .../tests/data/test_branch.git/description      |   1 +
 .../test_branch.git/hooks/applypatch-msg.sample |  15 ++
 .../test_branch.git/hooks/commit-msg.sample     |  24 +++
 .../test_branch.git/hooks/post-update.sample    |   8 +
 .../test_branch.git/hooks/pre-applypatch.sample |  14 ++
 .../test_branch.git/hooks/pre-commit.sample     |  49 ++++++
 .../data/test_branch.git/hooks/pre-push.sample  |  54 ++++++
 .../test_branch.git/hooks/pre-rebase.sample     | 169 +++++++++++++++++++
 .../hooks/prepare-commit-msg.sample             |  36 ++++
 .../data/test_branch.git/hooks/update.sample    | 128 ++++++++++++++
 .../tests/data/test_branch.git/info/exclude     |   6 +
 .../26/d219526a6a64efcd2bf566f04735f798a50084   | Bin 0 -> 53 bytes
 .../7d/30f18e9c19aa41138c96fe31fb07dc02409361   | Bin 0 -> 127 bytes
 .../9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4   | Bin 0 -> 20 bytes
 .../tests/data/test_branch.git/refs/heads/test  |   1 +
 .../tests/functional/test_controllers.py        |  24 +++
 .../forgegit/tests/model/test_repository.py     |   4 +
 ForgeGit/forgegit/tests/test_git_app.py         |   5 -
 22 files changed, 555 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/Allura/allura/model/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index c08e546..b4c5d64 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -664,6 +664,22 @@ class Repository(Artifact, ActivityObject):
         self.status = status
         session(self).flush(self)
 
+    def get_default_branch(self, default_name):
+        default_branch_name = getattr(
+            self, 'default_branch_name', None)
+        branch_names = []
+
+        if not self.is_empty():
+            branch_names = [b.name for b in self._impl.branches]
+        if default_branch_name not in branch_names:
+            if (default_name in branch_names) or (len(branch_names) == 0):
+                default_branch_name = default_name
+            else:
+                default_branch_name = branch_names[0]
+                self.set_default_branch(default_branch_name)
+        return default_branch_name
+
+
 
 class MergeRequest(VersionedArtifact, ActivityObject):
     statuses = ['open', 'merged', 'rejected']

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/git_main.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/git_main.py b/ForgeGit/forgegit/git_main.py
index 5a7dfd4..62fc0f7 100644
--- a/ForgeGit/forgegit/git_main.py
+++ b/ForgeGit/forgegit/git_main.py
@@ -68,11 +68,7 @@ class ForgeGitApp(RepositoryApp):
 
     @property
     def default_branch_name(self):
-        default_branch_name = getattr(
-            self.repo, 'default_branch_name', 'master')
-        if not default_branch_name:
-            default_branch_name = 'master'
-        return default_branch_name
+        return self.repo.get_default_branch('master')
 
     def admin_menu(self):
         links = []

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/HEAD
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/HEAD b/ForgeGit/forgegit/tests/data/test_branch.git/HEAD
new file mode 100644
index 0000000..cea9d05
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/test_branch.git/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/test

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/config
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/config b/ForgeGit/forgegit/tests/data/test_branch.git/config
new file mode 100644
index 0000000..07d359d
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/test_branch.git/config
@@ -0,0 +1,4 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/description
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/description b/ForgeGit/forgegit/tests/data/test_branch.git/description
new file mode 100644
index 0000000..498b267
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/test_branch.git/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/hooks/applypatch-msg.sample
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/hooks/applypatch-msg.sample b/ForgeGit/forgegit/tests/data/test_branch.git/hooks/applypatch-msg.sample
new file mode 100755
index 0000000..8b2a2fe
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/test_branch.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+"$@"}
+:

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/hooks/commit-msg.sample
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/hooks/commit-msg.sample b/ForgeGit/forgegit/tests/data/test_branch.git/hooks/commit-msg.sample
new file mode 100755
index 0000000..b58d118
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/test_branch.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
+}

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/hooks/post-update.sample
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/hooks/post-update.sample b/ForgeGit/forgegit/tests/data/test_branch.git/hooks/post-update.sample
new file mode 100755
index 0000000..ec17ec1
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/test_branch.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

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/hooks/pre-applypatch.sample
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/hooks/pre-applypatch.sample b/ForgeGit/forgegit/tests/data/test_branch.git/hooks/pre-applypatch.sample
new file mode 100755
index 0000000..b1f187c
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/test_branch.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+"$@"}
+:

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/hooks/pre-commit.sample
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/hooks/pre-commit.sample b/ForgeGit/forgegit/tests/data/test_branch.git/hooks/pre-commit.sample
new file mode 100755
index 0000000..68d62d5
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/test_branch.git/hooks/pre-commit.sample
@@ -0,0 +1,49 @@
+#!/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 --bool 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
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/hooks/pre-push.sample
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/hooks/pre-push.sample b/ForgeGit/forgegit/tests/data/test_branch.git/hooks/pre-push.sample
new file mode 100755
index 0000000..1f3bceb
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/test_branch.git/hooks/pre-push.sample
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local sha1> <remote ref> <remote sha1>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+z40=0000000000000000000000000000000000000000
+
+IFS=' '
+while read local_ref local_sha remote_ref remote_sha
+do
+	if [ "$local_sha" = $z40 ]
+	then
+		# Handle delete
+		:
+	else
+		if [ "$remote_sha" = $z40 ]
+		then
+			# New branch, examine all commits
+			range="$local_sha"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_sha..$local_sha"
+		fi
+
+		# Check for WIP commit
+		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
+		if [ -n "$commit" ]
+		then
+			echo "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/hooks/pre-rebase.sample
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/hooks/pre-rebase.sample b/ForgeGit/forgegit/tests/data/test_branch.git/hooks/pre-rebase.sample
new file mode 100755
index 0000000..33730ca
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/test_branch.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
+
+<<\DOC_END
+
+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".
+
+DOC_END

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/hooks/prepare-commit-msg.sample
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/hooks/prepare-commit-msg.sample
b/ForgeGit/forgegit/tests/data/test_branch.git/hooks/prepare-commit-msg.sample
new file mode 100755
index 0000000..f093a02
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/test_branch.git/hooks/prepare-commit-msg.sample
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples.  The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+case "$2,$3" in
+  merge,)
+    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+#   /usr/bin/perl -i.bak -pe '
+#      print "\n" . `git diff --cached --name-status -r`
+#	 if /^#/ && $first++ == 0' "$1" ;;
+
+  *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/hooks/update.sample
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/hooks/update.sample b/ForgeGit/forgegit/tests/data/test_branch.git/hooks/update.sample
new file mode 100755
index 0000000..d847583
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/test_branch.git/hooks/update.sample
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to blocks unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/info/exclude
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/info/exclude b/ForgeGit/forgegit/tests/data/test_branch.git/info/exclude
new file mode 100644
index 0000000..a5196d1
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/test_branch.git/info/exclude
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/objects/26/d219526a6a64efcd2bf566f04735f798a50084
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/objects/26/d219526a6a64efcd2bf566f04735f798a50084
b/ForgeGit/forgegit/tests/data/test_branch.git/objects/26/d219526a6a64efcd2bf566f04735f798a50084
new file mode 100644
index 0000000..4023d5a
Binary files /dev/null and b/ForgeGit/forgegit/tests/data/test_branch.git/objects/26/d219526a6a64efcd2bf566f04735f798a50084
differ

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/objects/7d/30f18e9c19aa41138c96fe31fb07dc02409361
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/objects/7d/30f18e9c19aa41138c96fe31fb07dc02409361
b/ForgeGit/forgegit/tests/data/test_branch.git/objects/7d/30f18e9c19aa41138c96fe31fb07dc02409361
new file mode 100644
index 0000000..10d41b5
Binary files /dev/null and b/ForgeGit/forgegit/tests/data/test_branch.git/objects/7d/30f18e9c19aa41138c96fe31fb07dc02409361
differ

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4
b/ForgeGit/forgegit/tests/data/test_branch.git/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4
new file mode 100644
index 0000000..4667dcf
Binary files /dev/null and b/ForgeGit/forgegit/tests/data/test_branch.git/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4
differ

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/data/test_branch.git/refs/heads/test
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/test_branch.git/refs/heads/test b/ForgeGit/forgegit/tests/data/test_branch.git/refs/heads/test
new file mode 100644
index 0000000..ebb07f7
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/test_branch.git/refs/heads/test
@@ -0,0 +1 @@
+7d30f18e9c19aa41138c96fe31fb07dc02409361

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index 5c85e2c..aaae6f3 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -725,3 +725,27 @@ class TestGitRename(TestController):
         resp = self.app.get(
             '/src-git/ci/7c09182e61af959e4f1fb0e354bab49f14ef810d/tree/f.txt')
         assert "2 lines (1 with data), 10 Bytes" in resp
+
+
+class TestGitBranch(TestController):
+    def setUp(self):
+        super(TestGitBranch, self).setUp()
+        self.setup_with_tools()
+
+    @with_git
+    def setup_with_tools(self):
+        h.set_context('test', 'src-git', neighborhood='Projects')
+        repo_dir = pkg_resources.resource_filename(
+            'forgegit', 'tests/data')
+        c.app.repo.fs_path = repo_dir
+        c.app.repo.status = 'ready'
+        c.app.repo.name = 'test_branch.git'
+        ThreadLocalORMSession.flush_all()
+        h.set_context('test', 'src-git', neighborhood='Projects')
+        c.app.repo.refresh()
+        ThreadLocalORMSession.flush_all()
+
+    def test_exotic_default_branch(self):
+        r = self.app.get('/src-git/').follow().follow()
+        assert '<span>README</span>' in r
+        assert_equal(c.app.repo.get_default_branch('master'), 'test')
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/model/test_repository.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/model/test_repository.py b/ForgeGit/forgegit/tests/model/test_repository.py
index ff4ee48..c283798 100644
--- a/ForgeGit/forgegit/tests/model/test_repository.py
+++ b/ForgeGit/forgegit/tests/model/test_repository.py
@@ -470,6 +470,10 @@ class TestGitRepo(unittest.TestCase, RepoImplTestBase):
             ThreadLocalORMSession.flush_all()
             assert repo2.is_empty()
 
+    def test_default_branch(self):
+        self.repo.default_branch_name = 'zz'
+        assert_equal(self.repo.get_default_branch('master'), 'zz')
+
     def test_clone_url(self):
         assert_equal(
             self.repo.clone_url('rw', 'nobody'),

http://git-wip-us.apache.org/repos/asf/allura/blob/6d1d1e42/ForgeGit/forgegit/tests/test_git_app.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/test_git_app.py b/ForgeGit/forgegit/tests/test_git_app.py
index 44ce991..41034b1 100644
--- a/ForgeGit/forgegit/tests/test_git_app.py
+++ b/ForgeGit/forgegit/tests/test_git_app.py
@@ -42,11 +42,6 @@ class TestGitApp(unittest.TestCase):
     def test_admin_menu(self):
         assert_equals(len(c.app.admin_menu()), 6)
 
-    def test_default_branch(self):
-        assert c.app.default_branch_name == 'master'
-        c.app.repo.default_branch_name = 'zz'
-        assert c.app.default_branch_name == 'zz'
-
     def test_uninstall(self):
         from allura import model as M
         M.MonQTask.run_ready()


Mime
View raw message