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

Merge with stable

Changeset a801a826a50a…

Parents 0278bb1d3cd7…

Parents aa23bf637b70…

by Steve Borho

Changes to 5 files · Browse files at a801a826a50a Showing diff from parent 0278bb1d3cd7 aa23bf637b70 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
414
415
416
417
 
 
418
419
420
 
858
859
860
 
861
862
863
 
414
415
416
 
417
418
419
420
421
 
859
860
861
862
863
864
865
@@ -414,7 +414,8 @@
  self.lastCommitMsg = self.msgte.text()   self.setMessage(hglib.tounicode(pctx.description()))   else: - self.setMessage(self.lastCommitMsg) + if self.lastAction == 'qref': + self.setMessage(self.lastCommitMsg)   if refreshwctx:   self.stwidget.refreshWctx()   self.mqtb.setText(curraction._text) @@ -858,6 +859,7 @@
  self.branchop = None   umsg = self.msgte.text()   if self.currentAction != 'qref': + self.lastCommitMsg = ''   if self.currentAction == 'commit':   # capture last message for BugTraq plugin   self.lastmessage = self.getMessage()
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​reporegistry.py Stacked
 
567
568
569
570
571
572
573
 
574
575
576
 
567
568
569
 
570
571
 
572
573
574
575
@@ -567,10 +567,9 @@
  def openAll(self):   for root in self.selitem.internalPointer().childRoots():   self.openRepo.emit(hglib.tounicode(root), False) -   def open(self, root=None):   'open context menu action, open repowidget unconditionally' - if root is None: + if not root:   root = self.selitem.internalPointer().rootpath()   repotype = self.selitem.internalPointer().repotype()   else:
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
1076
1077
1078
 
 
 
 
 
 
 
 
1079
1080
1081
 
1429
1430
1431
 
 
 
 
 
 
 
 
 
 
 
 
1432
1433
1434
 
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
 
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
@@ -1076,6 +1076,14 @@
  entry(menu, None, isrev, _('Update...'), 'hg-update',   self.updateToRevision)   entry(menu) + submenu = menu.addMenu(_('Push')) + entry(submenu, None, isrev, _('Push all'), 'hg-push', + self.pushToRevision) + entry(submenu, None, isrev, _('Push to here'), '', + self.pushToRevision) + entry(submenu, None, isrev, _('Push selected branch'), '', + self.pushBranch) + entry(menu)   entry(menu, None, isctx, _('Visual diff...'), 'visualdiff',   self.visualDiffRevision)   entry(menu, None, isrev, _('Diff to local...'), 'ldiff', @@ -1429,6 +1437,18 @@
  dlg.finished.connect(dlg.deleteLater)   dlg.exec_()   + def pushAll(self): + self.syncDemand.forward('push', True) + + def pushToRevision(self): + # Do not ask for confirmation + self.syncDemand.forward('push', False, rev=self.rev) + + def pushBranch(self): + # Do not ask for confirmation + self.syncDemand.forward('push', False, + branch=self.repo[self.rev].branch()) +   def manifestRevision(self):   run.manifest(self.repo.ui, repo=self.repo, rev=self.rev)  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
214
215
216
 
 
 
 
217
218
219
220
221
 
214
215
216
217
218
219
220
221
 
222
223
224
@@ -214,8 +214,11 @@
  self.refreshWctx()     def setPatchContext(self, pctx): + if pctx != self.pctx: + self.savechecks = False + else: + self.savechecks = True   self.pctx = pctx - self.savechecks = False     def refreshWctx(self, synchronous=False):   if self.refthread:
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
677
678
679
680
 
681
682
683
684
 
685
686
687
 
847
848
849
850
 
851
852
853
 
869
870
871
 
 
 
 
872
873
874
 
677
678
679
 
680
681
682
683
 
684
685
686
687
 
847
848
849
 
850
851
852
853
 
869
870
871
872
873
874
875
876
877
878
@@ -677,11 +677,11 @@
  else:   self.outclicked()   - def push(self, confirm): + def push(self, confirm, rev=None, branch=None):   if self.cmd.core.running():   self.showMessage.emit(_('sync command already running'))   else: - self.pushclicked(confirm) + self.pushclicked(confirm, rev, branch)     def pullBundle(self, bundle, rev):   'accept bundle changesets' @@ -847,7 +847,7 @@
  self.showMessage.emit(_('Perforce pending...'))   self.run(['--repository', self.repo.root, 'p4pending', '--verbose'], ())   - def pushclicked(self, confirm): + def pushclicked(self, confirm, rev=None, branch=None):   url = self.currentUrl(True)   urlu = hglib.tounicode(url)   if (not hg.islocal(self.currentUrl(False)) and confirm @@ -869,6 +869,10 @@
  self.pushCompleted.emit()   self.finishfunc = finished   cmdline = ['--repository', self.repo.root, 'push'] + if rev: + cmdline.extend(['--rev', str(rev)]) + if branch: + cmdline.extend(['--branch', branch])   self.run(cmdline, ('force', 'new-branch', 'branch', 'rev'))     def postpullclicked(self):