Skip to content

Conversation

@ThomasWaldmann
Copy link
Member

@ThomasWaldmann ThomasWaldmann commented Oct 12, 2025

Port of #9005 to master.

@ThomasWaldmann ThomasWaldmann changed the title Port #8998 to master diff: --sort-by=field[,field,...], fixes #8998 Oct 18, 2025
@codecov
Copy link

codecov bot commented Oct 18, 2025

Codecov Report

❌ Patch coverage is 82.19178% with 13 lines in your changes missing coverage. Please review.
✅ Project coverage is 81.05%. Comparing base (eba3f8c) to head (5c44dad).
⚠️ Report is 12 commits behind head on master.

Files with missing lines Patch % Lines
src/borg/archiver/diff_cmd.py 83.33% 4 Missing and 8 partials ⚠️
src/borg/archiver/__init__.py 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #9062      +/-   ##
==========================================
+ Coverage   80.94%   81.05%   +0.11%     
==========================================
  Files          77       77              
  Lines       13563    13632      +69     
  Branches     2015     2039      +24     
==========================================
+ Hits        10978    11049      +71     
+ Misses       1919     1910       -9     
- Partials      666      673       +7     

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

@ThomasWaldmann ThomasWaldmann force-pushed the port-8998-master branch 4 times, most recently from a3ab6d3 to b107117 Compare October 21, 2025 00:38
previously, it also matched on --sort-by when it only should have matched on --sort.
use borg diff --sort-by=spec1,spec2,spec2 for enhanced sorting.

remove legacy --sort behaviour (sort by path), this was deprecated
since 1.4.2.

Co-authored-by: Daniel Rudolf <[email protected]>

This is a port of borgbackup#9005 to master branch.
@ThomasWaldmann ThomasWaldmann merged commit 1b4a380 into borgbackup:master Nov 3, 2025
13 checks passed
@ThomasWaldmann ThomasWaldmann deleted the port-8998-master branch November 3, 2025 22:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant