mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-23 14:41:43 +00:00
Code Issues Releases Wiki Activity
3635 commits 9 branches 139 tags 63 MiB
Commit graph

3635 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Waldmann
8d432b01e1 paperkey.html - decode as utf-8, fixes #2150 
hardcoded the encoding for reading it. while utf-8 is the default
encoding on many systems, it does not work everywhere.

and when it tries to decode with the ascii decoder, it fails.
 2017-02-13 21:24:34 +01:00
Marian Beermann
11318c94dc add paperkey.html to pyinstaller spec 2017-02-13 21:24:34 +01:00
Marian Beermann
44798e0edd setup.py: build_api: sort file list for determinism 
# Conflicts:
#	docs/api.rst
#	setup.py

Original-Commit: e208d115
 2017-02-13 21:24:33 +01:00
Marian Beermann
1fabb2df58 key export: center QR code on the page 2017-02-13 21:24:33 +01:00
Marian Beermann
04bd6fb013 add test for export key --qr-html 2017-02-13 21:24:33 +01:00
Marian Beermann
79dd920661 update CHANGES (1.0.10) 
# Conflicts:
#	docs/changes.rst

Original-Commit: e635f219
 2017-02-13 21:24:33 +01:00
Benedikt Heine
2cdb583879 clearify doc for same filesystems 
# Conflicts:
#	src/borg/archiver.py

Original-Commit: d3a2f36b03
 2017-02-13 21:24:33 +01:00
Martin Hostettler
179f1bc147 Add qr html export mode to key export command 2017-02-13 21:24:33 +01:00
Martin Hostettler
e0f36e8613 quickstart.rst: Add link to paperkey template. 2017-02-13 20:45:49 +01:00
Martin Hostettler
b44882d10c paperkey.html: Add interactive html template for printing key backups. 2017-02-13 20:45:46 +01:00
Martin Hostettler
fb44362c95 Add myself to AUTHORS 
# Conflicts:
#	AUTHORS

Original-Commit: bd8be26
 2017-02-13 20:45:19 +01:00
Martin Hostettler
32e73e8c7e Manifest: Make sure manifest timestamp is strictly monotonically increasing. 
Computer clocks are often not set very accurately set, but borg
assumes manifest timestamps are never going back in time.

Ensure that this is actually the case.

# Conflicts:
#	src/borg/helpers.py

Original-Commit: 6b8cf0a
 2017-02-13 20:43:57 +01:00
enkore
ab52ce38f3 Merge pull request #2145 from enkore/f/manpages 
manpages part two
 2017-02-12 22:55:23 +01:00
Marian Beermann
e4486cd370 fix rST warning in Repository.scan 2017-02-12 18:51:41 +01:00
Marian Beermann
0971fdce8d docs: changes: fix two rST warnings 2017-02-12 18:51:41 +01:00
Marian Beermann
847797b477 update development.rst for docs changes 2017-02-12 18:51:41 +01:00
Marian Beermann
95b69a433c docs: usage: remove not-updated-anymore debug* files. 2017-02-12 18:51:41 +01:00
Marian Beermann
96fa1e8414 docs: define "ours" merge strategy for auto-generated files 2017-02-12 18:51:40 +01:00
Marian Beermann
1d9378f12c man pages: generate page for subparsers, eg. borg-key(1) 
Conflicts:
	docs/man/borg-key.1
 2017-02-12 15:28:59 +01:00
Marian Beermann
fa24e1f38f man pages: add borg(1) master/intro page 2017-02-12 15:28:59 +01:00
Marian Beermann
15dfaae223 docs: create: move --exclude note to main doc 2017-02-12 15:28:59 +01:00
Marian Beermann
0710bbd40e docs: create: move item flags to main doc 2017-02-12 15:28:58 +01:00
Marian Beermann
497da8df04 docs: init: fix markup/typos 2017-02-12 15:27:06 +01:00
enkore
f6732b62fd Merge pull request #2114 from textshell/feature/debug-dump-json 
Add 'debug dump-manifest' and 'debug dump-archive' commands.
 2017-02-11 20:19:04 +01:00
Martin Hostettler
e8335dba0f archiver: Add 'debug dump-manifest' and 'debug dump-archive' commands. 2017-02-10 22:56:54 +01:00
enkore
bb94ab7118 Merge pull request #2127 from enkore/f/manpages 
Man pages
 2017-02-05 22:13:19 +01:00
