upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-04-01 15:15:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
5270 commits 10 branches 151 tags 72 MiB
Commit graph

5270 commits

This branch
This branch
All branches
Author SHA1 Message Date
TW
bf496d5a66
Merge pull request #4615 from ThomasWaldmann/fix-4607-extract-hl-crash-1.1 
extract: fix KeyError for "partial" extraction
 2019-06-10 19:41:33 +02:00
Thomas Waldmann
16f9d45209 extract: fix KeyError for "partial" extraction, fixes #4607 
note that "partial" even applied to giving an always matching condition.

"full" is only assumed if no conditions are given.
 2019-06-10 18:23:28 +02:00
TW
b2ea4e77ee
Merge pull request #4609 from ThomasWaldmann/1.1-fixes 
cosmetic fixes (1.1)
 2019-06-09 14:41:24 +02:00
Thomas Waldmann
f072a3579e remove superfluous whitespace in docs 2019-06-08 17:56:58 +02:00
TW
e6e8f570f4
Merge pull request #4601 from d7415/pattern_example_1.1 
Add example of exclude-norecurse rule in help patterns
 2019-06-03 11:48:05 +02:00
Martin Stone
38d971ac43
Add example of exclude-norecurse rule in help patterns 2019-06-02 20:44:55 +01:00
TW
8e6773265c
Merge pull request #4596 from slokhorst/brew-link-1.1-maint 
docs: update macOS Brew link (1.1-maint)
 2019-05-30 16:10:26 +02:00
Sebastiaan Lokhorst
89d564d427 docs: update macOS Brew link 2019-05-30 09:32:46 +02:00
TW
da28d8e7a3
Merge pull request #4588 from decentral1se/docsfix/point-to-related-software-1.1-maint 
Add note for software for automating backup docs
 2019-05-22 11:25:12 +02:00
Luke Murphy
878edc8d8b
Add note for software for automating backup docs 
Closes https://github.com/borgbackup/borg/issues/4581.
 2019-05-22 11:01:39 +02:00
TW
78cda685f2
Merge pull request #4576 from FelixSchwarz/add-msgpack-to-authors 
AUTHORS: mention copyright+license for bundled msgpack
 2019-05-16 11:48:58 +02:00
Felix Schwarz
fa5590507b AUTHORS: mention copyright+license for bundled msgpack 2019-05-16 11:34:38 +02:00
TW
4984ccd431
Merge pull request #4572 from borgbackup/rel1110 
release 1.1.10
 2019-05-16 05:29:35 +02:00
Thomas Waldmann
aefe327ed0 build_man 2019-05-16 02:37:58 +02:00
Thomas Waldmann
2f1f73c92c build_usage 2019-05-16 02:37:58 +02:00
Thomas Waldmann
d9288797b5 update CHANGES (1.1-maint) 2019-05-16 02:37:58 +02:00
Thomas Waldmann
20d3435e1b vagrant: use python 3.5.7 for build 2019-05-16 02:37:58 +02:00
Thomas Waldmann
c0f879f1d0 upgrade osxfuse from 3.8.2 to 3.8.3 2019-05-16 02:33:47 +02:00
TW
87827b7443
Merge pull request #4567 from ThomasWaldmann/rename-fuse-based-test 
rename fuse based test
 2019-05-16 01:11:19 +02:00
Thomas Waldmann
be16b167ea rename test_mount_hardlinks to test_fuse_mount_hardlinks 
so both can be excluded by "not test_fuse"

(fedora does this for testing)
 2019-05-16 00:17:19 +02:00
TW
ddf615149a
Merge pull request #4560 from ThomasWaldmann/bundle-msgpack 
Bundle msgpack
 2019-05-15 21:16:26 +02:00
TW
0f6aa52106
Merge pull request #4564 from ThomasWaldmann/placeholders-in-comments 
enable placeholder usage at some places
 2019-05-14 21:35:03 +02:00
Thomas Waldmann
7f0e07603e enable placeholder usage in --comment, fixes #4559 2019-05-14 14:51:57 +02:00
Thomas Waldmann
fb05da42cf enable placeholder usage in --glob-archives, fixes #4495 
they are supported for --prefix already, so it totally makes sense to
also support them for the more powerful/generic --glob-archives.
 2019-05-14 14:31:37 +02:00
Thomas Waldmann
fee6b5ded4 add msgpack license to docs/3rd_party/msgpack 2019-05-14 00:23:13 +02:00
Thomas Waldmann
5fa05ffed9 move msgpack hints to helpers.py 
also remove msgpack from install_requires - by default we use the
bundled code now.
 2019-05-14 00:00:47 +02:00
Thomas Waldmann
4d1cacca66 use bundled msgpack (optionally use external msgpack) 
based on a patch by felix schwarz, thanks!

changes after that:

import msgpack from borg.helpers (as master branch does)

there:
- try importing it from borg.algorithms.msgpack bundled code.
- if that does not work, try importing external msgpack.
- if it is desired to import the external msgpack without ripping
  out the bundled code, set prefer_system_msgpack = True.

fix msgpack.fallback reference, fix msgpack import.
 2019-05-13 23:32:11 +02:00
