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

hg init a

     4

cd a

     5

echo a > a

     6

hg ci -A -d'1 0' -m a

     7

     8

cd ..

     9

    10

hg init b

    11

cd b

    12

echo b > b

    13

hg ci -A -d'1 0' -m b

    14

    15

cd ..

    16

    17

hg clone a c

    18

cd c

    19

hg pull -f ../b

    20

HGMERGE=merge hg merge

    21

    22

cd ..

    23

    24

echo %% -R/--repository

    25

hg -R a tip

    26

hg --repository b tip

    27

    28

echo %% abbrev of long option

    29

hg --repo c tip

    30

    31

echo %% --cwd

    32

hg --cwd a parents

    33

    34

echo %% -y/--noninteractive - just be sure it is parsed

    35

hg --cwd a tip -q --noninteractive

    36

hg --cwd a tip -q -y

    37

    38

echo %% -q/--quiet

    39

hg -R a -q tip

    40

hg -R b -q tip

    41

hg -R c --quiet parents

    42

    43

echo %% -v/--verbose

    44

hg --cwd c head -v

    45

hg --cwd b tip --verbose

    46

    47

echo %% --config

    48

hg --cwd c --config paths.quuxfoo=bar paths | grep quuxfoo > /dev/null && echo quuxfoo

    49

hg --cwd c --config '' tip -q

    50

hg --cwd c --config a.b tip -q

    51

hg --cwd c --config a tip -q

    52

hg --cwd c --config a.= tip -q

    53

hg --cwd c --config .b= tip -q

    54

    55

echo %% --debug

    56

hg --cwd c log --debug

    57

    58

echo %% --traceback

    59

hg --cwd c --config x --traceback tip 2>&1 | grep -i 'traceback'

    60

    61

echo %% --time

    62

hg --cwd a --time tip 2>&1 | grep '^Time:' | sed 's/[0-9][0-9]*/x/g'

    63

    64

echo %% --version

    65

hg --version -q | sed 's/version [^)]*/version xxx/'

    66

    67

echo %% -h/--help

    68

hg -h

    69

hg --help

    70

    71

echo %% not tested: --debugger

    72