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

Parents ca39273fe63d…

Parents 7e16ca8e250e…

by Steve Borho

Changes to 5 files · Browse files at a8d27ba47d50 Showing diff from parent ca39273fe63d 7e16ca8e250e Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​backout.py Stacked
 
480
481
482
 
 
 
 
483
484
485
486
487
488
 
489
490
491
492
493
494
495
 
496
497
498
 
480
481
482
483
484
485
486
487
488
489
490
491
 
492
493
494
495
496
497
498
 
499
500
501
502
@@ -480,19 +480,23 @@
  if self.cmd.core.running():   return False   + user = qtlib.getCurrentUsername(self, self.repo) + if not user: + return False +   if self.wizard().parentbackout:   self.setTitle(_('Backing out and committing...'))   self.setSubTitle(_('Please wait while making backout.'))   message = hglib.fromunicode(self.msgEntry.text())   cmdline = ['backout', '--verbose', '--message', message, '--rev', - str(self.wizard().backoutrev), + str(self.wizard().backoutrev), '--user', user,   '--repository', self.repo.root]   else:   self.setTitle(_('Committing...'))   self.setSubTitle(_('Please wait while committing merged files.'))   message = hglib.fromunicode(self.msgEntry.text())   cmdline = ['commit', '--verbose', '--message', message, - '--repository', self.repo.root] + '--repository', self.repo.root, '--user', user]   commandlines = [cmdline]   pushafter = self.repo.ui.config('tortoisehg', 'cipushafter')   if pushafter:
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
 
599
600
601
602
 
603
604
605
 
516
517
518
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
519
520
521
 
574
575
576
 
577
578
579
580
@@ -516,31 +516,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() @@ -599,7 +574,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 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
564
565
566
 
 
 
 
567
568
569
570
571
572
 
573
574
575
 
564
565
566
567
568
569
570
571
572
573
574
575
 
576
577
578
579
@@ -564,12 +564,16 @@
  if self.cmd.core.running():   return False   + user = qtlib.getCurrentUsername(self, self.repo) + if not user: + return False +   self.setTitle(_('Committing...'))   self.setSubTitle(_('Please wait while committing merged files.'))     message = hglib.fromunicode(self.msgEntry.text())   cmdline = ['commit', '--verbose', '--message', message, - '--repository', self.repo.root] + '--repository', self.repo.root, '--user', user]   commandlines = [cmdline]   pushafter = self.repo.ui.config('tortoisehg', 'cipushafter')   if pushafter:
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​qtlib.py Stacked
 
892
893
894
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
@@ -892,3 +892,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 +
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​tag.py Stacked
 
267
268
269
270
 
 
 
 
 
271
272
273
 
267
268
269
 
270
271
272
273
274
275
276
277
@@ -267,7 +267,11 @@
  else:   self.set_status(_("Tag '%s' has been added") % tagu, True)   - cmd = ['tag', '--repository', self.repo.root, '--rev', str(self.rev)] + user = qtlib.getCurrentUsername(self, self.repo) + if not user: + return + cmd = ['tag', '--repository', self.repo.root, '--rev', str(self.rev), + '--user', user]   if local:   cmd.append('--local')   else: