1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 17:57:59 +00:00
Commit graph

4758 commits

Author SHA1 Message Date
Thomas Waldmann
938d122191 docs: fix examples with problematic option placements, fixes #3356
have options to the left OR to the right of all positional arguments,
but not on BOTH sides and not in between them.

(cherry picked from commit f2a1539f25)
2017-11-26 04:03:16 +01:00
TW
26cfaf3681
Merge pull request #3359 from milkey-mouse/borg-config-cmd-bp1.1
Add borg config command (1.1 backport)
2017-11-26 03:56:01 +01:00
Milkey Mouse
5331b378f7
fixup! Add borg config command (fixes #3304)
Don't use list unpacking for function calls in order to support py3.4

Reword basic borg config help

It doesn't edit the repo config, but any borg-related config.
2017-11-25 15:58:08 -08:00
TW
960c78ffea
Merge pull request #3367 from ThomasWaldmann/create-tuning-options-1.1
docs: point out tuning options for borg create, fixes #3239
2017-11-25 15:27:37 +01:00
Thomas Waldmann
3bdf1193ad docs: point out tuning options for borg create, fixes #3239
(cherry picked from commit 520a6a2ef1)
2017-11-25 15:25:15 +01:00
TW
4021423330
Merge pull request #3365 from ThomasWaldmann/update-usage-man-1.1
update usage / man (1.1-maint)
2017-11-25 14:54:12 +01:00
Thomas Waldmann
0340fbe420 build_man (1.1-maint)
also: git add borgfs.1
2017-11-25 14:49:00 +01:00
Thomas Waldmann
7bf838003a build_usage (1.1-maint)
also: git add borgfs.rst.inc
2017-11-25 14:45:28 +01:00
TW
f651e08d45
Merge pull request #3362 from ThomasWaldmann/package-data-1.1
clean up and simplify packaging (1.1-maint)
2017-11-25 14:40:43 +01:00
Thomas Waldmann
13d339bb85 clean up and simplify packaging
1.1.2 was released with a sdist that included quite some files that
did not belong into the package (I tried nuitka at some time).

This was because the old MANIFEST.in / setup.py included all the stuff
in the package dir.

Now, setuptools_scm is to automatically deal with the INCLUDES and
MANIFEST.in only handles the EXCLUDES, so only committed files get
into the sdist (minus some we do not want).

Also, no .c .h .pyx files will be installed - they are not needed as
they have been compiled into binary files.

(cherry picked from commit feb428b4e0)
2017-11-25 13:56:51 +01:00
Milkey Mouse
15d9c94981
Fix borg config flake8 failures
Suppressed E731 so lambdas can be assigned to vars
2017-11-24 16:39:27 -08:00
Milkey Mouse
2ac0bf4980
Add borg config command (fixes #3304)
This command works similarly to "git config" - it parses repo and
cache configs to get, set, and delete values. It only works on local
repos so a malicious client can't e.g. override their storage quota
or reset the append_only flag.

Add tests for borg config

Add documentation for borg config

Change manual config edits -> borg config

There were a couple places in the documentation where it was advised
to edit the repository or cache config file, a process that is stream-
lined by borg config.
2017-11-24 16:38:56 -08:00
TW
0a5d17018e
Merge pull request #3354 from ThomasWaldmann/mount-options-1.1
borg mount options (1.1 backport)
2017-11-24 16:57:22 +01:00
Thomas Waldmann
47d16e0f62 borg mount: support --consider-part-files correctly, fixes #3347
(cherry picked from commit caece370b8)
2017-11-24 01:45:42 +01:00
Thomas Waldmann
0e07647576 borg mount: support hardlinks correctly, add tests
previous commit did not yet support hardlinks correctly, if the
hardlink master was excluded somehow.

added some tests for this, also refactored related tests slightly.

(cherry picked from commit e97deafb16)
2017-11-24 00:30:28 +01:00
TW
6fb5f989a9
Merge pull request #3353 from milkey-mouse/document-ntfsclone-bp1.1
Add instructions for using ntfsclone (1.1 backport)
2017-11-24 00:25:16 +01:00
Thomas Waldmann
52410b6976 borg mount: support exclusion group options and paths, fixes #2138
borg mount [options] repo_or_archive mountpoint path [paths...]

paths: you can just give some "root paths" (like for borg extract) to
only partially populate the FUSE filesystem.

Similar for these exclusion group options:
--exclude
--exclude-from
--pattern
--patterns-from
--strip-components

(cherry picked from commit 77df1cfe8c)
2017-11-24 00:09:08 +01:00
Milkey Mouse
46698bde6e
Move image backup-related FAQ entries to a new page 2017-11-23 15:06:23 -08:00
Milkey Mouse
f9ed3b3ed7
Add instructions for zerofree 2017-11-23 15:05:22 -08:00
Milkey Mouse
454317dc02
Add instructions for ntfsclone (fixes #81) 2017-11-23 15:05:17 -08:00
TW
babdef574c
Merge pull request #3351 from milkey-mouse/fewer-not-less-bp1.1
Correct usage of "fewer" in place of "less" (1.1 backport)
2017-11-23 13:52:22 +01:00
TW
df709a7678
Merge pull request #3350 from milkey-mouse/list-format-aliases-bp1.1
Clarify key aliases for borg list --format (1.1 backport)
2017-11-23 13:44:08 +01:00
Tom Denley
8fb8692d42
Correct usage of "fewer" in place of "less" 2017-11-22 21:52:41 -08:00
Milkey Mouse
4dab6d29d8
Clarify key aliases for borg list --format (fixes #3111) 2017-11-22 21:18:21 -08:00
TW
b1f9bca8b9
Merge pull request #3343 from milkey-mouse/repo-replay-message-bp1.1
Highlight that information is obtained from security dir (1.1 backport)
2017-11-20 23:22:29 +01:00
TW
78189ed613
Merge pull request #3342 from milkey-mouse/document-sshfs-stupidity-bp1.1
Document sshfs rename workaround (1.1 backport)
2017-11-20 23:21:02 +01:00
TW
96b6033f29
Merge pull request #3341 from milkey-mouse/break-lock-interrupt-bp1.1
Mention break-lock in checkpointing FAQ entry (1.1 backport)
2017-11-20 23:19:23 +01:00
TW
0f59e53554
Merge pull request #3344 from milkey-mouse/faq-remove-bp1.1
add FAQ about removing old files and policies (1.1 backport)
2017-11-20 23:16:58 +01:00
Antoine Beaupré
8735e17575
add FAQ about removing old files and policies
This has been asked twice already this year:

https://mail.python.org/pipermail/borgbackup/2017q3/000796.html
https://mail.python.org/pipermail/borgbackup/2017q4/000891.html

... and I was asked again privately today, so this qualifies as FAQ to
me.
2017-11-20 13:52:09 -08:00
Aidan Woods
7fa5561cbc
Highlight that information is obtained from security dir
(deleting the cache will not bypass this error in the
event the user knows this is a legitimate repo).
2017-11-20 13:10:59 -08:00
Milkey Mouse
ebecd8bd73
Document sshfs rename workaround (fixes #3315) 2017-11-20 13:03:12 -08:00
Milkey Mouse
fda9b7d5b9
Mention break-lock in checkpointing FAQ entry (fixes #3328) 2017-11-20 12:35:14 -08:00
TW
3a8b5c7510
Merge pull request #3322 from ThomasWaldmann/crc32-unaligned-1.1
crc32: deal with unaligned buffer, tests, fixes #3317
2017-11-14 18:59:16 +01:00
Thomas Waldmann
3d3f3500f9 crc32: deal with unaligned buffer, tests, fixes #3317
fixing only the (generic) slice-by-8 crc32 implementation,
it is assumed that CPUs supporting CLMUL can also efficiently
and correctly deal with unaligned accesses.

slice-by-8 is used e.g. on ARM cpus and they might not (efficiently)
support unaligned memory access, leading to bus errors or low
performance.

(cherry picked from commit f9cd6f7512)
2017-11-14 15:33:28 +01:00
TW
9f9cb88a01
Merge pull request #3311 from milkey-mouse/borgfs-man-bp1.1
Generate usage & man page for borgfs (1.1-maint)
2017-11-14 00:28:59 +01:00
TW
b1ac8f0fa3
Merge pull request #3321 from smammy/3272-birthtime-1.1
Backport birthtime patch to 1.1-maint branch.
2017-11-14 00:22:37 +01:00
Sam H
e51cf43142 include item birthtime in archive (where available) (#3313)
include item birthtime in archive, fixes #3272

* use `safe_ns` when reading birthtime into attributes
* proper order for `birthtime` in `ITEM_KEYS` list
* use `bigint` wrapper for consistency
* Add tests to verify that birthtime is normally preserved, but not preserved when `--nobirthtime` is passed to `borg create`.
2017-11-13 14:18:59 -05:00
Milkey Mouse
0ec703ff40
Check borgfs man formatting in tests
I only realized after the first PR was merged that the code used for
finding which man pages to generate was duplicated in the testsuite
(since setup.py can't import from the installed module and vice versa.)
These are essentially the same changes as made to setup.py in #3290.
2017-11-12 18:38:51 -08:00
Milkey Mouse
eadb74eb6f
Generate man page for borgfs (fixes #3216) 2017-11-12 15:06:08 -08:00
Milkey Mouse
18b934496c
Don't show sub-command in borgfs help (fixes #3287) 2017-11-12 15:06:07 -08:00
TW
1201b62e2b
Merge pull request #3308 from milkey-mouse/no-dry-stats-bp1.1
Show an error when --dry-run & --stats are both used (1.1-maint)
2017-11-12 12:40:46 +01:00
TW
089b38b8e0
Merge pull request #3309 from milkey-mouse/key-export-docs-bp1.1
Clarify encryption of key for borg key export (1.1-maint)
2017-11-12 12:39:53 +01:00
TW
3d2f2b8a39
Merge pull request #3310 from milkey-mouse/clarify-duration-bp1.1
Clarify create --stats duration vs. wall time (1.1-maint)
2017-11-12 12:39:23 +01:00
Milkey Mouse
e20b1ebbc4
Clarify create --stats duration vs. wall time (fixes #3301) 2017-11-10 11:51:16 -08:00
Milkey Mouse
68bb3792fb
Clarify encrypted key format for borg key export (fixes #3296) 2017-11-10 11:48:17 -08:00
Milkey Mouse
31031e9578
Show an error when --dry-run & --stats are both used (fixes #3298) 2017-11-10 11:44:48 -08:00
TW
66d5e7d208
Merge pull request #3294 from ThomasWaldmann/release-checklist-1.1
update release checklist about security fixes
2017-11-06 10:47:23 +01:00
Thomas Waldmann
07f36542a6 update release checklist about security fixes
(cherry picked from commit 818b61935b)
2017-11-06 10:42:28 +01:00
TW
49c93043f3
Merge pull request #3291 from borgbackup/rel112
release 1.1.2
2017-11-06 01:10:07 +01:00
Thomas Waldmann
ce7936b608 vagrant: use https pypi url for wheezy
http url stopped working
2017-11-05 23:52:15 +01:00