hgext/evolve.py
branchstable
changeset 722 4e7e7a7d8500
parent 716 4c0f6d555032
child 723 2a325626bf06
equal deleted inserted replaced
721:26930fab9c8e 722:4e7e7a7d8500
   885             ui.write_err(_('nothing to evolve here\n'))
   885             ui.write_err(_('nothing to evolve here\n'))
   886             ui.status(_('(%i troubled changesets, do you want --any ?)\n')
   886             ui.status(_('(%i troubled changesets, do you want --any ?)\n')
   887                       % len(troubled))
   887                       % len(troubled))
   888             return 2
   888             return 2
   889         else:
   889         else:
   890             ui.write_err(_('no troubled changesets\n')) 
   890             ui.write_err(_('no troubled changesets\n'))
   891             return 1
   891             return 1
   892 
   892 
   893     while tr is not None:
   893     while tr is not None:
   894         result = _evolveany(ui, repo, tr, dryrunopt)
   894         result = _evolveany(ui, repo, tr, dryrunopt)
   895         if not allopt:
   895         if not allopt:
   896             return result
   896             return result
   897         tr = _picknexttroubled(ui, repo, anyopt or allopt)
   897         tr = _picknexttroubled(ui, repo, anyopt or allopt)
   898         
   898 
   899 
   899 
   900 def _evolveany(ui, repo, tr, dryrunopt):
   900 def _evolveany(ui, repo, tr, dryrunopt):
   901     repo = repo.unfiltered()
   901     repo = repo.unfiltered()
   902     tr = repo[tr.rev()]
   902     tr = repo[tr.rev()]
   903     cmdutil.bailifchanged(repo)
   903     cmdutil.bailifchanged(repo)