comparison src/mainwindow.h @ 519:000f13faa089

Bookmarks are now displayed -- but exactly like tags, so far, there's no differentiation yet
author Chris Cannam
date Tue, 08 Nov 2011 16:42:09 +0000
parents 306a62fe851e
children a17c06f773cd
comparison
equal deleted inserted replaced
518:5c846f3c9244 519:000f13faa089
120 120
121 void newerVersionAvailable(QString); 121 void newerVersionAvailable(QString);
122 122
123 private: 123 private:
124 void hgQueryBranch(); 124 void hgQueryBranch();
125 void hgQueryBookmarks();
125 void hgQueryHeadsActive(); 126 void hgQueryHeadsActive();
126 void hgQueryHeads(); 127 void hgQueryHeads();
127 void hgQueryParents(); 128 void hgQueryParents();
128 void hgLog(); 129 void hgLog();
129 void hgLogIncremental(QStringList prune); 130 void hgLogIncremental(QStringList prune);
190 QString m_remoteRepoPath; 191 QString m_remoteRepoPath;
191 QString m_workFolderPath; 192 QString m_workFolderPath;
192 QString m_currentBranch; 193 QString m_currentBranch;
193 Changesets m_currentHeads; 194 Changesets m_currentHeads;
194 Changesets m_activeHeads; 195 Changesets m_activeHeads;
196 QHash<QString, QStringList> m_bookmarks; // changeset id -> names, not vice versa
195 QSet<QString> m_closedHeadIds; 197 QSet<QString> m_closedHeadIds;
196 Changesets m_currentParents; 198 Changesets m_currentParents;
197 int m_commitsSincePush; 199 int m_commitsSincePush;
198 bool m_stateUnknown; 200 bool m_stateUnknown;
199 bool m_hgIsOK; 201 bool m_hgIsOK;