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 1a84db9363f6…

Parents e915ca0e8d3f…

Parents 4dfacfcc8d3c…

by Steve Borho

Changes to 7 files · Browse files at 1a84db9363f6 Showing diff from parent e915ca0e8d3f 4dfacfcc8d3c Diff from another changeset...

Change 1 of 1 Show Entire File TortoiseHgOverlayServer.py Stacked
 
196
197
198
199
 
 
 
 
200
201
202
 
196
197
198
 
199
200
201
202
203
204
205
@@ -196,7 +196,10 @@
  while cnt <= max_try and self.pipethread.isAlive():   print "testing pipe [try %d] ..." % cnt   try: - self.pipethread.terminate() + try: + self.pipethread.terminate() + except ValueError: + pass   win32pipe.CallNamedPipe(PIPENAME, '', PIPEBUFSIZE, 0)   except:   logger.msg(traceback.format_exc())
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​branchop.py Stacked
 
19
20
21
22
 
23
24
25
 
19
20
21
 
22
23
24
25
@@ -19,7 +19,7 @@
  'Dialog for manipulating wctx.branch()'   def __init__(self, repo, oldbranchop, parent=None):   QDialog.__init__(self, parent) - self.setWindowTitle('%s - branch operation' % repo.displayname) + self.setWindowTitle(_('%s - branch operation') % repo.displayname)   self.setWindowIcon(qtlib.geticon('branch'))   layout = QVBoxLayout()   self.setLayout(layout)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
685
686
687
688
 
689
690
691
 
979
980
981
982
 
983
984
985
 
685
686
687
 
688
689
690
691
 
979
980
981
 
982
983
984
985
@@ -685,7 +685,7 @@
  'Utility dialog for configuring uncommon settings'   def __init__(self, opts, userhistory, parent):   QDialog.__init__(self, parent) - self.setWindowTitle('%s - commit options' % parent.repo.displayname) + self.setWindowTitle(_('%s - commit options') % parent.repo.displayname)   self.repo = parent.repo     layout = QVBoxLayout() @@ -979,7 +979,7 @@
  commit.commitComplete.connect(self.postcommit)   commit.commitButtonEnable.connect(self.commitButton.setEnabled)   - self.setWindowTitle('%s - commit' % commit.repo.displayname) + self.setWindowTitle(_('%s - commit') % commit.repo.displayname)   self.commit = commit   self.commit.reload()   self.updateUndo()
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​mq.py Stacked
 
919
920
921
922
 
923
924
925
 
919
920
921
 
922
923
924
925
@@ -919,7 +919,7 @@
  'Utility dialog for configuring uncommon options'   def __init__(self, parent):   QDialog.__init__(self, parent) - self.setWindowTitle('MQ options') + self.setWindowTitle(_('MQ options'))     layout = QFormLayout()   self.setLayout(layout)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​purge.py Stacked
 
67
68
69
70
 
71
72
73
 
67
68
69
 
70
71
72
73
@@ -67,7 +67,7 @@
  self.bb = bb   self.layout().addWidget(bb)   - self.setWindowTitle('%s - purge' % repo.displayname) + self.setWindowTitle(_('%s - purge') % repo.displayname)   self.setWindowIcon(qtlib.geticon('hg-purge'))   self.repo = repo  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​quickop.py Stacked
 
41
42
43
44
 
45
46
47
 
41
42
43
 
44
45
46
47
@@ -41,7 +41,7 @@
  command = 'remove'   self.command = command   - self.setWindowTitle('%s - hg %s' % (repo.displayname, command)) + self.setWindowTitle(_('%s - hg %s') % (repo.displayname, command))   self.setWindowIcon(qtlib.geticon(ICONS[command]))     layout = QVBoxLayout()
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
1376
1377
1378
1379
 
1380
1381
1382
 
1376
1377
1378
 
1379
1380
1381
1382
@@ -1376,7 +1376,7 @@
  'Utility dialog for configuring uncommon options'   def __init__(self, opts, parent):   QDialog.__init__(self, parent) - self.setWindowTitle('%s - sync options' % parent.repo.displayname) + self.setWindowTitle(_('%s - sync options') % parent.repo.displayname)   self.repo = parent.repo     layout = QFormLayout()