src/TortoiseProc/ConflictResolveDlg.cpp

   1 // TortoiseSVN - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2007-2008 - TortoiseSVN
   4
   5 // This program is free software; you can redistribute it and/or
   6 // modify it under the terms of the GNU General Public License
   7 // as published by the Free Software Foundation; either version 2
   8 // of the License, or (at your option) any later version.
   9
  10 // This program is distributed in the hope that it will be useful,
  11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
  12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  13 // GNU General Public License for more details.
  14
  15 // You should have received a copy of the GNU General Public License
  16 // along with this program; if not, write to the Free Software Foundation,
  17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  18 //
  19 #include "stdafx.h"
  20 #include "TortoiseProc.h"
  21 #include "ConflictResolveDlg.h"
  22 #include "TSVNPath.h"
  23 #include "UnicodeUtils.h"
  24 #include "PathUtils.h"
  25 #include "AppUtils.h"
  26 #include "TempFile.h"
  27
  28 IMPLEMENT_DYNAMIC(CConflictResolveDlg, CResizableStandAloneDialog)
  29
  30 CConflictResolveDlg::CConflictResolveDlg(CWnd* pParent /*=NULL*/)
  31         : CResizableStandAloneDialog(CConflictResolveDlg::IDD, pParent)
  32         , m_pConflictDescription(NULL)
  33         , m_choice(svn_wc_conflict_choose_postpone)
  34         , m_bCancelled(false)
  35 {
  36
  37 }
  38
  39 CConflictResolveDlg::~CConflictResolveDlg()
  40 {
  41 }
  42
  43 void CConflictResolveDlg::DoDataExchange(CDataExchange* pDX)
  44 {
  45         CResizableStandAloneDialog::DoDataExchange(pDX);
  46 }
  47
  48
  49 BEGIN_MESSAGE_MAP(CConflictResolveDlg, CResizableStandAloneDialog)
  50         ON_BN_CLICKED(IDC_USELOCAL, &CConflictResolveDlg::OnBnClickedUselocal)
  51         ON_BN_CLICKED(IDC_USEREPO, &CConflictResolveDlg::OnBnClickedUserepo)
  52         ON_BN_CLICKED(IDC_EDITCONFLICT, &CConflictResolveDlg::OnBnClickedEditconflict)
  53         ON_BN_CLICKED(IDC_RESOLVED, &CConflictResolveDlg::OnBnClickedResolved)
  54         ON_BN_CLICKED(IDC_RESOLVEALLLATER, &CConflictResolveDlg::OnBnClickedResolvealllater)
  55         ON_BN_CLICKED(IDHELP, &CConflictResolveDlg::OnBnClickedHelp)
  56         ON_BN_CLICKED(IDC_ABORT, &CConflictResolveDlg::OnBnClickedAbort)
  57 END_MESSAGE_MAP()
  58
  59
  60 // CConflictResolveDlg message handlers
  61
  62 BOOL CConflictResolveDlg::OnInitDialog()
  63 {
  64         CResizableStandAloneDialog::OnInitDialog();
  65
  66         // without a conflict description, this dialog is useless.
  67         ASSERT(m_pConflictDescription);
  68
  69         CString filename = CUnicodeUtils::GetUnicode(m_pConflictDescription->path);
  70         filename = CPathUtils::GetFileNameFromPath(filename);
  71
  72         CString sInfoText;
  73         CString sActionText;
  74         CString sReasonText;
  75         switch (m_pConflictDescription->action)
  76         {
  77         case svn_wc_conflict_action_edit:
  78                 if (m_pConflictDescription->property_name)
  79                         sActionText.Format(IDS_EDITCONFLICT_PROP_ACTIONINFO_MODIFY,
  80                                 (LPCTSTR)CUnicodeUtils::GetUnicode(m_pConflictDescription->property_name),
  81                                 (LPCTSTR)filename);
  82                 else
  83                         sActionText.Format(IDS_EDITCONFLICT_ACTIONINFO_MODIFY, (LPCTSTR)filename);
  84                 break;
  85         case svn_wc_conflict_action_add:
  86                 if (m_pConflictDescription->property_name)
  87                         sActionText.Format(IDS_EDITCONFLICT_PROP_ACTIONINFO_ADD,
  88                                 (LPCTSTR)CUnicodeUtils::GetUnicode(m_pConflictDescription->property_name),
  89                                 (LPCTSTR)filename);
  90                 else
  91                         sActionText.Format(IDS_EDITCONFLICT_ACTIONINFO_ADD, (LPCTSTR)filename);
  92                 break;
  93         case svn_wc_conflict_action_delete:
  94                 if (m_pConflictDescription->property_name)
  95                         sActionText.Format(IDS_EDITCONFLICT_PROP_ACTIONINFO_DELETE,
  96                                 (LPCTSTR)CUnicodeUtils::GetUnicode(m_pConflictDescription->property_name),
  97                                 (LPCTSTR)filename);
  98                 else
  99                         sActionText.Format(IDS_EDITCONFLICT_ACTIONINFO_DELETE, (LPCTSTR)filename);
 100                 break;
 101         default:
 102                 break;
 103         }
 104
 105         switch (m_pConflictDescription->reason)
 106         {
 107         case svn_wc_conflict_reason_edited:
 108                 sReasonText.LoadString(IDS_EDITCONFLICT_REASONINFO_EDITED);
 109                 break;
 110         case svn_wc_conflict_reason_obstructed:
 111                 sReasonText.LoadString(IDS_EDITCONFLICT_REASONINFO_OBSTRUCTED);
 112                 break;
 113         case svn_wc_conflict_reason_deleted:
 114                 sReasonText.LoadString(IDS_EDITCONFLICT_REASONINFO_DELETED);
 115                 break;
 116         case svn_wc_conflict_reason_missing:
 117                 sReasonText.LoadString(IDS_EDITCONFLICT_REASONINFO_MISSING);
 118                 break;
 119         case svn_wc_conflict_reason_unversioned:
 120                 sReasonText.LoadString(IDS_EDITCONFLICT_REASONINFO_UNVERSIONED);
 121                 break;
 122         default:
 123                 break;
 124         }
 125
 126         sInfoText = sActionText + _T(" ") + sReasonText;
 127         SetDlgItemText(IDC_INFOLABEL, sInfoText);
 128
 129         // if we deal with a binary file, editing the conflict isn't possible
 130         // because the 'merged_file' is not used and Subversion therefore can't
 131         // use it as the result of the edit.
 132         if (m_pConflictDescription->is_binary)
 133         {
 134                 GetDlgItem(IDC_RESOLVELABEL)->EnableWindow(FALSE);
 135                 GetDlgItem(IDC_EDITCONFLICT)->EnableWindow(FALSE);
 136                 GetDlgItem(IDC_RESOLVED)->EnableWindow(FALSE);
 137         }
 138
 139         // the "resolved" button must not be enabled as long as the user hasn't used
 140         // the "edit" button.
 141         GetDlgItem(IDC_RESOLVED)->EnableWindow(FALSE);
 142
 143         m_bCancelled = false;
 144
 145         AddAnchor(IDC_INFOLABEL, TOP_LEFT, BOTTOM_RIGHT);
 146         AddAnchor(IDC_GROUP, BOTTOM_LEFT, BOTTOM_RIGHT);
 147         AddAnchor(IDC_CHOOSELABEL, BOTTOM_LEFT);
 148         AddAnchor(IDC_USELOCAL, BOTTOM_LEFT);
 149         AddAnchor(IDC_USEREPO, BOTTOM_RIGHT);
 150         AddAnchor(IDC_ORLABEL, BOTTOM_LEFT);
 151         AddAnchor(IDC_RESOLVELABEL, BOTTOM_LEFT);
 152         AddAnchor(IDC_EDITCONFLICT, BOTTOM_LEFT);
 153         AddAnchor(IDC_RESOLVED, BOTTOM_RIGHT);
 154         AddAnchor(IDC_ORLABEL2, BOTTOM_LEFT);
 155         AddAnchor(IDC_LEAVELABEL, BOTTOM_LEFT);
 156         AddAnchor(IDCANCEL, BOTTOM_LEFT);
 157         AddAnchor(IDC_RESOLVEALLLATER, BOTTOM_RIGHT);
 158         AddAnchor(IDC_ABORT, BOTTOM_RIGHT);
 159         AddAnchor(IDHELP, BOTTOM_RIGHT);
 160
 161
 162         return TRUE;
 163 }
 164
 165 void CConflictResolveDlg::OnBnClickedUselocal()
 166 {
 167         m_choice = svn_wc_conflict_choose_mine_full;
 168         EndDialog(IDOK);
 169 }
 170
 171 void CConflictResolveDlg::OnBnClickedUserepo()
 172 {
 173         m_choice = svn_wc_conflict_choose_theirs_full;
 174         EndDialog(IDOK);
 175 }
 176
 177 void CConflictResolveDlg::OnBnClickedEditconflict()
 178 {
 179         CString filename, n1, n2, n3;
 180         if (m_pConflictDescription->property_name)
 181         {
 182                 filename = CUnicodeUtils::GetUnicode(m_pConflictDescription->property_name);
 183                 n1.Format(IDS_DIFF_PROP_WCNAME, (LPCTSTR)filename);
 184                 n2.Format(IDS_DIFF_PROP_BASENAME, (LPCTSTR)filename);
 185                 n3.Format(IDS_DIFF_PROP_REMOTENAME, (LPCTSTR)filename);
 186         }
 187         else
 188         {
 189                 filename = CUnicodeUtils::GetUnicode(m_pConflictDescription->path);
 190                 filename = CPathUtils::GetFileNameFromPath(filename);
 191                 n1.Format(IDS_DIFF_WCNAME, (LPCTSTR)filename);
 192                 n2.Format(IDS_DIFF_BASENAME, (LPCTSTR)filename);
 193                 n3.Format(IDS_DIFF_REMOTENAME, (LPCTSTR)filename);
 194         }
 195
 196         if (m_pConflictDescription->base_file == NULL)
 197         {
 198                 CAppUtils::DiffFlags flags;
 199                 // no base file, start TortoiseMerge in Two-way diff mode
 200                 CAppUtils::StartExtDiff(CTSVNPath(CUnicodeUtils::GetUnicode(m_pConflictDescription->their_file)),
 201                         CTSVNPath(CUnicodeUtils::GetUnicode(m_pConflictDescription->my_file)),
 202                         n3, n1, flags);
 203         }
 204         else
 205         {
 206                 // Subversion segfaults (1.5.1) if the path of the merged file is not a child of the
 207                 // folder where the conflict occurs. That's why we try to use the provided file path first...
 208                 if (m_pConflictDescription->merged_file)
 209                         m_mergedfile = CUnicodeUtils::GetUnicode(m_pConflictDescription->merged_file);
 210                 else
 211                         m_mergedfile = CTempFiles::Instance().GetTempFilePath(false, CTSVNPath(CUnicodeUtils::GetUnicode(m_pConflictDescription->path))).GetWinPath();
 212                 CAppUtils::StartExtMerge(CTSVNPath(CUnicodeUtils::GetUnicode(m_pConflictDescription->base_file)),
 213                                                                 CTSVNPath(CUnicodeUtils::GetUnicode(m_pConflictDescription->their_file)),
 214                                                                 CTSVNPath(CUnicodeUtils::GetUnicode(m_pConflictDescription->my_file)),
 215                                                                 CTSVNPath(m_mergedfile),
 216                                                                 n2, n3, n1, CString(), false);
 217         }
 218
 219         GetDlgItem(IDC_RESOLVED)->EnableWindow(TRUE);
 220 }
 221
 222 void CConflictResolveDlg::OnBnClickedResolved()
 223 {
 224         m_choice = svn_wc_conflict_choose_merged;
 225         if (m_mergedfile.IsEmpty())
 226                 m_mergedfile = CUnicodeUtils::GetUnicode(m_pConflictDescription->my_file);
 227         EndDialog(IDOK);
 228 }
 229
 230 void CConflictResolveDlg::OnBnClickedResolvealllater()
 231 {
 232         m_choice = svn_wc_conflict_choose_postpone;
 233         EndDialog(IDOK);
 234 }
 235
 236 void CConflictResolveDlg::OnCancel()
 237 {
 238         m_choice = svn_wc_conflict_choose_postpone;
 239
 240         CResizableStandAloneDialog::OnCancel();
 241 }
 242
 243 void CConflictResolveDlg::OnBnClickedHelp()
 244 {
 245         OnHelp();
 246 }
 247
 248 void CConflictResolveDlg::OnBnClickedAbort()
 249 {
 250         m_bCancelled = true;
 251         m_choice = svn_wc_conflict_choose_postpone;
 252         CResizableStandAloneDialog::OnCancel();
 253 }