1
=== modified file 'bzr_set.py'
2
--- bzr_set.py	2011-03-07 10:59:15 +0000
3
+++ bzr_set.py	2011-10-07 13:03:45 +0000
4
@@ -2,23 +2,16 @@
5
2
2
6
3
__all__ = ['update_openerp']
3
__all__ = ['update_openerp']
7
4
4
8
5
9
5
import os
6
import os
10
6
import shutil
11
7
import glob
12
8
import bzrlib.builtins
7
import bzrlib.builtins
13
8
from shutil import rmtree
14
9
from glob import glob
15
9
from bzrlib.plugins import launchpad
10
from bzrlib.plugins import launchpad
16
10
from bzrlib.branch import Branch
11
from bzrlib.branch import Branch
17
11
from bzrlib.errors import NotBranchError
12
from bzrlib.errors import NotBranchError
18
12
from bzrlib.revisionspec import RevisionSpec
13
from bzrlib.revisionspec import RevisionSpec
19
13
14
20
14
def run_cmd(cmdname, *args, **kwargs):
21
15
    f = getattr(bzrlib.builtins, 'cmd_' + cmdname)()
22
16
    if hasattr(f, '_setup_outf'):
23
17
        # old versions of bzr does not have this function   
24
18
        # this function must be called to avoid a exception in bzr code
25
19
        f._setup_outf()
26
20
    return f.run(*args, **kwargs)
27
21
28
22
_VERSIONS = ('4.2', '5.0', '6.0', 'trunk')
15
_VERSIONS = ('4.2', '5.0', '6.0', 'trunk')
29
23
_DEFAULT_VERSION = '6.0'
16
_DEFAULT_VERSION = '6.0'
30
24
_EXTRA_ADDONS_MAP = {
17
_EXTRA_ADDONS_MAP = {
31
@@ -28,10 +21,21 @@
32
28
    'trunk': 'trunk-extra-addons',
21
    'trunk': 'trunk-extra-addons',
33
29
}
22
}
34
30
23
36
31
def update_openerp(dest_dir, version=_DEFAULT_VERSION, lplogin=None, export=False, revision=None, verbose=False):
24
37
25
def run_cmd(cmdname, *args, **kwargs):
38
26
    f = getattr(bzrlib.builtins, 'cmd_' + cmdname)()
39
27
    if hasattr(f, '_setup_outf'):
40
28
        # old versions of bzr does not have this function
41
29
        # this function must be called to avoid a exception in bzr code
42
30
        f._setup_outf()
43
31
    return f.run(*args, **kwargs)
44
32
45
33
46
34
def update_openerp(dest_dir, version=_DEFAULT_VERSION, lplogin=None,
47
35
                   export=False, revision=None, verbose=False):
48
32
    """
36
    """
49
33
        if lplogin == None -> make a branch instead of a checkout
37
        if lplogin == None -> make a branch instead of a checkout
51
34
        if export == True -> bzr export 
38
        if export == True -> bzr export
52
35
        if revision is provided, get the branches at this revision
39
        if revision is provided, get the branches at this revision
53
36
            more information with:
40
            more information with:
54
37
                $> bzr help revisionspec
41
                $> bzr help revisionspec
55
@@ -59,10 +63,30 @@
56
59
        'server': (BASEURL + '~openerp/openobject-server/' + version, True),
63
        'server': (BASEURL + '~openerp/openobject-server/' + version, True),
57
60
        'client': (BASEURL + '~openerp/openobject-client/' + version, True),
64
        'client': (BASEURL + '~openerp/openobject-client/' + version, True),
58
61
        'addons': (BASEURL + '~openerp/openobject-addons/' + version, True),
65
        'addons': (BASEURL + '~openerp/openobject-addons/' + version, True),
62
62
        'addons-extra': (BASEURL + '~openerp-commiter/openobject-addons/' + extraversion, False),
