Mercurial > evolve
comparison hgext/evolve.py @ 1306:02a5624c5605 stable
evolve: remove unused code in _evolveany
remove some code that was doing nothing useful in _evolveany.
| author | Laurent Charignon <lcharignon@fb.com> |
|---|---|
| date | Thu, 30 Apr 2015 14:30:15 -0700 |
| parents | 14587fbcba93 |
| children | 677c5da57b9c |
comparison
equal
deleted
inserted
replaced
| 1305:14587fbcba93 | 1306:02a5624c5605 |
|---|---|
| 1258 if 'unstable' in troubles: | 1258 if 'unstable' in troubles: |
| 1259 return _solveunstable(ui, repo, tro, dryrunopt, confirmopt, progresscb) | 1259 return _solveunstable(ui, repo, tro, dryrunopt, confirmopt, progresscb) |
| 1260 elif 'bumped' in troubles: | 1260 elif 'bumped' in troubles: |
| 1261 return _solvebumped(ui, repo, tro, dryrunopt, confirmopt, progresscb) | 1261 return _solvebumped(ui, repo, tro, dryrunopt, confirmopt, progresscb) |
| 1262 elif 'divergent' in troubles: | 1262 elif 'divergent' in troubles: |
| 1263 repo = repo.unfiltered() | |
| 1264 tro = repo[tro.rev()] | |
| 1265 return _solvedivergent(ui, repo, tro, dryrunopt, confirmopt, | 1263 return _solvedivergent(ui, repo, tro, dryrunopt, confirmopt, |
| 1266 progresscb) | 1264 progresscb) |
| 1267 else: | 1265 else: |
| 1268 assert False # WHAT? unknown troubles | 1266 assert False # WHAT? unknown troubles |
| 1269 | 1267 |