Permalink
Browse files

Missed some stuff

  • Loading branch information...
rtomayko committed Feb 23, 2013
1 parent 78f7ce7 commit 79e14a3da68a39640fee24b6206f9c78eb74e579
Showing with 647 additions and 0 deletions.
  1. +92 −0 lib/grit/rev_list_parser.rb
  2. 0 test/dot_git_empty_messages/COMMIT_EDITMSG
  3. +1 −0 test/dot_git_empty_messages/HEAD
  4. +1 −0 test/dot_git_empty_messages/ORIG_HEAD
  5. +6 −0 test/dot_git_empty_messages/config
  6. +1 −0 test/dot_git_empty_messages/description
  7. +15 −0 test/dot_git_empty_messages/hooks/applypatch-msg.sample
  8. +24 −0 test/dot_git_empty_messages/hooks/commit-msg.sample
  9. +8 −0 test/dot_git_empty_messages/hooks/post-update.sample
  10. +14 −0 test/dot_git_empty_messages/hooks/pre-applypatch.sample
  11. +50 −0 test/dot_git_empty_messages/hooks/pre-commit.sample
  12. +169 −0 test/dot_git_empty_messages/hooks/pre-rebase.sample
  13. +36 −0 test/dot_git_empty_messages/hooks/prepare-commit-msg.sample
  14. +128 −0 test/dot_git_empty_messages/hooks/update.sample
  15. BIN test/dot_git_empty_messages/index
  16. +6 −0 test/dot_git_empty_messages/info/exclude
  17. +1 −0 test/dot_git_empty_messages/logs/HEAD
  18. +1 −0 test/dot_git_empty_messages/logs/refs/heads/master
  19. BIN test/dot_git_empty_messages/objects/2e/f2c2b18fcd6c1ba4f1faa8cf5683bf742188ae
  20. BIN test/dot_git_empty_messages/objects/4a/295262f134e3b97b3988d631e3bd9f9b132c8a
  21. BIN test/dot_git_empty_messages/objects/4d/1a44e56ba90cede39f40e48c0720e5f0cf4ff3
  22. BIN test/dot_git_empty_messages/objects/78/477bd8ee77c451f4e5f3e7f702b85c3a544b0c
  23. BIN test/dot_git_empty_messages/objects/a1/806fdbd334abc84018bd739a7b15550f1f3eed
  24. BIN test/dot_git_empty_messages/objects/b5/a089c7f17aa8fb1b3fd0b93313e7d3bea554a8
  25. BIN test/dot_git_empty_messages/objects/c0/1a96da0c12a4c49260cefa744b34c53a0c7c68
  26. BIN test/dot_git_empty_messages/objects/dc/c773ea6f2e04a9bc829d0c8f528701e9ba3fa0
  27. +1 −0 test/dot_git_empty_messages/refs/heads/master
  28. +1 −0 test/dot_git_signed_tag_merged/COMMIT_EDITMSG
  29. +1 −0 test/dot_git_signed_tag_merged/HEAD
  30. +1 −0 test/dot_git_signed_tag_merged/ORIG_HEAD
  31. +6 −0 test/dot_git_signed_tag_merged/config
  32. +1 −0 test/dot_git_signed_tag_merged/description
  33. BIN test/dot_git_signed_tag_merged/index
  34. +6 −0 test/dot_git_signed_tag_merged/info/exclude
  35. +7 −0 test/dot_git_signed_tag_merged/logs/HEAD
  36. +3 −0 test/dot_git_signed_tag_merged/logs/refs/heads/bar
  37. +2 −0 test/dot_git_signed_tag_merged/logs/refs/heads/foo
  38. +1 −0 test/dot_git_signed_tag_merged/logs/refs/heads/master
  39. +1 −0 test/dot_git_signed_tag_merged/objects/2a/e8b20538f5d358e97978632965efc380c42c9a
  40. BIN test/dot_git_signed_tag_merged/objects/3a/f7c2a1c819758c0fa2683c7f9b5533ecbec979
  41. BIN test/dot_git_signed_tag_merged/objects/67/1d0b0a85af271395eb71ff91f942f54681b144
  42. BIN test/dot_git_signed_tag_merged/objects/6a/a95c7b8c82fc9eb9c2a3b7c71abec19cb8c9ec
  43. BIN test/dot_git_signed_tag_merged/objects/73/95a5fa71a98c5531e9ec665914b1bce2457f85
  44. BIN test/dot_git_signed_tag_merged/objects/a9/ac6c1e58bbdd7693e49ce34b32d9b0b53c0bcf
  45. BIN test/dot_git_signed_tag_merged/objects/b2/b1760347d797f3dc79360d487b9afa7baafd6a
  46. BIN test/dot_git_signed_tag_merged/objects/d2/dea06dfd520a0a0b15d921efe7a0c26f886783
  47. BIN test/dot_git_signed_tag_merged/objects/d5/77fc4a18a1fdee327b2538d2739bead4231f65
  48. BIN test/dot_git_signed_tag_merged/objects/dc/e37589cfa5748900d05ab07ee2af5010866838
  49. BIN test/dot_git_signed_tag_merged/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
  50. BIN test/dot_git_signed_tag_merged/objects/f6/ea0495187600e7b2288c8ac19c5886383a4632
  51. BIN test/dot_git_signed_tag_merged/objects/fc/a9c5f64413cf9c2149d482df5b72b558cdbc8f
  52. +1 −0 test/dot_git_signed_tag_merged/refs/heads/bar
  53. +1 −0 test/dot_git_signed_tag_merged/refs/heads/foo
  54. +1 −0 test/dot_git_signed_tag_merged/refs/heads/master
  55. +1 −0 test/dot_git_signed_tag_merged/refs/tags/v1.0
  56. +1 −0 test/dot_git_signed_tag_merged/refs/tags/v1.1
  57. +58 −0 test/test_rev_list_parser.rb
