TortoiseGit merge requestshttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests2015-08-14T20:12:21Zhttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/2Update libgit to 2.5.02015-08-14T20:12:21Zusername-removed-112407Update libgit to 2.5.0@all This is an update to libgit 2.5.0. It's working for me so far. Please help testing.
Are there more memory leaks than in libgit 1.9.0?@all This is an update to libgit 2.5.0. It's working for me so far. Please help testing.
Are there more memory leaks than in libgit 1.9.0?https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/6Fixed issue #2559: Commit path changed to lower case when copying and adding ...2015-08-18T14:09:38Zusername-removed-94717Fixed issue #2559: Commit path changed to lower case when copying and adding files in Windows Explorer1. Captured the Debug strings of TGitCache
102.89755249 [14904] CShellUpdater::WorkerThread: shell notification for C:\Users\Tester\Documents\TestRepo\Abc
102.89969635 [14904] ```CShellUpdater::WorkerThread:``` shell notification for...1. Captured the Debug strings of TGitCache
102.89755249 [14904] CShellUpdater::WorkerThread: shell notification for C:\Users\Tester\Documents\TestRepo\Abc
102.89969635 [14904] ```CShellUpdater::WorkerThread:``` shell notification for ```C:\Users\Tester\Documents\TestRepo\abc\Test.txt```
2. Debug TGitCache and trace to [this line](https://gitlab.com/tortoisegit/tortoisegit/blob/fb6362a6e699d6233b7252737b6a84bf5f4d5390/src/TGitCache/ShellUpdater.cpp#L142)
3. Put a break point at [here](https://gitlab.com/tortoisegit/tortoisegit/blob/fb6362a6e699d6233b7252737b6a84bf5f4d5390/src/TGitCache/ShellUpdater.cpp#L76)
4. Check the Call Stack and trace to [here](https://gitlab.com/tortoisegit/tortoisegit/blob/fb6362a6e699d6233b7252737b6a84bf5f4d5390/src/Git/GitStatus.cpp#L448)
5. Found ```casepath``` uses lower case path
6. Look back to CShellUpdater::WorkerThread(), and SHChangeNotify() is called to update path to Shell with lower case.
7. Debug TortoiseShell
8. Put a break point at [here](https://gitlab.com/tortoisegit/tortoisegit/blob/fb6362a6e699d6233b7252737b6a84bf5f4d5390/src/TortoiseShell/ContextMenu.cpp#L230)
9. Use Shell to add file
10. This [GetDisplayNameOf()](https://gitlab.com/tortoisegit/tortoisegit/blob/fb6362a6e699d6233b7252737b6a84bf5f4d5390/src/TortoiseShell/ItemIDList.cpp#L109) is called, and the ```name``` is filled with lower case, then filled into our temp file "gitXXXX.tmp", ...
So, lowercase -> SHChangeNotify() -> GetDisplayNameOf() -> gitXXXX.tmp
Build a new setup based on this fix, looks good.
username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/7Fixed Issue #2492: ssh key not used for new remote after clone2015-08-20T12:33:27Zusername-removed-217046Fixed Issue #2492: ssh key not used for new remote after cloneWhen the ssh key is loaded in the settings it is done per remote name:
https://gitlab.com/tortoisegit/tortoisegit/blob/master/src/TortoiseProc/Settings/SettingGitRemote.cpp#L288
However it was always saved for the 'origin' remote. ...When the ssh key is loaded in the settings it is done per remote name:
https://gitlab.com/tortoisegit/tortoisegit/blob/master/src/TortoiseProc/Settings/SettingGitRemote.cpp#L288
However it was always saved for the 'origin' remote. This is now fixed.https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/11Update doc2015-08-25T16:48:48Zusername-removed-94717Update doc - Update outdated links (Suppose it should be squash into previous commit.)
- Improve the TortoiseGit's History
- Update outdated links (Suppose it should be squash into previous commit.)
- Improve the TortoiseGit's History
username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/14Fixed issue #2583: No overlay icon theme for Windows 102015-09-09T18:11:28Zusername-removed-94717Fixed issue #2583: No overlay icon theme for Windows 10The message `Overlay icon theme created by Charles Milette for TortoiseGit` is from the ReadMe.txt which is provided by @charlesmilette in his [Win10.zip](https://gitlab.com/tortoisegit/tortoisegit/uploads/bbc2a8eb39dd620deb8e6cbe1ab8439...The message `Overlay icon theme created by Charles Milette for TortoiseGit` is from the ReadMe.txt which is provided by @charlesmilette in his [Win10.zip](https://gitlab.com/tortoisegit/tortoisegit/uploads/bbc2a8eb39dd620deb8e6cbe1ab8439d/Win10.zip).
The sign-off `Signed-off-by: Charles Milette <charles.milette@gmail.com>` is added by me.username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/10Improve building Language DLL2015-09-17T09:51:16Zusername-removed-138980Improve building Language DLL- Build language DLLs into `bin\Languages` directly
- Facilitate update of `Tortoise.Pot`
- Build language DLLs into `bin\Languages` directly
- Facilitate update of `Tortoise.Pot`
https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/16Update Tortoise.pot2015-10-09T08:05:05Zusername-removed-94717Update Tortoise.potcf. e1bf4514b0b6ae20e56d4fe797d38b7d2ce74a8e
```
* Allow to change file encoding
Use the encoding comboboxes at the bottom right to reload the file with the specified encoding if the ctrl key is pressed.
The behavior is left as is ...cf. e1bf4514b0b6ae20e56d4fe797d38b7d2ce74a8e
```
* Allow to change file encoding
Use the encoding comboboxes at the bottom right to reload the file with the specified encoding if the ctrl key is pressed.
The behavior is left as is if the ctrl key is not pressed, i.e. the shown file is converted to the specified encoding.
Based on TortoiseSVN revision #26882 and #26883.
```username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/17Fix duplicate hot-key2015-10-10T11:51:38Zusername-removed-94717Fix duplicate hot-keyDuplicate with "&Redo" (IDS_SCIEDIT_REDO)
Regression of 610d24da1e684a13891298b05d411a3d47e6740e
----
These are common SCI items:
```
IDS_SCIEDIT_UNDO "&Undo"
IDS_SCIEDIT_REDO "&Redo"
IDS_SCIEDIT_CU...Duplicate with "&Redo" (IDS_SCIEDIT_REDO)
Regression of 610d24da1e684a13891298b05d411a3d47e6740e
----
These are common SCI items:
```
IDS_SCIEDIT_UNDO "&Undo"
IDS_SCIEDIT_REDO "&Redo"
IDS_SCIEDIT_CUT "Cu&t"
IDS_SCIEDIT_COPY "Cop&y"
IDS_SCIEDIT_PASTE "&Paste"
IDS_SCIEDIT_SELECTALL "Select &All"
```
So, hot-keys **U R t y P A** are used.
And, these are extra SCI item for commit dialog:
```
IDS_COMMITDLG_POPUP_PICKCOMMITHASH "Pick commit &hash"
IDS_COMMITDLG_POPUP_PICKCOMMITMESSAGE "Pick commit &message"
IDS_COMMITDLG_POPUP_PASTEFILELIST "Paste &filename list"
IDS_COMMITDLG_POPUP_PASTELASTMESSAGE "Paste &last commit message"
IDS_COMMITDLG_POPUP_LOGHISTORY "Paste &recent message..."
```
So, hot-keys **h m f l** are used, and **r** is duplicate one(with **R**).
username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/18Fixed issue #2604: Tag using TortoiseGitProc.exe /command:tag should accept a...2015-10-11T03:18:01Zusername-removed-94717Fixed issue #2604: Tag using TortoiseGitProc.exe /command:tag should accept a tag name argumentShould I update doc?
For now, there is no ":tag" in table "D.1. List of available commands and options".
Should I update doc?
For now, there is no ":tag" in table "D.1. List of available commands and options".
username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/19Fixed issue #2609: Start scrolling the log from the bottom of the window rath...2015-10-11T21:21:20Zusername-removed-94717Fixed issue #2609: Start scrolling the log from the bottom of the window rather than the top when finishing the progress1. The CRichEditCtrl ::LineScroll() does not take effect at all after my testing. So I changed to use `PostMessage(WM_VSCROLL, SB_BOTTOM, 0)`.
2. Only one `PostMessage(WM_VSCROLL, SB_BOTTOM, 0)` is used at the end of progress.1. The CRichEditCtrl ::LineScroll() does not take effect at all after my testing. So I changed to use `PostMessage(WM_VSCROLL, SB_BOTTOM, 0)`.
2. Only one `PostMessage(WM_VSCROLL, SB_BOTTOM, 0)` is used at the end of progress.username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/20Fixed issue #2641: Commit: Pre-select first item from "Changes made" list2015-11-20T20:43:33Zusername-removed-94717Fixed issue #2641: Commit: Pre-select first item from "Changes made" listusername-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/22Re-use CGitLogListBase::ShowGraphColumn()2015-12-09T22:05:50Zusername-removed-94717Re-use CGitLogListBase::ShowGraphColumn()username-removed-138980username-removed-138980https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/21Fixed issue #2643: Set branch description on its creation2015-12-10T20:40:59Zusername-removed-94717Fixed issue #2643: Set branch description on its creationI found:
1. There are no quotation marks when writing description into branch.\<BRANCH_NAME\>.description.
2. The Description column of Browser references dialog only shows the first line. The rest lines are not showed.
Fix them in ...I found:
1. There are no quotation marks when writing description into branch.\<BRANCH_NAME\>.description.
2. The Description column of Browser references dialog only shows the first line. The rest lines are not showed.
Fix them in this MR?
---
One more thing I want to add is showing the description when mouse hovers the branch label in Log Message dialog, just like a tooltip.
How about it?username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/24Fixed issue #2670: TortoiseGit->Show log->revision view below->cannot paste t...2015-12-19T10:32:33Zusername-removed-94717Fixed issue #2670: TortoiseGit->Show log->revision view below->cannot paste to "Filter paths"username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/25Add %GIT_EXEC_PATH% to %PATH% when launching libgit2 filter executable2015-12-19T15:40:47Zusername-removed-138980Add %GIT_EXEC_PATH% to %PATH% when launching libgit2 filter executableAdd %GIT_EXEC_PATH% to %PATH% when launching libgit2 filter executable.
Test with git-lfs.
1. Commit a file with git-lfs tracked.
2. Open Log Dialog, double click that file to diff
3. libgit2 is used to apply filter (it calls `git-...Add %GIT_EXEC_PATH% to %PATH% when launching libgit2 filter executable.
Test with git-lfs.
1. Commit a file with git-lfs tracked.
2. Open Log Dialog, double click that file to diff
3. libgit2 is used to apply filter (it calls `git-lfs`)
Reference: git source code `exec_cmd.c` Line 93-108https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/23Show branch description when mouse hovers the ref lable2015-12-21T13:59:45Zusername-removed-94717Show branch description when mouse hovers the ref lablePlus some cleanup and refactor.Plus some cleanup and refactor.username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/27Fixed issue #2673: Display tracked remote URL in folder properties2015-12-29T00:55:22Zusername-removed-94717Fixed issue #2673: Display tracked remote URL in folder propertiesusername-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/31Fixed issue #2679: Don't show horizontal scrollbar when logwidthmarker is set2015-12-30T16:20:36Zusername-removed-360247Fixed issue #2679: Don't show horizontal scrollbar when logwidthmarker is setScintilla has default width of horizontal scrollbar 2000.
It applies only when logwidthmarker is set and edit window
is not wrapped.
Signed-off-by: Jiří Engelthaler <EngyCZ@gmail.com>Scintilla has default width of horizontal scrollbar 2000.
It applies only when logwidthmarker is set and edit window
is not wrapped.
Signed-off-by: Jiří Engelthaler <EngyCZ@gmail.com>https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/29Add support for rebase.autostash2015-12-30T21:39:42Zusername-removed-112407Add support for rebase.autostash@ch3cooli Comments?@ch3cooli Comments?https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/28Fixed issue #2676: Swapped Theirs and Mine in Edit conflicts outside of rebas...2015-12-30T21:39:43Zusername-removed-112407Fixed issue #2676: Swapped Theirs and Mine in Edit conflicts outside of rebase dialog on rebasingThis is not limited to vanilla git rebase: Even if we use our own rebase dialog and open edit conflicts outside the dialog, we get swapped diffs.
This MR tries to fix both use cases.
@ch3cooli Comments?This is not limited to vanilla git rebase: Even if we use our own rebase dialog and open edit conflicts outside the dialog, we get swapped diffs.
This MR tries to fix both use cases.
@ch3cooli Comments?