TW
ceaa7e9210
Merge pull request #3883 from saurvs/prune_forwardport
...
borg prune: improve progress display (fwd port to master)
2018-06-09 22:39:03 +02:00
Thomas Waldmann
c454bf6fa6
borg prune: improve progress display
...
the old progress output was kind of broken:
Archiver() did output some progress when add_item was called.
Archive.delete() did output progress for a single archive deletion
but what we really want is a overall progress indication, advancing
the progress for each deleted archive.
(cherry picked from commit 529bbfdeca
2018-06-08 15:08:30 +05:30
TW
a6c3168006
Merge pull request #3882 from ThomasWaldmann/vagrant-fixes-master
...
vagrantfile fixes (fwd port to master)
2018-06-08 09:11:53 +02:00
Thomas Waldmann
7e59a6c229
vagrantfile fixes (fwd port to master)
2018-06-08 09:01:25 +02:00
Rémi Oudin
73410861ae
borg config --list <repo>, fixes #3612
...
Add --list option to dump the repo configuration / the default values.
Also: fixes argument order in borg config tests
2018-06-08 08:26:32 +02:00
TW
c97006ecf2
Merge pull request #3863 from saurvs/doc
...
Clarify --append-only flag
2018-05-28 01:47:13 +02:00
Saurav Sachidanand
5225dbfc4e
Clarify --append-only flag
2018-05-27 19:56:57 +05:30
TW
ac7fd2cbe9
Merge pull request #3861 from ThomasWaldmann/delete-dry-run-master
...
borg delete improvements (fwd port to master)
2018-05-27 16:23:46 +02:00
TW
c6a12dc686
Merge pull request #3860 from saurvs/master
...
Update docs on deleting multiple archives
2018-05-27 16:20:48 +02:00
TW
ecba3517fa
Merge pull request #3862 from ThomasWaldmann/fix-pypi-desc-master
...
fix package long description, fixes #3854
2018-05-27 12:22:25 +02:00
Saurav Sachidanand
b3c1104760
Update docs on deleting multiple archives
2018-05-27 09:38:23 +05:30
Thomas Waldmann
89c7093048
fix package long description, fixes #3854
...
(cherry picked from commit a318c3bb66
2018-05-26 23:30:21 +02:00
Thomas Waldmann
0377fb38fd
fixup: output stats in dry-run mode
...
it will just show nothing was deleted, but one sees how it would look
like.
this is also for consistency with borg prune --dry-run --stats, which
behaves the same.
(cherry picked from commit 857c5635dd
2018-05-26 23:23:24 +02:00
Thomas Waldmann
7ed377679b
borg delete: implement --dry-run, fixes #3822
...
(cherry picked from commit ec4ccc0b6b
2018-05-26 23:23:16 +02:00
Thomas Waldmann
3dfee5d71c
borg delete: only commit once, fixes #3823
...
borg delete was slower than required when it deleted multiple archives
as it committed repo and cache once per archive.
borg prune (doing a similar job) is faster as it commits only once for
all deleted archives.
borg delete now also only commits once and also (similar to borg prune)
only outputs a overall statistics for all deleted archives.
log output of borg delete was made similar to borg prune.
(cherry picked from commit a88a3153ad
2018-05-26 23:23:06 +02:00
TW
3931340baa
Merge pull request #3857 from milkey-mouse/fp-3776
...
docs: fix and deduplicate encryption quickstart docs (forward-port)
2018-05-24 00:50:54 +02:00
TW
485368d50d
docs: fix and deduplicate encryption quickstart docs ( #3776 )
...
docs: fix and deduplicate encryption quickstart docs
just refer to "borg init" docs rather than duplicating it in quickstart.
also: s/archive/repository/
2018-05-23 14:17:01 -07:00
TW
ce069035ce
Merge pull request #3849 from ThomasWaldmann/hashindex-debug-print
...
add debug_print macro for hashindex debugging, see #3807
2018-05-19 22:58:23 +02:00
Thomas Waldmann
ce4d248e0b
add debug_print macro for hashindex debugging, see #3807
2018-05-19 22:26:56 +02:00
TW
491d69a5d6
Merge pull request #3848 from ThomasWaldmann/manifest-rebuild-progress-master
...
borg check: show progress while rebuilding missing manifest, fixes #3787
2018-05-19 22:08:01 +02:00
Thomas Waldmann
e064fcd99b
borg check: show progress while rebuilding missing manifest, fixes #3787
...
(cherry picked from commit 85bc590c75
2018-05-19 01:28:55 +02:00
TW
036b501d82
Merge pull request #3847 from ThomasWaldmann/config-repo-without-key--master
...
Config repo without key (fwd port to master)
2018-05-19 01:05:20 +02:00
TW
6290f44425
Merge pull request #3844 from ThomasWaldmann/more-check-output-master
...
More check output (fwd port to master)
2018-05-19 00:47:35 +02:00
TW
e67b3ec96f
Merge pull request #3846 from ThomasWaldmann/dump-objs-no-manifest-master
...
debug dump-repo-objs should not depend on a manifest obj (fwd port to master)
2018-05-19 00:05:16 +02:00
TW
ae2077e883
Merge pull request #3845 from ThomasWaldmann/zstd-update-master
...
Zstd update (fwd port to master)
2018-05-18 23:49:28 +02:00
TW
02fef39e60
Merge pull request #3843 from ThomasWaldmann/fuse-options-master
...
Fuse options (fwd port to master)
2018-05-18 23:11:20 +02:00
Thomas Waldmann
6783894ff3
fix borg config --cache (make sure cache gets closed via try/finally)
...
(cherry picked from commit 322b442641
2018-05-18 22:40:42 +02:00
Thomas Waldmann
0405c1a1bb
fix borg config --cache (minimal change)
...
this was broken by previous changeset.
now doing just a minimal change for better diff display,
see also next commit.
(cherry picked from commit 697bb36402
2018-05-18 22:40:33 +02:00
Thomas Waldmann
219fce3fe8
borg config repo ... does not need cache/manifest/key, fixes #3802
...
thus, we should not use the with_repository decorator to set up
the cache / key / manifest.
this enables running borg config on the repo without the key / key
passphrase (the config itself is in plaintext).
(cherry picked from commit d593d17562
2018-05-18 22:40:24 +02:00
Thomas Waldmann
0874bcbbf1
debug dump-repo-objs should not depend on a manifest obj
...
thus, we should not use the with_repository decorator to set up
the key as it uses Manifest.load() to set up the key.
if the Manifest is lost, that does not work.
but we can use some arbitrary object to set up the key, so just
do that.
(cherry picked from commit 2e1f2e84d7
2018-05-18 22:35:23 +02:00
Thomas Waldmann
d2884d3317
temporarily prefer bundled zstd to test it
...
(cherry picked from commit 6a6ad89f5b
2018-05-18 22:30:38 +02:00
Thomas Waldmann
3d3154fd49
update bundled zstd to 1.3.4, fixes #3745
...
(cherry picked from commit d4d5f0c447
2018-05-18 22:29:55 +02:00
Thomas Waldmann
7792cec03a
borg check: fixup for "deleting orphaned objs" msgs, fixes #3795
...
only output msgs if there is actually something to delete.
be more precise, show count of orphaned / superseded objects.
(cherry picked from commit d671e9acf2
2018-05-18 22:05:38 +02:00
Thomas Waldmann
be4fdee3ae
more borg check --repair output
...
(cherry picked from commit e6e1d18f9a
2018-05-18 22:03:03 +02:00
TW
ea7c543471
Merge pull request #3840 from ThomasWaldmann/env-cleanup-uname-master
...
sysinfo() related forward ports (master)
2018-05-18 21:58:19 +02:00
TW
da8eb379ff
Merge pull request #3842 from ThomasWaldmann/msgpack-requirement-master
...
update msgpack requirement, fixes #3753 (master)
2018-05-18 21:57:48 +02:00
Thomas Waldmann
cd70192bea
borg mount: support umask= mount option
...
(cherry picked from commit eb61c2153b
2018-05-18 21:56:37 +02:00
Thomas Waldmann
c7d12e3fc0
borg mount: support uid= and gid= mount options
...
also: refactor popping an option, converting an options value
(cherry picked from commit f993f0fd49
2018-05-18 21:43:10 +02:00
TW
e4f9c870d0
Merge pull request #3841 from ThomasWaldmann/vagrant-changes-master
...
Vagrant changes (master)
2018-05-18 19:56:56 +02:00
TW
ff522ae9c9
Merge pull request #3839 from ThomasWaldmann/include-coveragerc-master
...
include .coveragerc, needed by tox.ini
2018-05-18 19:42:10 +02:00
Thomas Waldmann
2c47b4596f
update msgpack requirement, fixes #3753
...
(cherry picked from commit 5be756a0c6
2018-05-18 19:30:24 +02:00
Thomas Waldmann
4e5a30189b
vagrant: use "vagrant" as username for new xenial box
2018-05-18 19:24:14 +02:00
Thomas Waldmann
798cbf7a66
vagrant: suppress any error msgs from __pycache__/.tox cleanup
2018-05-18 19:20:57 +02:00
Thomas Waldmann
4cffed8334
vagrant: update to Python 3.6.5 (for binary builds)
2018-05-18 19:18:15 +02:00
TW
6ffb0e1a33
Merge pull request #3836 from ThomasWaldmann/fix-3808-master
...
xattrs: fix borg exception handling on ENOSPC error, fixes #3808
2018-05-18 19:00:59 +02:00
Thomas Waldmann
d94bd22740
BORG_SHOW_SYSINFO=no to hide system information from exceptions
...
Can be used:
- in case of troubles with the sysinfo code
- by borg backup providers who do not want to show system information
(cherry picked from commit 64aaec6628
2018-05-18 18:49:56 +02:00
Thomas Waldmann
30bd78f266
remove platform.uname() call, fixes #3732
...
also: add exception handler around deprecated platform.linux_distribution() call.
(cherry picked from commit 1e94211bf54f45eb660a
2018-05-18 18:38:21 +02:00
Thomas Waldmann
c2b0c7c483
include .coveragerc, needed by tox.ini
...
I noticed that archlinux has an identical coveragerc and wondered why.
Then noticed that our tox.ini (which we bundle into the pypi package)
needs .coveragerc, but we did not bundle it until now.
(cherry picked from commit c79156caf5
2018-05-18 17:52:32 +02:00
Thomas Waldmann
1ee4397c1c
xattrs: fix borg exception handling on ENOSPC error, fixes #3808
...
(cherry picked from commit 959beb867b
2018-05-18 17:27:51 +02:00
TW
b2a42bd674
Merge pull request #3819 from ThomasWaldmann/fix-travis-osx-master
...
travis OS X: use xcode 8.3 (not broken)
2018-05-15 23:38:45 +02:00
