upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-04-21 14:20:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
2394 commits 10 branches 151 tags 73 MiB
Commit graph

2394 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marian Beermann
90317bebbf
Merge branch 'master' into windows 
Also: platform_windows -> platform.windows
 2016-05-31 17:35:54 +02:00
enkore
bf5406d05a Merge pull request #1113 from enkore/feature/pltstr 
platform_base should use platform-provided implementations when needed
 2016-05-31 17:28:19 +02:00
Marian Beermann
0ca1a18b33
Make borg.platform a package 2016-05-31 15:38:56 +02:00
Marian Beermann
0333f91eb2 platform: rearrange imports 2016-05-31 15:38:16 +02:00
Marian Beermann
2d90bb2c55 Compose platform_base from the platform-specific functionality 
Noticed while working on the windows branch.
 2016-05-31 15:38:16 +02:00
enkore
a1c4d45920 Merge pull request #1112 from ThomasWaldmann/refactor-helper-imports 
split helpers import into multiple ones
 2016-05-31 15:07:14 +02:00
Marian Beermann
c600edfbeb
borg/platform_windows.pyx -> src/borg/platform_windows.pyx 2016-05-31 02:08:30 +02:00
Thomas Waldmann
d3deec9fc9 cleanup / reorder imports 
import stdlib
from stdlib import x

import 3rd party

import borg stuff
 2016-05-31 01:18:03 +02:00
Thomas Waldmann
49484d6d67 split helpers import into multiple ones 2016-05-31 00:33:13 +02:00
Marian Beermann
0b9b03b1d2 Merge branch 'master' into windows 2016-05-30 23:07:41 +02:00
Marian Beermann
c50c291e9f Merge branch 'master' into windows 
# Conflicts:
#	.gitignore
#	setup.py
 2016-05-30 23:07:30 +02:00
Thomas Waldmann
d62f55158e sphinx: fix sys.path so it finds the borg package 2016-05-30 23:00:33 +02:00
TW
0aec338761 Merge pull request #1016 from ThomasWaldmann/move-to-src 
move to src/
 2016-05-30 22:50:12 +02:00
enkore
a4d1dcff81 Merge pull request #1110 from enkore/feature/win-installer 
windows: Add setup wizard
 2016-05-30 22:17:13 +02:00
Thomas Waldmann
c15787852a tox.ini: remove changedir 2016-05-30 22:10:03 +02:00
Marian Beermann
82bcb039cb
Add setup wizard 
$ python3 deployment/windows/buildwin32.py
...
$

Fire ISS up, build installer. Result is in Output directory.
Should be around ~4 MB
 2016-05-30 21:53:06 +02:00
enkore
5ed1c6f906 Merge pull request #1109 from enkore/windows 
Merge branch 'master' into windows
 2016-05-30 19:42:11 +02:00
Thomas Waldmann
7e0ea1635a Merge branch 'master' into move-to-src 2016-05-30 19:41:30 +02:00
Marian Beermann
51dc9f1e8b
platform_windows: sync_dir = no-op for now 
*scratches head again about inheritance vs. composition*

*thinks that composition would be more apt, but hasn't yet reached
 conclusion on how to implement it nicely here*
 2016-05-30 19:39:03 +02:00
Thomas Waldmann
045e5a1203 Merge branch 'master' into move-to-src 2016-05-30 19:38:16 +02:00
Marian Beermann
a5b7f36918
platform_windows: API_VERSION=3 2016-05-30 19:34:19 +02:00
Marian Beermann
885a5c9868
Merge branch 'master' into windows 2016-05-30 19:28:31 +02:00
TW
6b666b217b Merge pull request #1108 from ThomasWaldmann/nitpicks 
log format tests: be more clear about new and old
 2016-05-30 19:21:05 +02:00
Thomas Waldmann
76d429edd3 log format tests: be more clear about new and old 2016-05-30 18:57:57 +02:00
TW
479819efa0 Merge pull request #1096 from edgewood/simplify_remote_logging_test 
Break out remote log and stderr handling code to simplify testing
 2016-05-30 18:47:33 +02:00
