OSDN Git Service
Frank Li [Thu, 5 Feb 2009 15:45:28 +0000 (23:45 +0800)]
Fix Issue 31 in tortoisegit: Init Repository, Commit dialog can show added file
Signed-off-by: Frank Li <lznuaa@gmail.com>
Colin Law [Thu, 5 Feb 2009 14:47:53 +0000 (14:47 +0000)]
Issue 30: Clone does not support UNC path to repository
This is a bit of a hack and only fixes it for the repository, not the destination.
There are probably many other places where a UNC path will not work and this is
expected to be fixed in new version of msysgit.
It is worth doing this here however as the most likely place for a user to require a UNC path is when cloning.
Frank Li [Thu, 5 Feb 2009 14:41:06 +0000 (22:41 +0800)]
Fix when setting ssh client is null. GIT_SSH environment variable is not clear
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 5 Feb 2009 14:23:53 +0000 (22:23 +0800)]
Fix Issue 29: F5 should refresh TGit log
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 5 Feb 2009 14:03:06 +0000 (22:03 +0800)]
Fix log filter don't filter commit hash
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 5 Feb 2009 09:13:33 +0000 (17:13 +0800)]
Issue 25: Log refresh does not pick up new tags on top line, or move 'master' up
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 5 Feb 2009 08:13:51 +0000 (16:13 +0800)]
Fix Issue 27: Deleted files not committed
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 5 Feb 2009 07:54:01 +0000 (15:54 +0800)]
Fix Issue 22 Error deleting file from context menu if filename contains spaces
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 5 Feb 2009 06:21:41 +0000 (14:21 +0800)]
Using GitProcessBar to show add process!
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 4 Feb 2009 16:18:59 +0000 (00:18 +0800)]
Fix Issue 6 Add does not work.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 4 Feb 2009 03:14:43 +0000 (11:14 +0800)]
Fix issue 17 Switch should default branch to current branch
Also fix push list local branch add remote branch
Signed-off-by: Frank Li <lznuaa@gmail.com>
Myagi [Wed, 4 Feb 2009 01:13:44 +0000 (02:13 +0100)]
disabled 'exe' overlay cache otption (until TGitCache is working)
Colin Law [Tue, 3 Feb 2009 16:19:42 +0000 (16:19 +0000)]
Modify Commit dialog to commit checked unversioned files.
Frank Li [Tue, 3 Feb 2009 15:11:39 +0000 (23:11 +0800)]
Update V0.3 change log
Frank Li [Tue, 3 Feb 2009 14:08:38 +0000 (22:08 +0800)]
update changelog for v0.3
Frank Li [Tue, 3 Feb 2009 13:04:35 +0000 (21:04 +0800)]
Add TortoisePLink to install script
Colin Law [Tue, 3 Feb 2009 12:36:10 +0000 (12:36 +0000)]
Fix bug messing up overlays after attempted commit with empty message.
If an attempt is made to commit with no message entered the commit fails but
then the overlay for files marked for commit is set to unmodified.
Fixed by trapping empty message before attempting commit.
Colin Law [Tue, 3 Feb 2009 10:32:40 +0000 (10:32 +0000)]
Improvements to Diff of modified version against head
Switched the two windows round so head is in left and modified in right.
Changed heading to show 'Working Copy' instead of '000000'
Removed path from filename in heading.
Colin Law [Mon, 2 Feb 2009 17:01:23 +0000 (17:01 +0000)]
Fix 'Explore To' in context menu in Commit Dialog
Pass directory containing file to ShellExecute rather than filename
Myagi [Mon, 2 Feb 2009 17:40:21 +0000 (18:40 +0100)]
added 'conflict' status and fixed status detection for context menu
Myagi [Mon, 2 Feb 2009 03:43:28 +0000 (04:43 +0100)]
fixed some invalid GUIDs for overlay states (maybe old SVN leftovers) changed context menu ID name to TortoiseGit
Frank Li [Mon, 2 Feb 2009 15:50:48 +0000 (23:50 +0800)]
add TortoiseOverlays 1.0.5.14479 msi
Frank Li [Mon, 2 Feb 2009 15:37:09 +0000 (23:37 +0800)]
Merge myapi_overlay.
Basic implment iconOverlay
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 2 Feb 2009 15:27:20 +0000 (23:27 +0800)]
Add workaround show corrent ContextMenu!
Colin Law [Mon, 2 Feb 2009 14:40:00 +0000 (14:40 +0000)]
Fix error in CGit::Run causing git error messages to be lost
In CGit::Run if git.exe failed with an exit code then the message
was not picked up.
Frank Li [Mon, 2 Feb 2009 14:54:10 +0000 (22:54 +0800)]
Fix when nothing commit, message box will show ask user enable "show unversion files"
if user choose yes, "show unversion files" checked. But no unversion files show
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 2 Feb 2009 14:46:02 +0000 (22:46 +0800)]
BugID 16 Fix F5 Refresh Don't work problem
http://code.google.com/p/tortoisegit/issues/detail?id=16
Git/GitStatusListCtrl have not clear before refresh
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 2 Feb 2009 11:10:32 +0000 (19:10 +0800)]
Set Default Checkbox of check out is uncheck at CreateBranchTagDlg
Because changed working tree need merge to new branch. It may be conflict. Want to let user known he will checkout when create branch.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Colin Law [Mon, 2 Feb 2009 10:21:55 +0000 (10:21 +0000)]
Fix repeated filenames in Commit Dialog
Fix problem that caused successive filenames to be concatenated
in unversioned section of commit dialog.
Colin Law [Mon, 2 Feb 2009 09:04:13 +0000 (09:04 +0000)]
Tidy up create branch/tag dialog
Add 'Switch to new branch' option when creating new branch
Add current branch indication beside HEAD text
Display error if branch/tag name is empty or contains spaces
Frank Li [Mon, 2 Feb 2009 05:18:50 +0000 (13:18 +0800)]
Add SSH client setting. TortoisePlink can work with password mode.
When Git clone, password input box can prompt. But have not tested authorize key mode. Package and download information still can't captured.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 1 Feb 2009 16:30:08 +0000 (00:30 +0800)]
Add Show Whole Project Checkbox at log dialog
Remove show all & show whole project push menu button
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 1 Feb 2009 15:38:13 +0000 (23:38 +0800)]
Follow first parent work at log dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 1 Feb 2009 10:19:23 +0000 (18:19 +0800)]
Add All Branch Check Box at LogDlg
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 1 Feb 2009 09:41:06 +0000 (17:41 +0800)]
Git LogDlg "Hide unrelated changed paths" Check box work
Signed-off-by: Frank Li <lznuaa@gmail.com>
Colin Law [Sat, 31 Jan 2009 21:14:01 +0000 (21:14 +0000)]
Remove some debug code.
Colin Law [Sat, 31 Jan 2009 20:37:16 +0000 (20:37 +0000)]
Tidy up of relative times, strings into resource files.
Colin Law [Sat, 31 Jan 2009 15:22:47 +0000 (15:22 +0000)]
Implement Show Relative Times checkbox in Settings, Dialog 1. This checkbox now controls relative time display in Log and Blame
Colin Law [Sat, 31 Jan 2009 10:52:19 +0000 (10:52 +0000)]
Make relative time format available for GitBlame
Colin Law [Sat, 31 Jan 2009 10:51:51 +0000 (10:51 +0000)]
Fix error in call to GetTimeZoneInformation().
Colin Law [Fri, 30 Jan 2009 21:22:25 +0000 (21:22 +0000)]
Provide sensible default column widths for log. Defaults for when there is nothing saved in reg.
Colin Law [Fri, 30 Jan 2009 16:14:47 +0000 (16:14 +0000)]
First pass at relative times in log. This version shows both local and relative time in the log. GitBlame does not yet build.
Johan t Hart [Sat, 31 Jan 2009 00:58:59 +0000 (01:58 +0100)]
Remove some more Subversion leftovers
Johan t Hart [Sat, 31 Jan 2009 00:34:45 +0000 (01:34 +0100)]
Fixed some typos and slightly changed dialog layout. Also removed some more warnings
Johan t Hart [Thu, 8 Jan 2009 23:56:50 +0000 (00:56 +0100)]
Removed some warnings
Frank Li [Sat, 31 Jan 2009 04:58:20 +0000 (12:58 +0800)]
TortoiseGitBlame Add next & prev toolbar button.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 31 Jan 2009 03:16:34 +0000 (11:16 +0800)]
Fix TortoiseGitBlame crash when file name incorrect
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 30 Jan 2009 16:34:41 +0000 (00:34 +0800)]
TortoiseGitBlame Add Next and Previous Function when choose one commit
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 30 Jan 2009 13:46:58 +0000 (21:46 +0800)]
Fix TortoiseGitBlame commit is not in log list problem.
Fix ToolTip information and property box error information when commit hash is not in log list.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 30 Jan 2009 08:30:45 +0000 (16:30 +0800)]
Add EnableSaveRestore at some dialog.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 30 Jan 2009 08:11:25 +0000 (16:11 +0800)]
Add Amend Last Commit Option
Simiplfy implement. It doesn't unstage committed file like git gui.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 30 Jan 2009 07:07:14 +0000 (15:07 +0800)]
Fix Amend Last Commit CheckBox wrong Position
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 30 Jan 2009 06:54:47 +0000 (14:54 +0800)]
Add Show "No Merge" and "First Parent Only" Option at Show ALL menu button
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 30 Jan 2009 06:25:16 +0000 (14:25 +0800)]
Show "Wait ... " at log list when fetch git log.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 30 Jan 2009 06:15:28 +0000 (14:15 +0800)]
Remove "Next100" button. Add second menubutton Show Whole Project
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 30 Jan 2009 03:35:27 +0000 (11:35 +0800)]
Fix don't show finish message box when apply patch
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 30 Jan 2009 03:28:21 +0000 (11:28 +0800)]
Merge From Colin Law Save and restore column widths for log and blame in registry
Signed-off-by: Frank Li <lznuaa@gmail.com>
Colin Law [Thu, 29 Jan 2009 16:09:43 +0000 (16:09 +0000)]
Save and restore column widths for log and blame in registry.
Frank Li [Fri, 30 Jan 2009 02:55:47 +0000 (10:55 +0800)]
Use safe back thread way to fetch log at GitLogList.
Use postmessage send message to main thread handle UI operation to avoid dead lock when use waitforsingle object when try to terminate back thread
Signed-off-by: Frank Li <lznuaa@gmail.com>
Colin Law [Thu, 29 Jan 2009 14:08:20 +0000 (14:08 +0000)]
TortoiseGitBlame minor code tidy.
Colin Law [Thu, 29 Jan 2009 13:56:54 +0000 (13:56 +0000)]
Fixes to TortoiseGitBlame for date format from locale. TortoiseGitBlameView and GitDiff now tested with date format.
Colin Law [Wed, 28 Jan 2009 21:15:15 +0000 (21:15 +0000)]
Add support for 'Use system locale for date/time'.
Colin Law [Wed, 28 Jan 2009 20:47:18 +0000 (20:47 +0000)]
Default date format to short format.
Colin Law [Wed, 28 Jan 2009 20:35:02 +0000 (20:35 +0000)]
In log, format Author Date from regional settings. Added CAppUtils::FormatDateAndTime to format a string according to control panel regional settings. Use this to format AuthorDate wherever used. Note that the mods in TortoiseGitBlameView and GitDiff are untested at this point as they are not funcioning. All uses in GitLogListBase tested.
Frank Li [Thu, 29 Jan 2009 13:28:49 +0000 (21:28 +0800)]
Fix FileDiffDlg ToolTip show error time info problem
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 29 Jan 2009 13:16:11 +0000 (21:16 +0800)]
Fix TortoiseGitBlame miss GitLogCache problem.
Fix save cache fail when close TortoiseGitBlame.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 29 Jan 2009 09:04:11 +0000 (17:04 +0800)]
Update TortoiseGit Web Information
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 29 Jan 2009 08:38:49 +0000 (16:38 +0800)]
Fix Compare with preview version crash problem at log dialog.
The reason is we use new "-z" option to parser git log output.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Myagi [Wed, 28 Jan 2009 19:13:48 +0000 (20:13 +0100)]
updated wingit.dll with some fixes
Frank Li [Wed, 28 Jan 2009 15:15:10 +0000 (23:15 +0800)]
Fix redraw all when loading thread finish load log
Colin Law [Tue, 27 Jan 2009 18:41:08 +0000 (18:41 +0000)]
Corrected registry key defs from Toroise to Tortoise
Frank Li [Wed, 28 Jan 2009 08:36:33 +0000 (16:36 +0800)]
Fix wxi duplicate uuid problem and debug version build problem
Myagi [Tue, 27 Jan 2009 18:14:43 +0000 (19:14 +0100)]
re-enabled libapr install in setup script (had missed that TortoiseMerge still needs them)
Myagi [Tue, 27 Jan 2009 17:54:52 +0000 (18:54 +0100)]
restored minor diff in proc project (happend while resolving conflict)
Myagi [Tue, 27 Jan 2009 17:41:21 +0000 (18:41 +0100)]
re-added accidently removed vars, while resolving conflict during rebase
Myagi [Tue, 27 Jan 2009 05:18:25 +0000 (06:18 +0100)]
updated wingit and fixed bug in new PATH init code (used wrong function for tchar str copy)
Myagi [Mon, 26 Jan 2009 06:36:43 +0000 (07:36 +0100)]
made wingit.dll delay load so that PATH can be inited with git/bin dir before dll loads
Myagi [Mon, 26 Jan 2009 04:57:19 +0000 (05:57 +0100)]
re-enabled a few blocks in installer script that were disabled for personal use
Myagi [Mon, 26 Jan 2009 03:56:31 +0000 (04:56 +0100)]
fixed typo of "TortoiseGit" that resulted in wrong registry keys read for settings
Myagi [Mon, 26 Jan 2009 02:39:22 +0000 (03:39 +0100)]
added some GetStatus functionality in GitStatus changed so empty (or only containing unversioned files) dirs appear unversioned new wingit version
Myagi [Sun, 25 Jan 2009 05:25:27 +0000 (06:25 +0100)]
fixed some wingit include and lib related stuff
Myagi [Sun, 25 Jan 2009 03:57:58 +0000 (04:57 +0100)]
initial icon overlay support using the wingit lib
Frank Li [Wed, 28 Jan 2009 03:02:48 +0000 (11:02 +0800)]
Merge branch 'log_cache'
Frank Li [Tue, 27 Jan 2009 16:13:54 +0000 (00:13 +0800)]
Git Log Cache Basic working
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 26 Jan 2009 16:06:47 +0000 (00:06 +0800)]
Log Cache Compile Okay
Colin Law [Mon, 26 Jan 2009 14:20:44 +0000 (14:20 +0000)]
Tweaks to Settings, General. Added some _T() forgotten on earlier commits. Disabled configure Sound button. Allow run to continue on startup with invalid msysgit dir if user clicks No to error message.
Colin Law [Sun, 25 Jan 2009 16:15:24 +0000 (16:15 +0000)]
Stop CGit::CheckMsysGitDir() from adding to the path every time through. 1. Make it check whether the msysgitpath is already in the environment path. 2. When it adds a new one take out the last one it added, if any.
Colin Law [Sat, 24 Jan 2009 21:51:40 +0000 (21:51 +0000)]
Tidy up Settings, General Fixed bug that caused default value for msysgit bin path to include double / Corrected title on Settings Dialog, was TortoiseSVN. Disabled items on Settings, General that are not implemented. Made changes to msysgit path enable Apply button. Check valid path to msysgit on exiting or applying. Also fixed small memory leak in CGit::CheckMsysGitDir().
Frank Li [Mon, 26 Jan 2009 15:00:45 +0000 (23:00 +0800)]
Add Log Cache Code
Colin Law [Fri, 23 Jan 2009 21:51:23 +0000 (21:51 +0000)]
Disable annoying warnings Disable 4018 (signed/unsigned) and 4996 (strcpy etc unsafe) in selected projects in Win32 builds. Add IBugTraqProvider as build dependency for TortoiseProc.
Colin Law [Fri, 23 Jan 2009 20:19:33 +0000 (20:19 +0000)]
Remove IBugTraqProvider intermediate files from repository
Frank Li [Fri, 23 Jan 2009 15:26:02 +0000 (23:26 +0800)]
Modify branch tag color
Frank Li [Fri, 23 Jan 2009 14:57:21 +0000 (22:57 +0800)]
Fix Blame show error info when hash is not log list
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 23 Jan 2009 10:26:41 +0000 (18:26 +0800)]
Use new way to convert multi to wide char.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Colin Law [Thu, 22 Jan 2009 16:30:56 +0000 (16:30 +0000)]
Compiler warnings removal Numerous tweaks to remove compiler warnings where solution was simple.
Colin Law [Thu, 22 Jan 2009 10:52:19 +0000 (10:52 +0000)]
Added .gitignore
Colin Law [Thu, 22 Jan 2009 10:52:00 +0000 (10:52 +0000)]
Fixed a couple of obvious code errors
Frank Li [Fri, 23 Jan 2009 01:28:49 +0000 (09:28 +0800)]
Enable Clean Up and Show log at GitStatusListCtrl
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 22 Jan 2009 16:13:29 +0000 (00:13 +0800)]
Commit dialog support check conflict and mark resolve function.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 22 Jan 2009 13:56:46 +0000 (21:56 +0800)]
Add Reset Command
Signed-off-by: Frank Li <lznuaa@gmail.com>