Files
@ ae5ac36cdf83
Branch filter:
Location: kallithea/rhodecode/tests/functional/test_compare.py
ae5ac36cdf83
15.0 KiB
text/x-python
pull request: use unionrepo instead of outgoing
This makes it possible to look the 'moving target' symbols up in the right repo.
Using a revset with the right revisions also removes the need for pruning
changesets that are outside the requested range.
It will also not be confused by changesets that for some reason has been pulled
to the repo but haven't been merged yet. They are going to be 'merged' by the
'pull' request and should thus be a part of what is reviewed.
This makes it possible to look the 'moving target' symbols up in the right repo.
Using a revset with the right revisions also removes the need for pruning
changesets that are outside the requested range.
It will also not be confused by changesets that for some reason has been pulled
to the repo but haven't been merged yet. They are going to be 'merged' by the
'pull' request and should thus be a part of what is reviewed.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 | from rhodecode.tests import *
from rhodecode.model.repo import RepoModel
from rhodecode.model.meta import Session
from rhodecode.model.db import Repository
from rhodecode.model.scm import ScmModel
from rhodecode.lib.vcs.backends.base import EmptyChangeset
def _fork_repo(fork_name, vcs_type, parent=None):
if vcs_type =='hg':
_REPO = HG_REPO
elif vcs_type == 'git':
_REPO = GIT_REPO
if parent:
_REPO = parent
form_data = dict(
repo_name=fork_name,
repo_name_full=fork_name,
repo_group=None,
repo_type=vcs_type,
description='',
private=False,
copy_permissions=False,
landing_rev='tip',
update_after_clone=False,
fork_parent_id=Repository.get_by_repo_name(_REPO),
)
repo = RepoModel().create_fork(form_data, cur_user=TEST_USER_ADMIN_LOGIN)
Session().commit()
return Repository.get_by_repo_name(fork_name)
def _commit_change(repo, filename, content, message, vcs_type, parent=None, newfile=False):
repo = Repository.get_by_repo_name(repo)
_cs = parent
if not parent:
_cs = EmptyChangeset(alias=vcs_type)
if newfile:
cs = ScmModel().create_node(
repo=repo.scm_instance, repo_name=repo.repo_name,
cs=_cs, user=TEST_USER_ADMIN_LOGIN,
author=TEST_USER_ADMIN_LOGIN,
message=message,
content=content,
f_path=filename
)
else:
cs = ScmModel().commit_change(
repo=repo.scm_instance, repo_name=repo.repo_name,
cs=parent, user=TEST_USER_ADMIN_LOGIN,
author=TEST_USER_ADMIN_LOGIN,
message=message,
content=content,
f_path=filename
)
return cs
class TestCompareController(TestController):
def test_compare_forks_on_branch_extra_commits_hg(self):
self.log_user()
repo1 = RepoModel().create_repo(repo_name='one', repo_type='hg',
description='diff-test',
owner=TEST_USER_ADMIN_LOGIN)
r1_id = repo1.repo_id
Session().commit()
#commit something !
cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',
message='commit1', vcs_type='hg', parent=None, newfile=True)
#fork this repo
repo2 = _fork_repo('one-fork', 'hg', parent='one')
Session().commit()
r2_id = repo2.repo_id
#add two extra commit into fork
cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n',
message='commit2', vcs_type='hg', parent=cs0)
cs2 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\nline3\n',
message='commit3', vcs_type='hg', parent=cs1)
rev1 = 'default'
rev2 = 'default'
response = self.app.get(url(controller='compare', action='index',
repo_name=repo2.repo_name,
org_ref_type="branch",
org_ref=rev1,
other_ref_type="branch",
other_ref=rev2,
repo=repo1.repo_name
))
try:
response.mustcontain('%s@%s -> %s@%s' % (repo2.repo_name, rev1, repo1.repo_name, rev2))
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#C--826e8142e6ba">file1</a>""" % (repo2.repo_name, rev1, rev2))
finally:
RepoModel().delete(r2_id)
RepoModel().delete(r1_id)
def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self):
self.log_user()
repo1 = RepoModel().create_repo(repo_name='one', repo_type='hg',
description='diff-test',
owner=TEST_USER_ADMIN_LOGIN)
r1_id = repo1.repo_id
Session().commit()
#commit something !
cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',
message='commit1', vcs_type='hg', parent=None, newfile=True)
#fork this repo
repo2 = _fork_repo('one-fork', 'hg', parent='one')
Session().commit()
#now commit something to origin repo
cs1_prim = _commit_change(repo1.repo_name, filename='file2', content='line1file2\n',
message='commit2', vcs_type='hg', parent=cs0, newfile=True)
r2_id = repo2.repo_id
#add two extra commit into fork
cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n',
message='commit2', vcs_type='hg', parent=cs0)
cs2 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\nline3\n',
message='commit3', vcs_type='hg', parent=cs1)
rev1 = 'default'
rev2 = 'default'
response = self.app.get(url(controller='compare', action='index',
repo_name=repo2.repo_name,
org_ref_type="branch",
org_ref=rev1,
other_ref_type="branch",
other_ref=rev2,
repo=repo1.repo_name
))
try:
response.mustcontain('%s@%s -> %s@%s' % (repo2.repo_name, rev1, repo1.repo_name, rev2))
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#C--826e8142e6ba">file1</a>""" % (repo2.repo_name, rev1, rev2))
finally:
RepoModel().delete(r2_id)
RepoModel().delete(r1_id)
# def test_compare_remote_repos_remote_flag_off(self):
# self.log_user()
# _fork_repo(HG_FORK, 'hg')
#
# rev1 = '56349e29c2af'
# rev2 = '7d4bc8ec6be5'
#
# 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,
# repo=HG_FORK,
# bundle=False,
# ))
#
# try:
# response.mustcontain('%s@%s -> %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:
# RepoModel().delete(HG_FORK)
#
# def test_compare_remote_branches_hg(self):
# self.log_user()
#
# _fork_repo(HG_FORK, 'hg')
#
# rev1 = '56349e29c2af'
# rev2 = '7d4bc8ec6be5'
#
# 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,
# repo=HG_FORK,
# ))
#
# try:
# response.mustcontain('%s@%s -> %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:
# RepoModel().delete(HG_FORK)
#
# def test_org_repo_new_commits_after_forking_simple_diff(self):
# self.log_user()
#
# repo1 = RepoModel().create_repo(repo_name='one', repo_type='hg',
# description='diff-test',
# owner=TEST_USER_ADMIN_LOGIN)
#
# Session().commit()
# r1_id = repo1.repo_id
# r1_name = repo1.repo_name
#
# #commit something initially !
# 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='commit1',
# content='line1',
# f_path='file1'
# )
# Session().commit()
# self.assertEqual(repo1.scm_instance.revisions, [cs0.raw_id])
# #fork the repo1
# repo2 = RepoModel().create_repo(repo_name='one-fork', repo_type='hg',
# description='compare-test',
# clone_uri=repo1.repo_full_path,
# owner=TEST_USER_ADMIN_LOGIN, fork_of='one')
# Session().commit()
# self.assertEqual(repo2.scm_instance.revisions, [cs0.raw_id])
# r2_id = repo2.repo_id
# r2_name = repo2.repo_name
#
# #make 3 new commits in fork
# cs1 = ScmModel().create_node(
# repo=repo2.scm_instance, repo_name=r2_name,
# cs=repo2.scm_instance[-1], user=TEST_USER_ADMIN_LOGIN,
# author=TEST_USER_ADMIN_LOGIN,
# message='commit1-fork',
# content='file1-line1-from-fork',
# f_path='file1-fork'
# )
# cs2 = ScmModel().create_node(
# repo=repo2.scm_instance, repo_name=r2_name,
# cs=cs1, user=TEST_USER_ADMIN_LOGIN,
# author=TEST_USER_ADMIN_LOGIN,
# message='commit2-fork',
# content='file2-line1-from-fork',
# f_path='file2-fork'
# )
# cs3 = ScmModel().create_node(
# repo=repo2.scm_instance, repo_name=r2_name,
# cs=cs2, user=TEST_USER_ADMIN_LOGIN,
# author=TEST_USER_ADMIN_LOGIN,
# message='commit3-fork',
# content='file3-line1-from-fork',
# f_path='file3-fork'
# )
#
# #compare !
# rev1 = 'default'
# rev2 = 'default'
# 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,
# bundle=False,
# ))
#
# try:
# #response.mustcontain('%s@%s -> %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 !
# rev1 = 'default'
# rev2 = 'default'
# 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,
# bundle=False
# ))
#
# response.mustcontain('%s@%s -> %s@%s' % (r2_name, rev1, r1_name, rev2))
# response.mustcontain("""file1-line1-from-fork""")
# response.mustcontain("""file2-line1-from-fork""")
# response.mustcontain("""file3-line1-from-fork""")
# self.assertFalse("""<a href="#">file2</a>""" in response.body) # new commit from parent
# self.assertFalse("""line1-from-new-parent""" in response.body)
# finally:
# RepoModel().delete(r2_id)
# RepoModel().delete(r1_id)
|