Add VERSION for 0.8.1

Replace manual CHANGELOG with generated one

.envrc

@@ -1 +0,0 @@
-GOPATH=$PWD:$PWD/vendor

.github/ISSUE_TEMPLATE.md

@@ -1,25 +1,63 @@
 <!--
-NOTE: Not filling out the issue template needs a good reason, otherwise the
-issue may be closed instantly! Please take the time to help us debugging the
-problem by collecting information, even if it seems irrelevant to you. Thanks!
+NOTE: Not filling out the issue template needs a good reason, otherwise it may
+take a lot longer to find the problem! Please take the time to help us
+debugging the problem by collecting information, even if it seems irrelevant to
+you. Thanks!
+
+If you have a question, the forum at https://discourse.restic.net is a better place.
+Please do not create issues for usage or documentation questions! We're using
+the GitHub issue tracker mainly for tracking bugs and feature requests.
 -->
 
 ## Output of `restic version`
 
 
-## How did you start restic exactly? (Include the complete command line)
+## How did you run restic exactly?
+
+<!--
+This section should include at least:
+
+ * The complete command line and any environment variables you used to
+   configure restic's backend access. Make sure to replace sensitive values!
+
+ * The output of the commands, what restic prints gives may give us much
+   information to diagnose the problem!
+-->
 
 
-## What backend/server/service did you use?
+## What backend/server/service did you use to store the repository?
 
 
 ## Expected behavior
 
+<!--
+Describe what you'd like restic to do differently.
+-->
 
 ## Actual behavior
 
+<!--
+In this section, please try to concentrate on observations, so only describe
+what you observed directly.
+-->
 
 ## Steps to reproduce the behavior
 
+<!--
+The more time you spend describing an easy way to reproduce the behavior (if
+this is possible), the easier it is for the project developers to fix it!
+-->
+
 
 ## Do you have any idea what may have caused this?