Thomas Waldmann
f9cb04079d setup.py: also build a bundled msgpack 
based on a patch by felix schwarz, thanks!

changes after that:

build msgpack cpp files at release time, do not use cython otherwise.

we want to include .cpp (and .c) files into the sdist, so users
installing the pypi package won't need to have cython installed.

also: python setup.py clean shall also cleanup the *.cpp and binaries
built from that.

.gitignore: ignore generated msgpack .cpp sources
setup.cfg: flake8: ignore 3rd party bundled msgpack source
 2019-05-13 23:29:17 +02:00
Thomas Waldmann
8f271ed7fc git mv _msgpack algorithms/msgpack 
we have all other bundled stuff there already.
 2019-05-13 23:27:18 +02:00
Thomas Waldmann
abda1a4463 patch msgpack to use relative imports 
patch by felix schwarz, thanks!
 2019-05-13 22:49:03 +02:00
Thomas Waldmann
383807aed7 bundle msgpack 0.5.6 "as is" as borg._msgpack 2019-05-13 22:49:03 +02:00
TW
c78c3ff8a4
Merge pull request #4561 from ThomasWaldmann/filter-msgpack-warning 
pure-py msgpack warning shall not make a lot of tests fail, fixes #4558
 2019-05-13 18:21:36 +02:00
Thomas Waldmann
690195a9a3 pure-py msgpack warning shall not make a lot of tests fail, fixes #4558 
if the tests use a pure-python msgpack, 1 test which is specifically
made for that, will fail. esp. for linux distribution packages, this
will still point to the problem (that the msgpack package is not built
or installed correctly).
 2019-05-13 17:10:14 +02:00
TW
3e90eb1d05
Merge pull request #4487 from ThomasWaldmann/nofollow-check 
do not check python/libc for borg serve, fixes #4483
 2019-05-12 19:08:39 +02:00
TW
d34b6a53e2
Merge pull request #4555 from ThomasWaldmann/update-changes-1.1 
Update changes (1.1)
 2019-05-12 19:05:26 +02:00
Thomas Waldmann
aca9855f80 update CHANGES (1.1-maint) 
for 1.1.10 mostly, also adding 1 item that was forgotton for 1.1.9.
 2019-05-12 03:08:50 +02:00
Thomas Waldmann
e0735e5d4f changelog: add 1.1.10 section 2019-05-12 03:03:29 +02:00
TW
d07d51e35e
Merge pull request #4554 from ThomasWaldmann/whitelist-client-options-1.1 
use whitelist approach for borg serve, fixes #4097 (1.1-maint backport)
 2019-05-12 02:53:50 +02:00
TW
7010cda6f6
Merge pull request #4553 from ThomasWaldmann/coverage-warning-1.1 
get rid of confusing coverage warning, fixes #2069 (1.1-maint backport)
 2019-05-11 23:37:30 +02:00
Thomas Waldmann
185282776e use whitelist approach for borg serve, fixes #4097 2019-05-11 23:13:11 +02:00
TW
b033693c9a
Merge pull request #4542 from ThomasWaldmann/fix-extract-hardlinks-1.1 
slave hardlinks extraction issue, see #4350 (1.1-maint)
 2019-05-11 22:15:16 +02:00
Thomas Waldmann
f2d8e3a93a get rid of confusing coverage warning, fixes #2069 2019-05-11 21:35:37 +02:00
TW
8a42028613
Merge pull request #4552 from ThomasWaldmann/upgrade-openbsd-box 
vagrant: upgrade openbsd box to 6.4
 2019-05-11 21:28:16 +02:00
Thomas Waldmann
847cc52209 vagrant: upgrade openbsd box to 6.4 
6.0 went out of support, the ftp server URL we used 404ed and we
already had the 6.4 box for master branch, so just use it for
1.1-maint also.
 2019-05-11 21:27:13 +02:00
Thomas Waldmann
18242ab9e2 preload chunks for hardlink slaves w/o preloaded master, fixes #4350 
also split the hardlink extraction test into 2 tests.

(cherry picked from commit f33f318d81)
 2019-05-06 20:11:18 +02:00
TW
b30eb36333
Merge pull request #4530 from shawnl/forward-port 
2 back ports
 2019-05-01 23:47:05 +02:00
Thomas Waldmann
e886df4cde create: only run stat_simple_attrs() once 
This is a backport of cd4f6b41ca

the second call was done in stat_attrs().

this increases backup with lots of unchanged files performance by ~ 5%.
 2019-04-30 15:28:29 -05:00
user062
133da4dd49 FIX #4373 (Incorrect borg prune --stats output with --dry-run) 
This is a backport of 68aff8b8c4
 2019-04-27 09:05:08 -05:00
TW
3bb9efc784
Merge pull request #4503 from mikenye/1.1-maint 
Add "SSH Configuration" section to "borg serve" (backport from master)
 2019-04-09 11:04:04 +02:00
Mike Nye
016942a222 modified: serve.rst 
Add "SSH Configuration" section to "borg serve" documentation, to outline ssh/sshd configuration to prevent borg serve keeping a lock on a repo in the event the ssh connection is abnormally disconnected.

In response to issues #3988, #636 and #4485 (and probably others).

Backported from master.
 2019-04-09 08:57:38 +08:00