1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-25 17:27:31 +00:00
Commit graph

3848 commits

Author SHA1 Message Date
enkore
7255e3b298 Merge pull request #2387 from enkore/f/placeholders-internals
placeholders: deny access to internals and other unspecified stuff
2017-04-05 14:10:30 +02:00
enkore
9a1c1e90c1 Merge pull request #2375 from enkore/buhdf
BORG_HOSTNAME_IS_UNIQUE=yes by default.
2017-04-05 14:09:58 +02:00
Marian Beermann
cc24fa2064 format_line: whitelist instead of checking against blacklist 2017-04-05 13:51:20 +02:00
Marian Beermann
49f6128d1c docs: serve: env vars in original commands are ignored 2017-04-05 13:34:50 +02:00
enkore
7a80b1802f Merge pull request #2383 from enkore/f/recreaterecompressargsthingsthatareugly
recreate: add --recompress flag, avoid weirdo use of args.compression
2017-04-05 12:23:59 +02:00
Marian Beermann
707316b0ea placeholders: document escaping 2017-04-05 00:11:46 +02:00
Marian Beermann
1bd381a13a format_line: deny conversions (!r, !s, !a) 2017-04-05 00:09:32 +02:00
Marian Beermann
e2e172c74f format_line: clearer error message for unrecognized placeholder 2017-04-05 00:09:32 +02:00
Marian Beermann
1924e33ef5 format_line: deny access to internal objects 2017-04-05 00:09:31 +02:00
Marian Beermann
dcfbd39125 recreate: unify --always-recompress and --recompress 2017-04-04 18:34:37 +02:00
enkore
7496569ccf Merge pull request #2374 from enkore/issue/2353
serve: fix forced command lines containing BORG_ env vars
2017-04-04 16:27:33 +02:00
Marian Beermann
88dfb3e9c5 serve: fix forced command lines containing BORG_ env vars 2017-04-04 15:25:40 +02:00
Marian Beermann
b2953357ed recreate: add --recompress flag, avoid weirdo use of args.compression 2017-04-04 15:11:15 +02:00
enkore
f878678b0c Merge pull request #2364 from enkore/f/autocomp
Refactor compression decision stuff
2017-04-04 00:28:03 +02:00
Marian Beermann
2ff75d58f2 remove Chunk() 2017-04-04 00:16:15 +02:00
Marian Beermann
69fb9bd403 remove --compression-from 2017-04-04 00:16:15 +02:00
Marian Beermann
929f2760dd change global compression default to lz4 as well
To be consistent with --compression defaults.
2017-04-04 00:16:15 +02:00
Marian Beermann
0847c3f9a5 Unify ComprSpec and CompressionSpec; don't instanciate Compressors right away 2017-04-04 00:16:14 +02:00
Marian Beermann
d1826cca92 Rename CompressionDecider1 -> CompressionDecider 2017-04-03 21:31:28 +02:00
Marian Beermann
0c7410104c Rename Chunk.meta[compress] => Chunk.meta[compressor] 2017-04-03 21:31:28 +02:00
Marian Beermann
88647595ac compress: docs 2017-04-03 21:31:28 +02:00
Marian Beermann
5a20fc08de key: compress(chunk) return data 2017-04-03 21:31:28 +02:00
Marian Beermann
a27f585eaa refactor CompressionDecider2 into a meta Compressor 2017-04-03 21:31:28 +02:00
Marian Beermann
bb6b4fde93 BORG_HOSTNAME_IS_UNIQUE=yes by default. 2017-04-01 21:28:41 +02:00
TW
d79da81d22 Merge pull request #2372 from RonnyPfannschmidt/travis
enhance travis setuptools_scm situation
2017-04-01 18:47:27 +02:00
Ronny Pfannschmidt
132f0006d3 enhance travis setuptools_scm situation
* add setuptools_scm to the development requirements
* print the own version at install time
* unshallow the repo and fetch all tags
2017-04-01 18:25:45 +02:00
enkore
74a4c4f78d Merge pull request #2371 from ThomasWaldmann/minor-extract-refactor
extract: remove duplicate code
2017-04-01 16:58:09 +02:00
Thomas Waldmann
bdbcbf7bb8 extract: remove duplicate code
anything at <path> gets nuked already a few lines above, if possible.
2017-04-01 16:56:21 +02:00
enkore
30f5e6efbb Merge pull request #2351 from ThomasWaldmann/refactor-extract
Refactor extract
2017-03-30 16:03:55 +02:00
Thomas Waldmann
d4e27e2952 extract: small bugfix and refactoring for parent dir creation
make_parent(path) helper to reduce code duplication.
also use it for directories although makedirs can also do it.

