.glyphicon-download-alt:before {

  content: "\e025";

}

.glyphicon-download:before {

  content: "\e026";

}

.glyphicon-upload:before {

  content: "\e027";

}

.glyphicon-inbox:before {

  content: "\e028";

}

.glyphicon-play-circle:before {

  content: "\e029";

}

.glyphicon-repeat:before {

  content: "\e030";

}

  content: "\e031";

}

.glyphicon-list-alt:before {

  content: "\e032";

}

.glyphicon-flag:before {

  content: "\e034";

}

.glyphicon-headphones:before {

  content: "\e035";

}

.glyphicon-volume-off:before {

  content: "\e036";

}

.glyphicon-volume-down:before {

  content: "\e037";

}

.glyphicon-volume-up:before {

/**

 * Stylesheets for the context bar

 */

i.icon-arrow-right { background-image: url('../images/icons/arrow_right.png');}

i.icon-bar-chart { background-image: url("../images/icons/chart_bar.png"); }

i.icon-code-merge { background-image: url("../images/icons/arrow_merge.png"); } /* unused! */

i.icon-ellipsis-horizontal:after { content: ' ...';}

i.icon-eye-open { background-image: url("../images/icons/eye.png"); }

i.icon-file-txt { background-image: url("../images/icons/note_error.png"); }

i.icon-git { background-image: url('../images/icons/giticon.png');}

i.icon-hg { background-image: url('../images/icons/hgicon.png');}

i.icon-disabled { background-image: url('../images/icons/shading.png');} /* todo: use instead of minus sign */

i[class^='icon-'] {

    background-repeat: no-repeat;

    background-position: center;

    display: inline-block;

    min-width: 16px;

    min-height: 16px;

    margin: -2px 0 -4px 0;

    /* background-color: red; /* for debugging */

}

/* css classes for diff file status ... it'd be nice if css had a way to

   inherit from another class but alas, we must make sure this content is the

   same from the icon font file */

.icon-diff-M:before {

    font-family: 'kallithea';

    content: '\e805';

    color: #d0b44c;

}

.icon-diff-D:before {

}

.locking_unlocked {

    background: #FFF url("../images/icons/accept.png") no-repeat scroll 3px;

    height: 16px;

    width: 20px;

    cursor: pointer;

    display: block;

    float: right;

    margin-top: 2px;

}

.currently_following {

    padding-left: 10px;

    padding-bottom: 5px;

}

.accept_icon {

    background: url("../images/icons/accept.png") no-repeat scroll 3px;

    padding-left: 20px;

    padding-top: 0px;

    text-align: left;

}

.pull_icon {

    background: url("../images/icons/connect.png") no-repeat scroll 3px;

    padding-left: 20px;

    padding-top: 0px;

    text-align: left;

}

.archive_icon {

    background: url("../images/icons/compress.png") no-repeat scroll 3px;

    padding-left: 20px;

    text-align: left;

    padding-top: 1px;

}

.start_following_icon {

    background: url("../images/icons/heart_add.png") no-repeat scroll 3px;

    padding-left: 20px;

    text-align: left;

    padding-top: 0px;

}

.action_button {

    border: 0;

    display: inline;

    %endif

</%def>

<%def name="breadcrumbs_links()">

  ${_('Compare Revisions')}

</%def>

<%def name="page_nav()">

    ${self.menu('repositories')}

</%def>

<%def name="main()">

${self.repo_context_bar('changelog')}

<div class="box">

    <!-- box / title -->

    <div class="title">

        ${self.breadcrumbs()}

    </div>

    <div class="table">

        <div id="body" class="diffblock">

            <div class="code-header">

                <div>

                    ${h.hidden('compare_org')} <i class="icon-arrow-right"></i> ${h.hidden('compare_other')}

                    %if not c.compare_home:

                    %endif

                    <div id="compare_revs" class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare Revisions')}</div>

                </div>

            </div>

        </div>

    %if c.compare_home:

        <div id="changeset_compare_view_content">

         <div style="color:#999;font-size: 18px">${_('Compare revisions, branches, bookmarks, or tags.')}</div>

        </div>

    %else:

        <div id="changeset_compare_view_content">

                ##CS

                <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>

                <%include file="compare_cs.html" />

                ## FILES

                <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

                % if c.limited_diff:

                    ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}

                % else:

                    ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:

                %endif

    <form id="filter_form">

    <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('quick filter...')}"/>

    <span class="tooltip" title="${h.tooltip(h.journal_filter_help())}">?</span>

    <input type='submit' value="${_('Filter')}" class="btn btn-small" style="padding:0px 2px 0px 2px;margin:0px"/>

    ${_('Journal')} - ${ungettext('%s Entry', '%s Entries', c.journal_pager.item_count) % (c.journal_pager.item_count)}

    </form>

    ${h.end_form()}

    </h5>

</%def>

<%def name="page_nav()">

    ${self.menu('journal')}

</%def>

<%def name="head_extra()">

<link href="${h.url('journal_atom', api_key=c.authuser.api_key)}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" />

<link href="${h.url('journal_rss', api_key=c.authuser.api_key)}" rel="alternate" title="${_('RSS journal feed')}" type="application/rss+xml" />

</%def>

