equal
deleted
inserted
replaced
1314 if anyopt: |
1314 if anyopt: |
1315 raise util.Abort('can not specify both "--any" and "--continue"') |
1315 raise util.Abort('can not specify both "--any" and "--continue"') |
1316 graftcmd = commands.table['graft'][0] |
1316 graftcmd = commands.table['graft'][0] |
1317 return graftcmd(ui, repo, old_obsolete=True, **{'continue': True}) |
1317 return graftcmd(ui, repo, old_obsolete=True, **{'continue': True}) |
1318 |
1318 |
1319 troubled = list(repo.revs('troubled()')) |
|
1320 tr = _picknexttroubled(ui, repo, anyopt) |
1319 tr = _picknexttroubled(ui, repo, anyopt) |
1321 if tr is None: |
1320 if tr is None: |
|
1321 troubled = list(repo.revs('troubled()')) |
1322 if troubled: |
1322 if troubled: |
1323 ui.write_err(_('nothing to evolve here\n')) |
1323 ui.write_err(_('nothing to evolve here\n')) |
1324 ui.status(_('(%i troubled changesets, do you want --any ?)\n') |
1324 ui.status(_('(%i troubled changesets, do you want --any ?)\n') |
1325 % len(troubled)) |
1325 % len(troubled)) |
1326 return 2 |
1326 return 2 |