so, se = org_repo.run_git_command(

                    'log --reverse --pretty="format: %%H" -s %s..%s'

                        % (org_rev, other_rev)

                )

                other_changesets = [org_repo.get_changeset(cs)

                              for cs in re.findall(r'[0-9a-fA-F]{40}', so)]

                so, se = org_repo.run_git_command(

                    'merge-base %s %s' % (org_rev, other_rev)

                )

                ancestor = re.findall(r'[0-9a-fA-F]{40}', so)[0]

            org_changesets = []

        else:

            raise Exception('Bad alias only git and hg is allowed')

        return other_changesets, org_changesets, ancestor

    @LoginRequired()

    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

                                   'repository.admin')

    def index(self, repo_name):

        c.compare_home = True

        org_repo = c.db_repo.repo_name

        other_repo = request.GET.get('other_repo', org_repo)

        return render('compare/compare_diff.html')

    @LoginRequired()

    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

                                   'repository.admin')

    def compare(self, repo_name, org_ref_type, org_ref_name, other_ref_type, other_ref_name):

        org_repo = c.db_repo.repo_name

        other_repo = request.GET.get('other_repo', org_repo)

        # If merge is True:

        #   Show what org would get if merged with other:

        #   List changesets that are ancestors of other but not of org.

        #   New changesets in org is thus ignored.

        #   Diff will be from common ancestor, and merges of org to other will thus be ignored.

        # If merge is False:

        #   Make a raw diff from org to other, no matter if related or not.

        #   Changesets in one and not in the other will be ignored

        merge = bool(request.GET.get('merge'))

        # fulldiff disables cut_off_limit

        c.fulldiff = request.GET.get('fulldiff')

        # partial uses compare_cs.html template directly

        partial = request.environ.get('HTTP_X_PARTIAL_XHR')

        # as_form puts hidden input field with changeset revisions

        c.as_form = partial and request.GET.get('as_form')

        # swap url for compare_diff page - never partial and never as_form

        ignore_whitespace = request.GET.get('ignorews') == '1'

        line_context = request.GET.get('context', 3)

        org_repo = Repository.get_by_repo_name(org_repo)

        other_repo = Repository.get_by_repo_name(other_repo)

        if org_repo is None:

            msg = 'Could not find org repo %s' % org_repo

            log.error(msg)

            h.flash(msg, category='error')

            return redirect(url('compare_home', repo_name=c.repo_name))

        if other_repo is None:

            msg = 'Could not find other repo %s' % other_repo

            log.error(msg)

            h.flash(msg, category='error')

            return redirect(url('compare_home', repo_name=c.repo_name))

        if org_repo.scm_instance.alias != other_repo.scm_instance.alias:

            msg = 'compare of two different kind of remote repos not available'

            log.error(msg)

            h.flash(msg, category='error')

            return redirect(url('compare_home', repo_name=c.repo_name))

        c.compare_home = False

        c.cs_repo = other_repo

        c.cs_ranges, c.cs_ranges_org, c.ancestor = self._get_changesets(

        raw_ids = [x.raw_id for x in c.cs_ranges]

        c.cs_comments = other_repo.get_comments(raw_ids)

        c.statuses = other_repo.statuses(raw_ids)

        revs = [ctx.revision for ctx in reversed(c.cs_ranges)]

        if partial:

            return render('compare/compare_cs.html')

        if merge and c.ancestor:

            # case we want a simple diff without incoming changesets,

            # previewing what will be merged.

            # Make the diff on the other repo (which is known to have other_rev)

            log.debug('Using ancestor %s as rev1 instead of %s'

            rev1 = c.ancestor

            org_repo = other_repo

        else: # comparing tips, not necessarily linearly related

            if merge:

                log.error('Unable to find ancestor revision')

            if org_repo != other_repo:

                # TODO: we could do this by using hg unionrepo

                log.error('cannot compare across repos %s and %s', org_repo, other_repo)

                h.flash(_('Cannot compare repositories without using common ancestor'), category='error')

                raise HTTPBadRequest

        diff_limit = self.cut_off_limit if not c.fulldiff else None

        log.debug('running diff between %s and %s in %s'

                                      ignore_whitespace=ignore_whitespace,

                                      context=line_context)

        diff_processor = diffs.DiffProcessor(txtdiff or '', format='gitdiff',

                                             diff_limit=diff_limit)

        _parsed = diff_processor.prepare()

        c.limited_diff = False

        if isinstance(_parsed, LimitedDiffContainer):

            c.limited_diff = True

        c.files = []

        c.changes = {}

        c.lines_added = 0

        c.lines_deleted = 0

        for f in _parsed:

            st = f['stats']

            if not st['binary']:

                c.lines_added += st['added']

                c.lines_deleted += st['deleted']

            fid = h.FID('', f['filename'])

            c.files.append([fid, f['operation'], f['filename'], f['stats']])

            htmldiff = diff_processor.as_html(enable_comments=False, parsed_lines=[f])

            c.changes[fid] = [f['operation'], f['filename'], htmldiff]

                                                 )

        return render('/pullrequests/pullrequest_show_my_data.html')

    @LoginRequired()

    @NotAnonymous()

    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

                                   'repository.admin')

    def index(self):

        org_repo = c.db_repo

        org_scm_instance = org_repo.scm_instance

        try:

            org_scm_instance.get_changeset()

        except EmptyRepositoryError, e:

            h.flash(h.literal(_('There are no changesets yet')),

                    category='warning')

            redirect(url('summary_home', repo_name=org_repo.repo_name))

        org_rev = request.GET.get('rev_end')

        # rev_start is not directly useful - its parent could however be used

        # as default for other and thus give a simple compare view

        #other_rev = request.POST.get('rev_start')

        branch = request.GET.get('branch')

        # add org repo to other so we can open pull request against peer branches on itself

        # add parent of this fork also and select it

        if org_repo.parent:

        else:

        # gather forks and add to this list ... even though it is rare to

        # request forks to pull from their parent

        for fork in org_repo.forks:

        return render('/pullrequests/pullrequest.html')

    @LoginRequired()

    @NotAnonymous()

    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

                                   'repository.admin')

    @jsonify

    def repo_info(self, repo_name):

        repo = RepoModel()._get_repo(repo_name)

        refs, selected_ref = self._get_repo_refs(repo.scm_instance)

        return {

            'description': repo.description.split('\n', 1)[0],

            'selected_ref': selected_ref,

            'refs': refs,

            'user': dict(user_id=repo.user.user_id,

                         username=repo.user.username,

                         firstname=repo.user.firstname,

                         lastname=repo.user.lastname,

                         gravatar_link=h.gravatar_url(repo.user.email, 14)),

            }

    @LoginRequired()

    @NotAnonymous()

            Session().commit()

            h.flash(_('Successfully deleted pull request'),

                    category='success')

            return redirect(url('my_account_pullrequests'))

        raise HTTPForbidden()

    @LoginRequired()

    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

                                   'repository.admin')

    def show(self, repo_name, pull_request_id, extra=None):

        repo_model = RepoModel()

        c.users_array = repo_model.get_users_js()

        c.user_groups_array = repo_model.get_user_groups_js()

        c.pull_request = PullRequest.get_or_404(pull_request_id)

        c.allowed_to_change_status = self._get_is_allowed_change_status(c.pull_request)

        cc_model = ChangesetCommentsModel()

        cs_model = ChangesetStatusModel()

        # pull_requests repo_name we opened it against

        # ie. other_repo must match

        if repo_name != c.pull_request.other_repo.repo_name:

            raise HTTPNotFound

        # load compare data into template context

        c.cs_ranges = [org_scm_instance.get_changeset(x) for x in c.pull_request.revisions]

        c.cs_ranges_org = None # not stored and not important and moving target - could be calculated ...

        revs = [ctx.revision for ctx in reversed(c.cs_ranges)]

        c.jsdata = json.dumps(graph_data(org_scm_instance, revs))

        c.available = []

            # candidates: descendants of old head that are on the right branch

            #             and not are the old head itself ...

            #             and nothing at all if old head is a descendent of target ref name

            if other_scm_instance._repo.revs('present(%s)::&%s', c.cs_ranges[-1].raw_id, other_branch_name):

                c.update_msg = _('This pull request has already been merged to %s.') % other_branch_name

            else: # look for children of PR head on source branch in org repo

                arevs = org_scm_instance._repo.revs('%s:: & branch(%s) - %s',

                if arevs:

                    if c.pull_request.is_closed():

                    else:

                    c.available = [org_scm_instance.get_changeset(x) for x in arevs]

                else:

                    c.update_msg = _('No changesets found for updating this pull request.')

            if revs:

                    h.short_id(org_scm_instance.get_changeset((max(revs))).raw_id))

            else:

        raw_ids = [x.raw_id for x in c.cs_ranges]

        ignore_whitespace = request.GET.get('ignorews') == '1'

        line_context = request.GET.get('context', 3)

        c.ignorews_url = _ignorews_url

        c.context_url = _context_url

        c.fulldiff = request.GET.get('fulldiff')

        diff_limit = self.cut_off_limit if not c.fulldiff else None

        # we swap org/other ref since we run a simple diff on one repo

        log.debug('running diff between %s and %s in %s'

                                      ignore_whitespace=ignore_whitespace,

                                      context=line_context)

        diff_processor = diffs.DiffProcessor(txtdiff or '', format='gitdiff',

                                             diff_limit=diff_limit)

        _parsed = diff_processor.prepare()

        c.limited_diff = False

        if isinstance(_parsed, LimitedDiffContainer):

            c.limited_diff = True

        c.files = []

        c.changes = {}

        c.lines_added = 0

        c.lines_deleted = 0

        for f in _parsed:

            st = f['stats']

            c.lines_added += st['added']

            c.lines_deleted += st['deleted']

            fid = h.FID('', f['filename'])

            c.files.append([fid, f['operation'], f['filename'], f['stats']])

            htmldiff = diff_processor.as_html(enable_comments=True,

                                              parsed_lines=[f])

                %if change in 'AM':

                  <img id="${FID}_image-diff-img-b" class="img-diff img-diff-swapable" style="display:none"

                      realsrc="${h.url('files_raw_home',repo_name=c.repo_name,revision=cs2,f_path=path)}" />

                %endif

              </div>

            %endif

        </div>

    </div>

