1
=== modified file 'lib/canonical/launchpad/helpers.py'
2
--- lib/canonical/launchpad/helpers.py	2009-11-25 10:26:03 +0000
3
+++ lib/canonical/launchpad/helpers.py	2009-12-10 12:14:13 +0000
4
@@ -26,8 +26,7 @@
5
26
26
6
27
import canonical
27
import canonical
7
28
from canonical.launchpad.interfaces import (
28
from canonical.launchpad.interfaces import (
10
29
    BinaryPackageFormat, ILaunchBag, IRequestPreferredLanguages,
29
    ILaunchBag, IRequestPreferredLanguages, IRequestLocalLanguages)
9
30
    IRequestLocalLanguages)
11
31
30
12
32
31
13
33
# pylint: disable-msg=W0102
32
# pylint: disable-msg=W0102
14
@@ -466,52 +465,6 @@
15
466
                long(sha.new(message_id).hexdigest(), 16), 62))
465
                long(sha.new(message_id).hexdigest(), 16), 62))
16
467
466
17
468
467
18
469
BINARYPACKAGE_EXTENSIONS = {
19
470
    BinaryPackageFormat.DEB: '.deb',
20
471
    BinaryPackageFormat.UDEB: '.udeb',
21
472
    BinaryPackageFormat.RPM: '.rpm'}
22
473
23
474
24
475
class UnrecognizedBinaryFormat(Exception):
25
476
26
477
    def __init__(self, fname, *args):
27
478
        Exception.__init__(self, *args)
28
479
        self.fname = fname
29
480
30
481
    def __str__(self):
31
482
        return '%s is not recognized as a binary file.' % self.fname
32
483
33
484
34
485
def getBinaryPackageFormat(fname):
35
486
    """Return the BinaryPackageFormat for the given filename.
36
487
37
488
    >>> getBinaryPackageFormat('mozilla-firefox_0.9_i386.deb').name
38
489
    'DEB'
39
490
    >>> getBinaryPackageFormat('debian-installer.9_all.udeb').name
40
491
    'UDEB'
41
492
    >>> getBinaryPackageFormat('network-manager.9_i386.rpm').name
42
493
    'RPM'
43
494
    """
44
495
    for key, value in BINARYPACKAGE_EXTENSIONS.items():
45
496
        if fname.endswith(value):
46
497
            return key
47
498
48
499
    raise UnrecognizedBinaryFormat(fname)
49
500
50
501
51
502
def getBinaryPackageExtension(format):
52
503
    """Return the file extension for the given BinaryPackageFormat.
53
504
54
505
    >>> getBinaryPackageExtension(BinaryPackageFormat.DEB)
55
506
    '.deb'
56
507
    >>> getBinaryPackageExtension(BinaryPackageFormat.UDEB)
57
508
    '.udeb'
58
509
    >>> getBinaryPackageExtension(BinaryPackageFormat.RPM)
59
510
    '.rpm'
60
511
    """
61
512
    return BINARYPACKAGE_EXTENSIONS[format]
62
513
63
514
64
515
def intOrZero(value):
468
def intOrZero(value):
65
516
    """Return int(value) or 0 if the conversion fails.
469
    """Return int(value) or 0 if the conversion fails.
66
517
470
67
518
471
68
=== modified file 'lib/lp/archiveuploader/tests/test_utils.py'
69
--- lib/lp/archiveuploader/tests/test_utils.py	2009-11-18 02:58:23 +0000
70
+++ lib/lp/archiveuploader/tests/test_utils.py	2009-12-10 13:32:27 +0000
71
@@ -10,6 +10,7 @@
72
10
import shutil
10
import shutil
73
11
11
74
12
from lp.registry.interfaces.sourcepackage import SourcePackageFileType
12
from lp.registry.interfaces.sourcepackage import SourcePackageFileType
75
13
from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFileType
76
13
from lp.archiveuploader.tests import datadir
14
from lp.archiveuploader.tests import datadir
77
14
15
78
15
16
79
@@ -72,6 +73,23 @@
80
72
        self.assertEquals(None, determine_source_file_type('foo_1.0'))
73
        self.assertEquals(None, determine_source_file_type('foo_1.0'))
81
73
        self.assertEquals(None, determine_source_file_type('foo_1.0.blah.gz'))
74
        self.assertEquals(None, determine_source_file_type('foo_1.0.blah.gz'))
82
74
75
83
76
    def test_determine_binary_file_type(self):
84
77
        """lp.archiveuploader.utils.determine_binary_file_type should work."""
85
78
        from lp.archiveuploader.utils import determine_binary_file_type
86
79
87
80
        # .deb -> DEB
88
81
        self.assertEquals(
89
82
            determine_binary_file_type('foo_1.0-1_all.deb'),
90
83
            BinaryPackageFileType.DEB)
91
84
92
85
        # .udeb -> UDEB
93
86
        self.assertEquals(
94
87
            determine_binary_file_type('foo_1.0-1_all.udeb'),
95
88
            BinaryPackageFileType.UDEB)
96
89
97
90
        self.assertEquals(determine_binary_file_type('foo_1.0'), None)
98
91
        self.assertEquals(determine_binary_file_type('foo_1.0.notdeb'), None)
99
92
100
75
    def testPrefixMultilineString(self):
93
    def testPrefixMultilineString(self):
101
76
        """lp.archiveuploader.utils.prefix_multi_line_string should work"""
94
        """lp.archiveuploader.utils.prefix_multi_line_string should work"""
102
77
        from lp.archiveuploader.utils import prefix_multi_line_string
95
        from lp.archiveuploader.utils import prefix_multi_line_string
103
78
96
104
=== modified file 'lib/lp/archiveuploader/utils.py'
105
--- lib/lp/archiveuploader/utils.py	2009-11-14 02:59:34 +0000
106
+++ lib/lp/archiveuploader/utils.py	2009-12-10 13:34:56 +0000
107
@@ -17,6 +17,7 @@
108
17
    're_changes_file_name',
17
    're_changes_file_name',
109
18
    're_extract_src_version',
18
    're_extract_src_version',
110
19
    'get_source_file_extension',
19
    'get_source_file_extension',
111
20
    'determine_binary_file_type',
112
20
    'determine_source_file_type',
21
    'determine_source_file_type',
113
21
    'prefix_multi_line_string',
22
    'prefix_multi_line_string',
114
22
    'safe_fix_maintainer',
23
    'safe_fix_maintainer',
115
@@ -88,6 +89,19 @@
116
88
        return None
89
        return None
117
89
90
118
90
91
119
92
def determine_binary_file_type(filename):
120
93
    """Determine the BinaryPackageFileType of the given filename."""
121
94
    # Avoid circular imports.
122
95
    from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFileType
123
96
124
97
    if filename.endswith(".deb"):
125
98
        return BinaryPackageFileType.DEB
126
99
    elif filename.endswith(".udeb"):
127
100
        return BinaryPackageFileType.UDEB
128
101
    else:
129
102
        return None
130
103
131
104
132
91
def prefix_multi_line_string(str, prefix, include_blank_lines=0):
105
def prefix_multi_line_string(str, prefix, include_blank_lines=0):
133
92
    """Utility function to split an input string and prefix,
106
    """Utility function to split an input string and prefix,
134
93
107
135
94
108
136
=== modified file 'lib/lp/soyuz/scripts/gina/handlers.py'
137
--- lib/lp/soyuz/scripts/gina/handlers.py	2009-11-25 10:26:03 +0000
138
+++ lib/lp/soyuz/scripts/gina/handlers.py	2009-12-10 12:15:49 +0000
139
@@ -29,7 +29,8 @@
140
29
29
141
30
from lp.archivepublisher.diskpool import poolify
30
from lp.archivepublisher.diskpool import poolify
142
31
from lp.archiveuploader.tagfiles import parse_tagfile
31
from lp.archiveuploader.tagfiles import parse_tagfile
144
32
from lp.archiveuploader.utils import determine_source_file_type
32
from lp.archiveuploader.utils import (determine_binary_file_type,
145
33
    determine_source_file_type)
146
33
34
147
34
from canonical.database.sqlbase import sqlvalues
35
from canonical.database.sqlbase import sqlvalues
148
35
36
149
@@ -47,22 +48,10 @@
150
47
48
151
48
from lp.registry.interfaces.person import IPersonSet, PersonCreationRationale
49
from lp.registry.interfaces.person import IPersonSet, PersonCreationRationale
152
49
from lp.registry.interfaces.sourcepackage import SourcePackageType
50
from lp.registry.interfaces.sourcepackage import SourcePackageType
153
50
from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFileType
154
51
from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
51
from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
155
52
from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat
156
52
from lp.soyuz.interfaces.build import BuildStatus
53
from lp.soyuz.interfaces.build import BuildStatus
157
53
from lp.soyuz.interfaces.publishing import PackagePublishingStatus
54
from lp.soyuz.interfaces.publishing import PackagePublishingStatus
158
54
from canonical.launchpad.helpers import getBinaryPackageFormat
159
55
160
56
161
57
def determine_binary_file_type(filename):
162
58
    """Determine the BinaryPackageFileType of the given filename."""
163
59
164
60
    if filename.endswith(".deb"):
165
61
        return BinaryPackageFileType.DEB
166
62
    elif filename.endswith(".udeb"):
167
63
        return BinaryPackageFileType.DEB
168
64
    else:
169
65
        return None
170
66
55
171
67
56
172
68
def check_not_in_librarian(files, archive_root, directory):
57
def check_not_in_librarian(files, archive_root, directory):
173
@@ -91,6 +80,39 @@
174
91
    return to_upload
80
    return to_upload
175
92
81
176
93
82
177
83
BINARYPACKAGE_EXTENSIONS = {
178
84
    BinaryPackageFormat.DEB: '.deb',
179
85
    BinaryPackageFormat.UDEB: '.udeb',
180
86
    BinaryPackageFormat.RPM: '.rpm'}
181
87
182
88
183
89
class UnrecognizedBinaryFormat(Exception):
184
90
185
91
    def __init__(self, fname, *args):
186
92
        Exception.__init__(self, *args)
187
93
        self.fname = fname
188
94
189
95
    def __str__(self):
190
96
        return '%s is not recognized as a binary file.' % self.fname
191
97
192
98
193
99
def getBinaryPackageFormat(fname):
194
100
    """Return the BinaryPackageFormat for the given filename.
195
101
196
102
    >>> getBinaryPackageFormat('mozilla-firefox_0.9_i386.deb').name
197
103
    'DEB'
198
104
    >>> getBinaryPackageFormat('debian-installer.9_all.udeb').name
199
105
    'UDEB'
200
106
    >>> getBinaryPackageFormat('network-manager.9_i386.rpm').name
201
107
    'RPM'
202
108
    """
203
109
    for key, value in BINARYPACKAGE_EXTENSIONS.items():
204
110
        if fname.endswith(value):
205
111
            return key
206
112
207
113
    raise UnrecognizedBinaryFormat(fname)
208
114
209
115
210
94
class DataSetupError(Exception):
116
class DataSetupError(Exception):
211
95
    """Raised when required data is found to be missing in the database"""
117
    """Raised when required data is found to be missing in the database"""
212
96
118
213
97
119
214
=== added file 'lib/lp/soyuz/scripts/tests/test_gina.py'
215
--- lib/lp/soyuz/scripts/tests/test_gina.py	1970-01-01 00:00:00 +0000
216
+++ lib/lp/soyuz/scripts/tests/test_gina.py	2009-12-10 12:19:14 +0000
217
@@ -0,0 +1,15 @@
218
1
# Copyright 2009 Canonical Ltd.  This software is licensed under the
219
2
# GNU Affero General Public License version 3 (see the file LICENSE).
220
3
221
4
import unittest
222
5
223
6
from zope.testing.doctest import DocTestSuite
224
7
225
8
import lp.soyuz.scripts.gina.handlers
226
9
227
10
228
11
def test_suite():
229
12
    suite = unittest.TestSuite()
230
13
    suite.addTest(DocTestSuite(lp.soyuz.scripts.gina.handlers))
231
14
    return suite
232
15
1
=== modified file 'lib/canonical/launchpad/fields/__init__.py'
2
--- lib/canonical/launchpad/fields/__init__.py	2009-12-09 23:11:31 +0000
3
+++ lib/canonical/launchpad/fields/__init__.py	2009-12-14 08:43:38 +0000
4
@@ -760,6 +760,14 @@
5
760
    """Return True if the person is public."""
760
    """Return True if the person is public."""
6
761
    from canonical.launchpad.interfaces import IPerson, PersonVisibility
761
    from canonical.launchpad.interfaces import IPerson, PersonVisibility
7
762
    if not IPerson.providedBy(person):
762
    if not IPerson.providedBy(person):
8
763
<<<<<<< TREE
9
764
=======
10
765
        return False
11
766
    if person.visibility == PersonVisibility.PUBLIC:
12
767
        return True
13
768
    else:
14
769
        # PRIVATE_MEMBERSHIP or PRIVATE.
15
770
>>>>>>> MERGE-SOURCE
16
763
        return False
771
        return False
17
764
    return person.visibility == PersonVisibility.PUBLIC
772
    return person.visibility == PersonVisibility.PUBLIC
18
765
773
19
@@ -768,7 +776,17 @@
20
768
    """True if the person/team has private membership visibility."""
776
    """True if the person/team has private membership visibility."""
21
769
    from canonical.launchpad.interfaces import IPerson, PersonVisibility
777
    from canonical.launchpad.interfaces import IPerson, PersonVisibility
22
770
    if not IPerson.providedBy(person):
778
    if not IPerson.providedBy(person):
24
771
        return False
779
<<<<<<< TREE
25
780
=======
26
781
        return False
27
782
    if person.visibility == PersonVisibility.PRIVATE_MEMBERSHIP:
28
783
        # PRIVATE_MEMBERSHIP.
29
784
        return True
30
785
    else:
31
786
        # PUBLIC or PRIVATE.
32
787
>>>>>>> MERGE-SOURCE
33
788
        return False
34
789
<<<<<<< TREE
35
772
    return person.visibility == PersonVisibility.PRIVATE_MEMBERSHIP
