1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-29 11:16:43 +00:00
Commit graph

4959 commits

Author SHA1 Message Date
TW
4cbcd98404
Merge pull request #3281 from SanskritFritz/master
Deleted options from #3226
2017-11-04 23:36:30 +01:00
SanskritFritz
afab6b4b53 Deleted options from #3226 2017-11-04 23:25:24 +01:00
TW
a25b2aca1f
Merge pull request #3278 from ThomasWaldmann/fix-diff-options
borg diff: remove tag-file options, fixes #3226
2017-11-04 23:15:30 +01:00
Thomas Waldmann
726ef118bc borg list: fix broken pipe handling, fixes #3245
always use sys.stdout.write as in main() we have replaced that with a
handler that deals with BrokenPipe exceptions.

all the encode / decode dance was just to remove surrogates,
but that is not needed as format_item already does remove surrogates.
2017-11-04 23:13:11 +01:00
Thomas Waldmann
67f6aaa52b borg diff: remove tag-file options, fixes #3226
they are not used for borg diff.
2017-11-04 22:46:28 +01:00
TW
9ebff91974
Merge pull request #3267 from ThomasWaldmann/fix-list-options
borg list: remove tag-file options, fixes #3226
2017-11-04 21:44:11 +01:00
TW
41ccd3d7d1
Merge pull request #3266 from ThomasWaldmann/set-bsdflags-last
set bsdflags last (include immutable flag), fixes #3263
2017-11-04 20:10:34 +01:00
TW
fcef52a5d8
Merge pull request #3230 from ThomasWaldmann/chunks-healthy-recreate-fix
recreate / chunks_healthy fixes
2017-11-04 20:07:24 +01:00
Thomas Waldmann
7aafcc517a recreate: move chunks_healthy when excluding hardlink master, fixes #3228 2017-11-04 18:39:00 +01:00
Thomas Waldmann
90186ad12b get rid of already existing invalid chunks_healthy metadata, see #3218 2017-11-04 18:39:00 +01:00
Thomas Waldmann
7211bb2211 get rid of chunks_healthy when rechunking, fixes #3218 2017-11-04 18:39:00 +01:00
TW
1fb154be06
Merge pull request #3234 from ThomasWaldmann/this-archive-stats
borg create: fix stats
2017-11-04 18:01:23 +01:00
TW
d1d5590444
Merge pull request #3269 from mrkmg/shell-completion-zsh-1.1.1
Added ZSH Shell Completion Script
2017-11-04 16:59:17 +01:00
TW
985d6c5b1a
Merge pull request #3268 from SanskritFritz/master
Add bash and fish shell auto-completions.
2017-11-04 16:56:17 +01:00
Kevin
0e67f1b6f3
Added ZSH Shell Completion Script
Added directly from upstream source at https://github.com/mrkmg/borgbackup-zsh-completion
2017-11-04 11:54:21 -04:00
Thomas Waldmann
702afa9e48 borg list: remove tag-file options, fixes #3226
they are not used for borg list.
2017-11-04 15:59:33 +01:00
SanskritFritz
d50f0ec90f Added bash and fish shell auto-completions. 2017-11-04 15:56:53 +01:00
Thomas Waldmann
2c6f9634bc set bsdflags last (include immutable flag), fixes #3263 2017-11-04 15:18:55 +01:00
TW
2e15c4dc10
Merge pull request #3246 from ThomasWaldmann/fix-old-server-hack
remove evil trailing comma, fixes #3244
2017-11-04 13:44:11 +01:00
Thomas Waldmann
427e2ca5fb borg create: fix stats
master branch only (not present in 1.1-maint):

stats were computed at 2 different places, but the summing up was missing.
2017-11-02 18:06:39 +01:00
Thomas Waldmann
117d30d171 remove evil trailing comma, fixes #3244
value type of compatMap is a tuple of strings.

due to the trailing comma, this was a 1-tuple of a tuple of strings.
2017-11-02 16:03:55 +01:00
TW
4a58310433
Merge pull request #3235 from NiklasMM/feat/2886_prune-show-which-rule-keeps-archive
prune: Show which rule was applied to keep archive
2017-11-01 13:40:17 +01:00
Niklas Meinzer
14782a831b prune: Show which rule was applied to keep archive
Prune now shows for each kept archive:
 * Which rule is responsible for keeping this archive
 * How many archived have been kept by this rule so far