%endfor

</div>

</%def>

<%def name="diff_block_simple(change)">

  %for op,filenode_path,diff in change:

    <div id="${h.FID('',filenode_path)}_target" style="clear:both;margin-top:25px"></div>

    <div id="${h.FID('',filenode_path)}" class="diffblock  margined comm">

      <div class="code-header">

          <div class="changeset_header">

              <div class="changeset_file">

                  ${h.safe_unicode(filenode_path)} |

                  ## TODO: link to ancestor and head of other instead of exactly other

                  %if op == 'A':

                    ${_('Added')}

                  %elif op == 'M':

                    <i class="icon-arrow-right"></i>

                  %elif op == 'D':

                    ${_('Deleted')}

                  %else:

                    ${op}???

                  %endif

              </div>

              <div class="diff-actions">

                  <img class="icon" src="${h.url('/images/icons/application_double.png')}"/>

                </a>

                ${c.ignorews_url(request.GET)}

                ${c.context_url(request.GET)}

              </div>

          </div>

      </div>

        <div class="code-body">

            <div class="full_f_path" path="${h.safe_unicode(filenode_path)}"></div>

            ${diff|n}

            %if filenode_path.rsplit('.')[-1] in ['png', 'gif', 'jpg', 'bmp']:

              <div class="btn btn-image-diff-show">Show images</div>

              %if op == 'M':

                <div id="${h.FID('',filenode_path)}_image-diff" class="btn btn-image-diff-swap" style="display:none">Press to swap images</div>

              %endif

              <div style="font-size: 0">

                %if op == 'M':

                  <img id="${h.FID('',filenode_path)}_image-diff-img-a" class="img-diff img-diff-swapable" style="display:none"

                %endif

                %if op in 'AM':

                  <img id="${h.FID('',filenode_path)}_image-diff-img-b" class="img-diff img-diff-swapable" style="display:none"

                %endif

              </div>

            %endif

        </div>

    </div>

  %endfor

