1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 01:37:20 +00:00
Commit graph

1544 commits

Author SHA1 Message Date
Thomas Waldmann
234a88bec6 avoid hidden import, make it easy for pyinstaller
this fixes #218 in an easier way so one doesn't have to type
--hidden-import=logging.config all the time when using pyinstaller.
2015-11-15 15:52:02 +01:00
TW
ff6e95534c Merge pull request #415 from ThomasWaldmann/flag-docs
add docs for item flags / status output, fixes #402
2015-11-15 14:50:04 +01:00
Thomas Waldmann
d6b8de943b add docs for item flags / status output, fixes #402 2015-11-15 14:32:19 +01:00
TW
44f54c427f Merge pull request #411 from jungle-boogie/patch-1
correct install link
2015-11-15 01:46:11 +01:00
jungle-boogie
5942b79740 correct install link 2015-11-14 16:13:25 -08:00
Thomas Waldmann
fd5ccadcac update CHANGES 2015-11-14 23:48:44 +01:00
TW
d52c09378d Merge pull request #408 from anarcat/static-usage
Static usage generation
2015-11-14 22:32:47 +01:00
Antoine Beaupré
811c18dcd4 explain how to regenerate usage and API files and when 2015-11-13 10:46:13 -05:00
Antoine Beaupré
8e36075fe9 commit usage files directly into git
the generation of those files was causing us way too much pain to
justify automatically generating them all the time.

those will have to be re-generated with `build_api` or `build_usage`
as appropriate, for example when function signatures or commandline
flags change.

see #384
2015-11-13 10:42:52 -05:00
Antoine Beaupré
f13dd6e579 completely remove have_cython() hack
this was making us require mock, which is really a test component and
shouldn't be part of the runtime dependencies. furthermore, it was
making the imports and the code more brittle: it may have been
possible that, through an environment variable, backups could be
corrupted because mock libraries would be configured instead of real
once, which is a risk we shouldn't be taking.

finally, this was used only to build docs, which we will build and
commit to git by hand with a fully working borg when relevant.

see #384.
2015-11-13 10:40:53 -05:00
Antoine Beaupré
f52fb410a5 Revert "use build_py to fix build on RTD", disables docs build
This reverts commit 86487d192a.

We will instead commit the generated `.rst` usage and API files
directly into git. The setup commands remain to generate them when the
usage or API changes, but as things are the hoops required to generate
those RST files are way too complicated to justify simply build docs.

See #384.

Conflicts:
	setup.py
2015-11-13 10:40:43 -05:00
TW
be73e7cb96 Merge pull request #396 from ThomasWaldmann/exclude_if_present
Exclude if present
2015-11-09 04:27:56 +01:00
Thomas Waldmann
7d178e09b0 Implement --keep-tag-files to preserve directory roots/tag-files
We also add --keep-tag-files to keep in the archive the root directory and the
tag/exclusion file in the archive.

This is taken from a attic PR (and adapted for borg):
    commit f61e22cacc90e76e6c8f4b23677eee62c09e97ac
    Author: Yuri D'Elia <yuri.delia@eurac.edu>
    Date:   Mon Dec 15 12:27:43 2014 +0100
2015-11-09 04:08:49 +01:00
Thomas Waldmann
a6a8a4ebd9 Implement --exclude-if-present
Add a new --exclude-if-present command-line flag to ``borg create``.  If
specified, directories containing the specified tag file will be excluded from
the backup. The flag can be repeated to ignore more than a single tag file,
irregardless of the contents.

This is taken from a attic PR (and adapted for borg):
    commit 3462a9ca90388dc5d8b4fa4218a32769676b3623
    Author: Yuri D'Elia <yuri.delia@eurac.edu>
    Date:   Sun Dec 7 19:15:17 2014 +0100
2015-11-09 03:41:06 +01:00
Thomas Waldmann
4a2e4ec683 update CHANGES 2015-11-08 17:10:18 +01:00
TW
3f6530d100 Merge pull request #388 from ThomasWaldmann/no-docs-build-by-default
do not try to build api / usage docs for production install
2015-11-08 16:56:39 +01:00
Thomas Waldmann
3238b8ea76 do not try to build api / usage docs for production install
it requires "mock" (and later also sphinx) and we do not (want to) have that in setup_requires.

I removed the build.sub_commands.append(...) because that made setup.py install run build_api
and build_usage automatically for production installs. the comment said it does not work on
readthedocs anyway.

build_api and build_usage can still be run manually.
2015-11-08 16:16:43 +01:00
TW
9292ce18fa Merge pull request #386 from bket/nameerror
Catch msgpack error in archive.py
2015-11-08 16:02:13 +01:00
Björn Ketelaars
e6911b2f25 Avoid using msgpack.packb at import time.
move item_keys = ... to __init__ (self.item_keys = ...)