bugfix: also create parent dir for device files, if needed.
2017-03-28 23:22:25 +02:00
Thomas Waldmann
ceaf4a8fcf extract: small bugfix and optimization for hardlink masters
if a hardlink master is not in the to-be-extracted subset, the "x"
status was not displayed for it.

also, the matcher was called twice for matching items.
2017-03-28 22:02:54 +02:00
enkore
22b56aebdc Merge pull request #2349 from enkore/f/clarify-license-text
LICENSE: use canonical formulation
2017-03-28 15:45:14 +02:00
Marian Beermann
9d8b7ca0f5 LICENSE: use canonical formulation
("copyright holders and contributors" instead of "author")
2017-03-28 14:11:35 +02:00
enkore
d8d7c68a9a Merge pull request #2348 from ThomasWaldmann/rel110b4
Release 1.1.0b4
2017-03-28 10:33:31 +02:00
Thomas Waldmann
963949812d vagrant: increase memory for parallel testing
considering that we run pytest-xdist with 4 parallel processes,
we need a bit more RAM to avoid the OOM killer and MemoryError.

so, 1GiB for 32bit, 1.5GiB for 64bit VMs.
2017-03-27 12:38:19 +02:00
Thomas Waldmann
38860b3f53 lz4 compress: lower max. buffer size, exception handling
on the wheezy32 test machine, a test testing with corrupted data crashed
with a MemoryError when it tried to get a ~800MB large buffer.
MemoryError is now transformed to DecompressionError, so it gets handled
better.

Also, the bound for giving up is now much lower: 1GiB -> 128MiB.
2017-03-27 12:08:54 +02:00
Thomas Waldmann
85bfcd439c ran setup.py build_man 2017-03-27 01:58:19 +02:00
Thomas Waldmann
acd3da62f4 add docstring to do_benchmark_crud 2017-03-27 01:57:52 +02:00
Thomas Waldmann
251983a741 ran setup.py build_usage 2017-03-27 01:45:45 +02:00
Thomas Waldmann
5bc17148e1 patterns help: mention path full-match in intro 2017-03-27 01:45:04 +02:00
Thomas Waldmann
72abd12e3c update CHANGES with release date 2017-03-27 01:35:32 +02:00
TW
d9462d406c Merge pull request #2327 from ThomasWaldmann/update-master-changes
update CHANGES (master / 1.1.0b4)
2017-03-27 01:26:06 +02:00
Thomas Waldmann
60ae95801d update CHANGES (master / 1.1.0b4) 2017-03-27 01:25:20 +02:00
TW
f2e9e862d8 Merge pull request #2334 from ThomasWaldmann/precise-pattern
add PathFullPattern / optimization for it
2017-03-27 01:15:24 +02:00
Thomas Waldmann
cb6bfdf4d6 add docs for path full-match patterns 2017-03-27 00:31:08 +02:00
Thomas Waldmann
93feb75411 optimize PathFullPattern matching for O(1) time
For a borg create run using a patterns file with 15.000 PathFullPattern excludes
that excluded almost all files in the input data set:
- before this optimization: ~60s
- after this optimization: ~1s
2017-03-27 00:31:08 +02:00
Thomas Waldmann
ebd928795e add PathFullPattern
not really a pattern (as in potentially having any variable parts) - it just does a full,
precise match, after the usual normalizations.

the reason for adding this is mainly for later optimizations, e.g. via set membership check,
so that a lot of such PathFullPatterns can be "matched" within O(1) time.
2017-03-27 00:31:08 +02:00
TW
6dab80218b Merge pull request #2344 from ThomasWaldmann/fix-size-symlink
fix symlink item fs size computation
2017-03-26 23:53:16 +02:00
Thomas Waldmann
90dd0e8eca fix symlink item fs size computation
a symlink has a 'source' attribute, so it was confused with a hardlink
slave here. see also issue #2343.

also, a symlink's fs size is defined as the length of the target path.
2017-03-26 23:11:14 +02:00
TW
4fe9d067da Merge pull request #2255 from ThomasWaldmann/async-errors
async exception processing
2017-03-26 18:15:12 +02:00