kallithea Changeset - 95a226b35b91

Changeset - 95a226b35b91

Parent rev.

Child rev.

[Not reviewed]

beta

0 6 0

Marcin Kuzminski - 13 years ago 2013-03-04 12:17:15
marcin@python-works.com

codecleaner, fix tabs -> spaces

6 files changed with 73 insertions and 73 deletions:

rhodecode/lib/vcs/utils/lockfiles.py

rhodecode/public/css/style.css

rhodecode/templates/admin/users/user_edit_my_account.html

rhodecode/templates/changelog/changelog.html

rhodecode/templates/email_templates/pull_request_comment.html

rhodecode/templates/pullrequests/pullrequest.html

0 comments (0 inline, 0 general)

rhodecode/lib/vcs/utils/lockfiles.py

➞

Show inline comments

 import os
 class LockFile(object):
 	"""Provides methods to obtain, check for, and release a file based lock which
 	should be used to handle concurrent access to the same file.
     """Provides methods to obtain, check for, and release a file based lock which
     should be used to handle concurrent access to the same file.
-	As we are a utility class to be derived from, we only use protected methods.
+    As we are a utility class to be derived from, we only use protected methods.
 	Locks will automatically be released on destruction"""
 	__slots__ = ("_file_path", "_owns_lock")
     Locks will automatically be released on destruction"""
     __slots__ = ("_file_path", "_owns_lock")
 	def __init__(self, file_path):
 		self._file_path = file_path
 		self._owns_lock = False
     def __init__(self, file_path):
         self._file_path = file_path
         self._owns_lock = False
 	def __del__(self):
 		self._release_lock()
     def __del__(self):
         self._release_lock()
 	def _lock_file_path(self):
 		""":return: Path to lockfile"""
 		return "%s.lock" % (self._file_path)
     def _lock_file_path(self):
         """:return: Path to lockfile"""
         return "%s.lock" % (self._file_path)
 	def _has_lock(self):
 		""":return: True if we have a lock and if the lockfile still exists
 		:raise AssertionError: if our lock-file does not exist"""
 		if not self._owns_lock:
 			return False
     def _has_lock(self):
         """:return: True if we have a lock and if the lockfile still exists
         :raise AssertionError: if our lock-file does not exist"""
         if not self._owns_lock:
             return False
-		return True
+        return True
 	def _obtain_lock_or_raise(self):
 		"""Create a lock file as flag for other instances, mark our instance as lock-holder
     def _obtain_lock_or_raise(self):
         """Create a lock file as flag for other instances, mark our instance as lock-holder
 		:raise IOError: if a lock was already present or a lock file could not be written"""
 		if self._has_lock():
 			return
 		lock_file = self._lock_file_path()
 		if os.path.isfile(lock_file):
 			raise IOError("Lock for file %r did already exist, delete %r in case the lock is illegal" % (self._file_path, lock_file))
         :raise IOError: if a lock was already present or a lock file could not be written"""
         if self._has_lock():
             return
         lock_file = self._lock_file_path()
         if os.path.isfile(lock_file):
             raise IOError("Lock for file %r did already exist, delete %r in case the lock is illegal" % (self._file_path, lock_file))
 		try:
 			fd = os.open(lock_file, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0)
 			os.close(fd)
 		except OSError,e:
 			raise IOError(str(e))
         try:
             fd = os.open(lock_file, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0)
             os.close(fd)
         except OSError,e:
             raise IOError(str(e))
-		self._owns_lock = True
+        self._owns_lock = True
 	def _obtain_lock(self):
 		"""The default implementation will raise if a lock cannot be obtained.
 		Subclasses may override this method to provide a different implementation"""
 		return self._obtain_lock_or_raise()
     def _obtain_lock(self):
         """The default implementation will raise if a lock cannot be obtained.
         Subclasses may override this method to provide a different implementation"""
         return self._obtain_lock_or_raise()
 	def _release_lock(self):
 		"""Release our lock if we have one"""
 		if not self._has_lock():
 			return
     def _release_lock(self):
         """Release our lock if we have one"""
         if not self._has_lock():
             return
 		# if someone removed our file beforhand, lets just flag this issue
 		# instead of failing, to make it more usable.
 		lfp = self._lock_file_path()
 		try:
 			# on bloody windows, the file needs write permissions to be removable.
 			# Why ...
 			if os.name == 'nt':
 				os.chmod(lfp, 0777)
 			# END handle win32
 			os.remove(lfp)
 		except OSError:
 			pass
 		self._owns_lock = False
         # if someone removed our file beforhand, lets just flag this issue
         # instead of failing, to make it more usable.
         lfp = self._lock_file_path()
         try:
             # on bloody windows, the file needs write permissions to be removable.
             # Why ...
             if os.name == 'nt':
                 os.chmod(lfp, 0777)
             # END handle win32
             os.remove(lfp)
         except OSError:
             pass
         self._owns_lock = False

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -267,97 +267,97 @@ div:hover > a.permalink { @@
     border-left: none;
     margin: 4px;
+}
 #header ul#logged-user li.first div.gravatar {
     margin-top: -2px;
