Show ctime and mtime on borg diff. Fixes #7248 (Backport of #7335)#7414
Conversation
--- - Added assert_line_exists helper in BaseTestCase - JSON strings in diff output are now sorted alphabetically - Modified diff test cases to confirm to new output format - Added a test case to test ctime and mtime inclusion - Mode, ctime & mtime are now only displayed on diff if --content-only flag is used
Michael-Girma
force-pushed
the
backport/1.2-maint-7248
branch
from
535ce0d to
6c042d7
Compare
|
Did you see the tests are failing? |
|
BTW: I likely will do a 1.2.4 release soon. |
|
@ThomasWaldmann was away from my rig. Taking a look now. |
|
@ThomasWaldmann couldn't recreate the issue locally. I tried with py39, py39-fuse2, py39-fuse3, py310, py310-fuse2, py310-fuse3 System information.Operating system (distribution) and version.Ubuntu 22.04.1 LTS Hardware / network configuration, and filesystems used.Intel® Core™ i5-8300H CPU @ 2.30GHz × 8 Full borg commandline that lead to the problem (leave away excludes and passwords)python setup.py clean clean2 |
|
I restarted the CI, let's see if it happens again. |
|
Ahh, able to recreate after pulling in latest 1.2-maint. Taking a look |
|
Getting two entries for a single file path on both text and JSON outputs. I couldn't get a hint as to why this happens (especially why it's only on linux). Any idea why this might be @ThomasWaldmann? |
|
@ThomasWaldmann Figured out why we're having double entries. Shouldn't the last line be referencing the item's path as opposed to just path? Since it's referring to path when addressing deferred items, it adds a tuple with the path of the last seen item, leading to two entries for a single item. Changing it to quick edit:
|
|
@Michael-Girma congrats, you found a bug! I think right above that line, there should be a And then it should use Can you check master for that problem and if present there, make a separate bugfix PR just for that? |
|
I just checked: due to the simplifications in master related to "hardlink masters", that code is not present any more. So guess it is fine if you just fix it here, in a separate commit please. |
Codecov Report
📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more @@ Coverage Diff @@
## 1.2-maint #7414 +/- ##
=============================================
- Coverage 82.43% 82.40% -0.04%
=============================================
Files 38 38
Lines 10596 10626 +30
Branches 2035 2040 +5
=============================================
+ Hits 8735 8756 +21
- Misses 1322 1330 +8
- Partials 539 540 +1
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
I think these change types are only displayed if the flag is not used. |
4 participants
Show ctime and mtime on borg diff. Fixes #7248 (Backport of #7335)