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

2682 commits

Author SHA1 Message Date
Thomas Waldmann
30d1e21e53 fixup: fixes, clarify 2016-11-26 20:49:39 +01:00
enkore
20798df7e3 Merge pull request #1876 from ThomasWaldmann/vagrantfile-cleanup
Vagrantfile cleanup
2016-11-26 19:14:44 +01:00
Thomas Waldmann
76c5f1a258 add more details about resource usage 2016-11-26 04:34:01 +01:00
TW
cc20c98262 Merge pull request #1875 from ThomasWaldmann/improve-files-cache-docs
improve cache / index docs, esp. files cache docs, fixes #1825
2016-11-26 02:24:50 +01:00
TW
d56683f2b5 Merge pull request #1877 from anarcat/pypi
display README correctly on PyPI
2016-11-24 16:50:00 +01:00
Antoine Beaupré
fbada18b0d display README correctly on PyPI
I have discovered that PyPI is way more sensitive to RST warnings than
other platforms: warnings and errors will make the document not show
up correctly, which is currently the case here:

https://pypi.python.org/pypi/borgbackup/

the suggested changes remove Sphinx-specific markup from the output,
namely the badges and `|replacement|` patterns, but also the
`higlight` directive. this also requires adding tags to the README to
mark the badges to remove and removal of the `none` argument for the
`.. code-block::` element which was not having any significant in
Sphinx anyways.
2016-11-24 09:09:15 -05:00
Thomas Waldmann
1dc51e6df8 Vagrantfile: reduce code duplication 2016-11-24 04:07:21 +01:00
Thomas Waldmann
6bb363c707 Vagrantfile: cosmetic: remove tabs / empty lines 2016-11-24 04:07:21 +01:00
Thomas Waldmann
c8b58e0fd8 improve cache / index docs, esp. files cache docs, fixes #1825 2016-11-24 01:53:23 +01:00
TW
df5482d7fc Merge pull request #1864 from ThomasWaldmann/fix-newest-mtime
fix determination of newest mtime, fixes #1860
2016-11-20 00:22:59 +01:00
Thomas Waldmann
cabcbc5887 fix determination of newest mtime, fixes #1860
bug:
if no files were added/modified, _newest_mtime stayed at its initial 0 value.
when saving the files cache, this killed all age 0 entries.

Now using None as initial value, so we can spot that circumstance.

The 2 ** 63 - 1 value is just so it is MAX_INT on a 64bit platform, for better performance.
It can be easily increased when y2262 is coming.
2016-11-20 00:08:33 +01:00
enkore
1fc368c0e9 Merge pull request #1863 from ThomasWaldmann/doc-updates
doc updates
2016-11-19 23:42:53 +01:00
Thomas Waldmann
5fe5b6b339 docs: different pattern matching for --exclude, fixes #1779 2016-11-19 22:26:07 +01:00
Thomas Waldmann
d8e806aac1 docs: datetime formatting examples for {now} placeholder, fixes #1822 2016-11-19 22:04:13 +01:00
Thomas Waldmann
3d174aef35 docs: clarify passphrase mode attic repo upgrade, fixes #1854 2016-11-19 21:52:11 +01:00
Thomas Waldmann
d7284a92f0 docs: clarify --umask usage, fixes #1859 2016-11-19 21:38:13 +01:00
TW
ea6515d1aa Merge pull request #1856 from ThomasWaldmann/umount
borg umount, fixes #1855
2016-11-17 22:18:20 +01:00
Thomas Waldmann
e17fe2b295 borg umount, fixes #1855
this refactors umount code we already used for the testsuite into the platform module's namespace.

