Revision: 78 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=78&view=rev Author: yurand Date: 2008-06-20 03:30:01 -0700 (Fri, 20 Jun 2008)

Log Message: ----------- Added geanyvc plugin

Added Paths: ----------- trunk/geanyvc/ trunk/geanyvc/.gitignore trunk/geanyvc/COPYING trunk/geanyvc/INSTALL trunk/geanyvc/Makefile.am trunk/geanyvc/README trunk/geanyvc/THANKS trunk/geanyvc/TODO trunk/geanyvc/autogen.sh trunk/geanyvc/commit.glade trunk/geanyvc/configure.in trunk/geanyvc/depcomp trunk/geanyvc/externdiff.c trunk/geanyvc/geanyvc.c trunk/geanyvc/geanyvc.h trunk/geanyvc/indent-all.sh trunk/geanyvc/install/ trunk/geanyvc/install/.gitignore trunk/geanyvc/install/PKGBUILD.in trunk/geanyvc/install/ebuild.in trunk/geanyvc/install/geninst.sh trunk/geanyvc/install/setup.nsi.in trunk/geanyvc/install-sh trunk/geanyvc/makefile.win32 trunk/geanyvc/missing trunk/geanyvc/po/ trunk/geanyvc/po/.gitignore trunk/geanyvc/po/ChangeLog trunk/geanyvc/po/LINGUAS trunk/geanyvc/po/POTFILES.in trunk/geanyvc/vc_bzr.c trunk/geanyvc/vc_cvs.c trunk/geanyvc/vc_git.c trunk/geanyvc/vc_hg.c trunk/geanyvc/vc_svk.c trunk/geanyvc/vc_svn.c

Added: trunk/geanyvc/.gitignore =================================================================== --- trunk/geanyvc/.gitignore (rev 0) +++ trunk/geanyvc/.gitignore 2008-06-20 10:30:01 UTC (rev 78) @@ -0,0 +1,23 @@ +autom4te.cache +Makefile +Makefile.in +aclocal.m4 +config.log +config.status +config.guess +config.sub +configure +.deps +.libs +*.o +*.la +*.lo +/ChangeLog +libtool +*.tar.gz +stamp-h1 +config.h +config.h.in +intltool-* +mkinstalldirs +ltmain.sh

Added: trunk/geanyvc/COPYING =================================================================== --- trunk/geanyvc/COPYING (rev 0) +++ trunk/geanyvc/COPYING 2008-06-20 10:30:01 UTC (rev 78) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, 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 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. + + 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 + 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 +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, +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. + + 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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.

Added: trunk/geanyvc/INSTALL =================================================================== --- trunk/geanyvc/INSTALL (rev 0) +++ trunk/geanyvc/INSTALL 2008-06-20 10:30:01 UTC (rev 78) @@ -0,0 +1,13 @@ +These installation instructions are written for a GNU/Linux system. + +At the time of this writing, building the plugin requires a recent SVN geany (r2411+) +installed. + + % configure + % make + % make install + +There is no "make uninstall" target, so if you want to remove the plugin, +just delete the "geanyvc.so" from geany plugins directory (usually: /usr/lib/geany). + +

Added: trunk/geanyvc/Makefile.am =================================================================== --- trunk/geanyvc/Makefile.am (rev 0) +++ trunk/geanyvc/Makefile.am 2008-06-20 10:30:01 UTC (rev 78) @@ -0,0 +1,34 @@ +## Makefile.am -- Process this file with automake to produce Makefile.in +SUBDIRS = po + +EXTRA_DIST = \ + autogen.sh \ + makefile.win32 \ + intltool-extract.in \ + intltool-merge.in \ + intltool-update.in \ + indent-all.sh \ + THANKS \ + commit.glade + +dist_noinst_SCRIPTS = indent-all.sh + +noinst_HEADERS = geanyvc.h + +lib_LTLIBRARIES = geanyvc.la +geanyvc_la_SOURCES = geanyvc.c externdiff.c vc_git.c vc_cvs.c vc_svn.c vc_svk.c vc_bzr.c vc_hg.c +geanyvc_la_LDFLAGS = -module -avoid-version +geanyvc_la_LIBADD = @GEANY_LIBS@ + +AM_CPPFLAGS = @GEANY_CFLAGS@ -DGEANY_DISABLE_DEPRECATED + + +.PHONY: ChangeLog mrproper + +ChangeLog: + git log > ChangeLog + +mrproper: + git clean -d -x -f + +

Added: trunk/geanyvc/README =================================================================== --- trunk/geanyvc/README (rev 0) +++ trunk/geanyvc/README 2008-06-20 10:30:01 UTC (rev 78) @@ -0,0 +1,160 @@ +.. |(version)| replace:: 0.3 + +======= +geanyvc +======= + +.. contents:: + +About +===== + +geanyvc is plugin that provides a uniform way of accessing the different +version-control systems inside Geany IDE. Only small subset of vc is +implemented, but, hey, you don't need anything besides diff, log, status, +revert and commit most time. + +Features +======== + +geanyvc currently support the following version control systems: + +Bazaar, GIT, Mercurial, Subversion, SVK:: + + * diff file + * diff directory + * diff project + * blame + * log file + * log directory + * log project + * status + * revert file + * add file + * remove file + * commit + * blame + +CVS:: + + * diff file + * diff directory + * diff project + * log file + * log directory + * log project + * status + * revert file + +Requirements +============ + +For compiling geanyvc you need Geany sources, you can get them at +http://geany.uvena.de/, you will need the GTK (>= 2.6.0) libraries +and header files. You will also need its dependency libraries and header +files, such as Pango, Glib and ATK. All these files are available at +http://www.gtk.org. If you like to use spellchecking for your commit +messages you will also need gtkspell (>=2.0), but this is only optional. + +Furthermore you need, of course, a C compiler and the Make tool; The +GNU versions of these tools are recommended. + +Usage +===== + +After compiling and/or installing geanyvc, start Geany and go to menu +Tools->Plugin Manager and set checkbox at VC plugin. + +You can configure the following options: + +* Set Change flag for document tabs created with pluging. + +If this option is activated, every new by the VC-plugin created document tab +will be marked as changed. Even thus this option is useful in some cases, it +could cause a big number of sometimes annoying "Do you want to save"-dialogs. + +* Confirm adding new files to a VCS + +Shows a confirmation dialog on adding a new (created) file to VCS. If not set +you will not see dialog "Do you want to add <file>?" + +* Enable CVS/GIT/Mercurial/SVN/SVK/Bazaar + +geanyvc detect if opened file is in version control by checking directories +and executing commands from version control systems toolchain. These options +disable checking for particular version control system. Disabling not +required ones can speed up things. So it is recommended to activate svk only +if you want to use it, since it is quiet slowly. + +License +======= + +geanyvc is distributed 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. A copy of this license +can be found in the file COPYING included with the source code of this +program. + +Ideas, questions, patches and bug reports +========================================= + +If you add something, or fix a bug, please send a patch (in 'diff -u' +format) to the geany mailing list or to one of the authors listed bellow. + +Coding +====== + +Use static functions where possible. +Try to use GLib types and functions - e.g. g_free instead of free and +try to use only GLib 2.6 and GTK 2.6 functions. At least for the moment, +we want to keep the minimum requirement for GTK at 2.6. + +Style +===== + +The file indent-all.sh contains information about +the current code style. Run this script before commit. + +Download +======== + +The current version is |(version)|, download it here http://users.cosmostv.by/yurand/geanyvc/geanyvc-0.3.tar.gz. + +There is also git repository http://git.or.cz available. In http://repo.or.cz/w/geanyvc.git you can +always find an up-to-date version of source code, even between releases. + +To clone geanyvc make sure you have the git package installed on your system. +Then run the following command:: + + git clone git://repo.or.cz/geanyvc.git + +or:: + + git clone http://repo.or.cz/r/geanyvc.git + +Gentoo +------ + +Gentoo ebuild is available here: http://bugs.gentoo.org/show_bug.cgi?id=218522 + +Arch linux +---------- + +A package for Arch Linux is available here: http://aur.archlinux.org/packages.php?ID=16484 + +Source Mage +----------- + +To install geanyvc, just run the following command:: + + cast geanyvc + +Windows +------- + +A windows installer is available here: http://users.cosmostv.by/yurand/geanyvc/geanyvc-0.3_setup.exe + +-- +2007-2008 by Yura Siamashka and Frank Lanitz +yurand2(at)gmail(dot)com +frank(at)frank(dot)uvena(dot)de

