mirror
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Releases Wiki Activity
2,796 Commits 7 Branches 49 Tags 76 MiB
Commit Graph

2796 Commits

Author SHA1 Message Date
Alexander Neumann 951a34dcbf Add entry to CHANGELOG 2017-09-11 19:02:36 +02:00
Alexander Neumann 36eaa22ed0 Merge pull request #1205 from mungomat/backup_time 
Backup time
 2017-09-11 19:01:41 +02:00
Alexander Neumann 62df316356 Merge pull request #1194 from mungomat/bugfix_bucker_always 
fix: bucker
 2017-09-11 19:01:23 +02:00
Alexander Neumann 9fa909ccd6 Update golden files 2017-09-11 17:52:22 +02:00
Alexander Neumann b1af544b1d Merge pull request #1224 from restic/improve-exclude-caches 
Allow multiple exclude-if-present
 2017-09-11 17:31:24 +02:00
Alexander Neumann 8e5b1e6f2f Add --group-by to manual 2017-09-10 21:00:51 +02:00
Alexander Neumann 257a454515 Add entry to CHANGELOG 2017-09-10 20:55:02 +02:00
Alexander Neumann b6aeea425b Merge pull request #1196 from mungomat/forget_groupByTagsOnly 
forget: group-by-tags-only
 2017-09-10 20:52:15 +02:00
Alexander Neumann c8e05d1f2a Add entry to CHANGELOG 2017-09-10 20:29:08 +02:00
Alexander Neumann a8aa4eb06c Rename parameter filename -> path 2017-09-10 20:28:21 +02:00
Alexander Neumann c1a02cc081 Merge pull request #1228 from restic/fix-1204-3 
Always use long name for keys
 2017-09-10 19:39:23 +02:00
Alexander Neumann e66adc42da Always use long name for keys 
Otherwise the code panics if a file with a short name is tried.
 2017-09-10 15:35:10 +02:00
Alexander Neumann 89938bc21c Update manual pages 2017-09-10 15:33:20 +02:00
Alexander Neumann 0b2947dedb Add test for rejectByPattern 2017-09-10 15:31:58 +02:00
Alexander Neumann 47ddd34266 Improve test 2017-09-10 15:20:41 +02:00
Alexander Neumann 2fdca5d310 Improve debug message 2017-09-10 15:16:05 +02:00
Alexander Neumann e5d4e33509 Improve error message if no targets specified 2017-09-10 15:14:11 +02:00
Alexander Neumann e117f613af Move device test into new RejectFunc 2017-09-10 15:13:40 +02:00
Alexander Neumann 0dfdf02885 Rework pattern excludes 2017-09-10 14:34:28 +02:00
Alexander Neumann 4a0129fc2b Rename excludeByFile -> rejectIfPresent 2017-09-10 14:25:58 +02:00
Alexander Neumann a9c705009c Move reject functions to new file 2017-09-10 14:25:25 +02:00
Alexander Neumann d937ad8cf6 Rename FilenameCheck to RejectFunc 
We already have the opposite: pipe.SelectFunc(item string, fi
os.FileInfo) bool, so RejectFunc is a good name.
 2017-09-10 14:21:51 +02:00
Alexander Neumann 1a08a8219f Merge pull request #1227 from restic/fix-1204-2 
Handle invalid key file
 2017-09-10 14:12:51 +02:00
Tobias Klein 9924c311c9 added test cases 2017-09-10 12:23:28 +02:00
Alexander Neumann e846e14965 Ignore files with invalid name in the repo 2017-09-10 11:00:07 +02:00
Alexander Neumann 36e70228f2 Handle invalid key file 2017-09-10 10:55:01 +02:00
Tobias Klein a677f1139a removed unnacessary line 2017-09-10 10:41:07 +02:00
Alexander Neumann 6f8eba9c28 Merge pull request #1222 from damiencourousse/manual-typo-fix 
manual: typo fix
 2017-09-09 21:40:00 +02:00
Alexander Neumann c22c582546 Allow multiple exclude-if-present 2017-09-09 21:24:29 +02:00
Alexander Neumann ea75509d6e Print warning for non-existing items 2017-09-09 21:12:41 +02:00
Tobias Klein ed30bd7b76 gofmt 2017-09-09 18:19:19 +02:00
Damien Couroussé 7090c5ceeb manual: typo fix 2017-09-09 16:58:17 +02:00
Tobias Klein bee09c1a0f test 2017-09-09 16:33:51 +02:00
Tobias Klein 8f9ef4402b error in case of unknown grouping option 2017-09-09 15:55:37 +02:00
Tobias Klein f26c0cb70f testcase updated 2017-09-09 15:33:12 +02:00
Tobias Klein 81d7ecba2b manual updated 2017-09-09 13:26:35 +02:00
Tobias Klein 087c3fe1dc tests updated 2017-09-09 13:26:35 +02:00
Tobias Klein 43ff971dfd new sub-option for backup: time 
New option to specify the timestamp for a backup
 2017-09-09 13:26:35 +02:00
