Merge pull request #3350 from milkey-mouse/list-format-aliases-bp1.1

Clarify key aliases for borg list --format (1.1 backport)
This commit is contained in:
TW 2017-11-23 13:44:08 +01:00 committed by GitHub
commit df709a7678
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions

View File

@ -1647,20 +1647,20 @@ class BaseFormatter:
class ArchiveFormatter(BaseFormatter): class ArchiveFormatter(BaseFormatter):
KEY_DESCRIPTIONS = { KEY_DESCRIPTIONS = {
'name': 'archive name interpreted as text (might be missing non-text characters, see barchive)',
'archive': 'archive name interpreted as text (might be missing non-text characters, see barchive)', 'archive': 'archive name interpreted as text (might be missing non-text characters, see barchive)',
'name': 'alias of "archive"',
'barchive': 'verbatim archive name, can contain any character except NUL', 'barchive': 'verbatim archive name, can contain any character except NUL',
'comment': 'archive comment interpreted as text (might be missing non-text characters, see bcomment)', 'comment': 'archive comment interpreted as text (might be missing non-text characters, see bcomment)',
'bcomment': 'verbatim archive comment, can contain any character except NUL', 'bcomment': 'verbatim archive comment, can contain any character except NUL',
'time': 'time (start) of creation of the archive',
# *start* is the key used by borg-info for this timestamp, this makes the formats more compatible # *start* is the key used by borg-info for this timestamp, this makes the formats more compatible
'start': 'time (start) of creation of the archive', 'start': 'time (start) of creation of the archive',
'time': 'alias of "start"',
'end': 'time (end) of creation of the archive', 'end': 'time (end) of creation of the archive',
'id': 'internal ID of the archive', 'id': 'internal ID of the archive',
} }
KEY_GROUPS = ( KEY_GROUPS = (
('name', 'archive', 'barchive', 'comment', 'bcomment', 'id'), ('archive', 'name', 'barchive', 'comment', 'bcomment', 'id'),
('time', 'start', 'end'), ('start', 'time', 'end'),
) )
@classmethod @classmethod