Show More
@@ -481,6 +481,19 b' class MergeInput(object):' | |||
|
481 | 481 | # separated by a ':'. The label is padded to make the ':' aligned among |
|
482 | 482 | # all merge inputs. |
|
483 | 483 | self.label_detail = label_detail |
|
484 | self._text = None | |
|
485 | ||
|
486 | def text(self): | |
|
487 | if self._text is None: | |
|
488 | # Merges were always run in the working copy before, which means | |
|
489 | # they used decoded data, if the user defined any repository | |
|
490 | # filters. | |
|
491 | # | |
|
492 | # Maintain that behavior today for BC, though perhaps in the future | |
|
493 | # it'd be worth considering whether merging encoded data (what the | |
|
494 | # repository usually sees) might be more useful. | |
|
495 | self._text = self.fctx.decodeddata() | |
|
496 | return self._text | |
|
484 | 497 | |
|
485 | 498 | |
|
486 | 499 | def simplemerge( |
@@ -498,26 +511,19 b' def simplemerge(' | |||
|
498 | 511 | The merged result is written into `localctx`. |
|
499 | 512 | """ |
|
500 | 513 | |
|
501 |
def readctx( |
|
|
502 | # Merges were always run in the working copy before, which means | |
|
503 | # they used decoded data, if the user defined any repository | |
|
504 | # filters. | |
|
505 | # | |
|
506 | # Maintain that behavior today for BC, though perhaps in the future | |
|
507 | # it'd be worth considering whether merging encoded data (what the | |
|
508 | # repository usually sees) might be more useful. | |
|
514 | def readctx(input): | |
|
509 | 515 | return _verifytext( |
|
510 |
|
|
|
511 | ctx.path(), | |
|
516 | input.text(), | |
|
517 | input.fctx.path(), | |
|
512 | 518 | ui, |
|
513 | 519 | quiet=quiet, |
|
514 | 520 | allow_binary=allow_binary, |
|
515 | 521 | ) |
|
516 | 522 | |
|
517 | 523 | try: |
|
518 |
localtext = readctx(local |
|
|
519 |
basetext = readctx(base |
|
|
520 |
othertext = readctx(other |
|
|
524 | localtext = readctx(local) | |
|
525 | basetext = readctx(base) | |
|
526 | othertext = readctx(other) | |
|
521 | 527 | except error.Abort: |
|
522 | 528 | return True |
|
523 | 529 |
General Comments 0
You need to be logged in to leave comments.
Login now