actually port simplemerge to hg - use bdiff instead of patiencediff; this is a larger change, since bdiff works on 2 multi-line strings, while patiencediff works on 2 lists; - rename the main class from Merge3 to Merge3Text and add a Merge3 class that derives from Merge3Text. This new Merge3 class has the same interface from the original class, so that the tests still work; - Merge3 uses util.binary to detect binary data and raises util.Abort instead of a specific exception; - don't use the @decorator syntax, to keep python2.3 compatibility; - the test uses unittest, which likes to print how long it took to run. This obviously doesn't play too well with hg's test suite, so we override time.time to fool unittest; - one test has a different (but still valid) output because of the different diff algorithm used; - the TestCase class used by bzr has some extras to help debugging. test-merge3.py used 2 of them: - log method to log some data - assertEqualDiff method to ease viewing diffs of diffs We add a dummy log method and use regular assertEquals instead of assertEqualDiff. - make simplemerge executable and add "#!/usr/bin/env python" header

     1

#!/bin/sh

     2

     3

echo "[extensions]" >> $HGRCPATH

     4

echo "extdiff=" >> $HGRCPATH

     5

     6

hg init a

     7

cd a

     8

echo a > a

     9

hg add

    10

hg extdiff -o -r $opt

    11

    12

echo "[extdiff]" >> $HGRCPATH

    13

echo "cmd.falabala=echo" >> $HGRCPATH

    14

echo "opts.falabala=diffing" >> $HGRCPATH

    15

    16

hg falabala

    17

    18

hg help falabala

    19

    20

hg ci -d '0 0' -mtest1

    21

    22

echo b >> a

    23

hg ci -d '1 0' -mtest2

    24

    25

hg falabala -r 0:1

    26

    27

# test diff during merge

    28

hg update 0

    29

echo b >> b

    30

hg add b

    31

hg ci -m "new branch" -d '1 0'

    32

hg update -C 1

    33

hg merge tip

    34

hg falabala || echo "diff-like tools yield a non-zero exit code"