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

@@ @@ -60,13 +60,13 @@ Troubleshooting @@
 :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`_

rhodecode/templates/admin/repos/repo_add.html

➞

Show inline comments

@@ @@ -10,13 +10,13 @@ @@
     ${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()">

rhodecode/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -137,26 +137,26 @@ @@
                          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];

rhodecode/tests/functional/test_compare.py

➞

Show inline comments

@@ @@ -154,13 +154,13 @@ class TestCompareController(TestControll @@
                                         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>""")
@@ @@ -177,13 +177,13 @@ class TestCompareController(TestControll @@
     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:
@@ @@ -226,13 +226,13 @@ class TestCompareController(TestControll @@
                                         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>""")
@@ @@ -251,13 +251,13 @@ class TestCompareController(TestControll @@
     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
@@ @@ -344,13 +344,13 @@ class TestCompareController(TestControll @@
                                         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))
@@ @@ -429,13 +429,13 @@ class TestCompareController(TestControll @@
                                         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,

0 comments (0 inline, 0 general)