kallithea Changeset - cfc0fef66ddd

Changeset - cfc0fef66ddd

Parent rev.

Child rev.

[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:

docs/usage/troubleshooting.rst

rhodecode/templates/admin/repos/repo_add.html

rhodecode/templates/pullrequests/pullrequest.html

rhodecode/tests/functional/test_compare.py

0 comments (0 inline, 0 general)

docs/usage/troubleshooting.rst

➞

Show inline comments

@@ @@ -54,25 +54,25 @@ Troubleshooting @@
 :Q: **RhodeCode is slow for me, how can i make it faster?**
 :A: See the :ref:`performance` section
+|
 :Q: **UnicodeDecodeError on Apache mod_wsgi**
 :A: Please read: https://docs.djangoproject.com/en/dev/howto/deployment/wsgi/modwsgi/#if-you-get-a-unicodeencodeerror
+|
 :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)
 For further questions search the `Issues tracker`_, or post a message in the
 `google group rhodecode`_
 .. _virtualenv: http://pypi.python.org/pypi/virtualenv
 .. _python: http://www.python.org/
 .. _mercurial: http://mercurial.selenic.com/
 .. _celery: http://celeryproject.org/
 .. _rabbitmq: http://www.rabbitmq.com/
 .. _python-ldap: http://www.python-ldap.org/

rhodecode/templates/admin/repos/repo_add.html

➞

Show inline comments

