comparison mercurial/commands.py @ 10651:5f091fc1bab7

style: use consistent variable names (*mod) with imports which would shadow

10650:9ea7238ad935

import os, re, sys, difflib, time, tempfile
import hg, util, revlog, bundlerepo, extensions, copies, error
import patch, help, mdiff, url, encoding, templatekw
import archival, changegroup, cmdutil, sshserver, hbisect
from hgweb import server, hgweb_mod, hgwebdir_mod
import merge as merge_
import minirst

# Commands start here, listed alphabetically

def add(ui, repo, *pats, **opts):

        raise util.Abort(_("can't specify --all and patterns"))
    if not (all or pats or show or mark or unmark):
        raise util.Abort(_('no files or directories specified; '
                           'use --all to remerge all files'))

    ms = merge_.mergestate(repo)
    m = cmdutil.match(repo, pats, opts)

    for f in ms:
        if m(f):
            if show:

        ui.write(m)
    else:
        ui.status(m)

    st = list(repo.status(unknown=True))[:6]
    ms = merge_.mergestate(repo)
    st.append([f for f in ms if ms[f] == 'u'])
    labels = [_('%d modified'), _('%d added'), _('%d removed'),
              _('%d deleted'), _('%d unknown'), _('%d ignored'),
              _('%d unresolved')]
    t = []

10651:5f091fc1bab7

import os, re, sys, difflib, time, tempfile
import hg, util, revlog, bundlerepo, extensions, copies, error
import patch, help, mdiff, url, encoding, templatekw
import archival, changegroup, cmdutil, sshserver, hbisect
from hgweb import server, hgweb_mod, hgwebdir_mod
import merge as mergemod
import minirst

# Commands start here, listed alphabetically

def add(ui, repo, *pats, **opts):

        raise util.Abort(_("can't specify --all and patterns"))
    if not (all or pats or show or mark or unmark):
        raise util.Abort(_('no files or directories specified; '
                           'use --all to remerge all files'))

    ms = mergemod.mergestate(repo)
    m = cmdutil.match(repo, pats, opts)

    for f in ms:
        if m(f):
            if show:

        ui.write(m)
    else:
        ui.status(m)

    st = list(repo.status(unknown=True))[:6]
    ms = mergemod.mergestate(repo)
    st.append([f for f in ms if ms[f] == 'u'])
    labels = [_('%d modified'), _('%d added'), _('%d removed'),
              _('%d deleted'), _('%d unknown'), _('%d ignored'),
              _('%d unresolved')]
    t = []