Mercurial > hg > easyhg

diff mainwindow.h @ 148:2fef6b0dfbe8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Some implementation of right-button menu actions on changeset item
author Chris Cannam
date Wed, 01 Dec 2010 21:02:53 +0000
parents 644bd31e8301
children fb697ce0f625
line wrap: on
line diff
--- a/mainwindow.h	Wed Dec 01 20:19:21 2010 +0000
+++ b/mainwindow.h	Wed Dec 01 21:02:53 2010 +0000
@@ -76,7 +76,8 @@
     void hgCommit();
     void hgFileDiff();
     void hgFolderDiff();
-    void hgChgSetDiff();
+    void hgDiffToCurrent(QString);
+    void hgDiffToParent(QString, QString);
     void hgUpdate();
     void hgRevert();
     void hgMerge();
@@ -86,7 +87,8 @@
     void hgIncoming();
     void hgPush();
     void hgPull();
-    void hgUpdateToRev();
+    void hgUpdateToRev(QString);
+    void hgMergeFrom(QString);
     void hgAnnotate();
     void hgResolveList();
     void hgResolveMark();