kallithea Changeset - 674a8fad3abc

Changeset - 674a8fad3abc

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 13 years ago 2013-02-10 17:13:25
marcin@python-works.com

show links to files on compare data at other and org refs

3 files changed with 7 insertions and 1 deletions:

rhodecode/controllers/compare.py

rhodecode/controllers/pullrequests.py

rhodecode/templates/changeset/diff_block.html

0 comments (0 inline, 0 general)

rhodecode/controllers/compare.py

➞

Show inline comments

@@ @@ -134,13 +134,15 @@ class CompareController(BaseRepoControll @@
         # defines that we need hidden inputs with changesets
         c.as_form = request.GET.get('as_form', False)
         if partial:
             return render('compare/compare_cs.html')
         c.org_ref = org_ref[1]
         c.org_ref_type = org_ref[0]
         c.other_ref = other_ref[1]
         c.other_ref_type = other_ref[0]
         if ancestor  and c.org_repo != c.other_repo:
             # case we want a simple diff without incoming changesets,
             # previewing what will be merged.
             # Make the diff on the forked repo, with
             # revision that is common ancestor

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -280,13 +280,15 @@ class PullrequestsController(BaseRepoCon @@
         c.statuses = org_repo.statuses([x.raw_id for x in c.cs_ranges])
         # defines that we need hidden inputs with changesets
         c.as_form = request.GET.get('as_form', False)
         c.org_ref = org_ref[1]
         c.org_ref_type = org_ref[0]
         c.other_ref = other_ref[1]
         c.other_ref_type = other_ref[0]
         diff_limit = self.cut_off_limit if not fulldiff else None
         #we swap org/other ref since we run a simple diff on one repo
         _diff = diffs.differ(org_repo, other_ref, other_repo, org_ref)

rhodecode/templates/changeset/diff_block.html

➞

Show inline comments

@@ @@ -45,13 +45,15 @@ @@
   %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">
                   <a href="#">${h.safe_unicode(filenode_path)}</a>
                   ${h.safe_unicode(filenode_path)} |
                   <a class="spantag" href="${h.url('files_home', repo_name=c.repo_name, f_path=filenode_path, revision=c.org_ref)}">${c.org_ref_type}@${c.org_ref}</a> -&gt;
                   <a class="spantag" href="${h.url('files_home', repo_name=c.repo_name, f_path=filenode_path, revision=c.other_ref)}">${c.other_ref_type}@${c.other_ref}</a>
               </div>
           </div>
       </div>
         <div class="code-body">
             <div class="full_f_path" path="${h.safe_unicode(filenode_path)}"></div>
             ${diff|n}

0 comments (0 inline, 0 general)