Changeset - 74bbfdd47884
Parent rev.
Child rev.
[Not reviewed]
beta
0 4 0
Marcin Kuzminski - 15 years ago 2010-11-03 16:09:12
marcin@python-works.com
Small fixes for style.
Added scm type for changeset.
Fixed raw changeset
4 files changed with 11 insertions and 7 deletions:
rhodecode/controllers/changeset.py
3
1
rhodecode/public/css/style.css
4
2
rhodecode/templates/changelog/changelog.html
2
2
rhodecode/templates/changeset/raw_changeset.html
2
2
0 comments (0 inline, 0 general)
rhodecode/controllers/changeset.py
➞
Show inline comments
 
@@ -90,94 +90,96 @@ class ChangesetController(BaseController
 
                        diff = wrap_to_table(_('Changeset is to big and was cut'
 
                                            ' off, see raw changeset instead'))
 

			




	
	
	
		
 
                cs1 = None

			




	
	
	
		
 
                cs2 = node.last_changeset.raw_id

			




	
	
	
		
 
                c.changes.append(('added', node, diff, cs1, cs2))

			




	
	
	
		
 

			




	
	
	
		
 
            #===================================================================

			




	
	
	
		
 
            # CHANGED FILES

			




	
	
	
		
 
            #===================================================================

			




	
	
	
		
 
            c.sum_removed = 0

			




	
	
	
		
 
            for node in c.changeset.changed:

			




	
	
	
		
 
                try:

			




	
	
	
		
 
                    filenode_old = c.changeset_old.get_node(node.path)

			




	
	
	
		
 
                except ChangesetError:

			




	
	
	
		
 
                    filenode_old = FileNode(node.path, '', EmptyChangeset())

			




	
	
	
		
 

			




	
	
	
		
 
                if filenode_old.is_binary or node.is_binary:

			




	
	
	
		
 
                    diff = wrap_to_table(_('binary file'))

			




	
	
	
		
 
                else:

			




	
	
	
		
 

			




	
	
	
		
 
                    if c.sum_removed < cut_off_limit:

			




	
	
	
		
 
                        f_udiff = differ.get_udiff(filenode_old, node)

			




	
	
	
		
 
                        diff = differ.DiffProcessor(f_udiff).as_html()

			




	
	
	
		
 
                        if diff:

			




	
	
	
		
 
                            c.sum_removed += len(diff)

			




	
	
	
		
 
                    else:

			




	
	
	
		
 
                        diff = wrap_to_table(_('Changeset is to big and was cut'

			




	
	
	
		
 
                                            ' off, see raw changeset instead'))

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
                cs1 = filenode_old.last_changeset.raw_id

			




	
	
	
		
 
                cs2 = node.last_changeset.raw_id

			




	
	
	
		
 
                c.changes.append(('changed', node, diff, cs1, cs2))

			




	
	
	
		
 

			




	
	
	
		
 
            #===================================================================

			




	
	
	
		
 
            # REMOVED FILES    

			




	
	
	
		
 
            #===================================================================

			




	
	
	
		
 
            for node in c.changeset.removed:

			




	
	
	
		
 
                c.changes.append(('removed', node, None, None, None))

			




	
	
	
		
 

			




	
	
	
		
 
        return render('changeset/changeset.html')

			




	
	
	
		
 

			




	
	
	
		
 
    def raw_changeset(self, revision):

			




	
	
	
		
 

			




	
	
	
		
 
        hg_model = HgModel()

			




	
	
	
		
 
        method = request.GET.get('diff', 'show')

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            c.changeset = hg_model.get_repo(c.repo_name).get_changeset(revision)

			




	
	
	
		
 
            r = hg_model.get_repo(c.repo_name)

			




	
	
	
		
 
            c.scm_type = r.alias

			




	
	
	
		
 
            c.changeset = r.get_changeset(revision)

			




	
	
	
		
 
        except RepositoryError:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            return redirect(url('home'))

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            try:

			




	
	
	
		
 
                c.changeset_old = c.changeset.parents[0]

			




	
	
	
		
 
            except IndexError:

			




	
	
	
		
 
                c.changeset_old = None

			




	
	
	
		
 
            c.changes = []

			




	
	
	
		
 

			




	
	
	
		
 
            for node in c.changeset.added:

			




	
	
	
		
 
                filenode_old = FileNode(node.path, '')

			




	
	
	
		
 
                if filenode_old.is_binary or node.is_binary:

			




	
	
	
		
 
                    diff = _('binary file')

			




	
	
	
		
 
                else:

			




	
	
	
		
 
                    f_udiff = differ.get_udiff(filenode_old, node)

			




	
	
	
		
 
                    diff = differ.DiffProcessor(f_udiff).raw_diff()

			




	
	
	
		
 

			




	
	
	
		
 
                cs1 = None

			




	
	
	
		
 
                cs2 = node.last_changeset.raw_id

			




	
	
	
		
 
                c.changes.append(('added', node, diff, cs1, cs2))

			




	
	
	
		
 

			




	
	
	
		
 
            for node in c.changeset.changed:

			




	
	
	
		
 
                filenode_old = c.changeset_old.get_node(node.path)

			




	
	
	
		
 
                if filenode_old.is_binary or node.is_binary:

			




	
	
	
		
 
                    diff = _('binary file')

			




	
	
	
		
 
                else:

			




	
	
	
		
 
                    f_udiff = differ.get_udiff(filenode_old, node)

			




	
	
	
		
 
                    diff = differ.DiffProcessor(f_udiff).raw_diff()

			




	
	
	
		
 

			




	
	
	
		
 
                cs1 = filenode_old.last_changeset.raw_id

			




	
	
	
		
 
                cs2 = node.last_changeset.raw_id

			




	
	
	
		
 
                c.changes.append(('changed', node, diff, cs1, cs2))

			




	
	
	
		
 

			




	
	
	
		
 
        response.content_type = 'text/plain'

			




	
	
	
		
 
        if method == 'download':

			




	
	
	
		
 
            response.content_disposition = 'attachment; filename=%s.patch' % revision

			




	
	
	
		
 
        parent = True if len(c.changeset.parents) > 0 else False

			




	
	
	
		
 
        c.parent_tmpl = 'Parent  %s' % c.changeset.parents[0].raw_id if parent else ''

			




	
	
	
		
 

			




	
	
	
		
 
        c.diffs = ''

			




	
	
	
		
 
        for x in c.changes:

			




	
	
	
		
 
            c.diffs += x[2]

			




	
	
	
		
 

			




	
	
	
		
 
        return render('changeset/raw_changeset.html')

			




        

    


    
    

    

        

                

                    rhodecode/public/css/style.css
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2267,53 +2267,55 @@ font-weight:700;

			




	
	
	
		
 

			




	
	
	
		
 
#login div.form div.fields div.field div.input,#register div.form div.fields div.field div.input {

			




	
	
	
		
 
float:left;

			




	
	
	
		
 
margin:0;

			




	
	
	
		
 
padding:0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#login div.form div.fields div.field div.checkbox,#register div.form div.fields div.field div.checkbox {

			




	
	
	
		
 
margin:0 0 0 184px;

			




	
	
	
		
 
padding:0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#login div.form div.fields div.field div.checkbox label,#register div.form div.fields div.field div.checkbox label {

			




	
	
	
		
 
color:#565656;

			




	
	
	
		
 
font-weight:700;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#login div.form div.fields div.buttons input,#register div.form div.fields div.buttons input {

			




	
	
	
		
 
color:#000;

			




	
	
	
		
 
font-size:1em;

			




	
	
	
		
 
font-weight:700;

			




	
	
	
		
 
font-family:Verdana, Helvetica, Sans-Serif;

			




	
	
	
		
 
margin:0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#changeset_content .container .wrapper,#graph_content .container .wrapper {

			




	
	
	
		
 
width:600px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#changeset_content .container .left,#graph_content .container .left {

			




	
	
	
		
 
float:left;

			




	
	
	
		
 
width:70%;

			




	
	
	
		
 
padding-left:5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#changeset_content .container .left .date,.ac .match {

			




	
	
	
		
 
font-weight:700;

			




	
	
	
		
 
padding-top: 5px;

			




	
	
	
		
 
padding-bottom:5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div#legend_container table td,div#legend_choices table td {

			




	
	
	
		
 
border:none !important;

			




	
	
	
		
 
height:20px !important;

			




	
	
	
		
 
padding:0 !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#q_filter{

			




	
	
	
		
 
border: 0px;

			




	
	
	
		
 
border:0 none;

			




	
	
	
		
 
color:#CDCDCD;

			




	
	
	
		
 
padding-left:3px

			




	
	
	
		
 
margin-bottom:-4px;

			




	
	
	
		
 
margin-top:-4px;

			




	
	
	
		
 
padding-left:3px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    rhodecode/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${h.link_to(u'Home',h.url('/'))}

			




	
	
	
		
 
    &raquo;

			




	
	
	
		
 
    ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}

			




	
	
	
		
 
    &raquo;

			




	
	
	
		
 
    ${_('Changelog')} - ${_('showing ')} ${c.size if c.size <= c.total_cs else c.total_cs} ${_('out of')} ${c.total_cs} ${_('revisions')}  

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
	${self.menu('changelog')}     

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
		% if c.pagination:

			




	
	
	
		
 
			<div id="graph">

			




	
	
	
		
 
				<div id="graph_nodes">

			




	
	
	
		
 
					<canvas id="graph_canvas"></canvas>

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
				<div id="graph_content">

			




	
	
	
		
 
					<div class="container_header">

			




	
	
	
		
 
						

			




	
	
	
		
 
        ${h.form(h.url.current(),method='get')}

			




	
	
	
		
 
        <div class="info_box">

			




	
	
	
		
 
          <span>${_('Show')}:</span>

			




	
	
	
		
 
          ${h.text('size',size=1,value=c.size)}

			




	
	
	
		
 
          <span>${_('revisions')}</span>

			




	
	
	
		
 
          ${h.submit('set',_('set'))}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        ${h.end_form()}

			




	
	
	
		
 
						

			




	
	
	
		
 
					</div>

			




	
	
	
		
 
				%for cnt,cs in enumerate(c.pagination):

			




	
	
	
		
 
					<div id="chg_${cnt+1}" class="container">

			




	
	
	
		
 
						<div class="left">

			




	
	
	
		
 
							<div class="date">${_('commit')} ${cs.revision}: ${cs.raw_id}@${cs.date}</div>

			




	
	
	
		
 
							<div class="date">${_('commit')} ${cs.revision}: ${h.short_id(cs.raw_id)}@${cs.date}</div>

			




	
	
	
		
 
							<div class="author">

			




	
	
	
		
 
								<div class="gravatar">

			




	
	
	
		
 
									<img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),20)}"/>

			




	
	
	
		
 
								</div>

			




	
	
	
		
 
								<span>${h.person(cs.author)}</span><br/>

			




	
	
	
		
 
								<span><a href="mailto:${h.email_or_none(cs.author)}">${h.email_or_none(cs.author)}</a></span><br/>

			




	
	
	
		
 
							</div>

			




	
	
	
		
 
							<div class="message">${h.link_to(h.wrap_paragraphs(cs.message),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
						</div>	

			




	
	
	
		
 
						<div class="right">

			




	
	
	
		
 
									<div class="changes">

			




	
	
	
		
 
										<span class="removed" title="${_('removed')}">${len(cs.removed)}</span>

			




	
	
	
		
 
										<span class="changed" title="${_('changed')}">${len(cs.changed)}</span>

			




	
	
	
		
 
										<span class="added" title="${_('added')}">${len(cs.added)}</span>

			




	
	
	
		
 
									</div>					

			




	
	
	
		
 
										%if len(cs.parents)>1:

			




	
	
	
		
 
										<div class="merge">

			




	
	
	
		
 
											${_('merge')}<img alt="merge" src="/images/icons/arrow_join.png"/>

			




	
	
	
		
 
										</div>

			




	
	
	
		
 
										%endif

			




	
	
	
		
 
								   %if cs.parents:							

			




	
	
	
		
 
									%for p_cs in reversed(cs.parents):

			




	
	
	
		
 
										<div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.raw_id,

			




	
	
	
		
 
										<div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(h.short_id(p_cs.raw_id),

			




	
	
	
		
 
											h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}

			




	
	
	
		
 
										</div>

			




	
	
	
		
 
									%endfor

			




	
	
	
		
 
								   %else:	

			




	
	
	
		
 
                                        <div class="parent">${_('No parents')}</div>   

			




	
	
	
		
 
                                   %endif  

			




	
	
	
		
 
                    									

			




	
	
	
		
 
								<span class="logtags">

			




	
	
	
		
 
									<span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">

			




	
	
	
		
 
									${h.link_to(cs.branch,h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>

			




	
	
	
		
 
									%for tag in cs.tags:

			




	
	
	
		
 
										<span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">

			




	
	
	
		
 
										${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>

			




	
	
	
		
 
									%endfor

			




	
	
	
		
 
								</span>																	

			




	
	
	
		
 
						</div>				

			




	
	
	
		
 
					</div>

			




	
	
	
		
 
					

			




	
	
	
		
 
				%endfor

			




	
	
	
		
 
				<div class="pagination-wh pagination-left">

			




	
	
	
		
 
					${c.pagination.pager('$link_previous ~2~ $link_next')}

			




	
	
	
		
 
				</div>			

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
			

			




	
	
	
		
 
			<script type="text/javascript" src="/js/graph.js"></script>

			




	
	
	
		
 
			<script type="text/javascript">

			




	
	
	
		
 
				YAHOO.util.Event.onDOMReady(function(){

			




	
	
	
		
 
					function set_canvas() {

			




	
	
	
		
 
						var c = document.getElementById('graph_nodes');

			




	
	
	
		
 
						var t = document.getElementById('graph_content');

			




	
	
	
		
 
						canvas = document.getElementById('graph_canvas');

			




	
	
	
		
 
						var div_h = t.clientHeight;

			




	
	
	
		
 
						c.style.height=div_h+'px';

			




	
	
	
		
 
						canvas.setAttribute('height',div_h);

			




	
	
	
		
 
						canvas.setAttribute('width',160);

			




	
	
	
		
 
					};

			




	
	
	
		
 
					set_canvas();

			




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

			




	
	
	
		
 
					var r = new BranchRenderer();

			




	
	
	
		
 
					r.render(jsdata); 

			




	
	
	
		
 
				});

			




	
	
	
		
 
			</script>

			




	
	
	
		
 
		%else:

			




	
	
	
		
 
			${_('There are no changes yet')}

			




	
	
	
		
 
		%endif  

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>    

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/raw_changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
# c.scm_type changeset patch

			




	
	
	
		
 
# ${c.scm_type} changeset patch

			




	
	
	
		
 
# User ${c.changeset.author|n}

			




	
	
	
		
 
# Date ${"%d %d" % c.changeset.date}

			




	
	
	
		
 
# Date ${c.changeset.date}

			




	
	
	
		
 
# Node ID ${c.changeset.raw_id}

			




	
	
	
		
 
# ${c.parent_tmpl}

			




	
	
	
		
 
${c.changeset.message}

			




	
	
	
		
 

			




	
	
	
		
 
${c.diffs|n}

			




	
	
		
 
\ No newline at end of file

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.