• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision13703 (tree)
Zeit2008-08-14 03:24:05
Autorstefankueng

Log Message

Merge r13701 and r13702 from trunk:
* Patch from Jan Linnenkohl: Fix issue tracker plugin docs.
* Don't overwrite an ssh setting in the Subversion config file if nothing is set in the TSVN settings dialog for the ssh client.

Ändern Zusammenfassung

Diff

--- branches/1.5.x/contrib/issue-tracker-plugins/issue-tracker-plugins.txt (revision 13702)
+++ branches/1.5.x/contrib/issue-tracker-plugins/issue-tracker-plugins.txt (revision 13703)
@@ -180,7 +180,7 @@
180180
181181 We can now implement the GetCommitMessage method as follows:
182182
183- public string GetCommitMessage(IntPtr hParentWnd, string parameters, string originalMessage)
183+ public string GetCommitMessage(IntPtr hParentWnd, string parameters, string commonRoot, string[] pathList, string originalMessage)
184184 {
185185 List<TicketItem> tickets = new List<TicketItem>();
186186 tickets.Add(new TicketItem(12, "Service doesn't start on Windows Vista"));
--- branches/1.5.x/src/Changelog.txt (revision 13702)
+++ branches/1.5.x/src/Changelog.txt (revision 13703)
@@ -21,6 +21,8 @@
2121 - BUG: When starting TortoiseProc with '*' separated, relative file paths, the
2222 commit dialog would either just flash and exit or not show all the
2323 files from all specified paths. (Stefan)
24+- BUG: TSVN would not use ssh clients set in the svn config file, only those
25+ set in the TSVN settings dialog. (Stefan)
2426
2527 Version 1.5.2
2628 - BUG: the "SVN Copy and Add" right-drag menu was not shown. (Stefan)
--- branches/1.5.x/src/SVN/SVN.cpp (revision 13702)
+++ branches/1.5.x/src/SVN/SVN.cpp (revision 13703)
@@ -117,7 +117,15 @@
117117 //set up the SVN_SSH param
118118 CString tsvn_ssh = CRegString(_T("Software\\TortoiseSVN\\SSH"));
119119 if (tsvn_ssh.IsEmpty())
120- tsvn_ssh = CPathUtils::GetAppDirectory() + _T("TortoisePlink.exe");
120+ {
121+ // check whether the ssh client is already set in the Subversion config
122+ svn_config_t * cfg = (svn_config_t *)apr_hash_get (m_pctx->config, SVN_CONFIG_CATEGORY_CONFIG,
123+ APR_HASH_KEY_STRING);
124+ const char * sshValue = NULL;
125+ svn_config_get(cfg, &sshValue, SVN_CONFIG_SECTION_TUNNELS, "ssh", "");
126+ if ((sshValue == NULL)||(sshValue[0] == 0))
127+ tsvn_ssh = _T("\"") + CPathUtils::GetAppDirectory() + _T("TortoisePlink.exe") + _T("\"");
128+ }
121129 tsvn_ssh.Replace('\\', '/');
122130 if (!tsvn_ssh.IsEmpty())
123131 {
Show on old repository browser