equal
deleted
inserted
replaced
2521 'b': 'ignore_space_change', |
2521 'b': 'ignore_space_change', |
2522 'B': 'ignore_blank_lines', |
2522 'B': 'ignore_blank_lines', |
2523 } |
2523 } |
2524 |
2524 |
2525 for diffopt in ('', 'w', 'b', 'B', 'wB'): |
2525 for diffopt in ('', 'w', 'b', 'B', 'wB'): |
2526 opts = dict((options[c], b'1') for c in diffopt) |
2526 opts = {options[c]: b'1' for c in diffopt} |
2527 |
2527 |
2528 def d(): |
2528 def d(): |
2529 ui.pushbuffer() |
2529 ui.pushbuffer() |
2530 commands.diff(ui, repo, **opts) |
2530 commands.diff(ui, repo, **opts) |
2531 ui.popbuffer() |
2531 ui.popbuffer() |
3046 except AttributeError: |
3046 except AttributeError: |
3047 segmentforrevs = rl._chunkraw |
3047 segmentforrevs = rl._chunkraw |
3048 |
3048 |
3049 # Verify engines argument. |
3049 # Verify engines argument. |
3050 if engines: |
3050 if engines: |
3051 engines = set(e.strip() for e in engines.split(b',')) |
3051 engines = {e.strip() for e in engines.split(b',')} |
3052 for engine in engines: |
3052 for engine in engines: |
3053 try: |
3053 try: |
3054 util.compressionengines[engine] |
3054 util.compressionengines[engine] |
3055 except KeyError: |
3055 except KeyError: |
3056 raise error.Abort(b'unknown compression engine: %s' % engine) |
3056 raise error.Abort(b'unknown compression engine: %s' % engine) |