[Gambas-user] New git support in the IDE
Hi, I have just committed git support in 'master'. The whole IDE version control management has been redesigned. Now version control is managed through a sub-menu in the 'Project' menu, or an equivalent menu button in the main toolbar. Everything is done except conflict management. I must understand how it works in git, and I'd like to have a file diff tool directly in the IDE, but it's a big job. Please report any problem or suggestion about it, especially in the git part. Like most of you, I am a git newbie, and this is very fresh code, so be careful with your projects! Enjoy. -- Benoît Minisini -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Gambas-user mailing list Gambas-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gambas-user
Re: [Gambas-user] New git support in the IDE
On Wed, 11 Oct 2017, Benoît Minisini via Gambas-user wrote: > Hi, > > I have just committed git support in 'master'. > > The whole IDE version control management has been redesigned. Now version > control is managed through a sub-menu in the 'Project' menu, or an > equivalent menu button in the main toolbar. > > Everything is done except conflict management. I must understand how it > works in git, and I'd like to have a file diff tool directly in the IDE, but > it's a big job. > Just in case you forgot, there is already the Patch class in the IDE which I wrote for the Patch dialogs. It's not much and they don't deal with conflict files but they do parse "diff -u" patches like the ones "git diff" produces. Regards, Tobi -- "There's an old saying: Don't change anything... ever!" -- Mr. Monk -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Gambas-user mailing list Gambas-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gambas-user
Re: [Gambas-user] New git support in the IDE
Le 12/10/2017 à 00:09, Tobias Boege a écrit : On Wed, 11 Oct 2017, Benoît Minisini via Gambas-user wrote: Hi, I have just committed git support in 'master'. The whole IDE version control management has been redesigned. Now version control is managed through a sub-menu in the 'Project' menu, or an equivalent menu button in the main toolbar. Everything is done except conflict management. I must understand how it works in git, and I'd like to have a file diff tool directly in the IDE, but it's a big job. Just in case you forgot, there is already the Patch class in the IDE which I wrote for the Patch dialogs. It's not much and they don't deal with conflict files but they do parse "diff -u" patches like the ones "git diff" produces. Regards, Tobi Yes, I know. But I'd like to have something like 'meld', that shows the differences side by side with colors, allowing to apply any difference from one side to the other. Maybe should I be lazy, and tell the user to install 'meld', 'kdiff3' or any similar tool, and configure the IDE so that it uses it to merge conflicts... -- Benoît Minisini -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Gambas-user mailing list Gambas-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gambas-user
Re: [Gambas-user] New git support in the IDE
Le 11/10/2017 à 23:56, Benoît Minisini via Gambas-user a écrit : Hi, I have just committed git support in 'master'. The whole IDE version control management has been redesigned. Now version control is managed through a sub-menu in the 'Project' menu, or an equivalent menu button in the main toolbar. Everything is done except conflict management. I must understand how it works in git, and I'd like to have a file diff tool directly in the IDE, but it's a big job. Please report any problem or suggestion about it, especially in the git part. Like most of you, I am a git newbie, and this is very fresh code, so be careful with your projects! Enjoy. Other things that still must be done: - The ability to create a project from a remote repository. - The ability to create a repository from an existing project. -- Benoît Minisini -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Gambas-user mailing list Gambas-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gambas-user
Re: [Gambas-user] New git support in the IDE
like benoit said, i prefer meld too, and also this git support are using library dependency or only command line more dependences? no please! users already must have git command also a library? the hability to create repository can be complicate, a proyecto from remote are more viable Lenz McKAY Gerardo (PICCORO) http://qgqlochekone.blogspot.com 2017-10-11 18:16 GMT-04:00 Benoît Minisini via Gambas-user < gambas-user@lists.sourceforge.net>: > Le 11/10/2017 à 23:56, Benoît Minisini via Gambas-user a écrit : > >> Hi, >> >> I have just committed git support in 'master'. >> >> The whole IDE version control management has been redesigned. Now version >> control is managed through a sub-menu in the 'Project' menu, or an >> equivalent menu button in the main toolbar. >> >> Everything is done except conflict management. I must understand how it >> works in git, and I'd like to have a file diff tool directly in the IDE, >> but it's a big job. >> >> Please report any problem or suggestion about it, especially in the git >> part. >> >> Like most of you, I am a git newbie, and this is very fresh code, so be >> careful with your projects! >> >> Enjoy. >> >> > Other things that still must be done: > > - The ability to create a project from a remote repository. > > - The ability to create a repository from an existing project. > > > -- > Benoît Minisini > > > -- > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > ___ > Gambas-user mailing list > Gambas-user@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/gambas-user > -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Gambas-user mailing list Gambas-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gambas-user
Re: [Gambas-user] New git support in the IDE
like benoit i prefer meld too also this git support are by commands or by using a library interface? (more dependences? no please)) Lenz McKAY Gerardo (PICCORO) http://qgqlochekone.blogspot.com 2017-10-11 18:16 GMT-04:00 Benoît Minisini via Gambas-user < gambas-user@lists.sourceforge.net>: > Le 11/10/2017 à 23:56, Benoît Minisini via Gambas-user a écrit : > >> Hi, >> >> I have just committed git support in 'master'. >> >> The whole IDE version control management has been redesigned. Now version >> control is managed through a sub-menu in the 'Project' menu, or an >> equivalent menu button in the main toolbar. >> >> Everything is done except conflict management. I must understand how it >> works in git, and I'd like to have a file diff tool directly in the IDE, >> but it's a big job. >> >> Please report any problem or suggestion about it, especially in the git >> part. >> >> Like most of you, I am a git newbie, and this is very fresh code, so be >> careful with your projects! >> >> Enjoy. >> >> > Other things that still must be done: > > - The ability to create a project from a remote repository. > > - The ability to create a repository from an existing project. > > > -- > Benoît Minisini > > > -- > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > ___ > Gambas-user mailing list > Gambas-user@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/gambas-user > -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Gambas-user mailing list Gambas-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gambas-user
Re: [Gambas-user] New git support in the IDE
Le 12/10/2017 à 02:10, PICCORO McKAY Lenz a écrit : like benoit i prefer meld too also this git support are by commands or by using a library interface? (more dependences? no please)) Lenz McKAY Gerardo (PICCORO) http://qgqlochekone.blogspot.com It is based on the git command-line. But it would based on the git library, it would change nothing to the dependencies, as git is based on the git library too. Logical... -- Benoît Minisini -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Gambas-user mailing list Gambas-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gambas-user
[Gambas-user] Fwd: [Gambas Bug Tracker] Bug #1198: In Commit 962adee5, gambas IDE won't compile
Message transféré Sujet : [Gambas Bug Tracker] Bug #1198: In Commit 962adee5, gambas IDE won't compile Date : Thu, 12 Oct 2017 00:59:05 GMT De : bugtrac...@gambaswiki.org Pour : tmore...@ajm-software.com, g4m...@gmail.com http://gambaswiki.org/bugtracker/edit?object=BUG.1198&from=L21haW4- Tony MOREHEN reported a new bug. Summary --- In Commit 962adee5, gambas IDE won't compile Type : Bug Priority : Medium Gambas version : Unknown Product : Unknown Description --- The compiler reports that gb.desktop is missing. Compilation does proceed without error if, in gb.desktop, Main.module function main, you comment out: Desktop.SendMail(Null, "/home/benoit/Translate.module, comma") System information -- [System] Gambas=3.9.90 r8018 OperatingSystem=Linux Kernel=4.8.15-1-MANJARO Architecture=x86_64 Distribution=Manjaro Linux Desktop=XFCE Theme=Gtk Language=en_CA.utf8 Memory=3947M [Libraries] Cairo=libcairo.so.2.11400.8 Curl=libcurl.so.4.4.0 DBus=libdbus-1.so.3.14.9 GStreamer=libgstreamer-0.10.so.0.30.0 GStreamer=libgstreamer-1.0.so.0.1002.0 GTK+2=libgtk-x11-2.0.so.0.2400.31 GTK+3=libgtk-3.so.0.2200.5 OpenGL=libGL.so.1.2.0 Poppler=libpoppler.so.66.0.0 QT4=libQtCore.so.4.8.7 QT5=libQt5Core.so.5.7.1 SDL=libSDL-1.2.so.0.11.4 SQLite=libsqlite3.so.0.8.6 [Environment] DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus DESKTOP_SESSION=xfce DISPLAY=:0.0 GB_GUI=gb.qt4 GDMSESSION=xfce GLADE_CATALOG_PATH=: GLADE_MODULE_PATH=: GLADE_PIXMAP_PATH=: GTK2_RC_FILES=/.gtkrc-2.0 GTK_MODULES=canberra-gtk-module HOME= LANG=en_CA.utf8 LC_ADDRESS=en_CA.UTF-8 LC_IDENTIFICATION=en_CA.UTF-8 LC_MEASUREMENT=en_CA.UTF-8 LC_MONETARY=en_CA.UTF-8 LC_NAME=en_CA.UTF-8 LC_NUMERIC=en_CA.UTF-8 LC_PAPER=en_CA.UTF-8 LC_TELEPHONE=en_CA.UTF-8 LC_TIME=en_CA.UTF-8 LOGNAME= MAIL=/var/spool/mail/ MOZ_PLUGIN_PATH=/usr/lib/mozilla/plugins PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl PWD= QT_QPA_PLATFORMTHEME=qt5ct SAL_USE_VCLPLUGIN=gtk SESSION_MANAGER=local/:@/tmp/.ICE-unix/9931,unix/:/tmp/.ICE-unix/9931 SHELL=/bin/bash SHLVL=2 SSH_AGENT_PID=9936 SSH_AUTH_SOCK=/tmp/ssh-bUdChQqs4Zo0/agent.9935 TZ=:/etc/localtime USER= XAUTHORITY=/.Xauthority XDG_CONFIG_DIRS=/etc/xdg XDG_CURRENT_DESKTOP=XFCE XDG_DATA_DIRS=/usr/local/share:/usr/share XDG_GREETER_DATA_DIR=/var/lib/lightdm-data/ XDG_MENU_PREFIX=xfce- XDG_RUNTIME_DIR=/run/user/1000 XDG_SEAT=seat0 XDG_SEAT_PATH=/org/freedesktop/DisplayManager/Seat0 XDG_SESSION_DESKTOP=xfce XDG_SESSION_ID=c4 XDG_SESSION_PATH=/org/freedesktop/DisplayManager/Session1 XDG_SESSION_TYPE=x11 XDG_VTNR=7 _=/usr/bin/gambas3 -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Gambas-user mailing list Gambas-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gambas-user
[Gambas-user] Fwd: [Gambas Bug Tracker] Bug #1198: In Commit 962adee5, gambas IDE won't compile
Message transféré Sujet : [Gambas Bug Tracker] Bug #1198: In Commit 962adee5, gambas IDE won't compile Date : Thu, 12 Oct 2017 01:26:14 GMT De : bugtrac...@gambaswiki.org Pour : tmore...@ajm-software.com, g4m...@gmail.com http://gambaswiki.org/bugtracker/edit?object=BUG.1198&from=L21haW4- Comment #1 by Benoît MINISINI: The problem is in gb.form.dialog, not in gb.desktop. Does last commit fix the problem? Benoît MINISINI changed the state of the bug to: NeedsInfo. -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Gambas-user mailing list Gambas-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gambas-user
Re: [Gambas-user] New git support in the IDE
git its based on the git library when compiled i donot see that in my requirements for git compilation?!! Lenz McKAY Gerardo (PICCORO) http://qgqlochekone.blogspot.com 2017-10-11 20:33 GMT-04:00 Benoît Minisini : > Le 12/10/2017 à 02:10, PICCORO McKAY Lenz a écrit : > >> like benoit i prefer meld too >> >> also this git support are by commands or by using a library interface? >> (more dependences? no please)) >> >> Lenz McKAY Gerardo (PICCORO) >> http://qgqlochekone.blogspot.com >> >> > It is based on the git command-line. But it would based on the git > library, it would change nothing to the dependencies, as git is based on > the git library too. > > Logical... > > -- > Benoît Minisini > -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Gambas-user mailing list Gambas-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gambas-user
Re: [Gambas-user] New git support in the IDE
Am 12.10.2017 um 00:15 schrieb Benoît Minisini via Gambas-user: > Maybe should I be lazy, and tell the user to install 'meld', 'kdiff3' or > any similar tool, and configure the IDE so that it uses it to merge > conflicts... Yes I think you should. I think its hard work to write "just another diff tool". I also think you your energy is better wasted on other things. ;-) Alles Gute Christof Thalhofer -- Dies ist keine Signatur signature.asc Description: OpenPGP digital signature -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot___ Gambas-user mailing list Gambas-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gambas-user
