diff options
| author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-06-16 06:28:02 +0300 |
|---|---|---|
| committer | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-06-16 06:28:02 +0300 |
| commit | 2c98d042e9f0d87ff9b4cd09b61b77cf18cacb28 (patch) | |
| tree | 29988a07f20d0a93e7c136f460d921696a637fd2 /main/src/addins/VersionControl | |
| parent | 4cc3b6de4fa7b7cd60733ace96f33a4cd8c1f7d7 (diff) | |
[Git] Fix previous commit.
Damn you git index
Diffstat (limited to 'main/src/addins/VersionControl')
5 files changed, 8 insertions, 8 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs index 0ecd7111f6..b94c57bd82 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs @@ -1474,17 +1474,17 @@ namespace MonoDevelop.VersionControl.Git RootRepository.Stage (".gitignore"); } - public override bool GetFileIsBinary (FilePath path) + public override bool GetFileIsText (FilePath path) { Commit c = GetHeadCommit (GetRepository (path)); if (c == null) - return base.GetFileIsBinary (path); + return base.GetFileIsText (path); var blob = GetBlob (c, path); if (blob == null) - return base.GetFileIsBinary (path); + return base.GetFileIsText (path); - return blob.IsBinary; + return !blob.IsBinary; } } diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs index b2957dd37a..c899794b45 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs @@ -36,7 +36,7 @@ namespace MonoDevelop.VersionControl public bool CanHandle (VersionControlItem item, DocumentView primaryView) { return (primaryView == null || primaryView.GetContent <ITextFile> () != null) - && !item.Repository.GetFileIsBinary (item.Path); + && item.Repository.GetFileIsText (item.Path); } public IBlameView CreateView (VersionControlDocumentInfo info) diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs index d03b79916e..4a2e775386 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs @@ -36,7 +36,7 @@ namespace MonoDevelop.VersionControl public bool CanHandle (VersionControlItem item, DocumentView primaryView) { return (primaryView == null || primaryView.GetContent <ITextFile> () != null) - && !item.Repository.GetFileIsBinary (item.Path); + && item.Repository.GetFileIsText (item.Path); } public IDiffView CreateView (VersionControlDocumentInfo info) diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs index 477134a00c..aba6756b08 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs @@ -36,7 +36,7 @@ namespace MonoDevelop.VersionControl public bool CanHandle (VersionControlItem item, DocumentView primaryView) { return (primaryView == null || primaryView.GetContent <ITextFile> () != null) - && !item.Repository.GetFileIsBinary (item.Path); + && item.Repository.GetFileIsText (item.Path); } public IMergeView CreateView (VersionControlDocumentInfo info) diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs index 34f68af0b3..e6f12d585f 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs @@ -834,7 +834,7 @@ namespace MonoDevelop.VersionControl protected abstract void OnUnignore (FilePath[] localPath); - public virtual bool GetFileIsBinary (FilePath path) + public virtual bool GetFileIsText (FilePath path) { return DesktopService.GetFileIsText (path); } |