Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/filemerge.py @ 27124:9c870e3efab7
filemerge: in ':prompt', use ':fail' tool rather than returning directly
The ':fail' tool now knows to write out the changed side for change/delete
conflicts.
This has no impact right now but will make things better when we move
change/delete conflicts in here.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Tue, 24 Nov 2015 10:58:35 -0800 |
| parents | 4dc5951df1e4 |
| children | 296d55def9c4 |
comparison
equal
deleted
inserted
replaced
| 27123:4dc5951df1e4 | 27124:9c870e3efab7 |
|---|---|
| 258 return _iother(repo, mynode, orig, fcd, fco, fca, toolconf) | 258 return _iother(repo, mynode, orig, fcd, fco, fca, toolconf) |
| 259 else: | 259 else: |
| 260 return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf) | 260 return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf) |
| 261 except error.ResponseExpected: | 261 except error.ResponseExpected: |
| 262 ui.write("\n") | 262 ui.write("\n") |
| 263 return 1, False | 263 return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf) |
| 264 | 264 |
| 265 @internaltool('local', nomerge) | 265 @internaltool('local', nomerge) |
| 266 def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf): | 266 def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf): |
| 267 """Uses the local version of files as the merged version.""" | 267 """Uses the local version of files as the merged version.""" |
| 268 return 0, fcd.isabsent() | 268 return 0, fcd.isabsent() |