tests: don't use mkcommit shell function in test-divergent.t Upcoming series will start merging commit descriptions while resolving content-divergence. This tests are here to test the basics of content-divegrence resolution and we should not be testing much of commit description merge here. Replacing mkcommit function with normal hg calls will help us decide on the commit messages ourselves and prevent conflicts while merging commit messages.

     1

import hghave

     2

     3

@hghave.check("docgraph-ext", "Extension to generate graph from repository")

     4

def docgraph():

     5

    try:

     6

        import hgext.docgraph

     7

        hgext.docgraph.cmdtable # trigger import

     8

    except ImportError:

     9

        try:

    10

            import hgext3rd.docgraph

    11

            hgext3rd.docgraph.cmdtable # trigger import

    12

        except ImportError:

    13

            return False

    14

    return True