790
    return person.visibility == PersonVisibility.PRIVATE_MEMBERSHIP
36
773
791
37
774
792
38
@@ -791,9 +809,33 @@
39
791
809
40
792
810
41
793
class PublicPersonChoice(PersonChoice):
811
class PublicPersonChoice(PersonChoice):
42
812
=======
43
813
44
814
45
815
class PrivateTeamNotAllowed(ConstraintNotSatisfied):
46
816
    __doc__ = _("A private team is not allowed.")
47
817
48
818
49
819
class PrivateMembershipTeamNotAllowed(ConstraintNotSatisfied):
50
820
    __doc__ = _("A private-membership team is not allowed.")
51
821
52
822
53
823
class PersonChoice(Choice):
54
824
    """A person or team.
55
825
56
826
    This is useful as a superclass and provides a clearer error message than
57
827
    "Constraint not satisfied".
58
828
    """
59
829
    implements(IReferenceChoice)
60
830
    schema = IObject    # Will be set to IPerson once IPerson is defined.
61
831
62
832
63
833
class PublicPersonChoice(PersonChoice):
64
834
>>>>>>> MERGE-SOURCE
65
794
    """A person or team who is public."""
835
    """A person or team who is public."""
66
795
836
67
796
    def constraint(self, value):
837
    def constraint(self, value):
68
838
<<<<<<< TREE
69
797
        if is_public_person(value):
839
        if is_public_person(value):
70
798
            return True
840
            return True
71
799
        else:
841
        else:
72
@@ -802,6 +844,16 @@
73
802
844
74
803
845
75
804
class ParticipatingPersonChoice(PersonChoice):
846
class ParticipatingPersonChoice(PersonChoice):
76
847
=======
77
848
        if is_valid_public_person(value):
78
849
            return True
79
850
        else:
80
851
            # The vocabulary prevents the revealing of private team names.
81
852
            raise PrivateTeamNotAllowed(value)
82
853
83
854
84
855
class ParticipatingPersonChoice(PersonChoice):
85
856
>>>>>>> MERGE-SOURCE
86
805
    """A person or team who is not a private membership team.
857
    """A person or team who is not a private membership team.
87
806
858
88
807
    A person can participate in all contexts.  A PRIVATE team can participate
859
    A person can participate in all contexts.  A PRIVATE team can participate
89
@@ -811,8 +863,16 @@
90
811
    """
863
    """
91
812
864
92
813
    def constraint(self, value):
865
    def constraint(self, value):
93
866
<<<<<<< TREE
94
814
        if not is_private_membership_person(value):
867
        if not is_private_membership_person(value):
95
815
            return True
868
            return True
96
816
        else:
869
        else:
97
817
            # The vocabulary prevents the revealing of private team names.
870
            # The vocabulary prevents the revealing of private team names.
98
818
            raise PrivateMembershipTeamNotAllowed(value)
871
            raise PrivateMembershipTeamNotAllowed(value)
99
872
=======
100
873
        if not is_private_membership(value):
101
874
            return True
102
875
        else:
103
876
            # The vocabulary prevents the revealing of private team names.
104
877
            raise PrivateMembershipTeamNotAllowed(value)
105
878
>>>>>>> MERGE-SOURCE
106
819
879
107
=== modified file 'lib/canonical/launchpad/helpers.py'
108
--- lib/canonical/launchpad/helpers.py	2009-11-14 02:55:15 +0000
109
+++ lib/canonical/launchpad/helpers.py	2009-12-14 08:43:38 +0000
110
@@ -26,9 +26,7 @@
111
26
26
112
27
import canonical
27
import canonical
113
28
from canonical.launchpad.interfaces import (
28
from canonical.launchpad.interfaces import (
117
29
    BinaryPackageFormat, BinaryPackageFileType, ILaunchBag,
29
    ILaunchBag, IRequestPreferredLanguages, IRequestLocalLanguages)
115
30
    IRequestPreferredLanguages, IRequestLocalLanguages,
116
31
    SourcePackageFileType)
118
32
30
119
33
31
120
34
# pylint: disable-msg=W0102
32
# pylint: disable-msg=W0102
121
@@ -467,67 +465,6 @@
122
467
                long(sha.new(message_id).hexdigest(), 16), 62))
465
                long(sha.new(message_id).hexdigest(), 16), 62))
123
468
466
124
469
467
125
470
def getFileType(fname):
126
471
    if fname.endswith(".deb"):
127
472
        return BinaryPackageFileType.DEB
128
473
    if fname.endswith(".udeb"):
129
474
        return BinaryPackageFileType.DEB
130
475
    if fname.endswith(".dsc"):
131
476
        return SourcePackageFileType.DSC
132
477
    if fname.endswith(".diff.gz"):
133
478
        return SourcePackageFileType.DIFF
134
479
    if fname.endswith(".orig.tar.gz"):
135
480
        return SourcePackageFileType.ORIG_TARBALL
136
481
    if fname.endswith(".tar.gz"):
137
482
        return SourcePackageFileType.NATIVE_TARBALL
138
483
139
484
140
485
BINARYPACKAGE_EXTENSIONS = {
141
486
    BinaryPackageFormat.DEB: '.deb',
142
487
    BinaryPackageFormat.UDEB: '.udeb',
143
488
    BinaryPackageFormat.RPM: '.rpm'}
144
489
145
490
146
491
class UnrecognizedBinaryFormat(Exception):
147
492
148
493
    def __init__(self, fname, *args):
149
494
        Exception.__init__(self, *args)
150
495
        self.fname = fname
151
496
152
497
    def __str__(self):
153
498
        return '%s is not recognized as a binary file.' % self.fname
154
499
155
500
156
501
def getBinaryPackageFormat(fname):
157
502
    """Return the BinaryPackageFormat for the given filename.
158
503
159
504
    >>> getBinaryPackageFormat('mozilla-firefox_0.9_i386.deb').name
160
505
    'DEB'
161
506
    >>> getBinaryPackageFormat('debian-installer.9_all.udeb').name
162
507
    'UDEB'
163
508
    >>> getBinaryPackageFormat('network-manager.9_i386.rpm').name
164
509
    'RPM'
165
510
    """
166
511
    for key, value in BINARYPACKAGE_EXTENSIONS.items():
167
512
        if fname.endswith(value):
168
513
            return key
169
514
170
515
    raise UnrecognizedBinaryFormat(fname)
171
516
172
517
173
518
def getBinaryPackageExtension(format):
174
519
    """Return the file extension for the given BinaryPackageFormat.
175
520
176
521
    >>> getBinaryPackageExtension(BinaryPackageFormat.DEB)
177
522
    '.deb'
178
523
    >>> getBinaryPackageExtension(BinaryPackageFormat.UDEB)
179
524
    '.udeb'
180
525
    >>> getBinaryPackageExtension(BinaryPackageFormat.RPM)
181
526
    '.rpm'
182
527
    """
183
528
    return BINARYPACKAGE_EXTENSIONS[format]
184
529
185
530
186
531
def intOrZero(value):
468
def intOrZero(value):
187
532
    """Return int(value) or 0 if the conversion fails.
469
    """Return int(value) or 0 if the conversion fails.
188
533
470
189
534
471
190
=== modified file 'lib/canonical/launchpad/javascript/bugs/filebug-dupefinder.js'
191
--- lib/canonical/launchpad/javascript/bugs/filebug-dupefinder.js	2009-12-11 11:09:35 +0000
192
+++ lib/canonical/launchpad/javascript/bugs/filebug-dupefinder.js	2009-12-14 08:43:37 +0000
193
@@ -25,6 +25,7 @@
194
25
 * The NodeList of possible duplicates.
25
 * The NodeList of possible duplicates.
195
26
 */
26
 */
196
27
var bug_already_reported_expanders;
27
var bug_already_reported_expanders;
197
28
<<<<<<< TREE
198
28
/*
29
/*
199
29
 * The search field on the +filebug form
30
 * The search field on the +filebug form
200
30
 */
31
 */
201
@@ -45,6 +46,16 @@
202
45
 * The URL of the inline +filebug form.
46
 * The URL of the inline +filebug form.
203
46
 */
47
 */
204
47
var filebug_form_url;
48
var filebug_form_url;
205
49
=======
206
50
/*
207
51
 * The search field on the +filebug form
208
52
 */
209
53
var search_field;
210
54
/*
211
55
 * The search button on the +filebug form
212
56
 */
213
57
var search_button;
214
58
>>>>>>> MERGE-SOURCE
215
48
/*
59
/*
216
49
 * The boilerplate elements for the do-you-want-to-subscribe
60
 * The boilerplate elements for the do-you-want-to-subscribe
217
50
 * FormOverlay.
61
 * FormOverlay.
218
@@ -119,6 +130,7 @@
219
119
}
130
}
220
120
131
221
121
/**
132
/**
222
133
<<<<<<< TREE
223
122
 * Search for bugs that may match the text that the user has entered and
134
 * Search for bugs that may match the text that the user has entered and
224
123
 * display them in-line.
135
 * display them in-line.
225
124
 */
136
 */
226
@@ -203,6 +215,93 @@
227
203
}
215
}
228
204
216
229
205
/*
217
/*
230
218
=======
231
219
 * Search for bugs that may match the text that the user has entered and
232
220
 * display them in-line.
233
221
 */
234
222
function search_for_and_display_dupes() {
235
223
    function show_failure_message(transaction_id, response, args) {
236
224
        // If the request failed due to a timeout, display a message
237
225
        // explaining how the user may be able to work around it.
238
226
        var error_message = '';
239
227
        if (response.status == 503) {
240
228
            // We treat 503 (service unavailable) as a timeout because
241
229
            // that's what timeouts in LP return.
242
230
            error_message =
243
231
                "Searching for your bug in Launchpad took too long. " +
244
232
                "Try reducing the number of words in the summary " +
245
233
                "field and click \"Check again\" to retry your search. " +
246
234
                "Alternatively, you can enter the details of your bug " +
247
235
                "below.";
248
236
        } else {
249
237
            // Any other error code gets a generic message.
250
238
            error_message =
251
239
                "An error occured whilst trying to find bugs matching " +
252
240
                "the summary you entered. Click \"Check again\" to retry " +
253
241
                "your search. Alternatively, you can enter the " +
254
242
                "details of your bug below.";
255
243
        }
256
244
257
245
        var error_node = Y.Node.create('<p></p>');
258
246
        error_node.set('text', error_message);
259
247
        Y.one('#possible-duplicates').appendChild(error_node);
260
248
261
249
        Y.one('#spinner').addClass(UNSEEN);
262
250
        show_bug_reporting_form();
263
251
264
252
        Y.one(Y.DOM.byId('field.title')).set(
265
253
            'value', search_field.get('value'));
266
254
        search_button.set('value', 'Check again');
267
255
        search_button.removeClass(UNSEEN);
268
256
    }
269
257
270
258
    function on_success(transaction_id, response, args) {
271
259
        // Hide the spinner and show the duplicates.
272
260
        Y.one('#spinner').addClass(UNSEEN);
273
261
274
262
        var duplicate_div = Y.one('#possible-duplicates');
275
263
        duplicate_div.set(INNER_HTML, response.responseText);
276
264
277
265
        bug_already_reported_expanders = Y.all(
278
266
            'img.bug-already-reported-expander');
279
267
        if (Y.Lang.isValue(bug_already_reported_expanders)) {
280
268
            // If there are duplicates shown, set up the JavaScript of
281
269
            // the duplicates that have been returned.
282
270
            Y.bugs.setup_dupes();
283
271
        } else {
284
272
            // Otherwise, show the bug reporting form.
285
273
            show_bug_reporting_form();
286
274
        }
287
275
288
276
        // Copy the value from the search field into the title field
289
277
        // on the filebug form.
290
278
        Y.one('#bug_reporting_form input[name=field.title]').set(
291
279
            'value', search_field.get('value'));
292
280
293
281
        // Finally, change the label on the search button and show it
294
282
        // again.
295
283
        search_button.set('value', 'Check again');
296
284
        search_button.removeClass(UNSEEN);
297
285
    }
298
286
299
287
    var search_term = encodeURI(search_field.get('value'));
300
288
    var search_url_base = Y.one(
301
289
        '#duplicate-search-url').getAttribute('href');
302
290
    var search_url = search_url_base + '?title=' + search_term;
303
291
304
292
    // Hide the button, show the spinner and clear the contents of the
305
293
    // possible duplicates div.
306
294
    search_button.addClass(UNSEEN);
307
295
    Y.one('#spinner').removeClass(UNSEEN);
308
296
    Y.one('#possible-duplicates').set(INNER_HTML, '');
309
297
310
298
    config = {on: {success: on_success,
311
299
                   failure: show_failure_message}};
312
300
    Y.io(search_url, config);
313
301
}
314
302
315
303
/*
316
304
>>>>>>> MERGE-SOURCE
317
206
 * Create the overlay for a user to optionally subscribe to a bug that
305
 * Create the overlay for a user to optionally subscribe to a bug that
318
207
 * affects them.
306
 * affects them.
319
208
 * @param form The form to which the FormOverlay is going to be
307
 * @param form The form to which the FormOverlay is going to be
320
@@ -265,11 +364,21 @@
321
265
364
322
266
    // Add an on-click handler to the radio buttons to ensure that their
365
    // Add an on-click handler to the radio buttons to ensure that their
323
267
    // labels' styles are set correctly when they're selected.
366
    // labels' styles are set correctly when they're selected.
324
367
<<<<<<< TREE
325
268
    var radio_buttons = form.queryAll('input.subscribe-option');
368
    var radio_buttons = form.queryAll('input.subscribe-option');
326
269
    Y.each(radio_buttons, function(radio_button) {
369
    Y.each(radio_buttons, function(radio_button) {
327
270
        var weight = radio_button.get('checked') ? 'bold' : 'normal';
370
        var weight = radio_button.get('checked') ? 'bold' : 'normal';
328
271
        radio_button.get('parentNode').setStyle('fontWeight', weight);
371
        radio_button.get('parentNode').setStyle('fontWeight', weight);
329
272
    });
372
    });
330
373
=======
331
374
    var radio_buttons = form.queryAll('input.subscribe-option');
332
375
    if (Y.Lang.isValue(radio_buttons)) {
333
376
        Y.each(radio_buttons, function(radio_button) {
334
377
            var weight = radio_button.get('checked') ? 'bold' : 'normal';
335
378
            radio_button.get('parentNode').setStyle('fontWeight', weight);
336
379
        });
337
380
    }
338
381
>>>>>>> MERGE-SOURCE
339
273
382
340
274
    return subscribe_form_overlay;
383
    return subscribe_form_overlay;
341
275
}
384
}
342
@@ -465,9 +574,142 @@
343
465
    });
574
    });
344
466
};
575
};
345
467
576
346
577
/**
347
578
 * Set up the dupe finder, overriding the default behaviour of the
348
579
 * +filebug search form.
349
580
 */
