Bug 23797 - Using Git in Xamarin Studio highlights entire file rather than just the changes
Summary: Using Git in Xamarin Studio highlights entire file rather than just the changes
Status: VERIFIED FIXED
Alias: None
Product: Xamarin Studio
Classification: Desktop
Component: Version Control ()
Version: 5.5
Hardware: Macintosh Mac OS
: Normal normal
Target Milestone: master
Assignee: Marius Ungureanu
URL:
Depends on:
Blocks:
 
Reported: 2014-10-13 18:36 UTC by Kent Green [MSFT]
Modified: 2015-08-20 03:23 UTC (History)
5 users (show)

Tags:
Is this bug a regression?: ---
Last known good build:


Attachments
Log files from Xamarin Studio (2.45 MB, application/zip)
2014-10-13 18:36 UTC, Kent Green [MSFT]
Details
sshot (238.12 KB, image/png)
2014-10-27 07:05 UTC, Atsushi Eno
Details


Notice (2018-05-24): bugzilla.xamarin.com is now in read-only mode.

Please join us on Visual Studio Developer Community and in the Xamarin and Mono organizations on GitHub to continue tracking issues. Bugzilla will remain available for reference in read-only mode. We will continue to work on open Bugzilla bugs, copy them to the new locations as needed for follow-up, and add the new items under Related Links.

Our sincere thanks to everyone who has contributed on this bug tracker over the years. Thanks also for your understanding as we make these adjustments and improvements for the future.


Please create a new report on Developer Community or GitHub with your current version information, steps to reproduce, and relevant error messages or log files if you are hitting an issue that looks similar to this resolved bug and you do not yet see a matching new report.

Related Links:
Status:
VERIFIED FIXED

Description Kent Green [MSFT] 2014-10-13 18:36:45 UTC
Created attachment 8402 [details]
Log files from Xamarin Studio

---Overview---
From desk case: 
https://xamarin.desk.com/agent/case/92706

When using Git in Xamarin Studio, the customer reports that the entire file is highlighted rather than just the changes.

Expected result:
http://www.screencast.com/t/W6oSswaoBjx

Actual result:
http://www.screencast.com/t/vFeCZRT0wmr7

=== Xamarin Studio ===
Version 5.5 (build 227)
Installation UUID: 8efcf015-0818-42ec-87af-1a538488f3cd
Runtime: 
Mono 3.10.0 ((detached/47db868) 
GTK+ 2.24.23 (Raleigh theme) 
Package version: 310000019

=== Apple Developer Tools ===
Xcode 6.0 (6299)Build 6A313

=== Xamarin.iOS ===
Version: 8.2.0.193 (Business Edition)
Hash: 959c1e4
Branch: 
Build date: 2014-10-03 00:25:37-0400

=== Xamarin.Android ===
Version: 4.18.0 (Business Edition)
Android SDK: /Users/alex/Library/Developer/Xamarin/android-sdk-macosx	
Supported Android versions:
	2.1 (API level 7)
	2.2 (API level 8)
	2.3 (API level 10)
	3.1 (API level 12)
	4.0.3 (API level 15)
	4.1 (API level 16)
	4.4 (API level 19)

Java SDK: /usrjava version "1.6.0_65"
Java(TM) SE Runtime Environment (build 1.6.0_65-b14-462-11M4609)
Java HotSpot(TM) 64-Bit Server VM (build 20.65-b04-462, mixed mode)

=== Xamarin.Mac ===
Version:

=== Build Information ===
Release ID: 505000227
Git revision: 7b721eeec7a2fa4c4f4de0ecd2aed4dc25edac95
Build date: 2014-10-02 15:53:38-04
Xamarin addins: 99ed56b428b31eba1efaace4d82188d6f334e6ca

=== Operating System ===
Mac OS X 10.9.5
Darwin MacbookPro-DRMTM-US.local 13.4.0 
Darwin Kernel Version 13.4.0 
Sun Aug 17 19:50:11 PDT 2014 root:xnu-2422.115.4~1/RELEASE_X86_64 x86_64
Comment 1 Parmendra Kumar 2014-10-14 08:12:57 UTC
I have checked this issue but I am not able to reproduce this issue. I have followed these steps to reproduce it.
1. Create a iPhone application.
2. Open the version control and checkout a project from gist.
3. the file open expected. 

Please check the steps and Let me know if I missed anything.
Could you Please provide us sample project or screencast that can be helpful to reproduce this issue at my end. 

Screencast:http://www.screencast.com/t/zKK94Ww1KOlb
Comment 2 Marius Ungureanu 2014-10-14 08:46:00 UTC
Lluis, can I move this to libgit2 as milestone? It's probably a line ending issue which NGit doesn't seem to support well.
Comment 3 Atsushi Eno 2014-10-27 07:04:57 UTC
I can reproduce this with my ongoing public repo:

1. git clone https://github.com/atsushieno/cadencii.git
2. git checkout 93ab641 (this has all the source files dos2unix-ed)
3. launch monodevelop, open Cadencii.sln
4. Open src/Cadencii.Application.Model/Utility.cs (actually can be any file)
5. click "Changes" tab in the text editor.
Comment 4 Atsushi Eno 2014-10-27 07:05:45 UTC
Created attachment 8514 [details]
sshot
Comment 5 Atsushi Eno 2014-10-29 03:04:33 UTC
For me the cause of the issue was bug #24124. It might apply to anyone else.
Comment 6 Marius Ungureanu 2014-12-01 20:55:34 UTC
Moved to libgit2 feature branch target.
Comment 7 Abhishek 2015-04-30 06:52:47 UTC
I have check this issue with XamarinStudio-6.0.0.514. Now this issue is working
fine. Here is the screencast: http://www.screencast.com/t/wRPtClXS2K

Hence Closing this issue.