mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity
3,632 Commits 9 Branches 137 Tags 57 MiB
Commit Graph

369 Commits

Author SHA1 Message Date
Marian Beermann 1fabb2df58 key export: center QR code on the page 2017-02-13 21:24:33 +01:00
Marian Beermann 04bd6fb013 add test for export key --qr-html 2017-02-13 21:24:33 +01:00
Benedikt Heine 2cdb583879 clearify doc for same filesystems 
# Conflicts:
#	src/borg/archiver.py

Original-Commit: d3a2f36b03
 2017-02-13 21:24:33 +01:00
Martin Hostettler 179f1bc147 Add qr html export mode to `key export` command 2017-02-13 21:24:33 +01:00
Martin Hostettler 32e73e8c7e Manifest: Make sure manifest timestamp is strictly monotonically increasing. 
Computer clocks are often not set very accurately set, but borg
assumes manifest timestamps are never going back in time.

Ensure that this is actually the case.

# Conflicts:
#	src/borg/helpers.py

Original-Commit: 6b8cf0a
 2017-02-13 20:43:57 +01:00
Marian Beermann e4486cd370 fix rST warning in Repository.scan 2017-02-12 18:51:41 +01:00
Marian Beermann 15dfaae223 docs: create: move --exclude note to main doc 2017-02-12 15:28:59 +01:00
Marian Beermann 0710bbd40e docs: create: move item flags to main doc 2017-02-12 15:28:58 +01:00
Marian Beermann 497da8df04 docs: init: fix markup/typos 2017-02-12 15:27:06 +01:00
Martin Hostettler e8335dba0f archiver: Add 'debug dump-manifest' and 'debug dump-archive' commands. 2017-02-10 22:56:54 +01:00
Marian Beermann 7e486074e8 docs: list: don't print key listings in fat (html + man) 2017-02-05 15:46:46 +01:00
Marian Beermann c7106e756e create real nice man pages 2017-02-05 15:46:09 +01:00
Marian Beermann 5bc03cc042 migrate-to-repokey: ask using canonical_path() as we do everywhere else 2017-02-04 15:16:18 +01:00
Marian Beermann 4e0422cdf0 Move change-passphrase to the "key" group (but leave old name, too) 2017-02-04 15:10:45 +01:00
Marian Beermann 5fe32866e6 Move migrate-to-repokey to the "key" command group 2017-02-04 15:10:45 +01:00
TW c6ea34be96 Merge pull request #2111 from ThomasWaldmann/merge-1.0-maint 
Merge 1.0-maint
 2017-02-01 12:13:37 +01:00
enkore f52bf883c3 Merge pull request #2010 from costela/master 
change dir_is_tagged to use os.path.exists()
 2017-02-01 00:53:36 +01:00
Radu Ciorba a85cf75465 fix wrong skip_hint on hashindex_set when encountering tombstones 
hashindex_lookup would always hint at skipping whatever it's probe
length had been with no regard for tombstones it had encountered. This
meant new keys would not overwrite first tombstones, but would always
land on empty buckets.

The regression was introduced in #1748
 2017-01-30 23:29:08 +02:00
Thomas Waldmann 7f2a108c94 fixup: do not access os.POSIX_FADV_* early 
before we know posix_fadvise support exists on the platform.
 2017-01-30 03:11:42 +01:00
Leo Antunes dd6b90fe6c change dir_is_tagged to use os.path.exists() 
Add --keep-exclude-tags option as alias to --keep-tag-files and
deprecate the later. Also make tagging accept directories as tags,
allowing things like `--exclude-if-present .git`.

fixes #1999
 2017-01-29 18:13:51 +01:00
Thomas Waldmann c0dc644ef6 Merge branch '1.0-maint' into merge-1.0-maint 
# Conflicts:
#	MANIFEST.in
#	Vagrantfile
#	docs/changes.rst
#	docs/usage/mount.rst.inc
#	src/borg/archiver.py
#	src/borg/fuse.py
#	src/borg/repository.py
 2017-01-29 05:49:53 +01:00
Thomas Waldmann e0dfb656ee fix crc32 compilation issues on wheezy 
moving the declaration / assignment from the middle of the function to the beginning.
 2017-01-15 15:09:40 +01:00
Thomas Waldmann 740312f725 Merge branch '1.0-maint' into merge-1.0-maint 
# Conflicts:
#	requirements.d/development.txt
#	tox.ini
 2017-01-15 01:15:04 +01:00
TW abfcf9955b Merge pull request #2045 from ThomasWaldmann/fix-platform 
posix platform module: only build / import on non-win32 platforms
 2017-01-14 16:06:28 +01:00
Marian Beermann ae0f1422bf crc: openbsd has no Intel intrinsics 2017-01-14 15:24:03 +01:00
Thomas Waldmann e4c5db4efc posix platform module: only build / import on non-win32 platforms, fixes #2041 
rather use a inverted check like "not windows".
also: add a base implementation for this stuff, just raising NotImplementedError
 2017-01-14 14:48:49 +01:00