+}
 #header ul#logged-user li.first div.account {
     padding-top: 4px;
     float: left;
+}
 #header ul#logged-user li.last {
     border-right: none;
+}
 #header ul#logged-user li a {
     color: #fff;
     font-weight: 700;
     text-decoration: none;
+}
 #header ul#logged-user li a:hover {
     text-decoration: underline;
+}
 #header ul#logged-user li.highlight a {
     color: #fff;
+}
 #header ul#logged-user li.highlight a:hover {
     color: #FFF;
+}
 #header-dd {
     clear: both;
     position: fixed !important;
     background-color: #003B76;
     opacity: 0.01;
     cursor: pointer;
     min-height: 10px;
     width: 100% !important;
     -webkit-border-radius: 0px 0px 4px 4px;
     -khtml-border-radius: 0px 0px 4px 4px;
     border-radius: 0px 0px 4px 4px;
+}
 #header-dd:hover{
-	opacity: 0.2;
+    opacity: 0.2;
     -webkit-transition: opacity 0.5s ease-in-out;
     -moz-transition: opacity 0.5s ease-in-out;
     transition: opacity 0.5s ease-in-out;
+}
 #header #header-inner {
     min-height: 44px;
     clear: both;
     position: relative;
     background-color: #003B76;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#003B76), to(#00376E) );
     background-image: -moz-linear-gradient(top, #003b76, #00376e);
     background-image: -ms-linear-gradient(top, #003b76, #00376e);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76),color-stop(100%, #00376e) );
     background-image: -webkit-linear-gradient(top, #003b76, #00376e);
     background-image: -o-linear-gradient(top, #003b76, #00376e);
     background-image: linear-gradient(to bottom, #003b76, #00376e);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',endColorstr='#00376e', GradientType=0 );
     margin: 0;
     padding: 0;
     display: block;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
     -webkit-border-radius: 0px 0px 4px 4px;
     -khtml-border-radius: 0px 0px 4px 4px;
     border-radius: 0px 0px 4px 4px;
+}
 #header #header-inner.hover {
     width: 100% !important;
     -webkit-border-radius: 0px 0px 0px 0px;
     -khtml-border-radius: 0px 0px 0px 0px;
     border-radius: 0px 0px 0px 0px;
     position: fixed !important;
     z-index: 10000;
+}
 .ie7 #header #header-inner.hover,
 .ie8 #header #header-inner.hover,
 .ie9 #header #header-inner.hover
+{
     z-index: auto !important;
+}
 .header-pos-fix, .anchor {
     margin-top: -46px;
     padding-top: 46px;
+}
@@ @@ -4553,111 +4553,111 @@ PULL REQUESTS @@
     font-weight: bold;
+}
 #perms .perm_tag {
     padding: 1px 3px 1px 3px;
     font-size: 10px;
     font-weight: bold;
     text-transform: uppercase;
     white-space: nowrap;
     -webkit-border-radius: 3px;
     border-radius: 3px;
+}
 #perms .perm_tag.admin {
     background-color: #B94A48;
     color: #ffffff;
+}
 #perms .perm_tag.write {
     background-color: #DB7525;
     color: #ffffff;
+}
 #perms .perm_tag.read {
     background-color: #468847;
     color: #ffffff;
+}
 #perms .perm_tag.none {
     background-color: #bfbfbf;
     color: #ffffff;
