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

3411 Commits

Author SHA1 Message Date
Martin Hostettler 6c1b337ce2 remote: Replace broken exception argument restoration with code that uses a fixed value. 2016-11-17 19:56:29 +01:00
Martin Hostettler d25e9aa4f0 remote: Use single quotes 2016-11-17 19:56:29 +01:00
Martin Hostettler 0da913f8ed remote: Decode method name as utf-8 instead of ascii for consistency. 2016-11-17 19:56:29 +01:00
Martin Hostettler c580d9c173 version: Add version parsing and formating 2016-11-17 19:56:29 +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 58024c0b1b Merge pull request #1850 from enkore/f/redpepper 
fixes for flake 3.1.1
 2016-11-14 22:28:47 +01:00
Marian Beermann c380d91805 fixes for flake 3.1.1 2016-11-14 21:50:20 +01:00
enkore cf8f8fb746 Merge pull request #1846 from Abogical/master 
Improve extract progress display, for #1721
 2016-11-14 21:43:35 +01:00
Abogical 34f529c7df satisfy codecov 2016-11-14 17:39:42 +02:00
Abogical 3896f26ab2 use monkeypatch 2016-11-14 16:41:37 +02:00
Abogical 76638d0562 If there is a small space for ellipsis_truncate, show '...' only 2016-11-14 15:16:14 +02:00
Abogical af925d2723 do not justify if we're not outputing to a terminal 2016-11-14 14:49:24 +02:00
Abogical 3232769ffc Respond to feedback 2016-11-14 11:43:46 +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
Thomas Waldmann 38fe61947e Merge branch '1.0-maint' 2016-11-14 03:22:36 +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
Abogical 1362d2e90f Set COLUMNS & LINES as if it was a terminal 2016-11-14 01:00:11 +02:00
Abogical 467fe38b15 Compatibility with python 3.4 2016-11-14 00:25:27 +02:00
Abogical b737866905 Improve extract progress display and ProgressIndicatorPercent 2016-11-13 23:41:01 +02:00
enkore ddb8839076 Merge pull request #1845 from enkore/merge/1.0-maint 
merge 1.0-maint
 2016-11-13 17:53:46 +01:00
Marian Beermann dfd748689c test_attic013_acl_bug: use def instead of lambda 2016-11-13 17:30:42 +01:00
Marian Beermann c2eb2539b9
Document maintenance merge command 2016-11-13 16:07:06 +01:00
Marian Beermann 0d2b76fa7d Merge branch '1.0-maint' into merge/1.0-maint 2016-11-13 15:58:42 +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 f568244a98 Merge pull request #1836 from enkore/f/smfsc 
repository: check_free_space, special case small repos
 2016-11-12 22:55:21 +01:00
Marian Beermann 00fae3f3e3
repository: check_free_space, special case small repos 2016-11-12 14:42:13 +01:00
enkore 80b86709ef Merge pull request #1833 from enkore/issue/1821 
borg init: fix free space check crashing if disk is full
 2016-11-12 01:23:34 +01:00
enkore e26348a055 Merge pull request #1834 from enkore/issue/1813 
Clarify cache/repository README file
 2016-11-11 21:25:30 +01:00
Marian Beermann bd4a0fe23b
Clarify cache/repository README file 2016-11-11 21:24:17 +01:00
enkore 01e56a8650 Merge pull request #1835 from enkore/f/sch-master 
debug, key: enable --help
 2016-11-11 19:55:48 +01:00
Marian Beermann ac5f9b61ec
debug, key: enable --help 
A small merge mishap in 2a864be8; 1.0-maint has it correctly.
 2016-11-11 19:54:11 +01:00
Marian Beermann 6c955579a8 repository: test_additional_free_space, assert it still exists 2016-11-11 16:39:11 +01:00
Marian Beermann 5b31a2cd61
borg init: fix free space check crashing if disk is full 2016-11-11 16:21:05 +01:00
enkore 223f7890fe Merge pull request #1819 from enkore/issue/1800 
Add BLAKE2b key types
 2016-11-11 03:11:38 +01:00
Marian Beermann a31ca4f022
crypto: link against system libb2, if possible 2016-11-11 03:08:11 +01:00
Marian Beermann 05ce8e0ff9 Add test script for blake2b_256 against CPython 3.6 hashlib 2016-11-11 03:07:05 +01:00