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

mkdir t

     4

cd t

     5

hg init

     6

echo import > port

     7

hg add port

     8

hg commit -m 0 -u spam -d '0 0'

     9

echo export >> port

    10

hg commit -m 1 -u eggs -d '1 0'

    11

echo export > port

    12

echo vaportight >> port

    13

echo 'import/export' >> port

    14

hg commit -m 2 -u spam -d '2 0'

    15

echo 'import/export' >> port

    16

hg commit -m 3 -u eggs -d '3 0'

    17

head -n 3 port > port1

    18

mv port1 port

    19

hg commit -m 4 -u spam -d '4 0'

    20

echo % simple

    21

hg grep port port

    22

echo % all

    23

hg grep --all -nu port port

    24

echo % other

    25

hg grep import port

    26

    27

hg cp port port2

    28

hg commit -m 4 -u spam -d '5 0'

    29

echo '% follow'

    30

hg grep -f 'import$' port2

    31

echo deport >> port2

    32

hg commit -m 5 -u eggs -d '6 0'

    33

hg grep -f --all -nu port port2

    34

    35

cd ..

    36

hg init t2

    37

cd t2

    38

hg grep foobar foo

    39

hg grep foobar

    40

echo blue >> color

    41

echo black >> color

    42

hg add color

    43

hg ci -m 0 -d '0 0'

    44

echo orange >> color

    45

hg ci -m 1 -d '0 0'

    46

echo black > color

    47

hg ci -m 2 -d '0 0'

    48

echo orange >> color

    49

echo blue >> color

    50

hg ci -m 3 -d '0 0'

    51

hg grep orange

    52

hg grep --all orange