66
        'addons-extra': (BASEURL + '~openerp-commiter/openobject-addons/' +
63
63
        'addons-community': (BASEURL + '~openerp-community/openobject-addons/' + communityversion + '-addons-community', False),
67
                         extraversion, False),
64
64
        'web': (BASEURL + '~openerp/openobject-client-web/' + webversion, True),
68
        'addons-community': (BASEURL +
65
69
                             '~openerp-community/openobject-addons/' +
66
70
                             communityversion + '-addons-community', False),
67
65
    }
71
    }
68
72
    if version in ('4.2', '5.0', '6.0'):
69
73
        bzr_repository['web'] = (BASEURL + '~openerp/openobject-client-web/' +
70
74
                               version, True)
71
75
    else:
72
76
        bzr_repository['web'] = (BASEURL + '~openerp/openerp-web/' + version,
73
77
                               True)
74
78
75
79
    if version in ('4.2', '5.0'):
76
80
        bzr_repository['doc'] = (BASEURL +
77
81
                               '~openerp-community/openobject-doc/5.0', True)
78
82
    elif version in ('6.0', ):
79
83
        bzr_repository['doc'] = (BASEURL +
80
84
                               '~openerp-community/openobject-doc/6.0', True)
81
85
    elif version in ('trunk',):
82
86
        bzr_repository['doc'] = (BASEURL +
83
87
                               '~openerp-community/openobject-doc/6.1', True)
84
88
85
89
    bzr_folders_links = ['server/bin/addons/', ]