350
581
function set_up_dupe_finder(transaction_id, response, args) {
351
582
    var filebug_form_container = Y.one('#filebug-form-container');
352
583
    filebug_form_container.set(INNER_HTML, response.responseText);
353
584
354
585
    // Activate the extra options collapsible section on the bug
355
586
    // reporting form.
356
587
    var bug_reporting_form = Y.one('#bug_reporting_form');
357
588
    if (Y.Lang.isValue(bug_reporting_form)) {
358
589
        activateCollapsibles();
359
590
    }
360
591
361
592
    search_button = Y.one(Y.DOM.byId('field.actions.search'));
362
593
363
594
    // Change the name and id of the search field so that it doesn't
364
595
    // confuse the view when we submit a bug report.
365
596
    search_field = Y.one(Y.DOM.byId('field.title'));
366
597
    search_field.set('name', 'field.search');
367
598
    search_field.set('id', 'field.search');
368
599
369
600
    // Update the label on the search button so that it no longer
370
601
    // says "Continue".
371
602
    search_button.set('value', 'Next');
372
603
373
604
    // Set up the handler for the search form.
374
605
    search_form = Y.one('#filebug-search-form');
375
606
    search_form.on('submit', function(e) {
376
607
        // Prevent the event from propagating; we don't want to reload
377
608
        // the page.
378
609
        e.halt();
379
610
        search_for_and_display_dupes();
380
611
    });
381
612
}
382
613
383
614
Y.bugs.setup_dupes = function() {
384
615
    bug_already_reported_expanders = Y.all(
385
616
        'img.bug-already-reported-expander');
386
617
    bug_reporting_form = Y.one('#bug_reporting_form');
387
618
388
619
    if (Y.Lang.isValue(bug_already_reported_expanders)) {
389
620
        // Collapse all the details divs, since we don't want them
390
621
        // expanded first up.
391
622
        Y.each(Y.all('div.duplicate-details'), function(div) {
392
623
            collapse_bug_details(div);
393
624
        });
394
625
395
626
        // Set up the onclick handlers for the expanders.
396
627
        Y.each(Y.all('.similar-bug'), function(row) {
397
628
            var bug_details_div = row.query('div.duplicate-details');
398
629
            var image = row.query('img.bug-already-reported-expander');
399
630
            var bug_title_link = row.query('.duplicate-bug-link');
400
631
            var view_bug_link = row.query('.view-bug-link');
401
632
402
633
            // Shut down the default action for the link and mark it
403
634
            // as a JS'd link. We do this as it's simpler than
404
635
            // trying to find all the bits of the row that we want
405
636
            // to make clickable.
406
637
            bug_title_link.addClass('js-action');
407
638
            bug_title_link.on('click', function(e) {
408
639
                e.preventDefault();
409
640
            });
410
641
411
642
            // The "view this bug" link shouldn't trigger the
412
643
            // collapsible, so we stop the event from propagating.
413
644
            view_bug_link.on('click', function(e) {
414
645
                e.stopPropagation();
415
646
            });
416
647
417
648
            // The same is true for the collapsible section. People
418
649
            // may want to copy and paste this, which involves
419
650
            // clicking, so we stop the onclick event from
420
651
            // propagating here, too.
421
652
            bug_details_div.on('click', function(e) {
422
653
                e.stopPropagation();
423
654
            });
424
655
425
656
            // Set up the on focus handler for the link so that
426
657
            // tabbing will expand the different bugs.
427
658
            bug_title_link.on('focus', function(e) {
428
659
                if (!bug_details_div.hasClass('lazr-opened')) {
429
660
                    var anim = Y.lazr.effects.slide_out(bug_details_div);
430
661
                    anim.run();
431
662
432
663
                    image.set(SRC, EXPANDER_EXPANDED);
433
664
434
665
                    // If the bug reporting form is shown, hide it.
435
666
                    if (bug_reporting_form.getStyle(DISPLAY) == BLOCK) {
436
667
                        bug_reporting_form.addClass(UNSEEN);
437
668
                    }
438
669
                }
439
670
            });
440
671
441
672
            row.on('click', function(e) {
442
673
                if (bug_details_div.hasClass('lazr-opened')) {
443
674
                    collapse_bug_details(image);
444
675
                } else {
445
676
                    var anim = Y.lazr.effects.slide_out(bug_details_div);
446
677
                    anim.run();
447
678
448
679
                    image.set(SRC, EXPANDER_EXPANDED);
449
680
                }
450
681
            });
451
682
        });
452
683
453
684
        // Hide the bug reporting form.
454
685
        bug_reporting_form.addClass(UNSEEN);
455
686
    }
456
687
457
688
    bug_not_reported_button = Y.one('#bug-not-already-reported');
458
689
    if (Y.Lang.isValue(bug_not_reported_button)) {
459
690
        // The bug_not_reported_button won't show up if there aren't any
460
691
        // possible duplicates.
461
692
        bug_not_reported_button.on('click', show_bug_reporting_form);
462
693
    }
463
694
464
695
    // Attach the form overlay to the "Yes, this is my bug" forms.
465
696
    var this_is_my_bug_forms = Y.all('form.this-is-my-bug-form');
466
697
    Y.each(this_is_my_bug_forms, function(form) {
467
698
        var subscribe_form_overlay = create_subscribe_overlay(form);
468
699
469
700
        form.on('submit', function(e) {
470
701
            // We don't care about the original event, so stop it
471
702
            // and show the form overlay that we just created.
472
703
            e.halt();
473
704
            subscribe_form_overlay.show();
474
705
        });
475
706
    });
476
707
};
477
708
478
468
Y.bugs.setup_dupe_finder = function() {
709
Y.bugs.setup_dupe_finder = function() {
479
469
    Y.log("In setup_dupe_finder");
710
    Y.log("In setup_dupe_finder");
480
470
    Y.on('domready', function() {
711
    Y.on('domready', function() {
481
712
<<<<<<< TREE
482
471
        config = {on: {success: set_up_dupe_finder,
713
        config = {on: {success: set_up_dupe_finder,
483
472
                       failure: function() {}}};
714
                       failure: function() {}}};
484
473
715
485
@@ -481,6 +723,21 @@
486
481
                'href');
723
                'href');
487
482
            Y.io(filebug_form_url, config);
724
            Y.io(filebug_form_url, config);
488
483
        }
725
        }
489
726
=======
490
727
        config = {on: {success: set_up_dupe_finder,
491
728
                       failure: function() {}}};
492
729
493
730
        // Load the filebug form asynchronously. If this fails we
494
731
        // degrade to the standard mode for bug filing, clicking through
495
732
        // to the second part of the bug filing form.
496
733
        var filebug_form_url_element = Y.one(
497
734
            '#filebug-form-url');
498
735
        if (Y.Lang.isValue(filebug_form_url_element)) {
499
736
            var filebug_form_url = filebug_form_url_element.getAttribute(
500
737
                'href');
501
738
            Y.io(filebug_form_url, config);
502
739
        }
503
740
>>>>>>> MERGE-SOURCE
504
484
    });
741
    });
505
485
};
742
};
506
486
743
507
487
744
508
=== modified file 'lib/lp/archiveuploader/tests/test_utils.py'
509
--- lib/lp/archiveuploader/tests/test_utils.py	2009-11-18 02:58:23 +0000
510
+++ lib/lp/archiveuploader/tests/test_utils.py	2009-12-14 08:43:38 +0000
511
@@ -10,6 +10,7 @@
512
10
import shutil
10
import shutil
513
11
11
514
12
from lp.registry.interfaces.sourcepackage import SourcePackageFileType
12
from lp.registry.interfaces.sourcepackage import SourcePackageFileType
515
13
from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFileType
516
13
from lp.archiveuploader.tests import datadir
14
from lp.archiveuploader.tests import datadir
517
14
15
518
15
16
519
@@ -72,6 +73,23 @@
520
72
        self.assertEquals(None, determine_source_file_type('foo_1.0'))
73
        self.assertEquals(None, determine_source_file_type('foo_1.0'))
521
73
        self.assertEquals(None, determine_source_file_type('foo_1.0.blah.gz'))
74
        self.assertEquals(None, determine_source_file_type('foo_1.0.blah.gz'))
522
74
75
523
76
    def test_determine_binary_file_type(self):
524
77
        """lp.archiveuploader.utils.determine_binary_file_type should work."""
525
78
        from lp.archiveuploader.utils import determine_binary_file_type
526
79
527
80
        # .deb -> DEB
528
81
        self.assertEquals(
529
82
            determine_binary_file_type('foo_1.0-1_all.deb'),
530
83
            BinaryPackageFileType.DEB)
531
84
532
85
        # .udeb -> UDEB
533
86
        self.assertEquals(
534
87
            determine_binary_file_type('foo_1.0-1_all.udeb'),
535
88
            BinaryPackageFileType.UDEB)
536
89
537
90
        self.assertEquals(determine_binary_file_type('foo_1.0'), None)
538
91
        self.assertEquals(determine_binary_file_type('foo_1.0.notdeb'), None)
539
92
540
75
    def testPrefixMultilineString(self):
93
    def testPrefixMultilineString(self):
541
76
        """lp.archiveuploader.utils.prefix_multi_line_string should work"""
94
        """lp.archiveuploader.utils.prefix_multi_line_string should work"""
542
77
        from lp.archiveuploader.utils import prefix_multi_line_string
95
        from lp.archiveuploader.utils import prefix_multi_line_string
543
78
96
544
=== modified file 'lib/lp/archiveuploader/utils.py'
545
--- lib/lp/archiveuploader/utils.py	2009-11-14 02:59:34 +0000
546
+++ lib/lp/archiveuploader/utils.py	2009-12-14 08:43:37 +0000
547
@@ -17,6 +17,7 @@
548
17
    're_changes_file_name',
17
    're_changes_file_name',
549
18
    're_extract_src_version',
18
    're_extract_src_version',
550
19
    'get_source_file_extension',
19
    'get_source_file_extension',
551
20
    'determine_binary_file_type',
552
20
    'determine_source_file_type',
21
    'determine_source_file_type',
553
21
    'prefix_multi_line_string',
22
    'prefix_multi_line_string',
554
22
    'safe_fix_maintainer',
23
    'safe_fix_maintainer',
555
@@ -88,6 +89,19 @@
556
88
        return None
89
        return None
557
89
90
558
90
91
559
92
def determine_binary_file_type(filename):
560
93
    """Determine the BinaryPackageFileType of the given filename."""
561
94
    # Avoid circular imports.
562
95
    from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFileType
563
96
564
97
    if filename.endswith(".deb"):
565
98
        return BinaryPackageFileType.DEB
566
99
    elif filename.endswith(".udeb"):
567
100
        return BinaryPackageFileType.UDEB
568
101
    else:
569
102
        return None
570
103
571
104
572
91
def prefix_multi_line_string(str, prefix, include_blank_lines=0):
105
def prefix_multi_line_string(str, prefix, include_blank_lines=0):
573
92
    """Utility function to split an input string and prefix,
106
    """Utility function to split an input string and prefix,
574
93
107
575
94
108
576
=== modified file 'lib/lp/bugs/browser/bugtarget.py'
577
--- lib/lp/bugs/browser/bugtarget.py	2009-12-11 10:58:46 +0000
578
+++ lib/lp/bugs/browser/bugtarget.py	2009-12-14 08:43:37 +0000
579
@@ -360,6 +360,11 @@
580
360
            if 'field.actions' in key] != [] or
360
            if 'field.actions' in key] != [] or
581
361
            self.user.inTeam(bug_supervisor))
361
            self.user.inTeam(bug_supervisor))
582
362
362
583
363
    @property
584
364
    def use_asynchronous_dupefinder(self):
585
365
        """Return True if the asynchronous dupe finder can be used."""
586
366
        return IProduct.providedBy(self.context)
587
367
588
363
    def getPackageNameFieldCSSClass(self):
368
    def getPackageNameFieldCSSClass(self):
589
364
        """Return the CSS class for the packagename field."""
369
        """Return the CSS class for the packagename field."""
590
365
        if self.widget_errors.get("packagename"):
370
        if self.widget_errors.get("packagename"):
591
@@ -700,6 +705,7 @@
592
700
        """Override this method in base classes to show the filebug form."""
705
        """Override this method in base classes to show the filebug form."""
593
701
        raise NotImplementedError
706
        raise NotImplementedError
594
702
707
595
708
<<<<<<< TREE
596
703
    @property
709
    @property
597
704
    def inline_filebug_base_url(self):
710
    def inline_filebug_base_url(self):
598
705
        """Return the base URL for the current request.
711
        """Return the base URL for the current request.
599
@@ -729,6 +735,28 @@
600
729
            url = urlappend(url, self.extra_data_token)
735
            url = urlappend(url, self.extra_data_token)
601
730
        return url
736
        return url
602
731
737
603
738
=======
604
739
    @property
605
740
    def inline_filebug_form_url(self):
606
741
        """The URL to the inline filebug form.
607
742
608
743
        If a token was passed to this view, it will be be passed through
609
744
        to the inline bug filing form via the returned URL.
610
745
        """
611
746
        url = canonical_url(self.context, view_name='+filebug-inline-form')
612
747
        if self.extra_data_token is not None:
613
748
            url = urlappend(url, self.extra_data_token)
614
749
        return url
615
750
616
751
    @property
617
752
    def duplicate_search_url(self):
618
753
        """The URL to the inline duplicate search view."""
