?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
If creating the ITaskbarList3 interface fails, set it to NULL
[TortoiseGit.git] / src / TortoiseProc / GitProgressDlg.cpp
blob624b78e8dad5a36df2d80695e489be265da966f0
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 = AtlLoadSystemLibraryUsingFullPath(_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 if (FAILED(m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList)))
772 m_pTaskbarList = nullptr;
773
774 m_ProgList.SetExtendedStyle (LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER);
775
776 m_ProgList.DeleteAllItems();
777 int c = ((CHeaderCtrl*)(m_ProgList.GetDlgItem(0)))->GetItemCount()-1;
778 while (c>=0)
779 m_ProgList.DeleteColumn(c--);
780 CString temp;
781 temp.LoadString(IDS_PROGRS_ACTION);
782 m_ProgList.InsertColumn(0, temp);
783 temp.LoadString(IDS_PROGRS_PATH);
784 m_ProgList.InsertColumn(1, temp);
785
786 m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
787 if (m_pThread==NULL)
788 {
789 ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
790 }
791 else
792 {
793 m_pThread->m_bAutoDelete = FALSE;
794 m_pThread->ResumeThread();
795 }
796
797 UpdateData(FALSE);
798
799 // Call this early so that the column headings aren't hidden before any
800 // text gets added.
801 ResizeColumns();
802
803 SetTimer(VISIBLETIMER, 300, NULL);
804
805 AddAnchor(IDC_SVNPROGRESS, TOP_LEFT, BOTTOM_RIGHT);
806 AddAnchor(IDC_PROGRESSLABEL, BOTTOM_LEFT, BOTTOM_CENTER);
807 AddAnchor(IDC_PROGRESSBAR, BOTTOM_CENTER, BOTTOM_RIGHT);
808 AddAnchor(IDC_INFOTEXT, BOTTOM_LEFT, BOTTOM_RIGHT);
809 AddAnchor(IDC_NONINTERACTIVE, BOTTOM_LEFT, BOTTOM_RIGHT);
810 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
811 AddAnchor(IDOK, BOTTOM_RIGHT);
812 AddAnchor(IDC_LOGBUTTON, BOTTOM_RIGHT);
813 //SetPromptParentWindow(this->m_hWnd);
814 if (hWndExplorer)
815 CenterWindow(CWnd::FromHandle(hWndExplorer));
816 EnableSaveRestore(_T("GITProgressDlg"));
817 return TRUE;
818 }
819
820 bool CGitProgressDlg::SetBackgroundImage(UINT nID)
821 {
822 return CAppUtils::SetListCtrlBackgroundImage(m_ProgList.GetSafeHwnd(), nID);
823 }
824
825 void CGitProgressDlg::ReportGitError()
826 {
827 ReportError(CString(giterr_last()->message));
828 }
829
830 void CGitProgressDlg::ReportError(const CString& sError)
831 {
832 CSoundUtils::PlayTGitError();
833 ReportString(sError, CString(MAKEINTRESOURCE(IDS_ERR_ERROR)), m_Colors.GetColor(CColors::Conflict));
834 m_bErrorsOccurred = true;
835 }
836
837 void CGitProgressDlg::ReportWarning(const CString& sWarning)
838 {
839 CSoundUtils::PlayTGitWarning();
840 ReportString(sWarning, CString(MAKEINTRESOURCE(IDS_WARN_WARNING)), m_Colors.GetColor(CColors::Conflict));
841 }
842
843 void CGitProgressDlg::ReportNotification(const CString& sNotification)
844 {
845 CSoundUtils::PlayTGitNotification();
846 ReportString(sNotification, CString(MAKEINTRESOURCE(IDS_WARN_NOTE)));
847 }
848
849 void CGitProgressDlg::ReportCmd(const CString& sCmd)
850 {
851 ReportString(sCmd, CString(MAKEINTRESOURCE(IDS_PROGRS_CMDINFO)), m_Colors.GetColor(CColors::Cmd));
852 }
853
854 void CGitProgressDlg::ReportString(CString sMessage, const CString& sMsgKind, COLORREF color)
855 {
856 // instead of showing a dialog box with the error message or notification,
857 // just insert the error text into the list control.
858 // that way the user isn't 'interrupted' by a dialog box popping up!
859
860 // the message may be split up into different lines
861 // so add a new entry for each line of the message
862 while (!sMessage.IsEmpty())
863 {
864 NotificationData * data = new NotificationData();
865 data->bAuxItem = true;
866 data->sActionColumnText = sMsgKind;
867 if (sMessage.Find('\n')>=0)
868 data->sPathColumnText = sMessage.Left(sMessage.Find('\n'));
869 else
870 data->sPathColumnText = sMessage;
871 data->sPathColumnText.Trim(_T("\n\r"));
872 data->color = color;
873 if (sMessage.Find('\n')>=0)
874 {
875 sMessage = sMessage.Mid(sMessage.Find('\n'));
876 sMessage.Trim(_T("\n\r"));
877 }
878 else
879 sMessage.Empty();
880 m_arData.push_back(data);
881 AddItemToList();
882 }
883 }
884
885 UINT CGitProgressDlg::ProgressThreadEntry(LPVOID pVoid)
886 {
887 return ((CGitProgressDlg*)pVoid)->ProgressThread();
888 }
889
890 UINT CGitProgressDlg::ProgressThread()
891 {
892 // The SetParams function should have loaded something for us
893
894 CString temp;
895 CString sWindowTitle;
896 bool localoperation = false;
897 bool bSuccess = false;
898 m_AlwaysConflicted = false;
899
900 DialogEnableWindow(IDOK, FALSE);
901 DialogEnableWindow(IDCANCEL, TRUE);
902 // SetAndClearProgressInfo(m_hWnd);
903 m_itemCount = m_itemCountTotal;
904
905 InterlockedExchange(&m_bThreadRunning, TRUE);
906 iFirstResized = 0;
907 bSecondResized = FALSE;
908 m_bFinishedItemAdded = false;
909 CTime startTime = CTime::GetCurrentTime();
910
911 if (m_pTaskbarList)
912 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_INDETERMINATE);
913
914 switch (m_Command)
915 {
916 case GitProgress_Add:
917 bSuccess = CmdAdd(sWindowTitle, localoperation);
918 break;
919 case GitProgress_Copy:
920 bSuccess = CmdCopy(sWindowTitle, localoperation);
921 break;
922 case GitProgress_Export:
923 bSuccess = CmdExport(sWindowTitle, localoperation);
924 break;
925 case GitProgress_Rename:
926 bSuccess = CmdRename(sWindowTitle, localoperation);
927 break;
928 case GitProgress_Resolve:
929 bSuccess = CmdResolve(sWindowTitle, localoperation);
930 break;
931 case GitProgress_Revert:
932 bSuccess = CmdRevert(sWindowTitle, localoperation);
933 break;
934 case GitProgress_Switch:
935 bSuccess = CmdSwitch(sWindowTitle, localoperation);
936 break;
937 case GitProgress_SendMail:
938 bSuccess = CmdSendMail(sWindowTitle, localoperation);
939 break;
940 }
941 if (!bSuccess)
942 temp.LoadString(IDS_PROGRS_TITLEFAILED);
943 else
944 temp.LoadString(IDS_PROGRS_TITLEFIN);
945 sWindowTitle = sWindowTitle + _T(" ") + temp;
946 SetWindowText(sWindowTitle);
947
948 KillTimer(TRANSFERTIMER);
949 KillTimer(VISIBLETIMER);
950
951 if (m_pTaskbarList)
952 {
953 if (DidErrorsOccur())
954 {
955 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_ERROR);
956 m_pTaskbarList->SetProgressValue(m_hWnd, 100, 100);
957 }
958 else
959 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NOPROGRESS);
960 }
961
962 DialogEnableWindow(IDCANCEL, FALSE);
963 DialogEnableWindow(IDOK, TRUE);
964
965 CString info = BuildInfoString();
966 if (!bSuccess)
967 info.LoadString(IDS_PROGRS_INFOFAILED);
968 SetDlgItemText(IDC_INFOTEXT, info);
969 ResizeColumns();
970 CWnd * pWndOk = GetDlgItem(IDOK);
971 if (pWndOk && ::IsWindow(pWndOk->GetSafeHwnd()))
972 {
973 SendMessage(DM_SETDEFID, IDOK);
974 GetDlgItem(IDOK)->SetFocus();
975 }
976
977 CString sFinalInfo;
978 if (!m_sTotalBytesTransferred.IsEmpty())
979 {
980 CTimeSpan time = CTime::GetCurrentTime() - startTime;
981 temp.Format(IDS_PROGRS_TIME, (LONG)time.GetTotalMinutes(), (LONG)time.GetSeconds());
982 sFinalInfo.Format(IDS_PROGRS_FINALINFO, m_sTotalBytesTransferred, (LPCTSTR)temp);
983 SetDlgItemText(IDC_PROGRESSLABEL, sFinalInfo);
984 }
985 else
986 GetDlgItem(IDC_PROGRESSLABEL)->ShowWindow(SW_HIDE);
987
988 GetDlgItem(IDC_PROGRESSBAR)->ShowWindow(SW_HIDE);
989
990 if (!m_bFinishedItemAdded)
991 {
992 // there's no "finished: xxx" line at the end. We add one here to make
993 // sure the user sees that the command is actually finished.
994 NotificationData * data = new NotificationData();
995 data->bAuxItem = true;
996 data->sActionColumnText.LoadString(IDS_PROGRS_FINISHED);
997 m_arData.push_back(data);
998 AddItemToList();
999 }
1000
1001 int count = m_ProgList.GetItemCount();
1002 if ((count > 0)&&(m_bLastVisible))
1003 m_ProgList.EnsureVisible(count-1, FALSE);
1004
1005 CLogFile logfile;
1006 if (logfile.Open())
1007 {
1008 logfile.AddTimeLine();
1009 for (size_t i=0; i<m_arData.size(); i++)
1010 {
1011 NotificationData * data = m_arData[i];
1012 temp.Format(_T("%-20s : %s"), (LPCTSTR)data->sActionColumnText, (LPCTSTR)data->sPathColumnText);
1013 logfile.AddLine(temp);
1014 }
1015 if (!sFinalInfo.IsEmpty())
1016 logfile.AddLine(sFinalInfo);
1017 logfile.Close();
1018 }
1019
1020 m_bCancelled = TRUE;
1021 InterlockedExchange(&m_bThreadRunning, FALSE);
1022 RefreshCursor();
1023
1024 #if 0
1025 DWORD dwAutoClose = CRegStdDWORD(_T("Software\\TortoiseGit\\AutoClose"), CLOSE_MANUAL);
1026 if (m_options & ProgOptDryRun)
1027 dwAutoClose = 0; // dry run means progress dialog doesn't auto close at all
1028 if (!m_bLastVisible)
1029 dwAutoClose = 0;
1030 if (m_dwCloseOnEnd != (DWORD)-1)
1031 dwAutoClose = m_dwCloseOnEnd; // command line value has priority over setting value
1032 if ((dwAutoClose == CLOSE_NOERRORS)&&(!m_bErrorsOccurred))
1033 PostMessage(WM_COMMAND, 1, (LPARAM)GetDlgItem(IDOK)->m_hWnd);
1034 if ((dwAutoClose == CLOSE_NOCONFLICTS)&&(!m_bErrorsOccurred)&&(m_nConflicts==0))
1035 PostMessage(WM_COMMAND, 1, (LPARAM)GetDlgItem(IDOK)->m_hWnd);
1036 if ((dwAutoClose == CLOSE_NOMERGES)&&(!m_bErrorsOccurred)&&(m_nConflicts==0)&&(!m_bMergesAddsDeletesOccurred))
1037 PostMessage(WM_COMMAND, 1, (LPARAM)GetDlgItem(IDOK)->m_hWnd);
1038 if ((dwAutoClose == CLOSE_LOCAL)&&(!m_bErrorsOccurred)&&(m_nConflicts==0)&&(localoperation))
1039 PostMessage(WM_COMMAND, 1, (LPARAM)GetDlgItem(IDOK)->m_hWnd);
1040 #endif
1041
1042 //Don't do anything here which might cause messages to be sent to the window
1043 //The window thread is probably now blocked in OnOK if we've done an auto close
1044 return 0;
1045 }
1046
1047 void CGitProgressDlg::OnBnClickedLogbutton()
1048 {
1049 switch(this->m_Command)
1050 {
1051 case GitProgress_Add:
1052 case GitProgress_Resolve:
1053 {
1054 CString cmd = _T(" /command:commit");
1055 cmd += _T(" /path:\"")+g_Git.m_CurrentDir+_T("\"");
1056
1057 CAppUtils::RunTortoiseGitProc(cmd);
1058 this->EndDialog(IDOK);
1059 break;
1060 }
1061 }
1062 #if 0
1063 if (m_targetPathList.GetCount() != 1)
1064 return;
1065 StringRevMap::iterator it = m_UpdateStartRevMap.begin();
1066 svn_revnum_t rev = -1;
1067 if (it != m_UpdateStartRevMap.end())
1068 {
1069 rev = it->second;
1070 }
1071 CLogDlg dlg;
1072 dlg.SetParams(m_targetPathList[0], m_RevisionEnd, m_RevisionEnd, rev, 0, TRUE);
1073 dlg.DoModal();
1074 #endif
1075 }
1076
1077
1078 void CGitProgressDlg::OnClose()
1079 {
1080 if (m_bCancelled)
1081 {
1082 TerminateThread(m_pThread->m_hThread, (DWORD)-1);
1083 InterlockedExchange(&m_bThreadRunning, FALSE);
1084 }
1085 else
1086 {
1087 m_bCancelled = TRUE;
1088 return;
1089 }
1090 DialogEnableWindow(IDCANCEL, TRUE);
1091 __super::OnClose();
1092 }
1093
1094 void CGitProgressDlg::OnOK()
1095 {
1096 if ((m_bCancelled)&&(!m_bThreadRunning))
1097 {
1098 // I have made this wait a sensible amount of time (10 seconds) for the thread to finish
1099 // You must be careful in the thread that after posting the WM_COMMAND/IDOK message, you
1100 // don't do any more operations on the window which might require message passing
1101 // If you try to send windows messages once we're waiting here, then the thread can't finished
1102 // because the Window's message loop is blocked at this wait
1103 WaitForSingleObject(m_pThread->m_hThread, 10000);
1104 __super::OnOK();
1105 }
1106 m_bCancelled = TRUE;
1107 }
1108
1109 void CGitProgressDlg::OnCancel()
1110 {
1111 if ((m_bCancelled)&&(!m_bThreadRunning))
1112 __super::OnCancel();
1113 m_bCancelled = TRUE;
1114 }
1115
1116 void CGitProgressDlg::OnLvnGetdispinfoSvnprogress(NMHDR *pNMHDR, LRESULT *pResult)
1117 {
1118 NMLVDISPINFO *pDispInfo = reinterpret_cast<NMLVDISPINFO*>(pNMHDR);
1119
1120 if (pDispInfo)
1121 {
1122 if (pDispInfo->item.mask & LVIF_TEXT)
1123 {
1124 if (pDispInfo->item.iItem < (int)m_arData.size())
1125 {
1126 const NotificationData * data = m_arData[pDispInfo->item.iItem];
1127 switch (pDispInfo->item.iSubItem)
1128 {
1129 case 0:
1130 lstrcpyn(m_columnbuf, data->sActionColumnText, MAX_PATH);
1131 break;
1132 case 1:
1133 lstrcpyn(m_columnbuf, data->sPathColumnText, pDispInfo->item.cchTextMax);
1134 if (!data->bAuxItem)
1135 {
1136 int cWidth = m_ProgList.GetColumnWidth(1);
1137 cWidth = max(12, cWidth-12);
1138 CDC * pDC = m_ProgList.GetDC();
1139 if (pDC != NULL)
1140 {
1141 CFont * pFont = pDC->SelectObject(m_ProgList.GetFont());
1142 PathCompactPath(pDC->GetSafeHdc(), m_columnbuf, cWidth);
1143 pDC->SelectObject(pFont);
1144 ReleaseDC(pDC);
1145 }
1146 }
1147 break;
1148 default:
1149 m_columnbuf[0] = 0;
1150 }
1151 pDispInfo->item.pszText = m_columnbuf;
1152 }
1153 }
1154 }
1155 *pResult = 0;
1156 }
1157
1158 void CGitProgressDlg::OnNMCustomdrawSvnprogress(NMHDR *pNMHDR, LRESULT *pResult)
1159 {
1160 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
1161
1162 // Take the default processing unless we set this to something else below.
1163 *pResult = CDRF_DODEFAULT;
1164
1165 // First thing - check the draw stage. If it's the control's prepaint
1166 // stage, then tell Windows we want messages for every item.
1167
1168 if ( CDDS_PREPAINT == pLVCD->nmcd.dwDrawStage )
1169 {
1170 *pResult = CDRF_NOTIFYITEMDRAW;
1171 }
1172 else if ( CDDS_ITEMPREPAINT == pLVCD->nmcd.dwDrawStage )
1173 {
1174 // This is the prepaint stage for an item. Here's where we set the
1175 // item's text color. Our return value will tell Windows to draw the
1176 // item itself, but it will use the new color we set here.
1177
1178 // Tell Windows to paint the control itself.
1179 *pResult = CDRF_DODEFAULT;
1180
1181 ASSERT(pLVCD->nmcd.dwItemSpec < m_arData.size());
1182 if(pLVCD->nmcd.dwItemSpec >= m_arData.size())
1183 {
1184 return;
1185 }
1186 const NotificationData * data = m_arData[pLVCD->nmcd.dwItemSpec];
1187 ASSERT(data != NULL);
1188 if (data == NULL)
1189 return;
1190
1191 // Store the color back in the NMLVCUSTOMDRAW struct.
1192 pLVCD->clrText = data->color;
1193 }
1194 }
1195
1196 void CGitProgressDlg::OnNMDblclkSvnprogress(NMHDR * /*pNMHDR*/, LRESULT * /*pResult*/)
1197 {
1198 #if 0
1199 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1200 *pResult = 0;
1201 if (pNMLV->iItem < 0)
1202 return;
1203 if (m_options & ProgOptDryRun)
1204 return; //don't do anything in a dry-run.
1205
1206 const NotificationData * data = m_arData[pNMLV->iItem];
1207 if (data == NULL)
1208 return;
1209
1210 if (data->bConflictedActionItem)
1211 {
1212 // We've double-clicked on a conflicted item - do a three-way merge on it
1213 SVNDiff::StartConflictEditor(data->path);
1214 }
1215 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))
1216 {
1217 // This is a modified file which has been merged on update. Diff it against base
1218 CTGitPath temporaryFile;
1219 SVNDiff diff(this, this->m_hWnd, true);
1220 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
1221 svn_revnum_t baseRev = 0;
1222 diff.DiffFileAgainstBase(data->path, baseRev);
1223 }
1224 else if ((!data->bAuxItem)&&(data->path.Exists())&&(!data->path.IsDirectory()))
1225 {
1226 bool bOpenWith = false;
1227 int ret = (int)ShellExecute(m_hWnd, NULL, data->path.GetWinPath(), NULL, NULL, SW_SHOWNORMAL);
1228 if (ret <= HINSTANCE_ERROR)
1229 bOpenWith = true;
1230 if (bOpenWith)
1231 {
1232 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
1233 cmd += data->path.GetWinPathString() + _T(" ");
1234 CAppUtils::LaunchApplication(cmd, NULL, false);
1235 }
1236 }
1237 #endif
1238 }
1239
1240 void CGitProgressDlg::OnHdnItemclickSvnprogress(NMHDR *pNMHDR, LRESULT *pResult)
1241 {
1242 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
1243 if (m_bThreadRunning)
1244 return;
1245 if (m_nSortedColumn == phdr->iItem)
1246 m_bAscending = !m_bAscending;
1247 else
1248 m_bAscending = TRUE;
1249 m_nSortedColumn = phdr->iItem;
1250 Sort();
1251
1252 CString temp;
1253 m_ProgList.SetRedraw(FALSE);
1254 m_ProgList.DeleteAllItems();
1255 m_ProgList.SetItemCountEx (static_cast<int>(m_arData.size()));
1256
1257 m_ProgList.SetRedraw(TRUE);
1258
1259 *pResult = 0;
1260 }
1261
1262 bool CGitProgressDlg::NotificationDataIsAux(const NotificationData* pData)
1263 {
1264 return pData->bAuxItem;
1265 }
1266
1267 LRESULT CGitProgressDlg::OnGitProgress(WPARAM /*wParam*/, LPARAM /*lParam*/)
1268 {
1269 #if 0
1270 SVNProgress * pProgressData = (SVNProgress *)lParam;
1271 CProgressCtrl * progControl = (CProgressCtrl *)GetDlgItem(IDC_PROGRESSBAR);
1272 if ((pProgressData->total > 1000)&&(!progControl->IsWindowVisible()))
1273 {
1274 progControl->ShowWindow(SW_SHOW);
1275 if (m_pTaskbarList)
1276 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
1277 }
1278 if (((pProgressData->total < 0)&&(pProgressData->progress > 1000)&&(progControl->IsWindowVisible()))&&(m_itemCountTotal<0))
1279 {
1280 progControl->ShowWindow(SW_HIDE);
1281 if (m_pTaskbarList)
1282 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_INDETERMINATE);
1283 }
1284 if (!GetDlgItem(IDC_PROGRESSLABEL)->IsWindowVisible())
1285 GetDlgItem(IDC_PROGRESSLABEL)->ShowWindow(SW_SHOW);
1286 SetTimer(TRANSFERTIMER, 2000, NULL);
1287 if ((pProgressData->total > 0)&&(pProgressData->progress > 1000))
1288 {
1289 progControl->SetPos((int)pProgressData->progress);
1290 progControl->SetRange32(0, (int)pProgressData->total);
1291 if (m_pTaskbarList)
1292 {
1293 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
1294 m_pTaskbarList->SetProgressValue(m_hWnd, pProgressData->progress, pProgressData->total);
1295 }
1296 }
1297 CString progText;
1298 if (pProgressData->overall_total < 1024)
1299 m_sTotalBytesTransferred.Format(IDS_SVN_PROGRESS_TOTALBYTESTRANSFERRED, pProgressData->overall_total);
1300 else if (pProgressData->overall_total < 1200000)
1301 m_sTotalBytesTransferred.Format(IDS_SVN_PROGRESS_TOTALTRANSFERRED, pProgressData->overall_total / 1024);
1302 else
1303 m_sTotalBytesTransferred.Format(IDS_SVN_PROGRESS_TOTALMBTRANSFERRED, (double)((double)pProgressData->overall_total / 1024000.0));
1304 progText.Format(IDS_SVN_PROGRESS_TOTALANDSPEED, (LPCTSTR)m_sTotalBytesTransferred, (LPCTSTR)pProgressData->SpeedString);
1305 SetDlgItemText(IDC_PROGRESSLABEL, progText);
1306 #endif
1307 return 0;
1308 }
1309
1310 void CGitProgressDlg::OnTimer(UINT_PTR nIDEvent)
1311 {
1312 if (nIDEvent == TRANSFERTIMER)
1313 {
1314 CString progText;
1315 CString progSpeed;
1316 progSpeed.Format(IDS_SVN_PROGRESS_BYTES_SEC, 0);
1317 progText.Format(IDS_SVN_PROGRESS_TOTALANDSPEED, (LPCTSTR)m_sTotalBytesTransferred, (LPCTSTR)progSpeed);
1318 SetDlgItemText(IDC_PROGRESSLABEL, progText);
1319 KillTimer(TRANSFERTIMER);
1320 }
1321 if (nIDEvent == VISIBLETIMER)
1322 {
1323 if (nEnsureVisibleCount)
1324 m_ProgList.EnsureVisible(m_ProgList.GetItemCount()-1, false);
1325 nEnsureVisibleCount = 0;
1326 }
1327 }
1328
1329 void CGitProgressDlg::Sort()
1330 {
1331 if(m_arData.size() < 2)
1332 {
1333 return;
1334 }
1335
1336 // We need to sort the blocks which lie between the auxiliary entries
1337 // This is so that any aux data stays where it was
1338 NotificationDataVect::iterator actionBlockBegin;
1339 NotificationDataVect::iterator actionBlockEnd = m_arData.begin(); // We start searching from here
1340
1341 for(;;)
1342 {
1343 // Search to the start of the non-aux entry in the next block
1344 actionBlockBegin = std::find_if(actionBlockEnd, m_arData.end(), std::not1(std::ptr_fun(&CGitProgressDlg::NotificationDataIsAux)));
1345 if(actionBlockBegin == m_arData.end())
1346 {
1347 // There are no more actions
1348 break;
1349 }
1350 // Now search to find the end of the block
1351 actionBlockEnd = std::find_if(actionBlockBegin+1, m_arData.end(), std::ptr_fun(&CGitProgressDlg::NotificationDataIsAux));
1352 // Now sort the block
1353 std::sort(actionBlockBegin, actionBlockEnd, &CGitProgressDlg::SortCompare);
1354 }
1355 }
1356
1357 bool CGitProgressDlg::SortCompare(const NotificationData * pData1, const NotificationData * pData2)
1358 {
1359 int result = 0;
1360 switch (m_nSortedColumn)
1361 {
1362 case 0: //action column
1363 result = pData1->sActionColumnText.Compare(pData2->sActionColumnText);
1364 break;
1365 case 1: //path column
1366 // Compare happens after switch()
1367 break;
1368 default:
1369 break;
1370 }
1371
1372 // Sort by path if everything else is equal
1373 if (result == 0)
1374 {
1375 result = CTGitPath::Compare(pData1->path, pData2->path);
1376 }
1377
1378 if (!m_bAscending)
1379 result = -result;
1380 return result < 0;
1381 }
1382
1383 BOOL CGitProgressDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
1384 {
1385 if (!GetDlgItem(IDOK)->IsWindowEnabled())
1386 {
1387 // only show the wait cursor over the list control
1388 if ((pWnd)&&(pWnd == GetDlgItem(IDC_SVNPROGRESS)))
1389 {
1390 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
1391 SetCursor(hCur);
1392 return TRUE;
1393 }
1394 }
1395 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
1396 SetCursor(hCur);
1397 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
1398 }
1399
1400 BOOL CGitProgressDlg::PreTranslateMessage(MSG* pMsg)
1401 {
1402 if (pMsg->message == WM_KEYDOWN)
1403 {
1404 if (pMsg->wParam == VK_ESCAPE)
1405 {
1406 // pressing the ESC key should close the dialog. But since we disabled the escape
1407 // key (so the user doesn't get the idea that he could simply undo an e.g. update)
1408 // this won't work.
1409 // So if the user presses the ESC key, change it to VK_RETURN so the dialog gets
1410 // the impression that the OK button was pressed.
1411 if ((!m_bThreadRunning)&&(!GetDlgItem(IDCANCEL)->IsWindowEnabled())
1412 &&(GetDlgItem(IDOK)->IsWindowEnabled())&&(GetDlgItem(IDOK)->IsWindowVisible()))
1413 {
1414 // since we convert ESC to RETURN, make sure the OK button has the focus.
1415 GetDlgItem(IDOK)->SetFocus();
1416 pMsg->wParam = VK_RETURN;
1417 }
1418 }
1419 if (pMsg->wParam == 'A')
1420 {
1421 if (GetKeyState(VK_CONTROL)&0x8000)
1422 {
1423 // Ctrl-A -> select all
1424 m_ProgList.SetSelectionMark(0);
1425 for (int i=0; i<m_ProgList.GetItemCount(); ++i)
1426 {
1427 m_ProgList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
1428 }
1429 }
1430 }
1431 if ((pMsg->wParam == 'C')||(pMsg->wParam == VK_INSERT))
1432 {
1433 int selIndex = m_ProgList.GetSelectionMark();
1434 if (selIndex >= 0)
1435 {
1436 if (GetKeyState(VK_CONTROL)&0x8000)
1437 {
1438 //Ctrl-C -> copy to clipboard
1439 CString sClipdata;
1440 POSITION pos = m_ProgList.GetFirstSelectedItemPosition();
1441 if (pos != NULL)
1442 {
1443 while (pos)
1444 {
1445 int nItem = m_ProgList.GetNextSelectedItem(pos);
1446 CString sAction = m_ProgList.GetItemText(nItem, 0);
1447 CString sPath = m_ProgList.GetItemText(nItem, 1);
1448 CString sMime = m_ProgList.GetItemText(nItem, 2);
1449 CString sLogCopyText;
1450 sLogCopyText.Format(_T("%s: %s %s\r\n"),
1451 (LPCTSTR)sAction, (LPCTSTR)sPath, (LPCTSTR)sMime);
1452 sClipdata += sLogCopyText;
1453 }
1454 CStringUtils::WriteAsciiStringToClipboard(sClipdata);
1455 }
1456 }
1457 }
1458 }
1459 } // if (pMsg->message == WM_KEYDOWN)
1460 return __super::PreTranslateMessage(pMsg);
1461 }
1462
1463 void CGitProgressDlg::OnContextMenu(CWnd* /*pWnd*/, CPoint /*point*/)
1464 {
1465 #if 0
1466 if (m_options & ProgOptDryRun)
1467 return; // don't do anything in a dry-run.
1468
1469 if (pWnd == &m_ProgList)
1470 {
1471 int selIndex = m_ProgList.GetSelectionMark();
1472 if ((point.x == -1) && (point.y == -1))
1473 {
1474 // Menu was invoked from the keyboard rather than by right-clicking
1475 CRect rect;
1476 m_ProgList.GetItemRect(selIndex, &rect, LVIR_LABEL);
1477 m_ProgList.ClientToScreen(&rect);
1478 point = rect.CenterPoint();
1479 }
1480
1481 if ((selIndex >= 0)&&(!m_bThreadRunning))
1482 {
1483 // entry is selected, thread has finished with updating so show the popup menu
1484 CIconMenu popup;
1485 if (popup.CreatePopupMenu())
1486 {
1487 bool bAdded = false;
1488 NotificationData * data = m_arData[selIndex];
1489 if ((data)&&(!data->path.IsDirectory()))
1490 {
1491 if (data->action == svn_wc_notify_update_update || data->action == svn_wc_notify_resolved)
1492 {
1493 if (m_ProgList.GetSelectedCount() == 1)
1494 {
1495 popup.AppendMenuIcon(ID_COMPARE, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
1496 bAdded = true;
1497 }
1498 }
1499 if (data->bConflictedActionItem)
1500 {
1501 if (m_ProgList.GetSelectedCount() == 1)
1502 {
1503 popup.AppendMenuIcon(ID_EDITCONFLICT, IDS_MENUCONFLICT,IDI_CONFLICT);
1504 popup.SetDefaultItem(ID_EDITCONFLICT, FALSE);
1505 popup.AppendMenuIcon(ID_CONFLICTRESOLVE, IDS_SVNPROGRESS_MENUMARKASRESOLVED,IDI_RESOLVE);
1506 }
1507 popup.AppendMenuIcon(ID_CONFLICTUSETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS,IDI_RESOLVE);
1508 popup.AppendMenuIcon(ID_CONFLICTUSEMINE, IDS_SVNPROGRESS_MENUUSEMINE,IDI_RESOLVE);
1509 }
1510 else if ((data->content_state == svn_wc_notify_state_merged)||(GitProgress_Merge == m_Command)||(data->action == svn_wc_notify_resolved))
1511 popup.SetDefaultItem(ID_COMPARE, FALSE);
1512
1513 if (m_ProgList.GetSelectedCount() == 1)
1514 {
1515 if ((data->action == svn_wc_notify_add)||
1516 (data->action == svn_wc_notify_update_add)||
1517 (data->action == svn_wc_notify_commit_added)||
1518 (data->action == svn_wc_notify_commit_modified)||
1519 (data->action == svn_wc_notify_restore)||
1520 (data->action == svn_wc_notify_revert)||
1521 (data->action == svn_wc_notify_resolved)||
1522 (data->action == svn_wc_notify_commit_replaced)||
1523 (data->action == svn_wc_notify_commit_modified)||
1524 (data->action == svn_wc_notify_commit_postfix_txdelta)||
1525 (data->action == svn_wc_notify_update_update))
1526 {
1527 popup.AppendMenuIcon(ID_LOG, IDS_MENULOG,IDI_LOG);
1528 if (data->action == svn_wc_notify_update_update)
1529 popup.AppendMenu(MF_SEPARATOR, NULL);
1530 popup.AppendMenuIcon(ID_OPEN, IDS_LOG_POPUP_OPEN, IDI_OPEN);
1531 popup.AppendMenuIcon(ID_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
1532 bAdded = true;
1533 }
1534 }
1535 } // if ((data)&&(!data->path.IsDirectory()))
1536 if (m_ProgList.GetSelectedCount() == 1)
1537 {
1538 if (data)
1539 {
1540 CString sPath = GetPathFromColumnText(data->sPathColumnText);
1541 if ((!sPath.IsEmpty())&&(!SVN::PathIsURL(CTGitPath(sPath))))
1542 {
1543 CTGitPath path = CTGitPath(sPath);
1544 if (path.GetDirectory().Exists())
1545 {
1546 popup.AppendMenuIcon(ID_EXPLORE, IDS_SVNPROGRESS_MENUOPENPARENT, IDI_EXPLORER);
1547 bAdded = true;
1548 }
1549 }
1550 }
1551 }
1552 if (m_ProgList.GetSelectedCount() > 0)
1553 {
1554 if (bAdded)
1555 popup.AppendMenu(MF_SEPARATOR, NULL);
1556 popup.AppendMenuIcon(ID_COPY, IDS_LOG_POPUP_COPYTOCLIPBOARD,IDI_COPYCLIP);
1557 bAdded = true;
1558 }
1559 if (bAdded)
1560 {
1561 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1562 DialogEnableWindow(IDOK, FALSE);
1563 this->SetPromptApp(&theApp);
1564 theApp.DoWaitCursor(1);
1565 bool bOpenWith = false;
1566 switch (cmd)
1567 {
1568 case ID_COPY:
1569 {
1570 CString sLines;
1571 POSITION pos = m_ProgList.GetFirstSelectedItemPosition();
1572 while (pos)
1573 {
1574 int nItem = m_ProgList.GetNextSelectedItem(pos);
1575 NotificationData * data = m_arData[nItem];
1576 if (data)
1577 {
1578 sLines += data->sPathColumnText;
1579 sLines += _T("\r\n");
1580 }
1581 }
1582 sLines.TrimRight();
1583 if (!sLines.IsEmpty())
1584 {
1585 CStringUtils::WriteAsciiStringToClipboard(sLines, GetSafeHwnd());
1586 }
1587 }
1588 break;
1589 case ID_EXPLORE:
1590 {
1591 CString sPath = GetPathFromColumnText(data->sPathColumnText);
1592
1593 CTGitPath path = CTGitPath(sPath);
1594 ShellExecute(m_hWnd, _T("explore"), path.GetDirectory().GetWinPath(), NULL, path.GetDirectory().GetWinPath(), SW_SHOW);
1595 }
1596 break;
1597 case ID_COMPARE:
1598 {
1599 svn_revnum_t rev = -1;
1600 StringRevMap::iterator it = m_UpdateStartRevMap.end();
1601 if (data->basepath.IsEmpty())
1602 it = m_UpdateStartRevMap.begin();
1603 else
1604 it = m_UpdateStartRevMap.find(data->basepath.GetSVNApiPath(pool));
1605 if (it != m_UpdateStartRevMap.end())
1606 rev = it->second;
1607 // if the file was merged during update, do a three way diff between OLD, MINE, THEIRS
1608 if (data->content_state == svn_wc_notify_state_merged)
1609 {
1610 CTGitPath basefile = CTempFiles::Instance().GetTempFilePath(false, data->path, rev);
1611 CTGitPath newfile = CTempFiles::Instance().GetTempFilePath(false, data->path, SVNRev::REV_HEAD);
1612 SVN svn;
1613 if (!svn.Cat(data->path, SVNRev(SVNRev::REV_WC), rev, basefile))
1614 {
1615 CMessageBox::Show(m_hWnd, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
1616 DialogEnableWindow(IDOK, TRUE);
1617 break;
1618 }
1619 // If necessary, convert the line-endings on the file before diffing
1620 if ((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\ConvertBase"), TRUE))
1621 {
1622 CTGitPath temporaryFile = CTempFiles::Instance().GetTempFilePath(false, data->path, SVNRev::REV_BASE);
1623 if (!svn.Cat(data->path, SVNRev(SVNRev::REV_BASE), SVNRev(SVNRev::REV_BASE), temporaryFile))
1624 {
1625 temporaryFile.Reset();
1626 break;
1627 }
1628 else
1629 {
1630 newfile = temporaryFile;
1631 }
1632 }
1633
1634 SetFileAttributes(newfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
1635 SetFileAttributes(basefile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
1636 CString revname, wcname, basename;
1637 revname.Format(_T("%s Revision %ld"), (LPCTSTR)data->path.GetUIFileOrDirectoryName(), rev);
1638 wcname.Format(IDS_DIFF_WCNAME, (LPCTSTR)data->path.GetUIFileOrDirectoryName());
1639 basename.Format(IDS_DIFF_BASENAME, (LPCTSTR)data->path.GetUIFileOrDirectoryName());
1640 CAppUtils::StartExtMerge(basefile, newfile, data->path, data->path, basename, revname, wcname, CString(), true);
1641 }
1642 else
1643 {
1644 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, data->path, rev);
1645 SVN svn;
1646 if (!svn.Cat(data->path, SVNRev(SVNRev::REV_WC), rev, tempfile))
1647 {
1648 CMessageBox::Show(m_hWnd, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
1649 DialogEnableWindow(IDOK, TRUE);
1650 break;
1651 }
1652 else
1653 {
1654 SetFileAttributes(tempfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
1655 CString revname, wcname;
1656 revname.Format(_T("%s Revision %ld"), (LPCTSTR)data->path.GetUIFileOrDirectoryName(), rev);
1657 wcname.Format(IDS_DIFF_WCNAME, (LPCTSTR)data->path.GetUIFileOrDirectoryName());
1658 CAppUtils::StartExtDiff(
1659 tempfile, data->path, revname, wcname,
1660 CAppUtils::DiffFlags().AlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000)));
1661 }
1662 }
1663 }
1664 break;
1665 case ID_EDITCONFLICT:
1666 {
1667 CString sPath = GetPathFromColumnText(data->sPathColumnText);
1668 SVNDiff::StartConflictEditor(CTGitPath(sPath));
1669 }
1670 break;
1671 case ID_CONFLICTUSETHEIRS:
1672 case ID_CONFLICTUSEMINE:
1673 case ID_CONFLICTRESOLVE:
1674 {
1675 svn_wc_conflict_choice_t result = svn_wc_conflict_choose_merged;
1676 switch (cmd)
1677 {
1678 case ID_CONFLICTUSETHEIRS:
1679 result = svn_wc_conflict_choose_theirs_full;
1680 break;
1681 case ID_CONFLICTUSEMINE:
1682 result = svn_wc_conflict_choose_mine_full;
1683 break;
1684 case ID_CONFLICTRESOLVE:
1685 result = svn_wc_conflict_choose_merged;
1686 break;
1687 }
1688 SVN svn;
1689 POSITION pos = m_ProgList.GetFirstSelectedItemPosition();
1690 CString sResolvedPaths;
1691 while (pos)
1692 {
1693 int nItem = m_ProgList.GetNextSelectedItem(pos);
1694 NotificationData * data = m_arData[nItem];
1695 if (data)
1696 {
1697 if (data->bConflictedActionItem)
1698 {
1699 if (!svn.Resolve(data->path, result, FALSE))
1700 {
1701 CMessageBox::Show(m_hWnd, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
1702 DialogEnableWindow(IDOK, TRUE);
1703 break;
1704 }
1705 else
1706 {
1707 data->color = ::GetSysColor(COLOR_WINDOWTEXT);
1708 data->action = svn_wc_notify_resolved;
1709 data->sActionColumnText.LoadString(IDS_SVNACTION_RESOLVE);
1710 data->bConflictedActionItem = false;
1711 m_nConflicts--;
1712
1713 if (m_nConflicts==0)
1714 {
1715 // When the last conflict is resolved we remove
1716 // the warning which we assume is in the last line.
1717 int nIndex = m_ProgList.GetItemCount()-1;
1718 VERIFY(m_ProgList.DeleteItem(nIndex));
1719
1720 delete m_arData[nIndex];
1721 m_arData.pop_back();
1722 }
1723 sResolvedPaths += data->path.GetWinPathString() + _T("\n");
1724 }
1725 }
1726 }
1727 }
1728 m_ProgList.Invalidate();
1729 CString info = BuildInfoString();
1730 SetDlgItemText(IDC_INFOTEXT, info);
1731
1732 if (!sResolvedPaths.IsEmpty())
1733 {
1734 CString msg;
1735 msg.Format(IDS_SVNPROGRESS_RESOLVED, (LPCTSTR)sResolvedPaths);
1736 CMessageBox::Show(m_hWnd, msg, _T("TortoiseGit"), MB_OK | MB_ICONINFORMATION);
1737 }
1738 }
1739 break;
1740 case ID_LOG:
1741 {
1742 svn_revnum_t rev = m_RevisionEnd;
1743 if (!data->basepath.IsEmpty())
1744 {
1745 StringRevMap::iterator it = m_FinishedRevMap.find(data->basepath.GetSVNApiPath(pool));
1746 if (it != m_FinishedRevMap.end())
1747 rev = it->second;
1748 }
1749 CLogDlg dlg;
1750 // fetch the log from HEAD, not the revision we updated to:
1751 // the path might be inside an external folder which has its own
1752 // revisions.
1753 CString sPath = GetPathFromColumnText(data->sPathColumnText);
1754 dlg.SetParams(CTGitPath(sPath), SVNRev(), SVNRev::REV_HEAD, 1, -1, TRUE);
1755 dlg.DoModal();
1756 }
1757 break;
1758 case ID_OPENWITH:
1759 bOpenWith = true;
1760 case ID_OPEN:
1761 {
1762 int ret = 0;
1763 CString sWinPath = GetPathFromColumnText(data->sPathColumnText);
1764 if (!bOpenWith)
1765 ret = (int)ShellExecute(this->m_hWnd, NULL, (LPCTSTR)sWinPath, NULL, NULL, SW_SHOWNORMAL);
1766 if ((ret <= HINSTANCE_ERROR)||bOpenWith)
1767 {
1768 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
1769 cmd += sWinPath + _T(" ");
1770 CAppUtils::LaunchApplication(cmd, NULL, false);
1771 }
1772 }
1773 }
1774 DialogEnableWindow(IDOK, TRUE);
1775 theApp.DoWaitCursor(-1);
1776 } // if (bAdded)
1777 }
1778 }
1779 }
1780 #endif
1781 }
1782
1783 void CGitProgressDlg::OnEnSetfocusInfotext()
1784 {
1785 CString sTemp;
1786 GetDlgItemText(IDC_INFOTEXT, sTemp);
1787 if (sTemp.IsEmpty())
1788 GetDlgItem(IDC_INFOTEXT)->HideCaret();
1789 }
1790
1791 void CGitProgressDlg::OnLvnBegindragSvnprogress(NMHDR* , LRESULT *pResult)
1792 {
1793 //LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1794 #if 0
1795 int selIndex = m_ProgList.GetSelectionMark();
1796 if (selIndex < 0)
1797 return;
1798
1799 CDropFiles dropFiles; // class for creating DROPFILES struct
1800
1801 int index;
1802 POSITION pos = m_ProgList.GetFirstSelectedItemPosition();
1803 while ( (index = m_ProgList.GetNextSelectedItem(pos)) >= 0 )
1804 {
1805 NotificationData * data = m_arData[index];
1806
1807 if ( data->kind==svn_node_file || data->kind==svn_node_dir )
1808 {
1809 CString sPath = GetPathFromColumnText(data->sPathColumnText);
1810
1811 dropFiles.AddFile( sPath );
1812 }
1813 }
1814
1815 if ( dropFiles.GetCount()>0 )
1816 {
1817 dropFiles.CreateStructure();
1818 }
1819 #endif
1820 *pResult = 0;
1821 }
1822
1823 void CGitProgressDlg::OnSize(UINT nType, int cx, int cy)
1824 {
1825 CResizableStandAloneDialog::OnSize(nType, cx, cy);
1826 if ((nType == SIZE_RESTORED)&&(m_bLastVisible))
1827 {
1828 if(!m_ProgList.m_hWnd)
1829 return;
1830
1831 int count = m_ProgList.GetItemCount();
1832 if (count > 0)
1833 m_ProgList.EnsureVisible(count-1, false);
1834 }
1835 }
1836
1837 //////////////////////////////////////////////////////////////////////////
1838 /// commands
1839 //////////////////////////////////////////////////////////////////////////
1840 bool CGitProgressDlg::CmdAdd(CString& sWindowTitle, bool& localoperation)
1841 {
1842 localoperation = true;
1843 sWindowTitle.LoadString(IDS_PROGRS_TITLE_ADD);
1844 CAppUtils::SetWindowTitle(m_hWnd, m_targetPathList.GetCommonRoot().GetUIPathString(), sWindowTitle);
1845 SetBackgroundImage(IDI_ADD_BKG);
1846 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_ADD)));
1847
1848 if (CRegDWORD(_T("Software\\TortoiseGit\\UseLibgit2"), TRUE) == TRUE)
1849 {
1850 git_repository *repo = NULL;
1851 git_index *index;
1852
1853 CStringA gitdir = CUnicodeUtils::GetMulti(CTGitPath(g_Git.m_CurrentDir).GetGitPathString(), CP_UTF8);
1854 if (git_repository_open(&repo, gitdir.GetBuffer()))
1855 {
1856 gitdir.ReleaseBuffer();
1857 ReportGitError();
1858 return false;
1859 }
1860 gitdir.ReleaseBuffer();
1861
1862 git_config * config;
1863 git_config_new(&config);
1864
1865 CStringA projectConfigA = CUnicodeUtils::GetMulti(g_Git.GetGitLocalConfig(), CP_UTF8);
1866 if (git_config_add_file_ondisk(config, projectConfigA.GetBuffer(), 4, FALSE))
1867 {
1868 projectConfigA.ReleaseBuffer();
1869 ReportGitError();
1870 git_config_free(config);
1871 git_repository_free(repo);
1872 return false;
1873 }
1874 projectConfigA.ReleaseBuffer();
1875 CString globalConfig = g_Git.GetGitGlobalConfig();
1876 if (PathFileExists(globalConfig))
1877 {
1878 CStringA globalConfigA = CUnicodeUtils::GetMulti(globalConfig, CP_UTF8);
1879 if (git_config_add_file_ondisk(config, globalConfigA.GetBuffer(), 3, FALSE))
1880 {
1881 globalConfigA.ReleaseBuffer();
1882 ReportGitError();
1883 git_config_free(config);
1884 git_repository_free(repo);
1885 return false;
1886 }
1887 globalConfigA.ReleaseBuffer();
1888 }
1889 CString globalXDGConfig = g_Git.GetGitGlobalXDGConfig();
1890 if (PathFileExists(globalXDGConfig))
1891 {
1892 CStringA globalXDGConfigA = CUnicodeUtils::GetMulti(globalXDGConfig, CP_UTF8);
1893 if (git_config_add_file_ondisk(config, globalXDGConfigA.GetBuffer(), 2, FALSE))
1894 {
1895 globalXDGConfigA.ReleaseBuffer();
1896 ReportGitError();
1897 git_config_free(config);
1898 git_repository_free(repo);
1899 return false;
1900 }
1901 globalXDGConfigA.ReleaseBuffer();
1902 }
1903 CString systemConfig = g_Git.GetGitSystemConfig();
1904 if (!systemConfig.IsEmpty())
1905 {
1906 CStringA systemConfigA = CUnicodeUtils::GetMulti(systemConfig, CP_UTF8);
1907 if (git_config_add_file_ondisk(config, systemConfigA.GetBuffer(), 1, FALSE))
1908 {
1909 systemConfigA.ReleaseBuffer();
1910 ReportGitError();
1911 git_config_free(config);
1912 git_repository_free(repo);
1913 return false;
1914 }
1915 systemConfigA.ReleaseBuffer();
1916 }
1917
1918 git_repository_set_config(repo, config);
1919
1920 if (git_repository_index(&index, repo))
1921 {
1922 ReportGitError();
1923 git_repository_free(repo);
1924 return false;
1925 }
1926 if (git_index_read(index))
1927 {
1928 ReportGitError();
1929 git_index_free(index);
1930 git_repository_free(repo);
1931 return false;
1932 }
1933
1934 for(int i=0;i<m_targetPathList.GetCount();i++)
1935 {
1936 if (git_index_add_from_workdir(index, CStringA(CUnicodeUtils::GetMulti(m_targetPathList[i].GetGitPathString(), CP_UTF8)).GetBuffer()))
1937 {
1938 ReportGitError();
1939 git_index_free(index);
1940 git_repository_free(repo);
1941 return false;
1942 }
1943 Notify(m_targetPathList[i],git_wc_notify_add);
1944 }
1945
1946 if (git_index_write(index))
1947 {
1948 ReportGitError();
1949 git_index_free(index);
1950 git_repository_free(repo);
1951 return false;
1952 }
1953
1954 git_index_free(index);
1955 git_repository_free(repo);
1956 }
1957 else
1958 {
1959 CMassiveGitTask mgt(L"add -f");
1960 mgt.ExecuteWithNotify(&m_targetPathList, m_bCancelled, git_wc_notify_add, this, &CGitProgressDlg::Notify);
1961 }
1962
1963 CShellUpdater::Instance().AddPathsForUpdate(m_targetPathList);
1964
1965 this->GetDlgItem(IDC_LOGBUTTON)->SetWindowText(_T("Commit ..."));
1966 this->GetDlgItem(IDC_LOGBUTTON)->ShowWindow(SW_SHOW);
1967 return true;
1968 }
1969
1970 bool CGitProgressDlg::CmdCopy(CString& /*sWindowTitle*/, bool& /*localoperation*/)
1971 {
1972 #if 0
1973 ASSERT(m_targetPathList.GetCount() == 1);
1974 sWindowTitle.LoadString(IDS_PROGRS_TITLE_COPY);
1975 SetWindowText(sWindowTitle); // needs to be updated, see TSVN rev. 21375
1976 SetBackgroundImage(IDI_COPY_BKG);
1977
1978 CString sCmdInfo;
1979 sCmdInfo.Format(IDS_PROGRS_CMD_COPY,
1980 m_targetPathList[0].IsUrl() ? (LPCTSTR)m_targetPathList[0].GetSVNPathString() : m_targetPathList[0].GetWinPath(),
1981 (LPCTSTR)m_url.GetSVNPathString(), (LPCTSTR)m_Revision.ToString());
1982 ReportCmd(sCmdInfo);
1983
1984 if (!Copy(m_targetPathList, m_url, m_Revision, m_pegRev, m_sMessage))
1985 {
1986 ReportSVNError();
1987 return false;
1988 }
1989 if (m_options & ProgOptSwitchAfterCopy)
1990 {
1991 sCmdInfo.Format(IDS_PROGRS_CMD_SWITCH,
1992 m_targetPathList[0].GetWinPath(),
1993 (LPCTSTR)m_url.GetSVNPathString(), (LPCTSTR)m_Revision.ToString());
1994 ReportCmd(sCmdInfo);
1995 if (!Switch(m_targetPathList[0], m_url, SVNRev::REV_HEAD, SVNRev::REV_HEAD, m_depth, TRUE, m_options & ProgOptIgnoreExternals))
1996 {
1997 if (!Switch(m_targetPathList[0], m_url, SVNRev::REV_HEAD, m_Revision, m_depth, TRUE, m_options & ProgOptIgnoreExternals))
1998 {
1999 ReportSVNError();
2000 return false;
2001 }
2002 }
2003 }
2004 else
2005 {
2006 if (SVN::PathIsURL(m_url))
2007 {
2008 CString sMsg(MAKEINTRESOURCE(IDS_PROGRS_COPY_WARNING));
2009 ReportNotification(sMsg);
2010 }
2011 }
2012 #endif
2013 return true;
2014 }
2015
2016 bool CGitProgressDlg::CmdExport(CString& /*sWindowTitle*/, bool& /*localoperation*/)
2017 {
2018 #if 0
2019 ASSERT(m_targetPathList.GetCount() == 1);
2020 sWindowTitle.LoadString(IDS_PROGRS_TITLE_EXPORT);
2021 sWindowTitle = m_url.GetUIFileOrDirectoryName()+_T(" - ")+sWindowTitle;
2022 SetWindowText(sWindowTitle); // needs to be updated, see TSVN rev. 21375
2023 SetBackgroundImage(IDI_EXPORT_BKG);
2024 CString eol;
2025 if (m_options & ProgOptEolCRLF)
2026 eol = _T("CRLF");
2027 if (m_options & ProgOptEolLF)
2028 eol = _T("LF");
2029 if (m_options & ProgOptEolCR)
2030 eol = _T("CR");
2031 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_EXPORT)));
2032 if (!Export(m_url, m_targetPathList[0], m_Revision, m_Revision, TRUE, m_options & ProgOptIgnoreExternals, m_depth, NULL, FALSE, eol))
2033 {
2034 ReportSVNError();
2035 return false;
2036 }
2037 #endif
2038 return true;
2039 }
2040
2041 bool CGitProgressDlg::CmdRename(CString& /*sWindowTitle*/, bool& /*localoperation*/)
2042 {
2043 #if 0
2044 ASSERT(m_targetPathList.GetCount() == 1);
2045 if ((!m_targetPathList[0].IsUrl())&&(!m_url.IsUrl()))
2046 localoperation = true;
2047 sWindowTitle.LoadString(IDS_PROGRS_TITLE_RENAME);
2048 SetWindowText(sWindowTitle); // needs to be updated, see TSVN rev. 21375
2049 SetBackgroundImage(IDI_RENAME_BKG);
2050 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_RENAME)));
2051 if (!Move(m_targetPathList, m_url, m_Revision, m_sMessage))
2052 {
2053 ReportSVNError();
2054 return false;
2055 }
2056 #endif
2057 return true;
2058 }
2059
2060 bool CGitProgressDlg::CmdResolve(CString& sWindowTitle, bool& localoperation)
2061 {
2062
2063 localoperation = true;
2064 ASSERT(m_targetPathList.GetCount() == 1);
2065 sWindowTitle.LoadString(IDS_PROGRS_TITLE_RESOLVE);
2066 CAppUtils::SetWindowTitle(m_hWnd, m_targetPathList.GetCommonRoot().GetUIPathString(), sWindowTitle);
2067 SetBackgroundImage(IDI_RESOLVE_BKG);
2068 // check if the file may still have conflict markers in it.
2069 //BOOL bMarkers = FALSE;
2070
2071 for(int i=0;i<m_targetPathList.GetCount();i++)
2072 {
2073 CString cmd,out,tempmergefile;
2074 cmd.Format(_T("git.exe add -f -- \"%s\""),m_targetPathList[i].GetGitPathString());
2075 if (g_Git.Run(cmd, &out, CP_UTF8))
2076 {
2077 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
2078 m_bErrorsOccurred=true;
2079 return false;
2080 }
2081
2082 CAppUtils::RemoveTempMergeFile((CTGitPath &)m_targetPathList[i]);
2083
2084 Notify(m_targetPathList[i],git_wc_notify_resolved);
2085 }
2086 #if 0
2087 if ((m_options & ProgOptSkipConflictCheck) == 0)
2088 {
2089 try
2090 {
2091 for (INT_PTR fileindex=0; (fileindex<m_targetPathList.GetCount()) && (bMarkers==FALSE); ++fileindex)
2092 {
2093 if (!m_targetPathList[fileindex].IsDirectory())
2094 {
2095 CStdioFile file(m_targetPathList[fileindex].GetWinPath(), CFile::typeBinary | CFile::modeRead);
2096 CString strLine = _T("");
2097 while (file.ReadString(strLine))
2098 {
2099 if (strLine.Find(_T("<<<<<<<"))==0)
2100 {
2101 bMarkers = TRUE;
2102 break;
2103 }
2104 }
2105 file.Close();
2106 }
2107 }
2108 }
2109 catch (CFileException* pE)
2110 {
2111 TRACE(_T("CFileException in Resolve!\n"));
2112 TCHAR error[10000] = {0};
2113 pE->GetErrorMessage(error, 10000);
2114 ReportError(error);
2115 pE->Delete();
2116 return false;
2117 }
2118 }
2119 if (bMarkers)
2120 {
2121 if (CMessageBox::Show(m_hWnd, IDS_PROGRS_REVERTMARKERS, IDS_APPNAME, MB_YESNO | MB_ICONQUESTION)==IDYES)
2122 {
2123 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_RESOLVE)));
2124 for (INT_PTR fileindex=0; fileindex<m_targetPathList.GetCount(); ++fileindex)
2125 Resolve(m_targetPathList[fileindex], svn_wc_conflict_choose_merged, true);
2126 }
2127 }
2128 else
2129 {
2130 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_RESOLVE)));
2131 for (INT_PTR fileindex=0; fileindex<m_targetPathList.GetCount(); ++fileindex)
2132 Resolve(m_targetPathList[fileindex], svn_wc_conflict_choose_merged, true);
2133 }
2134 #endif
2135 CShellUpdater::Instance().AddPathsForUpdate(m_targetPathList);
2136
2137 this->GetDlgItem(IDC_LOGBUTTON)->SetWindowText(_T("Commit ..."));
2138 this->GetDlgItem(IDC_LOGBUTTON)->ShowWindow(SW_SHOW);
2139
2140 return true;
2141 }
2142
2143 bool CGitProgressDlg::CmdRevert(CString& sWindowTitle, bool& localoperation)
2144 {
2145
2146 localoperation = true;
2147 sWindowTitle.LoadString(IDS_PROGRS_TITLE_REVERT);
2148 CAppUtils::SetWindowTitle(m_hWnd, m_targetPathList.GetCommonRoot().GetUIPathString(), sWindowTitle);
2149 SetBackgroundImage(IDI_REVERT_BKG);
2150
2151 CTGitPathList delList;
2152 for(int i=0;i<m_selectedPaths.GetCount();i++)
2153 {
2154 CTGitPath path;
2155 int action;
2156 path.SetFromWin(g_Git.m_CurrentDir+_T("\\")+m_selectedPaths[i].GetWinPath());
2157 action = m_selectedPaths[i].m_Action;
2158 /* rename file can't delete because it needs original file*/
2159 if((!(action & CTGitPath::LOGACTIONS_ADDED)) &&
2160 (!(action & CTGitPath::LOGACTIONS_REPLACED)))
2161 delList.AddPath(path);
2162 }
2163 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))
2164 delList.DeleteAllFiles(true);
2165
2166 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_REVERT)));
2167 for(int i=0;i<m_selectedPaths.GetCount();i++)
2168 {
2169 if(g_Git.Revert(_T("HEAD"), (CTGitPath&)m_selectedPaths[i]))
2170 {
2171 CMessageBox::Show(NULL,_T("Revert Fail"),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
2172 m_bErrorsOccurred=true;
2173 return false;
2174 }
2175 Notify(m_selectedPaths[i],git_wc_notify_revert);
2176 }
2177
2178 CShellUpdater::Instance().AddPathsForUpdate(m_selectedPaths);
2179
2180 return true;
2181 }
2182
2183 bool CGitProgressDlg::CmdSwitch(CString& /*sWindowTitle*/, bool& /*localoperation*/)
2184 {
2185 #if 0
2186 ASSERT(m_targetPathList.GetCount() == 1);
2187 SVNStatus st;
2188 sWindowTitle.LoadString(IDS_PROGRS_TITLE_SWITCH);
2189 SetWindowText(sWindowTitle); // needs to be updated, see TSVN rev. 21375
2190 SetBackgroundImage(IDI_SWITCH_BKG);
2191 LONG rev = 0;
2192 if (st.GetStatus(m_targetPathList[0]) != (-2))
2193 {
2194 if (st.status->entry != NULL)
2195 {
2196 rev = st.status->entry->revision;
2197 }
2198 }
2199
2200 CString sCmdInfo;
2201 sCmdInfo.Format(IDS_PROGRS_CMD_SWITCH,
2202 m_targetPathList[0].GetWinPath(), (LPCTSTR)m_url.GetSVNPathString(),
2203 (LPCTSTR)m_Revision.ToString());
2204 ReportCmd(sCmdInfo);
2205
2206 bool depthIsSticky = true;
2207 if (m_depth == svn_depth_unknown)
2208 depthIsSticky = false;
2209 if (!Switch(m_targetPathList[0], m_url, m_Revision, m_Revision, m_depth, depthIsSticky, m_options & ProgOptIgnoreExternals))
2210 {
2211 ReportSVNError();
2212 return false;
2213 }
2214 m_UpdateStartRevMap[m_targetPathList[0].GetSVNApiPath(pool)] = rev;
2215 if ((m_RevisionEnd >= 0)&&(rev >= 0)
2216 &&((LONG)m_RevisionEnd > (LONG)rev))
2217 {
2218 GetDlgItem(IDC_LOGBUTTON)->ShowWindow(SW_SHOW);
2219 }
2220 #endif
2221 return true;
2222 }
2223
2224 void CGitProgressDlg::OnBnClickedNoninteractive()
2225 {
2226 LRESULT res = ::SendMessage(GetDlgItem(IDC_NONINTERACTIVE)->GetSafeHwnd(), BM_GETCHECK, 0, 0);
2227 m_AlwaysConflicted = (res == BST_CHECKED);
2228 CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseGit\\MergeNonInteractive"), FALSE);
2229 nonint = m_AlwaysConflicted;
2230 }
2231
2232 CString CGitProgressDlg::GetPathFromColumnText(const CString& sColumnText)
2233 {
2234 CString sPath = CPathUtils::ParsePathInString(sColumnText);
2235 if (sPath.Find(':')<0)
2236 {
2237 // the path is not absolute: add the common root of all paths to it
2238 sPath = m_targetPathList.GetCommonRoot().GetDirectory().GetWinPathString() + _T("\\") + CPathUtils::ParsePathInString(sColumnText);
2239 }
2240 return sPath;
2241 }
2242
2243 bool CGitProgressDlg::CmdSendMail(CString& sWindowTitle, bool& /*localoperation*/)
2244 {
2245 sWindowTitle.LoadString(IDS_PROGRS_TITLE_SENDMAIL);
2246 CAppUtils::SetWindowTitle(m_hWnd, m_targetPathList.GetCommonRoot().GetUIPathString(), sWindowTitle);
2247 //SetBackgroundImage(IDI_ADD_BKG);
2248 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_SENDMAIL)));
2249 bool ret=true;
2250 if(this->m_SendMailFlags&SENDMAIL_COMBINED)
2251 {
2252 CString error;
2253 CTGitPath path;
2254 Notify(path,git_wc_notify_sendmail_start);
2255 CString err;
2256 int retry=0;
2257 while(retry <3)
2258 {
2259 if(!!CPatch::SendPatchesCombined(m_targetPathList,m_SendMailTO,m_SendMailCC,m_SendMailSubject,!!(this->m_SendMailFlags&SENDMAIL_ATTACHMENT),!!(this->m_SendMailFlags&SENDMAIL_MAPI),&err))
2260 {
2261 Notify(path,git_wc_notify_sendmail_error,ret,&err);
2262 ret = false;
2263 }
2264 else
2265 {
2266 break;
2267 }
2268
2269 retry++;
2270 if (retry < 3)
2271 Notify(path,git_wc_notify_sendmail_retry,ret,&err);
2272 Sleep(2000);
2273 if(m_bCancelled)
2274 {
2275 CString str(_T("User Canceled"));
2276 Notify(path,git_wc_notify_sendmail_error,ret,&str);
2277 return false;
2278 }
2279 }
2280 if (ret)
2281 Notify(path,git_wc_notify_sendmail_done,ret);
2282 }
2283 else
2284 {
2285 for(int i=0;ret && i<m_targetPathList.GetCount();i++)
2286 {
2287 CPatch patch;
2288 Notify(m_targetPathList[i],git_wc_notify_sendmail_start);
2289
2290 int retry=0;
2291 while(retry<3)
2292 {
2293 if(!!patch.Send((CString&)m_targetPathList[i].GetWinPathString(),this->m_SendMailTO,
2294 this->m_SendMailCC,!!(this->m_SendMailFlags&SENDMAIL_ATTACHMENT),!!(this->m_SendMailFlags&SENDMAIL_MAPI)))
2295 {
2296 Notify(m_targetPathList[i],git_wc_notify_sendmail_error,ret,&patch.m_LastError);
2297 ret = false;
2298
2299 }
2300 else
2301 {
2302 ret = true;
2303 break;
2304 }
2305 retry++;
2306 if (retry < 3)
2307 Notify(m_targetPathList[i],git_wc_notify_sendmail_retry,ret,&patch.m_LastError);
2308 Sleep(2000);
2309 if(m_bCancelled)
2310 {
2311 CString str(_T("User Canceled"));
2312 Notify(m_targetPathList[i],git_wc_notify_sendmail_error,ret,&str);
2313 return false;
2314 }
2315 }
2316 if (ret)
2317 Notify(m_targetPathList[i],git_wc_notify_sendmail_done,ret);
2318 }
2319 }
2320 return ret;
2321 }
2322
2323 LRESULT CGitProgressDlg::OnTaskbarBtnCreated(WPARAM /*wParam*/, LPARAM /*lParam*/)
2324 {
2325 m_pTaskbarList.Release();
2326 m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList);
2327 return 0;
2328 }
Windows Explorer Extension to Operate Git