view tests/test-dispatch.py @ 5149:ad6b97132b81

merge: fix a copy detection bug (issue672) When merging rev1 and rev2, we want to search for copies that happened in rev1 but not in rev2 and vice-versa. We were starting the search at rev1/rev2 and then going back, stopping as soon as we reached the revno of the ancestor, but that can miss some cases (see the new test-issue672). Now we calculate the revisions that are ancestors of rev1 or rev2 (but not both) and make sure the search doesn't stop too early. Simplified test provided by mpm, based on a test case provided by Edward Lee.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 12 Aug 2007 12:15:10 -0300
parents f3f033def181
children 18a9fbb5cd78
line wrap: on
line source

import os
from mercurial import commands

def dispatch(cmd):
    """Simple wrapper around commands.dispatch()

    Prints command and result value, but does not handle quoting.
    """
    print "running: %s" % (cmd,)
    result = commands.dispatch(cmd.split())
    print "result: %r" % (result,)


dispatch("init test1")
os.chdir('test1')

# create file 'foo', add and commit
f = file('foo', 'wb')
f.write('foo\n')
f.close()
dispatch("add foo")
dispatch("commit -m commit1 -d 2000-01-01 foo")

# append to file 'foo' and commit
f = file('foo', 'ab')
f.write('bar\n')
f.close()
dispatch("commit -m commit2 -d 2000-01-02 foo")

# check 88803a69b24 (fancyopts modified command table)
dispatch("log -r 0")
dispatch("log -r tip")