Added: trunk/geanyvc/THANKS =================================================================== --- trunk/geanyvc/THANKS (rev 0) +++ trunk/geanyvc/THANKS 2008-06-20 10:30:01 UTC (rev 78) @@ -0,0 +1,15 @@ +What's this file about? +----------------------- +This file lists all external people that have contributed to this project. + +Testers and contributors: +------------------------- +Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - some patches +Enrico Troeger <enrico(dot)troeger(at)uvena(dot)de> - Geany IDE author, some patches and testing +Jeff Pohlmeyer <yetanothergeek(at)gmail(dot)com> - INSTALL instructions stolen from him. +Karel Kolman <kolmis(at)gmail(dot)com> - Bazaar support. +David Kalnischkies <kalnischkies(at)gmail(dot)com> - Mercurial support + +Projects +-------- +Sylpheed

Added: trunk/geanyvc/TODO =================================================================== --- trunk/geanyvc/TODO (rev 0) +++ trunk/geanyvc/TODO 2008-06-20 10:30:01 UTC (rev 78) @@ -0,0 +1,11 @@ +* fix mess with local and utf8 encodings. +* implement in_vc_cvs function. +* implement cvs commit command. +* implement cvs blame(?) command. +* option external diff program. +* check windows build for problems with stdout/stderr output +* (add spellchecking to commit dialog) +* (add function to change branches for VCS that support it) +* (add auto wrapping long line at commit dialog) +* (add commit function for a single file) +* (add git bisec support)

