1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2012 - TortoiseGit
4 // Copyright (C) 2003-2008 - TortoiseSVN
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.
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.
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.
21 #include "TortoiseProc.h"
22 #include "messagebox.h"
23 #include "GITProgressDlg.h"
27 #include "GitStatus.h"
29 #include "PathUtils.h"
30 #include "StringUtils.h"
32 #include "UnicodeUtils.h"
33 #include "SoundUtils.h"
36 #include "DropFiles.h"
37 //#include "GitLogHelper.h"
38 #include "RegHistory.h"
39 //#include "ConflictResolveDlg.h"
41 #include "ShellUpdater.h"
43 #include "BugTraqAssociations.h"
45 #include "MassiveGitTask.h"
47 #include "SmartHandle.h"
49 static UINT WM_GITPROGRESS
= RegisterWindowMessage(_T("TORTOISEGIT_GITPROGRESS_MSG"));
51 BOOL
CGitProgressDlg::m_bAscending
= FALSE
;
52 int CGitProgressDlg::m_nSortedColumn
= -1;
54 #define TRANSFERTIMER 100
55 #define VISIBLETIMER 101
57 enum GITProgressDlgContextMenuCommands
59 // needs to start with 1, since 0 is the return value if *nothing* is clicked on in the context menu
72 IMPLEMENT_DYNAMIC(CGitProgressDlg
, CResizableStandAloneDialog
)
73 CGitProgressDlg::CGitProgressDlg(CWnd
* pParent
/*=NULL*/)
74 : CResizableStandAloneDialog(CGitProgressDlg::IDD
, pParent
)
78 , m_Revision(_T("HEAD"))
80 , m_bLockWarning(false)
81 , m_bLockExists(false)
82 , m_bThreadRunning(FALSE
)
84 , m_bErrorsOccurred(FALSE
)
85 , m_bMergesAddsDeletesOccurred(FALSE
)
87 , m_options(ProgOptNone
)
88 , m_dwCloseOnEnd((DWORD
)-1)
89 , m_bFinishedItemAdded(false)
90 , m_bLastVisible(false)
91 // , m_depth(svn_depth_unknown)
93 , m_itemCountTotal(-1)
94 , m_AlwaysConflicted(false)
95 , m_BugTraqProvider(NULL
)
96 , sDryRun(MAKEINTRESOURCE(IDS_PROGRS_DRYRUN
))
97 , sRecordOnly(MAKEINTRESOURCE(IDS_MERGE_RECORDONLY
))
102 CGitProgressDlg::~CGitProgressDlg()
104 for (size_t i
=0; i
<m_arData
.size(); i
++)
108 if(m_pThread
!= NULL
)
114 void CGitProgressDlg::DoDataExchange(CDataExchange
* pDX
)
116 CResizableStandAloneDialog::DoDataExchange(pDX
);
117 DDX_Control(pDX
, IDC_SVNPROGRESS
, m_ProgList
);
120 BEGIN_MESSAGE_MAP(CGitProgressDlg
, CResizableStandAloneDialog
)
121 ON_BN_CLICKED(IDC_LOGBUTTON
, OnBnClickedLogbutton
)
122 ON_NOTIFY(NM_CUSTOMDRAW
, IDC_SVNPROGRESS
, OnNMCustomdrawSvnprogress
)
124 ON_NOTIFY(NM_DBLCLK
, IDC_SVNPROGRESS
, OnNMDblclkSvnprogress
)
125 ON_NOTIFY(HDN_ITEMCLICK
, 0, OnHdnItemclickSvnprogress
)
128 ON_REGISTERED_MESSAGE(WM_GITPROGRESS
, OnGitProgress
)
130 ON_EN_SETFOCUS(IDC_INFOTEXT
, &CGitProgressDlg::OnEnSetfocusInfotext
)
131 ON_NOTIFY(LVN_BEGINDRAG
, IDC_SVNPROGRESS
, &CGitProgressDlg::OnLvnBegindragSvnprogress
)
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
)
139 BOOL
CGitProgressDlg::Cancel()
144 LRESULT
CGitProgressDlg::OnShowConflictResolver(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
147 CConflictResolveDlg
dlg(this);
148 const svn_wc_conflict_description_t
*description
= (svn_wc_conflict_description_t
*)lParam
;
151 dlg
.SetConflictDescription(description
);
154 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_PAUSED
);
156 if (dlg
.DoModal() == IDOK
)
158 if (dlg
.GetResult() == svn_wc_conflict_choose_postpone
)
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);
166 m_mergedfile
= dlg
.GetMergedFile();
167 m_bCancelled
= dlg
.IsCancelled();
169 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_INDETERMINATE
);
170 return dlg
.GetResult();
173 return svn_wc_conflict_choose_postpone
;
178 svn_wc_conflict_choice_t
CGitProgressDlg::ConflictResolveCallback(const svn_wc_conflict_description_t
*description
, CString
& mergedfile
)
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
))
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
;
191 return svn_wc_conflict_choose_postpone
;
194 void CGitProgressDlg::AddItemToList()
196 int totalcount
= m_ProgList
.GetItemCount();
198 m_ProgList
.SetItemCountEx(totalcount
+1, LVSICF_NOSCROLL
|LVSICF_NOINVALIDATEALL
);
199 // make columns width fit
200 if (iFirstResized
< 30)
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.
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))
215 nEnsureVisibleCount
++;
216 m_bLastVisible
= true;
220 nEnsureVisibleCount
= 0;
222 m_bLastVisible
= false;
227 BOOL
CGitProgressDlg::Notify(const CTGitPath
& path
, git_wc_notify_action_t action
,
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
240 bool bNoNotify
= false;
241 bool bDoAddData
= true;
242 NotificationData
* data
= new NotificationData();
244 data
->action
= action
;
245 data
->sPathColumnText
=path
.GetGitPathString();
246 data
->bAuxItem
= false;
249 data
->mime_type
= mime_type
;
250 data
->content_state
= content_state
;
251 data
->prop_state
= prop_state
;
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
;
261 data
->merge_range
= *range
;
263 switch (data
->action
)
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))
269 // data->color = m_Colors.GetColor(CColors::Conflict);
270 // data->bConflictedActionItem = true;
271 // data->sActionColumnText.LoadString(IDS_SVNACTION_CONFLICTED);
276 // m_bMergesAddsDeletesOccurred = true;
277 data
->sActionColumnText
.LoadString(IDS_SVNACTION_ADD
);
278 data
->color
= m_Colors
.GetColor(CColors::Added
);
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
);
287 case git_wc_notify_sendmail_error
:
288 data
->bAuxItem
= true;
289 data
->sActionColumnText
.LoadString(IDS_SVNACTION_SENDMAIL_ERROR
);
291 data
->sPathColumnText
= *strErr
;
293 data
->sPathColumnText
.Empty();
294 data
->color
= m_Colors
.GetColor(CColors::Modified
);
297 case git_wc_notify_sendmail_done
:
299 data
->sActionColumnText
.LoadString(IDS_SVNACTION_SENDMAIL_DONE
);
300 data
->sPathColumnText
.Empty();
301 data
->color
= m_Colors
.GetColor(CColors::Modified
);
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
);
311 case git_wc_notify_resolved
:
312 data
->sActionColumnText
.LoadString(IDS_SVNACTION_RESOLVE
);
315 case git_wc_notify_revert
:
316 data
->sActionColumnText
.LoadString(IDS_SVNACTION_REVERT
);
320 case svn_wc_notify_commit_added
:
321 data
->sActionColumnText
.LoadString(IDS_SVNACTION_ADDING
);
322 data
->color
= m_Colors
.GetColor(CColors::Added
);
324 case svn_wc_notify_copy
:
325 data
->sActionColumnText
.LoadString(IDS_SVNACTION_COPY
);
327 case svn_wc_notify_commit_modified
:
328 data
->sActionColumnText
.LoadString(IDS_SVNACTION_MODIFIED
);
329 data
->color
= m_Colors
.GetColor(CColors::Modified
);
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
);
337 case svn_wc_notify_commit_deleted
:
338 data
->sActionColumnText
.LoadString(IDS_SVNACTION_DELETING
);
339 data
->color
= m_Colors
.GetColor(CColors::Deleted
);
341 case svn_wc_notify_restore
:
342 data
->sActionColumnText
.LoadString(IDS_SVNACTION_RESTORE
);
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
);
350 case svn_wc_notify_exists
:
351 if ((data
->content_state
== svn_wc_notify_state_conflicted
) || (data
->prop_state
== svn_wc_notify_state_conflicted
))
353 data
->color
= m_Colors
.GetColor(CColors::Conflict
);
354 data
->bConflictedActionItem
= true;
356 data
->sActionColumnText
.LoadString(IDS_SVNACTION_CONFLICTED
);
358 else if ((data
->content_state
== svn_wc_notify_state_merged
) || (data
->prop_state
== svn_wc_notify_state_merged
))
360 data
->color
= m_Colors
.GetColor(CColors::Merged
);
361 m_bMergesAddsDeletesOccurred
= true;
362 data
->sActionColumnText
.LoadString(IDS_SVNACTION_MERGED
);
365 data
->sActionColumnText
.LoadString(IDS_SVNACTION_EXISTS
);
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
)))
379 if ((data
->content_state
== svn_wc_notify_state_conflicted
) || (data
->prop_state
== svn_wc_notify_state_conflicted
))
381 data
->color
= m_Colors
.GetColor(CColors::Conflict
);
382 data
->bConflictedActionItem
= true;
384 data
->sActionColumnText
.LoadString(IDS_SVNACTION_CONFLICTED
);
386 else if ((data
->content_state
== svn_wc_notify_state_merged
) || (data
->prop_state
== svn_wc_notify_state_merged
))
388 data
->color
= m_Colors
.GetColor(CColors::Merged
);
389 m_bMergesAddsDeletesOccurred
= true;
390 data
->sActionColumnText
.LoadString(IDS_SVNACTION_MERGED
);
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
)))
395 data
->sActionColumnText
.LoadString(IDS_SVNACTION_UPDATE
);
402 if (lock_state
== svn_wc_notify_lock_state_unlocked
)
404 CString
temp(MAKEINTRESOURCE(IDS_SVNACTION_UNLOCKED
));
405 data
->sActionColumnText
+= _T(", ") + temp
;
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;
416 case svn_wc_notify_update_completed
:
418 data
->sActionColumnText
.LoadString(IDS_SVNACTION_COMPLETED
);
419 data
->bAuxItem
= true;
420 bool bEmpty
= !!m_ExtStack
.IsEmpty();
422 data
->sPathColumnText
.Format(IDS_PROGRS_PATHATREV
, (LPCTSTR
)m_ExtStack
.RemoveHead(), rev
);
424 data
->sPathColumnText
.Format(IDS_PROGRS_ATREV
, rev
);
426 if ((m_nConflicts
>0)&&(bEmpty
))
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
);
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
441 if (!m_basePath
.IsEmpty())
442 m_FinishedRevMap
[m_basePath
.GetSVNApiPath(pool
)] = rev
;
444 m_bFinishedItemAdded
= true;
447 case svn_wc_notify_commit_postfix_txdelta
:
448 data
->sActionColumnText
.LoadString(IDS_SVNACTION_POSTFIX
);
450 case svn_wc_notify_failed_revert
:
451 data
->sActionColumnText
.LoadString(IDS_SVNACTION_FAILEDREVERT
);
453 case svn_wc_notify_status_completed
:
454 case svn_wc_notify_status_external
:
455 data
->sActionColumnText
.LoadString(IDS_SVNACTION_STATUS
);
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
))
460 data
->sActionColumnText
.LoadString(IDS_SVNACTION_SKIPMISSING
);
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
);
468 data
->sActionColumnText
.LoadString(IDS_SVNACTION_SKIP
);
470 case svn_wc_notify_locked
:
471 if ((lock
)&&(lock
->owner
))
472 data
->sActionColumnText
.Format(IDS_SVNACTION_LOCKEDBY
, (LPCTSTR
)CUnicodeUtils::GetUnicode(lock
->owner
));
474 case svn_wc_notify_unlocked
:
475 data
->sActionColumnText
.LoadString(IDS_SVNACTION_UNLOCKED
);
477 case svn_wc_notify_failed_lock
:
478 data
->sActionColumnText
.LoadString(IDS_SVNACTION_FAILEDLOCK
);
479 m_arData
.push_back(data
);
481 ReportError(SVN::GetErrorString(err
));
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;
488 case svn_wc_notify_failed_unlock
:
489 data
->sActionColumnText
.LoadString(IDS_SVNACTION_FAILEDUNLOCK
);
490 m_arData
.push_back(data
);
492 ReportError(SVN::GetErrorString(err
));
494 if (err
->apr_err
== SVN_ERR_FS_OUT_OF_DATE
)
495 m_bLockWarning
= true;
497 case svn_wc_notify_changelist_set
:
498 data
->sActionColumnText
.Format(IDS_SVNACTION_CHANGELISTSET
, (LPCTSTR
)data
->changelistname
);
500 case svn_wc_notify_changelist_clear
:
501 data
->sActionColumnText
.LoadString(IDS_SVNACTION_CHANGELISTCLEAR
);
503 case svn_wc_notify_changelist_moved
:
504 data
->sActionColumnText
.Format(IDS_SVNACTION_CHANGELISTMOVED
, (LPCTSTR
)data
->changelistname
);
506 case svn_wc_notify_foreign_merge_begin
:
507 case svn_wc_notify_merge_begin
:
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
);
517 data
->sActionColumnText
.Format(IDS_SVNACTION_MERGEBEGINMULTIPLEREVERSE
, data
->merge_range
.start
, data
->merge_range
.end
+ 1);
518 data
->bAuxItem
= true;
523 } // switch (data->action)
531 m_arData
.push_back(data
);
533 if ((!data
->bAuxItem
) && (m_itemCount
> 0))
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
);
543 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
544 m_pTaskbarList
->SetProgressValue(m_hWnd
, m_itemCountTotal
-m_itemCount
, m_itemCountTotal
);
548 //if ((action == svn_wc_notify_commit_postfix_txdelta)&&(bSecondResized == FALSE))
551 // bSecondResized = TRUE;
559 CString
CGitProgressDlg::BuildInfoString()
562 if(this->m_Command
== GitProgress_Resolve
)
563 infotext
= _T("You need commit your change after resolve conflict");
580 for (size_t i
=0; i
<m_arData
.size(); ++i
)
582 const NotificationData
* dat
= m_arData
[i
];
585 case svn_wc_notify_add
:
586 case svn_wc_notify_update_add
:
587 case svn_wc_notify_commit_added
:
588 if (dat
->bConflictedActionItem
)
593 case svn_wc_notify_copy
:
596 case svn_wc_notify_delete
:
597 case svn_wc_notify_update_delete
:
598 case svn_wc_notify_commit_deleted
:
601 case svn_wc_notify_restore
:
604 case svn_wc_notify_revert
:
607 case svn_wc_notify_resolved
:
610 case svn_wc_notify_update_update
:
611 if (dat
->bConflictedActionItem
)
613 else if ((dat
->content_state
== svn_wc_notify_state_merged
) || (dat
->prop_state
== svn_wc_notify_state_merged
))
618 case svn_wc_notify_commit_modified
:
621 case svn_wc_notify_skip
:
624 case svn_wc_notify_commit_replaced
:
631 temp
.LoadString(IDS_SVNACTION_CONFLICTED
);
633 temp
.Format(_T(":%d "), conflicted
);
638 temp
.LoadString(IDS_SVNACTION_SKIP
);
640 infotext
.AppendFormat(_T(":%d "), skipped
);
644 temp
.LoadString(IDS_SVNACTION_MERGED
);
646 infotext
.AppendFormat(_T(":%d "), merged
);
650 temp
.LoadString(IDS_SVNACTION_ADD
);
652 infotext
.AppendFormat(_T(":%d "), added
);
656 temp
.LoadString(IDS_SVNACTION_DELETE
);
658 infotext
.AppendFormat(_T(":%d "), deleted
);
662 temp
.LoadString(IDS_SVNACTION_MODIFIED
);
664 infotext
.AppendFormat(_T(":%d "), modified
);
668 temp
.LoadString(IDS_SVNACTION_COPY
);
670 infotext
.AppendFormat(_T(":%d "), copied
);
674 temp
.LoadString(IDS_SVNACTION_REPLACED
);
676 infotext
.AppendFormat(_T(":%d "), replaced
);
680 temp
.LoadString(IDS_SVNACTION_UPDATE
);
682 infotext
.AppendFormat(_T(":%d "), updated
);
686 temp
.LoadString(IDS_SVNACTION_RESTORE
);
688 infotext
.AppendFormat(_T(":%d "), restored
);
692 temp
.LoadString(IDS_SVNACTION_REVERT
);
694 infotext
.AppendFormat(_T(":%d "), reverted
);
698 temp
.LoadString(IDS_SVNACTION_RESOLVE
);
700 infotext
.AppendFormat(_T(":%d "), resolved
);
706 void CGitProgressDlg::SetSelectedList(const CTGitPathList
& selPaths
)
708 m_selectedPaths
= selPaths
;
711 void CGitProgressDlg::ResizeColumns()
713 m_ProgList
.SetRedraw(FALSE
);
715 TCHAR textbuf
[MAX_PATH
];
717 int maxcol
= ((CHeaderCtrl
*)(m_ProgList
.GetDlgItem(0)))->GetItemCount()-1;
718 for (int col
= 0; col
<= maxcol
; col
++)
720 // find the longest width of all items
721 int count
= m_ProgList
.GetItemCount();
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
729 for (int index
= 0; index
<count
; ++index
)
731 // get the width of the string and add 12 pixels for the column separator and margins
736 linewidth
= m_ProgList
.GetStringWidth(m_arData
[index
]->sActionColumnText
) + 12;
739 linewidth
= m_ProgList
.GetStringWidth(m_arData
[index
]->sPathColumnText
) + 12;
742 linewidth
= m_ProgList
.GetStringWidth(m_arData
[index
]->mime_type
) + 12;
748 m_ProgList
.SetColumnWidth(col
, cx
);
751 m_ProgList
.SetRedraw(TRUE
);
754 BOOL
CGitProgressDlg::OnInitDialog()
756 __super::OnInitDialog();
758 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
759 // do this, Explorer would be unable to send that message to our window if we
760 // were running elevated. It's OK to make the call all the time, since if we're
761 // not elevated, this is a no-op.
762 CHANGEFILTERSTRUCT cfs
= { sizeof(CHANGEFILTERSTRUCT
) };
763 typedef BOOL STDAPICALLTYPE
ChangeWindowMessageFilterExDFN(HWND hWnd
, UINT message
, DWORD action
, PCHANGEFILTERSTRUCT pChangeFilterStruct
);
764 CAutoLibrary hUser
= ::LoadLibrary(_T("user32.dll"));
767 ChangeWindowMessageFilterExDFN
*pfnChangeWindowMessageFilterEx
= (ChangeWindowMessageFilterExDFN
*)GetProcAddress(hUser
, "ChangeWindowMessageFilterEx");
768 if (pfnChangeWindowMessageFilterEx
)
770 pfnChangeWindowMessageFilterEx(m_hWnd
, WM_TASKBARBTNCREATED
, MSGFLT_ALLOW
, &cfs
);
773 m_pTaskbarList
.Release();
774 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
776 m_ProgList
.SetExtendedStyle (LVS_EX_FULLROWSELECT
| LVS_EX_DOUBLEBUFFER
);
778 m_ProgList
.DeleteAllItems();
779 int c
= ((CHeaderCtrl
*)(m_ProgList
.GetDlgItem(0)))->GetItemCount()-1;
781 m_ProgList
.DeleteColumn(c
--);
783 temp
.LoadString(IDS_PROGRS_ACTION
);
784 m_ProgList
.InsertColumn(0, temp
);
785 temp
.LoadString(IDS_PROGRS_PATH
);
786 m_ProgList
.InsertColumn(1, temp
);
787 temp
.LoadString(IDS_PROGRS_MIMETYPE
);
788 m_ProgList
.InsertColumn(2, temp
);
790 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
793 ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED
)));
797 m_pThread
->m_bAutoDelete
= FALSE
;
798 m_pThread
->ResumeThread();
803 // Call this early so that the column headings aren't hidden before any
807 SetTimer(VISIBLETIMER
, 300, NULL
);
809 AddAnchor(IDC_SVNPROGRESS
, TOP_LEFT
, BOTTOM_RIGHT
);
810 AddAnchor(IDC_PROGRESSLABEL
, BOTTOM_LEFT
, BOTTOM_CENTER
);
811 AddAnchor(IDC_PROGRESSBAR
, BOTTOM_CENTER
, BOTTOM_RIGHT
);
812 AddAnchor(IDC_INFOTEXT
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
813 AddAnchor(IDC_NONINTERACTIVE
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
814 AddAnchor(IDCANCEL
, BOTTOM_RIGHT
);
815 AddAnchor(IDOK
, BOTTOM_RIGHT
);
816 AddAnchor(IDC_LOGBUTTON
, BOTTOM_RIGHT
);
817 //SetPromptParentWindow(this->m_hWnd);
819 CenterWindow(CWnd::FromHandle(hWndExplorer
));
820 EnableSaveRestore(_T("GITProgressDlg"));
824 bool CGitProgressDlg::SetBackgroundImage(UINT nID
)
826 return CAppUtils::SetListCtrlBackgroundImage(m_ProgList
.GetSafeHwnd(), nID
);
829 void CGitProgressDlg::ReportGitError()
831 ReportError(CString(git_lasterror()));
834 void CGitProgressDlg::ReportError(const CString
& sError
)
836 CSoundUtils::PlayTGitError();
837 ReportString(sError
, CString(MAKEINTRESOURCE(IDS_ERR_ERROR
)), m_Colors
.GetColor(CColors::Conflict
));
838 m_bErrorsOccurred
= true;
841 void CGitProgressDlg::ReportWarning(const CString
& sWarning
)
843 CSoundUtils::PlayTGitWarning();
844 ReportString(sWarning
, CString(MAKEINTRESOURCE(IDS_WARN_WARNING
)), m_Colors
.GetColor(CColors::Conflict
));
847 void CGitProgressDlg::ReportNotification(const CString
& sNotification
)
849 CSoundUtils::PlayTGitNotification();
850 ReportString(sNotification
, CString(MAKEINTRESOURCE(IDS_WARN_NOTE
)));
853 void CGitProgressDlg::ReportCmd(const CString
& sCmd
)
855 ReportString(sCmd
, CString(MAKEINTRESOURCE(IDS_PROGRS_CMDINFO
)), m_Colors
.GetColor(CColors::Cmd
));
858 void CGitProgressDlg::ReportString(CString sMessage
, const CString
& sMsgKind
, COLORREF color
)
860 // instead of showing a dialog box with the error message or notification,
861 // just insert the error text into the list control.
862 // that way the user isn't 'interrupted' by a dialog box popping up!
864 // the message may be split up into different lines
865 // so add a new entry for each line of the message
866 while (!sMessage
.IsEmpty())
868 NotificationData
* data
= new NotificationData();
869 data
->bAuxItem
= true;
870 data
->sActionColumnText
= sMsgKind
;
871 if (sMessage
.Find('\n')>=0)
872 data
->sPathColumnText
= sMessage
.Left(sMessage
.Find('\n'));
874 data
->sPathColumnText
= sMessage
;
875 data
->sPathColumnText
.Trim(_T("\n\r"));
877 if (sMessage
.Find('\n')>=0)
879 sMessage
= sMessage
.Mid(sMessage
.Find('\n'));
880 sMessage
.Trim(_T("\n\r"));
884 m_arData
.push_back(data
);
889 UINT
CGitProgressDlg::ProgressThreadEntry(LPVOID pVoid
)
891 return ((CGitProgressDlg
*)pVoid
)->ProgressThread();
894 UINT
CGitProgressDlg::ProgressThread()
896 // The SetParams function should have loaded something for us
899 CString sWindowTitle
;
900 bool localoperation
= false;
901 bool bSuccess
= false;
902 m_AlwaysConflicted
= false;
904 DialogEnableWindow(IDOK
, FALSE
);
905 DialogEnableWindow(IDCANCEL
, TRUE
);
906 // SetAndClearProgressInfo(m_hWnd);
907 m_itemCount
= m_itemCountTotal
;
909 InterlockedExchange(&m_bThreadRunning
, TRUE
);
911 bSecondResized
= FALSE
;
912 m_bFinishedItemAdded
= false;
913 CTime startTime
= CTime::GetCurrentTime();
916 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_INDETERMINATE
);
920 case GitProgress_Add
:
921 bSuccess
= CmdAdd(sWindowTitle
, localoperation
);
923 case GitProgress_Copy
:
924 bSuccess
= CmdCopy(sWindowTitle
, localoperation
);
926 case GitProgress_Export
:
927 bSuccess
= CmdExport(sWindowTitle
, localoperation
);
929 case GitProgress_Rename
:
930 bSuccess
= CmdRename(sWindowTitle
, localoperation
);
932 case GitProgress_Resolve
:
933 bSuccess
= CmdResolve(sWindowTitle
, localoperation
);
935 case GitProgress_Revert
:
936 bSuccess
= CmdRevert(sWindowTitle
, localoperation
);
938 case GitProgress_Switch
:
939 bSuccess
= CmdSwitch(sWindowTitle
, localoperation
);
941 case GitProgress_SendMail
:
942 bSuccess
= CmdSendMail(sWindowTitle
, localoperation
);
946 temp
.LoadString(IDS_PROGRS_TITLEFAILED
);
948 temp
.LoadString(IDS_PROGRS_TITLEFIN
);
949 sWindowTitle
= sWindowTitle
+ _T(" ") + temp
;
950 SetWindowText(sWindowTitle
);
952 KillTimer(TRANSFERTIMER
);
953 KillTimer(VISIBLETIMER
);
957 if (DidErrorsOccur())
959 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_ERROR
);
960 m_pTaskbarList
->SetProgressValue(m_hWnd
, 100, 100);
963 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
966 DialogEnableWindow(IDCANCEL
, FALSE
);
967 DialogEnableWindow(IDOK
, TRUE
);
969 CString info
= BuildInfoString();
971 info
.LoadString(IDS_PROGRS_INFOFAILED
);
972 SetDlgItemText(IDC_INFOTEXT
, info
);
974 SendMessage(DM_SETDEFID
, IDOK
);
975 GetDlgItem(IDOK
)->SetFocus();
978 if (!m_sTotalBytesTransferred
.IsEmpty())
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
);
986 GetDlgItem(IDC_PROGRESSLABEL
)->ShowWindow(SW_HIDE
);
988 GetDlgItem(IDC_PROGRESSBAR
)->ShowWindow(SW_HIDE
);
990 if (!m_bFinishedItemAdded
)
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
);
1001 int count
= m_ProgList
.GetItemCount();
1002 if ((count
> 0)&&(m_bLastVisible
))
1003 m_ProgList
.EnsureVisible(count
-1, FALSE
);
1008 logfile
.AddTimeLine();
1009 for (size_t i
=0; i
<m_arData
.size(); i
++)
1011 NotificationData
* data
= m_arData
[i
];
1012 temp
.Format(_T("%-20s : %s"), (LPCTSTR
)data
->sActionColumnText
, (LPCTSTR
)data
->sPathColumnText
);
1013 logfile
.AddLine(temp
);
1015 if (!sFinalInfo
.IsEmpty())
1016 logfile
.AddLine(sFinalInfo
);
1020 m_bCancelled
= TRUE
;
1021 InterlockedExchange(&m_bThreadRunning
, FALSE
);
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
)
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
);
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
1047 void CGitProgressDlg::OnBnClickedLogbutton()
1049 switch(this->m_Command
)
1051 case GitProgress_Add
:
1052 case GitProgress_Resolve
:
1054 CString cmd
= _T(" /command:commit");
1055 cmd
+= _T(" /path:\"")+g_Git
.m_CurrentDir
+_T("\"");
1057 CAppUtils::RunTortoiseProc(cmd
);
1058 this->EndDialog(IDOK
);
1063 if (m_targetPathList
.GetCount() != 1)
1065 StringRevMap::iterator it
= m_UpdateStartRevMap
.begin();
1066 svn_revnum_t rev
= -1;
1067 if (it
!= m_UpdateStartRevMap
.end())
1072 dlg
.SetParams(m_targetPathList
[0], m_RevisionEnd
, m_RevisionEnd
, rev
, 0, TRUE
);
1078 void CGitProgressDlg::OnClose()
1082 TerminateThread(m_pThread
->m_hThread
, (DWORD
)-1);
1083 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1087 m_bCancelled
= TRUE
;
1090 DialogEnableWindow(IDCANCEL
, TRUE
);
1094 void CGitProgressDlg::OnOK()
1096 if ((m_bCancelled
)&&(!m_bThreadRunning
))
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);
1106 m_bCancelled
= TRUE
;
1109 void CGitProgressDlg::OnCancel()
1111 if ((m_bCancelled
)&&(!m_bThreadRunning
))
1112 __super::OnCancel();
1113 m_bCancelled
= TRUE
;
1116 void CGitProgressDlg::OnLvnGetdispinfoSvnprogress(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1118 NMLVDISPINFO
*pDispInfo
= reinterpret_cast<NMLVDISPINFO
*>(pNMHDR
);
1122 if (pDispInfo
->item
.mask
& LVIF_TEXT
)
1124 if (pDispInfo
->item
.iItem
< (int)m_arData
.size())
1126 const NotificationData
* data
= m_arData
[pDispInfo
->item
.iItem
];
1127 switch (pDispInfo
->item
.iSubItem
)
1130 lstrcpyn(m_columnbuf
, data
->sActionColumnText
, MAX_PATH
);
1133 lstrcpyn(m_columnbuf
, data
->sPathColumnText
, pDispInfo
->item
.cchTextMax
);
1134 if (!data
->bAuxItem
)
1136 int cWidth
= m_ProgList
.GetColumnWidth(1);
1137 cWidth
= max(12, cWidth
-12);
1138 CDC
* pDC
= m_ProgList
.GetDC();
1141 CFont
* pFont
= pDC
->SelectObject(m_ProgList
.GetFont());
1142 PathCompactPath(pDC
->GetSafeHdc(), m_columnbuf
, cWidth
);
1143 pDC
->SelectObject(pFont
);
1149 lstrcpyn(m_columnbuf
, data
->mime_type
, MAX_PATH
);
1154 pDispInfo
->item
.pszText
= m_columnbuf
;
1161 void CGitProgressDlg::OnNMCustomdrawSvnprogress(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1163 NMLVCUSTOMDRAW
* pLVCD
= reinterpret_cast<NMLVCUSTOMDRAW
*>( pNMHDR
);
1165 // Take the default processing unless we set this to something else below.
1166 *pResult
= CDRF_DODEFAULT
;
1168 // First thing - check the draw stage. If it's the control's prepaint
1169 // stage, then tell Windows we want messages for every item.
1171 if ( CDDS_PREPAINT
== pLVCD
->nmcd
.dwDrawStage
)
1173 *pResult
= CDRF_NOTIFYITEMDRAW
;
1175 else if ( CDDS_ITEMPREPAINT
== pLVCD
->nmcd
.dwDrawStage
)
1177 // This is the prepaint stage for an item. Here's where we set the
1178 // item's text color. Our return value will tell Windows to draw the
1179 // item itself, but it will use the new color we set here.
1181 // Tell Windows to paint the control itself.
1182 *pResult
= CDRF_DODEFAULT
;
1184 ASSERT(pLVCD
->nmcd
.dwItemSpec
< m_arData
.size());
1185 if(pLVCD
->nmcd
.dwItemSpec
>= m_arData
.size())
1189 const NotificationData
* data
= m_arData
[pLVCD
->nmcd
.dwItemSpec
];
1190 ASSERT(data
!= NULL
);
1194 // Store the color back in the NMLVCUSTOMDRAW struct.
1195 pLVCD
->clrText
= data
->color
;
1199 void CGitProgressDlg::OnNMDblclkSvnprogress(NMHDR
* /*pNMHDR*/, LRESULT
* /*pResult*/)
1202 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1204 if (pNMLV
->iItem
< 0)
1206 if (m_options
& ProgOptDryRun
)
1207 return; //don't do anything in a dry-run.
1209 const NotificationData
* data
= m_arData
[pNMLV
->iItem
];
1213 if (data
->bConflictedActionItem
)
1215 // We've double-clicked on a conflicted item - do a three-way merge on it
1216 SVNDiff::StartConflictEditor(data
->path
);
1218 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
))
1220 // This is a modified file which has been merged on update. Diff it against base
1221 CTGitPath temporaryFile
;
1222 SVNDiff
diff(this, this->m_hWnd
, true);
1223 diff
.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT
) & 0x8000));
1224 svn_revnum_t baseRev
= 0;
1225 diff
.DiffFileAgainstBase(data
->path
, baseRev
);
1227 else if ((!data
->bAuxItem
)&&(data
->path
.Exists())&&(!data
->path
.IsDirectory()))
1229 bool bOpenWith
= false;
1230 int ret
= (int)ShellExecute(m_hWnd
, NULL
, data
->path
.GetWinPath(), NULL
, NULL
, SW_SHOWNORMAL
);
1231 if (ret
<= HINSTANCE_ERROR
)
1235 CString cmd
= _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
1236 cmd
+= data
->path
.GetWinPathString() + _T(" ");
1237 CAppUtils::LaunchApplication(cmd
, NULL
, false);
1243 void CGitProgressDlg::OnHdnItemclickSvnprogress(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1245 LPNMHEADER phdr
= reinterpret_cast<LPNMHEADER
>(pNMHDR
);
1246 if (m_bThreadRunning
)
1248 if (m_nSortedColumn
== phdr
->iItem
)
1249 m_bAscending
= !m_bAscending
;
1251 m_bAscending
= TRUE
;
1252 m_nSortedColumn
= phdr
->iItem
;
1256 m_ProgList
.SetRedraw(FALSE
);
1257 m_ProgList
.DeleteAllItems();
1258 m_ProgList
.SetItemCountEx (static_cast<int>(m_arData
.size()));
1260 m_ProgList
.SetRedraw(TRUE
);
1265 bool CGitProgressDlg::NotificationDataIsAux(const NotificationData
* pData
)
1267 return pData
->bAuxItem
;
1270 LRESULT
CGitProgressDlg::OnGitProgress(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
1273 SVNProgress
* pProgressData
= (SVNProgress
*)lParam
;
1274 CProgressCtrl
* progControl
= (CProgressCtrl
*)GetDlgItem(IDC_PROGRESSBAR
);
1275 if ((pProgressData
->total
> 1000)&&(!progControl
->IsWindowVisible()))
1277 progControl
->ShowWindow(SW_SHOW
);
1279 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
1281 if (((pProgressData
->total
< 0)&&(pProgressData
->progress
> 1000)&&(progControl
->IsWindowVisible()))&&(m_itemCountTotal
<0))
1283 progControl
->ShowWindow(SW_HIDE
);
1285 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_INDETERMINATE
);
1287 if (!GetDlgItem(IDC_PROGRESSLABEL
)->IsWindowVisible())
1288 GetDlgItem(IDC_PROGRESSLABEL
)->ShowWindow(SW_SHOW
);
1289 SetTimer(TRANSFERTIMER
, 2000, NULL
);
1290 if ((pProgressData
->total
> 0)&&(pProgressData
->progress
> 1000))
1292 progControl
->SetPos((int)pProgressData
->progress
);
1293 progControl
->SetRange32(0, (int)pProgressData
->total
);
1296 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
1297 m_pTaskbarList
->SetProgressValue(m_hWnd
, pProgressData
->progress
, pProgressData
->total
);
1301 if (pProgressData
->overall_total
< 1024)
1302 m_sTotalBytesTransferred
.Format(IDS_SVN_PROGRESS_TOTALBYTESTRANSFERRED
, pProgressData
->overall_total
);
1303 else if (pProgressData
->overall_total
< 1200000)
1304 m_sTotalBytesTransferred
.Format(IDS_SVN_PROGRESS_TOTALTRANSFERRED
, pProgressData
->overall_total
/ 1024);
1306 m_sTotalBytesTransferred
.Format(IDS_SVN_PROGRESS_TOTALMBTRANSFERRED
, (double)((double)pProgressData
->overall_total
/ 1024000.0));
1307 progText
.Format(IDS_SVN_PROGRESS_TOTALANDSPEED
, (LPCTSTR
)m_sTotalBytesTransferred
, (LPCTSTR
)pProgressData
->SpeedString
);
1308 SetDlgItemText(IDC_PROGRESSLABEL
, progText
);
1313 void CGitProgressDlg::OnTimer(UINT_PTR nIDEvent
)
1315 if (nIDEvent
== TRANSFERTIMER
)
1319 progSpeed
.Format(IDS_SVN_PROGRESS_BYTES_SEC
, 0);
1320 progText
.Format(IDS_SVN_PROGRESS_TOTALANDSPEED
, (LPCTSTR
)m_sTotalBytesTransferred
, (LPCTSTR
)progSpeed
);
1321 SetDlgItemText(IDC_PROGRESSLABEL
, progText
);
1322 KillTimer(TRANSFERTIMER
);
1324 if (nIDEvent
== VISIBLETIMER
)
1326 if (nEnsureVisibleCount
)
1327 m_ProgList
.EnsureVisible(m_ProgList
.GetItemCount()-1, false);
1328 nEnsureVisibleCount
= 0;
1332 void CGitProgressDlg::Sort()
1334 if(m_arData
.size() < 2)
1339 // We need to sort the blocks which lie between the auxiliary entries
1340 // This is so that any aux data stays where it was
1341 NotificationDataVect::iterator actionBlockBegin
;
1342 NotificationDataVect::iterator actionBlockEnd
= m_arData
.begin(); // We start searching from here
1346 // Search to the start of the non-aux entry in the next block
1347 actionBlockBegin
= std::find_if(actionBlockEnd
, m_arData
.end(), std::not1(std::ptr_fun(&CGitProgressDlg::NotificationDataIsAux
)));
1348 if(actionBlockBegin
== m_arData
.end())
1350 // There are no more actions
1353 // Now search to find the end of the block
1354 actionBlockEnd
= std::find_if(actionBlockBegin
+1, m_arData
.end(), std::ptr_fun(&CGitProgressDlg::NotificationDataIsAux
));
1355 // Now sort the block
1356 std::sort(actionBlockBegin
, actionBlockEnd
, &CGitProgressDlg::SortCompare
);
1360 bool CGitProgressDlg::SortCompare(const NotificationData
* pData1
, const NotificationData
* pData2
)
1363 switch (m_nSortedColumn
)
1365 case 0: //action column
1366 result
= pData1
->sActionColumnText
.Compare(pData2
->sActionColumnText
);
1368 case 1: //path column
1369 // Compare happens after switch()
1371 case 2: //mime-type column
1372 result
= pData1
->mime_type
.Compare(pData2
->mime_type
);
1378 // Sort by path if everything else is equal
1381 result
= CTGitPath::Compare(pData1
->path
, pData2
->path
);
1389 BOOL
CGitProgressDlg::OnSetCursor(CWnd
* pWnd
, UINT nHitTest
, UINT message
)
1391 if (!GetDlgItem(IDOK
)->IsWindowEnabled())
1393 // only show the wait cursor over the list control
1394 if ((pWnd
)&&(pWnd
== GetDlgItem(IDC_SVNPROGRESS
)))
1396 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_WAIT
));
1401 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_ARROW
));
1403 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1406 BOOL
CGitProgressDlg::PreTranslateMessage(MSG
* pMsg
)
1408 if (pMsg
->message
== WM_KEYDOWN
)
1410 if (pMsg
->wParam
== VK_ESCAPE
)
1412 // pressing the ESC key should close the dialog. But since we disabled the escape
1413 // key (so the user doesn't get the idea that he could simply undo an e.g. update)
1415 // So if the user presses the ESC key, change it to VK_RETURN so the dialog gets
1416 // the impression that the OK button was pressed.
1417 if ((!m_bThreadRunning
)&&(!GetDlgItem(IDCANCEL
)->IsWindowEnabled())
1418 &&(GetDlgItem(IDOK
)->IsWindowEnabled())&&(GetDlgItem(IDOK
)->IsWindowVisible()))
1420 // since we convert ESC to RETURN, make sure the OK button has the focus.
1421 GetDlgItem(IDOK
)->SetFocus();
1422 pMsg
->wParam
= VK_RETURN
;
1425 if (pMsg
->wParam
== 'A')
1427 if (GetKeyState(VK_CONTROL
)&0x8000)
1429 // Ctrl-A -> select all
1430 m_ProgList
.SetSelectionMark(0);
1431 for (int i
=0; i
<m_ProgList
.GetItemCount(); ++i
)
1433 m_ProgList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
1437 if ((pMsg
->wParam
== 'C')||(pMsg
->wParam
== VK_INSERT
))
1439 int selIndex
= m_ProgList
.GetSelectionMark();
1442 if (GetKeyState(VK_CONTROL
)&0x8000)
1444 //Ctrl-C -> copy to clipboard
1446 POSITION pos
= m_ProgList
.GetFirstSelectedItemPosition();
1451 int nItem
= m_ProgList
.GetNextSelectedItem(pos
);
1452 CString sAction
= m_ProgList
.GetItemText(nItem
, 0);
1453 CString sPath
= m_ProgList
.GetItemText(nItem
, 1);
1454 CString sMime
= m_ProgList
.GetItemText(nItem
, 2);
1455 CString sLogCopyText
;
1456 sLogCopyText
.Format(_T("%s: %s %s\r\n"),
1457 (LPCTSTR
)sAction
, (LPCTSTR
)sPath
, (LPCTSTR
)sMime
);
1458 sClipdata
+= sLogCopyText
;
1460 CStringUtils::WriteAsciiStringToClipboard(sClipdata
);
1465 } // if (pMsg->message == WM_KEYDOWN)
1466 return __super::PreTranslateMessage(pMsg
);
1469 void CGitProgressDlg::OnContextMenu(CWnd
* /*pWnd*/, CPoint
/*point*/)
1472 if (m_options
& ProgOptDryRun
)
1473 return; // don't do anything in a dry-run.
1475 if (pWnd
== &m_ProgList
)
1477 int selIndex
= m_ProgList
.GetSelectionMark();
1478 if ((point
.x
== -1) && (point
.y
== -1))
1480 // Menu was invoked from the keyboard rather than by right-clicking
1482 m_ProgList
.GetItemRect(selIndex
, &rect
, LVIR_LABEL
);
1483 m_ProgList
.ClientToScreen(&rect
);
1484 point
= rect
.CenterPoint();
1487 if ((selIndex
>= 0)&&(!m_bThreadRunning
))
1489 // entry is selected, thread has finished with updating so show the popup menu
1491 if (popup
.CreatePopupMenu())
1493 bool bAdded
= false;
1494 NotificationData
* data
= m_arData
[selIndex
];
1495 if ((data
)&&(!data
->path
.IsDirectory()))
1497 if (data
->action
== svn_wc_notify_update_update
|| data
->action
== svn_wc_notify_resolved
)
1499 if (m_ProgList
.GetSelectedCount() == 1)
1501 popup
.AppendMenuIcon(ID_COMPARE
, IDS_LOG_POPUP_COMPARE
, IDI_DIFF
);
1505 if (data
->bConflictedActionItem
)
1507 if (m_ProgList
.GetSelectedCount() == 1)
1509 popup
.AppendMenuIcon(ID_EDITCONFLICT
, IDS_MENUCONFLICT
,IDI_CONFLICT
);
1510 popup
.SetDefaultItem(ID_EDITCONFLICT
, FALSE
);
1511 popup
.AppendMenuIcon(ID_CONFLICTRESOLVE
, IDS_SVNPROGRESS_MENUMARKASRESOLVED
,IDI_RESOLVE
);
1513 popup
.AppendMenuIcon(ID_CONFLICTUSETHEIRS
, IDS_SVNPROGRESS_MENUUSETHEIRS
,IDI_RESOLVE
);
1514 popup
.AppendMenuIcon(ID_CONFLICTUSEMINE
, IDS_SVNPROGRESS_MENUUSEMINE
,IDI_RESOLVE
);
1516 else if ((data
->content_state
== svn_wc_notify_state_merged
)||(GitProgress_Merge
== m_Command
)||(data
->action
== svn_wc_notify_resolved
))
1517 popup
.SetDefaultItem(ID_COMPARE
, FALSE
);
1519 if (m_ProgList
.GetSelectedCount() == 1)
1521 if ((data
->action
== svn_wc_notify_add
)||
1522 (data
->action
== svn_wc_notify_update_add
)||
1523 (data
->action
== svn_wc_notify_commit_added
)||
1524 (data
->action
== svn_wc_notify_commit_modified
)||
1525 (data
->action
== svn_wc_notify_restore
)||
1526 (data
->action
== svn_wc_notify_revert
)||
1527 (data
->action
== svn_wc_notify_resolved
)||
1528 (data
->action
== svn_wc_notify_commit_replaced
)||
1529 (data
->action
== svn_wc_notify_commit_modified
)||
1530 (data
->action
== svn_wc_notify_commit_postfix_txdelta
)||
1531 (data
->action
== svn_wc_notify_update_update
))
1533 popup
.AppendMenuIcon(ID_LOG
, IDS_MENULOG
,IDI_LOG
);
1534 if (data
->action
== svn_wc_notify_update_update
)
1535 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
1536 popup
.AppendMenuIcon(ID_OPEN
, IDS_LOG_POPUP_OPEN
, IDI_OPEN
);
1537 popup
.AppendMenuIcon(ID_OPENWITH
, IDS_LOG_POPUP_OPENWITH
, IDI_OPEN
);
1541 } // if ((data)&&(!data->path.IsDirectory()))
1542 if (m_ProgList
.GetSelectedCount() == 1)
1546 CString sPath
= GetPathFromColumnText(data
->sPathColumnText
);
1547 if ((!sPath
.IsEmpty())&&(!SVN::PathIsURL(CTGitPath(sPath
))))
1549 CTGitPath path
= CTGitPath(sPath
);
1550 if (path
.GetDirectory().Exists())
1552 popup
.AppendMenuIcon(ID_EXPLORE
, IDS_SVNPROGRESS_MENUOPENPARENT
, IDI_EXPLORER
);
1558 if (m_ProgList
.GetSelectedCount() > 0)
1561 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
1562 popup
.AppendMenuIcon(ID_COPY
, IDS_LOG_POPUP_COPYTOCLIPBOARD
,IDI_COPYCLIP
);
1567 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1568 DialogEnableWindow(IDOK
, FALSE
);
1569 this->SetPromptApp(&theApp
);
1570 theApp
.DoWaitCursor(1);
1571 bool bOpenWith
= false;
1577 POSITION pos
= m_ProgList
.GetFirstSelectedItemPosition();
1580 int nItem
= m_ProgList
.GetNextSelectedItem(pos
);
1581 NotificationData
* data
= m_arData
[nItem
];
1584 sLines
+= data
->sPathColumnText
;
1585 sLines
+= _T("\r\n");
1589 if (!sLines
.IsEmpty())
1591 CStringUtils::WriteAsciiStringToClipboard(sLines
, GetSafeHwnd());
1597 CString sPath
= GetPathFromColumnText(data
->sPathColumnText
);
1599 CTGitPath path
= CTGitPath(sPath
);
1600 ShellExecute(m_hWnd
, _T("explore"), path
.GetDirectory().GetWinPath(), NULL
, path
.GetDirectory().GetWinPath(), SW_SHOW
);
1605 svn_revnum_t rev
= -1;
1606 StringRevMap::iterator it
= m_UpdateStartRevMap
.end();
1607 if (data
->basepath
.IsEmpty())
1608 it
= m_UpdateStartRevMap
.begin();
1610 it
= m_UpdateStartRevMap
.find(data
->basepath
.GetSVNApiPath(pool
));
1611 if (it
!= m_UpdateStartRevMap
.end())
1613 // if the file was merged during update, do a three way diff between OLD, MINE, THEIRS
1614 if (data
->content_state
== svn_wc_notify_state_merged
)
1616 CTGitPath basefile
= CTempFiles::Instance().GetTempFilePath(false, data
->path
, rev
);
1617 CTGitPath newfile
= CTempFiles::Instance().GetTempFilePath(false, data
->path
, SVNRev::REV_HEAD
);
1619 if (!svn
.Cat(data
->path
, SVNRev(SVNRev::REV_WC
), rev
, basefile
))
1621 CMessageBox::Show(m_hWnd
, svn
.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR
);
1622 DialogEnableWindow(IDOK
, TRUE
);
1625 // If necessary, convert the line-endings on the file before diffing
1626 if ((DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\ConvertBase"), TRUE
))
1628 CTGitPath temporaryFile
= CTempFiles::Instance().GetTempFilePath(false, data
->path
, SVNRev::REV_BASE
);
1629 if (!svn
.Cat(data
->path
, SVNRev(SVNRev::REV_BASE
), SVNRev(SVNRev::REV_BASE
), temporaryFile
))
1631 temporaryFile
.Reset();
1636 newfile
= temporaryFile
;
1640 SetFileAttributes(newfile
.GetWinPath(), FILE_ATTRIBUTE_READONLY
);
1641 SetFileAttributes(basefile
.GetWinPath(), FILE_ATTRIBUTE_READONLY
);
1642 CString revname
, wcname
, basename
;
1643 revname
.Format(_T("%s Revision %ld"), (LPCTSTR
)data
->path
.GetUIFileOrDirectoryName(), rev
);
1644 wcname
.Format(IDS_DIFF_WCNAME
, (LPCTSTR
)data
->path
.GetUIFileOrDirectoryName());
1645 basename
.Format(IDS_DIFF_BASENAME
, (LPCTSTR
)data
->path
.GetUIFileOrDirectoryName());
1646 CAppUtils::StartExtMerge(basefile
, newfile
, data
->path
, data
->path
, basename
, revname
, wcname
, CString(), true);
1650 CTGitPath tempfile
= CTempFiles::Instance().GetTempFilePath(false, data
->path
, rev
);
1652 if (!svn
.Cat(data
->path
, SVNRev(SVNRev::REV_WC
), rev
, tempfile
))
1654 CMessageBox::Show(m_hWnd
, svn
.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR
);
1655 DialogEnableWindow(IDOK
, TRUE
);
1660 SetFileAttributes(tempfile
.GetWinPath(), FILE_ATTRIBUTE_READONLY
);
1661 CString revname
, wcname
;
1662 revname
.Format(_T("%s Revision %ld"), (LPCTSTR
)data
->path
.GetUIFileOrDirectoryName(), rev
);
1663 wcname
.Format(IDS_DIFF_WCNAME
, (LPCTSTR
)data
->path
.GetUIFileOrDirectoryName());
1664 CAppUtils::StartExtDiff(
1665 tempfile
, data
->path
, revname
, wcname
,
1666 CAppUtils::DiffFlags().AlternativeTool(!!(GetAsyncKeyState(VK_SHIFT
) & 0x8000)));
1671 case ID_EDITCONFLICT
:
1673 CString sPath
= GetPathFromColumnText(data
->sPathColumnText
);
1674 SVNDiff::StartConflictEditor(CTGitPath(sPath
));
1677 case ID_CONFLICTUSETHEIRS
:
1678 case ID_CONFLICTUSEMINE
:
1679 case ID_CONFLICTRESOLVE
:
1681 svn_wc_conflict_choice_t result
= svn_wc_conflict_choose_merged
;
1684 case ID_CONFLICTUSETHEIRS
:
1685 result
= svn_wc_conflict_choose_theirs_full
;
1687 case ID_CONFLICTUSEMINE
:
1688 result
= svn_wc_conflict_choose_mine_full
;
1690 case ID_CONFLICTRESOLVE
:
1691 result
= svn_wc_conflict_choose_merged
;
1695 POSITION pos
= m_ProgList
.GetFirstSelectedItemPosition();
1696 CString sResolvedPaths
;
1699 int nItem
= m_ProgList
.GetNextSelectedItem(pos
);
1700 NotificationData
* data
= m_arData
[nItem
];
1703 if (data
->bConflictedActionItem
)
1705 if (!svn
.Resolve(data
->path
, result
, FALSE
))
1707 CMessageBox::Show(m_hWnd
, svn
.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR
);
1708 DialogEnableWindow(IDOK
, TRUE
);
1713 data
->color
= ::GetSysColor(COLOR_WINDOWTEXT
);
1714 data
->action
= svn_wc_notify_resolved
;
1715 data
->sActionColumnText
.LoadString(IDS_SVNACTION_RESOLVE
);
1716 data
->bConflictedActionItem
= false;
1719 if (m_nConflicts
==0)
1721 // When the last conflict is resolved we remove
1722 // the warning which we assume is in the last line.
1723 int nIndex
= m_ProgList
.GetItemCount()-1;
1724 VERIFY(m_ProgList
.DeleteItem(nIndex
));
1726 delete m_arData
[nIndex
];
1727 m_arData
.pop_back();
1729 sResolvedPaths
+= data
->path
.GetWinPathString() + _T("\n");
1734 m_ProgList
.Invalidate();
1735 CString info
= BuildInfoString();
1736 SetDlgItemText(IDC_INFOTEXT
, info
);
1738 if (!sResolvedPaths
.IsEmpty())
1741 msg
.Format(IDS_SVNPROGRESS_RESOLVED
, (LPCTSTR
)sResolvedPaths
);
1742 CMessageBox::Show(m_hWnd
, msg
, _T("TortoiseGit"), MB_OK
| MB_ICONINFORMATION
);
1748 svn_revnum_t rev
= m_RevisionEnd
;
1749 if (!data
->basepath
.IsEmpty())
1751 StringRevMap::iterator it
= m_FinishedRevMap
.find(data
->basepath
.GetSVNApiPath(pool
));
1752 if (it
!= m_FinishedRevMap
.end())
1756 // fetch the log from HEAD, not the revision we updated to:
1757 // the path might be inside an external folder which has its own
1759 CString sPath
= GetPathFromColumnText(data
->sPathColumnText
);
1760 dlg
.SetParams(CTGitPath(sPath
), SVNRev(), SVNRev::REV_HEAD
, 1, -1, TRUE
);
1769 CString sWinPath
= GetPathFromColumnText(data
->sPathColumnText
);
1771 ret
= (int)ShellExecute(this->m_hWnd
, NULL
, (LPCTSTR
)sWinPath
, NULL
, NULL
, SW_SHOWNORMAL
);
1772 if ((ret
<= HINSTANCE_ERROR
)||bOpenWith
)
1774 CString cmd
= _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
1775 cmd
+= sWinPath
+ _T(" ");
1776 CAppUtils::LaunchApplication(cmd
, NULL
, false);
1780 DialogEnableWindow(IDOK
, TRUE
);
1781 theApp
.DoWaitCursor(-1);
1789 void CGitProgressDlg::OnEnSetfocusInfotext()
1792 GetDlgItemText(IDC_INFOTEXT
, sTemp
);
1793 if (sTemp
.IsEmpty())
1794 GetDlgItem(IDC_INFOTEXT
)->HideCaret();
1797 void CGitProgressDlg::OnLvnBegindragSvnprogress(NMHDR
* , LRESULT
*pResult
)
1799 //LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1801 int selIndex
= m_ProgList
.GetSelectionMark();
1805 CDropFiles dropFiles
; // class for creating DROPFILES struct
1808 POSITION pos
= m_ProgList
.GetFirstSelectedItemPosition();
1809 while ( (index
= m_ProgList
.GetNextSelectedItem(pos
)) >= 0 )
1811 NotificationData
* data
= m_arData
[index
];
1813 if ( data
->kind
==svn_node_file
|| data
->kind
==svn_node_dir
)
1815 CString sPath
= GetPathFromColumnText(data
->sPathColumnText
);
1817 dropFiles
.AddFile( sPath
);
1821 if ( dropFiles
.GetCount()>0 )
1823 dropFiles
.CreateStructure();
1829 void CGitProgressDlg::OnSize(UINT nType
, int cx
, int cy
)
1831 CResizableStandAloneDialog::OnSize(nType
, cx
, cy
);
1832 if ((nType
== SIZE_RESTORED
)&&(m_bLastVisible
))
1834 if(!m_ProgList
.m_hWnd
)
1837 int count
= m_ProgList
.GetItemCount();
1839 m_ProgList
.EnsureVisible(count
-1, false);
1843 //////////////////////////////////////////////////////////////////////////
1845 //////////////////////////////////////////////////////////////////////////
1846 bool CGitProgressDlg::CmdAdd(CString
& sWindowTitle
, bool& localoperation
)
1848 localoperation
= true;
1849 sWindowTitle
.LoadString(IDS_PROGRS_TITLE_ADD
);
1850 CAppUtils::SetWindowTitle(m_hWnd
, m_targetPathList
.GetCommonRoot().GetUIPathString(), sWindowTitle
);
1851 SetBackgroundImage(IDI_ADD_BKG
);
1852 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_ADD
)));
1854 // HACK for separate-git-dir, libgit2 doesn't support it atm
1855 if (CTGitPath(g_Git
.m_CurrentDir
+ _T("/.git")).IsDirectory() && CRegDWORD(_T("Software\\TortoiseGit\\UseLibgit2"), FALSE
) == TRUE
)
1857 git_repository
*repo
= NULL
;
1860 CStringA gitdir
= CUnicodeUtils::GetMulti(CTGitPath(g_Git
.m_CurrentDir
).GetGitPathString() + _T("/.git"), CP_UTF8
);
1861 if (git_repository_open(&repo
, gitdir
.GetBuffer()))
1866 if (git_repository_index(&index
, repo
))
1869 git_repository_free(repo
);
1872 if (git_index_read(index
))
1875 git_index_free(index
);
1876 git_repository_free(repo
);
1880 for(int i
=0;i
<m_targetPathList
.GetCount();i
++)
1882 if (git_index_add(index
, CStringA(CUnicodeUtils::GetMulti(m_targetPathList
[i
].GetGitPathString(), CP_UTF8
)).GetBuffer(), 0))
1885 git_index_free(index
);
1886 git_repository_free(repo
);
1889 Notify(m_targetPathList
[i
],git_wc_notify_add
);
1892 if (git_index_write(index
))
1895 git_index_free(index
);
1896 git_repository_free(repo
);
1900 git_index_free(index
);
1901 git_repository_free(repo
);
1905 CMassiveGitTask
mgt(L
"add -f");
1906 mgt
.ExecuteWithNotify(&m_targetPathList
, m_bCancelled
, git_wc_notify_add
, this, &CGitProgressDlg::Notify
);
1909 CShellUpdater::Instance().AddPathsForUpdate(m_targetPathList
);
1910 m_bErrorsOccurred
=false;
1912 this->GetDlgItem(IDC_LOGBUTTON
)->SetWindowText(_T("Commit ..."));
1913 this->GetDlgItem(IDC_LOGBUTTON
)->ShowWindow(SW_SHOW
);
1917 bool CGitProgressDlg::CmdCopy(CString
& /*sWindowTitle*/, bool& /*localoperation*/)
1920 ASSERT(m_targetPathList
.GetCount() == 1);
1921 sWindowTitle
.LoadString(IDS_PROGRS_TITLE_COPY
);
1922 SetWindowText(sWindowTitle
); // needs to be updated, see TSVN rev. 21375
1923 SetBackgroundImage(IDI_COPY_BKG
);
1926 sCmdInfo
.Format(IDS_PROGRS_CMD_COPY
,
1927 m_targetPathList
[0].IsUrl() ? (LPCTSTR
)m_targetPathList
[0].GetSVNPathString() : m_targetPathList
[0].GetWinPath(),
1928 (LPCTSTR
)m_url
.GetSVNPathString(), (LPCTSTR
)m_Revision
.ToString());
1929 ReportCmd(sCmdInfo
);
1931 if (!Copy(m_targetPathList
, m_url
, m_Revision
, m_pegRev
, m_sMessage
))
1936 if (m_options
& ProgOptSwitchAfterCopy
)
1938 sCmdInfo
.Format(IDS_PROGRS_CMD_SWITCH
,
1939 m_targetPathList
[0].GetWinPath(),
1940 (LPCTSTR
)m_url
.GetSVNPathString(), (LPCTSTR
)m_Revision
.ToString());
1941 ReportCmd(sCmdInfo
);
1942 if (!Switch(m_targetPathList
[0], m_url
, SVNRev::REV_HEAD
, SVNRev::REV_HEAD
, m_depth
, TRUE
, m_options
& ProgOptIgnoreExternals
))
1944 if (!Switch(m_targetPathList
[0], m_url
, SVNRev::REV_HEAD
, m_Revision
, m_depth
, TRUE
, m_options
& ProgOptIgnoreExternals
))
1953 if (SVN::PathIsURL(m_url
))
1955 CString
sMsg(MAKEINTRESOURCE(IDS_PROGRS_COPY_WARNING
));
1956 ReportNotification(sMsg
);
1963 bool CGitProgressDlg::CmdExport(CString
& /*sWindowTitle*/, bool& /*localoperation*/)
1966 ASSERT(m_targetPathList
.GetCount() == 1);
1967 sWindowTitle
.LoadString(IDS_PROGRS_TITLE_EXPORT
);
1968 sWindowTitle
= m_url
.GetUIFileOrDirectoryName()+_T(" - ")+sWindowTitle
;
1969 SetWindowText(sWindowTitle
); // needs to be updated, see TSVN rev. 21375
1970 SetBackgroundImage(IDI_EXPORT_BKG
);
1972 if (m_options
& ProgOptEolCRLF
)
1974 if (m_options
& ProgOptEolLF
)
1976 if (m_options
& ProgOptEolCR
)
1978 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_EXPORT
)));
1979 if (!Export(m_url
, m_targetPathList
[0], m_Revision
, m_Revision
, TRUE
, m_options
& ProgOptIgnoreExternals
, m_depth
, NULL
, FALSE
, eol
))
1988 bool CGitProgressDlg::CmdRename(CString
& /*sWindowTitle*/, bool& /*localoperation*/)
1991 ASSERT(m_targetPathList
.GetCount() == 1);
1992 if ((!m_targetPathList
[0].IsUrl())&&(!m_url
.IsUrl()))
1993 localoperation
= true;
1994 sWindowTitle
.LoadString(IDS_PROGRS_TITLE_RENAME
);
1995 SetWindowText(sWindowTitle
); // needs to be updated, see TSVN rev. 21375
1996 SetBackgroundImage(IDI_RENAME_BKG
);
1997 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_RENAME
)));
1998 if (!Move(m_targetPathList
, m_url
, m_Revision
, m_sMessage
))
2007 bool CGitProgressDlg::CmdResolve(CString
& sWindowTitle
, bool& localoperation
)
2010 localoperation
= true;
2011 ASSERT(m_targetPathList
.GetCount() == 1);
2012 sWindowTitle
.LoadString(IDS_PROGRS_TITLE_RESOLVE
);
2013 CAppUtils::SetWindowTitle(m_hWnd
, m_targetPathList
.GetCommonRoot().GetUIPathString(), sWindowTitle
);
2014 SetBackgroundImage(IDI_RESOLVE_BKG
);
2015 // check if the file may still have conflict markers in it.
2016 //BOOL bMarkers = FALSE;
2018 for(int i
=0;i
<m_targetPathList
.GetCount();i
++)
2020 CString cmd
,out
,tempmergefile
;
2021 cmd
.Format(_T("git.exe add -f -- \"%s\""),m_targetPathList
[i
].GetGitPathString());
2022 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
2024 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
2025 m_bErrorsOccurred
=true;
2029 CAppUtils::RemoveTempMergeFile((CTGitPath
&)m_targetPathList
[i
]);
2031 Notify(m_targetPathList
[i
],git_wc_notify_resolved
);
2034 if ((m_options
& ProgOptSkipConflictCheck
) == 0)
2038 for (INT_PTR fileindex
=0; (fileindex
<m_targetPathList
.GetCount()) && (bMarkers
==FALSE
); ++fileindex
)
2040 if (!m_targetPathList
[fileindex
].IsDirectory())
2042 CStdioFile
file(m_targetPathList
[fileindex
].GetWinPath(), CFile::typeBinary
| CFile::modeRead
);
2043 CString strLine
= _T("");
2044 while (file
.ReadString(strLine
))
2046 if (strLine
.Find(_T("<<<<<<<"))==0)
2056 catch (CFileException
* pE
)
2058 TRACE(_T("CFileException in Resolve!\n"));
2059 TCHAR error
[10000] = {0};
2060 pE
->GetErrorMessage(error
, 10000);
2068 if (CMessageBox::Show(m_hWnd
, IDS_PROGRS_REVERTMARKERS
, IDS_APPNAME
, MB_YESNO
| MB_ICONQUESTION
)==IDYES
)
2070 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_RESOLVE
)));
2071 for (INT_PTR fileindex
=0; fileindex
<m_targetPathList
.GetCount(); ++fileindex
)
2072 Resolve(m_targetPathList
[fileindex
], svn_wc_conflict_choose_merged
, true);
2077 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_RESOLVE
)));
2078 for (INT_PTR fileindex
=0; fileindex
<m_targetPathList
.GetCount(); ++fileindex
)
2079 Resolve(m_targetPathList
[fileindex
], svn_wc_conflict_choose_merged
, true);
2082 CShellUpdater::Instance().AddPathsForUpdate(m_targetPathList
);
2084 this->GetDlgItem(IDC_LOGBUTTON
)->SetWindowText(_T("Commit ..."));
2085 this->GetDlgItem(IDC_LOGBUTTON
)->ShowWindow(SW_SHOW
);
2090 bool CGitProgressDlg::CmdRevert(CString
& sWindowTitle
, bool& localoperation
)
2093 localoperation
= true;
2094 sWindowTitle
.LoadString(IDS_PROGRS_TITLE_REVERT
);
2095 CAppUtils::SetWindowTitle(m_hWnd
, m_targetPathList
.GetCommonRoot().GetUIPathString(), sWindowTitle
);
2096 SetBackgroundImage(IDI_REVERT_BKG
);
2098 CTGitPathList delList
;
2099 for(int i
=0;i
<m_selectedPaths
.GetCount();i
++)
2103 path
.SetFromWin(g_Git
.m_CurrentDir
+_T("\\")+m_selectedPaths
[i
].GetWinPath());
2104 action
= m_selectedPaths
[i
].m_Action
;
2105 /* rename file can't delete because it needs original file*/
2106 if((!(action
& CTGitPath::LOGACTIONS_ADDED
)) &&
2107 (!(action
& CTGitPath::LOGACTIONS_REPLACED
)))
2108 delList
.AddPath(path
);
2110 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE
)))
2111 delList
.DeleteAllFiles(true);
2113 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_REVERT
)));
2114 for(int i
=0;i
<m_selectedPaths
.GetCount();i
++)
2116 if(g_Git
.Revert(_T("HEAD"), (CTGitPath
&)m_selectedPaths
[i
]))
2118 CMessageBox::Show(NULL
,_T("Revert Fail"),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
2119 m_bErrorsOccurred
=true;
2122 Notify(m_selectedPaths
[i
],git_wc_notify_revert
);
2125 CShellUpdater::Instance().AddPathsForUpdate(m_selectedPaths
);
2130 bool CGitProgressDlg::CmdSwitch(CString
& /*sWindowTitle*/, bool& /*localoperation*/)
2133 ASSERT(m_targetPathList
.GetCount() == 1);
2135 sWindowTitle
.LoadString(IDS_PROGRS_TITLE_SWITCH
);
2136 SetWindowText(sWindowTitle
); // needs to be updated, see TSVN rev. 21375
2137 SetBackgroundImage(IDI_SWITCH_BKG
);
2139 if (st
.GetStatus(m_targetPathList
[0]) != (-2))
2141 if (st
.status
->entry
!= NULL
)
2143 rev
= st
.status
->entry
->revision
;
2148 sCmdInfo
.Format(IDS_PROGRS_CMD_SWITCH
,
2149 m_targetPathList
[0].GetWinPath(), (LPCTSTR
)m_url
.GetSVNPathString(),
2150 (LPCTSTR
)m_Revision
.ToString());
2151 ReportCmd(sCmdInfo
);
2153 bool depthIsSticky
= true;
2154 if (m_depth
== svn_depth_unknown
)
2155 depthIsSticky
= false;
2156 if (!Switch(m_targetPathList
[0], m_url
, m_Revision
, m_Revision
, m_depth
, depthIsSticky
, m_options
& ProgOptIgnoreExternals
))
2161 m_UpdateStartRevMap
[m_targetPathList
[0].GetSVNApiPath(pool
)] = rev
;
2162 if ((m_RevisionEnd
>= 0)&&(rev
>= 0)
2163 &&((LONG
)m_RevisionEnd
> (LONG
)rev
))
2165 GetDlgItem(IDC_LOGBUTTON
)->ShowWindow(SW_SHOW
);
2171 void CGitProgressDlg::OnBnClickedNoninteractive()
2173 LRESULT res
= ::SendMessage(GetDlgItem(IDC_NONINTERACTIVE
)->GetSafeHwnd(), BM_GETCHECK
, 0, 0);
2174 m_AlwaysConflicted
= (res
== BST_CHECKED
);
2175 CRegDWORD nonint
= CRegDWORD(_T("Software\\TortoiseGit\\MergeNonInteractive"), FALSE
);
2176 nonint
= m_AlwaysConflicted
;
2179 CString
CGitProgressDlg::GetPathFromColumnText(const CString
& sColumnText
)
2181 CString sPath
= CPathUtils::ParsePathInString(sColumnText
);
2182 if (sPath
.Find(':')<0)
2184 // the path is not absolute: add the common root of all paths to it
2185 sPath
= m_targetPathList
.GetCommonRoot().GetDirectory().GetWinPathString() + _T("\\") + CPathUtils::ParsePathInString(sColumnText
);
2190 bool CGitProgressDlg::CmdSendMail(CString
& sWindowTitle
, bool& /*localoperation*/)
2192 sWindowTitle
.LoadString(IDS_PROGRS_TITLE_SENDMAIL
);
2193 CAppUtils::SetWindowTitle(m_hWnd
, m_targetPathList
.GetCommonRoot().GetUIPathString(), sWindowTitle
);
2194 //SetBackgroundImage(IDI_ADD_BKG);
2195 ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_SENDMAIL
)));
2197 if(this->m_SendMailFlags
&SENDMAIL_COMBINED
)
2201 Notify(path
,git_wc_notify_sendmail_start
);
2206 if(!!CPatch::SendPatchesCombined(m_targetPathList
,m_SendMailTO
,m_SendMailCC
,m_SendMailSubject
,!!(this->m_SendMailFlags
&SENDMAIL_ATTACHMENT
),!!(this->m_SendMailFlags
&SENDMAIL_MAPI
),&err
))
2208 Notify(path
,git_wc_notify_sendmail_error
,ret
,&err
);
2218 Notify(path
,git_wc_notify_sendmail_retry
,ret
,&err
);
2222 CString
str(_T("User Canceled"));
2223 Notify(path
,git_wc_notify_sendmail_error
,ret
,&str
);
2228 Notify(path
,git_wc_notify_sendmail_done
,ret
);
2232 for(int i
=0;ret
&& i
<m_targetPathList
.GetCount();i
++)
2235 Notify(m_targetPathList
[i
],git_wc_notify_sendmail_start
);
2240 if(!!patch
.Send((CString
&)m_targetPathList
[i
].GetWinPathString(),this->m_SendMailTO
,
2241 this->m_SendMailCC
,!!(this->m_SendMailFlags
&SENDMAIL_ATTACHMENT
),!!(this->m_SendMailFlags
&SENDMAIL_MAPI
)))
2243 Notify(m_targetPathList
[i
],git_wc_notify_sendmail_error
,ret
,&patch
.m_LastError
);
2254 Notify(m_targetPathList
[i
],git_wc_notify_sendmail_retry
,ret
,&patch
.m_LastError
);
2258 CString
str(_T("User Canceled"));
2259 Notify(m_targetPathList
[i
],git_wc_notify_sendmail_error
,ret
,&str
);
2264 Notify(m_targetPathList
[i
],git_wc_notify_sendmail_done
,ret
);
2270 LRESULT
CGitProgressDlg::OnTaskbarBtnCreated(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
2272 m_pTaskbarList
.Release();
2273 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);