Page MenuHomeSoftware Heritage
Differential D6102

git_bare: Use an enum to represent the root object type
ClosedPublic
Actions

Authored by vlorentz on Aug 17 2021, 10:47 AM.

Details

Reviewers
anlambert
Group Reviewers
Reviewers
Maniphest Tasks
T843: Vault: Add a "git bare" tarball cooker
Commits
rDVAU438f81c62e95: git_bare: Use an enum to represent the root object type
Summary

Instead of parsing self.bundle_type on the fly in multiple places.

Diff Detail

Repository
rDVAU Software Heritage Vault
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

vlorentz created this revision.Aug 17 2021, 10:47 AM
Herald added a reviewer: Reviewers. · View Herald TranscriptAug 17 2021, 10:47 AM
swh-public-ci added a comment.Aug 17 2021, 10:51 AM

Build is green

Patch application report for D6102 (id=22073)

Could not rebase; Attempt merge onto 149b1c1c31...

Updating 149b1c1..d0da7ba
Fast-forward
 swh/vault/backend.py                  | 121 +++++++++++++++++-----------------
 swh/vault/cache.py                    |  28 ++++----
 swh/vault/cli.py                      |   6 +-
 swh/vault/cookers/__init__.py         |  14 ++--
 swh/vault/cookers/base.py             |  25 +++----
 swh/vault/cookers/git_bare.py         | 119 ++++++++++++++++++++++-----------
 swh/vault/cookers/revision_gitfast.py |   2 +-
 swh/vault/cooking_tasks.py            |   8 +--
 swh/vault/in_memory_backend.py        |  18 ++---
 swh/vault/interface.py                |  14 ++--
 swh/vault/tests/test_backend.py       |  16 ++---
 swh/vault/tests/test_cli.py           |   9 ++-
 swh/vault/tests/test_cookers_base.py  |   2 +-
 swh/vault/tests/test_server.py        |   4 +-
 14 files changed, 220 insertions(+), 166 deletions(-)
Changes applied before test
commit d0da7bad3473b2a5d7c2635ed2e69e74b2534bd1
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Aug 17 10:47:02 2021 +0200

    git_bare: Use an enum to represent the root object type
    
    Instead of parsing self.bundle_type on the fly in multiple places.

commit e3b5805f2bceb11d18136ab024c01c844a19dc5d
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Aug 17 10:38:22 2021 +0200

    Rename obj_type to bundle_type
    
    'obj_type' was confusing, because it means 'the type of objects in the
    vault backend', which is actually made of an object type (dir/rev/...)
    AND the cooker name.
    
    Plus, I want to reuse the name 'obj_type' in a future commit to reference
    what is actually the object type, in the swh-model definition.

commit 6f395bee4b2ecba0661da4093846efd14278ba79
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 13 10:38:53 2021 +0200

    git_bare: add some modularity to directory creation
    
    It allows me to tweak the code to experiment

commit 22abc040f2fcfd930f231b07bea81f383b7d4620
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 13 10:04:49 2021 +0200

    git_bare: Add support for directories as snapshot branches

commit 0d7d0786c5f63e0164eadc4c0f65967a144d6831
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 13 10:03:31 2021 +0200

    git_bare: Skip loading empty lists

commit 0b3bf03d32a67422fd39e4d411471a23311ec253
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 13 10:01:56 2021 +0200

    git_bare: Deduplicate loading of release subgraphs

commit 03ab5a97b46b37eb6925ccb459893bce02ce7654
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 13 09:58:19 2021 +0200

    git_bare: Fix crash on dangling branches

commit 4d31b7a49a17531fe9d5de24f3085870e691a383
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 13 09:57:21 2021 +0200

    Disable bundle size limit when running from the CLI.

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

Harbormaster completed remote builds in B23028: Diff 22073.Aug 17 2021, 10:51 AM
vlorentz requested review of this revision.Aug 17 2021, 10:51 AM
anlambert accepted this revision.Aug 17 2021, 11:21 AM
anlambert added a subscriber: anlambert.

+1, and code is more readable that way imho

This revision is now accepted and ready to land.Aug 17 2021, 11:21 AM
vlorentz updated this revision to Diff 22081.Aug 17 2021, 11:46 AM

rebase

swh-public-ci added a comment.Aug 17 2021, 11:59 AM

Build is green

Patch application report for D6102 (id=22081)

Could not rebase; Attempt merge onto 38fcc30ba5...

Updating 38fcc30..438f81c
Fast-forward
 swh/vault/backend.py                    | 121 ++++++++++++++++----------------
 swh/vault/cache.py                      |  28 ++++----
 swh/vault/cli.py                        |   5 +-
 swh/vault/cookers/__init__.py           |  14 ++--
 swh/vault/cookers/base.py               |  25 +++----
 swh/vault/cookers/git_bare.py           |  71 ++++++++++++-------
 swh/vault/cookers/revision_gitfast.py   |   2 +-
 swh/vault/cooking_tasks.py              |   8 +--
 swh/vault/in_memory_backend.py          |  18 ++---
 swh/vault/interface.py                  |  14 ++--
 swh/vault/tests/test_backend.py         |  16 ++---
 swh/vault/tests/test_cli.py             |   8 ++-
 swh/vault/tests/test_cookers_base.py    |   2 +-
 swh/vault/tests/test_git_bare_cooker.py | 105 +++++++++++++++++++--------
 swh/vault/tests/test_server.py          |   4 +-
 15 files changed, 259 insertions(+), 182 deletions(-)
Changes applied before test
commit 438f81c62e950b63b42717f478f70aa4bdcc4f05
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Aug 17 10:47:02 2021 +0200

    git_bare: Use an enum to represent the root object type
    
    Instead of parsing self.bundle_type on the fly in multiple places.

commit cf6e9bd6a834761a2af0d2a1a60df566d60adad8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Aug 17 10:38:22 2021 +0200

    Rename obj_type to bundle_type
    
    'obj_type' was confusing, because it means 'the type of objects in the
    vault backend', which is actually made of an object type (dir/rev/...)
    AND the cooker name.
    
    Plus, I want to reuse the name 'obj_type' in a future commit to reference
    what is actually the object type, in the swh-model definition.

commit 04a738807217ef5968cd62670a21374bff48748d
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 13 10:38:53 2021 +0200

    git_bare: add some modularity to directory creation
    
    It allows me to tweak the code to experiment

commit 2320131e2331588ef8951ee9655dce46e0affcce
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 13 10:04:49 2021 +0200

    git_bare: Add support for directories as snapshot branches

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

Harbormaster completed remote builds in B23037: Diff 22081.Aug 17 2021, 11:59 AM
Closed by commit rDVAU438f81c62e95: git_bare: Use an enum to represent the root object type (authored by vlorentz). · Explain WhyAug 17 2021, 12:39 PM
This revision was automatically updated to reflect the committed changes.
vlorentz added a commit: rDVAU438f81c62e95: git_bare: Use an enum to represent the root object type.
vlorentz added a task: T843: Vault: Add a "git bare" tarball cooker.Aug 23 2021, 10:55 AM

Revision Contents
Changeset List

PathSize
swh/
vault/
cookers/
47 lines

Diff 22086

View Options

swh/vault/cookers/git_bare.py

Loading...
About · Developer information · Legal