@@ -0,0 +1,92 @@
+module Grit
+ class RevListParser
+ class Entry
+ attr_reader :meta, :message_lines
+
+ def initialize
+ @finished_meta = false
+ @meta = {}
+ @message_lines = []
+ end
+
+ def commit
+ (@meta[:commit] || []).first
+ end
+
+ def parents
+ @meta[:parent] || []
+ end
+
+ def tree
+ (@meta[:tree] || []).first
+ end
+
+ def author
+ (@meta[:author] || []).first
+ end
+
+ def committer
+ (@meta[:committer] || []).first
+ end
+
+ def parse(line)
+ if line.empty?
+ # 2 blank lines after meta data means no commit message
+ return if @finished_meta
+
+ # if this is our first blank line, lets get the message
+ return @finished_meta = true
+ end
+
+ spaces = line.scan(/^ */).first
+
+ if @finished_meta
+ # messages should be prefixed by at least 4 spaces. Otherwise we
+ # may be in the next commit.
+ return if spaces.size < 4
+ parse_message(line)
+ else
+ parse_meta(line, spaces.size)
+ end
+ true
+ end
+
+ def parse_meta(line, spaces)
+ return if spaces > 0 || line.empty?
+ header, value = line.split(' ', 2)
+ values = @meta[header.to_sym] ||= []
+ values << value
+ end
+
+ def parse_message(line)
+ @message_lines << line[4..-1]
+ end
+
+ def message?
+ @message_lines.size > 0
+ end
+ end
+
+ attr_reader :entries
+
+ def initialize(text)
+ @entries = []
+ lines = text.split("\n")
+ @entry = nil
+ while !lines.empty?
+ parse_line(lines.shift)
+ end
+ end
+
+ def parse_line(line)
+ if @entry && !@entry.parse(line)
+ @entry = nil
+ end
+
+ if !@entry && !line.empty?
+ @entries << (@entry = Entry.new)
+ @entry.parse(line)
+ end
+ end
+ end
+end
No changes.
@@ -0,0 +1 @@
+ref: refs/heads/master
@@ -0,0 +1 @@
+4a295262f134e3b97b3988d631e3bd9f9b132c8a
@@ -0,0 +1,6 @@
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = false
+ logallrefupdates = true
+ ignorecase = true
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
@@ -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+"$@"}
+:
@@ -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
+}
@@ -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
@@ -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+"$@"}
+:
@@ -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 --
@@ -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".
Oops, something went wrong.

0 comments on commit 79e14a3

Please sign in to comment.