OSDN Git Service

Add select file at log dialog
authorFrank Li <lznuaa@gmail.com>
Tue, 20 Jan 2009 09:14:59 +0000 (17:14 +0800)
committerFrank Li <lznuaa@gmail.com>
Tue, 20 Jan 2009 09:14:59 +0000 (17:14 +0800)
src/Git/Git.h
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/GitLogListBase.cpp
src/TortoiseProc/GitLogListBase.h
src/TortoiseProc/LogDlg.cpp
src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user [deleted file]
src/TortoiseProc/resource.h

index db3832a..96a0186 100644 (file)
@@ -50,7 +50,8 @@ public:
                LOG_INFO_FILESTATE=0x2,\r
                LOG_INFO_PATCH=0x4,\r
                LOG_INFO_FULLHISTORY=0x8,\r
-               LOG_INFO_BOUNDARY=0x10\r
+               LOG_INFO_BOUNDARY=0x10,\r
+        LOG_INFO_ALL=0x20\r
        }LOG_INFO_MASK;\r
 \r
        int GetRemoteList(STRING_VECTOR &list);\r
index e28c147..15ee9f2 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ
index b43065f..ed13ed8 100644 (file)
@@ -86,6 +86,7 @@ CGitLogListBase::CGitLogListBase():CHintListCtrl()
 \r
        m_From=CTime(1970,1,2,0,0,0);\r
        m_To=CTime::GetCurrentTime();\r
+    m_bAllBranch = FALSE;\r
 }\r
 \r
 CGitLogListBase::~CGitLogListBase()\r
@@ -1321,6 +1322,9 @@ int CGitLogListBase::FillGitLog(CTGitPath *path,int info)
                m_logEntries[i].m_IsFull=TRUE;\r
                this->m_arShownList.Add(&m_logEntries[i]);\r
        }\r
+\r
+    if(path)\r
+        m_Path=*path;\r
        return 0;\r
 \r
 }\r
@@ -1330,7 +1334,13 @@ int CGitLogListBase::FillGitShortLog()
        ClearText();\r
 \r
        this->m_logEntries.ClearAll();\r
-       this->m_logEntries.ParserShortLog();\r
+    CTGitPath *path;\r
+    if(this->m_Path.IsEmpty())\r
+        path=NULL;\r
+    else\r
+        path=&this->m_Path;\r
+\r
+       this->m_logEntries.ParserShortLog(path,-1);\r
 \r
        //this->m_logEntries.ParserFromLog();\r
        SetItemCountEx(this->m_logEntries.size());\r
index bd643e2..4fbe806 100644 (file)
@@ -148,6 +148,10 @@ public:
        CString                         m_sFilterText;\r
        CTime                   m_From;\r
        CTime                   m_To;\r
+    \r
+    CTGitPath           m_Path;\r
+    BOOL           m_bAllBranch;\r
+\r
        void                            GetTimeRange(CTime &oldest,CTime &latest);\r
        virtual void ContextMenuAction(int cmd,int FirstSelect, int LastSelect)=0;\r
        void ReloadHashMap()\r
index f098c66..e85e71e 100644 (file)
@@ -337,7 +337,7 @@ BOOL CLogDlg::OnInitDialog()
        // set the choices for the "Show All" button\r
        temp.LoadString(IDS_LOG_SHOWALL);\r
        m_btnShow.AddEntry(temp);\r
-       temp.LoadString(IDS_LOG_SHOWRANGE);\r
+       temp.LoadString(IDS_LOG_SHOW_WHOLE);\r
        m_btnShow.AddEntry(temp);\r
        m_btnShow.SetCurrentEntry((LONG)CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry")));\r
 \r
@@ -375,7 +375,7 @@ void CLogDlg::LogRunStatus(int cur)
 \r
                GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);\r
 \r
-               DialogEnableWindow(IDC_GETALL, FALSE);\r
+               //DialogEnableWindow(IDC_GETALL, FALSE);\r
                DialogEnableWindow(IDC_NEXTHUNDRED, FALSE);\r
                DialogEnableWindow(IDC_CHECK_STOPONCOPY, FALSE);\r
                DialogEnableWindow(IDC_INCLUDEMERGE, FALSE);\r
@@ -390,7 +390,7 @@ void CLogDlg::LogRunStatus(int cur)
                if (!m_bShowedAll)\r
                        DialogEnableWindow(IDC_NEXTHUNDRED, TRUE);\r
 \r
-               //DialogEnableWindow(IDC_CHECK_STOPONCOPY, TRUE);\r
+               DialogEnableWindow(IDC_GETALL, TRUE);\r
                //DialogEnableWindow(IDC_INCLUDEMERGE, TRUE);\r
                DialogEnableWindow(IDC_STATBUTTON, TRUE);\r
                DialogEnableWindow(IDC_REFRESH, TRUE);\r
diff --git a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
deleted file mode 100644 (file)
index db909ba..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioUserFile\r
-       ProjectType="Visual C++"\r
-       Version="9.00"\r
-       ShowAllFiles="true"\r
-       >\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       >\r
-                       <DebugSettings\r
-                               Command="$(TargetPath)"\r
-                               WorkingDirectory="D:\Profiles\b20596\tortoisegit"\r
-                               CommandArguments="/command:log /path:&quot;D:\Profiles\b20596\buildtest\TortoiseGit&quot;"\r
-                               Attach="false"\r
-                               DebuggerType="3"\r
-                               Remote="1"\r
-                               RemoteMachine="B20596-01"\r
-                               RemoteCommand=""\r
-                               HttpUrl=""\r
-                               PDBPath=""\r
-                               SQLDebugging=""\r
-                               Environment=""\r
-                               EnvironmentMerge="true"\r
-                               DebuggerFlavor="0"\r
-                               MPIRunCommand=""\r
-                               MPIRunArguments=""\r
-                               MPIRunWorkingDirectory=""\r
-                               ApplicationCommand=""\r
-                               ApplicationArguments=""\r
-                               ShimCommand=""\r
-                               MPIAcceptMode=""\r
-                               MPIAcceptFilter=""\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       >\r
-                       <DebugSettings\r
-                               Command="$(TargetPath)"\r
-                               WorkingDirectory=""\r
-                               CommandArguments=""\r
-                               Attach="false"\r
-                               DebuggerType="3"\r
-                               Remote="1"\r
-                               RemoteMachine="B20596-01"\r
-                               RemoteCommand=""\r
-                               HttpUrl=""\r
-                               PDBPath=""\r
-                               SQLDebugging=""\r
-                               Environment=""\r
-                               EnvironmentMerge="true"\r
-                               DebuggerFlavor=""\r
-                               MPIRunCommand=""\r
-                               MPIRunArguments=""\r
-                               MPIRunWorkingDirectory=""\r
-                               ApplicationCommand=""\r
-                               ApplicationArguments=""\r
-                               ShimCommand=""\r
-                               MPIAcceptMode=""\r
-                               MPIAcceptFilter=""\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-</VisualStudioUserFile>\r
index 4d77923..feba744 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