Author Topic: GitBlocks Plugin  (Read 26429 times)

Offline stahta01

  • Lives here!
  • ****
  • Posts: 6295
    • My Best Post
Re: GitBlocks Plugin
« Reply #30 on: November 26, 2015, 06:19:40 am »
stahta01, just now compile plugin from your repo, its not work.

Code: [Select]
Fetching status ...
git status
Fetching from origin ...
cmd.exe /C "git fetch origin"
Fetching log ...
git log --pretty=format:%h%x09%an%x09%ad%x09%s

Windows 8 x64

I have no idea what your are asking or telling in your post!

http://www.catb.org/esr/faqs/smart-questions.html

Tim S.
C Programmer working to learn more about C++ and Git.
On Windows 7 64 bit and Windows 10 32 bit.
On Debian Testing, compiling CB Trunk against wxWidgets 3.0.2.
--
When in doubt, read the CB WiKi FAQ. http://wiki.codeblocks.org

Offline yvesdm3000

  • Almost regular
  • **
  • Posts: 226
Re: GitBlocks Plugin
« Reply #31 on: February 09, 2016, 04:37:44 pm »
Any plans to embed this plugin better in the UI instead of putting everything under a menu ?

I was thinking of the context-menu in the Projects tree or context-menu in a open-files-list ?

Yves
Clang based code completion for Code::Blocks:   http://github.com/yvesdm3000/ClangLib

Online MortenMacFly

  • Administrator
  • Lives here!
  • *****
  • Posts: 9456
Re: GitBlocks Plugin
« Reply #32 on: February 09, 2016, 08:12:51 pm »
Any plans to embed this plugin better in the UI instead of putting everything under a menu ?
I am not sure if this project is still active. It has also quite some serious bugs, some of them I've fixed already, but its not prime-time yet.

Sad story, we had so many approaches (cb_svn, CBTortoiseSVN, cbvcs, SVNInside, cbGIT, GitBlocks) but they all died out before they were ready. Seems no-one has the strength to finish the work. Also sad to see that everybody starts again from scratch and does not pick up an existing project and continue the work from there.

Just my 2 cents.
Compiler logging: Settings->Compiler & Debugger->tab "Other"->Compiler logging="Full command line"
C::B Manual: http://www.codeblocks.org/docs/main_codeblocks_en.html
C::B FAQ: http://wiki.codeblocks.org/index.php?title=FAQ

Offline raynebc

  • Almost regular
  • **
  • Posts: 154
Re: GitBlocks Plugin
« Reply #33 on: February 09, 2016, 09:13:17 pm »
It doesn't seem like it should be very complicated to have a button that launches the commit command for the project's SVN/Git repo path.  Even then, I can't imagine it could be that much of a time saver compared to just launching the commit from the Explorer integration of installed SVN/Git software.

Online MortenMacFly

  • Administrator
  • Lives here!
  • *****
  • Posts: 9456
Re: GitBlocks Plugin
« Reply #34 on: February 09, 2016, 09:25:59 pm »
I can't imagine it could be that much of a time saver compared to just launching the commit from the Explorer integration of installed SVN/Git software.
Perfectly true. Unless you provide features like flat mode that need good additional programming before launching the commands.
Compiler logging: Settings->Compiler & Debugger->tab "Other"->Compiler logging="Full command line"
C::B Manual: http://www.codeblocks.org/docs/main_codeblocks_en.html
C::B FAQ: http://wiki.codeblocks.org/index.php?title=FAQ

Offline yvesdm3000

  • Almost regular
  • **
  • Posts: 226
Re: GitBlocks Plugin
« Reply #35 on: February 10, 2016, 07:12:09 am »
I can't imagine it could be that much of a time saver compared to just launching the commit from the Explorer integration of installed SVN/Git software.
Perfectly true. Unless you provide features like flat mode that need good additional programming before launching the commands.
Yes, and you forget that other platforms don't have Tortoise, and looking at a diff of a single file would be a lot more practical when it's open in the IDE...

Yves
Clang based code completion for Code::Blocks:   http://github.com/yvesdm3000/ClangLib

Online MortenMacFly

  • Administrator
  • Lives here!
  • *****
  • Posts: 9456
