Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 14259:df9ccd39828c
patch: move updatedir() from cmdutil into patch
Also, create an artificial wdutil.py to avoid import cycles between patch.py
and cmdutil.py.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 08 May 2011 17:48:30 +0200 |
| parents | d6a762d93b77 |
| children | 00a881581400 |
line wrap: on
line diff
--- a/mercurial/commands.py Sun May 08 17:48:29 2011 +0200 +++ b/mercurial/commands.py Sun May 08 17:48:30 2011 +0200 @@ -2627,8 +2627,8 @@ patch.patch(tmpname, ui, strip=strip, cwd=repo.root, files=files, eolmode=None) finally: - files = cmdutil.updatedir(ui, repo, files, - similarity=sim / 100.0) + files = patch.updatedir(ui, repo, files, + similarity=sim / 100.0) if opts.get('no_commit'): if message: msgs.append(message)