Page MenuHomeSoftware Heritage

maven-lister: initialise lister.maven-lister: update following review on D6133. [PLEASE DELETE ME]
AbandonedPublic

Authored by borisbaldassari on Oct 2 2021, 8:49 PM.

Details

Reviewers
None
Group Reviewers
Reviewers
Maniphest Tasks
T1724: Maven Central repository support
Summary

Would you mind deleting this revision? This is a (failed) try at cleaning up the commits after review D6133.
The new revision https://forge.softwareheritage.org/D6395 seems to be successful, though.
Thanks for your patience.

Diff Detail

Repository
rDLS Listers
Branch
T1724_maven_central_lister
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 24167
Build 37719: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 37718: arc lint + arc unit

Event Timeline

Build is green

Patch application report for D6393 (id=23250)

Rebasing onto e7716c0122...

First, rewinding head to replay your work on top of it...
Applying: gitlab: Allow listing of instances providing multiple vcs_type
Using index info to reconstruct a base tree...
M	swh/lister/gitlab/lister.py
M	swh/lister/gitlab/tests/test_lister.py
Falling back to patching base and 3-way merge...
Auto-merging swh/lister/gitlab/tests/test_lister.py
CONFLICT (content): Merge conflict in swh/lister/gitlab/tests/test_lister.py
Auto-merging swh/lister/gitlab/lister.py
CONFLICT (content): Merge conflict in swh/lister/gitlab/lister.py
Patch failed at 0001 gitlab: Allow listing of instances providing multiple vcs_type

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 e7716c0122...

Already up to date.
Changes applied before test
commit a7743ee4bd821da7fae90a046d9a2cbff20c7c32
Author: Boris Baldassari <boris@chrysalice.org>
Date:   Sat Oct 2 20:37:56 2021 +0200

    maven-lister: Refactor file get loop (review D6133).

commit 37b103c76722407af068ce54d28365118236c2fb
Author: Boris Baldassari <boris@chrysalice.org>
Date:   Wed Aug 25 14:23:09 2021 +0200

    maven-lister: initialise lister.
    maven-lister: initialise lister.
    maven-lister: add docker in requirements.txt..
    maven-lister: refactor to externalize index export.
    maven-lister: fix test_task with new parameters.
    maven-lister: fix mocking of index download.
    maven-lister: add maven to list_cli for testing.
    maven-lister: fix function doc comment for sphinx.
    maven-lister: add extra loader arguments for jar loader output.
    maven-lister: add extra loader arguments for jar loader output.
    maven-lister: add last modif time to extra args for jar files.
    maven-lister: set last modif time to epoch int.
    maven-lister: add changes from review D6133.
    maven-lister: Fix inaccurate comment (review D6133).
    maven-lister: Fix tests (review D6133)
    maven-lister: Fix various comments from review (review D6133).
    maven-lister: add README.md to describe design decisions (review D6133).
    maven-lister: Fix useless storage of file + minor fixes (review D6133).
    maven-lister: Document regexpes (review D6133).
    maven-lister: various small fixes and optimisations (review D6133).
    maven-lister: various small fixes and optimisations (review D6133).
    maven-lister: Fix and add tests (review D6133).
    maven-lister: Refactor file get loop + minor fixes (review D6133).

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

borisbaldassari retitled this revision from maven-lister: initialise lister. maven-lister: update following review on D6133. to maven-lister: initialise lister.maven-lister: update following review on D6133. [PLEASE DELETE ME].Oct 2 2021, 9:06 PM
borisbaldassari edited the summary of this revision. (Show Details)

@borisbaldassari Click "Add Action..." over the comment box, select "Abandon Revision", then submit

Thanks vlorentz. Done.