Mercurial > kallithea
annotate rhodecode/tests/functional/test_compare.py @ 3840:dc4644865e8b beta
Implemented simple gist functionality ref #530.
- creation of public/private gists with given lifetime
- rhodecode-gist CLI for quick gist creation
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 11 May 2013 20:24:02 +0200 |
parents | 8a86836fad64 |
children | ffd45b185016 |
rev | line source |
---|---|
2241
b2a2868d7bec
Basic compare-view controller with ref parsing
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
1 from rhodecode.tests import * |
2684
2b6939a77052
Bumped mercurial version to 2.3
Marcin Kuzminski <marcin@python-works.com>
parents:
2478
diff
changeset
|
2 from rhodecode.model.repo import RepoModel |
2b6939a77052
Bumped mercurial version to 2.3
Marcin Kuzminski <marcin@python-works.com>
parents:
2478
diff
changeset
|
3 from rhodecode.model.meta import Session |
2b6939a77052
Bumped mercurial version to 2.3
Marcin Kuzminski <marcin@python-works.com>
parents:
2478
diff
changeset
|
4 from rhodecode.model.db import Repository |
2b6939a77052
Bumped mercurial version to 2.3
Marcin Kuzminski <marcin@python-works.com>
parents:
2478
diff
changeset
|
5 from rhodecode.model.scm import ScmModel |
2b6939a77052
Bumped mercurial version to 2.3
Marcin Kuzminski <marcin@python-works.com>
parents:
2478
diff
changeset
|
6 from rhodecode.lib.vcs.backends.base import EmptyChangeset |
3645
aef5f5ce5ead
use fixtures for forking
Marcin Kuzminski <marcin@python-works.com>
parents:
3486
diff
changeset
|
7 from rhodecode.tests.fixture import Fixture |
3023
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
8 |
3645
aef5f5ce5ead
use fixtures for forking
Marcin Kuzminski <marcin@python-works.com>
parents:
3486
diff
changeset
|
9 fixture = Fixture() |
3023
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
10 |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
11 |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
12 def _commit_change(repo, filename, content, message, vcs_type, parent=None, newfile=False): |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
13 repo = Repository.get_by_repo_name(repo) |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
14 _cs = parent |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
15 if not parent: |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
16 _cs = EmptyChangeset(alias=vcs_type) |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
17 |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
18 if newfile: |
3840
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
19 nodes = { |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
20 filename: { |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
21 'content': content |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
22 } |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
23 } |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
24 cs = ScmModel().create_nodes( |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
25 user=TEST_USER_ADMIN_LOGIN, repo=repo, |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
26 message=message, |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
27 nodes=nodes, |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
28 parent_cs=_cs, |
3023
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
29 author=TEST_USER_ADMIN_LOGIN, |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
30 ) |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
31 else: |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
32 cs = ScmModel().commit_change( |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
33 repo=repo.scm_instance, repo_name=repo.repo_name, |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
34 cs=parent, user=TEST_USER_ADMIN_LOGIN, |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
35 author=TEST_USER_ADMIN_LOGIN, |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
36 message=message, |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
37 content=content, |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
38 f_path=filename |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
39 ) |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
40 return cs |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
41 |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
42 |
2241
b2a2868d7bec
Basic compare-view controller with ref parsing
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
43 class TestCompareController(TestController): |
b2a2868d7bec
Basic compare-view controller with ref parsing
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
44 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
45 def setUp(self): |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
46 self.r1_id = None |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
47 self.r2_id = None |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
48 |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
49 def tearDown(self): |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
50 if self.r2_id: |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
51 RepoModel().delete(self.r2_id) |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
52 if self.r1_id: |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
53 RepoModel().delete(self.r1_id) |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
54 Session().commit() |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
55 Session.remove() |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
56 |
3023
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
57 def test_compare_forks_on_branch_extra_commits_hg(self): |
2684
2b6939a77052
Bumped mercurial version to 2.3
Marcin Kuzminski <marcin@python-works.com>
parents:
2478
diff
changeset
|
58 self.log_user() |
3647
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
59 repo1 = fixture.create_repo('one', repo_type='hg', |
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
60 repo_description='diff-test', |
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
61 cur_user=TEST_USER_ADMIN_LOGIN) |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
62 self.r1_id = repo1.repo_id |
3023
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
63 #commit something ! |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
64 cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n', |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
65 message='commit1', vcs_type='hg', parent=None, newfile=True) |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
66 |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
67 #fork this repo |
3645
aef5f5ce5ead
use fixtures for forking
Marcin Kuzminski <marcin@python-works.com>
parents:
3486
diff
changeset
|
68 repo2 = fixture.create_fork('one', 'one-fork') |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
69 self.r2_id = repo2.repo_id |
2684
2b6939a77052
Bumped mercurial version to 2.3
Marcin Kuzminski <marcin@python-works.com>
parents:
2478
diff
changeset
|
70 |
3023
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
71 #add two extra commit into fork |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
72 cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n', |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
73 message='commit2', vcs_type='hg', parent=cs0) |
2684
2b6939a77052
Bumped mercurial version to 2.3
Marcin Kuzminski <marcin@python-works.com>
parents:
2478
diff
changeset
|
74 |
3023
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
75 cs2 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\nline3\n', |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
76 message='commit3', vcs_type='hg', parent=cs1) |
3015
16af24982e30
Multiple changes for compare system
Marcin Kuzminski <marcin@python-works.com>
parents:
2907
diff
changeset
|
77 |
3023
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
78 rev1 = 'default' |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
79 rev2 = 'default' |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
80 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
81 response = self.app.get(url(controller='compare', action='index', |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
82 repo_name=repo1.repo_name, |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
83 org_ref_type="branch", |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
84 org_ref=rev2, |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
85 other_repo=repo2.repo_name, |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
86 other_ref_type="branch", |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
87 other_ref=rev1, |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3484
diff
changeset
|
88 merge='1', |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
89 )) |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
90 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
91 response.mustcontain('%s@%s -> %s@%s' % (repo1.repo_name, rev2, repo2.repo_name, rev1)) |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
92 response.mustcontain("""Showing 2 commits""") |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
93 response.mustcontain("""1 file changed with 2 insertions and 0 deletions""") |
3015
16af24982e30
Multiple changes for compare system
Marcin Kuzminski <marcin@python-works.com>
parents:
2907
diff
changeset
|
94 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
95 response.mustcontain("""<div class="message tooltip" title="commit2" style="white-space:normal">commit2</div>""") |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
96 response.mustcontain("""<div class="message tooltip" title="commit3" style="white-space:normal">commit3</div>""") |
3015
16af24982e30
Multiple changes for compare system
Marcin Kuzminski <marcin@python-works.com>
parents:
2907
diff
changeset
|
97 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
98 response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id)) |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
99 response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id)) |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
100 ## files |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3484
diff
changeset
|
101 response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=1#C--826e8142e6ba">file1</a>""" % (repo1.repo_name, rev2, rev1, repo2.repo_name)) |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
102 #swap |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3484
diff
changeset
|
103 response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True">[swap]</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) |
3029
685ebc84c2e9
White space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
3026
diff
changeset
|
104 |
3023
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
105 def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self): |
3015
16af24982e30
Multiple changes for compare system
Marcin Kuzminski <marcin@python-works.com>
parents:
2907
diff
changeset
|
106 self.log_user() |
16af24982e30
Multiple changes for compare system
Marcin Kuzminski <marcin@python-works.com>
parents:
2907
diff
changeset
|
107 |
3647
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
108 repo1 = fixture.create_repo('one', repo_type='hg', |
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
109 repo_description='diff-test', |
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
110 cur_user=TEST_USER_ADMIN_LOGIN) |
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
111 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
112 self.r1_id = repo1.repo_id |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
113 |
3023
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
114 #commit something ! |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
115 cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n', |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
116 message='commit1', vcs_type='hg', parent=None, newfile=True) |
3015
16af24982e30
Multiple changes for compare system
Marcin Kuzminski <marcin@python-works.com>
parents:
2907
diff
changeset
|
117 |
3023
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
118 #fork this repo |
3645
aef5f5ce5ead
use fixtures for forking
Marcin Kuzminski <marcin@python-works.com>
parents:
3486
diff
changeset
|
119 repo2 = fixture.create_fork('one', 'one-fork') |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
120 self.r2_id = repo2.repo_id |
3015
16af24982e30
Multiple changes for compare system
Marcin Kuzminski <marcin@python-works.com>
parents:
2907
diff
changeset
|
121 |
3023
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
122 #now commit something to origin repo |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
123 cs1_prim = _commit_change(repo1.repo_name, filename='file2', content='line1file2\n', |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
124 message='commit2', vcs_type='hg', parent=cs0, newfile=True) |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
125 |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
126 #add two extra commit into fork |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
127 cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n', |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
128 message='commit2', vcs_type='hg', parent=cs0) |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
129 |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
130 cs2 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\nline3\n', |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
131 message='commit3', vcs_type='hg', parent=cs1) |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
132 |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
133 rev1 = 'default' |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
134 rev2 = 'default' |
2684
2b6939a77052
Bumped mercurial version to 2.3
Marcin Kuzminski <marcin@python-works.com>
parents:
2478
diff
changeset
|
135 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
136 response = self.app.get(url(controller='compare', action='index', |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
137 repo_name=repo1.repo_name, |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
138 org_ref_type="branch", |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
139 org_ref=rev2, |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
140 other_repo=repo2.repo_name, |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
141 other_ref_type="branch", |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
142 other_ref=rev1, |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3484
diff
changeset
|
143 merge='x', |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
144 )) |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
145 response.mustcontain('%s@%s -> %s@%s' % (repo1.repo_name, rev2, repo2.repo_name, rev1)) |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
146 response.mustcontain("""Showing 2 commits""") |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
147 response.mustcontain("""1 file changed with 2 insertions and 0 deletions""") |
2684
2b6939a77052
Bumped mercurial version to 2.3
Marcin Kuzminski <marcin@python-works.com>
parents:
2478
diff
changeset
|
148 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
149 response.mustcontain("""<div class="message tooltip" title="commit2" style="white-space:normal">commit2</div>""") |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
150 response.mustcontain("""<div class="message tooltip" title="commit3" style="white-space:normal">commit3</div>""") |
2684
2b6939a77052
Bumped mercurial version to 2.3
Marcin Kuzminski <marcin@python-works.com>
parents:
2478
diff
changeset
|
151 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
152 response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id)) |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
153 response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id)) |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
154 ## files |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3484
diff
changeset
|
155 response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=x#C--826e8142e6ba">file1</a>""" % (repo1.repo_name, rev2, rev1, repo2.repo_name)) |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
156 #swap |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3484
diff
changeset
|
157 response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True">[swap]</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) |
2684
2b6939a77052
Bumped mercurial version to 2.3
Marcin Kuzminski <marcin@python-works.com>
parents:
2478
diff
changeset
|
158 |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
159 def test_compare_cherry_pick_changesets_from_bottom(self): |
3380
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
160 |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
161 # repo1: |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
162 # cs0: |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
163 # cs1: |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
164 # repo1-fork- in which we will cherry pick bottom changesets |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
165 # cs0: |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
166 # cs1: |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
167 # cs2: x |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
168 # cs3: x |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
169 # cs4: x |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
170 # cs5: |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
171 #make repo1, and cs1+cs2 |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
172 self.log_user() |
3023
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3015
diff
changeset
|
173 |
3647
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
174 repo1 = fixture.create_repo('repo1', repo_type='hg', |
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
175 repo_description='diff-test', |
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
176 cur_user=TEST_USER_ADMIN_LOGIN) |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
177 self.r1_id = repo1.repo_id |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
178 |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
179 #commit something ! |
3380
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
180 cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n', |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
181 message='commit1', vcs_type='hg', parent=None, |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
182 newfile=True) |
3380
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
183 cs1 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\n', |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
184 message='commit2', vcs_type='hg', parent=cs0) |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
185 #fork this repo |
3645
aef5f5ce5ead
use fixtures for forking
Marcin Kuzminski <marcin@python-works.com>
parents:
3486
diff
changeset
|
186 repo2 = fixture.create_fork('repo1', 'repo1-fork') |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
187 self.r2_id = repo2.repo_id |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
188 #now make cs3-6 |
3380
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
189 cs2 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\n', |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
190 message='commit3', vcs_type='hg', parent=cs1) |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
191 cs3 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\n', |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
192 message='commit4', vcs_type='hg', parent=cs2) |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
193 cs4 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\n', |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
194 message='commit5', vcs_type='hg', parent=cs3) |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
195 cs5 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\nline6\n', |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
196 message='commit6', vcs_type='hg', parent=cs4) |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
197 |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
198 response = self.app.get(url(controller='compare', action='index', |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
199 repo_name=repo2.repo_name, |
3484
75e563531350
compare: drop unused rev_start and rev_end
Mads Kiilerich <madski@unity3d.com>
parents:
3442
diff
changeset
|
200 org_ref_type="rev", |
3647
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
201 org_ref=cs1.short_id, # parent of cs2, in repo2 |
3380
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
202 other_repo=repo1.repo_name, |
3484
75e563531350
compare: drop unused rev_start and rev_end
Mads Kiilerich <madski@unity3d.com>
parents:
3442
diff
changeset
|
203 other_ref_type="rev", |
75e563531350
compare: drop unused rev_start and rev_end
Mads Kiilerich <madski@unity3d.com>
parents:
3442
diff
changeset
|
204 other_ref=cs4.short_id, |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3484
diff
changeset
|
205 merge='True', |
3380
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
206 )) |
3484
75e563531350
compare: drop unused rev_start and rev_end
Mads Kiilerich <madski@unity3d.com>
parents:
3442
diff
changeset
|
207 response.mustcontain('%s@%s -> %s@%s' % (repo2.repo_name, cs1.short_id, repo1.repo_name, cs4.short_id)) |
3380
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
208 response.mustcontain("""Showing 3 commits""") |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
209 response.mustcontain("""1 file changed with 3 insertions and 0 deletions""") |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
210 |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
211 response.mustcontain("""<div class="message tooltip" title="commit3" style="white-space:normal">commit3</div>""") |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
212 response.mustcontain("""<div class="message tooltip" title="commit4" style="white-space:normal">commit4</div>""") |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
213 response.mustcontain("""<div class="message tooltip" title="commit5" style="white-space:normal">commit5</div>""") |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
214 |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
215 response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo1.repo_name, cs2.raw_id, cs2.short_id)) |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
216 response.mustcontain("""<a href="/%s/changeset/%s">r3:%s</a>""" % (repo1.repo_name, cs3.raw_id, cs3.short_id)) |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
217 response.mustcontain("""<a href="/%s/changeset/%s">r4:%s</a>""" % (repo1.repo_name, cs4.raw_id, cs4.short_id)) |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
218 ## files |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
219 response.mustcontain("""#C--826e8142e6ba">file1</a>""") |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
220 |
3380
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
221 def test_compare_cherry_pick_changesets_from_top(self): |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
222 # repo1: |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
223 # cs0: |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
224 # cs1: |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
225 # repo1-fork- in which we will cherry pick bottom changesets |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
226 # cs0: |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
227 # cs1: |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
228 # cs2: |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
229 # cs3: x |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
230 # cs4: x |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
231 # cs5: x |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
232 # |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
233 #make repo1, and cs1+cs2 |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
234 self.log_user() |
3647
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
235 repo1 = fixture.create_repo('repo1', repo_type='hg', |
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
236 repo_description='diff-test', |
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
237 cur_user=TEST_USER_ADMIN_LOGIN) |
3380
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
238 self.r1_id = repo1.repo_id |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
239 |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
240 #commit something ! |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
241 cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n', |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
242 message='commit1', vcs_type='hg', parent=None, |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
243 newfile=True) |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
244 cs1 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\n', |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
245 message='commit2', vcs_type='hg', parent=cs0) |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
246 #fork this repo |
3645
aef5f5ce5ead
use fixtures for forking
Marcin Kuzminski <marcin@python-works.com>
parents:
3486
diff
changeset
|
247 repo2 = fixture.create_fork('repo1', 'repo1-fork') |
3380
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
248 self.r2_id = repo2.repo_id |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
249 #now make cs3-6 |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
250 cs2 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\n', |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
251 message='commit3', vcs_type='hg', parent=cs1) |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
252 cs3 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\n', |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
253 message='commit4', vcs_type='hg', parent=cs2) |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
254 cs4 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\n', |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
255 message='commit5', vcs_type='hg', parent=cs3) |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
256 cs5 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\nline6\n', |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
257 message='commit6', vcs_type='hg', parent=cs4) |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
258 response = self.app.get(url(controller='compare', action='index', |
3484
75e563531350
compare: drop unused rev_start and rev_end
Mads Kiilerich <madski@unity3d.com>
parents:
3442
diff
changeset
|
259 repo_name=repo1.repo_name, |
75e563531350
compare: drop unused rev_start and rev_end
Mads Kiilerich <madski@unity3d.com>
parents:
3442
diff
changeset
|
260 org_ref_type="rev", |
75e563531350
compare: drop unused rev_start and rev_end
Mads Kiilerich <madski@unity3d.com>
parents:
3442
diff
changeset
|
261 org_ref=cs2.short_id, # parent of cs3, not in repo2 |
75e563531350
compare: drop unused rev_start and rev_end
Mads Kiilerich <madski@unity3d.com>
parents:
3442
diff
changeset
|
262 other_ref_type="rev", |
75e563531350
compare: drop unused rev_start and rev_end
Mads Kiilerich <madski@unity3d.com>
parents:
3442
diff
changeset
|
263 other_ref=cs5.short_id, |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3484
diff
changeset
|
264 merge='1', |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
265 )) |
3380
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
266 |
3484
75e563531350
compare: drop unused rev_start and rev_end
Mads Kiilerich <madski@unity3d.com>
parents:
3442
diff
changeset
|
267 response.mustcontain('%s@%s -> %s@%s' % (repo1.repo_name, cs2.short_id, repo1.repo_name, cs5.short_id)) |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
268 response.mustcontain("""Showing 3 commits""") |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
269 response.mustcontain("""1 file changed with 3 insertions and 0 deletions""") |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
270 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
271 response.mustcontain("""<div class="message tooltip" title="commit4" style="white-space:normal">commit4</div>""") |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
272 response.mustcontain("""<div class="message tooltip" title="commit5" style="white-space:normal">commit5</div>""") |
3380
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
273 response.mustcontain("""<div class="message tooltip" title="commit6" style="white-space:normal">commit6</div>""") |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
274 |
3380
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
275 response.mustcontain("""<a href="/%s/changeset/%s">r3:%s</a>""" % (repo1.repo_name, cs3.raw_id, cs3.short_id)) |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
276 response.mustcontain("""<a href="/%s/changeset/%s">r4:%s</a>""" % (repo1.repo_name, cs4.raw_id, cs4.short_id)) |
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
277 response.mustcontain("""<a href="/%s/changeset/%s">r5:%s</a>""" % (repo1.repo_name, cs5.raw_id, cs5.short_id)) |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
278 ## files |
3380
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
279 response.mustcontain("""#C--826e8142e6ba">file1</a>""") |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
280 |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
281 def test_compare_cherry_pick_changeset_mixed_branches(self): |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
282 pass |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
283 #TODO write this tastecase |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
284 |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
285 def test_compare_remote_branches_hg(self): |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
286 self.log_user() |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
287 |
3645
aef5f5ce5ead
use fixtures for forking
Marcin Kuzminski <marcin@python-works.com>
parents:
3486
diff
changeset
|
288 repo2 = fixture.create_fork(HG_REPO, HG_FORK) |
3380
01fe360a66c0
fixed pull-requests with cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
3379
diff
changeset
|
289 self.r2_id = repo2.repo_id |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
290 rev1 = '56349e29c2af' |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
291 rev2 = '7d4bc8ec6be5' |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
292 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
293 response = self.app.get(url(controller='compare', action='index', |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
294 repo_name=HG_REPO, |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
295 org_ref_type="rev", |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
296 org_ref=rev1, |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
297 other_ref_type="rev", |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
298 other_ref=rev2, |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
299 other_repo=HG_FORK, |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3484
diff
changeset
|
300 merge='1', |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
301 )) |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
302 response.mustcontain('%s@%s -> %s@%s' % (HG_REPO, rev1, HG_FORK, rev2)) |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
303 ## outgoing changesets between those revisions |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
304 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
305 response.mustcontain("""<a href="/%s/changeset/2dda4e345facb0ccff1a191052dd1606dba6781d">r4:2dda4e345fac</a>""" % (HG_FORK)) |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
306 response.mustcontain("""<a href="/%s/changeset/6fff84722075f1607a30f436523403845f84cd9e">r5:6fff84722075</a>""" % (HG_FORK)) |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
307 response.mustcontain("""<a href="/%s/changeset/7d4bc8ec6be56c0f10425afb40b6fc315a4c25e7">r6:%s</a>""" % (HG_FORK, rev2)) |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
308 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
309 ## files |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3484
diff
changeset
|
310 response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s&merge=1#C--9c390eb52cd6">vcs/backends/hg.py</a>""" % (HG_REPO, rev1, rev2, HG_FORK)) |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3484
diff
changeset
|
311 response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s&merge=1#C--41b41c1f2796">vcs/backends/__init__.py</a>""" % (HG_REPO, rev1, rev2, HG_FORK)) |
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3484
diff
changeset
|
312 response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s&merge=1#C--2f574d260608">vcs/backends/base.py</a>""" % (HG_REPO, rev1, rev2, HG_FORK)) |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
313 |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
314 def test_org_repo_new_commits_after_forking_simple_diff(self): |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
315 self.log_user() |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
316 |
3647
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
317 repo1 = fixture.create_repo('one', repo_type='hg', |
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
318 repo_description='diff-test', |
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
319 cur_user=TEST_USER_ADMIN_LOGIN) |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
320 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
321 self.r1_id = repo1.repo_id |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
322 r1_name = repo1.repo_name |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
323 |
3840
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
324 cs0 = _commit_change(repo=r1_name, filename='file1', |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
325 content='line1', message='commit1', vcs_type='hg', |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
326 newfile=True) |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
327 Session().commit() |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
328 self.assertEqual(repo1.scm_instance.revisions, [cs0.raw_id]) |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
329 #fork the repo1 |
3647
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
330 repo2 = fixture.create_repo('one-fork', repo_type='hg', |
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
331 repo_description='diff-test', |
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
332 cur_user=TEST_USER_ADMIN_LOGIN, |
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
333 clone_uri=repo1.repo_full_path, |
8a86836fad64
more usage of fixture tools
Marcin Kuzminski <marcin@python-works.com>
parents:
3645
diff
changeset
|
334 fork_of='one') |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
335 Session().commit() |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
336 self.assertEqual(repo2.scm_instance.revisions, [cs0.raw_id]) |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
337 self.r2_id = repo2.repo_id |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
338 r2_name = repo2.repo_name |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
339 |
3840
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
340 |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
341 cs1 = _commit_change(repo=r2_name, filename='file1-fork', |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
342 content='file1-line1-from-fork', message='commit1-fork', |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
343 vcs_type='hg', parent=repo2.scm_instance[-1], |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
344 newfile=True) |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
345 |
3840
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
346 cs2 = _commit_change(repo=r2_name, filename='file2-fork', |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
347 content='file2-line1-from-fork', message='commit2-fork', |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
348 vcs_type='hg', parent=cs1, |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
349 newfile=True) |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
350 |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
351 cs3 = _commit_change(repo=r2_name, filename='file3-fork', |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
352 content='file3-line1-from-fork', message='commit3-fork', |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
353 vcs_type='hg', parent=cs2, newfile=True) |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
354 #compare ! |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
355 rev1 = 'default' |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
356 rev2 = 'default' |
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
357 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
358 response = self.app.get(url(controller='compare', action='index', |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
359 repo_name=r2_name, |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
360 org_ref_type="branch", |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
361 org_ref=rev1, |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
362 other_ref_type="branch", |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
363 other_ref=rev2, |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
364 other_repo=r1_name, |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3484
diff
changeset
|
365 merge='1', |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
366 )) |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
367 response.mustcontain('%s@%s -> %s@%s' % (r2_name, rev1, r1_name, rev2)) |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
368 response.mustcontain('No files') |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
369 response.mustcontain('No changesets') |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
370 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
371 #add new commit into parent ! |
3840
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
372 # cs0 = ScmModel().create_node( |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
373 # repo=repo1.scm_instance, repo_name=r1_name, |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
374 # cs=EmptyChangeset(alias='hg'), user=TEST_USER_ADMIN_LOGIN, |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
375 # author=TEST_USER_ADMIN_LOGIN, |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
376 # message='commit2-parent', |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
377 # content='line1-added-after-fork', |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
378 # f_path='file2' |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
379 # ) |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
380 cs0 = _commit_change(repo=r1_name, filename='file2', |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
381 content='line1-added-after-fork', message='commit2-parent', |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
382 vcs_type='hg', parent=None, newfile=True) |
dc4644865e8b
Implemented simple gist functionality ref #530.
Marcin Kuzminski <marcin@python-works.com>
parents:
3647
diff
changeset
|
383 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
384 #compare ! |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
385 rev1 = 'default' |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
386 rev2 = 'default' |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
387 response = self.app.get(url(controller='compare', action='index', |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
388 repo_name=r2_name, |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
389 org_ref_type="branch", |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
390 org_ref=rev1, |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
391 other_ref_type="branch", |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
392 other_ref=rev2, |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
393 other_repo=r1_name, |
3486
2053053e0882
compare/pullrequest: introduce merge parameter
Mads Kiilerich <madski@unity3d.com>
parents:
3484
diff
changeset
|
394 merge='1', |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
395 )) |
3331
0379e15f0b85
added some failing tests for compare using cherry pick changesets, to be fixed later
Marcin Kuzminski <marcin@python-works.com>
parents:
3322
diff
changeset
|
396 |
3379
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
397 response.mustcontain('%s@%s -> %s@%s' % (r2_name, rev1, r1_name, rev2)) |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
398 |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
399 response.mustcontain("""commit2-parent""") |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
400 response.mustcontain("""1 file changed with 1 insertions and 0 deletions""") |
8171dfafb5db
some tests fixes for compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
3338
diff
changeset
|
401 response.mustcontain("""line1-added-after-fork""") |