Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 1ac53134b385…

Parents d6363fbfe2c8…

Parents 413a86ef8cfd…

by Steve Borho

Changes to 3 files · Browse files at 1ac53134b385 Showing diff from parent d6363fbfe2c8 413a86ef8cfd Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​clone.py Stacked
 
40
41
42
 
 
43
44
45
 
65
66
67
68
69
70
71
 
308
309
310
 
 
 
 
 
 
 
 
311
312
313
 
40
41
42
43
44
45
46
47
 
67
68
69
 
70
71
72
 
309
310
311
312
313
314
315
316
317
318
319
320
321
322
@@ -40,6 +40,8 @@
  usrc = hglib.tounicode(src)   ucwd = hglib.tounicode(cwd)   + self.prev_dest = None +   # base layout box   box = QVBoxLayout()   box.setSpacing(6) @@ -65,7 +67,6 @@
  self.dest_combo = QComboBox()   self.dest_combo.setEditable(True)   self.dest_combo.setMinimumWidth(310) - self.dest_combo.lineEdit().returnPressed.connect(self.clone)   self.dest_btn = QPushButton(_('Browse...'))   self.dest_btn.setAutoDefault(False)   self.dest_btn.clicked.connect(self.browse_dest) @@ -308,6 +309,14 @@
  cmdline.append('--')   cmdline.append(dest)   + # do not make the same clone twice (see #514) + if dest == self.prev_dest: + qtlib.ErrorMsgBox(_('TortoiseHg Clone'), + _('Please enter a new destination path.')) + self.dest_combo.setFocus() + return + self.prev_dest = dest +   # start cloning   self.cmd.run(cmdline)  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filelistview.py Stacked
 
62
63
64
 
 
 
65
66
67
 
62
63
64
65
66
67
68
69
70
@@ -62,6 +62,9 @@
  if model._ctx is not None:   self.contextChanged(model._ctx)   + def setRepo(self, repo): + self.model().repo = repo +   def contextChanged(self, ctx):   real = type(ctx.rev()) is int   wd = ctx.rev() is None
