upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-09 17:00:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #9488 from ThomasWaldmann/archive-cwd-1.4

Browse source 
info: show cwd at the time of backup creation, fixes #6191
This commit is contained in:
TW 2026-03-16 21:58:54 +01:00 committed by GitHub
commit f452ad7fca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/borg/archive.py
View file

@ -555,6 +555,7 @@ class Archive:
cp = normalize_chunker_params(cp) if cp is not None else ''
info.update({
'command_line': self.metadata.cmdline,
'cwd': self.metadata.get('cwd', ''),
'hostname': self.metadata.hostname,
'username': self.metadata.username,
'comment': self.metadata.get('comment', ''),
@ -635,6 +636,7 @@ Utilization of max. archive size: {csize_max:.0%}
'username': getuser(),
'time': start.strftime(ISO_FORMAT),
'time_end': end.strftime(ISO_FORMAT),
'cwd': self.cwd,
'chunker_params': self.chunker_params,
}
# we always want to create archives with the addtl. metadata (nfiles, etc.),

1
src/borg/archiver.py
View file

@ -1567,6 +1567,7 @@ class Archiver:
Time (end): {end}
Duration: {duration}
Number of files: {stats[nfiles]}
Working Directory: {cwd}
Command line: {command_line}
Utilization of maximum supported archive size: {limits[max_archive_size]:.0%}
------------------------------------------------------------------------------

2
src/borg/constants.py
View file

@ -12,7 +12,7 @@ ARCHIVE_KEYS = frozenset(['version', 'name', 'items', 'cmdline', 'hostname', 'us
'comment', 'chunker_params',
'recreate_cmdline',
'recreate_source_id', 'recreate_args', 'recreate_partial_chunks', # used in 1.1.0b1 .. b2
'size', 'csize', 'nfiles', 'size_parts', 'csize_parts', 'nfiles_parts', ])
'size', 'csize', 'nfiles', 'size_parts', 'csize_parts', 'nfiles_parts', 'cwd', ])
# This is the set of keys that are always present in archives:
REQUIRED_ARCHIVE_KEYS = frozenset(['version', 'name', 'items', 'cmdline', 'time', ])

1
src/borg/item.pyx
View file

@ -390,6 +390,7 @@ class ArchiveItem(PropDict):
size_parts = PropDict._make_property('size_parts', int)
csize_parts = PropDict._make_property('csize_parts', int)
nfiles_parts = PropDict._make_property('nfiles_parts', int)
cwd = PropDict._make_property('cwd', str, 'surrogate-escaped str', encode=safe_encode, decode=safe_decode)
class ManifestItem(PropDict):

10
src/borg/testsuite/archiver.py
View file

@ -1710,6 +1710,16 @@ class ArchiverTestCase(ArchiverTestCaseBase):
info_repo = json.loads(self.cmd('info', '--json', '--last=1', self.repository_location))
assert info_repo["archives"] == []
def test_info_working_directory(self):
# create a file in input and create the archive from inside the input directory
self.create_regular_file('file1', size=1)
self.cmd('init', '--encryption=repokey', self.repository_location)
expected_cwd = os.path.abspath('input')
with changedir('input'):
self.cmd('create', self.repository_location + '::test', '.')
info_archive = self.cmd('info', self.repository_location + '::test')
assert f'Working Directory: {expected_cwd}' in info_archive
def test_comment(self):
self.create_regular_file('file1', size=1024 * 80)
self.cmd('init', '--encryption=repokey', self.repository_location)