?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Disable warnings and drop prebuild scripts
[TortoiseGit.git] / src / TortoiseProc / GitProgressDlg.cpp
blob5538abe0da0244a0ac5e4d122c551a7bde49f5d0
1 // TortoiseGit - a Windows shell extension for easy version control
2
3 // Copyright (C) 2008-2012 - TortoiseGit
4 // Copyright (C) 2003-2008 - TortoiseSVN
5
6 // This program is free software; you can redistribute it and/or
7 // modify it under the terms of the GNU General Public License
8 // as published by the Free Software Foundation; either version 2
9 // of the License, or (at your option) any later version.
10
11 // This program is distributed in the hope that it will be useful,
12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 // GNU General Public License for more details.
15
16 // You should have received a copy of the GNU General Public License
17 // along with this program; if not, write to the Free Software Foundation,
18 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19 //
20 #include "stdafx.h"
21 #include "TortoiseProc.h"
22 #include "messagebox.h"
23 #include "GITProgressDlg.h"
24 #include "LogDlg.h"
25 #include "TGitPath.h"
26 #include "Registry.h"
27 #include "GitStatus.h"
28 #include "AppUtils.h"
29 #include "PathUtils.h"
30 #include "StringUtils.h"
31 #include "TempFile.h"
32 #include "UnicodeUtils.h"
33 #include "SoundUtils.h"
34 #include "GitDiff.h"
35 #include "Hooks.h"
36 #include "DropFiles.h"
37 //#include "GitLogHelper.h"
38 #include "RegHistory.h"
39 //#include "ConflictResolveDlg.h"
40 #include "LogFile.h"
41 #include "ShellUpdater.h"
42 #include "IconMenu.h"
43 #include "BugTraqAssociations.h"
44 #include "patch.h"
45 #include "MassiveGitTask.h"
46 #include "git2.h"
47 #include "SmartHandle.h"
48
49 static UINT WM_GITPROGRESS = RegisterWindowMessage(_T("TORTOISEGIT_GITPROGRESS_MSG"));
50
51 BOOL CGitProgressDlg::m_bAscending = FALSE;
52 int CGitProgressDlg::m_nSortedColumn = -1;
53
54 #define TRANSFERTIMER 100
55 #define VISIBLETIMER 101
56
57 enum GITProgressDlgContextMenuCommands
58 {
59 // needs to start with 1, since 0 is the return value if *nothing* is clicked on in the context menu
60 ID_COMPARE = 1,
61 ID_EDITCONFLICT,
62 ID_CONFLICTRESOLVE,
63 ID_CONFLICTUSETHEIRS,
64 ID_CONFLICTUSEMINE,
65 ID_LOG,
66 ID_OPEN,
67 ID_OPENWITH,
68 ID_EXPLORE,
69 ID_COPY
70 };
71
72 IMPLEMENT_DYNAMIC(CGitProgressDlg, CResizableStandAloneDialog)
73 CGitProgressDlg::CGitProgressDlg(CWnd* pParent /*=NULL*/)
74 : CResizableStandAloneDialog(CGitProgressDlg::IDD, pParent)
75 , m_bCancelled(FALSE)
76 , m_pThread(NULL)
77 , m_bErrorsOccurred(false)
78 #if 0
79 , m_Revision(_T("HEAD"))
80 //, m_RevisionEnd(0)
81 , m_bLockWarning(false)
82 , m_bLockExists(false)
83 , m_bThreadRunning(FALSE)
84 , m_nConflicts(0)
85 , m_bMergesAddsDeletesOccurred(FALSE)
86
87 , m_options(ProgOptNone)
88 , m_dwCloseOnEnd((DWORD)-1)
89 , m_bFinishedItemAdded(false)
90 , m_bLastVisible(false)
91 // , m_depth(svn_depth_unknown)
92 , m_itemCount(-1)
93 , m_itemCountTotal(-1)
94 , m_AlwaysConflicted(false)
95 , m_BugTraqProvider(NULL)
96 , sDryRun(MAKEINTRESOURCE(IDS_PROGRS_DRYRUN))
97 , sRecordOnly(MAKEINTRESOURCE(IDS_MERGE_RECORDONLY))
98 #endif
99 {
100 }
101
102 CGitProgressDlg::~CGitProgressDlg()
103 {
104 for (size_t i=0; i<m_arData.size(); i++)
105 {
106 delete m_arData[i];
107 }
108 if(m_pThread != NULL)
109 {
110 delete m_pThread;
111 }
112 }
113
114 void CGitProgressDlg::DoDataExchange(CDataExchange* pDX)
115 {
116 CResizableStandAloneDialog::DoDataExchange(pDX);
117 DDX_Control(pDX, IDC_SVNPROGRESS, m_ProgList);
118 }
119
120 BEGIN_MESSAGE_MAP(CGitProgressDlg, CResizableStandAloneDialog)
121 ON_BN_CLICKED(IDC_LOGBUTTON, OnBnClickedLogbutton)
122 ON_NOTIFY(NM_CUSTOMDRAW, IDC_SVNPROGRESS, OnNMCustomdrawSvnprogress)
123 ON_WM_CLOSE()
124 ON_NOTIFY(NM_DBLCLK, IDC_SVNPROGRESS, OnNMDblclkSvnprogress)
125 ON_NOTIFY(HDN_ITEMCLICK, 0, OnHdnItemclickSvnprogress)
126 ON_WM_SETCURSOR()
127 ON_WM_CONTEXTMENU()
128 ON_REGISTERED_MESSAGE(WM_GITPROGRESS, OnGitProgress)
129 ON_WM_TIMER()
130 ON_EN_SETFOCUS(IDC_INFOTEXT, &CGitProgressDlg::OnEnSetfocusInfotext)
131 ON_NOTIFY(LVN_BEGINDRAG, IDC_SVNPROGRESS, &CGitProgressDlg::OnLvnBegindragSvnprogress)
132 ON_WM_SIZE()
133 ON_NOTIFY(LVN_GETDISPINFO, IDC_SVNPROGRESS, &CGitProgressDlg::OnLvnGetdispinfoSvnprogress)
134 ON_BN_CLICKED(IDC_NONINTERACTIVE, &CGitProgressDlg::OnBnClickedNoninteractive)
135 ON_MESSAGE(WM_SHOWCONFLICTRESOLVER, OnShowConflictResolver)
136 ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED, OnTaskbarBtnCreated)
137 END_MESSAGE_MAP()
138
139 BOOL CGitProgressDlg::Cancel()
140 {
141 return m_bCancelled;
142 }
143
144 LRESULT CGitProgressDlg::OnShowConflictResolver(WPARAM /*wParam*/, LPARAM /*lParam*/)
145 {
146 #if 0
147 CConflictResolveDlg dlg(this);
148 const svn_wc_conflict_description_t *description = (svn_wc_conflict_description_t *)lParam;
149 if (description)
150 {
151 dlg.SetConflictDescription(description);
152 if (m_pTaskbarList)
153 {
154 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_PAUSED);
155 }
156 if (dlg.DoModal() == IDOK)
157 {
158 if (dlg.GetResult() == svn_wc_conflict_choose_postpone)
159 {
160 // if the result is conflicted and the dialog returned IDOK,
161 // that means we should not ask again in case of a conflict
162 m_AlwaysConflicted = true;
163 ::SendMessage(GetDlgItem(IDC_NONINTERACTIVE)->GetSafeHwnd(), BM_SETCHECK, BST_CHECKED, 0);
164 }
165 }
166 m_mergedfile = dlg.GetMergedFile();
167 m_bCancelled = dlg.IsCancelled();
168 if (m_pTaskbarList)
169 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_INDETERMINATE);
170 return dlg.GetResult();
171 }
172
173 return svn_wc_conflict_choose_postpone;
174 #endif
175 return 0;
176 }
177 #if 0
178 svn_wc_conflict_choice_t CGitProgressDlg::ConflictResolveCallback(const svn_wc_conflict_description_t *description, CString& mergedfile)
179 {
180 // we only bother the user when merging
181 if (((m_Command == GitProgress_Merge)||(m_Command == GitProgress_MergeAll)||(m_Command == GitProgress_MergeReintegrate))&&(!m_AlwaysConflicted)&&(description))
182 {
183 // we're in a worker thread here. That means we must not show a dialog from the thread
184 // but let the UI thread do it.
185 // To do that, we send a message to the UI thread and let it show the conflict resolver dialog.
186 LRESULT dlgResult = ::SendMessage(GetSafeHwnd(), WM_SHOWCONFLICTRESOLVER, 0, (LPARAM)description);
187 mergedfile = m_mergedfile;
188 return (svn_wc_conflict_choice_t)dlgResult;
189 }
190
191 return svn_wc_conflict_choose_postpone;
192 }
193 #endif
194 void CGitProgressDlg::AddItemToList()
195 {
196 int totalcount = m_ProgList.GetItemCount();
197
198 m_ProgList.SetItemCountEx(totalcount+1, LVSICF_NOSCROLL|LVSICF_NOINVALIDATEALL);
199 // make columns width fit
200 if (iFirstResized < 30)
201 {
202 // only resize the columns for the first 30 or so entries.
203 // after that, don't resize them anymore because that's an
204 // expensive function call and the columns will be sized
205 // close enough already.
206 ResizeColumns();
207 iFirstResized++;
208 }
209
210 // Make sure the item is *entirely* visible even if the horizontal
211 // scroll bar is visible.
212 int count = m_ProgList.GetCountPerPage();
213 if (totalcount <= (m_ProgList.GetTopIndex() + count + nEnsureVisibleCount + 2))
214 {
215 nEnsureVisibleCount++;
216 m_bLastVisible = true;
217 }
218 else
219 {
220 nEnsureVisibleCount = 0;
221 if (IsIconic() == 0)
222 m_bLastVisible = false;
223 }
224 }
225
226
227 BOOL CGitProgressDlg::Notify(const CTGitPath& path, git_wc_notify_action_t action,
228 int /*status*/ ,
229 CString *strErr
230 /*
231 svn_node_kind_t kind, const CString& mime_type,
232 svn_wc_notify_state_t content_state,
233 svn_wc_notify_state_t prop_state, LONG rev,
234 const svn_lock_t * lock, svn_wc_notify_lock_state_t lock_state,
235 const CString& changelistname,
236 svn_merge_range_t * range,
237 svn_error_t * err, apr_pool_t * pool
238 */)
239 {
240 bool bNoNotify = false;
241 bool bDoAddData = true;
242 NotificationData * data = new NotificationData();
243 data->path = path;
244 data->action = action;
245 data->sPathColumnText=path.GetGitPathString();
246 data->bAuxItem = false;
247 #if 0
248 data->kind = kind;
249 data->mime_type = mime_type;
250 data->content_state = content_state;
251 data->prop_state = prop_state;
252 data->rev = rev;
253 data->lock_state = lock_state;
254 data->changelistname = changelistname;
255 if ((lock)&&(lock->owner))
256 data->owner = CUnicodeUtils::GetUnicode(lock->owner);
257 data->sPathColumnText = path.GetUIPathString();
258 if (!m_basePath.IsEmpty())
259 data->basepath = m_basePath;
260 if (range)
261 data->merge_range = *range;
262 #endif
263 switch (data->action)
264 {
265 case git_wc_notify_add:
266 //case svn_wc_notify_update_add:
267 // if ((data->content_state == svn_wc_notify_state_conflicted) || (data->prop_state == svn_wc_notify_state_conflicted))
268 // {
269 // data->color = m_Colors.GetColor(CColors::Conflict);
270 // data->bConflictedActionItem = true;
271 // data->sActionColumnText.LoadString(IDS_SVNACTION_CONFLICTED);
272 // m_nConflicts++;
273 // }
274 // else
275 // {
276 // m_bMergesAddsDeletesOccurred = true;
277 data->sActionColumnText.LoadString(IDS_SVNACTION_ADD);
278 data->color = m_Colors.GetColor(CColors::Added);
279 // }
280 break;
281 case git_wc_notify_sendmail_start:
282 data->bAuxItem = true;
283 data->sActionColumnText.LoadString(IDS_SVNACTION_SENDMAIL_START);
284 data->color = m_Colors.GetColor(CColors::Modified);
285 break;
286
287 case git_wc_notify_sendmail_error:
288 data->bAuxItem = true;
289 data->sActionColumnText.LoadString(IDS_SVNACTION_SENDMAIL_ERROR);
290 if(strErr)
291 data->sPathColumnText = *strErr;
292 else
293 data->sPathColumnText.Empty();
294 data->color = m_Colors.GetColor(CColors::Modified);
295 break;
296
297 case git_wc_notify_sendmail_done:
298
299 data->sActionColumnText.LoadString(IDS_SVNACTION_SENDMAIL_DONE);
300 data->sPathColumnText.Empty();
301 data->color = m_Colors.GetColor(CColors::Modified);
302 break;
303
304 case git_wc_notify_sendmail_retry:
305 data->sActionColumnText.LoadString(IDS_SVNACTION_SENDMAIL_RETRY);
306 data->sPathColumnText.Empty();
307 data->color = m_Colors.GetColor(CColors::Modified);
308 break;
309
310
311 case git_wc_notify_resolved:
312 data->sActionColumnText.LoadString(IDS_SVNACTION_RESOLVE);
313 break;
314
315 case git_wc_notify_revert:
316 data->sActionColumnText.LoadString(IDS_SVNACTION_REVERT);
317 break;
318
319 #if 0
320 case svn_wc_notify_commit_added:
321 data->sActionColumnText.LoadString(IDS_SVNACTION_ADDING);
322 data->color = m_Colors.GetColor(CColors::Added);
323 break;
324 case svn_wc_notify_copy:
325 data->sActionColumnText.LoadString(IDS_SVNACTION_COPY);
326 break;
327 case svn_wc_notify_commit_modified:
328 data->sActionColumnText.LoadString(IDS_SVNACTION_MODIFIED);
329 data->color = m_Colors.GetColor(CColors::Modified);
330 break;
331 case svn_wc_notify_delete:
332 case svn_wc_notify_update_delete:
333 data->sActionColumnText.LoadString(IDS_SVNACTION_DELETE);
334 m_bMergesAddsDeletesOccurred = true;
335 data->color = m_Colors.GetColor(CColors::Deleted);
336 break;
337 case svn_wc_notify_commit_deleted:
338 data->sActionColumnText.LoadString(IDS_SVNACTION_DELETING);
339 data->color = m_Colors.GetColor(CColors::Deleted);
340 break;
341 case svn_wc_notify_restore:
342 data->sActionColumnText.LoadString(IDS_SVNACTION_RESTORE);
343 break;
344
345 case svn_wc_notify_update_replace:
346 case svn_wc_notify_commit_replaced:
347 data->sActionColumnText.LoadString(IDS_SVNACTION_REPLACED);
348 data->color = m_Colors.GetColor(CColors::Deleted);
349 break;
350 case svn_wc_notify_exists:
351 if ((data->content_state == svn_wc_notify_state_conflicted) || (data->prop_state == svn_wc_notify_state_conflicted))
352 {
353 data->color = m_Colors.GetColor(CColors::Conflict);
354 data->bConflictedActionItem = true;
355 m_nConflicts++;
356 data->sActionColumnText.LoadString(IDS_SVNACTION_CONFLICTED);
357 }
358 else if ((data->content_state == svn_wc_notify_state_merged) || (data->prop_state == svn_wc_notify_state_merged))
359 {
360 data->color = m_Colors.GetColor(CColors::Merged);
361 m_bMergesAddsDeletesOccurred = true;
362 data->sActionColumnText.LoadString(IDS_SVNACTION_MERGED);
363 }
364 else
365 data->sActionColumnText.LoadString(IDS_SVNACTION_EXISTS);
366 break;
367 case svn_wc_notify_update_update:
368 // if this is an inoperative dir change, don't show the notification.
369 // an inoperative dir change is when a directory gets updated without
370 // any real change in either text or properties.
371 if ((kind == svn_node_dir)
372 && ((prop_state == svn_wc_notify_state_inapplicable)
373 || (prop_state == svn_wc_notify_state_unknown)
374 || (prop_state == svn_wc_notify_state_unchanged)))
375 {
376 bNoNotify = true;
377 break;
378 }
379 if ((data->content_state == svn_wc_notify_state_conflicted) || (data->prop_state == svn_wc_notify_state_conflicted))
380 {
381 data->color = m_Colors.GetColor(CColors::Conflict);
382 data->bConflictedActionItem = true;
383 m_nConflicts++;
384 data->sActionColumnText.LoadString(IDS_SVNACTION_CONFLICTED);
385 }
386 else if ((data->content_state == svn_wc_notify_state_merged) || (data->prop_state == svn_wc_notify_state_merged))
387 {
388 data->color = m_Colors.GetColor(CColors::Merged);
389 m_bMergesAddsDeletesOccurred = true;
390 data->sActionColumnText.LoadString(IDS_SVNACTION_MERGED);
391 }
392 else if (((data->content_state != svn_wc_notify_state_unchanged)&&(data->content_state != svn_wc_notify_state_unknown)) ||
393 ((data->prop_state != svn_wc_notify_state_unchanged)&&(data->prop_state != svn_wc_notify_state_unknown)))
394 {
395 data->sActionColumnText.LoadString(IDS_SVNACTION_UPDATE);
396 }
397 else
398 {
399 bNoNotify = true;
400 break;
401 }
402 if (lock_state == svn_wc_notify_lock_state_unlocked)
403 {
404 CString temp(MAKEINTRESOURCE(IDS_SVNACTION_UNLOCKED));
405 data->sActionColumnText += _T(", ") + temp;
406 }
407 break;
408
409 case svn_wc_notify_update_external:
410 // For some reason we build a list of externals...
411 m_ExtStack.AddHead(path.GetUIPathString());
412 data->sActionColumnText.LoadString(IDS_SVNACTION_EXTERNAL);
413 data->bAuxItem = true;
414 break;
415
416 case svn_wc_notify_update_completed:
417 {
418 data->sActionColumnText.LoadString(IDS_SVNACTION_COMPLETED);
419 data->bAuxItem = true;
420 bool bEmpty = !!m_ExtStack.IsEmpty();
421 if (!bEmpty)
422 data->sPathColumnText.Format(IDS_PROGRS_PATHATREV, (LPCTSTR)m_ExtStack.RemoveHead(), rev);
423 else
424 data->sPathColumnText.Format(IDS_PROGRS_ATREV, rev);
425
426 if ((m_nConflicts>0)&&(bEmpty))
427 {
428 // We're going to add another aux item - let's shove this current onto the list first
429 // I don't really like this, but it will do for the moment.
430 m_arData.push_back(data);
431 AddItemToList();
432
433 data = new NotificationData();
434 data->bAuxItem = true;
435 data->sActionColumnText.LoadString(IDS_PROGRS_CONFLICTSOCCURED_WARNING);
436 data->sPathColumnText.LoadString(IDS_PROGRS_CONFLICTSOCCURED);
437 data->color = m_Colors.GetColor(CColors::Conflict);
438 CSoundUtils::PlayTSVNWarning();
439 // This item will now be added after the switch statement
440 }
441 if (!m_basePath.IsEmpty())
442 m_FinishedRevMap[m_basePath.GetSVNApiPath(pool)] = rev;
443 m_RevisionEnd = rev;
444 m_bFinishedItemAdded = true;
445 }
446 break;
447 case svn_wc_notify_commit_postfix_txdelta:
448 data->sActionColumnText.LoadString(IDS_SVNACTION_POSTFIX);
449 break;
450 case svn_wc_notify_failed_revert:
451 data->sActionColumnText.LoadString(IDS_SVNACTION_FAILEDREVERT);
452 break;
453 case svn_wc_notify_status_completed:
454 case svn_wc_notify_status_external:
455 data->sActionColumnText.LoadString(IDS_SVNACTION_STATUS);
456 break;
457 case svn_wc_notify_skip:
458 if ((content_state == svn_wc_notify_state_missing)||(content_state == svn_wc_notify_state_obstructed)||(content_state == svn_wc_notify_state_conflicted))
459 {
460 data->sActionColumnText.LoadString(IDS_SVNACTION_SKIPMISSING);
461
462 // The color settings dialog describes the red color with
463 // "possible or real conflict / obstructed" which also applies to
464 // skipped targets during a merge. So we just use the same color.
465 data->color = m_Colors.GetColor(CColors::Conflict);
466 }
467 else
468 data->sActionColumnText.LoadString(IDS_SVNACTION_SKIP);
469 break;
470 case svn_wc_notify_locked:
471 if ((lock)&&(lock->owner))
472 data->sActionColumnText.Format(IDS_SVNACTION_LOCKEDBY, (LPCTSTR)CUnicodeUtils::GetUnicode(lock->owner));
473 break;
474 case svn_wc_notify_unlocked:
475 data->sActionColumnText.LoadString(IDS_SVNACTION_UNLOCKED);
476 break;
477 case svn_wc_notify_failed_lock:
478 data->sActionColumnText.LoadString(IDS_SVNACTION_FAILEDLOCK);
479 m_arData.push_back(data);
480 AddItemToList();
481 ReportError(SVN::GetErrorString(err));
482 bDoAddData = false;
483 if (err->apr_err == SVN_ERR_FS_OUT_OF_DATE)
484 m_bLockWarning = true;
485 if (err->apr_err == SVN_ERR_FS_PATH_ALREADY_LOCKED)
486 m_bLockExists = true;
487 break;
488 case svn_wc_notify_failed_unlock:
489 data->sActionColumnText.LoadString(IDS_SVNACTION_FAILEDUNLOCK);
490 m_arData.push_back(data);
491 AddItemToList();
492 ReportError(SVN::GetErrorString(err));
493 bDoAddData = false;
494 if (err->apr_err == SVN_ERR_FS_OUT_OF_DATE)
495 m_bLockWarning = true;
496 break;
497 case svn_wc_notify_changelist_set:
498 data->sActionColumnText.Format(IDS_SVNACTION_CHANGELISTSET, (LPCTSTR)data->changelistname);
499 break;
500 case svn_wc_notify_changelist_clear:
501 data->sActionColumnText.LoadString(IDS_SVNACTION_CHANGELISTCLEAR);
502 break;
503 case svn_wc_notify_changelist_moved:
504 data->sActionColumnText.Format(IDS_SVNACTION_CHANGELISTMOVED, (LPCTSTR)data->changelistname);
505 break;
506 case svn_wc_notify_foreign_merge_begin:
507 case svn_wc_notify_merge_begin:
508 if (range == NULL)
509 data->sActionColumnText.LoadString(IDS_SVNACTION_MERGEBEGINNONE);
510 else if ((data->merge_range.start == data->merge_range.end) || (data->merge_range.start == data->merge_range.end - 1))
511 data->sActionColumnText.Format(IDS_SVNACTION_MERGEBEGINSINGLE, data->merge_range.end);
512 else if (data->merge_range.start - 1 == data->merge_range.end)
513 data->sActionColumnText.Format(IDS_SVNACTION_MERGEBEGINSINGLEREVERSE, data->merge_range.start);
514 else if (data->merge_range.start < data->merge_range.end)
515 data->sActionColumnText.Format(IDS_SVNACTION_MERGEBEGINMULTIPLE, data->merge_range.start + 1, data->merge_range.end);
516 else
517 data->sActionColumnText.Format(IDS_SVNACTION_MERGEBEGINMULTIPLEREVERSE, data->merge_range.start, data->merge_range.end + 1);
518 data->bAuxItem = true;
519 break;
520 #endif
521 default:
522 break;
523 } // switch (data->action)
524
525 if (bNoNotify)
526 delete data;
527 else
528 {
529 if (bDoAddData)
530 {
531 m_arData.push_back(data);
532 AddItemToList();
533 if ((!data->bAuxItem) && (m_itemCount > 0))
534 {
535 m_itemCount--;
536
537 CProgressCtrl * progControl = (CProgressCtrl *)GetDlgItem(IDC_PROGRESSBAR);
538 progControl->ShowWindow(SW_SHOW);
539 progControl->SetPos(m_itemCountTotal - m_itemCount);
540 progControl->SetRange32(0, m_itemCountTotal);
541 if (m_pTaskbarList)
542 {
543 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
544 m_pTaskbarList->SetProgressValue(m_hWnd, m_itemCountTotal-m_itemCount, m_itemCountTotal);
545 }
546 }
547 }
548 //if ((action == svn_wc_notify_commit_postfix_txdelta)&&(bSecondResized == FALSE))
549 //{
550 // ResizeColumns();
551 // bSecondResized = TRUE;
552 //}
553 }
554
555 return TRUE;
556 }
557
558
559 CString CGitProgressDlg::BuildInfoString()
560 {
561 CString infotext;
562 if(this->m_Command == GitProgress_Resolve)
563 infotext = _T("You need commit your change after resolve conflict");
564 #if 0
565
566 CString temp;
567 int added = 0;
568 int copied = 0;
569 int deleted = 0;
570 int restored = 0;
571 int reverted = 0;
572 int resolved = 0;
573 int conflicted = 0;
574 int updated = 0;
575 int merged = 0;
576 int modified = 0;
577 int skipped = 0;
578 int replaced = 0;
579
580 for (size_t i=0; i<m_arData.size(); ++i)
581 {
582 const NotificationData * dat = m_arData[i];
583 switch (dat->action)
584 {
585 case svn_wc_notify_add:
586 case svn_wc_notify_update_add:
587 case svn_wc_notify_commit_added:
588 if (dat->bConflictedActionItem)
589 conflicted++;
590 else
591 added++;
592 break;
593 case svn_wc_notify_copy:
594 copied++;
595 break;
596 case svn_wc_notify_delete:
597 case svn_wc_notify_update_delete:
598 case svn_wc_notify_commit_deleted:
599 deleted++;
600 break;
601 case svn_wc_notify_restore:
602 restored++;
603 break;
604 case svn_wc_notify_revert:
605 reverted++;
606 break;
607 case svn_wc_notify_resolved:
608 resolved++;
609 break;
610 case svn_wc_notify_update_update:
611 if (dat->bConflictedActionItem)
612 conflicted++;
613 else if ((dat->content_state == svn_wc_notify_state_merged) || (dat->prop_state == svn_wc_notify_state_merged))
614 merged++;
615 else
616 updated++;
617 break;
618 case svn_wc_notify_commit_modified:
619 modified++;
620 break;
621 case svn_wc_notify_skip:
622 skipped++;
623 break;
624 case svn_wc_notify_commit_replaced:
625 replaced++;
626 break;
627 }
628 }
629 if (conflicted)
630 {
631 temp.LoadString(IDS_SVNACTION_CONFLICTED);
632 infotext += temp;
633 temp.Format(_T(":%d "), conflicted);
634 infotext += temp;
635 }
636 if (skipped)
637 {
638 temp.LoadString(IDS_SVNACTION_SKIP);
639 infotext += temp;
640 infotext.AppendFormat(_T(":%d "), skipped);
641 }
642 if (merged)
643 {
644 temp.LoadString(IDS_SVNACTION_MERGED);
645 infotext += temp;
646 infotext.AppendFormat(_T(":%d "), merged);
647 }
648 if (added)
649 {
650 temp.LoadString(IDS_SVNACTION_ADD);
651 infotext += temp;
652 infotext.AppendFormat(_T(":%d "), added);
653 }
654 if (deleted)
655 {
656 temp.LoadString(IDS_SVNACTION_DELETE);
657 infotext += temp;
658 infotext.AppendFormat(_T(":%d "), deleted);
659 }
660 if (modified)
661 {
662 temp.LoadString(IDS_SVNACTION_MODIFIED);
663 infotext += temp;
664 infotext.AppendFormat(_T(":%d "), modified);
665 }
666 if (copied)
667 {
668 temp.LoadString(IDS_SVNACTION_COPY);
669 infotext += temp;
670 infotext.AppendFormat(_T(":%d "), copied);
671 }
672 if (replaced)
673 {
674 temp.LoadString(IDS_SVNACTION_REPLACED);
675 infotext += temp;
676 infotext.AppendFormat(_T(":%d "), replaced);
677 }
678 if (updated)
679 {
680 temp.LoadString(IDS_SVNACTION_UPDATE);
681 infotext += temp;
682 infotext.AppendFormat(_T(":%d "), updated);
683 }
684 if (restored)
685 {
686 temp.LoadString(IDS_SVNACTION_RESTORE);
687 infotext += temp;
688 infotext.AppendFormat(_T(":%d "), restored);
689 }
690 if (reverted)
691 {
692 temp.LoadString(IDS_SVNACTION_REVERT);
693 infotext += temp;
694 infotext.AppendFormat(_T(":%d "), reverted);
695 }
696 if (resolved)
697 {
698 temp.LoadString(IDS_SVNACTION_RESOLVE);
699 infotext += temp;
700 infotext.AppendFormat(_T(":%d "), resolved);
701 }
702 #endif
703 return infotext;
704 }
705
706 void CGitProgressDlg::SetSelectedList(const CTGitPathList& selPaths)
707 {
708 m_selectedPaths = selPaths;
709 }
710
711 void CGitProgressDlg::ResizeColumns()
712 {
713 m_ProgList.SetRedraw(FALSE);
714
715 TCHAR textbuf[MAX_PATH];
716
717 int maxcol = ((CHeaderCtrl*)(m_ProgList.GetDlgItem(0)))->GetItemCount()-1;
718 for (int col = 0; col <= maxcol; col++)
719 {
720 // find the longest width of all items
721 int count = m_ProgList.GetItemCount();
722 HDITEM hdi = {0};
723 hdi.mask = HDI_TEXT;
724 hdi.pszText = textbuf;
725 hdi.cchTextMax = sizeof(textbuf);
726 ((CHeaderCtrl*)(m_ProgList.GetDlgItem(0)))->GetItem(col, &hdi);
727 int cx = m_ProgList.GetStringWidth(hdi.pszText)+20; // 20 pixels for col separator and margin
728
729 for (int index = 0; index<count; ++index)
730 {
731 // get the width of the string and add 12 pixels for the column separator and margins
732 int linewidth = cx;
733 switch (col)
734 {
735 case 0:
736 linewidth = m_ProgList.GetStringWidth(m_arData[index]->sActionColumnText) + 12;
737 break;
738 case 1:
739 linewidth = m_ProgList.GetStringWidth(m_arData[index]->sPathColumnText) + 12;
740 break;
741 }
742 if (cx < linewidth)
743 cx = linewidth;
744 }
745 m_ProgList.SetColumnWidth(col, cx);
746 }
747
748 m_ProgList.SetRedraw(TRUE);
749 }
750
751 BOOL CGitProgressDlg::OnInitDialog()
752 {
753 __super::OnInitDialog();
754
755 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
756 // do this, Explorer would be unable to send that message to our window if we
757 // were running elevated. It's OK to make the call all the time, since if we're
758 // not elevated, this is a no-op.
759 CHANGEFILTERSTRUCT cfs = { sizeof(CHANGEFILTERSTRUCT) };
760 typedef BOOL STDAPICALLTYPE ChangeWindowMessageFilterExDFN(HWND hWnd, UINT message, DWORD action, PCHANGEFILTERSTRUCT pChangeFilterStruct);
761 CAutoLibrary hUser = ::LoadLibrary(_T("user32.dll"));
762 if (hUser)
763 {
764 ChangeWindowMessageFilterExDFN *pfnChangeWindowMessageFilterEx = (ChangeWindowMessageFilterExDFN*)GetProcAddress(hUser, "ChangeWindowMessageFilterEx");
765 if (pfnChangeWindowMessageFilterEx)
766 {
767 pfnChangeWindowMessageFilterEx(m_hWnd, WM_TASKBARBTNCREATED, MSGFLT_ALLOW, &cfs);
768 }
769 }
770 m_pTaskbarList.Release();
771 m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList);
772
773 m_ProgList.SetExtendedStyle (LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER);
774
775 m_ProgList.DeleteAllItems();
776 int c = ((CHeaderCtrl*)(m_ProgList.GetDlgItem(0)))->GetItemCount()-1;
777 while (c>=0)
778 m_ProgList.DeleteColumn(c--);
779 CString temp;
780 temp.LoadString(IDS_PROGRS_ACTION);
781 m_ProgList.InsertColumn(0, temp);
782 temp.LoadString(IDS_PROGRS_PATH);
783 m_ProgList.InsertColumn(1, temp);
784
785 m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
786 if (m_pThread==NULL)
787 {
788 ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
789 }
790 else
791 {
792 m_pThread->m_bAutoDelete = FALSE;
793 m_pThread->ResumeThread();
794 }
795
796 UpdateData(FALSE);
797
798 // Call this early so that the column headings aren't hidden before any
799 // text gets added.
800 ResizeColumns();
801
802 SetTimer(VISIBLETIMER, 300, NULL);
803
804 AddAnchor(IDC_SVNPROGRESS, TOP_LEFT, BOTTOM_RIGHT);
805 AddAnchor(IDC_PROGRESSLABEL, BOTTOM_LEFT, BOTTOM_CENTER);
806 AddAnchor(IDC_PROGRESSBAR, BOTTOM_CENTER, BOTTOM_RIGHT);
807 AddAnchor(IDC_INFOTEXT, BOTTOM_LEFT, BOTTOM_RIGHT);
808 AddAnchor(IDC_NONINTERACTIVE, BOTTOM_LEFT, BOTTOM_RIGHT);
809 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
810 AddAnchor(IDOK, BOTTOM_RIGHT);
811 AddAnchor(IDC_LOGBUTTON, BOTTOM_RIGHT);
812 //SetPromptParentWindow(this->m_hWnd);
813 if (hWndExplorer)
814 CenterWindow(CWnd::FromHandle(hWndExplorer));
815 EnableSaveRestore(_T("GITProgressDlg"));
816 return TRUE;
817 }
818
819 bool CGitProgressDlg::SetBackgroundImage(UINT nID)
820 {
821 return CAppUtils::SetListCtrlBackgroundImage(m_ProgList.GetSafeHwnd(), nID);
822 }
823
824 void CGitProgressDlg::ReportGitError()
825 {
826 ReportError(CString(giterr_last()->message));
827 }
828
829 void CGitProgressDlg::ReportError(const CString& sError)
830 {
831 CSoundUtils::PlayTGitError();
832 ReportString(sError, CString(MAKEINTRESOURCE(IDS_ERR_ERROR)), m_Colors.GetColor(CColors::Conflict));
833 m_bErrorsOccurred = true;
834 }
835
836 void CGitProgressDlg::ReportWarning(const CString& sWarning)
837 {
838 CSoundUtils::PlayTGitWarning();
839 ReportString(sWarning, CString(MAKEINTRESOURCE(IDS_WARN_WARNING)), m_Colors.GetColor(CColors::Conflict));
840 }
841
842 void CGitProgressDlg::ReportNotification(const CString& sNotification)
843 {
844 CSoundUtils::PlayTGitNotification();
845 ReportString(sNotification, CString(MAKEINTRESOURCE(IDS_WARN_NOTE)));
846 }
847
848 void CGitProgressDlg::ReportCmd(const CString& sCmd)
849 {
850 ReportString(sCmd, CString(MAKEINTRESOURCE(IDS_PROGRS_CMDINFO)), m_Colors.GetColor(CColors::Cmd));
851 }
852
853 void CGitProgressDlg::ReportString(CString sMessage, const CString& sMsgKind, COLORREF color)
854 {
855 // instead of showing a dialog box with the error message or notification,
856 // just insert the error text into the list control.
857 // that way the user isn't 'interrupted' by a dialog box popping up!
858
859 // the message may be split up into different lines
860 // so add a new entry for each line of the message
861 while (!sMessage.IsEmpty())
862 {
863 NotificationData * data = new NotificationData();
864 data->bAuxItem = true;
865 data->sActionColumnText = sMsgKind;
866 if (sMessage.Find('\n')>=0)
867 data->sPathColumnText = sMessage.Left(sMessage.Find('\n'));
868 else
869 data->sPathColumnText = sMessage;
870 data->sPathColumnText.Trim(_T("\n\r"));
871 data->color = color;
872 if (sMessage.Find('\n')>=0)
873 {
874 sMessage = sMessage.Mid(sMessage.Find('\n'));
875 sMessage.Trim(_T("\n\r"));
876 }
877 else
878 sMessage.Empty();
879 m_arData.push_back(data);
880 AddItemToList();
881 }
882 }
883
884 UINT CGitProgressDlg::ProgressThreadEntry(LPVOID pVoid)
885 {
886 return ((CGitProgressDlg*)pVoid)->ProgressThread();
887 }
888
889 UINT CGitProgressDlg::ProgressThread()
890 {
891 // The SetParams function should have loaded something for us
892
893 CString temp;
894 CString sWindowTitle;
895 bool localoperation = false;
896 bool bSuccess = false;
897 m_AlwaysConflicted = false;
898
899 DialogEnableWindow(IDOK, FALSE);
900 DialogEnableWindow(IDCANCEL, TRUE);
901 // SetAndClearProgressInfo(m_hWnd);
902 m_itemCount = m_itemCountTotal;
903
904 InterlockedExchange(&m_bThreadRunning, TRUE);
905 iFirstResized = 0;
906 bSecondResized = FALSE;
907 m_bFinishedItemAdded = false;
908 CTime startTime = CTime::GetCurrentTime();
909
910 if (m_pTaskbarList)
911 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_INDETERMINATE);
912
913 switch (m_Command)
914 {
915 case GitProgress_Add:
916 bSuccess = CmdAdd(sWindowTitle, localoperation);
917 break;
918 case GitProgress_Copy:
919 bSuccess = CmdCopy(sWindowTitle, localoperation);
920 break;
921 case GitProgress_Export:
922 bSuccess = CmdExport(sWindowTitle, localoperation);
923 break;
924 case GitProgress_Rename:
925 bSuccess = CmdRename(sWindowTitle, localoperation);
926 break;
927 case GitProgress_Resolve:
928 bSuccess = CmdResolve(sWindowTitle, localoperation);
929 break;
930 case GitProgress_Revert:
931 bSuccess = CmdRevert(sWindowTitle, localoperation);
932 break;
933 case GitProgress_Switch:
934 bSuccess = CmdSwitch(sWindowTitle, localoperation);
935 break;
936 case GitProgress_SendMail:
937 bSuccess = CmdSendMail(sWindowTitle, localoperation);
938 break;
939 }
940 if (!bSuccess)
941 temp.LoadString(IDS_PROGRS_TITLEFAILED);
942 else
943 temp.LoadString(IDS_PROGRS_TITLEFIN);
944 sWindowTitle = sWindowTitle + _T(" ") + temp;
945 SetWindowText(sWindowTitle);
946
947 KillTimer(TRANSFERTIMER);
948 KillTimer(VISIBLETIMER);
949
950 if (m_pTaskbarList)
951 {
952 if (DidErrorsOccur())
953 {
954 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_ERROR);
955 m_pTaskbarList->SetProgressValue(m_hWnd, 100, 100);
956 }
957 else
958 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NOPROGRESS);
959 }
960
961 DialogEnableWindow(IDCANCEL, FALSE);
962 DialogEnableWindow(IDOK, TRUE);
963
964 CString info = BuildInfoString();
965 if (!bSuccess)
966 info.LoadString(IDS_PROGRS_INFOFAILED);
967 SetDlgItemText(IDC_INFOTEXT, info);
968 ResizeColumns();
969 CWnd * pWndOk = GetDlgItem(IDOK);
970 if (pWndOk && ::IsWindow(pWndOk->GetSafeHwnd()))
971 {
972 SendMessage(DM_SETDEFID, IDOK);
973 GetDlgItem(IDOK)->SetFocus();
974 }
975
976 CString sFinalInfo;
977 if (!m_sTotalBytesTransferred.IsEmpty())
978 {
979 CTimeSpan time = CTime::GetCurrentTime() - startTime;
980 temp.Format(IDS_PROGRS_TIME, (LONG)time.GetTotalMinutes(), (LONG)time.GetSeconds());
981 sFinalInfo.Format(IDS_PROGRS_FINALINFO, m_sTotalBytesTransferred, (LPCTSTR)temp);
982 SetDlgItemText(IDC_PROGRESSLABEL, sFinalInfo);
983 }
984 else
985 GetDlgItem(IDC_PROGRESSLABEL)->ShowWindow(SW_HIDE);
986
987 GetDlgItem(IDC_PROGRESSBAR)->ShowWindow(SW_HIDE);
988
989 if (!m_bFinishedItemAdded)
990 {
991 // there's no "finished: xxx" line at the end. We add one here to make
992 // sure the user sees that the command is actually finished.
993 NotificationData * data = new NotificationData();
994 data->bAuxItem = true;
995 data->sActionColumnText.LoadString(IDS_PROGRS_FINISHED);
996 m_arData.push_back(data);
997 AddItemToList();
998 }
999
1000 int count = m_ProgList.GetItemCount();
1001 if ((count > 0)&&(m_bLastVisible))
1002 m_ProgList.EnsureVisible(count-1, FALSE);
1003
1004 CLogFile logfile;
1005 if (logfile.Open())
1006 {
1007 logfile.AddTimeLine();
1008 for (size_t i=0; i<m_arData.size(); i++)
1009 {
1010 NotificationData * data = m_arData[i];
1011 temp.Format(_T("%-20s : %s"), (LPCTSTR)data->sActionColumnText, (LPCTSTR)data->sPathColumnText);
1012 logfile.AddLine(temp);
1013 }
1014 if (!sFinalInfo.IsEmpty())
1015 logfile.AddLine(sFinalInfo);
1016 logfile.Close();
1017 }
1018
1019 m_bCancelled = TRUE;
1020 InterlockedExchange(&m_bThreadRunning, FALSE);
1021 RefreshCursor();
1022
1023 #if 0
1024 DWORD dwAutoClose = CRegStdDWORD(_T("Software\\TortoiseGit\\AutoClose"), CLOSE_MANUAL);
1025 if (m_options & ProgOptDryRun)
1026 dwAutoClose = 0; // dry run means progress dialog doesn't auto close at all
1027 if (!m_bLastVisible)
1028 dwAutoClose = 0;
1029 if (m_dwCloseOnEnd != (DWORD)-1)
1030 dwAutoClose = m_dwCloseOnEnd; // command line value has priority over setting value
1031 if ((dwAutoClose == CLOSE_NOERRORS)&&(!m_bErrorsOccurred))
1032 PostMessage(WM_COMMAND, 1, (LPARAM)GetDlgItem(IDOK)->m_hWnd);
1033 if ((dwAutoClose == CLOSE_NOCONFLICTS)&&(!m_bErrorsOccurred)&&(m_nConflicts==0))
1034 PostMessage(WM_COMMAND, 1, (LPARAM)GetDlgItem(IDOK)->m_hWnd);
1035 if ((dwAutoClose == CLOSE_NOMERGES)&&(!m_bErrorsOccurred)&&(m_nConflicts==0)&&(!m_bMergesAddsDeletesOccurred))
1036 PostMessage(WM_COMMAND, 1, (LPARAM)GetDlgItem(IDOK)->m_hWnd);
1037 if ((dwAutoClose == CLOSE_LOCAL)&&(!m_bErrorsOccurred)&&(m_nConflicts==0)&&(localoperation))
1038 PostMessage(WM_COMMAND, 1, (LPARAM)GetDlgItem(IDOK)->m_hWnd);
1039 #endif
1040
1041 //Don't do anything here which might cause messages to be sent to the window
1042 //The window thread is probably now blocked in OnOK if we've done an auto close
1043 return 0;
1044 }
1045
1046 void CGitProgressDlg::OnBnClickedLogbutton()
1047 {
1048 switch(this->m_Command)
1049 {
1050 case GitProgress_Add:
1051 case GitProgress_Resolve:
1052 {
1053 CString cmd = _T(" /command:commit");
1054 cmd += _T(" /path:\"")+g_Git.m_CurrentDir+_T("\"");
1055
1056 CAppUtils::RunTortoiseGitProc(cmd);
1057 this->EndDialog(IDOK);
1058 break;
1059 }
1060 }
1061 #if 0
1062 if (m_targetPathList.GetCount() != 1)
1063 return;
1064 StringRevMap::iterator it = m_UpdateStartRevMap.begin();
1065 svn_revnum_t rev = -1;
1066 if (it != m_UpdateStartRevMap.end())
1067 {
1068 rev = it->second;
1069 }
1070 CLogDlg dlg;
1071 dlg.SetParams(m_targetPathList[0], m_RevisionEnd, m_RevisionEnd, rev, 0, TRUE);
1072 dlg.DoModal();
1073 #endif
1074 }
1075
1076
1077 void CGitProgressDlg::OnClose()
1078 {
1079 if (m_bCancelled)
1080 {
1081 TerminateThread(m_pThread->m_hThread, (DWORD)-1);
1082 InterlockedExchange(&m_bThreadRunning, FALSE);
1083 }
1084 else
1085 {
1086 m_bCancelled = TRUE;
1087 return;
1088 }
1089 DialogEnableWindow(IDCANCEL, TRUE);
1090 __super::OnClose();
1091 }
1092
1093 void CGitProgressDlg::OnOK()
1094 {
1095 if ((m_bCancelled)&&(!m_bThreadRunning))
1096 {
1097 // I have made this wait a sensible amount of time (10 seconds) for the thread to finish
1098 // You must be careful in the thread that after posting the WM_COMMAND/IDOK message, you
1099 // don't do any more operations on the window which might require message passing
1100 // If you try to send windows messages once we're waiting here, then the thread can't finished
1101 // because the Window's message loop is blocked at this wait
1102 WaitForSingleObject(m_pThread->m_hThread, 10000);
1103 __super::OnOK();
1104 }
1105 m_bCancelled = TRUE;
1106 }
1107
1108 void CGitProgressDlg::OnCancel()
1109 {
1110 if ((m_bCancelled)&&(!m_bThreadRunning))
1111 __super::OnCancel();
1112 m_bCancelled = TRUE;
1113 }
1114
1115 void CGitProgressDlg::OnLvnGetdispinfoSvnprogress(NMHDR *pNMHDR, LRESULT *pResult)
1116 {
1117 NMLVDISPINFO *pDispInfo = reinterpret_cast<NMLVDISPINFO*>(pNMHDR);
1118
1119 if (pDispInfo)
1120 {
1121 if (pDispInfo->item.mask & LVIF_TEXT)
1122 {
1123 if (pDispInfo->item.iItem < (int)m_arData.size())
1124 {
1125 const NotificationData * data = m_arData[pDispInfo->item.iItem];
1126 switch (pDispInfo->item.iSubItem)
1127 {
1128 case 0:
1129 lstrcpyn(m_columnbuf, data->sActionColumnText, MAX_PATH);
1130 break;
1131 case 1:
1132 lstrcpyn(m_columnbuf, data->sPathColumnText, pDispInfo->item.cchTextMax);
1133 if (!data->bAuxItem)
1134 {
1135 int cWidth = m_ProgList.GetColumnWidth(1);
1136 cWidth = max(12, cWidth-12);
1137 CDC * pDC = m_ProgList.GetDC();
1138 if (pDC != NULL)
1139 {
1140 CFont * pFont = pDC->SelectObject(m_ProgList.GetFont());
1141 PathCompactPath(pDC->GetSafeHdc(), m_columnbuf, cWidth);
1142 pDC->SelectObject(pFont);
1143 ReleaseDC(pDC);
1144 }
1145 }
1146 break;
1147 default:
1148 m_columnbuf[0] = 0;
1149 }
1150 pDispInfo->item.pszText = m_columnbuf;
1151 }
1152 }
1153 }
1154 *pResult = 0;
1155 }
1156
1157 void CGitProgressDlg::OnNMCustomdrawSvnprogress(NMHDR *pNMHDR, LRESULT *pResult)
1158 {
1159 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
1160
1161 // Take the default processing unless we set this to something else below.
1162 *pResult = CDRF_DODEFAULT;
1163
1164 // First thing - check the draw stage. If it's the control's prepaint
1165 // stage, then tell Windows we want messages for every item.
1166
1167 if ( CDDS_PREPAINT == pLVCD->nmcd.dwDrawStage )
1168 {
1169 *pResult = CDRF_NOTIFYITEMDRAW;
1170 }
1171 else if ( CDDS_ITEMPREPAINT == pLVCD->nmcd.dwDrawStage )
1172 {
1173 // This is the prepaint stage for an item. Here's where we set the
1174 // item's text color. Our return value will tell Windows to draw the
1175 // item itself, but it will use the new color we set here.
1176
1177 // Tell Windows to paint the control itself.
1178 *pResult = CDRF_DODEFAULT;
1179
1180 ASSERT(pLVCD->nmcd.dwItemSpec < m_arData.size());
1181 if(pLVCD->nmcd.dwItemSpec >= m_arData.size())
1182 {
1183 return;
1184 }
1185 const NotificationData * data = m_arData[pLVCD->nmcd.dwItemSpec];
1186 ASSERT(data != NULL);
1187 if (data == NULL)
1188 return;
1189
1190 // Store the color back in the NMLVCUSTOMDRAW struct.
1191 pLVCD->clrText = data->color;
1192 }
1193 }
1194
1195 void CGitProgressDlg::OnNMDblclkSvnprogress(NMHDR * /*pNMHDR*/, LRESULT * /*pResult*/)
1196 {
1197 #if 0
1198 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1199 *pResult = 0;
1200 if (pNMLV->iItem < 0)
1201 return;
1202 if (m_options & ProgOptDryRun)
1203 return; //don't do anything in a dry-run.
1204
1205 const NotificationData * data = m_arData[pNMLV->iItem];
1206 if (data == NULL)
1207 return;
1208
1209 if (data->bConflictedActionItem)
1210 {
1211 // We've double-clicked on a conflicted item - do a three-way merge on it
1212 SVNDiff::StartConflictEditor(data->path);
1213 }
1214 else if ((data->action == svn_wc_notify_update_update) && ((data->content_state == svn_wc_notify_state_merged)||(GitProgress_Merge == m_Command)) || (data->action == svn_wc_notify_resolved))
1215 {
1216 // This is a modified file which has been merged on update. Diff it against base
1217 CTGitPath temporaryFile;
1218 SVNDiff diff(this, this->m_hWnd, true);
1219 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
1220 svn_revnum_t baseRev = 0;
1221 diff.DiffFileAgainstBase(data->path, baseRev);
1222 }
1223 else if ((!data->bAuxItem)&&(data->path.Exists())&&(!data->path.IsDirectory()))
1224 {
1225 bool bOpenWith = false;
1226 int ret = (int)ShellExecute(m_hWnd, NULL, data->path.GetWinPath(), NULL, NULL, SW_SHOWNORMAL);
1227 if (ret <= HINSTANCE_ERROR)
1228 bOpenWith = true;
1229 if (bOpenWith)
1230 {
1231 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
1232 cmd += data->path.GetWinPathString() + _T(" ");
1233 CAppUtils::LaunchApplication(cmd, NULL, false);
1234 }
1235 }
1236 #endif
1237 }
1238
1239 void CGitProgressDlg::OnHdnItemclickSvnprogress(NMHDR *pNMHDR, LRESULT *pResult)
1240 {
1241 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
1242 if (m_bThreadRunning)
1243 return;
1244 if (m_nSortedColumn == phdr->iItem)
1245 m_bAscending = !m_bAscending;
1246 else
1247 m_bAscending = TRUE;
1248 m_nSortedColumn = phdr->iItem;
1249 Sort();
1250
1251 CString temp;
1252 m_ProgList.SetRedraw(FALSE);
1253 m_ProgList.DeleteAllItems();
1254 m_ProgList.SetItemCountEx (static_cast<int>(m_arData.size()));
1255
1256 m_ProgList.SetRedraw(TRUE);
1257
1258 *pResult = 0;
1259 }
1260
1261 bool CGitProgressDlg::NotificationDataIsAux(const NotificationData* pData)
1262 {
1263 return pData->bAuxItem;
1264 }
1265
1266 LRESULT CGitProgressDlg::OnGitProgress(WPARAM /*wParam*/, LPARAM /*lParam*/)
1267 {
1268 #if 0
1269 SVNProgress * pProgressData = (SVNProgress *)lParam;
1270 CProgressCtrl * progControl = (CProgressCtrl *)GetDlgItem(IDC_PROGRESSBAR);
1271 if ((pProgressData->total > 1000)&&(!progControl->IsWindowVisible()))
1272 {
1273 progControl->ShowWindow(SW_SHOW);
1274 if (m_pTaskbarList)
1275 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
1276 }
1277 if (((pProgressData->total < 0)&&(pProgressData->progress > 1000)&&(progControl->IsWindowVisible()))&&(m_itemCountTotal<0))
1278 {
1279 progControl->ShowWindow(SW_HIDE);
1280 if (m_pTaskbarList)
1281 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_INDETERMINATE);
1282 }
1283 if (!GetDlgItem(IDC_PROGRESSLABEL)->IsWindowVisible())
1284 GetDlgItem(IDC_PROGRESSLABEL)->ShowWindow(SW_SHOW);
1285 SetTimer(TRANSFERTIMER, 2000, NULL);
1286 if ((pProgressData->total > 0)&&(pProgressData->progress > 1000))
1287 {
1288 progControl->SetPos((int)pProgressData->progress);
1289 progControl->SetRange32(0, (int)pProgressData->total);
1290 if (m_pTaskbarList)
1291 {
1292 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
1293 m_pTaskbarList->SetProgressValue(m_hWnd, pProgressData->progress, pProgressData->total);
1294 }
1295 }
1296 CString progText;
1297 if (pProgressData->overall_total < 1024)
1298 m_sTotalBytesTransferred.Format(IDS_SVN_PROGRESS_TOTALBYTESTRANSFERRED, pProgressData->overall_total);
1299 else if (pProgressData->overall_total < 1200000)
1300 m_sTotalBytesTransferred.Format(IDS_SVN_PROGRESS_TOTALTRANSFERRED, pProgressData->overall_total / 1024);
1301 else
1302 m_sTotalBytesTransferred.Format(IDS_SVN_PROGRESS_TOTALMBTRANSFERRED, (double)((double)pProgressData->overall_total / 1024000.0));
1303 progText.Format(IDS_SVN_PROGRESS_TOTALANDSPEED, (LPCTSTR)m_sTotalBytesTransferred, (LPCTSTR)pProgressData->SpeedString);
1304 SetDlgItemText(IDC_PROGRESSLABEL, progText);
1305 #endif
1306 return 0;
1307 }
1308
1309 void CGitProgressDlg::OnTimer(UINT_PTR nIDEvent)
1310 {
1311 if (nIDEvent == TRANSFERTIMER)
1312 {
1313 CString progText;
1314 CString progSpeed;
1315 progSpeed.Format(IDS_SVN_PROGRESS_BYTES_SEC, 0);
1316 progText.Format(IDS_SVN_PROGRESS_TOTALANDSPEED, (LPCTSTR)m_sTotalBytesTransferred, (LPCTSTR)progSpeed);
1317 SetDlgItemText(IDC_PROGRESSLABEL, progText);
1318 KillTimer(TRANSFERTIMER);
1319 }
1320 if (nIDEvent == VISIBLETIMER)
1321 {
1322 if (nEnsureVisibleCount)
1323 m_ProgList.EnsureVisible(m_ProgList.GetItemCount()-1, false);
1324 nEnsureVisibleCount = 0;
1325 }
1326 }
1327
1328 void CGitProgressDlg::Sort()
1329 {
1330 if(m_arData.size() < 2)
1331 {
1332 return;
1333 }
1334
1335 // We need to sort the blocks which lie between the auxiliary entries
1336 // This is so that any aux data stays where it was
1337 NotificationDataVect::iterator actionBlockBegin;
1338 NotificationDataVect::iterator actionBlockEnd = m_arData.begin(); // We start searching from here
1339
1340 for(;;)
1341 {
1342 // Search to the start of the non-aux entry in the next block
1343 actionBlockBegin = std::find_if(actionBlockEnd, m_arData.end(), std::not1(std::ptr_fun(&CGitProgressDlg::NotificationDataIsAux)));
1344 if(actionBlockBegin == m_arData.end())
1345 {
1346 // There are no more actions
1347 break;
1348 }
1349 // Now search to find the end of the block
1350 actionBlockEnd = std::find_if(actionBlockBegin+1, m_arData.end(), std::ptr_fun(&CGitProgressDlg::NotificationDataIsAux));
1351 // Now sort the block
1352 std::sort(actionBlockBegin, actionBlockEnd, &CGitProgressDlg::SortCompare);
1353 }
1354 }
1355
1356 bool CGitProgressDlg::SortCompare(const NotificationData * pData1, const NotificationData * pData2)
1357 {
1358 int result = 0;
1359 switch (m_nSortedColumn)
1360 {
1361 case 0: //action column
1362 result = pData1->sActionColumnText.Compare(pData2->sActionColumnText);
1363 break;
1364 case 1: //path column
1365 // Compare happens after switch()
1366 break;
1367 default:
1368 break;
1369 }
1370
1371 // Sort by path if everything else is equal
1372 if (result == 0)
1373 {
1374 result = CTGitPath::Compare(pData1->path, pData2->path);
1375 }
1376
1377 if (!m_bAscending)
1378 result = -result;
1379 return result < 0;
1380 }
1381
1382 BOOL CGitProgressDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
1383 {
1384 if (!GetDlgItem(IDOK)->IsWindowEnabled())
1385 {
1386 // only show the wait cursor over the list control
1387 if ((pWnd)&&(pWnd == GetDlgItem(IDC_SVNPROGRESS)))
1388 {
1389 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
1390 SetCursor(hCur);
1391 return TRUE;
1392 }
1393 }
1394 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
1395 SetCursor(hCur);
1396 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
1397 }
1398
1399 BOOL CGitProgressDlg::PreTranslateMessage(MSG* pMsg)
1400 {
1401 if (pMsg->message == WM_KEYDOWN)
1402 {
1403 if (pMsg->wParam == VK_ESCAPE)
1404 {
1405 // pressing the ESC key should close the dialog. But since we disabled the escape
1406 // key (so the user doesn't get the idea that he could simply undo an e.g. update)
1407 // this won't work.
1408 // So if the user presses the ESC key, change it to VK_RETURN so the dialog gets
1409 // the impression that the OK button was pressed.
1410 if ((!m_bThreadRunning)&&(!GetDlgItem(IDCANCEL)->IsWindowEnabled())
1411 &&(GetDlgItem(IDOK)->IsWindowEnabled())&&(GetDlgItem(IDOK)->IsWindowVisible()))
1412 {
1413 // since we convert ESC to RETURN, make sure the OK button has the focus.
1414 GetDlgItem(IDOK)->SetFocus();
1415 pMsg->wParam = VK_RETURN;
1416 }
1417 }
1418 if (pMsg->wParam == 'A')
1419 {
1420 if (GetKeyState(VK_CONTROL)&0x8000)
1421 {
1422 // Ctrl-A -> select all
1423 m_ProgList.SetSelectionMark(0);
1424 for (int i=0; i<m_ProgList.GetItemCount(); ++i)
1425 {
1426 m_ProgList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
1427 }
1428 }
1429 }
1430 if ((pMsg->wParam == 'C')||(pMsg->wParam == VK_INSERT))
1431 {
1432 int selIndex = m_ProgList.GetSelectionMark();
1433 if (selIndex >= 0)
1434 {
1435 if (GetKeyState(VK_CONTROL)&0x8000)
1436 {
1437 //Ctrl-C -> copy to clipboard
1438 CString sClipdata;
1439 POSITION pos = m_ProgList.GetFirstSelectedItemPosition();
1440 if (pos != NULL)
1441 {
1442 while (pos)
1443 {
1444 int nItem = m_ProgList.GetNextSelectedItem(pos);
1445 CString sAction = m_ProgList.GetItemText(nItem, 0);
1446 CString sPath = m_ProgList.GetItemText(nItem, 1);
1447 CString sMime = m_ProgList.GetItemText(nItem, 2);
1448 CString sLogCopyText;
1449 sLogCopyText.Format(_T("%s: %s %s\r\n"),
1450 (LPCTSTR)sAction, (LPCTSTR)sPath, (LPCTSTR)sMime);
1451 sClipdata += sLogCopyText;
1452 }
1453 CStringUtils::WriteAsciiStringToClipboard(sClipdata);
1454 }
1455 }
1456 }
1457 }
1458 } // if (pMsg->message == WM_KEYDOWN)
1459 return __super::PreTranslateMessage(pMsg);
1460 }
1461
1462 void CGitProgressDlg::OnContextMenu(CWnd* /*pWnd*/, CPoint /*point*/)
1463 {
1464 #if 0
1465 if (m_options & ProgOptDryRun)
1466 return; // don't do anything in a dry-run.
1467
1468 if (pWnd == &m_ProgList)
1469 {
1470 int selIndex = m_ProgList.GetSelectionMark();
1471 if ((point.x == -1) && (point.y == -1))
1472 {
1473 // Menu was invoked from the keyboard rather than by right-clicking
1474 CRect rect;
1475 m_ProgList.GetItemRect(selIndex, &rect, LVIR_LABEL);
1476 m_ProgList.ClientToScreen(&rect);
1477 point = rect.CenterPoint();
1478 }
1479
1480 if ((selIndex >= 0)&&(!m_bThreadRunning))
1481 {
1482 // entry is selected, thread has finished with updating so show the popup menu
1483 CIconMenu popup;
1484 if (popup.CreatePopupMenu())
1485 {
1486 bool bAdded = false;
1487 NotificationData * data = m_arData[selIndex];
1488 if ((data)&&(!data->path.IsDirectory()))
1489 {
1490 if (data->action == svn_wc_notify_update_update || data->action == svn_wc_notify_resolved)
1491 {
1492 if (m_ProgList.GetSelectedCount() == 1)
1493 {
1494 popup.AppendMenuIcon(ID_COMPARE, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
1495 bAdded = true;
1496 }
1497 }
1498 if (data->bConflictedActionItem)
1499 {
1500 if (m_ProgList.GetSelectedCount() == 1)
1501 {
1502 popup.AppendMenuIcon(ID_EDITCONFLICT, IDS_MENUCONFLICT,IDI_CONFLICT);
1503 popup.SetDefaultItem(ID_EDITCONFLICT, FALSE);
1504 popup.AppendMenuIcon(ID_CONFLICTRESOLVE, IDS_SVNPROGRESS_MENUMARKASRESOLVED,IDI_RESOLVE);
1505 }
1506 popup.AppendMenuIcon(ID_CONFLICTUSETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS,IDI_RESOLVE);
1507 popup.AppendMenuIcon(ID_CONFLICTUSEMINE, IDS_SVNPROGRESS_MENUUSEMINE,IDI_RESOLVE);
1508 }
1509 else if ((data->content_state == svn_wc_notify_state_merged)||(GitProgress_Merge == m_Command)||(data->action == svn_wc_notify_resolved))
1510 popup.SetDefaultItem(ID_COMPARE, FALSE);
1511
1512 if (m_ProgList.GetSelectedCount() == 1)
1513 {
1514 if ((data->action == svn_wc_notify_add)||
1515 (data->action == svn_wc_notify_update_add)||
1516 (data->action == svn_wc_notify_commit_added)||
1517 (data->action == svn_wc_notify_commit_modified)||
1518 (data->action == svn_wc_notify_restore)||
1519 (data->action == svn_wc_notify_revert)||
1520 (data->action == svn_wc_notify_resolved)||
1521 (data->action == svn_wc_notify_commit_replaced)||
1522 (data->action == svn_wc_notify_commit_modified)||
1523 (data->action == svn_wc_notify_commit_postfix_txdelta)||
1524 (data->action == svn_wc_notify_update_update))
1525 {
1526 popup.AppendMenuIcon(ID_LOG, IDS_MENULOG,IDI_LOG);
1527 if (data->action == svn_wc_notify_update_update)
1528 popup.AppendMenu(MF_SEPARATOR, NULL);
1529 popup.AppendMenuIcon(ID_OPEN, IDS_LOG_POPUP_OPEN, IDI_OPEN);
1530 popup.AppendMenuIcon(ID_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
1531 bAdded = true;
1532 }
1533 }
1534 } // if ((data)&&(!data->path.IsDirectory()))
1535 if (m_ProgList.GetSelectedCount() == 1)
1536 {
1537 if (data)
1538 {
1539 CString sPath = GetPathFromColumnText(data->sPathColumnText);
1540 if ((!sPath.IsEmpty())&&(!SVN::PathIsURL(CTGitPath(sPath))))
1541 {
1542 CTGitPath path = CTGitPath(sPath);
1543 if (path.GetDirectory().Exists())
1544 {
1545 popup.AppendMenuIcon(ID_EXPLORE, IDS_SVNPROGRESS_MENUOPENPARENT, IDI_EXPLORER);
1546 bAdded = true;
1547 }
1548 }
1549 }
1550 }
1551 if (m_ProgList.GetSelectedCount() > 0)
1552 {
1553 if (bAdded)
1554 popup.AppendMenu(MF_SEPARATOR, NULL);
1555 popup.AppendMenuIcon(ID_COPY, IDS_LOG_POPUP_COPYTOCLIPBOARD,IDI_COPYCLIP);
1556 bAdded = true;
1557 }
1558 if (bAdded)
1559 {
1560 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1561 DialogEnableWindow(IDOK, FALSE);
1562 this->SetPromptApp(&theApp);
1563 theApp.DoWaitCursor(1);
1564 bool bOpenWith = false;
1565 switch (cmd)
1566 {
1567 case ID_COPY:
1568 {
1569 CString sLines;
1570 POSITION pos = m_ProgList.GetFirstSelectedItemPosition();
1571 while (pos)
1572 {
1573 int nItem = m_ProgList.GetNextSelectedItem(pos);
1574 NotificationData * data = m_arData[nItem];
1575 if (data)
1576 {
1577 sLines += data->sPathColumnText;
1578 sLines += _T("\r\n");
1579 }
1580 }
1581 sLines.TrimRight();
1582 if (!sLines.IsEmpty())
1583 {
1584 CStringUtils::WriteAsciiStringToClipboard(sLines, GetSafeHwnd());
1585 }
1586 }
1587 break;
1588 case ID_EXPLORE:
1589 {
1590 CString sPath = GetPathFromColumnText(data->sPathColumnText);
1591
1592 CTGitPath path = CTGitPath(sPath);
1593 ShellExecute(m_hWnd, _T("explore"), path.GetDirectory().GetWinPath(), NULL, path.GetDirectory().GetWinPath(), SW_SHOW);
1594 }
1595 break;
1596 case ID_COMPARE:
1597 {
1598 svn_revnum_t rev = -1;
1599 StringRevMap::iterator it = m_UpdateStartRevMap.end();
1600 if (data->basepath.IsEmpty())
1601 it = m_UpdateStartRevMap.begin();
1602 else
1603 it = m_UpdateStartRevMap.find(data->basepath.GetSVNApiPath(pool));
1604 if (it != m_UpdateStartRevMap.end())
1605 rev = it->second;
1606 // if the file was merged during update, do a three way diff between OLD, MINE, THEIRS
1607 if (data->content_state == svn_wc_notify_state_merged)
1608 {
1609 CTGitPath basefile = CTempFiles::Instance().GetTempFilePath(false, data->path, rev);
1610 CTGitPath newfile = CTempFiles::Instance().GetTempFilePath(false, data->path, SVNRev::REV_HEAD);
1611 SVN svn;
1612 if (!svn.Cat(data->path, SVNRev(SVNRev::REV_WC), rev, basefile))
1613 {
1614 CMessageBox::Show(m_hWnd, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
1615 DialogEnableWindow(IDOK, TRUE);
1616 break;
1617 }
1618 // If necessary, convert the line-endings on the file before diffing
1619 if ((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\ConvertBase"), TRUE))
1620 {
1621 CTGitPath temporaryFile = CTempFiles::Instance().GetTempFilePath(false, data->path, SVNRev::REV_BASE);
1622 if (!svn.Cat(data->path, SVNRev(SVNRev::REV_BASE), SVNRev(SVNRev::REV_BASE), temporaryFile))
1623 {
1624 temporaryFile.Reset();
1625 break;
1626 }
1627 else
1628 {
1629 newfile = temporaryFile;
1630 }
1631 }
1632
1633 SetFileAttributes(newfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
1634 SetFileAttributes(basefile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
1635 CString revname, wcname, basename;
1636 revname.Format(_T("%s Revision %ld"), (LPCTSTR)data->path.GetUIFileOrDirectoryName(), rev);
1637 wcname.Format(IDS_DIFF_WCNAME, (LPCTSTR)data->path.GetUIFileOrDirectoryName());
1638 basename.Format(IDS_DIFF_BASENAME, (LPCTSTR)data->path.GetUIFileOrDirectoryName());
1639 CAppUtils::StartExtMerge(basefile, newfile, data->path, data->path, basename, revname, wcname, CString(), true);
1640 }
1641 else
1642 {
1643 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, data->path, rev);
1644 SVN svn;
1645 if (!svn.Cat(data->path, SVNRev(SVNRev::REV_WC), rev, tempfile))
1646 {
1647 CMessageBox::Show(m_hWnd, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
1648 DialogEnableWindow(IDOK, TRUE);
1649 break;
1650 }
1651 else
1652 {
1653 SetFileAttributes(tempfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
1654 CString revname, wcname;
1655 revname.Format(_T("%s Revision %ld"), (LPCTSTR)data->path.GetUIFileOrDirectoryName(), rev);
1656 wcname.Format(IDS_DIFF_WCNAME, (LPCTSTR)data->path.GetUIFileOrDirectoryName());
1657 CAppUtils::StartExtDiff(
1658 tempfile, data->path, revname, wcname,
1659 CAppUtils::DiffFlags().AlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000)));
1660 }
1661 }
1662 }
1663 break;
1664 case ID_EDITCONFLICT:
1665 {
1666 CString sPath = GetPathFromColumnText(data->sPathColumnText);
1667 SVNDiff::StartConflictEditor(CTGitPath(sPath));
1668 }
1669 break;
1670 case ID_CONFLICTUSETHEIRS:
1671 case ID_CONFLICTUSEMINE:
1672 case ID_CONFLICTRESOLVE:
1673 {
1674 svn_wc_conflict_choice_t result = svn_wc_conflict_choose_merged;
1675 switch (cmd)
1676 {
1677 case ID_CONFLICTUSETHEIRS:
1678 result = svn_wc_conflict_choose_theirs_full;
1679 break;
1680 case ID_CONFLICTUSEMINE:
1681 result = svn_wc_conflict_choose_mine_full;
1682 break;
1683 case ID_CONFLICTRESOLVE:
1684 result = svn_wc_conflict_choose_merged;
1685 break;
1686 }
1687 SVN svn;
1688 POSITION pos = m_ProgList.GetFirstSelectedItemPosition();
1689 CString sResolvedPaths;
1690 while (pos)
1691 {
1692 int nItem = m_ProgList.GetNextSelectedItem(pos);
1693 NotificationData * data = m_arData[nItem];
1694 if (data)
1695 {
1696 if (data->bConflictedActionItem)
1697 {
1698 if (!svn.Resolve(data->path, result, FALSE))
1699 {
1700 CMessageBox::Show(m_hWnd, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
1701 DialogEnableWindow(IDOK, TRUE);
1702 break;
1703 }
1704 else
1705 {
1706 data->color = ::GetSysColor(COLOR_WINDOWTEXT);
1707 data->action = svn_wc_notify_resolved;
1708 data->sActionColumnText.LoadString(IDS_SVNACTION_RESOLVE);
1709 data->bConflictedActionItem = false;
1710 m_nConflicts--;
1711
1712 if (m_nConflicts==0)
1713 {
1714 // When the last conflict is resolved we remove
1715 // the warning which we assume is in the last line.
1716 int nIndex = m_ProgList.GetItemCount()-1;
1717 VERIFY(m_ProgList.DeleteItem(nIndex));
1718
1719 delete m_arData[nIndex];
1720 m_arData.pop_back();
1721 }
1722 sResolvedPaths += data->path.GetWinPathString() + _T("\n");
1723 }
1724 }
1725 }
1726 }
1727 m_ProgList.Invalidate();
1728 CString info = BuildInfoString();
1729 SetDlgItemText(IDC_INFOTEXT, info);
1730
1731 if (!sResolvedPaths.IsEmpty())
1732 {
1733 CString msg;
1734 msg.Format(IDS_SVNPROGRESS_RESOLVED, (LPCTSTR)sResolvedPaths);
1735 CMessageBox::Show(m_hWnd, msg, _T("TortoiseGit"), MB_OK | MB_ICONINFORMATION);
1736 }
1737 }
1738 break;
1739 case ID_LOG:
1740 {
1741 svn_revnum_t rev = m_RevisionEnd;
1742 if (!data->basepath.IsEmpty())
1743 {
1744 StringRevMap::iterator it = m_FinishedRevMap.find(data->basepath.GetSVNApiPath(pool));
1745 if (it != m_FinishedRevMap.end())
1746 rev = it->second;
1747 }
1748 CLogDlg dlg;
1749 // fetch the log from HEAD, not the revision we updated to:
1750 // the path might be inside an external folder which has its own
1751 // revisions.
1752 CString sPath = GetPathFromColumnText(data->sPathColumnText);
1753 dlg.SetParams(CTGitPath(sPath), SVNRev(), SVNRev::REV_HEAD, 1, -1, TRUE);
1754 dlg.DoModal();
1755 }
1756 break;
1757 case ID_OPENWITH:
1758 bOpenWith = true;
1759 case ID_OPEN:
1760 {
1761 int ret = 0;
1762 CString sWinPath = GetPathFromColumnText(data->sPathColumnText);
1763 if (!bOpenWith)
1764 ret = (int)ShellExecute(this->m_hWnd, NULL, (LPCTSTR)sWinPath, NULL, NULL, SW_SHOWNORMAL);
1765 if ((ret <= HINSTANCE_ERROR)||bOpenWith)
1766 {
1767 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
1768 cmd += sWinPath + _T(" ");
1769 CAppUtils::LaunchApplication(cmd, NULL, false);
1770 }
1771 }
1772 }
1773 DialogEnableWindow(IDOK, TRUE);
1774 theApp.DoWaitCursor(-1);
1775 } // if (bAdded)
1776 }
1777 }
1778 }
1779 #endif
1780 }
1781
1782 void CGitProgressDlg::OnEnSetfocusInfotext()
1783 {
1784 CString sTemp;
1785 GetDlgItemText(IDC_INFOTEXT, sTemp);
1786 if (sTemp.IsEmpty())
1787 GetDlgItem(IDC_INFOTEXT)->HideCaret();
1788 }
1789
1790 void CGitProgressDlg::OnLvnBegindragSvnprogress(NMHDR* , LRESULT *pResult)
1791 {
1792 //LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1793 #if 0
1794 int selIndex = m_ProgList.GetSelectionMark();
1795 if (selIndex < 0)
1796 return;
1797
1798 CDropFiles dropFiles; // class for creating DROPFILES struct
1799
1800 int index;
1801 POSITION pos = m_ProgList.GetFirstSelectedItemPosition();
1802 while ( (index = m_ProgList.GetNextSelectedItem(pos)) >= 0 )
1803 {
1804 NotificationData * data = m_arData[index];
1805
1806 if ( data->kind==svn_node_file || data->kind==svn_node_dir )
1807 {
1808 CString sPath = GetPathFromColumnText(data->sPathColumnText);
1809
1810 dropFiles.AddFile( sPath );
1811 }
1812 }
1813
1814 if ( dropFiles.GetCount()>0 )
1815 {
1816 dropFiles.CreateStructure();
1817 }
1818 #endif
1819 *pResult = 0;
1820 }
1821
1822 void CGitProgressDlg::OnSize(UINT nType, int cx, int cy)
1823 {
1824 CResizableStandAloneDialog::OnSize(nType, cx, cy);
1825 if ((nType == SIZE_RESTORED)&&(m_bLastVisible))
1826 {
1827 if(!m_ProgList.m_hWnd)
1828 return;
1829
1830 int count = m_ProgList.GetItemCount();
1831 if (count > 0)
1832 m_ProgList.EnsureVisible(count-1, false);
1833 }
1834 }
1835
1836 //////////////////////////////////////////////////////////////////////////
1837 /// commands
1838 //////////////////////////////////////////////////////////////////////////
1839 bool CGitProgressDlg::CmdAdd(CString& sWindowTitle, bool& localoperation)
1840 {
1841 localoperation = true;
1842 sWindowTitle.LoadString(IDS_PROGRS_TITLE_ADD);
1843 CAppUtils::SetWindowTitle(m_hWnd, m_targetPathList.GetCommonRoot().GetUIPathString(), sWindowTitle);
1844 SetBackgroundImage(IDI_ADD_BKG);
1845 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_ADD)));
1846
1847 if (CRegDWORD(_T("Software\\TortoiseGit\\UseLibgit2"), TRUE) == TRUE)
1848 {
1849 git_repository *repo = NULL;
1850 git_index *index;
1851
1852 CStringA gitdir = CUnicodeUtils::GetMulti(CTGitPath(g_Git.m_CurrentDir).GetGitPathString(), CP_UTF8);
1853 if (git_repository_open(&repo, gitdir.GetBuffer()))
1854 {
1855 gitdir.ReleaseBuffer();
1856 ReportGitError();
1857 return false;
1858 }
1859 gitdir.ReleaseBuffer();
1860
1861 git_config * config;
1862 git_config_new(&config);
1863
1864 CStringA projectConfigA = CUnicodeUtils::GetMulti(g_Git.GetGitLocalConfig(), CP_UTF8);
1865 if (git_config_add_file_ondisk(config, projectConfigA.GetBuffer(), 4, FALSE))
1866 {
1867 projectConfigA.ReleaseBuffer();
1868 ReportGitError();
1869 git_config_free(config);
1870 git_repository_free(repo);
1871 return false;
1872 }
1873 projectConfigA.ReleaseBuffer();
1874 CString globalConfig = g_Git.GetGitGlobalConfig();
1875 if (PathFileExists(globalConfig))
1876 {
1877 CStringA globalConfigA = CUnicodeUtils::GetMulti(globalConfig, CP_UTF8);
1878 if (git_config_add_file_ondisk(config, globalConfigA.GetBuffer(), 3, FALSE))
1879 {
1880 globalConfigA.ReleaseBuffer();
1881 ReportGitError();
1882 git_config_free(config);
1883 git_repository_free(repo);
1884 return false;
1885 }
1886 globalConfigA.ReleaseBuffer();
1887 }
1888 CString globalXDGConfig = g_Git.GetGitGlobalXDGConfig();
1889 if (PathFileExists(globalXDGConfig))
1890 {
1891 CStringA globalXDGConfigA = CUnicodeUtils::GetMulti(globalXDGConfig, CP_UTF8);
1892 if (git_config_add_file_ondisk(config, globalXDGConfigA.GetBuffer(), 2, FALSE))
1893 {
1894 globalXDGConfigA.ReleaseBuffer();
1895 ReportGitError();
1896 git_config_free(config);
1897 git_repository_free(repo);
1898 return false;
1899 }
1900 globalXDGConfigA.ReleaseBuffer();
1901 }
1902 CString systemConfig = g_Git.GetGitSystemConfig();
1903 if (!systemConfig.IsEmpty())
1904 {
1905 CStringA systemConfigA = CUnicodeUtils::GetMulti(systemConfig, CP_UTF8);
1906 if (git_config_add_file_ondisk(config, systemConfigA.GetBuffer(), 1, FALSE))
1907 {
1908 systemConfigA.ReleaseBuffer();
1909 ReportGitError();
1910 git_config_free(config);
1911 git_repository_free(repo);
1912 return false;
1913 }
1914 systemConfigA.ReleaseBuffer();
1915 }
1916
1917 git_repository_set_config(repo, config);
1918
1919 if (git_repository_index(&index, repo))
1920 {
1921 ReportGitError();
1922 git_repository_free(repo);
1923 return false;
1924 }
1925 if (git_index_read(index))
1926 {
1927 ReportGitError();
1928 git_index_free(index);
1929 git_repository_free(repo);
1930 return false;
1931 }
1932
1933 for(int i=0;i<m_targetPathList.GetCount();i++)
1934 {
1935 if (git_index_add_from_workdir(index, CStringA(CUnicodeUtils::GetMulti(m_targetPathList[i].GetGitPathString(), CP_UTF8)).GetBuffer()))
1936 {
1937 ReportGitError();
1938 git_index_free(index);
1939 git_repository_free(repo);
1940 return false;
1941 }
1942 Notify(m_targetPathList[i],git_wc_notify_add);
1943 }
1944
1945 if (git_index_write(index))
1946 {
1947 ReportGitError();
1948 git_index_free(index);
1949 git_repository_free(repo);
1950 return false;
1951 }
1952
1953 git_index_free(index);
1954 git_repository_free(repo);
1955 }
1956 else
1957 {
1958 CMassiveGitTask mgt(L"add -f");
1959 mgt.ExecuteWithNotify(&m_targetPathList, m_bCancelled, git_wc_notify_add, this, &CGitProgressDlg::Notify);
1960 }
1961
1962 CShellUpdater::Instance().AddPathsForUpdate(m_targetPathList);
1963
1964 this->GetDlgItem(IDC_LOGBUTTON)->SetWindowText(_T("Commit ..."));
1965 this->GetDlgItem(IDC_LOGBUTTON)->ShowWindow(SW_SHOW);
1966 return true;
1967 }
1968
1969 bool CGitProgressDlg::CmdCopy(CString& /*sWindowTitle*/, bool& /*localoperation*/)
1970 {
1971 #if 0
1972 ASSERT(m_targetPathList.GetCount() == 1);
1973 sWindowTitle.LoadString(IDS_PROGRS_TITLE_COPY);
1974 SetWindowText(sWindowTitle); // needs to be updated, see TSVN rev. 21375
1975 SetBackgroundImage(IDI_COPY_BKG);
1976
1977 CString sCmdInfo;
1978 sCmdInfo.Format(IDS_PROGRS_CMD_COPY,
1979 m_targetPathList[0].IsUrl() ? (LPCTSTR)m_targetPathList[0].GetSVNPathString() : m_targetPathList[0].GetWinPath(),
1980 (LPCTSTR)m_url.GetSVNPathString(), (LPCTSTR)m_Revision.ToString());
1981 ReportCmd(sCmdInfo);
1982
1983 if (!Copy(m_targetPathList, m_url, m_Revision, m_pegRev, m_sMessage))
1984 {
1985 ReportSVNError();
1986 return false;
1987 }
1988 if (m_options & ProgOptSwitchAfterCopy)
1989 {
1990 sCmdInfo.Format(IDS_PROGRS_CMD_SWITCH,
1991 m_targetPathList[0].GetWinPath(),
1992 (LPCTSTR)m_url.GetSVNPathString(), (LPCTSTR)m_Revision.ToString());
1993 ReportCmd(sCmdInfo);
1994 if (!Switch(m_targetPathList[0], m_url, SVNRev::REV_HEAD, SVNRev::REV_HEAD, m_depth, TRUE, m_options & ProgOptIgnoreExternals))
1995 {
1996 if (!Switch(m_targetPathList[0], m_url, SVNRev::REV_HEAD, m_Revision, m_depth, TRUE, m_options & ProgOptIgnoreExternals))
1997 {
1998 ReportSVNError();
1999 return false;
2000 }
2001 }
2002 }
2003 else
2004 {
2005 if (SVN::PathIsURL(m_url))
2006 {
2007 CString sMsg(MAKEINTRESOURCE(IDS_PROGRS_COPY_WARNING));
2008 ReportNotification(sMsg);
2009 }
2010 }
2011 #endif
2012 return true;
2013 }
2014
2015 bool CGitProgressDlg::CmdExport(CString& /*sWindowTitle*/, bool& /*localoperation*/)
2016 {
2017 #if 0
2018 ASSERT(m_targetPathList.GetCount() == 1);
2019 sWindowTitle.LoadString(IDS_PROGRS_TITLE_EXPORT);
2020 sWindowTitle = m_url.GetUIFileOrDirectoryName()+_T(" - ")+sWindowTitle;
2021 SetWindowText(sWindowTitle); // needs to be updated, see TSVN rev. 21375
2022 SetBackgroundImage(IDI_EXPORT_BKG);
2023 CString eol;
2024 if (m_options & ProgOptEolCRLF)
2025 eol = _T("CRLF");
2026 if (m_options & ProgOptEolLF)
2027 eol = _T("LF");
2028 if (m_options & ProgOptEolCR)
2029 eol = _T("CR");
2030 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_EXPORT)));
2031 if (!Export(m_url, m_targetPathList[0], m_Revision, m_Revision, TRUE, m_options & ProgOptIgnoreExternals, m_depth, NULL, FALSE, eol))
2032 {
2033 ReportSVNError();
2034 return false;
2035 }
2036 #endif
2037 return true;
2038 }
2039
2040 bool CGitProgressDlg::CmdRename(CString& /*sWindowTitle*/, bool& /*localoperation*/)
2041 {
2042 #if 0
2043 ASSERT(m_targetPathList.GetCount() == 1);
2044 if ((!m_targetPathList[0].IsUrl())&&(!m_url.IsUrl()))
2045 localoperation = true;
2046 sWindowTitle.LoadString(IDS_PROGRS_TITLE_RENAME);
2047 SetWindowText(sWindowTitle); // needs to be updated, see TSVN rev. 21375
2048 SetBackgroundImage(IDI_RENAME_BKG);
2049 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_RENAME)));
2050 if (!Move(m_targetPathList, m_url, m_Revision, m_sMessage))
2051 {
2052 ReportSVNError();
2053 return false;
2054 }
2055 #endif
2056 return true;
2057 }
2058
2059 bool CGitProgressDlg::CmdResolve(CString& sWindowTitle, bool& localoperation)
2060 {
2061
2062 localoperation = true;
2063 ASSERT(m_targetPathList.GetCount() == 1);
2064 sWindowTitle.LoadString(IDS_PROGRS_TITLE_RESOLVE);
2065 CAppUtils::SetWindowTitle(m_hWnd, m_targetPathList.GetCommonRoot().GetUIPathString(), sWindowTitle);
2066 SetBackgroundImage(IDI_RESOLVE_BKG);
2067 // check if the file may still have conflict markers in it.
2068 //BOOL bMarkers = FALSE;
2069
2070 for(int i=0;i<m_targetPathList.GetCount();i++)
2071 {
2072 CString cmd,out,tempmergefile;
2073 cmd.Format(_T("git.exe add -f -- \"%s\""),m_targetPathList[i].GetGitPathString());
2074 if (g_Git.Run(cmd, &out, CP_UTF8))
2075 {
2076 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
2077 m_bErrorsOccurred=true;
2078 return false;
2079 }
2080
2081 CAppUtils::RemoveTempMergeFile((CTGitPath &)m_targetPathList[i]);
2082
2083 Notify(m_targetPathList[i],git_wc_notify_resolved);
2084 }
2085 #if 0
2086 if ((m_options & ProgOptSkipConflictCheck) == 0)
2087 {
2088 try
2089 {
2090 for (INT_PTR fileindex=0; (fileindex<m_targetPathList.GetCount()) && (bMarkers==FALSE); ++fileindex)
2091 {
2092 if (!m_targetPathList[fileindex].IsDirectory())
2093 {
2094 CStdioFile file(m_targetPathList[fileindex].GetWinPath(), CFile::typeBinary | CFile::modeRead);
2095 CString strLine = _T("");
2096 while (file.ReadString(strLine))
2097 {
2098 if (strLine.Find(_T("<<<<<<<"))==0)
2099 {
2100 bMarkers = TRUE;
2101 break;
2102 }
2103 }
2104 file.Close();
2105 }
2106 }
2107 }
2108 catch (CFileException* pE)
2109 {
2110 TRACE(_T("CFileException in Resolve!\n"));
2111 TCHAR error[10000] = {0};
2112 pE->GetErrorMessage(error, 10000);
2113 ReportError(error);
2114 pE->Delete();
2115 return false;
2116 }
2117 }
2118 if (bMarkers)
2119 {
2120 if (CMessageBox::Show(m_hWnd, IDS_PROGRS_REVERTMARKERS, IDS_APPNAME, MB_YESNO | MB_ICONQUESTION)==IDYES)
2121 {
2122 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_RESOLVE)));
2123 for (INT_PTR fileindex=0; fileindex<m_targetPathList.GetCount(); ++fileindex)
2124 Resolve(m_targetPathList[fileindex], svn_wc_conflict_choose_merged, true);
2125 }
2126 }
2127 else
2128 {
2129 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_RESOLVE)));
2130 for (INT_PTR fileindex=0; fileindex<m_targetPathList.GetCount(); ++fileindex)
2131 Resolve(m_targetPathList[fileindex], svn_wc_conflict_choose_merged, true);
2132 }
2133 #endif
2134 CShellUpdater::Instance().AddPathsForUpdate(m_targetPathList);
2135
2136 this->GetDlgItem(IDC_LOGBUTTON)->SetWindowText(_T("Commit ..."));
2137 this->GetDlgItem(IDC_LOGBUTTON)->ShowWindow(SW_SHOW);
2138
2139 return true;
2140 }
2141
2142 bool CGitProgressDlg::CmdRevert(CString& sWindowTitle, bool& localoperation)
2143 {
2144
2145 localoperation = true;
2146 sWindowTitle.LoadString(IDS_PROGRS_TITLE_REVERT);
2147 CAppUtils::SetWindowTitle(m_hWnd, m_targetPathList.GetCommonRoot().GetUIPathString(), sWindowTitle);
2148 SetBackgroundImage(IDI_REVERT_BKG);
2149
2150 CTGitPathList delList;
2151 for(int i=0;i<m_selectedPaths.GetCount();i++)
2152 {
2153 CTGitPath path;
2154 int action;
2155 path.SetFromWin(g_Git.m_CurrentDir+_T("\\")+m_selectedPaths[i].GetWinPath());
2156 action = m_selectedPaths[i].m_Action;
2157 /* rename file can't delete because it needs original file*/
2158 if((!(action & CTGitPath::LOGACTIONS_ADDED)) &&
2159 (!(action & CTGitPath::LOGACTIONS_REPLACED)))
2160 delList.AddPath(path);
2161 }
2162 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))
2163 delList.DeleteAllFiles(true);
2164
2165 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_REVERT)));
2166 for(int i=0;i<m_selectedPaths.GetCount();i++)
2167 {
2168 if(g_Git.Revert(_T("HEAD"), (CTGitPath&)m_selectedPaths[i]))
2169 {
2170 CMessageBox::Show(NULL,_T("Revert Fail"),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
2171 m_bErrorsOccurred=true;
2172 return false;
2173 }
2174 Notify(m_selectedPaths[i],git_wc_notify_revert);
2175 }
2176
2177 CShellUpdater::Instance().AddPathsForUpdate(m_selectedPaths);
2178
2179 return true;
2180 }
2181
2182 bool CGitProgressDlg::CmdSwitch(CString& /*sWindowTitle*/, bool& /*localoperation*/)
2183 {
2184 #if 0
2185 ASSERT(m_targetPathList.GetCount() == 1);
2186 SVNStatus st;
2187 sWindowTitle.LoadString(IDS_PROGRS_TITLE_SWITCH);
2188 SetWindowText(sWindowTitle); // needs to be updated, see TSVN rev. 21375
2189 SetBackgroundImage(IDI_SWITCH_BKG);
2190 LONG rev = 0;
2191 if (st.GetStatus(m_targetPathList[0]) != (-2))
2192 {
2193 if (st.status->entry != NULL)
2194 {
2195 rev = st.status->entry->revision;
2196 }
2197 }
2198
2199 CString sCmdInfo;
2200 sCmdInfo.Format(IDS_PROGRS_CMD_SWITCH,
2201 m_targetPathList[0].GetWinPath(), (LPCTSTR)m_url.GetSVNPathString(),
2202 (LPCTSTR)m_Revision.ToString());
2203 ReportCmd(sCmdInfo);
2204
2205 bool depthIsSticky = true;
2206 if (m_depth == svn_depth_unknown)
2207 depthIsSticky = false;
2208 if (!Switch(m_targetPathList[0], m_url, m_Revision, m_Revision, m_depth, depthIsSticky, m_options & ProgOptIgnoreExternals))
2209 {
2210 ReportSVNError();
2211 return false;
2212 }
2213 m_UpdateStartRevMap[m_targetPathList[0].GetSVNApiPath(pool)] = rev;
2214 if ((m_RevisionEnd >= 0)&&(rev >= 0)
2215 &&((LONG)m_RevisionEnd > (LONG)rev))
2216 {
2217 GetDlgItem(IDC_LOGBUTTON)->ShowWindow(SW_SHOW);
2218 }
2219 #endif
2220 return true;
2221 }
2222
2223 void CGitProgressDlg::OnBnClickedNoninteractive()
2224 {
2225 LRESULT res = ::SendMessage(GetDlgItem(IDC_NONINTERACTIVE)->GetSafeHwnd(), BM_GETCHECK, 0, 0);
2226 m_AlwaysConflicted = (res == BST_CHECKED);
2227 CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseGit\\MergeNonInteractive"), FALSE);
2228 nonint = m_AlwaysConflicted;
2229 }
2230
2231 CString CGitProgressDlg::GetPathFromColumnText(const CString& sColumnText)
2232 {
2233 CString sPath = CPathUtils::ParsePathInString(sColumnText);
2234 if (sPath.Find(':')<0)
2235 {
2236 // the path is not absolute: add the common root of all paths to it
2237 sPath = m_targetPathList.GetCommonRoot().GetDirectory().GetWinPathString() + _T("\\") + CPathUtils::ParsePathInString(sColumnText);
2238 }
2239 return sPath;
2240 }
2241
2242 bool CGitProgressDlg::CmdSendMail(CString& sWindowTitle, bool& /*localoperation*/)
2243 {
2244 sWindowTitle.LoadString(IDS_PROGRS_TITLE_SENDMAIL);
2245 CAppUtils::SetWindowTitle(m_hWnd, m_targetPathList.GetCommonRoot().GetUIPathString(), sWindowTitle);
2246 //SetBackgroundImage(IDI_ADD_BKG);
2247 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_SENDMAIL)));
2248 bool ret=true;
2249 if(this->m_SendMailFlags&SENDMAIL_COMBINED)
2250 {
2251 CString error;
2252 CTGitPath path;
2253 Notify(path,git_wc_notify_sendmail_start);
2254 CString err;
2255 int retry=0;
2256 while(retry <3)
2257 {
2258 if(!!CPatch::SendPatchesCombined(m_targetPathList,m_SendMailTO,m_SendMailCC,m_SendMailSubject,!!(this->m_SendMailFlags&SENDMAIL_ATTACHMENT),!!(this->m_SendMailFlags&SENDMAIL_MAPI),&err))
2259 {
2260 Notify(path,git_wc_notify_sendmail_error,ret,&err);
2261 ret = false;
2262 }
2263 else
2264 {
2265 break;
2266 }
2267
2268 retry++;
2269 if (retry < 3)
2270 Notify(path,git_wc_notify_sendmail_retry,ret,&err);
2271 Sleep(2000);
2272 if(m_bCancelled)
2273 {
2274 CString str(_T("User Canceled"));
2275 Notify(path,git_wc_notify_sendmail_error,ret,&str);
2276 return false;
2277 }
2278 }
2279 if (ret)
2280 Notify(path,git_wc_notify_sendmail_done,ret);
2281 }
2282 else
2283 {
2284 for(int i=0;ret && i<m_targetPathList.GetCount();i++)
2285 {
2286 CPatch patch;
2287 Notify(m_targetPathList[i],git_wc_notify_sendmail_start);
2288
2289 int retry=0;
2290 while(retry<3)
2291 {
2292 if(!!patch.Send((CString&)m_targetPathList[i].GetWinPathString(),this->m_SendMailTO,
2293 this->m_SendMailCC,!!(this->m_SendMailFlags&SENDMAIL_ATTACHMENT),!!(this->m_SendMailFlags&SENDMAIL_MAPI)))
2294 {
2295 Notify(m_targetPathList[i],git_wc_notify_sendmail_error,ret,&patch.m_LastError);
2296 ret = false;
2297
2298 }
2299 else
2300 {
2301 ret = true;
2302 break;
2303 }
2304 retry++;
2305 if (retry < 3)
2306 Notify(m_targetPathList[i],git_wc_notify_sendmail_retry,ret,&patch.m_LastError);
2307 Sleep(2000);
2308 if(m_bCancelled)
2309 {
2310 CString str(_T("User Canceled"));
2311 Notify(m_targetPathList[i],git_wc_notify_sendmail_error,ret,&str);
2312 return false;
2313 }
2314 }
2315 if (ret)
2316 Notify(m_targetPathList[i],git_wc_notify_sendmail_done,ret);
2317 }
2318 }
2319 return ret;
2320 }
2321
2322 LRESULT CGitProgressDlg::OnTaskbarBtnCreated(WPARAM /*wParam*/, LPARAM /*lParam*/)
2323 {
2324 m_pTaskbarList.Release();
2325 m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList);
2326 return 0;
2327 }
Windows Explorer Extension to Operate Git