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

3219 Commits

Author SHA1 Message Date
TW 3a3cdadeba Merge pull request #1661 from ThomasWaldmann/update-1.0-changes 
update CHANGES
 2016-09-29 17:39:21 +02:00
Thomas Waldmann e124f3c67b update CHANGES 2016-09-29 17:16:57 +02:00
TW 2314d8b3f4 Merge pull request #1660 from ThomasWaldmann/merge-1.0-maint 
Merge 1.0 maint
 2016-09-29 13:34:49 +02:00
Thomas Waldmann ba30098079 Merge branch '1.0-maint' into merge-1.0-maint 2016-09-29 12:57:29 +02:00
enkore ab9d761c40 Merge pull request #1659 from ThomasWaldmann/fix-iterator 
hashindex: fix iterator implementation
 2016-09-29 11:13:10 +02:00
Thomas Waldmann 8fd0e07a1c hashindex: fix iterator implementation 
NSKeyIterator and ChunkKeyIterator raised StopIteration once only when they reached their end.

But they did not raise StopIteration if one called next() again after they were exhausted,
so they did not comply to the standard iterator protocol.

AFAIK, this did not cause actual problems due to the way these iterators are used,
but when I tried to use itertools.islice() to get n-long sequences from these iterators,
it failed / went into an endless loop.
 2016-09-29 04:41:59 +02:00
TW 62bec8ab1c Merge pull request #1652 from ThomasWaldmann/merge-1.0-maint 
Merge 1.0 maint
 2016-09-27 23:42:27 +02:00
Thomas Waldmann 186223ddef Merge branch '1.0-maint' into merge-1.0-maint 2016-09-27 23:21:46 +02:00
Thomas Waldmann 4838b9e110 vagrant: upgrade osxfuse to 3.5.2 2016-09-27 22:44:33 +02:00
Thomas Waldmann 47cf501bc1 Merge branch '1.0-maint' into merge-1.0-maint 2016-09-27 22:35:30 +02:00
Martin Hostettler fe9816d8d4 setup.py: Fix build_usage to always process all commands. 2016-09-27 22:34:19 +02:00
Thomas Waldmann 2a864be84f Merge branch '1.0-maint' into merge-1.0-maint 
# Conflicts:
#	setup.py
#	src/borg/archiver.py
#	src/borg/helpers.py
 2016-09-27 21:31:41 +02:00