Change 1 of 1 Show Changes Only tortoisehg/​hgqt/​revdetails.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
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
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
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
 # revdetails.py - TortoiseHg revision details widget  #  # Copyright (C) 2007-2010 Logilab. All rights reserved.  # Copyright (C) 2010 Adrian Buehlmann <adrian@cadifra.com>  #  # This software may be used and distributed according to the terms  # of the GNU General Public License, incorporated herein by reference.    from tortoisehg.hgqt.qtlib import getfont, geticon, descriptionhtmlizer  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt.filelistmodel import HgFileListModel  from tortoisehg.hgqt.filelistview import HgFileListView  from tortoisehg.hgqt.fileview import HgFileView  from tortoisehg.hgqt.revpanel import RevPanelWidget  from tortoisehg.hgqt import thgrepo, qscilib    from PyQt4.QtCore import *  from PyQt4.QtGui import *    class RevDetailsWidget(QWidget):     showMessage = pyqtSignal(QString)   linkActivated = pyqtSignal(unicode)   grepRequested = pyqtSignal(unicode, dict)   revisionSelected = pyqtSignal(int)   updateToRevision = pyqtSignal(int)     def __init__(self, repo):   QWidget.__init__(self)     self.repo = repo   self.splitternames = []     self._deschtmlize = descriptionhtmlizer(repo.ui)   repo.configChanged.connect(self._updatedeschtmlizer)     # these are used to know where to go after a reload   self._last_rev = None   self._reload_file = None     self.setupUi()   self.createActions()   self.setupModels()     self.fileview.setFont(getfont('fontdiff').font())   self.fileview.showMessage.connect(self.showMessage)   self.fileview.grepRequested.connect(self.grepRequested)   self.fileview.revisionSelected.connect(self.revisionSelected)     def setRepo(self, repo):   self.repo = repo   self.fileview.setRepo(repo) + self.filelist.setRepo(repo)     def setupUi(self):   SP = QSizePolicy   sp = SP(SP.Preferred, SP.Expanding)   sp.setHorizontalStretch(0)   sp.setVerticalStretch(0)   sp.setHeightForWidth(self.sizePolicy().hasHeightForWidth())   self.setSizePolicy(sp)     # + revisiondetails_layout -----------------------------------------+   # |+ filelist_splitter ........ |   # | + tbarFileListFrame (vbox)| + cset_and_file_details_frame (vbox)|   # | + filelistToolbar | + revpanel |   # +---------------------------+-------------------------------------+   # | + filelist | + message_splitter |   # | | :+ message |   # | | :----------------------------------+   # | | + fileview |   # +---------------------------+-------------------------------------+     revisiondetails_layout = QVBoxLayout(self)   revisiondetails_layout.setSpacing(0)   revisiondetails_layout.setMargin(0)   revisiondetails_layout.setContentsMargins(2, 2, 2, 2)     self.filelist_splitter = QSplitter(self)   self.splitternames.append('filelist_splitter')     sp = SP(SP.Expanding, SP.Expanding)   sp.setHorizontalStretch(0)   sp.setVerticalStretch(0)   sp.setHeightForWidth(self.filelist_splitter.sizePolicy().hasHeightForWidth())   self.filelist_splitter.setSizePolicy(sp)   self.filelist_splitter.setOrientation(Qt.Horizontal)   self.filelist_splitter.setChildrenCollapsible(False)     self.filelistToolbar = QToolBar(_('File List Toolbar'))   self.filelistToolbar.setIconSize(QSize(16,16))   self.filelist = HgFileListView()   self.filelist.linkActivated.connect(self.linkActivated)     self.tbarFileListFrame = QFrame(self.filelist_splitter)   sp = SP(SP.Preferred, SP.Preferred)   sp.setHorizontalStretch(3)   sp.setVerticalStretch(0)   sp.setHeightForWidth(   self.tbarFileListFrame.sizePolicy().hasHeightForWidth())   self.tbarFileListFrame.setSizePolicy(sp)   self.tbarFileListFrame.setFrameShape(QFrame.NoFrame)   vbox = QVBoxLayout()   vbox.setSpacing(0)   vbox.setMargin(0)   vbox.addWidget(self.filelistToolbar)   vbox.addWidget(self.filelist)   self.tbarFileListFrame.setLayout(vbox)     self.cset_and_file_details_frame = QFrame(self.filelist_splitter)   sp = SP(SP.Preferred, SP.Preferred)   sp.setHorizontalStretch(7)   sp.setVerticalStretch(0)   sp.setHeightForWidth(   self.cset_and_file_details_frame.sizePolicy().hasHeightForWidth())   self.cset_and_file_details_frame.setSizePolicy(sp)   self.cset_and_file_details_frame.setFrameShape(QFrame.NoFrame)     vbox = QVBoxLayout(self.cset_and_file_details_frame)   vbox.setSpacing(0)   vbox.setSizeConstraint(QLayout.SetDefaultConstraint)   vbox.setMargin(0)   cset_and_file_details_layout = vbox     self.message_splitter = QSplitter(self.cset_and_file_details_frame)   self.splitternames.append('message_splitter')   sp = SP(SP.Preferred, SP.Expanding)   sp.setHorizontalStretch(0)   sp.setVerticalStretch(0)   sp.setHeightForWidth(self.message_splitter.sizePolicy().hasHeightForWidth())   self.message_splitter.setSizePolicy(sp)   self.message_splitter.setMinimumSize(QSize(50, 50))   self.message_splitter.setFrameShape(QFrame.NoFrame)   self.message_splitter.setLineWidth(0)   self.message_splitter.setMidLineWidth(0)   self.message_splitter.setOrientation(Qt.Vertical)   self.message_splitter.setOpaqueResize(True)   self.message = QTextBrowser(self.message_splitter,   lineWrapMode=QTextEdit.NoWrap,   openLinks=False)   self.message.minimumSizeHint = lambda: QSize(0, 25)   self.message.anchorClicked.connect(   lambda url: self.linkActivated.emit(url.toString()))     sp = SP(SP.Expanding, SP.Expanding)   sp.setHorizontalStretch(0)   sp.setVerticalStretch(2)   sp.setHeightForWidth(self.message.sizePolicy().hasHeightForWidth())   self.message.setSizePolicy(sp)   self.message.setMinimumSize(QSize(0, 0))   f = getfont('fontcomment')   self.message.setFont(f.font())   f.changed.connect(self.forwardFont)     self.fileview = HgFileView(self.repo, self.message_splitter)   sp = SP(SP.Expanding, SP.Expanding)   sp.setHorizontalStretch(0)   sp.setVerticalStretch(5)   sp.setHeightForWidth(self.fileview.sizePolicy().hasHeightForWidth())   self.fileview.setSizePolicy(sp)   self.fileview.setMinimumSize(QSize(0, 0))   self.fileview.linkActivated.connect(self.linkActivated)     self.revpanel = RevPanelWidget(self.repo)   self.revpanel.linkActivated.connect(self.linkActivated)     cset_and_file_details_layout.addWidget(self.revpanel)   cset_and_file_details_layout.addWidget(self.message_splitter)     revisiondetails_layout.addWidget(self.filelist_splitter)     self.filelist.fileSelected.connect(self.fileview.displayFile)   self.filelist.clearDisplay.connect(self.fileview.clearDisplay)     def forwardFont(self, font):   self.message.setFont(font)     def createActions(self):   def fileActivated():   idx = self.filelist.currentIndex()   self.filelist.fileActivated(idx, alternate=True)   self.actionActivateFileAlt = QAction('Activate alt. file', self)   self.actionActivateFileAlt.setShortcuts([Qt.ALT+Qt.Key_Return,   Qt.ALT+Qt.Key_Enter])   self.actionActivateFileAlt.triggered.connect(fileActivated)     self.actionUpdate = a = self.filelistToolbar.addAction(   geticon('hg-update'), _('Update to this revision'))   a.triggered.connect(lambda: self.updateToRevision.emit(self._last_rev))   self.filelistToolbar.addSeparator()   self.filelistToolbar.addAction(self.filelist.actionShowAllMerge)     self.actionNextLine = QAction('Next line', self)   self.actionNextLine.setShortcut(Qt.SHIFT + Qt.Key_Down)   self.actionNextLine.triggered.connect(self.fileview.nextLine)   self.addAction(self.actionNextLine)   self.actionPrevLine = QAction('Prev line', self)   self.actionPrevLine.setShortcut(Qt.SHIFT + Qt.Key_Up)   self.actionPrevLine.triggered.connect(self.fileview.prevLine)   self.addAction(self.actionPrevLine)   self.actionNextCol = QAction('Next column', self)   self.actionNextCol.setShortcut(Qt.SHIFT + Qt.Key_Right)   self.actionNextCol.triggered.connect(self.fileview.nextCol)   self.addAction(self.actionNextCol)   self.actionPrevCol = QAction('Prev column', self)   self.actionPrevCol.setShortcut(Qt.SHIFT + Qt.Key_Left)   self.actionPrevCol.triggered.connect(self.fileview.prevCol)   self.addAction(self.actionPrevCol)     def create_models(self):   self.filelistmodel = HgFileListModel(self.repo, self)     def setupModels(self):   self.create_models()   self.filelist.setModel(self.filelistmodel)     def onRevisionSelected(self, rev):   'called by repowidget when repoview changes revisions'   self._last_rev = rev   ctx = self.repo.changectx(rev)   self.revpanel.set_revision(rev)   self.revpanel.update(repo = self.repo)   self.message.setHtml('<pre>%s</pre>'   % self._deschtmlize(ctx.description()))   self.fileview.setContext(ctx)   self.filelistmodel.setContext(ctx)     @pyqtSlot()   def _updatedeschtmlizer(self):   self._deschtmlize = descriptionhtmlizer(self.repo.ui)   self.onRevisionSelected(self._last_rev) # regenerate desc html     def reload(self):   'Task tab is reloaded, or repowidget is refreshed'   if type(self._last_rev) is int and len(self.repo) <= self._last_rev:   self._last_rev = 'tip'   f = self.filelist.currentFile()   self.onRevisionSelected(self._last_rev)   self.filelist.selectFile(f)     def saveSettings(self, s):   wb = "RevDetailsWidget/"   for n in self.splitternames:   s.setValue(wb + n, getattr(self, n).saveState())   s.setValue(wb + 'revpanel.expanded', self.revpanel.is_expanded())   self.fileview.saveSettings(s, 'revpanel/fileview')     def loadSettings(self, s):   wb = "RevDetailsWidget/"   for n in self.splitternames:   getattr(self, n).restoreState(s.value(wb + n).toByteArray())   expanded = s.value(wb + 'revpanel.expanded', False).toBool()   self.revpanel.set_expanded(expanded)   self.fileview.loadSettings(s, 'revpanel/fileview')