</%def>

<%def name="diff_block_js()">

<script type="text/javascript">

$(document).ready(function(){

    $('.btn-image-diff-show').click(function(e){

        $('.btn-image-diff-show').hide();

        $('.btn-image-diff-swap').show();

        $('.img-diff-swapable')

            .each(function(i,e){

                    $(e).attr('src', $(e).attr('realsrc'));

                })

            .show();

        });

    $('.btn-image-diff-swap').mousedown(function(e){

        $('#'+e.currentTarget.id+'-img-a.img-diff-swapable')

          .before($('#'+e.currentTarget.id+'-img-b.img-diff-swapable'));

              </div>

          %endif

        </td>

        <td style="width: 140px"><span class="tooltip" title="${h.tooltip(h.age(cs.date))}">${cs.date}</span></td>

        <td><div class="gravatar" commit_id="${cs.raw_id}"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}" height="14" width="14"/></div></td>

        <td><div class="author">${h.person(cs.author)}</div></td>

        <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>

        <td>

        %if cs.branch:

        <span class="branchtag">${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.cs_repo.repo_name,branch=cs.branch))}</span>

        %endif

        </td>

        <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">

            <i class="icon-resize-vertical" style="color:#DDD"></i>

        </td>

        <td><div id="C-${cs.raw_id}" class="message">${h.urlify_commit(cs.message, c.repo_name)}</div></td>

        </tr>

    %endfor

    </table>

    </div>

    %if c.as_form:

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

      ${h.link_to(_('Show merge diff'),

        h.url('compare_url',

          merge='1'),

        )}

      </div>

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

        ${_('Common ancestor')}:

        %if c.ancestor:

        ${h.link_to(h.short_id(c.ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=c.ancestor))}

        %else:

        ${_('No common ancestor found - repositories are unrelated')}

        %endif

      </div>

    %endif

    %if c.cs_ranges_org is not None:

      ## TODO: list actual changesets?

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

        ${_('is')}

        <a href="${c.swap_url}">${_('%s changesets') % (len(c.cs_ranges_org))}</a>

        ${_('behind')}

      </div>

    %endif

  %endif

</div>

%if c.as_form:

<div id="jsdata" style="display:none">${c.jsdata|n}</div>

%else:

<script type="text/javascript" src="${h.url('/js/graph.js')}"></script>

%endif

<script type="text/javascript">

    $(document).ready(function(){

%if not c.as_form:

        var jsdata = ${c.jsdata|n};

        var r = new BranchRenderer('graph_canvas', 'graph_content_pr');

        r.render(jsdata,100);

%endif

        $('.expand_commit').click(function(e){

            var cid = $(this).attr('commit_id');

            $('#C-'+cid).toggleClass('expanded');

            r.render(jsdata,100);

## -*- coding: utf-8 -*-

<%inherit file="/base/base.html"/>

<%def name="title()">

    %if c.compare_home:

        ${_('%s Compare') % c.repo_name}

    %else:

    %endif

    %if c.site_name:

        · ${c.site_name}

    %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>

                % if c.limited_diff:

                  <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h5>

                % endif

         </div>

        ## diff block

        <%namespace name="diff_block" file="/changeset/diff_block.html"/>

        ${diff_block.diff_block_js()}

        %for fid, change, f, stat in c.files:

          ${diff_block.diff_block_simple([c.changes[fid]])}

        %endfor

        % if c.limited_diff:

          <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h4>

        % endif

    %endif

    </div>

</div>

    <script type="text/javascript">

   $(document).ready(function(){

    var cache = {}

    $("#compare_org").select2({

        formatSelection: function(obj){

        },

        dropdownAutoWidth: true,

        query: function(query){

          var key = 'cache';

          var cached = cache[key] ;

          if(cached) {

            var data = {results: []};

            //filter results

            $.each(cached.results, function(){

                var section = this.text;

                var children = [];

                $.each(this.children, function(){

                    if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){

                        children.push({'id': this.id, 'text': this.text})

                    }

                })

                data.results.push({'text': section, 'children': children})

            });

            //push the typed in changeset

            data.results.push({'text':_TM['Specify changeset'],

                               'children': [{'id': query.term, 'text': query.term, 'type': 'rev'}]})

            query.callback(data);

          }else{

              $.ajax({

                data: {},

                dataType: 'json',

                type: 'GET',

                success: function(data) {

                  cache[key] = data;

                  query.callback(data);

                }

              })

          }

        },

    });

    $("#compare_other").select2({

        dropdownAutoWidth: true,

        formatSelection: function(obj){

        },

        query: function(query){

          var key = 'cache2';

          var cached = cache[key] ;

          if(cached) {

            var data = {results: []};

            //filter results

            $.each(cached.results, function(){

                var section = this.text;

                var children = [];

                $.each(this.children, function(){

                    if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){

                        children.push({'id': this.id, 'text': this.text})

                    }

                })

                data.results.push({'text': section, 'children': children})

            });

            //push the typed in changeset

            data.results.push({'text':_TM['Specify changeset'],

                               'children': [{'id': query.term, 'text': query.term, 'type': 'rev'}]})

            query.callback(data);

          }else{

              $.ajax({

                data: {},

                dataType: 'json',

                type: 'GET',

                success: function(data) {

                  cache[key] = data;

                  query.callback({results: data.results});

                }

              })

          }

        },

    });

    var values_changed = function() {

        var values = $('#compare_org').select2('data') && $('#compare_other').select2('data');

        if (values) {

             $('#compare_revs').removeClass("disabled");

             // TODO: the swap button ... if any

        } else {

             $('#compare_revs').addClass("disabled");

             // TODO: the swap button ... if any

        }

    }

    values_changed();

    $('#compare_org').change(values_changed);

    $('#compare_other').change(values_changed);

    $('#compare_revs').on('click', function(e){

        var org = $('#compare_org').select2('data');

        var other = $('#compare_other').select2('data');

        if (!org || !other) {

            return;

        }

        var u = compare_url.replace('__other_ref_type__',org.type)

                           .replace('__org__',org.text)

                           .replace('__org_ref_type__',other.type)

                           .replace('__other__',other.text);

        window.location = u;

    });

   });

    </script>

</%def>

                </div>

             </div>

            <div class="field">

                <div class="label label-textarea">

                    <label for="pullrequest_desc">${_('Description')}:</label>

                </div>

                <div class="textarea text-area editor">

                    ${h.textarea('pullrequest_desc',size=30,placeholder=_('Write a short description on this pull request'))}

                </div>

            </div>

            <div class="field">

                <div class="label label-textarea">

                    <label for="pullrequest_desc">${_('Changeset flow')}:</label>

                </div>

                <div class="input">

                    ##ORG

                    <div>

                        <div>

                            <div style="padding:5px 3px 3px 3px;">

                            <b>${_('Origin repository')}:</b> <span id="org_repo_desc">${c.db_repo.description.split('\n')[0]}</span>

                            </div>

                            <div>

                            </div>

                            <div style="padding:5px 3px 3px 3px;">

                            <b>${_('Revision')}:</b> <span id="org_rev_span">-</span>

                            </div>

                        </div>

                    </div>

                    ##OTHER, most Probably the PARENT OF THIS FORK

                    <div style="border-top: 1px solid #EEE; margin: 5px 0px 0px 0px">

                        <div>

                            ## filled with JS

                            <div style="padding:5px 3px 3px 3px;">

                            </div>

                            <div>

                            </div>

                            <div style="padding:5px 3px 3px 3px;">

                            <b>${_('Revision')}:</b> <span id="other_rev_span">-</span>

                            </div>

                        </div>

                    </div>

                    <div style="clear:both"></div>

                </div>

            </div>

            <div class="field">

                <div class="buttons">

                    ${h.submit('save',_('Create Pull Request'),class_="btn")}

                    ${h.reset('reset',_('Reset'),class_="btn")}

               </div>

            </div>

        </div>

        ## Reviewers

        <div style="float:left; border-left:1px dashed #eee">

            <div class="pr-details-title">${_('Pull request reviewers')}</div>

            <div id="reviewers" style="padding:0px 0px 0px 15px">

              ## members goes here !

              <div>

                <ul id="review_members" class="group_members">

                  <li id="reviewer_${member.user_id}">

                    <div class="reviewers_member">

                      <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email, 14)}"/> </div>

                      <div style="float:left">${member.firstname} ${member.lastname} (${_('owner')})</div>

                      <input type="hidden" value="${member.user_id}" name="review_members" />

                      <span class="action_button" style="padding: 3px" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}>

                          <i class="icon-remove-sign" style="color: #FF4444;"></i>

                      </span>

                    </div>

                  </li>

                %endfor

                </ul>

              </div>

              <div class='ac'>

                <div class="reviewer_ac">

                   ${h.text('user', class_='yui-ac-input',placeholder=_('Type name of reviewer to add'))}

                   <div id="reviewers_container"></div>

                </div>

              </div>

            </div>

        </div>

        <div style="clear:both;padding: 0 0 30px 0;"></div>

<%inherit file="/base/base.html"/>

<%def name="title()">

    ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)}

    %if c.site_name:

        · ${c.site_name}