Added: trunk/geanyvc/autogen.sh =================================================================== --- trunk/geanyvc/autogen.sh (rev 0) +++ trunk/geanyvc/autogen.sh 2008-06-20 10:30:01 UTC (rev 78) @@ -0,0 +1,159 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +DIE=0 + +if [ -n "$GNOME2_DIR" ]; then + ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS" + LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH" + PATH="$GNOME2_DIR/bin:$PATH" + export PATH + export LD_LIBRARY_PATH +fi + +(test -f $srcdir/configure.in) || { + echo -n "**Error**: Directory "`$srcdir'" does not look like the" + echo " top-level package directory" + exit 1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have `autoconf' installed." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && { + (intltoolize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have `intltool' installed." + echo "You can get it from:" + echo " ftp://ftp.gnome.org/pub/GNOME/" + DIE=1 + } +} + +(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && { + (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have `xml-i18n-toolize' installed." + echo "You can get it from:" + echo " ftp://ftp.gnome.org/pub/GNOME/" + DIE=1 + } +} + +(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { + (libtool --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have `libtool' installed." + echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" + DIE=1 + } +} + +(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.in >/dev/null) && { + (grep "sed.*POTFILES" $srcdir/configure.in) > /dev/null || \ + (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have `glib' installed." + echo "You can get it from: ftp://ftp.gtk.org/pub/gtk" + DIE=1 + } +} + +(automake --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have `automake' installed." + echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" + DIE=1 + NO_AUTOMAKE=yes +} + + +# if no automake, don't bother testing for aclocal +test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: Missing `aclocal'. The version of `automake'" + echo "installed doesn't appear recent enough." + echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "**Warning**: I am going to run `configure' with no arguments." + echo "If you wish to pass any to it, please specify them on the" + echo `$0'" command line." + echo +fi + +case $CC in +xlc ) + am_opt=--include-deps;; +esac + +for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.in -print` +do + dr=`dirname $coin` + if test -f $dr/NO-AUTO-GEN; then + echo skipping $dr -- flagged as no auto-gen + else + echo processing $dr + ( cd $dr + + aclocalinclude="$ACLOCAL_FLAGS" + + if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then + echo "Creating $dr/aclocal.m4 ..." + test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 + echo "Running glib-gettextize... Ignore non-fatal messages." + echo "no" | glib-gettextize --force --copy + echo "Making $dr/aclocal.m4 writable ..." + test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 + fi + if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then + echo "Running intltoolize..." + intltoolize --copy --force --automake + fi + if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then + echo "Running xml-i18n-toolize..." + xml-i18n-toolize --copy --force --automake + fi + if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then + if test -z "$NO_LIBTOOLIZE" ; then + echo "Running libtoolize..." + libtoolize --force --copy + fi + fi + echo "Running aclocal $aclocalinclude ..." + aclocal $aclocalinclude + if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then + echo "Running autoheader..." + autoheader + fi + echo "Running automake --gnu $am_opt ..." + automake --add-missing --gnu $am_opt + echo "Running autoconf ..." + autoconf + ) + fi +done + +conf_flags="--enable-maintainer-mode" + +if test x$NOCONFIGURE = x; then + echo Running $srcdir/configure $conf_flags "$@" ... + $srcdir/configure $conf_flags "$@" \ + && echo Now type `make' to compile. || exit 1 +else + echo Skipping configure process. +fi

Property changes on: trunk/geanyvc/autogen.sh ___________________________________________________________________ Name: svn:executable + *

Added: trunk/geanyvc/commit.glade =================================================================== --- trunk/geanyvc/commit.glade (rev 0) +++ trunk/geanyvc/commit.glade 2008-06-20 10:30:01 UTC (rev 78) @@ -0,0 +1,168 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<!--Generated with glade3 3.2.2 on Thu Nov 29 23:29:48 2007 by yura@localhost--> +<glade-interface> + <widget class="GtkDialog" id="commitDialog"> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="border_width">5</property> + <property name="title" translatable="yes">Commit</property> + <property name="modal">True</property> + <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> + <property name="destroy_with_parent">True</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="has_separator">False</property> + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox1"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="spacing">2</property> + <child> + <widget class="GtkVPaned" id="vpaned1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <child> + <widget class="GtkTreeView" id="treeSelect"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="headers_clickable">True</property> + </widget> + </child> + </widget> + <packing> + <property name="resize">False</property> + <property name="shrink">True</property> + </packing> + </child> + <child> + <widget class="GtkVPaned" id="vpaned2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <child> + <widget class="GtkTextView" id="textDiff"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="editable">False</property> + </widget> + </child> + </widget> + <packing> + <property name="resize">True</property> + <property name="shrink">True</property> + </packing> + </child> + <child> + <widget class="GtkFrame" id="frame1"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label_xalign">0</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + <child> + <widget class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <child> + <widget class="GtkTextView" id="textCommitMessage"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + </widget> + </child> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">&lt;b&gt;Commit message:&lt;/b&gt;</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="resize">True</property> + <property name="shrink">True</property> + </packing> + </child> + </widget> + <packing> + <property name="resize">True</property> + <property name="shrink">True</property> + </packing> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area1"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + <child> + <widget class="GtkButton" id="btnCancel"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">gtk-cancel</property> + <property name="use_stock">True</property> + <property name="response_id">-6</property> + </widget> + </child> + <child> + <widget class="GtkButton" id="btnCommit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">_Commit</property> + <property name="response_id">-10</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + </widget> + </child> + </widget> +</glade-interface>

Added: trunk/geanyvc/configure.in =================================================================== --- trunk/geanyvc/configure.in (rev 0) +++ trunk/geanyvc/configure.in 2008-06-20 10:30:01 UTC (rev 78) @@ -0,0 +1,93 @@ +dnl Process this file with autoconf to produce a configure script. + +AC_INIT([geanyvc], [0.4], [yurand2@gmail.com]) +AM_INIT_AUTOMAKE([1.9 foreign]) + +AM_CONFIG_HEADER(config.h) + +AC_PROG_CC + +AC_DISABLE_STATIC +AM_PROG_LIBTOOL +LIBTOOL="$LIBTOOL --silent" + +AC_PROG_INSTALL +AC_PROG_INTLTOOL + + +# checking for Geany +PKG_CHECK_MODULES(GEANY, [geany >= 0.15]) +AC_SUBST(GTK_CFLAGS) +AC_SUBST(GTK_LIBS) + +GEANY_VERSION=`$PKG_CONFIG --modversion geany` +GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0` + + +dnl Check for GtkSpell support +AC_MSG_CHECKING([whether to use GtkSpell]) +AC_ARG_ENABLE(gtkspell, + [ --disable-gtkspell Do not use GtkSpell in editor], + [ac_cv_enable_gtkspell=$enableval], [ac_cv_enable_gtkspell=yes]) +if test "$ac_cv_enable_gtkspell" = yes; then + AC_MSG_RESULT(yes) + AC_MSG_CHECKING([whether GtkSpell is available]) + if $PKG_CONFIG gtkspell-2.0 ; then + AC_MSG_RESULT(yes) + CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gtkspell-2.0`" + LIBS="$LIBS `$PKG_CONFIG --libs gtkspell-2.0`" + AC_DEFINE(USE_GTKSPELL, 1, Use GtkSpell in editor) + else + AC_MSG_RESULT(no) + ac_cv_enable_gtkspell=no + fi +else + AC_MSG_RESULT(no) +fi + +# i18n +GETTEXT_PACKAGE=geanyvc +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) + +ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`" # take all languages found in file po/LINGUAS + +AM_GLIB_GNU_GETTEXT +# workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845) +if test "x$MSGFMT" = "xno"; then + AC_MSG_ERROR([msgfmt not found. Please install the gettext package.]) +fi + +# intltool hack to define install_sh on Debian/Ubuntu systems +if test "x$install_sh" = "x"; then + install_sh="`pwd`/install-sh" + AC_SUBST(install_sh) +fi + +# get the plugin installed at the correct location for Geany +# TODO find a way to NOT override --libdir command line option if given +libdir="`$PKG_CONFIG --variable=libdir geany`/geany" + +dnl unittests +PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], [ +AC_SUBST(CHECK_CFLAGS) +AC_SUBST(CHECK_LIBS) +AM_CONDITIONAL(UNITTESTS, true) +], [ +AM_CONDITIONAL(UNITTESTS, false) +]) + + +AC_OUTPUT([ +Makefile +po/Makefile.in +]) + +echo "----------------------------------------" +echo "Install geanyvc in : ${libdir}" +echo "Using Geany version : ${GEANY_VERSION}" +echo "Using GTK version : ${GTK_VERSION}" +echo "Building with GtkSpell support : ${ac_cv_enable_gtkspell}" +echo "" +echo "Configuration is done OK." +echo ""

Added: trunk/geanyvc/depcomp =================================================================== --- trunk/geanyvc/depcomp (rev 0) +++ trunk/geanyvc/depcomp 2008-06-20 10:30:01 UTC (rev 78) @@ -0,0 +1,584 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects + +scriptversion=2006-10-15.18 + +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software +# Foundation, Inc. + +# 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, 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., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Alexandre Oliva oliva@dcc.unicamp.br. + +case $1 in + '') + echo "$0: No command. Try `$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to bug-automake@gnu.org. +EOF + exit $? + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit $? + ;; +esac + +if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +fi + +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\/]*$|'${DEPDIR-.deps}'/&|;s|.([^.]*)$|.P\1|;s|Pobj$|Po|'`} +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/.([^.]*)$/.T\1/'`} + +rm -f "$tmpdepfile" + +# Some modes work just like other modes, but use different flags. We +# parameterize here, but still list the modes in the big case below, +# to make depend.m4 easier to write. Note that we *cannot* use a case +# here, because this file can only contain one case statement. +if test "$depmode" = hp; then + # HP compiler uses -M and no extra arg. + gccflag=-M + depmode=gcc +fi + +if test "$depmode" = dashXmstdout; then + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout +fi + +case "$depmode" in +gcc3) +## gcc 3 implements dependency tracking that does exactly what +## we want. Yay! Note: for some reason libtool 1.4 doesn't like +## it if -MD -MP comes after the -MF stuff. Hmm. +## Unfortunately, FreeBSD c89 acceptance of flags depends upon +## the command line argument order; so add the flags where they +## appear in depend2.am. Note that the slowdown incurred here +## affects only configure: in makefiles, %FASTDEP% shortcuts this. + for arg + do + case $arg in + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; + *) set fnord "$@" "$arg" ;; + esac + shift # fnord + shift # $arg + done + "$@" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + mv "$tmpdepfile" "$depfile" + ;; + +gcc) +## There are various ways to get dependency output from gcc. Here's +## why we pick this rather obscure method: +## - Don't want to use -MD because we'd like the dependencies to end +## up in a subdir. Having to rename by hand is ugly. +## (We might end up doing this anyway to support other compilers.) +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like +## -MM, not -M (despite what the docs say). +## - Using -M directly means running the compiler twice (even worse +## than renaming). + if test -z "$gccflag"; then + gccflag=-MD, + fi + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \" > "$depfile" + alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +## The second -e expression handles DOS-style file names with drive letters. + sed -e 's/^[^:]*: / /' \ + -e 's/^['$alpha']:/[^:]*: / /' < "$tmpdepfile" >> "$depfile" +## This next piece of magic avoids the `deleted header file' problem. +## The problem is that when a header file which appears in a .P file +## is deleted, the dependency causes make to die (because there is +## typically no way to rebuild the header). We avoid this by adding +## dummy dependencies for each header file. Too bad gcc doesn't do +## this for us directly. + tr ' ' ' +' < "$tmpdepfile" | +## Some versions of gcc put a space before the `:'. On the theory +## that the space means something, we add a space to the output as +## well. +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +sgi) + if test "$libtool" = yes; then + "$@" "-Wp,-MDupdate,$tmpdepfile" + else + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \" > "$depfile" + + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; + # the IRIX cc adds comments like `#:fec' to the end of the + # dependency line. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr ' +' ' ' >> $depfile + echo >> $depfile + + # The second pass generates a dummy entry for each header file. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> $depfile + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +aix) + # The C for AIX Compiler uses -M and outputs the dependencies + # in a .u file. In older versions, this file always lives in the + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. + stripped=`echo "$object" | sed 's/(.*)..*$/\1/'` + tmpdepfile="$stripped.u" + if test "$libtool" = yes; then + "$@" -Wc,-M + else + "$@" -M + fi + stat=$? + + if test -f "$tmpdepfile"; then : + else + stripped=`echo "$stripped" | sed 's,^.*/,,'` + tmpdepfile="$stripped.u" + fi + + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + + if test -f "$tmpdepfile"; then + outname="$stripped.o" + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" + sed -e "s,^$outname: (.*)$,\1:," < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +icc) + # Intel's C compiler understands `-MD -MF file'. However on + # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # ICC 7.0 will fill foo.d with something like + # foo.o: sub/foo.c + # foo.o: sub/foo.h + # which is wrong. We want: + # sub/foo.o: sub/foo.c + # sub/foo.o: sub/foo.h + # sub/foo.c: + # sub/foo.h: + # ICC 7.1 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using \ : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h ', or ` dep3.h dep4.h '. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: (.*)$,\1,;s/^\$//;/^$/d;/:$/d' < "$tmpdepfile" | + sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp2) + # The "hp" stanza above does not work with aCC (C++) and HP's ia64 + # compilers, which have integrated preprocessors. The correct option + # to use with these is +Maked; it writes dependencies to a file named + # 'foo.d', which lands next to the object file, wherever that + # happens to be. + # Much of this is similar to the tru64 case; see comments there. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/.o$//' -e 's/.lo$//'` + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir.libs/$base.d + "$@" -Wc,+Maked + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + "$@" +Maked + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + # Add `dependent.h:' lines. + sed -ne '2,${; s/^ *//; s/ \*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" "$tmpdepfile2" + ;; + +tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in `foo.d' instead, so we check for that too. + # Subdirectories are respected. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/.o$//' -e 's/.lo$//'` + + if test "$libtool" = yes; then + # With Tru64 cc, shared objects can also be used to make a + # static library. This mechanism is used in libtool 1.4 series to + # handle both shared and static libraries in a single compilation. + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. + # + # With libtool 1.5 this exception was removed, and libtool now + # generates 2 separate objects for the 2 libraries. These two + # compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 + tmpdepfile2=$dir$base.o.d # libtool 1.5 + tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 + tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.o.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + tmpdepfile4=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +#nosideeffect) + # This comment above is used by automake to tell side-effect + # dependency tracking mechanisms from slower ones. + +dashmstdout) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout, regardless of -o. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + test -z "$dashmflag" && dashmflag=-M + # Require at least two characters before searching for `:' + # in the target name. This is to cope with DOS-style filenames: + # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + "$@" $dashmflag | + sed 's:^[ ]*[^: ][^:][^:]*:[ ]*:'"$object"': :' > "$tmpdepfile" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tr ' ' ' +' < "$tmpdepfile" | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +dashXmstdout) + # This case only exists to satisfy depend.m4. It is never actually + # run, as this mode is specially recognized in the preamble. + exit 1 + ;; + +makedepend) + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + # X makedepend + shift + cleared=no + for arg in "$@"; do + case $cleared in + no) + set ""; shift + cleared=yes ;; + esac + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. + -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + esac + done + obj_suffix="`echo $object | sed 's/^.*././'`" + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' ' +' | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" "$tmpdepfile".bak + ;; + +cpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + "$@" -E | + sed -n -e '/^# [0-9][0-9]* "([^"]*)".*/ s:: \1 \:p' \ + -e '/^#line [0-9][0-9]* "([^"]*)".*/ s:: \1 \:p' | + sed '$ s: \$::' > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" + sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \$//;s/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvisualcpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + "$@" || exit $? + IFS=" " + for arg + do + case "$arg" in + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + set fnord "$@" + shift + shift + ;; + *) + set fnord "$@" "$arg" + shift + shift + ;; + esac + done + "$@" -E | + sed -n '/^#line [0-9][0-9]* "([^"]*)"/ s::echo "`cygpath -u \"\1\"`":p' | sort | uniq > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \" > "$depfile" + . "$tmpdepfile" | sed 's% %\ %g' | sed -n '/^(.*)$/ s:: \1 \:p' >> "$depfile" + echo " " >> "$depfile" + . "$tmpdepfile" | sed 's% %\ %g' | sed -n '/^(.*)$/ s::\1::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +none) + exec "$@" + ;; + +*) + echo "Unknown depmode $depmode" 1>&2 + exit 1 + ;; +esac + +exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End:

Property changes on: trunk/geanyvc/depcomp ___________________________________________________________________ Name: svn:executable + *

Added: trunk/geanyvc/externdiff.c =================================================================== --- trunk/geanyvc/externdiff.c (rev 0) +++ trunk/geanyvc/externdiff.c 2008-06-20 10:30:01 UTC (rev 78) @@ -0,0 +1,87 @@ +/* + * externdiff.h - Plugin to geany light IDE to work with vc + * + * Copyright 2008 Yura Siamashka yurand2@gmail.com + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include <string.h> + +#include "geany.h" +#include "support.h" +#include "plugindata.h" +#include "document.h" +#include "filetypes.h" +#include "utils.h" +#include "ui_utils.h" +#include "project.h" +#include "prefs.h" +#include "pluginmacros.h" + + +#include "geanyvc.h" + +extern GeanyFunctions *geany_functions; + +enum +{ + EXTERNAL_DIFF_MELD, + EXTERNAL_DIFF_KOMPARE, + EXTERNAL_DIFF_KDIFF3, + EXTERNAL_DIFF_DIFFUSE, + EXTERNAL_DIFF_TKDIFF, + EXTERNAL_DIFF_COUNT +}; + +static gchar *viewers[EXTERNAL_DIFF_COUNT] = { "meld", "kompare", "kdiff3", "diffuse", "tkdiff" }; + +static gchar *extern_diff_viewer = NULL; +const gchar * +get_external_diff_viewer() +{ + gint i; + + if (extern_diff_viewer) + return extern_diff_viewer; + + for (i = 0; i < EXTERNAL_DIFF_COUNT; i++) + { + if (g_find_program_in_path(viewers[i])) + { + extern_diff_viewer = viewers[i]; + return extern_diff_viewer; + } + } + return NULL; +} + +void +vc_external_diff(const gchar * src, const gchar * dest) +{ + gchar *argv[4] = { NULL, NULL, NULL, NULL }; + + const gchar *diff = get_external_diff_viewer(); + if (!diff) + return; + + argv[0] = (gchar *) diff; + argv[1] = (gchar *) src; + argv[2] = (gchar *) dest; + + p_utils->spawn_sync(NULL, argv, NULL, + G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL | + G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, NULL, NULL, NULL, NULL); +}

Added: trunk/geanyvc/geanyvc.c =================================================================== --- trunk/geanyvc/geanyvc.c (rev 0) +++ trunk/geanyvc/geanyvc.c 2008-06-20 10:30:01 UTC (rev 78) @@ -0,0 +1,1925 @@ +/* + * geanyvc.c - Plugin to geany light IDE to work with vc + * + * Copyright 2007, 2008 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2007 Enrico Tröger enrico.troeger@uvena.de + * Copyright 2007 Nick Treleaven nick.treleaven@btinternet.com + * Copyright 2007, 2008 Yura Siamashka yurand2@gmail.com + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/* VC plugin */ +/* This plugin allow to works with cvs/svn/git inside geany light IDE. */ + +#include <string.h> +#include <glib.h> +#include <glib/gstdio.h> + +#include "geany.h" +#include "support.h" +#include "plugindata.h" +#include "document.h" +#include "filetypes.h" +#include "utils.h" +#include "ui_utils.h" +#include "project.h" +#include "prefs.h" +#include "pluginmacros.h" + +#include "highlighting.h" +#include "SciLexer.h" + +#include "geanyvc.h" + +#include "config.h" + +#ifdef USE_GTKSPELL +#include <gtkspell/gtkspell.h> +#endif + +PluginFields *plugin_fields; +GeanyData *geany_data; +GeanyFunctions *geany_functions; + + +PLUGIN_VERSION_CHECK(71); +PLUGIN_SET_INFO(_("VC"), _("Interface to different Version Control systems."), VERSION, + _("Yura Siamashka yurand2@gmail.com,\nFrank Lanitz frank@frank.uvena.de")); + +/* Some global variables */ +static gboolean set_changed_flag; +static gboolean set_add_confirmation; +static gboolean set_maximize_commit_dialog; +static gboolean set_external_diff; + +static gchar *config_file; + +static gboolean enable_cvs; +static gboolean enable_git; +static gboolean enable_svn; +static gboolean enable_svk; +static gboolean enable_bzr; +static gboolean enable_hg; + +#ifdef USE_GTKSPELL +static gchar *lang; +#endif + +static GSList *VC = NULL; + +/* The addresses of these strings act as enums, their contents are not used. */ +const gchar DIRNAME[] = "*DIRNAME*"; +const gchar FILENAME[] = "*FILENAME*"; +const gchar BASE_FILENAME[] = "*BASE_FILENAME*"; +const gchar FILE_LIST[] = "*FILE_LIST*"; +const gchar MESSAGE[] = "*MESSAGE*"; + +/* this string is used when action require to run several commands */ +const gchar CMD_SEPARATOR[] = "*CMD-SEPARATOR*"; +const gchar CMD_FUNCTION[] = "*CUSTOM_FUNCTION*"; + +/* commit status */ +const gchar FILE_STATUS_MODIFIED[] = "Modified"; +const gchar FILE_STATUS_ADDED[] = "Added"; +const gchar FILE_STATUS_DELETED[] = "Deleted"; +const gchar FILE_STATUS_UNKNOWN[] = "Unknown"; + +void *NO_ENV[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; + +static void registrate(); + +GSList * +get_commit_files_null(G_GNUC_UNUSED const gchar * dir) +{ + return NULL; +} + +static void +free_text_list(GSList * lst) +{ + GSList *tmp; + if (!lst) + return; + for (tmp = lst; tmp != NULL; tmp = g_slist_next(tmp)) + { + g_free((CommitItem *) (tmp->data)); + } + g_slist_free(lst); +} + +static void +free_commit_list(GSList * lst) +{ + GSList *tmp; + if (!lst) + return; + for (tmp = lst; tmp != NULL; tmp = g_slist_next(tmp)) + { + g_free(((CommitItem *) (tmp->data))->path); + g_free((CommitItem *) (tmp->data)); + } + g_slist_free(lst); +} + +gchar * +find_subdir_path(const gchar * filename, const gchar * subdir) +{ + gboolean ret = FALSE; + gchar *base; + gchar *gitdir; + gchar *base_prev = g_strdup(":"); + + if (g_file_test(filename, G_FILE_TEST_IS_DIR)) + base = g_strdup(filename); + else + base = g_path_get_dirname(filename); + + while (strcmp(base, base_prev) != 0) + { + gitdir = g_build_filename(base, subdir, NULL); + ret = g_file_test(gitdir, G_FILE_TEST_IS_DIR); + g_free(gitdir); + if (ret) + break; + g_free(base_prev); + base_prev = base; + base = g_path_get_dirname(base); + } + + g_free(base_prev); + if (ret) + return base; + g_free(base); + return NULL; +} + +static gboolean +find_subdir(const gchar * filename, const gchar * subdir) +{ + gchar *basedir; + basedir = find_subdir_path(filename, subdir); + if (basedir) + { + g_free(basedir); + return TRUE; + } + return FALSE; +} + +gboolean +find_dir(const gchar * filename, const char *find, gboolean recursive) +{ + gboolean ret; + gchar *base; + gchar *dir; + + if (!filename) + return FALSE; + + if (recursive) + { + ret = find_subdir(filename, find); + } + else + { + if (g_file_test(filename, G_FILE_TEST_IS_DIR)) + base = g_strdup(filename); + else + base = g_path_get_dirname(filename); + dir = g_build_filename(base, find, NULL); + + ret = g_file_test(dir, G_FILE_TEST_IS_DIR); + + g_free(base); + g_free(dir); + } + return ret; +} + + +static const VC_RECORD * +find_vc(const char *filename) +{ + GSList *tmp; + + for (tmp = VC; tmp != NULL; tmp = g_slist_next(tmp)) + { + if (((VC_RECORD *) tmp->data)->in_vc(filename)) + { + return (VC_RECORD *) tmp->data; + } + } + return NULL; +} + +static void * +find_cmd_env(gint cmd_type, gboolean cmd, const gchar * filename) +{ + const VC_RECORD *vc; + vc = find_vc(filename); + if (vc) + { + if (cmd) + return vc->commands[cmd_type]; + else + return vc->envs[cmd_type]; + } + return NULL; +} + +/* Get list of commands for given command spec*/ +static GSList * +get_cmd(const gchar ** argv, const gchar * filename, GSList * filelist, const gchar * message) +{ + gint i, j; + gint len = 0; + gchar **ret; + gchar *dir; + gchar *base_filename; + GSList *head = NULL; + GSList *tmp; + GString *repl; + + if (g_file_test(filename, G_FILE_TEST_IS_DIR)) + { + dir = g_strdup(filename); + } + else + { + dir = g_path_get_dirname(filename); + } + base_filename = g_path_get_basename(filename); + + while (1) + { + if (argv[len] == NULL) + break; + len++; + } + if (filelist) + ret = g_malloc0(sizeof(gchar *) * (len * g_slist_length(filelist) + 1)); + else + ret = g_malloc0(sizeof(gchar *) * (len + 1)); + + head = g_slist_alloc(); + head->data = ret; + + for (i = 0, j = 0; i < len; i++, j++) + { + if (argv[i] == CMD_SEPARATOR) + { + if (filelist) + ret = g_malloc0(sizeof(gchar *) * + (len * g_slist_length(filelist) + 1)); + else + ret = g_malloc0(sizeof(gchar *) * (len + 1)); + j = -1; + head = g_slist_append(head, ret); + } + else if (argv[i] == DIRNAME) + { + ret[j] = p_utils->get_locale_from_utf8(dir); + } + else if (argv[i] == FILENAME) + { + ret[j] = p_utils->get_locale_from_utf8(filename); + } + else if (argv[i] == BASE_FILENAME) + { + ret[j] = p_utils->get_locale_from_utf8(base_filename); + } + else if (argv[i] == FILE_LIST) + { + for (tmp = filelist; tmp != NULL; tmp = g_slist_next(tmp)) + { + ret[j] = p_utils->get_locale_from_utf8((gchar *) tmp->data); + j++; + } + j--; + } + else if (argv[i] == MESSAGE) + { + ret[j] = p_utils->get_locale_from_utf8(message); + } + else + { + repl = g_string_new(argv[i]); + p_utils->string_replace_all(repl, P_DIRNAME, dir); + p_utils->string_replace_all(repl, P_FILENAME, filename); + p_utils->string_replace_all(repl, P_BASE_FILENAME, base_filename); + ret[j] = g_string_free(repl, FALSE); + setptr(ret[j], p_utils->get_locale_from_utf8(ret[j])); + } + } + g_free(dir); + g_free(base_filename); + return head; +} + + +/* name should be in UTF-8, and can have a path. */ +static void +show_output(const gchar * std_output, const gchar * name, const gchar * force_encoding) +{ + gint page; + GtkNotebook *book; + GeanyDocument *doc, *cur_doc; + + if (std_output) + { + cur_doc = p_document->get_current(); + doc = p_document->find_by_filename(name); + if (doc == NULL) + { + doc = p_document->new_file(name, NULL, std_output); + } + else + { + p_sci->set_text(doc->sci, std_output); + book = GTK_NOTEBOOK(main_widgets->notebook); + page = gtk_notebook_page_num(book, GTK_WIDGET(doc->sci)); + gtk_notebook_set_current_page(book, page); + } + p_document->set_text_changed(doc, set_changed_flag); + p_document->set_encoding(doc, (force_encoding ? force_encoding : "UTF-8")); + p_navqueue->goto_line(cur_doc, doc, 1); + } + else + { + p_ui->set_statusbar(FALSE, _("Could not parse the output of command")); + } +} + +/* + * Execute command by command spec, return std_out std_err + * + * @argv - command spec + * @env - envirounment + * @std_out - if not NULL here will be returned standard output converted to utf8 of last command in spec + * @std_err - if not NULL here will be returned standard error converted to utf8 of last command in spec + * @filename - filename for spec, commands will be running in it's basedir . Used to replace FILENAME, BASE_FILENAME in spec + * @list - used to replace FILE_LIST in spec + * @message - used to replace MESSAGE in spec + * + * @return - exit code of last command in spec + */ +gint +execute_custom_command(const gchar ** argv, const gchar ** env, gchar ** std_out, gchar ** std_err, + const gchar * filename, GSList * list, const gchar * message) +{ + gint exit_code; + gchar *dir; + GString *tmp; + GSList *cur; + GSList *largv = get_cmd(argv, filename, list, message); + GError *error = NULL; + + if (std_out) + *std_out = NULL; + if (std_err) + *std_err = NULL; + + if (!largv) + { + return 0; + } + + if (g_file_test(filename, G_FILE_TEST_IS_DIR)) + { + dir = g_strdup(filename); + } + else + { + dir = g_path_get_dirname(filename); + } + + for (cur = largv; cur != NULL; cur = g_slist_next(cur)) + { + argv = cur->data; + if (cur != g_slist_last(largv)) + { + p_utils->spawn_sync(dir, cur->data, (gchar **) env, + G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL | + G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, NULL, NULL, + &exit_code, &error); + } + else + { + p_utils->spawn_sync(dir, cur->data, (gchar **) env, + G_SPAWN_SEARCH_PATH | (std_out ? 0 : + G_SPAWN_STDOUT_TO_DEV_NULL) | + (std_err ? 0 : G_SPAWN_STDERR_TO_DEV_NULL), NULL, NULL, + std_out, std_err, &exit_code, &error); + } + if (error) + { + fprintf(stderr, "geanyvc: s_spawn_sync error: %s\n", error->message); + p_ui->set_statusbar(FALSE, _("geanyvc: s_spawn_sync error: %s"), + error->message); + g_error_free(error); + } + + // need to convert output text from the encoding of the original file into + // UTF-8 because internally Geany always needs UTF-8 + if (std_out && *std_out) + { + tmp = g_string_new(*std_out); + p_utils->string_replace_all(tmp, "\r\n", "\n"); + p_utils->string_replace_all(tmp, "\r", "\n"); + setptr(*std_out, g_string_free(tmp, FALSE)); + + if (!g_utf8_validate(*std_out, -1, NULL)) + { + setptr(*std_out, p_encodings->convert_to_utf8(*std_out, + strlen(*std_out), + NULL)); + } + if (!NZV(*std_out)) + { + g_free(*std_out); + *std_out = NULL; + } + } + if (std_err && *std_err) + { + tmp = g_string_new(*std_err); + p_utils->string_replace_all(tmp, "\r\n", "\n"); + p_utils->string_replace_all(tmp, "\r", "\n"); + setptr(*std_err, g_string_free(tmp, FALSE)); + + if (!g_utf8_validate(*std_err, -1, NULL)) + { + setptr(*std_err, p_encodings->convert_to_utf8(*std_err, + strlen(*std_err), + NULL)); + } + if (!NZV(*std_err)) + { + g_free(*std_err); + *std_err = NULL; + } + } + g_strfreev(cur->data); + } + g_free(dir); + g_slist_free(largv); + return exit_code; +} + +gint +execute_command(const VC_RECORD * vc, gchar ** std_out, gchar ** std_err, const gchar * filename, + gint cmd, GSList * list, const gchar * message) +{ + if (std_out) + *std_out = NULL; + if (std_err) + *std_err = NULL; + + if (((gchar **) vc->commands[cmd])[0] == CMD_FUNCTION) + { + typedef gint(*cmd_function) (gchar **, gchar **, const gchar *, GSList *, + const gchar *); + return ((cmd_function *) vc->commands[cmd])[1] (std_out, std_err, filename, list, + message); + } + return execute_custom_command(vc->commands[cmd], vc->envs[cmd], std_out, std_err, filename, + list, message); +} + +/* Callback if menu item for a single file was activated */ +static void +vcdiff_file_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +{ + gchar *text = NULL; + gchar *new, *old; + gchar *name; + gchar *localename; + const VC_RECORD *vc; + GeanyDocument *doc; + + doc = p_document->get_current(); + g_return_if_fail(doc != NULL && doc->file_name != NULL); + + if (doc->changed) + { + p_document->save_file(doc, FALSE); + } + + vc = find_vc(doc->file_name); + g_return_if_fail(vc); + + execute_command(vc, &text, NULL, doc->file_name, VC_COMMAND_DIFF_FILE, NULL, NULL); + if (text) + { + if (set_external_diff && get_external_diff_viewer()) + { + g_free(text); + + /* 1) rename file to file.geany.~NEW~ + 2) revert file + 3) rename file to file.geanyvc.~BASE~ + 4) rename file.geany.~NEW~ to origin file + 5) show diff + */ + localename = p_utils->get_locale_from_utf8(doc->file_name); + + new = g_strconcat(doc->file_name, ".geanyvc.~NEW~", NULL); + setptr(new, p_utils->get_locale_from_utf8(new)); + + old = g_strconcat(doc->file_name, ".geanyvc.~BASE~", NULL); + setptr(old, p_utils->get_locale_from_utf8(old)); + + if (g_rename(localename, new) != 0) + { + fprintf(stderr, + _ + ("geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'\n"), + localename, new); + goto end; + } + + execute_command(vc, NULL, NULL, doc->file_name, + VC_COMMAND_REVERT_FILE, NULL, NULL); + + if (g_rename(localename, old) != 0) + { + fprintf(stderr, + _ + ("geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'\n"), + localename, old); + g_rename(new, localename); + goto end; + } + g_rename(new, localename); + + vc_external_diff(old, localename); + g_unlink(old); + end: + g_free(old); + g_free(new); + g_free(localename); + return; + } + else + { + name = g_strconcat(doc->file_name, ".vc.diff", NULL); + show_output(text, name, doc->encoding); + g_free(text); + g_free(name); + } + + } + else + { + p_ui->set_statusbar(FALSE, _("No changes were made.")); + } +} + +/* Make a diff from the current directory */ +static void +vcdiff_dir_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +{ + gchar *base_name = NULL; + gchar *text = NULL; + const VC_RECORD *vc; + GeanyDocument *doc; + + doc = p_document->get_current(); + g_return_if_fail(doc != NULL && doc->file_name != NULL); + + if (doc->changed) + { + p_document->save_file(doc, FALSE); + } + + base_name = g_path_get_dirname(doc->file_name); + + vc = find_vc(base_name); + g_return_if_fail(vc); + + execute_command(vc, &text, NULL, base_name, VC_COMMAND_DIFF_DIR, NULL, NULL); + if (text) + { + setptr(base_name, g_strconcat(base_name, ".vc.diff", NULL)); + show_output(text, base_name, NULL); + g_free(text); + } + else + { + p_ui->set_statusbar(FALSE, _("No changes were made.")); + } + + g_free(base_name); +} + + +/* Callback if menu item for the current project was activated */ +static void +vcdiff_project_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +{ + gchar *text = NULL; + gchar *name; + const VC_RECORD *vc; + GeanyDocument *doc; + + doc = p_document->get_current(); + + g_return_if_fail(project != NULL && NZV(project->base_path)); + + if (doc && doc->changed && doc->file_name != NULL) + { + p_document->save_file(doc, FALSE); + } + + vc = find_vc(project->base_path); + g_return_if_fail(vc); + + execute_command(vc, &text, NULL, project->base_path, VC_COMMAND_DIFF_DIR, NULL, NULL); + if (text) + { + name = g_strconcat(project->name, ".vc.diff", NULL); + show_output(text, name, NULL); + g_free(text); + g_free(name); + } + else + { + p_ui->set_statusbar(FALSE, _("No changes were made.")); + } +} + +static void +vcblame_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +{ + gchar *text = NULL; + const VC_RECORD *vc; + GeanyDocument *doc; + + doc = p_document->get_current(); + g_return_if_fail(doc != NULL && doc->file_name != NULL); + + vc = find_vc(doc->file_name); + g_return_if_fail(vc); + + execute_command(vc, &text, NULL, doc->file_name, VC_COMMAND_BLAME, NULL, NULL); + if (text) + { + show_output(text, "*VC-BLAME*", NULL); + g_free(text); + } + else + { + p_ui->set_statusbar(FALSE, _("No history avaible")); + } +} + + +static void +vclog_file_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +{ + gchar *output = NULL; + const VC_RECORD *vc; + GeanyDocument *doc; + + doc = p_document->get_current(); + g_return_if_fail(doc != NULL && doc->file_name != NULL); + + p_ui->set_statusbar(TRUE, doc->file_name); + + vc = find_vc(doc->file_name); + g_return_if_fail(vc); + + execute_command(vc, &output, NULL, doc->file_name, VC_COMMAND_LOG_FILE, NULL, NULL); + if (output) + { + show_output(output, "*VC-LOG*", NULL); + g_free(output); + } +} + +static void +vclog_dir_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +{ + gchar *base_name = NULL; + gchar *text = NULL; + const VC_RECORD *vc; + GeanyDocument *doc; + + doc = p_document->get_current(); + g_return_if_fail(doc != NULL && doc->file_name != NULL); + + base_name = g_path_get_dirname(doc->file_name); + + vc = find_vc(base_name); + g_return_if_fail(vc); + + execute_command(vc, &text, NULL, base_name, VC_COMMAND_LOG_DIR, NULL, NULL); + if (text) + { + show_output(text, "*VC-LOG*", NULL); + g_free(text); + } + + g_free(base_name); +} + +static void +vclog_project_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +{ + gchar *text = NULL; + const VC_RECORD *vc; + + g_return_if_fail(project != NULL && NZV(project->base_path)); + + vc = find_vc(project->base_path); + g_return_if_fail(vc); + + execute_command(vc, &text, NULL, project->base_path, VC_COMMAND_LOG_DIR, NULL, NULL); + if (text) + { + show_output(text, "*VC-LOG*", NULL); + g_free(text); + } +} + +/* Show status from the current directory */ +static void +vcstatus_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +{ + gchar *base_name = NULL; + gchar *text = NULL; + const VC_RECORD *vc; + GeanyDocument *doc; + + doc = p_document->get_current(); + g_return_if_fail(doc != NULL && doc->file_name != NULL); + + if (doc->changed) + { + p_document->save_file(doc, FALSE); + } + + base_name = g_path_get_dirname(doc->file_name); + + vc = find_vc(base_name); + g_return_if_fail(vc); + + execute_command(vc, &text, NULL, base_name, VC_COMMAND_STATUS, NULL, NULL); + if (text) + { + show_output(text, "*VC-STATUS*", NULL); + g_free(text); + } + + g_free(base_name); +} + +static gboolean +command_with_question_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata, + gint cmd, const gchar * question, gboolean ask) +{ + gchar *text; + GtkWidget *dialog; + gint result; + gchar *dir; + const VC_RECORD *vc; + GeanyDocument *doc; + + doc = p_document->get_current(); + g_return_val_if_fail(doc != NULL && doc->file_name != NULL, FALSE); + + if (doc->changed) + { + p_document->save_file(doc, FALSE); + } + + if (ask) + { + dialog = gtk_message_dialog_new(GTK_WINDOW(main_widgets->window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, question, doc->file_name); + result = gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); + } + else + { + result = GTK_RESPONSE_YES; + } + + if (result == GTK_RESPONSE_YES) + { + dir = g_path_get_dirname(doc->file_name); + vc = find_vc(dir); + g_return_val_if_fail(vc, FALSE); + + execute_command(vc, &text, NULL, doc->file_name, cmd, NULL, NULL); + if (text) + { + g_free(text); + } + g_free(dir); + } + return (result == GTK_RESPONSE_YES) ? TRUE : FALSE; +} + +static void +vcrevert_activated(GtkMenuItem * menuitem, gpointer gdata) +{ + gboolean ret; + GeanyDocument *doc; + + doc = p_document->get_current(); + g_return_if_fail(doc != NULL && doc->file_name != NULL); + + ret = command_with_question_activated(menuitem, gdata, VC_COMMAND_REVERT_FILE, + _("Do you really want to revert: %s"), TRUE); + if (ret) + { + p_document->reload_file(doc, NULL); + } +} + + +static void +vcadd_activated(GtkMenuItem * menuitem, gpointer gdata) +{ + command_with_question_activated(menuitem, gdata, VC_COMMAND_ADD, + _("Do you really want to add: %s"), set_add_confirmation); +} + +static void +vcremove_activated(GtkMenuItem * menuitem, gpointer gdata) +{ + gboolean ret; + + ret = command_with_question_activated(menuitem, gdata, VC_COMMAND_REMOVE, + _("Do you really want to remove: %s"), TRUE); + if (ret) + { + p_document-> + remove_page(gtk_notebook_get_current_page + (GTK_NOTEBOOK(main_widgets->notebook))); + } +} + +enum +{ + COLUMN_COMMIT, + COLUMN_STATUS, + COLUMN_PATH, + NUM_COLUMNS +}; + +static GtkTreeModel * +create_commit_model(const GSList * commit) +{ + GtkListStore *store; + GtkTreeIter iter; + const GSList *cur; + + /* create list store */ + store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING); + + /* add data to the list store */ + + for (cur = commit; cur != NULL; cur = g_slist_next(cur)) + { + gtk_list_store_append(store, &iter); + gtk_list_store_set(store, &iter, + COLUMN_COMMIT, TRUE, + COLUMN_STATUS, ((CommitItem *) (cur->data))->status, + COLUMN_PATH, ((CommitItem *) (cur->data))->path, -1); + } + + return GTK_TREE_MODEL(store); +} + +static gboolean +get_commit_files_foreach(GtkTreeModel * model, G_GNUC_UNUSED GtkTreePath * path, GtkTreeIter * iter, + gpointer data) +{ + GSList **files = (GSList **) data; + gboolean commit; + gchar *filename; + + gtk_tree_model_get(model, iter, COLUMN_COMMIT, &commit, -1); + if (!commit) + return FALSE; + + gtk_tree_model_get(model, iter, COLUMN_PATH, &filename, -1); + *files = g_slist_prepend(*files, filename); + return FALSE; +} + +static gboolean +get_commit_diff_foreach(GtkTreeModel * model, G_GNUC_UNUSED GtkTreePath * path, GtkTreeIter * iter, + gpointer data) +{ + gchar **diff = (gchar **) data; + gboolean commit; + gchar *filename; + gchar *tmp = NULL; + gchar *status; + const VC_RECORD *vc; + + gtk_tree_model_get(model, iter, COLUMN_COMMIT, &commit, -1); + if (!commit) + return FALSE; + + gtk_tree_model_get(model, iter, COLUMN_STATUS, &status, -1); + + if (strcmp(status, FILE_STATUS_MODIFIED) != 0) + { + g_free(status); + return FALSE; + } + + gtk_tree_model_get(model, iter, COLUMN_PATH, &filename, -1); + + vc = find_vc(filename); + g_return_val_if_fail(vc, FALSE); + + execute_command(vc, &tmp, NULL, filename, VC_COMMAND_DIFF_FILE, NULL, NULL); + if (tmp) + { + setptr(*diff, g_strdup_printf("%s%s", *diff, tmp)); + g_free(tmp); + } + else + { + fprintf(stderr, "error: geanyvc: get_commit_diff_foreach: empty diff output\n"); + } + g_free(filename); + return FALSE; +} + +static gchar * +get_commit_diff(GtkTreeView * treeview) +{ + GtkTreeModel *model = gtk_tree_view_get_model(treeview); + gchar *ret = g_strdup(""); + + gtk_tree_model_foreach(model, get_commit_diff_foreach, &ret); + return ret; +} + +static void +set_diff_buff(GtkTextBuffer * buffer, const gchar * txt) +{ + GtkTextIter start, end; + const gchar *tagname = ""; + + const gchar *p = txt; + gtk_text_buffer_set_text(buffer, txt, -1); + + gtk_text_buffer_get_start_iter(buffer, &start); + gtk_text_buffer_get_end_iter(buffer, &end); + + gtk_text_buffer_remove_all_tags(buffer, &start, &end); + + while (p) + { + if (*p == '-') + { + tagname = "deleted"; + } + else if (*p == '+') + { + tagname = "added"; + } + else if (*p == ' ') + { + tagname = ""; + } + else + { + tagname = "default"; + } + gtk_text_buffer_get_iter_at_offset(buffer, &start, + g_utf8_pointer_to_offset(txt, p)); + + p = strchr(p, '\n'); + if (p) + { + if (*tagname) + { + gtk_text_buffer_get_iter_at_offset(buffer, &end, + g_utf8_pointer_to_offset(txt, + p)); + gtk_text_buffer_apply_tag_by_name(buffer, tagname, &start, &end); + } + p++; + } + } +} + +static void +commit_toggled(G_GNUC_UNUSED GtkCellRendererToggle * cell, gchar * path_str, gpointer data) +{ + GtkTreeView *treeview = GTK_TREE_VIEW(data); + GtkWidget *diffView = p_support->lookup_widget(GTK_WIDGET(treeview), "textDiff"); + GtkTreeModel *model = gtk_tree_view_get_model(treeview); + GtkTreeIter iter; + GtkTreePath *path = gtk_tree_path_new_from_string(path_str); + gboolean fixed; + gchar *diff; + + /* get toggled iter */ + gtk_tree_model_get_iter(model, &iter, path); + gtk_tree_model_get(model, &iter, COLUMN_COMMIT, &fixed, -1); + + /* do something with the value */ + fixed ^= 1; + + /* set new value */ + gtk_list_store_set(GTK_LIST_STORE(model), &iter, COLUMN_COMMIT, fixed, -1); + + diff = get_commit_diff(GTK_TREE_VIEW(treeview)); + set_diff_buff(gtk_text_view_get_buffer(GTK_TEXT_VIEW(diffView)), diff); + + /* clean up */ + gtk_tree_path_free(path); + g_free(diff); +} + +static void +add_commit_columns(GtkTreeView * treeview) +{ + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + + /* column for fixed toggles */ + renderer = gtk_cell_renderer_toggle_new(); + g_signal_connect(renderer, "toggled", G_CALLBACK(commit_toggled), treeview); + + column = gtk_tree_view_column_new_with_attributes("Commit?", + renderer, "active", COLUMN_COMMIT, NULL); + + /* set this column to a fixed sizing (of 50 pixels) */ + gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN(column), 70); + gtk_tree_view_append_column(treeview, column); + + /* column for bug numbers */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("Status", + renderer, "text", COLUMN_STATUS, NULL); + gtk_tree_view_column_set_sort_column_id(column, COLUMN_STATUS); + gtk_tree_view_append_column(treeview, column); + + /* column for severities */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("Path", + renderer, "text", COLUMN_PATH, NULL); + gtk_tree_view_column_set_sort_column_id(column, COLUMN_PATH); + gtk_tree_view_append_column(treeview, column); +} + +static GdkColor * +get_diff_color(G_GNUC_UNUSED GeanyDocument * doc, gint style) +{ + static GdkColor c = { 0, 0, 0, 0 }; + const HighlightingStyle *s; + + s = p_highlighting->get_style(GEANY_FILETYPES_DIFF, style); + c.red = (s->foreground % 256) * 257; + c.green = s->foreground & -16711936; + c.blue = (s->foreground & 0xff0000) / 256; + + return &c; +} + +#define GLADE_HOOKUP_OBJECT(component,widget,name) \ + g_object_set_data_full (G_OBJECT (component), name, \ + gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref) + +#define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \ + g_object_set_data (G_OBJECT (component), name, widget) + +GtkWidget * +create_commitDialog(void) +{ + GtkWidget *commitDialog; + GtkWidget *dialog_vbox1; + GtkWidget *vpaned1; + GtkWidget *scrolledwindow1; + GtkWidget *treeSelect; + GtkWidget *vpaned2; + GtkWidget *scrolledwindow2; + GtkWidget *textDiff; + GtkWidget *frame1; + GtkWidget *alignment1; + GtkWidget *scrolledwindow3; + GtkWidget *textCommitMessage; + GtkWidget *label1; + GtkWidget *dialog_action_area1; + GtkWidget *btnCancel; + GtkWidget *btnCommit; + + gchar *rcstyle = g_strdup_printf("style "geanyvc-diff-font"\n" + "{\n" + " font_name="%s"\n" + "}\n" + "widget "*.GeanyVCCommitDialogDiff" style "geanyvc-diff-font"", + geany_data->interface_prefs->editor_font); + + gtk_rc_parse_string(rcstyle); + g_free(rcstyle); + + commitDialog = gtk_dialog_new(); + gtk_container_set_border_width(GTK_CONTAINER(commitDialog), 5); + gtk_widget_set_events(commitDialog, + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); + gtk_window_set_title(GTK_WINDOW(commitDialog), _("Commit")); + gtk_window_set_position(GTK_WINDOW(commitDialog), GTK_WIN_POS_CENTER_ON_PARENT); + gtk_window_set_modal(GTK_WINDOW(commitDialog), TRUE); + gtk_window_set_destroy_with_parent(GTK_WINDOW(commitDialog), TRUE); + gtk_window_set_type_hint(GTK_WINDOW(commitDialog), GDK_WINDOW_TYPE_HINT_DIALOG); + gtk_dialog_set_has_separator(GTK_DIALOG(commitDialog), FALSE); + + dialog_vbox1 = GTK_DIALOG(commitDialog)->vbox; + gtk_widget_show(dialog_vbox1); + + vpaned1 = gtk_vpaned_new(); + gtk_widget_show(vpaned1); + gtk_box_pack_start(GTK_BOX(dialog_vbox1), vpaned1, TRUE, TRUE, 0); + + scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL); + gtk_widget_show(scrolledwindow1); + gtk_paned_pack1(GTK_PANED(vpaned1), scrolledwindow1, FALSE, TRUE); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow1), GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + + treeSelect = gtk_tree_view_new(); + gtk_widget_show(treeSelect); + gtk_container_add(GTK_CONTAINER(scrolledwindow1), treeSelect); + gtk_widget_set_events(treeSelect, + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); + + vpaned2 = gtk_vpaned_new(); + gtk_widget_show(vpaned2); + gtk_paned_pack2(GTK_PANED(vpaned1), vpaned2, TRUE, TRUE); + + scrolledwindow2 = gtk_scrolled_window_new(NULL, NULL); + gtk_widget_show(scrolledwindow2); + gtk_paned_pack1(GTK_PANED(vpaned2), scrolledwindow2, TRUE, TRUE); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow2), GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow2), GTK_SHADOW_IN); + + textDiff = gtk_text_view_new(); + gtk_widget_set_name(textDiff, "GeanyVCCommitDialogDiff"); + gtk_widget_show(textDiff); + gtk_container_add(GTK_CONTAINER(scrolledwindow2), textDiff); + gtk_widget_set_events(textDiff, + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); + gtk_text_view_set_editable(GTK_TEXT_VIEW(textDiff), FALSE); + + frame1 = gtk_frame_new(NULL); + gtk_widget_show(frame1); + gtk_paned_pack2(GTK_PANED(vpaned2), frame1, TRUE, TRUE); + gtk_frame_set_shadow_type(GTK_FRAME(frame1), GTK_SHADOW_NONE); + + alignment1 = gtk_alignment_new(0.5, 0.5, 1, 1); + gtk_widget_show(alignment1); + gtk_container_add(GTK_CONTAINER(frame1), alignment1); + gtk_alignment_set_padding(GTK_ALIGNMENT(alignment1), 0, 0, 12, 0); + + scrolledwindow3 = gtk_scrolled_window_new(NULL, NULL); + gtk_widget_show(scrolledwindow3); + gtk_container_add(GTK_CONTAINER(alignment1), scrolledwindow3); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow3), GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow3), GTK_SHADOW_IN); + + textCommitMessage = gtk_text_view_new(); + gtk_widget_show(textCommitMessage); + gtk_container_add(GTK_CONTAINER(scrolledwindow3), textCommitMessage); + gtk_widget_set_events(textCommitMessage, + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); + + label1 = gtk_label_new(_("<b>Commit message:</b>")); + gtk_widget_show(label1); + gtk_frame_set_label_widget(GTK_FRAME(frame1), label1); + gtk_label_set_use_markup(GTK_LABEL(label1), TRUE); + + dialog_action_area1 = GTK_DIALOG(commitDialog)->action_area; + gtk_widget_show(dialog_action_area1); + gtk_button_box_set_layout(GTK_BUTTON_BOX(dialog_action_area1), GTK_BUTTONBOX_END); + + btnCancel = gtk_button_new_from_stock("gtk-cancel"); + gtk_widget_show(btnCancel); + gtk_dialog_add_action_widget(GTK_DIALOG(commitDialog), btnCancel, GTK_RESPONSE_CANCEL); + + btnCommit = gtk_button_new_with_mnemonic(_("_Commit")); + gtk_widget_show(btnCommit); + gtk_dialog_add_action_widget(GTK_DIALOG(commitDialog), btnCommit, GTK_RESPONSE_APPLY); + + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF(commitDialog, commitDialog, "commitDialog"); + GLADE_HOOKUP_OBJECT_NO_REF(commitDialog, dialog_vbox1, "dialog_vbox1"); + GLADE_HOOKUP_OBJECT(commitDialog, vpaned1, "vpaned1"); + GLADE_HOOKUP_OBJECT(commitDialog, scrolledwindow1, "scrolledwindow1"); + GLADE_HOOKUP_OBJECT(commitDialog, treeSelect, "treeSelect"); + GLADE_HOOKUP_OBJECT(commitDialog, vpaned2, "vpaned2"); + GLADE_HOOKUP_OBJECT(commitDialog, scrolledwindow2, "scrolledwindow2"); + GLADE_HOOKUP_OBJECT(commitDialog, textDiff, "textDiff"); + GLADE_HOOKUP_OBJECT(commitDialog, frame1, "frame1"); + GLADE_HOOKUP_OBJECT(commitDialog, alignment1, "alignment1"); + GLADE_HOOKUP_OBJECT(commitDialog, scrolledwindow3, "scrolledwindow3"); + GLADE_HOOKUP_OBJECT(commitDialog, textCommitMessage, "textCommitMessage"); + GLADE_HOOKUP_OBJECT(commitDialog, label1, "label1"); + GLADE_HOOKUP_OBJECT_NO_REF(commitDialog, dialog_action_area1, "dialog_action_area1"); + GLADE_HOOKUP_OBJECT(commitDialog, btnCancel, "btnCancel"); + GLADE_HOOKUP_OBJECT(commitDialog, btnCommit, "btnCommit"); + + return commitDialog; +} + +static void +vccommit_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +{ + GeanyDocument *doc; + gint result; + const VC_RECORD *vc; + GSList *lst; + GtkTreeModel *model; + GtkWidget *commit = create_commitDialog(); + GtkWidget *treeview = p_support->lookup_widget(commit, "treeSelect"); + GtkWidget *diffView = p_support->lookup_widget(commit, "textDiff"); + GtkWidget *messageView = p_support->lookup_widget(commit, "textCommitMessage"); + GtkWidget *vpaned1 = p_support->lookup_widget(commit, "vpaned1"); + GtkWidget *vpaned2 = p_support->lookup_widget(commit, "vpaned2"); + + GtkTextBuffer *mbuf; + GtkTextBuffer *diffbuf; + + GtkTextIter begin; + GtkTextIter end; + GSList *selected_files = NULL; + + gchar *dir; + gchar *message; + gchar *diff; + + gint height; + +#ifdef USE_GTKSPELL + GtkSpell *speller = NULL; + GError *spellcheck_error = NULL; +#endif + + doc = p_document->get_current(); + g_return_if_fail(doc); + g_return_if_fail(doc->file_name); + dir = g_path_get_dirname(doc->file_name); + + vc = find_vc(dir); + g_return_if_fail(vc); + + lst = vc->get_commit_files(dir); + if (!lst) + { + g_free(dir); + p_ui->set_statusbar(FALSE, _("Nothing to commit.")); + return; + } + + model = create_commit_model(lst); + gtk_tree_view_set_model(GTK_TREE_VIEW(treeview), model); + g_object_unref(model); + + /* add columns to the tree view */ + add_commit_columns(GTK_TREE_VIEW(treeview)); + + diff = get_commit_diff(GTK_TREE_VIEW(treeview)); + diffbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(diffView)); + + gtk_text_buffer_create_tag(diffbuf, "deleted", "foreground-gdk", + get_diff_color(doc, SCE_DIFF_DELETED), NULL); + + gtk_text_buffer_create_tag(diffbuf, "added", "foreground-gdk", + get_diff_color(doc, SCE_DIFF_ADDED), NULL); + + gtk_text_buffer_create_tag(diffbuf, "default", "foreground-gdk", + get_diff_color(doc, SCE_DIFF_POSITION), NULL); + + set_diff_buff(diffbuf, diff); + + if (set_maximize_commit_dialog) + { + gtk_window_maximize(GTK_WINDOW(commit)); + gtk_widget_show_now(commit); + gtk_window_get_size(GTK_WINDOW(commit), NULL, &height); + gtk_paned_set_position(GTK_PANED(vpaned1), height * 30 / 100); + gtk_paned_set_position(GTK_PANED(vpaned2), height * 15 / 100); + } + else + { + gtk_widget_set_size_request(commit, 700, 500); + gtk_widget_show_now(commit); + gtk_window_get_size(GTK_WINDOW(commit), NULL, &height); + gtk_paned_set_position(GTK_PANED(vpaned1), height * 30 / 100); + gtk_paned_set_position(GTK_PANED(vpaned2), height * 55 / 100); + } + +#ifdef USE_GTKSPELL + speller = gtkspell_new_attach(GTK_TEXT_VIEW(messageView), NULL, &spellcheck_error); + if (speller == NULL) + { + p_ui->set_statusbar(FALSE, _("Error initializing spell checking: %s"), + spellcheck_error->message); + g_error_free(spellcheck_error); + spellcheck_error = NULL; + } + else if (lang != NULL) + { + gtkspell_set_language(speller, lang, &spellcheck_error); + if (spellcheck_error != NULL) + { + p_ui->set_statusbar(TRUE, + _

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.