Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@Gelma
Copy link
Contributor

@Gelma Gelma commented Dec 26, 2020

Hi everyone,
and thanks a lot for your work.

Here's a stupid patch to fix a few typos.

Thanks again,
Gelma

@codecov-io
Copy link

codecov-io commented Dec 26, 2020

Codecov Report

Merging #5597 (7a3a49e) into master (9088b1e) will decrease coverage by 0.03%.
The diff coverage is 50.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5597      +/-   ##
==========================================
- Coverage   83.30%   83.26%   -0.04%     
==========================================
  Files          38       38              
  Lines       10119    10119              
  Branches     1678     1678              
==========================================
- Hits         8430     8426       -4     
- Misses       1190     1194       +4     
  Partials      499      499              
Impacted Files Coverage Δ
src/borg/archiver.py 80.00% <0.00%> (-0.35%) ⬇️
src/borg/helpers/errors.py 100.00% <ø> (ø)
src/borg/helpers/progress.py 91.66% <ø> (ø)
src/borg/locking.py 87.32% <ø> (ø)
src/borg/logger.py 70.58% <ø> (ø)
src/borg/repository.py 84.21% <ø> (+0.18%) ⬆️
src/borg/patterns.py 92.26% <100.00%> (ø)
src/borg/helpers/parseformat.py 90.05% <0.00%> (+0.16%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 268eb2e...7a3a49e. Read the comment docs.

Copy link
Member

@ThomasWaldmann ThomasWaldmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks much for finding these lots of typos!

Some stuff needs to be fixed at other places though (either in upstream project or in other files in this project), can you do that?

@Gelma
Copy link
Contributor Author

Gelma commented Dec 27, 2020

Thanks much for finding these lots of typos!

Some stuff needs to be fixed at other places though (either in upstream project or in other files in this project), can you do that?

Glad you appreciated it!

Well, I checked all the files in git. I'm going to check if something were excluded in the commit.

@ThomasWaldmann
Copy link
Member

ThomasWaldmann commented Dec 27, 2020

What I meant with "fixed at other places" is that you actually did fix it, but not at right place:

  • either in a generated file (needs fix in source file and removing the fix in the generated file)
  • upstream (3rd party stuff we just copy)

See my comments in the review.

@Gelma
Copy link
Contributor Author

Gelma commented Dec 27, 2020 via email

Copy link
Member

@ThomasWaldmann ThomasWaldmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also, the changes in algorithms/{lz4,zstd,xxhash}/* should be removed - they are maintained upstream.

@ThomasWaldmann
Copy link
Member

@Gelma can you finish this or shall I help with it?

@ThomasWaldmann
Copy link
Member

Looks like @Gelma is busy otherwise, so I'll finish this myself now.

@ThomasWaldmann ThomasWaldmann self-assigned this Jan 7, 2021
@ThomasWaldmann
Copy link
Member

^^ rebased on current master, no content change, force pushed.

this stuff will be auto-generated, regularly done at release time.
all algorithms/* stuff needs to be fixed upstream.

we just copy the files from there now and then.

https://github.com/lz4/lz4
https://github.com/facebook/zstd
https://github.com/Cyan4973/xxHash
@ThomasWaldmann
Copy link
Member

i now also created separate diffs for the upstream projects: zstd, lz4 and xxh64 - will try to submit it there.

Copy link
Member

@ThomasWaldmann ThomasWaldmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ThomasWaldmann
Copy link
Member

ThomasWaldmann commented Jan 7, 2021

@ThomasWaldmann ThomasWaldmann merged commit 37d4aee into borgbackup:master Jan 7, 2021
@ThomasWaldmann
Copy link
Member

Needs checking whether these typos are also in 1.1-maint.

If applicable, only the overall diff over all 3 commits should be applied in a single commit.

@ThomasWaldmann
Copy link
Member

ThomasWaldmann commented Feb 28, 2021

Note: backport this AFTER backporting:

This was referenced Jun 16, 2021
ThomasWaldmann added a commit that referenced this pull request Jun 16, 2021
@ghost ghost mentioned this pull request Aug 26, 2021
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.

3 participants