Changeset - cfc0fef66ddd
[Not reviewed]
beta
0 4 0
Marcin Kuzminski - 13 years ago 2013-02-08 22:16:25
marcin@python-works.com
whitespace cleanup
4 files changed with 12 insertions and 12 deletions:
0 comments (0 inline, 0 general)
docs/usage/troubleshooting.rst
Show inline comments
 
@@ -63,7 +63,7 @@ Troubleshooting
 
|
 

	
 
:Q: **Requests hanging on Windows**
 
:A: Please try out with disabled Antivirus software, there are some known problems with Eset Anitivirus. Make sure 
 
:A: Please try out with disabled Antivirus software, there are some known problems with Eset Anitivirus. Make sure
 
    you have installed latest windows patches (especially KB2789397)
 

	
 

	
rhodecode/templates/admin/repos/repo_add.html
Show inline comments
 
@@ -13,7 +13,7 @@
 
    %else:
 
    ${_('Admin')}
 
    »
 
    ${_('Repositories')}    
 
    ${_('Repositories')}
 
    %endif
 
    »
 
    ${_('add new')}
rhodecode/templates/pullrequests/pullrequest.html
Show inline comments
 
@@ -140,10 +140,10 @@
 
                         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,
 
@@ -151,9 +151,9 @@
 
    	  'org_ref_type': org_ref[0],
 
    	  'other_repo': other_repo,
 
          'other_ref': other_ref[1],
 
          'other_ref_type': other_ref[0],    	  
 
          'other_ref_type': other_ref[0],
 
      }; // gather the org/other ref and repo here
 
      
 

	
 
      for (k in rev_data){
 
    	  url = url.replace('__'+k+'__',rev_data[k]);
 
      }
rhodecode/tests/functional/test_compare.py
Show inline comments
 
@@ -157,7 +157,7 @@ class TestCompareController(TestControll
 
                                        other_repo=repo2.repo_name,
 
                                        other_ref_type="branch",
 
                                        other_ref=rev1,
 
                                        ))            
 
                                        ))
 
            response.mustcontain('%s@%s -> %s@%s' % (repo1.repo_name, rev2, repo2.repo_name, rev1))
 
            response.mustcontain("""Showing 2 commits""")
 
            response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")
 
@@ -180,7 +180,7 @@ class TestCompareController(TestControll
 
        repo1:
 
            cs1:
 
            cs2:
 
        repo1-fork- in which we will cherry pick bottom changesets 
 
        repo1-fork- in which we will cherry pick bottom changesets
 
            cs1:
 
            cs2:
 
            cs3: x
 
@@ -229,7 +229,7 @@ class TestCompareController(TestControll
 
                                        other_ref=rev2,
 
                                        rev_start=cs3.raw_id,
 
                                        rev_end=cs5.raw_id,
 
                                        ))            
 
                                        ))
 
            response.mustcontain('%s@%s -> %s@%s' % (repo2.repo_name, rev1, repo1.repo_name, rev2))
 
            response.mustcontain("""Showing 3 commits""")
 
            response.mustcontain("""1 file changed with 3 insertions and 0 deletions""")
 
@@ -254,7 +254,7 @@ class TestCompareController(TestControll
 
        repo1:
 
            cs1:
 
            cs2:
 
        repo1-fork- in which we will cherry pick bottom changesets 
 
        repo1-fork- in which we will cherry pick bottom changesets
 
            cs1:
 
            cs2:
 
            cs3:
 
@@ -347,7 +347,7 @@ class TestCompareController(TestControll
 
                                        other_ref_type="rev",
 
                                        other_ref=rev2,
 
                                        other_repo=HG_FORK,
 
                                        ))            
 
                                        ))
 
            response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, rev1, HG_FORK, rev2))
 
            ## outgoing changesets between those revisions
 

	
 
@@ -432,7 +432,7 @@ class TestCompareController(TestControll
 
                                        other_ref_type="branch",
 
                                        other_ref=rev2,
 
                                        repo=r1_name,
 
                                        ))            
 
                                        ))
 
            #response.mustcontain('%s@%s -> %s@%s' % (r2_name, rev1, r1_name, rev2))
 

	
 
            #add new commit into parent !
0 comments (0 inline, 0 general)