Page MenuHomeSoftware Heritage

Add a --version option to all the CLI commands
AbandonedPublic

Authored by vlorentz on Mar 24 2021, 7:27 PM.
This revision can not be accepted until the required legal agreements have been signed.

Diff Detail

Repository
rDCNT Archive counters
Branch
version-cli-command-counters
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 20208
Build 31363: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 31362: arc lint + arc unit

Event Timeline

Build is green

Patch application report for D5326 (id=19094)

Rebasing onto 7dbe186b01...

First, rewinding head to replay your work on top of it...
Applying: Add a --version option to all the CLI commands
Using index info to reconstruct a base tree...
M	swh/counters/interface.py
Falling back to patching base and 3-way merge...
Auto-merging swh/counters/tests/test_server.py
CONFLICT (add/add): Merge conflict in swh/counters/tests/test_server.py
Auto-merging swh/counters/interface.py
Auto-merging swh/counters/api/server.py
CONFLICT (add/add): Merge conflict in swh/counters/api/server.py
Patch failed at 0001 Add a --version option to all the CLI commands

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

Rebase failed (ret=1)!

Could not rebase; Attempt merge onto 7dbe186b01...

Already up to date.
Changes applied before test
commit b858559c7c5a5ad2e6d2bffce9e7b8b359a75561
Author: Vincent SELLIER <vincent.sellier@softwareheritage.org>
Date:   Mon Mar 15 17:50:41 2021 +0100

    Add a --version option to all the CLI commands
    
    Related to T2912

See https://jenkins.softwareheritage.org/job/DCNT/job/tests-on-diff/15/ for more details.

Build is green

Patch application report for D5326 (id=19095)

Rebasing onto 7dbe186b01...

First, rewinding head to replay your work on top of it...
Applying: Add a --version option to all the CLI commands
Using index info to reconstruct a base tree...
M	swh/counters/interface.py
Falling back to patching base and 3-way merge...
Auto-merging swh/counters/interface.py
Changes applied before test
commit da3c1165f30e4e01bbb4ef39aad4707fc9e2cc40
Author: Vincent SELLIER <vincent.sellier@softwareheritage.org>
Date:   Mon Mar 15 17:50:41 2021 +0100

    Add a --version option to all the CLI commands
    
    Related to T2912

See https://jenkins.softwareheritage.org/job/DCNT/job/tests-on-diff/16/ for more details.

set commit to only needed changes

Build is green

Patch application report for D5326 (id=19096)

Rebasing onto 7dbe186b01...

First, rewinding head to replay your work on top of it...
Applying: Add a --version option to all the CLI commands
Changes applied before test
commit 7705230365f10fb911fe2e3564faadc145ae2407
Author: Vincent SELLIER <vincent.sellier@softwareheritage.org>
Date:   Mon Mar 15 17:50:41 2021 +0100

    Add a --version option to all the CLI commands
    
    Related to T2912

See https://jenkins.softwareheritage.org/job/DCNT/job/tests-on-diff/17/ for more details.

Hi, thanks for the diff.

Could you update your diff description, it should reference T3167, not T2912.

And commit message too.

And there's an issue with the commit author name, you wrote Vincent SELLIER instead of your own name

This revision now requires changes to proceed.Mar 25 2021, 10:27 AM

Build is green

Patch application report for D5326 (id=19121)

Rebasing onto 7dbe186b01...

First, rewinding head to replay your work on top of it...
Applying: Add a --version option to all the CLI commands
Changes applied before test
commit 56eab2bfecb5d2094db5c489ec6082f3f0bcba83
Author: Paulo Lima <paulojorgelima18@gmail.com>
Date:   Mon Mar 15 17:50:41 2021 +0100

    Add a --version option to all the CLI commands
    
    Related to T2912

See https://jenkins.softwareheritage.org/job/DCNT/job/tests-on-diff/18/ for more details.

Build is green

Patch application report for D5326 (id=19122)

Rebasing onto 7dbe186b01...

First, rewinding head to replay your work on top of it...
Applying: Version option to all cli commands
Changes applied before test
commit bb000b999efcb83ae7028891947f66b0191e0864
Author: Paulo Lima <paulojorgelima18@gmail.com>
Date:   Mon Mar 15 17:50:41 2021 +0100

    Version option to all cli commands
    
    Related to T3167

See https://jenkins.softwareheritage.org/job/DCNT/job/tests-on-diff/19/ for more details.

This revision is now accepted and ready to land.Mar 25 2021, 2:47 PM

Hi @vlorentz, I suspect this diff would have also introduced an issue similar to the one mentioned in T3209. What do you suggest?

vlorentz requested changes to this revision.May 4 2021, 4:07 PM

Yes, indeed. @earthizflat, please add importlib-metadata to the requirements.txt file.

This revision now requires changes to proceed.May 4 2021, 4:07 PM
ardumont added inline comments.
swh/counters/cli.py
23

as well.

vlorentz abandoned this revision.
vlorentz edited reviewers, added: earthizflat; removed: vlorentz.

Closing this due to inactivity

Content Hidden

The content of this revision is hidden until the author has signed all of the required legal agreements.