diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 96d9bbb..0000000 --- a/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -*.pyc -*.sw? -*~ -.coverage -.eggs/ -__pycache__ -*.egg-info/ -version.txt -logs/ -archives/ -build/ -dist/ diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 2d0a34a..0000000 --- a/AUTHORS +++ /dev/null @@ -1,3 +0,0 @@ -Copyright (C) 2015 The Software Heritage developers - -See http://www.softwareheritage.org/ for more information. diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 94a9ed0..0000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - 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 - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - 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 . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/PKG-INFO b/PKG-INFO index f6bc759..7685187 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,91 +1,91 @@ Metadata-Version: 2.1 Name: swh.loader.svn -Version: 0.0.42 +Version: 0.0.44 Summary: Software Heritage Loader SVN Home-page: https://forge.softwareheritage.org/diffusion/DLDSVN Author: Software Heritage developers Author-email: swh-devel@inria.fr License: UNKNOWN -Project-URL: Bug Reports, https://forge.softwareheritage.org/maniphest Project-URL: Funding, https://www.softwareheritage.org/donate Project-URL: Source, https://forge.softwareheritage.org/source/swh-loader-svn +Project-URL: Bug Reports, https://forge.softwareheritage.org/maniphest Description: swh-loader-svn ============== Documents are in the ./docs folder: - Specification: ./docs/swh-loader-svn.txt # Configuration file ## Location Either: - /etc/softwareheritage/ - ~/.config/swh/ - ~/.swh/ Note: Will call that location $SWH_CONFIG_PATH ## Configuration sample $SWH_CONFIG_PATH/loader/svn.yml: ``` storage: cls: remote args: url: http://localhost:5002/ ``` ## Local run ### local svn repository ``` $ python3 repo = 'pyang-repo-r343-eol-native-mixed-lf-crlf' #repo = 'zipeg-gae' origin_url = 'http://%s.googlecode.com' % repo local_repo_path = '/home/storage/svn/repo' svn_url = 'file://%s/%s' % (local_repo_path, repo) import logging logging.basicConfig(level=logging.DEBUG) from swh.loader.svn.tasks import LoadSvnRepository t = LoadSvnRepository() t.run(svn_url=svn_url, origin_url=origin_url, visit_date='2016-05-03T15:16:32+00:00', start_from_scratch=True) ``` ### Mount and load an archive repository dump ``` $ python3 repo = '0-512-md' archive_name = '%s-repo.svndump.gz' % repo archive_path = '/home/storage/svn/dumps/%s' % archive_name origin_url = 'http://%s.googlecode.com' % repo svn_url = 'file://%s' % repo import logging logging.basicConfig(level=logging.DEBUG) from swh.loader.svn.tasks import MountAndLoadSvnRepository t = MountAndLoadSvnRepository() t.run(archive_path=archive_path, origin_url=origin_url, visit_date='2016-05-03T15:16:32+00:00', start_from_scratch=True) ``` Platform: UNKNOWN Classifier: Programming Language :: Python :: 3 Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3) Classifier: Operating System :: OS Independent Classifier: Development Status :: 5 - Production/Stable Description-Content-Type: text/markdown Provides-Extra: testing diff --git a/bin/init-svn-repository.sh b/bin/init-svn-repository.sh deleted file mode 100755 index 3ade7c8..0000000 --- a/bin/init-svn-repository.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -# script to ease the initialization of an svn repository - -SVN_DIR=${1-"/home/storage/svn/example"} -REMOTE_SVN=${2-"http://example.googlecode.com/svn/"} - -[ -d $SVN_DIR ] && echo "$SVN_DIR already present. Do 'rm -rf $SVN_DIR' and relaunch this script if you really want to start from scratch." && exit 1 - -set -x - -svnadmin create $SVN_DIR - -cd $SVN_DIR - -echo -e '#!/bin/sh\n' > hooks/pre-revprop-change -chmod +x hooks/pre-revprop-change - -# Fill in some repository -svnsync init file://$SVN_DIR $REMOTE_SVN -svnsync sync file://$SVN_DIR diff --git a/bin/swh-svn b/bin/swh-svn deleted file mode 100755 index 2e7366c..0000000 --- a/bin/swh-svn +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python3 - -# Use sample: -# swh-svn --remote-url file:///home/storage/svn/repos/asf \ -# --revision 30000 --path swh-asf-30000 - -import click - -from subvertpy.ra import Auth, get_username_provider -from subvertpy import client - - -@click.command() -@click.option('--remote-url', - help='Remote url to export.') -@click.option('--path', default='.', - help='path to checkout locally.') -@click.option('--revision', type=click.INT, - help='') -def main(remote_url, path, revision): - _auth = Auth([get_username_provider()]) - _client = client.Client(auth=_auth) - - print('svn export --ignore-keywords %s@%s %s' % ( - remote_url, revision, path)) - _client.export(remote_url, - to=path, - rev=revision, - ignore_keywords=True) - - -if __name__ == '__main__': - main() diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index e442e89..0000000 --- a/debian/changelog +++ /dev/null @@ -1,6 +0,0 @@ -swh-loader-svn (0.0.1-1) unstable; urgency=low - - * Import initial source package. - - -- Antoine R. Dumont (@ardumont) Wed, 13 Apr 2016 16:44:38 +0200 - diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control deleted file mode 100644 index a8388f9..0000000 --- a/debian/control +++ /dev/null @@ -1,36 +0,0 @@ -Source: swh-loader-svn -Maintainer: Software Heritage developers -Section: python -Priority: optional -Build-Depends: debhelper (>= 9), - dh-python (>= 2), - python3-all, - python3-click, - python3-dateutil, - python3-nose, - python3-retrying, - python3-setuptools, - python3-subvertpy (>= 0.9.4~), - python3-swh.core (>= 0.0.19~), - python3-swh.loader.core (>= 0.0.34~), - python3-swh.model (>= 0.0.18~), - python3-swh.scheduler (>= 0.0.14~), - python3-swh.storage (>= 0.0.83~), - python3-vcversioner, - subversion -Standards-Version: 3.9.6 -Homepage: https://forge.softwareheritage.org/diffusion/DLDSVN/ - -Package: python3-swh.loader.svn -Architecture: all -Depends: gzip, - python3-swh.core (>= 0.0.19~), - python3-swh.loader.core (>= 0.0.34~), - python3-swh.model (>= 0.0.18~), - python3-swh.scheduler (>= 0.0.14~), - python3-swh.storage (>= 0.0.83~), - subversion, - ${misc:Depends}, - ${python3:Depends} -Description: Software Heritage Loader Svn - Module in charge of loading svn repositories into swh storage. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 9430897..0000000 --- a/debian/copyright +++ /dev/null @@ -1,22 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ - -Files: * -Copyright: 2015-2016 The Software Heritage developers -License: GPL-3+ - -License: GPL-3+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - . - 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 . - . - On Debian systems, the complete text of the GNU General Public - License version 3 can be found in `/usr/share/common-licenses/GPL-3'. diff --git a/debian/rules b/debian/rules deleted file mode 100755 index e411b3b..0000000 --- a/debian/rules +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/make -f - -export PYBUILD_NAME=swh.loader.svn -export export PYBUILD_TEST_ARGS=--with-doctest -sv - -%: - dh $@ --with python3 --buildsystem=pybuild - -override_dh_install: - dh_install - rm -v $(CURDIR)/debian/python3-*/usr/lib/python*/dist-packages/swh/__init__.py - rm -v $(CURDIR)/debian/python3-*/usr/lib/python*/dist-packages/swh/loader/__init__.py diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index 58a761e..0000000 --- a/docs/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -_build/ -apidoc/ -*-stamp diff --git a/docs/Makefile b/docs/Makefile deleted file mode 100644 index c30c50a..0000000 --- a/docs/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../swh-docs/Makefile.sphinx diff --git a/docs/_static/.placeholder b/docs/_static/.placeholder deleted file mode 100644 index e69de29..0000000 diff --git a/docs/_templates/.placeholder b/docs/_templates/.placeholder deleted file mode 100644 index e69de29..0000000 diff --git a/docs/conf.py b/docs/conf.py deleted file mode 100644 index 190deb7..0000000 --- a/docs/conf.py +++ /dev/null @@ -1 +0,0 @@ -from swh.docs.sphinx.conf import * # NoQA diff --git a/docs/index.rst b/docs/index.rst deleted file mode 100644 index a29402c..0000000 --- a/docs/index.rst +++ /dev/null @@ -1,19 +0,0 @@ -.. _swh-loader-svn: - -Software Heritage - Subversion loader -===================================== - -Loader for `Subversion `_ repositories. - - -.. toctree:: - :maxdepth: 2 - :caption: Contents: - - -Indices and tables -================== - -* :ref:`genindex` -* :ref:`modindex` -* :ref:`search` diff --git a/docs/swh-loader-svn.txt b/docs/swh-loader-svn.txt deleted file mode 100644 index 532b305..0000000 --- a/docs/swh-loader-svn.txt +++ /dev/null @@ -1,195 +0,0 @@ -swh-loader-svn -============== - -The goal is to load a svn repository's lifetime logs to swh-storage. - -This must be able to deal with: -- unknown svn repository (resulting in a new origin) -- known svn repository (starting up from the last known svn revision - and update from that moment on) - -For a full detailed comparison between version's speed, please refer -to https://forge.softwareheritage.org/diffusion/DLDSVN/browse/master/docs/comparison-git-svn-swh-svn.org. - - -# v1 - -## Description - -This is a first basic implementation, a proof-of-concept of sort. -Based on checkout-ing on disk the svn repository at each revision and -walking the tree at svn revision to compute the swh hashes and store -them in swh-storage. - -Conclusion: It is possible but it is slow. - -We use git-svn to check if the hash computations were a match, and -they were not. The swh hashes computation are corrects though. - -It's just not the same assertions as git-svn so the hashes mismatch. - -git-svn: -- does not checkout empty folders -- adds metadata at the end of the svn commit message (by default, this - can be avoided but then no update, in the swh sense, is possible - afterwards) -- integrates the svn repository's uuid in the git revision for the - commit author (author@) - -swh-loader-svn: -- checkouts empty folder (which are then used in swh hashes) -- adds metadata the git way (leveraging git's extra-header slot), so - that we can deal with svn repository updates - -## Pseudo - -``` -Checkout/Update/Export on disk the first known revision or 1 if unknown repository -When revision is not 1 - Check the history is altered (revision hashes won't match) - If it is altered, log an error message and stop - Otherwise continue - -Iterate over logs from revision 1 to revision head_revision - The revision is now rev - checkout/update/export the revision at rev - walk the tree directory for that revision and compute hashes - compute the revision hash - send the blobs for storage in swh - send the directories for storage in swh - send the revision for storage in swh -done - -Send the occurrence pointing to the last revision seen -``` - -## Notes - -SVN checkout/update instructions are faster than export since they -leverage svn diffs. But: -- they do keyword expansion (so bad for diffs with external tools so - bad for swh) -- we need to ignore .svn folder since it's present (this needed some - adaptation in code to ignore folder based on pattern so slow as - well) - -SVN export instruction is slower than the 2 previous ones since they -don't use diffs. But: -- there is one option to ignore keyword expansion (good) -- no folder are to be omitted during hash computation from disk (good) - -All in all, there is a trade-off here to choose from. - -Still, everything was tested (with much code adapted in the lower -level api) and both are slow. - -# v2 - -## Description - -The v2 is more about: -- adding options to match the git-svn's hash computations -- trying to improve the performance - -So, options are added: -- remove empty folder when encountered (to ignore during hash - computations) -- add an extra commit line to the svn commit message -- (de)activate the loader svn's update routine -- (de)activate the sending of - contents/directories/revisions/occurrences/releases to swh-storage -- (de)activate the extra-header metadata in revision hash (thus - deactivating the svn update options altogether) - -As this is thought as genuine implementation, we adapted the revision -message to also use the repository's uuid in the author's email. - -Also, optimization are done as well: -- instead of walking the disk from the top leve at each revision (slow - for huge repository like svn.apache.org), compute from the svn log's - changed paths between the previous revision and the current one, the - lowest common path. Then, walk only that path to compute the updated - hashes. Then update from that path to the top level the in-memory - hashes (less i/o, less RAM are used). - -- in the loader-core, lifting the existing swh-storage api to filter - only the missing entities on the client side (there are already - filters on the server side but filtering client-side uses less RAM. - Especially for blobs, since we extract the data from disk and store - it in RAM, this is now done only for unknown blobs and still before - updating the disk with a new revision content) - -- in the loader-core, cache are added as well - -Now the computations, with the right options, are a match with git-svn. -Still, the performance against git-svn are bad. - -Taking a closer look at git-svn, they used a remote-access approach, -that is discussing directly with the svn server and computing at the -same time the hashes. -That is the base for the v3 implementation. - -## Pseudo - -Relatively to the v1, the logic does not change, only the inner -implementation. - -# v3 - -## Description - -This one is about performance only. - -Leveraging another low-level library (subvertpy) to permit the use of -the same git-svn approach, the remote-access. - -The idea is to replay the logs and diffs on disk and compute hashes -closely in time (not as close as possible though, cf. ## Note below). - -## Pseudo - -``` -Do we know the repository (with swh-svn-update option on)? - Yes, extract the last swh known revision from swh-storage - set start-rev to last-swh-known-revision - Export on disk the svn at start-rev - Compute revision hashes (from top level tree's hashes + commit log for that revision) - Does the revision hash match the one in swh-storage? (<=> Is the history altered?) - No - log an error message and stop - Yes - keep the current in-memory hashes (for the following updates steps if any) - No - set start-rev to 1 - -Set head-revision to latest svn repository's head revision -When start-rev is the same as head revision, we are done. -Otherwise continue - -Iterate over the stream of svn-logs from start-rev to head-rev - The current revision is rev - replay the diffs from previous rev (rev - 1) to rev and compute hashes along - compute the revision hash - send the blobs for storage in swh - send the directories for storage in swh - send the revision for storage in swh -done - -Send the occurrence pointing to the last revision seen -``` - -## Note - -There could be margin for improvment in the actual implementation -here. - -We apply the diff on files first and then open the file to compute its -hashes afterwards. - -If we'd apply the diff and compute the hashes directly, we'd gain one -round-trip. Depending on the ratio files/directory, this could be -significant. - -This approach has also the following benefits: -- no keyword expansion -- no need to ignore .svn folder (since it does not exist) diff --git a/install/install-pysvn.sh b/install/install-pysvn.sh deleted file mode 100755 index a8ca607..0000000 --- a/install/install-pysvn.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -# Reference steps to install pysvn from tarballs served at -# http://pysvn.barrys-emacs.org/ - -# system pre-requisites -sudo apt-get install libaprutil1-dev libapr1-dev libsvn1 - -# on to the installation -mkdir /tmp/pysvn-build && cd /tmp/pysvn-build - -wget http://pysvn.barrys-emacs.org/source_kits/pysvn-1.8.0.tar.gz - -tar xvf pysvn-1.8.0.tar.gz - -cd pysvn-1.8.0/Source/ - -python3 setup.py configure --svn-lib-dir=/usr/lib/x86_64-linux-gnu --apr-inc-dir=/usr/include/apr-1.0 --apu-inc-dir=/usr/include/apr-1.0 --apr-lib-dir=/usr/lib/x86_64-linux-gnu - -make - -mkdir -p ~/.local/lib/python3.5/ - -cp -rv pysvn/ ~/.local/lib/python3.5/ diff --git a/install/install-subvertpy.sh b/install/install-subvertpy.sh deleted file mode 100755 index 336b4c3..0000000 --- a/install/install-subvertpy.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -sudo apt-get install libaprutil1-dev libapr1-dev libsvn-dev -sudo pip3 install subvertpy diff --git a/requirements-swh.txt b/requirements-swh.txt index c0aa135..db18b4e 100644 --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,5 +1,5 @@ swh.core >= 0.0.19 -swh.storage >= 0.0.83 +swh.storage >= 0.0.114 swh.model >= 0.0.18 -swh.scheduler >= 0.0.14 -swh.loader.core >= 0.0.34 +swh.scheduler >= 0.0.39 +swh.loader.core >= 0.0.37 diff --git a/requirements-test.txt b/requirements-test.txt deleted file mode 100644 index f3c7e8e..0000000 --- a/requirements-test.txt +++ /dev/null @@ -1 +0,0 @@ -nose diff --git a/resources/svn.ini b/resources/svn.ini deleted file mode 100644 index 8da9f00..0000000 --- a/resources/svn.ini +++ /dev/null @@ -1,24 +0,0 @@ -[main] -storage_class = remote_storage -storage_args = http://localhost:5002/ -send_contents = True -send_directories = True -send_revisions = True -send_releases = True -send_occurrences = True -# nb of max contents to send for storage (if size threshold not reached before) -content_packet_size = 10000 -# 100 Mib of content data (size threshold of data before sending for storage) -content_packet_block_size_bytes = 104857600 -# limit for swh content storage for one blob (beyond that limit, the -# content's data is not sent for storage) -content_packet_size_bytes = 1073741824 -# packet of directories to send for storage -directory_packet_size = 25000 -# packet of revisions to send for storage -revision_packet_size = 10000 -# packet of releases to send for storage -release_packet_size = 100000 -# packet of occurrences to send for storage -occurrence_packet_size = 100000 - diff --git a/svn-lib-client-analysis.org b/svn-lib-client-analysis.org deleted file mode 100644 index aaa7494..0000000 --- a/svn-lib-client-analysis.org +++ /dev/null @@ -1,25 +0,0 @@ -#+title: svn lib client analysis - -|-----------------------------------------+----------------------------------------------------------------------+------------------------------------------------------------------------------+-------------+------------------------------------------| -| Client | Cons | Pros | License | work as advertize | -|-----------------------------------------+----------------------------------------------------------------------+------------------------------------------------------------------------------+-------------+------------------------------------------| -| http://subversion.apache.org/ | broken api link to doc: http://subversion.apache.org/docsapi/latest/ | python-subversion debian package | [[http://www.apache.org/licenses/LICENSE-2.0][Apache v2.0]] | X | -| | python 2 only | official bindings | | | -| | | doc: http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.developer.usingapi | | | -|-----------------------------------------+----------------------------------------------------------------------+------------------------------------------------------------------------------+-------------+------------------------------------------| -| http://pysvn.tigris.org/ | no pip package | tigris maintainer (seems legit regarding xp tortoise-svn...) | [[http://www.apache.org/licenses/LICENSE-1.1][Apache v1.1]] | No, not found a way to have with python3 | -| | | python 2/3 compatible | | | -| | | bindings | | | -| | | debian python-svn package | | | -| | | doc: http://pysvn.tigris.org/docs/pysvn.html | | | -| | | fully supports svn 1.9.1 and earlier | | | -|-----------------------------------------+----------------------------------------------------------------------+------------------------------------------------------------------------------+-------------+------------------------------------------| -| https://github.com/dsoprea/PySvn | wrapper around svn command (no c binding) | python2/3 compatible | | Yes | -| https://pypi.python.org/pypi/svn/0.3.36 | incomplete (but maybe sufficient) | pip3 package | [[https://raw.githubusercontent.com/dsoprea/PySvn/master/LICENSE][GPL2]] | | -|-----------------------------------------+----------------------------------------------------------------------+------------------------------------------------------------------------------+-------------+------------------------------------------| -| https://github.com/jelmer/subvertpy | python2 only | pip + debian package (python2) | [[https://raw.githubusercontent.com/jelmer/subvertpy/master/COPYING][GPL2.1]] | X | -| | javadoc like doc | same maintainer as https://github.com/jelmer/dulwich | | | -| | | docs: https://www.samba.org/~jelmer/subvertpy/apidocs/ | | | -| | | full support svn api | | | -|-----------------------------------------+----------------------------------------------------------------------+------------------------------------------------------------------------------+-------------+------------------------------------------| -Note: All are free software, so it's not entertained as pros (as it is implicit). diff --git a/swh.loader.svn.egg-info/PKG-INFO b/swh.loader.svn.egg-info/PKG-INFO index f6bc759..7685187 100644 --- a/swh.loader.svn.egg-info/PKG-INFO +++ b/swh.loader.svn.egg-info/PKG-INFO @@ -1,91 +1,91 @@ Metadata-Version: 2.1 Name: swh.loader.svn -Version: 0.0.42 +Version: 0.0.44 Summary: Software Heritage Loader SVN Home-page: https://forge.softwareheritage.org/diffusion/DLDSVN Author: Software Heritage developers Author-email: swh-devel@inria.fr License: UNKNOWN -Project-URL: Bug Reports, https://forge.softwareheritage.org/maniphest Project-URL: Funding, https://www.softwareheritage.org/donate Project-URL: Source, https://forge.softwareheritage.org/source/swh-loader-svn +Project-URL: Bug Reports, https://forge.softwareheritage.org/maniphest Description: swh-loader-svn ============== Documents are in the ./docs folder: - Specification: ./docs/swh-loader-svn.txt # Configuration file ## Location Either: - /etc/softwareheritage/ - ~/.config/swh/ - ~/.swh/ Note: Will call that location $SWH_CONFIG_PATH ## Configuration sample $SWH_CONFIG_PATH/loader/svn.yml: ``` storage: cls: remote args: url: http://localhost:5002/ ``` ## Local run ### local svn repository ``` $ python3 repo = 'pyang-repo-r343-eol-native-mixed-lf-crlf' #repo = 'zipeg-gae' origin_url = 'http://%s.googlecode.com' % repo local_repo_path = '/home/storage/svn/repo' svn_url = 'file://%s/%s' % (local_repo_path, repo) import logging logging.basicConfig(level=logging.DEBUG) from swh.loader.svn.tasks import LoadSvnRepository t = LoadSvnRepository() t.run(svn_url=svn_url, origin_url=origin_url, visit_date='2016-05-03T15:16:32+00:00', start_from_scratch=True) ``` ### Mount and load an archive repository dump ``` $ python3 repo = '0-512-md' archive_name = '%s-repo.svndump.gz' % repo archive_path = '/home/storage/svn/dumps/%s' % archive_name origin_url = 'http://%s.googlecode.com' % repo svn_url = 'file://%s' % repo import logging logging.basicConfig(level=logging.DEBUG) from swh.loader.svn.tasks import MountAndLoadSvnRepository t = MountAndLoadSvnRepository() t.run(archive_path=archive_path, origin_url=origin_url, visit_date='2016-05-03T15:16:32+00:00', start_from_scratch=True) ``` Platform: UNKNOWN Classifier: Programming Language :: Python :: 3 Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3) Classifier: Operating System :: OS Independent Classifier: Development Status :: 5 - Production/Stable Description-Content-Type: text/markdown Provides-Extra: testing diff --git a/swh.loader.svn.egg-info/SOURCES.txt b/swh.loader.svn.egg-info/SOURCES.txt index efe9545..225225b 100644 --- a/swh.loader.svn.egg-info/SOURCES.txt +++ b/swh.loader.svn.egg-info/SOURCES.txt @@ -1,61 +1,37 @@ -.gitignore -AUTHORS -LICENSE MANIFEST.in Makefile README.md requirements-swh.txt -requirements-test.txt requirements.txt setup.py -svn-lib-client-analysis.org version.txt -bin/init-svn-repository.sh -bin/swh-svn -debian/changelog -debian/compat -debian/control -debian/copyright -debian/rules -debian/source/format -docs/.gitignore -docs/Makefile -docs/conf.py -docs/index.rst -docs/swh-loader-svn.txt -docs/_static/.placeholder -docs/_templates/.placeholder -install/install-pysvn.sh -install/install-subvertpy.sh -resources/svn.ini swh/__init__.py swh.loader.svn.egg-info/PKG-INFO swh.loader.svn.egg-info/SOURCES.txt swh.loader.svn.egg-info/dependency_links.txt swh.loader.svn.egg-info/requires.txt swh.loader.svn.egg-info/top_level.txt swh/loader/__init__.py swh/loader/svn/__init__.py swh/loader/svn/converters.py swh/loader/svn/exception.py swh/loader/svn/loader.py swh/loader/svn/ra.py swh/loader/svn/svn.py swh/loader/svn/tasks.py swh/loader/svn/utils.py swh/loader/svn/tests/__init__.py swh/loader/svn/tests/test_converters.py -swh/loader/svn/tests/test_loader.org swh/loader/svn/tests/test_loader.py swh/loader/svn/tests/test_utils.py swh/loader/svn/tests/resources/httthttt.tgz swh/loader/svn/tests/resources/mediawiki-repo-r407-eol-native-crlf.tgz swh/loader/svn/tests/resources/pkg-doc-linux-r10.tgz swh/loader/svn/tests/resources/pkg-doc-linux-r11.tgz swh/loader/svn/tests/resources/pkg-doc-linux-r12.tgz swh/loader/svn/tests/resources/pkg-gourmet-with-edge-case-links-and-files.tgz swh/loader/svn/tests/resources/pkg-gourmet-with-external-id.tgz swh/loader/svn/tests/resources/pkg-gourmet-with-updates.tgz swh/loader/svn/tests/resources/pkg-gourmet-with-wrong-link-cases.tgz swh/loader/svn/tests/resources/pkg-gourmet.tgz swh/loader/svn/tests/resources/pyang-repo-r343-eol-native-mixed-lf-crlf.tgz \ No newline at end of file diff --git a/swh.loader.svn.egg-info/requires.txt b/swh.loader.svn.egg-info/requires.txt index 0041c26..fd2b4a1 100644 --- a/swh.loader.svn.egg-info/requires.txt +++ b/swh.loader.svn.egg-info/requires.txt @@ -1,13 +1,13 @@ +vcversioner click -python-dateutil retrying +python-dateutil subvertpy>=0.9.4 swh.core>=0.0.19 -swh.loader.core>=0.0.34 +swh.storage>=0.0.114 swh.model>=0.0.18 -swh.scheduler>=0.0.14 -swh.storage>=0.0.83 -vcversioner +swh.scheduler>=0.0.39 +swh.loader.core>=0.0.37 [testing] -nose +pytest diff --git a/swh/loader/svn/loader.py b/swh/loader/svn/loader.py index cdfde06..a526fc0 100644 --- a/swh/loader/svn/loader.py +++ b/swh/loader/svn/loader.py @@ -1,737 +1,737 @@ # Copyright (C) 2015-2018 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information """Loader in charge of injecting either new or existing svn mirrors to swh-storage. """ import os import re import shutil import tempfile from mmap import mmap, ACCESS_WRITE from subprocess import run, PIPE from swh.model import hashutil from swh.model.from_disk import Directory from swh.model.identifiers import identifier_to_bytes, revision_identifier from swh.model.identifiers import snapshot_identifier -from swh.loader.core.loader import SWHLoader +from swh.loader.core.loader import BufferedLoader from swh.loader.core.utils import clean_dangling_folders from . import svn, converters from .utils import ( init_svn_repo_from_dump, init_svn_repo_from_archive_dump ) from .exception import SvnLoaderUneventful from .exception import SvnLoaderHistoryAltered DEFAULT_BRANCH = b'HEAD' def _revision_id(revision): return identifier_to_bytes(revision_identifier(revision)) def build_swh_snapshot(revision_id, branch=DEFAULT_BRANCH): """Build a swh snapshot from the revision id, origin id, and visit. """ return { 'id': None, 'branches': { branch: { 'target': revision_id, 'target_type': 'revision', } } } TEMPORARY_DIR_PREFIX_PATTERN = 'swh.loader.svn.' -class SvnLoader(SWHLoader): +class SvnLoader(BufferedLoader): """Swh svn loader. The repository is either remote or local. The loader deals with update on an already previously loaded repository. """ CONFIG_BASE_FILENAME = 'loader/svn' ADDITIONAL_CONFIG = { 'temp_directory': ('str', '/tmp'), 'debug': ('bool', False), # NOT FOR PRODUCTION, False for production 'check_revision': ('dict', { 'status': False, # do we check the revision? 'limit': 1000, # at which pace do we check it? }), } def __init__(self): super().__init__(logging_class='swh.loader.svn.SvnLoader') self.origin_id = None self.debug = self.config['debug'] self.last_seen_revision = None self.temp_directory = self.config['temp_directory'] self.done = False self.svnrepo = None # Revision check is configurable check_revision = self.config['check_revision'] if check_revision['status']: self.check_revision = check_revision['limit'] else: self.check_revision = None # internal state used to store swh objects self._contents = [] self._directories = [] self._revisions = [] self._snapshot = None self._last_revision = None self._visit_status = 'full' self._load_status = 'uneventful' def pre_cleanup(self): """Cleanup potential dangling files from prior runs (e.g. OOM killed tasks) """ clean_dangling_folders(self.temp_directory, pattern_check=TEMPORARY_DIR_PREFIX_PATTERN, log=self.log) def cleanup(self): """Clean up the svn repository's working representation on disk. """ if not self.svnrepo: # could happen if `prepare` fails return if self.debug: self.log.error('''NOT FOR PRODUCTION - debug flag activated Local repository not cleaned up for investigation: %s''' % ( self.svnrepo.local_url.decode('utf-8'), )) return self.svnrepo.clean_fs() def swh_revision_hash_tree_at_svn_revision(self, revision): """Compute and return the hash tree at a given svn revision. Args: rev (int): the svn revision we want to check Returns: The hash tree directory as bytes. """ local_dirname, local_url = self.svnrepo.export_temporary(revision) h = Directory.from_disk(path=local_url).hash self.svnrepo.clean_fs(local_dirname) return h def get_svn_repo(self, svn_url, local_dirname, origin_id): """Instantiates the needed svnrepo collaborator to permit reading svn repository. Args: svn_url (str): the svn repository url to read from local_dirname (str): the local path on disk to compute data origin_id (int): the corresponding origin id Returns: Instance of :mod:`swh.loader.svn.svn` clients """ return svn.SvnRepo(svn_url, local_dirname=local_dirname, origin_id=origin_id) def swh_latest_snapshot_revision(self, origin_id, previous_swh_revision=None): """Look for latest snapshot revision and returns it if any. Args: origin_id (int): Origin identifier previous_swh_revision: (optional) id of a possible previous swh revision Returns: dict: The latest known point in time. Dict with keys: 'revision': latest visited revision 'snapshot': latest snapshot If None is found, return an empty dict. """ storage = self.storage if not previous_swh_revision: # check latest snapshot's revision latest_snap = storage.snapshot_get_latest(origin_id) if latest_snap: branches = latest_snap.get('branches') if not branches: return {} branch = branches.get(DEFAULT_BRANCH) if not branch: return {} target_type = branch['target_type'] if target_type != 'revision': return {} previous_swh_revision = branch['target'] else: return {} if isinstance(previous_swh_revision, dict): swh_id = previous_swh_revision['id'] else: swh_id = previous_swh_revision revs = list(storage.revision_get([swh_id])) if revs: return { 'snapshot': latest_snap, 'revision': revs[0] } return {} def build_swh_revision(self, rev, commit, dir_id, parents): """Build the swh revision dictionary. This adds: - the `'synthetic`' flag to true - the '`extra_headers`' containing the repository's uuid and the svn revision number. Args: rev (dict): the svn revision commit (dict): the commit metadata dir_id (bytes): the upper tree's hash identifier parents ([bytes]): the parents' identifiers Returns: The swh revision corresponding to the svn revision. """ return converters.build_swh_revision( rev, commit, self.svnrepo.uuid, dir_id, parents) def check_history_not_altered(self, svnrepo, revision_start, swh_rev): """Given a svn repository, check if the history was not tampered with. """ revision_id = swh_rev['id'] parents = swh_rev['parents'] hash_data_per_revs = svnrepo.swh_hash_data_at_revision(revision_start) rev = revision_start rev, _, commit, _, root_dir = list(hash_data_per_revs)[0] dir_id = root_dir.hash swh_revision = self.build_swh_revision(rev, commit, dir_id, parents) swh_revision_id = _revision_id(swh_revision) return swh_revision_id == revision_id def _init_from(self, partial_swh_revision, previous_swh_revision): """Function to determine from where to start from. Args: partial_swh_revision (dict): A known revision from which the previous loading did not finish. known_previous_revision (dict): A known revision from which the previous loading did finish. Returns: The revision from which to start or None if nothing (fresh start). """ if partial_swh_revision and not previous_swh_revision: return partial_swh_revision if not partial_swh_revision and previous_swh_revision: return previous_swh_revision if partial_swh_revision and previous_swh_revision: # will determine from which to start from extra_headers1 = dict( partial_swh_revision['metadata']['extra_headers']) extra_headers2 = dict( previous_swh_revision['metadata']['extra_headers']) rev_start1 = int(extra_headers1['svn_revision']) rev_start2 = int(extra_headers2['svn_revision']) if rev_start1 <= rev_start2: return previous_swh_revision return partial_swh_revision return None def start_from(self, last_known_swh_revision=None, start_from_scratch=False): """Determine from where to start the loading. Args: last_known_swh_revision (dict): Last know swh revision or None start_from_scratch (bool): To start loading from scratch or not Returns: tuple (revision_start, revision_end, revision_parents) Raises: SvnLoaderHistoryAltered: When a hash divergence has been detected (should not happen) SvnLoaderUneventful: Nothing changed since last visit """ revision_head = self.svnrepo.head_revision() if revision_head == 0: # empty repository case revision_start = 0 revision_end = 0 else: # default configuration revision_start = self.svnrepo.initial_revision() revision_end = revision_head revision_parents = { revision_start: [] } if not start_from_scratch: # Check if we already know a previous revision for that origin if self.latest_snapshot: swh_rev = self.latest_snapshot['revision'] else: swh_rev = None # Determine from which known revision to start swh_rev = self._init_from(last_known_swh_revision, previous_swh_revision=swh_rev) if swh_rev: # Yes, we know a previous revision. Try and update it. extra_headers = dict(swh_rev['metadata']['extra_headers']) revision_start = int(extra_headers['svn_revision']) revision_parents = { revision_start: swh_rev['parents'], } self.log.debug('svn export --ignore-keywords %s@%s' % ( self.svnrepo.remote_url, revision_start)) if swh_rev and not self.check_history_not_altered( self.svnrepo, revision_start, swh_rev): msg = 'History of svn %s@%s altered. ' \ 'Skipping...' % ( self.svnrepo.remote_url, revision_start) raise SvnLoaderHistoryAltered(msg) # now we know history is ok, we start at next revision revision_start = revision_start + 1 # and the parent become the latest know revision for # that repository revision_parents[revision_start] = [swh_rev['id']] - if revision_start > revision_end and revision_start is not 1: + if revision_start > revision_end and revision_start != 1: msg = '%s@%s already injected.' % (self.svnrepo.remote_url, revision_end) raise SvnLoaderUneventful(msg) self.log.info('Processing revisions [%s-%s] for %s' % ( revision_start, revision_end, self.svnrepo)) return revision_start, revision_end, revision_parents def _check_revision_divergence(self, count, rev, dir_id): """Check for hash revision computation divergence. The Rationale behind this is that svn can trigger unknown edge cases (mixed CRLF, svn properties, etc...). Those are not always easy to spot. Adding a check will help in spotting missing edge cases. Args: count (int): The number of revisions done so far rev (dict): The actual revision we are computing from dir_id (bytes): The actual directory for the given revision Returns: False if no hash divergence detected Raises ValueError if a hash divergence is detected """ if (count % self.check_revision) == 0: # hash computation check self.log.debug('Checking hash computations on revision %s...' % rev) checked_dir_id = self.swh_revision_hash_tree_at_svn_revision( rev) if checked_dir_id != dir_id: err = 'Hash tree computation divergence detected ' \ '(%s != %s), stopping!' % ( hashutil.hash_to_hex(dir_id), hashutil.hash_to_hex(checked_dir_id)) raise ValueError(err) def process_svn_revisions(self, svnrepo, revision_start, revision_end, revision_parents): """Process svn revisions from revision_start to revision_end. At each svn revision, apply new diffs and simultaneously compute swh hashes. This yields those computed swh hashes as a tuple (contents, directories, revision). Note that at every `self.check_revision`, a supplementary check takes place to check for hash-tree divergence (related T570). Yields: tuple (contents, directories, revision) of dict as a dictionary with keys, sha1_git, sha1, etc... Raises: ValueError in case of a hash divergence detection """ gen_revs = svnrepo.swh_hash_data_per_revision( revision_start, revision_end) swh_revision = None count = 0 for rev, nextrev, commit, new_objects, root_directory in gen_revs: count += 1 # Send the associated contents/directories _contents = new_objects.get('content', {}).values() _directories = new_objects.get('directory', {}).values() # compute the fs tree's checksums dir_id = root_directory.hash swh_revision = self.build_swh_revision( rev, commit, dir_id, revision_parents[rev]) swh_revision['id'] = _revision_id(swh_revision) self.log.debug('rev: %s, swhrev: %s, dir: %s' % ( rev, hashutil.hash_to_hex(swh_revision['id']), hashutil.hash_to_hex(dir_id))) if self.check_revision: self._check_revision_divergence(count, rev, dir_id) if nextrev: revision_parents[nextrev] = [swh_revision['id']] yield _contents, _directories, swh_revision def prepare_origin_visit(self, *, svn_url, visit_date=None, origin_url=None, **kwargs): self.origin = { 'url': origin_url if origin_url else svn_url, 'type': 'svn', } self.visit_date = visit_date def prepare(self, *, svn_url, destination_path=None, swh_revision=None, start_from_scratch=False, **kwargs): self.start_from_scratch = start_from_scratch if swh_revision: self.last_known_swh_revision = swh_revision else: self.last_known_swh_revision = None self.latest_snapshot = self.swh_latest_snapshot_revision( self.origin_id, self.last_known_swh_revision) if destination_path: local_dirname = destination_path else: local_dirname = tempfile.mkdtemp( suffix='-%s' % os.getpid(), prefix=TEMPORARY_DIR_PREFIX_PATTERN, dir=self.temp_directory) self.svnrepo = self.get_svn_repo( svn_url, local_dirname, self.origin_id) try: revision_start, revision_end, revision_parents = self.start_from( self.last_known_swh_revision, self.start_from_scratch) self.swh_revision_gen = self.process_svn_revisions( self.svnrepo, revision_start, revision_end, revision_parents) except SvnLoaderUneventful as e: - self.log.warn(e) + self.log.warning(e) if self.latest_snapshot and 'snapshot' in self.latest_snapshot: self._snapshot = self.latest_snapshot['snapshot'] self.done = True except SvnLoaderHistoryAltered as e: self.log.error(e) self.done = True self._visit_status = 'partial' def fetch_data(self): """Fetching svn revision information. This will apply svn revision as patch on disk, and at the same time, compute the swh hashes. In effect, fetch_data fetches those data and compute the necessary swh objects. It's then stored in the internal state instance variables (initialized in `_prepare_state`). This is up to `store_data` to actually discuss with the storage to store those objects. Returns: bool: True to continue fetching data (next svn revision), False to stop. """ data = None if self.done: return False try: data = next(self.swh_revision_gen) self._load_status = 'eventful' except StopIteration: self.done = True self._visit_status = 'full' return False # Stopping iteration except Exception as e: # svn:external, hash divergence, i/o error... self.log.exception(e) self.done = True self._visit_status = 'partial' return False # Stopping iteration self._contents, self._directories, revision = data if revision: self._last_revision = revision self._revisions.append(revision) return True # next svn revision def store_data(self): """We store the data accumulated in internal instance variable. If the iteration over the svn revisions is done, we create the snapshot and flush to storage the data. This also resets the internal instance variable state. """ self.maybe_load_contents(self._contents) self.maybe_load_directories(self._directories) self.maybe_load_revisions(self._revisions) if self.done: # finish line, snapshot! self.generate_and_load_snapshot(revision=self._last_revision, snapshot=self._snapshot) self.flush() self._contents = [] self._directories = [] self._revisions = [] def generate_and_load_snapshot(self, revision=None, snapshot=None): """Create the snapshot either from existing revision or snapshot. Revision (supposedly new) has priority over the snapshot (supposedly existing one). Args: revision (dict): Last revision seen if any (None by default) snapshot (dict): Snapshot to use if any (None by default) """ if revision: # Priority to the revision snap = build_swh_snapshot(revision['id']) snap['id'] = identifier_to_bytes(snapshot_identifier(snap)) elif snapshot: # Fallback to prior snapshot snap = snapshot else: return None self.log.debug('snapshot: %s' % snap) self.maybe_load_snapshot(snap) def load_status(self): return { 'status': self._load_status, } def visit_status(self): return self._visit_status class SvnLoaderFromDumpArchive(SvnLoader): """Uncompress an archive containing an svn dump, mount the svn dump as an svn repository and load said repository. """ def __init__(self, archive_path): super().__init__() self.archive_path = archive_path self.temp_dir = None self.repo_path = None def prepare(self, *, svn_url, destination_path=None, swh_revision=None, start_from_scratch=False, **kwargs): self.log.info('Archive to mount and load %s' % self.archive_path) self.temp_dir, self.repo_path = init_svn_repo_from_archive_dump( self.archive_path, prefix=TEMPORARY_DIR_PREFIX_PATTERN, suffix='-%s' % os.getpid(), root_dir=self.temp_directory) if not svn_url: svn_url = 'file://%s' % self.repo_path super().prepare(svn_url=svn_url, destination_path=destination_path, swh_revision=swh_revision, start_from_scratch=start_from_scratch, **kwargs) def cleanup(self): super().cleanup() if self.temp_dir and os.path.exists(self.temp_dir): msg = 'Clean up temporary directory dump %s for project %s' % ( self.temp_dir, os.path.basename(self.repo_path)) self.log.debug(msg) shutil.rmtree(self.temp_dir) class SvnLoaderFromRemoteDump(SvnLoader): """ Create a subversion repository dump using the svnrdump utility, mount it locally and load the repository from it. """ def __init__(self): super().__init__() self.temp_dir = tempfile.mkdtemp(dir=self.temp_directory) self.repo_path = None self.truncated_dump = False def get_last_loaded_svn_rev(self, svn_url): """ Check if the svn repository has already been visited and return the last loaded svn revision number or -1 otherwise. """ last_loaded_svn_rev = -1 try: origin = \ self.storage.origin_get({'type': 'svn', 'url': svn_url}) last_swh_rev = \ self.swh_latest_snapshot_revision(origin['id'])['revision'] last_swh_rev_headers = \ dict(last_swh_rev['metadata']['extra_headers']) last_loaded_svn_rev = int(last_swh_rev_headers['svn_revision']) except Exception: pass return last_loaded_svn_rev def dump_svn_revisions(self, svn_url, last_loaded_svn_rev=-1): """ Generate a subversion dump file using the svnrdump tool. If the svnrdump command failed somehow, the produced dump file is analyzed to determine if a partial loading is still feasible. """ # Build the svnrdump command line svnrdump_cmd = ['svnrdump', 'dump', svn_url] # Launch the svnrdump command while capturing stderr as # successfully dumped revision numbers are printed to it dump_temp_dir = tempfile.mkdtemp(dir=self.temp_dir) dump_name = ''.join(c for c in svn_url if c.isalnum()) dump_path = '%s/%s.svndump' % (dump_temp_dir, dump_name) self.log.debug('Executing %s' % ' '.join(svnrdump_cmd)) with open(dump_path, 'wb') as dump_file: svnrdump = run(svnrdump_cmd, stdout=dump_file, stderr=PIPE) if svnrdump.returncode == 0: return dump_path # There was an error but it does not mean that no revisions # can be loaded. # Get the stderr line with latest dumped revision stderr_lines = svnrdump.stderr.split(b'\n') last_dumped_rev = None if len(stderr_lines) > 1: last_dumped_rev = stderr_lines[-2] if last_dumped_rev: # Get the latest dumped revision number matched_rev = re.search(b'.*revision ([0-9]+)', last_dumped_rev) last_dumped_rev = int(matched_rev.group(1)) if matched_rev else -1 # Check if revisions inside the dump file can be loaded anyway if last_dumped_rev > last_loaded_svn_rev: self.log.debug(('svnrdump did not dump all expected revisions ' 'but revisions range %s:%s are available in ' 'the generated dump file and will be loaded ' 'into the archive.') % (last_loaded_svn_rev+1, last_dumped_rev)) # Truncate the dump file after the last successfully dumped # revision to avoid the loading of corrupted data self.log.debug(('Truncating dump file after the last ' 'successfully dumped revision (%s) to avoid ' 'the loading of corrupted data') % last_dumped_rev) with open(dump_path, 'r+b') as f: with mmap(f.fileno(), 0, access=ACCESS_WRITE) as s: pattern = ('Revision-number: %s' % (last_dumped_rev+1)).encode() n = s.rfind(pattern) if n != -1: s.resize(n) self.truncated_dump = True return dump_path elif last_dumped_rev != -1: raise Exception(('Last dumped subversion revision (%s) is ' 'lesser than the last one loaded into the ' 'archive (%s).') % (last_dumped_rev, last_loaded_svn_rev)) raise Exception('An error occurred when running svnrdump and ' 'no exploitable dump file has been generated.') def prepare(self, *, svn_url, destination_path=None, swh_revision=None, start_from_scratch=False, **kwargs): # First, check if previous revisions have been loaded for the # subversion origin and get the number of the last one last_loaded_svn_rev = self.get_last_loaded_svn_rev(svn_url) # Then try to generate a dump file containing relevant svn revisions # to load, an exception will be thrown if something wrong happened dump_path = self.dump_svn_revisions(svn_url, last_loaded_svn_rev) # Finally, mount the dump and load the repository self.log.debug('Mounting dump file with "svnadmin load".') _, self.repo_path = \ init_svn_repo_from_dump(dump_path, prefix=TEMPORARY_DIR_PREFIX_PATTERN, suffix='-%s' % os.getpid(), root_dir=self.temp_dir) super().prepare(svn_url='file://%s' % self.repo_path, destination_path=destination_path, swh_revision=swh_revision, start_from_scratch=start_from_scratch, **kwargs) def cleanup(self): super().cleanup() if self.temp_dir and os.path.exists(self.temp_dir): shutil.rmtree(self.temp_dir) def visit_status(self): if self.truncated_dump: return 'partial' else: return super().visit_status() diff --git a/swh/loader/svn/tasks.py b/swh/loader/svn/tasks.py index 936a8a8..ac03c29 100644 --- a/swh/loader/svn/tasks.py +++ b/swh/loader/svn/tasks.py @@ -1,95 +1,72 @@ # Copyright (C) 2015-2018 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information - -from swh.scheduler.task import Task +from celery import current_app as app from .loader import ( SvnLoader, SvnLoaderFromDumpArchive, SvnLoaderFromRemoteDump ) -class LoadSvnRepository(Task): - """Load an svn repository to Software Heritage. - - """ - task_queue = 'swh_loader_svn' - - def run_task(self, *, svn_url, - destination_path=None, - swh_revision=None, - origin_url=None, - visit_date=None, - start_from_scratch=None): - """Import a svn repository - - Args: - args: ordered arguments (expected None) - kwargs: Dictionary with the following expected keys: - - - svn_url (str): (mandatory) svn's repository url - - destination_path (str): (mandatory) root directory to - locally retrieve svn's data - - origin_url (str): Optional original url override - - swh_revision (dict): (optional) extra revision hex to - start from. see swh.loader.svn.SvnLoader.process - docstring +@app.task(name=__name__ + '.LoadSvnRepository') +def load_svn(svn_url, + destination_path=None, + swh_revision=None, + origin_url=None, + visit_date=None, + start_from_scratch=None): + """Import a svn repository - """ - loader = SvnLoader() - loader.log = self.log - return loader.load( - svn_url=svn_url, - destination_path=destination_path, - origin_url=origin_url, - swh_revision=swh_revision, - visit_date=visit_date, - start_from_scratch=start_from_scratch) + Args: + args: ordered arguments (expected None) + kwargs: Dictionary with the following expected keys: - -class MountAndLoadSvnRepository(Task): - """Mount an archive dump into an svn repository, then load the - repository to Software Heritage. + - svn_url (str): (mandatory) svn's repository url + - destination_path (str): (mandatory) root directory to + locally retrieve svn's data + - origin_url (str): Optional original url override + - swh_revision (dict): (optional) extra revision hex to + start from. see swh.loader.svn.SvnLoader.process + docstring """ - task_queue = 'swh_loader_svn_mount_and_load' + return SvnLoader().load( + svn_url=svn_url, + destination_path=destination_path, + origin_url=origin_url, + swh_revision=swh_revision, + visit_date=visit_date, + start_from_scratch=start_from_scratch) + + +@app.task(name=__name__ + '.MountAndLoadSvnRepository') +def mount_load_svn(archive_path, origin_url=None, visit_date=None, + start_from_scratch=False): + """1. Mount an svn dump from archive as a local svn repository + 2. Load it through the svn loader + 3. Clean up mounted svn repository archive - def run_task(self, *, archive_path, origin_url=None, visit_date=None, - start_from_scratch=False): - """1. Mount an svn dump from archive as a local svn repository - 2. Load it through the svn loader - 3. Clean up mounted svn repository archive + """ + return SvnLoaderFromDumpArchive(archive_path).load( + svn_url=None, + origin_url=origin_url, + visit_date=visit_date, + archive_path=archive_path, + start_from_scratch=start_from_scratch) - """ - loader = SvnLoaderFromDumpArchive(archive_path) - loader.log = self.log - return loader.load(svn_url=None, - origin_url=origin_url, - visit_date=visit_date, - archive_path=archive_path, - start_from_scratch=start_from_scratch) +@app.task(name=__name__ + '.DumpMountAndLoadSvnRepository') +def dump_mount_load_svn(svn_url, origin_url=None, visit_date=None, + start_from_scratch=False): + """1. Mount an svn dump from archive as a local svn repository. + 2. Load it through the svn loader. + 3. Clean up mounted svn repository archive. -class DumpMountAndLoadSvnRepository(Task): - """ - Create a dump of a remote repository through the svnrdump - tool, mount it locally then load the repository into the - Software Heritage archive. """ - task_queue = 'swh_loader_svn_dump_mount_and_load' - - def run_task(self, *, svn_url, origin_url=None, visit_date=None, - start_from_scratch=False): - """1. Mount an svn dump from archive as a local svn repository. - 2. Load it through the svn loader. - 3. Clean up mounted svn repository archive. - - """ - loader = SvnLoaderFromRemoteDump() - loader.log = self.log - return loader.load(svn_url=svn_url, - origin_url=origin_url, - visit_date=visit_date, - start_from_scratch=start_from_scratch) + return SvnLoaderFromRemoteDump().load( + svn_url=svn_url, + origin_url=origin_url, + visit_date=visit_date, + start_from_scratch=start_from_scratch) diff --git a/swh/loader/svn/tests/test_converters.py b/swh/loader/svn/tests/test_converters.py index f5805f5..ec3fa1a 100644 --- a/swh/loader/svn/tests/test_converters.py +++ b/swh/loader/svn/tests/test_converters.py @@ -1,294 +1,280 @@ # Copyright (C) 2015-2018 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information import unittest -from nose.tools import istest - from swh.loader.svn import converters class TestAuthorGitSvnConverters(unittest.TestCase): - @istest - def svn_author_to_gitsvn_person(self): + def test_svn_author_to_gitsvn_person(self): """The author should have name, email and fullname filled. """ actual_person = converters.svn_author_to_gitsvn_person( 'tony ', repo_uuid=None) - self.assertEquals(actual_person, { + self.assertEqual(actual_person, { 'fullname': b'tony ', 'name': b'tony', 'email': b'ynot@dagobah', }) - @istest - def svn_author_to_gitsvn_person_no_email(self): + def test_svn_author_to_gitsvn_person_no_email(self): """The author should see his/her email filled with author@. """ actual_person = converters.svn_author_to_gitsvn_person( 'tony', repo_uuid=b'some-uuid') - self.assertEquals(actual_person, { + self.assertEqual(actual_person, { 'fullname': b'tony ', 'name': b'tony', 'email': b'tony@some-uuid', }) - @istest - def svn_author_to_gitsvn_person_empty_person(self): + def test_svn_author_to_gitsvn_person_empty_person(self): """The empty person should see name, fullname and email filled. """ actual_person = converters.svn_author_to_gitsvn_person( '', repo_uuid=b'some-uuid') self.assertEqual(actual_person, { 'fullname': b'(no author) <(no author)@some-uuid>', 'name': b'(no author)', 'email': b'(no author)@some-uuid' }) class TestAuthorConverters(unittest.TestCase): - @istest - def svn_author_to_swh_person(self): + def test_svn_author_to_swh_person(self): """The author should have name, email and fullname filled. """ actual_person = converters.svn_author_to_swh_person( 'tony ') - self.assertEquals(actual_person, { + self.assertEqual(actual_person, { 'fullname': b'tony ', 'name': b'tony', 'email': b'ynot@dagobah', }) - @istest - def svn_author_to_swh_person_no_email(self): + def test_svn_author_to_swh_person_no_email(self): """The author and fullname should be the same as the input (author). """ actual_person = converters.svn_author_to_swh_person('tony') - self.assertEquals(actual_person, { + self.assertEqual(actual_person, { 'fullname': b'tony', 'name': b'tony', 'email': None, }) - @istest - def svn_author_to_swh_person_empty_person(self): + def test_svn_author_to_swh_person_empty_person(self): """Empty person has only its fullname filled with the empty byte-string. """ actual_person = converters.svn_author_to_swh_person('') self.assertEqual(actual_person, { 'fullname': b'', 'name': None, 'email': None, }) class TestRevisionConverters(unittest.TestCase): - @istest - def build_swh_revision_default(self): + def test_build_swh_revision_default(self): """This should build the swh revision with the swh revision's extra headers about the repository. """ actual_swh_revision = converters.build_swh_revision( repo_uuid=b'uuid', dir_id='dir-id', commit={ 'author_name': { 'name': b'theo', 'email': b'theo@uuid', 'fullname': b'theo ' }, 'message': b'commit message', 'author_date': { 'timestamp': { 'seconds': 1088108379, 'microseconds': 0, }, 'offset': 0 } }, rev=10, parents=['123']) date = { 'timestamp': { 'seconds': 1088108379, 'microseconds': 0, }, 'offset': 0, } - self.assertEquals(actual_swh_revision, { + self.assertEqual(actual_swh_revision, { 'date': date, 'committer_date': date, 'type': 'svn', 'directory': 'dir-id', 'message': b'commit message', 'author': { 'name': b'theo', 'email': b'theo@uuid', 'fullname': b'theo ' }, 'committer': { 'name': b'theo', 'email': b'theo@uuid', 'fullname': b'theo ' }, 'synthetic': True, 'metadata': { 'extra_headers': [ ['svn_repo_uuid', b'uuid'], ['svn_revision', b'10'], ] }, 'parents': ['123'], }) class TestGitSvnRevisionConverters(unittest.TestCase): - @istest - def build_gitsvn_swh_revision_default(self): + def test_build_gitsvn_swh_revision_default(self): """This should build the swh revision without the swh revision's extra headers about the repository. """ actual_swh_revision = converters.build_gitsvn_swh_revision( dir_id='dir-id', commit={ 'author_name': { 'name': b'theo', 'email': b'theo@uuid', 'fullname': b'theo ' }, 'message': b'commit message', 'author_date': { 'timestamp': { 'seconds': 1088108379, 'microseconds': 0, }, 'offset': 0 } }, rev=10, parents=['123']) date = { 'timestamp': { 'seconds': 1088108379, 'microseconds': 0, }, 'offset': 0, } - self.assertEquals(actual_swh_revision, { + self.assertEqual(actual_swh_revision, { 'date': date, 'committer_date': date, 'type': 'svn', 'directory': 'dir-id', 'message': b'commit message', 'author': { 'name': b'theo', 'email': b'theo@uuid', 'fullname': b'theo ' }, 'committer': { 'name': b'theo', 'email': b'theo@uuid', 'fullname': b'theo ' }, 'synthetic': True, 'metadata': None, 'parents': ['123'], }) class ConvertDate(unittest.TestCase): - @istest - def svn_date_to_swh_date(self): + def test_svn_date_to_swh_date(self): """The timestamp should not be tampered with and include the decimals. """ - self.assertEquals( + self.assertEqual( converters.svn_date_to_swh_date('2011-05-31T06:04:39.500900Z'), { 'timestamp': { 'seconds': 1306821879, 'microseconds': 500900, }, 'offset': 0 }) - self.assertEquals( + self.assertEqual( converters.svn_date_to_swh_date('2011-05-31T06:04:39.800722Z'), { 'timestamp': { 'seconds': 1306821879, 'microseconds': 800722, }, 'offset': 0 }) - @istest - def svn_date_to_swh_date_epoch(self): + def test_svn_date_to_swh_date_epoch(self): """Empty date should be EPOCH (timestamp and offset at 0).""" # It should return 0, epoch - self.assertEquals({ + self.assertEqual({ 'timestamp': { 'seconds': 0, 'microseconds': 0, }, 'offset': 0, }, converters.svn_date_to_swh_date('')) - self.assertEquals({ + self.assertEqual({ 'timestamp': { 'seconds': 0, 'microseconds': 0, }, 'offset': 0, }, converters.svn_date_to_swh_date(None)) class ConvertGitSvnDate(unittest.TestCase): - @istest - def svn_date_to_gitsvn_date(self): + def test_svn_date_to_gitsvn_date(self): """The timestamp should be truncated to be an integer.""" actual_ts = converters.svn_date_to_gitsvn_date( '2011-05-31T06:04:39.800722Z') - self.assertEquals(actual_ts, { + self.assertEqual(actual_ts, { 'timestamp': { 'seconds': 1306821879, 'microseconds': 0, }, 'offset': 0, }) - @istest - def svn_date_to_gitsvn_date_epoch(self): + def test_svn_date_to_gitsvn_date_epoch(self): """Empty date should be EPOCH (timestamp and offset at 0).""" # It should return 0, epoch - self.assertEquals({ + self.assertEqual({ 'timestamp': { 'seconds': 0, 'microseconds': 0, }, 'offset': 0, }, converters.svn_date_to_gitsvn_date('')) - self.assertEquals({ + self.assertEqual({ 'timestamp': { 'seconds': 0, 'microseconds': 0, }, 'offset': 0, }, converters.svn_date_to_gitsvn_date(None)) diff --git a/swh/loader/svn/tests/test_loader.org b/swh/loader/svn/tests/test_loader.org deleted file mode 100644 index 18f764a..0000000 --- a/swh/loader/svn/tests/test_loader.org +++ /dev/null @@ -1,317 +0,0 @@ -#+title: Prepare test_converters.py it tests -#+author: ardumont - -* Requisite: - -#+BEGIN_SRC sh -sudo apt install subversion git-svn -#+END_SRC - -* Create mirror repository - -Then: -#+BEGIN_SRC sh -./init-svn-repository.sh /home/storage/svn/repos/pkg-gourmet svn://svn.debian.org/svn/pkg-gourmet/ -#+END_SRC -Note: -Saved as ../../../../bin/init-svn-repository.sh - -And now we have a mirror svn repository at file:///home/storage/svn/repos/pkg-gourmet - -* git-svn policy - -`git svn clone` the repository and parse the git log entries for the needed data. - -#+BEGIN_SRC sh -git svn clone file:///home/storage/svn/repos/pkg-gourmet -q --no-metadata -cd pkg-gourmet -# commit -git log --format=raw --reverse | grep '^commit ' | awk '{print $2}' -# tree -git log --format=raw --reverse | grep '^tree ' | awk '{print $2}' -#+END_SRC - -Those are the data to check when done parsing the repository: - -|------------------------------------------+------------------------------------------| -| revision | tree | -|------------------------------------------+------------------------------------------| -| 22c0fa5195a53f2e733ec75a9b6e9d1624a8b771 | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | -| 17a631d474f49bbebfdf3d885dcde470d7faafd7 | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | -| c8a9172b2a615d461154f61158180de53edc6070 | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | -| 7c8f83394b6e8966eb46f0d3416c717612198a4b | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | -| 852547b3b2bb76c8582cee963e8aa180d552a15c | ab047e38d1532f61ff5c3621202afc3e763e9945 | -| bad4a83737f337d47e0ba681478214b07a707218 | 9bcfc25001b71c333b4b5a89224217de81c56e2e | -|------------------------------------------+------------------------------------------| - -* swh policy - -** New repository - -For this one this was more tedious. -#+BEGIN_SRC sh -$ svn export --ignore-keywords file:///home/storage/svn/repos/pkg-gourmet@1 -#+END_SRC -The export does not expand the keywords and does not include the .svn folder. - -Then: -#+BEGIN_SRC sh -$ cd pkg-gourmet -$ swh-hashtree --path . -669a71cce6c424a81ba42b7dc5d560d32252f0ca -#+END_SRC - -Note: ../../../../bin/hashtree - -Then for the next revision: -#+BEGIN_SRC sh -cd .. ; rm -rf pkg-gourmet; svn export --ignore-keywords file:///home/storage/svn/repos/pkg-gourmet@2 -A pkg-gourmet -A pkg-gourmet/gourmet -A pkg-gourmet/gourmet/trunk -Exported revision 2. -$ cd pkg-gourmet && swh-hashtree --path . -008ac97a1118560797c50e3392fa1443acdaa349 -#+END_SRC -etc... - -|--------------+------------------------------------------+------------------------------------------| -| svn revision | swh revision | tree | -|--------------+------------------------------------------+------------------------------------------| -| 1 | 0d7dd5f751cef8fe17e8024f7d6b0e3aac2cfd71 | 669a71cce6c424a81ba42b7dc5d560d32252f0ca | -| 2 | 95edacc8848369d6fb1608e887d6d2474fd5224f | 008ac97a1118560797c50e3392fa1443acdaa349 | -| 3 | fef26ea45a520071711ba2b9d16a2985ee837021 | 3780effbe846a26751a95a8c95c511fb72be15b4 | -| 4 | 3f51abf3b3d466571be0855dfa67e094f9ceff1b | ffcca9b09c5827a6b8137322d4339c8055c3ee1e | -| 5 | a3a577948fdbda9d1061913b77a1588695eadb41 | 7dc52cc04c3b8bd7c085900d60c159f7b846f866 | -| 6 | 4876cb10aec6f708f7466dddf547567b65f6c39c | 0deab3023ac59398ae467fc4bff5583008af1ee2 | -|--------------+------------------------------------------+------------------------------------------| - -For the revision, cheating a little. -That is adapting swh.model.identifiers.revision_identifiers to print the commit's manifest: - -#+BEGIN_SRC sh -b'tree 669a71cce6c424a81ba42b7dc5d560d32252f0ca\nauthor seanius 1138341038.645397 +0000\ncommitter seanius 1138341038.645397 +0000\nsvn_repo_uuid 3187e211-bb14-4c82-9596-0b59d67cd7f4\nsvn_revision 1\n\nmaking dir structure...' -[2016-06-23 12:35:39,291: DEBUG/Worker-1] rev: 1, swhrev: 0d7dd5f751cef8fe17e8024f7d6b0e3aac2cfd71, dir: 669a71cce6c424a81ba42b7dc5d560d32252f0ca -b'tree 008ac97a1118560797c50e3392fa1443acdaa349\nparent 0d7dd5f751cef8fe17e8024f7d6b0e3aac2cfd71\nauthor seanius 1138341044.821526 +0000\ncommitter seanius 1138341044.821526 +0000\nsvn_repo_uuid 3187e211-bb14-4c82-9596-0b59d67cd7f4\nsvn_revision 2\n\nmaking dir structure...' -[2016-06-23 12:35:39,302: DEBUG/Worker-1] rev: 2, swhrev: 95edacc8848369d6fb1608e887d6d2474fd5224f, dir: 008ac97a1118560797c50e3392fa1443acdaa349 -b'tree 3780effbe846a26751a95a8c95c511fb72be15b4\nparent 95edacc8848369d6fb1608e887d6d2474fd5224f\nauthor seanius 1138341057.282488 +0000\ncommitter seanius 1138341057.282488 +0000\nsvn_repo_uuid 3187e211-bb14-4c82-9596-0b59d67cd7f4\nsvn_revision 3\n\nmaking dir structure...' -[2016-06-23 12:35:39,313: DEBUG/Worker-1] rev: 3, swhrev: fef26ea45a520071711ba2b9d16a2985ee837021, dir: 3780effbe846a26751a95a8c95c511fb72be15b4 -b'tree ffcca9b09c5827a6b8137322d4339c8055c3ee1e\nparent fef26ea45a520071711ba2b9d16a2985ee837021\nauthor seanius 1138341064.191867 +0000\ncommitter seanius 1138341064.191867 +0000\nsvn_repo_uuid 3187e211-bb14-4c82-9596-0b59d67cd7f4\nsvn_revision 4\n\nmaking dir structure...' -[2016-06-23 12:35:39,322: DEBUG/Worker-1] rev: 4, swhrev: 3f51abf3b3d466571be0855dfa67e094f9ceff1b, dir: ffcca9b09c5827a6b8137322d4339c8055c3ee1e -b'tree 7dc52cc04c3b8bd7c085900d60c159f7b846f866\nparent 3f51abf3b3d466571be0855dfa67e094f9ceff1b\nauthor seanius 1138342632.066765 +0000\ncommitter seanius 1138342632.066765 +0000\nsvn_repo_uuid 3187e211-bb14-4c82-9596-0b59d67cd7f4\nsvn_revision 5\n\ninitial import' -[2016-06-23 12:35:39,339: DEBUG/Worker-1] rev: 5, swhrev: a3a577948fdbda9d1061913b77a1588695eadb41, dir: 7dc52cc04c3b8bd7c085900d60c159f7b846f866 -b'tree 0deab3023ac59398ae467fc4bff5583008af1ee2\nparent a3a577948fdbda9d1061913b77a1588695eadb41\nauthor seanius 1138343905.448277 +0000\ncommitter seanius 1138343905.448277 +0000\nsvn_repo_uuid 3187e211-bb14-4c82-9596-0b59d67cd7f4\nsvn_revision 6\n\nfix breakage in rules' -[2016-06-23 12:35:39,348: DEBUG/Worker-1] rev: 6, swhrev: 4876cb10aec6f708f7466dddf547567b65f6c39c, dir: 0deab3023ac59398ae467fc4bff5583008af1ee2 -[2016-06-23 12:35:39,355: INFO/Worker-1] Processed 6 revisions: [0d7dd5f751cef8fe17e8024f7d6b0e3aac2cfd71, ...] -#+END_SRC - -Then checking the manifest's hash is ok: -#+BEGIN_SRC sh -$ echo -en 'tree 669a71cce6c424a81ba42b7dc5d560d32252f0ca\nauthor seanius 1138341038.645397 +0000\ncommitter seanius 1138341038.645397 +0000\nsvn_repo_uuid 3187e211-bb14-4c82-9596-0b59d67cd7f4\nsvn_revision 1\n\nmaking dir structure...' | git hash-object -t commit --stdin -0d7dd5f751cef8fe17e8024f7d6b0e3aac2cfd71 -#+END_SRC - -And all is ok. - -** Update existing repository - -Checkout on disk the repository and do some modifications on it: -#+BEGIN_SRC sh -$ svn co file:///home/storage/svn/repos/pkg-gourmet/ -A pkg-gourmet/gourmet -A pkg-gourmet/gourmet/branches -A pkg-gourmet/gourmet/tags -A pkg-gourmet/gourmet/trunk -A pkg-gourmet/gourmet/trunk/debian -A pkg-gourmet/gourmet/trunk/debian/patches -A pkg-gourmet/gourmet/trunk/debian/patches/00list -A pkg-gourmet/gourmet/trunk/debian/patches/01_printer_warning.dpatch -A pkg-gourmet/gourmet/trunk/debian/README.Maintainer -A pkg-gourmet/gourmet/trunk/debian/TODO -A pkg-gourmet/gourmet/trunk/debian/changelog -A pkg-gourmet/gourmet/trunk/debian/compat -A pkg-gourmet/gourmet/trunk/debian/control -A pkg-gourmet/gourmet/trunk/debian/copyright -A pkg-gourmet/gourmet/trunk/debian/dirs -A pkg-gourmet/gourmet/trunk/debian/docs -A pkg-gourmet/gourmet/trunk/debian/gourmet.1 -A pkg-gourmet/gourmet/trunk/debian/menu -A pkg-gourmet/gourmet/trunk/debian/postinst -A pkg-gourmet/gourmet/trunk/debian/postrm -A pkg-gourmet/gourmet/trunk/debian/prerm -A pkg-gourmet/gourmet/trunk/debian/recbox.xpm -A pkg-gourmet/gourmet/trunk/debian/rules -A pkg-gourmet/gourmet/trunk/debian/source.lintian-overrides -Checked out revision 6. -$ cd pkg-gourmet -$ mkdir foo/bar/ -p -$ em foo/bar/new-file -% svn add foo -A foo -A foo/bar -A foo/bar/README -$ svn commit -m 'Add a new README' -Adding foo -Adding foo/bar -Adding foo/bar/README -Transmitting file data .done -Committing transaction... -Committed revision 7. -$ ln -s foo/bar/README README -$ svn add README -A README -$ svn commit -m 'Add link to README' -Adding README -Transmitting file data .done -Committing transaction... -Committed revision 8. -$ svn update -Updating '.': -At revision 8. -#+END_SRC - -Checking the log, we see those new svn commits: -#+BEGIN_SRC sh -$ svn log ------------------------------------------------------------------------- -r11 | tony | 2016-07-11 10:38:43 +0200 (Mon, 11 Jul 2016) | 1 line - -Delete broken link ------------------------------------------------------------------------- -r10 | tony | 2016-07-11 10:09:13 +0200 (Mon, 11 Jul 2016) | 1 line - -Add bin/hello executable ------------------------------------------------------------------------- -r9 | tony | 2016-07-07 11:13:52 +0200 (Thu, 07 Jul 2016) | 1 line - ------------------------------------------------------------------------- -r8 | tony | 2016-06-24 11:08:42 +0200 (Fri, 24 Jun 2016) | 1 line - -Add link to README ------------------------------------------------------------------------- -r7 | tony | 2016-06-24 11:07:04 +0200 (Fri, 24 Jun 2016) | 1 line - -Add a new README ------------------------------------------------------------------------- -r6 | seanius | 2006-01-27 07:38:25 +0100 (Fri, 27 Jan 2006) | 1 line - -fix breakage in rules -#+END_SRC - -Loading the svn repository, we see 2 new swh revisions: -#+BEGIN_SRC sh -b'tree 752c52134dcbf2fff13c7be1ce4e9e5dbf428a59\nparent 4876cb10aec6f708f7466dddf547567b65f6c39c\nauthor tony 1466759224.2817 +0000\ncommitter tony 1466759224.2817 +0000\nsvn_repo_uuid 3187e211-bb14-4c82-9596-0b59d67cd7f4\nsvn_revision 7\n\nAdd a new README' -[2016-06-24 11:18:21,055: DEBUG/Worker-1] rev: 7, swhrev: 7f5bc909c29d4e93d8ccfdda516e51ed44930ee1, dir: 752c52134dcbf2fff13c7be1ce4e9e5dbf428a59 -b'tree 39c813fb4717a4864bacefbd90b51a3241ae4140\nparent 7f5bc909c29d4e93d8ccfdda516e51ed44930ee1\nauthor tony 1466759322.099151 +0000\ncommitter tony 1466759322.099151 +0000\nsvn_repo_uuid 3187e211-bb14-4c82-9596-0b59d67cd7f4\nsvn_revision 8\n\nAdd link to README' -[2016-06-24 11:18:21,066: DEBUG/Worker-1] rev: 8, swhrev: 38d81702cb28db4f1a6821e64321e5825d1f7fd6, dir: 39c813fb4717a4864bacefbd90b51a3241ae4140 -[2016-07-11 10:47:18,609: DEBUG/Worker-1] rev: 9, swhrev: 99c27ebbd43feca179ac0e895af131d8314cafe1, dir: 3397ca7f709639cbd36b18a0d1b70bce80018c45 -[2016-07-11 10:47:18,644: DEBUG/Worker-1] rev: 10, swhrev: 902f29b4323a9b9de3af6d28e72dd581e76d9397, dir: c4e12483f0a13e6851459295a4ae735eb4e4b5c4 -[2016-07-11 10:47:18,831: DEBUG/Worker-1] rev: 11, swhrev: 171dc35522bfd17dda4e90a542a0377fb2fc707a, dir: fd24a76c87a3207428e06612b49860fc78e9f6dc -#+END_SRC - -|--------------+------------------------------------------+------------------------------------------| -| svn revision | swh revision | tree | -|--------------+------------------------------------------+------------------------------------------| -| 7 | 7f5bc909c29d4e93d8ccfdda516e51ed44930ee1 | 752c52134dcbf2fff13c7be1ce4e9e5dbf428a59 | -| 8 | 38d81702cb28db4f1a6821e64321e5825d1f7fd6 | 39c813fb4717a4864bacefbd90b51a3241ae4140 | -| 9 | 99c27ebbd43feca179ac0e895af131d8314cafe1 | 3397ca7f709639cbd36b18a0d1b70bce80018c45 | -| 10 | 902f29b4323a9b9de3af6d28e72dd581e76d9397 | c4e12483f0a13e6851459295a4ae735eb4e4b5c4 | -| 11 | 171dc35522bfd17dda4e90a542a0377fb2fc707a | fd24a76c87a3207428e06612b49860fc78e9f6dc | -|--------------+------------------------------------------+------------------------------------------| -*** Checks -**** Trees - -#+BEGIN_SRC sh -$ pwd -/home/storage/svn/working-copies/pkg-gourmet -$ cd ..; rm -rf pkg-gourmet; svn export --ignore-keywords file:///home/storage/svn/repos/pkg-gourmet@7; cd pkg-gourmet; swh-hashtree --path . -A pkg-gourmet -A pkg-gourmet/foo -A pkg-gourmet/foo/bar -A pkg-gourmet/foo/bar/README -A pkg-gourmet/gourmet -A pkg-gourmet/gourmet/branches -A pkg-gourmet/gourmet/tags -A pkg-gourmet/gourmet/trunk -A pkg-gourmet/gourmet/trunk/debian -A pkg-gourmet/gourmet/trunk/debian/patches -A pkg-gourmet/gourmet/trunk/debian/patches/00list -A pkg-gourmet/gourmet/trunk/debian/patches/01_printer_warning.dpatch -A pkg-gourmet/gourmet/trunk/debian/README.Maintainer -A pkg-gourmet/gourmet/trunk/debian/TODO -A pkg-gourmet/gourmet/trunk/debian/changelog -A pkg-gourmet/gourmet/trunk/debian/compat -A pkg-gourmet/gourmet/trunk/debian/control -A pkg-gourmet/gourmet/trunk/debian/copyright -A pkg-gourmet/gourmet/trunk/debian/dirs -A pkg-gourmet/gourmet/trunk/debian/docs -A pkg-gourmet/gourmet/trunk/debian/gourmet.1 -A pkg-gourmet/gourmet/trunk/debian/menu -A pkg-gourmet/gourmet/trunk/debian/postinst -A pkg-gourmet/gourmet/trunk/debian/postrm -A pkg-gourmet/gourmet/trunk/debian/prerm -A pkg-gourmet/gourmet/trunk/debian/recbox.xpm -A pkg-gourmet/gourmet/trunk/debian/rules -A pkg-gourmet/gourmet/trunk/debian/source.lintian-overrides -Exported revision 7. -752c52134dcbf2fff13c7be1ce4e9e5dbf428a59 -$ cd ..; rm -rf pkg-gourmet; svn export --ignore-keywords file:///home/storage/svn/repos/pkg-gourmet@8; cd pkg-gourmet; swh-hashtree --path . -A pkg-gourmet -A pkg-gourmet/foo -A pkg-gourmet/foo/bar -A pkg-gourmet/foo/bar/README -A pkg-gourmet/gourmet -A pkg-gourmet/gourmet/branches -A pkg-gourmet/gourmet/tags -A pkg-gourmet/gourmet/trunk -A pkg-gourmet/gourmet/trunk/debian -A pkg-gourmet/gourmet/trunk/debian/patches -A pkg-gourmet/gourmet/trunk/debian/patches/00list -A pkg-gourmet/gourmet/trunk/debian/patches/01_printer_warning.dpatch -A pkg-gourmet/gourmet/trunk/debian/README.Maintainer -A pkg-gourmet/gourmet/trunk/debian/TODO -A pkg-gourmet/gourmet/trunk/debian/changelog -A pkg-gourmet/gourmet/trunk/debian/compat -A pkg-gourmet/gourmet/trunk/debian/control -A pkg-gourmet/gourmet/trunk/debian/copyright -A pkg-gourmet/gourmet/trunk/debian/dirs -A pkg-gourmet/gourmet/trunk/debian/docs -A pkg-gourmet/gourmet/trunk/debian/gourmet.1 -A pkg-gourmet/gourmet/trunk/debian/menu -A pkg-gourmet/gourmet/trunk/debian/postinst -A pkg-gourmet/gourmet/trunk/debian/postrm -A pkg-gourmet/gourmet/trunk/debian/prerm -A pkg-gourmet/gourmet/trunk/debian/recbox.xpm -A pkg-gourmet/gourmet/trunk/debian/rules -A pkg-gourmet/gourmet/trunk/debian/source.lintian-overrides -A pkg-gourmet/README -Exported revision 8. -39c813fb4717a4864bacefbd90b51a3241ae4140 -#+END_SRC - -Trees ok! - -**** Revisions - -#+BEGIN_SRC sh -$ git-revhash 'tree 752c52134dcbf2fff13c7be1ce4e9e5dbf428a59\nparent 4876cb10aec6f708f7466dddf547567b65f6c39c\nauthor tony 1466759224.2817 +0000\ncommitter tony 1466759224.2817 +0000\nsvn_repo_uuid 3187e211-bb14-4c82-9596-0b59d67cd7f4\nsvn_revision 7\n\nAdd a new README' -7f5bc909c29d4e93d8ccfdda516e51ed44930ee1 -$ git-revhash 'tree 39c813fb4717a4864bacefbd90b51a3241ae4140\nparent 7f5bc909c29d4e93d8ccfdda516e51ed44930ee1\nauthor tony 1466759322.099151 +0000\ncommitter tony 1466759322.099151 +0000\nsvn_repo_uuid 3187e211-bb14-4c82-9596-0b59d67cd7f4\nsvn_revision 8\n\nAdd link to README -38d81702cb28db4f1a6821e64321e5825d1f7fd6 -#+END_SRC -** Adding new corner cases - -About [[http://svnbook.red-bean.com/en/1.8/svn.advanced.props.file-portability.html#svn.advanced.props.special.eol-style][eol property on files]]. - -|--------------+------------------------------------------+------------------------------------------+-------------------------------------------------+-----------------------------------------| -| svn revision | swh revision | tree | File | Expects | -|--------------+------------------------------------------+------------------------------------------+-------------------------------------------------+-----------------------------------------| -| 12 | 027e8769f4786597436ab94a91f85527d04a6cbb | 2d9ca72c6afec6284fb01e459588cbb007017c8c | Added and committed a file with standard lf eol | Nothing to do | -| 13 | 4474d96018877742d9697d5c76666c9693353bfc | ab111577e0ab39e4a157c476072af48f2641d93f | Added and committed a file with crlf eol | Nothing done (file contains CRLF) | -| 14 | 97ad21eab92961e2a22ca0285f09c6d1e9a7ffbc | ab111577e0ab39e4a157c476072af48f2641d93f | Update that file with svn:style 'CRLF' | Nothing to do (already in CRLF) | -| 15 | d04ea8afcee6205cc8384c091bfc578931c169fd | b0a648b02e55a4dce356ac35187a058f89694ec7 | Update that file with svn:style 'native' | Conversion to LF (during commit) | -| 16 | ded78810401fd354ffe894aa4a1e5c7d30a645d1 | b0a648b02e55a4dce356ac35187a058f89694ec7 | Update that file with svn:style 'LF | Nothing to do (already converted in LF) | -| 17 | 4ee95e39358712f53c4fc720da3fafee9249ed19 | c3c98df624733fef4e592bef983f93e2ed02b179 | Added and committed a file with cr eol | Nothing to do (file contains CR) | -| 18 | ffa901b69ca0f46a2261f42948838d19709cb9f8 | c3c98df624733fef4e592bef983f93e2ed02b179 | Update that file with svn:style 'CR' | Nothing to do (already in CR) | -| 19 | 0148ae3eaa520b73a50802c59f3f416b7a36cf8c | 844d4646d6c2b4f3a3b2b22ab0ee38c7df07bab2 | Update that file with svn:style 'native' | Conversion (during commit) | -|--------------+------------------------------------------+------------------------------------------+-------------------------------------------------+-----------------------------------------| diff --git a/swh/loader/svn/tests/test_loader.py b/swh/loader/svn/tests/test_loader.py index 9ed15c0..8ca4a10 100644 --- a/swh/loader/svn/tests/test_loader.py +++ b/swh/loader/svn/tests/test_loader.py @@ -1,957 +1,863 @@ # Copyright (C) 2016-2018 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information +import copy import os - -from nose.tools import istest from unittest import TestCase +from swh.loader.core.tests import BaseLoaderTest +from swh.loader.svn.loader import (DEFAULT_BRANCH, SvnLoader, + SvnLoaderFromRemoteDump, build_swh_snapshot) from swh.model import hashutil -from swh.loader.svn.loader import build_swh_snapshot, DEFAULT_BRANCH -from swh.loader.svn.loader import SvnLoader, SvnLoaderFromRemoteDump -from swh.loader.core.tests import LoaderNoStorage, BaseLoaderTest - - -class BaseSvnLoaderTest(BaseLoaderTest): - """Base test loader class. - - In its setup, it's uncompressing a local svn mirror to /tmp. - - """ - def setUp(self, archive_name='pkg-gourmet.tgz', filename='pkg-gourmet'): - super().setUp(archive_name=archive_name, filename=filename, - prefix_tmp_folder_name='swh.loader.svn.', - start_path=os.path.dirname(__file__)) - self.svn_mirror_url = self.repo_url - class TestSnapshot(TestCase): - @istest - def build_swh_snapshot(self): + def test_build_swh_snapshot(self): actual_snap = build_swh_snapshot('revision-id') - self.assertEquals(actual_snap, { + self.assertEqual(actual_snap, { 'id': None, 'branches': { DEFAULT_BRANCH: { 'target': 'revision-id', 'target_type': 'revision', } } }) -class LoaderWithState: - """Additional state setup (bypassed by some override for test purposes) +_LOADER_TEST_CONFIG = { + 'check_revision': {'limit': 100, 'status': False}, + 'content_packet_block_size_bytes': 104857600, + 'content_packet_size': 10000, + 'content_packet_size_bytes': 1073741824, + 'content_size_limit': 104857600, + 'debug': False, + 'directory_packet_size': 2500, + 'log_db': 'dbname=softwareheritage-log', + 'occurrence_packet_size': 1000, + 'release_packet_size': 1000, + 'revision_packet_size': 10, + 'save_data': False, + 'save_data_path': '', + 'send_contents': True, + 'send_directories': True, + 'send_occurrences': True, + 'send_releases': True, + 'send_revisions': True, + 'send_snapshot': True, + 'storage': {'args': {}, 'cls': 'memory'}, + 'temp_directory': '/tmp' +} + + +class SvnLoaderTest(SvnLoader): + """An SVNLoader with no persistence. + + Context: + Load a new svn repository using the swh policy (so no update). """ - def __init__(self): + def __init__(self, last_snp_rev={}): super().__init__() self.origin = { 'id': 1, 'url': '/dev/null', 'type': 'svn', } self.visit = { 'origin': 1, 'visit': 1, } + self.last_snp_rev = last_snp_rev + def parse_config_file(self, *args, **kwargs): + return _LOADER_TEST_CONFIG -class SvnLoaderNoStorage(LoaderNoStorage, LoaderWithState, SvnLoader): - """An SVNLoader with no persistence. - - Context: - Load a new svn repository using the swh policy (so no update). - - """ - def swh_latest_snapshot_revision(self, origin_id, prev_swh_revision=None): - """We do not know this repository so no revision. - - """ - return {} - - -class SvnLoaderUpdateNoStorage(LoaderNoStorage, LoaderWithState, SvnLoader): - """An SVNLoader with no persistence. - - Context: - Load a known svn repository using the swh policy. - We can either: - - do nothing since it does not contain any new commit (so no - change) - - either check its history is not altered and update in - consequence by loading the new revision - - """ def swh_latest_snapshot_revision(self, origin_id, prev_swh_revision=None): """Avoid the storage persistence call and return the expected previous revision for that repository. Check the following for explanation about the hashes: - test_loader.org for (swh policy). - - cf. SvnLoaderITTest + - cf. SvnLoaderTest """ - return { - 'snapshot': 'something', # need a snapshot of sort - 'revision': { - 'id': hashutil.hash_to_bytes( - '4876cb10aec6f708f7466dddf547567b65f6c39c'), - 'parents': [hashutil.hash_to_bytes( - 'a3a577948fdbda9d1061913b77a1588695eadb41')], - 'directory': hashutil.hash_to_bytes( - '0deab3023ac59398ae467fc4bff5583008af1ee2'), - 'target_type': 'revision', - 'metadata': { - 'extra_headers': [ - ['svn_repo_uuid', - '3187e211-bb14-4c82-9596-0b59d67cd7f4'], - ['svn_revision', '6'] - ] - } - } - } - + return self.last_snp_rev -class SvnLoaderUpdateHistoryAlteredNoStorage(LoaderNoStorage, LoaderWithState, - SvnLoader): - """Context: Load a known svn repository using the swh policy with its - history altered so we do not update it. - """ - def swh_latest_snapshot_revision(self, origin_id, prev_swh_revision=None): - """Avoid the storage persistence call and return the expected previous - revision for that repository. +class BaseSvnLoaderTest(BaseLoaderTest): + """Base test loader class. - Check the following for explanation about the hashes: - - test_loader.org for (swh policy). - - cf. SvnLoaderITTest + In its setup, it's uncompressing a local svn mirror to /tmp. - """ - return { - 'snapshot': None, - 'revision': { - # Changed the revision id's hash to simulate history altered - 'id': hashutil.hash_to_bytes( - 'badbadbadbadf708f7466dddf547567b65f6c39d'), - 'parents': [hashutil.hash_to_bytes( - 'a3a577948fdbda9d1061913b77a1588695eadb41')], - 'directory': hashutil.hash_to_bytes( - '0deab3023ac59398ae467fc4bff5583008af1ee2'), - 'target_type': 'revision', - 'metadata': { - 'extra_headers': [ - ['svn_repo_uuid', - '3187e211-bb14-4c82-9596-0b59d67cd7f4'], - ['svn_revision', b'6'] - ] - } - } - } + """ + def setUp(self, archive_name='pkg-gourmet.tgz', filename='pkg-gourmet', + loader=None): + super().setUp(archive_name=archive_name, filename=filename, + prefix_tmp_folder_name='swh.loader.svn.', + start_path=os.path.dirname(__file__)) + self.svn_mirror_url = self.repo_url + self.loader = loader or SvnLoaderTest() + self.storage = self.loader.storage -class SvnLoaderITest1(BaseSvnLoaderTest): +class SvnLoaderTest1(BaseSvnLoaderTest): """Load an unknown svn repository results in new data. """ - def setUp(self): - super().setUp() - self.loader = SvnLoaderNoStorage() - - @istest - def load(self): + def test_load(self): """Load a new repository results in new swh object and snapshot """ # when self.loader.load( svn_url=self.svn_mirror_url, destination_path=self.destination_path) # then self.assertCountRevisions(6) self.assertCountReleases(0) last_revision = '4876cb10aec6f708f7466dddf547567b65f6c39c' # cf. test_loader.org for explaining from where those hashes # come from expected_revisions = { # revision hash | directory hash '0d7dd5f751cef8fe17e8024f7d6b0e3aac2cfd71': '669a71cce6c424a81ba42b7dc5d560d32252f0ca', # noqa '95edacc8848369d6fb1608e887d6d2474fd5224f': '008ac97a1118560797c50e3392fa1443acdaa349', # noqa 'fef26ea45a520071711ba2b9d16a2985ee837021': '3780effbe846a26751a95a8c95c511fb72be15b4', # noqa '3f51abf3b3d466571be0855dfa67e094f9ceff1b': 'ffcca9b09c5827a6b8137322d4339c8055c3ee1e', # noqa 'a3a577948fdbda9d1061913b77a1588695eadb41': '7dc52cc04c3b8bd7c085900d60c159f7b846f866', # noqa last_revision: '0deab3023ac59398ae467fc4bff5583008af1ee2', # noqa } - self.assertRevisionsOk(expected_revisions) + self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) # FIXME: Check the snapshot's state - # self.assertEquals(self.loader.all_snapshots[0], {}) + # self.assertEqual(self.loader.all_snapshots[0], {}) self.assertEqual(self.loader.load_status(), {'status': 'eventful'}) self.assertEqual(self.loader.visit_status(), 'full') -class SvnLoaderITest2(BaseSvnLoaderTest): +_LAST_SNP_REV = { + 'snapshot': { + 'id': 'something', + 'branches': {} + }, # need a snapshot of sort + 'revision': { + 'id': hashutil.hash_to_bytes( + '4876cb10aec6f708f7466dddf547567b65f6c39c'), + 'parents': [hashutil.hash_to_bytes( + 'a3a577948fdbda9d1061913b77a1588695eadb41')], + 'directory': hashutil.hash_to_bytes( + '0deab3023ac59398ae467fc4bff5583008af1ee2'), + 'target_type': 'revision', + 'metadata': { + 'extra_headers': [ + ['svn_repo_uuid', + '3187e211-bb14-4c82-9596-0b59d67cd7f4'], + ['svn_revision', '6'] + ] + } + } +} + + +class SvnLoaderTest2(BaseSvnLoaderTest): """Load a visited repository with no new change results in no data change. """ def setUp(self): - super().setUp() - self.loader = SvnLoaderUpdateNoStorage() + super().setUp(loader=SvnLoaderTest(last_snp_rev=_LAST_SNP_REV)) - @istest - def load(self): + def test_load(self): """Load a repository without new changes results in same snapshot """ # when self.loader.load( svn_url=self.svn_mirror_url, destination_path=self.destination_path) # then self.assertCountContents(0) self.assertCountDirectories(0) self.assertCountRevisions(0) self.assertCountReleases(0) self.assertCountSnapshots(1) # FIXME: Check the snapshot's state - # self.assertEquals(self.loader.all_snapshots[0], {}) + # self.assertEqual(self.loader.all_snapshots[0], {}) self.assertEqual(self.loader.load_status(), {'status': 'uneventful'}) self.assertEqual(self.loader.visit_status(), 'full') -class SvnLoaderITest3(BaseSvnLoaderTest): +class SvnLoaderTest3(BaseSvnLoaderTest): """In this scenario, the dump has been tampered with to modify the commit log. This results in a hash divergence which is detected at startup. In effect, that stops the loading and do nothing. """ def setUp(self): + last_snp_rev = copy.deepcopy(_LAST_SNP_REV) + last_snp_rev['snapshot'] = None + # Changed the revision id's hash to simulate history altered + last_snp_rev['revision']['id'] = \ + hashutil.hash_to_bytes('badbadbadbadf708f7466dddf547567b65f6c39d') # the svn repository pkg-gourmet has been updated with changes - super().setUp(archive_name='pkg-gourmet-with-updates.tgz') - self.loader = SvnLoaderUpdateHistoryAlteredNoStorage() + super().setUp(archive_name='pkg-gourmet-with-updates.tgz', + loader=SvnLoaderTest(last_snp_rev=last_snp_rev)) - @istest - def load(self): + def test_load(self): """Load known repository with history altered should do nothing """ # when self.loader.load(svn_url=self.svn_mirror_url, destination_path=self.destination_path) # then # we got the previous run's last revision (rev 6) # so 2 news + 1 old self.assertCountContents(0) self.assertCountDirectories(0) self.assertCountRevisions(0) self.assertCountReleases(0) self.assertCountSnapshots(0) # FIXME: Check the snapshot's state - # self.assertEquals(self.loader.all_snapshots[0], {}) + # self.assertEqual(self.loader.all_snapshots[0], {}) self.assertEqual(self.loader.load_status(), {'status': 'uneventful'}) self.assertEqual(self.loader.visit_status(), 'partial') -class SvnLoaderITest4(BaseSvnLoaderTest): +class SvnLoaderTest4(BaseSvnLoaderTest): """In this scenario, the repository has been updated with new changes. The loading visit should result in new objects stored and 1 new snapshot. """ def setUp(self): # the svn repository pkg-gourmet has been updated with changes - super().setUp(archive_name='pkg-gourmet-with-updates.tgz') - self.loader = SvnLoaderUpdateNoStorage() + super().setUp(archive_name='pkg-gourmet-with-updates.tgz', + loader=SvnLoaderTest(last_snp_rev=_LAST_SNP_REV)) - @istest - def process_repository(self): + def test_process_repository(self): """Process updated repository should yield new objects """ # when self.loader.load(svn_url=self.svn_mirror_url, destination_path=self.destination_path) # then # we got the previous run's last revision (rev 6) # so 2 new self.assertCountRevisions(5) self.assertCountReleases(0) last_revision = '171dc35522bfd17dda4e90a542a0377fb2fc707a' # cf. test_loader.org for explaining from where those hashes # come from expected_revisions = { # revision hash | directory hash '7f5bc909c29d4e93d8ccfdda516e51ed44930ee1': '752c52134dcbf2fff13c7be1ce4e9e5dbf428a59', # noqa '38d81702cb28db4f1a6821e64321e5825d1f7fd6': '39c813fb4717a4864bacefbd90b51a3241ae4140', # noqa '99c27ebbd43feca179ac0e895af131d8314cafe1': '3397ca7f709639cbd36b18a0d1b70bce80018c45', # noqa '902f29b4323a9b9de3af6d28e72dd581e76d9397': 'c4e12483f0a13e6851459295a4ae735eb4e4b5c4', # noqa last_revision: 'fd24a76c87a3207428e06612b49860fc78e9f6dc' # noqa } - self.assertRevisionsOk(expected_revisions) + self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) # FIXME: Check the snapshot's state - # self.assertEquals(self.loader.all_snapshots[0], {}) + # self.assertEqual(self.loader.all_snapshots[0], {}) self.assertEqual(self.loader.load_status(), {'status': 'eventful'}) self.assertEqual(self.loader.visit_status(), 'full') -class SvnLoaderITTest5(BaseSvnLoaderTest): +class SvnLoaderTest5(BaseSvnLoaderTest): """Context: - Repository already injected with successful data - New visit from scratch done with successful load """ def setUp(self): # the svn repository pkg-gourmet has been updated with changes - super().setUp(archive_name='pkg-gourmet-with-updates.tgz') - self.loader = SvnLoaderUpdateNoStorage() + super().setUp(archive_name='pkg-gourmet-with-updates.tgz', + loader=SvnLoaderTest(last_snp_rev=_LAST_SNP_REV)) - @istest - def load(self): + def test_load(self): """Load an existing repository from scratch yields same swh objects """ # when self.loader.load(svn_url=self.svn_mirror_url, destination_path=self.destination_path, start_from_scratch=True) # then # we got the previous run's last revision (rev 6) # but we do not inspect that as we start from from scratch so # we should have all revisions so 11 self.assertCountRevisions(11) self.assertCountReleases(0) expected_revisions = { '0d7dd5f751cef8fe17e8024f7d6b0e3aac2cfd71': '669a71cce6c424a81ba42b7dc5d560d32252f0ca', # noqa '95edacc8848369d6fb1608e887d6d2474fd5224f': '008ac97a1118560797c50e3392fa1443acdaa349', # noqa 'fef26ea45a520071711ba2b9d16a2985ee837021': '3780effbe846a26751a95a8c95c511fb72be15b4', # noqa '3f51abf3b3d466571be0855dfa67e094f9ceff1b': 'ffcca9b09c5827a6b8137322d4339c8055c3ee1e', # noqa 'a3a577948fdbda9d1061913b77a1588695eadb41': '7dc52cc04c3b8bd7c085900d60c159f7b846f866', # noqa '4876cb10aec6f708f7466dddf547567b65f6c39c': '0deab3023ac59398ae467fc4bff5583008af1ee2', # noqa '7f5bc909c29d4e93d8ccfdda516e51ed44930ee1': '752c52134dcbf2fff13c7be1ce4e9e5dbf428a59', # noqa '38d81702cb28db4f1a6821e64321e5825d1f7fd6': '39c813fb4717a4864bacefbd90b51a3241ae4140', # noqa '99c27ebbd43feca179ac0e895af131d8314cafe1': '3397ca7f709639cbd36b18a0d1b70bce80018c45', # noqa '902f29b4323a9b9de3af6d28e72dd581e76d9397': 'c4e12483f0a13e6851459295a4ae735eb4e4b5c4', # noqa '171dc35522bfd17dda4e90a542a0377fb2fc707a': 'fd24a76c87a3207428e06612b49860fc78e9f6dc', # noqa } - self.assertRevisionsOk(expected_revisions) + self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) # FIXME: Check the snapshot's state - # self.assertEquals(self.loader.all_snapshots[0], {}) + # self.assertEqual(self.loader.all_snapshots[0], {}) self.assertEqual(self.loader.load_status(), {'status': 'eventful'}) self.assertEqual(self.loader.visit_status(), 'full') -class SvnLoaderWithPreviousRevisionNoStorage(LoaderNoStorage, LoaderWithState, - SvnLoader): - """An SVNLoader with no persistence. - - Context: Load a known svn repository using the swh policy with its - history altered so we do not update it. +class SvnLoaderTest6(BaseSvnLoaderTest): + """Context: + - repository already visited with load successful + - Changes on existing repository + - New Visit done with successful new data """ - def swh_latest_snapshot_revision(self, origin_id, prev_swh_revision=None): - """Avoid the storage persistence call and return the expected previous - revision for that repository. - - Check the following for explanation about the hashes: - - test_loader.org for (swh policy). - - cf. SvnLoaderITTest - - """ - return { + def setUp(self): + last_snp_rev = { 'snapshot': None, 'revision': { 'id': hashutil.hash_to_bytes( '4876cb10aec6f708f7466dddf547567b65f6c39c'), 'parents': [hashutil.hash_to_bytes( 'a3a577948fdbda9d1061913b77a1588695eadb41')], 'directory': hashutil.hash_to_bytes( '0deab3023ac59398ae467fc4bff5583008af1ee2'), 'target_type': 'revision', 'metadata': { 'extra_headers': [ ['svn_repo_uuid', '3187e211-bb14-4c82-9596-0b59d67cd7f4'], # noqa ['svn_revision', '6'] ] } } } + super().setUp(archive_name='pkg-gourmet-with-updates.tgz', + loader=SvnLoaderTest(last_snp_rev=last_snp_rev)) - -class SvnLoaderITTest6(BaseSvnLoaderTest): - """Context: - - repository already visited with load successful - - Changes on existing repository - - New Visit done with successful new data - - """ - def setUp(self): - super().setUp(archive_name='pkg-gourmet-with-updates.tgz') - self.loader = SvnLoaderWithPreviousRevisionNoStorage() - - @istest - def load(self): + def test_load(self): """Load from partial previous visit result in new changes """ # when self.loader.load( svn_url=self.svn_mirror_url, destination_path=self.destination_path) # then # we got the previous run's last revision (rev 6) # so 2 new self.assertCountRevisions(5) self.assertCountReleases(0) last_revision = '171dc35522bfd17dda4e90a542a0377fb2fc707a' # cf. test_loader.org for explaining from where those hashes # come from expected_revisions = { # revision hash | directory hash '7f5bc909c29d4e93d8ccfdda516e51ed44930ee1': '752c52134dcbf2fff13c7be1ce4e9e5dbf428a59', # noqa '38d81702cb28db4f1a6821e64321e5825d1f7fd6': '39c813fb4717a4864bacefbd90b51a3241ae4140', # noqa '99c27ebbd43feca179ac0e895af131d8314cafe1': '3397ca7f709639cbd36b18a0d1b70bce80018c45', # noqa '902f29b4323a9b9de3af6d28e72dd581e76d9397': 'c4e12483f0a13e6851459295a4ae735eb4e4b5c4', # noqa last_revision: 'fd24a76c87a3207428e06612b49860fc78e9f6dc' # noqa } - self.assertRevisionsOk(expected_revisions) + self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) # FIXME: Check the snapshot's state - # self.assertEquals(self.loader.all_snapshots[0], {}) + # self.assertEqual(self.loader.all_snapshots[0], {}) self.assertEqual(self.loader.load_status(), {'status': 'eventful'}) self.assertEqual(self.loader.visit_status(), 'full') -class SvnLoaderITest7(BaseSvnLoaderTest): +class SvnLoaderTest7(BaseSvnLoaderTest): """Context: - repository already visited with load successful - Changes on existing repository - New Visit done with successful new data """ def setUp(self): - super().setUp(archive_name='pkg-gourmet-with-updates.tgz') - self.loader = SvnLoaderUpdateNoStorage() + super().setUp(archive_name='pkg-gourmet-with-updates.tgz', + loader=SvnLoaderTest(last_snp_rev=_LAST_SNP_REV)) - @istest - def load(self): + def test_load(self): """Load known and partial repository should start from last visit """ previous_unfinished_revision = { 'id': hashutil.hash_to_bytes( 'a3a577948fdbda9d1061913b77a1588695eadb41'), 'parents': [hashutil.hash_to_bytes( '3f51abf3b3d466571be0855dfa67e094f9ceff1b')], 'directory': hashutil.hash_to_bytes( '7dc52cc04c3b8bd7c085900d60c159f7b846f866'), 'target_type': 'revision', 'metadata': { 'extra_headers': [ ['svn_repo_uuid', '3187e211-bb14-4c82-9596-0b59d67cd7f4'], ['svn_revision', '5'] ] } } # when self.loader.load( svn_url=self.svn_mirror_url, destination_path=self.destination_path, swh_revision=previous_unfinished_revision) # then # we got the previous run's last revision (rev 6) # so 2 new self.assertCountRevisions(5) self.assertCountReleases(0) last_revision = '171dc35522bfd17dda4e90a542a0377fb2fc707a' # cf. test_loader.org for explaining from where those hashes # come from expected_revisions = { # revision hash | directory hash '7f5bc909c29d4e93d8ccfdda516e51ed44930ee1': '752c52134dcbf2fff13c7be1ce4e9e5dbf428a59', # noqa '38d81702cb28db4f1a6821e64321e5825d1f7fd6': '39c813fb4717a4864bacefbd90b51a3241ae4140', # noqa '99c27ebbd43feca179ac0e895af131d8314cafe1': '3397ca7f709639cbd36b18a0d1b70bce80018c45', # noqa '902f29b4323a9b9de3af6d28e72dd581e76d9397': 'c4e12483f0a13e6851459295a4ae735eb4e4b5c4', # noqa last_revision: 'fd24a76c87a3207428e06612b49860fc78e9f6dc' # noqa } - self.assertRevisionsOk(expected_revisions) + self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) # FIXME: Check the snapshot's state - # self.assertEquals(self.loader.all_snapshots[0], {}) + # self.assertEqual(self.loader.all_snapshots[0], {}) self.assertEqual(self.loader.load_status(), {'status': 'eventful'}) self.assertEqual(self.loader.visit_status(), 'full') -class SvnLoaderUpdateLessRecentNoStorage(LoaderNoStorage, LoaderWithState, - SvnLoader): +class SvnLoaderTest8(BaseSvnLoaderTest): """Context: - Load a known svn repository. The last visit seen is less - recent than a previous unfinished crawl. - """ - def swh_latest_snapshot_revision(self, origin_id, prev_swh_revision=None): - """Avoid the storage persistence call and return the expected previous - revision for that repository. - - Check the following for explanation about the hashes: - - test_loader.org for (swh policy). - - cf. SvnLoaderITTest + - Previous visit on existing repository done + - Starting the loading from the last unfinished visit + - New objects are created (1 new snapshot) - """ - return { + """ + def setUp(self): + last_snp_rev = { 'snapshot': None, 'revision': { 'id': hashutil.hash_to_bytes( 'a3a577948fdbda9d1061913b77a1588695eadb41'), 'parents': [hashutil.hash_to_bytes( '3f51abf3b3d466571be0855dfa67e094f9ceff1b')], 'directory': hashutil.hash_to_bytes( '7dc52cc04c3b8bd7c085900d60c159f7b846f866'), 'target_type': 'revision', 'metadata': { 'extra_headers': [ ['svn_repo_uuid', '3187e211-bb14-4c82-9596-0b59d67cd7f4'], ['svn_revision', '5'] ] } } } + super().setUp(archive_name='pkg-gourmet-with-updates.tgz', + loader=SvnLoaderTest(last_snp_rev=last_snp_rev)) - -class SvnLoaderITest8(BaseSvnLoaderTest): - """Context: - - - Previous visit on existing repository done - - Starting the loading from the last unfinished visit - - New objects are created (1 new snapshot) - - """ - def setUp(self): - super().setUp(archive_name='pkg-gourmet-with-updates.tgz') - self.loader = SvnLoaderUpdateLessRecentNoStorage() - - @istest - def load(self): + def test_load(self): """Load repository should yield revisions starting from last visit """ previous_unfinished_revision = { 'id': hashutil.hash_to_bytes( '4876cb10aec6f708f7466dddf547567b65f6c39c'), 'parents': [hashutil.hash_to_bytes( 'a3a577948fdbda9d1061913b77a1588695eadb41')], 'directory': hashutil.hash_to_bytes( '0deab3023ac59398ae467fc4bff5583008af1ee2'), 'target_type': 'revision', 'metadata': { 'extra_headers': [ ['svn_repo_uuid', '3187e211-bb14-4c82-9596-0b59d67cd7f4'], ['svn_revision', '6'] ] } } # when self.loader.load( svn_url=self.svn_mirror_url, destination_path=self.destination_path, swh_revision=previous_unfinished_revision) # then # we got the previous run's last revision (rev 6) # so 2 new self.assertCountRevisions(5) self.assertCountReleases(0) last_revision = '171dc35522bfd17dda4e90a542a0377fb2fc707a' # cf. test_loader.org for explaining from where those hashes # come from expected_revisions = { # revision hash | directory hash '7f5bc909c29d4e93d8ccfdda516e51ed44930ee1': '752c52134dcbf2fff13c7be1ce4e9e5dbf428a59', # noqa '38d81702cb28db4f1a6821e64321e5825d1f7fd6': '39c813fb4717a4864bacefbd90b51a3241ae4140', # noqa '99c27ebbd43feca179ac0e895af131d8314cafe1': '3397ca7f709639cbd36b18a0d1b70bce80018c45', # noqa '902f29b4323a9b9de3af6d28e72dd581e76d9397': 'c4e12483f0a13e6851459295a4ae735eb4e4b5c4', # noqa last_revision: 'fd24a76c87a3207428e06612b49860fc78e9f6dc' # noqa } - self.assertRevisionsOk(expected_revisions) + self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) # FIXME: Check the snapshot's state - # self.assertEquals(self.loader.all_snapshots[0], {}) + # self.assertEqual(self.loader.all_snapshots[0], {}) self.assertEqual(self.loader.load_status(), {'status': 'eventful'}) self.assertEqual(self.loader.visit_status(), 'full') class SvnLoaderTTest9(BaseSvnLoaderTest): """Check that a svn repo containing a versioned file with CRLF line endings with svn:eol-style property set to 'native' (this is a violation of svn specification as the file should have been stored with LF line endings) can be loaded anyway. """ def setUp(self): super().setUp(archive_name='mediawiki-repo-r407-eol-native-crlf.tgz', filename='mediawiki-repo-r407-eol-native-crlf') - self.loader = SvnLoaderNoStorage() - @istest - def process_repository(self): + def test_process_repository(self): """Load repository with CRLF endings (svn:eol-style: native) is ok """ # noqa # when self.loader.load(svn_url=self.svn_mirror_url, destination_path=self.destination_path) expected_revisions = { '7da4975c363101b819756d33459f30a866d01b1b': 'f63637223ee0f7d4951ffd2d4d9547a4882c5d8b' # noqa } - self.assertRevisionsOk(expected_revisions) + self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) # FIXME: Check the snapshot's state - # self.assertEquals(self.loader.all_snapshots[0], {}) + # self.assertEqual(self.loader.all_snapshots[0], {}) self.assertEqual(self.loader.load_status(), {'status': 'eventful'}) self.assertEqual(self.loader.visit_status(), 'full') -class SvnLoaderITest10(BaseSvnLoaderTest): # noqa +class SvnLoaderTest10(BaseSvnLoaderTest): # noqa """Check that a svn repo containing a versioned file with mixed CRLF/LF line endings with svn:eol-style property set to 'native' (this is a violation of svn specification as mixed line endings for textual content should not be stored when the svn:eol-style property is set) can be loaded anyway. """ def setUp(self): super().setUp( archive_name='pyang-repo-r343-eol-native-mixed-lf-crlf.tgz', filename='pyang-repo-r343-eol-native-mixed-lf-crlf') - self.loader = SvnLoaderNoStorage() - @istest - def load(self): + def test_load(self): """Load repo with mixed CRLF/LF endings (svn:eol-style:native) is ok """ self.loader.load(svn_url=self.svn_mirror_url, destination_path=self.destination_path) expected_revisions = { '9c6962eeb9164a636c374be700672355e34a98a7': '16aa6b6271f3456d4643999d234cf39fe3d0cc5a' # noqa } - self.assertRevisionsOk(expected_revisions) + self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) # FIXME: Check the snapshot's state - # self.assertEquals(self.loader.all_snapshots[0], {}) + # self.assertEqual(self.loader.all_snapshots[0], {}) self.assertEqual(self.loader.load_status(), {'status': 'eventful'}) self.assertEqual(self.loader.visit_status(), 'full') -class SvnLoaderITest11(BaseSvnLoaderTest): +class SvnLoaderTest11(BaseSvnLoaderTest): """Context: - Repository with svn:external (which is not deal with for now) - Visit is partial with as much data loaded as possible """ def setUp(self): super().setUp(archive_name='pkg-gourmet-with-external-id.tgz') - self.loader = SvnLoaderNoStorage() - @istest - def load(self): + def test_load(self): """Repository with svn:externals property, will stop raising an error """ previous_unfinished_revision = None # when self.loader.load( svn_url=self.svn_mirror_url, destination_path=self.destination_path, swh_revision=previous_unfinished_revision) # then repositories holds 21 revisions, but the last commit # one holds an 'svn:externals' property which will make the # loader-svn stops at the last revision prior to the bad one self.assertCountRevisions(20) self.assertCountReleases(0) last_revision = '82a7a4a09f9549223429143ba36ad77375e33c5c' expected_revisions = { # revision hash | directory hash '0d7dd5f751cef8fe17e8024f7d6b0e3aac2cfd71': '669a71cce6c424a81ba42b7dc5d560d32252f0ca', # noqa '95edacc8848369d6fb1608e887d6d2474fd5224f': '008ac97a1118560797c50e3392fa1443acdaa349', # noqa 'fef26ea45a520071711ba2b9d16a2985ee837021': '3780effbe846a26751a95a8c95c511fb72be15b4', # noqa '3f51abf3b3d466571be0855dfa67e094f9ceff1b': 'ffcca9b09c5827a6b8137322d4339c8055c3ee1e', # noqa 'a3a577948fdbda9d1061913b77a1588695eadb41': '7dc52cc04c3b8bd7c085900d60c159f7b846f866', # noqa '4876cb10aec6f708f7466dddf547567b65f6c39c': '0deab3023ac59398ae467fc4bff5583008af1ee2', # noqa '7f5bc909c29d4e93d8ccfdda516e51ed44930ee1': '752c52134dcbf2fff13c7be1ce4e9e5dbf428a59', # noqa '38d81702cb28db4f1a6821e64321e5825d1f7fd6': '39c813fb4717a4864bacefbd90b51a3241ae4140', # noqa '99c27ebbd43feca179ac0e895af131d8314cafe1': '3397ca7f709639cbd36b18a0d1b70bce80018c45', # noqa '902f29b4323a9b9de3af6d28e72dd581e76d9397': 'c4e12483f0a13e6851459295a4ae735eb4e4b5c4', # noqa '171dc35522bfd17dda4e90a542a0377fb2fc707a': 'fd24a76c87a3207428e06612b49860fc78e9f6dc', # noqa '027e8769f4786597436ab94a91f85527d04a6cbb': '2d9ca72c6afec6284fb01e459588cbb007017c8c', # noqa '4474d96018877742d9697d5c76666c9693353bfc': 'ab111577e0ab39e4a157c476072af48f2641d93f', # noqa '97ad21eab92961e2a22ca0285f09c6d1e9a7ffbc': 'ab111577e0ab39e4a157c476072af48f2641d93f', # noqa 'd04ea8afcee6205cc8384c091bfc578931c169fd': 'b0a648b02e55a4dce356ac35187a058f89694ec7', # noqa 'ded78810401fd354ffe894aa4a1e5c7d30a645d1': 'b0a648b02e55a4dce356ac35187a058f89694ec7', # noqa '4ee95e39358712f53c4fc720da3fafee9249ed19': 'c3c98df624733fef4e592bef983f93e2ed02b179', # noqa 'ffa901b69ca0f46a2261f42948838d19709cb9f8': 'c3c98df624733fef4e592bef983f93e2ed02b179', # noqa '0148ae3eaa520b73a50802c59f3f416b7a36cf8c': '844d4646d6c2b4f3a3b2b22ab0ee38c7df07bab2', # noqa last_revision: '0de6e75d2b79ec90d00a3a7611aa3861b2e4aa5e', # noqa } # The last revision being the one used later to start back from - self.assertRevisionsOk(expected_revisions) + self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) # FIXME: Check the snapshot's state self.assertEqual(self.loader.load_status(), {'status': 'eventful'}) self.assertEqual(self.loader.visit_status(), 'partial') -class SvnLoaderITest12(BaseSvnLoaderTest): +class SvnLoaderTest12(BaseSvnLoaderTest): """Edge cases: - first create a file and commit it. Remove it, then add folder holding the same name, commit. - do the same scenario with symbolic link (instead of file) """ def setUp(self): super().setUp( archive_name='pkg-gourmet-with-edge-case-links-and-files.tgz') - self.loader = SvnLoaderNoStorage() - @istest - def load(self): + def test_load(self): """File/Link removed prior to folder with same name creation is ok """ previous_unfinished_revision = None # when self.loader.load( svn_url=self.svn_mirror_url, destination_path=self.destination_path, swh_revision=previous_unfinished_revision) # then repositories holds 14 revisions, but the last commit self.assertCountRevisions(19) self.assertCountReleases(0) last_revision = '3f43af2578fccf18b0d4198e48563da7929dc608' expected_revisions = { # revision hash | directory hash '0d7dd5f751cef8fe17e8024f7d6b0e3aac2cfd71': '669a71cce6c424a81ba42b7dc5d560d32252f0ca', # noqa '95edacc8848369d6fb1608e887d6d2474fd5224f': '008ac97a1118560797c50e3392fa1443acdaa349', # noqa 'fef26ea45a520071711ba2b9d16a2985ee837021': '3780effbe846a26751a95a8c95c511fb72be15b4', # noqa '3f51abf3b3d466571be0855dfa67e094f9ceff1b': 'ffcca9b09c5827a6b8137322d4339c8055c3ee1e', # noqa 'a3a577948fdbda9d1061913b77a1588695eadb41': '7dc52cc04c3b8bd7c085900d60c159f7b846f866', # noqa '4876cb10aec6f708f7466dddf547567b65f6c39c': '0deab3023ac59398ae467fc4bff5583008af1ee2', # noqa '7f5bc909c29d4e93d8ccfdda516e51ed44930ee1': '752c52134dcbf2fff13c7be1ce4e9e5dbf428a59', # noqa '38d81702cb28db4f1a6821e64321e5825d1f7fd6': '39c813fb4717a4864bacefbd90b51a3241ae4140', # noqa '99c27ebbd43feca179ac0e895af131d8314cafe1': '3397ca7f709639cbd36b18a0d1b70bce80018c45', # noqa '902f29b4323a9b9de3af6d28e72dd581e76d9397': 'c4e12483f0a13e6851459295a4ae735eb4e4b5c4', # noqa '171dc35522bfd17dda4e90a542a0377fb2fc707a': 'fd24a76c87a3207428e06612b49860fc78e9f6dc', # noqa '9231f9a98a9051a0cd34231cddd4e11773f8348e': '6c07f4f4ac780eaf99a247fbfd0897533598dd36', # noqa 'c309bd3b57796696d6655ab3ab0b438fdd2d8201': 'fd24a76c87a3207428e06612b49860fc78e9f6dc', # noqa 'bb78300cc1ac9119eb6fffa9e9fa04a7f9340b11': 'ee995a0d85f6917c75bcee3aa448bea7726b265d', # noqa 'f2e01111329f84580dc3febb1fd45515692c5886': 'e2baec7b6a5543758e9c73695bc847db0a4f7941', # noqa '1a0f70c34e211f073e1be3435ecf6f0dd7700267': 'e7536e721fa806c19971b749c091c144b2f2b88e', # noqa '0c612a23d293cc3100496a54ae4ad13d750efe4c': '2123d12749294bbfb54e73f9d73fac658aabb266', # noqa '69a53d972e2f863acbbbda546d9da96287af6a88': '13896cb96ec004140ce5be8852fee8c29830d9c7', # noqa last_revision: '6b1e0243768ff9ac060064b2eeade77e764ffc82', # noqa } - self.assertRevisionsOk(expected_revisions) + self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) # FIXME: Check the snapshot's state self.assertEqual(self.loader.load_status(), {'status': 'eventful'}) self.assertEqual(self.loader.visit_status(), 'full') -class SvnLoaderITTest13(BaseSvnLoaderTest): +class SvnLoaderTest13(BaseSvnLoaderTest): """Edge cases: - wrong symbolic link - wrong symbolic link with empty space names """ def setUp(self): super().setUp( archive_name='pkg-gourmet-with-wrong-link-cases.tgz') - self.loader = SvnLoaderNoStorage() - @istest - def load(self): + def test_load(self): """Wrong link or empty space-named link should be ok """ # when self.loader.load( svn_url=self.svn_mirror_url, destination_path=self.destination_path) # then repositories holds 14 revisions, but the last commit self.assertCountRevisions(21) self.assertCountReleases(0) last_revision = 'cf30d3bb9d5967d0a2bbeacc405f10a5dd9b138a' expected_revisions = { # revision hash | directory hash '0d7dd5f751cef8fe17e8024f7d6b0e3aac2cfd71': '669a71cce6c424a81ba42b7dc5d560d32252f0ca', # noqa '95edacc8848369d6fb1608e887d6d2474fd5224f': '008ac97a1118560797c50e3392fa1443acdaa349', # noqa 'fef26ea45a520071711ba2b9d16a2985ee837021': '3780effbe846a26751a95a8c95c511fb72be15b4', # noqa '3f51abf3b3d466571be0855dfa67e094f9ceff1b': 'ffcca9b09c5827a6b8137322d4339c8055c3ee1e', # noqa 'a3a577948fdbda9d1061913b77a1588695eadb41': '7dc52cc04c3b8bd7c085900d60c159f7b846f866', # noqa '4876cb10aec6f708f7466dddf547567b65f6c39c': '0deab3023ac59398ae467fc4bff5583008af1ee2', # noqa '7f5bc909c29d4e93d8ccfdda516e51ed44930ee1': '752c52134dcbf2fff13c7be1ce4e9e5dbf428a59', # noqa '38d81702cb28db4f1a6821e64321e5825d1f7fd6': '39c813fb4717a4864bacefbd90b51a3241ae4140', # noqa '99c27ebbd43feca179ac0e895af131d8314cafe1': '3397ca7f709639cbd36b18a0d1b70bce80018c45', # noqa '902f29b4323a9b9de3af6d28e72dd581e76d9397': 'c4e12483f0a13e6851459295a4ae735eb4e4b5c4', # noqa '171dc35522bfd17dda4e90a542a0377fb2fc707a': 'fd24a76c87a3207428e06612b49860fc78e9f6dc', # noqa '9231f9a98a9051a0cd34231cddd4e11773f8348e': '6c07f4f4ac780eaf99a247fbfd0897533598dd36', # noqa 'c309bd3b57796696d6655ab3ab0b438fdd2d8201': 'fd24a76c87a3207428e06612b49860fc78e9f6dc', # noqa 'bb78300cc1ac9119eb6fffa9e9fa04a7f9340b11': 'ee995a0d85f6917c75bcee3aa448bea7726b265d', # noqa 'f2e01111329f84580dc3febb1fd45515692c5886': 'e2baec7b6a5543758e9c73695bc847db0a4f7941', # noqa '1a0f70c34e211f073e1be3435ecf6f0dd7700267': 'e7536e721fa806c19971b749c091c144b2f2b88e', # noqa '0c612a23d293cc3100496a54ae4ad13d750efe4c': '2123d12749294bbfb54e73f9d73fac658aabb266', # noqa '69a53d972e2f863acbbbda546d9da96287af6a88': '13896cb96ec004140ce5be8852fee8c29830d9c7', # noqa '3f43af2578fccf18b0d4198e48563da7929dc608': '6b1e0243768ff9ac060064b2eeade77e764ffc82', # noqa '4ab5fc264732cd474d2e695c5ac66e4933bdad74': '9a1f5e3961db89422250ce6c1441476f40d65205', # noqa last_revision: 'd853d9628f6f0008d324fed27dadad00ce48bc62', # noqa } - self.assertRevisionsOk(expected_revisions) + self.assertRevisionsContain(expected_revisions) self.assertCountSnapshots(1) # FIXME: Check the snapshot's state self.assertEqual(self.loader.load_status(), {'status': 'eventful'}) self.assertEqual(self.loader.visit_status(), 'full') -class SvnLoaderFromRemoteDumpNoStorage(LoaderNoStorage, LoaderWithState, - SvnLoaderFromRemoteDump): - """A SvnLoaderFromRemoteDump with no persistence. - - Context: - Load a remote svn repository from a generated dump file. - - """ - - def swh_latest_snapshot_revision(self, origin_id, prev_swh_revision=None): - """We do not know this repository so no revision. - - """ - return {} +class SvnLoaderTestFromRemoteDump(SvnLoaderTest, SvnLoaderFromRemoteDump): + pass -class SvnLoaderFromRemoteDump(BaseSvnLoaderTest): +class SvnLoaderFromRemoteDumpTest(BaseSvnLoaderTest): """ Check that the results obtained with the remote svn dump loader and the base svn loader are the same. """ def setUp(self): - super().setUp(archive_name='pkg-gourmet.tgz') + super().setUp(archive_name='pkg-gourmet.tgz', + loader=SvnLoaderTestFromRemoteDump()) - @istest - def load(self): + def test_load(self): """ Compare results of remote dump loader and base loader """ - dump_loader = SvnLoaderFromRemoteDumpNoStorage() + dump_loader = self.loader dump_loader.load(svn_url=self.svn_mirror_url) - base_loader = SvnLoaderNoStorage() + self.assertCountContents(19) + self.assertCountDirectories(17) + self.assertCountRevisions(6) + self.assertCountSnapshots(1) + + base_loader = SvnLoaderTest() base_loader.load(svn_url=self.svn_mirror_url) - self.assertEqual(dump_loader.state('content'), - base_loader.state('content')) - self.assertEqual(dump_loader.state('directory'), - base_loader.state('directory')) - self.assertEqual(dump_loader.state('revision'), - base_loader.state('revision')) - self.assertEqual(dump_loader.state('snapshot'), - base_loader.state('snapshot')) + dump_storage_stat = dump_loader.storage.stat_counters() + base_storage_stat = base_loader.storage.stat_counters() + + self.assertEqual(dump_storage_stat, base_storage_stat) -class SvnLoaderITTest14(BaseSvnLoaderTest): +class SvnLoaderTest14(BaseSvnLoaderTest): """Edge cases: The repository held some user defined svn-properties with special encodings, this prevented the repository from being loaded even though we do not ingest those information. """ def setUp(self): super().setUp(archive_name='httthttt.tgz', filename='httthttt') - self.loader = SvnLoaderNoStorage() - @istest - def load(self): + def test_load(self): """Decoding user defined svn properties error should not fail loading """ # when self.loader.load( svn_url=self.svn_mirror_url, destination_path=self.destination_path) self.assertCountRevisions(7, '7 svn commits') self.assertCountReleases(0) last_revision = '604a17dbb15e8d7ecb3e9f3768d09bf493667a93' expected_revisions = { 'e6ae8487c6d14df9e6cb7196c6aac045798fd5be': '75ed58f260bfa4102d0e09657803511f5f0ab372', # noqa 'e1e3314e0e9c9d17e6a3f60d6662f48f0e3c2fa3': '7bfb95cef68c1affe8d7f786353213d92abbb2b7', # noqa '1632fd38a8653e9b607c00feb93a41faddfb544c': 'cd6de65c84d9405e7ca45fead02aa10162e30727', # noqa '0ad1ebbb92d00721644b0a46d6322d18dbcba848': 'cd6de65c84d9405e7ca45fead02aa10162e30727', # noqa '94b87c97697d178a9311b018daa5179f7d4ba31e': 'c2128108adecb59a0144339c2e701cd8118cff5a', # noqa 'bd741cf22f0642d88cd0d8b545e8896b898c692d': 'c2128108adecb59a0144339c2e701cd8118cff5a', # noqa last_revision: 'f051d60256b2d89a0ca2704d6f91ad1b0ab44e02', } - self.assertRevisionsOk(expected_revisions) + self.assertRevisionsContain(expected_revisions) expected_snapshot_id = '70487267f682c07e52a2371061369b6cf5bffa47' expected_branches = { 'HEAD': { 'target': last_revision, 'target_type': 'revision' } } - self.assertSnapshotOk(expected_snapshot_id, expected_branches) + self.assertSnapshotEqual(expected_snapshot_id, expected_branches) self.assertEqual(self.loader.load_status(), {'status': 'eventful'}) self.assertEqual(self.loader.visit_status(), 'full') diff --git a/swh/loader/svn/tests/test_utils.py b/swh/loader/svn/tests/test_utils.py index 739be71..f5a1961 100644 --- a/swh/loader/svn/tests/test_utils.py +++ b/swh/loader/svn/tests/test_utils.py @@ -1,31 +1,27 @@ # Copyright (C) 2016 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information import unittest -from nose.tools import istest - from swh.loader.svn import utils class TestUtils(unittest.TestCase): - @istest - def strdate_to_timestamp(self): + def test_strdate_to_timestamp(self): """Formatted string date should be converted in timestamp.""" actual_ts = utils.strdate_to_timestamp('2011-05-31T06:04:39.800722Z') - self.assertEquals(actual_ts, {'seconds': 1306821879, - 'microseconds': 800722}) + self.assertEqual(actual_ts, {'seconds': 1306821879, + 'microseconds': 800722}) actual_ts = utils.strdate_to_timestamp('2011-05-31T06:03:39.123450Z') - self.assertEquals(actual_ts, {'seconds': 1306821819, - 'microseconds': 123450}) + self.assertEqual(actual_ts, {'seconds': 1306821819, + 'microseconds': 123450}) - @istest - def strdate_to_timestamp_empty_does_not_break(self): + def test_strdate_to_timestamp_empty_does_not_break(self): """Empty or None date should be timestamp 0.""" - self.assertEquals({'seconds': 0, 'microseconds': 0}, - utils.strdate_to_timestamp('')) - self.assertEquals({'seconds': 0, 'microseconds': 0}, - utils.strdate_to_timestamp(None)) + self.assertEqual({'seconds': 0, 'microseconds': 0}, + utils.strdate_to_timestamp('')) + self.assertEqual({'seconds': 0, 'microseconds': 0}, + utils.strdate_to_timestamp(None)) diff --git a/version.txt b/version.txt index f859e41..204a9a7 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v0.0.42-0-g80adbff \ No newline at end of file +v0.0.44-0-gbf78d8b \ No newline at end of file