1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-28 02:38:43 +00:00
Commit graph

4223 commits

Author SHA1 Message Date
Marian Beermann
92a01f9d6c cache sync: fix incorrect .integrity location for .compact 2017-06-09 12:23:27 +02:00
Marian Beermann
3789459a41 cache sync: extract read_archive_index function 2017-06-09 12:23:26 +02:00
Marian Beermann
09a9d892cf cache sync: convert existing archive chunks idx to compact 2017-06-09 12:23:26 +02:00
Marian Beermann
295ac86d71 testsuite: hashindex: test compact -> merge 2017-06-09 12:23:26 +02:00
Marian Beermann
1379af22de HashIndexCompactTestCase 2017-06-09 12:23:26 +02:00
Marian Beermann
6e011b9354 cache: compact hashindex before writing to chunks.archive.d 2017-06-09 12:23:26 +02:00
TW
eeaeaf9e12 Merge pull request #2634 from ThomasWaldmann/cygwin
enable remote tests on cygwin
2017-06-09 00:08:01 +02:00
enkore
554ac7455e Merge pull request #2636 from enkore/issue/2634
hashindex: Cython defines PY_SSIZE_T_CLEAN
2017-06-08 17:39:43 +02:00
Marian Beermann
b75c214af5 hashindex: Cython defines PY_SSIZE_T_CLEAN 2017-06-08 15:16:52 +02:00
enkore
6add4daa54 Merge pull request #2635 from borgbackup/enkore-patch-1
gitattributes: docs/usage/*.rst.INC merge=ours
2017-06-08 13:11:58 +02:00
enkore
63d94cd14b gitattributes: docs/usage/*.rst.INC merge=ours 2017-06-08 13:11:49 +02:00
enkore
524e0b5322 docs: development: vagrant, windows10 requirements 2017-06-08 12:27:16 +02:00
Thomas Waldmann
4766d66875 enable remote tests on cygwin
the cygwin issue that caused these tests to break was fixed in cygwin
at least since cygwin 2.8.0 (maybe even since 2.7.0).

also added a comment to our workaround (os_write wrapper, that is needed
still for people running older cygwin versions) that it can be removed
when cygwin 2.8.0 is considered ancient (and everybody has upgraded to
some fixed version).
2017-06-08 02:23:57 +02:00
enkore
19c8adb109 Merge pull request #2632 from enkore/docs/nanorst
nanorst for --help
2017-06-08 02:00:55 +02:00
enkore
b0e4c432a5 Merge pull request #2633 from enkore/precise-pangolin
borg.algorithms definition
2017-06-08 00:19:38 +02:00
Marian Beermann
5b9c34f523 borg.algorithms definition 2017-06-07 23:53:19 +02:00
Marian Beermann
3f8a0221ee Revert "move chunker to borg.algorithms"
This reverts commit 956b50b29c.

# Conflicts:
#	setup.py
#	src/borg/archive.py
#	src/borg/helpers.py
2017-06-07 23:51:42 +02:00
Marian Beermann
1cf031045c nanorst for --help 2017-06-07 18:16:11 +02:00
enkore
300f2955a9 Merge pull request #2631 from enkore/docs/man-examples-fix
docs: fix build_man for relocated examples
2017-06-07 16:31:02 +02:00
Marian Beermann
0d6064e7f3 docs: fix build_man for relocated examples 2017-06-07 16:29:37 +02:00
enkore
2118fb45a2 Merge pull request #2630 from enkore/issue/2252
docs: faq: Can I use Borg on SMR hard drives?
2017-06-07 11:29:40 +02:00
Marian Beermann
cd67628646 docs: changes: fix rst warning 2017-06-07 11:28:45 +02:00
Marian Beermann
07deaf14cb docs: faq: Can I use Borg on SMR hard drives? 2017-06-07 11:28:43 +02:00
enkore
fa28d483f0 Merge pull request #2629 from enkore/f/gitignore
update .gitignore
2017-06-07 11:06:58 +02:00
Marian Beermann
ee821a70f5 update .gitignore 2017-06-07 11:06:37 +02:00
enkore
02a8205395 Merge pull request #2627 from enkore/docs/split-usage
docs: split usage
2017-06-07 10:00:08 +02:00
TW
af979c2b2a Merge pull request #2617 from ThomasWaldmann/fix-parse-version
fix parse_version, add tests, fixes #2556
2017-06-07 02:04:25 +02:00
Thomas Waldmann
a7e8e8ccd9 fix parse_version, add tests, fixes #2556 2017-06-07 01:15:58 +02:00
enkore
fb26b3c728 Merge pull request #2622 from enkore/issue/2557
repository: truncate segments before unlinking
2017-06-07 00:49:02 +02:00
Marian Beermann
13adc80cde docs: usage: avoid bash highlight, [options] instead of <options> 2017-06-07 00:44:53 +02:00
Marian Beermann
22311abe02 docs: usage: add benchmark page
Previously, benchmark crud was not contained in the usage pages
at all.
2017-06-07 00:42:43 +02:00
Marian Beermann
8fb7db71bc docs: split usage 2017-06-07 00:38:48 +02:00
enkore
bc23890259 Merge pull request #2626 from enkore/docs/broken-changelog
docs: fix broken changes listing of 1.1.0b6
2017-06-07 00:17:21 +02:00
Marian Beermann
52afd5f4ff docs: fix broken changes listing of 1.1.0b6 2017-06-07 00:17:05 +02:00
enkore
bdd5f7c1e9 Merge pull request #2625 from enkore/issue/2623
docs: don't suggest to leak BORG_PASSPHRASE
2017-06-06 21:32:11 +02:00
Marian Beermann
3faafb1dee docs: faq: specify "using inline shell scripts" 2017-06-06 21:30:58 +02:00
Marian Beermann
aa7fbff55f docs: quickstart: delete problematic BORG_PASSPRHASE use 2017-06-06 21:29:31 +02:00
Marian Beermann
1135114520 helpers: truncate_and_unlink doc 2017-06-06 19:52:08 +02:00
Marian Beermann
ed0a5c798f platform.SaveFile: truncate_and_unlink temporary
SaveFile is typically used for small files where this is not
necessary. The sole exception is the files cache.
2017-06-06 18:13:20 +02:00
Marian Beermann
95064cd241 repository: truncate segments before unlinking 2017-06-06 17:21:45 +02:00
enkore
68b61acffd Merge pull request #2619 from ThomasWaldmann/remove-attic-dependency
remove attic dependency of the tests, fixes #2505
2017-06-06 11:43:52 +02:00
TW
957aeec533 Merge pull request #2620 from ThomasWaldmann/coala-fixes
whitespace changes by coala
2017-06-06 05:19:09 +02:00
Thomas Waldmann
f5d2e67129 whitespace changes by coala 2017-06-06 04:46:15 +02:00
Thomas Waldmann
fed5873e29 remove attic dependency of the tests, fixes #2505
attic.tar.gz contains a repo + corresponding keyfile - all the
upgrader module tests need.

.tar.gz because the .tar was 20x bigger.
2017-06-06 04:26:48 +02:00
Marian Beermann
f5e7d964cf docs: internals: feature flags set theory 2017-06-05 22:29:29 +02:00
TW
88669611b1 Merge pull request #2615 from ThomasWaldmann/suppress-timestamp-future-errmsg
tests: suppress tar's future timestamp warning
2017-06-05 16:59:12 +02:00
enkore
7a646a1b03 Merge pull request #2616 from enkore/docs/internals-toc
docs: internals: columnize rather long ToC [webkit fixup]
2017-06-05 16:04:35 +02:00
Marian Beermann
fc599befc9 docs: internals: columnize rather long ToC [webkit fixup] 2017-06-05 16:04:03 +02:00
enkore
8023bc6a00 Merge pull request #2614 from enkore/docs/internals-toc
docs: internals: columnize rather long ToC
2017-06-05 15:57:52 +02:00
Thomas Waldmann
4e6c56538a test: suppress tar's future timestamp warning
in this case, it is expected as we archived a file with such a ts.
2017-06-05 15:43:13 +02:00