1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-27 18:28:42 +00:00
Commit graph

7049 commits

Author SHA1 Message Date
TW
9e5062c015
Merge pull request #6774 from ThomasWaldmann/fix-selftest-count-borg2
borg2: misc small fixes
2022-06-14 16:57:26 +02:00
TW
a3a1974c52
Merge pull request #6773 from wizeman/fix-obfuscate
fix test_obfuscate byte accounting
2022-06-14 15:43:30 +02:00
Thomas Waldmann
c01f3527e5 fix linter errors 2022-06-14 15:42:30 +02:00
Thomas Waldmann
72994a4432 also test pull requests against borg2 branch 2022-06-14 15:40:09 +02:00
Thomas Waldmann
f9132687e3 fix selftest count 2022-06-14 15:17:30 +02:00
Ricardo M. Correia
18f70be0e3 fix test_obfuscate byte accounting 2022-06-14 14:55:02 +02:00
TW
dc4a1e6d2d
Merge pull request #6705 from ThomasWaldmann/repoindex
borg2: repoindex improvements
2022-06-14 14:51:18 +02:00
Thomas Waldmann
e5ea016115 repository: set/query flags, iteration over flagged items (NSIndex)
use this to query or set/clear flags in the "extra" word.

also: remove direct access to the "extra" word, adapt tests.
2022-06-14 14:48:56 +02:00
Thomas Waldmann
bf9f42320e repository: sync write file in get_fd
this fixes a strange test failure that did not happen until now:
it could not read the MAGIC bytes from a (quite new) segment file,
it just returned the empty string.

maybe its appearance is related to the removed I/O calls.
2022-06-14 14:48:56 +02:00
Thomas Waldmann
3ce3fbcdff repository index: add payload size (==csize) and flags to NSIndex entries
This saves some segment file random IO that was previously necessary
just to determine the size of to be deleted data.

Keep old one as NSIndex1 for old borg compatibility.
Choose NSIndex or NSIndex1 based on repo index layout from HashHeader.

for an old repo index repo.get(key) returns segment, offset, None, None
2022-06-14 14:48:56 +02:00
TW
fc8a289647
Merge pull request #6763 from ThomasWaldmann/remove-csize
borg2: there is no csize
2022-06-14 12:15:56 +02:00
TW
9747ce459b
Merge pull request #6770 from ThomasWaldmann/safe-secure-erase-master
secure_erase: avoid collateral damage, fixes #6768
2022-06-13 19:41:23 +02:00
TW
e380136ae6
Merge pull request #6772 from sergeyklay/patch-1
Use license_files instead of license_file
2022-06-13 19:38:08 +02:00
Serghei Iakovlev
928d2925bb
Use license_files instead of license_file
Closes #6727