+}
 .perm-gravatar {
     vertical-align:middle;
     padding:2px;
+}
 .perm-gravatar-ac {
     vertical-align:middle;
     padding:2px;
     width: 14px;
     height: 14px;
+}
 /*****************************************************************************
                                   DIFFS CSS
 ******************************************************************************/
 .diff-collapse{
 	text-align: center;
 	margin-bottom: -15px;
     text-align: center;
     margin-bottom: -15px;
+}
 .diff-collapse-button{
 	cursor: pointer;
 	color: #666;
 	font-size: 16px;
     cursor: pointer;
     color: #666;
     font-size: 16px;
+}
 .diff-container {
+}
 .diff-container.hidden{
 	display: none;
 	overflow: hidden;
     display: none;
     overflow: hidden;
+}
 div.diffblock {
     overflow: auto;
     padding: 0px;
     border: 1px solid #ccc;
     background: #f8f8f8;
     font-size: 100%;
     line-height: 100%;
     /* new */
     line-height: 125%;
     -webkit-border-radius: 6px 6px 0px 0px;
     border-radius: 6px 6px 0px 0px;
+}
 div.diffblock.margined {
     margin: 0px 20px 0px 20px;
+}
 div.diffblock .code-header {
     border-bottom: 1px solid #CCCCCC;
     background: #EEEEEE;
     padding:10px 0 10px 0;
     height: 14px;
+}
 div.diffblock .code-header.banner {
     border-bottom: 1px solid #CCCCCC;
     background: #EEEEEE;
     height: 14px;
     margin: 0px 95px 0px 95px;
     padding: 3px 3px 11px 3px;
+}
 div.diffblock .code-header.cv {
     height: 34px;
+}
 div.diffblock .code-header-title {
     padding: 0px 0px 10px 5px !important;
     margin: 0 !important;
+}
 div.diffblock .code-header .hash {
     float: left;
     padding: 2px 0 0 2px;
+}
 div.diffblock .code-header .date {
     float:left;
     text-transform: uppercase;
     padding: 2px 0px 0px 2px;

rhodecode/templates/admin/users/user_edit_my_account.html

➞

Show inline comments

@@ @@ -103,97 +103,97 @@ @@
 <script type="text/javascript">
 pyroutes.register('admin_settings_my_pullrequests', "${url('admin_settings_my_pullrequests')}", []);
 var show_perms = function(e){
     YUD.addClass('show_perms', 'current');
     YUD.removeClass('show_my','current');
     YUD.removeClass('show_pullrequests','current');
     YUD.setStyle('my_container','display','none');
     YUD.setStyle('pullrequests_container','display','none');
     YUD.setStyle('perms_container','display','');
     YUD.setStyle('q_filter','display','none');
+}
 YUE.on('show_perms','click',function(e){
     show_perms();
 })
 var show_my = function(e){
     YUD.addClass('show_my', 'current');
     YUD.removeClass('show_perms','current');
     YUD.removeClass('show_pullrequests','current');
     YUD.setStyle('perms_container','display','none');
     YUD.setStyle('pullrequests_container','display','none');
     YUD.setStyle('my_container','display','');
     YUD.setStyle('q_filter','display','');
     if(!YUD.hasClass('show_my', 'loaded')){
         table_renderer(${c.data |n});
         YUD.addClass('show_my', 'loaded');
+    }
+}
 YUE.on('show_my','click',function(e){
     show_my(e);
 })
 var show_pullrequests = function(e){
     YUD.addClass('show_pullrequests', 'current');
     YUD.removeClass('show_my','current');
     YUD.removeClass('show_perms','current');
     YUD.setStyle('my_container','display','none');
     YUD.setStyle('perms_container','display','none');
     YUD.setStyle('pullrequests_container','display','');
     YUD.setStyle('q_filter','display','none');
     var url = pyroutes.url('admin_settings_my_pullrequests');
     if(YUD.get('show_closed') && YUD.get('show_closed').checked) {
-    	var url = pyroutes.url('admin_settings_my_pullrequests', {'pr_show_closed': '1'});
+        var url = pyroutes.url('admin_settings_my_pullrequests', {'pr_show_closed': '1'});
+    }
     ypjax(url, 'pullrequests_container', function(){
         YUE.on('show_closed','change',function (e) {
             show_pullrequests(e);
         });
     });
+}
 YUE.on('show_pullrequests','click',function(e){
     show_pullrequests(e)
 })
 var tabs = {
     'perms': show_perms,
     'my': show_my,
     'pullrequests': show_pullrequests
+}
 var url = location.href.split('#');
 if (url[1]) {
     //We have a hash
     var tabHash = url[1];
     var func = tabs[tabHash]
     if (func){
         func();
+    }
+}
 function table_renderer(data){
     var myDataSource = new YAHOO.util.DataSource(data);
     myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
     myDataSource.responseSchema = {
         resultsList: "records",
         fields: [
             {key:"menu"},
             {key:"raw_name"},
             {key:"name"},
             {key:"last_changeset"},
             {key:"action"},
+            ]
         };
     myDataSource.doBeforeCallback = function(req,raw,res,cb) {
         // This is the filter function
         var data     = res.results || [],
             filtered = [],
             i,l;
         if (req) {
             req = req.toLowerCase();

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -129,98 +129,98 @@ ${_('%s Changelog') % c.repo_name} - ${c @@
                                     %for tag in cs.tags:
                                         <span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
                                         ${h.link_to(h.shorter(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="${h.url('/js/graph.js')}"></script>
             <script type="text/javascript">
                 YAHOO.util.Event.onDOMReady(function(){
                     //Monitor range checkboxes and build a link to changesets
                     //ranges
                     var checkboxes = YUD.getElementsByClassName('changeset_range');
                     var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}";
                     var pr_tmpl = "${h.url('pullrequest_home',repo_name=c.repo_name)}";
                     YUE.on(checkboxes,'click',function(e){
                         var clicked_cb = e.currentTarget;
                         var checked_checkboxes = [];
                         for (pos in checkboxes){
                             if(checkboxes[pos].checked){
                                 checked_checkboxes.push(checkboxes[pos]);
+                            }
+                        }
                         if(YUD.get('open_new_pr')){
                           if(checked_checkboxes.length>0){
                             // modify open pull request to show we have selected cs
                             YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets'];
                           }else{
                             YUD.get('open_new_pr').innerHTML = _TM['Open new pull request'];
+                          }
+                        }
                         if(checked_checkboxes.length>0){
                             var rev_end = checked_checkboxes[0].name;
                             var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;
                             var url = url_tmpl.replace('__REVRANGE__',
                                     rev_start+'...'+rev_end);
                             var link = (rev_start == rev_end)
                               	? _TM['Show selected change __S']
                             	: _TM['Show selected changes __S -> __E'];
                                 ? _TM['Show selected change __S']
                                 : _TM['Show selected changes __S -> __E'];
                             link = link.replace('__S',rev_start.substr(0,6));
                             link = link.replace('__E',rev_end.substr(0,6));
                             YUD.get('rev_range_container').href = url;
                             YUD.get('rev_range_container').innerHTML = link;
                             YUD.setStyle('rev_range_container','display','');
                             YUD.setStyle('rev_range_clear','display','');
                             YUD.get('open_new_pr').href = pr_tmpl + '?rev_start={0}&rev_end={1}'.format(rev_start,rev_end);
+                        }
                         else{
                             YUD.setStyle('rev_range_container','display','none');
                             YUD.setStyle('rev_range_clear','display','none');
+                        }
                     });
                     YUE.on('rev_range_clear','click',function(e){
                         for (var i=0; i<checkboxes.length; i++){
                             var cb = checkboxes[i];
                             cb.checked = false;
+                        }
                         YUE.preventDefault(e);
                     })
                     var msgs = YUQ('.message');
                     // get first element height
                     var el = YUQ('#graph_content .container')[0];
                     var row_h = el.clientHeight;
                     for(var i=0;i<msgs.length;i++){
                         var m = msgs[i];
                         var h = m.clientHeight;
                         var pad = YUD.getStyle(m,'padding');
                         if(h > row_h){
                             var offset = row_h - (h+12);
                             YUD.setStyle(m.nextElementSibling,'display','block');
                             YUD.setStyle(m.nextElementSibling,'margin-top',offset+'px');
                         };
+                    }
                     YUE.on(YUQ('.expand'),'click',function(e){
                         var elem = e.currentTarget.parentNode.parentNode;
                         YUD.setStyle(e.currentTarget,'display','none');
                         YUD.setStyle(elem,'height','auto');
                         //redraw the graph, line_count and jsdata are global vars
                         set_canvas(100);
                         var r = new BranchRenderer();
                         r.render(jsdata,100,line_count);

rhodecode/templates/email_templates/pull_request_comment.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="main.html"/>
 ${_('Pull request #%s for repository %s') % (pr_id, pr_target_repo) |n}
 ##message from user goes here
 <p>
 ${pr_comment_user}: <br/>
 ${body}
 </p>
 <div>${_('View this comment here')}: ${pr_comment_url}</div>
 %if status_change:
 	%if closing_pr:
 	   <span>${_('Closing pull request with status')} -&gt; ${status_change}</span>
 	%else:
 	   <span>${_('New status')} -&gt; ${status_change}</span>
 	%endif
     %if closing_pr:
        <span>${_('Closing pull request with status')} -&gt; ${status_change}</span>
     %else:
        <span>${_('New status')} -&gt; ${status_change}</span>
     %endif
 %endif
 </p>

rhodecode/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -110,93 +110,93 @@ @@
             <div class="buttons">
                 ${h.submit('save',_('Send pull request'),class_="ui-btn large")}
                 ${h.reset('reset',_('Reset'),class_="ui-btn large")}
            </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script type="text/javascript">
   var _USERS_AC_DATA = ${c.users_array|n};
   var _GROUPS_AC_DATA = ${c.users_groups_array|n};
   PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
   var other_repos_info = ${c.other_repos_info|n};
   var loadPreview = function(){
       YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none');
       //url template
       var url = "${h.url('compare_url',
                          repo_name='__other_repo__',
                          org_ref_type='__other_ref_type__',
                          org_ref='__other_ref__',
                          other_repo='__org_repo__',
                          other_ref_type='__org_ref_type__',
                          other_ref='__org_ref__',
                          as_form=True,
                          rev_start=request.GET.get('rev_start',''),
                          rev_end=request.GET.get('rev_end',''))}";
       var org_repo = YUQ('#pull_request_form #org_repo')[0].value;
       var org_ref = YUQ('#pull_request_form #org_ref')[0].value.split(':');
       var other_repo = YUQ('#pull_request_form #other_repo')[0].value;
       var other_ref = YUQ('#pull_request_form #other_ref')[0].value.split(':');
       var select_refs = YUQ('#pull_request_form select.refs')
       var rev_data = {
           'org_repo': org_repo,
           'org_ref': org_ref[2],
           'org_ref_type': 'rev',
           'other_repo': other_repo,
           'other_ref': other_ref[2],
           'other_ref_type': 'rev',
       }; // gather the org/other ref and repo here
       for (k in rev_data){
-    	  url = url.replace('__'+k+'__',rev_data[k]);
+          url = url.replace('__'+k+'__',rev_data[k]);
+      }
       YUD.get('pull_request_overview').innerHTML = "${_('Loading ...')}";
       YUD.get('pull_request_overview_url').href = url; // shouldn't have as_form ... but ...
       YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','');
       ypjax(url,'pull_request_overview', function(data){
           var sel_box = YUQ('#pull_request_form #other_repo')[0];
           var repo_name = sel_box.options[sel_box.selectedIndex].value;
           var _data = other_repos_info[repo_name];
           YUD.get('other_repo_desc').innerHTML = other_repos_info[repo_name]['description'];
           YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs'];
           // select back the revision that was just compared
           setSelectValue(YUD.get('other_ref'), rev_data['other_ref']);
           // reset && add the reviewer based on selected repo
           YUD.get('review_members').innerHTML = '';
           addReviewMember(_data.user.user_id, _data.user.firstname,
         		          _data.user.lastname, _data.user.username,
         		          _data.user.gravatar_link);
                           _data.user.lastname, _data.user.username,
                           _data.user.gravatar_link);
       })
+  }
   ## refresh automatically when something changes (org_repo can't change)
   YUE.on('org_ref', 'change', function(e){
      loadPreview();
   });
   YUE.on('other_repo', 'change', function(e){
       var repo_name = e.currentTarget.value;
       // replace the <select> of changed repo
       YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs'];
       loadPreview();
   });
   YUE.on('other_ref', 'change', function(e){
      loadPreview();
   });
   //lazy load overview after 0.5s
   setTimeout(loadPreview, 500)
 </script>
 </%def>

0 comments (0 inline, 0 general)