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 208569 - Support various comparision modes in History tab
Summary: Support various comparision modes in History tab
Status: RESOLVED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: History (show other bugs)
Version: 7.2
Hardware: PC Mac OS X
: P1 normal (vote)
Assignee: Tomas Stupka
URL:
Keywords:
Depends on: 209673
Blocks:
  Show dependency tree
 
Reported: 2012-02-17 14:23 UTC by Tomas Stupka
Modified: 2012-04-13 10:23 UTC (History)
0 users

See Also:
Issue Type: ENHANCEMENT
Exception Reporter:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Tomas Stupka 2012-02-17 14:23:31 UTC
when selecting a revision in the history tab, it is compared with the current state in the editor, while this is intentional it also seems to be desirable to support a revision browsing mode when a selected revision is compared to the previous one - the same way as in the diff view in a vcs Search History dialog.

suggested solution:

- add toggle to the toolbar to switch between selection modes - compare with current vs. compare with previous
- default state should be compare with current
Comment 1 Tomas Stupka 2012-03-07 22:22:30 UTC
first draft core-main #e0b938e731a0

added a combo to the toolbar to switch between the two modes:
1.) Diff to Current (default) 
compares the selected revision with the current state in the editor

2.) Diff to Previous 
compares the selected revision with a previous revision which in the current state is:
- in case of a vcs revision the time nearest vcs revision available
- in case of a local change the time nearest revision, no matter if vcs or a local change

Note that this might be incorrect in some cases: 
- in case of a selected VCS revision it actually should be it's "parent" revision - will fix before this issue is resolved
- in case of a selected local change the time-nearest doesn't necessarily has to be the revision from which the selected one originates. Will ignore for now as wontfix. Maybe it could be always compared to the next nearest local change but that could be again source of confusion and it isn't expected that this mode will be used that much for loca lchanges anyway.

also note that decided to call it "previous" insted of "parent" as the first one seems to be more general in it's meaning
Comment 2 Quality Engineering 2012-03-09 11:06:16 UTC
Integrated into 'main-golden', will be available in build *201203090400* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main-golden/rev/e0b938e731a0
User: Tomas Stupka <tstupka@netbeans.org>
Log: Issue #208569 - Support various comparision modes in History tab
Comment 3 Tomas Stupka 2012-03-19 10:30:21 UTC
> Note that this might be incorrect in some cases: 
> - in case of a selected VCS revision it actually should be it's "parent" revision - will fix before this issue is resolved
see issue #209673
Comment 4 Tomas Stupka 2012-04-13 10:23:48 UTC
fixed in scope of issue #209673, together with core-main #66afe125adfe