Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Renamed websocket-server-node.js temporarily
- Loading branch information
Makoto Inoue
committed
Dec 8, 2009
1 parent
266dd21
commit 1974765
Showing
382 changed files
with
1,056 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Removed END |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
624bc948ec42c664e387e1f323cd0336d1f3e50f branch 'master' of git://github.com/alexanderte/websocket-server-node.js |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
ref: refs/heads/master |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
885b5db57e5cd5994f95fae6b4916400352c8bdc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
[core] | ||
repositoryformatversion = 0 | ||
filemode = true | ||
bare = false | ||
logallrefupdates = true | ||
ignorecase = true | ||
[remote "origin"] | ||
fetch = +refs/heads/*:refs/remotes/origin/* | ||
url = git://github.com/alexanderte/websocket-server-node.js.git | ||
[branch "master"] | ||
remote = origin | ||
merge = refs/heads/master |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Unnamed repository; edit this file 'description' to name the repository. |
15 changes: 15 additions & 0 deletions
15
server/websocket-server-node.js_a/.git_bak/hooks/applypatch-msg.sample
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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+"$@"} | ||
: |
24 changes: 24 additions & 0 deletions
24
server/websocket-server-node.js_a/.git_bak/hooks/commit-msg.sample
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
} |
8 changes: 8 additions & 0 deletions
8
server/websocket-server-node.js_a/.git_bak/hooks/post-commit.sample
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
#!/bin/sh | ||
# | ||
# An example hook script that is called after a successful | ||
# commit is made. | ||
# | ||
# To enable this hook, rename this file to "post-commit". | ||
|
||
: Nothing |
15 changes: 15 additions & 0 deletions
15
server/websocket-server-node.js_a/.git_bak/hooks/post-receive.sample
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
#!/bin/sh | ||
# | ||
# An example hook script for the "post-receive" event. | ||
# | ||
# The "post-receive" script is run after receive-pack has accepted a pack | ||
# and the repository has been updated. It is passed arguments in through | ||
# stdin in the form | ||
# <oldrev> <newrev> <refname> | ||
# For example: | ||
# aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master | ||
# | ||
# see contrib/hooks/ for an sample, or uncomment the next line and | ||
# rename the file to "post-receive". | ||
|
||
#. /usr/share/doc/git-core/contrib/hooks/post-receive-email |
8 changes: 8 additions & 0 deletions
8
server/websocket-server-node.js_a/.git_bak/hooks/post-update.sample
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
14 changes: 14 additions & 0 deletions
14
server/websocket-server-node.js_a/.git_bak/hooks/pre-applypatch.sample
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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+"$@"} | ||
: |
43 changes: 43 additions & 0 deletions
43
server/websocket-server-node.js_a/.git_bak/hooks/pre-commit.sample
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
#!/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 you want to allow non-ascii filenames set this variable to true. | ||
allownonascii=$(git config hooks.allownonascii) | ||
|
||
# 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" ] && | ||
test "$(git diff --cached --name-only --diff-filter=A -z | | ||
LC_ALL=C tr -d '[ -~]\0')" | ||
then | ||
echo "Error: Attempt to add a non-ascii filename." | ||
echo | ||
echo "This can cause problems if you want to work together" | ||
echo "with people on other platforms than you." | ||
echo | ||
echo "To be portable it is adviseable 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 git-rev-parse --verify HEAD >/dev/null 2>&1 | ||
then | ||
against=HEAD | ||
else | ||
# Initial commit: diff against an empty tree object | ||
against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 | ||
fi | ||
|
||
exec git diff-index --check --cached $against -- |
169 changes: 169 additions & 0 deletions
169
server/websocket-server-node.js_a/.git_bak/hooks/pre-rebase.sample
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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"` | ||
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". |
36 changes: 36 additions & 0 deletions
36
server/websocket-server-node.js_a/.git_bak/hooks/prepare-commit-msg.sample
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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,) | ||
perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; | ||
|
||
# ,|template,) | ||
# 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" |
Oops, something went wrong.