You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@netbeans.apache.org by Jaroslav Tulach <ja...@gmail.com> on 2018/01/27 09:00:28 UTC

Improve Git Support

Hi devs,
if you want to get familiar with (part of) NetBeans code base and contribute 
to development of this IDE, here is a quest:

Please take a look at my PR: https://github.com/apache/incubator-netbeans/
pull/391/files

It improves the "Show Git History" window to handle `git replace`. It is a 
simple change - when there is no parent of certain Git RevCommit - search 
refs/replace/<id> and continue the search from there.

Don't you want to improve your development karma by doing the same for "Show 
Annotations" e.g. `git blame` support?

-jt

PS: In any case I need a reviewer to approve my change, so give me a +1, 
please.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists




Re: AW: Improve Git Support

Posted by Neil C Smith <ne...@apache.org>.
On Mon, 29 Jan 2018 at 17:57 Matthias Bläsing <mb...@doppel-helix.eu>
wrote:

> I'd offer a beer to anyone managing to write the graphical revision
> tree without pulling in additional dependencies.
>

+1 to the beer, and the need to try and do this without additional
dependencies.

At some point we may need to discuss alternative UI toolkits, and maybe
HTML5 has a place (was having a look at an interesting Vaadin / Electron
mash-up last week) ... but, I'm really unsure about mixing little bits of
HTML into the current UI.


> This looks as if it could be embedded into the listview and rendered by
> a special cell renderer. Mix some Java2D into this and you should be
> good.
>

Well, that IntelliJ component is almost certainly Java 2D and Apache
licensed! ;-)

Best wishes,

Neil
-- 
Neil C Smith
Artist & Technologist
www.neilcsmith.net

Praxis LIVE - hybrid visual IDE for creative coding - www.praxislive.org

Re: AW: Improve Git Support

Posted by Matthias Bläsing <mb...@doppel-helix.eu>.
Hey,

I'd offer a beer to anyone managing to write the graphical revision
tree without pulling in additional dependencies.

This looks as if it could be embedded into the listview and rendered by
a special cell renderer. Mix some Java2D into this and you should be
good.

gitk does this and is based on TCL/Tk, this does not look to hard to
do.

Matthias


Am Montag, den 29.01.2018, 15:46 +0100 schrieb Christian Lenz:
> > I'd argue that this is an excellent opportunity to use HTML/Java UI
> > - I
> > assume there is a bunch of HTML+JavaScript based solution for
> > rendering
> > this and it makes little sense to write new one in Swing. I am
> > CCing Pavel,
> > as I believe he wrote one as well.
> 
> 
> Yes I thought so too, a HTML UI would be nice.
> 
> 
> Cheers
> 
> Chris
> 
> Von: Jaroslav Tulach
> Gesendet: Montag, 29. Januar 2018 09:18
> An: Apache NetBeans
> Cc: pavel.flaska@oracle.com
> Betreff: Re: Improve Git Support
> 
> 2018-01-27 10:40 GMT+01:00 Christian Lenz <ch...@gmx.net>:
> 
> > Great Thing Jaroslav. Of Course we need more and better git support
> > in
> > NetBeans, like the long asked feature for a visual git log like
> > this:
> > https://blog.jetbrains.com/idea/files/2011/11/log1.jpg. Only to let
> > you
> > know that. This is of Course another topic and I will create a new
> > ticket
> > for this. I did it in the bugzilla board already.
> > 
> 
> I'd argue that this is an excellent opportunity to use HTML/Java UI -
> I
> assume there is a bunch of HTML+JavaScript based solution for
> rendering
> this and it makes little sense to write new one in Swing. I am CCing
> Pavel,
> as I believe he wrote one as well.
> 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists




AW: Improve Git Support

Posted by Christian Lenz <ch...@gmx.net>.
> I'd argue that this is an excellent opportunity to use HTML/Java UI - I
> assume there is a bunch of HTML+JavaScript based solution for rendering
> this and it makes little sense to write new one in Swing. I am CCing Pavel,
> as I believe he wrote one as well.


Yes I thought so too, a HTML UI would be nice.


Cheers

Chris

Von: Jaroslav Tulach
Gesendet: Montag, 29. Januar 2018 09:18
An: Apache NetBeans
Cc: pavel.flaska@oracle.com
Betreff: Re: Improve Git Support

2018-01-27 10:40 GMT+01:00 Christian Lenz <ch...@gmx.net>:

> Great Thing Jaroslav. Of Course we need more and better git support in
> NetBeans, like the long asked feature for a visual git log like this:
> https://blog.jetbrains.com/idea/files/2011/11/log1.jpg. Only to let you
> know that. This is of Course another topic and I will create a new ticket
> for this. I did it in the bugzilla board already.
>

I'd argue that this is an excellent opportunity to use HTML/Java UI - I
assume there is a bunch of HTML+JavaScript based solution for rendering
this and it makes little sense to write new one in Swing. I am CCing Pavel,
as I believe he wrote one as well.

-jt


Von: Jaroslav Tulach
> Gesendet: Samstag, 27. Januar 2018 10:00
> An: Apache NetBeans
> Betreff: Improve Git Support
>
> Hi devs,
> if you want to get familiar with (part of) NetBeans code base and
> contribute
> to development of this IDE, here is a quest:
>
> Please take a look at my PR: https://github.com/apache/incubator-netbeans/
> pull/391/files
>
> It improves the "Show Git History" window to handle `git replace`. It is a
> simple change - when there is no parent of certain Git RevCommit - search
> refs/replace/<id> and continue the search from there.
>
> Don't you want to improve your development karma by doing the same for
> "Show
> Annotations" e.g. `git blame` support?
>
> -jt
>
> PS: In any case I need a reviewer to approve my change, so give me a +1,
> please.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
>
>


