# HG changeset patch # User Patrick Mezard # Date 1295784077 -3600 # Node ID 90e7be23167e3da41d266bcc58675b5221a38c87 # Parent 82133e91ce7de67e6b3daca02f2bf027064658fd record: turn prompt() into a pure function diff -r 82133e91ce7d -r 90e7be23167e hgext/record.py --- a/hgext/record.py Sun Jan 23 12:44:05 2011 +0100 +++ b/hgext/record.py Sun Jan 23 13:01:17 2011 +0100 @@ -266,13 +266,7 @@ consumed.append(chunks.pop()) return consumed - chunks = list(chunks) - chunks.reverse() - seen = set() - resp_all = [None] # this two are changed from inside prompt, - resp_file = [None] # so can't be usual variables - applied = {} # 'filename' -> [] of chunks - def prompt(query): + def prompt(skipfile, skipall, query): """prompt query, and process base inputs - y/n for the rest of file @@ -280,13 +274,12 @@ - ? (help) - q (quit) - Returns True/False and sets reps_all and resp_file as - appropriate. + Return True/False and possibly updated skipfile and skipall. """ - if resp_all[0] is not None: - return resp_all[0] - if resp_file[0] is not None: - return resp_file[0] + if skipall is not None: + return skipall, skipfile, skipall + if skipfile is not None: + return skipfile, skipfile, skipall while True: resps = _('[Ynsfdaq?]') choices = (_('&Yes, record this change'), @@ -311,33 +304,40 @@ elif r == 1: # no ret = False elif r == 2: # Skip - ret = resp_file[0] = False + ret = skipfile = False elif r == 3: # file (Record remaining) - ret = resp_file[0] = True + ret = skipfile = True elif r == 4: # done, skip remaining - ret = resp_all[0] = False + ret = skipall = False elif r == 5: # all - ret = resp_all[0] = True + ret = skipall = True elif r == 6: # quit raise util.Abort(_('user quit')) - return ret + return ret, skipfile, skipall + + chunks = list(chunks) + chunks.reverse() + seen = set() + applied = {} # 'filename' -> [] of chunks + skipfile, skipall = None, None pos, total = 0, len(chunks) - 1 while chunks: pos = total - len(chunks) + 1 chunk = chunks.pop() if isinstance(chunk, header): # new-file mark - resp_file = [None] + skipfile = None fixoffset = 0 hdr = ''.join(chunk.header) if hdr in seen: consumefile(chunks) continue seen.add(hdr) - if resp_all[0] is None: + if skipall is None: chunk.pretty(ui) - r = prompt(_('examine changes to %s?') % - _(' and ').join(map(repr, chunk.files()))) + msg = (_('examine changes to %s?') % + _(' and ').join(map(repr, chunk.files()))) + r, skipfile, skipall = prompt(skipfile, skipall, msg) if r: applied[chunk.filename()] = [chunk] if chunk.allhunks(): @@ -346,12 +346,13 @@ consumefile(chunks) else: # new hunk - if resp_file[0] is None and resp_all[0] is None: + if skipfile is None and skipall is None: chunk.pretty(ui) - r = (total == 1 - and prompt(_('record this change to %r?') % chunk.filename()) - or prompt(_('record change %d/%d to %r?') % - (pos, total, chunk.filename()))) + msg = (total == 1 + and (_('record this change to %r?') % chunk.filename()) + or (_('record change %d/%d to %r?') % + (pos, total, chunk.filename()))) + r, skipfile, skipall = prompt(skipfile, skipall, msg) if r: if fixoffset: chunk = copy.copy(chunk)