facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2025-01-06 04:43:19 +03:00
Code Issues Projects Releases Wiki Activity

Make prompting go

Browse Source 
Minor UI tweaking
Add merge prompting
This commit is contained in:
mpm@selenic.com 2005-05-18 18:25:37 -08:00
parent 3157c9afd4
commit aea9850302
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hg
View File

@ -87,7 +87,9 @@ def diff(files = None, node1 = None, node2 = None):
options = {}
opts = [('v', 'verbose', None, 'verbose'),
('d', 'debug', None, 'debug'),
('q', 'quiet', None, 'quiet')]
('q', 'quiet', None, 'quiet'),
('y', 'noninteractive', None, 'run non-interactively'),
]
args = fancyopts.fancyopts(sys.argv[1:], opts, options,
'hg [options] <command> [command options] [files]')
@ -98,7 +100,8 @@ try:
except:
cmd = ""
ui = hg.ui(options["verbose"], options["debug"], options["quiet"])
ui = hg.ui(options["verbose"], options["debug"], options["quiet"],
not options["noninteractive"])
if cmd == "init":
repo = hg.repository(ui, ".", create=1)
@ -348,6 +351,9 @@ elif cmd == "dumpmanifest":
for f in files:
print hg.hex(m[f]), f
elif cmd == "debugprompt":
print ui.prompt(args[0], args[1], args[2])
elif cmd == "debughash":
f = repo.file(args[0])
print f.encodepath(args[0])

33
mercurial/hg.py
View File

@ -675,7 +675,7 @@ class localrepository:
omap = self.manifest.read(mo) # other
amap = self.manifest.read(ma) # ancestor
mmap = self.manifest.read(mm) # mine
self.ui.debug("ancestor %s local %s other %s\n" %
self.ui.debug("ancestor %s local %s remote %s\n" %
(short(ma), short(mm), short(mo)))
nmap = {}
@ -691,8 +691,10 @@ class localrepository:
del omap[f]
elif f in amap:
if mid != amap[f]:
self.ui.debug("local changed %s which other deleted\n" % f)
pass # we should prompt here
r = self.ui.prompt(
("local changed %s which remote deleted\n" % f) +
"(k)eep or (d)elete?", "[kd]", "k")
if r == "k": nmap[f] = mid
else:
self.ui.debug("other deleted %s\n" % f)
pass # other deleted it
@ -705,8 +707,10 @@ class localrepository:
for f, oid in omap.iteritems():
if f in amap:
if oid != amap[f]:
self.ui.debug("other changed %s which we deleted\n" % f)
pass # this is the nasty case, we should prompt
r = self.ui.prompt(
("remote changed %s which local deleted\n" % f) +
"(k)eep or (d)elete?", "[kd]", "k")
if r == "k": nmap[f] = oid
else:
pass # probably safe
else:
@ -811,26 +815,33 @@ def repository(ui, path=None, create=0):
return localrepository(ui, path, create)
class ui:
def __init__(self, verbose=False, debug=False, quiet=False):
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 prompt(self, msg, pat):
def readline(self):
return sys.stdin.readline()[:-1]
def prompt(self, msg, pat, default = "y"):
if not self.interactive: return default
while 1:
sys.stdout.write(msg)
r = sys.stdin.readline()[:-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):
def note(self, *msg):
if self.verbose: self.write(*msg)
def debug(self, msg):
def debug(self, *msg):
if self.debugflag: self.write(*msg)
def edit(self, text):
(fd, name) = tempfile.mkstemp("hg")