OSDN Git Service
(root)
/
tortoisegit
/
TortoiseGitJp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Direct Launch external diff when open dialog at file
[tortoisegit/TortoiseGitJp.git]
/
src
/
TortoiseProc
/
GitLogListAction.cpp
diff --git
a/src/TortoiseProc/GitLogListAction.cpp
b/src/TortoiseProc/GitLogListAction.cpp
index
d6baf29
..
4d1c9b7
100644
(file)
--- a/
src/TortoiseProc/GitLogListAction.cpp
+++ b/
src/TortoiseProc/GitLogListAction.cpp
@@
-48,6
+48,7
@@
#include "FileDiffDlg.h"
\r
#include "CommitDlg.h"
\r
#include "RebaseDlg.h"
\r
#include "FileDiffDlg.h"
\r
#include "CommitDlg.h"
\r
#include "RebaseDlg.h"
\r
+#include "GitDiff.h"
\r
\r
IMPLEMENT_DYNAMIC(CGitLogList, CHintListCtrl)
\r
\r
\r
IMPLEMENT_DYNAMIC(CGitLogList, CHintListCtrl)
\r
\r
@@
-161,9
+162,7
@@
void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect)
{
\r
GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
\r
GitRev * r2 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(LastSelect));
\r
{
\r
GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
\r
GitRev * r2 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(LastSelect));
\r
- CFileDiffDlg dlg;
\r
- dlg.SetDiff(NULL,*r1,*r2);
\r
- dlg.DoModal();
\r
+ CGitDiff::DiffCommit(this->m_Path, r1,r2);
\r
\r
}
\r
break;
\r
\r
}
\r
break;
\r
@@
-173,9
+172,8
@@
void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect)
{
\r
GitRev * r1 = &m_wcRev;
\r
GitRev * r2 = pSelLogEntry;
\r
{
\r
GitRev * r1 = &m_wcRev;
\r
GitRev * r2 = pSelLogEntry;
\r
- CFileDiffDlg dlg;
\r
- dlg.SetDiff(NULL,*r1,*r2);
\r
- dlg.DoModal();
\r
+
\r
+ CGitDiff::DiffCommit(this->m_Path, r1,r2);
\r
\r
//user clicked on the menu item "compare with working copy"
\r
//if (PromptShown())
\r
\r
//user clicked on the menu item "compare with working copy"
\r
//if (PromptShown())
\r
@@
-198,8
+196,8
@@
void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect)
if(pSelLogEntry->m_ParentHash.size()>0)
\r
//if(m_logEntries.m_HashMap[pSelLogEntry->m_ParentHash[0]]>=0)
\r
{
\r
if(pSelLogEntry->m_ParentHash.size()>0)
\r
//if(m_logEntries.m_HashMap[pSelLogEntry->m_ParentHash[0]]>=0)
\r
{
\r
-
dlg.SetDiff(NULL,
pSelLogEntry->m_CommitHash.ToString(),pSelLogEntry->m_ParentHash[0].ToString());
\r
- dlg.DoModal();
\r
+
CGitDiff::DiffCommit(this->m_Path,
pSelLogEntry->m_CommitHash.ToString(),pSelLogEntry->m_ParentHash[0].ToString());
\r
+
\r
}else
\r
{
\r
CMessageBox::Show(NULL,_T("No previous version"),_T("TortoiseGit"),MB_OK);
\r
}else
\r
{
\r
CMessageBox::Show(NULL,_T("No previous version"),_T("TortoiseGit"),MB_OK);
\r