comparison src/mainwindow.h @ 520:a17c06f773cd

idiot -- we don't need to query bookmarks separately, we can just add them to the log template
author Chris Cannam
date Wed, 09 Nov 2011 13:04:00 +0000
parents 000f13faa089
children a4e699d32a9a
comparison
equal deleted inserted replaced
519:000f13faa089 520:a17c06f773cd
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();
126 void hgQueryHeadsActive(); 125 void hgQueryHeadsActive();
127 void hgQueryHeads(); 126 void hgQueryHeads();
128 void hgQueryParents(); 127 void hgQueryParents();
129 void hgLog(); 128 void hgLog();
130 void hgLogIncremental(QStringList prune); 129 void hgLogIncremental(QStringList prune);
191 QString m_remoteRepoPath; 190 QString m_remoteRepoPath;
192 QString m_workFolderPath; 191 QString m_workFolderPath;
193 QString m_currentBranch; 192 QString m_currentBranch;
194 Changesets m_currentHeads; 193 Changesets m_currentHeads;
195 Changesets m_activeHeads; 194 Changesets m_activeHeads;
196 QHash<QString, QStringList> m_bookmarks; // changeset id -> names, not vice versa
197 QSet<QString> m_closedHeadIds; 195 QSet<QString> m_closedHeadIds;
198 Changesets m_currentParents; 196 Changesets m_currentParents;
199 int m_commitsSincePush; 197 int m_commitsSincePush;
200 bool m_stateUnknown; 198 bool m_stateUnknown;
201 bool m_hgIsOK; 199 bool m_hgIsOK;