diff --git a/cmd/git-remote-ipld/git-remote-ipld b/cmd/git-remote-ipld/git-remote-ipld new file mode 100755 index 0000000..7705cff Binary files /dev/null and b/cmd/git-remote-ipld/git-remote-ipld differ diff --git a/cmd/git-remote-ipld/ipld.go b/cmd/git-remote-ipld/ipld.go index 5370fb2..0ae86fa 100644 --- a/cmd/git-remote-ipld/ipld.go +++ b/cmd/git-remote-ipld/ipld.go @@ -6,12 +6,13 @@ import ( "fmt" "github.com/magik6k/git-remote-ipld/core" "gopkg.in/src-d/go-git.v4/plumbing" - "os" ) type IpldHandler struct { - // remoteHash is hash form remote name + // remoteHash is hash from remote name remoteHash string + // command line arguments + osArgs []string } func (h *IpldHandler) List(remote *core.Remote, forPush bool) ([]string, error) { @@ -38,7 +39,7 @@ func (h *IpldHandler) List(remote *core.Remote, forPush bool) ([]string, error) } // pull ipld::hash, we only want to update HEAD - if !forPush && headRef.Target() == ref.Name() && headRef.Type() == plumbing.SymbolicReference && len(os.Args) >= 3 { + if !forPush && headRef.Target() == ref.Name() && headRef.Type() == plumbing.SymbolicReference && len(h.osArgs) >= 3 { sha, err := hex.DecodeString(h.remoteHash) if err != nil { return err @@ -61,7 +62,7 @@ func (h *IpldHandler) List(remote *core.Remote, forPush bool) ([]string, error) } // For clone - if n == 0 && !forPush && len(os.Args) >= 3 { + if n == 0 && !forPush && len(h.osArgs) >= 3 { sha, err := hex.DecodeString(h.remoteHash) if err != nil { return nil, err diff --git a/cmd/git-remote-ipld/ipld_test.go b/cmd/git-remote-ipld/ipld_test.go new file mode 100644 index 0000000..404d7e9 --- /dev/null +++ b/cmd/git-remote-ipld/ipld_test.go @@ -0,0 +1,101 @@ +package main + +import ( + "bytes" + "github.com/magik6k/git-remote-ipld/util" + "io" + "io/ioutil" + "log" + "os" + "path/filepath" + "strings" + "testing" +) + +func TestCapabilities(t *testing.T) { + tmpdir := setupTest(t) + defer os.RemoveAll(tmpdir) + + // git clone ipld::d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 + args := []string{"git-remote-ipld", "origin", "d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8"} + + listExp := []string{ + "0000000000000000000000000000000000000000 refs/heads/french", + "0000000000000000000000000000000000000000 refs/heads/italian", + "d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 refs/heads/master", + "@refs/heads/master HEAD", + } + listForPushExp := []string{ + "0000000000000000000000000000000000000000 refs/heads/french", + "0000000000000000000000000000000000000000 refs/heads/italian", + "0000000000000000000000000000000000000000 refs/heads/master", + "@refs/heads/master HEAD", + } + + testCase(t, args, "capabilities", []string{"push", "fetch"}) + testCase(t, args, "list", listExp) + testCase(t, args, "list for-push", listForPushExp) + + // mock/git> git push --set-upstream ipld:: master + testCase(t, args, "push refs/heads/master:refs/heads/master", []string{}) + + testCase(t, args, "fetch d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 refs/heads/master\n", []string{""}) + comparePullToMock(t, tmpdir, "git") +} + +func testCase(t *testing.T, args []string, input string, expected []string) { + reader := strings.NewReader(input + "\n") + var writer bytes.Buffer + logger := log.New(ioutil.Discard, "", 0) + err := Main(args, reader, &writer, logger) + if err != nil && err != io.EOF { + t.Fatal(err) + } + + response := writer.String() + exp := strings.Join(expected, "\n") + if strings.TrimSpace(response) != exp { + t.Fatalf("Args: %s\nInput:\n%s\nExpected:\n%s\nActual:\n'%s'\n", args, input, exp, response) + } +} + +func comparePullToMock(t *testing.T, tmpdir, mock string) { + wd, _ := os.Getwd() + mockdir := filepath.Join(wd, "..", "..", "mock", mock) + compareContents(t, filepath.Join(tmpdir, ".git"), mockdir) +} + +func compareContents(t *testing.T, src, dst string) { + src = filepath.Clean(src) + dst = filepath.Clean(dst) + err := util.CompareDirs(src, dst, []string{"ipld"}) + if err != nil { + t.Fatal(err) + } +} + +func setupTest(t *testing.T) string { + wd, _ := os.Getwd() + src := filepath.Join(wd, "..", "..", "mock", "git") + si, err := os.Stat(src) + if err != nil { + t.Fatal(err) + } + if !si.IsDir() { + t.Fatal("source is not a directory") + } + + tmpdir, err := ioutil.TempDir("", "git-test") + if err != nil { + t.Fatal(err) + } + + dst := filepath.Join(tmpdir, ".git") + err = util.CopyDir(src, dst) + if err != nil { + t.Fatal(err) + } + + os.Setenv("GIT_DIR", dst) + return tmpdir +} diff --git a/cmd/git-remote-ipld/main.go b/cmd/git-remote-ipld/main.go index 18ef647..41ba669 100644 --- a/cmd/git-remote-ipld/main.go +++ b/cmd/git-remote-ipld/main.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "io" "log" "os" "strings" @@ -14,27 +15,26 @@ const ( IPFS_PREFIX = "ipfs://" ) -func Main() error { - if len(os.Args) < 3 { +func Main(args []string, reader io.Reader, writer io.Writer, logger *log.Logger) error { + if len(args) < 3 { return fmt.Errorf("Usage: git-remote-ipld remote-name url") } - hashArg := os.Args[2] + hashArg := args[2] if strings.HasPrefix(hashArg, IPLD_PREFIX) || strings.HasPrefix(hashArg, IPFS_PREFIX) { hashArg = hashArg[len(IPLD_PREFIX):] } - remote, err := core.NewRemote(&IpldHandler{remoteHash: hashArg}) + remote, err := core.NewRemote(&IpldHandler{remoteHash: hashArg, osArgs: args}, reader, writer, logger) if err != nil { return err } defer remote.Close() - return remote.ProcessCommands() } func main() { - if err := Main(); err != nil { + if err := Main(os.Args, nil, nil, nil); err != nil { fmt.Fprintf(os.Stderr, "\x1b[K") log.Fatal(err) } diff --git a/cmd/git-remote-ipns/git-remote-ipns b/cmd/git-remote-ipns/git-remote-ipns new file mode 100755 index 0000000..574fefd Binary files /dev/null and b/cmd/git-remote-ipns/git-remote-ipns differ diff --git a/cmd/git-remote-ipns/ipns.go b/cmd/git-remote-ipns/ipns.go index f0d6de9..4684b00 100644 --- a/cmd/git-remote-ipns/ipns.go +++ b/cmd/git-remote-ipns/ipns.go @@ -1,17 +1,17 @@ package main import ( - "path" "fmt" + "path" "strings" ipfs "github.com/ipfs/go-ipfs-api" "github.com/magik6k/git-remote-ipld/core" - cid "gx/ipfs/QmNp85zy9RLrQ5oQD4hPyS39ezrrXpcaa7R4Y9kxdWQLLQ/go-cid" - "gopkg.in/src-d/go-git.v4/plumbing" - "encoding/hex" "bytes" + "encoding/hex" + "gopkg.in/src-d/go-git.v4/plumbing" + cid "gx/ipfs/QmNp85zy9RLrQ5oQD4hPyS39ezrrXpcaa7R4Y9kxdWQLLQ/go-cid" ) const ( @@ -20,7 +20,7 @@ const ( ) type refPath struct { - path string + path string rType int hash string diff --git a/cmd/git-remote-ipns/main.go b/cmd/git-remote-ipns/main.go index 726306f..7730c4e 100644 --- a/cmd/git-remote-ipns/main.go +++ b/cmd/git-remote-ipns/main.go @@ -2,17 +2,18 @@ package main import ( "fmt" + "github.com/magik6k/git-remote-ipld/core" + "io" "log" "os" "strings" - "github.com/magik6k/git-remote-ipld/core" ) const ( IPNS_PREFIX = "ipns://" ) -func Main() error { +func Main(reader io.Reader, writer io.Writer, logger *log.Logger) error { if len(os.Args) < 3 { return fmt.Errorf("Usage: git-remote-ipns remote-name url") } @@ -22,7 +23,7 @@ func Main() error { remoteName = remoteName[len(IPNS_PREFIX):] } - remote, err := core.NewRemote(&IpnsHandler{remoteName:remoteName}) + remote, err := core.NewRemote(&IpnsHandler{remoteName: remoteName}, reader, writer, logger) if err != nil { return err } @@ -31,7 +32,7 @@ func Main() error { } func main() { - if err := Main(); err != nil { + if err := Main(nil, nil, nil); err != nil { fmt.Fprintf(os.Stderr, "\x1b[K") log.Fatal(err) } diff --git a/core/remote.go b/core/remote.go index 5743719..8972a1f 100644 --- a/core/remote.go +++ b/core/remote.go @@ -4,6 +4,7 @@ import ( "bufio" "encoding/hex" "fmt" + "io" "log" "os" "path" @@ -18,6 +19,8 @@ type RemoteHandler interface { } type Remote struct { + reader io.Reader + writer io.Writer Logger *log.Logger localDir string @@ -29,7 +32,7 @@ type Remote struct { todo []func() (string, error) } -func NewRemote(handler RemoteHandler) (*Remote, error) { +func NewRemote(handler RemoteHandler, reader io.Reader, writer io.Writer, logger *log.Logger) (*Remote, error) { localDir, err := GetLocalDir() if err != nil { return nil, err @@ -50,20 +53,32 @@ func NewRemote(handler RemoteHandler) (*Remote, error) { return nil, fmt.Errorf("fetch: %v", err) } + if reader == nil { + reader = os.Stdin + } + if writer == nil { + writer = os.Stdout + } + if logger == nil { + logger = log.New(os.Stderr, "", 0) + } + return &Remote{ - Logger: log.New(os.Stderr, "", 0), + reader: reader, + writer: writer, + Logger: logger, localDir: localDir, Repo: repo, Tracker: tracker, Handler: handler, - }, nil + }, nil } func (r *Remote) Printf(format string, a ...interface{}) (n int, err error) { r.Logger.Printf("> "+format, a...) - return fmt.Printf(format, a...) + return fmt.Fprintf(r.writer, format, a...) } func (r *Remote) NewPush() *Push { @@ -108,9 +123,9 @@ func (r *Remote) fetch(sha, ref string) { } func (r *Remote) ProcessCommands() error { - stdinReader := bufio.NewReader(os.Stdin) + reader := bufio.NewReader(r.reader) for { - command, err := stdinReader.ReadString('\n') + command, err := reader.ReadString('\n') if err != nil { return err } @@ -141,7 +156,7 @@ func (r *Remote) ProcessCommands() error { case command == "": fallthrough case command == "\n": - r.Logger.Println("Processsing tasks") + r.Logger.Println("Processing tasks") for _, task := range r.todo { resp, err := task() if err != nil { diff --git a/core/util.go b/core/util.go index 4f36cbf..04aff62 100644 --- a/core/util.go +++ b/core/util.go @@ -6,9 +6,9 @@ import ( "os" "path" + "fmt" cid "gx/ipfs/QmNp85zy9RLrQ5oQD4hPyS39ezrrXpcaa7R4Y9kxdWQLLQ/go-cid" mh "gx/ipfs/QmU9a9NV9RdPNwZQDYd5uKsm6N6LJLSvLbywDDYFbaaC6P/go-multihash" - "fmt" ) func compressObject(in []byte) []byte { diff --git a/mock/git/COMMIT_EDITMSG b/mock/git/COMMIT_EDITMSG new file mode 100644 index 0000000..6cf43c8 --- /dev/null +++ b/mock/git/COMMIT_EDITMSG @@ -0,0 +1 @@ +English -> Italian diff --git a/mock/git/HEAD b/mock/git/HEAD new file mode 100644 index 0000000..cb089cd --- /dev/null +++ b/mock/git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/mock/git/config b/mock/git/config new file mode 100644 index 0000000..6c9406b --- /dev/null +++ b/mock/git/config @@ -0,0 +1,7 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true diff --git a/mock/git/description b/mock/git/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/mock/git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/mock/git/hooks/applypatch-msg.sample b/mock/git/hooks/applypatch-msg.sample new file mode 100755 index 0000000..a5d7b84 --- /dev/null +++ b/mock/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 +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/mock/git/hooks/commit-msg.sample b/mock/git/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/mock/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 +} diff --git a/mock/git/hooks/post-update.sample b/mock/git/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/mock/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 diff --git a/mock/git/hooks/pre-applypatch.sample b/mock/git/hooks/pre-applypatch.sample new file mode 100755 index 0000000..4142082 --- /dev/null +++ b/mock/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 +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/mock/git/hooks/pre-commit.sample b/mock/git/hooks/pre-commit.sample new file mode 100755 index 0000000..68d62d5 --- /dev/null +++ b/mock/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 -- diff --git a/mock/git/hooks/pre-push.sample b/mock/git/hooks/pre-push.sample new file mode 100755 index 0000000..6187dbf --- /dev/null +++ b/mock/git/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/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: +# +# +# +# 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 + +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 >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/mock/git/hooks/pre-rebase.sample b/mock/git/hooks/pre-rebase.sample new file mode 100755 index 0000000..9773ed4 --- /dev/null +++ b/mock/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". diff --git a/mock/git/hooks/prepare-commit-msg.sample b/mock/git/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..f093a02 --- /dev/null +++ b/mock/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" diff --git a/mock/git/hooks/update.sample b/mock/git/hooks/update.sample new file mode 100755 index 0000000..d847583 --- /dev/null +++ b/mock/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 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&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 diff --git a/mock/git/index b/mock/git/index new file mode 100644 index 0000000..8da6827 Binary files /dev/null and b/mock/git/index differ diff --git a/mock/git/info/exclude b/mock/git/info/exclude new file mode 100644 index 0000000..8e9f207 --- /dev/null +++ b/mock/git/info/exclude @@ -0,0 +1,7 @@ +# 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] +# *~ +.DS_Store diff --git a/mock/git/logs/HEAD b/mock/git/logs/HEAD new file mode 100644 index 0000000..8e87dc7 --- /dev/null +++ b/mock/git/logs/HEAD @@ -0,0 +1,8 @@ +0000000000000000000000000000000000000000 d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 Dirk McCormick 1517945658 -0500 commit (initial): Say hello +d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 Dirk McCormick 1517945683 -0500 checkout: moving from master to french +d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 31f087b9bf39d5bcbba5d4e80b2b4ff19a71dc00 Dirk McCormick 1517945712 -0500 commit: English -> French +31f087b9bf39d5bcbba5d4e80b2b4ff19a71dc00 162429cc0dac923dff140ec29247f42a8e362419 Dirk McCormick 1517945735 -0500 commit: goodbye.txt +162429cc0dac923dff140ec29247f42a8e362419 d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 Dirk McCormick 1517945739 -0500 checkout: moving from french to master +d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 Dirk McCormick 1517945747 -0500 checkout: moving from master to italian +d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 78a77abd233c24d8e6a0d0d040c79ae569fc7a19 Dirk McCormick 1517945768 -0500 commit: English -> Italian +78a77abd233c24d8e6a0d0d040c79ae569fc7a19 d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 Dirk McCormick 1517945774 -0500 checkout: moving from italian to master diff --git a/mock/git/logs/refs/heads/french b/mock/git/logs/refs/heads/french new file mode 100644 index 0000000..38e8916 --- /dev/null +++ b/mock/git/logs/refs/heads/french @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 Dirk McCormick 1517945683 -0500 branch: Created from HEAD +d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 31f087b9bf39d5bcbba5d4e80b2b4ff19a71dc00 Dirk McCormick 1517945712 -0500 commit: English -> French +31f087b9bf39d5bcbba5d4e80b2b4ff19a71dc00 162429cc0dac923dff140ec29247f42a8e362419 Dirk McCormick 1517945735 -0500 commit: goodbye.txt diff --git a/mock/git/logs/refs/heads/italian b/mock/git/logs/refs/heads/italian new file mode 100644 index 0000000..e0d7184 --- /dev/null +++ b/mock/git/logs/refs/heads/italian @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 Dirk McCormick 1517945747 -0500 branch: Created from HEAD +d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 78a77abd233c24d8e6a0d0d040c79ae569fc7a19 Dirk McCormick 1517945768 -0500 commit: English -> Italian diff --git a/mock/git/logs/refs/heads/master b/mock/git/logs/refs/heads/master new file mode 100644 index 0000000..c7ad70a --- /dev/null +++ b/mock/git/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 d5b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 Dirk McCormick 1517945658 -0500 commit (initial): Say hello diff --git a/mock/git/objects/04/47b05c9be04cd29f437f2ec98af9b5a6a17156 b/mock/git/objects/04/47b05c9be04cd29f437f2ec98af9b5a6a17156 new file mode 100644 index 0000000..7385637 Binary files /dev/null and b/mock/git/objects/04/47b05c9be04cd29f437f2ec98af9b5a6a17156 differ diff --git a/mock/git/objects/16/2429cc0dac923dff140ec29247f42a8e362419 b/mock/git/objects/16/2429cc0dac923dff140ec29247f42a8e362419 new file mode 100644 index 0000000..e5d4218 --- /dev/null +++ b/mock/git/objects/16/2429cc0dac923dff140ec29247f42a8e362419 @@ -0,0 +1,2 @@ +xA +0E]e4IDzLEc$Dۛ3ڔi5%3N4g2>0AGP7GSV/0BZ,#&N4Ec Z`v-UzSg>WtΒއK}J;pr:nɖ̇K)B4O~{I \ No newline at end of file diff --git a/mock/git/objects/31/f087b9bf39d5bcbba5d4e80b2b4ff19a71dc00 b/mock/git/objects/31/f087b9bf39d5bcbba5d4e80b2b4ff19a71dc00 new file mode 100644 index 0000000..8640d06 --- /dev/null +++ b/mock/git/objects/31/f087b9bf39d5bcbba5d4e80b2b4ff19a71dc00 @@ -0,0 +1 @@ +x[ E*f5@y&1"0XD/kܜsNĠSw(F$ită+*5,rb0MQFm iD BQ{k* <𲗜pSh}z=7N*L1ֵEVݶ3#[5Kc \ No newline at end of file diff --git a/mock/git/objects/45/306d9e3a93e015de956ec7be2b3fb377d3ec85 b/mock/git/objects/45/306d9e3a93e015de956ec7be2b3fb377d3ec85 new file mode 100644 index 0000000..3b607ed Binary files /dev/null and b/mock/git/objects/45/306d9e3a93e015de956ec7be2b3fb377d3ec85 differ diff --git a/mock/git/objects/58/1caa0fe56cf01dc028cc0b089d364993e046b6 b/mock/git/objects/58/1caa0fe56cf01dc028cc0b089d364993e046b6 new file mode 100644 index 0000000..2373cdf --- /dev/null +++ b/mock/git/objects/58/1caa0fe56cf01dc028cc0b089d364993e046b6 @@ -0,0 +1 @@ +x+)JMU06g040031QH+(a/`E۪{E 2<, \ No newline at end of file diff --git a/mock/git/objects/78/a77abd233c24d8e6a0d0d040c79ae569fc7a19 b/mock/git/objects/78/a77abd233c24d8e6a0d0d040c79ae569fc7a19 new file mode 100644 index 0000000..c6b8692 --- /dev/null +++ b/mock/git/objects/78/a77abd233c24d8e6a0d0d040c79ae569fc7a19 @@ -0,0 +1,2 @@ +xKj0@))#[_!vE1g=xxkf11> )32 @%&K֩'uYd0c`dO1S\04{q" +EuWzc޹e?哷vmzQvf~Rp8eRiU/K \ No newline at end of file diff --git a/mock/git/objects/95/3ee2f1c6a92eeff7604e9a5e6c93b1d28615c8 b/mock/git/objects/95/3ee2f1c6a92eeff7604e9a5e6c93b1d28615c8 new file mode 100644 index 0000000..82ee42b Binary files /dev/null and b/mock/git/objects/95/3ee2f1c6a92eeff7604e9a5e6c93b1d28615c8 differ diff --git a/mock/git/objects/98/0a0d5f19a64b4b30a87d4206aade58726b60e3 b/mock/git/objects/98/0a0d5f19a64b4b30a87d4206aade58726b60e3 new file mode 100644 index 0000000..c6f4349 Binary files /dev/null and b/mock/git/objects/98/0a0d5f19a64b4b30a87d4206aade58726b60e3 differ diff --git a/mock/git/objects/98/991eb8d6cb267d0ccc296c29b109d3d062da76 b/mock/git/objects/98/991eb8d6cb267d0ccc296c29b109d3d062da76 new file mode 100644 index 0000000..6f882b2 Binary files /dev/null and b/mock/git/objects/98/991eb8d6cb267d0ccc296c29b109d3d062da76 differ diff --git a/mock/git/objects/a1/0a342f7ead6bcea5a7564b2f3cee749063ad60 b/mock/git/objects/a1/0a342f7ead6bcea5a7564b2f3cee749063ad60 new file mode 100644 index 0000000..4c3d329 Binary files /dev/null and b/mock/git/objects/a1/0a342f7ead6bcea5a7564b2f3cee749063ad60 differ diff --git a/mock/git/objects/d5/b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 b/mock/git/objects/d5/b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 new file mode 100644 index 0000000..0482864 --- /dev/null +++ b/mock/git/objects/d5/b0d08c180fd7a9bf4f684a37e60ceeb4d25ec8 @@ -0,0 +1,2 @@ +xQ +!@sbl"l+ >{xTErq3X)F\:ZP'£'}H3!LNw_k{n= len(srcEntries) { + dstSubPath := filepath.Join(dstPath, dstEntries[i].Name()) + return fmt.Errorf("File %s in destination directory does not exist in source directory %s", dstSubPath, srcPath) + } + if i >= len(dstEntries) { + srcSubPath := filepath.Join(srcPath, srcEntries[i].Name()) + return fmt.Errorf("File %s in source directory does not exist in destination directory %s", srcSubPath, dstPath) + } + if srcEntries[i].Name() < dstEntries[i].Name() { + srcSubPath := filepath.Join(srcPath, srcEntries[i].Name()) + return fmt.Errorf("File %s in source directory does not exist in destination directory %s", srcSubPath, dstPath) + } else if srcEntries[i].Name() > dstEntries[i].Name() { + dstSubPath := filepath.Join(dstPath, dstEntries[i].Name()) + return fmt.Errorf("File %s in destination directory does not exist in source directory %s", dstSubPath, srcPath) + } + } + + for _, entry := range srcEntries { + srcSubPath := filepath.Join(srcPath, entry.Name()) + dstSubPath := filepath.Join(dstPath, entry.Name()) + + if entry.IsDir() { + err = CompareDirs(srcSubPath, dstSubPath, ignore) + if err != nil { + return err + } + // Skip symlinks. + } else if entry.Mode()&os.ModeSymlink == 0 { + err = CompareFiles(srcSubPath, dstSubPath) + if err != nil { + return err + } + } + } + return nil +} + +const chunkSize = 64000 + +func CompareFiles(file1, file2 string) error { + f1, err := os.Open(file1) + if err != nil { + return err + } + + f2, err := os.Open(file2) + if err != nil { + return err + } + + for { + b1 := make([]byte, chunkSize) + _, err1 := f1.Read(b1) + + b2 := make([]byte, chunkSize) + _, err2 := f2.Read(b2) + + if err1 != nil || err2 != nil { + if err1 == io.EOF && err2 == io.EOF { + return nil + } else if err1 == io.EOF || err2 == io.EOF { + return fmt.Errorf("File %s != %s", file1, file2) + } else { + return err1 + } + } + + if !bytes.Equal(b1, b2) { + return fmt.Errorf("File %s != %s", file1, file2) + } + } +} diff --git a/util/copy.go b/util/copy.go new file mode 100644 index 0000000..d6aef7d --- /dev/null +++ b/util/copy.go @@ -0,0 +1,133 @@ +/* MIT License + * + * Copyright (c) 2017 Roland Singer [roland.singer@desertbit.com] + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package util + +import ( + "fmt" + "io" + "io/ioutil" + "os" + "path/filepath" +) + +// CopyFile copies the contents of the file named src to the file named +// by dst. The file will be created if it does not already exist. If the +// destination file exists, all it's contents will be replaced by the contents +// of the source file. The file mode will be copied from the source and +// the copied data is synced/flushed to stable storage. +func CopyFile(src, dst string) (err error) { + in, err := os.Open(src) + if err != nil { + return + } + defer in.Close() + + out, err := os.Create(dst) + if err != nil { + return + } + defer func() { + if e := out.Close(); e != nil { + err = e + } + }() + + _, err = io.Copy(out, in) + if err != nil { + return + } + + err = out.Sync() + if err != nil { + return + } + + si, err := os.Stat(src) + if err != nil { + return + } + err = os.Chmod(dst, si.Mode()) + if err != nil { + return + } + + return +} + +// CopyDir recursively copies a directory tree, attempting to preserve permissions. +// Source directory must exist, destination directory must *not* exist. +// Symlinks are ignored and skipped. +func CopyDir(src string, dst string) (err error) { + src = filepath.Clean(src) + dst = filepath.Clean(dst) + + si, err := os.Stat(src) + if err != nil { + return err + } + if !si.IsDir() { + return fmt.Errorf("source is not a directory") + } + + _, err = os.Stat(dst) + if err != nil && !os.IsNotExist(err) { + return + } + if err == nil { + return fmt.Errorf("destination already exists") + } + + err = os.MkdirAll(dst, si.Mode()) + if err != nil { + return + } + + entries, err := ioutil.ReadDir(src) + if err != nil { + return + } + + for _, entry := range entries { + srcPath := filepath.Join(src, entry.Name()) + dstPath := filepath.Join(dst, entry.Name()) + + if entry.IsDir() { + err = CopyDir(srcPath, dstPath) + if err != nil { + return + } + } else { + // Skip symlinks. + if entry.Mode()&os.ModeSymlink != 0 { + continue + } + + err = CopyFile(srcPath, dstPath) + if err != nil { + return + } + } + } + + return +}