mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity
5,096 Commits 9 Branches 137 Tags 57 MiB
Commit Graph

5096 Commits

Author SHA1 Message Date
TW ccbcb4f1e3
Merge pull request #4161 from Ashmodei/1.1-maint-3561-backport 
Added PATH::archive output for creation function on info log level. Backport to 1.1-maint
 2018-11-09 11:49:51 +01:00
ashmodei 81f10266e3 Added PATH::archive output for creation function on info log level. 2018-11-09 10:39:03 +03:00
TW fd1fe93c9a
Merge pull request #4151 from ThomasWaldmann/flake8-1.1 
Flake8 fixes (backport to 1.1-maint)
 2018-11-05 21:22:07 +01:00
Thomas Waldmann 4f1f98eee3 fixup: the help text is parsed as rst markup, so a lone * is an error 
* and ** are interpreted as emphasis and need to be matched for begin
and end of emphasis. the \ in front of it is to get a non-markup *.

(cherry picked from commit 64a53ba43a)
 2018-11-04 20:01:18 +01:00
Thomas Waldmann 50df335f37 flake8: use separate lines for different classes of flake8 ignores 
(cherry picked from commit b0afc6709b)
 2018-11-04 20:01:06 +01:00
Thomas Waldmann 76185efb84 flake8: fix W605 (invalid escape sequences) 
(cherry picked from commit 5c66a60f79)
 2018-11-04 19:58:46 +01:00
Thomas Waldmann 78c6d21a08 flake8: fix F841 
(cherry picked from commit 10cdadb2f8)
 2018-11-04 19:58:17 +01:00
Thomas Waldmann b628166c5a flake8: disable the new checks of flake8 3.6 for now 
(cherry picked from commit fc4a7bc0c9)
 2018-11-04 19:50:00 +01:00
TW b2f887e4b3
Merge pull request #4144 from step21/1.1-maint 
misc backports to 1.1-maint
 2018-11-02 23:57:51 +01:00
step21 27eeef242a Moving the flags of the compiled regex to the front to fix #4137 2018-11-02 00:37:35 +01:00
step21 2a3b534a61 Fixed link to cachedir spec in fs helper to address #4140 for 1.1-maint 2018-11-02 00:33:19 +01:00
step21 85fa5e67f3 Fixed link to cachedir spec in docs to address #4140 2018-11-02 00:28:48 +01:00
step21 34ee2af6b3 Explicitly convert environment variable to str to address #4136 2018-11-02 00:08:25 +01:00
TW 1900e0f677
Merge pull request #4095 from m3nu/1.1-maint 
Add storage_quota for forced_result if set by serve-command.
 2018-10-03 18:42:27 +02:00
Manu 975cc33206 Add storage_quota for forced_result if set by serve command. 2018-10-03 23:47:36 +08:00
TW 3162abb356
Merge pull request #4083 from steelman/borg-passphrase-fd-1.1 
read a passphrase from a file descriptor
 2018-09-22 19:09:52 +02:00
Łukasz Stelmach 82e37fbd03 read a passphrase from a file descriptor 
Read a passpharase from a file descriptor specified in the
BORG_PASSPHRASE_FD environment variable.
 2018-09-22 11:33:23 +02:00
TW ac7bfec4a3
Merge pull request #4067 from audeoudh/1.1-maint 
Forward the `format_spec` to `datetime` class (1.1 backport)
 2018-08-30 12:33:23 +02:00
Henry-Joseph Audéoud 219e9d082a Forward the `format_spec` to `datetime` class 
If specified, the argument `format_spec` is forwarded from the method
`OutputTimestamp.__format__` to the method `format_time` method.  Thus,
we are able to specify the format, in a way supported by the class
`datetime`.

The default behaviour of `format_time` is not affected.  The other parts
of code that does not provide a `format_spec` are not affected by the
change.
 2018-08-30 10:49:50 +02:00
TW 3e22a0f653
Merge pull request #4041 from ThomasWaldmann/rel117 
release 1.1.7
 2018-08-11 21:45:28 +02:00
Thomas Waldmann 4e236daf0c update CHANGES (py356 not available yet) 2018-08-11 19:23:17 +02:00
Thomas Waldmann d04fc3b0ef Revert "vagrant: use python 3.5.6 (1.1-maint)" 
This reverts commit 6fe6abc0da.
 2018-08-11 19:22:31 +02:00
Thomas Waldmann ad5615fa81 update CHANGES (release date 1.1.7) 2018-08-11 18:15:21 +02:00
TW a855c9769d
Merge pull request #4026 from ThomasWaldmann/update-changes-1.1 
update CHANGES
 2018-08-11 18:11:29 +02:00
Thomas Waldmann 7b98dd3b58 update CHANGES (1.1) 2018-08-11 18:10:36 +02:00
TW 2ada9baf4a
Merge pull request #4040 from ThomasWaldmann/update-man-usage 
Update man / usage
 2018-08-11 18:07:30 +02:00
