comparison mercurial/commands.py @ 1618:ff339dd21976

Renamed c, a, d, u to modified, added, removed, unknown for users of changes()

1617:ece5d785e87a

                mode)

def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
           changes=None, text=False):
    if not changes:
        (c, a, d, u) = repo.changes(node1, node2, files, match=match)
    else:
        (c, a, d, u) = changes
    if files:
        c, a, d = map(lambda x: filterfiles(files, x), (c, a, d))

    if not c and not a and not d:
        return

    if node2:
        change = repo.changelog.read(node2)
        mmap2 = repo.manifest.read(change[0])

    change = repo.changelog.read(node1)
    mmap = repo.manifest.read(change[0])
    date1 = util.datestr(change[2])

    for f in c:
        to = None
        if f in mmap:
            to = repo.file(f).read(mmap[f])
        tn = read(f)
        fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text))
    for f in a:
        to = None
        tn = read(f)
        fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text))
    for f in d:
        to = repo.file(f).read(mmap[f])
        tn = None
        fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text))

def trimuser(ui, name, rev, revcache):

    if opts['addremove']:
        addremove(ui, repo, *pats, **opts)
    fns, match, anypats, cwd = matchpats(repo, pats, opts)
    if pats:
        c, a, d, u = repo.changes(files=fns, match=match)
        files = c + a + [fn for fn in d if repo.dirstate.state(fn) == 'r']
    else:
        files = []
    try:
        repo.commit(files, message, opts['user'], opts['date'], match)
    except ValueError, inst:

    if not parents:
        ui.write(_("unknown\n"))
        return

    hexfunc = ui.verbose and hex or short
    (c, a, d, u) = repo.changes()
    output = ["%s%s" % ('+'.join([hexfunc(parent) for parent in parents]),
                        (c or a or d) and "+" or "")]

    if not ui.quiet:
        # multiple tags for a single parent separated by '/'
        parenttags = ['/'.join(tags)
                      for tags in map(repo.nodetags, parents) if tags]

    safety check, not to import a real mail message.
    """
    patches = (patch1,) + patches

    if not opts['force']:
        (c, a, d, u) = repo.changes()
        if c or a or d:
            raise util.Abort(_("outstanding uncommitted changes"))

    d = opts["base"]
    strip = opts["strip"]

    entire project history.  If the files still exist in the working
    directory, they will be deleted from it.
    """
    names = []
    def okaytoremove(abs, rel, exact):
        c, a, d, u = repo.changes(files = [abs])
        reason = None
        if c:
            reason = _('is modified')
        elif a:
            reason = _('has been marked for add')
        elif u:
            reason = _('is not managed')
        if reason:
            if exact:
                ui.warn(_('not removing %s: file %s\n') % (rel, reason))
        else:

    """
    node = opts['rev'] and repo.lookup(opts['rev']) or \
           repo.dirstate.parents()[0]

    files, choose, anypats, cwd = matchpats(repo, pats, opts)
    (c, a, d, u) = repo.changes(match=choose)
    repo.forget(a)
    repo.undelete(d)

    return repo.update(node, False, True, choose, False)

def root(ui, repo):
    """print the root (top) of the current working dir

    R = removed
    ? = not tracked
    """

    files, matchfn, anypats, cwd = matchpats(repo, pats, opts)
    (c, a, d, u) = [[util.pathto(cwd, x) for x in n]
                    for n in repo.changes(files=files, match=matchfn)]

    changetypes = [(_('modified'), 'M', c),
                   (_('added'), 'A', a),
                   (_('removed'), 'R', d),
                   (_('unknown'), '?', u)]

    end = opts['print0'] and '\0' or '\n'

    for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]
                               or changetypes):

    if opts['local']:
        repo.opener("localtags", "a").write("%s %s\n" % (r, name))
        return

    (c, a, d, u) = repo.changes()
    for x in (c, a, d, u):
        if ".hgtags" in x:
            raise util.Abort(_("working copy of .hgtags is changed "
                               "(please commit .hgtags manually)"))

    repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))

1618:ff339dd21976

                mode)

def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
           changes=None, text=False):
    if not changes:
        changes = repo.changes(node1, node2, files, match=match)
    modified, added, removed, unknown = changes
    if files:
        modified, added, removed = map(lambda x: filterfiles(x, files),
                                       (modified, added, removed))

    if not modified and not added and not removed:
        return

    if node2:
        change = repo.changelog.read(node2)
        mmap2 = repo.manifest.read(change[0])

    change = repo.changelog.read(node1)
    mmap = repo.manifest.read(change[0])
    date1 = util.datestr(change[2])

    for f in modified:
        to = None
        if f in mmap:
            to = repo.file(f).read(mmap[f])
        tn = read(f)
        fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text))
    for f in added:
        to = None
        tn = read(f)
        fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text))
    for f in removed:
        to = repo.file(f).read(mmap[f])
        tn = None
        fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text))

def trimuser(ui, name, rev, revcache):

    if opts['addremove']:
        addremove(ui, repo, *pats, **opts)
    fns, match, anypats, cwd = matchpats(repo, pats, opts)
    if pats:
        modified, added, removed, unknown = (
            repo.changes(files=fns, match=match))
        files = (modified + added +
                [fn for fn in removed if repo.dirstate.state(fn) == 'r'])
    else:
        files = []
    try:
        repo.commit(files, message, opts['user'], opts['date'], match)
    except ValueError, inst:

    if not parents:
        ui.write(_("unknown\n"))
        return

    hexfunc = ui.verbose and hex or short
    modified, added, removed, unknown = repo.changes()
    output = ["%s%s" % ('+'.join([hexfunc(parent) for parent in parents]),
                        (modified or added or removed) and "+" or "")]

    if not ui.quiet:
        # multiple tags for a single parent separated by '/'
        parenttags = ['/'.join(tags)
                      for tags in map(repo.nodetags, parents) if tags]

    safety check, not to import a real mail message.
    """
    patches = (patch1,) + patches

    if not opts['force']:
        modified, added, removed, unknown = repo.changes()
        if modified or added or removed:
            raise util.Abort(_("outstanding uncommitted changes"))

    d = opts["base"]
    strip = opts["strip"]

    entire project history.  If the files still exist in the working
    directory, they will be deleted from it.
    """
    names = []
    def okaytoremove(abs, rel, exact):
        modified, added, removed, unknown = repo.changes(files=[abs])
        reason = None
        if modified:
            reason = _('is modified')
        elif added:
            reason = _('has been marked for add')
        elif unknown:
            reason = _('is not managed')
        if reason:
            if exact:
                ui.warn(_('not removing %s: file %s\n') % (rel, reason))
        else:

    """
    node = opts['rev'] and repo.lookup(opts['rev']) or \
           repo.dirstate.parents()[0]

    files, choose, anypats, cwd = matchpats(repo, pats, opts)
    modified, added, removed, unknown = repo.changes(match=choose)
    repo.forget(added)
    repo.undelete(removed)

    return repo.update(node, False, True, choose, False)

def root(ui, repo):
    """print the root (top) of the current working dir

    R = removed
    ? = not tracked
    """

    files, matchfn, anypats, cwd = matchpats(repo, pats, opts)
    modified, added, removed, unknown = [
        [util.pathto(cwd, x) for x in n]
        for n in repo.changes(files=files, match=matchfn)]

    changetypes = [(_('modified'), 'M', modified),
                   (_('added'), 'A', added),
                   (_('removed'), 'R', removed),
                   (_('unknown'), '?', unknown)]

    end = opts['print0'] and '\0' or '\n'

    for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]
                               or changetypes):

    if opts['local']:
        repo.opener("localtags", "a").write("%s %s\n" % (r, name))
        return

    for x in repo.changes():
        if ".hgtags" in x:
            raise util.Abort(_("working copy of .hgtags is changed "
                               "(please commit .hgtags manually)"))

    repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))