+
+
+## Do you have an idea how to solve the issue?
+
+## Did restic help you or made you happy in any way?
+
+<!--
+Answering this question is not required, but if you have anything positive to share, please do so here!
+Sometimes we get tired of reading bug reports all day and a little positive end note does wonders.
+Idea by Joey Hess, https://joeyh.name/blog/entry/two_holiday_stories/
+-->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,31 @@
+<!--
+Thank you very much for contributing code or documentation to restic! Please
+fill out the following questions to make it easier for us to review your
+changes.
+
+You do not need to check all the boxes below all at once, feel free to take
+your time and add more commits. If you're done and ready for review, please
+check the last box.
+-->
+
+### What is the purpose of this change? What does it change?
+
+<!--
+Describe the changes here, as detailed as needed.
+-->
+
+### Was the change discussed in an issue or in the forum before?
+
+<!--
+Link issues and relevant forum posts here.
+-->
+
+### Checklist
+
+- [ ] I have read the [Contribution Guidelines](https://github.com/restic/restic/blob/master/CONTRIBUTING.md#providing-patches)
+- [ ] I have added tests for all changes in this PR
+- [ ] I have added documentation for the changes (in the manual)
+- [ ] There's an entry in the `CHANGELOG.md` file that describe the changes for our users
+- [ ] I have run `gofmt` on the code in all commits
+- [ ] All commit messages are formatted in the same style as [the other commits in the repo](https://github.com/restic/restic/blob/master/CONTRIBUTING.md#git-commits)
+- [ ] I'm done, this Pull Request is ready for review

.gitignore

@@ -1,6 +1,3 @@
-/pkg
-/bin
 /restic
 /.vagrant
-/vendor/pkg
 /doc/_build

.travis.yml

@@ -2,9 +2,8 @@ language: go
 sudo: false
 
 go:
-  - 1.7.6
-  - 1.8.3
-  - tip
+  - 1.8.x
+  - 1.9.x
 
 os:
   - linux
@@ -17,19 +16,15 @@ env:
 matrix:
   exclude:
     - os: osx
-      go: 1.7.6
-    - os: osx
-      go: tip
+      go: 1.8.x
     - os: linux
-      go: 1.8.3
+      go: 1.9.x
   include:
     - os: linux
-      go: 1.8.3
+      go: 1.9.x
       sudo: true
       env:
         RESTIC_TEST_FUSE=1
-  allow_failures:
-    - go: tip
 
 branches:
   only:

CHANGELOG.md

@@ -1,69 +1,700 @@
-This file describes changes relevant to all users that are made in each
-released version of restic from the perspective of the user.
+Changelog for restic 0.8.1 (UNRELEASED)
+=======================================
 
-Important Changes in 0.6.1
-==========================
+The following sections list the changes in restic 0.8.1 relevant to
+restic users. The changes are ordered by importance.
 
-This is mostly a bugfix release and only contains small changes:
+Summary
+-------
 
- * We've fixed a bug where `rebuild-index` would corrupt the index when used
-   with the s3 backend together with the `default` layout. This is not the
-   default setting.
+ * Fix #1457: Improve s3 backend with DigitalOcean Spaces
+ * Fix #1454: Correct cache dir location for Windows and Darwin
+ * Fix #1457: Disable handling SIGPIPE
+ * Chg #1452: Do not save atime by default
+ * Enh #1436: Add code to detect old cache directories
+ * Enh #1439: Improve cancellation logic
+ * Enh #11: Add the `diff` command
+
+Details
+-------
+
+ * Bugfix #1457: Improve s3 backend with DigitalOcean Spaces
+
+   https://github.com/restic/restic/issues/1457
+   https://github.com/restic/restic/pull/1459
+
+ * Bugfix #1454: Correct cache dir location for Windows and Darwin
+
+   The cache directory on Windows and Darwin was not correct, instead the directory `.cache` was
+   used.
+
+   https://github.com/restic/restic/pull/1454
+
+ * Bugfix #1457: Disable handling SIGPIPE
+
+   We've disabled handling SIGPIPE again. Turns out, writing to broken TCP connections also
+   raised SIGPIPE, so restic exits on the first write to a broken connection. Instead, restic
+   should retry the request.
+
+   https://github.com/restic/restic/issues/1457
+   https://github.com/restic/restic/issues/1466
+   https://github.com/restic/restic/pull/1459
+
+ * Change #1452: Do not save atime by default
+
+   By default, the access time for files and dirs is not saved any more. It is not possible to
+   reliably disable updating the access time during a backup, so for the next backup the access
+   time is different again. This means a lot of metadata is saved. If you want to save the access time
+   anyway, pass `--with-atime` to the `backup` command.
+
+   https://github.com/restic/restic/pull/1452
+
+ * Enhancement #1436: Add code to detect old cache directories
+
+   We've added code to detect old cache directories of repositories that haven't been used in a
+   long time, restic now prints a note when it detects that such dirs exist. Also, the option
+   `--cleanup-cache` was added to automatically remove such directories. That's not a problem
+   because the cache will be rebuild once a repo is accessed again.
+
+   https://github.com/restic/restic/pull/1436
+
+ * Enhancement #1439: Improve cancellation logic
+
+   The cancellation logic was improved, restic can now shut down cleanly when requested to do so
+   (e.g. via ctrl+c).
+
+   https://github.com/restic/restic/pull/1439
+
+ * Enhancement #11: Add the `diff` command
+
+   The command `diff` was added, it allows comparing two snapshots and listing all differences.
+
+   https://github.com/restic/restic/issues/11
+   https://github.com/restic/restic/issues/1460
+   https://github.com/restic/restic/pull/1462
+
+
+Changelog for restic 0.8.0 (2017-11-26)
+=======================================
+
+The following sections list the changes in restic 0.8.0 relevant to
+restic users. The changes are ordered by importance.
+
+Summary
+-------
+
+ * Sec #1445: Prevent writing outside the target directory during restore
+ * Fix #1256: Re-enable workaround for S3 backend
+ * Fix #1291: Reuse backend TCP connections to BackBlaze B2
+ * Fix #1317: Run prune when `forget --prune` is called with just snapshot IDs
+ * Fix #1292: Remove implicit path `/restic` for the s3 backend
+ * Enh #1102: Add subdirectory `ids` to fuse mount
+ * Enh #1114: Add `--cacert` to specify TLS certificates to check against
+ * Enh #1216: Add upload/download limiting
+ * Enh #1271: Cache results for excludes for `backup`
+ * Enh #1274: Add `generate` command, replaces `manpage` and `autocomplete`
+ * Enh #1367: Allow comments in files read from via `--file-from`
+ * Enh #448: Sftp backend prompts for password
+ * Enh #510: Add `dump` command
+ * Enh #29: Add local metadata cache
+ * Enh #1249: Add `latest` symlink in fuse mount
+ * Enh #1269: Add `--compact` to `forget` command
+ * Enh #1281: Google Cloud Storage backend needs less permissions
+ * Enh #1303: Make `check` print `no errors found` explicitly
+ * Enh #1353: Retry failed backend requests
+
+Details
+-------
+
+ * Security #1445: Prevent writing outside the target directory during restore
+
+   A vulnerability was found in the restic restorer, which allowed attackers in special
+   circumstances to restore files to a location outside of the target directory. Due to the
+   circumstances we estimate this to be a low-risk vulnerability, but urge all users to upgrade to
+   the latest version of restic.
+
+   Exploiting the vulnerability requires a Linux/Unix system which saves backups via restic and
+   a Windows systems which restores files from the repo. In addition, the attackers need to be able
+   to create create files with arbitrary names which are then saved to the restic repo. For
+   example, by creating a file named "..\test.txt" (which is a perfectly legal filename on Linux)
+   and restoring a snapshot containing this file on Windows, it would be written to the parent of
+   the target directory.
+
+   We'd like to thank Tyler Spivey for reporting this responsibly!
+
+   https://github.com/restic/restic/pull/1445
+
+ * Bugfix #1256: Re-enable workaround for S3 backend
+
+   We've re-enabled a workaround for `minio-go` (the library we're using to access s3 backends),
+   this reduces memory usage.
+
+   https://github.com/restic/restic/issues/1256
+   https://github.com/restic/restic/pull/1267
+
+ * Bugfix #1291: Reuse backend TCP connections to BackBlaze B2
+
+   A bug was discovered in the library we're using to access Backblaze, it now reuses already
+   established TCP connections which should be a lot faster and not cause network failures any
+   more.
+
+   https://github.com/restic/restic/issues/1291
+   https://github.com/restic/restic/pull/1301
+
+ * Bugfix #1317: Run prune when `forget --prune` is called with just snapshot IDs
+
+   A bug in the `forget` command caused `prune` not to be run when `--prune` was specified without a
+   policy, e.g. when only snapshot IDs that should be forgotten are listed manually.
+
+   https://github.com/restic/restic/pull/1317
+
+ * Bugfix #1292: Remove implicit path `/restic` for the s3 backend
+
+   The s3 backend used the subdir `restic` within a bucket if no explicit path after the bucket name
+   was specified. Since this version, restic does not use this default path any more. If you
+   created a repo on s3 in a bucket without specifying a path within the bucket, you need to add
+   `/restic` at the end of the repository specification to access your repo:
+   `s3:s3.amazonaws.com/bucket/restic`
+
+   https://github.com/restic/restic/issues/1292
+   https://github.com/restic/restic/pull/1437
+
+ * Enhancement #1102: Add subdirectory `ids` to fuse mount
+
+   The fuse mount now has an `ids` subdirectory which contains the snapshots below their (short)
+   IDs.
+
+   https://github.com/restic/restic/issues/1102
+   https://github.com/restic/restic/pull/1299
+   https://github.com/restic/restic/pull/1320
+
+ * Enhancement #1114: Add `--cacert` to specify TLS certificates to check against
+
+   We've added the `--cacert` option which can be used to pass one (or more) CA certificates to
+   restic. These are used in addition to the system CA certificates to verify HTTPS certificates
+   (e.g. for the REST backend).
+
+   https://github.com/restic/restic/issues/1114
+   https://github.com/restic/restic/pull/1276
+
+ * Enhancement #1216: Add upload/download limiting
+
+   We've added support for rate limiting through `--limit-upload` and `--limit-download`
+   flags.
+
+   https://github.com/restic/restic/issues/1216
+   https://github.com/restic/restic/pull/1336
+   https://github.com/restic/restic/pull/1358
+
+ * Enhancement #1271: Cache results for excludes for `backup`
+
+   The `backup` command now caches the result of excludes for a directory.
+
+   https://github.com/restic/restic/issues/1271
+   https://github.com/restic/restic/pull/1326
+
+ * Enhancement #1274: Add `generate` command, replaces `manpage` and `autocomplete`
+
+   The `generate` command has been added, which replaces the now removed commands `manpage` and
+   `autocomplete`. This release of restic contains the most recent manpages in `doc/man` and the
+   auto-completion files for bash and zsh in `doc/bash-completion.sh` and
+   `doc/zsh-completion.zsh`
+
+   https://github.com/restic/restic/issues/1274
+   https://github.com/restic/restic/pull/1282
+
+ * Enhancement #1367: Allow comments in files read from via `--file-from`
+
+   When the list of files/dirs to be saved is read from a file with `--files-from`, comment lines
+   (starting with `#`) are now ignored.
+
+   https://github.com/restic/restic/issues/1367
+   https://github.com/restic/restic/pull/1368
+
+ * Enhancement #448: Sftp backend prompts for password
+
+   The sftp backend now prompts for the password if a password is necessary for login.
+
+   https://github.com/restic/restic/issues/448
+   https://github.com/restic/restic/pull/1270
+
+ * Enhancement #510: Add `dump` command
+
+   We've added the `dump` command which prints a file from a snapshot to stdout. This can e.g. be
+   used to restore files read with `backup --stdin`.
+
+   https://github.com/restic/restic/issues/510
+   https://github.com/restic/restic/pull/1346
+
+ * Enhancement #29: Add local metadata cache
+
+   We've added a local cache for metadata so that restic doesn't need to load all metadata
+   (snapshots, indexes, ...) from the repo each time it starts. By default the cache is active, but
+   there's a new global option `--no-cache` that can be used to disable the cache. By deafult, the
+   cache a standard cache folder for the OS, which can be overridden with `--cache-dir`. The cache
+   will automatically populate, indexes and snapshots are saved as they are loaded. Cache
+   directories for repos that haven't been used recently can automatically be removed by restic
+   with the `--cleanup-cache` option.
+
+   A related change was to by default create pack files in the repo that contain either data or
+   metadata, not both mixed together. This allows easy caching of only the metadata files. The
+   next run of `restic prune` will untangle mixed files automatically.
+
+   https://github.com/restic/restic/issues/29
+   https://github.com/restic/restic/issues/738
+   https://github.com/restic/restic/issues/282
+   https://github.com/restic/restic/pull/1040
+   https://github.com/restic/restic/pull/1287
+   https://github.com/restic/restic/pull/1436
+   https://github.com/restic/restic/pull/1265
+
+ * Enhancement #1249: Add `latest` symlink in fuse mount
+
+   The directory structure in the fuse mount now exposes a symlink `latest` which points to the
+   latest snapshot in that particular directory.
+
+   https://github.com/restic/restic/pull/1249
+
+ * Enhancement #1269: Add `--compact` to `forget` command
+
+   The option `--compact` was added to the `forget` command to provide the same compact view as the
+   `snapshots` command.
+
+   https://github.com/restic/restic/pull/1269
+
+ * Enhancement #1281: Google Cloud Storage backend needs less permissions
+
+   The Google Cloud Storage backend no longer requires the service account to have the
+   `storage.buckets.get` permission ("Storage Admin" role) in `restic init` if the bucket
+   already exists.
+
+   https://github.com/restic/restic/pull/1281
+
+ * Enhancement #1303: Make `check` print `no errors found` explicitly
+
+   The `check` command now explicetly prints `No errors were found` when no errors could be found.
+
+   https://github.com/restic/restic/issues/1303
+   https://github.com/restic/restic/pull/1319
+
+ * Enhancement #1353: Retry failed backend requests
+
+   https://github.com/restic/restic/pull/1353
+
+
+Changelog for restic 0.7.3 (2017-09-20)
+=======================================
+
+The following sections list the changes in restic 0.7.3 relevant to
+restic users. The changes are ordered by importance.
+
+Summary
+-------
+
+ * Fix #1246: List all files stored in Google Cloud Storage
+
+Details
+-------
+
+ * Bugfix #1246: List all files stored in Google Cloud Storage
+
+   For large backups stored in Google Cloud Storage, the `prune` command fails because listing
+   only returns the first 1000 files. This has been corrected, no data is lost in the process. In
+   addition, a plausibility check was added to `prune`.
+
+   https://github.com/restic/restic/issues/1246
+   https://github.com/restic/restic/pull/1247
+
+
+Changelog for restic 0.7.2 (2017-09-13)
+=======================================
+
+The following sections list the changes in restic 0.7.2 relevant to
+restic users. The changes are ordered by importance.
+
+Summary
+-------
+
+ * Fix #1167: Do not create a local repo unless `init` is used
+ * Fix #1164: Make the `key remove` command behave as documented
+ * Fix #1191: Make sure to write profiling files on interrupt
+ * Enh #1132: Make `key` command always prompt for a password
+ * Enh #1179: Resolve name conflicts, append a counter
+ * Enh #1218: Add `--compact` to `snapshots` command
+ * Enh #317: Add `--exclude-caches` and `--exclude-if-present`
+ * Enh #697: Automatically generate man pages for all restic commands
+ * Enh #1044: Improve `restore`, do not traverse/load excluded directories
+ * Enh #1061: Add Dockerfile and official Docker image
+ * Enh #1126: Use the standard Go git repository layout, use `dep` for vendoring
+ * Enh #211: Add support for storing backups on Google Cloud Storage
+ * Enh #1144: Properly report errors when reading files with exclude patterns.
+ * Enh #609: Add support for storing backups on Microsoft Azure Blob Storage
+ * Enh #1196: Add `--group-by` to `forget` command for flexible grouping
+ * Enh #1203: Print stats on all BSD systems when SIGINFO (ctrl+t) is received
+ * Enh #1205: Allow specifying time/date for a backup with `--time`
+
+Details
+-------
+
+ * Bugfix #1167: Do not create a local repo unless `init` is used
+
+   When a restic command other than `init` is used with a local repository and the repository
+   directory does not exist, restic creates the directory structure. That's an error, only the
+   `init` command should create the dir.
+
+   https://github.com/restic/restic/issues/1167
+   https://github.com/restic/restic/pull/1182
+
+ * Bugfix #1164: Make the `key remove` command behave as documented
+
+   https://github.com/restic/restic/pull/1164
+
+ * Bugfix #1191: Make sure to write profiling files on interrupt
+
+   Since a few releases restic had the ability to write profiling files for memory and CPU usage
+   when `debug` is enabled. It was discovered that when restic is interrupted (ctrl+c is
+   pressed), the proper shutdown hook is not run. This is now corrected.
+
+   https://github.com/restic/restic/pull/1191
+
+ * Enhancement #1132: Make `key` command always prompt for a password
+
+   The `key` command now prompts for a password even if the original password to access a repo has
+   been specified via the `RESTIC_PASSWORD` environment variable or a password file.
+
+   https://github.com/restic/restic/issues/1132
+   https://github.com/restic/restic/pull/1133
+
+ * Enhancement #1179: Resolve name conflicts, append a counter
+
+   https://github.com/restic/restic/issues/1179
+   https://github.com/restic/restic/pull/1209
+
+ * Enhancement #1218: Add `--compact` to `snapshots` command
+
+   The option `--compact` was added to the `snapshots` command to get a better overview of the
+   snapshots in a repo. It limits each snapshot to a single line.
+
+   https://github.com/restic/restic/issues/1218
+   https://github.com/restic/restic/pull/1223
+
+ * Enhancement #317: Add `--exclude-caches` and `--exclude-if-present`
+
+   A new option `--exclude-caches` was added that allows excluding cache directories (that are
+   tagged as such). This is a special case of a more generic option `--exclude-if-present` which
+   excludes a directory if a file with a specific name (and contents) is present.
+
+   https://github.com/restic/restic/issues/317
+   https://github.com/restic/restic/pull/1170
+   https://github.com/restic/restic/pull/1224
+
+ * Enhancement #697: Automatically generate man pages for all restic commands
+
+   https://github.com/restic/restic/issues/697
+   https://github.com/restic/restic/pull/1147
+
+ * Enhancement #1044: Improve `restore`, do not traverse/load excluded directories
+
+   https://github.com/restic/restic/pull/1044
+
+ * Enhancement #1061: Add Dockerfile and official Docker image
+
+   https://github.com/restic/restic/pull/1061
+
+ * Enhancement #1126: Use the standard Go git repository layout, use `dep` for vendoring
+
+   The git repository layout was changed to resemble the layout typically used in Go projects,
+   we're not using `gb` for building restic any more and vendoring the dependencies is now taken
+   care of by `dep`.
+
+   https://github.com/restic/restic/pull/1126
+
+ * Enhancement #211: Add support for storing backups on Google Cloud Storage
+
+   https://github.com/restic/restic/issues/211
+   https://github.com/restic/restic/pull/1134
+   https://github.com/restic/restic/pull/1052
+
+ * Enhancement #1144: Properly report errors when reading files with exclude patterns.
+
+   https://github.com/restic/restic/pull/1144
+
+ * Enhancement #609: Add support for storing backups on Microsoft Azure Blob Storage
+
+   The library we're using to access the service requires Go 1.8, so restic now needs at least Go
+   1.8.
+
+   https://github.com/restic/restic/issues/609
+   https://github.com/restic/restic/pull/1149
+   https://github.com/restic/restic/pull/1059
+
+ * Enhancement #1196: Add `--group-by` to `forget` command for flexible grouping
+
+   https://github.com/restic/restic/pull/1196
+
+ * Enhancement #1203: Print stats on all BSD systems when SIGINFO (ctrl+t) is received
+
+   https://github.com/restic/restic/pull/1203
+   https://github.com/restic/restic/pull/1082
+
+ * Enhancement #1205: Allow specifying time/date for a backup with `--time`
+
+   https://github.com/restic/restic/pull/1205
+
+
+Changelog for restic 0.7.1 (2017-07-22)
+=======================================
+
+The following sections list the changes in restic 0.7.1 relevant to
+restic users. The changes are ordered by importance.
+
+Summary
+-------
+
+ * Fix #1115: Fix `prune`, only include existing files in indexes
+ * Enh #1055: Create subdirs below `data/` for local/sftp backends
+ * Enh #1067: Allow loading credentials for s3 from IAM
+ * Enh #1073: Add `migrate` cmd to migrate from `s3legacy` to `default` layout
+ * Enh #1081: Clarify semantic for `--tasg` for the `forget` command
+ * Enh #1080: Ignore chmod() errors on filesystems which do not support it
+ * Enh #1082: Print stats on SIGINFO on Darwin and FreeBSD (ctrl+t)
+
+Details
+-------
+
+ * Bugfix #1115: Fix `prune`, only include existing files in indexes
+
+   A bug was found (and corrected) in the index rebuilding after prune, which led to indexes which
+   include blobs that were not present in the repo any more. There were already checks in place
+   which detected this situation and aborted with an error message. A new run of either `prune` or
+   `rebuild-index` corrected the index files. This is now fixed and a test has been added to detect
+   this.
+
+   https://github.com/restic/restic/pull/1115
+
+ * Enhancement #1055: Create subdirs below `data/` for local/sftp backends
+
+   The local and sftp backends now create the subdirs below `data/` on open/init. This way, restic
+   makes sure that they always exist. This is connected to an issue for the sftp server:
+
+   https://github.com/restic/restic/issues/1055
+   https://github.com/restic/restic/pull/1077
+   https://github.com/restic/restic/pull/1105
+   https://github.com/restic/rest-server/pull/11#issuecomment-309879710
+
+ * Enhancement #1067: Allow loading credentials for s3 from IAM
+
+   When no S3 credentials are specified in the environment variables, restic now tries to load
+   credentials from an IAM instance profile when the s3 backend is used.
+
+   https://github.com/restic/restic/issues/1067
+   https://github.com/restic/restic/pull/1086
+
+ * Enhancement #1073: Add `migrate` cmd to migrate from `s3legacy` to `default` layout
+
+   The `migrate` command for chaning the `s3legacy` layout to the `default` layout for s3
+   backends has been improved: It can now be restarted with `restic migrate --force s3_layout`
+   and automatically retries operations on error.
+
+   https://github.com/restic/restic/issues/1073
+   https://github.com/restic/restic/pull/1075
+
+ * Enhancement #1081: Clarify semantic for `--tasg` for the `forget` command
+
+   https://github.com/restic/restic/issues/1081
+   https://github.com/restic/restic/pull/1090
+
+ * Enhancement #1080: Ignore chmod() errors on filesystems which do not support it
+
+   https://github.com/restic/restic/pull/1080
+   https://github.com/restic/restic/pull/1112
+
+ * Enhancement #1082: Print stats on SIGINFO on Darwin and FreeBSD (ctrl+t)
+
+   https://github.com/restic/restic/pull/1082
+
+
+Changelog for restic 0.7.0 (2017-07-01)
+=======================================
+
+The following sections list the changes in restic 0.7.0 relevant to
+restic users. The changes are ordered by importance.
+
+Summary
+-------
+
+ * Fix #1013: Switch back to using the high-level minio-go API for s3
+ * Fix #965: Switch to `default` repo layout for the s3 backend
+ * Enh #1021: Detect invalid backend name and print error
+ * Enh #1029: Remove invalid pack files when `prune` is run
+ * Enh #512: Add Backblaze B2 backend
+ * Enh #636: Add dirs `tags` and `hosts` to fuse mount
+ * Enh #989: Improve performance of the `find` command
+ * Enh #975: Add new backend for OpenStack Swift
+ * Enh #998: Improve performance of the fuse mount
+
+Details
+-------
+
+ * Bugfix #1013: Switch back to using the high-level minio-go API for s3
+
+   For the s3 backend we're back to using the high-level API the s3 client library for uploading
+   data, a few users reported dropped connections (which the library will automatically retry
+   now).
+
+   https://github.com/restic/restic/issues/1013
+   https://github.com/restic/restic/issues/1023
+   https://github.com/restic/restic/pull/1025
+
+ * Bugfix #965: Switch to `default` repo layout for the s3 backend
+
+   The default layout for the s3 backend is now `default` (instead of `s3legacy`). Also, there's a
+   new `migrate` command to convert an existing repo, it can be run like this: `restic migrate
+   s3_layout`
+
+   https://github.com/restic/restic/issues/965
+   https://github.com/restic/restic/pull/1004
+
+ * Enhancement #1021: Detect invalid backend name and print error
+
+   Restic now tries to detect when an invalid/unknown backend is used and returns an error
+   message.
+
+   https://github.com/restic/restic/issues/1021
+   https://github.com/restic/restic/pull/1070
+
+ * Enhancement #1029: Remove invalid pack files when `prune` is run
+
+   The `prune` command has been improved and will now remove invalid pack files, for example files
+   that have not been uploaded completely because a backup was interrupted.
+
+   https://github.com/restic/restic/issues/1029
+   https://github.com/restic/restic/pull/1036
+
+ * Enhancement #512: Add Backblaze B2 backend
+
+   https://github.com/restic/restic/issues/512
+   https://github.com/restic/restic/pull/978
+
+ * Enhancement #636: Add dirs `tags` and `hosts` to fuse mount
+
+   The fuse mount now has two more directories: `tags` contains a subdir for each tag, which in turn
+   contains only the snapshots that have this tag. The subdir `hosts` contains a subdir for each
+   host that has a snapshot, and the subdir contains the snapshots for that host.
+
+   https://github.com/restic/restic/issues/636
+   https://github.com/restic/restic/pull/1050
+
+ * Enhancement #989: Improve performance of the `find` command
+
+   Improved performance for the `find` command: Restic recognizes paths it has already checked
+   for the files in question, so the number of backend requests is reduced a lot.
+
+   https://github.com/restic/restic/issues/989
+   https://github.com/restic/restic/pull/993
+
+ * Enhancement #975: Add new backend for OpenStack Swift
+
+   https://github.com/restic/restic/pull/975
+   https://github.com/restic/restic/pull/648
+
+ * Enhancement #998: Improve performance of the fuse mount
+
+   Listing directories which contain large files now is significantly faster.
+
+   https://github.com/restic/restic/pull/998
+
+
+Changelog for restic 0.6.1 (2017-06-01)
+=======================================
+
+The following sections list the changes in restic 0.6.1 relevant to
+restic users. The changes are ordered by importance.
+
+Summary
+-------
+
+ * Enh #985: Allow multiple parallel idle HTTP connections
+ * Enh #981: Remove temporary path from binary in `build.go`
+ * Enh #974: Remove regular status reports
+
+Details
+-------
+
+ * Enhancement #985: Allow multiple parallel idle HTTP connections
+
+   Backends based on HTTP now allow several idle connections in parallel. This is especially
+   important for the REST backend, which (when used with a local server) may create a lot
+   connections and exhaust available ports quickly.
 
- * Backends based on HTTP now allow several idle connections in parallel. This
-   is especially important for the REST backend, which (when used with a local
-   server) may create a lot connections and exhaust available ports quickly.
    https://github.com/restic/restic/issues/985
    https://github.com/restic/restic/pull/986
 
- * Regular status report: We've removed the status report that was printed
-   every 10 seconds when restic is run non-interactively. You can still force
-   reporting the current status by sending a `USR1` signal to the process.
-   https://github.com/restic/restic/pull/974
+ * Enhancement #981: Remove temporary path from binary in `build.go`
+
+   The `build.go` now strips the temporary directory used for compilation from the binary. This
+   is the first step in enabling reproducible builds.
 
- * The `build.go` now strips the temporary directory used for compilation from
-   the binary. This is the first step in enabling reproducible builds.
    https://github.com/restic/restic/pull/981
 
-Important Changes in 0.6.0
-==========================
+ * Enhancement #974: Remove regular status reports
 
-Consistent forget policy
-------------------------
+   Regular status report: We've removed the status report that was printed every 10 seconds when
+   restic is run non-interactively. You can still force reporting the current status by sending a
+   `USR1` signal to the process.
 
-The `forget` command was corrected to be more consistent in which snapshots are
-to be forgotten. It is possible that the new code removes more snapshots than
-before, so please review what would be deleted by using the `--dry-run` option.
+   https://github.com/restic/restic/pull/974
 
-https://github.com/restic/restic/pull/957
-https://github.com/restic/restic/issues/953
 
-Unified repository layout
--------------------------
+Changelog for restic 0.6.0 (2017-05-29)
+=======================================
 
-Up to now the s3 backend used a special repository layout. We've decided to
-unify the repository layout and implemented the default layout also for the s3
-backend. For creating a new repository on s3 with the default layout, use
-`restic -o s3.layout=default init`. For further commands the option is not
-necessary any more, restic will automatically detect the correct layout to use.
-A future version will switch to the default layout for new repositories.
+The following sections list the changes in restic 0.6.0 relevant to
+restic users. The changes are ordered by importance.
 
-https://github.com/restic/restic/pull/966
-https://github.com/restic/restic/issues/965
+Summary
+-------
 
-Memory and time improvements for the s3 backend
------------------------------------------------
+ * Enh #953: Make `forget` consistent
+ * Enh #965: Unify repository layout for all backends
+ * Enh #962: Improve memory and runtime for the s3 backend
+
+Details
+-------
+
+ * Enhancement #953: Make `forget` consistent
+
+   The `forget` command was corrected to be more consistent in which snapshots are to be
+   forgotten. It is possible that the new code removes more snapshots than before, so please
+   review what would be deleted by using the `--dry-run` option.
+
+   https://github.com/restic/restic/issues/953
+   https://github.com/restic/restic/pull/957
+
+ * Enhancement #965: Unify repository layout for all backends
+
+   Up to now the s3 backend used a special repository layout. We've decided to unify the repository
+   layout and implemented the default layout also for the s3 backend. For creating a new
+   repository on s3 with the default layout, use `restic -o s3.layout=default init`. For further
+   commands the option is not necessary any more, restic will automatically detect the correct
+   layout to use. A future version will switch to the default layout for new repositories.
+
+   https://github.com/restic/restic/issues/965
+   https://github.com/restic/restic/pull/966
+
+ * Enhancement #962: Improve memory and runtime for the s3 backend
+
+   We've updated the library used for accessing s3, switched to using a lower level API and added
+   caching for some requests. This lead to a decrease in memory usage and a great speedup. In
+   addition, we added benchmark functions for all backends, so we can track improvements over
+   time. The Continuous Integration test service we're using (Travis) now runs the s3 backend
+   tests not only against a Minio server, but also against the Amazon s3 live service, so we should
+   be notified of any regressions much sooner.
+
+   https://github.com/restic/restic/pull/962
+   https://github.com/restic/restic/pull/960
+   https://github.com/restic/restic/pull/946
+   https://github.com/restic/restic/pull/938
+   https://github.com/restic/restic/pull/883
 
-We've updated the library used for accessing s3, switched to using a lower
-level API and added caching for some requests. This lead to a decrease in
-memory usage and a great speedup. In addition, we added benchmark functions for
-all backends, so we can track improvements over time. The Continuous
-Integration test service we're using (Travis) now runs the s3 backend tests not
-only against a Minio server, but also against the Amazon s3 live service, so we
-should be notified of any regressions much sooner.
 
-https://github.com/restic/restic/pull/962
-https://github.com/restic/restic/pull/960
-https://github.com/restic/restic/pull/946
-https://github.com/restic/restic/pull/938
-https://github.com/restic/restic/pull/883

CONTRIBUTING.md

@@ -60,50 +60,35 @@ 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:
+In order to compile restic with the `go` tool directly, it needs to be checked
+out at the right path within a `GOPATH`. The concept of a `GOPATH` is explained
+in ["How to write Go code"](https://golang.org/doc/code.html).
 
-    $ 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:
+If you do not have a directory with Go code yet, executing the following
+instructions in your shell will create one for you and check out the restic
+repo:
 
+    $ export GOPATH="$HOME/go"
+    $ mkdir -p "$GOPATH/src/github.com/restic"
+    $ cd "$GOPATH/src/github.com/restic"
     $ git clone https://github.com/restic/restic
     $ cd restic
-    $ gb build
-    [...]
-    $ bin/restic version
+
+You can then build restic as follows:
+
+    $ go build ./cmd/restic
+    $ ./restic version
     restic compiled manually
-    compiled at unknown time with go1.7
+    compiled with go1.8.3 on linux/amd64
 
 The following commands can be used to run all the tests:
 
-    $ gb test
-    ok          github.com/restic/restic        8.174s
-    [...]
+    $ go test ./cmd/... ./internal/...
 
-If you want to run your tests on Linux, OpenBSD or FreeBSD, you can use
-[vagrant](https://www.vagrantup.com/) with the provided `Vagrantfile` to
-quickly set up VMs and run the tests, e.g.:
-
-    $ vagrant up freebsd
-    [...]
-
-    $ vagrant ssh freebsd -c 'cd restic/restic; go test -v ./...'
-    [...]
-
-The default `go` tool can also be used by setting the environment variable
-`GOPATH` to the following value while being in the top level directory in the
-git repository:
-
-    $ export GOPATH=$PWD:$PWD/vendor
-
-The file `.envrc` allows automatic `GOPATH` configuration with
-[direnv](https://direnv.net/), inspect the file and then allow automatic
-configuration by running `direnv allow`.
+The repository contains two sets of directories with code: `cmd/` and
+`internal/` contain the code written for restic, whereas `vendor/` contains
+copies of libraries restic depends on. The libraries are managed with the
+[`dep`](https://github.com/golang/dep) tool.
 
 Providing Patches
 =================
@@ -122,7 +107,8 @@ down to the following steps:
 
  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. Especially take care to place your forked repository
+    at the correct path (`src/github.com/restic/restic`) within your `GOPATH`.
 
  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.
@@ -144,7 +130,7 @@ down to the following steps:
     would I need to be aware of with this change.
 
  8. Once your code looks good and passes all the tests, we'll merge it. Thanks
-    a low for your contribution!
+    a lot for your contribution!
 
 Please provide the patches for each bug or feature in a separate branch and
 open up a pull request for each.
@@ -170,7 +156,7 @@ what the tests are there for.
 Git Commits
 -----------
 
-I would be good if you could follow the same general style regarding Git
+It would be good if you could follow the same general style regarding Git
 commits as the rest of the project, this makes reviewing code, browsing the
 history and triaging bugs much easier.
 

Dockerfile

@@ -1,57 +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.6.4 -t restic/test:go1.6.4 .
-
-FROM ubuntu:14.04
-
-ARG GOVERSION=1.8.3
-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/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

Gopkg.lock

@@ -0,0 +1,219 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  branch = "master"
+  name = "bazil.org/fuse"
+  packages = [".","fs","fuseutil"]
+  revision = "371fbbdaa8987b715bdd21d6adc4c9b20155f748"
+
+[[projects]]
+  name = "cloud.google.com/go"
+  packages = ["compute/metadata"]
+  revision = "2d3a6656c17a60b0815b7e06ab0be04eacb6e613"
+  version = "v0.16.0"
+
+[[projects]]
+  name = "github.com/Azure/azure-sdk-for-go"
+  packages = ["storage"]
+  revision = "7692b0cef22674113fcf71cc17ac3ccc1a7fef48"
+  version = "v11.2.2-beta"
+
+[[projects]]
+  name = "github.com/Azure/go-autorest"
+  packages = ["autorest","autorest/adal","autorest/azure","autorest/date"]
+  revision = "c67b24a8e30d876542a85022ebbdecf0e5a935e8"
+  version = "v9.4.1"
+
+[[projects]]
+  name = "github.com/cenkalti/backoff"
+  packages = ["."]
+  revision = "61153c768f31ee5f130071d08fc82b85208528de"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/cpuguy83/go-md2man"
+  packages = ["md2man"]
+  revision = "1d903dcb749992f3741d744c0f8376b4bd7eb3e1"
+  version = "v1.0.7"
+
+[[projects]]
+  name = "github.com/dgrijalva/jwt-go"
+  packages = ["."]
+  revision = "dbeaa9332f19a944acb5736b4456cfcc02140e29"
+  version = "v3.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/dustin/go-humanize"
+  packages = ["."]
+  revision = "bb3d318650d48840a39aa21a027c6630e198e626"
+
+[[projects]]
+  name = "github.com/elithrar/simple-scrypt"
+  packages = ["."]
+  revision = "2325946f714c95de4a6088202c402fbdfa64163b"
+  version = "v1.2.0"
+
+[[projects]]
+  name = "github.com/go-ini/ini"
+  packages = ["."]
+  revision = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a"
+  version = "v1.32.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golang/protobuf"
+  packages = ["proto"]
+  revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845"
+
+[[projects]]
+  name = "github.com/inconshreveable/mousetrap"
+  packages = ["."]
+  revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+  version = "v1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/juju/ratelimit"
+  packages = ["."]
+  revision = "59fac5042749a5afb9af70e813da1dd5474f0167"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kr/fs"
+  packages = ["."]
+  revision = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"
+
+[[projects]]
+  name = "github.com/kurin/blazer"
+  packages = ["b2","base","internal/b2types","internal/blog"]
+  revision = "e269a1a17bb6aec278c06a57cb7e8f8d0d333e04"
+  version = "v0.2.1"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/minio/go-homedir"
+  packages = ["."]
+  revision = "21304a94172ae3a09dee2cd86a12fb6f842138c7"
+
+[[projects]]
+  name = "github.com/minio/minio-go"
+  packages = [".","pkg/credentials","pkg/encrypt","pkg/policy","pkg/s3signer","pkg/s3utils","pkg/set"]
+  revision = "57a8ae886b49af6eb0d2c27c2d007ed2f71e1da5"
+  version = "4.0.3"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/ncw/swift"
+  packages = ["."]
+  revision = "c95c6e5c2d1a3d37fc44c8c6dc9e231c7500667d"
+
+[[projects]]
+  name = "github.com/pkg/errors"
+  packages = ["."]
+  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
+  version = "v0.8.0"
+
+[[projects]]
+  name = "github.com/pkg/profile"
+  packages = ["."]
+  revision = "5b67d428864e92711fcbd2f8629456121a56d91f"
+  version = "v1.2.1"
+
+[[projects]]
+  name = "github.com/pkg/sftp"
+  packages = ["."]
+  revision = "98203f5a8333288eb3163b7c667d4260fe1333e9"
+  version = "1.0.0"
+
+[[projects]]
+  name = "github.com/pkg/xattr"
+  packages = ["."]
+  revision = "23c75e3f6c1d8b13b3dd905b011a7f38a06044b7"
+  version = "v0.2.1"
+
+[[projects]]
+  name = "github.com/restic/chunker"
+  packages = ["."]
+  revision = "db83917be3b88cc307464b7d8a221c173e34a0db"
+  version = "v0.2.0"
+
+[[projects]]
+  name = "github.com/russross/blackfriday"
+  packages = ["."]
+  revision = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c"
+  version = "v1.5"
+
+[[projects]]
+  name = "github.com/satori/uuid"
+  packages = ["."]
+  revision = "879c5887cd475cd7864858769793b2ceb0d44feb"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/sirupsen/logrus"
+  packages = ["."]
+  revision = "f006c2ac4710855cf0f916dd6b77acf6b048dc6e"
+  version = "v1.0.3"
+
+[[projects]]
+  name = "github.com/spf13/cobra"
+  packages = [".","doc"]
+  revision = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
+  version = "v0.0.1"
+
+[[projects]]
+  name = "github.com/spf13/pflag"
+  packages = ["."]
+  revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+  packages = ["curve25519","ed25519","ed25519/internal/edwards25519","pbkdf2","poly1305","scrypt","ssh","ssh/terminal"]
+  revision = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/net"
+  packages = ["context","context/ctxhttp"]
+  revision = "a8b9294777976932365dabb6640cf1468d95c70f"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/oauth2"
+  packages = [".","google","internal","jws","jwt"]
+  revision = "f95fa95eaa936d9d87489b15d1d18b97c1ba9c28"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = ["unix","windows"]
+  revision = "8b4580aae2a0dd0c231a45d3ccb8434ff533b840"
+
+[[projects]]
+  branch = "master"
+  name = "google.golang.org/api"
+  packages = ["gensupport","googleapi","googleapi/internal/uritemplates","storage/v1"]
+  revision = "3a1d936b7575b82197a1fea0632218dd07b1e65c"
+
+[[projects]]
+  name = "google.golang.org/appengine"
+  packages = [".","internal","internal/app_identity","internal/base","internal/datastore","internal/log","internal/modules","internal/remote_api","internal/urlfetch","urlfetch"]
+  revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "v2"
+  name = "gopkg.in/yaml.v2"
+  packages = ["."]
+  revision = "287cf08546ab5e7e37d55a84f7ed3fd1db036de5"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "f0a207197cb502238ac87ca8e07b2640c02ec380a50b036e09ef87e40e31ca2d"
+  solver-name = "gps-cdcl"
+  solver-version = 1

Gopkg.toml

@@ -0,0 +1,21 @@
+
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"

LICENSE

@@ -1,19 +1,21 @@
+BSD 2-Clause License
+
 Copyright (c) 2014, Alexander Neumann <alexander@bumpern.de>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
 FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR

Makefile

@@ -6,7 +6,8 @@ restic:
 	go run build.go
 
 clean:
-	rm -rf restic
+	rm -f restic
 
 test:
-	go test ./...
+	go test ./cmd/... ./internal/...
+

README.rst

@@ -1,4 +1,4 @@
-|Documentation| |Build Status| |Build status| |Report Card| |Say Thanks|
+|Documentation| |Build Status| |Build status| |Report Card| |Say Thanks| |TestCoverage|
 
 Introduction
 ------------
@@ -7,11 +7,13 @@ restic is a backup program that is fast, efficient and secure.
 
 For detailed usage and installation instructions check out the `documentation <https://restic.readthedocs.io/en/latest>`__.
 
+You can ask questions in our `Discourse forum <https://forum.restic.net>`__.
+
 Quick start
 -----------
 
 Once you've `installed
-<https://restic.readthedocs.io/en/latest/installation.html>`__ restic, start
+<https://restic.readthedocs.io/en/latest/020_installation.html>`__ restic, start
 off with creating a repository for your backups:
 
 .. code-block:: console
@@ -35,7 +37,26 @@ and add some data:
     duration: 0:29, 54.47MiB/s
     snapshot 40dc1520 saved
 
-For more options check out the `manual guide <https://restic.readthedocs.io/en/latest/manual.html>`__.
+Next you can either use ``restic restore`` to restore files or use ``restic
+mount`` to mount the repository via fuse and browse the files from previous
+snapshots.
+
+For more options check out the `online documentation <https://restic.readthedocs.io/en/latest/>`__.
+
+Backends
+--------
+
+Saving a backup on the same machine is nice but not a real backup strategy.
+Therefore, restic supports the following backends for storing backups natively:
+
+- `Local directory <https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#local>`__
+- `sftp server (via SSH) <https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#sftp>`__
+- `HTTP REST server <https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#rest-server>`__ (`protocol <doc/100_references.rst#rest-backend>`__ `rest-server <https://github.com/restic/rest-server>`__)
+- `AWS S3 <https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#amazon-s3>`__ (either from Amazon or using the `Minio <https://minio.io>`__ server)
+- `OpenStack Swift <https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#openstack-swift>`__
+- `BackBlaze B2 <https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#backblaze-b2>`__
+- `Microsoft Azure Blob Storage <https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#microsoft-azure-blob-storage>`__
+- `Google Cloud Storage <https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#google-cloud-storage>`__
 
 Design Principles
 -----------------
@@ -72,10 +93,10 @@ Reproducible Builds
 -------------------
 
 The binaries released with each restic version starting at 0.6.1 are
-[reproducible](https://reproducible-builds.org/), which means that you can
+`reproducible <https://reproducible-builds.org/>`__, which means that you can
 easily reproduce a byte identical version from the source code for that
 release. Instructions on how to do that are contained in the
-[build repository](https://github.com/restic/build).
+`builder repository <https://github.com/restic/builder>`__.
 
 News
 ----
@@ -86,7 +107,7 @@ the `development blog <https://restic.github.io/blog/>`__.
 License
 -------
 
-Restic is licensed under "BSD 2-Clause License". You can find the
+Restic is licensed under `BSD 2-Clause License <https://opensource.org/licenses/BSD-2-Clause>`__. You can find the
 complete text in ``LICENSE``.
 
 .. |Documentation| image:: https://readthedocs.org/projects/restic/badge/?version=latest
@@ -95,7 +116,9 @@ complete text in ``LICENSE``.
    :target: https://travis-ci.org/restic/restic
 .. |Build status| image:: https://ci.appveyor.com/api/projects/status/nuy4lfbgfbytw92q/branch/master?svg=true
    :target: https://ci.appveyor.com/project/fd0/restic/branch/master
-.. |Report Card| image:: http://goreportcard.com/badge/github.com/restic/restic
-   :target: http://goreportcard.com/report/github.com/restic/restic
+.. |Report Card| image:: https://goreportcard.com/badge/github.com/restic/restic
+   :target: https://goreportcard.com/report/github.com/restic/restic
 .. |Say Thanks| image:: https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg
    :target: https://saythanks.io/to/restic
+.. |TestCoverage| image:: https://codecov.io/gh/restic/restic/branch/master/graph/badge.svg
+   :target: https://codecov.io/gh/restic/restic

VERSION

@@ -1 +1 @@
-0.6.1
+0.8.1

Vagrantfile

@@ -1,124 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-GO_VERSION = '1.7'
-
-def packages_freebsd
-  return <<-EOF
-    pkg install -y git
-    pkg install -y curl
-
-    echo 'fuse_load="YES"' >> /boot/loader.conf
-    echo 'vfs.usermount=1' >> /etc/sysctl.conf
-
-    kldload fuse
-    sysctl vfs.usermount=1
-    pw groupmod operator -M vagrant
-  EOF
-end
-
-def packages_openbsd
-  return <<-EOF
-    . ~/.profile
-    pkg_add git curl bash gtar--
-    ln -sf /usr/local/bin/gtar /usr/local/bin/tar
-  EOF
-end
-
-def packages_linux
-  return <<-EOF
-    apt-get update
-    apt-get install -y git curl
-  EOF
-end
-
-def packages_darwin
-  return <<-EOF
-    ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-    brew cask install osxfuse
-  EOF
-end
-
-def install_gimme
-  return <<-EOF
-    rm -rf /opt/gimme
-    mkdir -p /opt/gimme || true
-    git clone https://github.com/meatballhat/gimme /opt/gimme
-    perl -p -i -e 's,/bin/bash,/usr/bin/env bash,' /opt/gimme/gimme
-    ln -sf /opt/gimme/gimme /usr/bin/gimme
-  EOF
-end
-
-def prepare_user(boxname)
-  return <<-EOF
-    mkdir -p ~/go/src
-    export PATH=/usr/local/bin:$PATH
-
-    gimme #{GO_VERSION} >> ~/.profile
-    echo export 'GOPATH=/vagrant/go' >> ~/.profile
-    echo export 'PATH=$GOPATH/bin:/usr/local/bin:$PATH' >> ~/.profile
-
-    . ~/.profile
-
-    go get golang.org/x/tools/cmd/cover
-    go get github.com/constabulary/gb/...
-
-    echo
-    echo "Run:"
-    echo "  vagrant rsync #{boxname}"
-    echo "  vagrant ssh #{boxname} -c 'cd /vagrant; gb build && gb test'"
-  EOF
-end
-
-def fix_perms
-  return <<-EOF
-    chown -R vagrant /vagrant
-  EOF
-end
-
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
-Vagrant.configure(2) do |config|
-  # use rsync to copy content to the folder
-  config.vm.synced_folder ".", "/vagrant", :type => "rsync"
-
-  # fix permissions on synced folder
-  config.vm.provision "fix perms", :type => :shell, :inline => fix_perms
-
-  config.vm.define "linux" do |b|
-    b.vm.box = "ubuntu/trusty64"
-    b.vm.provision "packages linux", :type => :shell, :inline => packages_linux
-    b.vm.provision "install gimme",  :type => :shell, :inline => install_gimme
-    b.vm.provision "prepare user",   :type => :shell, :privileged => false, :inline => prepare_user("linux")
-
-    # fix network card
-    config.vm.provider "virtualbox" do |v|
-      v.customize ["modifyvm", :id, "--nictype1", "virtio"]
-    end
-  end
-
-  config.vm.define "freebsd" do |b|
-    b.vm.box = "geoffgarside/freebsd-10.1"
-    b.vm.provision "packages freebsd", :type => :shell, :inline => packages_freebsd
-    b.vm.provision "install gimme",  :type => :shell, :inline => install_gimme
-    b.vm.provision "prepare user",   :type => :shell, :privileged => false, :inline => prepare_user("freebsd")
-  end
-
-  config.vm.define "openbsd" do |b|
-    b.vm.box = "tmatilai/openbsd-5.6"
-    b.vm.provision "packages openbsd", :type => :shell, :inline => packages_openbsd
-    b.vm.provision "install gimme",  :type => :shell, :inline => install_gimme
-    b.vm.provision "prepare user",   :type => :shell, :privileged => false, :inline => prepare_user("openbsd")
-  end
-
-  config.vm.define "darwin" do |b|
-    #b.vm.box = "jhcook/osx-yosemite-10.10"
-    b.vm.box = "jhcook/yosemite-clitools"
-    b.vm.provision "packages darwin", :type => :shell, :privileged => false, :inline => packages_darwin
-    b.vm.provision "install gimme",  :type => :shell, :inline => install_gimme
-    b.vm.provision "prepare user",   :type => :shell, :privileged => false, :inline => prepare_user("darwin")
-  end
-
-end

appveyor.yml

@@ -17,8 +17,8 @@ init:
 
 install:
   - rmdir c:\go /s /q
-  - appveyor DownloadFile https://storage.googleapis.com/golang/go1.8.1.windows-amd64.msi
-  - msiexec /i go1.8.1.windows-amd64.msi /q
+  - appveyor DownloadFile https://storage.googleapis.com/golang/go1.9.windows-amd64.msi
+  - msiexec /i go1.9.windows-amd64.msi /q
   - go version
   - go env
   - appveyor DownloadFile http://sourceforge.netcologne.de/project/gnuwin32/tar/1.13-1/tar-1.13-1-bin.zip -FileName tar.zip

build.go

@@ -27,10 +27,12 @@ var config = struct {
 	Main      string
 	Tests     []string
 }{
-	Name:      "restic",                           // name of the program executable and directory
-	Namespace: "",                                 // subdir of GOPATH, e.g. "github.com/foo/bar"
-	Main:      "cmds/restic",                      // package name for the main package
-	Tests:     []string{"restic/...", "cmds/..."}, // tests to run
+	Name:      "restic",                              // name of the program executable and directory
+	Namespace: "github.com/restic/restic",            // subdir of GOPATH, e.g. "github.com/foo/bar"
+	Main:      "github.com/restic/restic/cmd/restic", // package name for the main package
+	Tests: []string{ // tests to run
+		"github.com/restic/restic/internal/...",
+		"github.com/restic/restic/cmd/..."},
 }
 
 // specialDir returns true if the file begins with a special character ('.' or '_').
@@ -77,7 +79,12 @@ func excludePath(name string) bool {
 //               └── restic
 //                   └── foo.go
 func updateGopath(dst, src, prefix string) error {
+	verbosePrintf("copy contents of %v to %v\n", src, filepath.Join(dst, prefix))
 	return filepath.Walk(src, func(name string, fi os.FileInfo, err error) error {
+		if name == src {
+			return err
+		}
+
 		if specialDir(name) {
 			if fi.IsDir() {
 				return filepath.SkipDir
@@ -86,6 +93,10 @@ func updateGopath(dst, src, prefix string) error {
 			return nil
 		}
 
+		if err != nil {
+			return err
+		}
+
 		if fi.IsDir() {
 			return nil
 		}
@@ -291,8 +302,8 @@ func (cs Constants) LDFlags() string {
 
 func main() {
 	ver := runtime.Version()
-	if strings.HasPrefix(ver, "go1") && ver < "go1.7" {
-		fmt.Fprintf(os.Stderr, "Go version %s detected, restic requires at least Go 1.7\n", ver)
+	if strings.HasPrefix(ver, "go1") && ver < "go1.8" {
+		fmt.Fprintf(os.Stderr, "Go version %s detected, restic requires at least Go 1.8\n", ver)
 		os.Exit(1)
 	}
 
@@ -368,13 +379,13 @@ func main() {
 	}
 
 	verbosePrintf("create GOPATH at %v\n", gopath)
-	if err = updateGopath(gopath, filepath.Join(root, "src"), config.Namespace); err != nil {
+	if err = updateGopath(gopath, root, config.Namespace); err != nil {
 		die("copying files from %v/src to %v/src failed: %v\n", root, gopath, err)
 	}
 
-	vendor := filepath.Join(root, "vendor", "src")
+	vendor := filepath.Join(root, "vendor")
 	if directoryExists(vendor) {
-		if err = updateGopath(gopath, vendor, ""); err != nil {
+		if err = updateGopath(gopath, vendor, filepath.Join(config.Namespace, "vendor")); err != nil {
 			die("copying files from %v to %v failed: %v\n", root, gopath, err)
 		}
 	}
@@ -401,7 +412,10 @@ func main() {
 	if err != nil {
 		die("Getwd() returned %v\n", err)
 	}
-	output := filepath.Join(cwd, outputFilename)
+	output := outputFilename
+	if !filepath.IsAbs(output) {
+		output = filepath.Join(cwd, output)
+	}
 
 	version := getVersion()
 	constants := Constants{}

changelog/0.6.0/issue-953

@@ -0,0 +1,8 @@
+Enhancement: Make `forget` consistent
+
+The `forget` command was corrected to be more consistent in which snapshots are
+to be forgotten. It is possible that the new code removes more snapshots than
+before, so please review what would be deleted by using the `--dry-run` option.
+
+https://github.com/restic/restic/pull/957
+https://github.com/restic/restic/issues/953

changelog/0.6.0/issue-965

@@ -0,0 +1,11 @@
+Enhancement: Unify repository layout for all backends
+
+Up to now the s3 backend used a special repository layout. We've decided to
+unify the repository layout and implemented the default layout also for the s3
+backend. For creating a new repository on s3 with the default layout, use
+`restic -o s3.layout=default init`. For further commands the option is not
+necessary any more, restic will automatically detect the correct layout to use.
+A future version will switch to the default layout for new repositories.
+
+https://github.com/restic/restic/pull/966
+https://github.com/restic/restic/issues/965

changelog/0.6.0/pull-962

@@ -0,0 +1,15 @@
+Enhancement: Improve memory and runtime for the s3 backend
+
+We've updated the library used for accessing s3, switched to using a lower
+level API and added caching for some requests. This lead to a decrease in
+memory usage and a great speedup. In addition, we added benchmark functions for
+all backends, so we can track improvements over time. The Continuous
+Integration test service we're using (Travis) now runs the s3 backend tests not
+only against a Minio server, but also against the Amazon s3 live service, so we
+should be notified of any regressions much sooner.
+
+https://github.com/restic/restic/pull/962
+https://github.com/restic/restic/pull/960
+https://github.com/restic/restic/pull/946
+https://github.com/restic/restic/pull/938
+https://github.com/restic/restic/pull/883

changelog/0.6.1/issue-985

@@ -0,0 +1,8 @@
+Enhancement: Allow multiple parallel idle HTTP connections
+
+Backends based on HTTP now allow several idle connections in parallel. This
+is especially important for the REST backend, which (when used with a local
+server) may create a lot connections and exhaust available ports quickly.
+
+https://github.com/restic/restic/issues/985
+https://github.com/restic/restic/pull/986

changelog/0.6.1/pull-891

@@ -0,0 +1,6 @@
+Enhancement: Remove temporary path from binary in `build.go`
+
+The `build.go` now strips the temporary directory used for compilation from
+the binary. This is the first step in enabling reproducible builds.
+
+https://github.com/restic/restic/pull/981

changelog/0.6.1/pull-974

@@ -0,0 +1,7 @@
+Enhancement: Remove regular status reports
+
+Regular status report: We've removed the status report that was printed
+every 10 seconds when restic is run non-interactively. You can still force
+reporting the current status by sending a `USR1` signal to the process.
+
+https://github.com/restic/restic/pull/974

changelog/0.7.0/issue-1013

@@ -0,0 +1,9 @@
+Bugfix: Switch back to using the high-level minio-go API for s3
+
+For the s3 backend we're back to using the high-level API the s3 client library
+for uploading data, a few users reported dropped connections (which the library
+will automatically retry now).
+
+https://github.com/restic/restic/issues/1013
+https://github.com/restic/restic/issues/1023
+https://github.com/restic/restic/pull/1025

changelog/0.7.0/issue-1021

@@ -0,0 +1,7 @@
+Enhancement: Detect invalid backend name and print error
+
+restic now tries to detect when an invalid/unknown backend is used and
+returns an error message.
+
+https://github.com/restic/restic/issues/1021
+https://github.com/restic/restic/pull/1070

changelog/0.7.0/issue-1029

@@ -0,0 +1,8 @@
+Enhancement: Remove invalid pack files when `prune` is run
+
+The `prune` command has been improved and will now remove invalid pack files,
+for example files that have not been uploaded completely because a backup was
+interrupted.
+
+https://github.com/restic/restic/issues/1029
+https://github.com/restic/restic/pull/1036

changelog/0.7.0/issue-512

@@ -0,0 +1,4 @@
+Enhancement: Add Backblaze B2 backend
+
+https://github.com/restic/restic/issues/512
+https://github.com/restic/restic/pull/978

changelog/0.7.0/issue-636

@@ -0,0 +1,9 @@
+Enhancement: Add dirs `tags` and `hosts` to fuse mount
+
+The fuse mount now has two more directories: `tags` contains a subdir for
+each tag, which in turn contains only the snapshots that have this tag. The
+subdir `hosts` contains a subdir for each host that has a snapshot, and the
+subdir contains the snapshots for that host.
+
+https://github.com/restic/restic/issues/636
+https://github.com/restic/restic/pull/1050

changelog/0.7.0/issue-965

@@ -0,0 +1,8 @@
+Bugfix: Switch to `default` repo layout for the s3 backend
+
+The default layout for the s3 backend is now `default` (instead of `s3legacy`).
+Also, there's a new `migrate` command to convert an existing repo, it can be
+run like this: `restic migrate s3_layout`
+
+https://github.com/restic/restic/issues/965
+https://github.com/restic/restic/pull/1004

changelog/0.7.0/issue-989

@@ -0,0 +1,8 @@
+Enhancement: Improve performance of the `find` command
+
+Improved performance for the `find` command: Restic recognizes paths it has
+already checked for the files in question, so the number of backend requests
+is reduced a lot.
+
+https://github.com/restic/restic/issues/989
+https://github.com/restic/restic/pull/993

changelog/0.7.0/pull-975

@@ -0,0 +1,4 @@
+Enhancement: Add new backend for OpenStack Swift
+
+https://github.com/restic/restic/pull/975
+https://github.com/restic/restic/pull/648

changelog/0.7.0/pull-998

@@ -0,0 +1,5 @@
+Enhancement: Improve performance of the fuse mount
+
+Listing directories which contain large files now is significantly faster.
+
+https://github.com/restic/restic/pull/998

changelog/0.7.1/issue-1055

@@ -0,0 +1,10 @@
+Enhancement: Create subdirs below `data/` for local/sftp backends
+
+The local and sftp backends now create the subdirs below `data/` on
+open/init. This way, restic makes sure that they always exist. This is
+connected to an issue for the sftp server:
+
+https://github.com/restic/rest-server/pull/11#issuecomment-309879710
+https://github.com/restic/restic/issues/1055
+https://github.com/restic/restic/pull/1077
+https://github.com/restic/restic/pull/1105

changelog/0.7.1/issue-1067

@@ -0,0 +1,8 @@
+Enhancement: Allow loading credentials for s3 from IAM
+
+When no S3 credentials are specified in the environment variables, restic
+now tries to load credentials from an IAM instance profile when the s3
+backend is used.
+
+https://github.com/restic/restic/issues/1067
+https://github.com/restic/restic/pull/1086

changelog/0.7.1/issue-1073

@@ -0,0 +1,8 @@
+Enhancement: Add `migrate` cmd to migrate from `s3legacy` to `default` layout
+
+The `migrate` command for chaning the `s3legacy` layout to the `default` layout
+for s3 backends has been improved: It can now be restarted with `restic migrate
+--force s3_layout` and automatically retries operations on error.
+
+https://github.com/restic/restic/issues/1073
+https://github.com/restic/restic/pull/1075

changelog/0.7.1/issue-1081

@@ -0,0 +1,4 @@
+Enhancement: Clarify semantic for `--tasg` for the `forget` command
+
+https://github.com/restic/restic/issues/1081
+https://github.com/restic/restic/pull/1090

changelog/0.7.1/plul-1080

@@ -0,0 +1,5 @@
+Enhancement: Ignore chmod() errors on filesystems which do not support it
+
+https://github.com/restic/restic/pull/1080
+https://github.com/restic/restic/pull/1112
+

changelog/0.7.1/pull-1082

@@ -0,0 +1,3 @@
+Enhancement: Print stats on SIGINFO on Darwin and FreeBSD (ctrl+t)
+
+https://github.com/restic/restic/pull/1082

changelog/0.7.1/pull-1115

@@ -0,0 +1,9 @@
+Bugfix: Fix `prune`, only include existing files in indexes
+
+A bug was found (and corrected) in the index rebuilding after prune, which led
+to indexes which include blobs that were not present in the repo any more.
+There were already checks in place which detected this situation and aborted
+with an error message. A new run of either `prune` or `rebuild-index` corrected
+the index files. This is now fixed and a test has been added to detect this.
+
+https://github.com/restic/restic/pull/1115

changelog/0.7.2/issue-1132

@@ -0,0 +1,8 @@
+Enhancement: Make `key` command always prompt for a password
+
+The `key` command now prompts for a password even if the original password
+to access a repo has been specified via the `RESTIC_PASSWORD` environment
+variable or a password file.
+
+https://github.com/restic/restic/issues/1132
+https://github.com/restic/restic/pull/1133

changelog/0.7.2/issue-1167

@@ -0,0 +1,8 @@
+Bugfix: Do not create a local repo unless `init` is used
+
+When a restic command other than `init` is used with a local repository and the
+repository directory does not exist, restic creates the directory structure.
+That's an error, only the `init` command should create the dir.
+
+https://github.com/restic/restic/issues/1167
+https://github.com/restic/restic/pull/1182

changelog/0.7.2/issue-1179

@@ -0,0 +1,4 @@
+Enhancement: Resolve name conflicts, append a counter
+
+https://github.com/restic/restic/issues/1179
+https://github.com/restic/restic/pull/1209

changelog/0.7.2/issue-1208

@@ -0,0 +1,7 @@
+Enhancement: Add `--compact` to `snapshots` command
+
+The option `--compact` was added to the `snapshots` command to get a better
+overview of the snapshots in a repo. It limits each snapshot to a single line.
+
+https://github.com/restic/restic/issues/1218
+https://github.com/restic/restic/pull/1223

changelog/0.7.2/issue-317

@@ -0,0 +1,10 @@
+Enhancement: Add `--exclude-caches` and `--exclude-if-present`
+
+A new option `--exclude-caches` was added that allows excluding cache
+directories (that are tagged as such). This is a special case of a more generic
+option `--exclude-if-present` which excludes a directory if a file with a
+specific name (and contents) is present.
+
+https://github.com/restic/restic/issues/317
+https://github.com/restic/restic/pull/1170
+https://github.com/restic/restic/pull/1224

changelog/0.7.2/issues-697

@@ -0,0 +1,4 @@
+Enhancement: Automatically generate man pages for all restic commands
+
+https://github.com/restic/restic/issues/697
+https://github.com/restic/restic/pull/1147

changelog/0.7.2/pull-1044

@@ -0,0 +1,3 @@
+Enhancement: Improve `restore`, do not traverse/load excluded directories
+
+https://github.com/restic/restic/pull/1044

changelog/0.7.2/pull-1061

@@ -0,0 +1,3 @@
+Enhancement: Add Dockerfile and official Docker image
+
+https://github.com/restic/restic/pull/1061

changelog/0.7.2/pull-1126

@@ -0,0 +1,7 @@
+Enhancement: Use the standard Go git repository layout, use `dep` for vendoring
+
+The git repository layout was changed to resemble the layout typically used in
+Go projects, we're not using `gb` for building restic any more and vendoring
+the dependencies is now taken care of by `dep`.
+
+https://github.com/restic/restic/pull/1126

changelog/0.7.2/pull-1134

@@ -0,0 +1,5 @@
+Enhancement: Add support for storing backups on Google Cloud Storage
+
+https://github.com/restic/restic/pull/1134
+https://github.com/restic/restic/pull/1052
+https://github.com/restic/restic/issues/211

changelog/0.7.2/pull-1144

@@ -0,0 +1,3 @@
+Enhancement: Properly report errors when reading files with exclude patterns.
+
+https://github.com/restic/restic/pull/1144

changelog/0.7.2/pull-1149

@@ -0,0 +1,8 @@
+Enhancement: Add support for storing backups on Microsoft Azure Blob Storage
+
+The library we're using to access the service requires Go 1.8, so restic now
+needs at least Go 1.8.
+
+https://github.com/restic/restic/pull/1149
+https://github.com/restic/restic/pull/1059
+https://github.com/restic/restic/issues/609

changelog/0.7.2/pull-1164

@@ -0,0 +1,3 @@
+Bugfix: Make the `key remove` command behave as documented
+
+https://github.com/restic/restic/pull/1164

changelog/0.7.2/pull-1191

@@ -0,0 +1,8 @@
+Bugfix: Make sure to write profiling files on interrupt
+
+Since a few releases restic had the ability to write profiling files for memory
+and CPU usage when `debug` is enabled. It was discovered that when restic is
+interrupted (ctrl+c is pressed), the proper shutdown hook is not run. This is
+now corrected.
+
+https://github.com/restic/restic/pull/1191

changelog/0.7.2/pull-1196

@@ -0,0 +1,3 @@
+Enhancement: Add `--group-by` to `forget` command for flexible grouping
+
+https://github.com/restic/restic/pull/1196

changelog/0.7.2/pull-1203

@@ -0,0 +1,5 @@
+Enhancement: Print stats on all BSD systems when SIGINFO (ctrl+t) is received
+
+https://github.com/restic/restic/pull/1203
+https://github.com/restic/restic/pull/1082#issuecomment-326279920
+

changelog/0.7.2/pull-1205

@@ -0,0 +1,3 @@
+Enhancement: Allow specifying time/date for a backup with `--time`
+
+https://github.com/restic/restic/pull/1205

changelog/0.7.3/issue-1246

@@ -0,0 +1,9 @@
+Bugfix: List all files stored in Google Cloud Storage
+
+For large backups stored in Google Cloud Storage, the `prune` command fails
+because listing only returns the first 1000 files. This has been corrected, no
+data is lost in the process. In addition, a plausibility check was added to
+`prune`.
+
+https://github.com/restic/restic/issues/1246
+https://github.com/restic/restic/pull/1247

changelog/0.8.0/issue-1102

@@ -0,0 +1,9 @@
+Enhancement: Add subdirectory `ids` to fuse mount
+
+The fuse mount now has an `ids` subdirectory which contains the snapshots below
+their (short) IDs.
+
+https://github.com/restic/restic/issues/1102
+https://github.com/restic/restic/pull/1299
+https://github.com/restic/restic/pull/1320
+

changelog/0.8.0/issue-1114

@@ -0,0 +1,10 @@
+Enhancement: Add `--cacert` to specify TLS certificates to check against
+
+We've added the `--cacert` option which can be used to pass one (or more) CA
+certificates to restic. These are used in addition to the system CA
+certificates to verify HTTPS certificates (e.g. for the REST backend).
+
+https://github.com/restic/restic/issues/1114
+https://github.com/restic/restic/pull/1276
+
+

changelog/0.8.0/issue-1216

@@ -0,0 +1,9 @@
+Enhancement: Add upload/download limiting
+
+We've added support for rate limiting through `--limit-upload` and
+`--limit-download` flags.
+
+https://github.com/restic/restic/issues/1216
+https://github.com/restic/restic/pull/1336
+https://github.com/restic/restic/pull/1358
+

changelog/0.8.0/issue-1256

@@ -0,0 +1,7 @@
+Bugfix: Re-enable workaround for S3 backend
+
+We've re-enabled a workaround for `minio-go` (the library we're using to
+access s3 backends), this reduces memory usage.
+
+https://github.com/restic/restic/issues/1256
+https://github.com/restic/restic/pull/1267

changelog/0.8.0/issue-1271

@@ -0,0 +1,6 @@
+Enhancement: Cache results for excludes for `backup`
+
+The `backup` command now caches the result of excludes for a directory.
+
+https://github.com/restic/restic/issues/1271
+https://github.com/restic/restic/pull/1326

changelog/0.8.0/issue-1274

@@ -0,0 +1,9 @@
+Enhancement: Add `generate` command, replaces `manpage` and `autocomplete`
+
+The `generate` command has been added, which replaces the now removed
+commands `manpage` and `autocomplete`. This release of restic contains the
+most recent manpages in `doc/man` and the auto-completion files for bash and
+zsh in `doc/bash-completion.sh` and `doc/zsh-completion.zsh`
+
+https://github.com/restic/restic/issues/1274
+https://github.com/restic/restic/pull/1282

changelog/0.8.0/issue-1291

@@ -0,0 +1,8 @@
+Bugfix: Reuse backend TCP connections to BackBlaze B2
+
+A bug was discovered in the library we're using to access Backblaze, it now
+reuses already established TCP connections which should be a lot faster and
+not cause network failures any more.
+
+https://github.com/restic/restic/issues/1291
+https://github.com/restic/restic/pull/1301

changelog/0.8.0/issue-1367

@@ -0,0 +1,7 @@
+Enhancement: Allow comments in files read from via `--file-from`
+
+When the list of files/dirs to be saved is read from a file with
+`--files-from`, comment lines (starting with `#`) are now ignored.
+
+https://github.com/restic/restic/issues/1367
+https://github.com/restic/restic/pull/1368

changelog/0.8.0/issue-1445

@@ -0,0 +1,18 @@
+Security: Prevent writing outside the target directory during restore
+
+A vulnerability was found in the restic restorer, which allowed attackers in
+special circumstances to restore files to a location outside of the target
+directory. Due to the circumstances we estimate this to be a low-risk
+vulnerability, but urge all users to upgrade to the latest version of restic.
+
+Exploiting the vulnerability requires a Linux/Unix system which saves backups
+via restic and a Windows systems which restores files from the repo. In
+addition, the attackers need to be able to create create files with arbitrary
+names which are then saved to the restic repo. For example, by creating a file
+named "..\test.txt" (which is a perfectly legal filename on Linux) and
+restoring a snapshot containing this file on Windows, it would be written to
+the parent of the target directory.
+
+We'd like to thank Tyler Spivey for reporting this responsibly!
+
+https://github.com/restic/restic/pull/1445

changelog/0.8.0/issue-448

@@ -0,0 +1,9 @@
+Enhancement: sftp backend prompts for password
+
+The sftp backend now prompts for the password if a password is necessary for
+login.
+
+https://github.com/restic/restic/issues/448
+https://github.com/restic/restic/pull/1270
+
+

changelog/0.8.0/issue-510

@@ -0,0 +1,7 @@
+Enhancement: Add `dump` command
+
+We've added the `dump` command which prints a file from a snapshot to
+stdout. This can e.g. be used to restore files read with `backup --stdin`.
+
+https://github.com/restic/restic/issues/510
+https://github.com/restic/restic/pull/1346

changelog/0.8.0/pull-1040

@@ -0,0 +1,23 @@
+Enhancement: Add local metadata cache
+
+We've added a local cache for metadata so that restic doesn't need to load
+all metadata (snapshots, indexes, ...) from the repo each time it starts. By
+default the cache is active, but there's a new global option `--no-cache`
+that can be used to disable the cache. By deafult, the cache a standard
+cache folder for the OS, which can be overridden with `--cache-dir`.  The
+cache will automatically populate, indexes and snapshots are saved as they
+are loaded. Cache directories for repos that haven't been used recently can
+automatically be removed by restic with the `--cleanup-cache` option.
+
+A related change was to by default create pack files in the repo that contain
+either data or metadata, not both mixed together. This allows easy caching of
+only the metadata files. The next run of `restic prune` will untangle mixed
+files automatically.
+
+https://github.com/restic/restic/pull/1040
+https://github.com/restic/restic/issues/29
+https://github.com/restic/restic/issues/738
+https://github.com/restic/restic/issues/282
+https://github.com/restic/restic/pull/1287
+https://github.com/restic/restic/pull/1436
+https://github.com/restic/restic/pull/1265

changelog/0.8.0/pull-1249

@@ -0,0 +1,6 @@
+Enhancement: Add `latest` symlink in fuse mount
+
+The directory structure in the fuse mount now exposes a symlink `latest`
+which points to the latest snapshot in that particular directory.
+
+https://github.com/restic/restic/pull/1249

changelog/0.8.0/pull-1269

@@ -0,0 +1,6 @@
+Enhancement: Add `--compact` to `forget` command
+
+The option `--compact` was added to the `forget` command to provide the same
+compact view as the `snapshots` command.
+
+https://github.com/restic/restic/pull/1269

changelog/0.8.0/pull-1281

@@ -0,0 +1,7 @@
+Enhancement: Google Cloud Storage backend needs less permissions
+
+The Google Cloud Storage backend no longer requires the service account to
+have the `storage.buckets.get` permission ("Storage Admin" role) in `restic
+init` if the bucket already exists.
+
+https://github.com/restic/restic/pull/1281

changelog/0.8.0/pull-1317

@@ -0,0 +1,7 @@
+Bugfix: Run prune when `forget --prune` is called with just snapshot IDs
+
+A bug in the `forget` command caused `prune` not to be run when `--prune` was
+specified without a policy, e.g. when only snapshot IDs that should be
+forgotten are listed manually.
+
+https://github.com/restic/restic/pull/1317

changelog/0.8.0/pull-1319

@@ -0,0 +1,8 @@
+Enhancement: Make `check` print `no errors found` explicitly
+
+The `check` command now explicetly prints `No errors were found` when no errors
+could be found.
+
+https://github.com/restic/restic/pull/1319
+https://github.com/restic/restic/issues/1303
+

changelog/0.8.0/pull-1353

@@ -0,0 +1,3 @@
+Enhancement: Retry failed backend requests
+
+https://github.com/restic/restic/pull/1353

changelog/0.8.0/pull-1437

@@ -0,0 +1,10 @@
+Bugfix: Remove implicit path `/restic` for the s3 backend
+
+The s3 backend used the subdir `restic` within a bucket if no explicit path
+after the bucket name was specified. Since this version, restic does not use
+this default path any more. If you created a repo on s3 in a bucket without
+specifying a path within the bucket, you need to add `/restic` at the end of
+the repository specification to access your repo: `s3:s3.amazonaws.com/bucket/restic`
+
+https://github.com/restic/restic/pull/1437
+https://github.com/restic/restic/issues/1292

changelog/0.8.1/issue-1457

@@ -0,0 +1,4 @@
+Bugfix: Improve s3 backend with DigitalOcean Spaces
+
+https://github.com/restic/restic/pull/1459
+https://github.com/restic/restic/issues/1457

changelog/0.8.1/pull-1436

@@ -0,0 +1,9 @@
+Enhancement: Add code to detect old cache directories
+
+We've added code to detect old cache directories of repositories that
+haven't been used in a long time, restic now prints a note when it detects
+that such dirs exist. Also, the option `--cleanup-cache` was added to
+automatically remove such directories. That's not a problem because the
+cache will be rebuild once a repo is accessed again.
+
+https://github.com/restic/restic/pull/1436

changelog/0.8.1/pull-1439

@@ -0,0 +1,6 @@
+Enhancement: Improve cancellation logic
+
+The cancellation logic was improved, restic can now shut down cleanly when
+requested to do so (e.g. via ctrl+c).
+
+https://github.com/restic/restic/pull/1439

changelog/0.8.1/pull-1452

@@ -0,0 +1,9 @@
+Change: Do not save atime by default
+
+By default, the access time for files and dirs is not saved any more. It is
+not possible to reliably disable updating the access time during a backup,
+so for the next backup the access time is different again. This means a lot
+of metadata is saved. If you want to save the access time anyway, pass
+`--with-atime` to the `backup` command.
+
+https://github.com/restic/restic/pull/1452

changelog/0.8.1/pull-1454

@@ -0,0 +1,6 @@
+Bugfix: Correct cache dir location for Windows and Darwin
+
+The cache directory on Windows and Darwin was not correct, instead the
+directory `.cache` was used.
+
+https://github.com/restic/restic/pull/1454

changelog/0.8.1/pull-1459

@@ -0,0 +1,9 @@
+Bugfix: Disable handling SIGPIPE
+
+We've disabled handling SIGPIPE again. Turns out, writing to broken TCP
+connections also raised SIGPIPE, so restic exits on the first write to a
+broken connection. Instead, restic should retry the request.
+
+https://github.com/restic/restic/pull/1459
+https://github.com/restic/restic/issues/1457
+https://github.com/restic/restic/issues/1466

changelog/0.8.1/pull-1462

@@ -0,0 +1,8 @@
+Enhancement: Add the `diff` command
+
+The command `diff` was added, it allows comparing two snapshots and listing
+all differences.
+
+https://github.com/restic/restic/issues/11
+https://github.com/restic/restic/issues/1460
+https://github.com/restic/restic/pull/1462

changelog/CHANGELOG.tmpl

@@ -0,0 +1,32 @@
+{{- range $changes := . }}{{ with $changes -}}
+Changelog for restic {{ .Version }} ({{ .Date }})
+=======================================
+
+The following sections list the changes in restic {{ .Version }} relevant to
+restic users. The changes are ordered by importance.
+
+Summary
+-------
+{{ range $entry := .Entries }}{{ with $entry }}
+ * {{ .TypeShort }} #{{ .PrimaryID }}: {{ .Title }}
+{{- end }}{{ end }}
+
+Details
+-------
+{{ range $entry := .Entries }}{{ with $entry }}
+ * {{ .Type }} #{{ .PrimaryID }}: {{ .Title }}
+{{ range $par := .Paragraphs }}
+   {{ wrap $par 80 3 }}
+{{ end -}}
+{{ range $id := .Issues }}
+   https://github.com/restic/restic/issues/{{ $id -}}
+{{ end -}}
+{{ range $id := .PRs }}
+   https://github.com/restic/restic/pull/{{ $id -}}
+{{ end -}}
+{{ range $url := .OtherURLs }}
+   {{ $url -}}
+{{ end }}
+{{ end }}{{ end }}
+
+{{ end }}{{ end -}}

changelog/changelog-entry.tmpl

@@ -0,0 +1,12 @@
+Bugfix: Fix behavior for foobar (in present tense)
+
+We've fixed the behavior for foobar, a long-standing annoyance for restic
+users.
+
+The text in the paragraphs is written in past tense. The last section is a list
+of issue URLs, PR URLs and other URLs. The first issue ID (or the first PR ID,
+in case there aren't any issue links) is used as the primary ID.
+
+https://github.com/restic/restic/issues/1234
+https://github.com/restic/restic/pull/55555
+https://forum.restic/.net/foo/bar/baz

changelog/changelog-github.tmpl

@@ -0,0 +1,32 @@
+{{- range $changes := . }}{{ with $changes -}}
+Changelog for restic {{ .Version }} ({{ .Date }})
+=======================================
+
+The following sections list the changes in restic {{ .Version }} relevant to
+restic users. The changes are ordered by importance.
+
+Summary
+-------
+{{ range $entry := .Entries }}{{ with $entry }}
+ * {{ .TypeShort }} [#{{ .PrimaryID }}]({{ .PrimaryURL }}): {{ .Title }}
+{{- end }}{{ end }}
+
+Details
+-------
+{{ range $entry := .Entries }}{{ with $entry }}
+ * {{ .Type }} #{{ .PrimaryID }}: {{ .Title }}
+{{ range $par := .Paragraphs }}
+   {{ $par }}
+{{ end }}
+   {{ range $id := .Issues -}}
+[{{ $id }}](https://github.com/restic/restic/issues/{{ $id -}})
+{{- end -}}
+{{ range $id := .PRs -}}
+{{ ` ` }}[#{{ $id }}](https://github.com/restic/restic/pull/{{ $id -}})
+{{- end -}}
+{{ ` ` }}{{ range $url := .OtherURLs -}}
+{{ $url -}}
+{{- end }}
+{{ end }}{{ end }}
+
+{{ end }}{{ end -}}

changelog/releases

@@ -0,0 +1,13 @@
+# This file lists all versions for the changelog. Each line consists of the
+# version string, followed by an optional release date.
+# 
+# The resulting changelog generated by `calens` will list all versions in
+# exactly this order.
+0.8.1
+0.8.0 2017-11-26
+0.7.3 2017-09-20
+0.7.2 2017-09-13
+0.7.1 2017-07-22
+0.7.0 2017-07-01
+0.6.1 2017-06-01
+0.6.0 2017-05-29

cmd/restic/background_linux.go

@@ -4,7 +4,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"restic/debug"
+	"github.com/restic/restic/internal/debug"
 )
 
 // IsProcessBackground returns true if it is running in the background or false if not

cmd/restic/cleanup.go

@@ -0,0 +1,90 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/signal"
+	"sync"
+	"syscall"
+
+	"github.com/restic/restic/internal/debug"
+)
+
+var cleanupHandlers struct {
+	sync.Mutex
+	list []func() error
+	done bool
+	ch   chan os.Signal
+}
+
+var stderr = os.Stderr
+
+func init() {
+	cleanupHandlers.ch = make(chan os.Signal)
+	go CleanupHandler(cleanupHandlers.ch)
+	InstallSignalHandler()
+}
+
+// InstallSignalHandler listens for SIGINT, and triggers the cleanup handlers.
+func InstallSignalHandler() {
+	signal.Notify(cleanupHandlers.ch, syscall.SIGINT)
+}
+
+// SuspendSignalHandler removes the signal handler for SIGINT.
+func SuspendSignalHandler() {
+	signal.Reset(syscall.SIGINT)
+}
+
+// AddCleanupHandler adds the function f to the list of cleanup handlers so
+// that it is executed when all the cleanup handlers are run, e.g. when SIGINT
+// is received.
+func AddCleanupHandler(f func() error) {
+	cleanupHandlers.Lock()
+	defer cleanupHandlers.Unlock()
+
+	// reset the done flag for integration tests
+	cleanupHandlers.done = false
+
+	cleanupHandlers.list = append(cleanupHandlers.list, f)
+}
+
+// RunCleanupHandlers runs all registered cleanup handlers
+func RunCleanupHandlers() {
+	cleanupHandlers.Lock()
+	defer cleanupHandlers.Unlock()
+
+	if cleanupHandlers.done {
+		return
+	}
+	cleanupHandlers.done = true
+
+	for _, f := range cleanupHandlers.list {
+		err := f()
+		if err != nil {
+			fmt.Fprintf(stderr, "error in cleanup handler: %v\n", err)
+		}
+	}
+	cleanupHandlers.list = nil
+}
+
+// CleanupHandler handles the SIGINT signals.
+func CleanupHandler(c <-chan os.Signal) {
+	for s := range c {
+		debug.Log("signal %v received, cleaning up", s)
+		fmt.Fprintf(stderr, "%ssignal %v received, cleaning up\n", ClearLine(), s)
+
+		code := 0
+		if s != syscall.SIGINT {
+			code = 1
+		}
+
+		Exit(code)
+	}
+}
+
+// Exit runs the cleanup handlers and then terminates the process with the
+// given exit code.
+func Exit(code int) {
+	RunCleanupHandlers()
+	os.Exit(code)
+}

cmd/restic/cmd_backup.go

@@ -0,0 +1,528 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"io"
+	"os"
+	"path"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/spf13/cobra"
+
+	"github.com/restic/restic/internal/archiver"
+	"github.com/restic/restic/internal/debug"
+	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/fs"
+	"github.com/restic/restic/internal/restic"
+)
+
+var cmdBackup = &cobra.Command{
+	Use:   "backup [flags] FILE/DIR [FILE/DIR] ...",
+	Short: "Create a new backup of files and/or directories",
+	Long: `
+The "backup" command creates a new snapshot and saves the files and directories
+given as the arguments.
+`,
+	PreRun: func(cmd *cobra.Command, args []string) {
+		if backupOptions.Hostname == "" {
+			hostname, err := os.Hostname()
+			if err != nil {
+				debug.Log("os.Hostname() returned err: %v", err)
+				return
+			}
+			backupOptions.Hostname = hostname
+		}
+	},
+	DisableAutoGenTag: true,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		if backupOptions.Stdin && backupOptions.FilesFrom == "-" {
+			return errors.Fatal("cannot use both `--stdin` and `--files-from -`")
+		}
+
+		if backupOptions.Stdin {
+			return readBackupFromStdin(backupOptions, globalOptions, args)
+		}
+
+		return runBackup(backupOptions, globalOptions, args)
+	},
+}
+
+// BackupOptions bundles all options for the backup command.
+type BackupOptions struct {
+	Parent           string
+	Force            bool
+	Excludes         []string
+	ExcludeFiles     []string
+	ExcludeOtherFS   bool
+	ExcludeIfPresent []string
+	ExcludeCaches    bool
+	Stdin            bool
+	StdinFilename    string
+	Tags             []string
+	Hostname         string
+	FilesFrom        string
+	TimeStamp        string
+	WithAtime        bool
+}
+
+var backupOptions BackupOptions
+
+func init() {
+	cmdRoot.AddCommand(cmdBackup)
+
+	f := cmdBackup.Flags()
+	f.StringVar(&backupOptions.Parent, "parent", "", "use this parent snapshot (default: last snapshot in the repo that has the same target files/directories)")
+	f.BoolVarP(&backupOptions.Force, "force", "f", false, `force re-reading the target files/directories (overrides the "parent" flag)`)
+	f.StringArrayVarP(&backupOptions.Excludes, "exclude", "e", nil, "exclude a `pattern` (can be specified multiple times)")
+	f.StringArrayVar(&backupOptions.ExcludeFiles, "exclude-file", nil, "read exclude patterns from a `file` (can be specified multiple times)")
+	f.BoolVarP(&backupOptions.ExcludeOtherFS, "one-file-system", "x", false, "exclude other file systems")
+	f.StringArrayVar(&backupOptions.ExcludeIfPresent, "exclude-if-present", nil, "takes filename[:header], exclude contents of directories containing filename (except filename itself) if header of that file is as provided (can be specified multiple times)")
+	f.BoolVar(&backupOptions.ExcludeCaches, "exclude-caches", false, `excludes cache directories that are marked with a CACHEDIR.TAG file`)
+	f.BoolVar(&backupOptions.Stdin, "stdin", false, "read backup from stdin")
+	f.StringVar(&backupOptions.StdinFilename, "stdin-filename", "stdin", "file name to use when reading from stdin")
+	f.StringArrayVar(&backupOptions.Tags, "tag", nil, "add a `tag` for the new snapshot (can be specified multiple times)")
+	f.StringVar(&backupOptions.Hostname, "hostname", "", "set the `hostname` for the snapshot manually. To prevent an expensive rescan use the \"parent\" flag")
+	f.StringVar(&backupOptions.FilesFrom, "files-from", "", "read the files to backup from file (can be combined with file args)")
+	f.StringVar(&backupOptions.TimeStamp, "time", "", "time of the backup (ex. '2012-11-01 22:08:41') (default: now)")
+	f.BoolVar(&backupOptions.WithAtime, "with-atime", false, "store the atime for all files and directories")
+}
+
+func newScanProgress(gopts GlobalOptions) *restic.Progress {
+	if gopts.Quiet {
+		return nil
+	}
+
+	p := restic.NewProgress()
+	p.OnUpdate = func(s restic.Stat, d time.Duration, ticker bool) {
+		if IsProcessBackground() {
+			return
+		}
+
+		PrintProgress("[%s] %d directories, %d files, %s", formatDuration(d), s.Dirs, s.Files, formatBytes(s.Bytes))
+	}
+
+	p.OnDone = func(s restic.Stat, d time.Duration, ticker bool) {
+		PrintProgress("scanned %d directories, %d files in %s\n", s.Dirs, s.Files, formatDuration(d))
+	}
+
+	return p
+}
+
+func newArchiveProgress(gopts GlobalOptions, todo restic.Stat) *restic.Progress {
+	if gopts.Quiet {
+		return nil
+	}
+
+	archiveProgress := restic.NewProgress()
+
+	var bps, eta uint64
+	itemsTodo := todo.Files + todo.Dirs
+
+	archiveProgress.OnUpdate = func(s restic.Stat, d time.Duration, ticker bool) {
+		if IsProcessBackground() {
+			return
+		}
+
+		sec := uint64(d / time.Second)
+		if todo.Bytes > 0 && sec > 0 && ticker {
+			bps = s.Bytes / sec
+			if s.Bytes >= todo.Bytes {
+				eta = 0
+			} else if bps > 0 {
+				eta = (todo.Bytes - s.Bytes) / bps
+			}
+		}
+
+		itemsDone := s.Files + s.Dirs
+
+		status1 := fmt.Sprintf("[%s] %s  %s/s  %s / %s  %d / %d items  %d errors  ",
+			formatDuration(d),
+			formatPercent(s.Bytes, todo.Bytes),
+			formatBytes(bps),
+			formatBytes(s.Bytes), formatBytes(todo.Bytes),
+			itemsDone, itemsTodo,
+			s.Errors)
+		status2 := fmt.Sprintf("ETA %s ", formatSeconds(eta))
+
+		if w := stdoutTerminalWidth(); w > 0 {
+			maxlen := w - len(status2) - 1
+
+			if maxlen < 4 {
+				status1 = ""
+			} else if len(status1) > maxlen {
+				status1 = status1[:maxlen-4]
+				status1 += "... "
+			}
+		}
+
+		PrintProgress("%s%s", status1, status2)
+	}
+
+	archiveProgress.OnDone = func(s restic.Stat, d time.Duration, ticker bool) {
+		fmt.Printf("\nduration: %s, %s\n", formatDuration(d), formatRate(todo.Bytes, d))
+	}
+
+	return archiveProgress
+}
+
+func newArchiveStdinProgress(gopts GlobalOptions) *restic.Progress {
+	if gopts.Quiet {
+		return nil
+	}
+
+	archiveProgress := restic.NewProgress()
+
+	var bps uint64
+
+	archiveProgress.OnUpdate = func(s restic.Stat, d time.Duration, ticker bool) {
+		if IsProcessBackground() {
+			return
+		}
+
+		sec := uint64(d / time.Second)
+		if s.Bytes > 0 && sec > 0 && ticker {
+			bps = s.Bytes / sec
+		}
+
+		status1 := fmt.Sprintf("[%s] %s  %s/s", formatDuration(d),
+			formatBytes(s.Bytes),
+			formatBytes(bps))
+
+		if w := stdoutTerminalWidth(); w > 0 {
+			maxlen := w - len(status1)
+
+			if maxlen < 4 {
+				status1 = ""
+			} else if len(status1) > maxlen {
+				status1 = status1[:maxlen-4]
+				status1 += "... "
+			}
+		}
+
+		PrintProgress("%s", status1)
+	}
+
+	archiveProgress.OnDone = func(s restic.Stat, d time.Duration, ticker bool) {
+		fmt.Printf("\nduration: %s, %s\n", formatDuration(d), formatRate(s.Bytes, d))
+	}
+
+	return archiveProgress
+}
+
+// filterExisting returns a slice of all existing items, or an error if no
+// items exist at all.
+func filterExisting(items []string) (result []string, err error) {
+	for _, item := range items {
+		_, err := fs.Lstat(item)
+		if err != nil && os.IsNotExist(errors.Cause(err)) {
+			Warnf("%v does not exist, skipping\n", item)
+			continue
+		}
+
+		result = append(result, item)
+	}
+
+	if len(result) == 0 {
+		return nil, errors.Fatal("all target directories/files do not exist")
+	}
+
+	return
+}
+
+func readBackupFromStdin(opts BackupOptions, gopts GlobalOptions, args []string) error {
+	if len(args) != 0 {
+		return errors.Fatal("when reading from stdin, no additional files can be specified")
+	}
+
+	fn := opts.StdinFilename
+
+	if fn == "" {
+		return errors.Fatal("filename for backup from stdin must not be empty")
+	}
+
+	if filepath.Base(fn) != fn || path.Base(fn) != fn {
+		return errors.Fatal("filename is invalid (may not contain a directory, slash or backslash)")
+	}
+
+	if gopts.password == "" {
+		return errors.Fatal("unable to read password from stdin when data is to be read from stdin, use --password-file or $RESTIC_PASSWORD")
+	}
+
+	repo, err := OpenRepository(gopts)
+	if err != nil {
+		return err
+	}
+
+	lock, err := lockRepo(repo)
+	defer unlockRepo(lock)
+	if err != nil {
+		return err
+	}
+
+	err = repo.LoadIndex(gopts.ctx)
+	if err != nil {
+		return err
+	}
+
+	r := &archiver.Reader{
+		Repository: repo,
+		Tags:       opts.Tags,
+		Hostname:   opts.Hostname,
+	}
+
+	_, id, err := r.Archive(gopts.ctx, fn, os.Stdin, newArchiveStdinProgress(gopts))
+	if err != nil {
+		return err
+	}
+
+	Verbosef("archived as %v\n", id.Str())
+	return nil
+}
+
+// readFromFile will read all lines from the given filename and write them to a
+// string array, if filename is empty readFromFile returns and empty string
+// array. If filename is a dash (-), readFromFile will read the lines from
+// the standard input.
+func readLinesFromFile(filename string) ([]string, error) {
+	if filename == "" {
+		return nil, nil
+	}
+
+	var r io.Reader = os.Stdin
+	if filename != "-" {
+		f, err := os.Open(filename)
+		if err != nil {
+			return nil, err
+		}
+		defer f.Close()
+		r = f
+	}
+
+	var lines []string
+
+	scanner := bufio.NewScanner(r)
+	for scanner.Scan() {
+		line := scanner.Text()
+		// ignore empty lines
+		if line == "" {
+			continue
+		}
+		// strip comments
+		if strings.HasPrefix(line, "#") {
+			continue
+		}
+		lines = append(lines, line)
+	}
+
+	if err := scanner.Err(); err != nil {
+		return nil, err
+	}
+
+	return lines, nil
+}
+
+func runBackup(opts BackupOptions, gopts GlobalOptions, args []string) error {
+	if opts.FilesFrom == "-" && gopts.password == "" {
+		return errors.Fatal("unable to read password from stdin when data is to be read from stdin, use --password-file or $RESTIC_PASSWORD")
+	}
+
+	fromfile, err := readLinesFromFile(opts.FilesFrom)
+	if err != nil {
+		return err
+	}
+
+	// merge files from files-from into normal args so we can reuse the normal
+	// args checks and have the ability to use both files-from and args at the
+	// same time
+	args = append(args, fromfile...)
+	if len(args) == 0 {
+		return errors.Fatal("nothing to backup, please specify target files/dirs")
+	}
+
+	target := make([]string, 0, len(args))
+	for _, d := range args {
+		if a, err := filepath.Abs(d); err == nil {
+			d = a
+		}
+		target = append(target, d)
+	}
+
+	target, err = filterExisting(target)
+	if err != nil {
+		return err
+	}
+
+	// rejectFuncs collect functions that can reject items from the backup
+	var rejectFuncs []RejectFunc
+
+	// allowed devices
+	if opts.ExcludeOtherFS {
+		f, err := rejectByDevice(target)
+		if err != nil {
+			return err
+		}
+		rejectFuncs = append(rejectFuncs, f)
+	}
+
+	// add patterns from file
+	if len(opts.ExcludeFiles) > 0 {
+		opts.Excludes = append(opts.Excludes, readExcludePatternsFromFiles(opts.ExcludeFiles)...)
+	}
+
+	if len(opts.Excludes) > 0 {
+		rejectFuncs = append(rejectFuncs, rejectByPattern(opts.Excludes))
+	}
+
+	if opts.ExcludeCaches {
+		opts.ExcludeIfPresent = append(opts.ExcludeIfPresent, "CACHEDIR.TAG:Signature: 8a477f597d28d172789f06886806bc55")
+	}
+
+	for _, spec := range opts.ExcludeIfPresent {
+		f, err := rejectIfPresent(spec)
+		if err != nil {
+			return err
+		}
+
+		rejectFuncs = append(rejectFuncs, f)
+	}
+
+	repo, err := OpenRepository(gopts)
+	if err != nil {
+		return err
+	}
+
+	lock, err := lockRepo(repo)
+	defer unlockRepo(lock)
+	if err != nil {
+		return err
+	}
+
+	// exclude restic cache
+	if repo.Cache != nil {
+		f, err := rejectResticCache(repo)
+		if err != nil {
+			return err
+		}
+
+		rejectFuncs = append(rejectFuncs, f)
+	}
+
+	err = repo.LoadIndex(gopts.ctx)
+	if err != nil {
+		return err
+	}
+
+	var parentSnapshotID *restic.ID
+
+	// Force using a parent
+	if !opts.Force && opts.Parent != "" {
+		id, err := restic.FindSnapshot(repo, opts.Parent)
+		if err != nil {
+			return errors.Fatalf("invalid id %q: %v", opts.Parent, err)
+		}
+
+		parentSnapshotID = &id
+	}
+
+	// Find last snapshot to set it as parent, if not already set
+	if !opts.Force && parentSnapshotID == nil {
+		id, err := restic.FindLatestSnapshot(gopts.ctx, repo, target, []restic.TagList{}, opts.Hostname)
+		if err == nil {
+			parentSnapshotID = &id
+		} else if err != restic.ErrNoSnapshotFound {
+			return err
+		}
+	}
+
+	if parentSnapshotID != nil {
+		Verbosef("using parent snapshot %v\n", parentSnapshotID.Str())
+	}
+
+	Verbosef("scan %v\n", target)
+
+	selectFilter := func(item string, fi os.FileInfo) bool {
+		for _, reject := range rejectFuncs {
+			if reject(item, fi) {
+				return false
+			}
+		}
+		return true
+	}
+
+	stat, err := archiver.Scan(target, selectFilter, newScanProgress(gopts))
+	if err != nil {
+		return err
+	}
+
+	arch := archiver.New(repo)
+	arch.Excludes = opts.Excludes
+	arch.SelectFilter = selectFilter
+	arch.WithAccessTime = opts.WithAtime
+
+	arch.Warn = func(dir string, fi os.FileInfo, err error) {
+		// TODO: make ignoring errors configurable
+		Warnf("%s\rwarning for %s: %v\n", ClearLine(), dir, err)
+	}
+
+	timeStamp := time.Now()
+	if opts.TimeStamp != "" {
+		timeStamp, err = time.Parse(TimeFormat, opts.TimeStamp)
+		if err != nil {
+			return errors.Fatalf("error in time option: %v\n", err)
+		}
+	}
+
+	_, id, err := arch.Snapshot(gopts.ctx, newArchiveProgress(gopts, stat), target, opts.Tags, opts.Hostname, parentSnapshotID, timeStamp)
+	if err != nil {
+		return err
+	}
+
+	Verbosef("snapshot %s saved\n", id.Str())
+
+	return nil
+}
+
+func readExcludePatternsFromFiles(excludeFiles []string) []string {
+	var excludes []string
+	for _, filename := range excludeFiles {
+		err := func() (err error) {
+			file, err := fs.Open(filename)
+			if err != nil {
+				return err
+			}
+			defer func() {
+				// return pre-close error if there was one
+				if errClose := file.Close(); err == nil {
+					err = errClose
+				}
+			}()
+
+			scanner := bufio.NewScanner(file)
+			for scanner.Scan() {
+				line := strings.TrimSpace(scanner.Text())
+
+				// ignore empty lines
+				if line == "" {
+					continue
+				}
+
+				// strip comments
+				if strings.HasPrefix(line, "#") {
+					continue
+				}
+
+				line = os.ExpandEnv(line)
+				excludes = append(excludes, line)
+			}
+			return scanner.Err()
+		}()
+		if err != nil {
+			Warnf("error reading exclude patterns: %v:", err)
+			return nil
+		}
+	}
+	return excludes
+}

cmd/restic/cmd_cat.go

@@ -7,18 +7,19 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"restic"
-	"restic/backend"
-	"restic/errors"
-	"restic/repository"
+	"github.com/restic/restic/internal/backend"
+	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
 )
 
 var cmdCat = &cobra.Command{
 	Use:   "cat [flags] [pack|blob|snapshot|index|key|masterkey|config|lock] ID",
-	Short: "print internal objects to stdout",
+	Short: "Print internal objects to stdout",
 	Long: `
 The "cat" command is used to print internal objects to stdout.
 `,
+	DisableAutoGenTag: true,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		return runCat(globalOptions, args)
 	},
@@ -73,7 +74,7 @@ func runCat(gopts GlobalOptions, args []string) error {
 		fmt.Println(string(buf))
 		return nil
 	case "index":
-		buf, err := repo.LoadAndDecrypt(restic.IndexFile, id)
+		buf, err := repo.LoadAndDecrypt(gopts.ctx, restic.IndexFile, id)
 		if err != nil {
 			return err
 		}
@@ -83,7 +84,7 @@ func runCat(gopts GlobalOptions, args []string) error {
 
 	case "snapshot":
 		sn := &restic.Snapshot{}
-		err = repo.LoadJSONUnpacked(restic.SnapshotFile, id, sn)
+		err = repo.LoadJSONUnpacked(gopts.ctx, restic.SnapshotFile, id, sn)
 		if err != nil {
 			return err
 		}
@@ -98,7 +99,7 @@ func runCat(gopts GlobalOptions, args []string) error {
 		return nil
 	case "key":
 		h := restic.Handle{Type: restic.KeyFile, Name: id.String()}
-		buf, err := backend.LoadAll(repo.Backend(), h)
+		buf, err := backend.LoadAll(gopts.ctx, repo.Backend(), h)
 		if err != nil {
 			return err
 		}
@@ -125,7 +126,7 @@ func runCat(gopts GlobalOptions, args []string) error {
 		fmt.Println(string(buf))
 		return nil
 	case "lock":
-		lock, err := restic.LoadLock(repo, id)
+		lock, err := restic.LoadLock(gopts.ctx, repo, id)
 		if err != nil {
 			return err
 		}
@@ -141,7 +142,7 @@ func runCat(gopts GlobalOptions, args []string) error {
 	}
 
 	// load index, handle all the other types
-	err = repo.LoadIndex()
+	err = repo.LoadIndex(gopts.ctx)
 	if err != nil {
 		return err
 	}
@@ -149,7 +150,7 @@ func runCat(gopts GlobalOptions, args []string) error {
 	switch tpe {
 	case "pack":
 		h := restic.Handle{Type: restic.DataFile, Name: id.String()}
-		buf, err := backend.LoadAll(repo.Backend(), h)
+		buf, err := backend.LoadAll(gopts.ctx, repo.Backend(), h)
 		if err != nil {
 			return err
 		}
@@ -171,7 +172,7 @@ func runCat(gopts GlobalOptions, args []string) error {
 			blob := list[0]
 
 			buf := make([]byte, blob.Length)
-			n, err := repo.LoadBlob(t, id, buf)
+			n, err := repo.LoadBlob(gopts.ctx, t, id, buf)
 			if err != nil {
 				return err
 			}

cmd/restic/cmd_check.go

@@ -7,18 +7,22 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"restic"
-	"restic/checker"
-	"restic/errors"
+	"github.com/restic/restic/internal/checker"
+	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
 )
 
 var cmdCheck = &cobra.Command{
 	Use:   "check [flags]",
-	Short: "check the repository for errors",
+	Short: "Check the repository for errors",
 	Long: `
 The "check" command tests the repository for errors and reports any errors it
 finds. It can also be used to read all data and therefore simulate a restore.
+
+By default, the "check" command will always load all data directly from the
+repository and not use a local cache.
 `,
+	DisableAutoGenTag: true,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		return runCheck(checkOptions, globalOptions, args)
 	},
@@ -28,6 +32,7 @@ finds. It can also be used to read all data and therefore simulate a restore.
 type CheckOptions struct {
 	ReadData    bool
 	CheckUnused bool
+	WithCache   bool
 }
 
 var checkOptions CheckOptions
@@ -38,6 +43,7 @@ func init() {
 	f := cmdCheck.Flags()
 	f.BoolVar(&checkOptions.ReadData, "read-data", false, "read all data blobs")
 	f.BoolVar(&checkOptions.CheckUnused, "check-unused", false, "find unused blobs")
+	f.BoolVar(&checkOptions.WithCache, "with-cache", false, "use the cache")
 }
 
 func newReadProgress(gopts GlobalOptions, todo restic.Stat) *restic.Progress {
@@ -75,13 +81,18 @@ func runCheck(opts CheckOptions, gopts GlobalOptions, args []string) error {
 		return errors.Fatal("check has no arguments")
 	}
 
+	if !opts.WithCache {
+		// do not use a cache for the checker
+		gopts.NoCache = true
+	}
+
 	repo, err := OpenRepository(gopts)
 	if err != nil {
 		return err
 	}
 
 	if !gopts.NoLock {
-		Verbosef("Create exclusive lock for repository\n")
+		Verbosef("create exclusive lock for repository\n")
 		lock, err := lockRepoExclusive(repo)
 		defer unlockRepo(lock)
 		if err != nil {
@@ -91,8 +102,8 @@ func runCheck(opts CheckOptions, gopts GlobalOptions, args []string) error {
 
 	chkr := checker.New(repo)
 
-	Verbosef("Load indexes\n")
-	hints, errs := chkr.LoadIndex()
+	Verbosef("load indexes\n")
+	hints, errs := chkr.LoadIndex(gopts.ctx)
 
 	dupFound := false
 	for _, hint := range hints {
@@ -113,23 +124,20 @@ func runCheck(opts CheckOptions, gopts GlobalOptions, args []string) error {
 		return errors.Fatal("LoadIndex returned errors")
 	}
 
-	done := make(chan struct{})
-	defer close(done)
-
 	errorsFound := false
 	errChan := make(chan error)
 
-	Verbosef("Check all packs\n")
-	go chkr.Packs(errChan, done)
+	Verbosef("check all packs\n")
+	go chkr.Packs(gopts.ctx, errChan)
 
 	for err := range errChan {
 		errorsFound = true
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 	}
 
-	Verbosef("Check snapshots, trees and blobs\n")
+	Verbosef("check snapshots, trees and blobs\n")
 	errChan = make(chan error)
-	go chkr.Structure(errChan, done)
+	go chkr.Structure(gopts.ctx, errChan)
 
 	for err := range errChan {
 		errorsFound = true
@@ -151,12 +159,12 @@ func runCheck(opts CheckOptions, gopts GlobalOptions, args []string) error {
 	}
 
 	if opts.ReadData {
-		Verbosef("Read all data\n")
+		Verbosef("read all data\n")
 
 		p := newReadProgress(gopts, restic.Stat{Blobs: chkr.CountPacks()})
 		errChan := make(chan error)
 
-		go chkr.ReadData(p, errChan, done)
+		go chkr.ReadData(gopts.ctx, p, errChan)
 
 		for err := range errChan {
 			errorsFound = true
@@ -167,5 +175,8 @@ func runCheck(opts CheckOptions, gopts GlobalOptions, args []string) error {
 	if errorsFound {
 		return errors.Fatal("repository contains errors")
 	}
+
+	Verbosef("no errors were found\n")
+
 	return nil
 }

cmd/restic/cmd_debug.go

@@ -0,0 +1,217 @@
+// +build debug
+
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"os"
+
+	"github.com/spf13/cobra"
+
+	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/pack"
+	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
+
+	"github.com/restic/restic/internal/worker"
+)
+
+var cmdDebug = &cobra.Command{
+	Use:   "debug",
+	Short: "Debug commands",
+}
+
+var cmdDebugDump = &cobra.Command{
+	Use:   "dump [indexes|snapshots|all|packs]",
+	Short: "Dump data structures",
+	Long: `
+The "dump" command dumps data structures from the repository as JSON objects. It
+is used for debugging purposes only.`,
+	DisableAutoGenTag: true,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return runDebugDump(globalOptions, args)
+	},
+}
+
+func init() {
+	cmdRoot.AddCommand(cmdDebug)
+	cmdDebug.AddCommand(cmdDebugDump)
+}
+
+func prettyPrintJSON(wr io.Writer, item interface{}) error {
+	buf, err := json.MarshalIndent(item, "", "  ")
+	if err != nil {
+		return err
+	}
+
+	_, err = wr.Write(append(buf, '\n'))
+	return err
+}
+
+func debugPrintSnapshots(repo *repository.Repository, wr io.Writer) error {
+	for id := range repo.List(context.TODO(), restic.SnapshotFile) {
+		snapshot, err := restic.LoadSnapshot(context.TODO(), repo, id)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "LoadSnapshot(%v): %v", id.Str(), err)
+			continue
+		}
+
+		fmt.Fprintf(wr, "snapshot_id: %v\n", id)
+
+		err = prettyPrintJSON(wr, snapshot)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+const dumpPackWorkers = 10
+
+// Pack is the struct used in printPacks.
+type Pack struct {
+	Name string `json:"name"`
+
+	Blobs []Blob `json:"blobs"`
+}
+
+// Blob is the struct used in printPacks.
+type Blob struct {
+	Type   restic.BlobType `json:"type"`
+	Length uint            `json:"length"`
+	ID     restic.ID       `json:"id"`
+	Offset uint            `json:"offset"`
+}
+
+func printPacks(repo *repository.Repository, wr io.Writer) error {
+	f := func(ctx context.Context, job worker.Job) (interface{}, error) {
+		name := job.Data.(string)
+
+		h := restic.Handle{Type: restic.DataFile, Name: name}
+
+		blobInfo, err := repo.Backend().Stat(ctx, h)
+		if err != nil {
+			return nil, err
+		}
+
+		blobs, err := pack.List(repo.Key(), restic.ReaderAt(repo.Backend(), h), blobInfo.Size)
+		if err != nil {
+			return nil, err
+		}
+
+		return blobs, nil
+	}
+
+	jobCh := make(chan worker.Job)
+	resCh := make(chan worker.Job)
+	wp := worker.New(context.TODO(), dumpPackWorkers, f, jobCh, resCh)
+
+	go func() {
+		for name := range repo.Backend().List(context.TODO(), restic.DataFile) {
+			jobCh <- worker.Job{Data: name}
+		}
+		close(jobCh)
+	}()
+
+	for job := range resCh {
+		name := job.Data.(string)
+
+		if job.Error != nil {
+			fmt.Fprintf(os.Stderr, "error for pack %v: %v\n", name, job.Error)
+			continue
+		}
+
+		entries := job.Result.([]restic.Blob)
+		p := Pack{
+			Name:  name,
+			Blobs: make([]Blob, len(entries)),
+		}
+		for i, blob := range entries {
+			p.Blobs[i] = Blob{
+				Type:   blob.Type,
+				Length: blob.Length,
+				ID:     blob.ID,
+				Offset: blob.Offset,
+			}
+		}
+
+		prettyPrintJSON(os.Stdout, p)
+	}
+
+	wp.Wait()
+
+	return nil
+}
+
+func dumpIndexes(repo restic.Repository) error {
+	for id := range repo.List(context.TODO(), restic.IndexFile) {
+		fmt.Printf("index_id: %v\n", id)
+
+		idx, err := repository.LoadIndex(context.TODO(), repo, id)
+		if err != nil {
+			return err
+		}
+
+		err = idx.Dump(os.Stdout)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func runDebugDump(gopts GlobalOptions, args []string) error {
+	if len(args) != 1 {
+		return errors.Fatal("type not specified")
+	}
+
+	repo, err := OpenRepository(gopts)
+	if err != nil {
+		return err
+	}
+
+	if !gopts.NoLock {
+		lock, err := lockRepo(repo)
+		defer unlockRepo(lock)
+		if err != nil {
+			return err
+		}
+	}
+
+	err = repo.LoadIndex(gopts.ctx)
+	if err != nil {
+		return err
+	}
+
+	tpe := args[0]
+
+	switch tpe {
+	case "indexes":
+		return dumpIndexes(repo)
+	case "snapshots":
+		return debugPrintSnapshots(repo, os.Stdout)
+	case "packs":
+		return printPacks(repo, os.Stdout)
+	case "all":
+		fmt.Printf("snapshots:\n")
+		err := debugPrintSnapshots(repo, os.Stdout)
+		if err != nil {
+			return err
+		}
+
+		fmt.Printf("\nindexes:\n")
+		err = dumpIndexes(repo)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	default:
+		return errors.Fatalf("no such type %q", tpe)
+	}
+}

cmd/restic/cmd_diff.go

@@ -0,0 +1,356 @@
+package main
+
+import (
+	"context"
+	"path"
+	"reflect"
+	"sort"
+
+	"github.com/restic/restic/internal/debug"
+	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/repository"
+	"github.com/restic/restic/internal/restic"
+	"github.com/spf13/cobra"
+)
+
+var cmdDiff = &cobra.Command{
+	Use:   "diff snapshot-ID snapshot-ID",
+	Short: "Show differences between two snapshots",
+	Long: `
+The "diff" command shows differences from the first to the second snapshot. The
+first characters in each line display what has happened to a particular file or
+directory:
+
+ +  The item was added
+ -  The item was removed
+ U  The metadata (access mode, timestamps, ...) for the item was updated
+ M  The file's content was modified
+ T  The type was changed, e.g. a file was made a symlink
+`,
+	DisableAutoGenTag: true,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return runDiff(diffOptions, globalOptions, args)
+	},
+}
+
+// DiffOptions collects all options for the diff command.
+type DiffOptions struct {
+	ShowMetadata bool
+}
+
+var diffOptions DiffOptions
+
+func init() {
+	cmdRoot.AddCommand(cmdDiff)
+
+	f := cmdDiff.Flags()
+	f.BoolVar(&diffOptions.ShowMetadata, "metadata", false, "print changes in metadata")
+}
+
+func loadSnapshot(ctx context.Context, repo *repository.Repository, desc string) (*restic.Snapshot, error) {
+	id, err := restic.FindSnapshot(repo, desc)
+	if err != nil {
+		return nil, err
+	}
+
+	return restic.LoadSnapshot(ctx, repo, id)
+}
+
+// Comparer collects all things needed to compare two snapshots.
+type Comparer struct {
+	repo restic.Repository
+	opts DiffOptions
+}
+
+// DiffStat collects stats for all types of items.
+type DiffStat struct {
+	Files, Dirs, Others  int
+	DataBlobs, TreeBlobs int
+	Bytes                int
+}
+
+// Add adds stats information for node to s.
+func (s *DiffStat) Add(node *restic.Node) {
+	if node == nil {
+		return
+	}
+
+	switch node.Type {
+	case "file":
+		s.Files++
+	case "dir":
+		s.Dirs++
+	default:
+		s.Others++
+	}
+}
+
+// addBlobs adds the blobs of node to s.
+func addBlobs(bs restic.BlobSet, node *restic.Node) {
+	if node == nil {
+		return
+	}
+
+	switch node.Type {
+	case "file":
+		for _, blob := range node.Content {
+			h := restic.BlobHandle{
+				ID:   blob,
+				Type: restic.DataBlob,
+			}
+			bs.Insert(h)
+		}
+	case "dir":
+		h := restic.BlobHandle{
+			ID:   *node.Subtree,
+			Type: restic.TreeBlob,
+		}
+		bs.Insert(h)
+	}
+}
+
+// DiffStats collects the differences between two snapshots.
+type DiffStats struct {
+	ChangedFiles            int
+	Added                   DiffStat
+	Removed                 DiffStat
+	BlobsBefore, BlobsAfter restic.BlobSet
+}
+
+// NewDiffStats creates new stats for a diff run.
+func NewDiffStats() *DiffStats {
+	return &DiffStats{
+		BlobsBefore: restic.NewBlobSet(),
+		BlobsAfter:  restic.NewBlobSet(),
+	}
+}
+
+// updateBlobs updates the blob counters in the stats struct.
+func updateBlobs(repo restic.Repository, blobs restic.BlobSet, stats *DiffStat) {
+	for h := range blobs {
+		switch h.Type {
+		case restic.DataBlob:
+			stats.DataBlobs++
+		case restic.TreeBlob:
+			stats.TreeBlobs++
+		}
+
+		size, err := repo.LookupBlobSize(h.ID, h.Type)
+		if err != nil {
+			Warnf("unable to find blob size for %v: %v\n", h, err)
+			continue
+		}
+
+		stats.Bytes += int(size)
+	}
+}
+
+func (c *Comparer) printDir(ctx context.Context, mode string, stats *DiffStat, blobs restic.BlobSet, prefix string, id restic.ID) error {
+	debug.Log("print %v tree %v", mode, id)
+	tree, err := c.repo.LoadTree(ctx, id)
+	if err != nil {
+		return err
+	}
+
+	for _, node := range tree.Nodes {
+		name := path.Join(prefix, node.Name)
+		if node.Type == "dir" {
+			name += "/"
+		}
+		Printf("%-5s%v\n", mode, name)
+		stats.Add(node)
+		addBlobs(blobs, node)
+
+		if node.Type == "dir" {
+			err := c.printDir(ctx, mode, stats, blobs, name, *node.Subtree)
+			if err != nil {
+				Warnf("error: %v\n", err)
+			}
+		}
+	}
+
+	return nil
+}
+
+func uniqueNodeNames(tree1, tree2 *restic.Tree) (tree1Nodes, tree2Nodes map[string]*restic.Node, uniqueNames []string) {
+	names := make(map[string]struct{})
+	tree1Nodes = make(map[string]*restic.Node)
+	for _, node := range tree1.Nodes {
+		tree1Nodes[node.Name] = node
+		names[node.Name] = struct{}{}
+	}
+
+	tree2Nodes = make(map[string]*restic.Node)
+	for _, node := range tree2.Nodes {
+		tree2Nodes[node.Name] = node
+		names[node.Name] = struct{}{}
+	}
+
+	uniqueNames = make([]string, 0, len(names))
+	for name := range names {
+		uniqueNames = append(uniqueNames, name)
+	}
+
+	sort.Sort(sort.StringSlice(uniqueNames))
+	return tree1Nodes, tree2Nodes, uniqueNames
+}
+
+func (c *Comparer) diffTree(ctx context.Context, stats *DiffStats, prefix string, id1, id2 restic.ID) error {
+	debug.Log("diffing %v to %v", id1, id2)
+	tree1, err := c.repo.LoadTree(ctx, id1)
+	if err != nil {
+		return err
+	}
+
+	tree2, err := c.repo.LoadTree(ctx, id2)
+	if err != nil {
+		return err
+	}
+
+	tree1Nodes, tree2Nodes, names := uniqueNodeNames(tree1, tree2)
+
+	for _, name := range names {
+		node1, t1 := tree1Nodes[name]
+		node2, t2 := tree2Nodes[name]
+
+		addBlobs(stats.BlobsBefore, node1)
+		addBlobs(stats.BlobsAfter, node2)
+
+		switch {
+		case t1 && t2:
+			name := path.Join(prefix, name)
+			mod := ""
+
+			if node1.Type != node2.Type {
+				mod += "T"
+			}
+
+			if node2.Type == "dir" {
+				name += "/"
+			}
+
+			if node1.Type == "file" &&
+				node2.Type == "file" &&
+				!reflect.DeepEqual(node1.Content, node2.Content) {
+				mod += "M"
+				stats.ChangedFiles++
+			} else if c.opts.ShowMetadata && !node1.Equals(*node2) {
+				mod += "U"
+			}
+
+			if mod != "" {
+				Printf("%-5s%v\n", mod, name)
+			}
+
+			if node1.Type == "dir" && node2.Type == "dir" {
+				err := c.diffTree(ctx, stats, name, *node1.Subtree, *node2.Subtree)
+				if err != nil {
+					Warnf("error: %v\n", err)
+				}
+			}
+		case t1 && !t2:
+			prefix := path.Join(prefix, name)
+			if node1.Type == "dir" {
+				prefix += "/"
+			}
+			Printf("%-5s%v\n", "-", prefix)
+			stats.Removed.Add(node1)
+
+			if node1.Type == "dir" {
+				err := c.printDir(ctx, "-", &stats.Removed, stats.BlobsBefore, prefix, *node1.Subtree)
+				if err != nil {
+					Warnf("error: %v\n", err)
+				}
+			}
+		case !t1 && t2:
+			prefix := path.Join(prefix, name)
+			if node2.Type == "dir" {
+				prefix += "/"
+			}
+			Printf("%-5s%v\n", "+", prefix)
+			stats.Added.Add(node2)
+
+			if node2.Type == "dir" {
+				err := c.printDir(ctx, "+", &stats.Added, stats.BlobsAfter, prefix, *node2.Subtree)
+				if err != nil {
+					Warnf("error: %v\n", err)
+				}
+			}
+		}
+	}
+
+	return nil
+}
+
+func runDiff(opts DiffOptions, gopts GlobalOptions, args []string) error {
+	if len(args) != 2 {
+		return errors.Fatalf("specify two snapshot IDs")
+	}
+
+	ctx, cancel := context.WithCancel(gopts.ctx)
+	defer cancel()
+
+	repo, err := OpenRepository(gopts)
+	if err != nil {
+		return err
+	}
+
+	if err = repo.LoadIndex(ctx); err != nil {
+		return err
+	}
+
+	if !gopts.NoLock {
+		lock, err := lockRepo(repo)
+		defer unlockRepo(lock)
+		if err != nil {
+			return err
+		}
+	}
+
+	sn1, err := loadSnapshot(ctx, repo, args[0])
+	if err != nil {
+		return err
+	}
+
+	sn2, err := loadSnapshot(ctx, repo, args[1])
+	if err != nil {
+		return err
+	}
+
+	Verbosef("comparing snapshot %v to %v:\n\n", sn1.ID().Str(), sn2.ID().Str())
+
+	if sn1.Tree == nil {
+		return errors.Errorf("snapshot %v has nil tree", sn1.ID().Str())
+	}
+
+	if sn2.Tree == nil {
+		return errors.Errorf("snapshot %v has nil tree", sn2.ID().Str())
+	}
+
+	c := &Comparer{
+		repo: repo,
+		opts: diffOptions,
+	}
+
+	stats := NewDiffStats()
+
+	err = c.diffTree(ctx, stats, "/", *sn1.Tree, *sn2.Tree)
+	if err != nil {
+		return err
+	}
+
+	both := stats.BlobsBefore.Intersect(stats.BlobsAfter)
+	updateBlobs(repo, stats.BlobsBefore.Sub(both), &stats.Removed)
+	updateBlobs(repo, stats.BlobsAfter.Sub(both), &stats.Added)
+
+	Printf("\n")
+	Printf("Files:       %5d new, %5d removed, %5d changed\n", stats.Added.Files, stats.Removed.Files, stats.ChangedFiles)
+	Printf("Dirs:        %5d new, %5d removed\n", stats.Added.Dirs, stats.Removed.Dirs)
+	Printf("Others:      %5d new, %5d removed\n", stats.Added.Others, stats.Removed.Others)
+	Printf("Data Blobs:  %5d new, %5d removed\n", stats.Added.DataBlobs, stats.Removed.DataBlobs)
+	Printf("Tree Blobs:  %5d new, %5d removed\n", stats.Added.TreeBlobs, stats.Removed.TreeBlobs)
+	Printf("  Added:   %-5s\n", formatBytes(uint64(stats.Added.Bytes)))
+	Printf("  Removed: %-5s\n", formatBytes(uint64(stats.Removed.Bytes)))
+
+	return nil
+}

cmd/restic/cmd_dump.go

@@ -0,0 +1,181 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/restic/restic/internal/debug"
+	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
+
+	"github.com/spf13/cobra"
+)
+
+var cmdDump = &cobra.Command{
+	Use:   "dump [flags] snapshotID file",
+	Short: "Print a backed-up file to stdout",
+	Long: `
+The "dump" command extracts a single file from a snapshot from the repository and
+prints its contents to stdout.
+
+The special snapshot "latest" can be used to use the latest snapshot in the
+repository.
+`,
+	DisableAutoGenTag: true,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return runDump(dumpOptions, globalOptions, args)
+	},
+}
+
+// DumpOptions collects all options for the dump command.
+type DumpOptions struct {
+	Host  string
+	Paths []string
+	Tags  restic.TagLists
+}
+
+var dumpOptions DumpOptions
+
+func init() {
+	cmdRoot.AddCommand(cmdDump)
+
+	flags := cmdDump.Flags()
+	flags.StringVarP(&dumpOptions.Host, "host", "H", "", `only consider snapshots for this host when the snapshot ID is "latest"`)
+	flags.Var(&dumpOptions.Tags, "tag", "only consider snapshots which include this `taglist` for snapshot ID \"latest\"")
+	flags.StringArrayVar(&dumpOptions.Paths, "path", nil, "only consider snapshots which include this (absolute) `path` for snapshot ID \"latest\"")
+}
+
+func splitPath(path string) []string {
+	d, f := filepath.Split(path)
+	if d == "" || d == "/" {
+		return []string{f}
+	}
+	s := splitPath(filepath.Clean(d))
+	return append(s, f)
+}
+
+func dumpNode(ctx context.Context, repo restic.Repository, node *restic.Node) error {
+	var buf []byte
+	for _, id := range node.Content {
+		size, err := repo.LookupBlobSize(id, restic.DataBlob)
+		if err != nil {
+			return err
+		}
+
+		buf = buf[:cap(buf)]
+		if len(buf) < restic.CiphertextLength(int(size)) {
+			buf = restic.NewBlobBuffer(int(size))
+		}
+
+		n, err := repo.LoadBlob(ctx, restic.DataBlob, id, buf)
+		if err != nil {
+			return err
+		}
+		buf = buf[:n]
+
+		_, err = os.Stdout.Write(buf)
+		if err != nil {
+			return errors.Wrap(err, "Write")
+		}
+	}
+	return nil
+}
+
+func printFromTree(ctx context.Context, tree *restic.Tree, repo restic.Repository, prefix string, pathComponents []string) error {
+	if tree == nil {
+		return fmt.Errorf("called with a nil tree")
+	}
+	if repo == nil {
+		return fmt.Errorf("called with a nil repository")
+	}
+	l := len(pathComponents)
+	if l == 0 {
+		return fmt.Errorf("empty path components")
+	}
+	item := filepath.Join(prefix, pathComponents[0])
+	for _, node := range tree.Nodes {
+		if node.Name == pathComponents[0] {
+			switch {
+			case l == 1 && node.Type == "file":
+				return dumpNode(ctx, repo, node)
+			case l > 1 && node.Type == "dir":
+				subtree, err := repo.LoadTree(ctx, *node.Subtree)
+				if err != nil {
+					return errors.Wrapf(err, "cannot load subtree for %q", item)
+				}
+				return printFromTree(ctx, subtree, repo, item, pathComponents[1:])
+			case l > 1:
+				return fmt.Errorf("%q should be a dir, but s a %q", item, node.Type)
+			case node.Type != "file":
+				return fmt.Errorf("%q should be a file, but is a %q", item, node.Type)
+			}
+		}
+	}
+	return fmt.Errorf("path %q not found in snapshot", item)
+}
+
+func runDump(opts DumpOptions, gopts GlobalOptions, args []string) error {
+	ctx := gopts.ctx
+
+	if len(args) != 2 {
+		return errors.Fatal("no file and no snapshot ID specified")
+	}
+
+	snapshotIDString := args[0]
+	pathToPrint := args[1]
+
+	debug.Log("dump file %q from %q", pathToPrint, snapshotIDString)
+
+	splittedPath := splitPath(pathToPrint)
+
+	repo, err := OpenRepository(gopts)
+	if err != nil {
+		return err
+	}
+
+	if !gopts.NoLock {
+		lock, err := lockRepo(repo)
+		defer unlockRepo(lock)
+		if err != nil {
+			return err
+		}
+	}
+
+	err = repo.LoadIndex(ctx)
+	if err != nil {
+		return err
+	}
+
+	var id restic.ID
+
+	if snapshotIDString == "latest" {
+		id, err = restic.FindLatestSnapshot(ctx, repo, opts.Paths, opts.Tags, opts.Host)
+		if err != nil {
+			Exitf(1, "latest snapshot for criteria not found: %v Paths:%v Host:%v", err, opts.Paths, opts.Host)
+		}
+	} else {
+		id, err = restic.FindSnapshot(repo, snapshotIDString)
+		if err != nil {
+			Exitf(1, "invalid id %q: %v", snapshotIDString, err)
+		}
+	}
+
+	sn, err := restic.LoadSnapshot(gopts.ctx, repo, id)
+	if err != nil {
+		Exitf(2, "loading snapshot %q failed: %v", snapshotIDString, err)
+	}
+
+	tree, err := repo.LoadTree(ctx, *sn.Tree)
+	if err != nil {
+		Exitf(2, "loading tree for snapshot %q failed: %v", snapshotIDString, err)
+	}
+
+	err = printFromTree(ctx, tree, repo, "", splittedPath)
+	if err != nil {
+		Exitf(2, "cannot dump file: %v", err)
+	}
+
+	return nil
+}

cmd/restic/cmd_find.go

@@ -0,0 +1,305 @@
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/spf13/cobra"
+
+	"github.com/restic/restic/internal/debug"
+	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
+)
+
+var cmdFind = &cobra.Command{
+	Use:   "find [flags] PATTERN",
+	Short: "Find a file or directory",
+	Long: `
+The "find" command searches for files or directories in snapshots stored in the
+repo. `,
+	DisableAutoGenTag: true,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return runFind(findOptions, globalOptions, args)
+	},
+}
+
+// FindOptions bundles all options for the find command.
+type FindOptions struct {
+	Oldest          string
+	Newest          string
+	Snapshots       []string
+	CaseInsensitive bool
+	ListLong        bool
+	Host            string
+	Paths           []string
+	Tags            restic.TagLists
+}
+
+var findOptions FindOptions
+
+func init() {
+	cmdRoot.AddCommand(cmdFind)
+
+	f := cmdFind.Flags()
+	f.StringVarP(&findOptions.Oldest, "oldest", "O", "", "oldest modification date/time")
+	f.StringVarP(&findOptions.Newest, "newest", "N", "", "newest modification date/time")
+	f.StringArrayVarP(&findOptions.Snapshots, "snapshot", "s", nil, "snapshot `id` to search in (can be given multiple times)")
+	f.BoolVarP(&findOptions.CaseInsensitive, "ignore-case", "i", false, "ignore case for pattern")
+	f.BoolVarP(&findOptions.ListLong, "long", "l", false, "use a long listing format showing size and mode")
+
+	f.StringVarP(&findOptions.Host, "host", "H", "", "only consider snapshots for this `host`, when no snapshot ID is given")
+	f.Var(&findOptions.Tags, "tag", "only consider snapshots which include this `taglist`, when no snapshot-ID is given")
+	f.StringArrayVar(&findOptions.Paths, "path", nil, "only consider snapshots which include this (absolute) `path`, when no snapshot-ID is given")
+}
+
+type findPattern struct {
+	oldest, newest time.Time
+	pattern        string
+	ignoreCase     bool
+}
+
+var timeFormats = []string{
+	"2006-01-02",
+	"2006-01-02 15:04",
+	"2006-01-02 15:04:05",
+	"2006-01-02 15:04:05 -0700",
+	"2006-01-02 15:04:05 MST",
+	"02.01.2006",
+	"02.01.2006 15:04",
+	"02.01.2006 15:04:05",
+	"02.01.2006 15:04:05 -0700",
+	"02.01.2006 15:04:05 MST",
+	"Mon Jan 2 15:04:05 -0700 MST 2006",
+}
+
+func parseTime(str string) (time.Time, error) {
+	for _, fmt := range timeFormats {
+		if t, err := time.ParseInLocation(fmt, str, time.Local); err == nil {
+			return t, nil
+		}
+	}
+
+	return time.Time{}, errors.Fatalf("unable to parse time: %q", str)
+}
+
+type statefulOutput struct {
+	ListLong bool
+	JSON     bool
+	inuse    bool
+	newsn    *restic.Snapshot
+	oldsn    *restic.Snapshot
+	hits     int
+}
+
+func (s *statefulOutput) PrintJSON(prefix string, node *restic.Node) {
+	type findNode restic.Node
+	b, err := json.Marshal(struct {
+		// Add these attributes
+		Path        string `json:"path,omitempty"`
+		Permissions string `json:"permissions,omitempty"`
+
+		*findNode
+
+		// Make the following attributes disappear
+		Name               byte `json:"name,omitempty"`
+		Inode              byte `json:"inode,omitempty"`
+		ExtendedAttributes byte `json:"extended_attributes,omitempty"`
+		Device             byte `json:"device,omitempty"`
+		Content            byte `json:"content,omitempty"`
+		Subtree            byte `json:"subtree,omitempty"`
+	}{
+		Path:        filepath.Join(prefix, node.Name),
+		Permissions: node.Mode.String(),
+		findNode:    (*findNode)(node),
+	})
+	if err != nil {
+		Warnf("Marshall failed: %v\n", err)
+		return
+	}
+	if !s.inuse {
+		Printf("[")
+		s.inuse = true
+	}
+	if s.newsn != s.oldsn {
+		if s.oldsn != nil {
+			Printf("],\"hits\":%d,\"snapshot\":%q},", s.hits, s.oldsn.ID())
+		}
+		Printf(`{"matches":[`)
+		s.oldsn = s.newsn
+		s.hits = 0
+	}
+	if s.hits > 0 {
+		Printf(",")
+	}
+	Printf(string(b))
+	s.hits++
+}
+
+func (s *statefulOutput) PrintNormal(prefix string, node *restic.Node) {
+	if s.newsn != s.oldsn {
+		if s.oldsn != nil {
+			Verbosef("\n")
+		}
+		s.oldsn = s.newsn
+		Verbosef("Found matching entries in snapshot %s\n", s.oldsn.ID())
+	}
+	Printf(formatNode(prefix, node, s.ListLong) + "\n")
+}
+
+func (s *statefulOutput) Print(prefix string, node *restic.Node) {
+	if s.JSON {
+		s.PrintJSON(prefix, node)
+	} else {
+		s.PrintNormal(prefix, node)
+	}
+}
+
+func (s *statefulOutput) Finish() {
+	if s.JSON {
+		// do some finishing up
+		if s.oldsn != nil {
+			Printf("],\"hits\":%d,\"snapshot\":%q}", s.hits, s.oldsn.ID())
+		}
+		if s.inuse {
+			Printf("]\n")
+		} else {
+			Printf("[]\n")
+		}
+		return
+	}
+}
+
+// Finder bundles information needed to find a file or directory.
+type Finder struct {
+	repo     restic.Repository
+	pat      findPattern
+	out      statefulOutput
+	notfound restic.IDSet
+}
+
+func (f *Finder) findInTree(ctx context.Context, treeID restic.ID, prefix string) error {
+	if f.notfound.Has(treeID) {
+		debug.Log("%v skipping tree %v, has already been checked", prefix, treeID.Str())
+		return nil
+	}
+
+	debug.Log("%v checking tree %v\n", prefix, treeID.Str())
+
+	tree, err := f.repo.LoadTree(ctx, treeID)
+	if err != nil {
+		return err
+	}
+
+	var found bool
+	for _, node := range tree.Nodes {
+		debug.Log("  testing entry %q\n", node.Name)
+
+		name := node.Name
+		if f.pat.ignoreCase {
+			name = strings.ToLower(name)
+		}
+
+		m, err := filepath.Match(f.pat.pattern, name)
+		if err != nil {
+			return err
+		}
+
+		if m {
+			if !f.pat.oldest.IsZero() && node.ModTime.Before(f.pat.oldest) {
+				debug.Log("    ModTime is older than %s\n", f.pat.oldest)
+				continue
+			}
+
+			if !f.pat.newest.IsZero() && node.ModTime.After(f.pat.newest) {
+				debug.Log("    ModTime is newer than %s\n", f.pat.newest)
+				continue
+			}
+
+			debug.Log("    found match\n")
+			found = true
+			f.out.Print(prefix, node)
+		}
+
+		if node.Type == "dir" {
+			if err := f.findInTree(ctx, *node.Subtree, filepath.Join(prefix, node.Name)); err != nil {
+				return err
+			}
+		}
+	}
+
+	if !found {
+		f.notfound.Insert(treeID)
+	}
+
+	return nil
+}
+
+func (f *Finder) findInSnapshot(ctx context.Context, sn *restic.Snapshot) error {
+	debug.Log("searching in snapshot %s\n  for entries within [%s %s]", sn.ID(), f.pat.oldest, f.pat.newest)
+
+	f.out.newsn = sn
+	return f.findInTree(ctx, *sn.Tree, string(filepath.Separator))
+}
+
+func runFind(opts FindOptions, gopts GlobalOptions, args []string) error {
+	if len(args) != 1 {
+		return errors.Fatal("wrong number of arguments")
+	}
+
+	var err error
+	pat := findPattern{pattern: args[0]}
+	if opts.CaseInsensitive {
+		pat.pattern = strings.ToLower(pat.pattern)
+		pat.ignoreCase = true
+	}
+
+	if opts.Oldest != "" {
+		if pat.oldest, err = parseTime(opts.Oldest); err != nil {
+			return err
+		}
+	}
+
+	if opts.Newest != "" {
+		if pat.newest, err = parseTime(opts.Newest); err != nil {
+			return err
+		}
+	}
+
+	repo, err := OpenRepository(gopts)
+	if err != nil {
+		return err
+	}
+
+	if !gopts.NoLock {
+		lock, err := lockRepo(repo)
+		defer unlockRepo(lock)
+		if err != nil {
+			return err
+		}
+	}
+
+	if err = repo.LoadIndex(gopts.ctx); err != nil {
+		return err
+	}
+
+	ctx, cancel := context.WithCancel(gopts.ctx)
+	defer cancel()
+
+	f := &Finder{
+		repo:     repo,
+		pat:      pat,
+		out:      statefulOutput{ListLong: opts.ListLong, JSON: globalOptions.JSON},
+		notfound: restic.NewIDSet(),
+	}
+	for sn := range FindFilteredSnapshots(ctx, repo, opts.Host, opts.Tags, opts.Paths, opts.Snapshots) {
+		if err = f.findInSnapshot(ctx, sn); err != nil {
+			return err
+		}
+	}
+	f.out.Finish()
+
+	return nil
+}

cmd/restic/cmd_forget.go

@@ -0,0 +1,242 @@
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"sort"
+	"strings"
+
+	"github.com/restic/restic/internal/errors"
+	"github.com/restic/restic/internal/restic"
+	"github.com/spf13/cobra"
+)
+
+var cmdForget = &cobra.Command{
+	Use:   "forget [flags] [snapshot ID] [...]",
+	Short: "Remove snapshots from the repository",
+	Long: `
+The "forget" command removes snapshots according to a policy. Please note that
+this command really only deletes the snapshot object in the repository, which
+is a reference to data stored there. In order to remove this (now unreferenced)
+data after 'forget' was run successfully, see the 'prune' command. `,
+	DisableAutoGenTag: true,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return runForget(forgetOptions, globalOptions, args)
+	},
+}
+
+// ForgetOptions collects all options for the forget command.
+type ForgetOptions struct {
+	Last     int
+	Hourly   int
+	Daily    int
+	Weekly   int
+	Monthly  int
+	Yearly   int
+	KeepTags restic.TagLists
+
+	Host    string
+	Tags    restic.TagLists
+	Paths   []string
+	Compact bool
+
+	// Grouping
+	GroupBy string
+	DryRun  bool
+	Prune   bool
+}
+
+var forgetOptions ForgetOptions
+
+func init() {
+	cmdRoot.AddCommand(cmdForget)
+
+	f := cmdForget.Flags()
+	f.IntVarP(&forgetOptions.Last, "keep-last", "l", 0, "keep the last `n` snapshots")
+	f.IntVarP(&forgetOptions.Hourly, "keep-hourly", "H", 0, "keep the last `n` hourly snapshots")
+	f.IntVarP(&forgetOptions.Daily, "keep-daily", "d", 0, "keep the last `n` daily snapshots")
+	f.IntVarP(&forgetOptions.Weekly, "keep-weekly", "w", 0, "keep the last `n` weekly snapshots")
+	f.IntVarP(&forgetOptions.Monthly, "keep-monthly", "m", 0, "keep the last `n` monthly snapshots")
+	f.IntVarP(&forgetOptions.Yearly, "keep-yearly", "y", 0, "keep the last `n` yearly snapshots")
+
+	f.Var(&forgetOptions.KeepTags, "keep-tag", "keep snapshots with this `taglist` (can be specified multiple times)")
+	// Sadly the commonly used shortcut `H` is already used.
+	f.StringVar(&forgetOptions.Host, "host", "", "only consider snapshots with the given `host`")
+	// Deprecated since 2017-03-07.
+	f.StringVar(&forgetOptions.Host, "hostname", "", "only consider snapshots with the given `hostname` (deprecated)")
+	f.Var(&forgetOptions.Tags, "tag", "only consider snapshots which include this `taglist` in the format `tag[,tag,...]` (can be specified multiple times)")
+	f.StringArrayVar(&forgetOptions.Paths, "path", nil, "only consider snapshots which include this (absolute) `path` (can be specified multiple times)")
+	f.BoolVarP(&forgetOptions.Compact, "compact", "c", false, "use compact format")
+
+	f.StringVarP(&forgetOptions.GroupBy, "group-by", "g", "host,paths", "string for grouping snapshots by host,paths,tags")
+	f.BoolVarP(&forgetOptions.DryRun, "dry-run", "n", false, "do not delete anything, just print what would be done")
+	f.BoolVar(&forgetOptions.Prune, "prune", false, "automatically run the 'prune' command if snapshots have been removed")
+
+	f.SortFlags = false
+}
+
+func runForget(opts ForgetOptions, gopts GlobalOptions, args []string) error {
+	repo, err := OpenRepository(gopts)
+	if err != nil {
+		return err
+	}
+
+	lock, err := lockRepoExclusive(repo)
+	defer unlockRepo(lock)
+	if err != nil {
+		return err
+	}
+
+	// group by hostname and dirs
+	type key struct {
+		Hostname string
+		Paths    []string
+		Tags     []string
+	}
+	snapshotGroups := make(map[string]restic.Snapshots)
+
+	var GroupByTag bool
+	var GroupByHost bool
+	var GroupByPath bool
+	var GroupOptionList []string
+
+	GroupOptionList = strings.Split(opts.GroupBy, ",")
+
+	for _, option := range GroupOptionList {
+		switch option {
+		case "host":
+			GroupByHost = true
+		case "paths":
+			GroupByPath = true
+		case "tags":
+			GroupByTag = true
+		case "":
+		default:
+			return errors.Fatal("unknown grouping option: '" + option + "'")
+		}
+	}
+
+	removeSnapshots := 0
+
+	ctx, cancel := context.WithCancel(gopts.ctx)
+	defer cancel()
+	for sn := range FindFilteredSnapshots(ctx, repo, opts.Host, opts.Tags, opts.Paths, args) {
+		if len(args) > 0 {
+			// When explicit snapshots args are given, remove them immediately.
+			if !opts.DryRun {
+				h := restic.Handle{Type: restic.SnapshotFile, Name: sn.ID().String()}
+				if err = repo.Backend().Remove(gopts.ctx, h); err != nil {
+					return err
+				}
+				Verbosef("removed snapshot %v\n", sn.ID().Str())
+				removeSnapshots++
+			} else {
+				Verbosef("would have removed snapshot %v\n", sn.ID().Str())
+			}
+		} else {
+			// Determining grouping-keys
+			var tags []string
+			var hostname string
+			var paths []string
+
+			if GroupByTag {
+				tags = sn.Tags
+				sort.StringSlice(tags).Sort()
+			}
+			if GroupByHost {
+				hostname = sn.Hostname
+			}
+			if GroupByPath {
+				paths = sn.Paths
+			}
+
+			sort.StringSlice(sn.Paths).Sort()
+			var k []byte
+			var err error
+
+			k, err = json.Marshal(key{Tags: tags, Hostname: hostname, Paths: paths})
+
+			if err != nil {
+				return err
+			}
+			snapshotGroups[string(k)] = append(snapshotGroups[string(k)], sn)
+		}
+	}
+	if len(args) > 0 {
+		return nil
+	}
+
+	policy := restic.ExpirePolicy{
+		Last:    opts.Last,
+		Hourly:  opts.Hourly,
+		Daily:   opts.Daily,
+		Weekly:  opts.Weekly,
+		Monthly: opts.Monthly,
+		Yearly:  opts.Yearly,
+		Tags:    opts.KeepTags,
+	}
+
+	if policy.Empty() {
+		Verbosef("no policy was specified, no snapshots will be removed\n")
+		return nil
+	}
+
+	for k, snapshotGroup := range snapshotGroups {
+		var key key
+		if json.Unmarshal([]byte(k), &key) != nil {
+			return err
+		}
+
+		// Info
+		Verbosef("snapshots")
+		var infoStrings []string
+		if GroupByTag {
+			infoStrings = append(infoStrings, "tags ["+strings.Join(key.Tags, ", ")+"]")
+		}
+		if GroupByHost {
+			infoStrings = append(infoStrings, "host ["+key.Hostname+"]")
+		}
+		if GroupByPath {
+			infoStrings = append(infoStrings, "paths ["+strings.Join(key.Paths, ", ")+"]")
+		}
+		if infoStrings != nil {
+			Verbosef(" for (" + strings.Join(infoStrings, ", ") + ")")
+		}
+		Verbosef(":\n\n")
+
+		keep, remove := restic.ApplyPolicy(snapshotGroup, policy)
+
+		if len(keep) != 0 && !gopts.Quiet {
+			Printf("keep %d snapshots:\n", len(keep))
+			PrintSnapshots(globalOptions.stdout, keep, opts.Compact)
+			Printf("\n")
+		}
+
+		if len(remove) != 0 && !gopts.Quiet {
+			Printf("remove %d snapshots:\n", len(remove))
+			PrintSnapshots(globalOptions.stdout, remove, opts.Compact)
+			Printf("\n")
+		}
+
+		removeSnapshots += len(remove)
+
+		if !opts.DryRun {
+			for _, sn := range remove {
+				h := restic.Handle{Type: restic.SnapshotFile, Name: sn.ID().String()}
+				err = repo.Backend().Remove(gopts.ctx, h)
+				if err != nil {
+					return err
+				}
+			}
+		}
+	}
+
+	if removeSnapshots > 0 && opts.Prune {
+		Verbosef("%d snapshots have been removed, running prune\n", removeSnapshots)
+		if !opts.DryRun {
+			return pruneRepository(gopts, repo)
+		}
+	}
+
+	return nil
+}

cmd/restic/cmd_generate.go

@@ -0,0 +1,94 @@
+package main
+
+import (
+	"time"
+
+	"github.com/restic/restic/internal/errors"
+	"github.com/spf13/cobra"
+	"github.com/spf13/cobra/doc"
+)
+
+var cmdGenerate = &cobra.Command{
+	Use:   "generate [command]",
+	Short: "Generate manual pages and auto-completion files (bash, zsh)",
+	Long: `
+The "generate" command writes automatically generated files like the man pages
+and the auto-completion files for bash and zsh).
+`,
+	DisableAutoGenTag: true,
+	RunE:              runGenerate,
+}
+
+type generateOptions struct {
+	ManDir             string
+	BashCompletionFile string
+	ZSHCompletionFile  string
+}
+
+var genOpts generateOptions
+
+func init() {
+	cmdRoot.AddCommand(cmdGenerate)
+	fs := cmdGenerate.Flags()
+	fs.StringVar(&genOpts.ManDir, "man", "", "write man pages to `directory`")
+	fs.StringVar(&genOpts.BashCompletionFile, "bash-completion", "", "write bash completion `file`")
+	fs.StringVar(&genOpts.ZSHCompletionFile, "zsh-completion", "", "write zsh completion `file`")
+}
+
+func writeManpages(dir string) error {
+	// use a fixed date for the man pages so that generating them is deterministic
+	date, err := time.Parse("Jan 2006", "Jan 2017")
+	if err != nil {
+		return err
+	}
+
+	header := &doc.GenManHeader{
+		Title:   "restic backup",
+		Section: "1",
+		Source:  "generated by `restic generate`",
+		Date:    &date,
+	}
+
+	Verbosef("writing man pages to directory %v\n", dir)
+	return doc.GenManTree(cmdRoot, header, dir)
+}
+
+func writeBashCompletion(file string) error {
+	Verbosef("writing bash completion file to %v\n", file)
+	return cmdRoot.GenBashCompletionFile(file)
+}
+
+func writeZSHCompletion(file string) error {
+	Verbosef("writing zsh completion file to %v\n", file)
+	return cmdRoot.GenZshCompletionFile(file)
+}
+
+func runGenerate(cmd *cobra.Command, args []string) error {
+	if genOpts.ManDir != "" {
+		err := writeManpages(genOpts.ManDir)
+		if err != nil {
+			return err
+		}
+	}
+
+	if genOpts.BashCompletionFile != "" {
+		err := writeBashCompletion(genOpts.BashCompletionFile)
+		if err != nil {
+			return err
+		}
+	}
+
+	if genOpts.ZSHCompletionFile != "" {
+		err := writeZSHCompletion(genOpts.ZSHCompletionFile)
+		if err != nil {
+			return err
+		}
+	}
+
+	var empty generateOptions
+	if genOpts == empty {
+		return errors.Fatal("nothing to do, please specify at least one output file/dir")
+	}
+
+	return nil
+}