mercurial/cmdutil.py
changeset 27611 fa8c491f2deb
parent 27533 a801d331a022
child 27612 a0dfe8d286fe
equal deleted inserted replaced
27610:b8405d739149 27611:fa8c491f2deb
   881     strip = opts["strip"]
   881     strip = opts["strip"]
   882     prefix = opts["prefix"]
   882     prefix = opts["prefix"]
   883     sim = float(opts.get('similarity') or 0)
   883     sim = float(opts.get('similarity') or 0)
   884     if not tmpname:
   884     if not tmpname:
   885         return (None, None, False)
   885         return (None, None, False)
   886     msg = _('applied to working directory')
       
   887 
   886 
   888     rejects = False
   887     rejects = False
   889 
   888 
   890     try:
   889     try:
   891         cmdline_message = logmessage(ui, opts)
   890         cmdline_message = logmessage(ui, opts)
  1007             # --exact with --no-commit is still useful in that it does merge
  1006             # --exact with --no-commit is still useful in that it does merge
  1008             # and branch bits
  1007             # and branch bits
  1009             ui.warn(_("warning: can't check exact import with --no-commit\n"))
  1008             ui.warn(_("warning: can't check exact import with --no-commit\n"))
  1010         elif opts.get('exact') and hex(n) != nodeid:
  1009         elif opts.get('exact') and hex(n) != nodeid:
  1011             raise error.Abort(_('patch is damaged or loses information'))
  1010             raise error.Abort(_('patch is damaged or loses information'))
       
  1011         msg = _('applied to working directory')
  1012         if n:
  1012         if n:
  1013             # i18n: refers to a short changeset id
  1013             # i18n: refers to a short changeset id
  1014             msg = _('created %s') % short(n)
  1014             msg = _('created %s') % short(n)
  1015         return (msg, n, rejects)
  1015         return (msg, n, rejects)
  1016     finally:
  1016     finally: