1
=== modified file 'lib/devscripts/sourcecode.py'
2
--- lib/devscripts/sourcecode.py	2009-09-18 08:33:35 +0000
3
+++ lib/devscripts/sourcecode.py	2009-09-19 01:11:00 +0000
4
@@ -95,8 +95,15 @@
5
95
    """Get the new branches into sourcecode."""
95
    """Get the new branches into sourcecode."""
6
96
    for project, (branch_url, optional) in new_branches.iteritems():
96
    for project, (branch_url, optional) in new_branches.iteritems():
7
97
        destination = os.path.join(sourcecode_directory, project)
97
        destination = os.path.join(sourcecode_directory, project)
10
98
        remote_branch = Branch.open(
98
        try:
11
99
            branch_url, possible_transports=possible_transports)
99
            remote_branch = Branch.open(
12
100
                branch_url, possible_transports=possible_transports)
13
101
        except BzrError:
14
102
            if optional:
15
103
                report_exception(sys.exc_info(), sys.stderr)
16
104
                continue
17
105
            else:
18
106
                raise
19
100
        possible_transports.append(
107
        possible_transports.append(
20
101
            remote_branch.bzrdir.root_transport)
108
            remote_branch.bzrdir.root_transport)
21
102
        print 'Getting %s from %s' % (project, branch_url)
109
        print 'Getting %s from %s' % (project, branch_url)
22
@@ -105,16 +112,10 @@
23
105
        # we should avoid sharing repositories to avoid format
112
        # we should avoid sharing repositories to avoid format
24
106
        # incompatibilities.
113
        # incompatibilities.
25
107
        force_new_repo = not optional
114
        force_new_repo = not optional
36
108
        try:
115
        remote_branch.bzrdir.sprout(
37
109
            remote_branch.bzrdir.sprout(
116
            destination, create_tree_if_local=True,
38
110
                destination, create_tree_if_local=True,
117
            source_branch=remote_branch, force_new_repo=force_new_repo,
39
111
                source_branch=remote_branch, force_new_repo=force_new_repo,
118
            possible_transports=possible_transports)
30
112
                possible_transports=possible_transports)
31
113
        except BzrError:
32
114
            if optional:
33
115
                report_exception(sys.exc_info(), sys.stderr)
34
116
            else:
35
117
                raise
40
118
119
41
119
120
42
120
def update_branches(sourcecode_directory, update_branches,
121
def update_branches(sourcecode_directory, update_branches,
43
@@ -128,19 +129,20 @@
44
128
        destination = os.path.join(sourcecode_directory, project)
129
        destination = os.path.join(sourcecode_directory, project)
45
129
        print 'Updating %s' % (project,)
130
        print 'Updating %s' % (project,)
46
130
        local_tree = WorkingTree.open(destination)
131
        local_tree = WorkingTree.open(destination)
47
131
        remote_branch = Branch.open(
48
132
            branch_url, possible_transports=possible_transports)
49
133
        possible_transports.append(
50
134
            remote_branch.bzrdir.root_transport)
51
135
        try:
132
        try:
55
136
            local_tree.pull(
133
            remote_branch = Branch.open(
56
137
                remote_branch, overwrite=True,
134
                branch_url, possible_transports=possible_transports)
54
138
                possible_transports=possible_transports)
57
139
        except BzrError:
135
        except BzrError:
58
140
            if optional:
136
            if optional:
59
141
                report_exception(sys.exc_info(), sys.stderr)
137
                report_exception(sys.exc_info(), sys.stderr)
60
138
                continue
61
142
            else:
139
            else:
62
143
                raise
140
                raise
63
141
        possible_transports.append(
64
142
            remote_branch.bzrdir.root_transport)
65
143
        local_tree.pull(
66
144
            remote_branch, overwrite=True,
67
145
            possible_transports=possible_transports)
68
144
146
69
145
147
70
146
def remove_branches(sourcecode_directory, removed_branches):
148
def remove_branches(sourcecode_directory, removed_branches):
Reviewer	Review Type	Date Requested	Status
Paul Hummer (community)		2009-09-19	Approve on 2009-09-19
Review via email: mp+12109@code.launchpad.net