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

3097 Commits

Author SHA1 Message Date
TW 913809689c Merge pull request #1722 from ThomasWaldmann/merge-1.0-maint 
Merge 1.0 maint
 2016-10-15 00:44:30 +02:00
Thomas Waldmann 775440fdcc Merge branch '1.0-maint' into merge-1.0-maint 2016-10-15 00:25:41 +02:00
enkore 34bd7cb4e2 Merge pull request #1716 from ThomasWaldmann/merge-1.0-maint 
Merge 1.0-maint
 2016-10-14 21:18:30 +02:00
enkore 12a127ace1 Merge pull request #1719 from ThomasWaldmann/clean_env_10 
Clean env in 1.0
 2016-10-14 10:37:23 +02:00
enkore f81a92bb77 Merge pull request #1718 from ThomasWaldmann/tests-use-temp-nonces-dir 
point XDG_*_HOME to temp dirs for tests, fixes #1714
 2016-10-14 10:35:30 +02:00
enkore 757e0380f7 Merge pull request #1717 from ThomasWaldmann/travis-py36 
travis: use 3.6-dev
 2016-10-14 10:31:37 +02:00
Thomas Waldmann 2b27a06595 use monkeypatch to set env vars 
but only on pytest based tests.
 2016-10-14 04:44:06 +02:00
Thomas Waldmann 2679963cb9 add conftest.py hack needed for borg 1.0.x 2016-10-14 04:42:13 +02:00
Thomas Waldmann f3efcdbd2e point XDG_*_HOME to temp dirs for tests, fixes #1714 
otherwise it spoils the user's nonces and cache dirs with lots of files.

also: remove all BORG_* env vars from the outer environment

fix get_*_dir tests to use monkeypatch.
 2016-10-14 00:46:43 +02:00
Thomas Waldmann 4e4847ccce point XDG_*_HOME to temp dirs for tests, fixes #1714 
otherwise it spoils the user's nonces and cache dirs with lots of files.

also: remove all BORG_* env vars from the outer environment
 2016-10-13 23:59:28 +02:00
Thomas Waldmann c9a3a201e5 travis: use 3.6-dev 
nightly points to python 3.7 now.
 2016-10-13 20:02:31 +02:00
Thomas Waldmann b0cc4fd74a Merge branch '1.0-maint' into merge-1.0-maint 2016-10-13 19:10:04 +02:00
enkore dda439be57 Merge pull request #1713 from ThomasWaldmann/fuse_mount-flexibility 
fuse_mount contextmanager: accept any options
 2016-10-13 10:47:13 +02:00
Thomas Waldmann 8d9475f704 fuse_mount contextmanager: accept any options 
not just the -o mount_options, but any options borg mount would take.
simpler, more flexible.
 2016-10-13 03:53:26 +02:00
TW f7d20f8eee Merge pull request #1710 from ThomasWaldmann/path-with-colon 
allow pathes with colons, fixes #1705
 2016-10-13 00:19:52 +02:00
TW a2dfe68609 Merge pull request #1706 from ThomasWaldmann/remove-debug-xxx 
remove debug-xxx commands, fixes #1627
 2016-10-12 23:25:43 +02:00
Thomas Waldmann 546c77f73d ssh:// Location URL - remove not needed # 
nobody could make sense of it, so guess it is a mistake.
 2016-10-12 23:10:38 +02:00
Thomas Waldmann e9ba14c686 Location parsing regexes: use verbose REs 
just added whitespace and comments, no semantic changes
 2016-10-12 23:10:38 +02:00
Thomas Waldmann cf0359eba7 allow pathes with colons, fixes #1705 
also:
- refactor / deduplicate the location parsing regexes
- add comments
- add more tests for Location parsing
 2016-10-12 22:57:23 +02:00
enkore 7a83bea0e8 Merge pull request #1690 from ThomasWaldmann/more-informative-integrityerror 
borg.key: include chunk id in exception msgs
 2016-10-10 11:17:03 +02:00
enkore 9381c38f29 Merge pull request #1703 from ThomasWaldmann/improve-scan 
Repository.scan(): avoid re-reading same repo object headers repeatedly
 2016-10-10 11:16:39 +02:00
enkore 2e5b2b150b Merge pull request #1709 from ThomasWaldmann/fix-1700 
better messages for cache newer than repo, fixes #1700
 2016-10-10 11:15:40 +02:00
enkore 76ade6f9fe Merge pull request #1708 from ThomasWaldmann/commit-previous-location 
update changed repo location immediately after acceptance
 2016-10-10 11:14:40 +02:00
Thomas Waldmann 4fc5a35572 better messages for cache newer than repo, fixes #1700 2016-10-10 06:10:39 +02:00
Thomas Waldmann 9ad9ae8ff0 Repository.scan(): avoid iterating same repo segments/objects repeatedly 
segments: avoid some listdir()
objects: avoid repeatedly re-reading object headers / seeking in segment

