From 8c383a69079b3599812470e2eff95cbb2c7d87e2 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 23 Dec 2012 16:25:45 +0100 Subject: [PATCH] Drop unnecessary code Signed-off-by: Sven Strickroth --- src/Git/GitIndex.cpp | 31 ------------------------------- src/Git/GitStatus.cpp | 5 ----- src/Git/GitStatus.h | 2 -- src/Git/gitindex.h | 1 - src/TGitCache/CachedDirectory.cpp | 4 ---- 5 files changed, 43 deletions(-) diff --git a/src/Git/GitIndex.cpp b/src/Git/GitIndex.cpp index cab2f6971..df5e1e80d 100644 --- a/src/Git/GitIndex.cpp +++ b/src/Git/GitIndex.cpp @@ -1447,34 +1447,3 @@ int CGitHeadFileMap::IsUnderVersionControl(const CString &gitdir, const CString return 0; } - -int CGitHeadFileMap::GetHeadHash(const CString &gitdir, CGitHash &hash) -{ - SHARED_TREE_PTR ptr; - ptr = this->SafeGet(gitdir); - - if(ptr.get() == NULL) - { - SHARED_TREE_PTR ptr1(new CGitHeadFileList()); - ptr1->ReadHeadHash(gitdir); - - hash = ptr1->m_Head; - - this->SafeSet(gitdir, ptr1); - - } - else - { - if(ptr->CheckHeadUpdate()) - { - SHARED_TREE_PTR ptr1(new CGitHeadFileList()); - ptr1->ReadHeadHash(gitdir); - - hash = ptr1->m_Head; - this->SafeSet(gitdir, ptr1); - } - - hash = ptr->m_Head; - } - return 0; -} diff --git a/src/Git/GitStatus.cpp b/src/Git/GitStatus.cpp index 96a9105f7..ae58aea2e 100644 --- a/src/Git/GitStatus.cpp +++ b/src/Git/GitStatus.cpp @@ -492,11 +492,6 @@ int GitStatus::GetFileStatus(const CString &gitdir, const CString &pathParam, gi } -int GitStatus::GetHeadHash(const CString &gitdir, CGitHash &hash) -{ - return g_HeadFileMap.GetHeadHash(gitdir, hash); -} - bool GitStatus::IsGitReposChanged(const CString &gitdir,const CString &subpaths, int mode) { if( mode & GIT_MODE_INDEX) diff --git a/src/Git/GitStatus.h b/src/Git/GitStatus.h index 9ab18c2c5..735040501 100644 --- a/src/Git/GitStatus.h +++ b/src/Git/GitStatus.h @@ -111,8 +111,6 @@ public: static __int64 GetIndexFileTime(const CString &gitdir); static bool IsExistIndexLockFile(const CString &gitdir); - static int GetHeadHash(const CString &gitdir, CGitHash &hash); - public: GitStatus(); ~GitStatus(void); diff --git a/src/Git/gitindex.h b/src/Git/gitindex.h index d84db4ab9..d1b1a04d2 100644 --- a/src/Git/gitindex.h +++ b/src/Git/gitindex.h @@ -200,7 +200,6 @@ public: FIll_STATUS_CALLBACK callback=NULL,void *pData=NULL, bool isLoaded=false); bool CheckHeadUpdate(const CString &gitdir); - int GetHeadHash(const CString &gitdir, CGitHash &hash); int IsUnderVersionControl(const CString &gitdir, const CString &path, bool isDir, bool *isVersion); bool IsHashChanged(const CString &gitdir) diff --git a/src/TGitCache/CachedDirectory.cpp b/src/TGitCache/CachedDirectory.cpp index e8381d912..49d8aefb1 100644 --- a/src/TGitCache/CachedDirectory.cpp +++ b/src/TGitCache/CachedDirectory.cpp @@ -269,10 +269,6 @@ CStatusCacheEntry CCachedDirectory::GetStatusFromGit(const CTGitPath &path, CStr GitStatus *pGitStatus = &CGitStatusCache::Instance().m_GitStatus; UNREFERENCED_PARAMETER(pGitStatus); - CGitHash head; - - pGitStatus->GetHeadHash(sProjectRoot,head); - bool isVersion =true; pGitStatus->IsUnderVersionControl(sProjectRoot, subpaths, path.IsDirectory(), &isVersion); if(!isVersion) -- 2.11.4.GIT