also, it exposes that functionality via the cli api, so users can use it via "borg umount <mountpoint>",
which is more consistent than using borg to mount and fusermount -u (or umount) to un-mount.
2016-11-17 20:16:28 +01:00
enkore
d871efc04a Merge pull request #1851 from Abogical/patch-1
Typo
2016-11-14 23:13:34 +01:00
Abdel-Rahman
9cf4846c27 Typo 2016-11-15 00:11:32 +02:00
enkore
c055dd2636 Merge pull request #1848 from ThomasWaldmann/clarify-pr-targets
developers docs: clarify how to choose PR target branch
2016-11-14 08:11:14 +01:00
Thomas Waldmann
c81f861ba6 developers docs: clarify how to choose PR target branch 2016-11-14 03:26:39 +01:00
TW
cda88e1207 Merge pull request #1847 from ThomasWaldmann/travis-osx
travis: allow OS X failures until the brew cask osxfuse issue is fixed
2016-11-14 03:19:34 +01:00
Thomas Waldmann
372ebb4e55 travis: allow OS X failures until the brew cask osxfuse issue is fixed 2016-11-14 02:08:11 +01:00
enkore
4b5a17c096 Merge pull request #1841 from enkore/issue/1837
Fix check incorrectly reporting attic 0.13 and earlier archives as corrupt
2016-11-13 15:26:19 +01:00
Marian Beermann
a898297669
check: improve "did not get expected metadata dict" diagnostic 2016-11-13 15:25:40 +01:00
Marian Beermann
639eba1635 Fix check incorrectly reporting attic 0.13 and earlier archives as corrupt 2016-11-13 15:25:10 +01:00
TW
9b1241eecd Merge pull request #1844 from enkore/issue/1815
check: catch two kinds of different repos
2016-11-13 14:44:17 +01:00
Marian Beermann
2261709e78
check: handle repo w/o objects gracefully
normal check would complete, --repair would crash when trying
to write the rebuilt (empty) manifest out, since self.key was None
2016-11-13 11:45:42 +01:00
Marian Beermann
64a3fa8e73 check: bail out early if repository is *completely* empty 2016-11-13 11:40:19 +01:00
enkore
3789c78f60 Merge pull request #1843 from enkore/issue/1801
Fix tox/pybuild in 1.0-maint
2016-11-13 11:32:08 +01:00
Marian Beermann
960c42193a
fix tox build for environment-python != containing-python in yet-another instance
this instance: the repository worktree is *not* named borg.

Cherry pick of 4f1157c into 1.0-maint due to f3efcdb

TODO removed since we already did that after 1.0-maint, but 1.0-maint
will never receive the change.
2016-11-13 11:20:00 +01:00
enkore
1a0218b50f Merge pull request #1840 from ThomasWaldmann/fix-logger
at xattr module import time, loggers are not initialized yet
2016-11-13 02:05:06 +01:00
Thomas Waldmann
3237db4621 at xattr module import time, loggers are not initialized yet 2016-11-12 23:10:40 +01:00
TW
5c98b850dc Merge pull request #1839 from ThomasWaldmann/osxfuse-non-beta
osxfuse non-beta
2016-11-12 23:04:50 +01:00
Thomas Waldmann
cd8dfda318 caskroom osxfuse-beta gone, it's osxfuse now (3.5.3) 2016-11-12 23:02:13 +01:00
TW
19f6f7f146 Merge pull request #1830 from languitar/1.0-maint
Clarify prune behavior for different archive contents
2016-11-10 21:17:13 +01:00
Johannes Wienke
3ee019761a Clarify prune behavior for different archive contents
In the online help, explain that archives with different contents need to be
separated via the prefix when pruning to achieve a desired retention policy per
archive set.

Relates to #1824.
2016-11-10 19:40:15 +01:00
enkore
5fecac63a9 testsuite/archiver: fix missing newline before RemoteArchiverTestCase 2016-11-10 17:35:59 +01:00
enkore
b026c8d0ec Merge pull request #1827 from textshell/feature/gitattribute-diff-python
.gitattributes: Set python diff mode for all *.py files.
2016-11-10 16:59:59 +01:00
Martin Hostettler
74ab7f1f61 .gitattributes: Set python diff mode for all *.py files. 2016-11-10 16:48:35 +01:00
TW
cc499fe7f9 Merge pull request #1791 from ThomasWaldmann/vagrant-llfuse-build
vagrant: remove llfuse from tox.ini at a central place
2016-11-05 14:25:10 +01:00
TW
19891d655b Merge pull request #1792 from ThomasWaldmann/cygwin-no-remote-archiver-tests
skip remote tests on cygwin
2016-11-05 14:24:34 +01:00
TW
94ff4959ee Merge pull request #1808 from anarcat/restore-size
restore normal size
2016-11-05 02:37:43 +01:00
Antoine Beaupré
adfd66d636 restore normal size
otherwise code examples overflow
2016-11-04 21:27:21 -04:00
TW
365ec85aa1 Merge pull request #1807 from anarcat/docs-misc
fix more issues with the PDF
2016-11-05 02:22:39 +01:00
Antoine Beaupré
057ad07d4b fix a heading that was incorrectly set 2016-11-04 21:16:41 -04:00
Antoine Beaupré
ec0ef2eaca remove third level headings, too verbose 2016-11-04 21:15:31 -04:00
Antoine Beaupré
af23eea39d fix levels in authors section
that way in the TOC, it doesn't look like borg authors are attic
2016-11-04 21:14:59 -04:00
TW
45c76c1dba Merge pull request #1804 from anarcat/security-notes
move security verification to support section
2016-11-05 02:04:27 +01:00