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 227348 - API allowing to compare between different branches
Summary: API allowing to compare between different branches
Status: RESOLVED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 7.4
Hardware: PC Linux
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords: API, API_REVIEW_FAST
Depends on:
Blocks: 207165
  Show dependency tree
 
Reported: 2013-03-12 10:32 UTC by Ondrej Vrabec
Modified: 2013-03-20 02:06 UTC (History)
3 users (show)

See Also:
Issue Type: ENHANCEMENT
Exception Reporter:


Attachments
api change (49.02 KB, patch)
2013-03-12 10:42 UTC, Ondrej Vrabec
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Ondrej Vrabec 2013-03-12 10:32:44 UTC
Git library has to be enhanced to allow:
1) return status of local files against any revision, not just the HEAD
2) compare and return file statuses for two commits/revisions
Comment 1 Ondrej Vrabec 2013-03-12 10:42:23 UTC
Asking for review of the following API change. Adding two new methods to GitClient API: the first compares local files against any git commit while the second compares any two commits.
Comment 2 Ondrej Vrabec 2013-03-12 10:42:30 UTC
Created attachment 132509 [details]
api change
Comment 3 Ondrej Vrabec 2013-03-12 12:28:42 UTC
... just to make sure what the new methods are:
> the first compares local files against any git commit
public Map<File, GitStatus> getStatus (File[] roots, String revision, ProgressMonitor monitor)
> while the second compares any two commits.
public Map<File, GitFileInfo> getStatus (File[] roots, String revisionFirst, String revisionSecond, ProgressMonitor monitor)
Comment 4 Ondrej Vrabec 2013-03-18 09:23:50 UTC
i will integrate tomorrow
Comment 5 Ondrej Vrabec 2013-03-19 09:09:59 UTC
fix: http://hg.netbeans.org/core-main/rev/9bf0efd1a5a3
Comment 6 Quality Engineering 2013-03-20 02:06:35 UTC
Integrated into 'main-golden', will be available in build *201303192300* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main-golden/rev/9bf0efd1a5a3
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #227348 - API allowing to compare between different branches
- compare any two revisions
- compare working tree to any revision