Add --format option to `borg diff`, resolve issue #4634 by RF-Tar-Railt · Pull Request #7440 · borgbackup/borg

RF-Tar-Railt · 2023-03-13T04:22:04Z

!!! warning
this pull request may cause conflict with #7414

…elete delete: remove --cache-only option, fixes #7440

RF-Tar-Railt · 2023-03-20T21:12:17Z

@ThomasWaldmann maybe you close the wrong pr! I guess #7449 is the issue you really want to close

ThomasWaldmann · 2023-03-20T21:43:41Z

Oops, you're right @RF-Tar-Railt, thanks for the hint!

ThomasWaldmann · 2023-03-30T14:00:52Z

BTW, you know you can run the test locally also? Just run tox(or e.g. tox -e flake8 for just the flake8 tests).

codecov-commenter · 2023-04-02T00:53:32Z

Codecov Report

Merging #7440 (38d7b51) into master (cca8280) will increase coverage by 0.07%.
The diff coverage is 93.85%.

❗ Current head 38d7b51 differs from pull request most recent head 08e69aa. Consider uploading reports for the commit 08e69aa to get more accurate results

📣 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             @@
##           master    #7440      +/-   ##
==========================================
+ Coverage   83.82%   83.90%   +0.07%     
==========================================
  Files          67       67              
  Lines       11849    11899      +50     
  Branches     2162     2175      +13     
==========================================
+ Hits         9933     9984      +51     
+ Misses       1341     1338       -3     
- Partials      575      577       +2

Impacted Files	Coverage Δ
src/borg/helpers/parseformat.py	`90.54% <92.75%> (-0.20%)`	⬇️
src/borg/archiver/diff_cmd.py	`94.82% <95.45%> (-1.10%)`	⬇️
src/borg/archive.py	`84.63% <100.00%> (+0.48%)`	⬆️
src/borg/archiver/list_cmd.py	`100.00% <100.00%> (ø)`
src/borg/archiver/prune_cmd.py	`87.05% <100.00%> (ø)`
src/borg/archiver/rlist_cmd.py	`100.00% <100.00%> (ø)`
src/borg/helpers/__init__.py	`100.00% <100.00%> (ø)`

... and 4 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

ThomasWaldmann · 2023-04-03T13:11:28Z

Can you check why this fails on windows?

>           assert "input/hardlink_target_removed" in output  # FIXME: unknown perf in other platforms
E           assert 'input/hardlink_target_removed' in "--chunker-params might be different between archives, diff will be slow.\r\nIf you know for certain that they are the same, pass --same-chunker-params to override this check.\r\nmodified:  (can't get size) input/file_replaced\r\nchanged link                input/link_changed\r\nmodified:  (can't get size) input/empty\r\nmodified:  (can't get size) input/hardlink_contents_changed\r\nadded directory             input/dir_added\r\nadded link                  input/link_added\r\nadded:                  0 B input/file_empty_added\r\nadded:              2.05 kB input/file_added\r\nadded:              2.05 kB input/hardlink_added\r\nremoved link                input/link_removed\r\nremoved directory           input/dir_removed\r\nremoved:              512 B input/file_removed2\r\nremoved:              256 B input/file_removed\r\nremoved:              256 B input/hardlink_removed\r\n"
src/borg/testsuite/archiver/diff_cmd.py:133: AssertionError

os.link should work on windows, hardlinks are supported.

RF-Tar-Railt · 2023-04-03T13:17:49Z

Can you check why this fails on windows?


>           assert "input/hardlink_target_removed" in output  # FIXME: unknown perf in other platforms

E           assert 'input/hardlink_target_removed' in "--chunker-params might be different between archives, diff will be slow.\r\nIf you know for certain that they are the same, pass --same-chunker-params to override this check.\r\nmodified:  (can't get size) input/file_replaced\r\nchanged link                input/link_changed\r\nmodified:  (can't get size) input/empty\r\nmodified:  (can't get size) input/hardlink_contents_changed\r\nadded directory             input/dir_added\r\nadded link                  input/link_added\r\nadded:                  0 B input/file_empty_added\r\nadded:              2.05 kB input/file_added\r\nadded:              2.05 kB input/hardlink_added\r\nremoved link                input/link_removed\r\nremoved directory           input/dir_removed\r\nremoved:              512 B input/file_removed2\r\nremoved:              256 B input/file_removed\r\nremoved:              256 B input/hardlink_removed\r\n"

src/borg/testsuite/archiver/diff_cmd.py:133: AssertionError

os.link should work on windows, hardlinks are supported.

I'm not sure about this

In old version

# Another link (marked previously as the source in borg) to the
                # same inode was removed. This should only change the ctime since removing
                # the link would result in the decrementation of the inode's hard-link count.
                assert "input/hardlink_target_removed" not in output

which should be the correct behave?

ThomasWaldmann

some stuff I noticed.

src/borg/archiver/diff_cmd.py

src/borg/helpers/parseformat.py

src/borg/item.pyx

src/borg/testsuite/archiver/diff_cmd.py

ThomasWaldmann · 2023-04-03T15:02:20Z

BTW, you work in your master branch, this has the issue of not being able to update your master to the state seen in upstream repo master.

I'ld recommend to read/follow #7495.

RF-Tar-Railt · 2023-04-03T15:10:54Z

