Page MenuHomeSoftware Heritage

vault: Rename downloaded files to replace ':' with '_' in SWHIDs
ClosedPublic

Authored by vlorentz on Sep 2 2021, 4:58 PM.

Details

Summary

Both Firefox and Chromium replace ':' (with spaces and underscores respectively)

Depends on D6171.

Event Timeline

Build is green

Patch application report for D6174 (id=22371)

Could not rebase; Attempt merge onto d0335365a4...

Removing cypress/fixtures/swh:1:rev:1c480a4573d2a003fc2630c21c2b25829de49972.gitfast.gz
Merge made by the 'recursive' strategy.
 assets/src/bundles/vault/vault-create-tasks.js     |   8 +++----
 assets/src/bundles/vault/vault-table-row.ejs       |   9 +++----
 assets/src/bundles/vault/vault-ui.js               |   8 +++----
 ...c480a4573d2a003fc2630c21c2b25829de49972.git.tar | Bin 0 -> 20480 bytes
 ...0a4573d2a003fc2630c21c2b25829de49972.gitfast.gz | Bin 1391 -> 0 bytes
 cypress/integration/vault.spec.js                  |  26 ++++++++++-----------
 swh/web/api/views/vault.py                         |  20 ++++++++++------
 swh/web/templates/includes/vault-create-tasks.html |   4 ++--
 8 files changed, 41 insertions(+), 34 deletions(-)
 create mode 100644 cypress/fixtures/swh:1:rev:1c480a4573d2a003fc2630c21c2b25829de49972.git.tar
 delete mode 100644 cypress/fixtures/swh:1:rev:1c480a4573d2a003fc2630c21c2b25829de49972.gitfast.gz
Changes applied before test
commit a40b418913de702a1a46bce38031ba9ad5d1a928
Merge: d0335365 f6148f53
Author: Jenkins user <jenkins@localhost>
Date:   Thu Sep 2 14:58:59 2021 +0000

    Merge branch 'diff-target' into HEAD

commit f6148f537356652dbbb24d993cbb09390e33584b
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Sep 2 16:58:06 2021 +0200

    vault: Rename downloaded files to replace ':' with '_' in SWHIDs
    
    Both Firefox and Chromium replace ':' (with spaces and underscores respectively)

commit d38b69cb404423634543d9e32439661357fede74
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Sep 2 15:06:31 2021 +0200

    Switch the UI to use bare git archives, instead of gitfast.

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

Build is green

Patch application report for D6174 (id=22373)

Could not rebase; Attempt merge onto d0335365a4...

Removing cypress/fixtures/swh:1:rev:1c480a4573d2a003fc2630c21c2b25829de49972.gitfast.gz
Merge made by the 'recursive' strategy.
 assets/src/bundles/vault/vault-create-tasks.js     |   8 +++---
 assets/src/bundles/vault/vault-table-row.ejs       |   7 ++---
 assets/src/bundles/vault/vault-ui.js               |   8 +++---
 ...0a4573d2a003fc2630c21c2b25829de49972.gitfast.gz | Bin 1391 -> 0 bytes
 ...d19126d815470b28919d64b2a8e6a3e37f900dd.tar.gz} | Bin
 ...c480a4573d2a003fc2630c21c2b25829de49972.git.tar | Bin 0 -> 20480 bytes
 cypress/integration/vault.spec.js                  |  30 ++++++++++-----------
 swh/web/api/views/vault.py                         |  20 +++++++++-----
 swh/web/templates/includes/vault-create-tasks.html |   4 +--
 9 files changed, 42 insertions(+), 35 deletions(-)
 delete mode 100644 cypress/fixtures/swh:1:rev:1c480a4573d2a003fc2630c21c2b25829de49972.gitfast.gz
 rename cypress/fixtures/{swh:1:dir:cd19126d815470b28919d64b2a8e6a3e37f900dd.tar.gz => swh_1_dir_cd19126d815470b28919d64b2a8e6a3e37f900dd.tar.gz} (100%)
 create mode 100644 cypress/fixtures/swh_1_rev_1c480a4573d2a003fc2630c21c2b25829de49972.git.tar
Changes applied before test
commit d5aea6bafe9c9ab86a13ffbe7c783eb666f80e2f
Merge: d0335365 42c74df4
Author: Jenkins user <jenkins@localhost>
Date:   Thu Sep 2 15:09:51 2021 +0000

    Merge branch 'diff-target' into HEAD

commit 42c74df4882106090573433e235fa8eccd260b94
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Sep 2 16:58:06 2021 +0200

    vault: Rename downloaded files to replace ':' with '_' in SWHIDs
    
    Both Firefox and Chromium replace ':' (with spaces and underscores respectively)

commit 7e1e167e80273f90a48d991e6e63102acaec28fd
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Sep 2 15:06:31 2021 +0200

    Switch the UI to use bare git archives, instead of gitfast.

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

anlambert added a subscriber: anlambert.

Looks good to me.

This revision is now accepted and ready to land.Sep 2 2021, 5:28 PM

Build is green

Patch application report for D6174 (id=22382)

Could not rebase; Attempt merge onto d0335365a4...

Updating d0335365..23d3d68f
Fast-forward
 assets/src/bundles/vault/vault-create-tasks.js     |   8 +++---
 assets/src/bundles/vault/vault-table-row.ejs       |   7 ++---
 assets/src/bundles/vault/vault-ui.js               |   8 +++---
 ...0a4573d2a003fc2630c21c2b25829de49972.gitfast.gz | Bin 1391 -> 0 bytes
 ...d19126d815470b28919d64b2a8e6a3e37f900dd.tar.gz} | Bin
 ...c480a4573d2a003fc2630c21c2b25829de49972.git.tar | Bin 0 -> 20480 bytes
 cypress/integration/vault.spec.js                  |  30 ++++++++++-----------
 swh/web/api/views/vault.py                         |  20 +++++++++-----
 swh/web/templates/includes/vault-create-tasks.html |   4 +--
 9 files changed, 42 insertions(+), 35 deletions(-)
 delete mode 100644 cypress/fixtures/swh:1:rev:1c480a4573d2a003fc2630c21c2b25829de49972.gitfast.gz
 rename cypress/fixtures/{swh:1:dir:cd19126d815470b28919d64b2a8e6a3e37f900dd.tar.gz => swh_1_dir_cd19126d815470b28919d64b2a8e6a3e37f900dd.tar.gz} (100%)
 create mode 100644 cypress/fixtures/swh_1_rev_1c480a4573d2a003fc2630c21c2b25829de49972.git.tar
Changes applied before test
commit 23d3d68f19686a83eb3a89a65465e12b487a0f8d
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Sep 2 16:58:06 2021 +0200

    vault: Rename downloaded files to replace ':' with '_' in SWHIDs
    
    Both Firefox and Chromium replace ':' (with spaces and underscores respectively)

commit f324ac3a549c4cf4bd78210eeca57e639dfcf668
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Sep 2 15:06:31 2021 +0200

    Switch the UI to use bare git archives, instead of gitfast.

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