equal
deleted
inserted
replaced
6 # GNU General Public License version 2 or any later version. |
6 # GNU General Public License version 2 or any later version. |
7 |
7 |
8 from node import hex, nullid, nullrev, short |
8 from node import hex, nullid, nullrev, short |
9 from i18n import _ |
9 from i18n import _ |
10 import os, sys, errno, re, glob, tempfile |
10 import os, sys, errno, re, glob, tempfile |
11 import util, templater, patch, error, encoding, templatekw |
11 import util, scmutil, templater, patch, error, encoding, templatekw |
12 import match as matchmod |
12 import match as matchmod |
13 import similar, revset, subrepo |
13 import similar, revset, subrepo |
14 |
14 |
15 revrangesep = ':' |
15 revrangesep = ':' |
16 |
16 |
433 reltarget = repo.pathto(abstarget, cwd) |
433 reltarget = repo.pathto(abstarget, cwd) |
434 target = repo.wjoin(abstarget) |
434 target = repo.wjoin(abstarget) |
435 src = repo.wjoin(abssrc) |
435 src = repo.wjoin(abssrc) |
436 state = repo.dirstate[abstarget] |
436 state = repo.dirstate[abstarget] |
437 |
437 |
438 util.checkfilename(abstarget) |
438 scmutil.checkportable(ui, abstarget) |
439 |
439 |
440 # check for collisions |
440 # check for collisions |
441 prevsrc = targets.get(abstarget) |
441 prevsrc = targets.get(abstarget) |
442 if prevsrc is not None: |
442 if prevsrc is not None: |
443 ui.warn(_('%s: not overwriting - %s collides with %s\n') % |
443 ui.warn(_('%s: not overwriting - %s collides with %s\n') % |