This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 255977 - NetBeans 8.1 RC2 Git plugin Show Incoming no longer working for individual directory or individual file
Summary: NetBeans 8.1 RC2 Git plugin Show Incoming no longer working for individual di...
Status: VERIFIED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 8.1
Hardware: PC Windows 7
: P2 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-10-16 22:49 UTC by idclaar
Modified: 2016-02-02 16:18 UTC (History)
2 users (show)

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
this shows the output from Git -> Remote -> Show Incoming from 8.0.2 and 8.1 RC2 side by side (265.08 KB, image/png)
2015-10-16 22:49 UTC, idclaar 		Details
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description idclaar 2015-10-16 22:49:15 UTC 
Created attachment 156763 [details]
this shows the output from Git -> Remote -> Show Incoming from 8.0.2 and 8.1 RC2 side by side

I'm not sure which priority to use for this, as I use this aspect of the Show Incoming a lot.  Before 8.1 RC2, I was able to (very happily) select a single file or subdirectory of a project and use the Git -> Remote -> Show Incoming to get the recent checkins from the remote to see if I was out of sync on just that one file or directory.  Now in 8.1 RC2, all checkins in the remote are reported back.  This made using git in the IDE a literal joy.  Now I need to look through possibly hundreds (not exaggerating a bit there...) of checkins in the remote to see if I'm out of sync on my one file change.  Please fix this regression!
Comment 1 Jiri Kovalsky 2015-10-19 08:30:38 UTC 
Ondro, could you please take a look at this ASAP? Thanks!
Comment 2 Ondrej Vrabec 2015-10-19 10:52:57 UTC 
It's this commit made a year ago: http://hg.netbeans.org/core-main/rev/26dbbc0cf30d
I am sorry, but i still think the current behaviour is correct. True it used to display only commits affecting the file but that was wrong. In most cases you want to see what commits will be pulled/pushed because you're interested in the fact if you may do a direct commit+push or that you will have to merge/rebase in the end.
Displaying just a subset of commits in this view is dangerous and confusing - imagine you want to review your commits before final push, you do Git -> Show Outgoing but: hey, where are all my commits and why is the view empty? It should primarily display all commits no matter what is the current selection in the IDE.

I can add the previous behaviour back, but only as a different action: something like "Show Incoming/Outgoing for Selection" but i will not change the current way it works, sorry.
Comment 3 Ondrej Vrabec 2015-10-22 19:25:55 UTC 
Please reporter, let me know if you're OK with adding another action as i suggested in my last comment
Comment 4 idclaar 2015-10-22 23:07:03 UTC 
Hi Ondrej.  I wasn't aware the behavior before had the negative aspect you mentioned.  I tested it just now and see what you're talking about.  Definitely not good, and I agree with your assessment and concerns.  

Please proceed with the route you mention, using a separate context option (Show Incoming/Outgoing for Selection).  Having this as a look ahead can be very handy, especially in large, unkempt codebases where overly large files are being worked on by a whole team.
Comment 5 Ondrej Vrabec 2015-11-20 14:39:35 UTC 
fix: http://hg.netbeans.org/core-main/rev/764d15246d88
Comment 6 Quality Engineering 2015-11-21 03:05:39 UTC 
Integrated into 'main-silver', will be available in build *201511210002* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)

Changeset: http://hg.netbeans.org/main-silver/rev/764d15246d88
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #255977 - NetBeans 8.1 RC2 Git plugin Show Incoming no longer working for individual directory or individual file
Add action for show incoming/outgoing searching only on the selected files.
Comment 7 Jiri Prox 2015-12-17 13:00:55 UTC 
verified in trunk