@@ @@ -4,25 +4,25 @@ @@
 <%def name="title()">
     ${_('Add repository')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     %if c.rhodecode_user.is_admin:
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Repositories'),h.url('repos'))}
     %else:
     ${_('Admin')}
     &raquo;
-    ${_('Repositories')}
     ${_('Repositories')}
     %endif
     &raquo;
     ${_('add new')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
     <div class="box">
         <!-- box / title -->

rhodecode/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -131,38 +131,38 @@ @@
       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[1],
     	  '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]);
+      }
       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;
           YUD.get('pull_request_overview_url').href = url;
           YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','');
           YUD.get('other_repo_gravatar').src = other_repos_info[repo_name]['gravatar'];
           YUD.get('other_repo_desc').innerHTML = other_repos_info[repo_name]['description'];
           YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs'];

rhodecode/tests/functional/test_compare.py

➞

Show inline comments

@@ @@ -148,48 +148,48 @@ class TestCompareController(TestControll @@
         rev1 = 'default'
         rev2 = 'default'
         try:
             response = self.app.get(url(controller='compare', action='index',
                                         repo_name=repo1.repo_name,
                                         org_ref_type="branch",
                                         org_ref=rev2,
                                         other_repo=repo2.repo_name,
                                         other_ref_type="branch",
                                         other_ref=rev1,
-                                        ))
                                         ))
             response.mustcontain('%s@%s -&gt; %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""")
             response.mustcontain("""<div class="message tooltip" title="commit2" style="white-space:normal">commit2</div>""")
             response.mustcontain("""<div class="message tooltip" title="commit3" style="white-space:normal">commit3</div>""")
             response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))
             response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))
             ## files
             response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s#C--826e8142e6ba">file1</a>""" % (repo1.repo_name, rev2, rev1, repo2.repo_name))
             #swap
             response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?as_form=None&amp;other_repo=%s">[swap]</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
         finally:
             RepoModel().delete(r2_id)
             RepoModel().delete(r1_id)
     def test_compare_cherry_pick_changesets_from_bottom(self):
         """
         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
             cs4: x
             cs5: x
             cs6:
         """
         #make repo1, and cs1+cs2
         self.log_user()
         repo1 = RepoModel().create_repo(repo_name='repo1', repo_type='hg',
                                         description='diff-test',
@@ @@ -220,50 +220,50 @@ class TestCompareController(TestControll @@
         rev2 = 'tip'
         try:
             response = self.app.get(url(controller='compare', action='index',
                                         repo_name=repo2.repo_name,
                                         org_ref_type="tag",
                                         org_ref=rev1,
                                         other_repo=repo1.repo_name,
                                         other_ref_type="tag",
                                         other_ref=rev2,
                                         rev_start=cs3.raw_id,
                                         rev_end=cs5.raw_id,
-                                        ))
                                         ))
             response.mustcontain('%s@%s -&gt; %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""")
             response.mustcontain("""<div class="message tooltip" title="commit3" style="white-space:normal">commit3</div>""")
             response.mustcontain("""<div class="message tooltip" title="commit4" style="white-space:normal">commit4</div>""")
             response.mustcontain("""<div class="message tooltip" title="commit5" style="white-space:normal">commit5</div>""")
             response.mustcontain("""<a href="/%s/changeset/%s">r3:%s</a>""" % (repo2.repo_name, cs3.raw_id, cs3.short_id))
             response.mustcontain("""<a href="/%s/changeset/%s">r4:%s</a>""" % (repo2.repo_name, cs4.raw_id, cs4.short_id))
             response.mustcontain("""<a href="/%s/changeset/%s">r5:%s</a>""" % (repo2.repo_name, cs5.raw_id, cs5.short_id))
             ## files
             response.mustcontain("""<a href="/%s/compare/tag@%s...tag@%s?other_repo=%s#C--826e8142e6ba">file1</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
             #swap
             response.mustcontain("""<a href="/%s/compare/tag@%s...tag@%s?as_form=None&amp;other_repo=%s">[swap]</a>""" % (repo1.repo_name, rev1, rev2, repo2.repo_name))
         finally:
             RepoModel().delete(r2_id)
             RepoModel().delete(r1_id)
     def test_compare_cherry_pick_changesets_from_top(self):
         """
         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:
             cs4: x
             cs5: x
             cs6: x
         """
         #make repo1, and cs1+cs2
         self.log_user()
         repo1 = RepoModel().create_repo(repo_name='repo1', repo_type='hg',
                                         description='diff-test',
@@ @@ -338,25 +338,25 @@ class TestCompareController(TestControll @@
         rev1 = '56349e29c2af'
         rev2 = '7d4bc8ec6be5'
         try:
             response = self.app.get(url(controller='compare', action='index',
                                         repo_name=HG_REPO,
                                         org_ref_type="rev",
                                         org_ref=rev1,
                                         other_ref_type="rev",
                                         other_ref=rev2,
                                         other_repo=HG_FORK,
-                                        ))
                                         ))
             response.mustcontain('%s@%s -&gt; %s@%s' % (HG_REPO, rev1, HG_FORK, rev2))
             ## outgoing changesets between those revisions
             response.mustcontain("""<a href="/%s/changeset/2dda4e345facb0ccff1a191052dd1606dba6781d">r4:2dda4e345fac</a>""" % (HG_REPO))
             response.mustcontain("""<a href="/%s/changeset/6fff84722075f1607a30f436523403845f84cd9e">r5:6fff84722075</a>""" % (HG_REPO))
             response.mustcontain("""<a href="/%s/changeset/7d4bc8ec6be56c0f10425afb40b6fc315a4c25e7">r6:%s</a>""" % (HG_REPO, rev2))
             ## files
             response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s#C--9c390eb52cd6">vcs/backends/hg.py</a>""" % (HG_REPO, rev1, rev2))
             response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s#C--41b41c1f2796">vcs/backends/__init__.py</a>""" % (HG_REPO, rev1, rev2))
             response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s#C--2f574d260608">vcs/backends/base.py</a>""" % (HG_REPO, rev1, rev2))
         finally:
@@ @@ -423,25 +423,25 @@ class TestCompareController(TestControll @@
         #compare !
         rev1 = 'default'
         rev2 = 'default'
         try:
             response = self.app.get(url(controller='compare', action='index',
                                         repo_name=r2_name,
                                         org_ref_type="branch",
                                         org_ref=rev1,
                                         other_ref_type="branch",
                                         other_ref=rev2,
                                         repo=r1_name,
-                                        ))
                                         ))
             #response.mustcontain('%s@%s -&gt; %s@%s' % (r2_name, rev1, r1_name, rev2))
             #add new commit into parent !
             cs0 = ScmModel().create_node(
                 repo=repo1.scm_instance, repo_name=r1_name,
                 cs=EmptyChangeset(alias='hg'), user=TEST_USER_ADMIN_LOGIN,
                 author=TEST_USER_ADMIN_LOGIN,
                 message='commit2',
                 content='line1',
                 f_path='file2'
+            )
             #compare !

0 comments (0 inline, 0 general)