Re: Improve Git Support

Posted by Jaroslav Tulach <ja...@gmail.com>.
2018-01-27 10:40 GMT+01:00 Christian Lenz <ch...@gmx.net>:

> Great Thing Jaroslav. Of Course we need more and better git support in
> NetBeans, like the long asked feature for a visual git log like this:
> https://blog.jetbrains.com/idea/files/2011/11/log1.jpg. Only to let you
> know that. This is of Course another topic and I will create a new ticket
> for this. I did it in the bugzilla board already.
>

I'd argue that this is an excellent opportunity to use HTML/Java UI - I
assume there is a bunch of HTML+JavaScript based solution for rendering
this and it makes little sense to write new one in Swing. I am CCing Pavel,
as I believe he wrote one as well.

-jt


Von: Jaroslav Tulach
> Gesendet: Samstag, 27. Januar 2018 10:00
> An: Apache NetBeans
> Betreff: Improve Git Support
>
> Hi devs,
> if you want to get familiar with (part of) NetBeans code base and
> contribute
> to development of this IDE, here is a quest:
>
> Please take a look at my PR: https://github.com/apache/incubator-netbeans/
> pull/391/files
>
> It improves the "Show Git History" window to handle `git replace`. It is a
> simple change - when there is no parent of certain Git RevCommit - search
> refs/replace/<id> and continue the search from there.
>
> Don't you want to improve your development karma by doing the same for
> "Show
> Annotations" e.g. `git blame` support?
>
> -jt
>
> PS: In any case I need a reviewer to approve my change, so give me a +1,
> please.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
>
>

AW: Improve Git Support

Posted by Christian Lenz <ch...@gmx.net>.
Great Thing Jaroslav. Of Course we need more and better git support in NetBeans, like the long asked feature for a visual git log like this: https://blog.jetbrains.com/idea/files/2011/11/log1.jpg. Only to let you know that. This is of Course another topic and I will create a new ticket for this. I did it in the bugzilla board already.


Cheers and great work

Chris

Von: Jaroslav Tulach
Gesendet: Samstag, 27. Januar 2018 10:00
An: Apache NetBeans
Betreff: Improve Git Support

Hi devs,
if you want to get familiar with (part of) NetBeans code base and contribute 
to development of this IDE, here is a quest:

Please take a look at my PR: https://github.com/apache/incubator-netbeans/
pull/391/files

It improves the "Show Git History" window to handle `git replace`. It is a 
simple change - when there is no parent of certain Git RevCommit - search 
refs/replace/<id> and continue the search from there.

Don't you want to improve your development karma by doing the same for "Show 
Annotations" e.g. `git blame` support?

-jt

PS: In any case I need a reviewer to approve my change, so give me a +1, 
please.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists





Re: Improve Git Support

Posted by John Kostaras <jk...@gmail.com>.
Hi Jarda,

you seem to have merged the change already to the main branch, but I would
like to shed a little more light to the change. I don't stay in just code
reviews normally but I like to create test cases and try to debug if
possible the changes to understand them as better as I can.

I 'm not an expert in git (I use mercurial most of the time), but following
this tutorial <https://www.git-scm.com/book/en/v2/Git-Tools-Replace> I
managed to create a git repo with a replaced changeset:

$ git log --oneline --decorate
ff2ba7a (HEAD, master) 5th
ff2b013 (replaced) 4th
7d1c5b7 3rd
3a94aac 2nd
aef022c 1st

$ git checkout history
$ git log --oneline --decorate
04679c6 (HEAD, history) 4th
7d1c5b7 3rd
3a94aac 2nd
aef022c 1st

Displaying "Show History" in NetBeans:

[image: Inline images 1]

[image: Inline images 3]
Not exactly the same.

$ git for-each-ref
04679c62e5b495b1d914d23c02c0fc2adf0c7e3d commit    refs/heads/history
ff2ba7ad6f14bcc13f85cba529ccb7a8d9df638e commit    refs/heads/master
04679c62e5b495b1d914d23c02c0fc2adf0c7e3d commit    refs/replace/
ff2b013f6b41d82ebb2bae4db1dafca49dbbecc2

Or am I missing something (my build didn't show any errors)?

Regards,
John.

On 27 January 2018 at 10:00, Jaroslav Tulach <ja...@gmail.com>
wrote:

> Hi devs,
> if you want to get familiar with (part of) NetBeans code base and
> contribute
> to development of this IDE, here is a quest:
>
> Please take a look at my PR: https://github.com/apache/incubator-netbeans/
> pull/391/files
> <https://github.com/apache/incubator-netbeans/pull/391/files>
>
> It improves the "Show Git History" window to handle `git replace`. It is a
> simple change - when there is no parent of certain Git RevCommit - search
> refs/replace/<id> and continue the search from there.
>
> Don't you want to improve your development karma by doing the same for
> "Show
> Annotations" e.g. `git blame` support?
>
> -jt
>
> PS: In any case I need a reviewer to approve my change, so give me a +1,
> please.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
>