From b570fa1435c66270883e1c78f520fc226f9cac47 Mon Sep 17 00:00:00 2001 From: Fintan Halpenny Date: Wed, 12 Nov 2025 12:20:36 +0000 Subject: [PATCH] Re-License to "MIT OR Aapache-2.0" The main dependant of `radicle-git`, and its crates, is [`heartwood`]. It is licensed under MIT or Apache-2.0, which has been incompatible with the GPL-3.0 license. Since the intellectual property of this code base is with the Better Internet Foundation, it was decided to re-license code in this repository to make the upstream repository compatible. - Remove the license headers (and instructions to add them) - Add MIT and Apache-2.0 licenses - Remove the GPL-3.0 license - Change the license declarations in the `Cargo.toml` files [`heartwood`]: https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 --- CONTRIBUTING.md | 8 - LICENSE | 639 ------------------ LICENSE-APACHE | 176 +++++ LICENSE-MIT | 21 + deny.toml | 1 - radicle-git-ext/Cargo.toml | 2 +- radicle-git-ext/git-ref-format/Cargo.toml | 2 +- .../git-ref-format/core/Cargo.toml | 2 +- .../git-ref-format/core/src/cbor.rs | 5 - .../git-ref-format/core/src/check.rs | 5 - .../git-ref-format/core/src/deriv.rs | 5 - .../git-ref-format/core/src/lib.rs | 5 - .../git-ref-format/core/src/lit.rs | 5 - .../git-ref-format/core/src/name.rs | 5 - .../git-ref-format/core/src/name/iter.rs | 5 - .../git-ref-format/core/src/refspec.rs | 5 - .../git-ref-format/core/src/refspec/iter.rs | 5 - .../git-ref-format/core/src/serde.rs | 5 - .../git-ref-format/macro/Cargo.toml | 2 +- .../git-ref-format/macro/src/lib.rs | 5 - radicle-git-ext/git-ref-format/src/lib.rs | 5 - radicle-git-ext/git-ref-format/t/Cargo.toml | 2 +- radicle-git-ext/src/blob.rs | 5 - radicle-git-ext/src/error.rs | 5 - radicle-git-ext/src/lib.rs | 5 - radicle-git-ext/src/oid.rs | 5 - radicle-git-ext/src/revwalk.rs | 5 - radicle-git-ext/src/transport.rs | 5 - radicle-git-ext/src/tree.rs | 5 - radicle-git-ext/t/Cargo.toml | 2 +- radicle-git-ext/t/src/gen.rs | 5 - radicle-git-ext/t/src/gen/urn.rs | 5 - radicle-git-ext/t/src/git_ref_format.rs | 3 - radicle-git-ext/t/src/git_ref_format/gen.rs | 3 - .../t/src/git_ref_format/properties.rs | 3 - .../t/src/git_ref_format/properties/name.rs | 3 - .../src/git_ref_format/properties/pattern.rs | 3 - radicle-git-ext/t/src/git_ref_format/tests.rs | 3 - radicle-git-ext/t/src/lib.rs | 2 - radicle-std-ext/Cargo.toml | 2 +- radicle-std-ext/src/lib.rs | 5 - radicle-std-ext/src/ops.rs | 5 - radicle-std-ext/src/result.rs | 5 - radicle-surf/Cargo.toml | 2 +- radicle-surf/DEVELOPMENT.md | 5 - radicle-surf/build.rs | 17 - radicle-surf/examples/browsing.rs | 17 - radicle-surf/examples/diff.rs | 17 - radicle-surf/src/blob.rs | 17 - radicle-surf/src/commit.rs | 17 - radicle-surf/src/diff.rs | 17 - radicle-surf/src/diff/git.rs | 17 - radicle-surf/src/error.rs | 17 - radicle-surf/src/fs.rs | 17 - radicle-surf/src/glob.rs | 17 - radicle-surf/src/history.rs | 17 - radicle-surf/src/lib.rs | 17 - radicle-surf/src/namespace.rs | 17 - radicle-surf/src/repo.rs | 17 - radicle-surf/src/revision.rs | 17 - radicle-surf/src/stats.rs | 17 - radicle-surf/src/tree.rs | 17 - radicle-surf/t/Cargo.toml | 2 +- radicle-surf/t/src/file_system.rs | 3 - radicle-surf/t/src/lib.rs | 3 - test/Cargo.toml | 2 +- test/src/lib.rs | 3 - test/test-helpers/Cargo.toml | 2 +- test/test-helpers/src/gen.rs | 3 - test/test-helpers/src/gen/std_net.rs | 3 - test/test-helpers/src/lib.rs | 3 - test/test-helpers/src/logging.rs | 5 - test/test-helpers/src/roundtrip.rs | 5 - test/test-helpers/src/tempdir.rs | 5 - 74 files changed, 208 insertions(+), 1126 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE-APACHE create mode 100644 LICENSE-MIT diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bfcac39..3e20770 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,13 +25,5 @@ If you did not sign-off one or more of your commits then it is not all for not. The crowd at `src-d` have a [wonderful guide][fixing-dco] on how to remedy this situation. -## License Header - -As part of our license, we must include a license header at the top of each -source file. The template for this header can be found [here][header-template]. -If you are creating a new file in the repository you will have to add this -header to the file. - [dco]: ./DCO [fixing-dco]: https://github.com/src-d/guide/blob/master/developer-community/fix-DCO.md -[header-template]: ./.license-header diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 2be3db5..0000000 --- a/LICENSE +++ /dev/null @@ -1,639 +0,0 @@ -radicle-git -Copyright © 2019-2021 The Radicle Foundation -Copyright © 2021-2022 The Radicle Link Contributors - -Copyright © 2022 The Radicle Git Contributors - - -radicle-link is licensed under version 3 of the GNU General Public License -(GPLv3). Any contribution to radicle-link must be made subject to the -Developer Certificate of Origin (DCO). - -By making your contribution, you are making the declaration set out in the -Linux Foundation’s Developer Certificate of Origin version 1.1, in which -the “open source licence indicated in the file” is GPLv3. A copy of the -DCO can be found in the file named “DCO”. - --------------------------------------------------------------------------- - - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS diff --git a/LICENSE-APACHE b/LICENSE-APACHE new file mode 100644 index 0000000..1b5ec8b --- /dev/null +++ b/LICENSE-APACHE @@ -0,0 +1,176 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 0000000..68fa6d1 --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 The Radicle Foundation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/deny.toml b/deny.toml index dd91321..98f6291 100644 --- a/deny.toml +++ b/deny.toml @@ -33,7 +33,6 @@ ignore = [ allow = [ "Apache-2.0", "BlueOak-1.0.0", - "GPL-3.0", "MIT", "Unicode-3.0", "Unlicense", diff --git a/radicle-git-ext/Cargo.toml b/radicle-git-ext/Cargo.toml index a6bd113..0858ae2 100644 --- a/radicle-git-ext/Cargo.toml +++ b/radicle-git-ext/Cargo.toml @@ -10,7 +10,7 @@ authors = [ edition = "2021" homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt/tree/README.md" repository = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt" -license = "GPL-3.0-or-later" +license = "MIT OR Apache-2.0" description = "Utilities and extensions to the git2 crate" keywords = ["git", "radicle"] diff --git a/radicle-git-ext/git-ref-format/Cargo.toml b/radicle-git-ext/git-ref-format/Cargo.toml index 0a058e4..fd18b5c 100644 --- a/radicle-git-ext/git-ref-format/Cargo.toml +++ b/radicle-git-ext/git-ref-format/Cargo.toml @@ -8,7 +8,7 @@ authors = [ edition = "2021" homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt/tree/README.md" repository = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt" -license = "GPL-3.0-or-later" +license = "MIT OR Apache-2.0" description = "Everything you never knew you wanted for handling git ref names." keywords = ["git", "references"] diff --git a/radicle-git-ext/git-ref-format/core/Cargo.toml b/radicle-git-ext/git-ref-format/core/Cargo.toml index 55f2131..e9a7cc4 100644 --- a/radicle-git-ext/git-ref-format/core/Cargo.toml +++ b/radicle-git-ext/git-ref-format/core/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Kim Altintop "] edition = "2021" homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt/tree/README.md" repository = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt" -license = "GPL-3.0-or-later" +license = "MIT OR Apache-2.0" description = "Core types for the git-ref-format crate" keywords = ["git", "references"] diff --git a/radicle-git-ext/git-ref-format/core/src/cbor.rs b/radicle-git-ext/git-ref-format/core/src/cbor.rs index 0df411b..c453577 100644 --- a/radicle-git-ext/git-ref-format/core/src/cbor.rs +++ b/radicle-git-ext/git-ref-format/core/src/cbor.rs @@ -1,8 +1,3 @@ -// Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use std::convert::TryFrom; use minicbor::{ diff --git a/radicle-git-ext/git-ref-format/core/src/check.rs b/radicle-git-ext/git-ref-format/core/src/check.rs index 4c60fce..36bb5f4 100644 --- a/radicle-git-ext/git-ref-format/core/src/check.rs +++ b/radicle-git-ext/git-ref-format/core/src/check.rs @@ -1,8 +1,3 @@ -// Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use thiserror::Error; pub struct Options { diff --git a/radicle-git-ext/git-ref-format/core/src/deriv.rs b/radicle-git-ext/git-ref-format/core/src/deriv.rs index 00c0a5f..174bd21 100644 --- a/radicle-git-ext/git-ref-format/core/src/deriv.rs +++ b/radicle-git-ext/git-ref-format/core/src/deriv.rs @@ -1,8 +1,3 @@ -// Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use std::{ borrow::Cow, fmt::{self, Display}, diff --git a/radicle-git-ext/git-ref-format/core/src/lib.rs b/radicle-git-ext/git-ref-format/core/src/lib.rs index 3f0cf09..eb069fb 100644 --- a/radicle-git-ext/git-ref-format/core/src/lib.rs +++ b/radicle-git-ext/git-ref-format/core/src/lib.rs @@ -1,8 +1,3 @@ -// Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - mod check; pub use check::{ref_format as check_ref_format, Error, Options}; diff --git a/radicle-git-ext/git-ref-format/core/src/lit.rs b/radicle-git-ext/git-ref-format/core/src/lit.rs index beae4e4..bcafefb 100644 --- a/radicle-git-ext/git-ref-format/core/src/lit.rs +++ b/radicle-git-ext/git-ref-format/core/src/lit.rs @@ -1,8 +1,3 @@ -// Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use crate::{name, Qualified, RefStr}; /// A literal [`RefStr`]. diff --git a/radicle-git-ext/git-ref-format/core/src/name.rs b/radicle-git-ext/git-ref-format/core/src/name.rs index 6d8ddd5..7802fa2 100644 --- a/radicle-git-ext/git-ref-format/core/src/name.rs +++ b/radicle-git-ext/git-ref-format/core/src/name.rs @@ -1,8 +1,3 @@ -// Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use std::{ borrow::{Borrow, Cow}, convert::TryFrom, diff --git a/radicle-git-ext/git-ref-format/core/src/name/iter.rs b/radicle-git-ext/git-ref-format/core/src/name/iter.rs index 3339107..2a093e1 100644 --- a/radicle-git-ext/git-ref-format/core/src/name/iter.rs +++ b/radicle-git-ext/git-ref-format/core/src/name/iter.rs @@ -1,8 +1,3 @@ -// Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use std::{ borrow::Cow, fmt::{self, Display}, diff --git a/radicle-git-ext/git-ref-format/core/src/refspec.rs b/radicle-git-ext/git-ref-format/core/src/refspec.rs index d47af01..532005d 100644 --- a/radicle-git-ext/git-ref-format/core/src/refspec.rs +++ b/radicle-git-ext/git-ref-format/core/src/refspec.rs @@ -1,8 +1,3 @@ -// Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use std::{ borrow::{Borrow, Cow}, convert::TryFrom, diff --git a/radicle-git-ext/git-ref-format/core/src/refspec/iter.rs b/radicle-git-ext/git-ref-format/core/src/refspec/iter.rs index 9ea3747..0858f3d 100644 --- a/radicle-git-ext/git-ref-format/core/src/refspec/iter.rs +++ b/radicle-git-ext/git-ref-format/core/src/refspec/iter.rs @@ -1,8 +1,3 @@ -// Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use std::fmt::{self, Display}; use super::PatternStr; diff --git a/radicle-git-ext/git-ref-format/core/src/serde.rs b/radicle-git-ext/git-ref-format/core/src/serde.rs index c5bac7f..f43cca0 100644 --- a/radicle-git-ext/git-ref-format/core/src/serde.rs +++ b/radicle-git-ext/git-ref-format/core/src/serde.rs @@ -1,8 +1,3 @@ -// Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use std::convert::TryFrom; use serde::{de, Deserialize, Deserializer, Serialize, Serializer}; diff --git a/radicle-git-ext/git-ref-format/macro/Cargo.toml b/radicle-git-ext/git-ref-format/macro/Cargo.toml index 6340890..fb86641 100644 --- a/radicle-git-ext/git-ref-format/macro/Cargo.toml +++ b/radicle-git-ext/git-ref-format/macro/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Kim Altintop "] edition = "2021" homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt/tree/README.md" repository = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt" -license = "GPL-3.0-or-later" +license = "MIT OR Apache-2.0" description = "Macros for the git-ref-format crate" keywords = ["git", "references"] diff --git a/radicle-git-ext/git-ref-format/macro/src/lib.rs b/radicle-git-ext/git-ref-format/macro/src/lib.rs index 9ccae39..324fee9 100644 --- a/radicle-git-ext/git-ref-format/macro/src/lib.rs +++ b/radicle-git-ext/git-ref-format/macro/src/lib.rs @@ -1,8 +1,3 @@ -// Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - #[macro_use] extern crate proc_macro_error2; diff --git a/radicle-git-ext/git-ref-format/src/lib.rs b/radicle-git-ext/git-ref-format/src/lib.rs index 98f6d4e..837dc0b 100644 --- a/radicle-git-ext/git-ref-format/src/lib.rs +++ b/radicle-git-ext/git-ref-format/src/lib.rs @@ -1,8 +1,3 @@ -// Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - //! Everything you never knew you wanted for handling git ref names. //! //! # Overview diff --git a/radicle-git-ext/git-ref-format/t/Cargo.toml b/radicle-git-ext/git-ref-format/t/Cargo.toml index d83a201..e802059 100644 --- a/radicle-git-ext/git-ref-format/t/Cargo.toml +++ b/radicle-git-ext/git-ref-format/t/Cargo.toml @@ -2,7 +2,7 @@ name = "git-ref-format-test" version = "0.1.0" edition = "2021" -license = "GPL-3.0-or-later" +license = "MIT OR Apache-2.0" publish = false diff --git a/radicle-git-ext/src/blob.rs b/radicle-git-ext/src/blob.rs index 451d4f7..4e23b5d 100644 --- a/radicle-git-ext/src/blob.rs +++ b/radicle-git-ext/src/blob.rs @@ -1,8 +1,3 @@ -// Copyright © 2019-2020 The Radicle Foundation -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use std::{borrow::Cow, path::Path}; use radicle_std_ext::result::ResultExt as _; diff --git a/radicle-git-ext/src/error.rs b/radicle-git-ext/src/error.rs index df7a8e9..b5681ec 100644 --- a/radicle-git-ext/src/error.rs +++ b/radicle-git-ext/src/error.rs @@ -1,8 +1,3 @@ -// Copyright © 2019-2020 The Radicle Foundation -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use std::{fmt::Display, io}; pub fn is_not_found_err(e: &git2::Error) -> bool { diff --git a/radicle-git-ext/src/lib.rs b/radicle-git-ext/src/lib.rs index 33db4a3..bae0b2b 100644 --- a/radicle-git-ext/src/lib.rs +++ b/radicle-git-ext/src/lib.rs @@ -1,8 +1,3 @@ -// Copyright © 2019-2020 The Radicle Foundation -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - //! Extensions and wrappers for `git2` types pub mod author; diff --git a/radicle-git-ext/src/oid.rs b/radicle-git-ext/src/oid.rs index 4e75b3c..8022746 100644 --- a/radicle-git-ext/src/oid.rs +++ b/radicle-git-ext/src/oid.rs @@ -1,8 +1,3 @@ -// Copyright © 2019-2020 The Radicle Foundation -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use std::{ convert::TryFrom, fmt::{self, Display}, diff --git a/radicle-git-ext/src/revwalk.rs b/radicle-git-ext/src/revwalk.rs index 4d498f6..8a3629f 100644 --- a/radicle-git-ext/src/revwalk.rs +++ b/radicle-git-ext/src/revwalk.rs @@ -1,8 +1,3 @@ -// Copyright © 2019-2020 The Radicle Foundation -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - pub enum Start { Oid(git2::Oid), Ref(String), diff --git a/radicle-git-ext/src/transport.rs b/radicle-git-ext/src/transport.rs index e708bfe..896bae3 100644 --- a/radicle-git-ext/src/transport.rs +++ b/radicle-git-ext/src/transport.rs @@ -1,7 +1,2 @@ -// Copyright © 2019-2020 The Radicle Foundation -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - pub const UPLOAD_PACK_HEADER: &[u8] = b"001e# service=git-upload-pack\n0000"; pub const RECEIVE_PACK_HEADER: &[u8] = b"001f# service=git-receive-pack\n0000"; diff --git a/radicle-git-ext/src/tree.rs b/radicle-git-ext/src/tree.rs index 932490c..f0ba555 100644 --- a/radicle-git-ext/src/tree.rs +++ b/radicle-git-ext/src/tree.rs @@ -1,8 +1,3 @@ -// Copyright © 2019-2020 The Radicle Foundation -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use std::{borrow::Cow, collections::BTreeMap, iter::FromIterator}; /// A simplified representation of a git tree, intended mainly to be created diff --git a/radicle-git-ext/t/Cargo.toml b/radicle-git-ext/t/Cargo.toml index 596bbfa..08c6677 100644 --- a/radicle-git-ext/t/Cargo.toml +++ b/radicle-git-ext/t/Cargo.toml @@ -2,7 +2,7 @@ name = "radicle-git-ext-test" version = "0.1.0" edition = "2021" -license = "GPL-3.0-or-later" +license = "MIT OR Apache-2.0" publish = false diff --git a/radicle-git-ext/t/src/gen.rs b/radicle-git-ext/t/src/gen.rs index ff91486..dc86363 100644 --- a/radicle-git-ext/t/src/gen.rs +++ b/radicle-git-ext/t/src/gen.rs @@ -1,8 +1,3 @@ -// Copyright © 2019-2022 The Radicle Foundation -// -// This file is part of radicle-git, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - //! Provides proptest generators use proptest::strategy::Strategy; diff --git a/radicle-git-ext/t/src/gen/urn.rs b/radicle-git-ext/t/src/gen/urn.rs index 479f666..15ab338 100644 --- a/radicle-git-ext/t/src/gen/urn.rs +++ b/radicle-git-ext/t/src/gen/urn.rs @@ -1,8 +1,3 @@ -// Copyright © 2019-2022 The Radicle Foundation -// -// This file is part of radicle-git, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use proptest::prelude::*; use radicle_git_ext::Oid; diff --git a/radicle-git-ext/t/src/git_ref_format.rs b/radicle-git-ext/t/src/git_ref_format.rs index aa4258a..847a56e 100644 --- a/radicle-git-ext/t/src/git_ref_format.rs +++ b/radicle-git-ext/t/src/git_ref_format.rs @@ -1,6 +1,3 @@ -// Copyright © 2022 The Radicle Link Contributors -// SPDX-License-Identifier: GPL-3.0-or-later - #[cfg(any(test, feature = "test"))] pub mod gen; diff --git a/radicle-git-ext/t/src/git_ref_format/gen.rs b/radicle-git-ext/t/src/git_ref_format/gen.rs index f592676..ea18d7b 100644 --- a/radicle-git-ext/t/src/git_ref_format/gen.rs +++ b/radicle-git-ext/t/src/git_ref_format/gen.rs @@ -1,6 +1,3 @@ -// Copyright © 2022 The Radicle Link Contributors -// SPDX-License-Identifier: GPL-3.0-or-later - use proptest::prelude::*; /// Any unicode "word" is trivially a valid refname. diff --git a/radicle-git-ext/t/src/git_ref_format/properties.rs b/radicle-git-ext/t/src/git_ref_format/properties.rs index f0a72ce..30de08f 100644 --- a/radicle-git-ext/t/src/git_ref_format/properties.rs +++ b/radicle-git-ext/t/src/git_ref_format/properties.rs @@ -1,6 +1,3 @@ -// Copyright © 2022 The Radicle Link Contributors -// SPDX-License-Identifier: GPL-3.0-or-later - use proptest::prelude::*; use radicle_git_ext::ref_format::{check_ref_format, Error, Options}; diff --git a/radicle-git-ext/t/src/git_ref_format/properties/name.rs b/radicle-git-ext/t/src/git_ref_format/properties/name.rs index e0f954b..6e20af9 100644 --- a/radicle-git-ext/t/src/git_ref_format/properties/name.rs +++ b/radicle-git-ext/t/src/git_ref_format/properties/name.rs @@ -1,6 +1,3 @@ -// Copyright © 2022 The Radicle Link Contributors -// SPDX-License-Identifier: GPL-3.0-or-later - use std::convert::TryFrom; use proptest::prelude::*; diff --git a/radicle-git-ext/t/src/git_ref_format/properties/pattern.rs b/radicle-git-ext/t/src/git_ref_format/properties/pattern.rs index 5ff8025..b1a1f68 100644 --- a/radicle-git-ext/t/src/git_ref_format/properties/pattern.rs +++ b/radicle-git-ext/t/src/git_ref_format/properties/pattern.rs @@ -1,6 +1,3 @@ -// Copyright © 2022 The Radicle Link Contributors -// SPDX-License-Identifier: GPL-3.0-or-later - use std::convert::TryFrom; use proptest::prelude::*; diff --git a/radicle-git-ext/t/src/git_ref_format/tests.rs b/radicle-git-ext/t/src/git_ref_format/tests.rs index e638bcf..f11cce4 100644 --- a/radicle-git-ext/t/src/git_ref_format/tests.rs +++ b/radicle-git-ext/t/src/git_ref_format/tests.rs @@ -1,6 +1,3 @@ -// Copyright © 2022 The Radicle Link Contributors -// SPDX-License-Identifier: GPL-3.0-or-later - use radicle_git_ext::ref_format::{ component, name, qualified, refname, refspec, Error, Qualified, RefStr, RefString, }; diff --git a/radicle-git-ext/t/src/lib.rs b/radicle-git-ext/t/src/lib.rs index 62e2c90..6075eb0 100644 --- a/radicle-git-ext/t/src/lib.rs +++ b/radicle-git-ext/t/src/lib.rs @@ -1,5 +1,3 @@ -// Copyright © 2022 The Radicle Link Contributors -// SPDX-License-Identifier: GPL-3.0-or-later #[cfg(test)] #[macro_use] extern crate assert_matches; diff --git a/radicle-std-ext/Cargo.toml b/radicle-std-ext/Cargo.toml index c056bf8..f01ebd5 100644 --- a/radicle-std-ext/Cargo.toml +++ b/radicle-std-ext/Cargo.toml @@ -5,7 +5,7 @@ authors = ["The Radicle Team "] edition = "2021" homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt/tree/README.md" repository = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt" -license = "GPL-3.0-or-later" +license = "MIT OR Apache-2.0" description = "Monkey patches of std types" keywords = ["std", "radicle"] diff --git a/radicle-std-ext/src/lib.rs b/radicle-std-ext/src/lib.rs index 55c47c4..a772c74 100644 --- a/radicle-std-ext/src/lib.rs +++ b/radicle-std-ext/src/lib.rs @@ -1,8 +1,3 @@ -// Copyright © 2019-2020 The Radicle Foundation -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - #![cfg_attr(feature = "nightly", feature(try_trait_v2))] pub mod ops; diff --git a/radicle-std-ext/src/ops.rs b/radicle-std-ext/src/ops.rs index 9dc48a5..1849aa5 100644 --- a/radicle-std-ext/src/ops.rs +++ b/radicle-std-ext/src/ops.rs @@ -1,8 +1,3 @@ -// Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - //! Provides Try-trait for stable rust //! //! Probably doesn't work with `?`-desugaring. If the `nightly` feature is diff --git a/radicle-std-ext/src/result.rs b/radicle-std-ext/src/result.rs index fbb4dae..f457366 100644 --- a/radicle-std-ext/src/result.rs +++ b/radicle-std-ext/src/result.rs @@ -1,8 +1,3 @@ -// Copyright © 2019-2020 The Radicle Foundation -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - pub trait ResultExt { /// Calls `f` if the result is [`Err`], **and** the predicate `pred` on the /// error value returns true. Otherwise returns the [`Ok`] value of diff --git a/radicle-surf/Cargo.toml b/radicle-surf/Cargo.toml index 49732c2..e94d061 100644 --- a/radicle-surf/Cargo.toml +++ b/radicle-surf/Cargo.toml @@ -7,7 +7,7 @@ authors = ["The Radicle Team "] edition = "2021" homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt/tree/radicle-surf/README.md" repository = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt" -license = "GPL-3.0-or-later" +license = "MIT OR Apache-2.0" include = [ "**/*.rs", diff --git a/radicle-surf/DEVELOPMENT.md b/radicle-surf/DEVELOPMENT.md index fff78fc..a3df0fa 100644 --- a/radicle-surf/DEVELOPMENT.md +++ b/radicle-surf/DEVELOPMENT.md @@ -3,11 +3,6 @@ Thanks for wanting to contribute to `radicle-surf`! -# Licensing - -We are [GPL-3.0-or-later](./LICENSE) licensed project. To keep in compliance with this we must -add a [license header](./.license-header) to any new files added. This is checked on each run of CI. - ## Building & Testing 🏗️ We try to make development as seemless as possible so we can get down to the real work. We supply diff --git a/radicle-surf/build.rs b/radicle-surf/build.rs index f6fbf21..54760a9 100644 --- a/radicle-surf/build.rs +++ b/radicle-surf/build.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-surf -// -// -// Copyright (C) 2019-2020 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - use std::{ env, fs, fs::File, diff --git a/radicle-surf/examples/browsing.rs b/radicle-surf/examples/browsing.rs index 5b2f3d8..a5206bb 100644 --- a/radicle-surf/examples/browsing.rs +++ b/radicle-surf/examples/browsing.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-surf -// -// -// Copyright (C) 2019-2020 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - //! An example of browsing a git repo using `radicle-surf`. //! //! How to run: diff --git a/radicle-surf/examples/diff.rs b/radicle-surf/examples/diff.rs index 31b5b76..9454589 100644 --- a/radicle-surf/examples/diff.rs +++ b/radicle-surf/examples/diff.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-surf -// -// -// Copyright (C) 2019-2020 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - extern crate radicle_surf; use std::{env::Args, str::FromStr, time::Instant}; diff --git a/radicle-surf/src/blob.rs b/radicle-surf/src/blob.rs index 628f032..427d0ca 100644 --- a/radicle-surf/src/blob.rs +++ b/radicle-surf/src/blob.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-surf -// -// -// Copyright (C) 2019-2020 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - //! Represents git object type 'blob', i.e. actual file contents. //! See git [doc](https://git-scm.com/book/en/v2/Git-Internals-Git-Objects) for more details. diff --git a/radicle-surf/src/commit.rs b/radicle-surf/src/commit.rs index 22bd2e3..c2ee708 100644 --- a/radicle-surf/src/commit.rs +++ b/radicle-surf/src/commit.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-surf -// -// -// Copyright (C) 2019-2020 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - use std::{convert::TryFrom, str}; use radicle_git_ext::Oid; diff --git a/radicle-surf/src/diff.rs b/radicle-surf/src/diff.rs index 0ecf656..211a369 100644 --- a/radicle-surf/src/diff.rs +++ b/radicle-surf/src/diff.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-surf -// -// -// Copyright (C) 2019-2020 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - //! Types that represent diff(s) in a Git repo. use std::{ diff --git a/radicle-surf/src/diff/git.rs b/radicle-surf/src/diff/git.rs index 6afe99b..4adf8d7 100644 --- a/radicle-surf/src/diff/git.rs +++ b/radicle-surf/src/diff/git.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-surf -// -// -// Copyright (C) 2019-2020 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - use std::convert::TryFrom; use super::{ diff --git a/radicle-surf/src/error.rs b/radicle-surf/src/error.rs index 5aef469..1a790dc 100644 --- a/radicle-surf/src/error.rs +++ b/radicle-surf/src/error.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-surf -// -// -// Copyright (C) 2019-2023 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - //! Definition for a crate level error type, which wraps up module level //! error types transparently. diff --git a/radicle-surf/src/fs.rs b/radicle-surf/src/fs.rs index 275be71..ce03062 100644 --- a/radicle-surf/src/fs.rs +++ b/radicle-surf/src/fs.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-surf -// -// -// Copyright (C) 2019-2020 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - //! Definition for a file system consisting of `Directory` and `File`. //! //! A `Directory` is expected to be a non-empty tree of directories and files. diff --git a/radicle-surf/src/glob.rs b/radicle-surf/src/glob.rs index eef779c..c5b0eb6 100644 --- a/radicle-surf/src/glob.rs +++ b/radicle-surf/src/glob.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-git -// -// -// Copyright (C) 2022 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - use std::marker::PhantomData; use git_ext::ref_format::{ diff --git a/radicle-surf/src/history.rs b/radicle-surf/src/history.rs index 82a1cb9..2ad41e1 100644 --- a/radicle-surf/src/history.rs +++ b/radicle-surf/src/history.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-surf -// -// -// Copyright (C) 2022 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - use std::{ convert::TryFrom, path::{Path, PathBuf}, diff --git a/radicle-surf/src/lib.rs b/radicle-surf/src/lib.rs index 675f812..c577b06 100644 --- a/radicle-surf/src/lib.rs +++ b/radicle-surf/src/lib.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-git -// -// -// Copyright (C) 2019-2023 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - //! `radicle-surf` is a library to help users explore a Git repository with //! ease. It supports browsing a repository via the concept of files and //! directories, or via blobs and trees in a git fashion. With the additional diff --git a/radicle-surf/src/namespace.rs b/radicle-surf/src/namespace.rs index 0fd82f5..590ff03 100644 --- a/radicle-surf/src/namespace.rs +++ b/radicle-surf/src/namespace.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-surf -// -// -// Copyright (C) 2019-2020 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - use std::{ convert::TryFrom, fmt, diff --git a/radicle-surf/src/repo.rs b/radicle-surf/src/repo.rs index 4d3b9cb..d1d0933 100644 --- a/radicle-surf/src/repo.rs +++ b/radicle-surf/src/repo.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-surf -// -// -// Copyright (C) 2019-2020 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - use std::{ collections::BTreeSet, convert::TryFrom, diff --git a/radicle-surf/src/revision.rs b/radicle-surf/src/revision.rs index 08826a6..087cb6a 100644 --- a/radicle-surf/src/revision.rs +++ b/radicle-surf/src/revision.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-surf -// -// -// Copyright (C) 2019-2020 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - use std::{convert::Infallible, str::FromStr}; use git_ext::{ diff --git a/radicle-surf/src/stats.rs b/radicle-surf/src/stats.rs index 312ca8e..f7f257c 100644 --- a/radicle-surf/src/stats.rs +++ b/radicle-surf/src/stats.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-surf -// -// -// Copyright (C) 2019-2020 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - #[cfg(feature = "serde")] use serde::Serialize; diff --git a/radicle-surf/src/tree.rs b/radicle-surf/src/tree.rs index ce4fba4..2f691d7 100644 --- a/radicle-surf/src/tree.rs +++ b/radicle-surf/src/tree.rs @@ -1,20 +1,3 @@ -// This file is part of radicle-surf -// -// -// Copyright (C) 2019-2020 The Radicle Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 3 or -// later as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - //! Represents git object type 'tree', i.e. like directory entries in Unix. //! See git [doc](https://git-scm.com/book/en/v2/Git-Internals-Git-Objects) for more details. diff --git a/radicle-surf/t/Cargo.toml b/radicle-surf/t/Cargo.toml index 78403c6..b38a2df 100644 --- a/radicle-surf/t/Cargo.toml +++ b/radicle-surf/t/Cargo.toml @@ -2,7 +2,7 @@ name = "radicle-surf-test" version = "0.1.0" edition = "2021" -license = "GPL-3.0-or-later" +license = "MIT OR Apache-2.0" publish = false diff --git a/radicle-surf/t/src/file_system.rs b/radicle-surf/t/src/file_system.rs index 9e572dc..75a5096 100644 --- a/radicle-surf/t/src/file_system.rs +++ b/radicle-surf/t/src/file_system.rs @@ -1,6 +1,3 @@ -// Copyright © 2022 The Radicle Git Contributors -// SPDX-License-Identifier: GPL-3.0-or-later - //! Unit tests for radicle_surf::file_system mod directory { diff --git a/radicle-surf/t/src/lib.rs b/radicle-surf/t/src/lib.rs index e733003..812646e 100644 --- a/radicle-surf/t/src/lib.rs +++ b/radicle-surf/t/src/lib.rs @@ -1,6 +1,3 @@ -// Copyright © 2022 The Radicle Git Contributors -// SPDX-License-Identifier: GPL-3.0-or-later - #[cfg(test)] const GIT_PLATINUM: &str = "../data/git-platinum"; diff --git a/test/Cargo.toml b/test/Cargo.toml index bac7c38..3bdff27 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -2,7 +2,7 @@ name = "tests" version = "0.1.0" edition = "2021" -license = "GPL-3.0-or-later" +license = "MIT OR Apache-2.0" publish = false diff --git a/test/src/lib.rs b/test/src/lib.rs index 8db6cbc..9f6736e 100644 --- a/test/src/lib.rs +++ b/test/src/lib.rs @@ -1,4 +1 @@ -// Copyright © 2022 The Radicle Link Contributors -// SPDX-License-Identifier: GPL-3.0-or-later - //! This page intentionally left blank. diff --git a/test/test-helpers/Cargo.toml b/test/test-helpers/Cargo.toml index 8706c90..327f386 100644 --- a/test/test-helpers/Cargo.toml +++ b/test/test-helpers/Cargo.toml @@ -2,7 +2,7 @@ name = "test-helpers" version = "0.1.0" edition = "2021" -license = "GPL-3.0-or-later" +license = "MIT OR Apache-2.0" publish = false description = "Test helpers" diff --git a/test/test-helpers/src/gen.rs b/test/test-helpers/src/gen.rs index f942317..88b6fce 100644 --- a/test/test-helpers/src/gen.rs +++ b/test/test-helpers/src/gen.rs @@ -1,4 +1 @@ -// Copyright © 2022 The Radicle Link Contributors -// SPDX-License-Identifier: GPLv3-or-later - pub mod std_net; diff --git a/test/test-helpers/src/gen/std_net.rs b/test/test-helpers/src/gen/std_net.rs index b632465..db90c07 100644 --- a/test/test-helpers/src/gen/std_net.rs +++ b/test/test-helpers/src/gen/std_net.rs @@ -1,6 +1,3 @@ -// Copyright © 2022 The Radicle Link Contributors -// SPDX-License-Identifier: GPLv3-or-later - use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6}; use proptest::prelude::*; diff --git a/test/test-helpers/src/lib.rs b/test/test-helpers/src/lib.rs index 06db053..992f6fd 100644 --- a/test/test-helpers/src/lib.rs +++ b/test/test-helpers/src/lib.rs @@ -1,6 +1,3 @@ -// Copyright © 2022 The Radicle Link Contributors -// SPDX-License-Identifier: GPLv3-or-later - pub mod gen; pub mod logging; pub mod roundtrip; diff --git a/test/test-helpers/src/logging.rs b/test/test-helpers/src/logging.rs index dc708d9..d7a9177 100644 --- a/test/test-helpers/src/logging.rs +++ b/test/test-helpers/src/logging.rs @@ -1,8 +1,3 @@ -// Copyright © 2019-2020 The Radicle Foundation -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use std::env; use log::{log_enabled, Level}; diff --git a/test/test-helpers/src/roundtrip.rs b/test/test-helpers/src/roundtrip.rs index 1a102f9..e0a9ee1 100644 --- a/test/test-helpers/src/roundtrip.rs +++ b/test/test-helpers/src/roundtrip.rs @@ -1,8 +1,3 @@ -// Copyright © 2019-2020 The Radicle Foundation -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use std::{ fmt::{Debug, Display}, str::FromStr, diff --git a/test/test-helpers/src/tempdir.rs b/test/test-helpers/src/tempdir.rs index 24a8b5c..f0f5c0d 100644 --- a/test/test-helpers/src/tempdir.rs +++ b/test/test-helpers/src/tempdir.rs @@ -1,8 +1,3 @@ -// Copyright © 2019-2020 The Radicle Foundation -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. - use std::{ io, ops::{Deref, DerefMut},