textshell b84014e7d9 archiver: Add documentation for "key export" and "key import" commands. (#1641) 
archiver: Add documentation for "key export" and "key import" commands
 2016-09-27 15:24:31 +02:00
enkore ea9e859026 Merge pull request #1635 from enkore/issue/1624 
Fix broken --progress for double-cell paths
 2016-09-27 13:14:16 +02:00
Marian Beermann 9cef0a9ed8 Fix broken --progress ellipsis for double-cell paths 2016-09-27 11:35:45 +02:00
TW f2cc97da8d Merge pull request #1649 from ThomasWaldmann/upgrade-osxfuse 
vagrant: update FUSE for macOS
 2016-09-26 20:09:03 +02:00
Thomas Waldmann bb6c0cd2ac vagrant: update FUSE for macOS 2016-09-26 20:08:04 +02:00
TW 1449c31c03 Merge pull request #1646 from textshell/fix/key-import-tests 
Fix key import tests
 2016-09-26 20:02:10 +02:00
Martin Hostettler 15444b19d1 testsuite/archiver.py: Fix key import failure with ArchiverTestCaseBinary 2016-09-26 19:47:39 +02:00
Martin Hostettler 7c2025a2c0 testsuite/archiver.py: Add a comment how to easily test ArchiverTestCaseBinary locally. 2016-09-26 19:28:00 +02:00
enkore e9486ec348 Merge pull request #1643 from ThomasWaldmann/fix-1551 
fix closed FD issue, fixes #1551
 2016-09-26 09:30:49 +02:00
Thomas Waldmann 60c5482e6b fix closed FD issue, fixes #1551 2016-09-26 04:34:25 +02:00
TW 38819552df Merge pull request #1636 from textshell/feature/subcommands 
Use subcommands for debug-* and key-*
 2016-09-25 23:33:38 +02:00
TW 233ae43551 Merge pull request #1640 from ThomasWaldmann/improve-borg-help 
Re-Indent borg help helptexts, again.
 2016-09-25 23:26:01 +02:00
TW 43432f9a14 Merge pull request #1615 from enkore/issue/1598 
Fix #1598
 2016-09-25 23:09:47 +02:00
Thomas Waldmann bf681e98ce Re-Indent borg help helptexts, again. 2016-09-25 22:50:08 +02:00
TW f36d551092 Merge pull request #1634 from ThomasWaldmann/improve-compression-docs 
borg help compression, fixes #1582
 2016-09-25 22:42:56 +02:00
TW 995c3a2488 Merge pull request #1623 from ThomasWaldmann/yes-retries 
yes(): abort on wrong answers, saying so
 2016-09-25 22:34:32 +02:00
Marian Beermann 8164524d99 Fix broken --progress for double-cell paths 2016-09-25 22:18:37 +02:00
TW 6642dadfc6 Merge pull request #1631 from ThomasWaldmann/improve-signal-handling 
Improve signal handling
 2016-09-25 22:14:38 +02:00
TW 5d6d4a1bd9 Merge pull request #1639 from textshell/patch-1 
development.rst: Add sphinx_rtd_theme to the sphinx install command
 2016-09-25 21:56:17 +02:00
Martin Hostettler 4f9f25db02 development.rst: Add sphinx_rtd_theme to the sphinx install command 
It’s used by default, so install it as well.
 2016-09-25 21:45:15 +02:00
enkore 895deccb06 Merge pull request #1637 from ThomasWaldmann/merge-1.0-maint 
Merge 1.0 maint
 2016-09-25 18:22:56 +02:00
Thomas Waldmann d9b880fdf3 fix signal handling, fixes #1620 
use context manager for signal handler installation / restoration -
this includes the special case of installing handler SIG_IGN to ignore
a signal and restoring the original (non-ignoring) handler.

use SIG_IGN to avoid a 2nd signal interrupts the handling of the 1st signal.
 2016-09-25 17:59:26 +02:00
Thomas Waldmann 28c57f98c9 Merge branch '1.0-maint' 
# Conflicts:
#	src/borg/archive.py
#	src/borg/archiver.py
#	src/borg/helpers.py
#	src/borg/testsuite/archiver.py
 2016-09-25 17:30:55 +02:00
Martin Hostettler a11436cfb6 setup.py: Add subcommand support to build_usage. 2016-09-25 17:11:56 +02:00
Martin Hostettler 5c2424831e archiver: Create a subcommmand debug for all debug-* commands 
The debug commands all should subcommands of a common debug command.

This commit adds this command but keeps the old command names for 1.0.x.
The plan is to remove them in 1.1.0.
 2016-09-25 16:24:57 +02:00
Martin Hostettler 29b5136da7 archiver: Move key management commands to new key subcommand. 2016-09-25 16:24:57 +02:00
Marian Beermann 66316e10b9 Fix indentation in borg help compression 2016-09-25 11:53:54 +02:00
Marian Beermann 7b1f10347a Repository: compact: fix incorrect preservation of delete tags 2016-09-25 10:13:31 +02:00
Marian Beermann abace16945 Repository.check: log transaction IDs 2016-09-25 10:12:42 +02:00
Thomas Waldmann d6bfdafdef borg help compression, fixes #1582 2016-09-25 02:32:02 +02:00
TW b055bb025f Merge pull request #1616 from textshell/issue/1555 
Implement key import / export
 2016-09-24 15:54:46 +02:00
Martin Hostettler 55a3331942 Implement key import / export 
We recommed that users backup their keys, this adds simple to use commands
to do so.

Supported formats are the keyfile format used by borg internally and
a special format with by line checksums for printed backups.

For this format the import is an interactive process which checks
each line as soon as it is input.

Fixes #1555
 2016-09-24 12:55:34 +02:00
TW d3e79c4e49 Merge pull request #1625 from bauerj/master 
Change {utcnow} and {now} to ISO-8601 format
 2016-09-23 18:24:10 +02:00
Johann Bauer a56dc44e1f Change {utcnow} and {now} to ISO-8601 format 2016-09-23 17:58:04 +02:00
TW 79617d4e74 Merge pull request #1629 from ThomasWaldmann/fix-narrow-terminal-crash 
adapt formatting to narrow screens, do not crash, fixes #1628
 2016-09-23 03:30:02 +02:00
TW 3874d62264 Merge pull request #1604 from textshell/feature/remote-ratelimit 
Add --remote-ratelimit
 2016-09-23 02:59:00 +02:00
Thomas Waldmann 7e7dd9688d adapt formatting to narrow screens, do not crash, fixes #1628 
when screen width was too narrow, the {space} placeholder could get negative,
which crashes as it is a width specification.

now we simplify progress output if screen is narrow.
we stop output completely if screen is ridiculously narrow.
 2016-09-23 00:26:04 +02:00
Thomas Waldmann 7b9d0c9739 yes(): abort on wrong answers, saying so 
except for the passphrase display as we can only display it as long as we have it in memory,
here: retry, telling the user if he entered something invalid and needs to enter again.
 2016-09-22 02:43:57 +02:00