619
754
        url = canonical_url(self.context, view_name='+filebug-show-similar')
620
755
        if self.extra_data_token is not None:
621
756
            url = urlappend(url, self.extra_data_token)
622
757
        return url
623
758
624
759
>>>>>>> MERGE-SOURCE
625
732
    def publishTraverse(self, request, name):
760
    def publishTraverse(self, request, name):
626
733
        """See IBrowserPublisher."""
761
        """See IBrowserPublisher."""
627
734
        if self.extra_data_token is not None:
762
        if self.extra_data_token is not None:
628
735
763
629
=== modified file 'lib/lp/bugs/browser/tests/bugtarget-filebug-views.txt'
630
--- lib/lp/bugs/browser/tests/bugtarget-filebug-views.txt	2009-12-10 17:29:26 +0000
631
+++ lib/lp/bugs/browser/tests/bugtarget-filebug-views.txt	2009-12-14 08:43:38 +0000
632
@@ -43,6 +43,7 @@
633
43
    u'Test description.'
43
    u'Test description.'
634
44
44
635
45
45
636
46
<<<<<<< TREE
637
46
== URLs to additional FileBug elements ==
47
== URLs to additional FileBug elements ==
638
47
48
639
48
FileBugViewBase's inline_filebug_base_url returns the base URL for all
49
FileBugViewBase's inline_filebug_base_url returns the base URL for all
640
@@ -90,6 +91,27 @@
641
90
    http://launchpad.dev/evolution/+filebug-show-similar
91
    http://launchpad.dev/evolution/+filebug-show-similar
642
91
92
643
92
93
644
94
=======
645
95
== URLs to additional FileBug elements ==
646
96
647
97
FileBugViewBase provides properties that return the URLs of further
648
98
useful parts of the +filebug process.
649
99
650
100
The inline_filebug_form_url property returns the URL of the inline
651
101
filebug form so that it may be loaded asynchronously.
652
102
653
103
    >>> print filebug_view.inline_filebug_form_url
654
104
    http://launchpad.dev/ubuntu/+source/mozilla-firefox/+filebug-inline-form
655
105
656
106
Similarly, the duplicate_search_url property returns the base URL for
657
107
the duplicate search view, which can be used to load the list of
658
108
possible duplicates for a bug asynchronously.
659
109
660
110
    >>> print filebug_view.duplicate_search_url
661
111
    http://launchpad.dev/ubuntu/+source/mozilla-firefox/+filebug-show-similar
662
112
663
113
664
114
>>>>>>> MERGE-SOURCE
665
93
== Adding extra info to filed bugs ==
115
== Adding extra info to filed bugs ==
666
94
116
667
95
It's possible for bug reporting tools to upload a file with debug
117
It's possible for bug reporting tools to upload a file with debug
668
96
118
669
=== modified file 'lib/lp/bugs/stories/bugattachments/20-edit-bug-attachment.txt'
670
--- lib/lp/bugs/stories/bugattachments/20-edit-bug-attachment.txt	2009-12-10 15:12:22 +0000
671
+++ lib/lp/bugs/stories/bugattachments/20-edit-bug-attachment.txt	2009-12-14 08:43:38 +0000
672
@@ -23,6 +23,7 @@
673
23
23
674
24
...we're redirected to the bug page
24
...we're redirected to the bug page
675
25
25
676
26
<<<<<<< TREE
677
26
    >>> user_browser.url
27
    >>> user_browser.url
678
27
    'http://bugs.launchpad.dev/firefox/+bug/1'
28
    'http://bugs.launchpad.dev/firefox/+bug/1'
679
28
29
680
@@ -67,3 +68,40 @@
681
67
    >>> patch_checkbox = user_browser.getControl('This attachment is a patch')
68
    >>> patch_checkbox = user_browser.getControl('This attachment is a patch')
682
68
    >>> patch_checkbox.selected
69
    >>> patch_checkbox.selected
683
69
    True
70
    True
684
71
=======
685
72
    >>> user_browser.url
686
73
    'http://bugs.launchpad.dev/firefox/+bug/1'
687
74
688
75
    >>> 'Another title' in user_browser.contents
689
76
    True
690
77
691
78
We can edit the attachment to be a patch.
692
79
693
80
    >>> user_browser.getLink(url='+attachment/1').click()
694
81
    >>> user_browser.getControl('This attachment is a patch').selected = True
695
82
    >>> user_browser.getControl('Change').click()
696
83
697
84
    >>> user_browser.url
698
85
    'http://bugs.launchpad.dev/firefox/+bug/1'
699
86
700
87
The attachment that became a patch is now shown in the portlet "Patches"...
701
88
702
89
    >>> patches = find_portlet(user_browser.contents, 'Patches')
703
90
    >>> for li_tag in patches.findAll('li', 'download-attachment'):
704
91
    ...   print li_tag.a.renderContents()
705
92
    Another title
706
93
707
94
...while it is gone from the portlet "Bug attachments".
708
95
709
96
    >>> attachments = find_portlet(user_browser.contents, 'Bug attachments')
710
97
    >>> for li_tag in attachments.findAll('li', 'download-attachment'):
711
98
    ...   print li_tag.a.renderContents()
712
99
    bar.txt
713
100
714
101
The content type of a patch is automatically changed to text/plain.
715
102
716
103
    >>> user_browser.getLink(url='+attachment/1').click()
717
104
    >>> user_browser.getControl('Content Type').value
718
105
    'text/plain'
719
106
720
107
>>>>>>> MERGE-SOURCE
721
70
108
722
=== modified file 'lib/lp/bugs/templates/bug-portlet-attachments.pt'
723
--- lib/lp/bugs/templates/bug-portlet-attachments.pt	2009-12-10 15:07:18 +0000
724
+++ lib/lp/bugs/templates/bug-portlet-attachments.pt	2009-12-14 08:43:39 +0000
725
@@ -2,6 +2,7 @@
726
2
    xmlns:tal="http://xml.zope.org/namespaces/tal"
2
    xmlns:tal="http://xml.zope.org/namespaces/tal"
727
3
    xmlns:metal="http://xml.zope.org/namespaces/metal"
3
    xmlns:metal="http://xml.zope.org/namespaces/metal"
728
4
    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
4
    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
729
5
<<<<<<< TREE
730
5
    tal:omit-tag="">
6
    tal:omit-tag="">
731
6
  <div tal:condition="view/regular_attachments" class="portlet"
7
  <div tal:condition="view/regular_attachments" class="portlet"
732
7
       id="portlet-attachments">
8
       id="portlet-attachments">
733
@@ -48,4 +49,52 @@
734
48
      </li>
49
      </li>
735
49
    </ul>
50
    </ul>
736
50
  </div>
51
  </div>
737
52
=======
738
53
    tal:omit-tag="">
739
54
  <div tal:condition="view/regular_attachments" class="portlet"
740
55
       id="portlet-attachments">
741
56
    <h2>Bug attachments</h2>
742
57
    <ul>
743
58
      <li class="download-attachment"
744
59
          tal:repeat="attachment view/regular_attachments">
745
60
        <a tal:attributes="href attachment/libraryfile/http_url"
746
61
           tal:content="attachment/title"
747
62
           class="sprite download-icon">
748
63
          Attachment Title
749
64
        </a>
750
65
        <small>
751
66
          (<a tal:attributes="href attachment/fmt:url">edit</a>)
752
67
        </small>
753
68
      </li>
754
69
    </ul>
755
70
    <ul>
756
71
      <li>
757
72
        <a tal:attributes="href view/current_bugtask/fmt:url/+addcomment"
758
73
           class="sprite add">Add attachment</a>
759
74
      </li>
760
75
    </ul>
761
76
  </div>
762
77
  <div tal:condition="view/patches" class="portlet" id="portlet-patches">
763
78
    <h2>Patches</h2>
764
79
    <ul>
765
80
      <li class="download-attachment"
766
81
          tal:repeat="attachment view/patches">
767
82
        <a tal:attributes="href attachment/libraryfile/http_url"
768
83
           tal:content="attachment/title"
769
84
           class="sprite download-icon">
770
85
          Attachment Title
771
86
        </a>
772
87
        <small>
773
88
          (<a tal:attributes="href attachment/fmt:url">edit</a>)
774
89
        </small>
775
90
      </li>
776
91
    </ul>
777
92
    <ul>
778
93
      <li>
779
94
        <a tal:attributes="href view/current_bugtask/fmt:url/+addcomment"
780
95
           class="sprite add">Add patch</a>
781
96
      </li>
782
97
    </ul>
783
98
  </div>
784
99
>>>>>>> MERGE-SOURCE
785
51
</div>
100
</div>
786
52
101
787
=== modified file 'lib/lp/bugs/templates/bugtarget-filebug-search.pt'
788
--- lib/lp/bugs/templates/bugtarget-filebug-search.pt	2009-12-11 10:58:46 +0000
789
+++ lib/lp/bugs/templates/bugtarget-filebug-search.pt	2009-12-14 08:43:38 +0000
790
@@ -5,6 +5,7 @@
791
5
  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
5
  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
792
6
  metal:use-macro="view/macro:page/main_only">
6
  metal:use-macro="view/macro:page/main_only">
793
7
7
794
8
<<<<<<< TREE
795
8
  <metal:block fill-slot="head_epilogue">
9
  <metal:block fill-slot="head_epilogue">
796
9
    <script type="text/javascript"
10
    <script type="text/javascript"
797
10
            tal:condition="devmode"
11
            tal:condition="devmode"
798
@@ -22,6 +23,27 @@
799
22
    </script>
23
    </script>
800
23
  </metal:block>
24
  </metal:block>
801
24
25
802
26
=======
803
27
  <metal:block fill-slot="head_epilogue">
804
28
    <script type="text/javascript"
805
29
            tal:condition="devmode"
806
30
            tal:content="string:var yui_base='${yui}';"></script>
807
31
    <script type="text/javascript"
808
32
            tal:condition="devmode"
809
33
            tal:define="lp_js string:${icingroot}/build"
810
34
            tal:attributes="src string:${lp_js}/bugs/filebug-dupefinder.js"></script>
811
35
812
36
    <tal:dupe-finder-js condition="view/use_asynchronous_dupefinder">
813
37
      <script type="text/javascript">
814
38
          LPS.use(
815
39
            'base', 'node', 'oop', 'event', 'bugs.dupe_finder', function(Y) {
816
40
              Y.bugs.setup_dupe_finder();
817
41
          });
818
42
      </script>
819
43
    </tal:dupe-finder-js>
820
44
  </metal:block>
821
45
822
46
>>>>>>> MERGE-SOURCE
823
25
  <div metal:fill-slot="heading">
47
  <div metal:fill-slot="heading">
824
26
    <div tal:condition="view/isPrivate" id="privacy" class="aside private">
48
    <div tal:condition="view/isPrivate" id="privacy" class="aside private">
825
27
      This report will be private, though you can disclose it later.
49
      This report will be private, though you can disclose it later.
826
@@ -106,6 +128,7 @@
827
106
            We add this to hide the standard action buttons.
128
            We add this to hide the standard action buttons.
828
107
          </tal:comment>
129
          </tal:comment>
829
108
        </div>
130
        </div>
830
131
<<<<<<< TREE
831
109
      </div>
132
      </div>
832
110
    </div>
133
    </div>
833
111
134
834
@@ -128,3 +151,25 @@
835
128
  </div>
151
  </div>
836
129
152
837
130
</html>
153
</html>
838
154
=======
839
155
      </div>
840
156
    </div>
841
157
    </tal:uses-malone>
842
158
  </div>
843
159
844
160
  <div id="possible-duplicates" style="text-align: left;">
845
161
  </div>
846
162
  <div id="filebug-form-container" style="display: none;">
847
163
  </div>
848
164
849
165
  <p style="display: none" tal:condition="view/use_asynchronous_dupefinder">
850
166
    <a id="filebug-form-url"
851
167
        tal:attributes="href view/inline_filebug_form_url"></a>
852
168
    <a id="duplicate-search-url"
853
169
        tal:attributes="href view/duplicate_search_url"></a>
854
170
  </p>
855
171
856
172
  </div>
857
173
858
174
</html>
859
175
>>>>>>> MERGE-SOURCE
860
131
176
861
=== modified file 'lib/lp/bugs/templates/bugtasks-and-nominations-table.pt'
862
--- lib/lp/bugs/templates/bugtasks-and-nominations-table.pt	2009-12-11 14:00:13 +0000
863
+++ lib/lp/bugs/templates/bugtasks-and-nominations-table.pt	2009-12-14 08:43:38 +0000
864
@@ -112,7 +112,54 @@
865
112
        define="link context_menu/nominate"
112
        define="link context_menu/nominate"
866
113
        condition="link/enabled"
113
        condition="link/enabled"
867
114
        replace="structure link/render" />
114
        replace="structure link/render" />
868
115
<<<<<<< TREE
869
115
  </tal:also-affects-links>
116
  </tal:also-affects-links>
870
117
=======
871
118
      <span id="affectsmetoo" style="display: inline"
872
119
            tal:condition="link/enabled"
873
120
            tal:define="link context_menu/affectsmetoo;
874
121
                        affected view/current_user_affected_status">
875
122
876
123
        <tal:comment condition="nothing">
877
124
          This .static section is shown in browsers with javascript
878
125
          enabled, and before setup_me_too is run.
879
126
        </tal:comment>
880
127
        <span class="static">
881
128
          <tal:affected condition="affected">
882
129
            <img width="14" height="14" src="/@@/flame-icon" alt="" />
883
130
            This bug affects me too
884
131
          </tal:affected>
885
132
          <tal:not-affected condition="not:affected">
886
133
            This bug doesn't affect me
887
134
          </tal:not-affected>
888
135
          <a href="+affectsmetoo">
889
136
            <img class="editicon" src="/@@/edit" alt="Edit" />
890
137
          </a>
891
138
        </span>
892
139
893
140
        <tal:comment condition="nothing">
894
141
          This .dynamic section is used by setup_me_too to display
895
142
          controls and information in the correct places.
896
143
        </tal:comment>
897
144
        <span class="dynamic unseen">
898
145
          <img src="/@@/flame-icon" alt=""/>
