Mercurial > hg > evolve
changeset 1498:08ae023882f1
evolve: check for uncommited change earlier
Before this patch we were checking for uncommited change multiple times and
quite late for uncommited change. This patch moves the check at the beginning
of the evolve method to avoid these shortcomings.
| author | Laurent Charignon <lcharignon@fb.com> |
|---|---|
| date | Tue, 16 Jun 2015 15:08:44 -0700 |
| parents | 7ddcbf5469bc |
| children | 9a8ecfdfa866 |
| files | hgext/evolve.py |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py +++ b/hgext/evolve.py @@ -1393,6 +1393,8 @@ raise util.Abort('cannot specify both "--all" and "--continue"') graftcmd = commands.table['graft'][0] return graftcmd(ui, repo, old_obsolete=True, **{'continue': True}) + cmdutil.bailifchanged(repo) + # Rev specified on the commands line if revopt: revs = repo.revs(revopt) @@ -1436,7 +1438,6 @@ def _evolveany(ui, repo, tro, dryrunopt, confirmopt, progresscb): repo = repo.unfiltered() tro = repo[tro.rev()] - cmdutil.bailifchanged(repo) troubles = tro.troubles() if 'unstable' in troubles: return _solveunstable(ui, repo, tro, dryrunopt, confirmopt, progresscb)