##// END OF EJS Templates
whitespace cleanup
marcink -
r3338:cfc0fef6 beta
parent child Browse files
Show More
@@ -63,7 +63,7 b' Troubleshooting'
63 63 |
64 64
65 65 :Q: **Requests hanging on Windows**
66 :A: Please try out with disabled Antivirus software, there are some known problems with Eset Anitivirus. Make sure
66 :A: Please try out with disabled Antivirus software, there are some known problems with Eset Anitivirus. Make sure
67 67 you have installed latest windows patches (especially KB2789397)
68 68
69 69
@@ -13,7 +13,7 b''
13 13 %else:
14 14 ${_('Admin')}
15 15 »
16 ${_('Repositories')}
16 ${_('Repositories')}
17 17 %endif
18 18 »
19 19 ${_('add new')}
@@ -140,10 +140,10 b''
140 140 rev_end=request.GET.get('rev_end',''))}";
141 141 var org_repo = YUQ('#pull_request_form #org_repo')[0].value;
142 142 var org_ref = YUQ('#pull_request_form #org_ref')[0].value.split(':');
143
143
144 144 var other_repo = YUQ('#pull_request_form #other_repo')[0].value;
145 145 var other_ref = YUQ('#pull_request_form #other_ref')[0].value.split(':');
146
146
147 147 var select_refs = YUQ('#pull_request_form select.refs')
148 148 var rev_data = {
149 149 'org_repo': org_repo,
@@ -151,9 +151,9 b''
151 151 'org_ref_type': org_ref[0],
152 152 'other_repo': other_repo,
153 153 'other_ref': other_ref[1],
154 'other_ref_type': other_ref[0],
154 'other_ref_type': other_ref[0],
155 155 }; // gather the org/other ref and repo here
156
156
157 157 for (k in rev_data){
158 158 url = url.replace('__'+k+'__',rev_data[k]);
159 159 }
@@ -157,7 +157,7 b' class TestCompareController(TestControll'
157 157 other_repo=repo2.repo_name,
158 158 other_ref_type="branch",
159 159 other_ref=rev1,
160 ))
160 ))
161 161 response.mustcontain('%s@%s -> %s@%s' % (repo1.repo_name, rev2, repo2.repo_name, rev1))
162 162 response.mustcontain("""Showing 2 commits""")
163 163 response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")
@@ -180,7 +180,7 b' class TestCompareController(TestControll'
180 180 repo1:
181 181 cs1:
182 182 cs2:
183 repo1-fork- in which we will cherry pick bottom changesets
183 repo1-fork- in which we will cherry pick bottom changesets
184 184 cs1:
185 185 cs2:
186 186 cs3: x
@@ -229,7 +229,7 b' class TestCompareController(TestControll'
229 229 other_ref=rev2,
230 230 rev_start=cs3.raw_id,
231 231 rev_end=cs5.raw_id,
232 ))
232 ))
233 233 response.mustcontain('%s@%s -> %s@%s' % (repo2.repo_name, rev1, repo1.repo_name, rev2))
234 234 response.mustcontain("""Showing 3 commits""")
235 235 response.mustcontain("""1 file changed with 3 insertions and 0 deletions""")
@@ -254,7 +254,7 b' class TestCompareController(TestControll'
254 254 repo1:
255 255 cs1:
256 256 cs2:
257 repo1-fork- in which we will cherry pick bottom changesets
257 repo1-fork- in which we will cherry pick bottom changesets
258 258 cs1:
259 259 cs2:
260 260 cs3:
@@ -347,7 +347,7 b' class TestCompareController(TestControll'
347 347 other_ref_type="rev",
348 348 other_ref=rev2,
349 349 other_repo=HG_FORK,
350 ))
350 ))
351 351 response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, rev1, HG_FORK, rev2))
352 352 ## outgoing changesets between those revisions
353 353
@@ -432,7 +432,7 b' class TestCompareController(TestControll'
432 432 other_ref_type="branch",
433 433 other_ref=rev2,
434 434 repo=r1_name,
435 ))
435 ))
436 436 #response.mustcontain('%s@%s -> %s@%s' % (r2_name, rev1, r1_name, rev2))
437 437
438 438 #add new commit into parent !
General Comments 0
You need to be logged in to leave comments. Login now