Page MenuHomeSoftware Heritage
Differential D8814

browse: Update snapshot branches list view to display all target types
ClosedPublic
Actions

Authored by anlambert on Nov 4 2022, 2:33 PM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Maniphest Tasks
T4669: Add support to browse snapshot branches targeting contents or directories
Commits
rDWAPPSf0f3e6890a2e: browse: Update snapshot branches list view to display all target types
Summary

Previously, the snapshot branches list view was only displaying branches
targeting revisions but it now exists cases where branches can target
contents or directories.

So update view implementation to display all type of branches and add
visual clues to indicate which object types they are targeting.

Depends on D8807

Related to T4669



Diff Detail

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

Event Timeline

anlambert created this revision.Nov 4 2022, 2:33 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptNov 4 2022, 2:33 PM
anlambert edited the summary of this revision. (Show Details)Nov 4 2022, 2:33 PM
anlambert added a parent revision: D8807: browse: Handle snapshots whose branches target contents or directories.
swh-public-ci added a comment.Nov 4 2022, 2:52 PM

Build has FAILED

Patch application report for D8814 (id=31755)

Could not rebase; Attempt merge onto d055e08d8b...

Updating d055e08d..f0f3e689
Fast-forward
 swh/web/browse/snapshot_context.py                 | 136 +++++++---
 swh/web/browse/templates/browse-branches.html      |   9 +-
 .../templates/includes/snapshot-context.html       |   6 +-
 .../browse/templates/includes/top-navigation.html  |   4 +-
 swh/web/tests/browse/test_snapshot_context.py      |  22 +-
 swh/web/tests/browse/views/test_content.py         |   8 +-
 swh/web/tests/browse/views/test_directory.py       |  12 +-
 swh/web/tests/browse/views/test_snapshot.py        | 295 +++++++++++++++++++--
 swh/web/tests/conftest.py                          |   4 +
 swh/web/tests/utils/test_archive.py                |   7 +-
 swh/web/utils/archive.py                           |   6 +
 swh/web/utils/typing.py                            |  10 +-
 12 files changed, 425 insertions(+), 94 deletions(-)
Changes applied before test
commit f0f3e6890a2e081c2f868a8e9a6755cd952ae227
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Fri Nov 4 14:26:10 2022 +0100

    browse: Update snapshot branches list view to display all target types
    
    Previously, the snapshot branches list view was only displaying branches
    targeting revisions but it now exists cases where branches can target
    contents or directories.
    
    So update view implementation to display all type of branches and add
    visual clues to indicate which object types they are targeting.
    
    Related to T4669

commit 8f594ec2b6e2e60d49a53fc9ed72d1f3607d1a10
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Wed Nov 2 15:52:59 2022 +0100

    browse: Handle snapshots whose branches target contents or directories
    
    Previously swh-web was only supporting the browsing of snapshot branches
    targeting revisions but we recently introduced new Software Heritage
    loaders producing snapshots whose branches target contents or directories
    but no revisions.
    
    So add support to browse such snapshots as previously they were flagged as
    empty when trying to display them.
    
    Related to T4669

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/2108/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/2108/console

swh-public-ci added a comment.Nov 4 2022, 2:53 PM

Build has FAILED

Patch application report for D8814 (id=31755)

Could not rebase; Attempt merge onto d055e08d8b...

Updating d055e08d..f0f3e689
Fast-forward
 swh/web/browse/snapshot_context.py                 | 136 +++++++---
 swh/web/browse/templates/browse-branches.html      |   9 +-
 .../templates/includes/snapshot-context.html       |   6 +-
 .../browse/templates/includes/top-navigation.html  |   4 +-
 swh/web/tests/browse/test_snapshot_context.py      |  22 +-
 swh/web/tests/browse/views/test_content.py         |   8 +-
 swh/web/tests/browse/views/test_directory.py       |  12 +-
 swh/web/tests/browse/views/test_snapshot.py        | 295 +++++++++++++++++++--
 swh/web/tests/conftest.py                          |   4 +
 swh/web/tests/utils/test_archive.py                |   7 +-
 swh/web/utils/archive.py                           |   6 +
 swh/web/utils/typing.py                            |  10 +-
 12 files changed, 425 insertions(+), 94 deletions(-)