899
146
          <a href="+affectsmetoo" class="js-action"
900
147
             ><span class="value">Does this bug affect you?</span></a>
901
148
          <img class="editicon" src="/@@/edit" alt="Edit" />
902
149
        </span>
903
150
904
151
        <script type="text/javascript" tal:content="string:
905
152
          LPS.use('event', 'bugs.bugtask_index', function(Y) {
906
153
              Y.on('load', function(e) {
907
154
                  Y.bugs.setup_me_too(${view/current_user_affected_js_status});
908
155
              }, window);
909
156
          });
910
157
          ">
911
158
        </script>
912
159
913
160
      </span>
914
161
    </tal:also-affects-links>
915
162
>>>>>>> MERGE-SOURCE
916
116
</div>
163
</div>
917
117
164
918
118
</tal:root>
165
</tal:root>
919
119
166
920
=== modified file 'lib/lp/code/browser/branch.py'
921
--- lib/lp/code/browser/branch.py	2009-12-11 00:56:16 +0000
922
+++ lib/lp/code/browser/branch.py	2009-12-14 08:43:37 +0000
923
@@ -83,8 +83,14 @@
924
83
    UICreatableBranchType)
83
    UICreatableBranchType)
925
84
from lp.code.errors import InvalidBranchMergeProposal
84
from lp.code.errors import InvalidBranchMergeProposal
926
85
from lp.code.interfaces.branch import (
85
from lp.code.interfaces.branch import (
929
86
    BranchCreationForbidden, BranchExists, IBranch,
86
<<<<<<< TREE
930
87
    user_has_special_branch_access)
87
    BranchCreationForbidden, BranchExists, IBranch,
931
88
    user_has_special_branch_access)
932
89
=======
933
90
    BranchCreationForbidden, BranchExists, IBranch,
934
91
    user_has_special_branch_access)
