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

merge: establish minimum size, check command line args before starting

Changeset 9b8daa20b2d6…

Parent d7b8b9516a9b…

by Steve Borho

Changes to one file · Browse files at 9b8daa20b2d6 Showing diff from parent d7b8b9516a9b Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
25
26
27
28
29
30
 
31
32
 
33
34
35
 
42
43
44
 
 
45
46
47
 
593
594
595
 
 
 
 
 
596
597
 
25
26
27
 
28
 
29
30
 
31
32
33
34
 
41
42
43
44
45
46
47
48
 
594
595
596
597
598
599
600
601
602
603
@@ -25,11 +25,10 @@
  f = self.windowFlags()   self.setWindowFlags(f & ~Qt.WindowContextHelpButtonHint)   - self.repo = repo   self.otherrev = str(otherrev) - self.localrev = str(self.repo['.'].rev()) + self.localrev = str(repo['.'].rev())   - self.setWindowTitle(_('Merge - %s') % self.repo.displayname) + self.setWindowTitle(_('Merge - %s') % repo.displayname)   self.setWindowIcon(qtlib.geticon('hg-merge'))   self.setOption(QWizard.NoBackButtonOnStartPage, True)   self.setOption(QWizard.NoBackButtonOnLastPage, True) @@ -42,6 +41,8 @@
  self.addPage(ResultPage(repo, self))   self.currentIdChanged.connect(self.pageChanged)   + self.resize(QSize(700, 489).expandedTo(self.minimumSizeHint())) +   repo.repositoryChanged.connect(self.repositoryChanged)   repo.configChanged.connect(self.configChanged)   @@ -593,5 +594,10 @@
  rev = opts.get('rev') or None   if not rev and len(pats):   rev = pats[0] + if not rev: + import sys + qtlib.InfoMsgBox(_('Unable to merge'), + _('Merge revision not specified or not found')) + sys.exit()   repo = thgrepo.repository(ui, path=paths.find_root())   return MergeDialog(rev, repo, None)