From 4fc450f8cf66f79f9fe6ab0ce07227f8ffceaf1f Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Mon, 28 Jun 2010 10:57:00 +0800
Subject: [PATCH] Fixed issue #493: Add username option at clone dialog

msysgit 1.7.1 support GIT_ASKPASS to launch external app to ask passwords.

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/Resources/TortoiseProcENG.rc           | Bin 456046 -> 456388 bytes
 src/TortoiseProc/CloneDlg.cpp              |  19 +++++++++++++++++--
 src/TortoiseProc/CloneDlg.h                |   4 ++++
 src/TortoiseProc/Commands/CloneCommand.cpp |   5 +++++
 src/TortoiseProc/resource.h                | Bin 168760 -> 168944 bytes
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 82a895f3b814deea8c6e29a3e5dbc84bc81c02a7..d146b6cb1ceead1f51ad109edf5d4b9038b039da 100644
GIT binary patch
delta 162
zcwT$=O8UrK>4p}@EldTw`OO$i7<3p6futdjHlA+ym&tf~!2%|w$pw#Dw%^#z^n_)y
z!Y7XD>ogcOIExtk7!nzB8B(VU8Zt{xXZgw^Fxljx-?ZIKT%2ZL156mqrw4v!a-Pog
wl|@Kchrx&eW`QY#1<V5N$!tf(rav%cW^2E3fC-41ftUq|S-0Ofz&6bU02k&n;Q#;t

delta 67
zcwRg5R{Gs5>4p}@EldTwxlI{N7<3p6fu!Md`CUwrlM5cRY`?La=?Tm9ZI78`+Vu`G
S0WmWWvj8#ccD+Mv(@X$jeHnBB

diff --git a/src/TortoiseProc/CloneDlg.cpp b/src/TortoiseProc/CloneDlg.cpp
index b0985eb29..aeaded04b 100644
--- a/src/TortoiseProc/CloneDlg.cpp
+++ b/src/TortoiseProc/CloneDlg.cpp
@@ -20,7 +20,9 @@ CCloneDlg::CCloneDlg(CWnd* pParent /*=NULL*/)
 	m_bSVN = FALSE;
 	m_bSVNTrunk = FALSE;
 	m_bSVNTags = FALSE;
-	m_bSVNBranch = FALSE;;
+	m_bSVNBranch = FALSE;
+	m_bSVNUserName = FALSE;
+
 	m_strSVNTrunk = _T("trunk");
 	m_strSVNTags = _T("tags");
 	m_strSVNBranchs = _T("branches");
@@ -50,14 +52,17 @@ void CCloneDlg::DoDataExchange(CDataExchange* pDX)
 	DDX_Check(pDX,IDC_CHECK_SVN_TAG, m_bSVNTags);
 	DDX_Check(pDX,IDC_CHECK_SVN_BRANCH, m_bSVNBranch);
 	DDX_Check(pDX,IDC_CHECK_SVN_FROM, m_bSVNFrom);
+	DDX_Check(pDX,IDC_CHECK_USERNAME, m_bSVNUserName);
 
 	DDX_Text(pDX, IDC_EDIT_SVN_TRUNK, m_strSVNTrunk);
 	DDX_Text(pDX, IDC_EDIT_SVN_TAG, m_strSVNTags);
 	DDX_Text(pDX, IDC_EDIT_SVN_BRANCH, m_strSVNBranchs);
 	DDX_Text(pDX, IDC_EDIT_SVN_FROM, this->m_nSVNFrom);
-	
+	DDX_Text(pDX, IDC_EDIT_USERNAME,m_strUserName);
+
 	DDX_Check(pDX, IDC_CHECK_DEPTH, m_bDepth);
 	DDX_Text(pDX, IDC_EDIT_DEPTH,m_nDepth);
+
 }
 
 BOOL CCloneDlg::OnInitDialog()
