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

stable qimport: warn the user when qimport fails because qparent is not a
descendant of the selected revision

Changeset 7fbe47339fd3…

Parent 850986489b41…

by Angel Ezquerra

Changes to one file · Browse files at 7fbe47339fd3 Showing diff from parent 850986489b41 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
1379
1380
1381
 
 
 
 
 
 
 
 
 
 
 
1382
1383
1384
 
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
@@ -1379,6 +1379,17 @@
  # collides with the revisions that are going to be imported   func = hglib.revsetmatch(self.repo.ui, '%s::%s' % (self.rev, endrev))   revList = [c for c in func(self.repo, range(len(self.repo)))] + + if endrev and not revList: + # There is a qparent but the revision list is empty + # This means that the qparent is not a descendant of the + # selected revision + QMessageBox.warning(self, _('Cannot import selected revision'), + _('The selected revision (rev #%d) cannot be imported ' + 'because it is not a descendant of ''qparent'' (rev #%d)') \ + % (self.rev, self.repo['qparent'].rev())) + return +   revNameSet = set(['%d.diff' % rev for rev in revList])   collidingPatchSet = revNameSet.intersection(set(self.repo.mq.series))