Fixes #9495 preserve cwd archive metadata

[ebuzerdrmz44]

Description

borg transfer was not preserving the cwdarchive metadata from the source archive. Instead, the transferred archive would end up with the cwd of the machine running the transfer command.

This adds cwd to the kept attributes in both UpgraderNoOp and UpgraderFrom12To20, so the original value is carried over. Also added a check for it test_transfer_archive_metadata.

Fixes #9495

Checklist

• PR is against master (or maintenance branch if only applicable there)
• New code has tests and docs where appropriate
• Tests pass (run tox or the relevant test subset)
• Commit messages are clean and reference related issues

[ThomasWaldmann]

ok, guess that solves it for borg 1.4 archives that do have the cwd metadata (borg 1.4.4+).

but what happens if an older archive gets transferred that does not have the cwd metadata, what will be and what should be in the resulting archive?

[ebuzerdrmz44]

thanks for the review. I guess we shouldn't check cwd inside the for loop. After the loop, could we check it specifically, like getattr(metadata, "cwd", "")?

[ebuzerdrmz44]

But I'm not sure if "" is the best choice here . would you prefer leaving cwd unset or is that fine

[ThomasWaldmann]

if we can't know, having it unset might be the best choice. check if the code can cope with that.

[ebuzerdrmz44]

Turns out omitting cwd from additional_metadata wasn't enough . save() always falls back to self.cwd. Used None as a sentinel instead: upgraders pass cwd=None for archives without it, and save() drops the key when it sees None.

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 83.37%. Comparing base (1356aeb) to head (6b51f36).
⚠️ Report is 11 commits behind head on master.
✅ All tests successful. No failed tests found.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #9501      +/-   ##
==========================================
+ Coverage   83.36%   83.37%   +0.01%     
==========================================
  Files          87       87              
  Lines       15439    15448       +9     
  Branches     2309     2311       +2     
==========================================
+ Hits        12870    12880      +10     
  Misses       1818     1818              
+ Partials      751      750       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[ThomasWaldmann]

LGTM.

[ThomasWaldmann]

Thanks!