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

cat > abortcommit.py <<EOF

     4

from mercurial import util

     5

     6

def hook(**args):

     7

    raise util.Abort("no commits allowed")

     8

     9

def reposetup(ui, repo):

    10

    repo.ui.setconfig("hooks", "pretxncommit.nocommits", hook)

    11

EOF

    12

abspath=`pwd`/abortcommit.py

    13

    14

echo "[extensions]" >> $HGRCPATH

    15

echo "mq=" >> $HGRCPATH

    16

echo "abortcommit = $abspath" >> $HGRCPATH

    17

    18

hg init foo

    19

cd foo

    20

echo foo > foo

    21

hg add foo

    22

    23

# mq may keep a reference to the repository so __del__ will not be called

    24

# and .hg/journal.dirstate will not be deleted:

    25

hg ci -m foo

    26

hg ci -m foo

    27

    28

exit 0