935
92
from lp.code.interfaces.branchmergeproposal import InvalidBranchMergeProposal
936
93
>>>>>>> MERGE-SOURCE
937
88
from lp.code.interfaces.branchtarget import IBranchTarget
94
from lp.code.interfaces.branchtarget import IBranchTarget
938
89
from lp.code.interfaces.codeimport import CodeImportReviewStatus
95
from lp.code.interfaces.codeimport import CodeImportReviewStatus
939
90
from lp.code.interfaces.codeimportjob import (
96
from lp.code.interfaces.codeimportjob import (
940
91
97
941
=== modified file 'lib/lp/code/templates/branchmergeproposal-index.pt'
942
--- lib/lp/code/templates/branchmergeproposal-index.pt	2009-12-11 05:07:57 +0000
943
+++ lib/lp/code/templates/branchmergeproposal-index.pt	2009-12-14 08:43:37 +0000
944
@@ -110,6 +110,7 @@
945
110
  </div>
110
  </div>
946
111
111
947
112
  <div class="yui-g">
112
  <div class="yui-g">
948
113
<<<<<<< TREE
949
113
    <tal:not-logged-in condition="not: view/user">
114
    <tal:not-logged-in condition="not: view/user">
950
114
      <div align="center" id="add-comment-login-first">
115
      <div align="center" id="add-comment-login-first">
951
115
        To post a comment you must <a href="+login">log in</a>.
116
        To post a comment you must <a href="+login">log in</a>.
952
@@ -117,6 +118,9 @@
953
117
    </tal:not-logged-in>
118
    </tal:not-logged-in>
954
118
119
955
119
    <div tal:define="link menu/add_comment"
120
    <div tal:define="link menu/add_comment"
956
121
=======
957
122
    <div tal:define="link menu/add_comment"
958
123
>>>>>>> MERGE-SOURCE
959
120
         tal:condition="link/enabled"
124
         tal:condition="link/enabled"
960
121
         tal:content="structure link/render">
125
         tal:content="structure link/render">
961
122
         Add comment
126
         Add comment
962
@@ -125,6 +129,7 @@
963
125
    <div id="conversation"
129
    <div id="conversation"
964
126
         tal:content="structure view/conversation/@@+render"/>
130
         tal:content="structure view/conversation/@@+render"/>
965
127
  </div>
131
  </div>
966
132
<<<<<<< TREE
967
128
133
968
129
  <tal:logged-in condition="view/user">
134
  <tal:logged-in condition="view/user">
969
130
    <div tal:define="comment_form nocall:context/@@+comment;
135
    <div tal:define="comment_form nocall:context/@@+comment;
970
@@ -146,6 +151,22 @@
971
146
    </div>
151
    </div>
972
147
  </tal:logged-in>
152
  </tal:logged-in>
973
148
153
974
154
=======
975
155
  <!-- Hide inline commenting if YUI isn't used. -->
976
156
  <div id="inline-add-comment" style="display: none">
977
157
  <tal:comment replace="structure context/@@+comment/++form++" />
978
158
      <div class="actions" id="launchpad-form-actions">
979
159
        <input type="submit" id="field.actions.add" name="field.actions.add" value="Save Comment" class="button" />
980
160
      </div>
981
161
  </div>
982
162
983
163
  <script type="text/javascript">
984
164
    LPS.use('lp.comment', function(Y) {
985
165
    var comment = new Y.lp.CodeReviewComment();
986
166
    comment.render();
987
167
    })
988
168
  </script>
989
169
>>>>>>> MERGE-SOURCE
990
149
  <div class="yui-g">
170
  <div class="yui-g">
991
150
    <div class="yui-u first">
171
    <div class="yui-u first">
992
151
      <div id="source-revisions"
172
      <div id="source-revisions"
993
@@ -190,7 +211,11 @@
994
190
  string:&lt;script id='codereview-script' type='text/javascript'&gt;" />
211
  string:&lt;script id='codereview-script' type='text/javascript'&gt;" />
995
191
  conf = <tal:status-config replace="view/status_config" />
212
  conf = <tal:status-config replace="view/status_config" />
996
192
  <!--
213
  <!--
997
214
<<<<<<< TREE
998
193
  LPS.use('io-base', 'code.codereview', 'code.branchmergeproposal', 'lp.comment',
215
  LPS.use('io-base', 'code.codereview', 'code.branchmergeproposal', 'lp.comment',
999
216
=======
1000
217
  LPS.use('io-base', 'code.codereview', 'code.branchmergeproposal',
1001
218
>>>>>>> MERGE-SOURCE
1002
194
            function(Y) {
219
            function(Y) {
1003
195
220
1004
196
    Y.on('load', function() {
221
    Y.on('load', function() {
1005
197
222
1006
=== modified file 'lib/lp/registry/browser/distroseries.py'
1007
--- lib/lp/registry/browser/distroseries.py	2009-12-09 19:47:23 +0000
1008
+++ lib/lp/registry/browser/distroseries.py	2009-12-14 08:43:39 +0000
1009
@@ -462,27 +462,59 @@
1010
462
    """A View to show series package to upstream package relationships."""
462
    """A View to show series package to upstream package relationships."""
1011
463
463
1012
464
    label = 'Mapping series packages to upstream project series'
464
    label = 'Mapping series packages to upstream project series'
1037
465
    page_title = 'Upstream packaging links'
465
<<<<<<< TREE
1038
466
466
    page_title = 'Upstream packaging links'
1039
467
    @cachedproperty
467
1040
468
    def unlinked_translatables(self):
468
    @cachedproperty
1041
469
        """The sourcepackages that lack a link to a productseries."""
469
    def unlinked_translatables(self):
1042
470
        packages = self.context.getUnlinkedTranslatableSourcePackages()
470
        """The sourcepackages that lack a link to a productseries."""
1043
471
        if self.context.distribution.full_functionality:
471
        packages = self.context.getUnlinkedTranslatableSourcePackages()
1044
472
            # Launchpad knows exactly what is published in the series.
472
        if self.context.distribution.full_functionality:
1045
473
            packages = [package for package in packages
473
            # Launchpad knows exactly what is published in the series.
1046
474
                        if package.currentrelease is not None]
474
            packages = [package for package in packages
1047
475
        return packages
475
                        if package.currentrelease is not None]
1048
476
476
        return packages
1049
477
    @cachedproperty
477
1050
478
    def show_unlinked_translatables(self):
478
    @cachedproperty
1051
479
        """Are there unlinked translatables and should they be shown."""
479
    def show_unlinked_translatables(self):
1052
480
        return (
480
        """Are there unlinked translatables and should they be shown."""
1053
481
            len(self.unlinked_translatables) > 0
481
        return (
1054
482
            and self.cached_packagings.start == 0)
482
            len(self.unlinked_translatables) > 0
1055
483
483
            and self.cached_packagings.start == 0)
1056
484
    @cachedproperty
484
1057
485
    def cached_packagings(self):
485
    @cachedproperty
1058
486
        """The batched upstream packaging links."""
486
    def cached_packagings(self):
1059
487
        packagings = self.context.packagings
487
        """The batched upstream packaging links."""
1060
488
        return BatchNavigator(packagings, self.request, size=200)
488
        packagings = self.context.packagings
1061
489
        return BatchNavigator(packagings, self.request, size=200)
1062
490
=======
1063
491
    page_title = 'Upstream packaging links'
1064
492
1065
493
    @cachedproperty
1066
494
    def unlinked_translatables(self):
1067
495
        """The sourcepackages that lack a link to a productseries."""
1068
496
        packages = self.context.getUnlinkedTranslatableSourcePackages()
1069
497
        if self.context.distribution.full_functionality:
1070
498
            # Launchpad knows exactly what is published in the series.
1071
499
            packages = [package for package in packages
1072
500
                        if package.currentrelease is not None]
1073
501
        return packages
1074
502
1075
503
    @cachedproperty
1076
504
    def show_unlinked_translatables(self):
1077
505
        """Are there unlinked translatables and should they be shown."""
1078
506
        return (
1079
507
            len(self.unlinked_translatables) > 0
1080
508
            and self.cached_packagings.start == 0)
1081
509
1082
510
    @cachedproperty
1083
511
    def cached_packagings(self):
1084
512
        """The batched upstream packaging links."""
1085
513
        packagings = self.context.packagings
1086
514
        if self.context.distribution.full_functionality:
1087
515
            # Launchpad knows exactly what is published in the series.
1088
516
            packagings = [
1089
517
                packaging for packaging in packagings
1090
518
                if packaging.sourcepackage.currentrelease is not None]
1091
519
        return BatchNavigator(packagings, self.request, size=200)
1092
520
>>>>>>> MERGE-SOURCE
1093
489
521
1094
=== modified file 'lib/lp/registry/browser/tests/packaging-views.txt'
1095
--- lib/lp/registry/browser/tests/packaging-views.txt	2009-12-10 20:03:11 +0000
1096
+++ lib/lp/registry/browser/tests/packaging-views.txt	2009-12-14 08:43:38 +0000
1097
@@ -341,6 +341,7 @@
1098
341
    sarge hotter
341
    sarge hotter
1099
342
    7.0 hotter
342
    7.0 hotter
1100
343
    grumpy hotter
343
    grumpy hotter
1101
344
<<<<<<< TREE
1102
344
345
1103
345
346
1104
346
Distro series +packaging view
347
Distro series +packaging view
1105
@@ -390,3 +391,60 @@
1106
390
    ...     hoary, name='+packaging', query_string='start=2')
391
    ...     hoary, name='+packaging', query_string='start=2')
1107
391
    >>> view.show_unlinked_translatables
392
    >>> view.show_unlinked_translatables
1108
392
    False
393
    False
1109
394
=======
1110
395
1111
396
1112
397
Distro series +packaging view
1113
398
-----------------------------
1114
399
1115
400
The DistroSeriesPackagesView shows the packages in a distro series that
1116
401
are linked to upstream projects.
1117
402
1118
403
    >>> view = create_initialized_view(hoary, name='+packaging')
1119
404
    >>> print view.label
1120
405
    Mapping series packages to upstream project series
1121
406
1122
407
    >>> print view.page_title
1123
408
    Upstream packaging links
1124
409
1125
410
The view provides a property to get the source packages that have
1126
411
translations, but are not linked to an upstream project. The view filters
1127
412
unpublished versions from full functionality distributions like Ubuntu.
1128
413
1129
414
    >>> hoary.getUnlinkedTranslatableSourcePackages()
1130
415
    [<SourcePackage .../hoary/pmount>, <SourcePackage .../hoary/mozilla>]
1131
416
1132
417
    >>> view.show_unlinked_translatables
1133
418
    True
1134
419
1135
420
    >>> view.unlinked_translatables
1136
421
    [<SourcePackage ubuntu/hoary/pmount>]
1137
422
1138
423
A distro series can have thousands of upstream packaging links. The view
1139
424
provides a batch navigator to access the packagings. The default batch size
1140
425
is 200. The view filters unpublished versions from full functionality
1141
426
distributions like Ubuntu.
1142
427
1143
428
    >>> for packaging in hoary.packagings:
1144
429
    ...     print packaging.sourcepackagename.name
1145
430
    evolution
1146
431
    mozilla-firefox
1147
432
    netapplet
1148
433
1149
434
    >>> batch_navigator = view.cached_packagings
1150
435
    >>> batch_navigator.default_size
1151
436
    200
1152
437
1153
438
    >>> for packaging in batch_navigator.batch:
1154
439
    ...     print packaging.sourcepackagename.name
1155
440
    evolution
1156
441
    netapplet
1157
442
1158
443
The show_unlinked_translatables property is False when the batch is after the
1159
444
first batch.
1160
445
1161
446
    >>> view = create_initialized_view(
1162
447
    ...     hoary, name='+packaging', query_string='start=2')
1163
448
    >>> view.show_unlinked_translatables
1164
449
    False
1165
450
>>>>>>> MERGE-SOURCE
1166
393
451
1167
=== modified file 'lib/lp/registry/interfaces/person.py'
1168
--- lib/lp/registry/interfaces/person.py	2009-12-09 23:11:31 +0000
1169
+++ lib/lp/registry/interfaces/person.py	2009-12-14 08:43:39 +0000
1170
@@ -65,10 +65,16 @@
1171
65
65
1172
66
from canonical.database.sqlbase import block_implicit_flushes
66
from canonical.database.sqlbase import block_implicit_flushes
1173
67
from canonical.launchpad.fields import (
67
from canonical.launchpad.fields import (
1174
68
<<<<<<< TREE
1175
68
    BlacklistableContentNameField, IconImageUpload,
69
    BlacklistableContentNameField, IconImageUpload,
1176
69
    is_private_membership_person, is_public_person, LogoImageUpload,
70
    is_private_membership_person, is_public_person, LogoImageUpload,
1177
70
    MugshotImageUpload, PasswordField, PersonChoice, PublicPersonChoice,
71
    MugshotImageUpload, PasswordField, PersonChoice, PublicPersonChoice,
1178
71
    StrippedTextLine)
72
    StrippedTextLine)
1179
73
=======
1180
74
    BlacklistableContentNameField, IconImageUpload, is_private_membership,
1181
75
    is_valid_public_person, LogoImageUpload, MugshotImageUpload,
1182
76
    PasswordField, PersonChoice, PublicPersonChoice, StrippedTextLine)
1183
77
>>>>>>> MERGE-SOURCE
1184
72
from canonical.launchpad.interfaces.account import AccountStatus, IAccount
78
from canonical.launchpad.interfaces.account import AccountStatus, IAccount
1185
73
from canonical.launchpad.interfaces.emailaddress import IEmailAddress
79
from canonical.launchpad.interfaces.emailaddress import IEmailAddress
1186
74
from lp.app.interfaces.headings import IRootContext
80
from lp.app.interfaces.headings import IRootContext
1187
75
81
1188
=== modified file 'lib/lp/registry/stories/distroseries/xx-show-distroseries-packaging.txt'
1189
--- lib/lp/registry/stories/distroseries/xx-show-distroseries-packaging.txt	2009-12-10 19:58:31 +0000
1190
+++ lib/lp/registry/stories/distroseries/xx-show-distroseries-packaging.txt	2009-12-14 08:43:38 +0000
1191
@@ -1,48 +1,98 @@
1240
1
Distro series packaging
1
<<<<<<< TREE
1241
2
=======================
2
Distro series packaging
1242
3
3
=======================
1243
4
The distro series packaging page is accssible to any user from the distro
4
1244
5
series +index page.
5
The distro series packaging page is accssible to any user from the distro
1245
6
6
series +index page.
1246
7
    >>> anon_browser.open('http://launchpad.dev/ubuntu/hoary')
7
1247
8
    >>> anon_browser.getLink('Upstream links').click()
8
    >>> anon_browser.open('http://launchpad.dev/ubuntu/hoary')
1248
9
    >>> print anon_browser.title
9
    >>> anon_browser.getLink('Upstream links').click()
1249
10
    Upstream packaging links : ...
10
    >>> print anon_browser.title
1250
11
11
    Upstream packaging links : ...
1251
12
The page lists the the source packages that have translations, but are
12
1252
13
not linked to an upstream project to sync them to.
13
The page lists the the source packages that have translations, but are
1253
14
14
not linked to an upstream project to sync them to.
1254
15
    >>> content = find_main_content(anon_browser.contents)
15
1255
16
    >>> print extract_text(find_tag_by_id(content, 'unlinked-translatables'))
16
    >>> content = find_main_content(anon_browser.contents)
1256
17
    Unlinked translatable packages
17
    >>> print extract_text(find_tag_by_id(content, 'unlinked-translatables'))
1257
18
    pmount
18
    Unlinked translatable packages
1258
19
19
    pmount
1259
20
The page lists the upstream packaging links.
20
1260
21
21
The page lists the upstream packaging links.
1261
22
    >>> print extract_text(find_tag_by_id(content, 'packagings'))
22
1262
23
    Source Package   Upstream Project Series
23
    >>> print extract_text(find_tag_by_id(content, 'packagings'))
1263
24
    evolution        Evolution trunk series
24
    Source Package   Upstream Project Series
1264
25
    mozilla-firefox  Mozilla Firefox 1.0 series
25
    evolution        Evolution trunk series
1265
26
    netapplet        NetApplet trunk series
26
    mozilla-firefox  Mozilla Firefox 1.0 series
1266
27
27
    netapplet        NetApplet trunk series
1267
28
The packaging links are batched so that users can view the thousands of
28
1268
29
links packages. Users can also hack the URL to set their own batch size.
29
The packaging links are batched so that users can view the thousands of
1269
30
30
links packages. Users can also hack the URL to set their own batch size.
1270
31
    >>> anon_browser.open(
31
1271
32
    ...     'http://launchpad.dev/ubuntu/hoary/+packaging?start=0&batch=1')
32
    >>> anon_browser.open(
1272
33
    >>> print extract_text(find_tag_by_id(
33
    ...     'http://launchpad.dev/ubuntu/hoary/+packaging?start=0&batch=1')
1273
34
    ...     anon_browser.contents, 'packagings'))
34
    >>> print extract_text(find_tag_by_id(
1274
35
    Source Package   Upstream Project Series
35
    ...     anon_browser.contents, 'packagings'))
1275
36
    evolution        Evolution trunk series
36
    Source Package   Upstream Project Series
1276
37
37
    evolution        Evolution trunk series
1277
38
    >>> anon_browser.getLink('Next', index=0).click()
38
1278
39
    >>> content = find_main_content(anon_browser.contents)
39
    >>> anon_browser.getLink('Next', index=0).click()
1279
40
    >>> print extract_text(find_tag_by_id(content, 'packagings'))
40
    >>> content = find_main_content(anon_browser.contents)
1280
41
    Source Package   Upstream Project Series
41
    >>> print extract_text(find_tag_by_id(content, 'packagings'))
1281
42
    mozilla-firefox  Mozilla Firefox 1.0 series
42
    Source Package   Upstream Project Series
1282
43
43
    mozilla-firefox  Mozilla Firefox 1.0 series
1283
44
The unlinked translatable source packages is not displayed on pages after
44
1284
45
the first page.
45
The unlinked translatable source packages is not displayed on pages after
1285
46
46
the first page.
1286
47
    >>> print find_tag_by_id(content, 'unlinked_translatables')
47
1287
48
    None
48
    >>> print find_tag_by_id(content, 'unlinked_translatables')
1288
49
    None
1289
50
=======
1290
51
Distro series packaging
1291
52
=======================
1292
53
1293
54
The distro series packaging page is accssible to any user from the distro
1294
55
series +index page.
1295
56
1296
57
    >>> anon_browser.open('http://launchpad.dev/ubuntu/hoary')
1297
58
    >>> anon_browser.getLink('Upstream links').click()
1298
59
    >>> print anon_browser.title
1299
60
    Upstream packaging links : ...
1300
61
1301
62
The page lists the the source packages that have translations, but are
1302
63
not linked to an upstream project to sync them to.
1303
64
1304
65
    >>> content = find_main_content(anon_browser.contents)
1305
66
    >>> print extract_text(find_tag_by_id(content, 'unlinked-translatables'))
1306
67
    Unlinked translatable packages
1307
68
    pmount
1308
69
1309
70
The page lists the upstream packaging links.
1310
71
1311
72
    >>> print extract_text(find_tag_by_id(content, 'packagings'))
1312
73
    Source Package   Upstream Project Series
1313
74
    evolution        Evolution trunk series
1314
75
    netapplet        NetApplet trunk series
1315
76
1316
77
The packaging links are batched so that users can view the thousands of
1317
78
links packages. Users can also hack the URL to set their own batch size.
1318
79
1319
80
    >>> anon_browser.open(
1320
81
    ...     'http://launchpad.dev/ubuntu/hoary/+packaging?start=0&batch=1')
1321
82
    >>> print extract_text(find_tag_by_id(
1322
83
    ...     anon_browser.contents, 'packagings'))
1323
84
    Source Package   Upstream Project Series
1324
85
    evolution        Evolution trunk series
1325
86
1326
87
    >>> anon_browser.getLink('Next', index=0).click()
1327
88
    >>> content = find_main_content(anon_browser.contents)
1328
89
    >>> print extract_text(find_tag_by_id(content, 'packagings'))
1329
90
    Source Package   Upstream Project Series
1330
91
    netapplet        NetApplet trunk series
1331
92
1332
93
The unlinked translatable source packages is not displayed on pages after
1333
94
the first page.
1334
95
1335
96
    >>> print find_tag_by_id(content, 'unlinked_translatables')
1336
97
    None
1337
98
>>>>>>> MERGE-SOURCE
1338
49
99
1339
=== modified file 'lib/lp/registry/tests/test_productseries_vocabularies.py'
1340
--- lib/lp/registry/tests/test_productseries_vocabularies.py	2009-12-09 23:11:31 +0000
1341
+++ lib/lp/registry/tests/test_productseries_vocabularies.py	2009-12-14 08:43:39 +0000
1342
@@ -1,3 +1,4 @@
1343
1
<<<<<<< TREE
1344
1
# Copyright 2009 Canonical Ltd.  This software is licensed under the
2
# Copyright 2009 Canonical Ltd.  This software is licensed under the
1345
2
# GNU Affero General Public License version 3 (see the file LICENSE).
3
# GNU Affero General Public License version 3 (see the file LICENSE).
1346
3
4
1347
@@ -80,3 +81,77 @@
1348
80
81
1349
81
def test_suite():
82
def test_suite():
1350
82
    return TestLoader().loadTestsFromName(__name__)
83
    return TestLoader().loadTestsFromName(__name__)
1351
84
=======
1352
85
# Copyright 2009 Canonical Ltd.  This software is licensed under the
1353
86
# GNU Affero General Public License version 3 (see the file LICENSE).
1354
87
1355
88
"""Test the milestone vocabularies."""
1356
89
1357
90
__metaclass__ = type
1358
91
1359
92
from unittest import TestLoader
1360
93
from operator import attrgetter
1361
94
1362
95
from lp.registry.vocabularies import ProductSeriesVocabulary
1363
96
from lp.testing import TestCaseWithFactory
1364
97
1365
98
from canonical.testing import DatabaseFunctionalLayer
1366
99
1367
100
1368
101
class TestProductSeriesVocabulary(TestCaseWithFactory):
1369
102
    """Test that the ProductSeriesVocabulary behaves as expected."""
1370
103
    layer = DatabaseFunctionalLayer
1371
104
1372
105
    def setUp(self):
1373
106
        super(TestProductSeriesVocabulary, self).setUp()
1374
107
        self.vocabulary = ProductSeriesVocabulary()
1375
108
        self.product_prefix = 'asdf987-'
1376
109
        self.series1_prefix = 'qwerty-'
1377
110
        self.product = self.factory.makeProduct(
1378
111
            self.product_prefix + 'product1')
1379
112
        self.series = self.factory.makeProductSeries(
1380
113
            product=self.product, name=self.series1_prefix + "series1")
1381
114
1382
115
    def tearDown(self):
1383
116
        super(TestProductSeriesVocabulary, self).tearDown()
1384
117
1385
118
    def test_search(self):
1386
119
        series2 = self.factory.makeProductSeries(product=self.product)
1387
120
        # Search by product name.
1388
121
        result = self.vocabulary.search(self.product.name)
1389
122
        self.assertEqual(
1390
123
            [self.series, series2].sort(key=attrgetter('id')),
1391
124
            list(result).sort(key=attrgetter('id')))
1392
125
        # Search by series name.
1393
126
        result = self.vocabulary.search(self.series.name)
1394
127
        self.assertEqual([self.series], list(result))
1395
128
        # Search by series2 name.
1396
129
        result = self.vocabulary.search(series2.name)
1397
130
        self.assertEqual([series2], list(result))
1398
131
        # Search by product & series name substrings.
1399
132
        result = self.vocabulary.search(
1400
133
            '%s/%s' % (self.product_prefix, self.series1_prefix))
1401
134
        self.assertEqual([self.series], list(result))
1402
135
1403
136
    def test_toTerm(self):
1404
137
        term = self.vocabulary.toTerm(self.series)
1405
138
        self.assertEqual(
1406
139
            '%s/%s' % (self.product.name, self.series.name),
1407
140
            term.token)
1408
141
        self.assertEqual(self.series, term.value)
1409
142
1410
143
    def test_getTermByToken(self):
1411
144
        token = '%s/%s' % (self.product.name, self.series.name)
1412
145
        term = self.vocabulary.getTermByToken(token)
1413
146
        self.assertEqual(token, term.token)
1414
147
        self.assertEqual(self.series, term.value)
1415
148
1416
149
    def test_getTermByToken_LookupError(self):
1417
150
        self.assertRaises(
1418
151
            LookupError,
1419
152
            self.vocabulary.getTermByToken, 'does/notexist')
1420
153
1421
154
1422
155
def test_suite():
1423
156
    return TestLoader().loadTestsFromName(__name__)
1424
157
>>>>>>> MERGE-SOURCE
1425
83
158
1426
=== modified file 'lib/lp/soyuz/doc/gina.txt'
1427
--- lib/lp/soyuz/doc/gina.txt	2009-09-09 21:41:04 +0000
1428
+++ lib/lp/soyuz/doc/gina.txt	2009-12-14 08:43:38 +0000
1429
@@ -187,7 +187,7 @@
1430
187
    16
187
    16
1431
188
    >>> count = SourcePackageRelease.select().count()
188
    >>> count = SourcePackageRelease.select().count()
1432
189
    >>> count - orig_spr_count
189
    >>> count - orig_spr_count
1434
190
    16
190
    17
1435
191
191
1436
192
Check that x11proto-damage has its Build-Depends-Indep value correctly set:
192
Check that x11proto-damage has its Build-Depends-Indep value correctly set:
1437
193
193
1438
@@ -317,13 +317,13 @@
1439
317
      util-linux (again, poor thing)
317
      util-linux (again, poor thing)
1440
318
318
1441
319
    >>> print SSPPH.select().count() - orig_sspph_count
319
    >>> print SSPPH.select().count() - orig_sspph_count
1443
320
    19
320
    20
1444
321
321
1445
322
    >>> print SSPPH.selectBy(
322
    >>> print SSPPH.selectBy(
1446
323
    ...     componentID=1,
323
    ...     componentID=1,
1447
324
    ...     pocket=PackagePublishingPocket.RELEASE).count() - \
324
    ...     pocket=PackagePublishingPocket.RELEASE).count() - \
1448
325
    ...     orig_sspph_main_count
325
    ...     orig_sspph_main_count
1450
326
    19
326
    20
1451
327
327
1452
328
=== Testing Binary Package Results ===
328
=== Testing Binary Package Results ===
1453
329
329
1454
@@ -441,11 +441,11 @@
1455
441
    >>> print p.name
441
    >>> print p.name
1456
442
    cjwatson
442
    cjwatson
1457
443
    >>> print Person.select().count() - orig_person_count
443
    >>> print Person.select().count() - orig_person_count
1459
444
    12
444
    13
1460
445
    >>> print TeamParticipation.select().count() - orig_tp_count
445
    >>> print TeamParticipation.select().count() - orig_tp_count
1462
446
    12
446
    13
1463
447
    >>> print EmailAddress.select().count() - orig_email_count
447
    >>> print EmailAddress.select().count() - orig_email_count
1465
448
    12
448
    13
1466
449
449
1467
450
450
1468
451
=== Re-run Gina ===
451
=== Re-run Gina ===
1469
@@ -515,13 +515,13 @@
1470
515
changed, etc.
515
changed, etc.
1471
516
516
1472
517
    >>> SourcePackageRelease.select().count() - orig_spr_count
517
    >>> SourcePackageRelease.select().count() - orig_spr_count
1474
518
    16
518
    17
1475
519
    >>> print Person.select().count() - orig_person_count
519
    >>> print Person.select().count() - orig_person_count
1477
520
    12
520
    13
1478
521
    >>> print TeamParticipation.select().count() - orig_tp_count
521
    >>> print TeamParticipation.select().count() - orig_tp_count
1480
522
    12
522
    13
1481
523
    >>> print EmailAddress.select().count() - orig_email_count
523
    >>> print EmailAddress.select().count() - orig_email_count
1483
524
    12
524
    13
1484
525
    >>> BinaryPackageRelease.select().count() - orig_bpr_count
525
    >>> BinaryPackageRelease.select().count() - orig_bpr_count
1485
526
    40
526
    40
1486
527
    >>> Build.select().count() - orig_build_count
527
    >>> Build.select().count() - orig_build_count
1487
@@ -532,7 +532,7 @@
1488
532
    >>> SBPPH.select().count() - orig_sbpph_count
532
    >>> SBPPH.select().count() - orig_sbpph_count
1489
533
    47
533
    47
1490
534
    >>> print SSPPH.select().count() - orig_sspph_count
534
    >>> print SSPPH.select().count() - orig_sspph_count
1492
535
    21
535
    22
1493
536
536
1494
537
Check that the overrides we did were correctly issued. We can't use selectOneBy
537
Check that the overrides we did were correctly issued. We can't use selectOneBy
1495
538
because, of course, there may be multiple rows published for that package --
538
because, of course, there may be multiple rows published for that package --
1496
539
539
1497
=== modified file 'lib/lp/soyuz/scripts/gina/handlers.py'
1498
--- lib/lp/soyuz/scripts/gina/handlers.py	2009-11-10 01:00:23 +0000
1499
+++ lib/lp/soyuz/scripts/gina/handlers.py	2009-12-14 08:43:39 +0000
1500
@@ -29,6 +29,8 @@
1501
29
29
1502
30
from lp.archivepublisher.diskpool import poolify
30
from lp.archivepublisher.diskpool import poolify
1503
31
from lp.archiveuploader.tagfiles import parse_tagfile
31
from lp.archiveuploader.tagfiles import parse_tagfile
1504
32
from lp.archiveuploader.utils import (determine_binary_file_type,
1505
33
    determine_source_file_type)
1506
32
34
1507
33
from canonical.database.sqlbase import sqlvalues
35
from canonical.database.sqlbase import sqlvalues
1508
34
36
1509
@@ -47,9 +49,9 @@
1510
47
from lp.registry.interfaces.person import IPersonSet, PersonCreationRationale
49
from lp.registry.interfaces.person import IPersonSet, PersonCreationRationale
1511
48
from lp.registry.interfaces.sourcepackage import SourcePackageType
50
from lp.registry.interfaces.sourcepackage import SourcePackageType
1512
49
from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
51
from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
1513
52
from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat
1514
50
from lp.soyuz.interfaces.build import BuildStatus
53
from lp.soyuz.interfaces.build import BuildStatus
1515
51
from lp.soyuz.interfaces.publishing import PackagePublishingStatus
54
from lp.soyuz.interfaces.publishing import PackagePublishingStatus
1516
52
from canonical.launchpad.helpers import getFileType, getBinaryPackageFormat
1517
53
55
1518
54
56
1519
55
def check_not_in_librarian(files, archive_root, directory):
57
def check_not_in_librarian(files, archive_root, directory):
1520
@@ -78,6 +80,39 @@
1521
78
    return to_upload
80
    return to_upload
1522
79
81
1523
80
82
1524
83
BINARYPACKAGE_EXTENSIONS = {
1525
84
    BinaryPackageFormat.DEB: '.deb',
1526
85
    BinaryPackageFormat.UDEB: '.udeb',
1527
86
    BinaryPackageFormat.RPM: '.rpm'}
1528
87
1529
88
1530
89
class UnrecognizedBinaryFormat(Exception):
1531
90
1532
91
    def __init__(self, fname, *args):
1533
92
        Exception.__init__(self, *args)
1534
93
        self.fname = fname
1535
94
1536
95
    def __str__(self):
1537
96
        return '%s is not recognized as a binary file.' % self.fname
1538
97
1539
98
1540
99
def getBinaryPackageFormat(fname):
1541
100
    """Return the BinaryPackageFormat for the given filename.
1542
101
1543
102
    >>> getBinaryPackageFormat('mozilla-firefox_0.9_i386.deb').name
1544
103
    'DEB'
1545
104
    >>> getBinaryPackageFormat('debian-installer.9_all.udeb').name
1546
105
    'UDEB'
1547
106
    >>> getBinaryPackageFormat('network-manager.9_i386.rpm').name
1548
107
    'RPM'
1549
108
    """
1550
109
    for key, value in BINARYPACKAGE_EXTENSIONS.items():
1551
110
        if fname.endswith(value):
1552
111
            return key
1553
112
1554
113
    raise UnrecognizedBinaryFormat(fname)
1555
114
1556
115
1557
81
class DataSetupError(Exception):
116
class DataSetupError(Exception):
1558
82
    """Raised when required data is found to be missing in the database"""
117
    """Raised when required data is found to be missing in the database"""
1559
83
118
1560
@@ -613,9 +648,10 @@
1561
613
        # SourcePackageReleaseFile entry on lp db.
648
        # SourcePackageReleaseFile entry on lp db.
1562
614
        for fname, path in to_upload:
649
        for fname, path in to_upload:
1563
615
            alias = getLibraryAlias(path, fname)
650
            alias = getLibraryAlias(path, fname)
1567
616
            SourcePackageReleaseFile(sourcepackagerelease=spr.id,
651
            SourcePackageReleaseFile(
1568
617
                                     libraryfile=alias,
652
                sourcepackagerelease=spr.id,
1569
618
                                     filetype=getFileType(fname))
653
                libraryfile=alias,
1570
654
                filetype=determine_source_file_type(fname))
1571
619
            log.info('Package file %s included into library' % fname)
655
            log.info('Package file %s included into library' % fname)
1572
620
656
1573
621
        return spr
657
        return spr
1574
@@ -805,9 +841,10 @@
1575
805
                 (bin_name.name, bin.version))
841
                 (bin_name.name, bin.version))
1576
806
842
1577
807
        alias = getLibraryAlias(path, fname)
843
        alias = getLibraryAlias(path, fname)
1581
808
        BinaryPackageFile(binarypackagerelease=binpkg.id,
844
        BinaryPackageFile(
1582
809
                          libraryfile=alias,
845
            binarypackagerelease=binpkg.id,
1583
810
                          filetype=getFileType(fname))
846
            libraryfile=alias,
1584
847
            filetype=determine_binary_file_type(fname))
1585
811
        log.info('Package file %s included into library' % fname)
848
        log.info('Package file %s included into library' % fname)
1586
812
849
1587
813
        # Return the binarypackage object.
850
        # Return the binarypackage object.
1588
814
851
1589
=== modified file 'lib/lp/soyuz/scripts/tests/gina_test_archive/dists/breezy/main/source/Sources'
1590
--- lib/lp/soyuz/scripts/tests/gina_test_archive/dists/breezy/main/source/Sources	2005-11-05 18:06:43 +0000
1591
+++ lib/lp/soyuz/scripts/tests/gina_test_archive/dists/breezy/main/source/Sources	2009-12-14 08:43:39 +0000
1592
@@ -139,6 +139,23 @@
1593
139
 7947f81d47c3ccdadf05d5e4a120b098 41936 x11proto-damage_6.8.99.7.orig.tar.gz
139
 7947f81d47c3ccdadf05d5e4a120b098 41936 x11proto-damage_6.8.99.7.orig.tar.gz
1594
140
 a4e78902d591d87ab864cedc1e83278d 2201 x11proto-damage_6.8.99.7-2.diff.gz
140
 a4e78902d591d87ab864cedc1e83278d 2201 x11proto-damage_6.8.99.7-2.diff.gz
1595
141
141
1596
142
Package: bar
1597
143
Binary: bar
1598
144
Version: 1.0-1
1599
145
Priority: optional
1600
146
Section: misc
1601
147
Maintainer: Launchpad team <launchpad@lists.canonical.com>
1602
148
Architecture: all
1603
149
Standards-Version: 3.6.2
1604
150
Format: 3.0 (quilt)
1605
151
Directory: pool/main/b/bar
1606
152
Files: 
1607
153
 662977e76501561c902c34bf94a2054d 1115 bar_1.0-1.dsc
1608
154
 eed105761436486f7eebaa8c017bc59a 178 bar_1.0.orig-comp1.tar.gz
1609
155
 0a30b50fa846e75261808ee1f41d1cbe 156 bar_1.0.orig-comp2.tar.bz2
1610
156
 fc1464e5985b962a042d5354452f361d 164 bar_1.0.orig.tar.gz
1611
157
 e68110184d4d9e7afd81520cc490b396 737 bar_1.0-1.debian.tar.bz2
1612
158
1613
142
Bogus, bogus, bogus
159
Bogus, bogus, bogus
1614
143
ain't invalid stanza's neat?
160
ain't invalid stanza's neat?
1615
144
161
1616
145
162
1617
=== modified file 'lib/lp/soyuz/scripts/tests/gina_test_archive/dists/breezy/main/source/Sources.gz'
1618
146
Binary files lib/lp/soyuz/scripts/tests/gina_test_archive/dists/breezy/main/source/Sources.gz	2005-11-11 11:35:22 +0000 and lib/lp/soyuz/scripts/tests/gina_test_archive/dists/breezy/main/source/Sources.gz	2009-12-14 08:43:38 +0000 differ
163
Binary files lib/lp/soyuz/scripts/tests/gina_test_archive/dists/breezy/main/source/Sources.gz	2005-11-11 11:35:22 +0000 and lib/lp/soyuz/scripts/tests/gina_test_archive/dists/breezy/main/source/Sources.gz	2009-12-14 08:43:38 +0000 differ
1619
=== added directory 'lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar'
1620
=== added file 'lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0-1.debian.tar.bz2'
1621
147
Binary files lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0-1.debian.tar.bz2	1970-01-01 00:00:00 +0000 and lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0-1.debian.tar.bz2	2009-12-14 08:43:39 +0000 differ
164
Binary files lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0-1.debian.tar.bz2	1970-01-01 00:00:00 +0000 and lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0-1.debian.tar.bz2	2009-12-14 08:43:39 +0000 differ
1622
=== added file 'lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0-1.dsc'
1623
--- lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0-1.dsc	1970-01-01 00:00:00 +0000
1624
+++ lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0-1.dsc	2009-12-14 08:43:38 +0000
1625
@@ -0,0 +1,22 @@
1626
1
Format: 3.0 (quilt)
1627
2
Source: bar
1628
3
Binary: bar
1629
4
Architecture: any
1630
5
Version: 1.0-1
1631
6
Maintainer: Launchpad team <launchpad@lists.canonical.com>
1632
7
Standards-Version: 3.6.2
1633
8
Checksums-Sha1: 
1634
9
 e7a106587e0f11220e27ccc5db7527cae05e4054 178 bar_1.0.orig-comp1.tar.gz
1635
10
 a645cc0856469f549f11bb9bdc4ca6dda4eedd4b 156 bar_1.0.orig-comp2.tar.bz2
1636
11
 73a04163fee97fd2257ab266bd48f1d3d528e012 164 bar_1.0.orig.tar.gz
1637
12
 727de2395d3a3e35c375159db01072935fea02f8 737 bar_1.0-1.debian.tar.bz2
1638
13
Checksums-Sha256: 
1639
14
 aff0bbc01c5883ac76e89cba7a9b6cd79b521183f0de86c93e93ab8804f5a256 178 bar_1.0.orig-comp1.tar.gz
1640
15
 955131b3a5bd881c008ff822c0f9b7544350647fe1f355f65a138e0e5e5e8d71 156 bar_1.0.orig-comp2.tar.bz2
1641
16
 f1ecff929899b567f45d6734b69d59a4f3c04dabce3cc8e6ed6d64073eda360e 164 bar_1.0.orig.tar.gz
1642
17
 3d2137f9f80f4b6c80f73acb8b3ac7986c962c4268d8948f54823d27148a6116 737 bar_1.0-1.debian.tar.bz2
1643
18
Files: 
1644
19
 eed105761436486f7eebaa8c017bc59a 178 bar_1.0.orig-comp1.tar.gz
1645
20
 0a30b50fa846e75261808ee1f41d1cbe 156 bar_1.0.orig-comp2.tar.bz2
1646
21
 fc1464e5985b962a042d5354452f361d 164 bar_1.0.orig.tar.gz
1647
22
 e68110184d4d9e7afd81520cc490b396 737 bar_1.0-1.debian.tar.bz2
1648
0
23
1649
=== added file 'lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0.orig-comp1.tar.gz'
1650
1
Binary files lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0.orig-comp1.tar.gz	1970-01-01 00:00:00 +0000 and lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0.orig-comp1.tar.gz	2009-12-14 08:43:39 +0000 differ
24
Binary files lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0.orig-comp1.tar.gz	1970-01-01 00:00:00 +0000 and lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0.orig-comp1.tar.gz	2009-12-14 08:43:39 +0000 differ
1651
=== added file 'lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0.orig-comp2.tar.bz2'
1652
2
Binary files lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0.orig-comp2.tar.bz2	1970-01-01 00:00:00 +0000 and lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0.orig-comp2.tar.bz2	2009-12-14 08:43:39 +0000 differ
25
Binary files lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0.orig-comp2.tar.bz2	1970-01-01 00:00:00 +0000 and lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0.orig-comp2.tar.bz2	2009-12-14 08:43:39 +0000 differ
1653
=== added file 'lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0.orig.tar.gz'
1654
3
Binary files lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0.orig.tar.gz	1970-01-01 00:00:00 +0000 and lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0.orig.tar.gz	2009-12-14 08:43:38 +0000 differ
26
Binary files lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0.orig.tar.gz	1970-01-01 00:00:00 +0000 and lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0.orig.tar.gz	2009-12-14 08:43:38 +0000 differ
1655
=== added file 'lib/lp/soyuz/scripts/tests/test_gina.py'
1656
--- lib/lp/soyuz/scripts/tests/test_gina.py	1970-01-01 00:00:00 +0000
1657
+++ lib/lp/soyuz/scripts/tests/test_gina.py	2009-12-14 08:43:39 +0000
1658
@@ -0,0 +1,15 @@
1659
1
# Copyright 2009 Canonical Ltd.  This software is licensed under the
1660
2
# GNU Affero General Public License version 3 (see the file LICENSE).
1661
3
1662
4
import unittest
1663
5
1664
6
from zope.testing.doctest import DocTestSuite
1665
7
1666
8
import lp.soyuz.scripts.gina.handlers
1667
9
1668
10
1669
11
def test_suite():
1670
12
    suite = unittest.TestSuite()
1671
13
    suite.addTest(DocTestSuite(lp.soyuz.scripts.gina.handlers))
1672
14
    return suite
1673
15
1674
0
16
1675
=== modified file 'lib/lp/translations/stories/distroseries/xx-distroseries-templates.txt'
1676
--- lib/lp/translations/stories/distroseries/xx-distroseries-templates.txt	2009-12-10 12:46:11 +0000
1677
+++ lib/lp/translations/stories/distroseries/xx-distroseries-templates.txt	2009-12-14 08:43:39 +0000
1678
@@ -1,5 +1,12 @@
1681
1
Templates view for DistroSeries
1
<<<<<<< TREE
1682
2
===============================
2
Templates view for DistroSeries
1683
3
===============================
1684
4
=======
1685
5
1686
6
1687
7
Templates view for DistroSeries
1688
8
===============================
1689
9
>>>>>>> MERGE-SOURCE
1690
3
10
1691
4
The +templates view for DistroSeries gives an overview of the translation
11
The +templates view for DistroSeries gives an overview of the translation
1692
5
templates in this series and provides easy access to the various subpages of
12
templates in this series and provides easy access to the various subpages of
1693
@@ -18,6 +25,7 @@
1694
18
    >>> print user_browser.url
25
    >>> print user_browser.url
1695
19
    http://translations.launchpad.dev/ubuntu/hoary/+templates
26
    http://translations.launchpad.dev/ubuntu/hoary/+templates
1696
20
27
1697
28
<<<<<<< TREE
1698
21
29
1699
22
The templates table
30
The templates table
1700
23
-------------------
31
-------------------
1701
@@ -58,6 +66,47 @@
1702
58
    ...
66
    ...
1703
59
    mozilla        pkgconf-mozilla   2005-05-06   Download
67
    mozilla        pkgconf-mozilla   2005-05-06   Download
1704
60
    ...
68
    ...
1705
69
=======
1706
70
The templates table
1707
71
-------------------
1708
72
1709
73
Full template listing for a distribution series is reached by following
1710
74
a link from the distribution series translations page.
1711
75
1712
76
    >>> anon_browser.open(
1713
77
    ...     'http://translations.launchpad.dev/ubuntu/hoary')
1714
78
    >>> anon_browser.getLink('full list of templates').click()
1715
79
1716
80
Full listing of templates shows source package name, template name and
1717
81
the date of last update for this distribution series.
1718
82
1719
83
    >>> table = find_tag_by_id(anon_browser.contents, 'templates_table')
1720
84
    >>> print extract_text(table)
1721
85
    Source package Template name      Last update             
1722
86
    evolution      disabled-template  2007-01-05
1723
87
    evolution      evolution-2.2      2005-05-06
1724
88
    evolution      man                2006-08-14
1725
89
    mozilla        pkgconf-mozilla    2005-05-06
1726
90
    pmount         man                2006-08-14
1727
91
    pmount         pmount             2005-05-06
1728
92
1729
93
1730
94
Logged-in users will see a link from distro series
1731
95
    >>> user_browser.open(
1732
96
    ...     'http://translations.launchpad.dev/ubuntu/hoary')
1733
97
    >>> user_browser.getLink('full list of templates').click()
1734
98
1735
99
Logged-in users can also choose to download all translations for each
1736
100
of the templates.
1737
101
1738
102
    >>> table = find_tag_by_id(user_browser.contents, 'templates_table')
1739
103
    >>> print extract_text(table)
1740
104
    Source package Template name     Last update  Actions
1741
105
    evolution      disabled-template 2007-01-05   Download
1742
106
    ...
1743
107
    mozilla        pkgconf-mozilla   2005-05-06   Download
1744
108
    ...
1745
109
>>>>>>> MERGE-SOURCE
1746
61
110
1747
62
Administrator can see all editing options.
111
Administrator can see all editing options.
1748
63
112
1749
@@ -69,6 +118,7 @@
1750
69
118
1751
70
    >>> table = find_tag_by_id(admin_browser.contents, 'templates_table')
119
    >>> table = find_tag_by_id(admin_browser.contents, 'templates_table')
1752
71
    >>> print extract_text(table)
120
    >>> print extract_text(table)
1753
121
<<<<<<< TREE
1754
72
    Source package Template name                Last update  Actions
122
    Source package Template name                Last update  Actions
1755
73
    evolution      disabled-template (inactive) 2007-01-05   Edit Upload Download Administer
123
    evolution      disabled-template (inactive) 2007-01-05   Edit Upload Download Administer
1756
74
    evolution      evolution-2.2                2005-05-06   Edit Upload Download Administer
124
    evolution      evolution-2.2                2005-05-06   Edit Upload Download Administer
1757
@@ -137,6 +187,19 @@
1758
137
187
1759
138
Links to the templates
188
Links to the templates
1760
139
----------------------
189
----------------------
1761
190
=======
1762
191
    Source package Template name     Last update  Actions
1763
192
    evolution      disabled-template 2007-01-05   Edit Upload Download Administer
1764
193
    evolution      evolution-2.2     2005-05-06   Edit Upload Download Administer
1765
194
    evolution      man               2006-08-14   Edit Upload Download Administer
1766
195
    mozilla        pkgconf-mozilla   2005-05-06   Edit Upload Download Administer
1767
196
    pmount         man               2006-08-14   Edit Upload Download Administer
1768
197
    pmount         pmount            2005-05-06   Edit Upload Download Administer
1769
198
1770
199
1771
200
Links to the templates
1772
201
----------------------
1773
202
>>>>>>> MERGE-SOURCE
1774
140
203
1775
141
Clicking on a template name will take the user to that template's overview
204
Clicking on a template name will take the user to that template's overview
1776
142
page.
205
page.
1777
143
206
1778
=== modified file 'lib/lp/translations/templates/object-templates.pt'
1779
--- lib/lp/translations/templates/object-templates.pt	2009-12-10 12:46:11 +0000
1780
+++ lib/lp/translations/templates/object-templates.pt	2009-12-14 08:43:37 +0000
1781
@@ -82,6 +82,7 @@
1782
82
          </tr>
82
          </tr>
1783
83
        </thead>
83
        </thead>
1784
84
        <tbody>
84
        <tbody>
1785
85
<<<<<<< TREE
1786
85
          <tal:templates repeat="template view/iter_templates">
86
          <tal:templates repeat="template view/iter_templates">
1787
86
            <tal:not-current condition="not: template/iscurrent">
87
            <tal:not-current condition="not: template/iscurrent">
1788
87
              <tal:admin condition="template/required:launchpad.TranslationsAdmin">
88
              <tal:admin condition="template/required:launchpad.TranslationsAdmin">
1789
@@ -133,6 +134,49 @@
1790
133
                  </div>
134
                  </div>
1791
134
                  </td>
135
                  </td>
1792
135
                </tr>
136
                </tr>
1793
137
=======
1794
138
          <tr tal:repeat="template view/iter_templates" class="template_row">
1795
139
            <td tal:condition="view/is_distroseries"
1796
140
                tal:content="template/sourcepackagename/name"
1797
141
                class="sourcepackage_column">Source package
1798
142
            </td>
1799
143
            <td class="template_column"><a tal:attributes="href template/fmt:url"
1800
144
                   tal:content="template/name">Template name</a></td>
1801
145
            <td class="lastupdate_column">
1802
146
              <span class="sortkey"
1803
147
                    tal:condition="template/date_last_updated"
1804
148
                    tal:content="template/date_last_updated/fmt:datetime">
1805
149
                    time sort key
1806
150
              </span>
1807
151
              <span class="lastupdate_column"
1808
152
                    tal:condition="template/date_last_updated"
1809
153
                    tal:attributes="
1810
154
                      title template/date_last_updated/fmt:datetime"
1811
155
                    tal:content="
1812
156
                      template/date_last_updated/fmt:approximatedate"
1813
157
              >
1814
158
                 2009-09-23
1815
159
              </span>
1816
160
            </td>
1817
161
            <td class="actions_column"
1818
162
                tal:condition="context/required:launchpad.AnyPerson">
1819
163
            <div class="template_links">
1820
164
              <tal:maintainer condition="template/required:launchpad.Edit">
1821
165
                <a tal:attributes="href string:${template/fmt:url}/+edit;
1822
166
                                   title string:Edit ${template/name}'s details">
1823
167
                   <img src="/@@/edit" />&nbsp;Edit</a>
1824
168
                <a tal:attributes="href string:${template/fmt:url}/+upload;
1825
169
                      title string:Upload translations to ${template/name}">
1826
170
                   <img src="/@@/add" />&nbsp;Upload</a>
1827
171
              </tal:maintainer>
1828
172
              <a tal:attributes="href string:${template/fmt:url}/+export;
1829
173
                   title string:Download translations from ${template/name}">
1830
174
                <img src="/@@/download" />&nbsp;Download</a>
1831
175
              <tal:admin condition="template/required:launchpad.Admin">
1832
176
                <a tal:attributes="href string:${template/fmt:url}/+admin;
1833
177
                                   title string:Administer ${template/name}">
1834
178
                   <img src="/@@/edit" />&nbsp;Administer</a>
1835
179
>>>>>>> MERGE-SOURCE
1836
136
              </tal:admin>
180
              </tal:admin>
1837
137
            </tal:not-current>
181
            </tal:not-current>
1838
138
            <tal:current condition="template/iscurrent">
182
            <tal:current condition="template/iscurrent">
Status:	Merged
Approved by:	Julian Edwards on 2009-12-01
Approved revision:	no longer in the source branch.
Merged at revision:	not available
Proposed branch:	lp:~wgrant/launchpad/gina-3.0-support
Merge into:	lp:launchpad/db-devel
Prerequisite:	lp:~wgrant/launchpad/distroseries-source-format-selection
Diff against target:	1838 lines (+1124/-159) 25 files modified lib/canonical/launchpad/fields/__init__.py (+61/-1) lib/canonical/launchpad/helpers.py (+1/-64) lib/canonical/launchpad/javascript/bugs/filebug-dupefinder.js (+257/-0) lib/lp/archiveuploader/tests/test_utils.py (+18/-0) lib/lp/archiveuploader/utils.py (+14/-0) lib/lp/bugs/browser/bugtarget.py (+28/-0) lib/lp/bugs/browser/tests/bugtarget-filebug-views.txt (+22/-0) lib/lp/bugs/stories/bugattachments/20-edit-bug-attachment.txt (+38/-0) lib/lp/bugs/templates/bug-portlet-attachments.pt (+49/-0) lib/lp/bugs/templates/bugtarget-filebug-search.pt (+45/-0) lib/lp/bugs/templates/bugtasks-and-nominations-table.pt (+47/-0) lib/lp/code/browser/branch.py (+8/-2) lib/lp/code/templates/branchmergeproposal-index.pt (+25/-0) lib/lp/registry/browser/distroseries.py (+56/-24) lib/lp/registry/browser/tests/packaging-views.txt (+58/-0) lib/lp/registry/interfaces/person.py (+6/-0) lib/lp/registry/stories/distroseries/xx-show-distroseries-packaging.txt (+98/-48) lib/lp/registry/tests/test_productseries_vocabularies.py (+75/-0) lib/lp/soyuz/doc/gina.txt (+11/-11) lib/lp/soyuz/scripts/gina/handlers.py (+44/-7) lib/lp/soyuz/scripts/tests/gina_test_archive/dists/breezy/main/source/Sources (+17/-0) lib/lp/soyuz/scripts/tests/gina_test_archive/pool/main/b/bar/bar_1.0-1.dsc (+22/-0) lib/lp/soyuz/scripts/tests/test_gina.py (+15/-0) lib/lp/translations/stories/distroseries/xx-distroseries-templates.txt (+65/-2) lib/lp/translations/templates/object-templates.pt (+44/-0)
To merge this branch:	bzr merge lp:~wgrant/launchpad/gina-3.0-support
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Данило Шеган (community)	release-critical		Approve on 2009-12-14
Julian Edwards (community)		2009-12-01	Approve on 2009-12-01
Review via email: mp+15478@code.launchpad.net