Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

repowidget: do not gratuitously convert revision to string

This caused the repoview to jump to *old* changesets after refresh if there
happened to be a collision between the revision number and a changeset hash.

Also, re-select the working directory through refresh

Changeset 5ae7a0f3674f…

Parent 452bb82ec5df…

by Steve Borho

Changes to 2 files · Browse files at 5ae7a0f3674f Showing diff from parent 452bb82ec5df Diff from another changeset...

Change 1 of 1 Show Changes Only tortoisehg/​hgqt/​repoview.py Stacked
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
 
 
231
232
233
234
235
236
237
238
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
 
 
229
230
231
232
233
234
235
236
237
238
 # Copyright (c) 2009-2010 LOGILAB S.A. (Paris, FRANCE).  # http://www.logilab.fr/ -- mailto:contact@logilab.fr  #  # This program is free software; you can redistribute it and/or modify it under  # the terms of the GNU General Public License as published by the Free Software  # Foundation; either version 2 of the License, or (at your option) any later  # version.  #  # This program is distributed in the hope that it will be useful, but WITHOUT  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS  # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.  #  # You should have received a copy of the GNU General Public License along with  # this program; if not, write to the Free Software Foundation, Inc.,  # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.    from mercurial.error import RepoError    from tortoisehg.util import hglib  from tortoisehg.hgqt.qtlib import geticon  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import htmllistview    from PyQt4.QtCore import *  from PyQt4.QtGui import *    class HgRepoView(QTableView):     revisionClicked = pyqtSignal(object)   revisionSelected = pyqtSignal(object)   revisionActivated = pyqtSignal(object)   menuRequested = pyqtSignal(QPoint, object)   showMessage = pyqtSignal(unicode)     def __init__(self, workbench, repo, parent=None):   QTableView.__init__(self, parent)   self.repo = repo   self.init_variables()   self.setShowGrid(False)     vh = self.verticalHeader()   vh.hide()   vh.setDefaultSectionSize(20)     self.horizontalHeader().setHighlightSections(False)     self.standardDelegate = self.itemDelegate()   self.htmlDelegate = htmllistview.HTMLDelegate(self)     self.setSelectionMode(QAbstractItemView.ExtendedSelection)   self.setSelectionBehavior(QAbstractItemView.SelectRows)     self.doubleClicked.connect(self.revActivated)   self.clicked.connect(self.revClicked)     self._actions = {}   self._actions['back'] = workbench.actionBack   self._actions['forward'] = workbench.actionForward     def setRepo(self, repo):   self.repo = repo     def mousePressEvent(self, event):   index = self.indexAt(event.pos())   if not index.isValid():   return   if event.button() == Qt.MidButton:   self.gotoAncestor(index)   return   QTableView.mousePressEvent(self, event)     def contextMenuEvent(self, event):   self.menuRequested.emit(event.globalPos(), self.selectedRevisions())     def init_variables(self):   # member variables   self.current_rev = -1   # rev navigation history (manage 'back' action)   self._rev_history = []   self._rev_pos = -1   self._in_history = False # flag set when we are "in" the   # history. It is required cause we cannot known, in   # "revision_selected", if we are crating a new branch in the   # history navigation or if we are navigating the history     def setModel(self, model):   self.init_variables()   QTableView.setModel(self, model)   self.selectionModel().currentRowChanged.connect(self.revSelected)   self.resetDelegate()   model.layoutChanged.connect(self.resetDelegate)     def resetDelegate(self):   # Model column layout has changed so we need to move   # our column delegate to correct location   if not self.model():   return   model = self.model()     for c in range(model.columnCount()):   if model._columns[c] in ['Log', 'Changes']:   self.setItemDelegateForColumn(c, self.htmlDelegate)   else:   self.setItemDelegateForColumn(c, self.standardDelegate)     def resizeColumns(self, *args):   # resize columns the smart way: the column holding Log   # is resized according to the total widget size.   if not self.model():   return   hh = self.horizontalHeader()   hh.setStretchLastSection(False)   self._resizeColumns()   hh.setStretchLastSection(True)     def _resizeColumns(self):   # _resizeColumns misbehaves if called with last section streched   model = self.model()   col1_width = self.viewport().width()   fontm = QFontMetrics(self.font())   tot_stretch = 0.0   for c in range(model.columnCount()):   if model._columns[c] in model._stretchs:   tot_stretch += model._stretchs[model._columns[c]]   continue   w = model.maxWidthValueForColumn(c)   if isinstance(w, int):   self.setColumnWidth(c, w)   elif w is not None:   w = fontm.width(hglib.tounicode(str(w)) + 'w')   self.setColumnWidth(c, w)   else:   w = self.sizeHintForColumn(c)   self.setColumnWidth(c, w)   col1_width -= self.columnWidth(c)   col1_width = max(col1_width, 100)   for c in range(model.columnCount()):   if model._columns[c] in model._stretchs:   w = model._stretchs[model._columns[c]] / tot_stretch   self.setColumnWidth(c, col1_width * w)     def revFromindex(self, index):   if not index.isValid():   return   model = self.model()   if model and model.graph:   row = index.row()   gnode = model.graph[row]   return gnode.rev     def context(self, rev):   return self.repo.changectx(rev)     def revClicked(self, index):   rev = self.revFromindex(index)   self.revisionClicked.emit(rev)     def revActivated(self, index):   rev = self.revFromindex(index)   if rev is not None:   self.revisionActivated.emit(rev)     def revSelected(self, index, index_from):   rev = self.revFromindex(index)   if self.current_rev == rev:   return     if not self._in_history:   del self._rev_history[self._rev_pos+1:]   self._rev_history.append(rev)   self._rev_pos = len(self._rev_history)-1     self._in_history = False   self.current_rev = rev     self.revisionSelected.emit(rev)   self.updateActions()     def selectedRevisions(self):   """Return the list of selected revisions"""   selmodel = self.selectionModel()   return [self.revFromindex(i) for i in selmodel.selectedRows()]     def gotoAncestor(self, index):   rev = self.revFromindex(index)   if rev is None or self.current_rev is None:   return   ctx = self.context(self.current_rev)   ctx2 = self.context(rev)   if ctx.thgmqunappliedpatch() or ctx2.thgmqunappliedpatch():   return   ancestor = ctx.ancestor(ctx2)   self.showMessage.emit(_("Goto ancestor of %s and %s") % (   ctx.rev(), ctx2.rev()))   self.goto(ancestor.rev())     def updateActions(self):   if len(self._rev_history) > 0:   back = self._rev_pos > 0   forw = self._rev_pos < len(self._rev_history)-1   else:   back = False   forw = False   self._actions['back'].setEnabled(back)   self._actions['forward'].setEnabled(forw)     def back(self):   if self._rev_history and self._rev_pos>0:   self._rev_pos -= 1   idx = self.model().indexFromRev(self._rev_history[self._rev_pos])   if idx is not None:   self._in_history = True   self.setCurrentIndex(idx)   self.updateActions()     def forward(self):   if self._rev_history and self._rev_pos<(len(self._rev_history)-1):   self._rev_pos += 1   idx = self.model().indexFromRev(self._rev_history[self._rev_pos])   if idx is not None:   self._in_history = True   self.setCurrentIndex(idx)   self.updateActions()     def goto(self, rev):   """   Select revision 'rev' (can be anything understood by repo.changectx())   """ - if rev is not None: - rev = str(rev) # might be a QString + if type(rev) is QString: + rev = str(rev)   try:   rev = self.repo.changectx(rev).rev()   except RepoError:   self.showMessage.emit(_("Can't find revision '%s'") % rev)   else:   idx = self.model().indexFromRev(rev)   if idx is not None:   self.setCurrentIndex(idx)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
526
527
528
529
530
531
532
533
 
534
535
536
 
547
548
549
550
 
551
552
553
 
526
527
528
 
 
529
 
 
530
531
532
533
 
544
545
546
 
547
548
549
550
@@ -526,11 +526,8 @@
  self.goto('.')     def goto(self, rev): - if rev is not None: - rev = str(rev)   self._reload_rev = rev - if len(self.repoview.model().graph): - self.repoview.goto(rev) + self.repoview.goto(rev)     def revision_activated(self, rev=None):   rev = rev or self.rev @@ -547,7 +544,7 @@
    def rebuildGraph(self):   self.showMessage('') - if self.rev is not None and len(self.repo) >= self.rev: + if self.rev is None or len(self.repo) > self.rev:   self._reload_rev = self.rev   else:   self._reload_rev = '.'