Mercurial > hg > easyhg
diff mainwindow.h @ 163:5c262ac73948
* First cut of work on merge/resolve logic
author | Chris Cannam |
---|---|
date | Fri, 03 Dec 2010 19:35:04 +0000 |
parents | 910c2c5d1873 |
children | de39da2f9f4d |
line wrap: on
line diff
--- a/mainwindow.h Fri Dec 03 14:43:32 2010 +0000 +++ b/mainwindow.h Fri Dec 03 19:35:04 2010 +0000 @@ -80,6 +80,7 @@ void hgUpdate(); void hgRevert(); void hgMerge(); + void hgMarkResolved(QStringList); void hgRetryMerge(); void hgCloneFromRemote(); void hgInit(); @@ -90,7 +91,6 @@ void hgMergeFrom(QString); void hgAnnotate(); void hgResolveList(); - void hgResolveMark(); void hgTag(); void hgServe(); void hgIgnore(); @@ -172,11 +172,8 @@ QAction *hgUpdateAct; QAction *hgCommitAct; QAction *hgMergeAct; - QAction *hgRetryMergeAct; QAction *hgUpdateToRevAct; QAction *hgAnnotateAct; - QAction *hgResolveListAct; - QAction *hgResolveMarkAct; QAction *hgTagAct; QAction *hgIgnoreAct; QAction *hgServeAct; @@ -199,12 +196,21 @@ HgRunner *runner; + bool shouldHgStat; + + QString diffBinaryName; + QString mergeBinaryName; + void findDiffBinaryName(); - QString diffBinaryName; + void findMergeBinaryName(); QFileSystemWatcher *fsWatcher; + QString lastStatOutput; + QStringList lastRevertedFiles; + bool justMerged; + QString mergeTargetRevision; QString mergeCommitComment; };