Changeset 451783699e98…
Parent 8de0fdbb7e44…
by
Changes to 2 files · Browse files at 451783699e98 Showing diff from parent 8de0fdbb7e44 Diff from another changeset...
@@ -12,7 +12,6 @@ import time
import inspect
-from mercurial.cmdutil import updatedir
from mercurial import ui, util, extensions, match, bundlerepo, url, cmdutil
from mercurial import dispatch, encoding, templatefilters, filemerge, error
from mercurial import scmutil
|
@@ -17,7 +17,7 @@ import re
import tempfile
-from mercurial import cmdutil, commands, cmdutil, hg, mdiff, patch, revlog
+from mercurial import commands, cmdutil, hg, mdiff, patch, revlog
from mercurial import util, fancyopts
from tortoisehg.util.i18n import _
@@ -601,7 +601,7 @@ fp.seek(0)
pfiles = {}
internalpatch(fp, ui, 1, repo.root, files=pfiles)
- hglib.updatedir(ui, repo, pfiles)
+ cmdutil.updatedir(ui, repo, pfiles)
patchdone = 1
except:
if opts['force']:
|
Loading...