Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

commit, status: standardize on showMessage signal name

Changeset f28341475773…

Parent e9281cea175d…

by Steve Borho

Changes to 2 files · Browse files at f28341475773 Showing diff from parent e9281cea175d Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
36
37
38
39
 
40
41
42
 
44
45
46
47
 
48
49
50
 
506
507
508
509
 
510
511
512
 
594
595
596
597
 
 
 
598
599
600
601
602
603
604
605
606
 
612
613
614
615
 
616
617
618
 
36
37
38
 
39
40
41
42
 
44
45
46
 
47
48
49
50
 
506
507
508
 
509
510
511
512
 
594
595
596
 
597
598
599
600
601
602
603
 
 
604
605
606
 
612
613
614
 
615
616
617
618
@@ -36,7 +36,7 @@
  'A widget that encompasses a StatusWidget and commit extras'   loadBegin = pyqtSignal()   loadComplete = pyqtSignal() - errorMessage = pyqtSignal(QString) + showMessage = pyqtSignal(str)   commitComplete = pyqtSignal()     def __init__(self, pats, opts, root=None, parent=None): @@ -44,7 +44,7 @@
    self.opts = opts # user, date   self.stwidget = status.StatusWidget(pats, opts, root, self) - self.stwidget.errorMessage.connect(self.errorMessage) + self.stwidget.showMessage.connect(self.showMessage)   self.stwidget.loadBegin.connect(lambda: self.loadBegin.emit())   self.stwidget.loadComplete.connect(lambda: self.loadComplete.emit())   self.msghistory = [] @@ -506,7 +506,7 @@
  else:   dcmd = []   except error.Abort, e: - self.errorMessage.emit(hglib.tounicode(str(e))) + self.showMessage.emit(hglib.tounicode(str(e)))   dcmd = []     cmdline = ['commit', '--user', user, '--message', msg] @@ -594,13 +594,13 @@
  commit.restoreState(s.value('commit/state').toByteArray())   self.restoreGeometry(s.value('commit/geom').toByteArray())   commit.loadConfigs(s) - commit.errorMessage.connect(self.errorMessage) + commit.showMessage.connect(self.showMessage) + commit.loadComplete.connect(self.updateUndo) + commit.commitComplete.connect(self.postcommit)     name = hglib.get_reponame(commit.stwidget.repo)   self.setWindowTitle('%s - commit' % name)   self.commit = commit - commit.loadComplete.connect(self.updateUndo) - commit.commitComplete.connect(self.postcommit)     def updateUndo(self):   BB = QDialogButtonBox @@ -612,7 +612,7 @@
  self.bb.button(BB.Discard).setEnabled(False)   self.bb.button(BB.Discard).setToolTip('')   - def errorMessage(self, msg): + def showMessage(self, msg):   print msg     def keyPressEvent(self, event):
Change 1 of 8 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
43
44
45
46
47
 
 
48
49
50
51
52
 
 
53
54
55
 
252
253
254
255
256
 
257
258
259
 
418
419
420
421
422
 
423
424
425
 
439
440
441
442
443
 
444
445
446
 
455
456
457
458
 
459
460
461
 
485
486
487
488
489
 
490
491
492
 
494
495
496
497
498
 
499
500
501
 
784
785
786
787
 
788
789
790
 
43
44
45
 
 
46
47
48
49
50
 
 
51
52
53
54
55
 
252
253
254
 
 
255
256
257
258
 
417
418
419
 
 
420
421
422
423
 
437
438
439
 
 
440
441
442
443
 
452
453
454
 
455
456
457
458
 
482
483
484
 
 
485
486
487
488
 
490
491
492
 
 
493
494
495
496
 
779
780
781
 
782
783
784
785
@@ -43,13 +43,13 @@
  SIGNALS:   loadBegin() - for progress bar   loadComplete() - for progress bar - errorMessage(QString) - for status bar - titleTextChanged(QString) - for window title + showMessage(str) - for status bar + titleTextChanged(str) - for window title   '''   loadBegin = pyqtSignal()   loadComplete = pyqtSignal() - titleTextChanged = pyqtSignal(QString) - errorMessage = pyqtSignal(QString) + titleTextChanged = pyqtSignal(str) + showMessage = pyqtSignal(str)     def __init__(self, pats, opts, root=None, parent=None):   QWidget.__init__(self, parent) @@ -252,8 +252,7 @@
  self.refreshing = StatusThread(self.repo, self.pats, self.opts)   self.refreshing.finished.connect(self.reloadComplete)   # re-emit error messages from this object - self.refreshing.errorMessage.connect( - lambda msg: self.errorMessage.emit(msg)) + self.refreshing.showMessage.connect(self.showMessage)   self.refreshing.start()     def reloadComplete(self, wctx, patchecked): @@ -418,8 +417,7 @@
  for s, l in patch.difflabel(self.wctx.diff, match=m, git=True):   hu.write(s, label=l)   except (IOError, error.RepoError, error.LookupError, util.Abort), e: - err = hglib.tounicode(str(e)) - self.errorMessage.emit(QString(err)) + self.showMessage.emit(hglib.tounicode(str(e)))   return   o, e = hu.getdata()   diff = o or _('<em>No displayable differences</em>') @@ -439,8 +437,7 @@
  match=m, git=True):   hu.write(s, label=l)   except (IOError, error.RepoError, error.LookupError, util.Abort), e: - err = hglib.tounicode(str(e)) - self.errorMessage.emit(QString(err)) + self.showMessage.emit(hglib.tounicode(str(e)))   return   text += '</br><h3>'   text += _('===== Diff to second parent %d:%s =====\n') % ( @@ -455,7 +452,7 @@
  '''Background thread for generating a workingctx'''     finished = pyqtSignal(object, object) - errorMessage = pyqtSignal(QString) + showMessage = pyqtSignal(str)     def __init__(self, repo, pats, opts, parent=None):   super(StatusThread, self).__init__() @@ -485,8 +482,7 @@
  wctx = self.repo[None]   wctx.status(**stopts)   except (OSError, IOError, util.Abort), e: - err = hglib.tounicode(str(e)) - self.errorMessage.emit(QString(err)) + self.showMessage.emit(hglib.tounicode(str(e)))   try:   wctx.dirtySubrepos = []   for s in wctx.substate: @@ -494,8 +490,7 @@
  wctx.dirtySubrepos.append(s)   except (OSError, IOError, util.Abort,   error.RepoLookupError, error.ConfigError), e: - err = hglib.tounicode(str(e)) - self.errorMessage.emit(QString(err)) + self.showMessage.emit(hglib.tounicode(str(e)))   self.finished.emit(wctx, patchecked)     @@ -784,7 +779,7 @@
  self.restoreGeometry(s.value('status/geom').toByteArray())     self.stwidget.titleTextChanged.connect(self.setWindowTitle) - self.stwidget.errorMessage.connect(self.stbar.showMessage) + self.stwidget.showMessage.connect(self.stbar.showMessage)   self.setWindowTitle(self.stwidget.getTitle())     def accept(self):