<%def name="main()">

    <div class="box box-left">

        <!-- box / title -->

        <div class="title">

         ${self.breadcrumbs()}

         <ul class="links icon-only-links">

           <li>

           </li>

           <li>

             <span><a href="${h.url('journal_atom', api_key=c.authuser.api_key)}"><i class="icon-rss-squared"></i></a></span>

           </li>

         </ul>

        </div>

        <div id="journal">${c.journal_data}</div>

    </div>

    <div class="box box-right">

        <!-- box / title -->

        <div class="title">

            <h5>

            <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value="" style="display: none"/>

            <input class="q_filter_box" id="q_filter_watched" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value="" style="display: none"/>

            </h5>

            <ul class="links nav nav-tabs">

                <li class="active" id="show_watched_li">

                    <a id="show_watched" href="#watched"><i class="icon-eye-open"></i> ${_('Watched')}</a>

                </li>

                <li id="show_my_li">

                    <a id="show_my" href="#my"><i class="icon-database"></i> ${_('My Repos')}</a>

               </li>

            </ul>

        rev2 = 'default'

        response = self.app.get(url('compare_url',

                                    repo_name=repo1.repo_name,

                                    org_ref_type="branch",

                                    org_ref_name=rev2,

                                    other_repo=repo2.repo_name,

                                    other_ref_type="branch",

                                    other_ref_name=rev1,

                                    merge='1',))

        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

        response.mustcontain("""Showing 2 commits""")

        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

        response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))

        response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))

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

        response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

        ## files

        response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")

        #swap

    def test_compare_forks_on_branch_extra_commits_git(self):

        self.log_user()

        repo1 = fixture.create_repo('one-git', repo_type='git',

                                    repo_description='diff-test',

                                    cur_user=TEST_USER_ADMIN_LOGIN)

        self.r1_id = repo1.repo_id

        #commit something !

        cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',

                             message='commit1', vcs_type='git', parent=None, newfile=True)

        #fork this repo

        repo2 = fixture.create_fork('one-git', 'one-git-fork')

        self.r2_id = repo2.repo_id

        #add two extra commit into fork

        cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n',

                             message='commit2', vcs_type='git', parent=cs0)

        cs2 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\nline3\n',

                             message='commit3', vcs_type='git', parent=cs1)

        rev1 = 'master'

        rev2 = 'master'

        response = self.app.get(url('compare_url',

                                    repo_name=repo1.repo_name,

                                    org_ref_type="branch",

                                    org_ref_name=rev2,

                                    other_repo=repo2.repo_name,

                                    other_ref_type="branch",

                                    other_ref_name=rev1,

                                    merge='1',))

        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

        response.mustcontain("""Showing 2 commits""")

        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

        response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))

        response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))

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

        response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

        ## files

        response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")

        #swap

    def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self):

        self.log_user()

        repo1 = fixture.create_repo('one', repo_type='hg',

                                    repo_description='diff-test',

                                    cur_user=TEST_USER_ADMIN_LOGIN)

        self.r1_id = repo1.repo_id

        #commit something !

        cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',

                             message='commit1', vcs_type='hg', parent=None, newfile=True)

        #fork this repo

        repo2 = fixture.create_fork('one', 'one-fork')

        self.r2_id = repo2.repo_id

        #now commit something to origin repo

        cs1_prim = _commit_change(repo1.repo_name, filename='file2', content='line1file2\n',

                                  message='commit2', vcs_type='hg', parent=cs0, newfile=True)

        #add two extra commit into fork

        cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n',

        rev2 = 'default'

        response = self.app.get(url('compare_url',

                                    repo_name=repo1.repo_name,

                                    org_ref_type="branch",

                                    org_ref_name=rev2,

                                    other_repo=repo2.repo_name,

                                    other_ref_type="branch",

                                    other_ref_name=rev1,

                                    merge='1',))

        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

        response.mustcontain("""Showing 2 commits""")

        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

        response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))

        response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))

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

        response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

        ## files

        response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")

        #swap

    def test_compare_forks_on_branch_extra_commits_origin_has_incomming_git(self):

        self.log_user()

        repo1 = fixture.create_repo('one-git', repo_type='git',

                                    repo_description='diff-test',

                                    cur_user=TEST_USER_ADMIN_LOGIN)

        self.r1_id = repo1.repo_id

        #commit something !

        cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',

                             message='commit1', vcs_type='git', parent=None, newfile=True)

        #fork this repo

        repo2 = fixture.create_fork('one-git', 'one-git-fork')

        self.r2_id = repo2.repo_id

        #now commit something to origin repo

        cs1_prim = _commit_change(repo1.repo_name, filename='file2', content='line1file2\n',

                                  message='commit2', vcs_type='git', parent=cs0, newfile=True)

        #add two extra commit into fork

        cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n',

        rev2 = 'master'

        response = self.app.get(url('compare_url',

                                    repo_name=repo1.repo_name,

                                    org_ref_type="branch",

                                    org_ref_name=rev2,

                                    other_repo=repo2.repo_name,

                                    other_ref_type="branch",

                                    other_ref_name=rev1,

                                    merge='1',))

        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

        response.mustcontain("""Showing 2 commits""")

        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

        response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))

        response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))

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

        response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

        ## files

        response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")

        #swap

    def test_compare_cherry_pick_changesets_from_bottom(self):

#        repo1:

#            cs0:

#            cs1:

#        repo1-fork- in which we will cherry pick bottom changesets

#            cs0:

#            cs1:

#            cs2: x

#            cs3: x

#            cs4: x

#            cs5:

        #make repo1, and cs1+cs2

        self.log_user()

        repo1 = fixture.create_repo('repo1', repo_type='hg',

                                    repo_description='diff-test',

                                    cur_user=TEST_USER_ADMIN_LOGIN)

        self.r1_id = repo1.repo_id

        #commit something !

        cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',

                             message='commit1', vcs_type='hg', parent=None,