Changeset - f0e19116f154
Parent rev.
Child rev.
[Not reviewed]
beta
0 2 0
Marcin Kuzminski - 13 years ago 2012-11-16 21:09:50
marcin@python-works.com
fixed file history tests
2 files changed with 28 insertions and 17 deletions:
rhodecode/controllers/files.py
2
6
rhodecode/tests/functional/test_files.py
26
11
0 comments (0 inline, 0 general)
rhodecode/controllers/files.py
➞
Show inline comments
 
@@ -530,69 +530,65 @@ class FilesController(BaseRepoController
 
            _, cs1, cs2, diff, st = diffs.wrapped_diff(filenode_old=node1,
 
                                         filenode_new=node2,
 
                                         cut_off_limit=lim,
 
                                         ignore_whitespace=ign_whitespace_lcl,
 
                                         line_context=line_context_lcl,
 
                                         enable_comments=False)
 
            op = ''
 
            filename = node1.path
 
            cs_changes = {
 
                'fid': [cs1, cs2, op, filename, diff, st]
 
            }
 
            c.changes = cs_changes
 

			




	
	
	
		
 
        return render('files/file_diff.html')

			




	
	
	
		
 

			




	
	
	
		
 
    def _get_node_history(self, cs, f_path, changesets=None):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        get changesets history for given node

			




	
	
	
		
 

			




	
	
	
		
 
        :param cs: changeset to calculate history

			




	
	
	
		
 
        :param f_path: path for node to calculate history for

			




	
	
	
		
 
        :param changesets: if passed don't calculate history and take

			




	
	
	
		
 
            changesets defined in this list

			




	
	
	
		
 
        """

			




	
	
	
		
 
        import time

			




	
	
	
		
 
        s = time.time()

			




	
	
	
		
 
        # calculate history based on tip

			




	
	
	
		
 
        tip_cs = c.rhodecode_repo.get_changeset()

			




	
	
	
		
 
        if changesets is None:

			




	
	
	
		
 
            try:

			




	
	
	
		
 
                changesets = tip_cs.get_file_history(f_path)

			




	
	
	
		
 
            except (NodeDoesNotExistError, ChangesetError):

			




	
	
	
		
 
                #this node is not present at tip !

			




	
	
	
		
 
                changesets = cs.get_file_history(f_path)

			




	
	
	
		
 
        print time.time()-s

			




	
	
	
		
 
        hist_l = []

			




	
	
	
		
 

			




	
	
	
		
 
        changesets_group = ([], _("Changesets"))

			




	
	
	
		
 
        branches_group = ([], _("Branches"))

			




	
	
	
		
 
        tags_group = ([], _("Tags"))

			




	
	
	
		
 
        _hg = cs.repository.alias == 'hg'

			




	
	
	
		
 
        for chs in changesets:

			




	
	
	
		
 
            #_branch = '(%s)' % chs.branch if _hg else ''

			




	
	
	
		
 
            _branch = chs.branch

			




	
	
	
		
 
            n_desc = 'r%s:%s %s' % (chs.revision, chs.short_id, _branch)

			




	
	
	
		
 
            n_desc = 'r%s:%s (%s)' % (chs.revision, chs.short_id, _branch)

			




	
	
	
		
 
            changesets_group[0].append((chs.raw_id, n_desc,))

			




	
	
	
		
 
        print time.time()-s

			




	
	
	
		
 
        hist_l.append(changesets_group)

			




	
	
	
		
 

			




	
	
	
		
 
        for name, chs in c.rhodecode_repo.branches.items():

			




	
	
	
		
 
            branches_group[0].append((chs, name),)

			




	
	
	
		
 
        hist_l.append(branches_group)

			




	
	
	
		
 

			




	
	
	
		
 
        for name, chs in c.rhodecode_repo.tags.items():

			




	
	
	
		
 
            tags_group[0].append((chs, name),)

			




	
	
	
		
 
        hist_l.append(tags_group)

			




	
	
	
		
 
        print time.time()-s

			




	
	
	
		
 

			




	
	
	
		
 
        return hist_l, changesets

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    @jsonify

			




	
	
	
		
 
    def nodelist(self, repo_name, revision, f_path):

			




	
	
	
		
 
        if request.environ.get('HTTP_X_PARTIAL_XHR'):

			




	
	
	
		
 
            cs = self.__get_cs_or_redirect(revision, repo_name)

			




	
	
	
		
 
            _d, _f = ScmModel().get_nodes(repo_name, cs.raw_id, f_path,

			




	
	
	
		
 
                                          flat=False)

			




	
	
	
		
 
            return {'nodes': _d + _f}

			




        

    


    
    

    

        

                

                    rhodecode/tests/functional/test_files.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -52,48 +52,64 @@ class TestFilesController(TestController

			




	
	
	
		
 

			




	
	
	
		
 
    def test_index_paging(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        for r in [(73, 'a066b25d5df7016b45a41b7e2a78c33b57adc235'),

			




	
	
	
		
 
                  (92, 'cc66b61b8455b264a7a8a2d8ddc80fcfc58c221e'),

			




	
	
	
		
 
                  (109, '75feb4c33e81186c87eac740cee2447330288412'),

			




	
	
	
		
 
                  (1, '3d8f361e72ab303da48d799ff1ac40d5ac37c67e'),

			




	
	
	
		
 
                  (0, 'b986218ba1c9b0d6a259fac9b050b1724ed8e545')]:

			




	
	
	
		
 

			




	
	
	
		
 
            response = self.app.get(url(controller='files', action='index',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision=r[1],

			




	
	
	
		
 
                                    f_path='/'))

			




	
	
	
		
 

			




	
	
	
		
 
            response.mustcontain("""@ r%s:%s""" % (r[0], r[1][:12]))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_file_source(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='index',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision='27cd5cce30c96924232dffcd24178a07ffeb5dfc',

			




	
	
	
		
 
                                    f_path='vcs/nodes.py'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<div class="commit">Partially implemented <a class="issue-tracker-link" href="https://myissueserver.com/vcs_test_hg/issue/16">#16</a>. filecontent/commit message/author/node name are safe_unicode now.

			




	
	
	
		
 
In addition some other __str__ are unicode as well

			




	
	
	
		
 
Added test for unicode

			




	
	
	
		
 
Improved test to clone into uniq repository.

			




	
	
	
		
 
removed extra unicode conversion in diff.</div>

			




	
	
	
		
 
""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_file_source_history(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='history',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision='27cd5cce30c96924232dffcd24178a07ffeb5dfc',

			




	
	
	
		
 
                                    f_path='vcs/nodes.py'),

			




	
	
	
		
 
                                extra_environ={'HTTP_X_PARTIAL_XHR': '1'},)

			




	
	
	
		
 
        #test or history

			




	
	
	
		
 
        response.mustcontain("""<optgroup label="Changesets">

			




	
	
	
		
 
<option selected="selected" value="8911406ad776fdd3d0b9932a2e89677e57405a48">r167:8911406ad776 (default)</option>

			




	
	
	
		
 
<option value="aa957ed78c35a1541f508d2ec90e501b0a9e3167">r165:aa957ed78c35 (default)</option>

			




	
	
	
		
 
<option value="48e11b73e94c0db33e736eaeea692f990cb0b5f1">r140:48e11b73e94c (default)</option>

			




	
	
	
		
 
<option value="adf3cbf483298563b968a6c673cd5bde5f7d5eea">r126:adf3cbf48329 (default)</option>

			




	
	
	
		
 
<option value="6249fd0fb2cfb1411e764129f598e2cf0de79a6f">r113:6249fd0fb2cf (git)</option>

			




	
	
	
		
 
<option value="75feb4c33e81186c87eac740cee2447330288412">r109:75feb4c33e81 (default)</option>

			




	
	
	
		
 
<option value="9a4dc232ecdc763ef2e98ae2238cfcbba4f6ad8d">r108:9a4dc232ecdc (default)</option>

			




	
	
	
		
 
<option value="595cce4efa21fda2f2e4eeb4fe5f2a6befe6fa2d">r107:595cce4efa21 (default)</option>

			




	
	
	
		
 
<option value="4a8bd421fbc2dfbfb70d85a3fe064075ab2c49da">r104:4a8bd421fbc2 (default)</option>

			




	
	
	
		
 
<option value="57be63fc8f85e65a0106a53187f7316f8c487ffa">r102:57be63fc8f85 (default)</option>

			




	
	
	
		
 
<option value="5530bd87f7e2e124a64d07cb2654c997682128be">r101:5530bd87f7e2 (git)</option>

			




	
	
	
		
 
<option value="e516008b1c93f142263dc4b7961787cbad654ce1">r99:e516008b1c93 (default)</option>

			




	
	
	
		
 
<option value="41f43fc74b8b285984554532eb105ac3be5c434f">r93:41f43fc74b8b (default)</option>

			




	
	
	
		
 
<option value="cc66b61b8455b264a7a8a2d8ddc80fcfc58c221e">r92:cc66b61b8455 (default)</option>

			




	
	
	
		
 
<option value="73ab5b616b3271b0518682fb4988ce421de8099f">r91:73ab5b616b32 (default)</option>

			




	
	
	
		
 
<option value="e0da75f308c0f18f98e9ce6257626009fdda2b39">r82:e0da75f308c0 (default)</option>

			




	
	
	
		
 
<option value="fb2e41e0f0810be4d7103bc2a4c7be16ee3ec611">r81:fb2e41e0f081 (default)</option>

			




	
	
	
		
 
<option value="602ae2f5e7ade70b3b66a58cdd9e3e613dc8a028">r76:602ae2f5e7ad (default)</option>

			




	
	
	
		
 
<option value="a066b25d5df7016b45a41b7e2a78c33b57adc235">r73:a066b25d5df7 (default)</option>

			




	
	
	
		
 
<option value="637a933c905958ce5151f154147c25c1c7b68832">r61:637a933c9059 (web)</option>

			




	
	
	
		
 
<option value="0c21004effeb8ce2d2d5b4a8baf6afa8394b6fbc">r60:0c21004effeb (web)</option>

			




	
	
	
		
 
<option value="a1f39c56d3f1d52d5fb5920370a2a2716cd9a444">r59:a1f39c56d3f1 (web)</option>

			




	
	
		
 
@@ -102,65 +118,66 @@ class TestFilesController(TestController

			




	
	
	
		
 
<option value="22f71ad265265a53238359c883aa976e725aa07d">r56:22f71ad26526 (web)</option>

			




	
	
	
		
 
<option value="97501f02b7b4330924b647755663a2d90a5e638d">r49:97501f02b7b4 (web)</option>

			




	
	
	
		
 
<option value="86ede6754f2b27309452bb11f997386ae01d0e5a">r47:86ede6754f2b (web)</option>

			




	
	
	
		
 
<option value="014c40c0203c423dc19ecf94644f7cac9d4cdce0">r45:014c40c0203c (web)</option>

			




	
	
	
		
 
<option value="ee87846a61c12153b51543bf860e1026c6d3dcba">r30:ee87846a61c1 (default)</option>

			




	
	
	
		
 
<option value="9bb326a04ae5d98d437dece54be04f830cf1edd9">r26:9bb326a04ae5 (default)</option>

			




	
	
	
		
 
<option value="536c1a19428381cfea92ac44985304f6a8049569">r24:536c1a194283 (default)</option>

			




	
	
	
		
 
<option value="dc5d2c0661b61928834a785d3e64a3f80d3aad9c">r8:dc5d2c0661b6 (default)</option>

			




	
	
	
		
 
<option value="3803844fdbd3b711175fc3da9bdacfcd6d29a6fb">r7:3803844fdbd3 (default)</option>

			




	
	
	
		
 
</optgroup>

			




	
	
	
		
 
<optgroup label="Branches">

			




	
	
	
		
 
<option value="27cd5cce30c96924232dffcd24178a07ffeb5dfc">default</option>

			




	
	
	
		
 
<option value="97e8b885c04894463c51898e14387d80c30ed1ee">git</option>

			




	
	
	
		
 
<option value="2e6a2bf9356ca56df08807f4ad86d480da72a8f4">web</option>

			




	
	
	
		
 
</optgroup>

			




	
	
	
		
 
<optgroup label="Tags">

			




	
	
	
		
 
<option value="27cd5cce30c96924232dffcd24178a07ffeb5dfc">tip</option>

			




	
	
	
		
 
<option value="fd4bdb5e9b2a29b4393a4ac6caef48c17ee1a200">0.1.4</option>

			




	
	
	
		
 
<option value="17544fbfcd33ffb439e2b728b5d526b1ef30bfcf">0.1.3</option>

			




	
	
	
		
 
<option value="a7e60bff65d57ac3a1a1ce3b12a70f8a9e8a7720">0.1.2</option>

			




	
	
	
		
 
<option value="eb3a60fc964309c1a318b8dfe26aa2d1586c85ae">0.1.1</option>

			




	
	
	
		
 
</optgroup>

			




	
	
	
		
 
""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<div class="commit">Partially implemented <a class="issue-tracker-link" href="https://myissueserver.com/vcs_test_hg/issue/16">#16</a>. filecontent/commit message/author/node name are safe_unicode now.

			




	
	
	
		
 
In addition some other __str__ are unicode as well

			




	
	
	
		
 
Added test for unicode

			




	
	
	
		
 
Improved test to clone into uniq repository.

			




	
	
	
		
 
removed extra unicode conversion in diff.</div>

			




	
	
	
		
 
""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_file_annotation(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='index',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision='27cd5cce30c96924232dffcd24178a07ffeb5dfc',

			




	
	
	
		
 
                                    f_path='vcs/nodes.py',

			




	
	
	
		
 
                                    annotate=True))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_file_annotation_history(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='history',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision='27cd5cce30c96924232dffcd24178a07ffeb5dfc',

			




	
	
	
		
 
                                    f_path='vcs/nodes.py',

			




	
	
	
		
 
                                    annotate=True),

			




	
	
	
		
 
                                extra_environ={'HTTP_X_PARTIAL_XHR': '1'})

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<optgroup label="Changesets">

			




	
	
	
		
 
<option selected="selected" value="8911406ad776fdd3d0b9932a2e89677e57405a48">r167:8911406ad776 (default)</option>

			




	
	
	
		
 
<option value="aa957ed78c35a1541f508d2ec90e501b0a9e3167">r165:aa957ed78c35 (default)</option>

			




	
	
	
		
 
<option value="48e11b73e94c0db33e736eaeea692f990cb0b5f1">r140:48e11b73e94c (default)</option>

			




	
	
	
		
 
<option value="adf3cbf483298563b968a6c673cd5bde5f7d5eea">r126:adf3cbf48329 (default)</option>

			




	
	
	
		
 
<option value="6249fd0fb2cfb1411e764129f598e2cf0de79a6f">r113:6249fd0fb2cf (git)</option>

			




	
	
	
		
 
<option value="75feb4c33e81186c87eac740cee2447330288412">r109:75feb4c33e81 (default)</option>

			




	
	
	
		
 
<option value="9a4dc232ecdc763ef2e98ae2238cfcbba4f6ad8d">r108:9a4dc232ecdc (default)</option>

			




	
	
	
		
 
<option value="595cce4efa21fda2f2e4eeb4fe5f2a6befe6fa2d">r107:595cce4efa21 (default)</option>

			




	
	
	
		
 
<option value="4a8bd421fbc2dfbfb70d85a3fe064075ab2c49da">r104:4a8bd421fbc2 (default)</option>

			




	
	
	
		
 
<option value="57be63fc8f85e65a0106a53187f7316f8c487ffa">r102:57be63fc8f85 (default)</option>

			




	
	
	
		
 
<option value="5530bd87f7e2e124a64d07cb2654c997682128be">r101:5530bd87f7e2 (git)</option>

			




	
	
	
		
 
<option value="e516008b1c93f142263dc4b7961787cbad654ce1">r99:e516008b1c93 (default)</option>

			




	
	
	
		
 
<option value="41f43fc74b8b285984554532eb105ac3be5c434f">r93:41f43fc74b8b (default)</option>

			




	
	
	
		
 
<option value="cc66b61b8455b264a7a8a2d8ddc80fcfc58c221e">r92:cc66b61b8455 (default)</option>

			




	
	
	
		
 
<option value="73ab5b616b3271b0518682fb4988ce421de8099f">r91:73ab5b616b32 (default)</option>

			




	
	
	
		
 
<option value="e0da75f308c0f18f98e9ce6257626009fdda2b39">r82:e0da75f308c0 (default)</option>

			




	
	
	
		
 
<option value="fb2e41e0f0810be4d7103bc2a4c7be16ee3ec611">r81:fb2e41e0f081 (default)</option>

			




	
	
	
		
 
<option value="602ae2f5e7ade70b3b66a58cdd9e3e613dc8a028">r76:602ae2f5e7ad (default)</option>

			




	
	
	
		
 
<option value="a066b25d5df7016b45a41b7e2a78c33b57adc235">r73:a066b25d5df7 (default)</option>

			




	
	
	
		
 
<option value="637a933c905958ce5151f154147c25c1c7b68832">r61:637a933c9059 (web)</option>

			




	
	
	
		
 
<option value="0c21004effeb8ce2d2d5b4a8baf6afa8394b6fbc">r60:0c21004effeb (web)</option>

			




	
	
	
		
 
<option value="a1f39c56d3f1d52d5fb5920370a2a2716cd9a444">r59:a1f39c56d3f1 (web)</option>

			




	
	
		
 
