mercurial/commands.py
changeset 31311 f59b6cf663a9
parent 31201 50d76bae15cf
child 31321 a3a2382b2e1b
equal deleted inserted replaced
31310:431d4f73249e 31311:f59b6cf663a9
  2381                 _('note: graft of %d:%s created no changes to commit\n') %
  2381                 _('note: graft of %d:%s created no changes to commit\n') %
  2382                 (ctx.rev(), ctx))
  2382                 (ctx.rev(), ctx))
  2383 
  2383 
  2384     # remove state when we complete successfully
  2384     # remove state when we complete successfully
  2385     if not opts.get('dry_run'):
  2385     if not opts.get('dry_run'):
  2386         util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
  2386         repo.vfs.unlinkpath('graftstate', ignoremissing=True)
  2387 
  2387 
  2388     return 0
  2388     return 0
  2389 
  2389 
  2390 @command('grep',
  2390 @command('grep',
  2391     [('0', 'print0', None, _('end fields with NUL')),
  2391     [('0', 'print0', None, _('end fields with NUL')),