Mercurial > evolve
comparison hgext/evolve.py @ 651:609faf10d307
evolve: ensure evolve command run unfiltered
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Fri, 04 Jan 2013 12:42:43 +0100 |
| parents | d318fbb1cd67 |
| children | 5a929510de9d |
comparison
equal
deleted
inserted
replaced
| 650:f88993f745ca | 651:609faf10d307 |
|---|---|
| 958 % len(troubled)) | 958 % len(troubled)) |
| 959 return 2 | 959 return 2 |
| 960 else: | 960 else: |
| 961 ui.write_err(_('no troubled changeset\n')) | 961 ui.write_err(_('no troubled changeset\n')) |
| 962 return 1 | 962 return 1 |
| 963 repo = repo.unfiltered() | |
| 964 tr = repo[tr.rev()] | |
| 963 cmdutil.bailifchanged(repo) | 965 cmdutil.bailifchanged(repo) |
| 964 troubles = tr.troubles() | 966 troubles = tr.troubles() |
| 965 if 'unstable' in troubles: | 967 if 'unstable' in troubles: |
| 966 return _solveunstable(ui, repo, tr, opts['dry_run']) | 968 return _solveunstable(ui, repo, tr, opts['dry_run']) |
| 967 elif 'bumped' in troubles: | 969 elif 'bumped' in troubles: |