Mercurial > public > mercurial-scm > hg
comparison mercurial/simplemerge.py @ 15355:dbdb777502dc stable
consistency: use util.realpath instead of os.path.realpath where useful
exceptions:
hg: os.path.realpath used before util can be imported
tests/run-tests.py: may not import mercurial modules
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 24 Oct 2011 13:51:24 +0200 |
| parents | 774da7121fc9 |
| children | c519cd8f0169 |
comparison
equal
deleted
inserted
replaced
| 15354:42630f54e513 | 15355:dbdb777502dc |
|---|---|
| 428 basetext = readfile(base) | 428 basetext = readfile(base) |
| 429 othertext = readfile(other) | 429 othertext = readfile(other) |
| 430 except util.Abort: | 430 except util.Abort: |
| 431 return 1 | 431 return 1 |
| 432 | 432 |
| 433 local = os.path.realpath(local) | 433 local = util.realpath(local) |
| 434 if not opts.get('print'): | 434 if not opts.get('print'): |
| 435 opener = scmutil.opener(os.path.dirname(local)) | 435 opener = scmutil.opener(os.path.dirname(local)) |
| 436 out = opener(os.path.basename(local), "w", atomictemp=True) | 436 out = opener(os.path.basename(local), "w", atomictemp=True) |
| 437 else: | 437 else: |
| 438 out = sys.stdout | 438 out = sys.stdout |