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 220383 - GIT --> Export Uncommitted Changes
Summary: GIT --> Export Uncommitted Changes
Status: RESOLVED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 7.2
Hardware: PC Windows XP
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-10-18 20:00 UTC by romanm
Modified: 2012-10-25 10:49 UTC (History)
1 user (show)

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
IDE log (257.57 KB, text/plain)
2012-10-18 20:00 UTC, romanm 		Details
export from GIT (2.47 KB, text/html)
2012-10-19 14:24 UTC, romanm 		Details
export from CVS (1.51 KB, text/html)
2012-10-19 14:25 UTC, romanm 		Details
Show Obsolete (1) 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 romanm 2012-10-18 20:00:39 UTC 
Product Version = NetBeans IDE 7.2 (Build 201207171143)
Operating System = Windows XP version 5.1 running on x86
Java; VM; Vendor = 1.7.0_02
Runtime = Java HotSpot(TM) Client VM 22.0-b10

I have two problems with the GIT --> Export Uncommitted Changes.

1. The colors do not appear on the exported page. 
    This feature is working in CVS --> Export Diff Patch

2. Sometimes the export is exporting all lines not just the uncommitted changes.
    I'am fixing the problem by restating IDE.

Roman
Comment 1 romanm 2012-10-18 20:00:45 UTC 
Created attachment 126159 [details]
IDE log
Comment 2 romanm 2012-10-18 20:13:08 UTC 
Comment on attachment 126159 [details]
IDE log

ffff
Comment 3 Ondrej Vrabec 2012-10-19 09:07:48 UTC 
> 1. The colors do not appear on the exported page. 
>     This feature is working in CVS --> Export Diff Patch
What colors? Make a screenshot to demonstrate your problem.
> 2. Sometimes the export is exporting all lines not just the uncommitted changes.
Do you mean that the change in the generated patch is: all file's content removed and the added again? As all lines appear with '-' first and then the same lines are generated with '+'? Again, make a screenshot or attach the generated patch. Probably the change is in different line-endings.
Comment 4 romanm 2012-10-19 14:24:13 UTC 
Created attachment 126197 [details]
export from GIT
Comment 5 romanm 2012-10-19 14:25:37 UTC 
Created attachment 126198 [details]
export from CVS
Comment 6 romanm 2012-10-19 14:27:28 UTC 
I've attached exports from GIT and CVS.

Today the colors appear on the export from GIT.
The GIT export file has to have .patch extension then the colors appear.

Please compare the exports. I just added a single line to the code.
GIT exported everything compare to CVS export.


Roman
Comment 7 Ondrej Vrabec 2012-10-19 14:36:58 UTC 
(In reply to comment #6)
> The GIT export file has to have .patch extension then the colors appear.
Sure, all diff/patch files need to have a  proper extension to be colored (.patch/.diff)
> Please compare the exports. I just added a single line to the code.
> GIT exported everything compare to CVS export.
I cannot reproduce on Linux, will try later on Windows. Could you pack and attach a test git repository where you experience this?
Comment 8 Ondrej Vrabec 2012-10-19 14:55:33 UTC 
right, reproducible on windows with autocrlf=true
Comment 9 Ondrej Vrabec 2012-10-19 15:03:35 UTC 
fix: http://hg.netbeans.org/core-main/rev/c3a1be1b63f0
Comment 10 Quality Engineering 2012-10-25 10:49:15 UTC 
Integrated into 'main-golden', will be available in build *201210250921* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main-golden/rev/c3a1be1b63f0
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #220383 - GIT --> Export Uncommitted Changes
using a comparator able to trim line-endings when autocrlf is on