comparison hgtabwidget.h @ 153:70fe12873106

* Show both parents of uncommitted merge; fixes to right-button menus

     void addIncrementalLog(QString hgLogList);
 
     void setWorkFolderAndRepoNames(QString workFolderPath, QString remoteRepoPath);
     void setState(QString state);
 
-    void setCurrent(QStringList ids);
+    void setCurrent(QStringList ids, QString branch);
 
     FileStates getFileStates() { return m_fileStates; }
 
     bool canCommit() const;
     bool canRevert() const;

     void mergeFrom(QString id);
     void tag(QString id);
 
 public slots:
     void clearSelections();
+    void showWorkTab();
+    void showHistoryTab();
 
 private:
     FileStatusWidget *m_fileStatusWidget;
     HistoryWidget *m_historyWidget;
     FileStates m_fileStates;