mercurial/commands.py
changeset 14259 df9ccd39828c
parent 14254 d6a762d93b77
child 14260 00a881581400
equal deleted inserted replaced
14258:50e3fb2ab9fa 14259:df9ccd39828c
  2625             files = {}
  2625             files = {}
  2626             try:
  2626             try:
  2627                 patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
  2627                 patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
  2628                             files=files, eolmode=None)
  2628                             files=files, eolmode=None)
  2629             finally:
  2629             finally:
  2630                 files = cmdutil.updatedir(ui, repo, files,
  2630                 files = patch.updatedir(ui, repo, files,
  2631                                           similarity=sim / 100.0)
  2631                                         similarity=sim / 100.0)
  2632             if opts.get('no_commit'):
  2632             if opts.get('no_commit'):
  2633                 if message:
  2633                 if message:
  2634                     msgs.append(message)
  2634                     msgs.append(message)
  2635             else:
  2635             else:
  2636                 if opts.get('exact'):
  2636                 if opts.get('exact'):