doc: Add paragraph about mkdocs

.github/ISSUE_TEMPLATE.md

@@ -1,12 +0,0 @@
-## Output of `restic version`
-
-
-## Expected behavior
-
-
-## Actual behavior
-
-
-## Steps to reproduce the behavior
-
-

.gitignore

@@ -1,5 +1,8 @@
-/pkg
-/bin
+/.gopath
 /restic
+/restic.debug
+/dirdiff
+cmd/dirdiff/dirdiff
+cmd/gentestdata/gentestdata
+cmd/restic/restic
 /.vagrant
-/vendor/pkg

.hound.yml

@@ -1,2 +0,0 @@
-go:
-  enabled: true

.travis.yml

@@ -3,23 +3,13 @@ sudo: false
 
 go:
   - 1.3.3
-  - 1.4.3
-  - 1.5.4
-  - 1.6.2
+  - 1.4.2
+  - 1.5
 
 os:
   - linux
   - osx
 
-matrix:
-  exclude:
-    - os: osx
-      go: 1.3.3
-    - os: osx
-      go: 1.4.3
-    - os: osx
-      go: 1.5.4
-
 notifications:
   irc:
     channels:
@@ -32,11 +22,11 @@ install:
   - go version
   - export GOBIN="$GOPATH/bin"
   - export PATH="$PATH:$GOBIN"
+  - export GOPATH="$GOPATH:${TRAVIS_BUILD_DIR}/Godeps/_workspace"
   - go env
-  - ulimit -n 2048
 
 script:
   - go run run_integration_tests.go
 
 after_success:
-  - GOPATH=$PWD:$PWD/vendor goveralls -coverprofile=all.cov -service=travis-ci -repotoken "$COVERALLS_TOKEN"
+  - goveralls -coverprofile=all.cov -service=travis-ci -repotoken "$COVERALLS_TOKEN" || true

CONTRIBUTING.md

