comparison mercurial/commands.py @ 946:6d21a3488df9

Merge with MPM.

945:f15901d053e1

                        opts.get('exclude'), head)

def makewalk(repo, pats, opts, head = ''):
    cwd = repo.getcwd()
    files, matchfn = matchpats(repo, cwd, pats, opts, head)
    def walk():
        for src, fn in repo.walk(files = files, match = matchfn):
            yield src, fn, util.pathto(cwd, fn)
    return files, matchfn, walk()

def walk(repo, pats, opts, head = ''):
    files, matchfn, results = makewalk(repo, pats, opts, head)
    for r in results: yield r

# Commands start here, listed alphabetically

def add(ui, repo, *pats, **opts):
    '''add the specified files on the next commit'''
    names = []
    q = dict(zip(pats, pats))
    for src, abs, rel in walk(repo, pats, opts):
        if rel in q or abs in q:
            names.append(abs)
        elif repo.dirstate.state(abs) == '?':
            ui.status('adding %s\n' % rel)
            names.append(abs)
    repo.add(names)

def addremove(ui, repo, *pats, **opts):
    """add all new files, delete all missing files"""
    q = dict(zip(pats, pats))
    add, remove = [], []
    for src, abs, rel in walk(repo, pats, opts):
        if src == 'f' and repo.dirstate.state(abs) == '?':
            add.append(abs)
            if rel not in q: ui.status('adding ', rel, '\n')
        if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
            remove.append(abs)
            if rel not in q: ui.status('removing ', rel, '\n')
    repo.add(add)
    repo.remove(remove)

def annotate(ui, repo, *pats, **opts):
    """show changeset information per file line"""

        node = repo.changelog.lookup(opts['rev'])
    else:
        node = repo.dirstate.parents()[0]
    change = repo.changelog.read(node)
    mmap = repo.manifest.read(change[0])
    for src, abs, rel in walk(repo, pats, opts):
        if abs not in mmap:
            ui.warn("warning: %s is not in the repository!\n" % rel)
            continue

        lines = repo.file(abs).annotate(mmap[abs])

    ui.write("}\n")

def debugwalk(ui, repo, *pats, **opts):
    items = list(walk(repo, pats, opts))
    if not items: return
    fmt = '%%s  %%-%ds  %%s' % max([len(abs) for (src, abs, rel) in items])
    for i in items: print fmt % i

def diff(ui, repo, *pats, **opts):
    """diff working directory (or selected files)"""
    revs = []
    if opts['rev']:

    files = []
    match = util.always
    if pats:
        roots, match, results = makewalk(repo, pats, opts)
        for src, abs, rel in results:
            files.append(abs)
    dodiff(sys.stdout, ui, repo, files, *revs, **{'match': match})

def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
    node = repo.lookup(changeset)

        seqno += 1
        doexport(ui, repo, cset, seqno, total, revwidth, opts)

def forget(ui, repo, *pats, **opts):
    """don't add the specified files on the next commit"""
    q = dict(zip(pats, pats))
    forget = []
    for src, abs, rel in walk(repo, pats, opts):
        if repo.dirstate.state(abs) == 'a':
            forget.append(abs)
            if rel not in q: ui.status('forgetting ', rel, '\n')
    repo.forget(forget)

def heads(ui, repo, **opts):
    """show current repository heads"""
    heads = repo.changelog.heads()

def locate(ui, repo, *pats, **opts):
    """locate files matching specific patterns"""
    end = '\n'
    if opts['print0']: end = '\0'

    for src, abs, rel in walk(repo, pats, opts, '(?:.*/|)'):
        if repo.dirstate.state(abs) == '?': continue
        if opts['fullpath']:
            ui.write(os.path.join(repo.root, abs), end)
        else:
            ui.write(rel, end)

globalopts = [('v', 'verbose', None, 'verbose mode'),
              ('', 'debug', None, 'debug mode'),
              ('q', 'quiet', None, 'quiet mode'),
              ('', 'profile', None, 'profile'),
              ('R', 'repository', "", 'repository root directory'),
              ('', 'traceback', None, 'print traceback on exception'),
              ('y', 'noninteractive', None, 'run non-interactively'),
              ('', 'version', None, 'output version information and exit'),
              ('', 'time', None, 'time how long the command takes'),

    except UnknownCommand, inst:
        u = ui.ui()
        u.warn("hg: unknown command '%s'\n" % inst.args[0])
        help_(u, 'shortlist')
        sys.exit(1)

    if options["time"]:
        def get_times():
            t = os.times()
            if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()

946:6d21a3488df9

                        opts.get('exclude'), head)

