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 ef70809a429b…

Parents 9c3a0494c6b0…

Parents 5360a2741540…

by Steve Borho

Changes to 3 files · Browse files at ef70809a429b Showing diff from parent 9c3a0494c6b0 5360a2741540 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​archive.py Stacked
 
280
281
282
283
 
284
285
286
 
280
281
282
 
283
284
285
286
@@ -280,7 +280,7 @@
  path = hglib.fromunicode(self.dest_edit.text())   path = remove_ext(path)   path = remove_rev(path) - path = add_rev(path, text) + path = add_rev(path, hglib.fromunicode(text))   path = add_ext(path)   self.dest_edit.setText(path)   self.prevtarget = text
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​backout.py Stacked
 
450
451
452
453
 
 
 
454
455
456
 
472
473
474
475
476
477
478
479
480
 
494
495
496
 
 
 
 
 
497
498
499
500
 
501
502
503
 
450
451
452
 
453
454
455
456
457
458
 
474
475
476
 
 
 
477
478
479
 
493
494
495
496
497
498
499
500
501
502
503
 
504
505
506
507
@@ -450,7 +450,9 @@
  pass     def cleanupPage(self): - QSettings().setValue('backout/skiplast', self.skiplast.isChecked()) + s = QSettings() + s.setValue('backout/skiplast', self.skiplast.isChecked()) + self.msgEntry.saveSettings(s, 'backout/message')     def currentPage(self):   engmsg = self.repo.ui.configbool('tortoisehg', 'engmsg', False) @@ -472,9 +474,6 @@
  def validatePage(self):   if self.commitComplete:   # commit succeeded, repositoryChanged() called wizard().next() - s = QSettings() - s.setValue('backout/skiplast', self.skiplast.isChecked()) - self.msgEntry.saveSettings(s, 'backout/message')   if self.skiplast.isChecked():   self.wizard().close()   return True @@ -494,10 +493,15 @@
  message = hglib.fromunicode(self.msgEntry.text())   cmdline = ['commit', '--verbose', '--message', message,   '--repository', self.repo.root] + commandlines = [cmdline] + pushafter = self.repo.ui.config('tortoisehg', 'cipushafter') + if pushafter: + cmd = ['push', '--repository', self.repo.root, pushafter] + commandlines.append(cmd)     self.repo.incrementBusyCount()   self.cmd.setShowOutput(True) - self.cmd.run(cmdline) + self.cmd.run(*commandlines)   return False     def onCommandFinished(self, ret):
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
205
206
207
208
 
 
209
210
211
 
1207
1208
1209
1210
 
1211
1212
1213
 
205
206
207
 
208
209
210
211
212
 
1208
1209
1210
 
1211
1212
1213
1214
@@ -205,7 +205,8 @@
  if self.bundle:   return _('%s <incoming>') % self.repo.shortname   elif self.branch: - return '%s [%s]' % (self.repo.shortname, self.branch) + return u'%s [%s]' % (self.repo.shortname, + hglib.tounicode(self.branch))   else:   return self.repo.shortname   @@ -1207,7 +1208,7 @@
  if not dir:   return   epath = os.path.join(hglib.fromunicode(dir), - self.repo.shortname + '_%r.patch') + hglib.fromunicode(self.repo.shortname)+'_%r.patch')   cmdline = ['export', '--repository', self.repo.root, '--verbose',   '--output', epath]   for rev in revisions: