Sven Strickroth [Thu, 2 May 2024 17:26:33 +0000 (2 19:26 +0200)]
Honor renames in patch views
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 30 Apr 2024 15:53:41 +0000 (30 17:53 +0200)]
Ignore /doc/source/en/TortoiseGit/git_doc/git-doc.xml
Follow-up of commit
7c901e441d07f46c6eff338b9005660256c114f1.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 30 Apr 2024 15:43:16 +0000 (30 17:43 +0200)]
Prepare release and bump version numbers to 2.16.0
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 30 Apr 2024 15:39:42 +0000 (30 17:39 +0200)]
Update changelog
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 30 Apr 2024 15:33:29 +0000 (30 17:33 +0200)]
Sync translations with Transifex
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 30 Apr 2024 15:32:52 +0000 (30 17:32 +0200)]
Update spell checker dictionaries
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 30 Apr 2024 15:31:22 +0000 (30 17:31 +0200)]
Merge branch 'scintilla-550'
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 30 Apr 2024 15:29:51 +0000 (30 17:29 +0200)]
Update Lexilla to 5.3.2
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 9 May 2023 16:30:26 +0000 (9 18:30 +0200)]
Apply backgroundcolors.patch
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 30 Apr 2024 15:29:14 +0000 (30 17:29 +0200)]
Update to Scintilla 5.5.0
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 28 Apr 2024 19:15:07 +0000 (28 21:15 +0200)]
Sync with official PuTTY 0.81 source code
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Mon, 15 Apr 2024 20:19:31 +0000 (15 22:19 +0200)]
Update PuTTY to 0.81
This fixes CVE-2024-31497.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 14 Apr 2024 07:57:44 +0000 (14 09:57 +0200)]
Word can also diff dot;dotx;odt;ods files
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 2 Apr 2024 18:50:03 +0000 (2 20:50 +0200)]
Update editorconfig to 0.12.7
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sean Conrad [Mon, 25 Mar 2024 14:39:11 +0000 (25 09:39 -0500)]
Upgrade libgit2 to v1.8.0
Signed-off-by: Sean Conrad <sconrad@epic.com>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 17 Mar 2024 14:40:24 +0000 (17 15:40 +0100)]
Upgrade libgit2
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 17 Mar 2024 14:25:32 +0000 (17 15:25 +0100)]
Show an error if a commit could not be loaded/diffed
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 9 Mar 2024 12:31:02 +0000 (9 13:31 +0100)]
Merge branch 'scintilla-543'
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 9 May 2023 16:30:26 +0000 (9 18:30 +0200)]
Apply backgroundcolors.patch
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 9 Mar 2024 12:11:40 +0000 (9 13:11 +0100)]
Update Scintilla to 5.4.3
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Fri, 8 Mar 2024 14:23:12 +0000 (8 15:23 +0100)]
Merge branch 'scintilla-542'
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Fri, 8 Mar 2024 14:16:52 +0000 (8 15:16 +0100)]
Update Lexilla to 5.3.1
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 9 May 2023 16:30:26 +0000 (9 18:30 +0200)]
Apply backgroundcolors.patch
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Fri, 8 Mar 2024 14:14:51 +0000 (8 15:14 +0100)]
Update Scintilla to 5.4.2
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Fri, 1 Mar 2024 19:36:15 +0000 (1 20:36 +0100)]
Fixed issue #4122: TortoiseGitMerge "Encountered an improper argument" error message
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 27 Feb 2024 20:25:49 +0000 (27 21:25 +0100)]
Fix c&p error
Relates to commit
b2ccff6e893f21a785dc4b799e42dd41afa14427.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 27 Feb 2024 16:53:24 +0000 (27 17:53 +0100)]
Fixed issue #3959: The slash direction of the abbreviated path displayed in the dialog box is different
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Mon, 26 Feb 2024 19:53:37 +0000 (26 20:53 +0100)]
Fixed issue #4015: Add --force option for worktree remove
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Mon, 26 Feb 2024 20:09:01 +0000 (26 21:09 +0100)]
Fixed issue #3909: App freezes when pasting from a closed logs window
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Mon, 26 Feb 2024 19:24:06 +0000 (26 20:24 +0100)]
Fixed issue #3981: Add stash controls to the Switch/Checkout progress dialog
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Mon, 26 Feb 2024 19:00:58 +0000 (26 20:00 +0100)]
Fixed issue #4004: TortoiseGit closes window after commit when pressing push when the owning explorer window has been closed
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 24 Feb 2024 18:42:21 +0000 (24 19:42 +0100)]
Updater: Add separate language pack version to simplify full updates to hotfixed versions
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 24 Feb 2024 14:48:40 +0000 (24 15:48 +0100)]
Honor nanoseconds in timestamps
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 24 Feb 2024 14:43:02 +0000 (24 15:43 +0100)]
libgit2: Fix submodule enumeration issue
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Fri, 23 Feb 2024 18:12:46 +0000 (23 19:12 +0100)]
Deduplicate code for setting window title
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Fri, 23 Feb 2024 17:49:04 +0000 (23 18:49 +0100)]
Consistently use CAppUtils::SetWindowTitle
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Fri, 23 Feb 2024 17:46:19 +0000 (23 18:46 +0100)]
Fixed issue #3325: Display repository name first in window title
Can be controlled using the DialogTitles advanced setting.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Thu, 22 Feb 2024 19:52:00 +0000 (22 20:52 +0100)]
Fix outdated info
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Thu, 22 Feb 2024 19:43:48 +0000 (22 20:43 +0100)]
Minor cleanup
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Thu, 22 Feb 2024 18:45:21 +0000 (22 19:45 +0100)]
Add safeguards that data types match
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Thu, 22 Feb 2024 18:35:31 +0000 (22 19:35 +0100)]
Fix/silence warnings
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Thu, 22 Feb 2024 18:34:08 +0000 (22 19:34 +0100)]
Update repository URL of pcre2
It's still the very same repository it was just renamed.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Mon, 19 Feb 2024 13:40:30 +0000 (19 14:40 +0100)]
Update pcre2 to 10.43
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 13 Feb 2024 19:41:24 +0000 (13 20:41 +0100)]
Make more use of --end-of-options
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 10 Feb 2024 10:59:44 +0000 (10 11:59 +0100)]
Fixed issue #4108: Icon overlays is not working correctly with big files > 4GB
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 10 Feb 2024 10:57:21 +0000 (10 11:57 +0100)]
Store correct last modify time in TGitCache
Regression of commit
37a19f096479c507833cc0e5fbea4c9bfdd92bb7.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 10 Feb 2024 09:46:54 +0000 (10 10:46 +0100)]
Delete bitmaps to avoid GDI leak
Based on TortoiseSVN rev. 29676.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Stefan Küng [Fri, 9 Feb 2024 19:29:03 +0000 (9 20:29 +0100)]
Fixed issue #4110: TortoiseGitMerge: Ribbon becomes empty after maximizing on Windows 11
Set extra window styles to avoid refresh problems with the ribbon UI.
Signed-off-by: Stefan Küng <stefankueng@gmail.com>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Thu, 8 Feb 2024 20:25:24 +0000 (8 21:25 +0100)]
Fixed issue #4112: After conducting a 'hard' reset, "git clean" should be offered
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Thu, 8 Feb 2024 14:28:50 +0000 (8 15:28 +0100)]
Update libgit2 to 1.7.2
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Mon, 22 Jan 2024 21:11:08 +0000 (22 22:11 +0100)]
Update zlib to 1.3.1
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Mon, 22 Jan 2024 10:03:48 +0000 (22 11:03 +0100)]
Fixed issue #4109: GitWCRev.exe 2.15.1 Preview: Output File is empty
Regression of commit
fc6538080b65a9940a8cb3284814fa74b8918114.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Mon, 8 Jan 2024 09:43:48 +0000 (8 10:43 +0100)]
Fixed issue #4106: Submodule Update with force not working when using the Git Sync Dialog
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 6 Jan 2024 09:43:08 +0000 (6 10:43 +0100)]
Update copyright years
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 31 Dec 2023 19:12:58 +0000 (31 20:12 +0100)]
No need to include RestartExplorer into CustomActions11.dll
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 31 Dec 2023 19:03:15 +0000 (31 20:03 +0100)]
Add version information to CustomActions(11).dll
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 30 Dec 2023 16:41:15 +0000 (30 17:41 +0100)]
Fixed issue #4097: Revert to parent version menu missing for added files in Log Viewer
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 30 Dec 2023 16:40:03 +0000 (30 17:40 +0100)]
Fixed issue #3881: Compare Revisions - Revert - can not undo an Add action
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 30 Dec 2023 10:30:36 +0000 (30 11:30 +0100)]
Merge branch 'scintilla-5.4.1'
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 9 May 2023 16:30:26 +0000 (9 18:30 +0200)]
Apply backgroundcolors.patch
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 30 Dec 2023 10:29:23 +0000 (30 11:29 +0100)]
Update Scintilla to 5.4.1
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 30 Dec 2023 10:28:56 +0000 (30 11:28 +0100)]
Update Lexilla to 5.3.0
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 30 Dec 2023 10:14:59 +0000 (30 11:14 +0100)]
Improve error dialog box
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Thu, 28 Dec 2023 11:11:24 +0000 (28 12:11 +0100)]
Make sure we only send CRLF terminated lines to SMTP servers
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Thu, 28 Dec 2023 10:50:46 +0000 (28 11:50 +0100)]
Enable latest TLS in SMTP connections
Use an explicit whitelist as there is no way to blacklist old protocols.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Thu, 28 Dec 2023 10:49:22 +0000 (28 11:49 +0100)]
Fix corner case in CStringUtils::GetAccellerator
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Yue Lin Ho [Thu, 21 Dec 2023 22:45:40 +0000 (22 06:45 +0800)]
Fix unable to delete reflog entry of current branch if deleting reflog entry of HEAD first
Signed-off-by: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Kent Zhang [Tue, 21 Nov 2023 01:34:52 +0000 (21 02:34 +0100)]
CommitDlg: Display read-only committer info even if not explicitly setting the author
Signed-off-by: Kent Zhang <doufu3344@gmail.com>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Wed, 20 Dec 2023 17:12:00 +0000 (20 18:12 +0100)]
Update shipped PuTTY binaries to 0.80
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Wed, 20 Dec 2023 17:10:45 +0000 (20 18:10 +0100)]
Update TortoiseGitPlink to PuTTY Plink 0.80
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Wed, 20 Dec 2023 08:23:47 +0000 (20 09:23 +0100)]
Fix c&p error
(fixes issue #4102)
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Wed, 20 Dec 2023 08:00:32 +0000 (20 09:00 +0100)]
Fix creating tag
Regression of commit
8e0dcce62a58beae904cb4cf293897c66edade25.
(fixes issue #4101)
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 17 Dec 2023 11:08:58 +0000 (17 12:08 +0100)]
Fixed issue #4073: TortoiseGit extremely slow on network shares / UNC paths since 2.14
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 12 Dec 2023 18:36:20 +0000 (12 19:36 +0100)]
Refactor AdvancedSettings
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Mon, 11 Dec 2023 19:55:03 +0000 (11 20:55 +0100)]
Directly write into CStringA buffer
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 10 Dec 2023 16:51:11 +0000 (10 17:51 +0100)]
Improve support for large files
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 10 Dec 2023 16:34:32 +0000 (10 17:34 +0100)]
Prevent possible overflows
Better be a bit more defensive...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 10 Dec 2023 16:01:30 +0000 (10 17:01 +0100)]
Honor CString MAX_INT length limitation and beware of unsafe conversions from size_t to int
Better fail early before using truncated data.
Inspired by: https://giodicanio.com/2023/10/20/beware-of-unsafe-conversions-from-size_t-to-int/
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 10 Dec 2023 15:55:51 +0000 (10 16:55 +0100)]
Prevent Scintilla from loading too large files
Styling gets really slow and Scintilla requires special initialization for large files.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 10 Dec 2023 15:40:32 +0000 (10 16:40 +0100)]
Don't use GetFileSize any more
It does not return INVALID_FILE_SIZE on large files. Hence, limit file sizes to <INT_MAX.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 10 Dec 2023 13:15:10 +0000 (10 14:15 +0100)]
Sync with TortoiseGitUDiff
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 10 Dec 2023 12:45:36 +0000 (10 13:45 +0100)]
Improve error reporting
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 10 Dec 2023 12:33:43 +0000 (10 13:33 +0100)]
TortoiseGitUDiff: Fix title
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 10 Dec 2023 12:33:20 +0000 (10 13:33 +0100)]
TortoiseGitUDiff: Improve error reporting
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 9 Dec 2023 17:15:53 +0000 (9 18:15 +0100)]
TortoiseGitUDiff: Ask whether to save changes before loading a new file
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 9 Dec 2023 17:05:24 +0000 (9 18:05 +0100)]
TortoiseGitBlame: Fix blaming a file from another working tree
Commit could not be loaded.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 9 Dec 2023 16:43:56 +0000 (9 17:43 +0100)]
Introduce operator to convert BYTE_VECTOR to CString
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 9 Dec 2023 16:42:17 +0000 (9 17:42 +0100)]
Consistently use git.exe for calling git.exe
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 9 Dec 2023 16:32:38 +0000 (9 17:32 +0100)]
Fix typo
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 9 Dec 2023 15:43:32 +0000 (9 16:43 +0100)]
Refactor: Do not allocate large (unused) buffer on the stack
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 3 Dec 2023 18:53:37 +0000 (3 19:53 +0100)]
Harden commit parsing code
Synced with libgit.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 3 Dec 2023 18:39:37 +0000 (3 19:39 +0100)]
Fix check for allocation failed
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 3 Dec 2023 18:21:59 +0000 (3 19:21 +0100)]
Do not throw exception if buffer allocation failed
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 3 Dec 2023 15:49:26 +0000 (3 16:49 +0100)]
TortoiseGitMerge: Refactor to make ownership more clear
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 3 Dec 2023 15:23:55 +0000 (3 16:23 +0100)]
TortoiseGitMerge: Improve support for large files
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Thu, 7 Dec 2023 16:30:28 +0000 (7 17:30 +0100)]
Fix an off-by-one error
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Thu, 7 Dec 2023 16:29:10 +0000 (7 17:29 +0100)]
Use '--' and '--end-of-options' to better separate arguments from options
Follow up for commit
8e0dcce62a58beae904cb4cf293897c66edade25.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 3 Dec 2023 11:52:57 +0000 (3 12:52 +0100)]
FileTextLines: Do not use raw buffer if decoding failed
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 3 Dec 2023 11:45:45 +0000 (3 12:45 +0100)]
Refactor to use smart pointer
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sun, 3 Dec 2023 10:47:13 +0000 (3 11:47 +0100)]
Refactor to reduce indentation level
Signed-off-by: Sven Strickroth <email@cs-ware.de>