Please enable JavaScript to use RhodeCode Enterprise
##// END OF EJS Templates
marcink
- Sun, 17 Jun 2012 22:41:10
Show More
rhodecode/controllers/changeset.py
0
+1
-1
@@
-382,7
+382,7
b' class ChangesetController(BaseRepoContro'
382
382
revision = revision ,
383
383
f_path = request . POST . get ( 'f_path' ),
384
384
line_no = request . POST . get ( 'line' ),
385
status_change = ( ChangesetStatus . get_status_lbl ( status )
385
status_change = ( ChangesetStatus . get_status_lbl ( status )
386
386
if status and change_status else None )
387
387
)
388
388
rhodecode/controllers/pullrequests.py
0
+2
-2
@@
-62,7
+62,7
b' class PullrequestsController(BaseRepoCon'
62
62
k , v in repo . branches . iteritems ()], _ ( "Branches" ))
63
63
bookmarks_group = ([( 'book: %s : %s ' % ( k , v ), k ) for
64
64
k , v in repo . bookmarks . iteritems ()], _ ( "Bookmarks" ))
65
tags_group = ([( 'tag: %s : %s ' % ( k , v ), k ) for
65
tags_group = ([( 'tag: %s : %s ' % ( k , v ), k ) for
66
66
k , v in repo . tags . iteritems ()], _ ( "Tags" ))
67
67
68
68
hist_l . append ( bookmarks_group )
@@
-242,7
+242,7
b' class PullrequestsController(BaseRepoCon'
242
242
pull_request = pull_request_id ,
243
243
f_path = request . POST . get ( 'f_path' ),
244
244
line_no = request . POST . get ( 'line' ),
245
status_change = ( ChangesetStatus . get_status_lbl ( status )
245
status_change = ( ChangesetStatus . get_status_lbl ( status )
246
246
if status and change_status else None )
247
247
)
248
248
rhodecode/lib/base.py
0
+1
-1
@@
-216,4
+216,4
b' class BaseRepoController(BaseController)'
216
216
# some globals counter for menu
217
217
c . repository_followers = self . scm_model . get_followers ( dbr )
218
218
c . repository_forks = self . scm_model . get_forks ( dbr )
219
c . repository_pull_requests = self . scm_model . get_pull_requests ( dbr )
No newline at end of file
219
c . repository_pull_requests = self . scm_model . get_pull_requests ( dbr )
rhodecode/lib/dbmigrate/schema/db_1_4_0.py
0
+1
-1
@@
-25,4
+25,4
b''
25
25
26
26
#TODO: replace that will db.py content after 1.5 Release
27
27
28
from rhodecode.model.db import *
No newline at end of file
28
from rhodecode.model.db import *
rhodecode/lib/diffs.py
0
+1
-1
@@
-566,7
+566,7
b' class InMemoryBundleRepo(bundlerepositor'
566
566
567
567
def differ ( org_repo , org_ref , other_repo , other_ref , discovery_data = None ):
568
568
"""
569
General differ between branches, bookmarks or separate but releated
569
General differ between branches, bookmarks or separate but releated
570
570
repositories
571
571
572
572
:param org_repo:
rhodecode/lib/vcs/nodes.py
0
+1
-1
@@
-432,7
+432,7
b' class RemovedFileNode(FileNode):'
432
432
RemovedFileNodeError.
433
433
"""
434
434
ALLOWED_ATTRIBUTES = [
435
'name' , 'path' , 'state' , 'is_root' , 'is_file' , 'is_dir' , 'kind' ,
435
'name' , 'path' , 'state' , 'is_root' , 'is_file' , 'is_dir' , 'kind' ,
436
436
'added' , 'changed' , 'not_changed' , 'removed'
437
437
]
438
438
rhodecode/lib/vcs/utils/hgcompat.py
0
+1
-1
@@
-12,4
+12,4
b' from mercurial.match import match'
12
12
from mercurial.mdiff import diffopts
13
13
from mercurial.node import hex
14
14
from mercurial.encoding import tolocal
15
from mercurial import discovery
No newline at end of file
15
from mercurial import discovery
rhodecode/model/changeset_status.py
0
+1
-1
@@
-120,7
+120,7
b' class ChangesetStatusModel(BaseModel):'
120
120
121
121
if revision :
122
122
new_status = _create_status ( user = user , repo = repo , status = status ,
123
comment = comment , revision = revision ,
123
comment = comment , revision = revision ,
124
124
pull_request = None )
125
125
self . sa . add ( new_status )
126
126
return new_status
rhodecode/model/comment.py
0
+1
-1
rhodecode/model/user.py
0
+1
-1
@@
-610,4
+610,4
b' class UserModel(BaseModel):'
610
610
user = self . _get_user ( user )
611
611
obj = UserEmailMap . query () . get ( email_id )
612
612
if obj :
613
self . sa . delete ( obj )
No newline at end of file
613
self . sa . delete ( obj )
rhodecode/templates/admin/users/user_edit.html
0
+4
-4
@@
-209,7
+209,7
b''
209
209
< div class = "title" >
210
210
< h5 > ${_('Email addresses')} </ h5 >
211
211
</ div >
212
212
213
213
< div class = "emails_wrap" >
214
214
< table class = "noborder" >
215
215
%for em in c.user_email_map:
@@
-221,13
+221,13
b''
221
221
${h.hidden('del_email',em.email_id)}
222
222
${h.submit('remove_',_('delete'),id="remove_email_%s" % em.email_id,
223
223
class_="delete_icon action_button", onclick="return confirm('"+_('Confirm to delete this email: %s') % em.email+"');")}
224
${h.end_form()}
224
${h.end_form()}
225
225
</ td >
226
226
</ tr >
227
227
%endfor
228
228
</ table >
229
229
</ div >
230
230
231
231
${h.form(url('user_emails', id=c.user.user_id),method='put')}
232
232
< div class = "form" >
233
233
<!-- fields -->
@@
-239,7
+239,7
b''
239
239
< div class = "input" >
240
240
${h.text('new_email', class_='medium')}
241
241
</ div >
242
</ div >
242
</ div >
243
243
< div class = "buttons" >
244
244
${h.submit('save',_('Add'),class_="ui-button")}
245
245
${h.reset('reset',_('Reset'),class_="ui-button")}
rhodecode/templates/branches/branches.html
0
+1
-1
@@
-44,7
+44,7
b" YUE.on('compare_branches','click',functi"
44
44
. replace ( '__OTHER__' , other . value );
45
45
window . location = u ;
46
46
}
47
47
48
48
})
49
49
// main table sorting
50
50
var myColumnDefs = [
rhodecode/templates/changeset/changeset_file_comment.html
0
+8
-8
rhodecode/templates/changeset/diff_block.html
0
+2
-2
@@
-44,7
+44,7
b''
44
44
45
45
%for op,filenode_path,diff in change:
46
46
< div id = "${h.FID('',filenode_path)}_target" style = "clear:both;margin-top:25px" ></ div >
47
< div id = "${h.FID('',filenode_path)}" class = "diffblock margined comm" >
47
< div id = "${h.FID('',filenode_path)}" class = "diffblock margined comm" >
48
48
< div class = "code-header" >
49
49
< div class = "changeset_header" >
50
50
< div class = "changeset_file" >
@@
-58,4
+58,4
b''
58
58
</ div >
59
59
</ div >
60
60
%endfor
61
< /%def>
No newline at end of file
61
< /%def>
rhodecode/templates/email_templates/changeset_comment.html
0
+2
-2
rhodecode/templates/pullrequests/pullrequest_show.html
0
+5
-5
@@
-19,20
+19,20
b''
19
19
< div class = "title" >
20
20
${self.breadcrumbs()}
21
21
</ div >
22
22
23
23
< h3 > ${_('Title')}: ${c.pull_request.title} </ h3 >
24
24
< div class = "changeset-status-container" style = "float:left;padding:0px 20px 20px 20px" >
25
25
%if c.current_changeset_status:
26
26
< div title = "${_('Changeset status')}" class = "changeset-status-lbl" > [${h.changeset_status_lbl(c.current_changeset_status)}] </ div >
27
27
< div class = "changeset-status-ico" >< img src = "${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></ div >
28
28
%endif
29
</ div >
29
</ div >
30
30
< div style = "padding:4px" >
31
31
< div > ${h.fmt_date(c.pull_request.created_on)} </ div >
32
32
</ div >
33
33
34
34
##DIFF
35
35
36
36
< div class = "table" >
37
37
< div id = "body" class = "diffblock" >
38
38
< div style = "white-space:pre-wrap;padding:5px" > ${h.literal(c.pull_request.description)} </ div >
@@
-72,7
+72,7
b''
72
72
## render comments main comments form and it status
73
73
${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id),
74
74
c.current_changeset_status)}
75
75
76
76
</ div >
77
77
78
78
< script type = "text/javascript" >
rhodecode/templates/pullrequests/pullrequest_show_all.html
0
+2
-2
@@
-19,11
+19,11
b''
19
19
< div class = "title" >
20
20
${self.breadcrumbs()}
21
21
</ div >
22
22
23
23
%for pr in c.pull_requests:
24
24
< a href = "${h.url('pullrequest_show',repo_name=c.repo_name,pull_request_id=pr.pull_request_id)}" > #${pr.pull_request_id} </ a >
25
25
%endfor
26
26
27
27
</ div >
28
28
29
29
< script type = "text/javascript" ></ script >
rhodecode/tests/__init__.py
0
+1
-1
@@
-28,7
+28,7
b' from rhodecode import is_windows'
28
28
from rhodecode.model.meta import Session
29
29
from rhodecode.model.db import User
30
30
from rhodecode.tests.nose_parametrized import parameterized
31
31
32
32
import pylons.test
33
33
34
34
rhodecode/tests/functional/test_compare.py
0
+1
-1
@@
-23,7
+23,7
b' class TestCompareController(TestControll'
23
23
response . mustcontain ( '''<a href="/ %s /changeset/9749bfbfc0d2eba208d7947de266303b67c87cda">r116:9749bfbfc0d2</a>''' % HG_REPO )
24
24
response . mustcontain ( '''<a href="/ %s /changeset/70d4cef8a37657ee4cf5aabb3bd9f68879769816">r115:70d4cef8a376</a>''' % HG_REPO )
25
25
response . mustcontain ( '''<a href="/ %s /changeset/c5ddebc06eaaba3010c2d66ea6ec9d074eb0f678">r112:c5ddebc06eaa</a>''' % HG_REPO )
26
26
27
27
## files diff
28
28
response . mustcontain ( '''<div class="node"><a href="/ %s /compare/tag@ %s ...tag@ %s #C--1c5cf9e91c12">docs/api/utils/index.rst</a></div>''' % ( HG_REPO , tag1 , tag2 ))
29
29
response . mustcontain ( '''<div class="node"><a href="/ %s /compare/tag@ %s ...tag@ %s #C--e3305437df55">test_and_report.sh</a></div>''' % ( HG_REPO , tag1 , tag2 ))
Site-wide shortcuts
/
Use quick search box
g h
Goto home page
g g
Goto my private gists page
g G
Goto my public gists page
g 0-9
Goto bookmarked items from 0-9
n r
New repository page
n g
New gist page
Repositories
g s
Goto summary page
g c
Goto changelog page
g f
Goto files page
g F
Goto files page with file search activated
g p
Goto pull requests page
g o
Goto repository settings
g O
Goto repository access permissions settings
t s
Toggle sidebar on some pages