@@ -25,64 +25,42 @@ those tagged
 [minor complexity](https://github.com/restic/restic/labels/minor%20complexity).
 
 
-Reporting Bugs
-==============
-
-You've found a bug? Thanks for letting us know so we can fix it! It is a good
-idea to describe in detail how to reproduce the bug (when you know how), what
-environment was used and so on. Please tell us at least the following things:
-
- * What's the version of restic you used? Please include the output of
-   `restic version` in your bug report.
- * What commands did you execute to get to where the bug occurred?
- * What did you expect?
- * What happened instead?
- * Are you aware of a way to reproduce the bug?
-
-Remember, the easier it is for us to reproduce the bug, the earlier it will be
-corrected!
-
-In addition, you can compile restic with debug support by running
-`go run build.go -tags debug` and instructing it to create a debug log by
-setting the environment variable `DEBUG_LOG` to a file, e.g. like this:
-
-    $ export DEBUG_LOG=/tmp/restic-debug.log
-    $ restic backup ~/work
-
-Please be aware that the debug log file will contain potentially sensitive
-things like file and directory names, so please either redact it before
-uploading it somewhere or post only the parts that are really relevant.
-
-
 Development Environment
 =======================
 
-For development you need the build tool [`gb`](https://getgb.io), it can be
-installed by running the following command:
+For development, it is recommended to check out the restic repository within a
+`GOPATH`, an introductory text is
+["How to Write Go Code"](https://golang.org/doc/code.html). It is recommended
+to have a working directory, we're using `~/work/restic` in the following. This
+directory mainly contains the directory `src`, where the source code is stored.
 
-    $ go get github.com/constabulary/gb/...
-
-The repository contains two directories with code: `src/` contains the code
-written for restic, whereas `vendor/` contains copies of libraries restic
-depends on. The libraries are managed with the `gb vendor` command.
-
-Just clone the repository, `cd` to it and run `gb build` to build the binary:
+First, create the necessary directory structure and clone the restic repository
+to the correct location:
 
+    $ mkdir --parents ~/work/restic/src/github.com/restic
+    $ cd ~/work/restic/src/github.com/restic
     $ git clone https://github.com/restic/restic
     $ cd restic
-    $ gb build
-    [...]
-    $ bin/restic version
-    restic compiled manually
-    compiled at unknown time with go1.6
+
+Now we're in the main directory of the restic repository. The last step is to
+set the environment variable `$GOPATH` to the correct value:
+
+    $ export GOPATH=~/work/restic:~/work/restic/src/github.com/restic/restic/Godeps/_workspace
 
 The following commands can be used to run all the tests:
 
-    $ gb test
+    $ go test ./...
     ok          github.com/restic/restic        8.174s
     [...]
 
-If you want to run your tests on Linux, OpenBSD or FreeBSD, you can use
+The restic binary can be built from the directory `cmd/restic` this way:
+
+    $ cd cmd/restic
+    $ go build
+    $ ./restic version
+    restic compiled manually on go1.4.2
+
+if you want to run your tests on Linux, OpenBSD or FreeBSD, you can use
 [vagrant](https://www.vagrantup.com/) with the proveded `Vagrantfile` to
 quickly set up VMs and run the tests, e.g.:
 
@@ -100,32 +78,23 @@ get it into the project! The workflow we're using is also described on the
 [GitHub Flow](https://guides.github.com/introduction/flow/) website, it boils
 down to the following steps:
 
- 0. If you want to work on something, please add a comment to the issue on
-    GitHub. For a new feature, please add an issue before starting to work on
-    it, so that duplicate work is prevented.
-
  1. First we would kindly ask you to fork our project on GitHub if you haven't
     done so already.
-
  2. Clone the repository locally and create a new branch. If you are working on
     the code itself, please set up the development environment as described in
-    the previous section.
-
+    the previous section and instead of cloning add your fork on GitHub as a
+    remote to the clone of the restic repository.
  3. Then commit your changes as fine grained as possible, as smaller patches,
     that handle one and only one issue are easier to discuss and merge.
-
  4. Push the new branch with your changes to your fork of the repository.
-
  5. Create a pull request by visiting the GitHub website, it will guide you
     through the process.
-
  6. You will receive comments on your code and the feature or bug that they
     address. Maybe you need to rework some minor things, in this case push new
     commits to the branch you created for the pull request, they will be
     automatically added to the pull request.
-
- 7. Once your code looks good and passes all the tests, we'll merge it. Thanks
-    a low for your contribution!
+ 7. Once your code looks good, we'll merge it. Thanks a low for your
+    contribution!
 
 Please provide the patches for each bug or feature in a separate branch and
 open up a pull request for each.
@@ -140,14 +109,6 @@ in the project root directory before committing. Installing the script
 pre-commit hook checks formatting before committing automatically, just copy
 this script to `.git/hooks/pre-commit`.
 
-For each pull request, several different systems run the integration tests on
-Linux, OS X and Windows. We won't merge any code that does not pass all tests
-for all systems, so when a tests fails, try to find out what's wrong and fix
-it. If you need help on this, please leave a comment in the pull request, and
-we'll be glad to assist. Having a PR with failing integration tests is nothing
-to be ashamed of. In contrast, that happens regularly for all of us. That's
-what the tests are there for.
-
 Git Commits
 -----------
 

Dockerfile

@@ -1,58 +0,0 @@
-# This Dockerfiles configures a container that is similar to the Travis CI
-# environment and can be used to run tests locally.
-#
-# build the image:
-#   docker build -t restic/test .
-#
-# run all tests and cross-compile restic:
-#   docker run --rm -v $PWD:/home/travis/restic restic/test go run run_integration_tests.go -minio minio
-#
-# run interactively:
-#   docker run --interactive --tty --rm -v $PWD:/home/travis/restic restic/test /bin/bash
-#
-# run a subset of tests:
-#   docker run --rm -v $PWD:/home/travis/restic restic/test gb test -v ./backend
-#
-# build the image for an older version of Go:
-#   docker build --build-arg GOVERSION=1.3.3 -t restic/test:go1.3.3 .
-
-FROM ubuntu:14.04
-
-ARG GOVERSION=1.6
-ARG GOARCH=amd64
-
-# install dependencies
-RUN apt-get update
-RUN apt-get install -y --no-install-recommends ca-certificates wget git build-essential openssh-server
-
-# add and configure user
-ENV HOME /home/travis
-RUN useradd -m -d $HOME -s /bin/bash travis
-
-# run everything below as user travis
-USER travis
-WORKDIR $HOME
-
-# download and install Go
-RUN wget -q -O /tmp/go.tar.gz https://storage.googleapis.com/golang/go${GOVERSION}.linux-${GOARCH}.tar.gz
-RUN tar xf /tmp/go.tar.gz && rm -f /tmp/go.tar.gz
-ENV GOROOT $HOME/go
-ENV GOPATH $HOME/gopath
-ENV PATH $PATH:$GOROOT/bin:$GOPATH/bin:$HOME/bin
-
-RUN mkdir -p $HOME/restic
-
-# pre-install tools, this speeds up running the tests itself
-RUN go get github.com/constabulary/gb/...
-RUN go get golang.org/x/tools/cmd/cover
-RUN go get github.com/mattn/goveralls
-RUN go get github.com/mitchellh/gox
-RUN go get github.com/pierrre/gotestcover
-RUN mkdir $HOME/bin \
-    && wget -q -O $HOME/bin/minio https://dl.minio.io/server/minio/release/linux-${GOARCH}/minio \
-    && chmod +x $HOME/bin/minio
-
-# set TRAVIS_BUILD_DIR for integration script
-ENV TRAVIS_BUILD_DIR $HOME/restic
-
-WORKDIR $HOME/restic

Godeps/Godeps.json

@@ -0,0 +1,62 @@
+{
+	"ImportPath": "github.com/restic/restic",
+	"GoVersion": "go1.4.2",
+	"Packages": [
+		"./..."
+	],
+	"Deps": [
+		{
+			"ImportPath": "bazil.org/fuse",
+			"Rev": "18419ee53958df28fcfc9490fe6123bd59e237bb"
+		},
+		{
+			"ImportPath": "github.com/jessevdk/go-flags",
+			"Comment": "v1-297-g1b89bf7",
+			"Rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"
+		},
+		{
+			"ImportPath": "github.com/juju/errors",
+			"Rev": "4567a5e69fd3130ca0d89f69478e7ac025b67452"
+		},
+		{
+			"ImportPath": "github.com/kr/fs",
+			"Rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b"
+		},
+		{
+			"ImportPath": "github.com/mitchellh/goamz/aws",
+			"Rev": "caaaea8b30ee15616494ee68abd5d8ebbbef05cf"
+		},
+		{
+			"ImportPath": "github.com/mitchellh/goamz/s3",
+			"Rev": "caaaea8b30ee15616494ee68abd5d8ebbbef05cf"
+		},
+		{
+			"ImportPath": "github.com/pkg/sftp",
+			"Rev": "518aed2757a65cfa64d4b1b2baf08410f8b7a6bc"
+		},
+		{
+			"ImportPath": "github.com/restic/chunker",
+			"Rev": "e795b80f4c927ebcf2687ce18bcf1a39fee740b1"
+		},
+		{
+			"ImportPath": "github.com/vaughan0/go-ini",
+			"Rev": "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"
+		},
+		{
+			"ImportPath": "golang.org/x/crypto/pbkdf2",
+			"Rev": "cc04154d65fb9296747569b107cfd05380b1ea3e"
+		},
+		{
+			"ImportPath": "golang.org/x/crypto/poly1305",
+			"Rev": "cc04154d65fb9296747569b107cfd05380b1ea3e"
+		},
+		{
+			"ImportPath": "golang.org/x/crypto/scrypt",
+			"Rev": "cc04154d65fb9296747569b107cfd05380b1ea3e"
+		},
+		{
+			"ImportPath": "golang.org/x/crypto/ssh",
+			"Rev": "cc04154d65fb9296747569b107cfd05380b1ea3e"
+		}
+	]
+}

Godeps/Readme

@@ -0,0 +1,5 @@
+This directory tree is generated automatically by godep.
+
+Please do not edit.
+
+See https://github.com/tools/godep for more information.

Godeps/_workspace/.gitignore

@@ -0,0 +1,2 @@
+/pkg
+/bin

Godeps/_workspace/src/bazil.org/fuse/.gitattributes

@@ -0,0 +1,2 @@
+*.go filter=gofmt
+*.cgo filter=gofmt

Godeps/_workspace/src/bazil.org/fuse/.gitignore

@@ -0,0 +1,11 @@
+*~
+.#*
+## the next line needs to start with a backslash to avoid looking like
+## a comment
+\#*#
+.*.swp
+
+*.test
+
+/clockfs
+/hellofs

Godeps/_workspace/src/bazil.org/fuse/doc/.gitignore

@@ -0,0 +1,4 @@
+/*.seq.svg
+
+# not ignoring *.seq.png; we want those committed to the repo
+# for embedding on Github

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/doc.go

@@ -0,0 +1 @@
+package fstestutil

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/record.go

@@ -1,4 +1,4 @@
-package record // import "bazil.org/fuse/fs/fstestutil/record"
+package record
 
 import (
 	"sync"

Godeps/_workspace/src/bazil.org/fuse/fs/serve.go

@@ -1,6 +1,6 @@
 // FUSE service loop, for servers that wish to use it.
 
-package fs // import "bazil.org/fuse/fs"
+package fs
 
 import (
 	"encoding/binary"

Godeps/_workspace/src/bazil.org/fuse/fuse.go

@@ -98,7 +98,7 @@
 // Behavior and metadata of the mounted file system can be changed by
 // passing MountOption values to Mount.
 //
-package fuse // import "bazil.org/fuse"
+package fuse
 
 import (
 	"bytes"

Godeps/_workspace/src/bazil.org/fuse/fuseutil/fuseutil.go

@@ -1,4 +1,4 @@
-package fuseutil // import "bazil.org/fuse/fuseutil"
+package fuseutil
 
 import (
 	"bazil.org/fuse"

Godeps/_workspace/src/bazil.org/fuse/syscallx/doc.go

@@ -10,4 +10,4 @@
 //
 // Options can be implemented with separate wrappers, in the style of
 // Linux getxattr/lgetxattr/fgetxattr.
-package syscallx // import "bazil.org/fuse/syscallx"
+package syscallx

Godeps/_workspace/src/github.com/jessevdk/go-flags/.travis.yml

@@ -0,0 +1,35 @@
+language: go
+
+install:
+  # go-flags
+  - go get -d -v ./...
+  - go build -v ./...
+
+  # linting
+  - go get golang.org/x/tools/cmd/vet
+  - go get github.com/golang/lint
+  - go install github.com/golang/lint/golint
+
+  # code coverage
+  - go get golang.org/x/tools/cmd/cover
+  - go get github.com/onsi/ginkgo/ginkgo
+  - go get github.com/modocache/gover
+  - if [ "$TRAVIS_SECURE_ENV_VARS" = "true" ]; then go get github.com/mattn/goveralls; fi
+
+script:
+  # go-flags
+  - $(exit $(gofmt -l . | wc -l))
+  - go test -v ./...
+
+  # linting
+  - go tool vet -all=true -v=true . || true
+  - $(go env GOPATH | awk 'BEGIN{FS=":"} {print $1}')/bin/golint ./...
+
+  # code coverage
+  - $(go env GOPATH | awk 'BEGIN{FS=":"} {print $1}')/bin/ginkgo -r -cover
+  - $(go env GOPATH | awk 'BEGIN{FS=":"} {print $1}')/bin/gover
+  - if [ "$TRAVIS_SECURE_ENV_VARS" = "true" ]; then $(go env GOPATH | awk 'BEGIN{FS=":"} {print $1}')/bin/goveralls -coverprofile=gover.coverprofile -service=travis-ci -repotoken $COVERALLS_TOKEN; fi
+
+env:
+  # coveralls.io
+  secure: "RCYbiB4P0RjQRIoUx/vG/AjP3mmYCbzOmr86DCww1Z88yNcy3hYr3Cq8rpPtYU5v0g7wTpu4adaKIcqRE9xknYGbqj3YWZiCoBP1/n4Z+9sHW3Dsd9D/GRGeHUus0laJUGARjWoCTvoEtOgTdGQDoX7mH+pUUY0FBltNYUdOiiU="