Ref #2886
2017-11-01 13:01:00 +01:00
Simon Frei
b148a366fe fuse: Separate creation of filesystem from implementation of llfuse funcs (#3042)
fuse: Separate creation of filesystem from implementation of llfuse funcs
2017-11-01 03:02:25 +01:00
TW
ddecd4b618
Merge pull request #3182 from TBurchfield/master
Removal of |project_name|.
2017-11-01 02:41:02 +01:00
TW
c640e3815b
Merge pull request #3236 from narendravardi/borg_config_dir_documentation
Added documentation for BORG_CONFIG_DIR
2017-10-30 06:49:43 +01:00
narendravardi
764a62f42c Added documentation for BORG_CONFIG_DIR 2017-10-29 21:52:33 +05:30
TW
2b79aade36
Merge pull request #3231 from ThomasWaldmann/flake8-fix
flake8: add some ignores
2017-10-29 11:44:39 +01:00
Thomas Waldmann
bb1c7a7f57 flake8: add some ignores 2017-10-29 11:39:13 +01:00
TW
926b1c6374
Merge pull request #3212 from ThomasWaldmann/stat-after-match
don't do stat() when not recursing into excluded dir, fixes #3209
2017-10-28 13:31:47 +02:00
TW
c0b9058759 Merge pull request #3217 from narendravardi/add_borg_config_dir
add BORG_CONFIG_DIR env, fixes #3083
2017-10-27 11:34:29 +02:00
TW
5b1a170ec2 Merge pull request #3219 from milkey-mouse/keyfile-docs
Clarify using a blank passphrase in keyfile mode
2017-10-26 07:29:57 +02:00
Milkey Mouse
87a9952f3b
Clarify using a blank passphrase in keyfile mode 2017-10-25 19:42:02 -07:00
Narendra Vardi
a3f1e6e250 added unittest for get_config_dir function 2017-10-25 23:07:45 +05:30
Narendra Vardi
56fed4f964 add BORG_CONFIG_DIR env (#3083) 2017-10-24 08:34:35 +05:30
Thomas Waldmann
36f2a4e1dc mention "!" (exclude-norecurse) type in patterns help 2017-10-24 03:18:40 +02:00
Thomas Waldmann
0c410e84fe don't do stat() when not recursing into excluded dir, fixes #3209
also: fix exception handling for the stat() calls

just moving all these lines into the "try"-block below (like it was in 1.0).
2017-10-24 03:17:41 +02:00
TW
46c071ca47 Merge pull request #3208 from ThomasWaldmann/fix-3205-master
arg parsing: fix fallback function, refactor, fixes #3205
2017-10-23 14:33:18 +02:00
Thomas Waldmann
ae91aff681 arg parsing: fix fallback function, refactor, fixes #3205
This is a fixup for #3155, which was broken on at least python <= 3.4.2.

Also clarify when to use which *func in set_defaults.

(cherry picked from commit 5ce4fa9704)
2017-10-22 23:45:04 +02:00
TW
152bb27663 Merge pull request #3193 from ThomasWaldmann/fix-4args-open
fix server-side IndexError for 4-arg open() of old clients, fixes #3192
2017-10-22 00:45:35 +02:00
TW
1d6ed506f1 Merge pull request #3198 from ThomasWaldmann/keyfile-abspath
fix crash with relative BORG_KEY_FILE, fixes #3197
2017-10-20 23:41:04 +02:00
TW
24fefbb0e0 Merge pull request #3190 from ThomasWaldmann/show-excluded-dirs
show excluded dir with "x" for tagged dirs / caches, fixes #3189
2017-10-20 21:16:51 +02:00
Thomas Waldmann
7136e2c93c fix crash with relative BORG_KEY_FILE, fixes #3197 2017-10-20 21:13:11 +02:00
TW
c91509e72b Merge pull request #3194 from Baughn/patch-1
Add Nix/NixOS install command
2017-10-20 18:46:10 +02:00
Svein Ove Aas
98443f15d5 Add Nix/NixOS install command 2017-10-20 17:08:10 +01:00
Thomas Waldmann
dbcc870489 fix server-side IndexError for 4-arg open() of old clients, fixes #3192
borg 1.1(.0) server didn't support the 4 argument open() calls made
by < 1.0.7 clients.
2017-10-20 16:47:32 +02:00
Thomas Waldmann
93de42bb25 show excluded dir with "x" for tagged dirs / caches, fixes #3189 2017-10-20 04:54:09 +02:00
TW
38dd1f11ac Merge pull request #3181 from ThomasWaldmann/hardlinked-symlink-warning
remove hardlinked symlink warning, update docs
2017-10-17 21:30:53 +02:00
8bit
8d830d069f Removed all |project_name
| instances, replaced with Borg
2017-10-17 11:50:55 -05:00
TW
c38657549e Merge pull request #3164 from ThomasWaldmann/no-bsdflags
implement --nobsdflags and --exclude-nodump
2017-10-17 18:49:57 +02:00