BTW, you work in your master branch, this has the issue of not being able to update your master to the state seen in upstream repo master.

github can keep the latest states for the fork repo, is it relevant to this?

ThomasWaldmann · 2023-04-03T15:12:32Z

@RF-Tar-Railt i think it is always relevant, otherwise you'll get in the way of yourself.

ThomasWaldmann · 2023-04-08T16:20:15Z

Oops, looks like I did not resolve the merge conflict correctly: the json parameter has to be removed.

RF-Tar-Railt · 2023-04-08T16:22:16Z

Oops, looks like I did not resolve the merge conflict correctly: the json parameter has to be removed.

I'll try to fix it...

I noticed that，and I'm doing some fix

RF-Tar-Railt · 2023-04-08T16:41:21Z

maybe fixed in 0a1aaa8

src/borg/archiver/diff_cmd.py

src/borg/archiver/rlist_cmd.py

ThomasWaldmann

another review (still to do: parseformat and tests).

src/borg/item.pyx

src/borg/archive.py

src/borg/archiver/diff_cmd.py

src/borg/item.pyi

RF-Tar-Railt · 2023-04-19T13:05:19Z

Oops！Serious misoperation

RF-Tar-Railt · 2023-04-19T13:12:26Z

try to fix....

ThomasWaldmann · 2023-04-19T13:16:30Z

I hope you have a (borg?) backup. :-)

RF-Tar-Railt · 2023-04-19T13:18:14Z

I hope you have a (borg?) backup. :-)

Luckily it hasn't changed in my local env

RF-Tar-Railt · 2023-04-19T13:19:11Z

I'm trying to create a new branch and push

RF-Tar-Railt · 2023-04-19T13:44:49Z

#7534

RF-Tar-Railt mentioned this pull request Mar 13, 2023

borg diff should have --format option #4634

Closed

RF-Tar-Railt marked this pull request as ready for review March 15, 2023 15:18

RF-Tar-Railt changed the title ~~[WIP] Add --format option to borg diff, resolve issue #4634~~ [Need More Discuss] Add --format option to borg diff, resolve issue #4634 Mar 15, 2023

RF-Tar-Railt changed the title ~~[Need More Discuss] Add --format option to borg diff, resolve issue #4634~~ Add --format option to borg diff, resolve issue #4634 Mar 19, 2023

ThomasWaldmann closed this in 02eb9cd Mar 20, 2023

ThomasWaldmann added a commit that referenced this pull request Mar 20, 2023

Merge pull request #7455 from ThomasWaldmann/remove-cache-only-from-d…

46f1cda

…elete delete: remove --cache-only option, fixes #7440

ThomasWaldmann reopened this Mar 20, 2023

ThomasWaldmann mentioned this pull request Mar 20, 2023

fix issue number in changelog for --cache-only fix #7457

Closed

ThomasWaldmann requested changes Apr 3, 2023

View reviewed changes

ThomasWaldmann reviewed Apr 8, 2023

View reviewed changes

src/borg/archiver/diff_cmd.py Outdated Show resolved Hide resolved

src/borg/archiver/diff_cmd.py Outdated Show resolved Hide resolved

src/borg/archiver/rlist_cmd.py Outdated Show resolved Hide resolved

ThomasWaldmann requested changes Apr 18, 2023

View reviewed changes

RF-Tar-Railt closed this Apr 19, 2023

RF-Tar-Railt force-pushed the master branch from 08e69aa to e302fd9 Compare April 19, 2023 13:03

ThomasWaldmann mentioned this pull request Apr 19, 2023

Add --format option to borg diff, resolve issue #4634 #7534

Merged

7 tasks

Uh oh!

Conversation

RF-Tar-Railt commented Mar 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RF-Tar-Railt commented Mar 20, 2023

Uh oh!

ThomasWaldmann commented Mar 20, 2023

Uh oh!

ThomasWaldmann commented Mar 30, 2023

Uh oh!

codecov-commenter commented Apr 2, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

ThomasWaldmann commented Apr 3, 2023

Uh oh!

RF-Tar-Railt commented Apr 3, 2023

Uh oh!

ThomasWaldmann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ThomasWaldmann commented Apr 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RF-Tar-Railt commented Apr 3, 2023

Uh oh!

ThomasWaldmann commented Apr 3, 2023

Uh oh!

ThomasWaldmann commented Apr 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RF-Tar-Railt commented Apr 8, 2023

Uh oh!

RF-Tar-Railt commented Apr 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ThomasWaldmann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

RF-Tar-Railt commented Apr 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RF-Tar-Railt commented Apr 19, 2023

Uh oh!

ThomasWaldmann commented Apr 19, 2023

Uh oh!

RF-Tar-Railt commented Apr 19, 2023

Uh oh!

RF-Tar-Railt commented Apr 19, 2023

Uh oh!

RF-Tar-Railt commented Apr 19, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

RF-Tar-Railt commented Mar 13, 2023 •

edited

Loading

codecov-commenter commented Apr 2, 2023 •

edited

Loading

ThomasWaldmann commented Apr 3, 2023 •

edited

Loading

ThomasWaldmann commented Apr 8, 2023 •

edited

Loading

RF-Tar-Railt commented Apr 8, 2023 •

edited

Loading

RF-Tar-Railt commented Apr 19, 2023 •

edited

Loading