equal
deleted
inserted
replaced
10 |
10 |
11 import os |
11 import os |
12 import copy |
12 import copy |
13 |
13 |
14 from mercurial import hg, commands, util, cmdutil, scmutil, match as match_, \ |
14 from mercurial import hg, commands, util, cmdutil, scmutil, match as match_, \ |
15 node, archival, error, merge, discovery |
15 node, archival, error, merge, discovery, pathutil |
16 from mercurial.i18n import _ |
16 from mercurial.i18n import _ |
17 from mercurial.node import hex |
17 from mercurial.node import hex |
18 from hgext import rebase |
18 from hgext import rebase |
19 |
19 |
20 import lfutil |
20 import lfutil |
467 if len(pats) < 2: |
467 if len(pats) < 2: |
468 # this isn't legal, let the original function deal with it |
468 # this isn't legal, let the original function deal with it |
469 return orig(ui, repo, pats, opts, rename) |
469 return orig(ui, repo, pats, opts, rename) |
470 |
470 |
471 def makestandin(relpath): |
471 def makestandin(relpath): |
472 path = scmutil.canonpath(repo.root, repo.getcwd(), relpath) |
472 path = pathutil.canonpath(repo.root, repo.getcwd(), relpath) |
473 return os.path.join(repo.wjoin(lfutil.standin(path))) |
473 return os.path.join(repo.wjoin(lfutil.standin(path))) |
474 |
474 |
475 fullpats = scmutil.expandpats(pats) |
475 fullpats = scmutil.expandpats(pats) |
476 dest = fullpats[-1] |
476 dest = fullpats[-1] |
477 |
477 |