Mercurial > hg
diff hgext/rebase.py @ 38546:731debab233f
rebase: improve output of --dry-run
Improved output when in dryrun, for user to make sure that
no change will be written to repository.
Differential Revision: https://phab.mercurial-scm.org/D3764
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Fri, 29 Jun 2018 01:35:09 +0530 |
parents | cf24f678adda |
children | a06b2b032557 |
line wrap: on
line diff
--- a/hgext/rebase.py Sun Jul 01 22:18:46 2018 +0900 +++ b/hgext/rebase.py Fri Jun 29 01:35:09 2018 +0530 @@ -844,6 +844,7 @@ def _dryrunrebase(ui, repo, opts): rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts) + ui.status(_('starting dry-run rebase; repository will not be changed\n')) with repo.wlock(), repo.lock(): try: overrides = {('rebase', 'singletransaction'): True} @@ -854,7 +855,8 @@ ui.status(_('hit a merge conflict\n')) return 1 else: - ui.status(_('there will be no conflict, you can rebase\n')) + ui.status(_('dry-run rebase completed successfully; run without ' + '-n/--dry-run to perform this rebase\n')) return 0 finally: # no need to store backup in case of dryrun