equal
deleted
inserted
replaced
16 |
16 |
17 # mbp: "you know that thing where cvs gives you conflict markers?" |
17 # mbp: "you know that thing where cvs gives you conflict markers?" |
18 # s: "i hate that." |
18 # s: "i hate that." |
19 |
19 |
20 from i18n import _ |
20 from i18n import _ |
21 import util, mdiff |
21 import scmutil, util, mdiff |
22 import sys, os |
22 import sys, os |
23 |
23 |
24 class CantReprocessAndShowBase(Exception): |
24 class CantReprocessAndShowBase(Exception): |
25 pass |
25 pass |
26 |
26 |
427 basetext = readfile(base) |
427 basetext = readfile(base) |
428 othertext = readfile(other) |
428 othertext = readfile(other) |
429 |
429 |
430 local = os.path.realpath(local) |
430 local = os.path.realpath(local) |
431 if not opts.get('print'): |
431 if not opts.get('print'): |
432 opener = util.opener(os.path.dirname(local)) |
432 opener = scmutil.opener(os.path.dirname(local)) |
433 out = opener(os.path.basename(local), "w", atomictemp=True) |
433 out = opener(os.path.basename(local), "w", atomictemp=True) |
434 else: |
434 else: |
435 out = sys.stdout |
435 out = sys.stdout |
436 |
436 |
437 reprocess = not opts.get('no_minimal') |
437 reprocess = not opts.get('no_minimal') |