Mercurial > hg
view mercurial/ui.py @ 226:1536ccac47e9
merge: don't bail on outstanding changes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
merge: don't bail on outstanding changes
With multiple heads, we don't need to worry about the working dir's
uncommitted changes at pull time
manifest hash: 5b4e024f220fa616732310ce5f48e71abfa910e0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoMFQywK+sNU5EO8RApLyAKCoNDF84wFzgnpS+WLuXdkGxeHFPwCdFsMy
CysB458dNcFuB/vDFhgJr58=
=gG+u
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 03 Jun 2005 12:45:04 -0800 |
parents | ec327cf0d3a9 |
children | 3427806d5ab9 4f802588cdfb afe895fcc0d0 |
line wrap: on
line source
# 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. import os, tempfile, sys, re class ui: def __init__(self, verbose=False, debug=False, quiet=False, interactive=True): self.quiet = quiet and not verbose and not debug self.verbose = verbose or debug self.debugflag = debug self.interactive = interactive def write(self, *args): for a in args: sys.stdout.write(str(a)) 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) def warn(self, msg): self.write(*msg) def note(self, *msg): if self.verbose: self.write(*msg) def debug(self, *msg): if self.debugflag: self.write(*msg) def edit(self, text): (fd, name) = tempfile.mkstemp("hg") f = os.fdopen(fd, "w") f.write(text) f.close() editor = os.environ.get("HGEDITOR") or os.environ.get("EDITOR", "vi") r = os.system("%s %s" % (editor, name)) if r: raise "Edit failed!" t = open(name).read() t = re.sub("(?m)^HG:.*\n", "", t) return t