Mercurial > hg > easyhg
diff mainwindow.h @ 336:4229b6a8e9c6
Merge
author | Chris Cannam |
---|---|
date | Mon, 14 Mar 2011 10:00:29 +0000 |
parents | acfe9390d5c6 |
children | 93feb59187f5 |
line wrap: on
line diff
--- a/mainwindow.h Wed Mar 02 15:58:34 2011 +0000 +++ b/mainwindow.h Mon Mar 14 10:00:29 2011 +0000 @@ -78,8 +78,7 @@ void hgUpdate(); void hgRevert(); void hgMerge(); - void hgMarkResolved(QStringList); - void hgRetryMerge(); + void hgRedoMerge(); void hgCloneFromRemote(); void hgInit(); void hgIncoming(); @@ -87,7 +86,6 @@ void hgPull(); void hgUpdateToRev(QString); void hgMergeFrom(QString); - void hgAnnotate(); void hgResolveList(); void hgTag(QString); void hgNewBranch(); @@ -95,6 +93,17 @@ void hgServe(); void hgIgnore(); + void hgAnnotateFiles(QStringList); + void hgDiffFiles(QStringList); + void hgCommitFiles(QStringList); + void hgRevertFiles(QStringList); + void hgAddFiles(QStringList); + void hgRemoveFiles(QStringList); + void hgRedoFileMerges(QStringList); + void hgMarkFilesResolved(QStringList); + void hgIgnoreFiles(QStringList); + void hgUnIgnoreFiles(QStringList); + void fsDirectoryChanged(QString); void fsFileChanged(QString); void checkFilesystem(); @@ -116,7 +125,6 @@ void readSettings(); void splitChangeSets(QStringList *list, QString hgLogOutput); void reportNewRemoteHeads(QString); - void presentLongStdoutToUser(QString stdo); void writeSettings(); QStringList listAllUpIpV4Addresses();