equal
deleted
inserted
replaced
499 # abssrc: hgsep |
499 # abssrc: hgsep |
500 # relsrc: ossep |
500 # relsrc: ossep |
501 # otarget: ossep |
501 # otarget: ossep |
502 def copy(origsrc, abssrc, relsrc, otarget, exact): |
502 def copy(origsrc, abssrc, relsrc, otarget, exact): |
503 abstarget = util.canonpath(repo.root, cwd, otarget) |
503 abstarget = util.canonpath(repo.root, cwd, otarget) |
504 reltarget = util.pathto(repo.root, cwd, abstarget) |
504 reltarget = repo.pathto(abstarget, cwd) |
505 prevsrc = targets.get(abstarget) |
505 prevsrc = targets.get(abstarget) |
506 src = repo.wjoin(abssrc) |
506 src = repo.wjoin(abssrc) |
507 target = repo.wjoin(abstarget) |
507 target = repo.wjoin(abstarget) |
508 if prevsrc is not None: |
508 if prevsrc is not None: |
509 ui.warn(_('%s: not overwriting - %s collides with %s\n') % |
509 ui.warn(_('%s: not overwriting - %s collides with %s\n') % |
2482 format = "%%s%s" % end |
2482 format = "%%s%s" % end |
2483 else: |
2483 else: |
2484 format = "%s %%s%s" % (char, end) |
2484 format = "%s %%s%s" % (char, end) |
2485 |
2485 |
2486 for f in changes: |
2486 for f in changes: |
2487 ui.write(format % util.pathto(repo.root, cwd, f)) |
2487 ui.write(format % repo.pathto(f, cwd)) |
2488 if ((all or opts.get('copies')) and not opts.get('no_status')): |
2488 if ((all or opts.get('copies')) and not opts.get('no_status')): |
2489 copied = repo.dirstate.copied(f) |
2489 copied = repo.dirstate.copied(f) |
2490 if copied: |
2490 if copied: |
2491 ui.write(' %s%s' % (util.pathto(repo.root, cwd, copied), |
2491 ui.write(' %s%s' % (repo.pathto(copied, cwd), end)) |
2492 end)) |
|
2493 |
2492 |
2494 def tag(ui, repo, name, rev_=None, **opts): |
2493 def tag(ui, repo, name, rev_=None, **opts): |
2495 """add a tag for the current or given revision |
2494 """add a tag for the current or given revision |
2496 |
2495 |
2497 Name a particular revision using <name>. |
2496 Name a particular revision using <name>. |