equal
deleted
inserted
replaced
295 r = ui.promptchoice("%s %s" % (query, resps), choices) |
295 r = ui.promptchoice("%s %s" % (query, resps), choices) |
296 if r == 7: # ? |
296 if r == 7: # ? |
297 doc = gettext(record.__doc__) |
297 doc = gettext(record.__doc__) |
298 c = doc.find(_('y - record this change')) |
298 c = doc.find(_('y - record this change')) |
299 for l in doc[c:].splitlines(): |
299 for l in doc[c:].splitlines(): |
300 if l: ui.write(l.strip(), '\n') |
300 if l: |
|
301 ui.write(l.strip(), '\n') |
301 continue |
302 continue |
302 elif r == 0: # yes |
303 elif r == 0: # yes |
303 ret = True |
304 ret = True |
304 elif r == 1: # no |
305 elif r == 1: # no |
305 ret = False |
306 ret = False |
435 chunks = filterpatch(ui, parsepatch(fp)) |
436 chunks = filterpatch(ui, parsepatch(fp)) |
436 del fp |
437 del fp |
437 |
438 |
438 contenders = set() |
439 contenders = set() |
439 for h in chunks: |
440 for h in chunks: |
440 try: contenders.update(set(h.files())) |
441 try: |
441 except AttributeError: pass |
442 contenders.update(set(h.files())) |
|
443 except AttributeError: |
|
444 pass |
442 |
445 |
443 changed = changes[0] + changes[1] + changes[2] |
446 changed = changes[0] + changes[1] + changes[2] |
444 newfiles = [f for f in changed if f in contenders] |
447 newfiles = [f for f in changed if f in contenders] |
445 if not newfiles: |
448 if not newfiles: |
446 ui.status(_('no changes to record\n')) |
449 ui.status(_('no changes to record\n')) |