Mercurial > hg

diff mercurial/commands.py @ 12266:00658492e2aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: break import cycle with cmdutil The patch module imported cmdutil but used it only in updatedir.
author Martin Geisler <mg@lazybytes.net>
date Mon, 13 Sep 2010 13:08:09 +0200
parents 1447d3a9ff4a
children 877236cdd437
line wrap: on
line diff
--- a/mercurial/commands.py	Sun Sep 12 16:10:41 2010 +0900
+++ b/mercurial/commands.py	Mon Sep 13 13:08:09 2010 +0200
@@ -2301,8 +2301,8 @@
                 patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
                             files=files, eolmode=None)
             finally:
-                files = patch.updatedir(ui, repo, files,
-                                        similarity=sim / 100.0)
+                files = cmdutil.updatedir(ui, repo, files,
+                                          similarity=sim / 100.0)
             if not opts.get('no_commit'):
                 if opts.get('exact'):
                     m = None