#include "Settings\SettingGitRemote.h"\r
#include "SinglePropSheetDlg.h"\r
#include "MessageBox.h"\r
+#include "RefLogDlg.h"\r
+#include "IconMenu.h"\r
\r
void SetSortArrow(CListCtrl * control, int nColumn, bool bAscending)\r
{\r
: CResizableStandAloneDialog(CBrowseRefsDlg::IDD, pParent),\r
m_cmdPath(cmdPath),\r
m_currSortCol(-1),\r
- m_currSortDesc(false)\r
+ m_currSortDesc(false),\r
+ m_initialRef(L"HEAD"),\r
+ m_pickRef_Kind(gPickRef_All)\r
{\r
\r
}\r
ON_NOTIFY(TVN_SELCHANGED, IDC_TREE_REF, &CBrowseRefsDlg::OnTvnSelchangedTreeRef)\r
ON_WM_CONTEXTMENU()\r
ON_NOTIFY(LVN_COLUMNCLICK, IDC_LIST_REF_LEAFS, &CBrowseRefsDlg::OnLvnColumnclickListRefLeafs)\r
+ ON_WM_DESTROY()\r
+ ON_NOTIFY(NM_DBLCLK, IDC_LIST_REF_LEAFS, &CBrowseRefsDlg::OnNMDblclkListRefLeafs)\r
END_MESSAGE_MAP()\r
\r
\r
AddAnchor(IDOK,BOTTOM_RIGHT);\r
AddAnchor(IDCANCEL,BOTTOM_RIGHT);\r
\r
- Refresh(true);\r
+ Refresh(m_initialRef);\r
\r
+ EnableSaveRestore(L"BrowseRefs");\r
\r
- return TRUE;\r
+\r
+ m_ListRefLeafs.SetFocus();\r
+ return FALSE;\r
}\r
\r
CShadowTree* CShadowTree::GetNextSub(CString& nameLeft, bool bCreateIfNotExist)\r
return &nextNode;\r
}\r
\r
+CShadowTree* CShadowTree::FindLeaf(CString partialRefName)\r
+{\r
+ if(IsLeaf())\r
+ {\r
+ if(m_csRefName.GetLength() > partialRefName.GetLength())\r
+ return NULL;\r
+ if(partialRefName.Right(m_csRefName.GetLength()) == m_csRefName)\r
+ {\r
+ //Match of leaf name. Try match on total name.\r
+ CString totalRefName = GetRefName();\r
+ if(totalRefName.Right(partialRefName.GetLength()) == partialRefName)\r
+ return this; //Also match. Found.\r
+ }\r
+ }\r
+ else\r
+ {\r
+ //Not a leaf. Search all nodes.\r
+ for(TShadowTreeMap::iterator itShadowTree = m_ShadowTree.begin(); itShadowTree != m_ShadowTree.end(); ++itShadowTree)\r
+ {\r
+ CShadowTree* pSubtree = itShadowTree->second.FindLeaf(partialRefName);\r
+ if(pSubtree != NULL)\r
+ return pSubtree; //Found\r
+ }\r
+ }\r
+ return NULL;//Not found\r
+}\r
+\r
+\r
typedef std::map<CString,CString> MAP_STRING_STRING;\r
\r
-void CBrowseRefsDlg::Refresh(bool bSelectCurHead)\r
+CString CBrowseRefsDlg::GetSelectedRef(bool onlyIfLeaf)\r
{\r
-// m_RefMap.clear();\r
-// g_Git.GetMapHashToFriendName(m_RefMap);\r
- \r
- CString selectRef;\r
- if(bSelectCurHead)\r
+ POSITION pos=m_ListRefLeafs.GetFirstSelectedItemPosition();\r
+ //List ctrl selection?\r
+ if(pos)\r
{\r
- g_Git.Run(L"git symbolic-ref HEAD",&selectRef,CP_UTF8);\r
- selectRef.Trim(L"\r\n\t ");\r
+ //A leaf is selected\r
+ CShadowTree* pTree=(CShadowTree*)m_ListRefLeafs.GetItemData(\r
+ m_ListRefLeafs.GetNextSelectedItem(pos));\r
+ return pTree->GetRefName();\r
}\r
- else\r
+ else if(!onlyIfLeaf)\r
{\r
- POSITION pos=m_ListRefLeafs.GetFirstSelectedItemPosition();\r
- //List ctrl selection?\r
- if(pos)\r
+ //Tree ctrl selection?\r
+ HTREEITEM hTree=m_RefTreeCtrl.GetSelectedItem();\r
+ if(hTree!=NULL)\r
{\r
- CShadowTree* pTree=(CShadowTree*)m_ListRefLeafs.GetItemData(\r
- m_ListRefLeafs.GetNextSelectedItem(pos));\r
- selectRef=pTree->GetRefName();\r
+ CShadowTree* pTree=(CShadowTree*)m_RefTreeCtrl.GetItemData(hTree);\r
+ return pTree->GetRefName();\r
}\r
- else\r
+ }\r
+ return CString();//None\r
+}\r
+\r
+void CBrowseRefsDlg::Refresh(CString selectRef)\r
+{\r
+// m_RefMap.clear();\r
+// g_Git.GetMapHashToFriendName(m_RefMap);\r
+ \r
+ if(!selectRef.IsEmpty())\r
+ {\r
+ if(selectRef == "HEAD")\r
{\r
- //Tree ctrl selection?\r
- HTREEITEM hTree=m_RefTreeCtrl.GetSelectedItem();\r
- if(hTree!=NULL)\r
- {\r
- CShadowTree* pTree=(CShadowTree*)m_RefTreeCtrl.GetItemData(hTree);\r
- selectRef=pTree->GetRefName();\r
- }\r
+ selectRef.Empty();\r
+ g_Git.Run(L"git symbolic-ref HEAD",&selectRef,CP_UTF8);\r
+ selectRef.Trim(L"\r\n\t ");\r
}\r
}\r
+ else\r
+ {\r
+ selectRef = GetSelectedRef(false);\r
+ }\r
\r
m_RefTreeCtrl.DeleteAllItems();\r
m_ListRefLeafs.DeleteAllItems();\r
int valuePos=0;\r
CString refName=singleRef.Tokenize(L"\04",valuePos);\r
CString refRest=singleRef.Mid(valuePos);\r
- refMap[refName]=refRest;\r
- }\r
\r
+ //Use ref based on m_pickRef_Kind\r
+ if(wcsncmp(refName,L"refs/heads",10)==0 && !(m_pickRef_Kind & gPickRef_Head) )\r
+ continue; //Skip\r
+ if(wcsncmp(refName,L"refs/tags",9)==0 && !(m_pickRef_Kind & gPickRef_Tag) )\r
+ continue; //Skip\r
+ if(wcsncmp(refName,L"refs/remotes",12)==0 && !(m_pickRef_Kind & gPickRef_Remote) )\r
+ continue; //Skip\r
+\r
+ refMap[refName] = refRest; //Use\r
+ }\r
\r
\r
-// for(MAP_HASH_NAME::iterator iterRef=m_RefMap.begin();iterRef!=m_RefMap.end();++iterRef)\r
-// for(STRING_VECTOR::iterator iterRefName=iterRef->second.begin();iterRefName!=iterRef->second.end();++iterRefName)\r
-// refName[*iterRefName]=iterRef->first;\r
\r
//Populate ref tree\r
for(MAP_STRING_STRING::iterator iterRefMap=refMap.begin();iterRefMap!=refMap.end();++iterRefMap)\r
}\r
\r
\r
- if(selectRef.IsEmpty() || !SelectRef(selectRef))\r
+ if(selectRef.IsEmpty() || !SelectRef(selectRef, false))\r
//Probably not on a branch. Select root node.\r
m_RefTreeCtrl.Expand(m_TreeRoot.m_hTree,TVE_EXPAND);\r
\r
}\r
\r
-bool CBrowseRefsDlg::SelectRef(CString refName)\r
+bool CBrowseRefsDlg::SelectRef(CString refName, bool bExactMatch)\r
{\r
+ if(!bExactMatch)\r
+ refName = GetFullRefName(refName);\r
if(wcsnicmp(refName,L"refs/",5)!=0)\r
return false; // Not a ref name\r
\r
return true;\r
}\r
\r
+CString CBrowseRefsDlg::GetFullRefName(CString partialRefName)\r
+{\r
+ CShadowTree* pLeaf = m_TreeRoot.FindLeaf(partialRefName);\r
+ if(pLeaf == NULL)\r
+ return CString();\r
+ return pLeaf->GetRefName();\r
+}\r
+\r
+\r
void CBrowseRefsDlg::OnContextMenu(CWnd* pWndFrom, CPoint point)\r
{\r
if(pWndFrom==&m_RefTreeCtrl) OnContextMenu_RefTreeCtrl(point);\r
\r
void CBrowseRefsDlg::ShowContextMenu(CPoint point, HTREEITEM hTreePos, VectorPShadowTree& selectedLeafs)\r
{\r
- CMenu popupMenu;\r
+ CIconMenu popupMenu;\r
popupMenu.CreatePopupMenu();\r
\r
+ bool bAddSeparator = false;\r
if(selectedLeafs.size()==1)\r
{\r
- popupMenu.AppendMenu(MF_STRING,eCmd_ViewLog,L"View log");\r
+ bAddSeparator = true;\r
+\r
+ bool bShowReflogOption = false;\r
+ bool bShowDeleteBranchOption = false;\r
+ bool bShowDeleteTagOption = false;\r
+\r
if(selectedLeafs[0]->IsFrom(L"refs/heads"))\r
- popupMenu.AppendMenu(MF_STRING,eCmd_DeleteBranch,L"Delete Branch");\r
+ {\r
+ bShowReflogOption = true;\r
+ bShowDeleteBranchOption = true;\r
+ }\r
+ else if(selectedLeafs[0]->IsFrom(L"refs/remotes"))\r
+ {\r
+ bShowReflogOption = true;\r
+ }\r
else if(selectedLeafs[0]->IsFrom(L"refs/tags"))\r
- popupMenu.AppendMenu(MF_STRING,eCmd_DeleteTag,L"Delete Tag");\r
+ {\r
+ bShowDeleteTagOption = true;\r
+ }\r
+\r
+ popupMenu.AppendMenuIcon(eCmd_ViewLog, L"Show Log", IDI_LOG);\r
+ if(bShowReflogOption) popupMenu.AppendMenuIcon(eCmd_ShowReflog, L"Show Reflog", IDI_LOG);\r
+ if(bShowDeleteTagOption) popupMenu.AppendMenuIcon(eCmd_DeleteTag, L"Delete Tag", IDI_DELETE);\r
+ if(bShowDeleteBranchOption) popupMenu.AppendMenuIcon(eCmd_DeleteBranch, L"Delete Branch", IDI_DELETE);\r
+\r
+\r
\r
// CShadowTree* pTree = (CShadowTree*)m_ListRefLeafs.GetItemData(pNMHDR->idFrom);\r
// if(pTree==NULL)\r
// return;\r
}\r
\r
+ if(bAddSeparator) popupMenu.AppendMenu(MF_SEPARATOR);\r
+\r
if(hTreePos!=NULL)\r
{\r
CShadowTree* pTree=(CShadowTree*)m_RefTreeCtrl.GetItemData(hTreePos);\r
if(pTree->IsFrom(L"refs/remotes"))\r
{\r
// popupMenu.AppendMenu(MF_STRING,eCmd_AddRemote,L"Add Remote");\r
- popupMenu.AppendMenu(MF_STRING,eCmd_ManageRemotes,L"Manage Remotes");\r
+ popupMenu.AppendMenuIcon(eCmd_ManageRemotes, L"Manage Remotes", IDI_SETTINGS);\r
}\r
else if(pTree->IsFrom(L"refs/heads"))\r
- popupMenu.AppendMenu(MF_STRING,eCmd_CreateBranch,L"Create Branch");\r
+ popupMenu.AppendMenuIcon(eCmd_CreateBranch, L"Create Branch", IDI_COPY);\r
else if(pTree->IsFrom(L"refs/tags"))\r
- popupMenu.AppendMenu(MF_STRING,eCmd_CreateTag,L"Create Tag");\r
+ popupMenu.AppendMenuIcon(eCmd_CreateTag, L"Create Tag", IDI_TAG);\r
}\r
\r
\r
case eCmd_ViewLog:\r
{\r
CLogDlg dlg;\r
- dlg.SetStartRef(selectedLeafs[0]->m_csRefHash);\r
+ dlg.SetStartRef(selectedLeafs[0]->GetRefName());\r
dlg.DoModal();\r
}\r
break;\r
Refresh();\r
}\r
break;\r
+ case eCmd_ShowReflog:\r
+ {\r
+ CRefLogDlg refLogDlg(this);\r
+ refLogDlg.m_CurrentBranch = selectedLeafs[0]->GetRefName();\r
+ refLogDlg.DoModal();\r
+ }\r
+ break;\r
case eCmd_AddRemote:\r
{\r
CAddRemoteDlg(this).DoModal();\r
break;\r
case eCmd_ManageRemotes:\r
{\r
- CSinglePropSheetDlg(L"Git Remote Settings",new CSettingGitRemote(m_cmdPath),this).DoModal();\r
+ CSinglePropSheetDlg(L"Git Remote Settings",new CSettingGitRemote(g_Git.m_CurrentDir),this).DoModal();\r
// CSettingGitRemote W_Remotes(m_cmdPath);\r
// W_Remotes.DoModal();\r
Refresh();\r
SetSortArrow(&m_ListRefLeafs,m_currSortCol,!m_currSortDesc);\r
}\r
\r
+void CBrowseRefsDlg::OnDestroy()\r
+{\r
+ m_pickedRef = GetSelectedRef(true);\r
+\r
+ CResizableStandAloneDialog::OnDestroy();\r
+}\r
+\r
+void CBrowseRefsDlg::OnNMDblclkListRefLeafs(NMHDR *pNMHDR, LRESULT *pResult)\r
+{\r
+ LPNMITEMACTIVATE pNMItemActivate = reinterpret_cast<LPNMITEMACTIVATE>(pNMHDR);\r
+ *pResult = 0;\r
+\r
+ EndDialog(IDOK);\r
+}\r
+\r
+CString CBrowseRefsDlg::PickRef(bool returnAsHash, CString initialRef, int pickRef_Kind)\r
+{\r
+ CBrowseRefsDlg dlg(CString(),NULL);\r
+ \r
+ dlg.m_initialRef = initialRef;\r
+ dlg.m_pickRef_Kind = pickRef_Kind;\r
+\r
+ if(dlg.DoModal() != IDOK)\r
+ return CString();\r
+\r
+ return dlg.m_pickedRef;\r
+}\r
+\r
+bool CBrowseRefsDlg::PickRefForCombo(CComboBoxEx* pComboBox, int pickRef_Kind)\r
+{\r
+ CString origRef;\r
+ pComboBox->GetLBText(pComboBox->GetCurSel(), origRef);\r
+ CString resultRef = PickRef(false,origRef,pickRef_Kind);\r
+ if(resultRef.IsEmpty())\r
+ return false;\r
+ if(wcsncmp(resultRef,L"refs/",5)==0)\r
+ resultRef = resultRef.Mid(5);\r
+// if(wcsncmp(resultRef,L"heads/",6)==0)\r
+// resultRef = resultRef.Mid(6);\r
+\r
+ //Find closest match of choice in combobox\r
+ int ixFound = -1;\r
+ int matchLength = 0;\r
+ CString comboRefName;\r
+ for(int i = 0; i < pComboBox->GetCount(); ++i)\r
+ {\r
+ pComboBox->GetLBText(i, comboRefName);\r
+ if(matchLength < comboRefName.GetLength() && resultRef.Right(comboRefName.GetLength()) == comboRefName)\r
+ {\r
+ matchLength = comboRefName.GetLength();\r
+ ixFound = i;\r
+ }\r
+ }\r
+ if(ixFound >= 0)\r
+ pComboBox->SetCurSel(ixFound);\r
+ else\r
+ ASSERT(FALSE);//No match found. So either pickRef_Kind is wrong or the combobox does not contain the ref specified in the picker (which it should unless the repo has changed before creating the CBrowseRef dialog)\r
+\r
+ return true;\r
+}\r
OSDN Git Service
