javahelp/org/nbgit/docs/about.html javahelp/org/nbgit/docs/credits.html javahelp/org/nbgit/docs/helpset.xml javahelp/org/nbgit/docs/index.xml javahelp/org/nbgit/docs/issues.html javahelp/org/nbgit/docs/map.xml javahelp/org/nbgit/docs/news.html javahelp/org/nbgit/docs/toc.xml release/modules/ext/com-jcraft-jsch.LICENSE.txt release/modules/ext/com-jcraft-jsch.jar release/modules/ext/org-spearce-jgit.LICENSE.txt release/modules/ext/org-spearce-jgit.jar src/org/nbgit/Bundle.properties src/org/nbgit/DiskMapTurboProvider.java src/org/nbgit/Git.java src/org/nbgit/GitAnnotator.java src/org/nbgit/GitInterceptor.java src/org/nbgit/GitModuleConfig.java src/org/nbgit/GitProgressSupport.java src/org/nbgit/GitRepository.java src/org/nbgit/GitVCS.java src/org/nbgit/OutputLogger.java src/org/nbgit/StatusCache.java src/org/nbgit/StatusInfo.java src/org/nbgit/options/Bundle.properties src/org/nbgit/options/GitAdvancedOption.java src/org/nbgit/options/GitExtProperties.java src/org/nbgit/options/GitOptionsPanelController.java src/org/nbgit/options/GitPanel.form src/org/nbgit/options/GitPanel.java src/org/nbgit/options/LabelsPanel.form src/org/nbgit/options/LabelsPanel.java src/org/nbgit/options/PropertiesPanel.form src/org/nbgit/options/PropertiesPanel.java src/org/nbgit/options/PropertiesTable.java src/org/nbgit/options/PropertiesTableModel.java src/org/nbgit/resources/Bundle.properties src/org/nbgit/resources/annotation.xml src/org/nbgit/resources/helpset.xml src/org/nbgit/resources/icons/commit.png src/org/nbgit/resources/icons/conflicts-badge.png src/org/nbgit/resources/icons/diff-next.png src/org/nbgit/resources/icons/diff-prev.png src/org/nbgit/resources/icons/diff.png src/org/nbgit/resources/icons/ending_revision.png src/org/nbgit/resources/icons/gitvcs-icon.png src/org/nbgit/resources/icons/modified-badge.png src/org/nbgit/resources/icons/onefolder.png src/org/nbgit/resources/icons/recent_messages.png src/org/nbgit/resources/icons/refresh.png src/org/nbgit/resources/icons/sinceorigin.png src/org/nbgit/resources/icons/starting_revision.png src/org/nbgit/resources/icons/twofolders.png src/org/nbgit/resources/icons/update.png src/org/nbgit/resources/icons/versioning-view.png src/org/nbgit/resources/layer.xml src/org/nbgit/resources/settings.xml src/org/nbgit/resources/wstcref.xml src/org/nbgit/ui/ContextAction.java src/org/nbgit/ui/GitFileNode.java src/org/nbgit/ui/commit/Bundle.properties src/org/nbgit/ui/commit/CommitAction.java src/org/nbgit/ui/commit/CommitOptions.java src/org/nbgit/ui/commit/CommitPanel.form src/org/nbgit/ui/commit/CommitPanel.java src/org/nbgit/ui/commit/CommitTable.java src/org/nbgit/ui/commit/CommitTableModel.java src/org/nbgit/ui/commit/ExcludeFromCommitAction.java src/org/nbgit/ui/diff/Bundle.properties src/org/nbgit/ui/diff/DiffAction.java src/org/nbgit/ui/diff/DiffFileTable.java src/org/nbgit/ui/diff/DiffNode.java src/org/nbgit/ui/diff/DiffSetupSource.java src/org/nbgit/ui/diff/DiffStreamSource.java src/org/nbgit/ui/diff/DiffTopComponent.java src/org/nbgit/ui/diff/MultiDiffPanel.form src/org/nbgit/ui/diff/MultiDiffPanel.java src/org/nbgit/ui/diff/Setup.java src/org/nbgit/ui/diff/VerticalFlowLayout.java src/org/nbgit/ui/init/Bundle.properties src/org/nbgit/ui/init/InitAction.java src/org/nbgit/ui/log/Bundle.properties src/org/nbgit/ui/log/DiffResultsView.java src/org/nbgit/ui/log/DiffTreeTable.java src/org/nbgit/ui/log/Divider.java src/org/nbgit/ui/log/GitLogMessageChangedPath.java src/org/nbgit/ui/log/LogAction.java src/org/nbgit/ui/log/RepositoryRevision.java src/org/nbgit/ui/log/RevisionNode.java src/org/nbgit/ui/log/RevisionNodeChildren.java src/org/nbgit/ui/log/SearchCriteriaPanel.form src/org/nbgit/ui/log/SearchCriteriaPanel.java src/org/nbgit/ui/log/SearchExecutor.java src/org/nbgit/ui/log/SearchHistoryAction.java src/org/nbgit/ui/log/SearchHistoryPanel.form src/org/nbgit/ui/log/SearchHistoryPanel.java src/org/nbgit/ui/log/SearchHistoryTopComponent.java src/org/nbgit/ui/log/SummaryView.java src/org/nbgit/ui/properties/Bundle.properties src/org/nbgit/ui/properties/GitProperties.java src/org/nbgit/ui/properties/GitPropertiesNode.java src/org/nbgit/ui/properties/PropertiesAction.java src/org/nbgit/ui/properties/PropertiesPanel.form src/org/nbgit/ui/properties/PropertiesPanel.java src/org/nbgit/ui/properties/PropertiesTable.java src/org/nbgit/ui/properties/PropertiesTableModel.java src/org/nbgit/ui/status/Bundle.properties src/org/nbgit/ui/status/GitVersioningTopComponent.java src/org/nbgit/ui/status/OpenInEditorAction.java src/org/nbgit/ui/status/OpenVersioningAction.java src/org/nbgit/ui/status/ShowAllChangesAction.java src/org/nbgit/ui/status/StatusAction.java src/org/nbgit/ui/status/SyncFileNode.java src/org/nbgit/ui/status/SyncTable.java src/org/nbgit/ui/status/VersioningPanel.form src/org/nbgit/ui/status/VersioningPanel.java src/org/nbgit/ui/update/Bundle.properties src/org/nbgit/ui/update/ConflictResolvedAction.java src/org/nbgit/ui/update/ResolveConflictsAction.java src/org/nbgit/ui/update/ResolveConflictsExecutor.java src/org/nbgit/ui/update/RevertModifications.java src/org/nbgit/ui/update/RevertModificationsAction.java src/org/nbgit/ui/update/RevertModificationsPanel.form src/org/nbgit/ui/update/RevertModificationsPanel.java src/org/nbgit/ui/update/Update.java src/org/nbgit/ui/update/UpdateAction.java src/org/nbgit/ui/update/UpdatePanel.form src/org/nbgit/ui/update/UpdatePanel.java src/org/nbgit/util/Bundle.properties src/org/nbgit/util/GitCommand.java src/org/nbgit/util/GitIgnore.java src/org/nbgit/util/GitProjectUtils.java src/org/nbgit/util/GitUtils.java src/org/nbgit/util/HtmlFormatter.java @@ -1,2 +1,2 @@ -build -nbproject/private +build/ +nbproject/private/ .gitignore @@ -1,278 +1,827 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) 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 -this service 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 make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. 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. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + +1. Definitions. + +1.1. "Contributor" means each individual or entity that +creates or contributes to the creation of Modifications. +spec.version.base=1.7.0 + +1.2. "Contributor Version" means the combination of the +Original Software, prior Modifications used by a +Contributor (if any), and the Modifications made by that +particular Contributor. + +1.3. "Covered Software" means (a) the Original Software, or +(b) Modifications, or (c) the combination of files +containing Original Software with files containing +Modifications, in each case including portions thereof. + +1.4. "Executable" means the Covered Software in any form +other than Source Code. + +1.5. "Initial Developer" means the individual or entity +that first makes Original Software available under this +License. + +1.6. "Larger Work" means a work which combines Covered +Software or portions thereof with code not governed by the +terms of this License. + +1.7. "License" means this document. + +1.8. "Licensable" means having the right to grant, to the +maximum extent possible, whether at the time of the initial +grant or subsequently acquired, any and all of the rights +conveyed herein. + +1.9. "Modifications" means the Source Code and Executable +form of any of the following: + +A. Any file that results from an addition to, +deletion from or modification of the contents of a +file containing Original Software or previous +Modifications; + +B. Any new file that contains any part of the +Original Software or previous Modification; or + +C. Any new file that is contributed or otherwise made +available under the terms of this License. + +1.10. "Original Software" means the Source Code and +Executable form of computer software code that is +originally released under this License. + +1.11. "Patent Claims" means any patent claim(s), now owned +or hereafter acquired, including without limitation, +method, process, and apparatus claims, in any patent +Licensable by grantor. + +1.12. "Source Code" means (a) the common form of computer +software code in which modifications are made and (b) +associated documentation included in or with such code. + +1.13. "You" (or "Your") means an individual or a legal +entity exercising rights under, and complying with all of +the terms of, this License. For legal entities, "You" +includes any entity which controls, is controlled by, or is +under common control with You. For purposes of this +definition, "control" means (a) the power, direct or +indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (b) ownership +of more than fifty percent (50%) of the outstanding shares +or beneficial ownership of such entity. + +2. License Grants. + +2.1. The Initial Developer Grant. + +Conditioned upon Your compliance with Section 3.1 below and +subject to third party intellectual property claims, the +Initial Developer hereby grants You a world-wide, +royalty-free, non-exclusive license: + +(a) under intellectual property rights (other than +patent or trademark) Licensable by Initial Developer, +to use, reproduce, modify, display, perform, +sublicense and distribute the Original Software (or +portions thereof), with or without Modifications, +and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, +using or selling of Original Software, to make, have +made, use, practice, sell, and offer for sale, and/or +otherwise dispose of the Original Software (or +portions thereof). + +(c) The licenses granted in Sections 2.1(a) and (b) +are effective on the date Initial Developer first +distributes or otherwise makes the Original Software +available to a third party under the terms of this +License. + +(d) Notwithstanding Section 2.1(b) above, no patent +license is granted: (1) for code that You delete from +the Original Software, or (2) for infringements +caused by: (i) the modification of the Original +Software, or (ii) the combination of the Original +Software with other software or devices. + +2.2. Contributor Grant. + +Conditioned upon Your compliance with Section 3.1 below and +subject to third party intellectual property claims, each +Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than +patent or trademark) Licensable by Contributor to +use, reproduce, modify, display, perform, sublicense +and distribute the Modifications created by such +Contributor (or portions thereof), either on an +unmodified basis, with other Modifications, as +Covered Software and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, +using, or selling of Modifications made by that +Contributor either alone and/or in combination with +its Contributor Version (or portions of such +combination), to make, use, sell, offer for sale, +have made, and/or otherwise dispose of: (1) +Modifications made by that Contributor (or portions +thereof); and (2) the combination of Modifications +made by that Contributor with its Contributor Version +(or portions of such combination). + +(c) The licenses granted in Sections 2.2(a) and +2.2(b) are effective on the date Contributor first +distributes or otherwise makes the Modifications +available to a third party. + +(d) Notwithstanding Section 2.2(b) above, no patent +license is granted: (1) for any code that Contributor +has deleted from the Contributor Version; (2) for +infringements caused by: (i) third party +modifications of Contributor Version, or (ii) the +combination of Modifications made by that Contributor +with other software (except as part of the +Contributor Version) or other devices; or (3) under +Patent Claims infringed by Covered Software in the +absence of Modifications made by that Contributor. + +3. Distribution Obligations. + +3.1. Availability of Source Code. + +Any Covered Software that You distribute or otherwise make +available in Executable form must also be made available in +Source Code form and that Source Code form must be +distributed only under the terms of this License. You must +include a copy of this License with every copy of the +Source Code form of the Covered Software You distribute or +otherwise make available. You must inform recipients of any +such Covered Software in Executable form as to how they can +obtain such Covered Software in Source Code form in a +reasonable manner on or through a medium customarily used +for software exchange. + +3.2. Modifications. + +The Modifications that You create or to which You +contribute are governed by the terms of this License. You +represent that You believe Your Modifications are Your +original creation(s) and/or You have sufficient rights to +grant the rights conveyed by this License. + +3.3. Required Notices. + +You must include a notice in each of Your Modifications +that identifies You as the Contributor of the Modification. +You may not remove or alter any copyright, patent or +trademark notices contained within the Covered Software, or +any notices of licensing or any descriptive text giving +attribution to any Contributor or the Initial Developer. + +3.4. Application of Additional Terms. + +You may not offer or impose any terms on any Covered +Software in Source Code form that alters or restricts the +applicable version of this License or the recipients' +rights hereunder. You may choose to offer, and to charge a +fee for, warranty, support, indemnity or liability +obligations to one or more recipients of Covered Software. +However, you may do so only on Your own behalf, and not on +behalf of the Initial Developer or any Contributor. You +must make it absolutely clear that any such warranty, +support, indemnity or liability obligation is offered by +You alone, and You hereby agree to indemnify the Initial +Developer and every Contributor for any liability incurred +by the Initial Developer or such Contributor as a result of +warranty, support, indemnity or liability terms You offer. + +3.5. Distribution of Executable Versions. + +You may distribute the Executable form of the Covered +Software under the terms of this License or under the terms +of a license of Your choice, which may contain terms +different from this License, provided that You are in +compliance with the terms of this License and that the +license for the Executable form does not attempt to limit +or alter the recipient's rights in the Source Code form +from the rights set forth in this License. If You +distribute the Covered Software in Executable form under a +different license, You must make it absolutely clear that +any terms which differ from this License are offered by You +alone, not by the Initial Developer or Contributor. You +hereby agree to indemnify the Initial Developer and every +Contributor for any liability incurred by the Initial +Developer or such Contributor as a result of any such terms +You offer. + +3.6. Larger Works. + +You may create a Larger Work by combining Covered Software +with other code not governed by the terms of this License +and distribute the Larger Work as a single product. In such +a case, You must make sure the requirements of this License +are fulfilled for the Covered Software. + +4. Versions of the License. + +4.1. New Versions. + +Sun Microsystems, Inc. is the initial license steward and +may publish revised and/or new versions of this License +from time to time. Each version will be given a +distinguishing version number. Except as provided in +Section 4.3, no one other than the license steward has the +right to modify this License. + +4.2. Effect of New Versions. + +You may always continue to use, distribute or otherwise +make the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. If the Initial Developer includes a +notice in the Original Software prohibiting it from being +distributed or otherwise made available under any +subsequent version of the License, You must distribute and +make the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. Otherwise, You may also choose to +use, distribute or otherwise make the Covered Software +available under the terms of any subsequent version of the +License published by the license steward. + +4.3. Modified Versions. + +When You are an Initial Developer and You want to create a +new license for Your Original Software, You may create and +use a modified version of this License if You: (a) rename +the license and remove any references to the name of the +license steward (except to note that the license differs +from this License); and (b) otherwise make it clear that +the license contains terms which differ from this License. + +5. DISCLAIMER OF WARRANTY. + +COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" +BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED +SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR +PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY +COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE +INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF +ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF +WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF +ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS +DISCLAIMER. + +6. TERMINATION. + +6.1. This License and the rights granted hereunder will +terminate automatically if You fail to comply with terms +herein and fail to cure such breach within 30 days of +becoming aware of the breach. Provisions which, by their +nature, must remain in effect beyond the termination of +this License shall survive. + +6.2. If You assert a patent infringement claim (excluding +declaratory judgment actions) against Initial Developer or +a Contributor (the Initial Developer or Contributor against +whom You assert such claim is referred to as "Participant") +alleging that the Participant Software (meaning the +Contributor Version where the Participant is a Contributor +or the Original Software where the Participant is the +Initial Developer) directly or indirectly infringes any +patent, then any and all rights granted directly or +indirectly to You by such Participant, the Initial +Developer (if the Initial Developer is not the Participant) +and all Contributors under Sections 2.1 and/or 2.2 of this +License shall, upon 60 days notice from Participant +terminate prospectively and automatically at the expiration +of such 60 day notice period, unless if within such 60 day +period You withdraw Your claim with respect to the +Participant Software against such Participant either +unilaterally or pursuant to a written agreement with +Participant. + +6.3. If You assert a patent infringement claim against +Participant alleging that the Participant Software directly +or indirectly infringes any patent where such claim is +resolved (such as by license or settlement) prior to the +initiation of patent infringement litigation, then the +reasonable value of the licenses granted by such Participant +under Sections 2.1 or 2.2 shall be taken into account in +determining the amount or value of any payment or license. + +6.4. In the event of termination under Sections 6.1 or 6.2 +above, all end user licenses that have been validly granted +by You or any distributor hereunder prior to termination +(excluding licenses granted to You by any distributor) +shall survive termination. + +7. LIMITATION OF LIABILITY. + +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT +(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE +INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF +COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE +LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR +CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT +LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK +STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER +COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN +INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF +LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL +INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT +APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO +NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR +CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT +APPLY TO YOU. + +8. U.S. GOVERNMENT END USERS. + +The Covered Software is a "commercial item," as that term is +defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial +computer software" (as that term is defined at 48 C.F.R. +§ 252.227-7014(a)(1)) and "commercial computer software +documentation" as such terms are used in 48 C.F.R. 12.212 (Sept. +1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 +through 227.7202-4 (June 1995), all U.S. Government End Users +acquire Covered Software with only those rights set forth herein. +This U.S. Government Rights clause is in lieu of, and supersedes, +any other FAR, DFAR, or other clause or provision that addresses +Government rights in computer software under this License. + +9. MISCELLANEOUS. + +This License represents the complete agreement concerning subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the +extent necessary to make it enforceable. This License shall be +governed by the law of the jurisdiction specified in a notice +contained within the Original Software (except to the extent +applicable law, if any, provides otherwise), excluding such +jurisdiction's conflict-of-law provisions. Any litigation +relating to this License shall be subject to the jurisdiction of +the courts located in the jurisdiction and venue specified in a +notice contained within the Original Software, with the losing +party responsible for costs, including, without limitation, court +costs and reasonable attorneys' fees and expenses. The +application of the United Nations Convention on Contracts for the +International Sale of Goods is expressly excluded. Any law or +regulation which provides that the language of a contract shall +be construed against the drafter shall not apply to this License. +You agree that You alone are responsible for compliance with the +United States export administration regulations (and the export +control laws and regulation of any other countries) when You use, +distribute or otherwise make available any Covered Software. + +10. RESPONSIBILITY FOR CLAIMS. + +As between Initial Developer and the Contributors, each party is +responsible for claims and damages arising, directly or +indirectly, out of its utilization of rights under this License +and You agree to work with Initial Developer and Contributors to +distribute such responsibility on an equitable basis. Nothing +herein is intended or shall be deemed to constitute any admission +of liability. + +NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND +DISTRIBUTION LICENSE (CDDL) + +The code released under the CDDL shall be governed by the laws +of the State of California (excluding conflict-of-law provisions). +Any litigation relating to this License shall be subject to the +jurisdiction of the Federal Courts of the Northern District of +California and the state courts of the State of California, with +venue lying in Santa Clara County, California. + + +The GNU General Public License (GPL) +Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim + copies of this license document, but changing it is not + allowed. + + Preamble + +The licenses for most software are designed to take away +your freedom to share and change it. By contrast, the GNU +General Public License is intended to guarantee your freedom +to share and change free software--to make sure the software +is free for all its users. This General Public License +applies to most of the Free Software Foundation's software +and to any other program whose authors commit to using it. +(Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) 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 this service 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 make restrictions that +forbid anyone to deny you these rights or to ask you to +surrender the rights. These restrictions translate to +certain responsibilities for you if you distribute copies of +the software, or if you modify it. + +For example, if you distribute copies of such a program, +whether gratis or for a fee, you must give the recipients +all the rights that you have. 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. + +We protect your rights with two steps: (1) copyright the +software, and (2) offer you this license which gives you +legal permission to copy, distribute and/or modify the +software. + +Also, for each author's protection and ours, we want to make +certain that everyone understands that there is no warranty +for this free software. If the software is modified by +someone else and passed on, we want its recipients to know +that what they have is not the original, so that any +problems introduced by others will not reflect on the +original authors' reputations. + +Finally, any free program is threatened constantly by +software patents. We wish to avoid the danger that +redistributors of a free program will individually obtain +patent licenses, in effect making the program proprietary. +To prevent this, we have made it clear that any patent must +be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution +and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND +MODIFICATION + +0. This License applies to any program or other work which +contains a notice placed by the copyright holder saying it +may be distributed under the terms of this General Public +License. The "Program", below, refers to any such program or +work, and a "work based on the Program" means either the +Program or any derivative work under copyright law: that is +to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into +another language. (Hereinafter, translation is included +without limitation in the term "modification".) Each +licensee is addressed as "you". + +Activities other than copying, distribution and modification +are not covered by this License; they are outside its scope. +The act of running the Program is not restricted, and the +output from the Program is covered only if its contents +constitute a work based on the Program (independent of +having been made by running the Program). Whether that is +true depends on what the Program does. + +1. You may copy and distribute 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 and disclaimer of +warranty; keep intact all the notices that refer to this +License and to the absence of any warranty; and give any +other recipients of the Program a copy of this License along +with the Program. + +You may charge a fee for the physical act of transferring a +copy, and you may at your option offer warranty protection +in exchange for a fee. + +2. You may modify your copy or copies of the Program or any +portion of it, thus forming a work based on the Program, and +copy and distribute such modifications or work under the +terms of Section 1 above, provided that you also meet all of +these conditions: + + a) You must cause the modified files to carry prominent + notices stating that you changed the files and the date + of any change. + + b) You must cause any work that you distribute or + publish, that in whole or in part contains or is derived + from the Program or any part thereof, to be licensed as + a whole at no charge to all third parties under the + terms of this License. + + c) If the modified program normally reads commands + interactively when run, you must cause it, when started + running for such interactive use in the most ordinary + way, to print or display an announcement including an + appropriate copyright notice and a notice that there is + no warranty (or else, saying that you provide a + warranty) and that users may redistribute the program + under these conditions, and telling the user how to view + a copy of this License. (Exception: if the Program + itself is interactive but does not normally print such + an announcement, your work based on the Program is not + required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the +Program, and can be reasonably considered independent and +separate works in themselves, then this License, and its +terms, do not apply to those sections when you distribute +them as separate works. But when you distribute the same +sections as part of a whole which is a work based on the +Program, the distribution of the whole must be on the terms +of this License, whose permissions for other licensees +extend to the entire whole, and thus to each and every part +regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights +or contest your rights to work written entirely by you; +rather, the intent is to exercise the right to control the +distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on +the Program with the Program (or with a work based on the +Program) on a volume of a storage or distribution medium +does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based +on it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you +also do one of the following: + + a) Accompany it with the complete corresponding + machine-readable source code, which must be distributed + under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to + b) Accompany it with a written offer, valid for at least + three years, to give any third party, for a charge no + more than your cost of physically performing source + distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the + terms of Sections 1 and 2 above on a medium customarily + used for software interchange; or, + + c) Accompany it with the information you received as to + the offer to distribute corresponding source code. (This + alternative is allowed only for noncommercial + distribution and only if you received the program in + object code or executable form with such an offer, in + accord with Subsection b above.) + +The source code for a work means the preferred form of the +work for making modifications to it. For an executable work, +complete source code means all the source code for all +modules it contains, plus any associated interface +definition files, plus the scripts used to control +compilation and installation of the executable. However, as +a special exception, the source code distributed need not +include anything that is normally distributed (in either +source or binary form) with the major components (compiler, +kernel, and so on) of the operating system on which the +executable runs, unless that component itself accompanies +the executable. + +If distribution of executable or object code is made by +offering access to copy from a designated place, then +offering equivalent access to copy the source code from the +same place counts as distribution of the source code, even +though third parties are not compelled to copy the source +along with the object code. + +4. You may not copy, modify, sublicense, or distribute the +Program except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense or distribute +the Program is void, and will automatically terminate your +rights under this License. However, parties who have +received copies, or rights, from you under this License will +not have their licenses terminated so long as such parties +remain in full compliance. + +5. You are not required to accept this License, since you +have not signed it. However, nothing else grants you +permission to modify or distribute the Program or its +derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or +distributing the Program (or any work based on the Program), +you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or +modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based +on the Program), the recipient automatically receives a +license from the original licensor to copy, distribute or +modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the +recipients' exercise of the rights granted herein. You are +not responsible for enforcing compliance by third parties to this License. - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -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 -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to +7. If, as a consequence of a court judgment or allegation of +patent infringement or for any other reason (not limited to +patent issues), 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 distribute so as +to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a +consequence you may not distribute the Program at all. For +example, if a patent license would not permit royalty-free +redistribution of the Program by all those who receive +copies directly or indirectly through you, then the only way +you could satisfy both it and this License would be to refrain entirely from distribution of the Program. -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the 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 a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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, +If any portion of this section is held invalid or +unenforceable under any particular circumstance, the balance +of the section is intended to apply and the section as a +whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to +infringe any patents or other property right claims or to +contest validity of any such claims; this section has the +sole purpose of protecting the integrity of the free +software distribution system, which is implemented by public +license practices. Many people have made generous +contributions to the wide range of software distributed +through that system in reliance on consistent application of +that system; it is up to the author/donor to decide if he or +she is willing to distribute software through any other +system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is +believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is +restricted in certain countries either by patents or by +copyrighted interfaces, the original copyright holder who +places the Program under this License may add an explicit +geographical distribution limitation excluding those +countries, so that distribution is permitted only in or +among countries not thus excluded. In such case, this +License incorporates the limitation as if written in the +body of this License. + +9. The Free Software Foundation may publish revised and/or +new versions of the 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 a version number of this License which +applies to it and "any later version", you have the option +of following the terms and conditions either of that version +or of any later version published by the Free Software +Foundation. If the Program does not specify a version number +of this License, you may choose any version ever published +by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into +other free programs whose distribution conditions are +different, write to the author to ask for permission. For +software which is copyrighted by the Free Software +Foundation, write to the Free Software Foundation; we +sometimes make exceptions for this. Our decision will be +guided by the two goals of preserving the free status of all +derivatives of our free software and of promoting the +sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE 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. +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED +TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY +WHO MAY MODIFY AND/OR REDISTRIBUTE 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. + + 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 convey the exclusion of warranty; and each +file should have at least the "copyright" line and a pointer +to where the full notice is found. + + One line to give the program's name and a brief idea of + what it does. Copyright (C) <year> <name of author> + + 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 2 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, write to + the Free Software Foundation, Inc., 59 Temple Place, + Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and +paper mail. + +If the program is interactive, make it output a short notice +like this when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of + author Gnomovision 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, the commands you use may be called something other +than `show w' and `show c'; they could even be mouse-clicks +or menu items--whatever suits your program. + +You should also get your employer (if you work as a +programmer) or your school, if any, to sign a "copyright +disclaimer" for the program, if necessary. Here is a sample; +alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in + the program `Gnomovision' (which makes passes at + compilers) written by James Hacker. + + signature of Ty Coon, 1 April 1989 + Ty Coon, President of Vice + +This 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 Library General +Public License instead of this License. + + +"CLASSPATH" EXCEPTION TO THE GPL VERSION 2 + + +Certain source files distributed by Sun Microsystems, Inc. +are subject to the following clarification and special +exception to the GPL Version 2, but only where Sun has expressly +included in the particular source file's header the words +"Sun designates this particular file as subject to the +"Classpath" exception as provided by Sun in the License file +that accompanied this code." + +Linking this library statically or dynamically with other +modules is making a combined work based on this library. +Thus, the terms and conditions of the GNU General Public +License Version 2 cover the whole combination. + +As a special exception, the copyright holders of this +library give you permission to link this library with +independent modules to produce an executable, regardless of +the license terms of these independent modules, and to copy +and distribute the resulting executable under terms of your +choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license +of that module. An independent module is a module which is +not derived from or based on this library. If you modify +this library, you may extend this exception to your version +of the library, but you are not obligated to do so. If you +do not wish to do so, delete this exception statement from +your version. LICENSE @@ -1,3 +1,37 @@ -= NetBeans Git Module - -Please see README.markdown. \ No newline at end of file +Netbeans Git Plugin +=================== + +A versioning plugin for working with Git repositories in Netbeans. It supports +the basic tasks of status, diff, commit, and log viewing. + +It uses the JGit library for accessing repositories. To ease installation +a JGit jar is distributed with the project source in release/modules/ext/. + +More information and documentation are available in the form of JavaHelp files +which can be found under: + + - javahelp/org/nbgit/docs/ + +They will also be accessible via the Help menu when the plugin has been +installed. + +To download the latest version, check the current status of development, or +report an issue visit the project page at: + + - http://nbgit.googlecode.com/ + +Installation +------------ + +This module is still under development and thus may randomly crash, eat +all your memory, etc. So consider yourself warned! Before installing or +upgrading make sure you read the release notes and list of known issues. +They can be found in: + + - javahelp/org/nbgit/docs/news.html + - javahelp/org/nbgit/docs/issues.html + +To install from source clone the repository and use File > Open Project to +add it to your project list in Netbeans. Then right click on the new project +and select "Install/Reload in Development IDE". You are advised to first test +the plugin by "running" the project. README @@ -1,5 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project basedir="." default="netbeans" name="git"> - <description>Builds, tests, and runs the project org.netbeans.modules.git</description> - <import file="nbproject/build-impl.xml"/> -</project> +<?xml version="1.0" encoding="UTF-8"?> +<!-- You may freely edit this file. See harness/README in the NetBeans platform --> +<!-- for some information on what you could do (e.g. targets to override). --> +<!-- If you delete this file and reopen the project it will be recreated. --> +<project name="org.nbgit" default="netbeans" basedir="."> + <description>Builds, tests, and runs the project org.nbgit.</description> + <import file="nbproject/build-impl.xml"/> + <target name="netbeans-extra" depends="init"> + <mkdir dir="${cluster}/modules/ext"/> + <copy todir="${cluster}/modules/ext"> + <fileset dir="release/modules/ext"> + <include name="com-jcraft-jsch.jar"/> + <include name="org-spearce-jgit.jar"/> + </fileset> + </copy> + </target> +</project> build.xml @@ -1,7 +1,6 @@ Manifest-Version: 1.0 -AutoUpdate-Show-In-Client: true -OpenIDE-Module: org.netbeans.modules.git/1 -OpenIDE-Module-Layer: org/netbeans/modules/git/resources/git-layer.xml -OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/git/Bundle.properties +OpenIDE-Module: org.nbgit +OpenIDE-Module-Layer: org/nbgit/resources/layer.xml +OpenIDE-Module-Localizing-Bundle: org/nbgit/Bundle.properties OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help -OpenIDE-Module-Specification-Version: 1.0 +OpenIDE-Module-Specification-Version: 0.1 manifest.mf @@ -3,7 +3,7 @@ *** GENERATED FROM project.xml - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> -<project name="org.netbeans.modules.git-impl" basedir=".."> +<project name="org.nbgit-impl" basedir=".."> <property file="nbproject/private/platform-private.properties"/> <property file="nbproject/platform.properties"/> <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2"> nbproject/build-impl.xml @@ -1,8 +1,8 @@ -build.xml.data.CRC32=927c300d -build.xml.script.CRC32=7f9b0c3a -build.xml.stylesheet.CRC32=be360661 +build.xml.data.CRC32=a585200d +build.xml.script.CRC32=8cb5fa8c +build.xml.stylesheet.CRC32=79c3b980 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=f2cd4840 -nbproject/build-impl.xml.script.CRC32=191a2928 +nbproject/build-impl.xml.data.CRC32=d680144d +nbproject/build-impl.xml.script.CRC32=f20ded20 nbproject/build-impl.xml.stylesheet.CRC32=deb65f65 nbproject/genfiles.properties @@ -1,17 +1,11 @@ -javac.compilerargs=-Xlint:unchecked +javahelp.base=org/nbgit/docs +javahelp.hs=helpset.xml javac.source=1.5 -javahelp.base=org/netbeans/modules/git/docs -javahelp.hs=git-hs.xml - +javac.compilerargs=-Xlint -Xlint:-serial license.file=LICENSE - -nbm.homepage=http://open.ikonoklastik.com/ -nbm.module.author=Alex Coles -nbm.needs.restart=true - -#qa-unit -test.unit.cp.extra= -test.unit.run.cp.extra= -#qa-functional -test.qa-functional.cp.extra=${openide.nodes.dir}/modules/org-openide-nodes.jar:\${openide.util.dir}/lib/org-openide-util.jar -test.qa-functional.run.cp.extra= \ No newline at end of file +nbm.homepage=http://nbgit.googlecode.com/ +nbm.module.author=Alex Coles <alex@alexcolesportfolio.com>, Jonas Fonseca <fonseca@diku.dk> +extra.module.files=ext/org-spearce-jgit.jar,\ + ext/org-jcraft-jsch.jar +cp.extra=release/modules/ext/org-spearce-jgit.jar,\ + release/modules/ext/org-jcraft-jsch.jar nbproject/project.properties @@ -3,8 +3,16 @@ <type>org.netbeans.modules.apisupport.project</type> <configuration> <data xmlns="http://www.netbeans.org/ns/nb-module-project/3"> - <code-name-base>org.netbeans.modules.git</code-name-base> + <code-name-base>org.nbgit</code-name-base> <standalone/> + <class-path-extension> + <runtime-relative-path>ext/org-spearce-jgit.jar</runtime-relative-path> + <binary-origin>release/modules/ext/org-spearce-jgit.jar</binary-origin> + </class-path-extension> + <class-path-extension> + <runtime-relative-path>ext/com-jcraft-jsch.jar</runtime-relative-path> + <binary-origin>release/modules/ext/com-jcraft-jsch.jar</binary-origin> + </class-path-extension> <module-dependencies> <dependency> <code-name-base>org.jdesktop.layout</code-name-base> @@ -25,15 +33,6 @@ </run-dependency> </dependency> <dependency> - <code-name-base>org.netbeans.libs.ini4j</code-name-base> - <build-prerequisite/> - <compile-dependency/> - <run-dependency> - <release-version>1</release-version> - <implementation-version/> - </run-dependency> - </dependency> - <dependency> <code-name-base>org.netbeans.modules.diff</code-name-base> <build-prerequisite/> <compile-dependency/> @@ -43,28 +42,12 @@ </run-dependency> </dependency> <dependency> - <code-name-base>org.netbeans.modules.editor.errorstripe</code-name-base> - <run-dependency> - <release-version>2</release-version> - <specification-version>2.4.0.1.1</specification-version> - </run-dependency> - </dependency> - <dependency> - <code-name-base>org.netbeans.modules.editor.errorstripe.api</code-name-base> - <build-prerequisite/> - <compile-dependency/> - <run-dependency> - <release-version>1</release-version> - <specification-version>2.4.0.1</specification-version> - </run-dependency> - </dependency> - <dependency> <code-name-base>org.netbeans.modules.editor.fold</code-name-base> <build-prerequisite/> <compile-dependency/> <run-dependency> <release-version>1</release-version> - <specification-version>1.7</specification-version> + <specification-version>1.8</specification-version> </run-dependency> </dependency> <dependency> @@ -73,16 +56,7 @@ <compile-dependency/> <run-dependency> <release-version>1</release-version> - <specification-version>1.22.0.4.2</specification-version> - </run-dependency> - </dependency> - <dependency> - <code-name-base>org.netbeans.modules.editor.lib2</code-name-base> - <build-prerequisite/> - <compile-dependency/> - <run-dependency> - <release-version>1</release-version> - <specification-version>1.6.0.2</specification-version> + <specification-version>1.25.2.4.2</specification-version> </run-dependency> </dependency> <dependency> @@ -104,15 +78,6 @@ </run-dependency> </dependency> <dependency> - <code-name-base>org.netbeans.modules.junit</code-name-base> - <build-prerequisite/> - <compile-dependency/> - <run-dependency> - <release-version>2</release-version> - <implementation-version/> - </run-dependency> - </dependency> - <dependency> <code-name-base>org.netbeans.modules.options.api</code-name-base> <build-prerequisite/> <compile-dependency/> @@ -136,7 +101,7 @@ <compile-dependency/> <run-dependency> <release-version>1</release-version> - <specification-version>1.27.0.6</specification-version> + <specification-version>1.29.1.6</specification-version> </run-dependency> </dependency> <dependency> @@ -170,7 +135,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.0.0.1</specification-version> + <specification-version>7.1.0.1</specification-version> </run-dependency> </dependency> <dependency> @@ -186,7 +151,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.13</specification-version> + <specification-version>6.13.1</specification-version> </run-dependency> </dependency> <dependency> @@ -194,7 +159,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.7</specification-version> + <specification-version>7.8</specification-version> </run-dependency> </dependency> <dependency> @@ -218,7 +183,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.3.0.1</specification-version> + <specification-version>7.3.1.1</specification-version> </run-dependency> </dependency> <dependency> @@ -226,7 +191,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.17</specification-version> + <specification-version>6.18.2</specification-version> </run-dependency> </dependency> <dependency> @@ -242,28 +207,10 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>6.19</specification-version> + <specification-version>6.20</specification-version> </run-dependency> </dependency> </module-dependencies> - <test-dependencies> - <test-type> - <name>unit</name> - </test-type> - <test-type> - <name>qa-functional</name> - <test-dependency> - <code-name-base>org.openide.nodes</code-name-base> - <compile-dependency/> - <test/> - </test-dependency> - <test-dependency> - <code-name-base>org.openide.util</code-name-base> - <compile-dependency/> - <test/> - </test-dependency> - </test-type> - </test-dependencies> <public-packages/> </data> </configuration> nbproject/project.xml @@ -1 +1 @@ -org.netbeans.modules.git.GitVCS +org.nbgit.GitVCS src/META-INF/services/org.netbeans.modules.versioning.spi.VersioningSystem javahelp/org/netbeans/modules/git/docs/credits.html javahelp/org/netbeans/modules/git/docs/git-about.html javahelp/org/netbeans/modules/git/docs/git-hs.xml javahelp/org/netbeans/modules/git/docs/git-idx.xml javahelp/org/netbeans/modules/git/docs/git-map.xml javahelp/org/netbeans/modules/git/docs/git-toc.xml src/org/netbeans/modules/git/Bundle.properties src/org/netbeans/modules/git/DiskMapTurboProvider.java src/org/netbeans/modules/git/ExceptionHandler.java src/org/netbeans/modules/git/FileInformation.java src/org/netbeans/modules/git/FileStatus.java src/org/netbeans/modules/git/FileStatusCache.java src/org/netbeans/modules/git/Git.java src/org/netbeans/modules/git/GitAnnotator.java src/org/netbeans/modules/git/GitException.java src/org/netbeans/modules/git/GitFileNode.java src/org/netbeans/modules/git/GitInterceptor.java src/org/netbeans/modules/git/GitMail.java src/org/netbeans/modules/git/GitModuleConfig.java src/org/netbeans/modules/git/GitProgressSupport.java src/org/netbeans/modules/git/GitVCS.java src/org/netbeans/modules/git/OutputLogger.java src/org/netbeans/modules/git/SuperGitAction.java src/org/netbeans/modules/git/VersionsCache.java src/org/netbeans/modules/git/config/Bundle.properties src/org/netbeans/modules/git/config/GitConfigFiles.java src/org/netbeans/modules/git/options/Bundle.properties src/org/netbeans/modules/git/options/GitAdvancedOption.java src/org/netbeans/modules/git/options/GitExtProperties.java src/org/netbeans/modules/git/options/GitOptionsPanelController.java src/org/netbeans/modules/git/options/GitPanel.form src/org/netbeans/modules/git/options/GitPanel.java src/org/netbeans/modules/git/options/LabelsPanel.form src/org/netbeans/modules/git/options/LabelsPanel.java src/org/netbeans/modules/git/options/PropertiesPanel.form src/org/netbeans/modules/git/options/PropertiesPanel.java src/org/netbeans/modules/git/options/PropertiesTable.java src/org/netbeans/modules/git/options/PropertiesTableModel.java src/org/netbeans/modules/git/resources/git-helpset.xml src/org/netbeans/modules/git/resources/git-layer.xml src/org/netbeans/modules/git/resources/git_annotation.xml src/org/netbeans/modules/git/resources/git_wstcref.xml src/org/netbeans/modules/git/resources/gitversioning.xml src/org/netbeans/modules/git/resources/icons/commit.png src/org/netbeans/modules/git/resources/icons/conflicts-badge.png src/org/netbeans/modules/git/resources/icons/diff-next.png src/org/netbeans/modules/git/resources/icons/diff-prev.png src/org/netbeans/modules/git/resources/icons/diff.png src/org/netbeans/modules/git/resources/icons/ending_revision.png src/org/netbeans/modules/git/resources/icons/gitvcs-icon.png src/org/netbeans/modules/git/resources/icons/modified-badge.png src/org/netbeans/modules/git/resources/icons/onefolder.png src/org/netbeans/modules/git/resources/icons/recent_messages.png src/org/netbeans/modules/git/resources/icons/refresh.png src/org/netbeans/modules/git/resources/icons/sinceorigin.png src/org/netbeans/modules/git/resources/icons/starting_revision.png src/org/netbeans/modules/git/resources/icons/twofolders.png src/org/netbeans/modules/git/resources/icons/update.png src/org/netbeans/modules/git/resources/icons/versioning-view.png src/org/netbeans/modules/git/ui/actions/ContextAction.java src/org/netbeans/modules/git/ui/annotate/AnnotateAction.java src/org/netbeans/modules/git/ui/annotate/AnnotateLine.java src/org/netbeans/modules/git/ui/annotate/AnnotationBar.java src/org/netbeans/modules/git/ui/annotate/AnnotationBarManager.java src/org/netbeans/modules/git/ui/annotate/AnnotationMark.java src/org/netbeans/modules/git/ui/annotate/AnnotationMarkInstaller.java src/org/netbeans/modules/git/ui/annotate/AnnotationMarkProvider.java src/org/netbeans/modules/git/ui/annotate/Bundle.properties src/org/netbeans/modules/git/ui/annotate/LinesReader.java src/org/netbeans/modules/git/ui/clone/Bundle.properties src/org/netbeans/modules/git/ui/clone/Clone.java src/org/netbeans/modules/git/ui/clone/CloneAction.java src/org/netbeans/modules/git/ui/clone/CloneCompleted.java src/org/netbeans/modules/git/ui/clone/CloneCompletedPanel.form src/org/netbeans/modules/git/ui/clone/CloneCompletedPanel.java src/org/netbeans/modules/git/ui/clone/CloneExternalAction.java src/org/netbeans/modules/git/ui/clone/ClonePanel.form src/org/netbeans/modules/git/ui/clone/ClonePanel.java src/org/netbeans/modules/git/ui/clone/ProjectUtilities.java src/org/netbeans/modules/git/ui/commit/Bundle.properties src/org/netbeans/modules/git/ui/commit/CommitAction.java src/org/netbeans/modules/git/ui/commit/CommitOptions.java src/org/netbeans/modules/git/ui/commit/CommitPanel.form src/org/netbeans/modules/git/ui/commit/CommitPanel.java src/org/netbeans/modules/git/ui/commit/CommitTable.java src/org/netbeans/modules/git/ui/commit/CommitTableModel.java src/org/netbeans/modules/git/ui/commit/ExcludeFromCommitAction.java src/org/netbeans/modules/git/ui/create/Bundle.properties src/org/netbeans/modules/git/ui/create/CreateAction.java src/org/netbeans/modules/git/ui/diff/ApplyDiffAction.java src/org/netbeans/modules/git/ui/diff/Bundle.properties src/org/netbeans/modules/git/ui/diff/DiffAction.java src/org/netbeans/modules/git/ui/diff/DiffFileTable.java src/org/netbeans/modules/git/ui/diff/DiffNode.java src/org/netbeans/modules/git/ui/diff/DiffSetupSource.java src/org/netbeans/modules/git/ui/diff/DiffStreamSource.java src/org/netbeans/modules/git/ui/diff/DiffTopComponent.java src/org/netbeans/modules/git/ui/diff/ExportDiff.java src/org/netbeans/modules/git/ui/diff/ExportDiffAction.java src/org/netbeans/modules/git/ui/diff/ExportDiffPanel.form src/org/netbeans/modules/git/ui/diff/ExportDiffPanel.java src/org/netbeans/modules/git/ui/diff/MultiDiffPanel.form src/org/netbeans/modules/git/ui/diff/MultiDiffPanel.java src/org/netbeans/modules/git/ui/diff/Setup.java src/org/netbeans/modules/git/ui/diff/VerticalFlowLayout.java src/org/netbeans/modules/git/ui/ignore/Bundle.properties src/org/netbeans/modules/git/ui/ignore/IgnoreAction.java src/org/netbeans/modules/git/ui/log/Bundle.properties src/org/netbeans/modules/git/ui/log/DiffResultsView.java src/org/netbeans/modules/git/ui/log/DiffTreeTable.java src/org/netbeans/modules/git/ui/log/Divider.java src/org/netbeans/modules/git/ui/log/FileEnvironment.java src/org/netbeans/modules/git/ui/log/GitLogMessage.java src/org/netbeans/modules/git/ui/log/GitLogMessageChangedPath.java src/org/netbeans/modules/git/ui/log/IncomingAction.java src/org/netbeans/modules/git/ui/log/LogAction.java src/org/netbeans/modules/git/ui/log/OutAction.java src/org/netbeans/modules/git/ui/log/RepositoryRevision.java src/org/netbeans/modules/git/ui/log/RevisionNode.java src/org/netbeans/modules/git/ui/log/RevisionNodeChildren.java src/org/netbeans/modules/git/ui/log/SearchCriteriaPanel.form src/org/netbeans/modules/git/ui/log/SearchCriteriaPanel.java src/org/netbeans/modules/git/ui/log/SearchExecutor.java src/org/netbeans/modules/git/ui/log/SearchHistoryAction.java src/org/netbeans/modules/git/ui/log/SearchHistoryPanel.form src/org/netbeans/modules/git/ui/log/SearchHistoryPanel.java src/org/netbeans/modules/git/ui/log/SearchHistoryTopComponent.java src/org/netbeans/modules/git/ui/log/SummaryView.java src/org/netbeans/modules/git/ui/merge/Bundle.properties src/org/netbeans/modules/git/ui/merge/MergeAction.java src/org/netbeans/modules/git/ui/merge/MergeRevisions.java src/org/netbeans/modules/git/ui/merge/MergeRevisionsPanel.form src/org/netbeans/modules/git/ui/merge/MergeRevisionsPanel.java src/org/netbeans/modules/git/ui/properties/Bundle.properties src/org/netbeans/modules/git/ui/properties/GitProperties.java src/org/netbeans/modules/git/ui/properties/GitPropertiesNode.java src/org/netbeans/modules/git/ui/properties/PropertiesAction.java src/org/netbeans/modules/git/ui/properties/PropertiesPanel.form src/org/netbeans/modules/git/ui/properties/PropertiesPanel.java src/org/netbeans/modules/git/ui/properties/PropertiesTable.java src/org/netbeans/modules/git/ui/properties/PropertiesTableModel.java src/org/netbeans/modules/git/ui/pull/Bundle.properties src/org/netbeans/modules/git/ui/pull/FetchAction.java src/org/netbeans/modules/git/ui/pull/PullAction.java src/org/netbeans/modules/git/ui/pull/PullOtherAction.java src/org/netbeans/modules/git/ui/push/Bundle.properties src/org/netbeans/modules/git/ui/push/PushAction.java src/org/netbeans/modules/git/ui/push/PushOtherAction.java src/org/netbeans/modules/git/ui/remove/Bundle.properties src/org/netbeans/modules/git/ui/remove/RemoveAction.java src/org/netbeans/modules/git/ui/repository/Bundle.properties src/org/netbeans/modules/git/ui/repository/GitURL.java src/org/netbeans/modules/git/ui/repository/Repository.java src/org/netbeans/modules/git/ui/repository/RepositoryConnection.java src/org/netbeans/modules/git/ui/repository/RepositoryDialogPanel.form src/org/netbeans/modules/git/ui/repository/RepositoryDialogPanel.java src/org/netbeans/modules/git/ui/repository/RepositoryPanel.form src/org/netbeans/modules/git/ui/repository/RepositoryPanel.java src/org/netbeans/modules/git/ui/rollback/Backout.java src/org/netbeans/modules/git/ui/rollback/BackoutAction.java src/org/netbeans/modules/git/ui/rollback/BackoutPanel.form src/org/netbeans/modules/git/ui/rollback/BackoutPanel.java src/org/netbeans/modules/git/ui/rollback/Bundle.properties src/org/netbeans/modules/git/ui/rollback/RollbackAction.java src/org/netbeans/modules/git/ui/rollback/Strip.java src/org/netbeans/modules/git/ui/rollback/StripAction.java src/org/netbeans/modules/git/ui/rollback/StripPanel.form src/org/netbeans/modules/git/ui/rollback/StripPanel.java src/org/netbeans/modules/git/ui/stash/Bundle.properties src/org/netbeans/modules/git/ui/stash/StashAction.java src/org/netbeans/modules/git/ui/status/Bundle.properties src/org/netbeans/modules/git/ui/status/GitVersioningTopComponent.java src/org/netbeans/modules/git/ui/status/OpenInEditorAction.java src/org/netbeans/modules/git/ui/status/OpenVersioningAction.java src/org/netbeans/modules/git/ui/status/ShowAllChangesAction.java src/org/netbeans/modules/git/ui/status/StatusAction.java src/org/netbeans/modules/git/ui/status/SyncFileNode.java src/org/netbeans/modules/git/ui/status/SyncTable.java src/org/netbeans/modules/git/ui/status/VersioningPanel.form src/org/netbeans/modules/git/ui/status/VersioningPanel.java src/org/netbeans/modules/git/ui/status/package.html src/org/netbeans/modules/git/ui/update/Bundle.properties src/org/netbeans/modules/git/ui/update/ConflictResolvedAction.java src/org/netbeans/modules/git/ui/update/ResolveConflictsAction.java src/org/netbeans/modules/git/ui/update/ResolveConflictsExecutor.java src/org/netbeans/modules/git/ui/update/RevertModifications.java src/org/netbeans/modules/git/ui/update/RevertModificationsAction.java src/org/netbeans/modules/git/ui/update/RevertModificationsPanel.form src/org/netbeans/modules/git/ui/update/RevertModificationsPanel.java src/org/netbeans/modules/git/ui/update/Update.java src/org/netbeans/modules/git/ui/update/UpdateAction.java src/org/netbeans/modules/git/ui/update/UpdatePanel.form src/org/netbeans/modules/git/ui/update/UpdatePanel.java src/org/netbeans/modules/git/ui/view/Bundle.properties src/org/netbeans/modules/git/ui/view/ViewAction.java src/org/netbeans/modules/git/ui/wizards/Bundle.properties src/org/netbeans/modules/git/ui/wizards/CloneDestinationDirectoryPanel.form src/org/netbeans/modules/git/ui/wizards/CloneDestinationDirectoryPanel.java src/org/netbeans/modules/git/ui/wizards/CloneDestinationDirectoryWizardPanel.java src/org/netbeans/modules/git/ui/wizards/ClonePathsPanel.form src/org/netbeans/modules/git/ui/wizards/ClonePathsPanel.java src/org/netbeans/modules/git/ui/wizards/ClonePathsWizardPanel.java src/org/netbeans/modules/git/ui/wizards/CloneRepositoryPanel.form src/org/netbeans/modules/git/ui/wizards/CloneRepositoryPanel.java src/org/netbeans/modules/git/ui/wizards/CloneRepositoryWizardPanel.java src/org/netbeans/modules/git/ui/wizards/CloneWizardAction.java src/org/netbeans/modules/git/ui/wizards/WizardStepProgressSupport.java src/org/netbeans/modules/git/util/Bundle.properties src/org/netbeans/modules/git/util/GitCommand.java src/org/netbeans/modules/git/util/GitLogMessage.java src/org/netbeans/modules/git/util/GitProjectUtils.java src/org/netbeans/modules/git/util/GitProxySettings.java src/org/netbeans/modules/git/util/GitRepositoryContextCache.java src/org/netbeans/modules/git/util/GitUtils.java test/build-qa-functional.xml test/build-unit.xml test/build.xml test/cfg-qa-functional.xml test/cfg-unit.xml test/qa-functional/src/org/netbeans/test/git/main/archeology/AnnotationsTest.java test/qa-functional/src/org/netbeans/test/git/main/commit/CommitDataTest.java test/qa-functional/src/org/netbeans/test/git/main/commit/CommitUiTest.java test/qa-functional/src/org/netbeans/test/git/main/commit/IgnoreTest.java test/qa-functional/src/org/netbeans/test/git/main/delete/DeleteTest.java test/qa-functional/src/org/netbeans/test/git/main/properties/GitPropertiesTest.java test/qa-functional/src/org/netbeans/test/git/operators/CommitOperator.java test/qa-functional/src/org/netbeans/test/git/operators/RevertModificationsOperator.java test/qa-functional/src/org/netbeans/test/git/operators/VersioningOperator.java test/qa-functional/src/org/netbeans/test/git/operators/actions/CommitAction.java test/qa-functional/src/org/netbeans/test/git/operators/actions/RevertAction.java test/qa-functional/src/org/netbeans/test/git/utils/RepositoryMaintenance.java test/qa-functional/src/org/netbeans/test/git/utils/StreamHandler.java test/qa-functional/src/org/netbeans/test/git/utils/TestKit.java 8fc578dcca8cb938217e27ca9cd10791cfeff564 Alex Coles alexbcoles@mac.com http://github.com/myabc/nbgit/commit/609d0cffba1ba7fc495103838dff6c6ee5313b47 609d0cffba1ba7fc495103838dff6c6ee5313b47 2008-09-04T17:06:44-07:00 2008-09-04T17:06:44-07:00 Merging in the nbjgit fork to master. * nbgit based on Shawn Pearce's JGit library will now be the principal focus of development, and as such will now be housed in nbgit's master branch. Squashed commit of the following: commit 0e1b21c464f95a1cf308ec7b4c8c49c69ff73900 Author: Alex Coles <alexbcoles@mac.com> Date: Fri Sep 5 02:03:46 2008 +0200 Minor fixes for Java 1.5 compatibility. commit 25cc12eff8bc6319afebf6ea5a7838350665a4ec Author: Alex Coles <alexbcoles@mac.com> Date: Fri Sep 5 02:03:12 2008 +0200 Fix to use implementation version of Versioning Utils. commit 2e7a67fa2a86c3df41d9566986fe8ab024bb0d79 Author: Alex Coles <alexbcoles@mac.com> Date: Fri Sep 5 02:01:52 2008 +0200 Rename packages to org.nbgit. commit 303aa72bb1663a3a1ebfb2a13cc03239752fa1ef Merge: 8fc578d... 7a22cf0... Author: Alex Coles <alexbcoles@mac.com> Date: Fri Sep 5 01:32:06 2008 +0200 Merge branch 'master' of git://repo.or.cz/nbjgit into jgit Initial merge of 'nbjgit' fork into nbgit. Conflicts: .gitignore LICENSE README build.xml manifest.mf nbproject/build-impl.xml nbproject/genfiles.properties nbproject/platform.properties nbproject/project.properties nbproject/project.xml src/META-INF/services/org.netbeans.modules.versioning.spi.VersioningSystem commit 7a22cf013fa57e44ecc4050c8560f92843ed631a Author: Jonas Fonseca <fonseca@diku.dk> Date: Wed Sep 3 01:51:42 2008 +0200 Improve performance and remove race conditions during commit Remove calls to reset() and dispose() after walking revisions or trees. If they are no longer needed the calls will mainly cause more memory to be allocated. Create the RefUpdate object before making the commit so that there will not be a later race condition when the branch reference is updated. Thanks to Shawn O. Spearce for the advices. commit 93bfbd150c1ee21e3f9e415aa077b2b513699f8e Author: Jonas Fonseca <fonseca@diku.dk> Date: Tue Sep 2 21:59:01 2008 +0200 Teach the log UI how to filter by author name and message content commit 17778ec6695b6da1da5179170353785b721e3863 Author: Jonas Fonseca <fonseca@diku.dk> Date: Tue Sep 2 21:39:57 2008 +0200 Show information about files changed in the log summary Code adapted from EGit's FileDiff class. commit bc6d355ca5f31107f831b2c066aaceba0198d3d6 Author: Jonas Fonseca <fonseca@diku.dk> Date: Tue Sep 2 16:19:41 2008 +0200 Improve memory usage of the log UI ... by making RepositoryRevision extend RevCommit and use a custom RevWalk class. The implementation needs to be cleaned up, but should safe some object creation. Thanks to Shawn for this idea. commit eefc889b4f4cfb086eaa2e18224b6a6c785455e8 Author: Jonas Fonseca <fonseca@diku.dk> Date: Tue Sep 2 01:39:10 2008 +0200 Move GitFileNode to .ui package commit 136438ede70a833abd0e06ad7152409e5f4641b2 Author: Jonas Fonseca <fonseca@diku.dk> Date: Tue Sep 2 01:30:51 2008 +0200 Squash Git.getNodes() into VersioningPanel.getNodes() commit f782ed1e355fcf0d3e8e647c547caee099d2791f Author: Jonas Fonseca <fonseca@diku.dk> Date: Tue Sep 2 00:18:04 2008 +0200 Fix revision code in the disabled part of the log UI commit c15d31e19bf9a6451dd639312e889d460d703a45 Author: Jonas Fonseca <fonseca@diku.dk> Date: Tue Sep 2 00:04:05 2008 +0200 Use RevCommit instead of Commit in for the log UI As adviced by Shawn O. Pearce RevCommit is much more lightweight and this saves us an extra object anyway. commit be6a4a64a6b40f9a2e345a5dc6f05367b933fbde Author: Jonas Fonseca <fonseca@diku.dk> Date: Mon Sep 1 23:58:23 2008 +0200 Make RevisionNode provide a much simpler interface to access commit info commit d58a4eda4ce4d05ddccc5c5f976603ded9044c6b Author: Jonas Fonseca <fonseca@diku.dk> Date: Mon Sep 1 23:42:01 2008 +0200 Make GitIgnore provide an interface for SharabilityQuery commit c6869bc15ee9c900e66dafcc50f4afd8399913d2 Author: Jonas Fonseca <fonseca@diku.dk> Date: Mon Sep 1 13:21:43 2008 +0200 Remove unused code commit 5667c0860b3e345197a0d4eb9b570a9537ca42ef Author: Jonas Fonseca <fonseca@diku.dk> Date: Mon Sep 1 13:20:09 2008 +0200 Remove bundled messages related to checking the git CLI version commit bdd94c684c436e47e10e3405b6fc5b9e2237671e Author: Jonas Fonseca <fonseca@diku.dk> Date: Mon Sep 1 02:08:48 2008 +0200 Minor rewording in the README file commit 7844d01426971f6e93e787c8fd07b7913ea45d68 Author: Jonas Fonseca <fonseca@diku.dk> Date: Sun Aug 31 18:21:10 2008 +0200 Minor documentation fixes commit 77c8cc2a11cc62b13060593c564ab0ab32137b9a Author: Jonas Fonseca <fonseca@diku.dk> Date: Sun Aug 31 13:06:42 2008 +0200 Partially fix the tool tip of the status component The HTML code seems to hide so that only one root file is shown. commit 85008f6d80246aab7fd0c56814d0bfd276756d24 Author: Jonas Fonseca <fonseca@diku.dk> Date: Sun Aug 31 04:23:06 2008 +0200 Update project information and add LICENSE file commit 62610495e9b80a938ad4ed63e662c7e56ce20477 Author: Jonas Fonseca <fonseca@diku.dk> Date: Sun Aug 31 02:52:00 2008 +0200 Remove unused GitLogMessage class commit b033438bc41e3b5983517b397eb1ca9282bb829a Author: Jonas Fonseca <fonseca@diku.dk> Date: Sun Aug 31 02:19:23 2008 +0200 Move list of issues to Google Code issue tracker commit 169ca96d33f8201a970e66393818a1c48a12f9d3 Author: Jonas Fonseca <fonseca@diku.dk> Date: Sun Aug 31 01:40:56 2008 +0200 Improve showing the branch name in the status UI commit 49c3c9505b69c1c884d1f30a06c0a436bce8bbc5 Author: Jonas Fonseca <fonseca@diku.dk> Date: Sun Aug 31 00:03:33 2008 +0200 Add .gitignore file with build/ and nbproject/private/ commit 516316fd90973e3115461ae795cb1108dc33f7a6 Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 23:37:19 2008 +0200 Add a small README with the most important information commit d30112231fc14b762fd5f47adaf75324d451fe7f Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 23:37:00 2008 +0200 More documentation updates commit fc23d14a3fc545312ef11eac5a9ee3bcfe8a82d6 Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 22:01:33 2008 +0200 Update project information commit 1bc4d73f39fdeb6b4c84ec160a84b2cc1941ff93 Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 22:01:03 2008 +0200 Add some more issues to work on commit f9e7ae5df26e4677e266b5818c8d362c13c9f92c Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 21:49:39 2008 +0200 Expand the credits page and improve linking commit d4e5129e7ed7991d537c7f8db1f5b571eb9ad3d5 Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 19:44:28 2008 +0200 Make the properties UI save settings to the repository config file As the last two commits show it should now be possible to configure the commit related configuration options properly. commit 1c124e448950e0d53a1f0b52f540dd4a9aaf2ca4 Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 19:41:38 2008 +0200 More fixes to the code used for getting the repository config file commit 23e2378c9c72845d64202223eb07ac21bdc1d775 Author: Jonas Fonseca <Jonas Fonseca@192.168.1.101> Date: Sat Aug 30 19:12:06 2008 +0200 Do not open a log tab when opening the log UI Signed-off-by: Jonas Fonseca <Jonas Fonseca@192.168.1.101> commit 21b40e08b426bc6ba47f5ab09a65ac966af2da3d Author: Jonas Fonseca <Jonas Fonseca@192.168.1.101> Date: Sat Aug 30 19:11:04 2008 +0200 Fix NullPointerExceptions on systems where no user or system gitconfig file is found Signed-off-by: Jonas Fonseca <Jonas Fonseca@192.168.1.101> commit cd80656ceffd7a70b8756390503923452ad2514e Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 16:21:25 2008 +0200 TODO: add module option for sanitizing space in commit messages commit fbe0db789294d761c8ef399743ebdbaf32221bb5 Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 16:11:51 2008 +0200 Polish the log summary view by removing and disabling unusable links The export diff link has been completely removed while the diff and revert links are disabled for now. commit 2e335d4e544af50b700dbc3dacfbc824157b74ae Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 15:39:59 2008 +0200 Move some context action setup into ContextAction Also provide a default isEnabled() metdhod. commit ec901ea0cd8bd6b1a117421fe7a797014a74be0c Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 15:14:52 2008 +0200 Enable the properties UI commit 8f87d05572c0b2841c252c7a27cf5c58896f2e9f Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 13:45:11 2008 +0200 Expand the documentation a bit commit 4205f70dccb35d6e82597b29723b08d197440405 Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 03:55:30 2008 +0200 Update project files commit 468d1025e5cc0761f3d81c86568d41f58ed2a830 Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 03:52:35 2008 +0200 Add update UI code commit 3dbd5623f1e575f4888a32e391c1fd28066cb32b Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 01:59:56 2008 +0200 Reformat some of the log UI code commit 31fea98f384d65d8ab6eb467786044c89c2950e1 Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 01:58:59 2008 +0200 Remove unused GitLogMessage JGit's Commit class is used instead. commit 82920d72626900c6c8acd45ef02c4c697898033e Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 01:08:31 2008 +0200 Oops, add the GitPanel files commit 388a7b9d4ea5b469b3d3a6cd568d2450ec324787 Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 01:03:49 2008 +0200 Fix bundle paths in .form files commit 9d0e79113aaee748734d243b02f056e019c3f186 Author: Jonas Fonseca <fonseca@diku.dk> Date: Sat Aug 30 00:13:42 2008 +0200 Add the option and properties code commit 079cae09fb8891070ab569a3740c8cdb8dc1ee69 Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 22:30:39 2008 +0200 Renable the original code for CommitAction.isEnabled() commit 39873bf70406fb244288a55263f862037edf8279 Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 22:27:27 2008 +0200 Add some @Override annotations commit 2cac2aa08109fdb38d4027f4227fa24c5443e977 Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 22:02:05 2008 +0200 Simplify Git instance init commit 4134424e9fc8154d577a2966f206635c9da8f1f3 Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 21:56:47 2008 +0200 Move GitAnnotator instance to GitVCS commit 26086fcff5368e93e4e5a9d3c7a0508da602593c Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 21:53:40 2008 +0200 Move HTML formatting to the HTMLFormatter utility class commit 40655bb5714f69548a8687e6b58b265bfcc1e0d6 Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 21:24:48 2008 +0200 Move GitInterceptor instance to GitVCS commit 7965cf96240acda6d9c2979732aa8c9a0656cdfe Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 21:14:05 2008 +0200 Remove some date related GitUtils formerly used by the log UI commit 8c1d8d6cf681286e12d0528f30b55edbe11c6634 Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 21:08:13 2008 +0200 Add license header to GitCommand commit 3334cba0cf818627f04d99b853f99eb7ef35fc75 Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 20:40:27 2008 +0200 Brand the history top component with the git icon ... and drop the "Git " prefix from the tab title to safe screen real estate. commit 2e13f643cae58414bbc6b5700943fd0879a566ac Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 20:32:08 2008 +0200 Add the log action with a lot of stuff disabled and even more not working commit 9493809d813fff068879040bff058195d42fb7c7 Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 12:46:52 2008 +0200 Ignore non-sharable files when getting status of single files This finally fixes the status maintenance of changed files. commit 6cd4595ca4d7ab42c9afd4557b9459dd5c628367 Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 12:32:31 2008 +0200 Fix file refreshing by disabling ignore handling for now commit 188332d558cbda2e9c95fddb6898f23fe9f7fe2c Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 12:28:01 2008 +0200 Refresh the index from disk also when getting single file status commit 7daed883dd6aa4ed037da2b8aaa6a0c2a861782d Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 12:26:32 2008 +0200 Remove FIXME code that caused post-commit state to be broken commit 3379c0ffec316a338332dc0455db8b9f43a324fd Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 06:33:25 2008 +0200 Fix the pop up menu in the status tab commit 99205b4f4494257dd62d7fd2776e465768294d5e Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 06:19:20 2008 +0200 Remove GitConfigFiles and cleanup GitModuleConfig commit 60dfcd124f1ea5903ea716ff94bf054e87994ebe Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 04:56:15 2008 +0200 Remove getComparableStatus() implementation from GitAnnotator There already exists one in GitUtils. commit 553a08770e123a2d5ad90a363b527e83ac71f4fd Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 04:48:14 2008 +0200 Remove GitException and friends commit 87987264647cc5d67176d236a454be7bb9f7dc56 Author: Jonas Fonseca <fonseca@diku.dk> Date: Fri Aug 29 04:17:42 2008 +0200 Remove extra separators from the action menus commit 3a672278efbb43b9abf9ba36e3ed775f7ad1479d Author: Jonas Fonseca <Jonas Fonseca@192.168.1.101> Date: Fri Aug 29 03:23:20 2008 +0200 Remove more unnecessary casts Signed-off-by: Jonas Fonseca <Jonas Fonseca@192.168.1.101> commit ebb1f1b2ed63ec91044602da370e046783c12f59 Author: Jonas Fonseca <Jonas Fonseca@192.168.1.101> Date: Fri Aug 29 03:00:30 2008 +0200 Remove more unnecessary casts commit cd9fa65f39413d86b240ae73cac570e1672e8c84 Author: Jonas Fonseca <Jonas Fonseca@192.168.1.101> Date: Fri Aug 29 02:38:33 2008 +0200 Remove logging for the status related GitCommand methods commit b54aa5e0827964ffad891d7466c0dd1fb47230aa Author: Jonas Fonseca <Jonas Fonseca@192.168.1.101> Date: Fri Aug 29 02:37:27 2008 +0200 Remove unnecessary casts commit 112da6aeae8249100ee96c556d5d489f7b825768 Author: Jonas Fonseca <Jonas Fonseca@192.168.1.101> Date: Fri Aug 29 02:31:33 2008 +0200 Remove unused Status class commit 0191d1109bf349a25b94bf0f78bc7a9dc652b101 Author: Jonas Fonseca <Jonas Fonseca@192.168.1.101> Date: Fri Aug 29 02:20:30 2008 +0200 Initial import 70fa2bc5dce10e5a0454604919ab684d6f798bbb Alex Coles alexbcoles@mac.com