TW
e69bc362e5 Merge pull request #858 from enkore/issue/843 
Auto-recover from corrupted index/hints file(s)
 2016-05-30 17:15:23 +02:00
enkore
ed4d2965cf Merge pull request #1037 from Anakonda/windows 
Windows file permissions
 2016-05-29 23:05:00 +02:00
enkore
1ec149fe27 Merge pull request #1095 from Voltara/master 
RemoteRepository: Fix busy wait in call_many, fixes #940
 2016-05-29 22:41:22 +02:00
Marian Beermann
d1ce746a02
borg.hashindex: use PyErr_SetFromErrnoWithFilename 
instead of home-grown (i.e. not medical grade) OSError raising.
 2016-05-29 19:52:56 +02:00
Marian Beermann
9ebb37cab8
testsuite/repository: fixup for 7a569bc 2016-05-29 18:51:13 +02:00
enkore
3be3de7032 Merge pull request #1097 from RonnyPfannschmidt/header-fix 
obtain ioctl from sys/ioctl.h as per manpage
 2016-05-29 00:50:03 +02:00
Ronny Pfannschmidt
7b564e518d obtain ioctl from sys/ioctl.h as per manpage 
fixed build failure on fedora
 2016-05-28 23:51:13 +02:00
Ed Blackman
d42f1e691a Break out remote log and stderr handling code to simplify testing 
May fix issue 1081, but that issue is hard to reproduce.
 2016-05-27 23:09:46 -04:00
Marian Beermann
1f33861fd6 Repository: better error reporting for index/hints failures 2016-05-27 22:25:15 +02:00
Marian Beermann
d979a84f37 Handle permission and similar errors on the index 2016-05-27 22:24:01 +02:00
Marian Beermann
252c1b9802 Auto-recover from corrupted index/hints file(s) 
And don't swallow all OSErrors when creating archives. We need to work on
that on a more general level...
 2016-05-27 22:24:01 +02:00
TW
f51715223a Merge pull request #1041 from enkore/feature/newcompact 
Repository: compact v2
 2016-05-27 22:06:48 +02:00
Andrew Skalski
731f6241fa RemoteRepository: Fix busy wait in call_many, fixes #940 2016-05-25 18:26:55 -04:00
TW
7aed2d1d29 Merge pull request #1094 from enkore/stuff/tests 
Travis workers hate him: improve testing speed with one simple trick
 2016-05-26 00:14:03 +02:00
Marian Beermann
478a6f29b6
Lower PBKDF2 iteration count for the tests 
This cuts testing time to about one third for me.
 2016-05-25 22:29:57 +02:00
Marian Beermann
0e3bba7b64 Don't rebuild command line parser for each invocation 
Makes tests faster
 2016-05-25 22:01:38 +02:00
Marian Beermann
2806133902
testsuite/repository: test .compact, _build_sparse 2016-05-25 12:15:49 +02:00
Marian Beermann
4619f781d8 Terms, principles of Repository 2016-05-25 11:47:12 +02:00
Marian Beermann
b8d1bc1ca8 Repository: don't read+verify old entries for size retrieval 2016-05-25 11:47:12 +02:00
Marian Beermann
f99ad4ca6f Repository: compact v2 
- Track free space information for each sparse segment
- Don't compact large segments with little free space
 2016-05-25 11:47:12 +02:00
enkore
4302ffbdbc Merge pull request #1092 from ThomasWaldmann/fix-stdout 
fix crashing borg extract --stdout, fixes #1064
 2016-05-24 23:11:03 +02:00
TW
4c4aa64410 Merge pull request #1091 from ThomasWaldmann/swidth-fallback 
fall back to len() if wcswidth returns negative value
 2016-05-24 22:56:59 +02:00
Thomas Waldmann
9fff2af134 fix crashing borg extract --stdout, fixes #1064 2016-05-24 22:40:20 +02:00
Thomas Waldmann
c4c11d75a1 fall back to len() if wcswidth returns neg. value, fixes #1090 2016-05-24 22:18:14 +02:00
enkore
e134f652ce Merge pull request #1089 from enkore/fix/tox-yes-again 
fix tox build for environment-python != containing-python in yet-anot…
 2016-05-24 21:41:28 +02:00