@@ -168,50 +185,48 @@ removed extra unicode conversion in diff

			




	
	
	
		
 
<option value="08eaf14517718dccea4b67755a93368341aca919">r57:08eaf1451771 (web)</option>

			




	
	
	
		
 
<option value="22f71ad265265a53238359c883aa976e725aa07d">r56:22f71ad26526 (web)</option>

			




	
	
	
		
 
<option value="97501f02b7b4330924b647755663a2d90a5e638d">r49:97501f02b7b4 (web)</option>

			




	
	
	
		
 
<option value="86ede6754f2b27309452bb11f997386ae01d0e5a">r47:86ede6754f2b (web)</option>

			




	
	
	
		
 
<option value="014c40c0203c423dc19ecf94644f7cac9d4cdce0">r45:014c40c0203c (web)</option>

			




	
	
	
		
 
<option value="ee87846a61c12153b51543bf860e1026c6d3dcba">r30:ee87846a61c1 (default)</option>

			




	
	
	
		
 
<option value="9bb326a04ae5d98d437dece54be04f830cf1edd9">r26:9bb326a04ae5 (default)</option>

			




	
	
	
		
 
<option value="536c1a19428381cfea92ac44985304f6a8049569">r24:536c1a194283 (default)</option>

			




	
	
	
		
 
<option value="dc5d2c0661b61928834a785d3e64a3f80d3aad9c">r8:dc5d2c0661b6 (default)</option>

			




	
	
	
		
 
<option value="3803844fdbd3b711175fc3da9bdacfcd6d29a6fb">r7:3803844fdbd3 (default)</option>

			




	
	
	
		
 
</optgroup>

			




	
	
	
		
 
<optgroup label="Branches">

			




	
	
	
		
 
<option value="27cd5cce30c96924232dffcd24178a07ffeb5dfc">default</option>

			




	
	
	
		
 
<option value="97e8b885c04894463c51898e14387d80c30ed1ee">git</option>

			




	
	
	
		
 
<option value="2e6a2bf9356ca56df08807f4ad86d480da72a8f4">web</option>

			




	
	
	
		
 
</optgroup>

			




	
	
	
		
 
<optgroup label="Tags">

			




	
	
	
		
 
<option value="27cd5cce30c96924232dffcd24178a07ffeb5dfc">tip</option>

			




	
	
	
		
 
<option value="fd4bdb5e9b2a29b4393a4ac6caef48c17ee1a200">0.1.4</option>

			




	
	
	
		
 
<option value="17544fbfcd33ffb439e2b728b5d526b1ef30bfcf">0.1.3</option>

			




	
	
	
		
 
<option value="a7e60bff65d57ac3a1a1ce3b12a70f8a9e8a7720">0.1.2</option>

			




	
	
	
		
 
<option value="eb3a60fc964309c1a318b8dfe26aa2d1586c85ae">0.1.1</option>

			




	
	
	
		
 
</optgroup>""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_file_annotation_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='index',

			




	
	
	
		
 
                                    repo_name=GIT_REPO,

			




	
	
	
		
 
                                    revision='master',

			




	
	
	
		
 
                                    f_path='vcs/nodes.py',

			




	
	
	
		
 
                                    annotate=True))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_archival(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        for arch_ext, info in ARCHIVE_SPECS.items():

			




	
	
	
		
 
            short = '27cd5cce30c9%s' % arch_ext

			




	
	
	
		
 
            fname = '27cd5cce30c96924232dffcd24178a07ffeb5dfc%s' % arch_ext

			




	
	
	
		
 
            filename = '%s-%s' % (HG_REPO, short)

			




	
	
	
		
 
            response = self.app.get(url(controller='files',

			




	
	
	
		
 
                                        action='archivefile',

			




	
	
	
		
 
                                        repo_name=HG_REPO,

			




	
	
	
		
 
                                        fname=fname))

			




	
	
	
		
 

			




	
	
	
		
 
            self.assertEqual(response.status, '200 OK')

			




	
	
	
		
 
            heads = [

			




	
	
	
		
 
                ('Pragma', 'no-cache'),

			




	
	
	
		
 
                ('Cache-Control', 'no-cache'),

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.