Changes applied before test
commit f0f3e6890a2e081c2f868a8e9a6755cd952ae227
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Fri Nov 4 14:26:10 2022 +0100

    browse: Update snapshot branches list view to display all target types
    
    Previously, the snapshot branches list view was only displaying branches
    targeting revisions but it now exists cases where branches can target
    contents or directories.
    
    So update view implementation to display all type of branches and add
    visual clues to indicate which object types they are targeting.
    
    Related to T4669

commit 8f594ec2b6e2e60d49a53fc9ed72d1f3607d1a10
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Wed Nov 2 15:52:59 2022 +0100

    browse: Handle snapshots whose branches target contents or directories
    
    Previously swh-web was only supporting the browsing of snapshot branches
    targeting revisions but we recently introduced new Software Heritage
    loaders producing snapshots whose branches target contents or directories
    but no revisions.
    
    So add support to browse such snapshots as previously they were flagged as
    empty when trying to display them.
    
    Related to T4669

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/2109/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/2109/console

Harbormaster returned this revision to the author for changes because remote builds failed.Nov 4 2022, 2:53 PM
Harbormaster failed remote builds in B32708: Diff 31755!
swh-public-ci added a comment.Nov 4 2022, 3:05 PM

Build was aborted

Patch application report for D8814 (id=31755)

Could not rebase; Attempt merge onto d055e08d8b...

Updating d055e08d..f0f3e689
Fast-forward
 swh/web/browse/snapshot_context.py                 | 136 +++++++---
 swh/web/browse/templates/browse-branches.html      |   9 +-
 .../templates/includes/snapshot-context.html       |   6 +-
 .../browse/templates/includes/top-navigation.html  |   4 +-
 swh/web/tests/browse/test_snapshot_context.py      |  22 +-
 swh/web/tests/browse/views/test_content.py         |   8 +-
 swh/web/tests/browse/views/test_directory.py       |  12 +-
 swh/web/tests/browse/views/test_snapshot.py        | 295 +++++++++++++++++++--
 swh/web/tests/conftest.py                          |   4 +
 swh/web/tests/utils/test_archive.py                |   7 +-
 swh/web/utils/archive.py                           |   6 +
 swh/web/utils/typing.py                            |  10 +-
 12 files changed, 425 insertions(+), 94 deletions(-)
Changes applied before test
commit f0f3e6890a2e081c2f868a8e9a6755cd952ae227
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Fri Nov 4 14:26:10 2022 +0100

    browse: Update snapshot branches list view to display all target types
    
    Previously, the snapshot branches list view was only displaying branches
    targeting revisions but it now exists cases where branches can target
    contents or directories.
    
    So update view implementation to display all type of branches and add
    visual clues to indicate which object types they are targeting.
    
    Related to T4669

commit 8f594ec2b6e2e60d49a53fc9ed72d1f3607d1a10
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Wed Nov 2 15:52:59 2022 +0100

    browse: Handle snapshots whose branches target contents or directories
    
    Previously swh-web was only supporting the browsing of snapshot branches
    targeting revisions but we recently introduced new Software Heritage
    loaders producing snapshots whose branches target contents or directories
    but no revisions.
    
    So add support to browse such snapshots as previously they were flagged as
    empty when trying to display them.
    
    Related to T4669

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/2110/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/2110/console

swh-public-ci added a comment.Nov 4 2022, 3:06 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/2112/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/2112/console

swh-public-ci added a comment.Nov 4 2022, 3:09 PM

Build was aborted

Patch application report for D8814 (id=31755)

Could not rebase; Attempt merge onto d055e08d8b...

Updating d055e08d..f0f3e689
Fast-forward
 swh/web/browse/snapshot_context.py                 | 136 +++++++---
 swh/web/browse/templates/browse-branches.html      |   9 +-
 .../templates/includes/snapshot-context.html       |   6 +-
 .../browse/templates/includes/top-navigation.html  |   4 +-
 swh/web/tests/browse/test_snapshot_context.py      |  22 +-
 swh/web/tests/browse/views/test_content.py         |   8 +-
 swh/web/tests/browse/views/test_directory.py       |  12 +-
 swh/web/tests/browse/views/test_snapshot.py        | 295 +++++++++++++++++++--
 swh/web/tests/conftest.py                          |   4 +
 swh/web/tests/utils/test_archive.py                |   7 +-
 swh/web/utils/archive.py                           |   6 +
 swh/web/utils/typing.py                            |  10 +-
 12 files changed, 425 insertions(+), 94 deletions(-)
