1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 09:47:58 +00:00
Commit graph

3370 commits

Author SHA1 Message Date
Thomas Waldmann
f10700841f add comment about requiring llfuse, fixes #1726 2016-10-19 00:56:22 +02:00
TW
64d128cf22 Merge pull request #1712 from ThomasWaldmann/mount-some
borg mount --first / --last / --sort / --prefix, fixes #1542
2016-10-18 01:22:10 +02:00
TW
ca357a2b38 Merge pull request #1736 from ThomasWaldmann/vagrant-rsync-no-chown
vagrant: no chown when rsyncing
2016-10-17 21:02:22 +02:00
Thomas Waldmann
57402b120b vagrant: no chown when rsyncing
it tries to do chown -R vagrant.vagrant, but some boxes do not
have a vagrant group and break there. also, we do our own chown
in the provisioning scripts.
2016-10-17 17:37:33 +02:00
TW
cf9e7adb9f Merge pull request #1733 from ThomasWaldmann/update-usage
Update usage.rst / api.rst
2016-10-17 04:13:22 +02:00
Thomas Waldmann
3550b24ed9 ran build_usage 2016-10-17 03:59:47 +02:00
Thomas Waldmann
b3133f6394 update api.rst 2016-10-17 03:58:22 +02:00
TW
dc596e8cfb Merge pull request #1731 from ThomasWaldmann/update-1.0-changes
update 1.0-maint CHANGES
2016-10-17 03:53:16 +02:00
Thomas Waldmann
4d7af95ad2 update 1.0 CHANGES 2016-10-17 03:50:47 +02:00
TW
6de09859e0 Merge pull request #1732 from ThomasWaldmann/debug-obj-refcount
add borg debug refcount-obj ID subcommand
2016-10-17 03:46:10 +02:00
Thomas Waldmann
498e71846c add borg debug refcount-obj ID subcommand 2016-10-17 03:19:43 +02:00
TW
48bcd2aa9a Merge pull request #1730 from ThomasWaldmann/fix-vagrant-netbsd
vagrant / netbsd: use own box, fixes #1671, fixes #1728
2016-10-17 02:04:41 +02:00
Thomas Waldmann
63ff002b19 vagrant / netbsd: use own box, fixes #1671, fixes #1728
self-made basic netbsd box includes pre-installed rsync as vagrant is unable to install rsync.
delete line from tox.ini with sed so it does not try to install llfuse (which is broken on netbsd).
2016-10-17 02:03:52 +02:00
enkore
1166ade6ed Merge pull request #1685 from enkore/f/remote-excs
fix debug get-obj / delete-obj crash if object not found and remote repo
2016-10-15 21:30:47 +02:00
TW
274d891f14 Merge pull request #1724 from ThomasWaldmann/fix-vagrant-openbsd
vagrant / openbsd: use own box, fixes #1695
2016-10-15 17:07:40 +02:00
Thomas Waldmann
4ca0ed150b vagrant / openbsd: use own box, fixes #1695
self-made basic openbsd box includes pre-installed rsync as vagrant is unable to install rsync.
as the self-made box now has enough space on /, remove workaround for low space.
delete line from tox.ini with sed so it does not try to install llfuse (which is broken on openbsd).
2016-10-15 15:21:38 +02:00
TW
00f1dcf366 Merge pull request #1711 from ThomasWaldmann/ssh-url-relative-path
implement /./relpath hack
2016-10-15 01:27:36 +02:00
Thomas Waldmann
5a12c6377a fuse mount options: add tests 2016-10-15 01:24:05 +02:00
Thomas Waldmann
b5f9858055 move first/last/sort_by-multiple functionality into Manifest.list
also: rename list_filtered to list_considering
2016-10-15 01:04:56 +02:00
Thomas Waldmann
694c3978a1 refactor Archiver._get_filtered_archives -> Archives.list_filtered
it did not belong into Archiver class (did not use "self"), but in into Archives.
2016-10-15 01:03:16 +02:00
Thomas Waldmann
26e6ac4fea borg mount --first / --last / --sort / --prefix, fixes #1542
also: use consider_part_files when dealing with multiple archives / whole repo mount
2016-10-15 01:03:16 +02:00
Thomas Waldmann
e829e8372d implement /./relpath hack, fixes #1655 2016-10-15 00:57:27 +02:00
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