Marian Beermann
1d91d2699c commit man pages 2017-02-05 15:46:46 +01:00
Marian Beermann
d6a26ca26d docs: fix examples using borg init without -e/--encryption 2017-02-05 15:46:46 +01:00
Marian Beermann
7e486074e8 docs: list: don't print key listings in fat (html + man) 2017-02-05 15:46:46 +01:00
Marian Beermann
83bb25d848 man pages: add EXAMPLES 
hacky, but works. Better would be to make a separate docs/examples dir
with only the examples in them, separated by command.

Or, putting these different sections; DESCRIPTION, EXAMPLES and NOTES
into the --help doc, but separately of course, so that they can be aptly
formatted for different media (html, --help, man).
 2017-02-05 15:46:46 +01:00
Marian Beermann
e5ea876f90 man pages: remove reference to borg(1) -- would have to be written first 
A compact introduction and perhaps a condensed quickstart would
be good for borg(1).
 2017-02-05 15:46:44 +01:00
Marian Beermann
c7106e756e create real nice man pages 2017-02-05 15:46:09 +01:00
enkore
c6de2615f2 Merge pull request #2124 from enkore/f/keycmds 
Move migrate-to-repokey, change-passphrase to key group
 2017-02-05 01:04:54 +01:00
Marian Beermann
5bc03cc042 migrate-to-repokey: ask using canonical_path() as we do everywhere else 2017-02-04 15:16:18 +01:00
Marian Beermann
4e0422cdf0 Move change-passphrase to the "key" group (but leave old name, too) 2017-02-04 15:10:45 +01:00
Marian Beermann
5fe32866e6 Move migrate-to-repokey to the "key" command group 2017-02-04 15:10:45 +01:00
TW
c6ea34be96 Merge pull request #2111 from ThomasWaldmann/merge-1.0-maint 
Merge 1.0-maint
 2017-02-01 12:13:37 +01:00
enkore
f52bf883c3 Merge pull request #2010 from costela/master 
change dir_is_tagged to use os.path.exists()
 2017-02-01 00:53:36 +01:00
TW
3dbf6218f0 Merge pull request #2116 from rciorba/fix_skip_hint 
fix wrong skip_hint on hashindex_set when encountering tombstones
 2017-01-31 00:51:19 +01:00
Radu Ciorba
a85cf75465 fix wrong skip_hint on hashindex_set when encountering tombstones 
hashindex_lookup would always hint at skipping whatever it's probe
length had been with no regard for tombstones it had encountered. This
meant new keys would not overwrite first tombstones, but would always
land on empty buckets.

The regression was introduced in #1748
 2017-01-30 23:29:08 +02:00
Thomas Waldmann
7f2a108c94 fixup: do not access os.POSIX_FADV_* early 
before we know posix_fadvise support exists on the platform.
 2017-01-30 03:11:42 +01:00
Leo Antunes
dd6b90fe6c change dir_is_tagged to use os.path.exists() 
Add --keep-exclude-tags option as alias to --keep-tag-files and
deprecate the later. Also make tagging accept directories as tags,
allowing things like `--exclude-if-present .git`.

fixes #1999
 2017-01-29 18:13:51 +01:00
Thomas Waldmann
e19537ff6f ran build_usage 2017-01-29 05:54:25 +01:00
Thomas Waldmann
c0dc644ef6 Merge branch '1.0-maint' into merge-1.0-maint 
# Conflicts:
#	MANIFEST.in
#	Vagrantfile
#	docs/changes.rst
#	docs/usage/mount.rst.inc
#	src/borg/archiver.py
#	src/borg/fuse.py
#	src/borg/repository.py
 2017-01-29 05:49:53 +01:00
TW
d23dbb47ba Merge pull request #2110 from ThomasWaldmann/release-1.0.10rc1 
release 1.0.10rc1
 2017-01-29 03:39:33 +01:00
Thomas Waldmann
e6c1931d47 ran build_usage 2017-01-28 23:36:56 +01:00
TW
62526149e6 Merge pull request #2090 from ThomasWaldmann/update-1.0-changes 
update CHANGES (1.0-maint)
 2017-01-28 23:28:56 +01:00
Thomas Waldmann
dc3492642d update CHANGES (1.0-maint) 2017-01-28 23:26:25 +01:00
TW
2c1751cbd5 Merge pull request #2104 from ThomasWaldmann/fix-fadvise-fail 
Work around fadvise fail
 2017-01-28 23:10:16 +01:00
Thomas Waldmann
add38e8cde ignore posix_fadvise errors in repository.py, work around #2095 
note: we also ignore the call's return value in _chunker.c.

both is harmless as the call not working does not cause incorrect function,
just worse performance due to constant flooding of the cache (as if we
would not issue the call).
 2017-01-28 22:38:25 +01:00