Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph

Merge with stable

Changeset 4fce6bab3840…

Parents e82e864a5439…

Parents ebc688d14817…

by Adrian Buehlmann

Changes to 4 files · Browse files at 4fce6bab3840 Showing diff from parent e82e864a5439 ebc688d14817 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filedialogs.py Stacked
 
288
289
290
291
 
292
293
294
 
288
289
290
 
291
292
293
294
@@ -288,7 +288,7 @@
  if ':' in link:   scheme, param = link.split(':', 1)   if scheme == 'cset': - rev = self.repo[param].rev() + rev = self.repo[hglib.fromunicode(param)].rev()   return self.goto(rev)   QDesktopServices.openUrl(QUrl(link))  
Change 1 of 7 Show Entire File tortoisehg/​hgqt/​reporegistry.py Stacked
 
16
17
18
19
20
21
22
23
24
 
50
51
52
53
 
 
54
55
56
 
58
59
60
61
62
63
64
65
 
208
209
210
 
 
211
212
213
 
222
223
224
225
226
227
228
229
230
231
 
279
280
281
 
 
282
283
284
 
643
644
645
646
 
647
648
649
 
16
17
18
 
 
 
19
20
21
 
47
48
49
 
50
51
52
53
54
 
56
57
58
 
 
59
60
61
 
204
205
206
207
208
209
210
211
 
220
221
222
 
 
 
 
223
224
225
 
273
274
275
276
277
278
279
280
 
639
640
641
 
642
643
644
645
@@ -16,9 +16,6 @@
 from PyQt4.QtCore import *  from PyQt4.QtGui import *   -import qtlib - -  def settingsfilename():   """Return path to thg-reporegistry.xml as unicode"""   s = QSettings() @@ -50,7 +47,8 @@
  self.setDragDropMode(QAbstractItemView.DragDrop)   self.setDefaultDropAction(Qt.MoveAction)   self.setDropIndicatorShown(True) - self.setEditTriggers(QAbstractItemView.DoubleClicked) + self.setEditTriggers(QAbstractItemView.DoubleClicked + | QAbstractItemView.EditKeyPressed)   self.setSelectionBehavior(QAbstractItemView.SelectRows)   QShortcut('Return', self, self.showFirstTabOrOpen).setContext(   Qt.WidgetShortcut) @@ -58,8 +56,6 @@
  Qt.WidgetShortcut)   QShortcut('Delete', self, self.removeSelected).setContext(   Qt.WidgetShortcut) - QShortcut('F2', self, self.renameSelected).setContext( - Qt.WidgetShortcut)     def contextMenuEvent(self, event):   if not self.selitem: @@ -208,6 +204,8 @@
  'remove selected repository'   s = self.selitem   item = s.internalPointer() + if 'remove' not in item.menulist(): # check capability + return   if not item.okToDelete():   labels = [(QMessageBox.Yes, _('&Delete')),   (QMessageBox.No, _('Cancel'))] @@ -222,10 +220,6 @@
  self.selectionChanged(None, None)   self.updateSettingsFile.emit()   - def renameSelected(self): - 'rename selected repository' - self.edit(self.selitem) -  class RepoRegistryView(QDockWidget):     showMessage = pyqtSignal(QString) @@ -279,6 +273,8 @@
  # Note that we must make sure that the settings file exists before   # setting thefile watcher   if not os.path.exists(sfile): + if not os.path.exists(os.path.dirname(sfile)): + os.makedirs(os.path.dirname(sfile))   tv.model().write(sfile)   self.watcher = QFileSystemWatcher(self)   self.watcher.addPath(sfile) @@ -643,7 +639,7 @@
  clip.setText(self.selitem.internalPointer().rootpath())     def startRename(self): - self.tview.renameSelected() + self.tview.edit(self.tview.currentIndex())     def newGroup(self):   self.tview.model().addGroup(_('New Group'))
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repoview.py Stacked
 
268
269
270
271
272
 
 
273
274
275
 
268
269
270
 
 
271
272
273
274
275
@@ -268,8 +268,8 @@
  """   Select revision 'rev' (can be anything understood by repo.changectx())   """ - if type(rev) is QString: - rev = str(rev) + if isinstance(rev, (unicode, QString)): + rev = hglib.fromunicode(rev)   try:   rev = self.repo.changectx(rev).rev()   except error.RepoError:
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
245
246
247
 
 
 
 
248
249
250
 
245
246
247
248
249
250
251
252
253
254
@@ -245,6 +245,10 @@
  idx = self.namedTabs[tabname]   self.taskTabsWidget.setCurrentIndex(idx)   + # restore default splitter position if task tab is invisible + if self.repotabs_splitter.sizes()[1] == 0: + self.repotabs_splitter.setSizes([1, 1]) +   def title(self):   """Returns the expected title for this widget [unicode]"""   if self.bundle: