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

fogcreek tip Merge with stable

Changeset d99a040d0640…

Parents 96e1e4a8b86f…

Parents c5b82b5a2bc7…

by David Golub

Changes to 4 files · Browse files at d99a040d0640 Showing diff from parent 96e1e4a8b86f c5b82b5a2bc7 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​branchop.py Stacked
 
63
64
65
 
66
67
68
 
63
64
65
66
67
68
69
@@ -63,6 +63,7 @@
  grid.setColumnStretch(0, 0)   grid.setColumnStretch(1, 1)   layout.addLayout(grid) + layout.addStretch()     newbranch.toggled.connect(branchCombo.setEnabled)   branchCombo.setEnabled(False)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​rename.py Stacked
 
289
290
291
292
 
293
294
295
 
289
290
291
 
292
293
294
295
@@ -289,7 +289,7 @@
  return   else:   try: - targetdir = os.path.dirname(dest) + targetdir = os.path.dirname(fulldest)   if not os.path.isdir(targetdir):   os.makedirs(targetdir)   os.rename(fullsrc, fulldest)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
11
12
13
14
 
15
16
17
 
1788
1789
1790
 
1791
1792
1793
 
11
12
13
 
14
15
16
17
 
1788
1789
1790
1791
1792
1793
1794
@@ -11,7 +11,7 @@
   from mercurial import revset, error, patch   -from tortoisehg.util import hglib +from tortoisehg.util import hglib, shlib    from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib @@ -1788,6 +1788,7 @@
    def onCommandFinished(self, ret):   self.repo.decrementBusyCount() + shlib.shell_notify(self.repo.root)     def runCommand(self, *cmdlines):   if self.runner.core.running():
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
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
 
451
452
453
454
455
 
 
456
457
458
 
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
 
449
450
451
 
 
452
453
454
455
456
@@ -212,33 +212,31 @@
  self.securebutton = a   tbar.addWidget(qtlib.Spacer(2, 2))   + self.hostAndPortActions = [] +   fontm = QFontMetrics(self.font())   self.hostentry = QLineEdit()   self.hostentry.setToolTip(_('Hostname'))   self.hostentry.setAcceptDrops(False)   self.hostentry.setFixedWidth(30 * fontm.width('9'))   self.hostentry.textChanged.connect(self.refreshUrl) - tbar.addWidget(self.hostentry) - tbar.addWidget(qtlib.Spacer(2, 2)) + self.hostAndPortActions.append(tbar.addWidget(self.hostentry)) + self.hostAndPortActions.append(tbar.addWidget(qtlib.Spacer(2, 2)))   - self.HostAndPortWidgets = [self.hostentry]   w = QLabel(':') - tbar.addWidget(w) - tbar.addWidget(qtlib.Spacer(2, 2)) - self.HostAndPortWidgets.append(w) + self.hostAndPortActions.append(tbar.addWidget(w)) + self.hostAndPortActions.append(tbar.addWidget(qtlib.Spacer(2, 2)))   self.portentry = QLineEdit()   self.portentry.setAcceptDrops(False)   self.portentry.setToolTip(_('Port'))   self.portentry.setFixedWidth(8 * fontm.width('9'))   self.portentry.setValidator(QIntValidator(0, 65536, self.portentry))   self.portentry.textChanged.connect(self.refreshUrl) - tbar.addWidget(self.portentry) - tbar.addWidget(qtlib.Spacer(2, 2)) - self.HostAndPortWidgets.append(self.portentry) + self.hostAndPortActions.append(tbar.addWidget(self.portentry)) + self.hostAndPortActions.append(tbar.addWidget(qtlib.Spacer(2, 2)))   w = QLabel('/') - tbar.addWidget(w) - tbar.addWidget(qtlib.Spacer(2, 2)) - self.HostAndPortWidgets.append(w) + self.hostAndPortActions.append(tbar.addWidget(w)) + self.hostAndPortActions.append(tbar.addWidget(qtlib.Spacer(2, 2)))   self.pathentry = QLineEdit()   self.pathentry.setAcceptDrops(False)   self.pathentry.setToolTip(_('Path')) @@ -451,8 +449,8 @@
  return   self.urllabel.setText(hglib.tounicode(self.currentUrl(True)))   schemeIndex = self.schemecombo.currentIndex() - for w in self.HostAndPortWidgets: - w.setDisabled(schemeIndex == 0) + for w in self.hostAndPortActions: + w.setVisible(schemeIndex != 0)   self.securebutton.setVisible(schemeIndex >= 3)     opts = []