Solution from/discussed with TW.
2015-11-08 15:23:09 +01:00
Thomas Waldmann
f48a5ae6a7 fix formatting issue in changes.rst 2015-11-08 02:17:37 +01:00
Thomas Waldmann
007572594f try to fix build on readthedocs 2015-11-08 02:00:51 +01:00
Thomas Waldmann
cd40ec280d update CHANGES 2015-11-08 01:29:53 +01:00
Thomas Waldmann
5595d56ecf deal with unicode errors for symlinks in same way as for regular files, fixes #382 2015-11-08 01:05:55 +01:00
Thomas Waldmann
ba67b96434 have a helpful warning message about how to fix wrong locale setup, fixes #382 2015-11-08 00:57:02 +01:00
Thomas Waldmann
244303ac66 add ACL keys the RobustUnpacker must know about 2015-11-07 19:55:17 +01:00
Thomas Waldmann
3d2a1da983 use latest pytest-benchmark 2015-11-07 16:13:24 +01:00
Thomas Waldmann
c9090fc3c2 helper: minor style fix 2015-11-07 15:37:05 +01:00
Thomas Waldmann
303bed9d12 docs: minor development docs update 2015-11-07 15:17:40 +01:00
Thomas Waldmann
8cc726a107 make basic test more robust, try 2
check if we have all expected files in list output (but ignore extra lines,
like "can't load libfakeroot" or so).
2015-11-07 00:30:02 +01:00
Thomas Waldmann
eb3bc1023b make basic test more robust
counting lines is a bad idea. just one unrelated output line and the test fails.
thus we rather check if what we expect is in the output.
2015-11-07 00:11:36 +01:00
Thomas Waldmann
c34ef37516 CHANGES: some fixes, add compatibility notes 2015-11-06 22:04:37 +01:00
Thomas Waldmann
47fec587d4 updated CHANGES 2015-11-06 21:33:43 +01:00
TW
1a20d3d5ae Merge pull request #366 from ThomasWaldmann/fix-364
Fix borg check crashing on some repos, issue #364
2015-11-06 21:05:30 +01:00
Thomas Waldmann
c01efa4666 repository: refactor some duplicate code 2015-11-06 19:37:39 +01:00
Thomas Waldmann
b1eb784bd1 docs: add section about debug commands 2015-11-06 18:31:06 +01:00
Thomas Waldmann
6c1b765741 docs: group general stuff under 1 headline, fix another headline level 2015-11-06 18:22:30 +01:00
TW
864fa9ae2d Merge pull request #370 from ThomasWaldmann/debug-helpers
Debug helpers
2015-11-06 18:08:05 +01:00
Thomas Waldmann
37c8aa2d42 debug-get-obj command 2015-11-06 17:45:30 +01:00
Thomas Waldmann
a2fc479da3 debug-put-obj command 2015-11-06 17:31:05 +01:00
Thomas Waldmann
9986705760 add some tests for the debug commands 2015-11-06 16:51:39 +01:00
TW
583a89c9b9 Merge pull request #379 from jaltek/patch-1
Fix for link to "The Borg collective"
2015-11-06 16:27:03 +01:00
Jan
bc6b92f130 Fix for link to "The Borg collective"
Fixed the link to "The Borg collective".
2015-11-06 16:22:05 +01:00
TW
ea10551be2 Merge pull request #378 from ThomasWaldmann/list-with-prefix
borg list --prefix=thishostname- REPO, fixes #205
2015-11-06 16:07:22 +01:00
Thomas Waldmann
7da730a8d7 borg list --prefix=thishostname- REPO, fixes #205
lists only archives with names starting with the given prefix.
2015-11-06 15:45:49 +01:00
Thomas Waldmann
a4bb85970d do not mention the deprecated passphrase mode 2015-11-06 15:01:37 +01:00
Thomas Waldmann
4c6be00d65 remove some superfluous / duplicate log messages 2015-11-06 14:58:12 +01:00
Thomas Waldmann
0f0a21cf54 Merge branch 'master' of github.com:borgbackup/borg 2015-11-04 01:51:34 +01:00
Thomas Waldmann
f6244f006e docs: warn about not running out of space 2015-11-04 01:51:09 +01:00
Thomas Waldmann
39b5734b31 debugging helper: borg debug-delete-obj 2015-11-04 01:05:21 +01:00
Thomas Waldmann
47813f6f6a archiver checker: better error logging, give chunk_id and sequence numbers
can be used together with borg debug-dump-archive-items.
2015-11-04 00:20:12 +01:00