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

set -e

     4

     5

echo "[extensions]" >> $HGRCPATH

     6

echo "hbisect=" >> $HGRCPATH

     7

     8

echo % init

     9

hg init

    10

    11

echo % committing changes

    12

count=0

    13

echo > a

    14

while test $count -lt 32 ; do

    15

    echo 'a' >> a

    16

    test $count -eq 0 && hg add

    17

    hg ci -m "msg $count" -d "$count 0"

    18

    echo % committed changeset $count

    19

    count=`expr $count + 1`

    20

done

    21

    22

echo % log

    23

hg log

    24

    25

echo % hg up -C

    26

hg up -C

    27

    28

echo % bisect test

    29

hg bisect init

    30

hg bisect bad

    31

hg bisect good 1

    32

hg bisect good

    33

hg bisect good

    34

hg bisect good

    35

hg bisect bad

    36

hg bisect good