Page MenuHomeSoftware Heritage
Differential D5280

browse: Filter out pull request branches in snapshot content
ClosedPublic
Actions

Authored by anlambert on Mar 18 2021, 5:20 PM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Maniphest Tasks
T2782: add a "Filter Pull Requests" checkbox (or similar) in the Branches view of an origin in the web UI
Commits
rDWAPPScc652d5240d9: browse: Filter out pull request branches in snapshot content
Summary

Github origins might contain a lot of branches corresponding to pull
requests in their associated snapshots.

Those branches are not really of interest and add a lot of noise in
the branches views of swh-web.

So filter out these branches from snapshots by default in the browse
web application in order to improve the display.

Nevertheless, those branches are not filtered out when querying a
snapshot with the Web API.

Related to T2782

Diff Detail

Repository
rDWAPPS Web applications
Branch
browse-filter-out-pull-request-branches
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 19996
Build 31037: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 31036: arc lint + arc unit

Unit TestsFailed
View All

TimeTest
0 msJenkins > should filter origins by visit type::Tests / Cypress tests / Run cypress tests / Test origin-search should filter origins by visit type
AssertionError: Timed out retrying after 20000ms: expected '<td#visit-type-origin-2.swh-origin-visit-type>' to have text 'git', but the text was 'tar' at Context.eval (http://localhost:5004/__cypress/tests?p=cypress/integration/origin-search.spec.js:189:25)
224 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.admin.test_origin_save::Tests / Python tests / test_accept_pending_save_request
810 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.admin.test_origin_save::Tests / Python tests / test_add_authorized_origin_url
123 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.admin.test_origin_save::Tests / Python tests / test_add_unauthorized_origin_url
127 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.admin.test_origin_save::Tests / Python tests / test_reject_pending_save_request
View Full Test Results (1 Failed · 646 Passed · 5 Skipped)

Event Timeline

anlambert created this revision.Mar 18 2021, 5:20 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptMar 18 2021, 5:20 PM
Harbormaster returned this revision to the author for changes because remote builds failed.Mar 18 2021, 5:21 PM
Harbormaster failed remote builds in B19996: Diff 18915!
swh-public-ci added a comment.Mar 18 2021, 5:39 PM

Build has FAILED

Patch application report for D5280 (id=18915)

Rebasing onto 5e00370682...

Current branch diff-target is up to date.
Changes applied before test
commit 6e335ababfe545a57c91f64b642afe4699b2d930
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Thu Mar 18 17:14:44 2021 +0100

    browse: Filter out pull request branches in snapshot content
    
    Github origins might contain a lot of branches corresponding to pull
    requests in their associated snapshots.
    
    Those branches are not really of interest and add a lot of noise in
    the branches views of swh-web.
    
    So filter out these branches from snapshots by default in the browse
    web application in order to improve the display.
    
    Nevertheless, those branches are not filtered out when querying a
    snapshot with the Web API.
    
    Related to T2782

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

anlambert updated this revision to Diff 18917.Mar 18 2021, 5:51 PM

Fix cypress test

swh-public-ci added a comment.Mar 18 2021, 5:58 PM

Build is green

Patch application report for D5280 (id=18917)

Rebasing onto 5e00370682...

Current branch diff-target is up to date.
Changes applied before test
commit 02d5ba85d1734409c45ad95971906183cb6ef8d9
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Thu Mar 18 17:14:44 2021 +0100

    browse: Filter out pull request branches in snapshot content
    
    Github origins might contain a lot of branches corresponding to pull
    requests in their associated snapshots.
    
    Those branches are not really of interest and add a lot of noise in
    the branches views of swh-web.
    
    So filter out these branches from snapshots by default in the browse
    web application in order to improve the display.
    
    Nevertheless, those branches are not filtered out when querying a
    snapshot with the Web API.
    
    Related to T2782

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

Harbormaster completed remote builds in B19997: Diff 18917.Mar 18 2021, 5:58 PM
anlambert requested review of this revision.Mar 18 2021, 5:58 PM
vlorentz accepted this revision.Mar 18 2021, 6:35 PM
vlorentz added a subscriber: vlorentz.

🎉

swh/web/api/views/snapshot.py
83–84

use kw arguments

This revision is now accepted and ready to land.Mar 18 2021, 6:35 PM
anlambert updated this revision to Diff 18923.Mar 18 2021, 6:46 PM

Update: Add kwargs support to api_lookup and use it instead of adding comments

anlambert updated this revision to Diff 18924.Mar 18 2021, 6:52 PM

Remove not needed line

swh-public-ci added a comment.Mar 18 2021, 6:53 PM

Build is green

Patch application report for D5280 (id=18923)

Rebasing onto 5e00370682...

Current branch diff-target is up to date.
Changes applied before test
commit 27119b3f6c35d1f6c555b1d5ddb75ba22c06bed6
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Thu Mar 18 17:14:44 2021 +0100

    browse: Filter out pull request branches in snapshot content
    
    Github origins might contain a lot of branches corresponding to pull
    requests in their associated snapshots.
    
    Those branches are not really of interest and add a lot of noise in
    the branches views of swh-web.
    
    So filter out these branches from snapshots by default in the browse
    web application in order to improve the display.
    
    Nevertheless, those branches are not filtered out when querying a
    snapshot with the Web API.
    
    Related to T2782

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

Harbormaster completed remote builds in B20003: Diff 18923.Mar 18 2021, 6:53 PM
swh-public-ci added a comment.Mar 18 2021, 7:00 PM

Build is green

Patch application report for D5280 (id=18924)

Rebasing onto 5e00370682...

Current branch diff-target is up to date.
Changes applied before test
commit cc652d5240d9cd6186c6a8ce8b5938f2c7a8f921
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Thu Mar 18 17:14:44 2021 +0100

    browse: Filter out pull request branches in snapshot content
    
    Github origins might contain a lot of branches corresponding to pull
    requests in their associated snapshots.
    
    Those branches are not really of interest and add a lot of noise in
    the branches views of swh-web.
    
    So filter out these branches from snapshots by default in the browse
    web application in order to improve the display.
    
    Nevertheless, those branches are not filtered out when querying a
    snapshot with the Web API.
    
    Related to T2782

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

Harbormaster completed remote builds in B20004: Diff 18924.Mar 18 2021, 7:00 PM
Closed by commit rDWAPPScc652d5240d9: browse: Filter out pull request branches in snapshot content (authored by anlambert). · Explain WhyMar 18 2021, 7:05 PM
This revision was automatically updated to reflect the committed changes.
anlambert added a commit: rDWAPPScc652d5240d9: browse: Filter out pull request branches in snapshot content.

Revision Contents
Changeset List

PathSize
swh/
web/
api/
views/
2 lines
common/
10 lines
tests/
api/
views/
18 lines
browse/
views/
18 lines
69 lines
16 lines

Diff 18915

View Options

swh/web/api/views/snapshot.py

Loading...
View Options

swh/web/common/archive.py

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

swh/web/tests/data.py

Loading...
View Options

swh/web/tests/strategies.py

Loading...
About · Developer information · Legal