1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-24 15:12:00 +00:00
Commit graph

2079 commits

Author SHA1 Message Date
TW
6841be3684 Merge pull request #789 from enkore/feature-hmac
Replace stdlib hmac, zero-copy decrypt
2016-03-31 18:15:57 +02:00
TW
233e23965d Merge pull request #816 from Ape/pr/sort_diff_output
Add '--sort' option for sorting diff command output
2016-03-31 18:13:00 +02:00
Lauri Niskanen
9d1a30c08b Add '--sort' option for sorting diff command output
Previously, on 'borg diff', the output always had first the modifications, then
additions, and finally removals. Output may be easier to follow if the various
kinds of changes are interleaved. This commit is a simple solution that first
collects the output lines and sorts them by file path before printing. This new
behavior is optional and disabled by default. It can be enabled with '--sort'
command line option.

This option will be especially useful after the planned multi-threading changes
arrive. Multi-threading may shuffle the archive order of files making diff
output hard to follow without sorting.

Resolves #797.
2016-03-31 18:55:02 +03:00
TW
2a026bd842 Merge pull request #815 from edgewood/master
Add 'x' status for excluded paths (#814)
2016-03-31 15:50:19 +02:00
Ed Blackman
2ab324c03f Add 'x' status for excluded paths (#814)
Makes it easy to see paths excluded by --exclude* options for testing of
regexes, and for ongoing monitoring that files desired for backup aren't
getting excluded accidentally.
2016-03-30 22:38:31 -04:00
TW
5a0f75df9b Merge pull request #806 from pyhalov/804
failing hashindex tests on netbsd, fixes #804
2016-03-28 01:14:00 +02:00
Alexander Pyhalov
a97c9f9e81 failing hashindex tests on netbsd, fixes #804 2016-03-27 17:42:45 +03:00
Marian Beermann
c5bd7f2216 Replace stdlib hmac with OpenSSL, zero-copy decrypt
AESKeyBase.decrypt makes less copies of the data, specifically data[41:],
which copies the payload, is gone. This is possible since this commit
makes our lil' crypto API compatible with simple buffers.

In Cython there is a syntax for creating memoryviews from buffer-enabled
objects, however, it doesn't support read-only buffers. ro_buffer gets
this job done, though, and also does the proper type checking
(by PyBUF_SIMPLE).

Note: msgpack doesn't support memoryviews. Otherwise we could avoid
      copying the en/de-crypted output with the final "return out[:ctl]"

This commit leads to a solid 10-15 % increase in performance of hash-lists
and extract.

The hmac_sha256() function releases the GIL.
2016-03-27 01:12:23 +01:00
TW
1787cf1c67 Merge pull request #783 from Ape/pr/improved_diff_format
Improved diff format
2016-03-26 23:06:59 +01:00
Lauri Niskanen
d5f045379d Add Lauri Niskanen to AUTHORS 2016-03-26 23:51:45 +02:00
Lauri Niskanen
4eba7d38ea Preserve archive order of added and removed files 2016-03-26 23:51:45 +02:00
Lauri Niskanen
1d3e69e4c7 Improve 'borg diff' output format
The main design goals of the new format:
 - One file takes exactly one line of output
 - The format is easy to read with typical, long list of changes
 - Metadata changes are visible and easy to examine
 - Unuseful information is not shown

Resolves #757.
2016-03-26 23:50:03 +02:00
Lauri Niskanen
c405122753 Add option for an explicit sign in sizeof_fmt functions in helpers 2016-03-26 23:49:24 +02:00
TW
db171e998e Merge pull request #777 from enkore/feature-ctxmng
Feature ctxmng: Repository context manager
2016-03-26 21:34:06 +01:00
TW
7225def75c Merge pull request #803 from borgbackup/1.0-maint
merge 1.0 maint
2016-03-26 17:51:12 +01:00
TW
bf208479d7 Merge pull request #801 from ThomasWaldmann/cosmetic-fix
fix capitalization, add ellipses, change log level to debug for 2 mes…
2016-03-26 17:16:13 +01:00
TW
74f15e239c Merge pull request #800 from ThomasWaldmann/vagrant-xenial
vagrant: add ubuntu/xenial 64bit
2016-03-26 17:15:11 +01:00
Thomas Waldmann
3e120378e0 fix capitalization, add ellipses, change log level to debug for 2 messages, fixes #798 2016-03-26 14:31:54 +01:00
Thomas Waldmann
54b7ac66e8 Merge branch 'lfam-packaged-for-guix' 2016-03-26 14:21:10 +01:00
Thomas Waldmann
d6b85a6a3b Merge branch 'packaged-for-guix' of https://github.com/lfam/borg into lfam-packaged-for-guix 2016-03-26 14:20:48 +01:00
Thomas Waldmann
cd3c36780a vagrant: add ubuntu/xenial 64bit
this box has still some issues, but hopefully they will be fixed soon.
2016-03-26 14:14:15 +01:00
TW
a7063991ca Merge pull request #799 from wormingdead/master
Your project's blurry logo drove me to correct it. I found the font in Google's database.
2016-03-26 12:56:22 +01:00
wormingdead
f5ea7f5643 Document logo font. Recreate logo png. Remove GIMP logo file. 2016-03-25 22:43:29 -07:00
TW
9068a40e2e Merge pull request #794 from infectormp/patch-1
Installation: Mention Gentoo package
2016-03-25 13:35:13 +01:00
infectormp
7412e30977 Installation: Mention Gentoo package
docs/installation.rst: Add Gentoo package to list of distribution packages.
2016-03-25 09:21:18 +03:00
lfam
587abf5376 Installation: Mention GNU Guix package.
* docs/installation.rst: Add GNU Guix package to list of distribution packages.
2016-03-25 00:13:24 -04:00
Marian Beermann
7caec0187f Make Repository a context manager, use decorators for wrapping withs
(Remote)Repository.close() is not a public API anymore, but a private
API. It shall not be used from within other classes than Repository
or it's tests. The proper way is to use a context manager now. However,
for RPC/Remote compatibility with Borg 1.0 it is kept and unchanged.

Repositories are not opened by __init__ now anymore, it is done
by binding it to a context manager. (This SHOULD be compatible both ways
with remote, since opening the repo is handled by a RepositoryServer method)

Decorators @with_repository() and @with_archive simplify
context manager handling and remove unnecessary indentation.
2016-03-23 00:41:15 +01:00
Thomas Waldmann
601313836d Merge branch 'master' of github.com:borgbackup/borg 2016-03-21 16:14:24 +01:00
Thomas Waldmann
de7582a9d7 Merge branch '1.0-maint' 2016-03-21 16:13:08 +01:00
Thomas Waldmann
40dbb7411c fix cygwin requirements (gcc-g++) 2016-03-21 16:11:43 +01:00
TW
42beb2dc92 Merge pull request #785 from pyhalov/illumos-build-1.0
Fix build on illumos
2016-03-21 16:07:52 +01:00
TW
e435a5ac41 Merge pull request #784 from pyhalov/doors-1.0
Don't try to backup doors or event ports (Solaris and derivates).
2016-03-21 16:04:35 +01:00
Alexander Pyhalov
f63be63347 Fix build on illumos 2016-03-21 17:39:55 +03:00
Alexander Pyhalov
e98f823f34 Don't try to backup doors or event ports 2016-03-21 17:35:51 +03:00
TW
2f7d8aaffb Merge pull request #778 from borgbackup/1.0-maint
merge 1.0 maint
2016-03-19 22:02:57 +01:00
Thomas Waldmann
f486a6772c do not sleep for >60s while waiting for lock, fixes #773 2016-03-19 21:19:30 +01:00
TW
ba68c17ccd Merge pull request #767 from enkore/feature-diff-docs
Update usage docs (diff and list)
2016-03-18 16:28:51 +01:00
Marian Beermann
9cf129935e borg diff help: clarify: for new archives different chunker params still require content compare 2016-03-18 15:42:32 +01:00
Marian Beermann
e64d91b735 Update borg diff help message regarding --same-chunker-params 2016-03-18 13:30:39 +01:00
Marian Beermann
0e9aea2660 Update borg diff example 2016-03-18 13:30:02 +01:00
Marian Beermann
343d84b427 ItemFormatter: group keys in help output 2016-03-18 13:29:49 +01:00
Marian Beermann
89120a9843 Update usage docs 2016-03-18 12:17:57 +01:00
TW
77dfcbc31d Merge pull request #763 from enkore/issue-761
fix links failing for extracting subtrees, fixes #761
2016-03-18 00:46:39 +01:00
Marian Beermann
9211d0fa18 borg extract: fix links failing for sub-tree extractions
fixes #761
2016-03-17 22:39:57 +01:00
TW
15c20dcd37 Merge pull request #759 from nachtgeist/public
refactor get_home_dir
2016-03-17 18:11:19 +01:00
TW
61db791f02 Merge pull request #751 from enkore/feature-newlist
ItemFormatter for printing items, borg list redo.
2016-03-17 18:10:54 +01:00
Marian Beermann
4151db270c Redo borg list
- This is compatible except for {formatkeys}, which has been replaced
  by "borg list --help"
- --list-format is deprecated, use --format instead
  (using deprecated arguments will print a warning and an exit code of 1)
- borg list now supports the usual [PATH [PATHS…]] syntax and excludes
- Additional keys: csize, num_chunks, unique_chunks, NUL
- Supports guaranteed_available hashlib hashes
  (to avoid varying functionality depending on environment)
  (also, the other hashes are really obscure, like MD-4)
2016-03-17 17:32:23 +01:00
Daniel Reichelt
9adf13d8b9 add changes from running build_api and build_usage 2016-03-17 14:35:56 +01:00
Daniel Reichelt
6dd5f6a179 refactor retrieval of a user's home into get_home_dir() 2016-03-17 14:35:56 +01:00
TW
220d44b2b8 Merge pull request #745 from nachtgeist/public
provide wrapper for borg mount, fixes #743
2016-03-17 01:58:57 +01:00