86
66
90
87
67
    bzr_links = {
91
    bzr_links = {
88
68
        'addons/*': 'server/bin/addons/',
92
        'addons/*': 'server/bin/addons/',
89
@@ -70,11 +94,14 @@
90
70
94
91
71
    if branch:
95
    if branch:
92
72
        cmd = {'new': lambda u, l, r: run_cmd('branch', u, l, revision=r),
96
        cmd = {'new': lambda u, l, r: run_cmd('branch', u, l, revision=r),
94
73
               'update': lambda u, l, r: run_cmd('pull', u, directory=l, overwrite=True, revision=r),
97
               'update': lambda u, l, r: run_cmd('pull', u, directory=l,
95
98
                                                 overwrite=True, revision=r),
96
74
        }
99
        }
97
75
    else:
100
    else:
100
76
        cmd = {'new': lambda u, l, r: run_cmd('checkout', u, l, lightweight=True, revision=r),
101
        cmd = {'new': lambda u, l, r: run_cmd('checkout', u, l,
101
77
               'update': lambda u, l, r: run_cmd('update', l), # no revision option :(
102
                                              lightweight=True, revision=r),
102
103
               # no revision option for update :(
103
104
               'update': lambda u, l, r: run_cmd('update', l),
104
78
        }
105
        }
105
79
    cmd['export'] = lambda u, l, r: run_cmd('export', l, u, revision=r)
106
    cmd['export'] = lambda u, l, r: run_cmd('export', l, u, revision=r)
106
80
107
107
@@ -88,17 +115,18 @@
108
88
        typ = ['checkout', 'branch'][branch]
115
        typ = ['checkout', 'branch'][branch]
109
89
        if export:
116
        if export:
110
90
            if os.path.exists(local):
117
            if os.path.exists(local):
112
91
                shutil.rmtree(local)
118
                rmtree(local)
113
92
            status = 'export'
119
            status = 'export'
114
93
            typ = 'sources'
120
            typ = 'sources'
115
94
        else:
121
        else:
116
95
            try:
122
            try:
117
96
                b = Branch.open(local)
123
                b = Branch.open(local)
119
97
                # FIXME check that the current workingDirectory is a branch or a checkout
124
                # FIXME check that the current workingDirectory is a branch or
120
125
                # a checkout
121
98
                status = 'update'
126
                status = 'update'
122
99
            except NotBranchError:
127
            except NotBranchError:
123
100
                status = 'new'
128
                status = 'new'
125
101
        
129
126
102
        frm = bzrdir
130
        frm = bzrdir
127
103
        rev = None
131
        rev = None
128
104
        if revision and (not revision.startswith('tag:') or has_tags):
132
        if revision and (not revision.startswith('tag:') or has_tags):
129
@@ -106,24 +134,30 @@
130
106
            rev = RevisionSpec.from_string(revision)
134
            rev = RevisionSpec.from_string(revision)
131
107
135
132
108
        log(msg % {'status': status, 'type': typ, 'to': local, 'from': frm})
136
        log(msg % {'status': status, 'type': typ, 'to': local, 'from': frm})
134
109
                
137
135
110
        cmd[status](bzrdir, local, rev and [rev] or None)
138
        cmd[status](bzrdir, local, rev and [rev] or None)
136
111
139
137
140
    for folder_links in bzr_folders_links:
138
141
        if not os.path.exists(os.path.join(dest_dir, folder_links)):
139
142
            os.makedirs(os.path.join(dest_dir, folder_links))
140
143
141
112
    # Doing symlinks
144
    # Doing symlinks
142
113
    log('(Re)Computing Symbolic links...')
145
    log('(Re)Computing Symbolic links...')
144
114
    for src2,dest2 in bzr_links.items():
146
    for src2, dest2 in bzr_links.items():
145
115
        src2 = os.path.join(dest_dir, src2)
147
        src2 = os.path.join(dest_dir, src2)
146
116
        dest2 = os.path.join(dest_dir, dest2)
148
        dest2 = os.path.join(dest_dir, dest2)
148
117
        for src in glob.glob(src2):
149
        for src in glob(src2):
149
118
            dest = os.path.join(dest2, os.path.basename(src))
150
            dest = os.path.join(dest2, os.path.basename(src))
150
119
            if not os.path.isdir(dest):
151
            if not os.path.isdir(dest):
151
120
                os.symlink(os.path.realpath(src), dest)
152
                os.symlink(os.path.realpath(src), dest)
152
121
153
158
122
    log('='*79)
154
    log('=' * 79)
159
123
    log('Sources of OpenERP have been installed. If you develop new features,')
155
    log('Sources of OpenERP have been installed. ' +
160
124
    log('you can get more information on how to contribute to the project here:')
156
        'If you develop new features,')
161
125
    log('\thttp://test.openobject.com')
157
    log('you can get more information on how to ' +
162
126
    log('='*79)
158
        'contribute to the project here:')
163
159
    log('\thttps://launchpad.net/openobject')
164
160
    log('=' * 79)
165
127
161
166
128
#
162
#
167
129
# Testing bzr send
163
# Testing bzr send
168
@@ -131,18 +165,29 @@
169
131
165
170
132
if __name__ == '__main__':
166
if __name__ == '__main__':
171
133
    import optparse
167
    import optparse
175
134
    description = """Tool that allows you to get the last sources of openerp on launchpad.
168
    description = """Tool that allows you to get the last sources of openerp on
176
135
It downloads all branches, and create symlinks for addons in the server. By
169
launchpad. It downloads all branches, and create symlinks for addons in the
177
136
default, it loads the latest stable version.
170
server. By default, it loads the latest stable version.
178
137
"""
171
"""
180
138
    parser = optparse.OptionParser(description=description, 
172
    parser = optparse.OptionParser(description=description,
181
139
                                   usage="%prog [options] [directory]")
173
                                   usage="%prog [options] [directory]")
187
140
    parser.add_option('--checkout', dest='lplogin', help="Specify the launchpad login to make a checkout instead of a branch")
174
    parser.add_option('--checkout', dest='lplogin',
188
141
    parser.add_option('--export', dest='export', help='Make an export of the sources, instead of branches', action='store_true', default=False)
175
                      help="Specify the launchpad login to make a checkout " +
189
142
    parser.add_option('-v', dest="version", default=_DEFAULT_VERSION, type="choice", choices=_VERSIONS, help="Specify the version to take (trunk, 4.2, 5.0, 6.0)")
176
                      "instead of a branch")
190
143
    parser.add_option('-r', dest="revision", default=None, help="Specify the revision to take. (useful to take a specific TAG or to specify a DATE)")
177
    parser.add_option('--export', dest='export',
191
144
    parser.add_option('-q', '--quiet', dest='quiet', help='Suppress the output', action='store_true', default=False)
178
                      help='Make an export of the sources, instead of ' +
192
179
                      'branches', action='store_true', default=False)
193
180
    parser.add_option('-v', dest="version", default=_DEFAULT_VERSION,
194
181
                      type="choice", choices=_VERSIONS,
195
182
                      help="Specify the version to take " +
196
183
                      "(trunk, 4.2, 5.0, 6.0)")
197
184
    parser.add_option('-r', dest="revision", default=None,
198
185
                      help="Specify the revision to take. (useful to take a " +
199
186
                      "specific TAG or to specify a DATE)")
200
187
    parser.add_option('-q', '--quiet', dest='quiet',
201
188
                      help='Suppress the output', action='store_true',
202
189
                      default=False)
203
145
    opt, args = parser.parse_args()
190
    opt, args = parser.parse_args()
204
146
    dest_dir = args and args[0] or '.'
191
    dest_dir = args and args[0] or '.'
207
147
    update_openerp(dest_dir, opt.version, opt.lplogin, opt.export, opt.revision, not opt.quiet)
192
    update_openerp(dest_dir, opt.version, opt.lplogin, opt.export,
208
148
193
                   opt.revision, not opt.quiet)
209
149
194
210
=== added file 'test_bzr_set.py'
211
--- test_bzr_set.py	1970-01-01 00:00:00 +0000
212
+++ test_bzr_set.py	2011-10-07 13:03:45 +0000
213
@@ -0,0 +1,46 @@
214
1
#!/usr/bin/env python
215
2
import unittest
216
3
217
4
from os import getcwd
218
5
from os.path import exists
219
6
from shutil import rmtree
220
7
from time import time
221
8
222
9
from bzr_set import _VERSIONS, update_openerp
223
10
224
11
225
12
class TestBzrSet(unittest.TestCase):
226
13
227
14
    def setUp(self):
228
15
        self.path = getcwd() + "/TestBzrSet/"
229
16
230
17
    def test_install_and_update(self):
231
18
        """ Test install and update all version with verbose
232
19
        """
233
20
234
21
        if exists(self.path):
235
22
            rmtree(self.path)
236
23
237
24
        # test install
238
25
        for version in _VERSIONS:
239
26
            print "Test Install Version %s " % version
240
27
            dest_dir = self.path + version
241
28
            time_start = time()
242
29
            update_openerp(dest_dir, version, verbose=True)
243
30
            time_duration = time() - time_start
244
31
            print "Duration : %s minutes %2.2f secondes " % \
245
32
                  (int(float(time_duration) / 60), (float(time_duration) % 60))
246
33
        # test update
247
34
        for version in _VERSIONS:
248
35
            print "Test Update Version %s " % version
249
36
            dest_dir = self.path + version
250
37
            time_start = time()
251
38
            update_openerp(dest_dir, version, verbose=True)
252
39
            time_duration = time() - time_start
253
40
            print "Duration : %2.2f secondes " % (float(time_duration) % 60)
254
41
255
42
        rmtree(self.path)
256
43
257
44
258
45
if __name__ == '__main__':
259
46
    unittest.main()
Status:	Needs review
Proposed branch:	lp:~xavinsky/openerp/2bugfix-and-doc
Merge into:	lp:openerp
Diff against target:	259 lines (+131/-40) 2 files modified bzr_set.py (+85/-40) test_bzr_set.py (+46/-0)
To merge this branch:	bzr merge lp:~xavinsky/openerp/2bugfix-and-doc
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
xavinsky (community)	unit test ok (56 minutes)		Approve on 2011-10-07
OpenERP Core Team		2011-10-07	Pending
Review via email: mp+78590@code.launchpad.net