guix: Ingesting TeX Live Subversion checkouts

@civodul In your excerpt, to what does the integrity field refer to?

Is that the Nar computation of the svn exported directory of the repository at the revision 66594 with only the subdirectories mentioned in the svn_subdirectories key?

Hi @ardumont!

The only hash Guix keeps is the nar hash of the combined checkouts, and this is what the integrity field contains (so it's currently incorrect).

What I'm proposing is to have svn_subdirectories specify which directories are being combined, with the understanding that integrity is the nar hash of that combination.

Does that make sense?

The only hash Guix keeps is the nar hash of the combined checkouts, and this is what the integrity field contains (so it's currently incorrect).

yes.

What I'm proposing is to have svn_subdirectories specify which directories are being combined, with the understanding that integrity is the nar hash of that combination. Does that make sense?

Yes, I think so. I'm under the impression we agree, just telling it differently.

Implementation wise, that gives roughly something like, using the json manifest:

Do the svn export of the repository at the svn revision mentioned.
Keep the subdirectories folder mentioned in the svn 'svn_subDirectories' key for that repository 'checkout'.
Compute the nar hash on the main repository folder.
That nar hash should match the integrity field.

Right?

Do the svn export of the repository at the svn revision mentioned.

Keep the subdirectories folder mentioned in the svn 'svn_subDirectories' key for that repository 'checkout'.

We should rather export each sub-directory independently as subversion allows it and combine them using the expected folders hierarchy, as Tex Live source tree is quite huge and a full export will consume a lot of bandwidth.

sure, even better!

This should be easy to modify the SvnExportLoader to implement the processing.

I tested it with the Guix package texlive-algpseudocodex to check if we end up with the correct nar hash.

Package definition is the following:

(define-public texlive-algpseudocodex
  (package
    (name "texlive-algpseudocodex")
    (version (number->string %texlive-revision))
    (source (texlive-origin
             name version
             (list "doc/latex/algpseudocodex/"
                   "tex/latex/algpseudocodex/")
             (base32
              "1gjcdmzijiagzxwjwygqpbjjapzk9dfljv5d94iabzr8032l9rsh")))
    (outputs '("out" "doc"))
    (build-system texlive-build-system)
    (home-page "https://ctan.org/pkg/algpseudocodex")
    (synopsis "Package for typesetting pseudocode")
    (description
     "This package allows typesetting pseudocode in LaTeX.  It is based on
@code{algpseudocode} from the @code{algorithmicx} package and uses the same
syntax, but adds several new features and improvements.  Notable features
include customizable indent guide lines and the ability to draw boxes around
parts of the code for highlighting differences.  This package also has better
support for long code lines spanning several lines and improved comments.")
    (license license:lppl1.3c)))

The two subfolders of the Tex Live repository to export are doc/latex/algpseudocodex and tex/latex/algpseudocodex from base URL svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist at revision 66594. The NAR hash to obtain is 1gjcdmzijiagzxwjwygqpbjjapzk9dfljv5d94iabzr8032l9rsh (in format nix-base32, default in guix hash).

Let's try to reproduce the directory to archive locally.

$ cd /tmp

$ mkdir texlive-algpseudocodex

$ cd texlive-algpseudocodex

$ svn export svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/doc/latex/algpseudocodex/@66594 doc/latex/algpseudocodex
A    doc/latex/algpseudocodex
A    doc/latex/algpseudocodex/README.md
A    doc/latex/algpseudocodex/algpseudocodex.pdf
A    doc/latex/algpseudocodex/algpseudocodex.tex
Exported revision 66594.

$ svn export svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/tex/latex/algpseudocodex/@66594 tex/latex/algpseudocodex
A    tex/latex/algpseudocodex
A    tex/latex/algpseudocodex/algpseudocodex.sty
Exported revision 66594.

$ tree
.
├── doc
│   └── latex
│       └── algpseudocodex
│           ├── algpseudocodex.pdf
│           ├── algpseudocodex.tex
│           └── README.md
└── tex
    └── latex
        └── algpseudocodex
            └── algpseudocodex.sty

7 directories, 4 files

$ guix hash -S nar .
1gjcdmzijiagzxwjwygqpbjjapzk9dfljv5d94iabzr8032l9rsh

All good !

So adding svn_subdirectories field in JSON manifest with value ["doc/latex/algpseudocodex/", "text/latex/algpseudocodex/"] is sufficient on our side to reconstruct the same directory to hash.

@ardumont @anlambert Awesome. I've deployed the thing in production: https://guix.gnu.org/sources.json. I ended up calling it svn_files because I realized it can be plain files too.

Let me know if you think it needs to be adjusted!

Another thought on how to proper archiving these Tex Live origins, currently in the manifest we only have the base SVN url for Tex Live, see sample below:

{
  "type": "svn",
  "svn_url": "svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/",
  "integrity": "sha256-aopNymksaI1whgNtmY9APCylFudXTjWKsrhx928wy+M=",
  "outputHashAlgo": "sha256",
  "outputHashMode": "recursive",
  "svn_revision": 66594
},
{
  "type": "svn",
  "svn_url": "svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/",
  "integrity": "sha256-p/ATFkIuWX8N0kCXgx2Dv8fNLH17ULSYaN+Qit4XOaw=",
  "outputHashAlgo": "sha256",
  "outputHashMode": "recursive",
  "svn_revision": 66594
},
...

While adding the new info of directories to checkout and combine will enable us to recompute the same hash, all archived directories will be a new snapshot of the same origin URL svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/ which is not an issue on the Guix side as directories will be requested by ExtIDs but is not really consistent on the SWH side.

Adding the Guix package names in the JSON manifest would be of interest to us so we could use origin URLs in the form https://packages.guix.gnu.org/packages/<package_name> to disambiguate what we archived.

Adding the Guix package names in the JSON manifest would be of interest to us so we could use origin URLs in the form https://packages.guix.gnu.org/packages/<package_name> to disambiguate what we archived.

In addition to svn_subdirectories, which field would be required in the file sources.json?

Adding a new packageName field would be of interest to us, for instance in the texlive-algpseudocodex example above, its entry in the manifest would be:

{
  "packageName": "texlive-algpseudocodex",
  "type": "svn",
  "svn_url": "svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/",
  "svn_subdirectories": ["doc/latex/algpseudocodex/", "text/latex/algpseudocodex/"],
  "integrity": "sha256-UOdExQAo/6UiSa1sSV1L818l5br4eS55/09FGX9tTL4=",
  "outputHashAlgo": "sha256",
  "outputHashMode": "recursive",
  "svn_revision": 66594
}

@ardumont, as an alternate way to disambiguate the archived directory, instead of changing the origin URL, we could create a branch in the produced snapshot with the package name.

@civodul added svn_files (instead of svn_subdirectories) with the rationale that it is not always directories but can also be just files. Is it fine?

The addition of the package name on our side needs some adaptations because the sources are extracted for each package. Other said, a package has one name but then it can refer to several origins (the main, patches, some inputs for the tests, etc.). Last each origin is processed and all the fields are filled; i.e., there is not anymore any field packageName.

Therefore, we need to special case svn and maybe TeXlive packages, in order to keep the packageName.

Or if you prefer, we could generate a list of URLs, something like:

{
  "type": "multi-svn",
  "svn_urls": ["svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/doc/latex/algpseudocodex", "svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/tex/latex/algpseudocodex"],
  "integrity": "sha256-aopNymksaI1whgNtmY9APCylFudXTjWKsrhx928wy+M=",
  "outputHashAlgo": "sha256",
  "outputHashMode": "recursive",
  "svn_revision": 66594
},

where multi-svn is for dealing with this list of URLs, here svn_urls. Or just svn and you check on the type of svn_url.

I do not know... @anlambert @ardumont WDYT?

@civodul added svn_files (instead of svn_subdirectories) with the rationale that it is not always directories but can also be just files. Is it fine?

All good !

The addition of the package name on our side needs some adaptations because the sources are extracted for each package. Other said, a package has one name but then it can refer to several origins (the main, patches, some inputs for the tests, etc.). Last each origin is processed and all the fields are filled; i.e., there is not anymore any field packageName.

Ack, I thought adding the package name was straightforward on your side but apparently not. Do not bother with that then, we will add a special processing in our guix lister for the the Tex Live origins to derive the tex package name from the paths listed in svn_files and use it as branch name in the snapshot to produce.

Or if you prefer, we could generate a list of URLs, something like: where multi-svn is for dealing with this list of URLs, here svn_urls. Or just svn and you check on the type of svn_url.

I think the current state of https://guix.gnu.org/sources.json is good enough for us, no need to change the current JSON layout.

mentioned in commit anlambert/swh-loader-svn@76efb0d9

mentioned in commit anlambert/swh-loader-svn@34f48d62

mentioned in merge request swh/devel/swh-loader-svn!245 (merged)

mentioned in commit anlambert/swh-loader-svn@25d04eee

mentioned in commit anlambert/swh-loader-svn@61497c7a

mentioned in commit anlambert/swh-loader-svn@58c9f964

mentioned in commit anlambert/swh-loader-svn@22619bfd

mentioned in commit anlambert/swh-loader-svn@0624978a

mentioned in commit anlambert/swh-loader-svn@2c0d3238

@civodul @zimoun Some follow-up on that issue.

The possibility to archive a subset of a subversion tree at a specific revision has been implemented in swh/devel/swh-loader-svn!245 (merged).

I tested locally the loading of the 4152 Tex Live packages referenced in the sources.json file and everything went fine except for the texlive-hyphen-complete where a NAR hash mismatch is obtained.

$ swh -l DEBUG loader run svn-export svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/ checksum_layout='nar' checksums='{"sha256": "8cbc1157aa9342fd5d7636f5e269cebb01cf4c443beff27b50cfdabaa548fbef"}' ref='66594' svn_paths='["doc/generic/dehyph-exptl/", "doc/generic/elhyphen", "doc/generic/huhyphen", "doc/generic/hyph-utf8/", "doc/luatex/hyph-utf8/", "doc/generic/ukrhyph/", "source/generic/hyph-utf8/", "source/luatex/hyph-utf8/", "source/generic/ruhyphen/", "tex/generic/config/", "tex/generic/dehyph/", "tex/generic/dehyph-exptl/", "tex/generic/hyph-utf8/", "tex/generic/hyphen/", "tex/generic/ruhyphen/", "tex/generic/ukrhyph/", "tex/luatex/hyph-utf8/"]'

WARNING:swh.loader.cli:No storage configuration detected, using an in-memory storage instead.
DEBUG:swh.loader.cli:kw: {'checksum_layout': 'nar', 'checksums': {'sha256': '8cbc1157aa9342fd5d7636f5e269cebb01cf4c443beff27b50cfdabaa548fbef'}, 'ref': 66594, 'svn_paths': ['doc/generic/dehyph-exptl/', 'doc/generic/elhyphen', 'doc/generic/huhyphen', 'doc/generic/hyph-utf8/', 'doc/luatex/hyph-utf8/', 'doc/generic/ukrhyph/', 'source/generic/hyph-utf8/', 'source/luatex/hyph-utf8/', 'source/generic/ruhyphen/', 'tex/generic/config/', 'tex/generic/dehyph/', 'tex/generic/dehyph-exptl/', 'tex/generic/hyph-utf8/', 'tex/generic/hyphen/', 'tex/generic/ruhyphen/', 'tex/generic/ukrhyph/', 'tex/luatex/hyph-utf8/']}
DEBUG:swh.loader.cli:registry: {'task_modules': [], 'loader': <class 'swh.loader.svn.directory.SvnExportLoader'>}
DEBUG:swh.loader.cli:loader class: <class 'swh.loader.svn.directory.SvnExportLoader'>
DEBUG:swh.loader.svn.directory.SvnExportLoader:Loader checksums computation: nar
INFO:swh.loader.svn.directory.SvnExportLoader:Load origin 'svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/' with type 'svn-export'
DEBUG:swh.loader.svn.directory.SvnExportLoader:lister_not provided, skipping extrinsic origin metadata
DEBUG:swh.core.statsd:Error submitting statsd packet. Dropping the packet and closing the socket.
DEBUG:swh.loader.svn.directory.SvnExportLoader:Exporting from the svn source tree rooted at svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/@66594 the sub-paths: doc/generic/dehyph-exptl/, doc/generic/elhyphen, doc/generic/huhyphen, doc/generic/hyph-utf8/, doc/luatex/hyph-utf8/, doc/generic/ukrhyph/, source/generic/hyph-utf8/, source/luatex/hyph-utf8/, source/generic/ruhyphen/, tex/generic/config/, tex/generic/dehyph/, tex/generic/dehyph-exptl/, tex/generic/hyph-utf8/, tex/generic/hyphen/, tex/generic/ruhyphen/, tex/generic/ukrhyph/, tex/luatex/hyph-utf8/
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/doc/generic/dehyph-exptl /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/doc/generic/dehyph-exptl
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/doc/generic/elhyphen /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/doc/generic/elhyphen
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/doc/generic/huhyphen /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/doc/generic/huhyphen
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/doc/generic/hyph-utf8 /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/doc/generic/hyph-utf8
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/doc/luatex/hyph-utf8 /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/doc/luatex/hyph-utf8
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/doc/generic/ukrhyph /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/doc/generic/ukrhyph
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/source/generic/hyph-utf8 /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/source/generic/hyph-utf8
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/source/luatex/hyph-utf8 /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/source/luatex/hyph-utf8
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/source/generic/ruhyphen /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/source/generic/ruhyphen
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/tex/generic/config /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/tex/generic/config
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/tex/generic/dehyph /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/tex/generic/dehyph
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/tex/generic/dehyph-exptl /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/tex/generic/dehyph-exptl
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/tex/generic/hyph-utf8 /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/tex/generic/hyph-utf8
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/tex/generic/hyphen /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/tex/generic/hyphen
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/tex/generic/ruhyphen /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/tex/generic/ruhyphen
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/tex/generic/ukrhyph /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/tex/generic/ukrhyph
DEBUG:swh.loader.svn.svn_repo:svn export -r 66594 --depth infinity --ignore-externals --force --ignore-keywords svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/tex/luatex/hyph-utf8 /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617/tex/luatex/hyph-utf8
DEBUG:swh.loader.svn.directory.SvnExportLoader:Artifact <svn-export> with path /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617
DEBUG:swh.loader.svn.directory.SvnExportLoader:Artifact <svn-export> to check nar hashes: /tmp/tmp03cwhjq4-2024-03-11T15:40:02.955617
DEBUG:swh.loader.svn.directory.SvnExportLoader:Mismatched checksums <svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/>: continue on next mirror url if any
ERROR:swh.loader.svn.directory.SvnExportLoader:Loading failure, updating to `failed` status
Traceback (most recent call last):
  File "/home/anlambert/swh/swh-environment/swh-loader-core/build/__editable__.swh.loader.core-5.17.1.dev3+gc45625f-py3-none-any/swh/loader/core/loader.py", line 451, in load
    more_data_to_fetch = self.fetch_data()
                         ^^^^^^^^^^^^^^^^^
  File "/home/anlambert/swh/swh-environment/swh-loader-core/build/__editable__.swh.loader.core-5.17.1.dev3+gc45625f-py3-none-any/swh/loader/core/loader.py", line 842, in fetch_data
    raise errors[0]
ValueError: Checksum mismatched on <svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/>: {'sha256': 'b7d29e459e66265fec358aac8a7758d2deb897d4f42ee1231d55524b216f8d85'} != {'sha256': '8cbc1157aa9342fd5d7636f5e269cebb01cf4c443beff27b50cfdabaa548fbef'}
DEBUG:swh.core.statsd:Error submitting statsd packet. Dropping the packet and closing the socket.
DEBUG:swh.loader.svn.svn_repo:cleanup /tmp/tmp1a_olgsf
DEBUG:swh.core.statsd:Error submitting statsd packet. Dropping the packet and closing the socket.
{'status': 'failed'} for origin 'svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/'

I extracted the content of the NAR archive for that package hosted on Guix using the following command:

$ wget -O - http://bordeaux.guix.gnu.org/nar/lzip/phsfa94n95wadi79fn7aqavc5qd3570d-texlive-hyphen-complete-66594-checkout | lzip -d | guix archive -x /tmp/texlive-hyphen-complete

and compared it with the expected one.

I noticed that the sub-directories doc/generic/elhyphen and doc/generic/huhyphen referenced in the guix package definition are missing in the NAR archive hence the hash mismatch.

Hi @anlambert

Thanks for the report. Indeed a bug on Guix side. I will send fixes for that, except if @civodul beats me. ;-)

Before and after the change:

$ guix hash -S nar -f hex -H sha256 $(guix build -S texlive-hyphen-complete)
8cbc1157aa9342fd5d7636f5e269cebb01cf4c443beff27b50cfdabaa548fbef
$ guix hash -S nar -f hex -H sha256 $(./pre-inst-env guix build -S texlive-hyphen-complete)
b7d29e459e66265fec358aac8a7758d2deb897d4f42ee1231d55524b216f8d85

The change:

$ git diff
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1732d842c8..21a2d47a39 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -400,8 +400,8 @@ (define-public texlive-hyphen-complete
     (source (texlive-origin
              name version
              (list "doc/generic/dehyph-exptl/"
-                   "doc/generic/elhyphen"
-                   "doc/generic/huhyphen"
+                   "doc/generic/elhyphen/"
+                   "doc/generic/huhyphen/"
                    "doc/generic/hyph-utf8/"
                    "doc/luatex/hyph-utf8/"
                    "doc/generic/ukrhyph/"
@@ -417,7 +417,7 @@ (define-public texlive-hyphen-complete
                    "tex/generic/ukrhyph/"
                    "tex/luatex/hyph-utf8/")
              (base32
-              "1vzv92jvmnnga1xz5vrv8i6cy0dvrrly5x9nfrfzshlkm9bi3g4c")))
+              "11cddwhlnljm3liy2bplsjbvipnjb1vqmb4a6pn5y9k6kr2rxlmp")))
     (outputs '("out" "doc"))

Arf! :-)

Cheers, simon

Hi @anlambert

Looking for something to prevent similar issue, I am not sure what could be done on our side.

Roughly, the ending slash / suffix is used to detect if svn export must happen in path/to/directory/ or in the directory name of path/to/file (i.e., path/to/). For each location listed (e.g., "doc/generic/elhyphen/"), the code reads:

                        (svn-fetch (string-append (getenv "svn url") "/" location)
                                   (string->number (getenv "svn revision"))
                                   (if (string-suffix? "/" location)
                                       (string-append #$output "/" location)
                                       (string-append #$output "/" (dirname location)))
                                   #:svn-command #+(file-append svn "/bin/svn")
                                   #:recursive? (match (getenv "svn recursive?")
                                                  ("yes" #t)
                                                  (_ #f))
                                   #:user-name (getenv "svn user name")
                                   #:password (getenv "svn password"))))

Therefore, I am not sure we could do better without something overcomplicated on our side. Other said, this kind of error might happen again if a slash / is forgotten as it was the case. Hum?

Well, I do not know...

Cheers, simon

Oh, I did not even notice the missing trailing slashes.

On the SWH side, we do not have such processing, trailing slashes are stripped and the svn export command is called to export either a directory or a file, see related code. Sub-folders to export are created a priori and we use the --force option of the export command to ensure subversion will not raise an error if a directory already exists due to a previous export operation.

Therefore, I am not sure we could do better without something overcomplicated on our side. Other said, this kind of error might happen again if a slash / is forgotten as it was the case. Hum?

Not sure what you can do on Guix side to avoid that kind of mistake. Maybe you could add some checks based on the svn info command as it can give you the type of svn node targeted by an URL:

$ svn info svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/doc/generic/elhyphen
Path: elhyphen
URL: svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/doc/generic/elhyphen
Relative URL: ^/tags/texlive-2023.0/Master/texmf-dist/doc/generic/elhyphen
Repository Root: svn://www.tug.org/texlive
Repository UUID: c570f23f-e606-0410-a88d-b1316a301751
Revision: 70618
Node Kind: directory
Last Changed Author: karl
Last Changed Rev: 29714
Last Changed Date: 2013-04-07 20:26:53 +0200 (dim., 07 avril 2013)

$ svn info svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/dvips/cm-super/config.cm-super
Path: config.cm-super
Name: config.cm-super
URL: svn://www.tug.org/texlive/tags/texlive-2023.0/Master/texmf-dist/dvips/cm-super/config.cm-super
Relative URL: ^/tags/texlive-2023.0/Master/texmf-dist/dvips/cm-super/config.cm-super
Repository Root: svn://www.tug.org/texlive
Repository UUID: c570f23f-e606-0410-a88d-b1316a301751
Revision: 70618
Node Kind: file
Size in Repository: 118
Last Changed Author: karl
Last Changed Rev: 88
Last Changed Date: 2006-01-09 02:01:02 +0100 (lun., 09 janv. 2006)

mentioned in commit anlambert/swh-scheduler@536428b9

mentioned in merge request swh/devel/swh-scheduler!374 (closed)

mentioned in commit anlambert/swh-loader-svn@8bd757b4

mentioned in merge request swh/devel/swh-loader-svn!247 (merged)

mentioned in commit anlambert/swh-lister@ed418bc9

mentioned in merge request swh/devel/swh-lister!521 (merged)

guix: Ingesting TeX Live Subversion checkouts

Designs

Child items ...

Activity