Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.2, 1.9.3, and 2.0

rebase: provide better feedback on errors when used from the command line

Changeset 677251ebf5f2…

Parent 38e9731a74d1…

by Steve Borho

Changes to one file · Browse files at 677251ebf5f2 Showing diff from parent 38e9731a74d1 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​rebase.py Stacked
 
245
246
247
248
 
 
249
250
 
 
251
252
 
245
246
247
 
248
249
250
 
251
252
253
254
@@ -245,8 +245,10 @@
  from tortoisehg.hgqt import thgrepo   repo = thgrepo.repository(ui, path=paths.find_root())   if os.path.exists(repo.join('rebasestate')): - print _('resuming rebase already in progress') + qtlib.InfoMsgBox(_('Rebase already in progress'), + _('Resuming rebase already in progress'))   elif not opts['source'] or not opts['dest']: - print _('abort: source and dest must be supplied') + qtlib.ErrorMsgBox(_('Abort'), + _('You must provide source and dest arguments'))   import sys; sys.exit()   return RebaseDialog(repo, None, **opts)