def makewalk(repo, pats, opts, head = ''):
    cwd = repo.getcwd()
    files, matchfn = matchpats(repo, cwd, pats, opts, head)
    exact = dict(zip(files, files))
    def walk():
        for src, fn in repo.walk(files = files, match = matchfn):
            yield src, fn, util.pathto(cwd, fn), fn in exact
    return files, matchfn, walk()

def walk(repo, pats, opts, head = ''):
    files, matchfn, results = makewalk(repo, pats, opts, head)
    for r in results: yield r

# Commands start here, listed alphabetically

def add(ui, repo, *pats, **opts):
    '''add the specified files on the next commit'''
    names = []
    for src, abs, rel, exact in walk(repo, pats, opts):
        if exact:
            names.append(abs)
        elif repo.dirstate.state(abs) == '?':
            ui.status('adding %s\n' % rel)
            names.append(abs)
    repo.add(names)

def addremove(ui, repo, *pats, **opts):
    """add all new files, delete all missing files"""
    add, remove = [], []
    for src, abs, rel, exact in walk(repo, pats, opts):
        if src == 'f' and repo.dirstate.state(abs) == '?':
            add.append(abs)
            if not exact: ui.status('adding ', rel, '\n')
        if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
            remove.append(abs)
            if not exact: ui.status('removing ', rel, '\n')
    repo.add(add)
    repo.remove(remove)

def annotate(ui, repo, *pats, **opts):
    """show changeset information per file line"""

        node = repo.changelog.lookup(opts['rev'])
    else:
        node = repo.dirstate.parents()[0]
    change = repo.changelog.read(node)
    mmap = repo.manifest.read(change[0])
    for src, abs, rel, exact in walk(repo, pats, opts):
        if abs not in mmap:
            ui.warn("warning: %s is not in the repository!\n" % rel)
            continue

        lines = repo.file(abs).annotate(mmap[abs])

    ui.write("}\n")

def debugwalk(ui, repo, *pats, **opts):
    items = list(walk(repo, pats, opts))
    if not items: return
    fmt = '%%s  %%-%ds  %%-%ds  %%s' % (
        max([len(abs) for (src, abs, rel, exact) in items]),
        max([len(rel) for (src, abs, rel, exact) in items]))
    exactly = {True: 'exact', False: ''}
    for src, abs, rel, exact in items:
        print fmt % (src, abs, rel, exactly[exact])

def diff(ui, repo, *pats, **opts):
    """diff working directory (or selected files)"""
    revs = []
    if opts['rev']:

    files = []
    match = util.always
    if pats:
        roots, match, results = makewalk(repo, pats, opts)
        for src, abs, rel, exact in results:
            files.append(abs)
    dodiff(sys.stdout, ui, repo, files, *revs, **{'match': match})

def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
    node = repo.lookup(changeset)

        seqno += 1
        doexport(ui, repo, cset, seqno, total, revwidth, opts)

def forget(ui, repo, *pats, **opts):
    """don't add the specified files on the next commit"""
    forget = []
    for src, abs, rel, exact in walk(repo, pats, opts):
        if repo.dirstate.state(abs) == 'a':
            forget.append(abs)
            if not exact: ui.status('forgetting ', rel, '\n')
    repo.forget(forget)

def heads(ui, repo, **opts):
    """show current repository heads"""
    heads = repo.changelog.heads()

def locate(ui, repo, *pats, **opts):
    """locate files matching specific patterns"""
    end = '\n'
    if opts['print0']: end = '\0'

    for src, abs, rel, exact in walk(repo, pats, opts, '(?:.*/|)'):
        if repo.dirstate.state(abs) == '?': continue
        if opts['fullpath']:
            ui.write(os.path.join(repo.root, abs), end)
        else:
            ui.write(rel, end)

globalopts = [('v', 'verbose', None, 'verbose mode'),
              ('', 'debug', None, 'debug mode'),
              ('q', 'quiet', None, 'quiet mode'),
              ('', 'profile', None, 'profile'),
              ('C', 'cwd', '', 'change working directory'),
              ('R', 'repository', "", 'repository root directory'),
              ('', 'traceback', None, 'print traceback on exception'),
              ('y', 'noninteractive', None, 'run non-interactively'),
              ('', 'version', None, 'output version information and exit'),
              ('', 'time', None, 'time how long the command takes'),

    except UnknownCommand, inst:
        u = ui.ui()
        u.warn("hg: unknown command '%s'\n" % inst.args[0])
        help_(u, 'shortlist')
        sys.exit(1)

    if options['cwd']:
        try:
            os.chdir(options['cwd'])
        except OSError, inst:
            u = ui.ui()
            u.warn('abort: %s: %s\n' % (options['cwd'], inst.strerror))
            sys.exit(1)

    if options["time"]:
        def get_times():
            t = os.times()
            if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()