Page MenuHomeSoftware Heritage

Replace deprecated PersistentID class with SWHID
ClosedPublic

Authored by haltode on Sep 18 2020, 9:42 AM.

Diff Detail

Repository
rDWCLI Web client
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Build is green

Patch application report for D3982 (id=14040)

Rebasing onto 257409e11b...

First, rewinding head to replay your work on top of it...
Applying: Replace deprecated PersistentID class with SWHID
Using index info to reconstruct a base tree...
M	swh/web/client/client.py
Falling back to patching base and 3-way merge...
Auto-merging swh/web/client/client.py
CONFLICT (content): Merge conflict in swh/web/client/client.py
Patch failed at 0001 Replace deprecated PersistentID class with SWHID

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 257409e11b...

Already up to date.
Changes applied before test
commit 9fe08b52d237ee0c12014329a68819aff89e57d8
Author: Thibault Allançon <haltode@gmail.com>
Date:   Fri Sep 18 09:36:18 2020 +0200

    Replace deprecated PersistentID class with SWHID

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

Missed one occurrence of PersistentId in documentation.

Build is green

Patch application report for D3982 (id=14041)

Rebasing onto 257409e11b...

First, rewinding head to replay your work on top of it...
Applying: Replace deprecated PersistentID class with SWHID
Using index info to reconstruct a base tree...
M	swh/web/client/client.py
Falling back to patching base and 3-way merge...
Auto-merging swh/web/client/client.py
CONFLICT (content): Merge conflict in swh/web/client/client.py
Patch failed at 0001 Replace deprecated PersistentID class with SWHID

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 257409e11b...

Already up to date.
Changes applied before test
commit b9ac0d212fa3818ee26b1558760b9859dd33f607
Author: Thibault Allançon <haltode@gmail.com>
Date:   Fri Sep 18 09:36:18 2020 +0200

    Replace deprecated PersistentID class with SWHID

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

zack added a subscriber: zack.

LGTM

This revision is now accepted and ready to land.Sep 18 2020, 9:47 AM
ardumont added inline comments.
swh/web/client/client.py
220

Jsyk, those kind of generator Generator[Any, None, None] can be simplified to Iterator[Any].
So here, that'd give Iterator[Dict[str, Any]].

swh/web/client/client.py
220

Good point. OTOH, that violates the principle of "accepting abstract types" and "returning concrete types" (as a generator is a concrete type while an iterator an abstract one). I tend to to thing that this principle is more important than hiding the "None", but I don't know what's the general best practice for this.

Simplify Generator type hints with Iterator.

Build is green

Patch application report for D3982 (id=14042)

Rebasing onto 257409e11b...

First, rewinding head to replay your work on top of it...
Applying: Replace deprecated PersistentID class with SWHID
Using index info to reconstruct a base tree...
M	swh/web/client/client.py
Falling back to patching base and 3-way merge...
Auto-merging swh/web/client/client.py
CONFLICT (content): Merge conflict in swh/web/client/client.py
Patch failed at 0001 Replace deprecated PersistentID class with SWHID

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 257409e11b...

Already up to date.
Changes applied before test
commit 6cb86338da574409bccffc95c125b58d503733b3
Author: Thibault Allançon <haltode@gmail.com>
Date:   Fri Sep 18 09:36:18 2020 +0200

    Replace deprecated PersistentID class with SWHID

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

Rebase on master (new isort hook)

Build is green

Patch application report for D3982 (id=14043)

Rebasing onto 257409e11b...

Current branch diff-target is up to date.
Changes applied before test
commit 17ff20ffaf34918325c521542f244b501a763be3
Author: Thibault Allançon <haltode@gmail.com>
Date:   Fri Sep 18 10:07:26 2020 +0200

    Replace deprecated PersistentID class with SWHID

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