From hpk at codespeak.net Tue Jul 15 10:46:27 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 10:46:27 +0200 (CEST) Subject: [vadm] r56554 - in vadm/branch/vadm-refactor/vadm: . bin doc test Message-ID: <20080715084627.A63C349800E@codespeak.net> Author: hpk Date: Tue Jul 15 10:46:25 2008 New Revision: 56554 Added: vadm/branch/vadm-refactor/vadm/COPYING vadm/branch/vadm-refactor/vadm/doc/conftest.py - copied unchanged from r56553, py/dist/py/doc/conftest.py Removed: vadm/branch/vadm-refactor/vadm/doc/notes.txt Modified: vadm/branch/vadm-refactor/vadm/__init__.py vadm/branch/vadm-refactor/vadm/bin/vadm vadm/branch/vadm-refactor/vadm/cmdline.py vadm/branch/vadm-refactor/vadm/doc/install.txt vadm/branch/vadm-refactor/vadm/env.py vadm/branch/vadm-refactor/vadm/sync.py vadm/branch/vadm-refactor/vadm/sync2.py vadm/branch/vadm-refactor/vadm/test/test_bootstrap.py Log: * remove old notes * add some copyright notices and a COPYING file Added: vadm/branch/vadm-refactor/vadm/COPYING ============================================================================== --- (empty file) +++ vadm/branch/vadm-refactor/vadm/COPYING Tue Jul 15 10:46:25 2008 @@ -0,0 +1,674 @@ + 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 +. Modified: vadm/branch/vadm-refactor/vadm/__init__.py ============================================================================== --- vadm/branch/vadm-refactor/vadm/__init__.py (original) +++ vadm/branch/vadm-refactor/vadm/__init__.py Tue Jul 15 10:46:25 2008 @@ -1,3 +1,4 @@ +# Copyright 2008 Holger Krekel """\ the py lib is a development support library featuring py.test, an interactive testing tool which supports Modified: vadm/branch/vadm-refactor/vadm/bin/vadm ============================================================================== --- vadm/branch/vadm-refactor/vadm/bin/vadm (original) +++ vadm/branch/vadm-refactor/vadm/bin/vadm Tue Jul 15 10:46:25 2008 @@ -1,4 +1,5 @@ #!/usr/bin/env python +# Copyright 2008, Holger Krekel # we have to get to insert sys.path to find our own package import os, sys d = os.path.dirname(os.path.dirname(os.path.dirname( Modified: vadm/branch/vadm-refactor/vadm/cmdline.py ============================================================================== --- vadm/branch/vadm-refactor/vadm/cmdline.py (original) +++ vadm/branch/vadm-refactor/vadm/cmdline.py Tue Jul 15 10:46:25 2008 @@ -1,4 +1,5 @@ #!/usr/bin/env python +# Copyright 2008, Holger Krekel """ module providing a cmdline interface to vadm @@ -93,7 +94,7 @@ if self.__class__ == cmd_config: text = "" else: - text = "[file1] [file2] ..." + text = "[FILE1] [FILE2] ..." else: text = posarghelp @@ -292,7 +293,7 @@ """ def parse_options(self, args): parser = self.getparser() - self.set_usage(parser, posarghelp="path_to_repository") + self.set_usage(parser, posarghelp="PATH_TO_REPOSITORY") self.doparse(parser, args, numargs=1) def execute(self): @@ -308,7 +309,7 @@ def parse_options(self, args): parser = self.getparser() - self.set_usage(parser, posarghelp="repositoryurl") + self.set_usage(parser, posarghelp="REPOSITORYURL") self.doparse(parser, args, numargs=1) def execute(self): Modified: vadm/branch/vadm-refactor/vadm/doc/install.txt ============================================================================== --- vadm/branch/vadm-refactor/vadm/doc/install.txt (original) +++ vadm/branch/vadm-refactor/vadm/doc/install.txt Tue Jul 15 10:46:25 2008 @@ -2,8 +2,14 @@ =================================================== **vadm** is a simple svn-like command line tool tool for -keeping track of system files and directories including -their POSIX ownership and permission information. +keeping track of unix system files and directories including +POSIX ownership and permission information. +vadm is released under the terms of the GPL Version 3. + +Current release: XXX + +.. contents:: +.. sectnum:: Installing VADM ----------------- @@ -12,6 +18,9 @@ by using the 'svn' command line tool. The **vadm** scripts also will make use of the **sudo** command which usually is available on Unix and OSX systems. +.. _`py lib`: http://pylib.org +.. _`py lib tarball`: http://codespeak.net/py/dist/download.html#downloading-a-tar-zip-file-and-installing-it + with easy_install +++++++++++++++++++ @@ -33,7 +42,7 @@ tar zxvf vadm-0.6.0.tar.gz cd vadm-0.6.0 python setup.py install - + working from development ++++++++++++++++++++++++++++ @@ -51,23 +60,25 @@ --------------------- The following command will create a repository -for storing information about your system files: +for storing information about your system files:: vadm create /path/to/my/sysrepo + Afterwards you can checkout from the newly created -repository: +repository:: vadm checkout file:///path/to/my/sysrepo + You may also use remote URLs if you have made the above repository accessible to you as a user. In general, vadm requires to be executed as a non-root user that has the right to execute ``sudo``. For adding, committing, reverting or inquiring of files -and directories you may now use svn-like commands. -For example:: +and directories you may now use svn-like commands, including +their abbreviations. For example:: vadm add /etc/passwd # add this file to version-control vadm commit -m "passwords" /etc @@ -75,21 +86,21 @@ vadm log /etc/passwd # show list of commits to this file vadm status / # show status of versioned files + vadm st # show status of current dir vadm help # lists all available commands Because **vadm** uses subversion under the hood you can -install commit notification and other hooks in the repository. -You can also supply a remote (e.g. svn+ssh or https) -addresses when vadm-initializing the repository. - +install commit notification and other hooks in your repository. +With ``vadm config`` you can get information about your local +working copy and the repository url. Some background and hints --------------------------------------------------- Here is some background that may you to deal -with problems or limitations you encounter. +with problems or limitations you encounter: -* **vadm** works by mapping all versioned files +- **vadm** works by mapping all versioned files into a per-user working copy. Permissions and ownership information are kept in ``vadm:posix`` svn properties. The @@ -97,24 +108,35 @@ ``$USER/.vadm/hostwc``. You may cd there and use ``svn`` for introspection directly. -* When you issue ``vadm add dir/somefile`` **vadm** +- When you issue ``vadm add dir/somefile`` **vadm** creates and adds a directory ``dir`` to the WC copies the `somefile` to the WC and schedules it for addition. -* When you issue almost any command, vadm will internally +- When you issue almost any command, vadm will internally first update the working copy files with their original filesystem information. This imposes a startup overhead which is usually not noticeable on modern systems if you only deal with typical system files. -* You can safely remove the Working Copy in - $USER/.vadm and or directly perform ``vadm init`` +- You can safely remove the Working Copy in + ``$USER/.vadm`` and or directly perform ``vadm init`` which will remove the working copy as well before re-creating it. - **vadm can re-create all its information from the + **vadm** can re-create all its information from the repository and the life filesystem. However, any information that only exists in the working copy (like files scheduled for addition or removal) will be lost. +Contact, Development, Help +------------------------------ + +* If you have questions or like to contribute please + subscribe to the `vadm mailinglist`_. Without subscription + you cannot post to the mailing list. + +* You may also come to the #codespeak channel on irc.freenode.org. + +.. _`vadm mailinglist`: http://codespeak.net/mailman/listinfo/vadm +.. _`vadm tarball`: http://xx Deleted: /vadm/branch/vadm-refactor/vadm/doc/notes.txt ============================================================================== --- /vadm/branch/vadm-refactor/vadm/doc/notes.txt Tue Jul 15 10:46:25 2008 +++ (empty file) @@ -1,262 +0,0 @@ -Design decisions ------------------ - -- much like 'svn' you can only use 'vadm' as a *non-root user*. - however, in many situations you need to be able to "sudo" to - the root user in order to change and access system files. - -- vadm is completly non-intrusive. Any "checkout" (or workingcopy - in version system terms) will happen in the user's home-directory. - The target directories and files are kept free from any "special" - files such as ".svn" directories. - -- vadm makes extensive use of the vpath_ package which provides a - convenient interface to local and subversion filesystems. - -- permissions/ownership information is maintained as svn-properties. - -- configuration information is encoded into a subversion-tree - -- the 'vadm' tool usually runs under user permissions. However - for syncing files to and from the repository the tool executes - small simple scripts via 'sudo' which invoke standard commands - as 'chown', 'chmod', 'cp', 'mv' - -- cmdline user-interface: all you need to start out is a repository - url and then type as a user - - vadm init URL - - If the subversion URL does not exist an attempt is made to create it. - Generally you should obviously should have commit rights on the - repository. - - -Structure of a 'vadm repository' --------------------------------- - -A vadm repository can be anywhere in a subversion-tree/repository. -Items within a vadm repository make use of 'svn-properties' for -recording permissions ownerships. - -The driving idea is that vadm is completly nonintrusive with -respect to the files it provides versioning for. Usually -if you want to checkout from svn (or cvs for that matter) -the version system prescribes a certain directory structure -and especially which contains relation and state information -of the local checkout (".svn" or ".cvs" directories). - - -examples --------- - -example usage:: - -vadm help # prints help screen - -vadm status # print a list of controled files and their - status with respect to the latest revision - -vadm st /etc/pam.d -vadm ci /etc/mail # checks in all files that changed in /etc/mail -vadm up /etc/printcap # -vadm add -g hostgroup1 /etc/printcap # - -directory structure -------------------- - -vadm uses subversion as its underlying version control system. - -For almost all operations - -- the filemappings are read and the list of hostgroups which - the current host is a member of is determined. - -- the matching files/directories are copied to their appropriate - working-copies. Unix-Owership/permissions info are preserved - as properties in the WC. - -so that the actual operations (like 'status', 'ci' etc.) will -simply take place on the workingcopy as an svn-operation. - -the directory structure is:: - ~/.vadm/ <- mode 700 - $hostname/ - WC_hostgroup1/ # each WC maps the filesystem directory structure - etc/ - printcap - WC_hostgroup2/ - WC_hostgroup3/ - -where each WC maps the relevant parts of the fs-hierarchies -(containing a version-controled file). - -/etc/vadm.conf --------------- - -The versioned administration config file ('vadm.conf') -defines mappings from system files to hostgroups -and hostgroup definitions. - -Within a hostgroup (which is simply a list of one or more hosts) -a system file or directory is shared between its hosts. - -When you update such a file on your system and are part -of a hostgroup managing that file, you can check it in -so that others in the hostgroup can get it, too. - -Checkins and checkouts are always performed as a regular *user*, -never as root. Because you want to manage root-owned files, too -'vadm' needs to be able to exec root-commands via 'sudo'. That's -why each user of vadm must be allowed to become root. -XXX We can probably relax this restriction by first trying to -execute without sudo and only fall back to sudo if we get permission -denied from the OS. - -concepts and background of the implementation -+++++++++++++++++++++++++++++++++++++++++++++ - -vadm works with three staging areas: - -A) live area: the actual system files - -B) archive area: the repository - -C) syncing area: a user and host specific working-copy - -Note that we want to allow several usages: - -1) single user / single filesystem - -2) multiple user / single filesystem - -3) single users / multiple filesystems - -4) multiple users / multiple filesystems - -In context of 'vadm' a user usually is an administrator -who wants to maintain, modify and upgrade "his" filesystem -contents in a trackable way. - -The syncing stage -+++++++++++++++++ - -The above four usages require careful "syncing" design. -There are two basic ways of syncing: - -checkin: syncing from the live system to the repository - -update: syncing from the repository to the live system - -The syncing area is implemented via a traditional -subversion working-copy. Let's detail the above two -basic operations: - -- (checkin) syncing from the live system to the repository is done - by mapping the system files into the sync area and - then committing the sync WC to the repository. - -- (update) Offhand, we don't know the exact revision of - the live file nor if it's locally modified. (E.g. in - a multiuser one-filesystem scenario the working-copies of - everybody but the commiter get out of sync with their live - counterparts on each commit). Thus - - a) we perform a diff-operation on the the WC-file (which - like usual maps the live file). - - b) If they differ then we check if the live file/WC file - differs to its current HEAD-revision in the repository. - (svn diff -u) - - c) if the live file differs to both the base revision and - the HEAD revision then it is likely that the file has - been locally modified. In this case - - 1. we update the file in the WC to its head revision - - 2. if we detect a merging failure we invoke an editor - to let the user resolve it. - - 3. the non-conflicting syncing area file is mapped - back to the live system (as usual). - - -some thoughts on the user interface -=================================== - -consider a possible output of a status command: - -M UPTODATE /live/filename1 -MM NOTINSYNC /live/filename2 - NOTINSYNC /live/filename3 - UPTODATE /etc/filename1 - NOREPO /etc/filename1 - -1st column: the first 'M' means locally modified, - the second 'M' means permissions/ownership modified - -2nd column: a live file can either relate to the HEAD revision of - its archive or relate to an older revision (in which case it - is not in sync). Note that we explicitely don't want to - talk about revision numbers in this context. - -3rd column: the filename of the live file - -possibilities what you can do in this status situation and how they are -supposedly implemented: - -- vadm ci (only safe after vadm up!) will check in your live files - into the repository by first copying them into the - sync area and proceeding from there. If you didn't do - an 'svn up' before that you might not be able to checkin - (you get "obstructed updates"). - -- vadm up will update the live files. - - each file in the working-copy will be updated individually - and in case of a merge conflict an editor will be opened - to ask the user to resolve it. If the user modifies and saves - the file the conflict is considered to be resolved. Eventually - the sync-area file will be copied to the live-filesystem i.e. - MODIFIY the live system. - - This scheme does currently not consider *moving* of system - files (or even directories), however ... - -- vadm mv will move a live file to a new location and perform the - approrpiate steps in the working-copy. When dealing with - *updates* of such moves in another file system there is - a slight problem: we currently don't interface with svn - in a way that we could track such moves during the 'up' - subversion operation (which bascially merges in the - a new repo revision). - -problems -++++++++ - -HEAD revision of the actual system files - -use case 1: multiuser / one machine - - WCs are only an intermediate stateless area to allow non-intrusive versioning - of system files. After one user commits a change all other user's WCs will - be out of sync with the system files. However, the system files will not - be out of sync with REPO-HEAD. - -use case 2: one user / multi machine - - 1) WCs are an intermediate area for performing commits/"updates" - - 2) WCs stick to the last checked out revision and local changes - (the system files) are diffed to this last checked out revision - (and not to the repository head revision) - - IOW: you have to explicitely bring your WC in sync with Repo-HEAD - -possible solution: - on commit write latest rev of hostgroup to /var/run/vadm/hostgroup - on prepare_wcs check if local checked out rev is less than - /var/run/vadm/hostgroup then automatically do rsync - - Modified: vadm/branch/vadm-refactor/vadm/env.py ============================================================================== --- vadm/branch/vadm-refactor/vadm/env.py (original) +++ vadm/branch/vadm-refactor/vadm/env.py Tue Jul 15 10:46:25 2008 @@ -1,3 +1,4 @@ +# Copyright 2008 Holger Krekel #!/usr/bin/python import sys, os Modified: vadm/branch/vadm-refactor/vadm/sync.py ============================================================================== --- vadm/branch/vadm-refactor/vadm/sync.py (original) +++ vadm/branch/vadm-refactor/vadm/sync.py Tue Jul 15 10:46:25 2008 @@ -1,7 +1,6 @@ +# Copyright 2008, Holger Krekel """ - module for reading and modifying the vadm.session sessionigfile - """ from __future__ import generators Modified: vadm/branch/vadm-refactor/vadm/sync2.py ============================================================================== --- vadm/branch/vadm-refactor/vadm/sync2.py (original) +++ vadm/branch/vadm-refactor/vadm/sync2.py Tue Jul 15 10:46:25 2008 @@ -1,3 +1,4 @@ +# Copyright 2008 Holger Krekel """ NOT IN USE (sync.py is in use for now) Modified: vadm/branch/vadm-refactor/vadm/test/test_bootstrap.py ============================================================================== --- vadm/branch/vadm-refactor/vadm/test/test_bootstrap.py (original) +++ vadm/branch/vadm-refactor/vadm/test/test_bootstrap.py Tue Jul 15 10:46:25 2008 @@ -1,3 +1,5 @@ +# Copyright 2008 Holger Krekel + import py from vadm.__.cmdline import Session, CommandError, create_svn_repo From hpk at codespeak.net Tue Jul 15 11:01:22 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 11:01:22 +0200 (CEST) Subject: [vadm] r56555 - vadm/branch/vadm-refactor/vadm/doc Message-ID: <20080715090122.B9C3D2A807A@codespeak.net> Author: hpk Date: Tue Jul 15 11:01:21 2008 New Revision: 56555 Modified: vadm/branch/vadm-refactor/vadm/doc/ (props changed) Log: ignore html From hpk at codespeak.net Tue Jul 15 11:16:59 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 11:16:59 +0200 (CEST) Subject: [vadm] r56556 - vadm/branch/vadm-refactor/vadm Message-ID: <20080715091659.112C42A807A@codespeak.net> Author: hpk Date: Tue Jul 15 11:16:58 2008 New Revision: 56556 Modified: vadm/branch/vadm-refactor/vadm/cmdline.py Log: fix tests again Modified: vadm/branch/vadm-refactor/vadm/cmdline.py ============================================================================== --- vadm/branch/vadm-refactor/vadm/cmdline.py (original) +++ vadm/branch/vadm-refactor/vadm/cmdline.py Tue Jul 15 11:16:58 2008 @@ -316,10 +316,7 @@ url = self.args[0] scheme = url.split(':')[0] if scheme not in ('file', 'http', 'https', 'svn+ssh'): - url = "file://%s" % (py.path.local(url),) - else: - url = "file://sysrepo" url = py.path.svnurl(url) if not url.check(): @@ -359,8 +356,9 @@ assert tw commitpaths = " ".join([repr(str(y.localpath)) for x,y in tw]) - if self.message: - os.system('svn commit -m %r %s' % (self.message, + message = self.session.options.message + if message: + os.system('svn commit -m %r %s' % (message, commitpaths)) else: os.system('svn commit %s' % commitpaths) @@ -390,7 +388,7 @@ print parser.usage raise CommandError("expecting either target file/directory arguments " "or a file list specified with --fromfile") - filelist = map(py.path.local, filelist) + self.filelist = map(py.path.local, filelist) def execute(self): self.prepare_wc() From hpk at codespeak.net Tue Jul 15 12:53:17 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 12:53:17 +0200 (CEST) Subject: [vadm] r56557 - in vadm/branch/vadm-refactor/vadm: . test Message-ID: <20080715105317.25A7A169EE3@codespeak.net> Author: hpk Date: Tue Jul 15 12:53:16 2008 New Revision: 56557 Modified: vadm/branch/vadm-refactor/vadm/cmdline.py vadm/branch/vadm-refactor/vadm/test/test_bootstrap.py vadm/branch/vadm-refactor/vadm/test/test_sync.py Log: more tests, make vadm workings relative to systemroot for better testing Modified: vadm/branch/vadm-refactor/vadm/cmdline.py ============================================================================== --- vadm/branch/vadm-refactor/vadm/cmdline.py (original) +++ vadm/branch/vadm-refactor/vadm/cmdline.py Tue Jul 15 12:53:16 2008 @@ -13,30 +13,11 @@ """ print info for the interactive user. """ print msg.strcontent() -def create_svn_repo(path, _no_vadmprop=False): - path = py.path.local(path) - if path.check(): - if path.listdir(): - raise ValueError("directory exists and is non-empty: %s" %(path,)) - else: - path.ensure(dir=1) - out = py.process.cmdexec("svnadmin create %s" %(path,)) - if not _no_vadmprop: - value = vadm.sync.getposix("/") - wc = py.path.svnwc(py.path.local.mkdtemp()) - try: - wc.checkout("file://%s" % path) - wc.propset(vadm.sync.vadmpropname, vadm.sync.getposix("/")) - wc.commit("init") - finally: - wc.localpath.remove() - return path - class Session: def __init__(self, hostwc=None, systemroot = '/'): - self.vadmdir = py.path.local(os.path.expanduser('~/.vadm')) if hostwc is None: - hostwc = self.vadmdir / 'hostwc' + vadmdir = py.path.local(os.path.expanduser('~/.vadm')) + hostwc = vadmdir / 'hostwc' self.hostwc = py.path.svnwc(hostwc) self.systemroot = py.path.local(systemroot) self.log = py.log.get('vadm', @@ -47,6 +28,25 @@ error=py.log.STDERR, fatal=py.log.STDERR) + def create_svn_repo(self, path, _no_vadmprop=False): + path = py.path.local(path) + if path.check(): + if path.listdir(): + raise ValueError("directory exists and is non-empty: %s" %(path,)) + else: + path.ensure(dir=1) + out = py.process.cmdexec("svnadmin create %s" %(path,)) + if not _no_vadmprop: + value = vadm.sync.getposix("/") + wc = py.path.svnwc(py.path.local.mkdtemp()) + try: + wc.checkout("file://%s" % path) + wc.propset(vadm.sync.vadmpropname, vadm.sync.getposix(self.systemroot)) + wc.commit("init") + finally: + wc.localpath.remove() + return path + def cmd(self, *args): if not args: args = ['status'] @@ -124,15 +124,19 @@ self.log.debug("syncing files to WC. ") vadm.sync.all_fs2wc(self.session) - def target_and_wcpath(self): - """ yield target, wcpath tuple (honour self.args if any). """ + def _getfileargs(self): args = self.args if not args: args = [str(py.path.local())] - + return args + + def target_and_wcpath(self): + """ yield target, wcpath tuple (honour self.args if any). """ + args = self._getfileargs() for fname in args: target = py.path.local(fname) - wcpath = self.session.hostwc.join(str(target)) + reltarget = target.relto(self.session.systemroot) + wcpath = self.session.hostwc.join(reltarget) if wcpath.check(): yield target, wcpath else: @@ -301,7 +305,7 @@ if repodir.check() and repodir.listdir(): raise CommandError("cannot create repository at: %s" %(repodir,)) repodir.ensure(dir=1) - create_svn_repo(repodir) + self.session.create_svn_repo(repodir) self.log.user("created svn repository at: %s" % repodir) class cmd_checkout(Command): @@ -348,20 +352,30 @@ self.doparse(parser, args) def execute(self): - # XXX we need a way to commit a collection of files - self.prepare_wc() - - tw = list(self.target_and_wcpath()) - assert tw - commitpaths = " ".join([repr(str(y.localpath)) - for x,y in tw]) - message = self.session.options.message - if message: - os.system('svn commit -m %r %s' % (message, - commitpaths)) - else: - os.system('svn commit %s' % commitpaths) + items = list(self.target_and_wcpath()) + + if len(items) == 1 and items[0][0] == self.session.systemroot: + wc = items[0][1] + st = wc.status() + if not (st.modified or st.prop_modified): + items.pop() + if not items: + args = " ".join(self._getfileargs()) + self.log.warn("nothing to commit at: %s" %(args)) + else: + commitpaths = " ".join([repr(str(y.localpath)) + for x,y in items]) + message = self.session.options.message + if message: + cmd = 'svn commit -m %r %s' % (message, commitpaths) + else: + cmd = 'svn commit %s' % (commitpaths,) + print "executing", cmd + ret = os.system(cmd) + if ret: + status = os.WEXITSTATUS(ret) + raise CommandError("svn execution failed: %s" % cmd) class cmd_add(Command): """ Schedule given files or directories for versioning. @@ -395,14 +409,19 @@ strict = self.session.options.strict assert not strict for target in self.filelist: + systemroot = self.session.systemroot + if not target.relto(systemroot): + raise CommandError( + "%s not relative to systemroot: %s" %(target, systemroot)) if not target.check(): - msg = "target path does not exist: %s" %(target,) + warnmsg = "target path does not exist: %s" %(target,) if strict: - raise CommandError(msg) + raise CommandError(warnmsg) else: - self.log.warn(msg) + self.log.warn(warnmsg) continue - wcpath = self.hostwc.join(str(target)) + + wcpath = self.hostwc.join(str(target.relto(systemroot))) if wcpath.check(versioned=0): if target.realpath() != target: raise CommandError, ( @@ -453,7 +472,8 @@ if self.args: for fname in self.args: target = py.path.local(fname) - wcpath = self.hostwc.join(str(target)) + reltarget = target.relto(self.session.systemroot) + wcpath = self.hostwc.join(reltarget) wcpath.remove(force=1) self.log.user('scheduling deletion of %r from repository' % target) Modified: vadm/branch/vadm-refactor/vadm/test/test_bootstrap.py ============================================================================== --- vadm/branch/vadm-refactor/vadm/test/test_bootstrap.py (original) +++ vadm/branch/vadm-refactor/vadm/test/test_bootstrap.py Tue Jul 15 12:53:16 2008 @@ -1,7 +1,7 @@ # Copyright 2008 Holger Krekel import py -from vadm.__.cmdline import Session, CommandError, create_svn_repo +from vadm.__.cmdline import Session, CommandError class _TestLog(dict): def __init__(self, session): @@ -26,8 +26,8 @@ self.wc = py.path.svnwc(self.tmp.join("wc")) self.repodir = self.tmp.join("sysrepo") self.repourl = py.path.svnurl("file://%s" %(self.repodir,)) - self.rootdir = self.tmp.ensure("systemroot", dir=1) - self.session = Session(self.wc, systemroot=self.rootdir) + self.systemroot = self.tmp.ensure("systemroot", dir=1) + self.session = Session(self.wc, systemroot=self.systemroot) self.testlog = _TestLog(self.session) class TestBootStrap(VadmTestBase): @@ -49,12 +49,12 @@ "self.session.cmd('co', self.repodir)") def test_co_fail_on_non_vadm_repo(self): - create_svn_repo(str(self.repodir), _no_vadmprop=True) + self.session.create_svn_repo(str(self.repodir), _no_vadmprop=True) py.test.raises(SystemExit, "self.session.cmd('co', self.repodir)") def test_co_use_existing_vadmrepo(self): - create_svn_repo(str(self.repodir)) + self.session.create_svn_repo(self.repodir) self.repourl.mkdir("testdir") self.session.cmd('co', self.repodir) assert self.wc.join("testdir").check() @@ -69,7 +69,7 @@ txt = self.testlog.poplog("error") assert txt.find("is not a working") != -1 - create_svn_repo(str(self.repodir)) + self.session.create_svn_repo(self.repodir) self.session.cmd('checkout', self.repodir) self.session.cmd('config') txt = self.testlog.poplog() Modified: vadm/branch/vadm-refactor/vadm/test/test_sync.py ============================================================================== --- vadm/branch/vadm-refactor/vadm/test/test_sync.py (original) +++ vadm/branch/vadm-refactor/vadm/test/test_sync.py Tue Jul 15 12:53:16 2008 @@ -1,4 +1,5 @@ -from test_bootstrap import VadmTestBase +from test_bootstrap import VadmTestBase, CommandError +import py class XXXTestSync(VadmTestBase): def test_passwd2wc(self): @@ -30,38 +31,61 @@ self.session.cmd("create", self.repodir) self.session.cmd("co", "file://%s" % (self.repodir,)) + def test_commit_nothing(self): + self.session.cmd('commit', '-m', 'x', self.systemroot) + txt = self.testlog.poplog("warn") + assert txt.find("nothing to commit") != -1 + + def test_commit_fails(self): + testpath = self.systemroot.join('etc','passwd').ensure() + self.session.cmd('add', testpath) + py.test.raises(CommandError, + "self.session.cmd('commit', '-m', 'x', testpath)") + #txt = self.testlog.poplog("error") + #assert txt.find("child") != -1 + + def test_add_outside_systemroot(self): + py.test.raises(CommandError, + "self.session.cmd('add', self.systemroot.dirpath())") + + def test_add_works_relative_to_systemrootself(self): + testpath = self.systemroot.ensure('etc','passwd') + self.session.cmd('add', testpath) + p = self.session.hostwc.join("etc", "passwd") + assert p.check() + self.testlog.poplog('warn') + self.session.cmd('status', self.systemroot.dirpath()) + txt = self.testlog.poplog('warn') + assert txt.find("path not versioned") + def test_addfile_revert(self): - testpath = self.rootdir.join('etc','passwd').ensure() - try: - self.session.cmd('add', str(testpath)) - assert not self.testlog.poplog('error') - self.session.cmd('status', str(testpath.dirpath())) - res = self.testlog.poplog("user") - assert res.find('add') != -1 - self.session.cmd('commit', '-m', 'test_add_message', str(testpath)) - assert not self.testlog.poplog('error') - - testpath.write('something else') - self.session.cmd('diff', str(testpath)) - assert self.testlog['user'] != [] - - self.session.cmd('revert', str(testpath)) - self.session.cmd('diff', str(testpath)) - #print "\n ".join([" ".join(args) for args in self.conf._result]) - assert self.testlog['user'] - finally: - pass + testpath = self.systemroot.join('etc','passwd').ensure() + self.session.cmd('add', testpath) + assert not self.testlog.poplog('error') + txt = self.testlog.poplog('user') + #assert txt.find("added") != -1 + #self.session.cmd('status', str(testpath.dirpath())) + #res = self.testlog.poplog("user") + #assert res.find('add') != -1 + self.session.cmd('commit', '-m', 'test_add_message', self.systemroot) + assert not self.testlog.poplog('error') + + testpath.write('something else') + self.session.cmd('diff', str(testpath)) + assert self.testlog['user'] != [] + + self.session.cmd('revert', str(testpath)) + self.session.cmd('diff', str(testpath)) + #print "\n ".join([" ".join(args) for args in self.conf._result]) + assert self.testlog['user'] - def _test_removefile(self): - testpath = self.rootdir.join('etc','something').ensure_filepath() - testpath.write('somecontent') - try: - self.session.cmd('add', str(testpath)) - self.session.cmd('commit', '-m', 'tempadd-to-remove') - self.session.cmd('remove', str(testpath)) - self.assertEquals(self.conf._error, []) - self.session.cmd('commit', '-m', 'tempadd-removed') - self.assert_(testpath.exists()) - #s = self.conf.hostwc.join(str(testpath.dirname())).status() - finally: - self.conf.hostwc.revert() + def test_removefile(self): + print "systemroot", self.systemroot + testpath = self.systemroot.ensure('etc','something') + self.session.cmd('add', testpath) + self.session.cmd('commit', '-m', 'tempadd-to-remove', self.systemroot) + self.session.cmd('remove', testpath) + self.session.cmd('commit', '-m', 'tempadd-removed', testpath) + assert testpath.check() + wctestpath = self.wc.join(testpath.relto(self.systemroot)) + assert not wctestpath.localpath.check() From hpk at codespeak.net Tue Jul 15 14:41:28 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 14:41:28 +0200 (CEST) Subject: [vadm] r56558 - vadm/branch/vadm-refactor/vadm/doc Message-ID: <20080715124128.2B9BB2A00DE@codespeak.net> Author: hpk Date: Tue Jul 15 14:41:27 2008 New Revision: 56558 Modified: vadm/branch/vadm-refactor/vadm/doc/install.txt Log: link to setuptools Modified: vadm/branch/vadm-refactor/vadm/doc/install.txt ============================================================================== --- vadm/branch/vadm-refactor/vadm/doc/install.txt (original) +++ vadm/branch/vadm-refactor/vadm/doc/install.txt Tue Jul 15 14:41:27 2008 @@ -24,9 +24,10 @@ with easy_install +++++++++++++++++++ -1. Download easy_install if you don't have it +1. `Install easy_install`_ if you don't have it 2. type 'easy_install vadm' (this should install the py lib if you don't have it) +.. _`Install easy_install`: http://peak.telecommunity.com/DevCenter/EasyInstall#installing-easy-install manually with setup.py ++++++++++++++++++++++++ @@ -139,4 +140,4 @@ * You may also come to the #codespeak channel on irc.freenode.org. .. _`vadm mailinglist`: http://codespeak.net/mailman/listinfo/vadm -.. _`vadm tarball`: http://xx +.. _`vadm tarball`: http://xxx From hpk at codespeak.net Tue Jul 15 15:02:06 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 15:02:06 +0200 (CEST) Subject: [vadm] r56559 - vadm/dist Message-ID: <20080715130206.015C02A0180@codespeak.net> Author: hpk Date: Tue Jul 15 15:02:05 2008 New Revision: 56559 Added: vadm/dist/ - copied from r56558, vadm/branch/vadm-refactor/ Log: "merge" branch From hpk at codespeak.net Tue Jul 15 15:02:32 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 15:02:32 +0200 (CEST) Subject: [vadm] r56560 - vadm/branch/vadm-refactor Message-ID: <20080715130232.342BB2A0157@codespeak.net> Author: hpk Date: Tue Jul 15 15:02:29 2008 New Revision: 56560 Removed: vadm/branch/vadm-refactor/ Log: remove not needed branch From hpk at codespeak.net Tue Jul 15 15:07:52 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 15:07:52 +0200 (CEST) Subject: [vadm] r56561 - in vadm/dist/vadm: . doc Message-ID: <20080715130752.234C3698031@codespeak.net> Author: hpk Date: Tue Jul 15 15:07:51 2008 New Revision: 56561 Added: vadm/dist/vadm/README.txt Modified: vadm/dist/vadm/doc/install.txt (contents, props changed) Log: adding readme, last-changed date info Added: vadm/dist/vadm/README.txt ============================================================================== --- (empty file) +++ vadm/dist/vadm/README.txt Tue Jul 15 15:07:51 2008 @@ -0,0 +1,8 @@ +**vadm** is a simple svn-like command line tool tool for +freely versioning unix system files and directories including +tracking of POSIX ownership and permission information. +vadm is released under the terms of the GPL Version 3. + +For a quick getting started, please consult doc/install.txt. + +holger krekel, merlinux GmbH July 2008, (holger at merlinux eu) Modified: vadm/dist/vadm/doc/install.txt ============================================================================== --- vadm/dist/vadm/doc/install.txt (original) +++ vadm/dist/vadm/doc/install.txt Tue Jul 15 15:07:51 2008 @@ -1,9 +1,10 @@ vadm: versioning of system files and directories =================================================== +[$Date$] **vadm** is a simple svn-like command line tool tool for -keeping track of unix system files and directories including -POSIX ownership and permission information. +freely versioning unix system files and directories including +tracking of POSIX ownership and permission information. vadm is released under the terms of the GPL Version 3. Current release: XXX From hpk at codespeak.net Tue Jul 15 16:22:31 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 16:22:31 +0200 (CEST) Subject: [vadm] r56562 - vadm/dist/vadm/test/data Message-ID: <20080715142231.C8DC42A8006@codespeak.net> Author: hpk Date: Tue Jul 15 16:22:30 2008 New Revision: 56562 Removed: vadm/dist/vadm/test/data/ Log: remove unused data dir From hpk at codespeak.net Tue Jul 15 16:24:48 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 16:24:48 +0200 (CEST) Subject: [vadm] r56563 - in vadm/dist/vadm: . bin doc Message-ID: <20080715142448.DCA862A00DE@codespeak.net> Author: hpk Date: Tue Jul 15 16:24:48 2008 New Revision: 56563 Added: vadm/dist/vadm/bin/__init__.py Modified: vadm/dist/vadm/__init__.py vadm/dist/vadm/bin/vadm vadm/dist/vadm/doc/install.txt (contents, props changed) Log: various tweaks mostly for setuptools to run sdist Modified: vadm/dist/vadm/__init__.py ============================================================================== --- vadm/dist/vadm/__init__.py (original) +++ vadm/dist/vadm/__init__.py Tue Jul 15 16:24:48 2008 @@ -1,21 +1,21 @@ # Copyright 2008 Holger Krekel """\ -the py lib is a development support library featuring -py.test, an interactive testing tool which supports -unittesting with practically no boilerplate. +vadm is a simple svn-like command line tool tool for +freely versioning unix system files and directories including +tracking of POSIX ownership and permission information. """ from py import initpkg initpkg(__name__, - description = "non-intrusive version control on systems", + description = "tool for versioning system files and directories", revision = '$LastChangedRevision: 11405 $', lastchangedate = '$LastChangedDate: 2005-04-24 15:18:48 +0200 (Sun, 24 Apr 2005) $', - version = "0.6.0-pre-alpha", + version = "0.6.0-alpha", #url = "http://codespeak.net/vadm", #download_url = "http://codespeak.net/download/py/py-0.6.0-pre-alpha.tar.gz", - license = "MIT license", + license = "GPL V3", platforms = ['unix', 'linux'], - author = "holger krekel", + author = "holger krekel, merlinux GmbH", author_email = "hpk at merlinux.de", long_description = globals()['__doc__'], Added: vadm/dist/vadm/bin/__init__.py ============================================================================== --- (empty file) +++ vadm/dist/vadm/bin/__init__.py Tue Jul 15 16:24:48 2008 @@ -0,0 +1,2 @@ + + Modified: vadm/dist/vadm/bin/vadm ============================================================================== --- vadm/dist/vadm/bin/vadm (original) +++ vadm/dist/vadm/bin/vadm Tue Jul 15 16:24:48 2008 @@ -1,12 +1,17 @@ #!/usr/bin/env python # Copyright 2008, Holger Krekel # we have to get to insert sys.path to find our own package +# import os, sys -d = os.path.dirname(os.path.dirname(os.path.dirname( - os.path.realpath(sys.argv[0])))) -#print "inserting", d -sys.path.insert(0, d) +def main(): + d = os.path.dirname(os.path.dirname(os.path.dirname( + os.path.realpath(sys.argv[0])))) + #print "inserting", d + sys.path.insert(0, d) -import vadm -vadm.cmdline.main() + import vadm + vadm.cmdline.main() + +if __name__ == '__main__': + main() Modified: vadm/dist/vadm/doc/install.txt ============================================================================== --- vadm/dist/vadm/doc/install.txt (original) +++ vadm/dist/vadm/doc/install.txt Tue Jul 15 16:24:48 2008 @@ -1,14 +1,13 @@ +*$LastChangedDate$* + vadm: versioning of system files and directories =================================================== -[$Date$] **vadm** is a simple svn-like command line tool tool for freely versioning unix system files and directories including tracking of POSIX ownership and permission information. vadm is released under the terms of the GPL Version 3. -Current release: XXX - .. contents:: .. sectnum:: @@ -26,7 +25,7 @@ +++++++++++++++++++ 1. `Install easy_install`_ if you don't have it -2. type 'easy_install vadm' (this should install the py lib if you don't have it) +2. type 'easy_install vadm' (this should also install the py lib if you don't have it) .. _`Install easy_install`: http://peak.telecommunity.com/DevCenter/EasyInstall#installing-easy-install From hpk at codespeak.net Tue Jul 15 16:25:10 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 16:25:10 +0200 (CEST) Subject: [vadm] r56564 - vadm/dist Message-ID: <20080715142510.C770E2A00DE@codespeak.net> Author: hpk Date: Tue Jul 15 16:25:10 2008 New Revision: 56564 Modified: vadm/dist/setup.py Log: the setup.py itself Modified: vadm/dist/setup.py ============================================================================== --- vadm/dist/setup.py (original) +++ vadm/dist/setup.py Tue Jul 15 16:25:10 2008 @@ -1,3 +1,32 @@ -from py.__.misc import _dist +#from py.__.misc import _dist +#import vadm +#_dist.setup(vadm) + +#from ez_setup import use_setuptools +#use_setuptools() +from setuptools import setup, find_packages import vadm -_dist.setup(vadm) + +packages = find_packages(exclude=['py*']) + +setup(name = "vadm", + version = vadm.__package__.version, + description = vadm.__package__.description, + author = vadm.__package__.author, + author_email = vadm.__package__.author_email, + license = vadm.__package__.license, + entry_points = {'console_scripts': [ + 'vadm = vadm.bin.vadm:main', + ]}, + packages = packages, + install_requires = ['py'], + #package_data = {'': ['vadm']}, + #test_suite = 'fruit.simpletests.getTestSuite', + classifiers = [ + "Development Status :: 3 - Alpha", + "Intended Audience :: Administrators", + "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)", + "Programming Language :: Python", + "Topic :: Utilities", + ], + ) From hpk at codespeak.net Tue Jul 15 16:58:52 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 16:58:52 +0200 (CEST) Subject: [vadm] r56565 - vadm/dist/vadm Message-ID: <20080715145852.E09C3169EFD@codespeak.net> Author: hpk Date: Tue Jul 15 16:58:50 2008 New Revision: 56565 Modified: vadm/dist/vadm/sync.py Log: fix error string Modified: vadm/dist/vadm/sync.py ============================================================================== --- vadm/dist/vadm/sync.py (original) +++ vadm/dist/vadm/sync.py Tue Jul 15 16:58:50 2008 @@ -12,10 +12,9 @@ def update_hostwc(session): """ update the hostwc (and ensure that all neccessary working-copies are there). """ - if not session.hostwc.check(): - raise SystemExit, "hostrepo %s does not exist. Initialize?" % session.hostwc - if not session.hostwc.localpath.join('.svn').check(dir=1): - raise SystemExit, "no working copy found at %r, use: vadm init" % (str(session.hostwc),) + if not session.hostwc.check() or \ + not session.hostwc.localpath.join('.svn').check(dir=1): + raise SystemExit, "no valid working copy found at: %s. Checkout one?" % str(session.hostwc) session.log.debug("checking status of %s" % session.hostwc) s = session.hostwc.status(rec=1, updates=1) From hpk at codespeak.net Tue Jul 15 16:59:14 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 16:59:14 +0200 (CEST) Subject: [vadm] r56566 - in vadm/dist: . vadm/bin Message-ID: <20080715145914.EB739169F00@codespeak.net> Author: hpk Date: Tue Jul 15 16:59:14 2008 New Revision: 56566 Added: vadm/dist/MANIFEST.in Removed: vadm/dist/vadm/bin/__init__.py Modified: vadm/dist/setup.py Log: adding manifest, fixing console script Added: vadm/dist/MANIFEST.in ============================================================================== --- (empty file) +++ vadm/dist/MANIFEST.in Tue Jul 15 16:59:14 2008 @@ -0,0 +1,3 @@ +recursive-include *.txt *.py +prune py +prune MANIFEST.in Modified: vadm/dist/setup.py ============================================================================== --- vadm/dist/setup.py (original) +++ vadm/dist/setup.py Tue Jul 15 16:59:14 2008 @@ -5,28 +5,29 @@ #from ez_setup import use_setuptools #use_setuptools() from setuptools import setup, find_packages -import vadm packages = find_packages(exclude=['py*']) setup(name = "vadm", - version = vadm.__package__.version, - description = vadm.__package__.description, - author = vadm.__package__.author, - author_email = vadm.__package__.author_email, - license = vadm.__package__.license, + version = "0.6.0-alpha", + description = "tool for versioning system files and directories", + author = "holger krekel, merlinux GmbH", + author_email = "hpk at merlinux.de", + license = "GPL V3", entry_points = {'console_scripts': [ - 'vadm = vadm.bin.vadm:main', + 'vadm = vadm.cmdline:main', ]}, packages = packages, install_requires = ['py'], + url = "http://codespeak.net/vadm", #package_data = {'': ['vadm']}, #test_suite = 'fruit.simpletests.getTestSuite', classifiers = [ "Development Status :: 3 - Alpha", - "Intended Audience :: Administrators", - "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)", + "Intended Audience :: System Administrators", + "License :: OSI Approved :: GNU General Public License (GPL)", + "Operating System :: POSIX", "Programming Language :: Python", - "Topic :: Utilities", + "Topic :: System :: Systems Administration", ], ) Deleted: /vadm/dist/vadm/bin/__init__.py ============================================================================== --- /vadm/dist/vadm/bin/__init__.py Tue Jul 15 16:59:14 2008 +++ (empty file) @@ -1,2 +0,0 @@ - - From hpk at codespeak.net Tue Jul 15 17:30:27 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 17:30:27 +0200 (CEST) Subject: [vadm] r56567 - vadm/dist/vadm/doc Message-ID: <20080715153027.AFE3F49800E@codespeak.net> Author: hpk Date: Tue Jul 15 17:30:25 2008 New Revision: 56567 Added: vadm/dist/vadm/doc/__init__.py vadm/dist/vadm/doc/confrest.py - copied, changed from r56566, py/dist/py/doc/confrest.py vadm/dist/vadm/doc/style.css - copied unchanged from r56566, py/dist/py/doc/style.css Modified: vadm/dist/vadm/doc/ (props changed) vadm/dist/vadm/doc/conftest.py vadm/dist/vadm/doc/install.txt Log: make home page Added: vadm/dist/vadm/doc/__init__.py ============================================================================== --- (empty file) +++ vadm/dist/vadm/doc/__init__.py Tue Jul 15 17:30:25 2008 @@ -0,0 +1 @@ +# Copied: vadm/dist/vadm/doc/confrest.py (from r56566, py/dist/py/doc/confrest.py) ============================================================================== --- py/dist/py/doc/confrest.py (original) +++ vadm/dist/vadm/doc/confrest.py Tue Jul 15 17:30:25 2008 @@ -1,7 +1,7 @@ import py from py.__.misc.rest import convert_rest_html, strip_html_header from py.__.misc.difftime import worded_time -from py.__.doc.conftest import get_apigenpath, get_docpath +from vadm.__.doc.conftest import get_apigenpath, get_docpath from py.__.apigen.linker import relpath html = py.xml.html Modified: vadm/dist/vadm/doc/conftest.py ============================================================================== --- vadm/dist/vadm/doc/conftest.py (original) +++ vadm/dist/vadm/doc/conftest.py Tue Jul 15 17:30:25 2008 @@ -81,6 +81,7 @@ for x in cur.parts(reverse=True): confrest = x.dirpath('confrest.py') if confrest.check(file=1): + print "importing", confrest confrest = confrest.pyimport() project = confrest.Project() _checkskip(path, project.get_htmloutputpath(path)) Modified: vadm/dist/vadm/doc/install.txt ============================================================================== --- vadm/dist/vadm/doc/install.txt (original) +++ vadm/dist/vadm/doc/install.txt Tue Jul 15 17:30:25 2008 @@ -4,8 +4,8 @@ =================================================== **vadm** is a simple svn-like command line tool tool for -freely versioning unix system files and directories including -tracking of POSIX ownership and permission information. +non-intrusively versioning unix system files and directories +including tracking of POSIX ownership and permission information. vadm is released under the terms of the GPL Version 3. .. contents:: From hpk at codespeak.net Tue Jul 15 17:31:12 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 17:31:12 +0200 (CEST) Subject: [vadm] r56568 - vadm/dist/vadm/doc Message-ID: <20080715153112.9ED7949800E@codespeak.net> Author: hpk Date: Tue Jul 15 17:31:12 2008 New Revision: 56568 Modified: vadm/dist/vadm/doc/install.txt Log: no section numbering Modified: vadm/dist/vadm/doc/install.txt ============================================================================== --- vadm/dist/vadm/doc/install.txt (original) +++ vadm/dist/vadm/doc/install.txt Tue Jul 15 17:31:12 2008 @@ -9,7 +9,6 @@ vadm is released under the terms of the GPL Version 3. .. contents:: -.. sectnum:: Installing VADM ----------------- From hpk at codespeak.net Tue Jul 15 17:32:50 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 17:32:50 +0200 (CEST) Subject: [vadm] r56569 - in vadm/dist: . vadm/test Message-ID: <20080715153250.B7B9D49800E@codespeak.net> Author: hpk Date: Tue Jul 15 17:32:50 2008 New Revision: 56569 Added: vadm/dist/vadm/test/test_commands.py - copied, changed from r56566, vadm/dist/vadm/test/test_sync.py Removed: vadm/dist/vadm/test/test_sync.py Modified: vadm/dist/setup.py Log: rename test file Modified: vadm/dist/setup.py ============================================================================== --- vadm/dist/setup.py (original) +++ vadm/dist/setup.py Tue Jul 15 17:32:50 2008 @@ -30,4 +30,5 @@ "Programming Language :: Python", "Topic :: System :: Systems Administration", ], + zip_safe = False, ) Copied: vadm/dist/vadm/test/test_commands.py (from r56566, vadm/dist/vadm/test/test_sync.py) ============================================================================== --- vadm/dist/vadm/test/test_sync.py (original) +++ vadm/dist/vadm/test/test_commands.py Tue Jul 15 17:32:50 2008 @@ -1,29 +1,6 @@ from test_bootstrap import VadmTestBase, CommandError import py -class XXXTestSync(VadmTestBase): - def test_passwd2wc(self): - try: - target = getlocal('/etc/passwd') - info = conf.getinfo(target) - self.assertNotEquals(info.wcpath.read(), target.read()) - fs2wc(info.target, info.wcpath) - self.assertEquals(info.wcpath.read(), target.read()) - finally: - info.wcpath.revert() - - def test_wc2passwd(self): - target = getlocal('/etc/passwd') - info = conf.getinfo(target) - base = udir.udir.join('wc2passwd') - target = base.join(target.strpath) - target.ensure_filepath() - wc2fs(info.wcpath, target) - self.assertEquals(target.read(), info.wcpath.read()) - self.assertEquals(target.owner(), 'root') - self.assertEquals(target.group(), 'root') - self.assertEquals(target.stat().st_mode , 0100644) - class TestSingleCommands(VadmTestBase): def setup_method(self, method): super(TestSingleCommands, self).setup_method(method) Deleted: /vadm/dist/vadm/test/test_sync.py ============================================================================== --- /vadm/dist/vadm/test/test_sync.py Tue Jul 15 17:32:50 2008 +++ (empty file) @@ -1,91 +0,0 @@ -from test_bootstrap import VadmTestBase, CommandError -import py - -class XXXTestSync(VadmTestBase): - def test_passwd2wc(self): - try: - target = getlocal('/etc/passwd') - info = conf.getinfo(target) - self.assertNotEquals(info.wcpath.read(), target.read()) - fs2wc(info.target, info.wcpath) - self.assertEquals(info.wcpath.read(), target.read()) - finally: - info.wcpath.revert() - - def test_wc2passwd(self): - target = getlocal('/etc/passwd') - info = conf.getinfo(target) - base = udir.udir.join('wc2passwd') - target = base.join(target.strpath) - target.ensure_filepath() - wc2fs(info.wcpath, target) - self.assertEquals(target.read(), info.wcpath.read()) - self.assertEquals(target.owner(), 'root') - self.assertEquals(target.group(), 'root') - self.assertEquals(target.stat().st_mode , 0100644) - -class TestSingleCommands(VadmTestBase): - def setup_method(self, method): - super(TestSingleCommands, self).setup_method(method) - print "repodir", self.repodir - self.session.cmd("create", self.repodir) - self.session.cmd("co", "file://%s" % (self.repodir,)) - - def test_commit_nothing(self): - self.session.cmd('commit', '-m', 'x', self.systemroot) - txt = self.testlog.poplog("warn") - assert txt.find("nothing to commit") != -1 - - def test_commit_fails(self): - testpath = self.systemroot.join('etc','passwd').ensure() - self.session.cmd('add', testpath) - py.test.raises(CommandError, - "self.session.cmd('commit', '-m', 'x', testpath)") - #txt = self.testlog.poplog("error") - #assert txt.find("child") != -1 - - def test_add_outside_systemroot(self): - py.test.raises(CommandError, - "self.session.cmd('add', self.systemroot.dirpath())") - - def test_add_works_relative_to_systemrootself(self): - testpath = self.systemroot.ensure('etc','passwd') - self.session.cmd('add', testpath) - p = self.session.hostwc.join("etc", "passwd") - assert p.check() - self.testlog.poplog('warn') - self.session.cmd('status', self.systemroot.dirpath()) - txt = self.testlog.poplog('warn') - assert txt.find("path not versioned") - - def test_addfile_revert(self): - testpath = self.systemroot.join('etc','passwd').ensure() - self.session.cmd('add', testpath) - assert not self.testlog.poplog('error') - txt = self.testlog.poplog('user') - #assert txt.find("added") != -1 - #self.session.cmd('status', str(testpath.dirpath())) - #res = self.testlog.poplog("user") - #assert res.find('add') != -1 - self.session.cmd('commit', '-m', 'test_add_message', self.systemroot) - assert not self.testlog.poplog('error') - - testpath.write('something else') - self.session.cmd('diff', str(testpath)) - assert self.testlog['user'] != [] - - self.session.cmd('revert', str(testpath)) - self.session.cmd('diff', str(testpath)) - #print "\n ".join([" ".join(args) for args in self.conf._result]) - assert self.testlog['user'] - - def test_removefile(self): - print "systemroot", self.systemroot - testpath = self.systemroot.ensure('etc','something') - self.session.cmd('add', testpath) - self.session.cmd('commit', '-m', 'tempadd-to-remove', self.systemroot) - self.session.cmd('remove', testpath) - self.session.cmd('commit', '-m', 'tempadd-removed', testpath) - assert testpath.check() - wctestpath = self.wc.join(testpath.relto(self.systemroot)) - assert not wctestpath.localpath.check() From hpk at codespeak.net Tue Jul 15 17:47:50 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 17:47:50 +0200 (CEST) Subject: [vadm] r56570 - vadm/dist/vadm/doc Message-ID: <20080715154750.3AF0A16853D@codespeak.net> Author: hpk Date: Tue Jul 15 17:47:49 2008 New Revision: 56570 Modified: vadm/dist/vadm/doc/install.txt Log: fix vadm tarball url Modified: vadm/dist/vadm/doc/install.txt ============================================================================== --- vadm/dist/vadm/doc/install.txt (original) +++ vadm/dist/vadm/doc/install.txt Tue Jul 15 17:47:49 2008 @@ -139,4 +139,4 @@ * You may also come to the #codespeak channel on irc.freenode.org. .. _`vadm mailinglist`: http://codespeak.net/mailman/listinfo/vadm -.. _`vadm tarball`: http://xxx +.. _`vadm tarball`: http://pypi.python.org/packages/source/v/vadm/vadm-0.6.0-alpha.tar.gz From hpk at codespeak.net Tue Jul 15 17:49:42 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 17:49:42 +0200 (CEST) Subject: [vadm] r56571 - vadm/dist/vadm/doc Message-ID: <20080715154942.3C143168543@codespeak.net> Author: hpk Date: Tue Jul 15 17:49:41 2008 New Revision: 56571 Modified: vadm/dist/vadm/doc/install.txt Log: fix ReST Modified: vadm/dist/vadm/doc/install.txt ============================================================================== --- vadm/dist/vadm/doc/install.txt (original) +++ vadm/dist/vadm/doc/install.txt Tue Jul 15 17:49:41 2008 @@ -31,13 +31,13 @@ manually with setup.py ++++++++++++++++++++++++ -1. download the `py lib tarball`_ and install it like this: +1. download the `py lib tarball`_ and install it like this:: tar zxvf py-0.9.1.tar.gz cd py-0.9.1 python setup.py install -2. download the `vadm tarball`_ and install it like this: +2. download the `vadm tarball`_ and install it like this:: tar zxvf vadm-0.6.0.tar.gz cd vadm-0.6.0 From hpk at codespeak.net Tue Jul 15 17:52:45 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 17:52:45 +0200 (CEST) Subject: [vadm] r56572 - vadm/dist/vadm/doc Message-ID: <20080715155245.ACA5316854B@codespeak.net> Author: hpk Date: Tue Jul 15 17:52:45 2008 New Revision: 56572 Modified: vadm/dist/vadm/doc/install.txt (contents, props changed) Log: more info Modified: vadm/dist/vadm/doc/install.txt ============================================================================== --- vadm/dist/vadm/doc/install.txt (original) +++ vadm/dist/vadm/doc/install.txt Tue Jul 15 17:52:45 2008 @@ -1,4 +1,5 @@ *$LastChangedDate$* +*$LastChangeBy$* vadm: versioning of system files and directories =================================================== From hpk at codespeak.net Tue Jul 15 17:53:29 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 17:53:29 +0200 (CEST) Subject: [vadm] r56573 - vadm/dist/vadm/doc Message-ID: <20080715155329.F4203168540@codespeak.net> Author: hpk Date: Tue Jul 15 17:53:29 2008 New Revision: 56573 Modified: vadm/dist/vadm/doc/install.txt Log: fix typo Modified: vadm/dist/vadm/doc/install.txt ============================================================================== --- vadm/dist/vadm/doc/install.txt (original) +++ vadm/dist/vadm/doc/install.txt Tue Jul 15 17:53:29 2008 @@ -1,5 +1,5 @@ *$LastChangedDate$* -*$LastChangeBy$* +*$LastChangedBy$* vadm: versioning of system files and directories =================================================== From hpk at codespeak.net Tue Jul 15 17:54:40 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 17:54:40 +0200 (CEST) Subject: [vadm] r56574 - vadm/dist/vadm/doc Message-ID: <20080715155440.A8084168540@codespeak.net> Author: hpk Date: Tue Jul 15 17:54:40 2008 New Revision: 56574 Modified: vadm/dist/vadm/doc/install.txt Log: other style Modified: vadm/dist/vadm/doc/install.txt ============================================================================== --- vadm/dist/vadm/doc/install.txt (original) +++ vadm/dist/vadm/doc/install.txt Tue Jul 15 17:54:40 2008 @@ -1,5 +1,4 @@ -*$LastChangedDate$* -*$LastChangedBy$* +[$Id$] vadm: versioning of system files and directories =================================================== From hpk at codespeak.net Tue Jul 15 18:01:19 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 18:01:19 +0200 (CEST) Subject: [vadm] r56575 - in vadm/dist: . vadm Message-ID: <20080715160119.85147168554@codespeak.net> Author: hpk Date: Tue Jul 15 18:01:18 2008 New Revision: 56575 Added: vadm/dist/vadm/README - copied unchanged from r56568, vadm/dist/vadm/README.txt Removed: vadm/dist/vadm/README.txt Modified: vadm/dist/setup.py vadm/dist/vadm/__init__.py vadm/dist/vadm/cmdline.py vadm/dist/vadm/env.py vadm/dist/vadm/sync.py vadm/dist/vadm/sync2.py Log: copyright / license notices Modified: vadm/dist/setup.py ============================================================================== --- vadm/dist/setup.py (original) +++ vadm/dist/setup.py Tue Jul 15 18:01:18 2008 @@ -1,9 +1,8 @@ +# Copyright 2008, Holger Krekel. Licensed under GPL V3. #from py.__.misc import _dist #import vadm #_dist.setup(vadm) -#from ez_setup import use_setuptools -#use_setuptools() from setuptools import setup, find_packages packages = find_packages(exclude=['py*']) Deleted: /vadm/dist/vadm/README.txt ============================================================================== --- /vadm/dist/vadm/README.txt Tue Jul 15 18:01:18 2008 +++ (empty file) @@ -1,8 +0,0 @@ -**vadm** is a simple svn-like command line tool tool for -freely versioning unix system files and directories including -tracking of POSIX ownership and permission information. -vadm is released under the terms of the GPL Version 3. - -For a quick getting started, please consult doc/install.txt. - -holger krekel, merlinux GmbH July 2008, (holger at merlinux eu) Modified: vadm/dist/vadm/__init__.py ============================================================================== --- vadm/dist/vadm/__init__.py (original) +++ vadm/dist/vadm/__init__.py Tue Jul 15 18:01:18 2008 @@ -1,4 +1,4 @@ -# Copyright 2008 Holger Krekel +# Copyright 2008, Holger Krekel. Licensed under GPL V3. """\ vadm is a simple svn-like command line tool tool for freely versioning unix system files and directories including Modified: vadm/dist/vadm/cmdline.py ============================================================================== --- vadm/dist/vadm/cmdline.py (original) +++ vadm/dist/vadm/cmdline.py Tue Jul 15 18:01:18 2008 @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2008, Holger Krekel +# Copyright 2008, Holger Krekel. Licensed under GPL V3. """ module providing a cmdline interface to vadm Modified: vadm/dist/vadm/env.py ============================================================================== --- vadm/dist/vadm/env.py (original) +++ vadm/dist/vadm/env.py Tue Jul 15 18:01:18 2008 @@ -1,4 +1,4 @@ -# Copyright 2008 Holger Krekel +# Copyright 2008, Holger Krekel. Licensed under GPL V3. #!/usr/bin/python import sys, os Modified: vadm/dist/vadm/sync.py ============================================================================== --- vadm/dist/vadm/sync.py (original) +++ vadm/dist/vadm/sync.py Tue Jul 15 18:01:18 2008 @@ -1,4 +1,4 @@ -# Copyright 2008, Holger Krekel +# Copyright 2008, Holger Krekel. Licensed under GPL V3. """ module for reading and modifying the vadm.session sessionigfile """ Modified: vadm/dist/vadm/sync2.py ============================================================================== --- vadm/dist/vadm/sync2.py (original) +++ vadm/dist/vadm/sync2.py Tue Jul 15 18:01:18 2008 @@ -1,4 +1,4 @@ -# Copyright 2008 Holger Krekel +# Copyright 2008, Holger Krekel. Licensed under GPL V3. """ NOT IN USE (sync.py is in use for now) From hpk at codespeak.net Tue Jul 15 18:11:50 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 18:11:50 +0200 (CEST) Subject: [vadm] r56576 - vadm/dist/vadm/doc Message-ID: <20080715161150.32AB22A8006@codespeak.net> Author: hpk Date: Tue Jul 15 18:11:49 2008 New Revision: 56576 Modified: vadm/dist/vadm/doc/install.txt Log: remove mentioning of remote url, it's confusing. Modified: vadm/dist/vadm/doc/install.txt ============================================================================== --- vadm/dist/vadm/doc/install.txt (original) +++ vadm/dist/vadm/doc/install.txt Tue Jul 15 18:11:49 2008 @@ -70,9 +70,6 @@ vadm checkout file:///path/to/my/sysrepo - -You may also use remote URLs if you have made -the above repository accessible to you as a user. In general, vadm requires to be executed as a non-root user that has the right to execute ``sudo``. From hpk at codespeak.net Tue Jul 15 18:22:21 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 18:22:21 +0200 (CEST) Subject: [vadm] r56577 - vadm/dist/vadm/doc Message-ID: <20080715162221.CC9352A8089@codespeak.net> Author: hpk Date: Tue Jul 15 18:22:21 2008 New Revision: 56577 Modified: vadm/dist/vadm/doc/install.txt Log: fixing docs Modified: vadm/dist/vadm/doc/install.txt ============================================================================== --- vadm/dist/vadm/doc/install.txt (original) +++ vadm/dist/vadm/doc/install.txt Tue Jul 15 18:22:21 2008 @@ -94,8 +94,13 @@ Some background and hints --------------------------------------------------- -Here is some background that may you to deal -with problems or limitations you encounter: +Here are some background notes and hints: + +- if you want to auto-commit nightly you + may create a crontab entry like this:: + + 59 23 * * * /usr/bin/vadm ci -m "autocommit" / >/dev/null + - **vadm** works by mapping all versioned files into a per-user working copy. Permissions @@ -106,21 +111,20 @@ and use ``svn`` for introspection directly. - When you issue ``vadm add dir/somefile`` **vadm** - creates and adds a directory ``dir`` to the WC - copies the `somefile` to the WC and schedules + creates and adds a directory ``dir`` to the WC, + copies the `somefile` to the WC and schedules it for addition. -- When you issue almost any command, vadm will internally - first update the working copy files with their original +- For almost any command, vadm will internally + first update the working copy files from the corresponding filesystem information. This imposes a startup overhead which is usually not noticeable on modern systems if you - only deal with typical system files. + only deal with text configuration files. -- You can safely remove the Working Copy in - ``$USER/.vadm`` and or directly perform ``vadm init`` - which will remove the working copy as well - before re-creating it. - **vadm** can re-create all its information from the +- You can always remove the Working Copy in + ``$USER/.vadm`` and/or directly perform ``vadm checkout URL`` + which will always remove the working copy before + re-creating it. **vadm** can re-create all its information from the repository and the life filesystem. However, any information that only exists in the working copy (like files scheduled for addition or removal) From hpk at codespeak.net Tue Jul 15 18:39:36 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 18:39:36 +0200 (CEST) Subject: [vadm] r56578 - vadm/dist/vadm/doc Message-ID: <20080715163936.7BDB469803E@codespeak.net> Author: hpk Date: Tue Jul 15 18:39:33 2008 New Revision: 56578 Modified: vadm/dist/vadm/doc/install.txt Log: note about multiple users Modified: vadm/dist/vadm/doc/install.txt ============================================================================== --- vadm/dist/vadm/doc/install.txt (original) +++ vadm/dist/vadm/doc/install.txt Tue Jul 15 18:39:33 2008 @@ -70,8 +70,9 @@ vadm checkout file:///path/to/my/sysrepo -In general, vadm requires to be executed as a non-root -user that has the right to execute ``sudo``. +Multiple users can checkout from the same repository. In +general, vadm requires to be executed as a non-root user that +has the right to execute ``sudo``. For adding, committing, reverting or inquiring of files and directories you may now use svn-like commands, including From hpk at codespeak.net Tue Jul 15 18:46:23 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 18:46:23 +0200 (CEST) Subject: [vadm] r56579 - in vadm/dist/vadm: . test Message-ID: <20080715164623.8077C49800E@codespeak.net> Author: hpk Date: Tue Jul 15 18:46:23 2008 New Revision: 56579 Modified: vadm/dist/vadm/cmdline.py vadm/dist/vadm/test/test_commands.py Log: added test and fixed "vadm log" Modified: vadm/dist/vadm/cmdline.py ============================================================================== --- vadm/dist/vadm/cmdline.py (original) +++ vadm/dist/vadm/cmdline.py Tue Jul 15 18:46:23 2008 @@ -283,8 +283,9 @@ def execute(self): self.prepare_wc() for target, wcpath in self.target_and_wcpath(): - l = wcpath.log()[:self.num] - self.log.user("%d most recent log entries" % self.num) + num = self.session.options.num + l = wcpath.log()[:num] + self.log.user("%d most recent log entries" % num) l.reverse() for i in l: self.log.user("-" * 70) Modified: vadm/dist/vadm/test/test_commands.py ============================================================================== --- vadm/dist/vadm/test/test_commands.py (original) +++ vadm/dist/vadm/test/test_commands.py Tue Jul 15 18:46:23 2008 @@ -35,15 +35,15 @@ txt = self.testlog.poplog('warn') assert txt.find("path not versioned") - def test_addfile_revert(self): + def test_addfile_revert_diff_log(self): testpath = self.systemroot.join('etc','passwd').ensure() self.session.cmd('add', testpath) assert not self.testlog.poplog('error') txt = self.testlog.poplog('user') - #assert txt.find("added") != -1 - #self.session.cmd('status', str(testpath.dirpath())) - #res = self.testlog.poplog("user") - #assert res.find('add') != -1 + assert txt.find("added") != -1 + self.session.cmd('status', str(testpath.dirpath())) + res = self.testlog.poplog("user") + assert res.find('add') != -1 self.session.cmd('commit', '-m', 'test_add_message', self.systemroot) assert not self.testlog.poplog('error') @@ -55,6 +55,10 @@ self.session.cmd('diff', str(testpath)) #print "\n ".join([" ".join(args) for args in self.conf._result]) assert self.testlog['user'] + self.testlog.poplog('user') + assert not self.testlog['user'] + self.session.cmd('log', self.systemroot) + assert self.testlog['user'] def test_removefile(self): print "systemroot", self.systemroot From hpk at codespeak.net Tue Jul 15 18:56:25 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 18:56:25 +0200 (CEST) Subject: [vadm] r56580 - in vadm/dist: . vadm vadm/test Message-ID: <20080715165625.5930D49800E@codespeak.net> Author: hpk Date: Tue Jul 15 18:56:24 2008 New Revision: 56580 Modified: vadm/dist/setup.py vadm/dist/vadm/__init__.py vadm/dist/vadm/cmdline.py vadm/dist/vadm/test/test_commands.py Log: adding the blame command, bumping version Modified: vadm/dist/setup.py ============================================================================== --- vadm/dist/setup.py (original) +++ vadm/dist/setup.py Tue Jul 15 18:56:24 2008 @@ -8,7 +8,7 @@ packages = find_packages(exclude=['py*']) setup(name = "vadm", - version = "0.6.0-alpha", + version = "0.6.0-alpha2", description = "tool for versioning system files and directories", author = "holger krekel, merlinux GmbH", author_email = "hpk at merlinux.de", Modified: vadm/dist/vadm/__init__.py ============================================================================== --- vadm/dist/vadm/__init__.py (original) +++ vadm/dist/vadm/__init__.py Tue Jul 15 18:56:24 2008 @@ -10,7 +10,7 @@ description = "tool for versioning system files and directories", revision = '$LastChangedRevision: 11405 $', lastchangedate = '$LastChangedDate: 2005-04-24 15:18:48 +0200 (Sun, 24 Apr 2005) $', - version = "0.6.0-alpha", + version = "0.6.0-alpha2", #url = "http://codespeak.net/vadm", #download_url = "http://codespeak.net/download/py/py-0.6.0-pre-alpha.tar.gz", license = "GPL V3", Modified: vadm/dist/vadm/cmdline.py ============================================================================== --- vadm/dist/vadm/cmdline.py (original) +++ vadm/dist/vadm/cmdline.py Tue Jul 15 18:56:24 2008 @@ -269,6 +269,25 @@ if s.strip(): self.log.user(s) +class cmd_blame(Command): + """ display blame information for the given file. + """ + def parse_options(self, args): + parser = self.getparser() + self.set_usage(parser) + self.doparse(parser, args, numargs=1) + + def execute(self): + self.prepare_wc() + for target, wcpath in self.target_and_wcpath(): + if not target.check(): + raise CommandError("does not exist: %s" %(target,)) + if not target.check(file=1): + raise CommandError("not a file: %s" %(target,)) + blameentries = wcpath.blame() + for rev, author, line in blameentries: + self.log.user("%6d %-10s %s" %(rev, author, line.rstrip())) + class cmd_log(Command): """ display history information for the given files (or all files if no files are given. Modified: vadm/dist/vadm/test/test_commands.py ============================================================================== --- vadm/dist/vadm/test/test_commands.py (original) +++ vadm/dist/vadm/test/test_commands.py Tue Jul 15 18:56:24 2008 @@ -35,7 +35,7 @@ txt = self.testlog.poplog('warn') assert txt.find("path not versioned") - def test_addfile_revert_diff_log(self): + def test_addfile_revert_diff_log_blame(self): testpath = self.systemroot.join('etc','passwd').ensure() self.session.cmd('add', testpath) assert not self.testlog.poplog('error') @@ -59,6 +59,10 @@ assert not self.testlog['user'] self.session.cmd('log', self.systemroot) assert self.testlog['user'] + self.testlog.poplog('user') + + self.session.cmd("blame", testpath) + print self.testlog['user'] def test_removefile(self): print "systemroot", self.systemroot From hpk at codespeak.net Tue Jul 15 19:13:19 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 19:13:19 +0200 (CEST) Subject: [vadm] r56581 - vadm/dist/vadm/doc Message-ID: <20080715171319.7718D49800E@codespeak.net> Author: hpk Date: Tue Jul 15 19:13:19 2008 New Revision: 56581 Modified: vadm/dist/vadm/doc/install.txt Log: a note for people coming from linux distros Modified: vadm/dist/vadm/doc/install.txt ============================================================================== --- vadm/dist/vadm/doc/install.txt (original) +++ vadm/dist/vadm/doc/install.txt Tue Jul 15 19:13:19 2008 @@ -23,8 +23,8 @@ with easy_install +++++++++++++++++++ -1. `Install easy_install`_ if you don't have it -2. type 'easy_install vadm' (this should also install the py lib if you don't have it) +1. `Install easy_install`_ if you don't have it. On linux distributions the package name you should look for is "setuptools" or "python-setuptools". +2. type ``easy_install vadm`` (this should also install the py lib if you don't have it) .. _`Install easy_install`: http://peak.telecommunity.com/DevCenter/EasyInstall#installing-easy-install From hpk at codespeak.net Tue Jul 15 23:28:33 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Tue, 15 Jul 2008 23:28:33 +0200 (CEST) Subject: [vadm] r56582 - in vadm/dist: . vadm vadm/doc Message-ID: <20080715212833.2190B2A019C@codespeak.net> Author: hpk Date: Tue Jul 15 23:28:33 2008 New Revision: 56582 Modified: vadm/dist/setup.py vadm/dist/vadm/README vadm/dist/vadm/__init__.py vadm/dist/vadm/doc/install.txt Log: mention Jum, some updates Modified: vadm/dist/setup.py ============================================================================== --- vadm/dist/setup.py (original) +++ vadm/dist/setup.py Tue Jul 15 23:28:33 2008 @@ -11,16 +11,16 @@ version = "0.6.0-alpha2", description = "tool for versioning system files and directories", author = "holger krekel, merlinux GmbH", - author_email = "hpk at merlinux.de", + author_email = "holger at merlinux.de", license = "GPL V3", - entry_points = {'console_scripts': [ - 'vadm = vadm.cmdline:main', - ]}, + entry_points = {'console_scripts': ['vadm = vadm.cmdline:main', ]}, packages = packages, install_requires = ['py'], + long_description = ("vadm is a simple svn-like command line tool " + "for versioning unix system files including " + "tracking of POSIX ownership and permission " + "information."), url = "http://codespeak.net/vadm", - #package_data = {'': ['vadm']}, - #test_suite = 'fruit.simpletests.getTestSuite', classifiers = [ "Development Status :: 3 - Alpha", "Intended Audience :: System Administrators", Modified: vadm/dist/vadm/README ============================================================================== --- vadm/dist/vadm/README (original) +++ vadm/dist/vadm/README Tue Jul 15 23:28:33 2008 @@ -5,4 +5,8 @@ For a quick getting started, please consult doc/install.txt. +The initial "vadm" idea was conceived and implemented +by Jens Uwe Mager (jum at anubis han de) and Holger Krekel +and used mainly on the codespeak.net site. + holger krekel, merlinux GmbH July 2008, (holger at merlinux eu) Modified: vadm/dist/vadm/__init__.py ============================================================================== --- vadm/dist/vadm/__init__.py (original) +++ vadm/dist/vadm/__init__.py Tue Jul 15 23:28:33 2008 @@ -16,7 +16,7 @@ license = "GPL V3", platforms = ['unix', 'linux'], author = "holger krekel, merlinux GmbH", - author_email = "hpk at merlinux.de", + author_email = "holger at merlinux.de", long_description = globals()['__doc__'], exportdefs = { Modified: vadm/dist/vadm/doc/install.txt ============================================================================== --- vadm/dist/vadm/doc/install.txt (original) +++ vadm/dist/vadm/doc/install.txt Tue Jul 15 23:28:33 2008 @@ -3,9 +3,9 @@ vadm: versioning of system files and directories =================================================== -**vadm** is a simple svn-like command line tool tool for -non-intrusively versioning unix system files and directories -including tracking of POSIX ownership and permission information. +**vadm** is a simple svn-like command line tool for +versioning unix system files including tracking of +POSIX ownership and permission information. vadm is released under the terms of the GPL Version 3. .. contents:: @@ -24,7 +24,7 @@ +++++++++++++++++++ 1. `Install easy_install`_ if you don't have it. On linux distributions the package name you should look for is "setuptools" or "python-setuptools". -2. type ``easy_install vadm`` (this should also install the py lib if you don't have it) +2. type ``easy_install vadm`` (this should install the py lib dependency). .. _`Install easy_install`: http://peak.telecommunity.com/DevCenter/EasyInstall#installing-easy-install @@ -47,32 +47,34 @@ working from development ++++++++++++++++++++++++++++ -If you want to easily follow the development version you ca type +If you want to follow the development version you ca type something like this:: svn co https://codespeak.net/svn/vadm/dist/vadm and add the ``vadm/bin/`` directory to your ``$PATH`` variable. -The vadm script will automatically use the development version. +The **vadm** script will automatically use the development version. Getting Started --------------------- -The following command will create a repository -for storing information about your system files:: +You first need to create a repository for storing +information about your system files:: vadm create /path/to/my/sysrepo - Afterwards you can checkout from the newly created repository:: vadm checkout file:///path/to/my/sysrepo -Multiple users can checkout from the same repository. In -general, vadm requires to be executed as a non-root user that -has the right to execute ``sudo``. +Multiple users can checkout from the same repository. EAch +of the users will have a "working copy" in its ``.vadm/hostwc`` +directory. + +Note that the vadm script mandates execution as a non-root user +that has the right to execute ``sudo``. For adding, committing, reverting or inquiring of files and directories you may now use svn-like commands, including @@ -138,7 +140,7 @@ subscribe to the `vadm mailinglist`_. Without subscription you cannot post to the mailing list. -* You may also come to the #codespeak channel on irc.freenode.org. +* You may also drop by the #codespeak channel on irc.freenode.org. .. _`vadm mailinglist`: http://codespeak.net/mailman/listinfo/vadm .. _`vadm tarball`: http://pypi.python.org/packages/source/v/vadm/vadm-0.6.0-alpha.tar.gz From hpk at codespeak.net Mon Jul 21 15:06:08 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Mon, 21 Jul 2008 15:06:08 +0200 (CEST) Subject: [vadm] r56698 - in vadm/dist: . vadm vadm/test Message-ID: <20080721130608.61966169F66@codespeak.net> Author: hpk Date: Mon Jul 21 15:06:06 2008 New Revision: 56698 Modified: vadm/dist/setup.py vadm/dist/vadm/__init__.py vadm/dist/vadm/cmdline.py vadm/dist/vadm/test/test_commands.py Log: * adding test and fix for ci with changes below sub dirs * fixing bug in a test * adding "vadm version" command Modified: vadm/dist/setup.py ============================================================================== --- vadm/dist/setup.py (original) +++ vadm/dist/setup.py Mon Jul 21 15:06:06 2008 @@ -8,7 +8,7 @@ packages = find_packages(exclude=['py*']) setup(name = "vadm", - version = "0.6.0-alpha2", + version = "0.6.0-beta", description = "tool for versioning system files and directories", author = "holger krekel, merlinux GmbH", author_email = "holger at merlinux.de", @@ -22,7 +22,7 @@ "information."), url = "http://codespeak.net/vadm", classifiers = [ - "Development Status :: 3 - Alpha", + "Development Status :: 2 - Beta", "Intended Audience :: System Administrators", "License :: OSI Approved :: GNU General Public License (GPL)", "Operating System :: POSIX", Modified: vadm/dist/vadm/__init__.py ============================================================================== --- vadm/dist/vadm/__init__.py (original) +++ vadm/dist/vadm/__init__.py Mon Jul 21 15:06:06 2008 @@ -10,8 +10,8 @@ description = "tool for versioning system files and directories", revision = '$LastChangedRevision: 11405 $', lastchangedate = '$LastChangedDate: 2005-04-24 15:18:48 +0200 (Sun, 24 Apr 2005) $', - version = "0.6.0-alpha2", - #url = "http://codespeak.net/vadm", + version = "0.6.0-beta", + url = "http://codespeak.net/vadm", #download_url = "http://codespeak.net/download/py/py-0.6.0-pre-alpha.tar.gz", license = "GPL V3", platforms = ['unix', 'linux'], Modified: vadm/dist/vadm/cmdline.py ============================================================================== --- vadm/dist/vadm/cmdline.py (original) +++ vadm/dist/vadm/cmdline.py Mon Jul 21 15:06:06 2008 @@ -62,6 +62,7 @@ command.parse_options(args) command.execute() + class Command: def __init__(self, session): self.session = session @@ -153,6 +154,20 @@ #if options.verbose >=3: # from vpath import svn_wc_command # svn_wc_command.DEBUG = 1 + # +class cmd_version(Command): + """ display version info""" + def parse_options(self, args): + pass + + def execute(self): + """ this produces a list of all commands together with + their abbreviations. + """ + self.log.user("version: %s" %(vadm.__package__.version)) + self.log.user("author: %s <%s>" %(vadm.__package__.author, + vadm.__package__.author_email)) + self.log.user("website: %s" %(vadm.__package__.url,)) class cmd_help(Command): """ display usage and help. """ @@ -374,11 +389,10 @@ def execute(self): self.prepare_wc() items = list(self.target_and_wcpath()) - if len(items) == 1 and items[0][0] == self.session.systemroot: wc = items[0][1] - st = wc.status() - if not (st.modified or st.prop_modified): + st = wc.status(rec=True) + if not (st.modified or st.prop_modified or st.added): items.pop() if not items: args = " ".join(self._getfileargs()) Modified: vadm/dist/vadm/test/test_commands.py ============================================================================== --- vadm/dist/vadm/test/test_commands.py (original) +++ vadm/dist/vadm/test/test_commands.py Mon Jul 21 15:06:06 2008 @@ -1,5 +1,6 @@ from test_bootstrap import VadmTestBase, CommandError import py +import vadm class TestSingleCommands(VadmTestBase): def setup_method(self, method): @@ -8,6 +9,14 @@ self.session.cmd("create", self.repodir) self.session.cmd("co", "file://%s" % (self.repodir,)) + def test_version(self): + self.testlog.poplog("user") + self.session.cmd('version', ) + txt = self.testlog.poplog("user") + assert txt.find(vadm.__package__.version) != -1 + assert txt.find(vadm.__package__.author) != -1 + assert txt.find(vadm.__package__.author_email) != -1 + def test_commit_nothing(self): self.session.cmd('commit', '-m', 'x', self.systemroot) txt = self.testlog.poplog("warn") @@ -21,6 +30,19 @@ #txt = self.testlog.poplog("error") #assert txt.find("child") != -1 + def test_commit_subsubchange(self): + testpath = self.systemroot.ensure('etc', dir=True) + self.session.cmd('add', testpath) + self.session.cmd('ci', "-m", "c", testpath) + txt = self.testlog.poplog("warn") + txt = self.testlog.poplog("user") + testpath = testpath.ensure("passwd") + self.session.cmd('add', testpath) + self.session.cmd('ci', "-m", "c", self.systemroot) + txt = self.testlog.poplog("warn") + print txt + assert txt.find("nothing to commit") == -1 + def test_add_outside_systemroot(self): py.test.raises(CommandError, "self.session.cmd('add', self.systemroot.dirpath())") @@ -46,10 +68,12 @@ assert res.find('add') != -1 self.session.cmd('commit', '-m', 'test_add_message', self.systemroot) assert not self.testlog.poplog('error') - - testpath.write('something else') - self.session.cmd('diff', str(testpath)) - assert self.testlog['user'] != [] + self.testlog.clear() + testpath.write('qwesomething else') + self.session.cmd('diff', testpath) + txt = self.testlog.poplog('user') + print txt + assert txt.find("+++") != -1 self.session.cmd('revert', str(testpath)) self.session.cmd('diff', str(testpath)) From hpk at codespeak.net Mon Jul 21 15:08:00 2008 From: hpk at codespeak.net (hpk at codespeak.net) Date: Mon, 21 Jul 2008 15:08:00 +0200 (CEST) Subject: [vadm] r56699 - vadm/dist Message-ID: <20080721130800.2C12E169F63@codespeak.net> Author: hpk Date: Mon Jul 21 15:07:59 2008 New Revision: 56699 Modified: vadm/dist/setup.py Log: fixing trove identifier Modified: vadm/dist/setup.py ============================================================================== --- vadm/dist/setup.py (original) +++ vadm/dist/setup.py Mon Jul 21 15:07:59 2008 @@ -22,7 +22,7 @@ "information."), url = "http://codespeak.net/vadm", classifiers = [ - "Development Status :: 2 - Beta", + "Development Status :: 4 - Beta", "Intended Audience :: System Administrators", "License :: OSI Approved :: GNU General Public License (GPL)", "Operating System :: POSIX",