Mercurial > hg > easyhg
comparison hgtabwidget.h @ 163:5c262ac73948
* First cut of work on merge/resolve logic
author | Chris Cannam |
---|---|
date | Fri, 03 Dec 2010 19:35:04 +0000 |
parents | 6bcb4a4d6521 |
children | 4bad3c5c053a |
comparison
equal
deleted
inserted
replaced
162:910c2c5d1873 | 163:5c262ac73948 |
---|---|
52 | 52 |
53 void updateHistory(); | 53 void updateHistory(); |
54 | 54 |
55 FileStates getFileStates() { return m_fileStates; } | 55 FileStates getFileStates() { return m_fileStates; } |
56 | 56 |
57 bool canDiff() const; | |
57 bool canCommit() const; | 58 bool canCommit() const; |
58 bool canRevert() const; | 59 bool canRevert() const; |
59 bool canAdd() const; | 60 bool canAdd() const; |
60 bool canRemove() const; | 61 bool canRemove() const; |
61 bool canDoDiff() const; | 62 bool canResolve() const; |
62 | 63 |
63 QStringList getAllSelectedFiles() const; | 64 QStringList getAllSelectedFiles() const; |
64 | 65 |
65 QStringList getSelectedCommittableFiles() const; | 66 QStringList getSelectedCommittableFiles() const; |
66 QStringList getAllCommittableFiles() const; | 67 QStringList getAllCommittableFiles() const; |
71 QStringList getSelectedAddableFiles() const; | 72 QStringList getSelectedAddableFiles() const; |
72 QStringList getAllAddableFiles() const; | 73 QStringList getAllAddableFiles() const; |
73 | 74 |
74 QStringList getSelectedRemovableFiles() const; | 75 QStringList getSelectedRemovableFiles() const; |
75 QStringList getAllRemovableFiles() const; | 76 QStringList getAllRemovableFiles() const; |
77 | |
78 QStringList getSelectedUnresolvedFiles() const; | |
79 QStringList getAllUnresolvedFiles() const; | |
76 | 80 |
77 signals: | 81 signals: |
78 void selectionChanged(); | 82 void selectionChanged(); |
79 | 83 |
80 void commit(); | 84 void commit(); |