Changes applied before test
commit f0f3e6890a2e081c2f868a8e9a6755cd952ae227
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Fri Nov 4 14:26:10 2022 +0100

    browse: Update snapshot branches list view to display all target types
    
    Previously, the snapshot branches list view was only displaying branches
    targeting revisions but it now exists cases where branches can target
    contents or directories.
    
    So update view implementation to display all type of branches and add
    visual clues to indicate which object types they are targeting.
    
    Related to T4669

commit 8f594ec2b6e2e60d49a53fc9ed72d1f3607d1a10
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Wed Nov 2 15:52:59 2022 +0100

    browse: Handle snapshots whose branches target contents or directories
    
    Previously swh-web was only supporting the browsing of snapshot branches
    targeting revisions but we recently introduced new Software Heritage
    loaders producing snapshots whose branches target contents or directories
    but no revisions.
    
    So add support to browse such snapshots as previously they were flagged as
    empty when trying to display them.
    
    Related to T4669

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/2111/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/2111/console

swh-public-ci added a comment.Nov 4 2022, 3:21 PM

Build has FAILED

Patch application report for D8814 (id=31755)

Could not rebase; Attempt merge onto d055e08d8b...

Updating d055e08d..f0f3e689
Fast-forward
 swh/web/browse/snapshot_context.py                 | 136 +++++++---
 swh/web/browse/templates/browse-branches.html      |   9 +-
 .../templates/includes/snapshot-context.html       |   6 +-
 .../browse/templates/includes/top-navigation.html  |   4 +-
 swh/web/tests/browse/test_snapshot_context.py      |  22 +-
 swh/web/tests/browse/views/test_content.py         |   8 +-
 swh/web/tests/browse/views/test_directory.py       |  12 +-
 swh/web/tests/browse/views/test_snapshot.py        | 295 +++++++++++++++++++--
 swh/web/tests/conftest.py                          |   4 +
 swh/web/tests/utils/test_archive.py                |   7 +-
 swh/web/utils/archive.py                           |   6 +
 swh/web/utils/typing.py                            |  10 +-
 12 files changed, 425 insertions(+), 94 deletions(-)
Changes applied before test
commit f0f3e6890a2e081c2f868a8e9a6755cd952ae227
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Fri Nov 4 14:26:10 2022 +0100

    browse: Update snapshot branches list view to display all target types
    
    Previously, the snapshot branches list view was only displaying branches
    targeting revisions but it now exists cases where branches can target
    contents or directories.
    
    So update view implementation to display all type of branches and add
    visual clues to indicate which object types they are targeting.
    
    Related to T4669

commit 8f594ec2b6e2e60d49a53fc9ed72d1f3607d1a10
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Wed Nov 2 15:52:59 2022 +0100

    browse: Handle snapshots whose branches target contents or directories
    
    Previously swh-web was only supporting the browsing of snapshot branches
    targeting revisions but we recently introduced new Software Heritage
    loaders producing snapshots whose branches target contents or directories
    but no revisions.
    
    So add support to browse such snapshots as previously they were flagged as
    empty when trying to display them.
    
    Related to T4669

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/2113/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/2113/console

swh-public-ci added a comment.Nov 4 2022, 4:07 PM

Build is green

Patch application report for D8814 (id=31755)

Could not rebase; Attempt merge onto d055e08d8b...

Updating d055e08d..f0f3e689
Fast-forward
 swh/web/browse/snapshot_context.py                 | 136 +++++++---
 swh/web/browse/templates/browse-branches.html      |   9 +-
 .../templates/includes/snapshot-context.html       |   6 +-
 .../browse/templates/includes/top-navigation.html  |   4 +-
 swh/web/tests/browse/test_snapshot_context.py      |  22 +-
 swh/web/tests/browse/views/test_content.py         |   8 +-
 swh/web/tests/browse/views/test_directory.py       |  12 +-
 swh/web/tests/browse/views/test_snapshot.py        | 295 +++++++++++++++++++--
 swh/web/tests/conftest.py                          |   4 +
 swh/web/tests/utils/test_archive.py                |   7 +-
 swh/web/utils/archive.py                           |   6 +
 swh/web/utils/typing.py                            |  10 +-
 12 files changed, 425 insertions(+), 94 deletions(-)
