Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 13945:03f3ce7ca2a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copy: do not copy file if name is disallowed anyway
author Adrian Buehlmann <adrian@cadifra.com>
date Fri, 15 Apr 2011 16:15:32 +0200
parents a8d13ee0ce68
children 8b252e826c68
comparison
equal deleted inserted replaced
13944:bc32bb0e909f 13945:03f3ce7ca2a8
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)
439
438 # check for collisions 440 # check for collisions
439 prevsrc = targets.get(abstarget) 441 prevsrc = targets.get(abstarget)
440 if prevsrc is not None: 442 if prevsrc is not None:
441 ui.warn(_('%s: not overwriting - %s collides with %s\n') % 443 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
442 (reltarget, repo.pathto(abssrc, cwd), 444 (reltarget, repo.pathto(abssrc, cwd),