Repository navigation
diff: handle deleted_item in --sort-by attribute and timestamp diff keys, fixes #10610 - #10631
Open
shikhabhadoria wants to merge 1 commit into
Open
shikhabhadoria wants to merge 1 commit into
shikhabhadoria wants to merge 1 commit into
Conversation
Author
|
This PR is ready for review whenever convenient. |
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #10610.
In
Archive.compare_archives_iter(), the missing side ofItemDifffor added or removed items isItem(deleted=True)rather thanNone, andbool(Item(deleted=True))isTrue.In
DiffMixIn.do_diff()(src/borg/archiver/diff_cmd.py):d._item1whend._item2 is None or d._item2.get("deleted")so removed items sort by theirARCHIVE1attributes (user,group,uid,gid,ctime,mtime) instead of the dummy defaults.0forctime_diffandmtime_diffwhen either item isNoneor markeddeleted, matchingItemDiff._time_diffs().test_sort_by_deleted_and_added_itemsinsrc/borg/testsuite/archiver/diff_cmd_test.py.