Changes applied before test
commit f0f3e6890a2e081c2f868a8e9a6755cd952ae227
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Fri Nov 4 14:26:10 2022 +0100

    browse: Update snapshot branches list view to display all target types
    
    Previously, the snapshot branches list view was only displaying branches
    targeting revisions but it now exists cases where branches can target
    contents or directories.
    
    So update view implementation to display all type of branches and add
    visual clues to indicate which object types they are targeting.
    
    Related to T4669

commit 8f594ec2b6e2e60d49a53fc9ed72d1f3607d1a10
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Wed Nov 2 15:52:59 2022 +0100

    browse: Handle snapshots whose branches target contents or directories
    
    Previously swh-web was only supporting the browsing of snapshot branches
    targeting revisions but we recently introduced new Software Heritage
    loaders producing snapshots whose branches target contents or directories
    but no revisions.
    
    So add support to browse such snapshots as previously they were flagged as
    empty when trying to display them.
    
    Related to T4669

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

swh-public-ci added a comment.Nov 4 2022, 4:26 PM

Build is green

Patch application report for D8814 (id=31755)

Could not rebase; Attempt merge onto d055e08d8b...

Updating d055e08d..f0f3e689
Fast-forward
 swh/web/browse/snapshot_context.py                 | 136 +++++++---
 swh/web/browse/templates/browse-branches.html      |   9 +-
 .../templates/includes/snapshot-context.html       |   6 +-
 .../browse/templates/includes/top-navigation.html  |   4 +-
 swh/web/tests/browse/test_snapshot_context.py      |  22 +-
 swh/web/tests/browse/views/test_content.py         |   8 +-
 swh/web/tests/browse/views/test_directory.py       |  12 +-
 swh/web/tests/browse/views/test_snapshot.py        | 295 +++++++++++++++++++--
 swh/web/tests/conftest.py                          |   4 +
 swh/web/tests/utils/test_archive.py                |   7 +-
 swh/web/utils/archive.py                           |   6 +
 swh/web/utils/typing.py                            |  10 +-
 12 files changed, 425 insertions(+), 94 deletions(-)
Changes applied before test
commit f0f3e6890a2e081c2f868a8e9a6755cd952ae227
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Fri Nov 4 14:26:10 2022 +0100

    browse: Update snapshot branches list view to display all target types
    
    Previously, the snapshot branches list view was only displaying branches
    targeting revisions but it now exists cases where branches can target
    contents or directories.
    
    So update view implementation to display all type of branches and add
    visual clues to indicate which object types they are targeting.
    
    Related to T4669

commit 8f594ec2b6e2e60d49a53fc9ed72d1f3607d1a10
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Wed Nov 2 15:52:59 2022 +0100

    browse: Handle snapshots whose branches target contents or directories
    
    Previously swh-web was only supporting the browsing of snapshot branches
    targeting revisions but we recently introduced new Software Heritage
    loaders producing snapshots whose branches target contents or directories
    but no revisions.
    
    So add support to browse such snapshots as previously they were flagged as
    empty when trying to display them.
    
    Related to T4669

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

Harbormaster completed remote builds in B32708: Diff 31755.Nov 4 2022, 4:26 PM
anlambert requested review of this revision.Nov 4 2022, 4:26 PM
anlambert added a child revision: D8816: browse/templates/top-navigation: Prevent VariableDoesNotExist exception.Nov 4 2022, 4:47 PM
vlorentz accepted this revision.Nov 4 2022, 5:10 PM
This revision is now accepted and ready to land.Nov 4 2022, 5:10 PM
Closed by commit rDWAPPSf0f3e6890a2e: browse: Update snapshot branches list view to display all target types (authored by anlambert). · Explain WhyNov 4 2022, 5:38 PM
This revision was automatically updated to reflect the committed changes.
anlambert added a commit: rDWAPPSf0f3e6890a2e: browse: Update snapshot branches list view to display all target types.

Revision Contents
Changeset List

PathSize
swh/
web/
browse/
34 lines
templates/
9 lines
tests/
browse/
views/
92 lines

Diff 31767

View Options

swh/web/browse/snapshot_context.py

Loading...
View Options

swh/web/browse/templates/browse-branches.html

Loading...
View Options

swh/web/tests/browse/views/test_snapshot.py

Loading...
About · Developer information · Legal