mercurial-scm/hg: comparison mercurial/commands.py

equal deleted inserted replaced

-:a454eeb1b827
+:de377b1a9a84
 from node import hex, nullid, nullrev, short
 from i18n import _, gettext
 import os, re, sys
 import hg, util, revlog, bundlerepo, extensions, copies, context, error
-import difflib, patch, time, help, mdiff, tempfile, url
+import difflib, patch, time, help, mdiff, tempfile, url, encoding
 import archival, changegroup, cmdutil, hgweb.server, sshserver, hbisect
 import merge as merge_
 # Commands start here, listed alphabetically
 elif label:
 if not opts.get('force') and label in repo.branchtags():
 if label not in [p.branch() for p in repo.parents()]:
 raise util.Abort(_('a branch of the same name already exists'
 ' (use --force to override)'))
-repo.dirstate.setbranch(util.fromlocal(label))
+repo.dirstate.setbranch(encoding.fromlocal(label))
 ui.status(_('marked working directory as branch %s\n') % label)
 else:
-ui.write("%s\n" % util.tolocal(repo.dirstate.branch()))
+ui.write("%s\n" % encoding.tolocal(repo.dirstate.branch()))
 def branches(ui, repo, active=False):
 """list repository named branches
 List the repository's named branches, indicating which ones are
 A branch is considered active if it contains repository heads.
 Use the command 'hg update' to switch to an existing branch.
 """
 hexfunc = ui.debugflag and hex or short
-activebranches = [util.tolocal(repo[n].branch())
+activebranches = [encoding.tolocal(repo[n].branch())
 for n in repo.heads(closed=False)]
 branches = util.sort([(tag in activebranches, repo.changelog.rev(node), tag)
 for tag, node in repo.branchtags().items()])
 branches.reverse()
 notice = ''
 elif hn not in repo.branchheads(tag, closed=False):
 notice = ' (closed)'
 else:
 notice = ' (inactive)'
-rev = str(node).rjust(31 - util.colwidth(tag))
+rev = str(node).rjust(31 - encoding.colwidth(tag))
 data = tag, rev, hexfunc(hn), notice
 ui.write("%s %s:%s%s\n" % data)
 def bundle(ui, repo, fname, dest=None, **opts):
 """create a changegroup file
 return name
 problems = 0
 # encoding
-ui.status(_("Checking encoding (%s)...\n") % util._encoding)
+ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
 try:
-util.fromlocal("test")
+encoding.fromlocal("test")
 except util.Abort, inst:
 ui.write(" %s\n" % inst)
 ui.write(_(" (check that your locale is properly set)\n"))
 problems += 1
 output = [hexfunc(ctx.node())]
 if num:
 output.append(str(ctx.rev()))
 if repo.local() and default and not ui.quiet:
-b = util.tolocal(ctx.branch())
+b = encoding.tolocal(ctx.branch())
 if b != 'default':
 output.append("(%s)" % b)
 # multiple tags for a single parent separated by '/'
 t = "/".join(ctx.tags())
 if t:
 output.append(t)
 if branch:
-output.append(util.tolocal(ctx.branch()))
+output.append(encoding.tolocal(ctx.branch()))
 if tags:
 output.extend(ctx.tags())
 ui.write("%s\n" % ' '.join(output))
 hn = hexfunc(n)
 r = "%5d:%s" % (repo.changelog.rev(n), hn)
 except error.LookupError:
 r = "    ?:%s" % hn
 else:
-spaces = " " * (30 - util.colwidth(t))
+spaces = " " * (30 - encoding.colwidth(t))
 if ui.verbose:
 if repo.tagtype(t) == 'local':
 tagtype = " local"
 else:
 tagtype = ""
 ('q', 'quiet', None, _('suppress output')),
 ('v', 'verbose', None, _('enable additional output')),
 ('', 'config', [], _('set/override config option')),
 ('', 'debug', None, _('enable debugging output')),
 ('', 'debugger', None, _('start debugger')),
-('', 'encoding', util._encoding, _('set the charset encoding')),
+('', 'encoding', encoding.encoding, _('set the charset encoding')),
-('', 'encodingmode', util._encodingmode, _('set the charset encoding mode')),
+('', 'encodingmode', encoding.encodingmode,
+_('set the charset encoding mode')),
 ('', 'lsprof', None, _('print improved command execution profile')),
 ('', 'traceback', None, _('print traceback on exception')),
 ('', 'time', None, _('time how long the command takes')),
 ('', 'profile', None, _('print command execution profile')),
 ('', 'version', None, _('output version information and exit')),

changeset 7948	de377b1a9a84
parent 7942	553cef16031f
child 7974	a8a719ff150a