Thomas Waldmann 163356db56 build_usage 2018-08-11 18:05:09 +02:00
Thomas Waldmann e88c2346ea build_man 2018-08-11 18:03:32 +02:00
TW 7df39ebb9f
Merge pull request #4039 from ThomasWaldmann/own-oi-box 
use own openindiana box
 2018-08-11 17:52:17 +02:00
Thomas Waldmann d533f4d691 use own openindiana box 
the one on vagrantcloud is not very recent...
 2018-08-11 17:50:34 +02:00
TW 84b063cb21
Merge pull request #4037 from ThomasWaldmann/vagrant-py356 
vagrant: use python 3.5.6 (1.1-maint)
 2018-08-11 16:51:35 +02:00
Thomas Waldmann 6fe6abc0da vagrant: use python 3.5.6 (1.1-maint) 2018-08-11 16:49:54 +02:00
TW feaeb7ba98
Merge pull request #4035 from ThomasWaldmann/osxfuse382 
vagrant: use osxfuse 3.8.2
 2018-08-11 14:33:24 +02:00
Thomas Waldmann 799d7b5904 vagrant: use osxfuse 3.8.2 2018-08-11 14:27:31 +02:00
TW a0cd7627bc
Merge pull request #4034 from newtonne/fix-man-table-1.1 
Remove row/column-spanning from docs source, fixes #4000
 2018-08-11 14:04:53 +02:00
newtonne f2f9838201 Remove row/column-spanning from docs source, fixes #4000 
Sphinx doesn't support row or column-spanning, which caused the content
of the additional features table to be incorrect. To fix this, we now
define the content of each cell explicitly.

This change also fixes #3990.

(cherry picked from commit 11a2f1f684)
 2018-08-11 10:58:30 +01:00
TW 855ae3f7ee
Merge pull request #4025 from ThomasWaldmann/fix-cachedir-1.1 
don't archive tagged dir when recursing an excluded dir, fixes #3991
 2018-08-09 15:33:37 +02:00
TW a38bdd7090
Merge pull request #4023 from ThomasWaldmann/hostname-fqdn-cleanups-1.1 
call socket.gethostname only once
 2018-08-09 13:28:00 +02:00
TW 059ad8d8ae
Merge pull request #4021 from ThomasWaldmann/init-warning-1.1 
init: add warning to store both key and passphrase at safe place(s)
 2018-08-09 09:29:11 +02:00
Thomas Waldmann 0fa63d9bac don't archive tagged dir when recursing an excluded dir, fixes #3991 
if we are recursing an explicitly excluded directory, we are only
looking for explicitly included items, but we do not need to archive
tagged directories or the tag files themselves - they are all excluded
by the explicit exclusion already.

for performance reasons, we still determine whether a directory is
tagged and if it is, we do not recurse into it as there can't be any
included items in there.

(cherry picked from commit 8256c26cf2)
 2018-08-09 09:25:32 +02:00
Thomas Waldmann 382e37feb7 call socket.gethostname only once 
(cherry picked from commit d2e2f1b89d)
 2018-08-09 09:08:43 +02:00
TW 48ed187279
Merge pull request #4020 from ThomasWaldmann/machine-id-1.1 
add BORG_HOST_ID, fixes #3985
 2018-08-09 09:01:15 +02:00
TW 105a23ac0e
Merge pull request #4019 from ThomasWaldmann/py37-1.1 
Py37 (1.1 backport)
 2018-08-09 08:38:00 +02:00
Thomas Waldmann d21da08f85 init: add warning to store both key and passphrase at safe place(s) 
(cherry picked from commit 4b31ad123f)
 2018-08-09 08:22:00 +02:00
Thomas Waldmann 901e3a7888 add BORG_HOST_ID, fixes #3985 
(cherry picked from commit 90348c1de9)
 2018-08-09 08:11:05 +02:00
Thomas Waldmann 2cbfd54490 travis: reorder envs, remove 3.6-dev 
flake8 first, 34/35/36/37 linux, 34/35/36 osx

also remove quotes around version number, not needed for 3.7.
 2018-08-09 08:04:38 +02:00
Thomas Waldmann ad6bb9cd1e add python 3.7 to pypi metadata 
(cherry picked from commit 751cd2caed)
 2018-08-09 07:59:03 +02:00
Thomas Waldmann 836dc0b568 tox / travis: enable testing on py37 
(cherry picked from commit fef9581690)
 2018-08-09 07:57:56 +02:00
Thomas Waldmann 02dbe5fd5c argparse: work around bad default in py 3.7.0a/b/rc, fixes #3996 
(cherry picked from commit 52f1cd4bc6)
 2018-08-09 07:52:37 +02:00
TW 64f2fc0a65
Merge pull request #3824 from ThomasWaldmann/finding-pieces 
some more debug commands
 2018-08-09 07:27:54 +02:00