Thread: [Gambas-user] New git support in the IDE
Brought to you by:
gambas
Menu
▾
▴
gambas-user
|
From: Benoît M. <ga...@us...> - 2017-10-11 21:56:30
|
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 |
|
From: Tobias B. <ta...@gm...> - 2017-10-11 22:09:07
|
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 |
|
From: Benoît M. <ga...@us...> - 2017-10-11 22:15:37
|
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 |
|
From: Benoît M. <ga...@us...> - 2017-10-11 22:16:58
|
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 |
|
From: PICCORO M. L. <mck...@gm...> - 2017-10-12 00:09:21
|
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 < gam...@li...>: > 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 > Gam...@li... > https://lists.sourceforge.net/lists/listinfo/gambas-user > |
|
From: PICCORO M. L. <mck...@gm...> - 2017-10-12 00:10:07
|
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 < gam...@li...>: > 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 > Gam...@li... > https://lists.sourceforge.net/lists/listinfo/gambas-user > |
|
From: Benoît M. <ga...@us...> - 2017-10-12 00:33:19
|
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 |
|
From: PICCORO M. L. <mck...@gm...> - 2017-10-12 01:48:12
|
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 <ga...@us...>: > 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 > |
|
From: Christof T. <ch...@de...> - 2017-10-12 06:32:28
Attachments:
signature.asc
|
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 |
|
From: Benoît M. <ga...@us...> - 2017-10-12 10:45:52
|
Le 12/10/2017 à 08:32, Christof Thalhofer a écrit : > 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 > An easier possibility is doing the same at gitliab : just take the conflicted file annotated by git, add colors on conflicted parts, and put buttons on each part to select "our changes" or "their changes". I will see... -- Benoît Minisini |
|
From: Christof T. <ch...@de...> - 2017-10-12 11:42:46
Attachments:
signature.asc
|
Am 12.10.2017 um 12:45 schrieb Benoît Minisini: > I will see... Just as an annotation. I myself prefer using Git via commandline. Because since I started using Git for some source code and then became familiar with it I found a lot of other possibilities to work with Git: My personal dotfiles on my computers, a bunch of script files on servers, the /etc directory on different servers, a couple of languages I use to program and so on ... For that I use Guake dropdown terminal, Tig and some shortcuts to the different directories I am working in, so that on each computer and each program I work with (different Editors, different IDEs) I have the same interface and the same couple of keystrokes to do versioning in Git, what I do all the time the whole day long. For me a special interface for Git in any IDE/Editor is wasted energy as I never will use it as long as it is not faster and more convenient than that I am using on all programs. And I doubt there ever will be one as GUI. A common criticism to Git is, that there is no real sufficient GUI for it, but I think the real reason for that is, that if one works with Git in different circumstances, commandline will always be the fastest and most flexible option. Alles Gute Christof Thalhofer P.S.: Sorry I sent this first to your address, Thunderbird !"§$R%# -- Dies ist keine Signatur |
|
From: Benoît M. <ga...@us...> - 2017-10-12 11:58:39
|
Le 12/10/2017 à 13:42, Christof Thalhofer a écrit : > Am 12.10.2017 um 12:45 schrieb Benoît Minisini: > >> I will see... > > Just as an annotation. I myself prefer using Git via commandline. > > Because since I started using Git for some source code and then became > familiar with it I found a lot of other possibilities to work with Git: > > My personal dotfiles on my computers, a bunch of script files on > servers, the /etc directory on different servers, a couple of languages > I use to program and so on ... > > For that I use Guake dropdown terminal, Tig and some shortcuts to the > different directories I am working in, so that on each computer and each > program I work with (different Editors, different IDEs) I have the same > interface and the same couple of keystrokes to do versioning in Git, > what I do all the time the whole day long. > > For me a special interface for Git in any IDE/Editor is wasted energy as > I never will use it as long as it is not faster and more convenient than > that I am using on all programs. And I doubt there ever will be one as GUI. > > A common criticism to Git is, that there is no real sufficient GUI for > it, but I think the real reason for that is, that if one works with Git > in different circumstances, commandline will always be the fastest and > most flexible option. > > > Alles Gute > > Christof Thalhofer > > P.S.: Sorry I sent this first to your address, Thunderbird !"§$R%# > I agree, but I think some people may prefer the IDE interface if they are not very easy with git. -- Benoît Minisini |
|
From: PICCORO M. L. <mck...@gm...> - 2017-10-12 12:20:56
|
2017-10-12 7:58 GMT-04:00 Benoît Minisini via Gambas-user < gam...@li...>: > I agree, but I think some people may prefer the IDE interface if they are > not very easy with git. reading and writting are the pilar of civilizations to lear we must read people must read to use git people must use command line, so must practice.. linux its for smart people, and smart people its the core of civilizations seems pretty logic > > > -- > 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 > Gam...@li... > https://lists.sourceforge.net/lists/listinfo/gambas-user > |
|
From: Christof T. <ch...@de...> - 2017-10-12 13:31:43
Attachments:
signature.asc
|
Am 12.10.2017 um 13:58 schrieb Benoît Minisini: > I agree, but I think some people may prefer the IDE interface if they > are not very easy with git. Ok, but then ... there are GUI interfaces for Git. Why not use them? For example, the IDE could execute gitg ~/path/to/project There a newbie can do all. Alles Gute Christof Thalhofer -- Dies ist keine Signatur |
|
From: PICCORO M. L. <mck...@gm...> - 2017-10-12 20:02:11
|
2017-10-12 9:31 GMT-04:00 Christof Thalhofer <ch...@de...>: > > I agree, but I think some people may prefer the IDE interface if they > > are not very easy with git. > Ok, but then ... there are GUI interfaces for Git. Why not use them? > all the linux gui git interfaces are very uncomplete... the most important step the push are missing in almost mayority of those gui interfaces > There a newbie can do all. > Ok i not repeat that i wrote in the previous mail.. i was a newbie some time ago.. but using only cicks and guis's the only result its a windoze user.. uggg.. no men, command line and some ide features.. for the rest, newbies must READ! and PRACTICE! > > Alles Gute > > Christof Thalhofer > > -- > Dies ist keine Signatur > > > ------------------------------------------------------------ > ------------------ > 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 > Gam...@li... > https://lists.sourceforge.net/lists/listinfo/gambas-user > > |
Thanks for helping keep SourceForge clean.
X