Enable Copy file List to commit Message

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/doc/source/en/TortoiseGit/tsvn_preface.xml b/doc/source/en/TortoiseGit/tsvn_preface.xml
index 1b74e99..91c3090 100644 (file)
--- a/doc/source/en/TortoiseGit/tsvn_preface.xml
+++ b/doc/source/en/TortoiseGit/tsvn_preface.xml
@@ -152,7 +152,7 @@
                <title>Acknowledgments</title>\r
                <variablelist>\r
                        <varlistentry>\r
-                               <term>Frank Li</term>\r
+                               <term>Frank Li "lznuaa@gmail.com"</term>\r
                                <listitem>\r
                                        <para>\r
                                                for founding the TortoiseGit project\r
@@ -160,19 +160,21 @@
                                </listitem>\r
                        </varlistentry>\r
                        <varlistentry>\r
-                               <term>Colin Law</term>\r
+                               <term>myagi(Georg Fischer) "snowcoder@gmail.com"</term>\r
                                <listitem>\r
-                                       <para>                                          \r
+                                       <para>\r
+                                       \r
+                                       For hard work to get TortoiseGit Overlay work.\r
                                        </para>\r
                                </listitem>\r
                        </varlistentry>\r
                        <varlistentry>\r
-                               <term>myagi</term>\r
+                               <term>Colin Law</term>\r
                                <listitem>\r
                                        <para>                                          \r
                                        </para>\r
                                </listitem>\r
-                       </varlistentry>\r
+                       </varlistentry>                 \r
                        <varlistentry>\r
                                <term>Johan t Hart</term>\r
                                <listitem>\r

diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp
index 84220a7..ca21f27 100644 (file)
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -1235,9 +1235,9 @@ void CCommitDlg::InsertMenuItems(CMenu& mPopup, int& nCmd)
        mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteListCmd, sMenuItemText);\r
 }\r
 \r
-bool CCommitDlg::HandleMenuItemClick(int /*cmd*/, CSciEdit * /*pSciEdit*/)\r
+bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit)\r
 {\r
-#if 0\r
+\r
        if (m_bBlock)\r
                return false;\r
        if (cmd == m_nPopupPasteListCmd)\r
@@ -1247,27 +1247,27 @@ bool CCommitDlg::HandleMenuItemClick(int /*cmd*/, CSciEdit * /*pSciEdit*/)
                int nListItems = m_ListCtrl.GetItemCount();\r
                for (int i=0; i<nListItems; ++i)\r
                {\r
-                       CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(i);\r
-                       if (entry->IsChecked())\r
+                       CTGitPath * entry = (CTGitPath*)m_ListCtrl.GetItemData(i);\r
+                       if (entry&&entry->m_Checked)\r
                        {\r
                                CString line;\r
-                               Git_wc_status_kind status = entry->status;\r
-                               if (status == Git_wc_status_unversioned)\r
-                                       status = Git_wc_status_added;\r
-                               if (status == Git_wc_status_missing)\r
-                                       status = Git_wc_status_deleted;\r
+                               CString status = entry->GetActionName();\r
+                               if(entry->m_Action & CTGitPath::LOGACTIONS_UNVER)\r
+                                       status = _T("Add");\r
+\r
+                               //git_wc_status_kind status = entry->status;\r
                                WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());\r
                                if (m_ProjectProperties.bFileListInEnglish)\r
                                        langID = 1033;\r
-                               GitStatus::GetStatusString(AfxGetResourceHandle(), status, buf, sizeof(buf)/sizeof(TCHAR), langID);\r
-                               line.Format(_T("%-10s %s\r\n"), buf, (LPCTSTR)m_ListCtrl.GetItemText(i,0));\r
+                               \r
+                               line.Format(_T("%-10s %s\r\n"),status , (LPCTSTR)m_ListCtrl.GetItemText(i,0));\r
                                logmsg += line;\r
                        }\r
                }\r
                pSciEdit->InsertText(logmsg);\r
                return true;\r
        }\r
-#endif\r
+\r
        return false;\r
 }\r
 \r