@@ -136,6 +141,7 @@ BEGIN_MESSAGE_MAP(CCloneDlg, CResizableStandAloneDialog)
 	ON_BN_CLICKED(IDC_CHECK_SVN_BRANCH, &CCloneDlg::OnBnClickedCheckSvnBranch)
 	ON_BN_CLICKED(IDC_CHECK_SVN_FROM, &CCloneDlg::OnBnClickedCheckSvnFrom)
 	ON_BN_CLICKED(IDC_CHECK_DEPTH, &CCloneDlg::OnBnClickedCheckDepth)
+	ON_BN_CLICKED(IDC_CHECK_USERNAME, &CCloneDlg::OnBnClickedCheckUsername)
 END_MESSAGE_MAP()
 
 
@@ -367,6 +373,7 @@ void CCloneDlg::OnBnClickedCheckSvn()
 	OnBnClickedCheckSvnTag();
 	OnBnClickedCheckSvnBranch();
 	OnBnClickedCheckSvnFrom();
+	OnBnClickedCheckUsername();
 }
 
 void CCloneDlg::OnBnClickedCheckSvnTrunk()
@@ -413,3 +420,11 @@ BOOL CCloneDlg::PreTranslateMessage(MSG* pMsg)
 
 	return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
 }
+
+void CCloneDlg::OnBnClickedCheckUsername()
+{
+	// TODO: Add your control notification handler code here
+	UpdateData(TRUE);
+	this->GetDlgItem(IDC_CHECK_USERNAME)->EnableWindow(this->m_bSVN);
+	this->GetDlgItem(IDC_EDIT_USERNAME)->EnableWindow(this->m_bSVNUserName && this->m_bSVN);
+}
diff --git a/src/TortoiseProc/CloneDlg.h b/src/TortoiseProc/CloneDlg.h
index e7ff922f6..06bc34c67 100644
--- a/src/TortoiseProc/CloneDlg.h
+++ b/src/TortoiseProc/CloneDlg.h
@@ -45,12 +45,15 @@ public:
 	BOOL	m_bSVNBranch;
 	BOOL	m_bSVNFrom;
 	BOOL	m_bDepth;
+	BOOL	m_bSVNUserName;
 
 	int		m_nDepth;
 
 	CString	m_strSVNTrunk;
 	CString m_strSVNTags;
 	CString m_strSVNBranchs;
+	CString m_strUserName;
+
 	int m_nSVNFrom;
 
 	CMenuButton m_BrowseUrl;
@@ -72,4 +75,5 @@ public:
 
 	CToolTips			m_tooltips;
 	virtual BOOL PreTranslateMessage(MSG* pMsg);
+	afx_msg void OnBnClickedCheckUsername();
 };
diff --git a/src/TortoiseProc/Commands/CloneCommand.cpp b/src/TortoiseProc/Commands/CloneCommand.cpp
index 21305a947..1ed201076 100644
--- a/src/TortoiseProc/Commands/CloneCommand.cpp
+++ b/src/TortoiseProc/Commands/CloneCommand.cpp
@@ -118,6 +118,11 @@ bool CloneCommand::Execute()
 				cmd+=_T(" -r ")+str;
 			}
 
+			if(dlg.m_bSVNUserName)
+			{
+				cmd+= _T(" --username ");
+				cmd+=dlg.m_strUserName;
+			}
 		}
 		CProgressDlg progress;
 		progress.m_GitCmd=cmd;
diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index 7fed90293d0d31649801b40235264cde9aa49008..98e2c01ccc234b245a396dc7e61cc3fd16482c15 100644
GIT binary patch
delta 66
zcwXDFjO)X4u7)j)+vZG*U=)~~kf1a90}speZIhTJCL7!mm>id202X-kkWpc}LKCCd
V_6u_uUwoaO#?B-*{oEv`EC8+c8>avO

delta 37
vcwPY|0NVfXrwX{H3V^f$ww#ynhyfb6h@AoG^_TdZ0T!3ck^&T$nv()nX1fvI

-- 
2.11.4.GIT