repo_name=HG_REPO,

                                    org_ref_type="rev",

                                    org_ref=rev1,

                                    other_ref_type="rev",

                                    other_ref=rev2,

                                    repo=HG_FORK

                                    ))

        try:

            response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, rev1, HG_FORK, rev2))

            ## outgoing changesets between those revisions

            response.mustcontain("""<a href="/%s/changeset/7d4bc8ec6be56c0f10425afb40b6fc315a4c25e7">r6:%s</a>""" % (HG_REPO, rev1))

            response.mustcontain("""<a href="/%s/changeset/6fff84722075f1607a30f436523403845f84cd9e">r5:6fff84722075</a>""" % (HG_REPO))

            response.mustcontain("""<a href="/%s/changeset/2dda4e345facb0ccff1a191052dd1606dba6781d">r4:2dda4e345fac</a>""" % (HG_REPO))

            ## files

            response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s#C--9c390eb52cd6">vcs/backends/hg.py</a>""" % (HG_REPO, rev1, rev2))

            response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s#C--41b41c1f2796">vcs/backends/__init__.py</a>""" % (HG_REPO, rev1, rev2))

            response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s#C--2f574d260608">vcs/backends/base.py</a>""" % (HG_REPO, rev1, rev2))

        finally:

            RepoModel().delete(HG_FORK)

    def test_compare_extra_commits(self):

        self.log_user()

        repo1 = RepoModel().create_repo(repo_name='one', repo_type='hg',

                                        description='diff-test',

                                        owner=TEST_USER_ADMIN_LOGIN)

        repo2 = RepoModel().create_repo(repo_name='one-fork', repo_type='hg',

                                        description='diff-test',

                                        owner=TEST_USER_ADMIN_LOGIN)

        Session().commit()

        r1_id = repo1.repo_id

        r1_name = repo1.repo_name

        r2_id = repo2.repo_id

        r2_name = repo2.repo_name

        #commit something !

        cs0 = ScmModel().create_node(

            repo=repo1.scm_instance, repo_name=r1_name,

            cs=EmptyChangeset(alias='hg'), user=TEST_USER_ADMIN_LOGIN,

            author=TEST_USER_ADMIN_LOGIN,

            message='commit1',

            content='line1',

            f_path='file1'

        )

        cs0_prim = ScmModel().create_node(

            repo=repo2.scm_instance, repo_name=r2_name,

            cs=EmptyChangeset(alias='hg'), user=TEST_USER_ADMIN_LOGIN,

            author=TEST_USER_ADMIN_LOGIN,

            message='commit1',

            content='line1',

            f_path='file1'

        )

        cs1 = ScmModel().commit_change(

            repo=repo2.scm_instance, repo_name=r2_name,

            cs=cs0_prim, user=TEST_USER_ADMIN_LOGIN, author=TEST_USER_ADMIN_LOGIN,

            message='commit2',

            content='line1\nline2',

            f_path='file1'

        )

        rev1 = 'default'

        rev2 = 'default'

        response = self.app.get(url(controller='compare', action='index',

                                    repo_name=r2_name,

                                    org_ref_type="branch",

                                    org_ref=rev1,

                                    other_ref_type="branch",

                                    other_ref=rev2,

                                    repo=r1_name

                                    ))

        try:

            response.mustcontain('%s@%s -> %s@%s' % (r2_name, rev1, r1_name, rev2))

            response.mustcontain("""<div class="message">commit2</div>""")

            response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (r2_name, cs1.raw_id, cs1.short_id))

            ## files

            response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s#C--826e8142e6ba">file1</a>""" % (r2_name, rev1, rev2))

        finally:

            RepoModel().delete(r1_id)

            RepoModel().delete(r2_id)

    def test_org_repo_new_commits_after_forking(self):

        self.log_user()

        repo1 = RepoModel().create_repo(repo_name='one', repo_type='hg',

                                        description='diff-test',

                                        owner=TEST_USER_ADMIN_LOGIN)

        Session().commit()

        r1_id = repo1.repo_id

        r1_name = repo1.repo_name

        #commit something initially !

        cs0 = ScmModel().create_node(

            repo=repo1.scm_instance, repo_name=r1_name,

            cs=EmptyChangeset(alias='hg'), user=TEST_USER_ADMIN_LOGIN,

            author=TEST_USER_ADMIN_LOGIN,

            message='commit1',

            content='line1',

            f_path='file1'

        )

        Session().commit()

        self.assertEqual(repo1.scm_instance.revisions, [cs0.raw_id])

        #fork the repo1

        repo2 = RepoModel().create_repo(repo_name='one-fork', repo_type='hg',

                                description='compare-test',

                                clone_uri=repo1.repo_full_path,

                                owner=TEST_USER_ADMIN_LOGIN, fork_of='one')

        Session().commit()

        self.assertEqual(repo2.scm_instance.revisions, [cs0.raw_id])

        r2_id = repo2.repo_id

        r2_name = repo2.repo_name

        #make 3 new commits in fork

        cs1 = ScmModel().create_node(

            repo=repo2.scm_instance, repo_name=r2_name,

            cs=repo2.scm_instance[-1], user=TEST_USER_ADMIN_LOGIN,

            author=TEST_USER_ADMIN_LOGIN,

            message='commit1-fork',

            content='file1-line1-from-fork',

            f_path='file1-fork'

        )

        cs2 = ScmModel().create_node(

            repo=repo2.scm_instance, repo_name=r2_name,

            cs=cs1, user=TEST_USER_ADMIN_LOGIN,

            author=TEST_USER_ADMIN_LOGIN,

            message='commit2-fork',

            content='file2-line1-from-fork',

            f_path='file2-fork'

        )

        cs3 = ScmModel().create_node(

            repo=repo2.scm_instance, repo_name=r2_name,

            cs=cs2, user=TEST_USER_ADMIN_LOGIN,

            author=TEST_USER_ADMIN_LOGIN,

            message='commit3-fork',

            content='file3-line1-from-fork',

            f_path='file3-fork'

        )

        #compare !

        rev1 = 'default'

        rev2 = 'default'

        response = self.app.get(url(controller='compare', action='index',

                                    repo_name=r2_name,

                                    org_ref_type="branch",

                                    org_ref=rev1,

                                    other_ref_type="branch",

                                    other_ref=rev2,

                                    repo=r1_name

                                    ))

        try:

            response.mustcontain('%s@%s -> %s@%s' % (r2_name, rev1, r1_name, rev2))

            response.mustcontain("""file1-line1-from-fork""")

            response.mustcontain("""file2-line1-from-fork""")

            response.mustcontain("""file3-line1-from-fork""")

            #add new commit into parent !

            cs0 = ScmModel().create_node(

                repo=repo1.scm_instance, repo_name=r1_name,

                cs=EmptyChangeset(alias='hg'), user=TEST_USER_ADMIN_LOGIN,

                author=TEST_USER_ADMIN_LOGIN,

                message='commit2',

                content='line1',

                f_path='file2'

            )

            #compare !

            rev1 = 'default'

            rev2 = 'default'

            response = self.app.get(url(controller='compare', action='index',

                                        repo_name=r2_name,

                                        org_ref_type="branch",

                                        org_ref=rev1,

                                        other_ref_type="branch",

                                        other_ref=rev2,

                                        repo=r1_name

                                        ))

            response.mustcontain('%s@%s -> %s@%s' % (r2_name, rev1, r1_name, rev2))

            response.mustcontain("""file1-line1-from-fork""")

            response.mustcontain("""file2-line1-from-fork""")

            response.mustcontain("""file3-line1-from-fork""")

        finally:

            RepoModel().delete(r1_id)