Alexander Neumann 5c75a98053 Merge pull request #1220 from restic/fix-1204 
Fix panic when file name is too short
 2017-09-09 11:49:23 +02:00
Alexander Neumann 7ce47402fb Merge pull request #1170 from fawick/exclude_caches 
Add option to exclude contents of cache directories
 2017-09-09 10:56:12 +02:00
Alexander Neumann 1e48141648 Fix panic when file name is too short 
Closes #1204
 2017-09-09 10:50:32 +02:00
Fabian Wickborn dbda892542 Add option to exclude directories with a tagfile 
The option is named --exclude-if-present and accepts a parameter
filename[:content]. Directories are excluded and their contents is not
backed up if they contain a file with the specified name and,
optionally, that starts with the specified content. The tagfile itself
is never excluded.

There is also a shortcut --exclude-caches that works in the same way as
the likewise-named option of tar(1): Directories are recognized as cache
if they contain a file named "CACHEDIR.TAG.

Closes #317.
 2017-09-09 09:57:42 +02:00
Alexander Neumann b46774be21 Merge pull request #1214 from ricardoseriani/fix-manual.rst-key-remove 
Fix manual.rst to use key remove instead of key rm
 2017-09-07 21:16:46 +02:00
Tobias Klein 1073bfba37 flexible grouping option for the forget-command 2017-09-06 20:14:18 +02:00
Alexander Neumann 5dfb4d1195 Merge pull request #1209 from restic/handle-colliding-names 
Resolve name collisions
 2017-09-05 22:33:32 +02:00
Alexander Neumann 0a2219c5f7 Travis: Reduce workload by removing Go tip 2017-09-05 22:08:23 +02:00
Alexander Neumann ff3149831e Merge pull request #1210 from prattmic/glob_test 
filter: document recursive wildcards
 2017-09-05 21:50:27 +02:00
Alexander Neumann c935d0558c Add entry to CHANGELOG 2017-09-05 21:48:13 +02:00
Alexander Neumann 83eb075e3a Resolve name collisions 
At the moment when two items to be saved have the same directory name,
restic only saves the first one to the repo. Let's say we have a
structure like this:

    dir1
    └── subdir
        └── file
    dir2
    └── subdir
        └── file

When restic is run on `dir1/subdir` and `dir2/subdir`, it will only save
the first `subdir`:

    $ restic backup dir1/subdir dir2/subdir
    [...]

    $ restic ls -l latest
    drwxr-xr-x  1000   100      0 2017-08-27 20:56:39 /subdir
    -rw-r--r--  1000   100     17 2017-08-27 20:56:39 /subdir/file

That's obviously a bad thing, caused by an early decision to strip the
full path to the files/dirs to save and only leave the last directory.

This commit partly resolves this by handling colliding names and
resolving the conflicts. Restic will now append a counter to the file
(`-123`) until the conflict is resolved. So in the example above, we'll
end up with the following structure:

    $ restic ls -l latest
    drwxr-xr-x  1000   100      0 2017-08-27 20:56:39 /subdir
    -rw-r--r--  1000   100     17 2017-08-27 20:56:39 /subdir/file
    drwxr-xr-x  1000   100      0 2017-08-27 20:56:46 /subdir-1
    -rw-r--r--  1000   100     17 2017-08-27 20:56:46 /subdir-1/file

This partly addresses #549 and closes #1179.

At first I thought that the obvious correction would be to archive the
full path. But it turns out that collisions may still occur: Suppose you
have a file named `foo` in the current directory, and the parent directory
also contains a file `foo`. Archiving these with restic also causes a
collision, since restic strips the `../` from the first file:

    $ restic backup ../foo foo

This also happens with `tar`, which does not handle the collision and
will happily archive two files called `foo`.

So, the best way forward is to handle name collisions and archive the
whole path. The latter will be tackled in a separate PR.
 2017-09-05 21:47:02 +02:00
Ricardo Seriani 204c2bf09c Fix manual to use key remove instead of key rm 2017-09-05 16:22:42 -03:00