Re: GitBlocks Plugin
« Reply #36 on: February 10, 2016, 08:39:51 am »
Yes, and you forget that other platforms don't have Tortoise, and looking at a diff of a single file would be a lot more practical when it's open in the IDE...
Well first of all there is not only Tortoise (which I don't like at all, btw) and for other platforms plenty of different really good tools are available, too. It should be clear that we will never reach the richness of an application created only for version control. I use SmartSVN which runs on all platforms and I am very happy with it. I also see that many of the features are rather complex and have been developed in decades by the (SmartSVN) team. So I think we should not try to re-invent the wheel because we can only loose.

That doesn't mean we don't want to get a plugin. For me, what I am missing most is basic functionality like the virtualisation of a VCS state in the project tree and surely the basic functions check-in/out ...
Then as a second requirement I would like to have an extensible plugin, meaning that I can configure the most important commands so these match my needs. For Diff, there is the cbDiff plugin which is really good, in fact.

All in all I think the approach to integfreate VCS in the FileManager plugin would be my favourite and dmoore has started it already some time ago. That doesn't mean I don't like Git/SVN/...only plugins but the more we get of these trying to pump in all features and failing the more I believe we should make it really simple in the first place but considering the most important features from the beginning.
Compiler logging: Settings->Compiler & Debugger->tab "Other"->Compiler logging="Full command line"
C::B Manual: http://www.codeblocks.org/docs/main_codeblocks_en.html
C::B FAQ: http://wiki.codeblocks.org/index.php?title=FAQ

Offline yvesdm3000

  • Almost regular
  • **
  • Posts: 226
Re: GitBlocks Plugin
« Reply #37 on: February 10, 2016, 03:13:49 pm »
Oh, I didn't know about the cgDiff plugin. Will try that shortly!

Yves
Clang based code completion for Code::Blocks:   http://github.com/yvesdm3000/ClangLib

Offline yvesdm3000

  • Almost regular
  • **
  • Posts: 226
Re: GitBlocks Plugin
« Reply #38 on: February 10, 2016, 05:05:35 pm »
Looks very decent, there is even a branch that implemented auto-detection of the type of file. I made my own branch and merged the 2 branches since they have diverted.

https://github.com/yvesdm3000/cbDiff

Yves
Clang based code completion for Code::Blocks:   http://github.com/yvesdm3000/ClangLib

Offline yvesdm3000

  • Almost regular
  • **
  • Posts: 226
Re: GitBlocks Plugin
« Reply #39 on: February 10, 2016, 05:57:11 pm »
It should be clear that we will never reach the richness of an application created only for version control.

All in all I think the approach to integfreate VCS in the FileManager plugin would be my favourite and dmoore has started it already some time ago. That doesn't mean I don't like Git/SVN/...only plugins but the more we get of these trying to pump in all features and failing the more I believe we should make it really simple in the first place but considering the most important features from the beginning.
I agree, I don't need all those features of branching, rebasing etc, only features that the existing tools can't deliver where it makes sense in regards to Code::Blocks integration. IMHO that's why I asked the question in the first place, to actually get a diff from a file that I can click in C::B without having to go to some external tool/browser, find the file and have the diff open outside of C::B...

Yves
Clang based code completion for Code::Blocks:   http://github.com/yvesdm3000/ClangLib

Online MortenMacFly

  • Administrator
  • Lives here!
  • *****
  • Posts: 9456
Re: GitBlocks Plugin
« Reply #40 on: February 10, 2016, 08:03:55 pm »
Looks very decent, there is even a branch that implemented auto-detection of the type of file.
I wasn't aware of that one. Who did it? Can you post a link?
Compiler logging: Settings->Compiler & Debugger->tab "Other"->Compiler logging="Full command line"
C::B Manual: http://www.codeblocks.org/docs/main_codeblocks_en.html
C::B FAQ: http://wiki.codeblocks.org/index.php?title=FAQ

Offline oBFusCATed

  • Developer
  • Lives here!
  • *****
  • Posts: 11040
    • Travis build status
Re: GitBlocks Plugin
« Reply #41 on: February 10, 2016, 08:40:23 pm »
I agree, I don't need all those features of branching, rebasing etc, only features that the existing tools can't deliver where it makes sense in regards to Code::Blocks integration. IMHO that's why I asked the question in the first place, to actually get a diff from a file that I can click in C::B without having to go to some external tool/browser, find the file and have the diff open outside of C::B...
I've setup a tool that opens my diff program with the currently selected file and if there are changes it shows them. It also goes to the correct line:)
I have also commands for git gui blame and gitk. They are pretty handy.
(most of the time I ignore long posts)
[strangers don't send me private messages, I'll ignore them; post a topic in the forum, but first read the rules!]

Offline yvesdm3000

  • Almost regular
  • **
  • Posts: 226
Re: GitBlocks Plugin
« Reply #42 on: February 10, 2016, 09:25:36 pm »
https://github.com/danselmi/cbDiff

I merged that into my own branch. I didn't add anything and issues a pull request to the upstream one, I'm however not sure if danselmi is still actively developing it, maybe he is but nothing needs to be changed anymor.

Yves
Clang based code completion for Code::Blocks:   http://github.com/yvesdm3000/ClangLib

Offline yvesdm3000

  • Almost regular
  • **
  • Posts: 226
Re: GitBlocks Plugin
« Reply #43 on: February 10, 2016, 09:28:27 pm »
I agree, I don't need all those features of branching, rebasing etc, only features that the existing tools can't deliver where it makes sense in regards to Code::Blocks integration. IMHO that's why I asked the question in the first place, to actually get a diff from a file that I can click in C::B without having to go to some external tool/browser, find the file and have the diff open outside of C::B...
I've setup a tool that opens my diff program with the currently selected file and if there are changes it shows them. It also goes to the correct line:)
I have also commands for git gui blame and gitk. They are pretty handy.

Does it start C::B when you do a git gui blame ? Maybe a nice howto or some notes on what you've configured? Helps others figuring out what to do to setup this...

Yves
Clang based code completion for Code::Blocks:   http://github.com/yvesdm3000/ClangLib

Online MortenMacFly

  • Administrator
  • Lives here!
  • *****
  • Posts: 9456
Re: GitBlocks Plugin
« Reply #44 on: February 10, 2016, 09:46:33 pm »
https://github.com/danselmi/cbDiff
OK. I knew that but forgot. There is another one here:
https://github.com/ywx/cbDiff
So there are 2 forks from the original and yours on top. Maybe you can merge all three. Because the ywx has highlight languages considered.
Compiler logging: Settings->Compiler & Debugger->tab "Other"->Compiler logging="Full command line"
C::B Manual: http://www.codeblocks.org/docs/main_codeblocks_en.html
C::B FAQ: http://wiki.codeblocks.org/index.php?title=FAQ