Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.5, 2.1, and 2.1.1

stable commit, qtlib: move getCurrentUsername from commit.py to qtlib.py

Add repo and opts as explicit arguments and opts is optional as it
is currently only available for commit dialog and not for merge,
backout and tag ones.

Changeset db0219ecd511…

Parent ad66f36fc6bc…

by André Sintzoff

Changes to 2 files · Browse files at db0219ecd511 Showing diff from parent ad66f36fc6bc Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
 
558
559
560
561
 
562
563
564
 
475
476
477
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
478
479
480
 
533
534
535
 
536
537
538
539
@@ -475,31 +475,6 @@
  self.userhist.insert(0, user)   self.userhist = self.userhist[:10]   - def getCurrentUsername(self): - # 1. Override has highest priority - user = self.opts.get('user') - if user: - return user - - # 2. Read from repository - try: - return self.repo.ui.username() - except error.Abort: - pass - - # 3. Get a username from the user - QMessageBox.information(self, _('Please enter a username'), - _('You must identify yourself to Mercurial'), - QMessageBox.Ok) - from tortoisehg.hgqt.settings import SettingsDialog - dlg = SettingsDialog(False, focus='ui.username') - dlg.exec_() - self.repo.invalidateui() - try: - return self.repo.ui.username() - except error.Abort: - return None -   def commit(self):   repo = self.repo   msg = self.getMessage() @@ -558,7 +533,7 @@
  if len(repo.parents()) > 1:   files = []   - user = self.getCurrentUsername() + user = qtlib.getCurrentUsername(self, self.repo, self.opts)   if not user:   return   self.addUsernameToHistory(user)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​qtlib.py Stacked
 
14
15
16
17
 
18
19
20
 
792
793
794
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
14
15
16
 
17
18
19
20
 
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
@@ -14,7 +14,7 @@
 import re  import weakref   -from mercurial import extensions +from mercurial import extensions, error    from tortoisehg.util import hglib, paths, wconfig  from tortoisehg.hgqt.i18n import _ @@ -792,3 +792,30 @@
    def __getattr__(self, name):   return getattr(self._widget, name) + +def getCurrentUsername(widget, repo, opts=None): + if opts: + # 1. Override has highest priority + user = opts.get('user') + if user: + return user + + # 2. Read from repository + try: + return repo.ui.username() + except error.Abort: + pass + + # 3. Get a username from the user + QMessageBox.information(widget, _('Please enter a username'), + _('You must identify yourself to Mercurial'), + QMessageBox.Ok) + from tortoisehg.hgqt.settings import SettingsDialog + dlg = SettingsDialog(False, focus='ui.username') + dlg.exec_() + repo.invalidateui() + try: + return repo.ui.username() + except error.Abort: + return None +