Thomas Waldmann ededb6f2c8 fix crc32 compile error, fixes #2039 2017-01-14 05:06:15 +01:00
Thomas Waldmann e431d60cc5 merge 1.0-maint into master 
# Conflicts:
#	src/borg/crypto.pyx
#	src/borg/hashindex.pyx
#	src/borg/helpers.py
#	src/borg/platform/__init__.py
#	src/borg/platform/darwin.pyx
#	src/borg/platform/freebsd.pyx
#	src/borg/platform/linux.pyx
#	src/borg/remote.py
 2017-01-14 03:07:11 +01:00
Marian Beermann 5cc292c52c fix performance regression in "borg info ::archive" 2017-01-13 15:33:38 +01:00
Marian Beermann f482c32423 crc32: sb8: remove some unneeded stuff, use hashindex byteorder detection 2017-01-13 00:33:34 +01:00
Marian Beermann 292fb1e2a9 crc: disable nice CLMUL version due to clang bugs. 2017-01-12 21:30:37 +01:00
Marian Beermann 7923088ff9 check: pick better insufficent archives matched warning from TW's merge 2017-01-12 17:04:51 +01:00
Marian Beermann 1d40675ce4 merge fixup 2017-01-12 15:04:57 +01:00
Marian Beermann ecad0ed53a Merge branch '1.0-maint' into merge/1.0-maint 
# Conflicts: ... everywhere ...
#	.travis.yml
#	Vagrantfile
#	borg/testsuite/key.py
#	docs/changes.rst
#	docs/quickstart.rst
#	docs/usage.rst
#	docs/usage/upgrade.rst.inc
#	src/borg/archive.py
#	src/borg/archiver.py
#	src/borg/crypto.pyx
#	src/borg/helpers.py
#	src/borg/key.py
#	src/borg/remote.py
#	src/borg/repository.py
#	src/borg/testsuite/archive.py
#	src/borg/testsuite/archiver.py
#	src/borg/testsuite/crypto.py
#	src/borg/testsuite/helpers.py
#	src/borg/testsuite/repository.py
#	src/borg/upgrader.py
#	tox.ini
 2017-01-12 15:01:41 +01:00
enkore 07049098ee Merge pull request #2014 from enkore/f/hostname->fqdn 
posix: use fully-qualified hostname + node ID
 2017-01-12 02:07:08 +01:00
enkore ded22d3650 Merge pull request #1927 from ThomasWaldmann/blake2b-mac-key-length 
demonstrate mac key length issue
 2017-01-12 01:21:13 +01:00
Marian Beermann 81bd55eec3 key testsuite: update blake2 test data to include padded keys 2017-01-12 01:05:59 +01:00
Marian Beermann b9770c348f posix: use fully-qualified hostname + node ID 
The node ID is usually the 48 bit MAC of the primary network
interface.
 2017-01-12 00:54:17 +01:00
enkore 902c423086 Merge pull request #1970 from enkore/f/dbg-speed 
fast crc
 2017-01-02 16:11:11 +01:00
Marian Beermann 56818d1db8 Credit the excellent work of these people in AUTHORS 2017-01-02 15:54:14 +01:00
Marian Beermann 9afebead84 two fast CRC implementations 
CRC slice by 8 for generic CPUs outperforms zlib CRC32 on ppc
and x86 (ARM untested but expected to as well).

PCLMULQDQ derived from Intel's zlib patches outperforms every other
CRC implementation by a huge margin.
 2017-01-02 15:54:14 +01:00
enkore cf19db466d Merge pull request #1989 from Abogical/master 
Happy new year!
 2017-01-01 01:14:08 +01:00
Abogical f043b966da It's 2017 2016-12-31 16:53:30 +02:00
Thomas Waldmann 7d48878cfe borg init --encryption - remove default 
use --encryption=repokey for all the tests except if they
have special needs.
 2016-12-24 02:53:44 +01:00
enkore a4eef67e3b Merge pull request #1912 from Abogical/prune-progress 
Add prune progress display
 2016-12-22 14:57:26 +01:00
Marian Beermann 742bfa33c4 flake8 2016-12-21 00:36:31 +01:00
Marian Beermann f9aefd6a68 Merge commit '343387b36ef' into merge/1.0-maint 
# Conflicts:
#	src/borg/archiver.py
 2016-12-20 23:00:28 +01:00
Marian Beermann df40b3840c upgrade: --disable-tam 
# Conflicts:
#	src/borg/helpers.py
#	src/borg/testsuite/archiver.py
 2016-12-20 22:53:57 +01:00
Marian Beermann c7c8c0fb57 init: explain manifest auth compatibility 
# Conflicts:
#	src/borg/archiver.py
 2016-12-20 22:53:55 +01:00
Marian Beermann d15fb241bd check: handle duplicate archive items neatly 
# Conflicts:
#	src/borg/archive.py
 2016-12-20 22:53:55 +01:00