Fixes #1610.
 2016-10-10 05:39:38 +02:00
Thomas Waldmann f50068944d update changed repo location immediately after acceptance 
fixes #1524

before, if a longer backup got interrupted before commit(),
it asked same question again.
 2016-10-10 05:18:43 +02:00
Björn Ketelaars a0df60e1b8 FUSE on OpenBSD 
Concerning #1696:

OpenBSD offers in kernel support for FUSE 2.6. Borg relies on llfuse,
which relies on FUSE >2.9.

I'm not aware of plans to bring FUSE on OpenBSD to a more recent
version.

Signed-off-by: Björn Ketelaars <bjorn.ketelaars@hydroxide.nl>
 2016-10-10 01:07:30 +02:00
Thomas Waldmann b88e82d99d remove debug-xxx commands, fixes #1627 
we use "debug xxx" subcommands now. docs updated.

also makes "borg help" shorter as not all debug-xxx commands
show up, but just 1 main "debug" command.
 2016-10-10 00:22:01 +02:00
enkore 8567fcfe58 Merge pull request #1418 from textshell/fix/preload 
Cleanup prefetch code in RemoteRepository
 2016-10-07 09:49:16 +02:00
enkore f355bd2570 Merge pull request #1693 from ThomasWaldmann/improve-diff-help 
clarify borg diff help, fixes #980
 2016-10-07 09:47:43 +02:00
enkore a69e346126 Merge pull request #1692 from ThomasWaldmann/placeholder-for-integrityerror 
IntegrityError: add placeholder for message, fixes #1572
 2016-10-07 09:46:33 +02:00
Thomas Waldmann f31112b975 clarify borg diff help, fixes #980 2016-10-07 04:09:05 +02:00
TW 9db16cf897 Merge pull request #1691 from ThomasWaldmann/vagrant-debian7-image-names 
vagrant: update image name of boxcutter debian7 boxes
 2016-10-06 23:45:32 +02:00
Thomas Waldmann 7434010cdd IntegrityError: add placeholder for message, fixes #1572 
So that the message we give appears not only in the traceback, but also in the (short) error message.
 2016-10-06 23:36:22 +02:00
Thomas Waldmann 75624f8e05 vagrant: update image name of boxcutter debian7 boxes 
debian711* is 404.
 2016-10-06 22:58:02 +02:00
Thomas Waldmann 5f337e2c9c borg.key: include chunk id in exception msgs 
this is a backport of bcdce91dfb2883c139011322a9e8086059fbe5c2 improvements on the exception msgs.
 2016-10-06 22:46:37 +02:00
TW 5ccc124667 Merge pull request #1687 from ThomasWaldmann/backport-bin-to-hex 
backport bin_to_hex and use it
 2016-10-06 22:21:38 +02:00
Martin Hostettler 02557f16b0 RemoteRepository: Rename cache to chunkid_to_msgids. Also fetch_from_cache to pop_preload_msgid. 2016-10-06 20:48:26 +02:00
Martin Hostettler 2608a5620a RemoteRepository: Always store chunk ids in cache instead of rpc argument encoding of get request. 2016-10-06 20:38:46 +02:00
Martin Hostettler e9605d67ad RemoteReposity: prefetch can only be 'get'. 2016-10-06 20:38:46 +02:00
Thomas Waldmann 67aafec195 backport bin_to_hex and use it 
simplifies code and also porting and merging between 1.0 and 1.1/master.
 2016-10-06 05:15:01 +02:00
TW 45a2d8b5c0 Merge pull request #1677 from enkore/pr/1676 
Added docs explaining multiple --restrict-to-path flags, with example…
 2016-10-06 01:48:13 +02:00
Marian Beermann 573cb616d3 deployment: synthesize alternative --restrict-to-path example 2016-10-06 01:00:07 +02:00
TW 1030660e71 Merge pull request #1682 from ThomasWaldmann/repo-list-in-order 
WIP: repo.scan - list keys in disk-order
 2016-10-05 21:00:12 +02:00
Thomas Waldmann cdb8d64fe2 check for index vs. segment files object count mismatch 2016-10-05 17:36:36 +02:00
Thomas Waldmann 6624ca9cdb verify_data: do a linear scan in disk-order 2016-10-05 17:36:36 +02:00
Thomas Waldmann 90111363ba repo.list() yielding IDs in on-disk order 2016-10-05 17:36:36 +02:00
enkore 27bc73c23e borg info <repo>: print general repo information (#1680) 2016-10-03 14:53:16 +02:00
Simon Heath cf1c73b4f9 Added docs explaining multiple --restrict-to-path flags, with example (take 2) 2016-10-03 09:25:48 +02:00
enkore ce72d24825 Clarify FAQ regarding backup of virtual machines (#1672) 2016-10-02 20:11:34 +02:00