See: https://github.com/pypa/setuptools/pull/2620
2022-06-13 16:09:38 +02:00
Thomas Waldmann
ba1f8926cc secure_erase: avoid collateral damage, fixes #6768
if a hardlink copy of a repo was made and a new repo config
shall be saved, do NOT fill in random garbage before deleting
the previous repo config, because that would damage the hardlink
copy.
2022-06-13 15:57:01 +02:00
Thomas Waldmann
1393e4f391 remove csize references from docs 2022-06-12 18:01:57 +02:00
Thomas Waldmann
75ad3b8e35 remove csize expectation from do_transfer upgrade_item
the size is already remove via Item._update_internal method.
2022-06-12 17:50:12 +02:00
TW
a4fc8a29f4
Merge pull request #6764 from targhs/doc/correct-installation-shell-syntax
Correct shell syntax for installation using git
2022-06-12 17:20:48 +02:00
Thomas Waldmann
822aefc7b0 re-add dsize placeholder 2022-06-12 17:15:13 +02:00
Thomas Waldmann
49adb77157 calc_stats: deduplicated size now, was deduplicated csize
also: remove pre12_meta cache
2022-06-12 17:15:13 +02:00
Thomas Waldmann
19dfbe5c5c compute the deduplicated size before compression
so we do not need csize for it.
2022-06-12 17:15:13 +02:00
Thomas Waldmann
1fd571a4d0 fix comments 2022-06-12 17:15:13 +02:00
Thomas Waldmann
2c1f7951c4 remove csize from ChunkIndexEntry 2022-06-12 17:15:13 +02:00
targhs
35c031ed2c Correct shell syntax for installation using git 2022-06-12 20:19:31 +05:30
Thomas Waldmann
b82a39c3b3 remove csize from stats_against() 2022-06-12 15:48:33 +02:00
Thomas Waldmann
0211948cac remove csize from summarize return tuple 2022-06-12 15:48:33 +02:00
Thomas Waldmann
b726aa5665 remove csize support from get_size 2022-06-12 15:48:33 +02:00
Thomas Waldmann
ace5957524 remove csize from item.chunks elements 2022-06-12 15:48:33 +02:00
Thomas Waldmann
b9f9623a6d prepare to remove csize (set it to 0 for now) 2022-06-12 15:48:33 +02:00
TW
a55f3f7285
Merge pull request #6762 from Maltimore/docs_line_continuation
[DOCS] Remove unnecessary/dangerous line continuation
2022-06-11 20:17:55 +02:00
Maltimore
4902398554 [DOCS] Remove unnecessary/dangerous line continuation 2022-06-10 21:21:52 +03:00
TW
2c9be35886
Merge pull request #6704 from ThomasWaldmann/msgpack-str-bytes-cleanup
borg2: cleanup msgpack related str/bytes mess
2022-06-09 18:18:13 +02:00
Thomas Waldmann
d4ee968b07 use borg 2.0 to refer to this, not 1.3
also, some type conversions are now done in update_internal once,
not in the decode methods of the classes in item.pyx.
2022-06-09 18:13:40 +02:00
Thomas Waldmann
08228fbd32 Item: remove unused hardlink_masters param 2022-06-09 17:57:28 +02:00
Thomas Waldmann
421d4bdfb0 docs: fix bytes -> str in data-structures docs 2022-06-09 17:57:28 +02:00
Thomas Waldmann
58009f6773 Key: fix once, remove decode=... 2022-06-09 17:57:28 +02:00
Thomas Waldmann
ed22f721f3 EncryptedKey: fix once, remove decode=... 2022-06-09 17:57:28 +02:00
Thomas Waldmann
f2b085787b Item: disallow None value for .user/group/chunks/chunks_healthy
If we do not know the value, just do not have that key/value pair in the item.
2022-06-09 17:57:28 +02:00
Thomas Waldmann
64cc16a9f4 Item: fix xattr processing
Item.xattrs is now always a StableDict mapping bytes keys -> bytes values.

The special casing of empty values (b'') getting replaced by None was removed.
2022-06-09 17:57:28 +02:00
Thomas Waldmann
9d684120a2 Item: assert type also in property getter
also: fixed Item.xattrs to be StableDict (not just a dict, as the
msgpack unpacker gives us)
2022-06-09 17:57:28 +02:00
Thomas Waldmann
7b138cc710 Item: convert timestamps once, get rid of bigint code 2022-06-09 17:57:28 +02:00
Thomas Waldmann
8e58525fc6 Item: remove some decode= params
update_internal() makes sure they have the desired type already.
2022-06-09 17:57:28 +02:00
Thomas Waldmann
655c1b9cc2 update docstrings / comments 2022-06-09 17:57:28 +02:00
Thomas Waldmann
33444be926 more str vs bytes fixing 2022-06-09 17:57:28 +02:00
Thomas Waldmann
8e87f1111b cleanup msgpack related str/bytes mess, fixes #968
see ticket and borg.helpers.msgpack docstring.

this changeset implements the full migration to
msgpack 2.0 spec (use_bin_type=True, raw=False).

still needed compat to the past is done via want_bytes decoder in borg.item.
2022-06-09 17:57:28 +02:00
Thomas Waldmann
f8dbe5b542 cleanup msgpack related str/bytes mess, see #968
see ticket and borg.helpers.msgpack docstring.
2022-06-09 17:57:28 +02:00
TW
86fe8bdd57
Merge pull request #6703 from ThomasWaldmann/r2r-transfer
borg2: "borg transfer" cmd (and also getting rid of legacy)
2022-06-09 17:56:03 +02:00
Thomas Waldmann
c5540c2dd9 upgrade compressed chunk: fix treatment of ObfuscateSize chunks
the inner payload of ObfuscateSize chunks are compressed chunks and need
the same zlib fix and level patching as non-obfuscated compressed chunks.
2022-06-09 17:49:16 +02:00
Thomas Waldmann
72c68c49d0 obfuscation: fix byte order for size, fixes #6701 2022-06-09 17:49:16 +02:00
Thomas Waldmann
6584a92c81 compression: use the 2 bytes for type and level, fixes #6698
adapt borg transfer, transferred chunks are set to compression level "unknown".
2022-06-09 17:49:16 +02:00