diff -Nru tarmac-0.1/bzrplugin/__init__.py tarmac-0.2a/bzrplugin/__init__.py --- tarmac-0.1/bzrplugin/__init__.py 1970-01-01 01:00:00.000000000 +0100 +++ tarmac-0.2a/bzrplugin/__init__.py 2009-07-10 21:28:28.000000000 +0100 @@ -0,0 +1,27 @@ +# This file is part of Tarmac. +# +# Tarmac is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3 as +# published by +# the Free Software Foundation. +# +# Tarmac 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 Tarmac. If not, see . + +'''Bazaar Plugin for Tarmac.''' + +from bzrlib.lazy_import import lazy_import +lazy_import(globals(), ''' +from bzrlib.hooks import known_hooks + +''') + +known_hooks.register_lazy( + ('tarmac.hooks.TarmacHooks', 'TarmacLander.hooks'), + 'tarmac.hooks', 'TarmacHooks') + diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/debian/changelog /tmp/MIkmk43Ogs/tarmac-0.2a/debian/changelog --- tarmac-0.1/debian/changelog 2009-07-10 22:00:30.000000000 +0100 +++ tarmac-0.2a/debian/changelog 2009-07-10 21:53:52.000000000 +0100 @@ -1,3 +1,9 @@ +tarmac (0.2a-0ubuntu1~9.10r126) karmic; urgency=low + + * Packaging a pre 0.2 source snapshot + + -- Elliot Murphy (personal) Fri, 10 Jul 2009 16:08:48 -0400 + tarmac (0.1-0ubuntu1~9.10ppa1) karmic; urgency=low * Packaging for the PPA. diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/debian/control /tmp/MIkmk43Ogs/tarmac-0.2a/debian/control --- tarmac-0.1/debian/control 2009-07-10 22:00:30.000000000 +0100 +++ tarmac-0.2a/debian/control 2009-07-10 21:35:48.000000000 +0100 @@ -17,7 +17,7 @@ Depends: ${python:Depends}, ${misc:Depends}, python-launchpadlib, - bzr + bzr (>= 1.13) Provides: ${python:Provides} Description: automatic merge tool for bazaar branches hosted on launchpad.net Tarmac uses the Launchpad API to manage a development focus branch's proposed diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/debian/patches/tarmac-lander-script.patch /tmp/MIkmk43Ogs/tarmac-0.2a/debian/patches/tarmac-lander-script.patch --- tarmac-0.1/debian/patches/tarmac-lander-script.patch 2009-07-10 22:00:30.000000000 +0100 +++ tarmac-0.2a/debian/patches/tarmac-lander-script.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -diff -Nur -x '*.orig' -x '*~' tarmac-0.1/tarmac-lander tarmac-0.1.new/tarmac-lander ---- tarmac-0.1/tarmac-lander 2009-03-04 01:18:44.000000000 -0500 -+++ tarmac-0.1.new/tarmac-lander 2009-07-10 11:21:37.197328203 -0400 -@@ -1,5 +1,5 @@ --# Copyright (c) 2009 - Paul Hummer - #!/usr/bin/env python -+# Copyright (c) 2009 - Paul Hummer - from tarmac.bin import TarmacLander - - if __name__ == '__main__': diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/LICENSE /tmp/MIkmk43Ogs/tarmac-0.2a/LICENSE --- tarmac-0.1/LICENSE 2009-03-04 06:18:44.000000000 +0000 +++ tarmac-0.2a/LICENSE 1970-01-01 01:00:00.000000000 +0100 @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/PKG-INFO /tmp/MIkmk43Ogs/tarmac-0.2a/PKG-INFO --- tarmac-0.1/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 +++ tarmac-0.2a/PKG-INFO 2009-07-10 21:32:04.000000000 +0100 @@ -0,0 +1,12 @@ +Metadata-Version: 1.0 +Name: tarmac +Version: 0.2a +Summary: Tarmac - The Launchpad Lander +Home-page: http://edge.launchpad.net/tarmac +Author: Paul Hummer +Author-email: Paul Hummer . '''Tarmac installation script.''' from distutils.core import setup @@ -7,13 +22,18 @@ from tarmac import __version__ setup( - name=u'Tarmac', + author='Paul Hummer', + author_email='Paul Hummer . + '''Code used by Tarmac scripts.''' +import atexit +import logging from optparse import OptionParser import os import sys -from bzrlib import branch, bzrdir -from bzrlib.plugin import load_plugins +from bzrlib.errors import PointlessMerge +from bzrlib.plugin import load_plugins as load_bzr_plugins from launchpadlib.errors import HTTPError +from tarmac.branch import Branch from tarmac.config import TarmacConfig -from tarmac.exceptions import NoCommitMessage +from tarmac.hooks import tarmac_hooks +from tarmac.plugin import load_plugins from tarmac.utils import get_launchpad_object +load_bzr_plugins() load_plugins() -DEV_SERVICE_ROOT = 'https://api.launchpad.dev/beta/' -class TarmacLander: - '''Tarmac script.''' +class TarmacScript: + '''An abstract script for reusable parts of Tarmac.''' + + def __init__(self, test_mode=False): + self.parser = self._create_option_parser() + self.options, self.args = self.parser.parse_args() + self.test_mode = test_mode + + def create_pid(self): + '''Create a pidfile for the running process.''' + assert not os.path.exists(self.configuration.PID_FILE) + pidfile = open(self.configuration.PID_FILE, 'wb') + pidfile.write(str(os.getpid())) + pidfile.close() + atexit.register(self.delete_pid) + + def delete_pid(self): + '''Delete the pid file. + + This method is usually called when the atexit signal is emitted. + ''' + assert os.path.exists(self.configuration.PID_FILE) + os.remove(self.configuration.PID_FILE) + + def _create_option_parser(self): + '''Create the option parser.''' + raise NotImplementedError + + def main(self): + '''Main part of each script.''' + raise NotImplementedError + + +class TarmacAuthenticate(TarmacScript): + '''Tarmac authentication script. - def __init__(self): + This script is intended do nothing but get an OAuth token from Launchpad, + and (optionally) output that token to a specified file. + ''' + def __init__(self, test_mode=False): + TarmacScript.__init__(self, test_mode) - parser = OptionParser() - parser.add_option('--dry-run', action='store_true', dest='dry_run', - help='Print out the branches that would be merged and their ' - 'commit messages, but don\'t actually merge the branches.') - options = parser.parse_args()[0] - self.dry_run = options.dry_run + self.configuration = TarmacConfig() try: - self.project = sys.argv[1] + self.filename = self.args[0] except IndexError: - # This code is merely a placeholder until I can get proper argument - # handling, at which point this should print usage information. - print ( - 'Oops! You\'ve forgotten to specify a project to land ' - 'branches for. Please specify your project as the first ' - 'argument to tarmac-lander.') - sys.exit() + self.filename = None - def _find_commit_message(self, comments): - '''Find the proper commit comment.''' - for comment in comments: - if comment.title.lower().startswith('commit message'): - return comment.message_body - elif comment.message_body.lower().startswith('commit message: '): - return comment.message_body[len('Commit message: '):] - raise NoCommitMessage + def _create_option_parser(self): + '''See `TarmacScript._create_option_parser`.''' + parser = OptionParser("%prog [options] ") + return parser def main(self): - configuration = TarmacConfig() + '''See `TarmacScript`.''' + launchpad = get_launchpad_object(self.configuration, + filename=self.filename) + + +class TarmacLander(TarmacScript): + '''Tarmac landing script. + + This script handles all landing of branches. It does the actual work for + Tarmac. + ''' + + def __init__(self, test_mode=False): + + TarmacScript.__init__(self, test_mode) + + self.dry_run = self.options.dry_run + + if len(self.args) != 1: + self.parser.error("Please specify a project name.") + + self.project, = self.args + self.configuration = TarmacConfig(self.project) + + logging.basicConfig(filename=self.configuration.log_file, + level=logging.INFO) + self.logger = logging.getLogger('tarmac-lander') + + # Write a pid file + if not test_mode: + if os.path.exists(self.configuration.PID_FILE): + message = 'An instance of tarmac is already running.' + self.logger.info(message) + print message + sys.exit() + self.create_pid() + + def _create_option_parser(self): + '''See `TarmacScript._create_option_parser`.''' + parser = OptionParser("%prog [options] ") + parser.add_option('--dry-run', action='store_true', + help='Merge the approved branch candidates (and optionally run ' + 'their accompanying test command), and then roll back the ' + 'trunk branch to pristine state.') + parser.add_option('--test-command', type='string', default=None, + metavar='TEST', + help='The test command to run after merging a branch.') + return parser + + def _get_reviewers(self, candidate): + '''Get all reviewers who approved the review.''' + return [comment.reviewer for comment in candidate.all_comments + if comment.vote == u'Approve'].join(', ') + + def main(self): + '''See `TarmacScript.main`.''' + # pylint: disable-msg=W0703 try: - launchpad = get_launchpad_object(configuration) + launchpad = get_launchpad_object(self.configuration) except HTTPError: - print ( + message = ( 'Oops! It appears that the OAuth token is invalid. Please ' 'delete %(credential_file)s and re-authenticate.' % - {'credential_file': configuration.CREDENTIALS}) + {'credential_file': self.configuration.CREDENTIALS}) + self.logger.error(message) + print message sys.exit() project = launchpad.projects[self.project] try: - trunk = project.development_focus.branch + trunk = Branch(project.development_focus.branch, create_tree=True) except AttributeError: - print ( + message = ( 'Oops! It looks like you\'ve forgotten to specify a ' 'development focus branch. Please link your "trunk" branch ' 'to the trunk development focus.') + self.logger.error(message) + print message sys.exit() candidates = [entry for entry in trunk.landing_candidates - if entry.queue_status == u'Approved'] + if entry.queue_status == u'Approved' and + entry.commit_message] + if not candidates: + self.logger.info('No branches approved to land.') + return for candidate in candidates: - commit_message = self._find_commit_message(candidate.all_comments) - if self.dry_run: - print '%(source_branch)s - %(commit_message)s' % { - 'source_branch': candidate.source_branch.bzr_identity, - 'commit_message': commit_message} + source_branch = Branch(candidate.source_branch) + + try: + trunk.merge(source_branch) + except PointlessMerge: + trunk.cleanup() continue - temp_dir = '/tmp/merge-%(source)s-%(pid)s' % { - 'source': candidate.source_branch.name, - 'pid': os.getpid() - } - os.mkdir(temp_dir) - - accelerator, target_branch = bzrdir.BzrDir.open_tree_or_branch( - candidate.target_branch.bzr_identity) - target_tree = target_branch.create_checkout( - temp_dir, None, True, accelerator) - source_branch = branch.Branch.open( - candidate.source_branch.bzr_identity) - - target_tree.merge_from_branch(source_branch) - # TODO: Add hook code. - target_tree.commit(candidate.all_comments[0].message_body) + try: + tarmac_hooks['pre_tarmac_commit'].fire( + self.options, self.configuration, candidate, + trunk) + if self.dry_run: + trunk.cleanup() + else: + trunk.commit(candidate.commit_message, + authors=source_branch.authors) + + except Exception, e: + print e + trunk.cleanup() + tarmac_hooks['post_tarmac_commit'].fire( + self.options, self.configuration, candidate, trunk) diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/tarmac/branch.py /tmp/MIkmk43Ogs/tarmac-0.2a/tarmac/branch.py --- tarmac-0.1/tarmac/branch.py 1970-01-01 01:00:00.000000000 +0100 +++ tarmac-0.2a/tarmac/branch.py 2009-07-10 21:28:28.000000000 +0100 @@ -0,0 +1,93 @@ +# Copyright 2009 Paul Hummer +# This file is part of Tarmac. +# +# Tarmac is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3 as +# published by +# the Free Software Foundation. +# +# Tarmac 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 Tarmac. If not, see . + +'''Tarmac branch tools.''' +import os +import shutil + +from bzrlib import branch as bzr_branch, revision + + +class Branch(object): + '''Wrapper for working with branches. + + This class wraps the Launchpad branch and the bzrlib branch functionalities + to work seamlessly with both. + ''' + + def __init__(self, lp_branch, create_tree=False): + + self.has_tree = create_tree + self.lp_branch = lp_branch + self.author_list = None + self.branch = bzr_branch.Branch.open(self.lp_branch.bzr_identity) + if self.has_tree: + self._set_up_working_tree() + + def _set_up_working_tree(self): + '''Create the dir and working tree.''' + self.temporary_dir = os.path.join('/tmp', self.lp_branch.project.name) + if os.path.exists(self.temporary_dir): + shutil.rmtree(self.temporary_dir) + self.tree = self.branch.create_checkout(self.temporary_dir) + if not self.author_list: + self._set_authors() + + def _set_authors(self): + '''Get the authors from the last revision and use it.''' + # XXX Need to get all authors from revisions not in target + last_rev = self.branch.last_revision() + # Empty the list first since we're going to refresh it + self.author_list = [] + # Only query for authors if last_rev is not null: + if last_rev != 'null:': + rev = self.branch.repository.get_revision(last_rev) + self.author_list.extend(rev.get_apparent_authors()) + + def merge(self, branch): + '''Merge from another tarmac.branch.Branch instance.''' + if not self.has_tree: + raise Exception('This branch wasn\'t set up to do merging,') + self.tree.merge_from_branch(branch.branch) + + def cleanup(self): + '''Remove the working tree from the temp dir.''' + if self.has_tree: + self._set_up_working_tree() + + def commit(self, commit_message, authors=None, **kw): + '''Commit changes.''' + if not self.has_tree: + raise Exception('This branch has no working tree.') + if not authors: + authors = self.authors + elif not self.authors: + self.author_list = authors + else: + self.author_list.append(authors) + self.tree.commit(commit_message, committer='Tarmac', authors=authors) + self._set_authors() + + @property + def landing_candidates(self): + '''Wrap the LP representation of landing_candidates.''' + return self.lp_branch.landing_candidates + + @property + def authors(self): + if self.author_list is None: + self._set_authors() + return self.author_list diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/tarmac/config.py /tmp/MIkmk43Ogs/tarmac-0.2a/tarmac/config.py --- tarmac-0.1/tarmac/config.py 2009-03-04 06:18:44.000000000 +0000 +++ tarmac-0.2a/tarmac/config.py 2009-07-10 21:28:28.000000000 +0100 @@ -1,13 +1,30 @@ -# Copyright (c) 2009 - Paul Hummer +# Copyright 2009 Paul Hummer +# This file is part of Tarmac. +# +# Tarmac is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3 as +# published by +# the Free Software Foundation. +# +# Tarmac 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 Tarmac. If not, see . + '''Configuration handler.''' # pylint: disable-msg=C0103 import os +from ConfigParser import NoSectionError, NoOptionError +from ConfigParser import SafeConfigParser as ConfigParser class TarmacConfig: '''A configuration class.''' - def __init__(self, section=None): + def __init__(self, project=None): '''The config options are based on ~/.config/tarmac. If the configuration directories don't exist, they will be created. @@ -15,12 +32,16 @@ config. ''' self.CONFIG_HOME = os.path.expanduser('~/.config/tarmac') - self.CONFIG = os.path.join(self.CONFIG_HOME, 'config') + self.PID_FILE = '/var/tmp/tarmac-%(project)s' % {'project': project } self.CREDENTIALS = os.path.join(self.CONFIG_HOME, 'credentials') - self.CACHEDIR = '/tmp/tarmac-cache-%(pid)s' % {'pid': os.getpid()} + self.CACHEDIR = os.path.join(self.CONFIG_HOME, 'cachedir') self._check_config_dirs() + self._CONFIG_FILE = os.path.join(self.CONFIG_HOME, 'tarmac.conf') + self._CONFIG = ConfigParser() + self._CONFIG.read(self._CONFIG_FILE) + self._PROJECT = project def _check_config_dirs(self): '''Create the configuration directory if it doesn't exist.''' @@ -31,4 +52,38 @@ if not os.path.exists(os.path.expanduser('~/.config/tarmac/cachedir')): os.mkdir(os.path.expanduser('~/.config/tarmac/cachedir')) + @property + def commit_message_template(self): + '''Return the commit_message_template.''' + return self.get('commit_message_template') + + @property + def test_command(self): + '''Get the test_command from the stored config.''' + return self.get('test_command') + + @property + def cia_server(self): + '''Server for the CIA plugin.''' + return self.get('cia_server') + + @property + def cia_project(self): + '''Project for the CIA plugin.''' + return self.get('cia_project') + + @property + def log_file(self): + '''Get the log_file from config or return a default.''' + try: + return self._CONFIG.get(self._PROJECT, 'log_file') + except (NoOptionError, NoSectionError): + return os.path.join(self.CONFIG_HOME, self._PROJECT) + + def get(self, key): + '''Get a config value for the given key.''' + try: + return self._CONFIG.get(self._PROJECT, key) + except (NoOptionError, NoSectionError): + return None diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/tarmac/exceptions.py /tmp/MIkmk43Ogs/tarmac-0.2a/tarmac/exceptions.py --- tarmac-0.1/tarmac/exceptions.py 2009-03-04 06:18:44.000000000 +0000 +++ tarmac-0.2a/tarmac/exceptions.py 2009-07-10 21:28:28.000000000 +0100 @@ -1,7 +1,17 @@ -# Copyright (c) 2009 - Paul Hummer -'''Tarmac specific exceptions.''' - - -class NoCommitMessage(Exception): - '''No commit message was found for a merge proposal.''' +# Copyright 2009 Paul Hummer +# This file is part of Tarmac. +# +# Tarmac is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3 as +# published by +# the Free Software Foundation. +# +# Tarmac 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 Tarmac. If not, see . +'''Tarmac specific exceptions.''' diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/tarmac/hooks.py /tmp/MIkmk43Ogs/tarmac-0.2a/tarmac/hooks.py --- tarmac-0.1/tarmac/hooks.py 1970-01-01 01:00:00.000000000 +0100 +++ tarmac-0.2a/tarmac/hooks.py 2009-07-10 21:28:28.000000000 +0100 @@ -0,0 +1,53 @@ +# Copyright 2009 Paul Hummer +# This file is part of Tarmac. +# +# Tarmac is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3 as +# published by +# the Free Software Foundation. +# +# Tarmac 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 Tarmac. If not, see . + +'''Hooks for Tarmac.''' + +from bzrlib import hooks + + +class TarmacHookPoint(hooks.HookPoint): + '''A special HookPoint for Tarmac. + + This HookPoint implements a fire method that the bzrlib.hooks.HookPoint + doesn't have. If this turns out to be helpful, than a patch to Bazaar + should be made to implement it in Bazaar. + ''' + + def fire(self, *args, **kwargs): + '''Fire all registered hooks for self.''' + for hook in self: + hook(*args, **kwargs) + + +class TarmacHookRegistry(hooks.Hooks): + '''Hooks for Tarmac.''' + + def __init__(self): + hooks.Hooks.__init__(self) + + self.create_hook(TarmacHookPoint('pre_tarmac_commit', + 'Called right after Tarmac checks out and merges in a new ' + 'branch, but before committing.', + (1, 14, 0), False)) + + self.create_hook(TarmacHookPoint('post_tarmac_commit', + 'Called right after Tarmac commits the merged revision', + (1, 14, 0), False)) + + +tarmac_hooks = TarmacHookRegistry() + diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/tarmac/__init__.py /tmp/MIkmk43Ogs/tarmac-0.2a/tarmac/__init__.py --- tarmac-0.1/tarmac/__init__.py 2009-03-04 06:18:44.000000000 +0000 +++ tarmac-0.2a/tarmac/__init__.py 2009-07-10 21:28:28.000000000 +0100 @@ -1,6 +1,21 @@ -# Copyright (c) 2009 - Paul Hummer +# Copyright 2009 Paul Hummer +# This file is part of Tarmac. +# +# Tarmac is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3 as +# published by +# the Free Software Foundation. +# +# Tarmac 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 Tarmac. If not, see . + '''Tarmac - A tool for controlling the landing of Launchpad branches.''' -__version__ = u'0.1' +__version__ = u'0.2a' __copyright__ = u'Paul Hummer ' diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/tarmac/plugin.py /tmp/MIkmk43Ogs/tarmac-0.2a/tarmac/plugin.py --- tarmac-0.1/tarmac/plugin.py 1970-01-01 01:00:00.000000000 +0100 +++ tarmac-0.2a/tarmac/plugin.py 2009-07-10 21:28:28.000000000 +0100 @@ -0,0 +1,76 @@ +# This file is part of Tarmac. +# +# Tarmac is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3 as +# published by +# the Free Software Foundation. +# +# Tarmac 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 Tarmac. If not, see . + +'''Plugin utilities for Tarmac.''' +# pylint: disable-msg=W0122,W0612 + +import imp +import os + +from tarmac import plugins as _mod_plugins + +# XXX: rockstar - There should be a way to load from ENV as well. +TARMAC_PLUGIN_PATHS = [ + os.path.expanduser('~/.config/tarmac/plugins'), + os.path.join(os.path.dirname(__file__), 'plugins')] + +def load_plugins(): + '''Load the plugins for Tarmac.''' + + valid_suffixes = [suffix for suffix, mod_type, flags in imp.get_suffixes() + if flags in (imp.PY_SOURCE, imp.PY_COMPILED)] + package_entries = ['__init__' + suffix for suffix in valid_suffixes] + + plugin_names = set() + for path in TARMAC_PLUGIN_PATHS: + try: + for _file in os.listdir(path): + full_path = os.path.join(path, _file) + if os.path.isdir(full_path): + for entry in package_entries: + if os.path.isfile(os.path.join(full_path, entry)): + # This directory is definitely a package + break + else: + continue + + else: + if _file.startswith('.'): + continue # Hidden file, should be ignored. + for suffix_info in imp.get_suffixes(): + if _file.endswith(suffix_info[0]): + _file = _file[:-len(suffix_info[0])] + if (suffix_info[2] == imp.C_EXTENSION and + _file.endswith('module')): + _file = _file[:-len('module')] + break + else: + continue + + if _file == '__init__': + continue + elif getattr(_mod_plugins, _file, None): + continue # Plugin is already loaded. + else: + plugin_names.add(_file) + except OSError: # Usually the dir does not exist + continue + + for name in plugin_names: + try: + exec 'import tarmac.plugins.%s' % name in {} + except KeyboardInterrupt: + raise + diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/tarmac/plugins/ciavc.py /tmp/MIkmk43Ogs/tarmac-0.2a/tarmac/plugins/ciavc.py --- tarmac-0.1/tarmac/plugins/ciavc.py 1970-01-01 01:00:00.000000000 +0100 +++ tarmac-0.2a/tarmac/plugins/ciavc.py 2009-07-10 21:28:28.000000000 +0100 @@ -0,0 +1,88 @@ +# Copyright 2009 Paul Hummer +# This file is part of Tarmac. +# +# Tarmac is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3 as +# published by +# the Free Software Foundation. +# +# Tarmac 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 Tarmac. If not, see . + +'''Tarmac plugin for enforcing a commit message format. + +This code is derived from Jelmer Vernooij's CIA script for Bazaar that is found +at http://samba.org/~jelmer/bzr/cia_bzr.py and modified to fit within the needs +of Tarmac. +''' + +import xmlrpclib +from xml.sax import saxutils + +from tarmac.hooks import tarmac_hooks +from tarmac.plugins import TarmacPlugin +from tarmac import __version__ as version_string + + +class CIAVC(TarmacPlugin): + '''Tarmac plugin for notifying CIA.vc of new commits.''' + + def __call__(self, options, configuration, candidate, trunk): + # pylint: disable-msg=W0613,W0104,C0324 + + if (configuration.cia_project and configuration.cia_server): + cia_project = configuration.cia_project + cia_server = configuration.cia_server + else: + return + + revno = trunk.branch.revno() + files = [] + delta = trunk.branch.get_revision_delta(revno) + + [files.append(f) for (f,_x,_x) in delta.added] + [files.append(f) for (f,_x,_x) in delta.removed] + [files.append(f) for (_x,f,_x,_x,_x,_x) in delta.renamed] + [files.append(f) for (f,_x,_x,_x,_x) in delta.modified] + + message = ''' + + + Tarmac + %(version)s + http://launchpad.net/tarmac + + + %(project)s + %(branch)s + + + + %(revision)s + %(files)s + %(author)s + %(commit_message)s + + + + ''' % { + 'version': version_string, + 'project': cia_project, + 'branch': trunk.lp_branch.bzr_identity, + 'revision': revno, + 'files': '\n'.join([ + '%s' % saxutils.escape(f) for f in files]), + 'author': saxutils.escape( + candidate.source_branch.owner.display_name), + 'commit_message': saxutils.escape(candidate.commit_message)} + + print "Updating cvs.vc for project " + cia_project + xmlrpclib.ServerProxy(cia_server).hub.deliver(message) + +tarmac_hooks['post_tarmac_commit'].hook(CIAVC(), 'CIA.vc plugin.') + diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/tarmac/plugins/commitmessage.py /tmp/MIkmk43Ogs/tarmac-0.2a/tarmac/plugins/commitmessage.py --- tarmac-0.1/tarmac/plugins/commitmessage.py 1970-01-01 01:00:00.000000000 +0100 +++ tarmac-0.2a/tarmac/plugins/commitmessage.py 2009-07-10 21:28:28.000000000 +0100 @@ -0,0 +1,47 @@ +# Copyright 2009 Paul Hummer +# This file is part of Tarmac. +# +# Tarmac is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3 as +# published by +# the Free Software Foundation. +# +# Tarmac 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 Tarmac. If not, see . + +'''Tarmac plugin for enforcing a commit message format.''' +from tarmac.hooks import tarmac_hooks +from tarmac.plugins import TarmacPlugin + + +class CommitMessageTemplate(TarmacPlugin): + '''Tarmac plugin for modifying the commit message to adhere to a template. + + This plugin checks for a commit_message_template specific to the project. + If to finds one, it will locally change the commit message to use the + template. + ''' + + def __call__(self, options, configuration, candidate, trunk): + # pylint: disable-msg=W0613 + + if configuration.commit_message_template: + self.template = configuration.commit_message_template + self.template = self.template.replace('<', '%(').replace( + '>', ')s') + else: + self.template = '%(commit_message)s' + + candidate.commit_message = self.template % { + 'author': candidate.source_branch.owner.display_name, + 'commit_message': candidate.commit_message, + 'reviewer': candidate.reviewer.display_name} + +tarmac_hooks['pre_tarmac_commit'].hook(CommitMessageTemplate(), + 'Commit messsage template editor.') + diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/tarmac/plugins/__init__.py /tmp/MIkmk43Ogs/tarmac-0.2a/tarmac/plugins/__init__.py --- tarmac-0.1/tarmac/plugins/__init__.py 1970-01-01 01:00:00.000000000 +0100 +++ tarmac-0.2a/tarmac/plugins/__init__.py 2009-07-10 21:28:28.000000000 +0100 @@ -0,0 +1,22 @@ +# Copyright 2009 Paul Hummer +# This file is part of Tarmac. +# +# Tarmac is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3 as +# published by +# the Free Software Foundation. +# +# Tarmac 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 Tarmac. If not, see . + +'''Tarmac supported plugins.''' + + +class TarmacPlugin(object): + '''Abstract class for Tarmac plugins.''' + diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/tarmac/plugins/runtest.py /tmp/MIkmk43Ogs/tarmac-0.2a/tarmac/plugins/runtest.py --- tarmac-0.1/tarmac/plugins/runtest.py 1970-01-01 01:00:00.000000000 +0100 +++ tarmac-0.2a/tarmac/plugins/runtest.py 2009-07-10 21:28:28.000000000 +0100 @@ -0,0 +1,82 @@ +# Copyright 2009 Paul Hummer +# This file is part of Tarmac. +# +# Tarmac is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3 as +# published by +# the Free Software Foundation. +# +# Tarmac 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 Tarmac. If not, see . + +'''Tarmac plugin for running tests pre-commit.''' +import os +import subprocess + +from bzrlib.errors import HookFailed + +from tarmac.hooks import tarmac_hooks +from tarmac.plugins import TarmacPlugin + + +class RunTest(TarmacPlugin): + '''Tarmac plugin for running a test command. + + This plugin checks for a config setting specific to the project. If it + finds one, it will run that command pre-commit. On fail, it calls the + do_failed method, and on success, continues. + ''' + #TODO: Add the specific config it checks for. + #TODO: Add the ability to override the test command in the command line. + + def __call__(self, options, configuration, candidate, trunk): + + if options.test_command: + self.test_command = options.test_command + elif configuration.test_command: + self.test_command = configuration.test_command + else: + return True + + self.candidate = candidate + + cwd = os.getcwd() + os.chdir(trunk.temporary_dir) + print 'Running test command: %s' % self.test_command + proc = subprocess.Popen( + self.test_command, + shell=True, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout_value, stderr_value = proc.communicate() + return_code = proc.wait() + os.chdir(cwd) + + if return_code == 0: + return + + else: + self.do_failed(stdout_value, stderr_value) + raise HookFailed('runtest hook failed') + + def do_failed(self, stdout_value, stderr_value): + '''Perform failure tests. + + In this case, the output of the test command is posted as a comment, + and the merge proposal is then set to "Needs review" so that Tarmac + doesn't attempt to merge it again without human interaction. An + exception is then raised to prevent the commit from happening. + ''' + comment = u'\n'.join([stdout_value, stderr_value]) + self.candidate.createComment(subject="Failed test command", + content=comment) + self.candidate.queue_status = u'Needs review' + self.candidate.lp_save() + + +tarmac_hooks['pre_tarmac_commit'].hook(RunTest(), 'Test run hook') diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/tarmac/tests/__init__.py /tmp/MIkmk43Ogs/tarmac-0.2a/tarmac/tests/__init__.py --- tarmac-0.1/tarmac/tests/__init__.py 2009-03-04 06:18:44.000000000 +0000 +++ tarmac-0.2a/tarmac/tests/__init__.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -# Copyright (c) 2009 - Paul Hummer -'''Tests for Tarmac!''' diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/tarmac/tests/test_scripts.py /tmp/MIkmk43Ogs/tarmac-0.2a/tarmac/tests/test_scripts.py --- tarmac-0.1/tarmac/tests/test_scripts.py 2009-03-04 06:18:44.000000000 +0000 +++ tarmac-0.2a/tarmac/tests/test_scripts.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,73 +0,0 @@ -# Copyright (c) 2009 - Paul Hummer -'''Tests for Tarmac scripts.''' -__metaclass__ = type - -import sys -import unittest - -from tarmac.bin import TarmacLander -from tarmac.exceptions import NoCommitMessage - - -class MockBMPComment: - '''A mock merge proposal comment.''' - - def __init__(self, _id): - title = 'This is a title %s.' % _id - message_body = 'This is a comment %s.' % _id - - -def make_comment_list(count=5): - '''Make a list of comments.''' - comments = [] - for i in range(0, count): - comments.append(MockBMPComment(i)) - return comments - - -class TestTarmacLander(unittest.TestCase): - '''Tests for TarmacLander.''' - - def test_lander_dry_run(self): - '''Test that setting --dry-run sets the dry_run property.''' - sys.argv = ['', 'foo', '--dry-run'] - script = TarmacLander() - self.assertTrue(script.dry_run) - - def test_lander_project(self): - '''Test that the project argument gets handled properly.''' - sys.argv = ['', 'foo'] - script = TarmacLander() - self.assertEqual(script.project, u'foo') - - def test_find_commit_message_from_title(self): - '''Test getting a commit message from a title.''' - script = TarmacLander() - comments = make_comment_list() - - comments[4].title = u'Commit message' - comments[4].message_body = u'All your base...' - - commit_message = script._find_commit_message(comments) - self.assertEqual(commit_message, u'All your base...') - - def test_find_commit_mesage_from_message_body(self): - '''Test getting a commit message from a message_body.''' - script = TarmacLander() - comments = make_comment_list() - - comments[4].message_body = u'Commit message: I\'m in ur code.' - - commit_message = script._find_commit_message(comments) - self.assertEqual(commit_message, u'I\'m in ur code.') - - def test_find_commit_message_no_commit_message(self): - '''Test that _find_commit_message raises NoCommentFound.''' - script = TarmacLander() - comments = make_comment_list() - - self.assertRaises( - NoCommitMessage, - script._find_commit_message, comments) - - diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/tarmac/utils.py /tmp/MIkmk43Ogs/tarmac-0.2a/tarmac/utils.py --- tarmac-0.1/tarmac/utils.py 2009-03-04 06:18:44.000000000 +0000 +++ tarmac-0.2a/tarmac/utils.py 2009-07-10 21:28:28.000000000 +0100 @@ -1,20 +1,44 @@ -# Copyright (c) 2009 - Paul Hummer +# Copyright 2009 Paul Hummer +# This file is part of Tarmac. +# +# Tarmac is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3 as +# published by +# the Free Software Foundation. +# +# Tarmac 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 Tarmac. If not, see . + '''Utilities for Tarmac, mostly dealing with Launchpad.''' import os -from launchpadlib.launchpad import Credentials, Launchpad, EDGE_SERVICE_ROOT +from launchpadlib.launchpad import (Credentials, Launchpad, EDGE_SERVICE_ROOT, + STAGING_SERVICE_ROOT) -def get_launchpad_object(config): +def get_launchpad_object(config, filename=None, staging=False): '''Return an autheticated launchpad API object.''' - if not os.path.exists(config.CREDENTIALS): + if not filename: + filename = config.CREDENTIALS + + if staging: + SERVICE_ROOT = STAGING_SERVICE_ROOT + else: + SERVICE_ROOT = EDGE_SERVICE_ROOT + + if not os.path.exists(filename): launchpad = Launchpad.get_token_and_login('Tarmac', - EDGE_SERVICE_ROOT, config.CACHEDIR) - launchpad.credentials.save(file(config.CREDENTIALS, 'w')) + SERVICE_ROOT, config.CACHEDIR) + launchpad.credentials.save(file(filename, 'w')) else: credentials = Credentials() - credentials.load(open(config.CREDENTIALS)) - launchpad = Launchpad(credentials, EDGE_SERVICE_ROOT, + credentials.load(open(filename)) + launchpad = Launchpad(credentials, SERVICE_ROOT, config.CACHEDIR) return launchpad diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/tarmac-authenticate /tmp/MIkmk43Ogs/tarmac-0.2a/tarmac-authenticate --- tarmac-0.1/tarmac-authenticate 1970-01-01 01:00:00.000000000 +0100 +++ tarmac-0.2a/tarmac-authenticate 2009-07-10 21:28:28.000000000 +0100 @@ -0,0 +1,24 @@ +#!/usr/bin/env python +# Copyright 2009 Paul Hummer +# +# This file is part of Tarmac. +# +# Tarmac is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3 as +# published by +# the Free Software Foundation. +# +# Tarmac 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 Tarmac. If not, see . + +from tarmac.bin import TarmacAuthenticate + +if __name__ == '__main__': + script = TarmacAuthenticate() + script.main() + diff -Nru /tmp/OnaTN4O2UD/tarmac-0.1/tarmac-lander /tmp/MIkmk43Ogs/tarmac-0.2a/tarmac-lander --- tarmac-0.1/tarmac-lander 2009-03-04 06:18:44.000000000 +0000 +++ tarmac-0.2a/tarmac-lander 2009-07-10 21:28:28.000000000 +0100 @@ -1,5 +1,21 @@ -# Copyright (c) 2009 - Paul Hummer #!/usr/bin/env python +# Copyright 2009 Paul Hummer +# +# This file is part of Tarmac. +# +# Tarmac is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3 as +# published by +# the Free Software Foundation. +# +# Tarmac 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 Tarmac. If not, see . + from tarmac.bin import TarmacLander if __name__ == '__main__':