From a0275d2e39427ae5f08b9310086a2e4a563d0ddc Mon Sep 17 00:00:00 2001 From: NinjaPewPew Date: Sun, 20 Oct 2019 19:20:01 +0200 Subject: [PATCH 1/2] Updated version number and changelog. --- CVS History Viewer/Properties/AssemblyInfo.cs | 4 ++-- changelog.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CVS History Viewer/Properties/AssemblyInfo.cs b/CVS History Viewer/Properties/AssemblyInfo.cs index d2b9d06..bd3ee69 100644 --- a/CVS History Viewer/Properties/AssemblyInfo.cs +++ b/CVS History Viewer/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.2.0")] -[assembly: AssemblyFileVersion("1.0.2.0")] +[assembly: AssemblyVersion("1.1.0.0")] +[assembly: AssemblyFileVersion("1.1.0.0")] diff --git a/changelog.md b/changelog.md index 3c3521e..ebc3114 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # CVS History Viewer Changelog -## v1.1.0 (Unreleased) +## v1.1.0 (Released 2019/10/20) ### New Features * (#30) Quick Diff View now got syntax highlighting! ### Improvements From c8ec1c7cbf0e16ce8a7a8a19d0aa45a218961aef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCtjerodt=2C=20Marcel?= Date: Mon, 21 Oct 2019 09:17:45 +0200 Subject: [PATCH 2/2] Resolves #43 - Index variable for loop was initialized wrong. --- CVS History Viewer/Properties/AssemblyInfo.cs | 4 ++-- CVS History Viewer/Resources/Classes/CVSCalls.cs | 2 +- changelog.md | 12 ++++++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CVS History Viewer/Properties/AssemblyInfo.cs b/CVS History Viewer/Properties/AssemblyInfo.cs index bd3ee69..2ffb29d 100644 --- a/CVS History Viewer/Properties/AssemblyInfo.cs +++ b/CVS History Viewer/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.0.0")] -[assembly: AssemblyFileVersion("1.1.0.0")] +[assembly: AssemblyVersion("1.1.1.0")] +[assembly: AssemblyFileVersion("1.1.1.0")] diff --git a/CVS History Viewer/Resources/Classes/CVSCalls.cs b/CVS History Viewer/Resources/Classes/CVSCalls.cs index 076f672..d902a84 100644 --- a/CVS History Viewer/Resources/Classes/CVSCalls.cs +++ b/CVS History Viewer/Resources/Classes/CVSCalls.cs @@ -376,7 +376,7 @@ private static Revision GetDiffPrevious(Revision oRevision, int iWhitespace) { if (bMergeRequired) { - for(int j = oRevision.cDiffBlocks.Count - 1; j >= 0; j--) + for(int j = oRevision.cDiffBlocks[i].cLines.Count - 1; j >= 0; j--) { oMergeInto.cLines.Insert(0, oRevision.cDiffBlocks[i].cLines[j]); } diff --git a/changelog.md b/changelog.md index ebc3114..6c5a155 100644 --- a/changelog.md +++ b/changelog.md @@ -1,21 +1,25 @@ # CVS History Viewer Changelog +# v1.1.1 (Released 2019/10/21) +### Bugfix +* (#43) Fixed a crash that would appear when the app tries to merge 2 or more diff blocks. + ## v1.1.0 (Released 2019/10/20) ### New Features * (#30) Quick Diff View now got syntax highlighting! ### Improvements -* (#27) Tabs are now converted to spaces (default 4). This can be modifed via setting file. +* (#27) Tabs are now converted to spaces (default 4). This can be modified via setting file. * (#31) UI will now restore the previous selected revision when going back to a previous selected commit. * (#35) If nothing was found using the search and the search term could be a commit hash without the "commit:" keyword, an automatic follow up search is triggered, treating the search term as a commit hash. * (#37) Revision entries (bottom-left list) now show the file path in the tooltip. * (#40) Big search performance improvements due to some database optimizations. ### Bugfix * (#22) Whitespace setting is now read from settings file. At some point in time there will be a way to change it via the UI, but for now you have to change it in the settings file (see local appdata folder). -* (#23) Search limit is now always applied, not just in the inital load. This should improve search performance on general searches (e.g. no or very few filter) **drastically**! +* (#23) Search limit is now always applied, not just in the initial load. This should improve search performance on general searches (e.g. no or very few filter) **drastically**! * (#28) Commit time is now converted to local time. Before it was shown in UTC, the way CVS logs it. * (#29) Fixed a bug that would reverse diff lines whenever 2 blocks are merged. -* (#38) Double-click in the revison list will now only respond if a revision was targeted. Before it would use whatever revision was previously selected. -* (#39) Fixed a crash that would happend, whenever trying to refresh from a folder that was deleted. +* (#38) Double-click in the revision list will now only respond if a revision was targeted. Before it would use whatever revision was previously selected. +* (#39) Fixed a crash that would happened, whenever trying to refresh from a folder that was deleted. ## v1.0.2 (Released 2019/05/21) ### Improvements