Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 4229:24c22a3f2ef8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pass repo.root to util.pathto() in preparation for the next patch
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 16 Mar 2007 00:22:57 -0300
parents 281f9f8f1bd4
children 83153299aab5
comparison
equal deleted inserted replaced
4228:c52b7176af94 4229:24c22a3f2ef8
485 # abssrc: hgsep 485 # abssrc: hgsep
486 # relsrc: ossep 486 # relsrc: ossep
487 # target: ossep 487 # target: ossep
488 def copy(origsrc, abssrc, relsrc, target, exact): 488 def copy(origsrc, abssrc, relsrc, target, exact):
489 abstarget = util.canonpath(repo.root, cwd, target) 489 abstarget = util.canonpath(repo.root, cwd, target)
490 reltarget = util.pathto(cwd, abstarget) 490 reltarget = util.pathto(repo.root, cwd, abstarget)
491 prevsrc = targets.get(abstarget) 491 prevsrc = targets.get(abstarget)
492 if prevsrc is not None: 492 if prevsrc is not None:
493 ui.warn(_('%s: not overwriting - %s collides with %s\n') % 493 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
494 (reltarget, util.localpath(abssrc), 494 (reltarget, util.localpath(abssrc),
495 util.localpath(prevsrc))) 495 util.localpath(prevsrc)))
2416 format = "%%s%s" % end 2416 format = "%%s%s" % end
2417 else: 2417 else:
2418 format = "%s %%s%s" % (char, end) 2418 format = "%s %%s%s" % (char, end)
2419 2419
2420 for f in changes: 2420 for f in changes:
2421 ui.write(format % util.pathto(cwd, f)) 2421 ui.write(format % util.pathto(repo.root, cwd, f))
2422 if ((all or opts.get('copies')) and not opts.get('no_status')): 2422 if ((all or opts.get('copies')) and not opts.get('no_status')):
2423 copied = repo.dirstate.copied(f) 2423 copied = repo.dirstate.copied(f)
2424 if copied: 2424 if copied:
2425 ui.write(' %s%s' % (util.pathto(cwd, copied), end)) 2425 ui.write(' %s%s' % (util.pathto(repo.root, cwd, copied),
2426 end))
2426 2427
2427 def tag(ui, repo, name, rev_=None, **opts): 2428 def tag(ui, repo, name, rev_=None, **opts):
2428 """add a tag for the current or given revision 2429 """add a tag for the current or given revision
2429 2430
2430 Name a particular revision using <name>. 2431 Name a particular revision using <name>.