comparison mercurial/commands.py @ 4232:0d51eb296fb9

Merge with crew-stable

4224:2a8b6d78d7ee

    # abssrc: hgsep
    # relsrc: ossep
    # target: ossep
    def copy(origsrc, abssrc, relsrc, target, exact):
        abstarget = util.canonpath(repo.root, cwd, target)
        reltarget = util.pathto(cwd, abstarget)
        prevsrc = targets.get(abstarget)
        if prevsrc is not None:
            ui.warn(_('%s: not overwriting - %s collides with %s\n') %
                    (reltarget, util.localpath(abssrc),
                     util.localpath(prevsrc)))

        if src == 'b':
            target_only[abs] = True

    # walk target manifest.

    for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node,
                                             badmatch=names.has_key):
        if abs in names: continue
        names[abs] = (rel, exact)
        target_only[abs] = True

    changes = repo.status(match=names.has_key, wlock=wlock)[:5]
    modified, added, removed, deleted, unknown = map(dict.fromkeys, changes)

            format = "%%s%s" % end
        else:
            format = "%s %%s%s" % (char, end)

        for f in changes:
            ui.write(format % util.pathto(cwd, f))
            if ((all or opts.get('copies')) and not opts.get('no_status')):
                copied = repo.dirstate.copied(f)
                if copied:
                    ui.write('  %s%s' % (util.pathto(cwd, copied), end))

def tag(ui, repo, name, rev_=None, **opts):
    """add a tag for the current or given revision

    Name a particular revision using <name>.

4232:0d51eb296fb9

    # abssrc: hgsep
    # relsrc: ossep
    # target: ossep
    def copy(origsrc, abssrc, relsrc, target, exact):
        abstarget = util.canonpath(repo.root, cwd, target)
        reltarget = util.pathto(repo.root, cwd, abstarget)
        prevsrc = targets.get(abstarget)
        if prevsrc is not None:
            ui.warn(_('%s: not overwriting - %s collides with %s\n') %
                    (reltarget, util.localpath(abssrc),
                     util.localpath(prevsrc)))

        if src == 'b':
            target_only[abs] = True

    # walk target manifest.

    def badmatch(path):
        if path in names:
            return True
        path_ = path + '/'
        for f in names:
            if f.startswith(path_):
                return True
        return False

    for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node,
                                             badmatch=badmatch):
        if abs in names or src == 'b':
            continue
        names[abs] = (rel, exact)
        target_only[abs] = True

    changes = repo.status(match=names.has_key, wlock=wlock)[:5]
    modified, added, removed, deleted, unknown = map(dict.fromkeys, changes)

            format = "%%s%s" % end
        else:
            format = "%s %%s%s" % (char, end)

        for f in changes:
            ui.write(format % util.pathto(repo.root, cwd, f))
            if ((all or opts.get('copies')) and not opts.get('no_status')):
                copied = repo.dirstate.copied(f)
                if copied:
                    ui.write('  %s%s' % (util.pathto(repo.root, cwd, copied),
                                         end))

def tag(ui, repo, name, rev_=None, **opts):
    """add a tag for the current or given revision

    Name a particular revision using <name>.