SF.net SVN: geany-plugins:[761] trunk/geany-plugins
frlan at users.sourceforge.net
frlan at xxxxx
Sun Jun 21 20:52:41 UTC 2009
Revision: 761
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=761&view=rev
Author: frlan
Date: 2009-06-21 20:52:40 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
Merge last stable version of geanyvc into new geany-plugins project. Autotools still missing
Modified Paths:
--------------
trunk/geany-plugins/wscript
Added Paths:
-----------
trunk/geany-plugins/geanyvc/
trunk/geany-plugins/geanyvc/AUTHORS
trunk/geany-plugins/geanyvc/COPYING
trunk/geany-plugins/geanyvc/ChangeLog
trunk/geany-plugins/geanyvc/README
trunk/geany-plugins/geanyvc/THANKS
trunk/geany-plugins/geanyvc/TODO
trunk/geany-plugins/geanyvc/src/
trunk/geany-plugins/geanyvc/src/externdiff.c
trunk/geany-plugins/geanyvc/src/geanyvc.c
trunk/geany-plugins/geanyvc/src/geanyvc.h
trunk/geany-plugins/geanyvc/src/utils.c
trunk/geany-plugins/geanyvc/src/vc_bzr.c
trunk/geany-plugins/geanyvc/src/vc_cvs.c
trunk/geany-plugins/geanyvc/src/vc_git.c
trunk/geany-plugins/geanyvc/src/vc_hg.c
trunk/geany-plugins/geanyvc/src/vc_svk.c
trunk/geany-plugins/geanyvc/src/vc_svn.c
Copied: trunk/geany-plugins/geanyvc/COPYING (from rev 760, tags/geanyvc/geanyvc-0.5/COPYING)
===================================================================
--- trunk/geany-plugins/geanyvc/COPYING (rev 0)
+++ trunk/geany-plugins/geanyvc/COPYING 2009-06-21 20:52:40 UTC (rev 761)
@@ -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.
Copied: trunk/geany-plugins/geanyvc/README (from rev 760, tags/geanyvc/geanyvc-0.5/README)
===================================================================
--- trunk/geany-plugins/geanyvc/README (rev 0)
+++ trunk/geany-plugins/geanyvc/README 2009-06-21 20:52:40 UTC (rev 761)
@@ -0,0 +1,197 @@
+.. |(version)| replace:: 0.5
+
+=======
+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.
+
+In order to use it you need Geany 0.16.
+
+Features
+========
+
+geanyvc currently support the following version control systems:
+
+Bazaar, GIT, Mercurial, Subversion, SVK::
+
+ * diff file
+ * diff directory
+ * diff base directory
+ * blame
+ * log file
+ * log directory
+ * log base directory
+ * status
+ * revert file
+ * revert directory
+ * revert base directory
+ * show unmodified original file
+ * add file
+ * remove file
+ * update
+ * commit
+
+CVS::
+
+ * diff file
+ * diff directory
+ * diff base directory
+ * log file
+ * log directory
+ * log base directory
+ * status
+ * revert file
+ * revert directory
+ * revert base directory
+ * update
+
+Requirements
+============
+
+For compiling the plugin yourself, 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.
+
+And obviously, you will need have Geany installed. If you have Geany installed
+from the sources, you should be ready to go.
+If you used a prepared package e.g. from your distribution you probably need
+to install an additional package, this might be called geany-dev or geany-devel.
+Please note that in order to compile and use this plugin, you need Geany 0.15
+or later.
+
+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>?"
+
+* Maximize commit dialog
+
+If this option is activated, commit dialog will fit the full size of your
+monitor. If it is not set commit dialog size will be 700x500.
+
+* Use external diff viewer
+
+If this option is activated and you have **meld**, **kompare**, **kdiff3**,
+**diffuse** or **tkdiff** available from command line, one of these program
+will be used to show differences for "Diff From Current File" command.
+
+* Enable CVS/GIT/SVN/SVK/Bazaar/Mercurial
+
+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 slow.
+
+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:
+
+============= =============== ==========================================================
+Geany Version Geanyvc Version Download
+============= =============== ==========================================================
+0.16 0.5 http://users.cosmostv.by/yurand/geanyvc/geanyvc-0.5.tar.gz
+============= =============== ==========================================================
+
+Up to date source code can be downloaded here::
+
+ svn checkout http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geanyvc
+
+If you have old version of Geany installed you need old version of plugin as well. These versions of plugin
+are no longer supported and if you find bug in one of them, it won't be fixed unless you do it yourself.
+
+============= =============== ==========================================================
+Geany Version Geanyvc Version Download
+============= =============== ==========================================================
+0.15 0.4 http://users.cosmostv.by/yurand/geanyvc/geanyvc-0.4.tar.gz
+
+0.14 0.3 http://users.cosmostv.by/yurand/geanyvc/geanyvc-0.3.tar.gz
+
+0.13 0.2 http://users.cosmostv.by/yurand/geanyvc/geanyvc-0.2.tar.gz
+============= =============== ==========================================================
+
+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.4_setup.exe
+
+--
+2007-2008 by Yura Siamashka and Frank Lanitz
+yurand2(at)gmail(dot)com
+frank(at)frank(dot)uvena(dot)de
Copied: trunk/geany-plugins/geanyvc/THANKS (from rev 760, tags/geanyvc/geanyvc-0.5/THANKS)
===================================================================
--- trunk/geany-plugins/geanyvc/THANKS (rev 0)
+++ trunk/geany-plugins/geanyvc/THANKS 2009-06-21 20:52:40 UTC (rev 761)
@@ -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
Copied: trunk/geany-plugins/geanyvc/TODO (from rev 760, tags/geanyvc/geanyvc-0.5/TODO)
===================================================================
--- trunk/geany-plugins/geanyvc/TODO (rev 0)
+++ trunk/geany-plugins/geanyvc/TODO 2009-06-21 20:52:40 UTC (rev 761)
@@ -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)
Copied: trunk/geany-plugins/geanyvc/src/externdiff.c (from rev 760, tags/geanyvc/geanyvc-0.5/externdiff.c)
===================================================================
--- trunk/geany-plugins/geanyvc/src/externdiff.c (rev 0)
+++ trunk/geany-plugins/geanyvc/src/externdiff.c 2009-06-21 20:52:40 UTC (rev 761)
@@ -0,0 +1,87 @@
+/*
+ * externdiff.h - Plugin to geany light IDE to work with vc
+ *
+ * Copyright 2008 Yura Siamashka <yurand2 at 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 "geanyfunctions.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;
+
+ 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);
+}
Copied: trunk/geany-plugins/geanyvc/src/geanyvc.c (from rev 760, tags/geanyvc/geanyvc-0.5/geanyvc.c)
===================================================================
--- trunk/geany-plugins/geanyvc/src/geanyvc.c (rev 0)
+++ trunk/geany-plugins/geanyvc/src/geanyvc.c 2009-06-21 20:52:40 UTC (rev 761)
@@ -0,0 +1,2200 @@
+/*
+ * geanyvc.c - Plugin to geany light IDE to work with vc
+ *
+ * Copyright 2007-2009 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+ * Copyright 2007, 2008 Enrico Tröger <enrico.troeger at uvena.de>
+ * Copyright 2007 Nick Treleaven <nick.treleaven at btinternet.com>
+ * Copyright 2007, 2008 Yura Siamashka <yurand2 at 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 "editor.h"
+#include "filetypes.h"
+#include "utils.h"
+#include "ui_utils.h"
+#include "prefs.h"
+#include "keybindings.h"
+#include "highlighting.h"
+#include "geanyfunctions.h"
+
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
+
+#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(115);
+PLUGIN_SET_INFO(_("VC"), _("Interface to different Version Control systems."), VERSION,
+ _("Yura Siamashka <yurand2 at gmail.com>,\nFrank Lanitz <frank at 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. */
+/* absolute path dirname of file */
+const gchar ABS_DIRNAME[] = "*ABS_DIRNAME*";
+/* absolute path filename of file */
+const gchar ABS_FILENAME[] = "*ABS_FILENAME*";;
+
+/* path to directory from base vc directory */
+const gchar BASE_DIRNAME[] = "*BASE_DIRNAME*";
+/* path to file from base vc directory */
+const gchar BASE_FILENAME[] = "*BASE_FILENAME*";
+
+/* basename of file */
+const gchar BASENAME[] = "*BASENAME*";
+/* list with absolute file names*/
+const gchar FILE_LIST[] = "*FILE_LIST*";
+/* message */
+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";
+
+static void registrate();
+
+
+/* Doing some basic keybinding stuff */
+enum
+{
+ VC_DIFF_FILE,
+ VC_DIFF_DIR,
+ VC_DIFF_BASEDIR,
+ VC_COMMIT,
+ VC_STATUS,
+ VC_UPDATE,
+ VC_REVERT_FILE,
+ VC_REVERT_DIR,
+ VC_REVERT_BASEDIR,
+ COUNT_KB
+};
+
+PLUGIN_KEY_GROUP(geanyvc, COUNT_KB)
+ 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].command;
+ else
+ return vc->commands[cmd_type].env;
+ }
+ return NULL;
+}
+
+/* Get list of commands for given command spec*/
+static GSList *
+get_cmd(const gchar ** argv, const gchar * dir, const gchar * filename, GSList * filelist,
+ const gchar * message)
+{
+ gint i, j;
+ gint len = 0;
+ gchar **ret;
+ gchar *abs_dir;
+ gchar *base_filename;
+ gchar *base_dirname;
+ gchar *basename;
+ GSList *head = NULL;
+ GSList *tmp;
+ GString *repl;
+
+ if (g_file_test(filename, G_FILE_TEST_IS_DIR))
+ abs_dir = g_strdup(filename);
+ else
+ abs_dir = g_path_get_dirname(filename);
+ basename = g_path_get_basename(filename);
+ base_filename = get_relative_path(dir, filename);
+ base_dirname = get_relative_path(dir, abs_dir);
+
+ 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] == ABS_DIRNAME)
+ {
+ ret[j] = utils_get_locale_from_utf8(abs_dir);
+ }
+ else if (argv[i] == ABS_FILENAME)
+ {
+ ret[j] = utils_get_locale_from_utf8(filename);
+ }
+ else if (argv[i] == BASE_DIRNAME)
+ {
+ ret[j] = utils_get_locale_from_utf8(base_dirname);
+ }
+ else if (argv[i] == BASE_FILENAME)
+ {
+ ret[j] = utils_get_locale_from_utf8(base_filename);
+ }
+ else if (argv[i] == BASENAME)
+ {
+ ret[j] = utils_get_locale_from_utf8(basename);
+ }
+ else if (argv[i] == FILE_LIST)
+ {
+ for (tmp = filelist; tmp != NULL; tmp = g_slist_next(tmp))
+ {
+ ret[j] = utils_get_locale_from_utf8((gchar *) tmp->data);
+ j++;
+ }
+ j--;
+ }
+ else if (argv[i] == MESSAGE)
+ {
+ ret[j] = utils_get_locale_from_utf8(message);
+ }
+ else
+ {
+ repl = g_string_new(argv[i]);
+ utils_string_replace_all(repl, P_ABS_DIRNAME, abs_dir);
+ utils_string_replace_all(repl, P_ABS_FILENAME, filename);
+ utils_string_replace_all(repl, P_BASENAME, basename);
+ ret[j] = g_string_free(repl, FALSE);
+ setptr(ret[j], utils_get_locale_from_utf8(ret[j]));
+ }
+ }
+ g_free(abs_dir);
+ g_free(base_dirname);
+ g_free(base_filename);
+ g_free(basename);
+ 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, GeanyFiletype * ftype)
+{
+ gint page;
+ GtkNotebook *book;
+ GeanyDocument *doc, *cur_doc;
+
+ if (std_output)
+ {
+ cur_doc = document_get_current();
+ doc = document_find_by_filename(name);
+ if (doc == NULL)
+ {
+ doc = document_new_file(name, ftype, std_output);
+ }
+ else
+ {
+ sci_set_text(doc->editor->sci, std_output);
+ if (ftype)
+ document_set_filetype(doc, ftype);
+ book = GTK_NOTEBOOK(geany->main_widgets->notebook);
+ page = gtk_notebook_page_num(book, GTK_WIDGET(doc->editor->sci));
+ gtk_notebook_set_current_page(book, page);
+ }
+ document_set_text_changed(doc, set_changed_flag);
+ document_set_encoding(doc, (force_encoding ? force_encoding : "UTF-8"));
+ navqueue_goto_line(cur_doc, doc, 1);
+ }
+ else
+ {
+ ui_set_statusbar(FALSE, _("Could not parse the output of command"));
+ }
+}
+
+/*
+ * Execute command by command spec, return std_out std_err
+ *
+ * @dir - start directory of command
+ * @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 * dir, const gchar ** argv, const gchar ** env, gchar ** std_out,
+ gchar ** std_err, const gchar * filename, GSList * list,
+ const gchar * message)
+{
+ gint exit_code;
+ GString *tmp;
+ GSList *cur;
+ GSList *largv = get_cmd(argv, dir, filename, list, message);
+ GError *error = NULL;
+
+ if (std_out)
+ *std_out = NULL;
+ if (std_err)
+ *std_err = NULL;
+
+ if (!largv)
+ {
+ return 0;
+ }
+ for (cur = largv; cur != NULL; cur = g_slist_next(cur))
+ {
+ argv = cur->data;
+ if (cur != g_slist_last(largv))
+ {
+ 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
+ {
+ 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)
+ {
+ g_warning("geanyvc: s_spawn_sync error: %s", error->message);
+ 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);
+ utils_string_replace_all(tmp, "\r\n", "\n");
+ 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, 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);
+ utils_string_replace_all(tmp, "\r\n", "\n");
+ 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, 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_slist_free(largv);
+ return exit_code;
+}
+
+static gint
+execute_command(const VC_RECORD * vc, gchar ** std_out, gchar ** std_err, const gchar * filename,
+ gint cmd, GSList * list, const gchar * message)
+{
+ gchar *dir;
+ gint ret;
+
+ if (std_out)
+ *std_out = NULL;
+ if (std_err)
+ *std_err = NULL;
+
+ if (vc->commands[cmd].function)
+ {
+ return vc->commands[cmd].function(std_out, std_err, filename, list, message);
+ }
+
+ if (vc->commands[cmd].startdir == VC_COMMAND_STARTDIR_FILE)
+ {
+ if (g_file_test(filename, G_FILE_TEST_IS_DIR))
+ dir = g_strdup(filename);
+ else
+ dir = g_path_get_dirname(filename);
+ }
+ else if (vc->commands[cmd].startdir == VC_COMMAND_STARTDIR_BASE)
+ {
+ dir = vc->get_base_dir(filename);
+ }
+ else
+ {
+ g_warning("geanyvc: unknown startdir type: %d", vc->commands[cmd].startdir);
+ }
+
+ ret = execute_custom_command(dir, vc->commands[cmd].command, vc->commands[cmd].env, std_out,
+ std_err, filename, list, message);
+ g_free(dir);
+ return ret;
+}
+
+/* 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 = document_get_current();
+ g_return_if_fail(doc != NULL && doc->file_name != NULL);
+
+ if (doc->changed)
+ {
+ 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 = utils_get_locale_from_utf8(doc->file_name);
+
+ new = g_strconcat(doc->file_name, ".geanyvc.~NEW~", NULL);
+ setptr(new, utils_get_locale_from_utf8(new));
+
+ old = g_strconcat(doc->file_name, ".geanyvc.~BASE~", NULL);
+ setptr(old, utils_get_locale_from_utf8(old));
+
+ if (g_rename(localename, new) != 0)
+ {
+ g_warning(_
+ ("geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'"),
+ localename, new);
+ goto end;
+ }
+
+ execute_command(vc, NULL, NULL, doc->file_name,
+ VC_COMMAND_REVERT_FILE, NULL, NULL);
+
+ if (g_rename(localename, old) != 0)
+ {
+ g_warning(_
+ ("geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'"),
+ 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, NULL);
+ g_free(text);
+ g_free(name);
+ }
+
+ }
+ else
+ {
+ ui_set_statusbar(FALSE, _("No changes were made."));
+ }
+}
+
+
+
+/* Callback if menu item for the base directory was activated */
+static void
+vcdiff_dir_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, gint flags)
+{
+ gchar *text = NULL;
+ gchar *dir;
+ const VC_RECORD *vc;
+ GeanyDocument *doc;
+
+ doc = document_get_current();
+ g_return_if_fail(doc != NULL && doc->file_name != NULL);
+
+ if (doc && doc->changed && doc->file_name != NULL)
+ {
+ document_save_file(doc, FALSE);
+ }
+
+ vc = find_vc(doc->file_name);
+ g_return_if_fail(vc);
+
+ if (flags & FLAG_BASEDIR)
+ {
+ dir = vc->get_base_dir(doc->file_name);
+ }
+ else if (flags & FLAG_DIR)
+ {
+ dir = g_path_get_dirname(doc->file_name);
+ }
+ else
+ return;
+ g_return_if_fail(dir);
+
+ execute_command(vc, &text, NULL, dir, VC_COMMAND_DIFF_DIR, NULL, NULL);
+ if (text)
+ {
+ gchar *name;
+ name = g_strconcat(dir, ".vc.diff", NULL);
+ show_output(text, name, doc->encoding, NULL);
+ g_free(text);
+ g_free(name);
+ }
+ else
+ {
+ ui_set_statusbar(FALSE, _("No changes were made."));
+ }
+ g_free(dir);
+}
+
+static void
+vcblame_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
+{
+ gchar *text = NULL;
+ const VC_RECORD *vc;
+ GeanyDocument *doc;
+
+ doc = 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, doc->file_type);
+ g_free(text);
+ }
+ else
+ {
+ 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 = 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, &output, NULL, doc->file_name, VC_COMMAND_LOG_FILE, NULL, NULL);
+ if (output)
+ {
+ show_output(output, "*VC-LOG*", NULL, 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 = 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, NULL);
+ g_free(text);
+ }
+
+ g_free(base_name);
+}
+
+static void
+vclog_basedir_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
+{
+ gchar *text = NULL;
+ const VC_RECORD *vc;
+ GeanyDocument *doc;
+ gchar *basedir;
+
+ doc = document_get_current();
+ g_return_if_fail(doc != NULL && doc->file_name != NULL);
+
+ vc = find_vc(doc->file_name);
+ g_return_if_fail(vc);
+
+ basedir = vc->get_base_dir(doc->file_name);
+ g_return_if_fail(basedir);
+
+ execute_command(vc, &text, NULL, basedir, VC_COMMAND_LOG_DIR, NULL, NULL);
+ if (text)
+ {
+ show_output(text, "*VC-LOG*", NULL, NULL);
+ g_free(text);
+ }
+ g_free(basedir);
+}
+
+/* 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 = document_get_current();
+ g_return_if_fail(doc != NULL && doc->file_name != NULL);
+
+ if (doc->changed)
+ {
+ 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, NULL);
+ g_free(text);
+ }
+
+ g_free(base_name);
+}
+
+static void
+vcshow_file_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
+{
+ gchar *output = NULL;
+ const VC_RECORD *vc;
+ GeanyDocument *doc;
+
+ doc = 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, &output, NULL, doc->file_name, VC_COMMAND_SHOW, NULL, NULL);
+ if (output)
+ {
+ gchar *name;
+ name = g_strconcat(doc->file_name, ".vc.orig", NULL);
+ show_output(output, name, doc->encoding, doc->file_type);
+ g_free(name);
+ g_free(output);
+ }
+}
+
+static gboolean
+command_with_question_activated(gchar ** text, gint cmd, const gchar * question, gint flags)
+{
+ GtkWidget *dialog;
+ gint result;
+ gchar *dir;
+ const VC_RECORD *vc;
+ GeanyDocument *doc;
+
+ doc = document_get_current();
+ g_return_val_if_fail(doc != NULL && doc->file_name != NULL, FALSE);
+
+ dir = g_path_get_dirname(doc->file_name);
+ vc = find_vc(dir);
+ g_return_val_if_fail(vc, FALSE);
+
+ if (flags & FLAG_BASEDIR)
+ {
+ dir = vc->get_base_dir(dir);
+ }
+
+ if (doc->changed)
+ {
+ document_save_file(doc, FALSE);
+ }
+
+ if ((flags & FLAG_FORCE_ASK) || set_add_confirmation)
+ {
+ dialog = gtk_message_dialog_new(GTK_WINDOW(geany->main_widgets->window),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_YES_NO, question,
+ (flags & (FLAG_DIR | FLAG_BASEDIR) ? dir :
+ doc->file_name));
+ result = gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_destroy(dialog);
+ }
+ else
+ {
+ result = GTK_RESPONSE_YES;
+ }
+
+ if (result == GTK_RESPONSE_YES)
+ {
+ if (flags & FLAG_FILE)
+ execute_command(vc, text, NULL, doc->file_name, cmd, NULL, NULL);
+ if (flags & (FLAG_DIR | FLAG_BASEDIR))
+ execute_command(vc, text, NULL, dir, cmd, NULL, NULL);
+ if (flags & FLAG_RELOAD)
+ document_reload_file(doc, NULL);
+ }
+ g_free(dir);
+ return (result == GTK_RESPONSE_YES);
+}
+
+static void
+vcrevert_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
+{
+ command_with_question_activated(NULL, VC_COMMAND_REVERT_FILE,
+ _("Do you really want to revert: %s?"),
+ FLAG_RELOAD | FLAG_FILE | FLAG_FORCE_ASK);
+}
+
+static void
+vcrevert_dir_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, gint flags)
+{
+ command_with_question_activated(NULL, VC_COMMAND_REVERT_DIR,
+ _("Do you really want to revert: %s?"),
+ FLAG_RELOAD | flags | FLAG_FORCE_ASK);
+}
+
+static void
+vcadd_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
+{
+ command_with_question_activated(NULL, VC_COMMAND_ADD,
+ _("Do you really want to add: %s?"), FLAG_FILE);
+}
+
+static void
+vcremove_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
+{
+ if (command_with_question_activated(NULL, VC_COMMAND_REMOVE,
+ _("Do you really want to remove: %s?"),
+ FLAG_FORCE_ASK | FLAG_FILE))
+ {
+ document_remove_page(gtk_notebook_get_current_page
+ (GTK_NOTEBOOK(geany->main_widgets->notebook)));
+ }
+}
+
+static void
+vcupdate_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
+{
+ gchar *text = NULL;
+ GeanyDocument *doc;
+
+ doc = document_get_current();
+ g_return_if_fail(doc != NULL && doc->file_name != NULL);
+
+ if (doc->changed)
+ {
+ document_save_file(doc, FALSE);
+ }
+
+ if (command_with_question_activated(&text, VC_COMMAND_UPDATE,
+ _("Do you really want to update?"), FLAG_FILE))
+ {
+ document_reload_file(doc, NULL);
+
+ if (NZV(text))
+ show_output(text, "*VC-UPDATE*", NULL, NULL);
+ g_free(text);
+ }
+}
+
+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
+ {
+ g_warning("error: geanyvc: get_commit_diff_foreach: empty diff output");
+ }
+ 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 = ui_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 Y/N"),
+ renderer, "active", COLUMN_COMMIT, NULL);
+
+ /* set this column to a fixed sizing (of 80 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), 80);
+ gtk_tree_view_append_column(treeview, column);
+
+ /* column for status */
+ 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 path of file to commit */
+ 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 GeanyLexerStyle *s;
+
+ s = 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)
+
+static 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 = ui_lookup_widget(commit, "treeSelect");
+ GtkWidget *diffView = ui_lookup_widget(commit, "textDiff");
+ GtkWidget *messageView = ui_lookup_widget(commit, "textCommitMessage");
+ GtkWidget *vpaned1 = ui_lookup_widget(commit, "vpaned1");
+ GtkWidget *vpaned2 = ui_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 = 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);
+ 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)
+ {
+ 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)
+ {
+ ui_set_statusbar(TRUE,
+ _
+ ("Error while setting up language for spellchecking. Please check configuration. Error message was: %s"),
+ spellcheck_error->message);
+ g_error_free(spellcheck_error);
+ spellcheck_error = NULL;
+ }
+ }
+#endif
+
+ /* put the input focus to the commit message text view */
+ gtk_widget_grab_focus(messageView);
+
+ result = gtk_dialog_run(GTK_DIALOG(commit));
+ if (result == GTK_RESPONSE_APPLY)
+ {
+ mbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(messageView));
+ gtk_text_buffer_get_start_iter(mbuf, &begin);
+ gtk_text_buffer_get_end_iter(mbuf, &end);
+ message = gtk_text_buffer_get_text(mbuf, &begin, &end, FALSE);
+ gtk_tree_model_foreach(model, get_commit_files_foreach, &selected_files);
+ if (NZV(message) && selected_files)
+ {
+ execute_command(vc, NULL, NULL, dir, VC_COMMAND_COMMIT, selected_files,
+ message);
+ free_text_list(selected_files);
+ }
+ g_free(message);
+ }
+
+ gtk_widget_destroy(commit);
+ free_commit_list(lst);
+ g_free(dir);
+ g_free(diff);
+}
+
+static GtkWidget *menu_vc_diff_file = NULL;
+static GtkWidget *menu_vc_diff_dir = NULL;
+static GtkWidget *menu_vc_diff_basedir = NULL;
+static GtkWidget *menu_vc_blame = NULL;
+static GtkWidget *menu_vc_log_file = NULL;
+static GtkWidget *menu_vc_log_dir = NULL;
+static GtkWidget *menu_vc_log_basedir = NULL;
+static GtkWidget *menu_vc_status = NULL;
+static GtkWidget *menu_vc_revert_file = NULL;
+static GtkWidget *menu_vc_revert_dir = NULL;
+static GtkWidget *menu_vc_revert_basedir = NULL;
+static GtkWidget *menu_vc_add_file = NULL;
+static GtkWidget *menu_vc_remove_file = NULL;
+static GtkWidget *menu_vc_update = NULL;
+static GtkWidget *menu_vc_commit = NULL;
+static GtkWidget *menu_vc_show_file = NULL;
+
+static void
+update_menu_items()
+{
+ GeanyDocument *doc;
+
+ gboolean have_file;
+ gboolean d_have_vc = FALSE;
+ gboolean f_have_vc = FALSE;
+
+ gchar *dir;
+
+ doc = document_get_current();
+ have_file = doc && doc->file_name && g_path_is_absolute(doc->file_name);
+
+ if (have_file)
+ {
+ dir = g_path_get_dirname(doc->file_name);
+ if (find_cmd_env(VC_COMMAND_DIFF_FILE, TRUE, dir))
+ d_have_vc = TRUE;
+
+ if (find_cmd_env(VC_COMMAND_DIFF_FILE, TRUE, doc->file_name))
+ f_have_vc = TRUE;
+ g_free(dir);
+ }
+
+ gtk_widget_set_sensitive(menu_vc_diff_file, f_have_vc);
+ gtk_widget_set_sensitive(menu_vc_diff_dir, d_have_vc);
+ gtk_widget_set_sensitive(menu_vc_diff_basedir, d_have_vc);
+
+ gtk_widget_set_sensitive(menu_vc_blame, f_have_vc);
+
+ gtk_widget_set_sensitive(menu_vc_log_file, f_have_vc);
+ gtk_widget_set_sensitive(menu_vc_log_dir, d_have_vc);
+ gtk_widget_set_sensitive(menu_vc_log_basedir, d_have_vc);
+
+ gtk_widget_set_sensitive(menu_vc_status, d_have_vc);
+
+ gtk_widget_set_sensitive(menu_vc_revert_file, f_have_vc);
+ gtk_widget_set_sensitive(menu_vc_revert_dir, f_have_vc);
+ gtk_widget_set_sensitive(menu_vc_revert_basedir, f_have_vc);
+
+ gtk_widget_set_sensitive(menu_vc_remove_file, f_have_vc);
+ gtk_widget_set_sensitive(menu_vc_add_file, d_have_vc && !f_have_vc);
+
+ gtk_widget_set_sensitive(menu_vc_update, d_have_vc);
+ gtk_widget_set_sensitive(menu_vc_commit, d_have_vc);
+
+ gtk_widget_set_sensitive(menu_vc_show_file, f_have_vc);
+}
+
+
+static void
+kbdiff_file(G_GNUC_UNUSED guint key_id)
+{
+ vcdiff_file_activated(NULL, NULL);
+}
+
+static void
+kbdiff_dir(G_GNUC_UNUSED guint key_id)
+{
+ vcdiff_dir_activated(NULL, FLAG_DIR);
+}
+
+static void
+kbdiff_basedir(G_GNUC_UNUSED guint key_id)
+{
+ vcdiff_dir_activated(NULL, FLAG_BASEDIR);
+}
+
+static void
+kbstatus(G_GNUC_UNUSED guint key_id)
+{
+ vcstatus_activated(NULL, NULL);
+}
+
+static void
+kbcommit(G_GNUC_UNUSED guint key_id)
+{
+ vccommit_activated(NULL, NULL);
+}
+
+static void
+kbrevert_file(G_GNUC_UNUSED guint key_id)
+{
+ vcrevert_activated(NULL, NULL);
+}
+
+static void
+kbrevert_dir(G_GNUC_UNUSED guint key_id)
+{
+ vcrevert_dir_activated(NULL, FLAG_DIR);
+}
+
+static void
+kbrevert_basedir(G_GNUC_UNUSED guint key_id)
+{
+ vcrevert_dir_activated(NULL, FLAG_BASEDIR);
+}
+
+static void
+kbupdate(G_GNUC_UNUSED guint key_id)
+{
+ vcupdate_activated(NULL, NULL);
+}
+
+
+static struct
+{
+ GtkWidget *cb_changed_flag;
+ GtkWidget *cb_confirm_add;
+ GtkWidget *cb_max_commit;
+ GtkWidget *cb_external_diff;
+ GtkWidget *cb_cvs;
+ GtkWidget *cb_git;
+ GtkWidget *cb_svn;
+ GtkWidget *cb_svk;
+ GtkWidget *cb_bzr;
+ GtkWidget *cb_hg;
+#ifdef USE_GTKSPELL
+ GtkWidget *spellcheck_lang_textbox;
+#endif
+}
+widgets;
+
+static void
+on_configure_response(G_GNUC_UNUSED GtkDialog * dialog, gint response,
+ G_GNUC_UNUSED gpointer user_data)
+{
+ if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY)
+ {
+ GKeyFile *config = g_key_file_new();
+ gchar *data;
+ gchar *config_dir = g_path_get_dirname(config_file);
+
+ set_changed_flag =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.cb_changed_flag));
+ set_add_confirmation =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.cb_confirm_add));
+ set_maximize_commit_dialog =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.cb_max_commit));
+
+ set_external_diff =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.cb_external_diff));
+
+ enable_cvs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.cb_cvs));
+ enable_git = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.cb_git));
+ enable_svn = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.cb_svn));
+ enable_svk = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.cb_svk));
+ enable_bzr = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.cb_bzr));
+ enable_hg = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.cb_hg));
+
+#ifdef USE_GTKSPELL
+ g_free(lang);
+ lang = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.spellcheck_lang_textbox)));
+#endif
+
+ g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL);
+
+ g_key_file_set_boolean(config, "VC", "set_changed_flag", set_changed_flag);
+ g_key_file_set_boolean(config, "VC", "set_add_confirmation", set_add_confirmation);
+ g_key_file_set_boolean(config, "VC", "set_external_diff", set_external_diff);
+ g_key_file_set_boolean(config, "VC", "set_maximize_commit_dialog",
+ set_maximize_commit_dialog);
+
+ g_key_file_set_boolean(config, "VC", "enable_cvs", enable_cvs);
+ g_key_file_set_boolean(config, "VC", "enable_git", enable_git);
+ g_key_file_set_boolean(config, "VC", "enable_svn", enable_svn);
+ g_key_file_set_boolean(config, "VC", "enable_svk", enable_svk);
+ g_key_file_set_boolean(config, "VC", "enable_bzr", enable_bzr);
+ g_key_file_set_boolean(config, "VC", "enable_hg", enable_hg);
+
+#ifdef USE_GTKSPELL
+ g_key_file_set_string(config, "VC", "spellchecking_language", lang);
+#endif
+
+ if (!g_file_test(config_dir, G_FILE_TEST_IS_DIR)
+ && utils_mkdir(config_dir, TRUE) != 0)
+ {
+ dialogs_show_msgbox(GTK_MESSAGE_ERROR,
+ _
+ ("Plugin configuration directory could not be created."));
+ }
+ else
+ {
+ // write config to file
+ data = g_key_file_to_data(config, NULL, NULL);
+ utils_write_file(config_file, data);
+ g_free(data);
+ }
+
+ g_free(config_dir);
+ g_key_file_free(config);
+
+ registrate();
+ }
+}
+
+GtkWidget *
+plugin_configure(GtkDialog * dialog)
+{
+ GtkWidget *vbox;
+
+#ifdef USE_GTKSPELL
+ GtkWidget *label_spellcheck_lang;
+#endif
+
+ GtkTooltips *tooltip = NULL;
+
+ tooltip = gtk_tooltips_new();
+ vbox = gtk_vbox_new(FALSE, 6);
+
+ widgets.cb_changed_flag =
+ gtk_check_button_new_with_label(_
+ ("Set Changed-flag for document tabs created by the plugin"));
+ gtk_tooltips_set_tip(tooltip, widgets.cb_changed_flag,
+ _
+ ("If this option is activated, every new by the VC-plugin created document tab "
+ "will be marked as changed. Even this option is useful in some cases, it could cause "
+ "a big number of annoying \"Do you want to save\"-dialogs."), NULL);
+ gtk_button_set_focus_on_click(GTK_BUTTON(widgets.cb_changed_flag), FALSE);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.cb_changed_flag), set_changed_flag);
+ gtk_box_pack_start(GTK_BOX(vbox), widgets.cb_changed_flag, FALSE, FALSE, 2);
+
+ widgets.cb_confirm_add =
+ gtk_check_button_new_with_label(_("Confirm adding new files to a VCS"));
+ gtk_tooltips_set_tip(tooltip, widgets.cb_confirm_add,
+ _
+ ("Shows a confirmation dialog on adding a new (created) file to VCS."),
+ NULL);
+ gtk_button_set_focus_on_click(GTK_BUTTON(widgets.cb_confirm_add), FALSE);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.cb_confirm_add),
+ set_add_confirmation);
+ gtk_box_pack_start(GTK_BOX(vbox), widgets.cb_confirm_add, TRUE, FALSE, 2);
+
+ widgets.cb_max_commit = gtk_check_button_new_with_label(_("Maximize commit dialog"));
+ gtk_tooltips_set_tip(tooltip, widgets.cb_max_commit, _("Show commit dialog maximize."),
+ NULL);
+ gtk_button_set_focus_on_click(GTK_BUTTON(widgets.cb_max_commit), FALSE);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.cb_max_commit),
+ set_maximize_commit_dialog);
+ gtk_box_pack_start(GTK_BOX(vbox), widgets.cb_max_commit, TRUE, FALSE, 2);
+
+ widgets.cb_external_diff = gtk_check_button_new_with_label(_("Use external diff viewer"));
+ gtk_tooltips_set_tip(tooltip, widgets.cb_external_diff,
+ _("Use external diff viewer for file diff."), NULL);
+ gtk_button_set_focus_on_click(GTK_BUTTON(widgets.cb_external_diff), FALSE);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.cb_external_diff),
+ set_external_diff);
+ gtk_box_pack_start(GTK_BOX(vbox), widgets.cb_external_diff, TRUE, FALSE, 2);
+
+ widgets.cb_cvs = gtk_check_button_new_with_label(_("Enable CVS"));
+ gtk_button_set_focus_on_click(GTK_BUTTON(widgets.cb_cvs), FALSE);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.cb_cvs), enable_cvs);
+ gtk_box_pack_start(GTK_BOX(vbox), widgets.cb_cvs, TRUE, FALSE, 2);
+
+ widgets.cb_git = gtk_check_button_new_with_label(_("Enable GIT"));
+ gtk_button_set_focus_on_click(GTK_BUTTON(widgets.cb_git), FALSE);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.cb_git), enable_git);
+ gtk_box_pack_start(GTK_BOX(vbox), widgets.cb_git, TRUE, FALSE, 2);
+
+ widgets.cb_svn = gtk_check_button_new_with_label(_("Enable SVN"));
+ gtk_button_set_focus_on_click(GTK_BUTTON(widgets.cb_svn), FALSE);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.cb_svn), enable_svn);
+ gtk_box_pack_start(GTK_BOX(vbox), widgets.cb_svn, TRUE, FALSE, 2);
+
+ widgets.cb_svk = gtk_check_button_new_with_label(_("Enable SVK"));
+ gtk_button_set_focus_on_click(GTK_BUTTON(widgets.cb_svk), FALSE);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.cb_svk), enable_svk);
+ gtk_box_pack_start(GTK_BOX(vbox), widgets.cb_svk, TRUE, FALSE, 2);
+
+ widgets.cb_bzr = gtk_check_button_new_with_label(_("Enable Bazaar"));
+ gtk_button_set_focus_on_click(GTK_BUTTON(widgets.cb_bzr), FALSE);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.cb_bzr), enable_bzr);
+ gtk_box_pack_start(GTK_BOX(vbox), widgets.cb_bzr, TRUE, FALSE, 2);
+
+ widgets.cb_hg = gtk_check_button_new_with_label(_("Enable Mercurial"));
+ gtk_button_set_focus_on_click(GTK_BUTTON(widgets.cb_hg), FALSE);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.cb_hg), enable_hg);
+ gtk_box_pack_start(GTK_BOX(vbox), widgets.cb_hg, TRUE, FALSE, 2);
+
+#ifdef USE_GTKSPELL
+ label_spellcheck_lang = gtk_label_new(_("Spellcheck language"));
+ widgets.spellcheck_lang_textbox = gtk_entry_new();
+ gtk_widget_show(widgets.spellcheck_lang_textbox);
+ if (lang != NULL)
+ gtk_entry_set_text(GTK_ENTRY(widgets.spellcheck_lang_textbox), lang);
+
+ gtk_misc_set_alignment(GTK_MISC(label_spellcheck_lang), 0, 0.5);
+ gtk_container_add(GTK_CONTAINER(vbox), label_spellcheck_lang);
+ gtk_container_add(GTK_CONTAINER(vbox), widgets.spellcheck_lang_textbox);
+#endif
+ gtk_widget_show_all(vbox);
+
+ g_signal_connect(dialog, "response", G_CALLBACK(on_configure_response), NULL);
+ return vbox;
+}
+
+static void
+load_config()
+{
+ GError *error = NULL;
+ GKeyFile *config = g_key_file_new();
+
+ g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL);
+ set_changed_flag = g_key_file_get_boolean(config, "VC", "set_changed_flag", &error);
+ if (error != NULL)
+ {
+ // Set default value
+ set_changed_flag = FALSE;
+ g_error_free(error);
+ error = NULL;
+ }
+ set_add_confirmation = g_key_file_get_boolean(config, "VC", "set_add_confirmation", &error);
+ if (error != NULL)
+ {
+ // Set default value
+ set_add_confirmation = TRUE;
+ g_error_free(error);
+ error = NULL;
+ }
+ set_maximize_commit_dialog =
+ g_key_file_get_boolean(config, "VC", "set_maximize_commit_dialog", &error);
+ if (error != NULL)
+ {
+ // Set default value
+ set_maximize_commit_dialog = FALSE;
+ g_error_free(error);
+ error = NULL;
+ }
+ set_external_diff = g_key_file_get_boolean(config, "VC", "set_external_diff", &error);
+ if (error != NULL)
+ {
+ // Set default value
+ set_external_diff = TRUE;
+ g_error_free(error);
+ error = NULL;
+ }
+
+ enable_cvs = g_key_file_get_boolean(config, "VC", "enable_cvs", &error);
+ if (error != NULL)
+ {
+ // Set default value
+ enable_cvs = TRUE;
+ g_error_free(error);
+ error = NULL;
+ }
+
+ enable_git = g_key_file_get_boolean(config, "VC", "enable_git", &error);
+ if (error != NULL)
+ {
+ // Set default value
+ enable_git = TRUE;
+ g_error_free(error);
+ error = NULL;
+ }
+
+ enable_svn = g_key_file_get_boolean(config, "VC", "enable_svn", &error);
+ if (error != NULL)
+ {
+ // Set default value
+ enable_svn = TRUE;
+ g_error_free(error);
+ error = NULL;
+ }
+
+ enable_svk = g_key_file_get_boolean(config, "VC", "enable_svk", &error);
+ if (error != NULL)
+ {
+ // Set default value
+ enable_svk = TRUE;
+ g_error_free(error);
+ error = NULL;
+ }
+
+ enable_bzr = g_key_file_get_boolean(config, "VC", "enable_bzr", &error);
+ if (error != NULL)
+ {
+ // Set default value
+ enable_bzr = TRUE;
+ g_error_free(error);
+ error = NULL;
+ }
+
+ enable_hg = g_key_file_get_boolean(config, "VC", "enable_hg", &error);
+ if (error != NULL)
+ {
+ // Set default value
+ enable_hg = TRUE;
+ g_error_free(error);
+ error = NULL;
+ }
+
+#ifdef USE_GTKSPELL
+ lang = g_key_file_get_string(config, "VC", "spellchecking_language", &error);
+ if (error != NULL)
+ {
+ // Set default value. Using system standard language.
+ lang = NULL;
+ g_error_free(error);
+ error = NULL;
+ }
+#endif
+
+ g_key_file_free(config);
+}
+
+static void
+registrate()
+{
+ gchar *path;
+ if (VC)
+ {
+ g_slist_free(VC);
+ VC = NULL;
+ }
+ REGISTER_VC(GIT, enable_git);
+ REGISTER_VC(SVN, enable_svn);
+ REGISTER_VC(CVS, enable_cvs);
+ REGISTER_VC(SVK, enable_svk);
+ REGISTER_VC(BZR, enable_bzr);
+ REGISTER_VC(HG, enable_hg);
+}
+
+static void
+do_current_file_menu(GtkWidget ** parent_menu, GtkTooltips ** tooltips)
+{
+ GtkWidget *cur_file_menu = NULL;
+ /* Menu which will hold the items in the current file menu */
+ cur_file_menu = gtk_menu_new();
+
+ *parent_menu = gtk_image_menu_item_new_with_mnemonic(_("_File"));
+ g_signal_connect((gpointer) * parent_menu, "activate", G_CALLBACK(update_menu_items), NULL);
+
+ /* Diff of current file */
+ menu_vc_diff_file = gtk_menu_item_new_with_mnemonic(_("_Diff"));
+ gtk_container_add(GTK_CONTAINER(cur_file_menu), menu_vc_diff_file);
+ gtk_tooltips_set_tip(*tooltips, menu_vc_diff_file,
+ _("Make a diff from the current active file"), NULL);
+
+ g_signal_connect((gpointer) menu_vc_diff_file, "activate",
+ G_CALLBACK(vcdiff_file_activated), NULL);
+
+ /* Revert current file */
+ menu_vc_revert_file = gtk_menu_item_new_with_mnemonic(_("_Revert"));
+ gtk_container_add(GTK_CONTAINER(cur_file_menu), menu_vc_revert_file);
+ gtk_tooltips_set_tip(*tooltips, menu_vc_revert_file,
+ _("Restore pristine working copy file (undo local edits)."), NULL);
+
+ g_signal_connect((gpointer) menu_vc_revert_file, "activate",
+ G_CALLBACK(vcrevert_activated), NULL);
+
+
+ gtk_container_add(GTK_CONTAINER(cur_file_menu), gtk_separator_menu_item_new());
+
+
+ /* Blame for current file */
+ menu_vc_blame = gtk_menu_item_new_with_mnemonic(_("_Blame"));
+ gtk_container_add(GTK_CONTAINER(cur_file_menu), menu_vc_blame);
+ gtk_tooltips_set_tip(*tooltips, menu_vc_blame,
+ _("Shows the changes made at one file per revision and author."),
+ NULL);
+
+ g_signal_connect((gpointer) menu_vc_blame, "activate", G_CALLBACK(vcblame_activated), NULL);
+
+ gtk_container_add(GTK_CONTAINER(cur_file_menu), gtk_separator_menu_item_new());
+
+ /* History/log of current file */
+ menu_vc_log_file = gtk_menu_item_new_with_mnemonic(_("_History"));
+ gtk_container_add(GTK_CONTAINER(cur_file_menu), menu_vc_log_file);
+ gtk_tooltips_set_tip(*tooltips, menu_vc_log_file,
+ _("Shows the log of the current file"), NULL);
+
+ g_signal_connect((gpointer) menu_vc_log_file, "activate",
+ G_CALLBACK(vclog_file_activated), NULL);
+
+ /* base version of the current file */
+ menu_vc_show_file = gtk_menu_item_new_with_mnemonic(_("_Original"));
+ gtk_container_add(GTK_CONTAINER(cur_file_menu), menu_vc_show_file);
+ gtk_tooltips_set_tip(*tooltips, menu_vc_log_file,
+ _("Shows the orignal of the current file"), NULL);
+
+ g_signal_connect((gpointer) menu_vc_show_file, "activate",
+ G_CALLBACK(vcshow_file_activated), NULL);
+
+
+ gtk_container_add(GTK_CONTAINER(cur_file_menu), gtk_separator_menu_item_new());
+
+ /* add current file */
+ menu_vc_add_file = gtk_menu_item_new_with_mnemonic(_("_Add to Version Control"));
+ gtk_container_add(GTK_CONTAINER(cur_file_menu), menu_vc_add_file);
+ gtk_tooltips_set_tip(*tooltips, menu_vc_add_file, _("Add file to repository."), NULL);
+
+ g_signal_connect((gpointer) menu_vc_add_file, "activate",
+ G_CALLBACK(vcadd_activated), NULL);
+
+ /* remove current file */
+ menu_vc_remove_file = gtk_menu_item_new_with_mnemonic(_("_Remove from Version Control"));
+ gtk_container_add(GTK_CONTAINER(cur_file_menu), menu_vc_remove_file);
+ gtk_tooltips_set_tip(*tooltips, menu_vc_remove_file,
+ _("Remove file from repository."), NULL);
+
+ g_signal_connect((gpointer) menu_vc_remove_file, "activate",
+ G_CALLBACK(vcremove_activated), NULL);
+
+ /* connect to parent menu */
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(*parent_menu), cur_file_menu);
+}
+
+static void
+do_current_dir_menu(GtkWidget ** parent_menu, GtkTooltips ** tooltips)
+{
+ GtkWidget *cur_dir_menu = NULL;
+ /* Menu which will hold the items in the current file menu */
+ cur_dir_menu = gtk_menu_new();
+
+ *parent_menu = gtk_image_menu_item_new_with_mnemonic(_("_Directory"));
+ g_signal_connect((gpointer) * parent_menu, "activate", G_CALLBACK(update_menu_items), NULL);
+ /* Diff of the current dir */
+ menu_vc_diff_dir = gtk_menu_item_new_with_mnemonic(_("_Diff"));
+ gtk_container_add(GTK_CONTAINER(cur_dir_menu), menu_vc_diff_dir);
+ gtk_tooltips_set_tip(*tooltips, menu_vc_diff_dir,
+ _("Make a diff from the directory of the current active file"), NULL);
+
+ g_signal_connect((gpointer) menu_vc_diff_dir, "activate",
+ G_CALLBACK(vcdiff_dir_activated), (gpointer) FLAG_DIR);
+
+ /* Revert current dir */
+ menu_vc_revert_dir = gtk_menu_item_new_with_mnemonic(_("_Revert"));
+ gtk_container_add(GTK_CONTAINER(cur_dir_menu), menu_vc_revert_dir);
+ gtk_tooltips_set_tip(*tooltips, menu_vc_revert_dir,
+ _("Restore original files in the current folder (undo local edits)."),
+ NULL);
+
+ g_signal_connect((gpointer) menu_vc_revert_dir, "activate",
+ G_CALLBACK(vcrevert_dir_activated), (gpointer) FLAG_DIR);
+
+ gtk_container_add(GTK_CONTAINER(cur_dir_menu), gtk_separator_menu_item_new());
+ /* History/log of the current dir */
+ menu_vc_log_dir = gtk_menu_item_new_with_mnemonic(_("_History"));
+ gtk_container_add(GTK_CONTAINER(cur_dir_menu), menu_vc_log_dir);
+ gtk_tooltips_set_tip(*tooltips, menu_vc_log_dir,
+ _("Shows the log of the current directory"), NULL);
+
+
+ /* connect to parent menu */
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(*parent_menu), cur_dir_menu);
+}
+
+static void
+do_basedir_menu(GtkWidget ** parent_menu, GtkTooltips ** tooltips)
+{
+ GtkWidget *basedir_menu = NULL;
+ /* Menu which will hold the items in the current file menu */
+ basedir_menu = gtk_menu_new();
+
+ *parent_menu = gtk_image_menu_item_new_with_mnemonic(_("_Base Directory"));
+ g_signal_connect((gpointer) * parent_menu, "activate", G_CALLBACK(update_menu_items), NULL);
+
+ /* Complete diff of base directory */
+ menu_vc_diff_basedir = gtk_menu_item_new_with_mnemonic(_("_Diff"));
+ gtk_container_add(GTK_CONTAINER(basedir_menu), menu_vc_diff_basedir);
+ gtk_tooltips_set_tip(*tooltips, menu_vc_diff_basedir,
+ _("Make a diff from the top VC directory"), NULL);
+
+ g_signal_connect((gpointer) menu_vc_diff_basedir, "activate",
+ G_CALLBACK(vcdiff_dir_activated), (gpointer) FLAG_BASEDIR);
+
+ /* Revert everything */
+ menu_vc_revert_basedir = gtk_menu_item_new_with_mnemonic(_("_Revert"));
+ gtk_container_add(GTK_CONTAINER(basedir_menu), menu_vc_revert_basedir);
+ gtk_tooltips_set_tip(*tooltips, menu_vc_revert_basedir, _("Revert any local edits."), NULL);
+
+ g_signal_connect((gpointer) menu_vc_revert_basedir, "activate",
+ G_CALLBACK(vcrevert_dir_activated), (gpointer) FLAG_BASEDIR);
+
+ gtk_container_add(GTK_CONTAINER(basedir_menu), gtk_separator_menu_item_new());
+ g_signal_connect((gpointer) menu_vc_log_dir, "activate",
+ G_CALLBACK(vclog_dir_activated), NULL);
+
+ /* Complete History/Log of base directory */
+ menu_vc_log_basedir = gtk_menu_item_new_with_mnemonic(_("_History"));
+ gtk_container_add(GTK_CONTAINER(basedir_menu), menu_vc_log_basedir);
+ gtk_tooltips_set_tip(*tooltips, menu_vc_log_basedir,
+ _("Shows the log of the top VC directory"), NULL);
+
+ g_signal_connect((gpointer) menu_vc_log_basedir, "activate",
+ G_CALLBACK(vclog_basedir_activated), NULL);
+
+ /* connect to parent menu */
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(*parent_menu), basedir_menu);
+}
+
+static void
+init_keybindings(void)
+{
+ /* init keybindins */
+ keybindings_set_item(plugin_key_group, VC_DIFF_FILE, kbdiff_file, 0, 0,
+ "vc_show_diff_of_file", _("Show diff of file"), menu_vc_diff_file);
+ keybindings_set_item(plugin_key_group, VC_DIFF_DIR, kbdiff_dir, 0, 0,
+ "vc_show_diff_of_dir", _("Show diff of diretory"), menu_vc_diff_dir);
+ keybindings_set_item(plugin_key_group, VC_DIFF_BASEDIR, kbdiff_basedir, 0, 0,
+ "vc_show_diff_of_basedir", _("Show diff of basedir"),
+ menu_vc_diff_basedir);
+ keybindings_set_item(plugin_key_group, VC_COMMIT, kbcommit, 0, 0, "vc_commit",
+ _("Commit changes"), menu_vc_commit);
+ keybindings_set_item(plugin_key_group, VC_STATUS, kbstatus, 0, 0, "vc_status",
+ _("Show status"), menu_vc_status);
+ keybindings_set_item(plugin_key_group, VC_REVERT_FILE, kbrevert_file, 0, 0,
+ "vc_revert_file", _("Revert single file"), menu_vc_revert_file);
+ keybindings_set_item(plugin_key_group, VC_REVERT_DIR, kbrevert_dir, 0, 0, "vc_revert_dir",
+ _("Revert directory"), menu_vc_revert_dir);
+ keybindings_set_item(plugin_key_group, VC_REVERT_BASEDIR, kbrevert_basedir, 0, 0,
+ "vc_revert_basedir", _("Revert base directory"), menu_vc_revert_basedir);
+ keybindings_set_item(plugin_key_group, VC_UPDATE, kbupdate, 0, 0, "vc_update",
+ _("Update file"), menu_vc_update);
+}
+
+/* Called by Geany to initialize the plugin */
+void
+plugin_init(G_GNUC_UNUSED GeanyData * data)
+{
+ GtkWidget *menu_vc = NULL;
+ GtkWidget *menu_vc_menu = NULL;
+ GtkWidget *menu_vc_file = NULL;
+ GtkWidget *menu_vc_dir = NULL;
+ GtkWidget *menu_vc_basedir = NULL;
+ GtkTooltips *tooltips = NULL;
+
+ main_locale_init(LOCALEDIR, GETTEXT_PACKAGE);
+
+ config_file =
+ g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S,
+ "VC", G_DIR_SEPARATOR_S, "VC.conf", NULL);
+
+ load_config();
+ registrate();
+
+ tooltips = gtk_tooltips_new();
+
+ menu_vc = gtk_image_menu_item_new_with_mnemonic(_("_VC"));
+ gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), menu_vc);
+
+ g_signal_connect((gpointer) menu_vc, "activate", G_CALLBACK(update_menu_items), NULL);
+
+ menu_vc_menu = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_vc), menu_vc_menu);
+
+ /* Create the current file Submenu */
+ do_current_file_menu(&menu_vc_file, &tooltips);
+ gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_file);
+ /* Create the current directory Submenu */
+ do_current_dir_menu(&menu_vc_dir, &tooltips);
+ gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_dir);
+ /* Create the current base directory Submenu */
+ do_basedir_menu(&menu_vc_basedir, &tooltips);
+ gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_basedir);
+
+ gtk_container_add(GTK_CONTAINER(menu_vc_menu), gtk_separator_menu_item_new());
+ /* Status of basedir */
+ menu_vc_status = gtk_menu_item_new_with_mnemonic(_("_Status"));
+ gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_status);
+ gtk_tooltips_set_tip(tooltips, menu_vc_status, _("Show status."), NULL);
+
+ g_signal_connect((gpointer) menu_vc_status, "activate",
+ G_CALLBACK(vcstatus_activated), NULL);
+
+
+ /* complete update */
+ menu_vc_update = gtk_menu_item_new_with_mnemonic(_("Update"));
+ gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_update);
+ gtk_tooltips_set_tip(tooltips, menu_vc_update, _("Update from remote repositary."), NULL);
+
+ g_signal_connect((gpointer) menu_vc_update, "activate",
+ G_CALLBACK(vcupdate_activated), NULL);
+
+
+ /* Commit all changes */
+ menu_vc_commit = gtk_menu_item_new_with_mnemonic(_("_Commit"));
+ gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_commit);
+ gtk_tooltips_set_tip(tooltips, menu_vc_commit, _("Commit changes."), NULL);
+
+ g_signal_connect((gpointer) menu_vc_commit, "activate",
+ G_CALLBACK(vccommit_activated), NULL);
+
+
+ gtk_widget_show_all(menu_vc);
+ gtk_widget_show_all(menu_vc_file);
+ gtk_widget_show_all(menu_vc_dir);
+ gtk_widget_show_all(menu_vc_basedir);
+
+ /* initialize keybindings */
+ init_keybindings();
+
+ plugin_fields->menu_item = menu_vc;
+ plugin_fields->flags = PLUGIN_IS_DOCUMENT_SENSITIVE;
+}
+
+
+/* Called by Geany before unloading the plugin. */
+void
+plugin_cleanup()
+{
+ // remove the menu item added in init()
+ gtk_widget_destroy(plugin_fields->menu_item);
+ g_slist_free(VC);
+ VC = NULL;
+ g_free(config_file);
+}
Copied: trunk/geany-plugins/geanyvc/src/geanyvc.h (from rev 760, tags/geanyvc/geanyvc-0.5/geanyvc.h)
===================================================================
--- trunk/geany-plugins/geanyvc/src/geanyvc.h (rev 0)
+++ trunk/geany-plugins/geanyvc/src/geanyvc.h 2009-06-21 20:52:40 UTC (rev 761)
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2007 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+ * Copyright 2007 Enrico Tröger <enrico.troeger at uvena.de>
+ * Copyright 2007 Nick Treleaven <nick.treleaven at btinternet.com>
+ * Copyright 2007 Yura Siamashka <yurand2 at 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.
+ */
+
+#ifndef __GEANYVC_HEADER__
+#define __GEANYVC_HEADER__
+
+enum
+{
+ VC_COMMAND_DIFF_FILE,
+ VC_COMMAND_DIFF_DIR,
+ VC_COMMAND_REVERT_FILE,
+ VC_COMMAND_REVERT_DIR,
+ VC_COMMAND_STATUS,
+ VC_COMMAND_ADD,
+ VC_COMMAND_REMOVE,
+ VC_COMMAND_LOG_FILE,
+ VC_COMMAND_LOG_DIR,
+ VC_COMMAND_COMMIT,
+ VC_COMMAND_BLAME,
+ VC_COMMAND_SHOW,
+ VC_COMMAND_UPDATE,
+ VC_COMMAND_COUNT
+};
+
+/*
+ * VC_COMMAND_STARTDIR_BASE - command strat dir will be VC base directory
+ * VC_COMMAND_STARTDIR_FILE - command start dir will be taken as basename
+ * of file, or directory itself if file is
+ * directory
+ */
+enum
+{
+ VC_COMMAND_STARTDIR_BASE,
+ VC_COMMAND_STARTDIR_FILE
+};
+
+#define FLAG_RELOAD (1<<0)
+#define FLAG_FORCE_ASK (1<<1)
+#define FLAG_FILE (1<<2)
+#define FLAG_DIR (1<<3)
+#define FLAG_BASEDIR (1<<4)
+
+#define P_ABS_DIRNAME "*<?geanyvcDIRNAME>*"
+#define P_ABS_FILENAME "*<?geanyvcFILENAME>*"
+#define P_BASENAME "*<?geanyvcBASE_FILENAME>*"
+
+/* The addresses of these strings act as enums, their contents are not used. */
+
+
+/* absolute path dirname of file */
+extern const gchar ABS_DIRNAME[];
+/* absolute path filename of file */
+extern const gchar ABS_FILENAME[];
+
+/* path to directory from base vc directory */
+extern const gchar BASE_DIRNAME[];
+/* path to file from base vc directory */
+extern const gchar BASE_FILENAME[];
+
+/* basename of file */
+extern const gchar BASENAME[];
+/* list with absolute file names*/
+extern const gchar FILE_LIST[];
+/* message */
+extern const gchar MESSAGE[];
+
+
+
+
+/* this string is used when action require to run several commands */
+extern const gchar CMD_SEPARATOR[];
+
+extern const gchar FILE_STATUS_MODIFIED[];
+extern const gchar FILE_STATUS_ADDED[];
+extern const gchar FILE_STATUS_DELETED[];
+extern const gchar FILE_STATUS_UNKNOWN[];
+
+gint
+execute_custom_command(const gchar * dir, const gchar ** argv, const gchar ** env, gchar ** std_out,
+ gchar ** std_err, const gchar * filename, GSList * list,
+ const gchar * message);
+
+gboolean find_dir(const gchar * filename, const char *find, gboolean recursive);
+gchar *find_subdir_path(const gchar * filename, const gchar * subdir);
+
+typedef struct _VC_COMMAND
+{
+ gint startdir;
+ const gchar **command;
+ const gchar **env;
+ gint(*function) (gchar **, gchar **, const gchar *, GSList *, const gchar *);
+} VC_COMMAND;
+
+typedef struct _VC_RECORD
+{
+ const VC_COMMAND *commands;
+ const gchar *program;
+ gchar *(*get_base_dir) (const gchar * path);
+ gboolean(*in_vc) (const gchar * path); // check if file in VC
+ GSList *(*get_commit_files) (const gchar * dir);
+} VC_RECORD;
+
+typedef struct _CommitItem
+{
+ gchar *path;
+ const gchar *status;
+} CommitItem;
+
+#define REGISTER_VC(vc,enable) {extern VC_RECORD VC_##vc;if(enable){path = g_find_program_in_path(VC_##vc.program); \
+ if (path) { g_free(path); VC = g_slist_append(VC, &VC_##vc);} }}
+
+/* Blank functions and values */
+GSList *get_commit_files_null(const gchar * dir);
+extern const gchar *NO_ENV[];
+
+/* External diff viewer */
+const gchar *get_external_diff_viewer();
+void vc_external_diff(const gchar * src, const gchar * dest);
+
+/* utils.c */
+gchar *normpath(const gchar * filename);
+gchar *get_full_path(const gchar * location, const gchar * path);
+gchar *get_relative_path(const gchar * location, const gchar * path);
+
+
+#endif // __GEANYVC_HEADER__
Copied: trunk/geany-plugins/geanyvc/src/utils.c (from rev 760, tags/geanyvc/geanyvc-0.5/utils.c)
===================================================================
--- trunk/geany-plugins/geanyvc/src/utils.c (rev 0)
+++ trunk/geany-plugins/geanyvc/src/utils.c 2009-06-21 20:52:40 UTC (rev 761)
@@ -0,0 +1,171 @@
+/*
+ *
+ * Copyright 2008 Yura Siamashka <yurand2 at 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <string.h>
+#include <glib.h>
+
+#include "geany.h"
+#include "utils.h"
+#include "plugindata.h"
+#include "geanyfunctions.h"
+
+extern GeanyData *geany_data;
+extern GeanyFunctions *geany_functions;
+
+
+/* Normalize a pathname. This collapses redundant separators and up-level references so that A//B, A/./B
+ * and A/foo/../B all become A/B. It does not normalize the case. On Windows, it converts forward
+ * slashes to backward slashes. It should be understood that this may change the meaning of the
+ * path if it contains symbolic links!
+ */
+gchar *
+normpath(const gchar * filename)
+{
+ gchar **v;
+ gchar **p;
+ gchar **out;
+ gchar **pout;
+ gchar *ret;
+
+ if (!filename || strlen(filename) == 0)
+ return g_strdup(".");
+ v = g_strsplit_set(filename, "/\\", -1);
+ if (!g_strv_length(v))
+ return g_strdup(".");
+
+ out = g_malloc0(sizeof(gchar *) * (g_strv_length(v) + 2));
+ pout = out;
+
+ if (filename[0] == '.' && strcmp(v[0], ".") == 0)
+ {
+ *pout = strdup(".");
+ pout++;
+ }
+ else if (filename[0] == '/')
+ {
+ *pout = strdup("/");
+ pout++;
+ }
+
+ for (p = v; *p; p++)
+ {
+ if (strcmp(*p, ".") == 0 || strcmp(*p, "") == 0)
+ {
+ continue;
+ }
+ else if (strcmp(*p, "..") == 0)
+ {
+ if (pout != out)
+ {
+ pout--;
+ if (strcmp(*pout, "..") != 0)
+ {
+ g_free(*pout);
+ *pout = NULL;
+ continue;
+ }
+ pout++;
+ }
+ }
+ *pout++ = g_strdup(*p);
+ }
+
+ ret = g_build_filenamev(out);
+
+ g_strfreev(out);
+ g_strfreev(v);
+ return ret;
+}
+
+gchar *
+get_full_path(const gchar * location, const gchar * path)
+{
+ gchar *dir;
+
+ dir = g_path_get_dirname(location);
+ setptr(dir, g_build_filename(dir, path, NULL));
+ setptr(dir, normpath(dir));
+ return dir;
+}
+
+gchar *
+get_relative_path(const gchar * location, const gchar * path)
+{
+ gchar *dir;
+ gchar *pth;
+ gchar *ret = NULL;
+
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Plugins-Commits
mailing list