##// END OF EJS Templates
Clean up walk and changes code to use normalised names properly....
Clean up walk and changes code to use normalised names properly. New function: commands.pathto returns the relative path from one path to another. For example, given foo/bar and baz/quux, it will return ../../baz/quux. This new function is used by the walk and status code to print relative paths correctly. New command: debugwalk exercises the walk code without doing anything more. hg.dirstate.walk now yields normalised names. For example, if you're in the baz directory and you ask it to walk ../foo/bar/.., it will yield names starting with foo/. As a result of this change, all of the other walk and changes methods in this module also return normalised names. The util.matcher function now normalises globs and path names, so that it will match normalised names properly. Finally, util.matcher uses the non-glob prefix of a glob to tell walk which directories to scan. Perviously, a glob like foo/* would scan everything, but only return matches for foo/*. Now, foo/* only scans under foo (using the globprefix function), which is much faster.

File last commit:

r691:61c6b417 default
r820:89985a1b default
Show More
ui.py
108 lines | 3.4 KiB | text/x-python | PythonLexer
mpm@selenic.com
Move ui class to its own module...
r207 # ui.py - user interface bits for mercurial
#
# Copyright 2005 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
Bryan O'Sullivan
Demand-load most modules in the commands and ui modules....
r613 import os, ConfigParser
from demandload import *
demandload(globals(), "re socket sys util")
mpm@selenic.com
Move ui class to its own module...
r207
class ui:
def __init__(self, verbose=False, debug=False, quiet=False,
interactive=True):
mpm@selenic.com
ui: add configuration file support...
r285 self.cdata = ConfigParser.SafeConfigParser()
self.cdata.read(os.path.expanduser("~/.hgrc"))
self.quiet = self.configbool("ui", "quiet")
self.verbose = self.configbool("ui", "verbose")
self.debugflag = self.configbool("ui", "debug")
self.interactive = self.configbool("ui", "interactive", True)
self.quiet = (self.quiet or quiet) and not verbose and not debug
self.verbose = (self.verbose or verbose) or debug
self.debugflag = (self.debugflag or debug)
self.interactive = (self.interactive and interactive)
mpm@selenic.com
Add support for .hg/hgrc file...
r337 def readconfig(self, fp):
self.cdata.readfp(fp)
mpm@selenic.com
ui: add configuration file support...
r285 def config(self, section, val, default=None):
if self.cdata.has_option(section, val):
return self.cdata.get(section, val)
return default
def configbool(self, section, val, default=False):
if self.cdata.has_option(section, val):
return self.cdata.getboolean(section, val)
return default
def configitems(self, section):
if self.cdata.has_section(section):
return self.cdata.items(section)
return []
Matt Mackall
Add username/merge/editor to .hgrc...
r608 def username(self):
mpm@selenic.com
HG environment variables take precedence over hgrc...
r691 return (os.environ.get("HGUSER") or
self.config("ui", "username") or
Matt Mackall
Add username/merge/editor to .hgrc...
r608 os.environ.get("EMAIL") or
(os.environ.get("LOGNAME",
os.environ.get("USERNAME", "unknown"))
+ '@' + socket.getfqdn()))
mpm@selenic.com
[PATCH] Add ui.expandpath command...
r506 def expandpath(self, loc):
paths = {}
for name, path in self.configitems("paths"):
paths[name] = path
return paths.get(loc, loc)
mpm@selenic.com
Move ui class to its own module...
r207 def write(self, *args):
for a in args:
sys.stdout.write(str(a))
mpm@selenic.com
[PATCH] Make ui.warn write to stderr...
r565
def write_err(self, *args):
sys.stdout.flush()
for a in args:
sys.stderr.write(str(a))
mpm@selenic.com
Move ui class to its own module...
r207 def readline(self):
return sys.stdin.readline()[:-1]
def prompt(self, msg, pat, default = "y"):
if not self.interactive: return default
while 1:
self.write(msg, " ")
r = self.readline()
if re.match(pat, r):
return r
else:
self.write("unrecognized response\n")
def status(self, *msg):
if not self.quiet: self.write(*msg)
Thomas Arendsen Hein
ui.warn can use more than one argument like the other ui methods.
r234 def warn(self, *msg):
mpm@selenic.com
[PATCH] Make ui.warn write to stderr...
r565 self.write_err(*msg)
mpm@selenic.com
Move ui class to its own module...
r207 def note(self, *msg):
if self.verbose: self.write(*msg)
def debug(self, *msg):
if self.debugflag: self.write(*msg)
def edit(self, text):
mpm@selenic.com
import and startup cleanups...
r249 import tempfile
mpm@selenic.com
Move ui class to its own module...
r207 (fd, name) = tempfile.mkstemp("hg")
f = os.fdopen(fd, "w")
f.write(text)
f.close()
mpm@selenic.com
HG environment variables take precedence over hgrc...
r691 editor = (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
Matt Mackall
Add username/merge/editor to .hgrc...
r608 os.environ.get("EDITOR", "vi"))
Radoslaw "AstralStorm" Szkodzinski
Pass username to hgeditor, remove temporary file...
r662 os.environ["HGUSER"] = self.username()
mpm@selenic.com
[PATCH] Harden os.system...
r508 util.system("%s %s" % (editor, name), errprefix = "edit failed")
mpm@selenic.com
Move ui class to its own module...
r207
t = open(name).read()
t = re.sub("(?m)^HG:.*\n", "", t)
Radoslaw "AstralStorm" Szkodzinski
Pass username to hgeditor, remove temporary file...
r662 os.unlink(name)
mpm@selenic.com
Move ui class to its own module...
r207 return t