Page MenuHomeSoftware Heritage
Differential D4413

Simplify algos.snapshot.snapshot_resolve_alias.
ClosedPublic
Actions

Authored by vlorentz on Nov 5 2020, 11:00 AM.

Details

Reviewers
anlambert
Commits
rDSTO1826b2b97d70: Simplify algos.snapshot.snapshot_resolve_alias.
Summary
  1. rename branch_info to last_branch
  2. exclude the last_branch from 'branches', so that: a) it never needs to contain a None value, so we don't need a cast b) no need for slicing

Diff Detail

Event Timeline

vlorentz created this revision.Nov 5 2020, 11:00 AM
swh-public-ci added a comment.Nov 5 2020, 11:05 AM

Build is green

Patch application report for D4413 (id=15635)

Rebasing onto 943e440a9f...

Current branch diff-target is up to date.
Changes applied before test
commit 6163a6513ff396de17a486c55ee6e157459f910d
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 5 11:00:03 2020 +0100

    Simplify algos.snapshot.snapshot_resolve_alias.
    
    1. rename branch_info to last_branch
    2. exclude the last_branch from 'branches', so that:
       a) it never needs to contain a None value, so we don't need a cast
       b) no need for slicing

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

Harbormaster completed remote builds in B16857: Diff 15635.Nov 5 2020, 11:05 AM
vlorentz updated this revision to Diff 15637.Nov 5 2020, 11:30 AM
  • rebase on top of D4414
  • fix a bug I introduced in the untested case
swh-public-ci added a comment.Nov 5 2020, 11:38 AM

Build is green

Patch application report for D4413 (id=15637)

Could not rebase; Attempt merge onto 943e440a9f...

Updating 943e440a..8ae9b689
Fast-forward
 swh/storage/algos/snapshot.py            | 22 +++++++++++-----------
 swh/storage/tests/algos/test_snapshot.py | 23 +++++++++++++++++++----
 2 files changed, 30 insertions(+), 15 deletions(-)
Changes applied before test
commit 8ae9b6891e7c2849f0da7fdb3db39bfd4c0d08e7
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 5 11:00:03 2020 +0100

    Simplify algos.snapshot.snapshot_resolve_alias.
    
    1. rename branch_info to last_branch
    2. exclude the last_branch from 'branches', so that:
       a) it never needs to contain a None value, so we don't need a cast
       b) no need for slicing

commit b00a21c7d084bd6df4bfa607a9b22dd6ec040b1f
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 5 11:28:10 2020 +0100

    Add test for snapshot_resolve_alias with a missing branch.

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

Harbormaster completed remote builds in B16859: Diff 15637.Nov 5 2020, 11:38 AM
vlorentz mentioned this in D4414: Add test for snapshot_resolve_alias with a missing branch..Nov 5 2020, 11:39 AM
vlorentz updated this revision to Diff 15639.Nov 5 2020, 11:40 AM

rebase

swh-public-ci added a comment.Nov 5 2020, 11:49 AM

Build is green

Patch application report for D4413 (id=15639)

Could not rebase; Attempt merge onto 943e440a9f...

Updating 943e440a..b650a829
Fast-forward
 swh/storage/algos/snapshot.py            | 22 +++++++++++-----------
 swh/storage/tests/algos/test_snapshot.py | 21 ++++++++++++++++++---
 2 files changed, 29 insertions(+), 14 deletions(-)
Changes applied before test
commit b650a829e257186db5dfad2d27241edbe58858d8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 5 11:00:03 2020 +0100

    Simplify algos.snapshot.snapshot_resolve_alias.
    
    1. rename branch_info to last_branch
    2. exclude the last_branch from 'branches', so that:
       a) it never needs to contain a None value, so we don't need a cast
       b) no need for slicing

commit ae4724edf45aca4d039a4d47d8b9b443fbb7b455
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 5 11:28:10 2020 +0100

    Add test for snapshot_resolve_alias with a missing branch.

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

Harbormaster completed remote builds in B16861: Diff 15639.Nov 5 2020, 11:49 AM
anlambert accepted this revision.Nov 5 2020, 11:55 AM
anlambert added inline comments.
swh/storage/algos/snapshot.py
215–216

You can remove these instructions as the while iteration will stop when last_branch is None

This revision is now accepted and ready to land.Nov 5 2020, 11:55 AM
vlorentz updated this revision to Diff 15640.Nov 5 2020, 11:55 AM

flip the diffs again

swh/storage/algos/snapshot.py
215–216

good catch!

vlorentz updated this revision to Diff 15642.Nov 5 2020, 11:57 AM

remove useless lines

vlorentz updated this revision to Diff 15643.Nov 5 2020, 11:57 AM

rebase

vlorentz updated this revision to Diff 15645.Nov 5 2020, 11:58 AM

remove commit

swh-public-ci added a comment.Nov 5 2020, 12:00 PM

Build is green

Patch application report for D4413 (id=15640)

Rebasing onto 943e440a9f...

Current branch diff-target is up to date.
Changes applied before test
commit 02d730401ff87ed26d1beab27781ab3aa3968e94
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 5 11:00:03 2020 +0100

    Simplify algos.snapshot.snapshot_resolve_alias.
    
    1. rename branch_info to last_branch
    2. exclude the last_branch from 'branches', so that:
       a) it never needs to contain a None value, so we don't need a cast
       b) no need for slicing

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

Harbormaster completed remote builds in B16862: Diff 15640.Nov 5 2020, 12:00 PM
This revision was landed with ongoing or failed builds.Nov 5 2020, 12:07 PM
Closed by commit rDSTO1826b2b97d70: Simplify algos.snapshot.snapshot_resolve_alias. (authored by vlorentz). · Explain Why
This revision was automatically updated to reflect the committed changes.
vlorentz added a commit: rDSTO1826b2b97d70: Simplify algos.snapshot.snapshot_resolve_alias..
swh-public-ci added a comment.Nov 5 2020, 12:10 PM

Build is green

Patch application report for D4413 (id=15642)

Rebasing onto 943e440a9f...

Current branch diff-target is up to date.
Changes applied before test
commit 1826b2b97d703e33f4a1d3c4393d8b51ffcaed19
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 5 11:00:03 2020 +0100

    Simplify algos.snapshot.snapshot_resolve_alias.
    
    1. rename branch_info to last_branch
    2. exclude the last_branch from 'branches', so that:
       a) it never needs to contain a None value, so we don't need a cast
       b) no need for slicing

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

Harbormaster completed remote builds in B16864: Diff 15642.Nov 5 2020, 12:10 PM
swh-public-ci added a comment.Nov 5 2020, 12:14 PM

Build is green

Patch application report for D4413 (id=15643)

Rebasing onto fa868346c6...

First, rewinding head to replay your work on top of it...
Fast-forwarded diff-target to base-revision-1047-D4413.
Changes applied before test



See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/1047/ for more details.
Harbormaster completed remote builds in B16865: Diff 15643.Nov 5 2020, 12:14 PM
swh-public-ci added a comment.Nov 5 2020, 12:24 PM
Build is green



Patch application report for D4413 (id=15645)



Rebasing onto fa868346c6...



First, rewinding head to replay your work on top of it...
Fast-forwarded diff-target to base-revision-1049-D4413.





Changes applied before test






See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/1049/ for more details.
Harbormaster completed remote builds in B16867: Diff 15645.Nov 5 2020, 12:24 PM
Revision Contents
Changeset List
PathSizeCoverage (All)Coverage (Touched)
swh/
storage/
algos/
22 lines97%
Loading...
Diff 15640
View Options
swh/storage/algos/snapshot.py
Loading...
About · Developer information · Legal