rlaunchpadlib 0.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +7 -0
- data/.gitignore +22 -0
- data/.rspec +3 -0
- data/.travis.yml +4 -0
- data/Gemfile +4 -0
- data/LICENSE.txt +22 -0
- data/README.md +44 -0
- data/Rakefile +6 -0
- data/lib/rlaunchpadlib.rb +9 -0
- data/lib/rlaunchpadlib/client.rb +26 -0
- data/lib/rlaunchpadlib/person.rb +96 -0
- data/lib/rlaunchpadlib/project.rb +81 -0
- data/lib/rlaunchpadlib/project_group.rb +43 -0
- data/lib/rlaunchpadlib/version.rb +3 -0
- data/rlaunchpadlib.gemspec +28 -0
- data/spec/cassettes/client_get.yml +376 -0
- data/spec/cassettes/person.yml +80 -0
- data/spec/cassettes/person_archivesubscriptions.yml +52 -0
- data/spec/cassettes/person_branches.yml +822 -0
- data/spec/cassettes/person_bug_subscriber_packages.yml +48 -0
- data/spec/cassettes/person_bugs.yml +1088 -0
- data/spec/cassettes/person_merge_proposals.yml +101 -0
- data/spec/cassettes/person_requested_reviews.yml +180 -0
- data/spec/cassettes/project.yml +119 -0
- data/spec/cassettes/project_branches.yml +1931 -0
- data/spec/cassettes/project_bugs.yml +1027 -0
- data/spec/cassettes/project_group.yml +71 -0
- data/spec/cassettes/project_group_branches.yml +1985 -0
- data/spec/cassettes/project_group_bugs.yml +1068 -0
- data/spec/cassettes/project_group_merges.yml +317 -0
- data/spec/cassettes/project_merge_proposals.yml +1905 -0
- data/spec/cassettes/project_subscriptions.yml +48 -0
- data/spec/cassettes/project_timeline.yml +164 -0
- data/spec/rlaunchpadlib/lib/client_spec.rb +28 -0
- data/spec/rlaunchpadlib/lib/person_spec.rb +147 -0
- data/spec/rlaunchpadlib/lib/project_group_spec.rb +93 -0
- data/spec/rlaunchpadlib/lib/project_spec.rb +146 -0
- data/spec/spec_helper.rb +31 -0
- metadata +202 -0
@@ -0,0 +1,317 @@
|
|
1
|
+
---
|
2
|
+
http_interactions:
|
3
|
+
- request:
|
4
|
+
method: get
|
5
|
+
uri: https://api.launchpad.net/1.0/mozilla/?ws.op=getMergeProposals
|
6
|
+
body:
|
7
|
+
encoding: US-ASCII
|
8
|
+
string: ''
|
9
|
+
headers: {}
|
10
|
+
response:
|
11
|
+
status:
|
12
|
+
code: 200
|
13
|
+
message: OK
|
14
|
+
headers:
|
15
|
+
Date:
|
16
|
+
- Sun, 18 May 2014 19:40:25 GMT
|
17
|
+
Server:
|
18
|
+
- zope.server.http (HTTP)
|
19
|
+
X-Powered-By:
|
20
|
+
- Zope (www.zope.org), Python (www.python.org)
|
21
|
+
Content-Length:
|
22
|
+
- '26723'
|
23
|
+
X-Xss-Protection:
|
24
|
+
- 1; mode=block
|
25
|
+
X-Content-Type-Options:
|
26
|
+
- nosniff
|
27
|
+
Strict-Transport-Security:
|
28
|
+
- max-age=15552000
|
29
|
+
Vary:
|
30
|
+
- Accept,Accept-Encoding
|
31
|
+
X-Frame-Options:
|
32
|
+
- SAMEORIGIN
|
33
|
+
X-Lazr-Notifications:
|
34
|
+
- "[]"
|
35
|
+
Content-Type:
|
36
|
+
- application/json
|
37
|
+
X-Cache:
|
38
|
+
- MISS from nutmeg.canonical.com
|
39
|
+
X-Cache-Lookup:
|
40
|
+
- MISS from nutmeg.canonical.com:3128
|
41
|
+
Via:
|
42
|
+
- 1.0 nutmeg.canonical.com:3128 (squid/2.7.STABLE7)
|
43
|
+
body:
|
44
|
+
encoding: UTF-8
|
45
|
+
string: '{"total_size": 15, "start": 0, "entries": [{"queuer_link": null, "queue_status":
|
46
|
+
"Needs review", "private": false, "registrant_link": "https://api.launchpad.net/1.0/~laney",
|
47
|
+
"date_reviewed": null, "target_branch_link": "https://api.launchpad.net/1.0/~mozillateam/firefox/firefox-trunk.head",
|
48
|
+
"http_etag": "\"ed5e49daadf4b0c6d457b66e6437a8a95b176052-300c25c6c50c1e9e8e630c07a22c5c748ad0c3a5\"",
|
49
|
+
"date_review_requested": "2013-11-26T17:12:00.956698+00:00", "votes_collection_link":
|
50
|
+
"https://api.launchpad.net/1.0/~laney/firefox/fonts-no-transitional/+merge/196756/votes",
|
51
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~laney/firefox/fonts-no-transitional/+merge/196756",
|
52
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
53
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~laney/firefox/fonts-no-transitional",
|
54
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~laney/firefox/fonts-no-transitional/+merge/196756/all_comments",
|
55
|
+
"date_merged": null, "description": " * debian/control{,.in}: Update ttf-wqy-zenhei
|
56
|
+
and ttf-arphic-ukai\n dependencies from firefox-testsuite to fonts-*. The
|
57
|
+
former are either\n transitional packages or have been removed.\n\nPlease
|
58
|
+
cherry-pick this into the trusty branch too.", "merge_reporter_link": null,
|
59
|
+
"preview_diffs_collection_link": "https://api.launchpad.net/1.0/~laney/firefox/fonts-no-transitional/+merge/196756/preview_diffs",
|
60
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~laney/firefox/fonts-no-transitional/+merge/196756/+preview-diff/453714",
|
61
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
62
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
63
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~laney/firefox/fonts-no-transitional/+merge/196756",
|
64
|
+
"date_created": "2013-11-26T17:12:00.956698+00:00", "queue_position": null},
|
65
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
66
|
+
"https://api.launchpad.net/1.0/~bkerensa", "date_reviewed": null, "target_branch_link":
|
67
|
+
"https://api.launchpad.net/1.0/~mozillateam/seamonkey/seamonkey.head", "http_etag":
|
68
|
+
"\"15172022f95afde9fb847841c8fc9b65b130218e-d9248da15f04040649a77e63a338818887921994\"",
|
69
|
+
"date_review_requested": "2012-06-26T02:30:45.139031+00:00", "votes_collection_link":
|
70
|
+
"https://api.launchpad.net/1.0/~bkerensa/seamonkey/seamonkey-dev/+merge/111992/votes",
|
71
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~bkerensa/seamonkey/seamonkey-dev/+merge/111992",
|
72
|
+
"commit_message": "Brought debian/vendor.js up to date", "resource_type_link":
|
73
|
+
"https://api.launchpad.net/1.0/#branch_merge_proposal", "source_branch_link":
|
74
|
+
"https://api.launchpad.net/1.0/~bkerensa/seamonkey/seamonkey-dev", "all_comments_collection_link":
|
75
|
+
"https://api.launchpad.net/1.0/~bkerensa/seamonkey/seamonkey-dev/+merge/111992/all_comments",
|
76
|
+
"date_merged": null, "description": "", "merge_reporter_link": null, "preview_diffs_collection_link":
|
77
|
+
"https://api.launchpad.net/1.0/~bkerensa/seamonkey/seamonkey-dev/+merge/111992/preview_diffs",
|
78
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~bkerensa/seamonkey/seamonkey-dev/+merge/111992/+preview-diff/257694",
|
79
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
80
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
81
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~bkerensa/seamonkey/seamonkey-dev/+merge/111992",
|
82
|
+
"date_created": "2012-06-26T02:30:45.139031+00:00", "queue_position": null},
|
83
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
84
|
+
"https://api.launchpad.net/1.0/~debfx", "date_reviewed": null, "target_branch_link":
|
85
|
+
"https://api.launchpad.net/1.0/~mozillateam/firefox/firefox-trunk.head", "http_etag":
|
86
|
+
"\"2ad8c639d2b30a78588861023d223917bde45493-4f3095f9bf490a1a4f9ad0a09458a60ae7800d79\"",
|
87
|
+
"date_review_requested": "2011-11-30T11:22:56.522511+00:00", "votes_collection_link":
|
88
|
+
"https://api.launchpad.net/1.0/~debfx/firefox/firefox-trunk.head.kde/+merge/83920/votes",
|
89
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~debfx/firefox/firefox-trunk.head.kde/+merge/83920",
|
90
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
91
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~debfx/firefox/firefox-trunk.head.kde",
|
92
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~debfx/firefox/firefox-trunk.head.kde/+merge/83920/all_comments",
|
93
|
+
"date_merged": "2011-11-30T11:22:34.116192+00:00", "description": "Fix LP:
|
94
|
+
#885836 - can''t save files in KDE\n\nI know that the patch is disabled in
|
95
|
+
the trunk branch but I want to make sure that the bugfix doesn''t regress
|
96
|
+
again.", "merge_reporter_link": "https://api.launchpad.net/1.0/~debfx", "preview_diffs_collection_link":
|
97
|
+
"https://api.launchpad.net/1.0/~debfx/firefox/firefox-trunk.head.kde/+merge/83920/preview_diffs",
|
98
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~debfx/firefox/firefox-trunk.head.kde/+merge/83920/+preview-diff/189597",
|
99
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
100
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
101
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~debfx/firefox/firefox-trunk.head.kde/+merge/83920",
|
102
|
+
"date_created": "2011-11-30T11:20:00.191662+00:00", "queue_position": null},
|
103
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
104
|
+
"https://api.launchpad.net/1.0/~wgrant", "date_reviewed": null, "target_branch_link":
|
105
|
+
"https://api.launchpad.net/1.0/~mozillateam/ubufox/trunk", "http_etag": "\"7cbfdf6d6d3ca27699edb9fe3134859daaff282b-53ef3fa5d6f42182ba4a19f4c4782d9c704fe66b\"",
|
106
|
+
"date_review_requested": "2011-11-28T05:19:11.528933+00:00", "votes_collection_link":
|
107
|
+
"https://api.launchpad.net/1.0/~wgrant/ubufox/bug-897067/+merge/83549/votes",
|
108
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~wgrant/ubufox/bug-897067/+merge/83549",
|
109
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
110
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~wgrant/ubufox/bug-897067",
|
111
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~wgrant/ubufox/bug-897067/+merge/83549/all_comments",
|
112
|
+
"date_merged": null, "description": "ubufox''s content/overlay.js uses URLs
|
113
|
+
like https://launchpad.net/distros/ubuntu/oneiric/+sources/firefox/+gethelp
|
114
|
+
and https://launchpad.net/distros/ubuntu/oneiric/+source/firefox/+translations.
|
115
|
+
/distros has been obsolete since 2006, and +sources was never really meant
|
116
|
+
to exist in the first place.\n\nThis branch adjusts it to use non-deprecated
|
117
|
+
URLs: https://launchpad.net/ubuntu/oneiric/+source/firefox/+gethelp and \u003chttps://launchpad.net/ubuntu/oneiric/+source/firefox/+translations.\n\nIt''s
|
118
|
+
pretty important that this change be in Precise, given its hilariously long
|
119
|
+
desktop support period. It would also be handy if this could be SRUed into
|
120
|
+
older series when a new Firefox hits them, but that''s far less important.",
|
121
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~wgrant/ubufox/bug-897067/+merge/83549/preview_diffs",
|
122
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~wgrant/ubufox/bug-897067/+merge/83549/+preview-diff/188666",
|
123
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
124
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
125
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~wgrant/ubufox/bug-897067/+merge/83549",
|
126
|
+
"date_created": "2011-11-28T05:19:11.528933+00:00", "queue_position": null},
|
127
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
128
|
+
"https://api.launchpad.net/1.0/~mconley", "date_reviewed": null, "target_branch_link":
|
129
|
+
"https://api.launchpad.net/1.0/~extension-hackers/messagingmenu-extension/trunk",
|
130
|
+
"http_etag": "\"3f29c476bedcd7a895fa9aa52fedaca88cef5d6f-79787556105f3d73193fb4a645d23d932a48231f\"",
|
131
|
+
"date_review_requested": "2011-09-20T15:29:01.908233+00:00", "votes_collection_link":
|
132
|
+
"https://api.launchpad.net/1.0/~mconley/messagingmenu-extension/init_tests/+merge/76243/votes",
|
133
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~mconley/messagingmenu-extension/init_tests/+merge/76243",
|
134
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
135
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~mconley/messagingmenu-extension/init_tests",
|
136
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~mconley/messagingmenu-extension/init_tests/+merge/76243/all_comments",
|
137
|
+
"date_merged": null, "description": "Just a simple set of tests to get the
|
138
|
+
ball rolling here.", "merge_reporter_link": null, "preview_diffs_collection_link":
|
139
|
+
"https://api.launchpad.net/1.0/~mconley/messagingmenu-extension/init_tests/+merge/76243/preview_diffs",
|
140
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~mconley/messagingmenu-extension/init_tests/+merge/76243/+preview-diff/170941",
|
141
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
142
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
143
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~mconley/messagingmenu-extension/init_tests/+merge/76243",
|
144
|
+
"date_created": "2011-09-20T15:29:01.908233+00:00", "queue_position": null},
|
145
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
146
|
+
"https://api.launchpad.net/1.0/~rsalveti", "date_reviewed": null, "target_branch_link":
|
147
|
+
"https://api.launchpad.net/1.0/~mozillateam/firefox/firefox-trunk.head", "http_etag":
|
148
|
+
"\"a7d3b5a5f1b13db911e1432b898511802afd771c-e16a391eab7d684b871fe603852d61b1400716db\"",
|
149
|
+
"date_review_requested": "2011-06-24T02:22:09.914668+00:00", "votes_collection_link":
|
150
|
+
"https://api.launchpad.net/1.0/~rsalveti/firefox/disable-thumb2/+merge/65758/votes",
|
151
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~rsalveti/firefox/disable-thumb2/+merge/65758",
|
152
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
153
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~rsalveti/firefox/disable-thumb2",
|
154
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~rsalveti/firefox/disable-thumb2/+merge/65758/all_comments",
|
155
|
+
"date_merged": null, "description": "As described by bug 789198, THUMB2 breaks
|
156
|
+
WebM functionality on ARM, and as side effect people can''t use youtube even
|
157
|
+
with html5 support.\n\nThis patch changes it in a way to make it easier to
|
158
|
+
build with thumb2 again, so people can easily try the thumb2 enabled build
|
159
|
+
to debug the issue.", "merge_reporter_link": null, "preview_diffs_collection_link":
|
160
|
+
"https://api.launchpad.net/1.0/~rsalveti/firefox/disable-thumb2/+merge/65758/preview_diffs",
|
161
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~rsalveti/firefox/disable-thumb2/+merge/65758/+preview-diff/125606",
|
162
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
163
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
164
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~rsalveti/firefox/disable-thumb2/+merge/65758",
|
165
|
+
"date_created": "2011-06-24T02:22:09.914668+00:00", "queue_position": null},
|
166
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
167
|
+
"https://api.launchpad.net/1.0/~chrisccoulson", "date_reviewed": null, "target_branch_link":
|
168
|
+
"https://api.launchpad.net/1.0/~asac/ubufox/main", "http_etag": "\"b2d2242ea71f15d724573dd9628eaa3188ff06d9-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
169
|
+
"date_review_requested": "2010-11-08T19:59:48.308602+00:00", "votes_collection_link":
|
170
|
+
"https://api.launchpad.net/1.0/~chrisccoulson/ubufox/ff-4.0/+merge/40373/votes",
|
171
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~chrisccoulson/ubufox/ff-4.0/+merge/40373",
|
172
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
173
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~chrisccoulson/ubufox/ff-4.0",
|
174
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~chrisccoulson/ubufox/ff-4.0/+merge/40373/all_comments",
|
175
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
176
|
+
"https://api.launchpad.net/1.0/~chrisccoulson/ubufox/ff-4.0/+merge/40373/preview_diffs",
|
177
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~chrisccoulson/ubufox/ff-4.0/+merge/40373/+preview-diff/69172",
|
178
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
179
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
180
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~chrisccoulson/ubufox/ff-4.0/+merge/40373",
|
181
|
+
"date_created": "2010-11-08T19:59:48.308602+00:00", "queue_position": null},
|
182
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
183
|
+
"https://api.launchpad.net/1.0/~csaba-kertesz", "date_reviewed": null, "target_branch_link":
|
184
|
+
"https://api.launchpad.net/1.0/~asac/ubufox/main", "http_etag": "\"aa8e8bf1fc9dfc301009c809530a420aec36efa6-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
185
|
+
"date_review_requested": "2010-03-23T13:20:11.475033+00:00", "votes_collection_link":
|
186
|
+
"https://api.launchpad.net/1.0/~csaba-kertesz/ubufox/lp542046/+merge/21929/votes",
|
187
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~csaba-kertesz/ubufox/lp542046/+merge/21929",
|
188
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
189
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~csaba-kertesz/ubufox/lp542046",
|
190
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~csaba-kertesz/ubufox/lp542046/+merge/21929/all_comments",
|
191
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
192
|
+
"https://api.launchpad.net/1.0/~csaba-kertesz/ubufox/lp542046/+merge/21929/preview_diffs",
|
193
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~csaba-kertesz/ubufox/lp542046/+merge/21929/+preview-diff/25080",
|
194
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
195
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
196
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~csaba-kertesz/ubufox/lp542046/+merge/21929",
|
197
|
+
"date_created": "2010-03-23T13:20:11.475033+00:00", "queue_position": null},
|
198
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
199
|
+
"https://api.launchpad.net/1.0/~sevoir", "date_reviewed": null, "target_branch_link":
|
200
|
+
"https://api.launchpad.net/1.0/~ubuntu-dev/firefox-extensions/ubuntu-hu-menu.ubuntu",
|
201
|
+
"http_etag": "\"86b18de8a86d4c19bf9eab7cb303f702e9add347-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
202
|
+
"date_review_requested": "2009-10-02T13:37:10.011680+00:00", "votes_collection_link":
|
203
|
+
"https://api.launchpad.net/1.0/~sevoir/firefox-extensions/ubuntu-hu-toolbar.ubuntu/+merge/12783/votes",
|
204
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~sevoir/firefox-extensions/ubuntu-hu-toolbar.ubuntu/+merge/12783",
|
205
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
206
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~sevoir/firefox-extensions/ubuntu-hu-toolbar.ubuntu",
|
207
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~sevoir/firefox-extensions/ubuntu-hu-toolbar.ubuntu/+merge/12783/all_comments",
|
208
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
209
|
+
"https://api.launchpad.net/1.0/~sevoir/firefox-extensions/ubuntu-hu-toolbar.ubuntu/+merge/12783/preview_diffs",
|
210
|
+
"preview_diff_link": null, "supersedes_link": null, "address": "\u003cemail
|
211
|
+
address hidden\u003e", "superseded_by_link": null, "date_queued": null, "prerequisite_branch_link":
|
212
|
+
null, "queued_revid": null, "merged_revno": null, "reviewed_revid": null,
|
213
|
+
"web_link": "https://code.launchpad.net/~sevoir/firefox-extensions/ubuntu-hu-toolbar.ubuntu/+merge/12783",
|
214
|
+
"date_created": "2009-10-02T13:37:10.011680+00:00", "queue_position": null},
|
215
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
216
|
+
"https://api.launchpad.net/1.0/~asac", "date_reviewed": null, "target_branch_link":
|
217
|
+
"https://api.launchpad.net/1.0/~ubuntu-dev/firefox-extensions/ubuntu-hu-menu.ubuntu",
|
218
|
+
"http_etag": "\"d0c78387458e879ad660f462f8ab3dc36cc9009d-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
219
|
+
"date_review_requested": "2009-10-01T13:46:33.190672+00:00", "votes_collection_link":
|
220
|
+
"https://api.launchpad.net/1.0/~sevoir/firefox-extensions/ubuntu-hu-menu.ubuntu/+merge/12718/votes",
|
221
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~sevoir/firefox-extensions/ubuntu-hu-menu.ubuntu/+merge/12718",
|
222
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
223
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~sevoir/firefox-extensions/ubuntu-hu-menu.ubuntu",
|
224
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~sevoir/firefox-extensions/ubuntu-hu-menu.ubuntu/+merge/12718/all_comments",
|
225
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
226
|
+
"https://api.launchpad.net/1.0/~sevoir/firefox-extensions/ubuntu-hu-menu.ubuntu/+merge/12718/preview_diffs",
|
227
|
+
"preview_diff_link": null, "supersedes_link": null, "address": "\u003cemail
|
228
|
+
address hidden\u003e", "superseded_by_link": null, "date_queued": null, "prerequisite_branch_link":
|
229
|
+
null, "queued_revid": null, "merged_revno": null, "reviewed_revid": null,
|
230
|
+
"web_link": "https://code.launchpad.net/~sevoir/firefox-extensions/ubuntu-hu-menu.ubuntu/+merge/12718",
|
231
|
+
"date_created": "2009-10-01T13:46:33.190672+00:00", "queue_position": null},
|
232
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
233
|
+
"https://api.launchpad.net/1.0/~gnomefreak", "date_reviewed": null, "target_branch_link":
|
234
|
+
"https://api.launchpad.net/1.0/~mozillateam/thunderbird/thunderbird-trunk.head",
|
235
|
+
"http_etag": "\"7da9dce0d0b55d8d4b03948287aadf757de3a838-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
236
|
+
"date_review_requested": "2009-07-22T11:45:45.221841+00:00", "votes_collection_link":
|
237
|
+
"https://api.launchpad.net/1.0/~gnomefreak/thunderbird/thunderbird.lp401165/+merge/9138/votes",
|
238
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~gnomefreak/thunderbird/thunderbird.lp401165/+merge/9138",
|
239
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
240
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~gnomefreak/thunderbird/thunderbird.lp401165",
|
241
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~gnomefreak/thunderbird/thunderbird.lp401165/+merge/9138/all_comments",
|
242
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
243
|
+
"https://api.launchpad.net/1.0/~gnomefreak/thunderbird/thunderbird.lp401165/+merge/9138/preview_diffs",
|
244
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~gnomefreak/thunderbird/thunderbird.lp401165/+merge/9138/+preview-diff/162359",
|
245
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
246
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
247
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~gnomefreak/thunderbird/thunderbird.lp401165/+merge/9138",
|
248
|
+
"date_created": "2009-07-22T11:45:45.221841+00:00", "queue_position": null},
|
249
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
250
|
+
"https://api.launchpad.net/1.0/~mcasadevall", "date_reviewed": null, "target_branch_link":
|
251
|
+
"https://api.launchpad.net/1.0/~mozillateam/thunderbird/icedove-2.0.0.x",
|
252
|
+
"http_etag": "\"c81d8c50d7ecbe75b42825218fe91c3f96af1d4f-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
253
|
+
"date_review_requested": "2009-07-07T19:22:04.138532+00:00", "votes_collection_link":
|
254
|
+
"https://api.launchpad.net/1.0/~mcasadevall/thunderbird/icedove-2.0.0.22-2/+merge/8334/votes",
|
255
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~mcasadevall/thunderbird/icedove-2.0.0.22-2/+merge/8334",
|
256
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
257
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~mcasadevall/thunderbird/icedove-2.0.0.22-2",
|
258
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~mcasadevall/thunderbird/icedove-2.0.0.22-2/+merge/8334/all_comments",
|
259
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
260
|
+
"https://api.launchpad.net/1.0/~mcasadevall/thunderbird/icedove-2.0.0.22-2/+merge/8334/preview_diffs",
|
261
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~mcasadevall/thunderbird/icedove-2.0.0.22-2/+merge/8334/+preview-diff/164603",
|
262
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
263
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
264
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~mcasadevall/thunderbird/icedove-2.0.0.22-2/+merge/8334",
|
265
|
+
"date_created": "2009-07-07T19:22:04.138532+00:00", "queue_position": null},
|
266
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
267
|
+
"https://api.launchpad.net/1.0/~andrew-bugs-launchpad-net", "date_reviewed":
|
268
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~asac/ubufox/main",
|
269
|
+
"http_etag": "\"00739eb7d2325e8ee8d921d598b8a5fa16461ce8-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
270
|
+
"date_review_requested": "2009-05-25T02:58:21.535785+00:00", "votes_collection_link":
|
271
|
+
"https://api.launchpad.net/1.0/~andrew-bugs-launchpad-net/ubufox/flashsaver/+merge/6768/votes",
|
272
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~andrew-bugs-launchpad-net/ubufox/flashsaver/+merge/6768",
|
273
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
274
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~andrew-bugs-launchpad-net/ubufox/flashsaver",
|
275
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~andrew-bugs-launchpad-net/ubufox/flashsaver/+merge/6768/all_comments",
|
276
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
277
|
+
"https://api.launchpad.net/1.0/~andrew-bugs-launchpad-net/ubufox/flashsaver/+merge/6768/preview_diffs",
|
278
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~andrew-bugs-launchpad-net/ubufox/flashsaver/+merge/6768/+preview-diff/162034",
|
279
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
280
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
281
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~andrew-bugs-launchpad-net/ubufox/flashsaver/+merge/6768",
|
282
|
+
"date_created": "2009-05-25T02:58:21.535785+00:00", "queue_position": null},
|
283
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
284
|
+
"registrant_link": "https://api.launchpad.net/1.0/~asac", "date_reviewed":
|
285
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~sebner/firefox-extensions/all-in-one-sidebar.ubuntu",
|
286
|
+
"http_etag": "\"d7feaf1aa9a2bab032b4a64e34f08d1013ccd944-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
287
|
+
"date_review_requested": null, "votes_collection_link": "https://api.launchpad.net/1.0/~asac/firefox-extensions/all-in-one-sidebar.ubuntu/+merge/194/votes",
|
288
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~asac/firefox-extensions/all-in-one-sidebar.ubuntu/+merge/194",
|
289
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
290
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~asac/firefox-extensions/all-in-one-sidebar.ubuntu",
|
291
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~asac/firefox-extensions/all-in-one-sidebar.ubuntu/+merge/194/all_comments",
|
292
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
293
|
+
"https://api.launchpad.net/1.0/~asac/firefox-extensions/all-in-one-sidebar.ubuntu/+merge/194/preview_diffs",
|
294
|
+
"preview_diff_link": null, "supersedes_link": null, "address": "\u003cemail
|
295
|
+
address hidden\u003e", "superseded_by_link": null, "date_queued": null, "prerequisite_branch_link":
|
296
|
+
null, "queued_revid": null, "merged_revno": null, "reviewed_revid": null,
|
297
|
+
"web_link": "https://code.launchpad.net/~asac/firefox-extensions/all-in-one-sidebar.ubuntu/+merge/194",
|
298
|
+
"date_created": "2008-04-03T19:29:13.975538+00:00", "queue_position": null},
|
299
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
300
|
+
"registrant_link": "https://api.launchpad.net/1.0/~asac", "date_reviewed":
|
301
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~asac/firefox-extensions/speeddial.ubuntu",
|
302
|
+
"http_etag": "\"98019543cf66b6e066be11bd01387f5ec0561814-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
303
|
+
"date_review_requested": null, "votes_collection_link": "https://api.launchpad.net/1.0/~csharma/firefox-extensions/speeddial.ubuntu/+merge/180/votes",
|
304
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~csharma/firefox-extensions/speeddial.ubuntu/+merge/180",
|
305
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
306
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~csharma/firefox-extensions/speeddial.ubuntu",
|
307
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~csharma/firefox-extensions/speeddial.ubuntu/+merge/180/all_comments",
|
308
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
309
|
+
"https://api.launchpad.net/1.0/~csharma/firefox-extensions/speeddial.ubuntu/+merge/180/preview_diffs",
|
310
|
+
"preview_diff_link": null, "supersedes_link": null, "address": "\u003cemail
|
311
|
+
address hidden\u003e", "superseded_by_link": null, "date_queued": null, "prerequisite_branch_link":
|
312
|
+
null, "queued_revid": null, "merged_revno": null, "reviewed_revid": null,
|
313
|
+
"web_link": "https://code.launchpad.net/~csharma/firefox-extensions/speeddial.ubuntu/+merge/180",
|
314
|
+
"date_created": "2008-03-26T15:02:50.452790+00:00", "queue_position": null}]}'
|
315
|
+
http_version:
|
316
|
+
recorded_at: Sun, 18 May 2014 19:40:29 GMT
|
317
|
+
recorded_with: VCR 2.9.0
|
@@ -0,0 +1,1905 @@
|
|
1
|
+
---
|
2
|
+
http_interactions:
|
3
|
+
- request:
|
4
|
+
method: get
|
5
|
+
uri: https://api.launchpad.net/1.0/bzr/?ws.op=getMergeProposals
|
6
|
+
body:
|
7
|
+
encoding: US-ASCII
|
8
|
+
string: ''
|
9
|
+
headers: {}
|
10
|
+
response:
|
11
|
+
status:
|
12
|
+
code: 200
|
13
|
+
message: OK
|
14
|
+
headers:
|
15
|
+
Date:
|
16
|
+
- Sun, 18 May 2014 23:49:00 GMT
|
17
|
+
Server:
|
18
|
+
- zope.server.http (HTTP)
|
19
|
+
X-Powered-By:
|
20
|
+
- Zope (www.zope.org), Python (www.python.org)
|
21
|
+
Content-Length:
|
22
|
+
- '170837'
|
23
|
+
X-Xss-Protection:
|
24
|
+
- 1; mode=block
|
25
|
+
X-Content-Type-Options:
|
26
|
+
- nosniff
|
27
|
+
Strict-Transport-Security:
|
28
|
+
- max-age=15552000
|
29
|
+
Vary:
|
30
|
+
- Accept,Accept-Encoding
|
31
|
+
X-Frame-Options:
|
32
|
+
- SAMEORIGIN
|
33
|
+
X-Lazr-Notifications:
|
34
|
+
- "[]"
|
35
|
+
Content-Type:
|
36
|
+
- application/json
|
37
|
+
X-Cache:
|
38
|
+
- MISS from nutmeg.canonical.com
|
39
|
+
X-Cache-Lookup:
|
40
|
+
- MISS from nutmeg.canonical.com:3128
|
41
|
+
Via:
|
42
|
+
- 1.0 nutmeg.canonical.com:3128 (squid/2.7.STABLE7)
|
43
|
+
body:
|
44
|
+
encoding: UTF-8
|
45
|
+
string: '{"total_size": 84, "start": 0, "next_collection_link": "https://api.launchpad.net/1.0/bzr?ws.op=getMergeProposals\u0026ws.size=75\u0026memo=75\u0026ws.start=75",
|
46
|
+
"entries": [{"queuer_link": null, "queue_status": "Needs review", "private":
|
47
|
+
false, "registrant_link": "https://api.launchpad.net/1.0/~slyguy", "date_reviewed":
|
48
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
49
|
+
"http_etag": "\"87c8c186beb928f8dbf4e0476f59d33fc7ecf381-d037b5235f6960da1bb7bc536d98460fd0278654\"",
|
50
|
+
"date_review_requested": "2013-05-27T19:23:45.441802+00:00", "votes_collection_link":
|
51
|
+
"https://api.launchpad.net/1.0/~slyguy/bzr/bug-855155/+merge/165929/votes",
|
52
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~slyguy/bzr/bug-855155/+merge/165929",
|
53
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
54
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~slyguy/bzr/bug-855155",
|
55
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~slyguy/bzr/bug-855155/+merge/165929/all_comments",
|
56
|
+
"date_merged": null, "description": "Bug fix with test for bug 855155.", "merge_reporter_link":
|
57
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~slyguy/bzr/bug-855155/+merge/165929/preview_diffs",
|
58
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~slyguy/bzr/bug-855155/+merge/165929/+preview-diff/380190",
|
59
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
60
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
61
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~slyguy/bzr/bug-855155/+merge/165929",
|
62
|
+
"date_created": "2013-05-27T19:23:45.441802+00:00", "queue_position": null},
|
63
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
64
|
+
"https://api.launchpad.net/1.0/~abentley", "date_reviewed": null, "target_branch_link":
|
65
|
+
"https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev", "http_etag": "\"e4e012f155f599029b27eef68ef4c9cb573c1e75-237b8f97003f8882442997cfce4cdeae5185e51e\"",
|
66
|
+
"date_review_requested": "2013-05-08T04:36:40.979032+00:00", "votes_collection_link":
|
67
|
+
"https://api.launchpad.net/1.0/~abentley/bzr/branches-uncommitted/+merge/162925/votes",
|
68
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~abentley/bzr/branches-uncommitted/+merge/162925",
|
69
|
+
"commit_message": "Show uncommitted changes in branches.", "resource_type_link":
|
70
|
+
"https://api.launchpad.net/1.0/#branch_merge_proposal", "source_branch_link":
|
71
|
+
"https://api.launchpad.net/1.0/~abentley/bzr/branches-uncommitted", "all_comments_collection_link":
|
72
|
+
"https://api.launchpad.net/1.0/~abentley/bzr/branches-uncommitted/+merge/162925/all_comments",
|
73
|
+
"date_merged": null, "description": "This branch enables showing uncommitted
|
74
|
+
changes for colocated branches, similar to the display in the ''pipeline''
|
75
|
+
plugin. Uncommitted changes in branches are created with switch --store,
|
76
|
+
and are a good reminder of which branches are works-in-progress.\n\nBranch.has_uncommitted
|
77
|
+
is implemented because the other way of determining uncommitted changes is
|
78
|
+
convoluted: call get_unshelver, providing a tree, and see whether it returns
|
79
|
+
None.", "merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~abentley/bzr/branches-uncommitted/+merge/162925/preview_diffs",
|
80
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~abentley/bzr/branches-uncommitted/+merge/162925/+preview-diff/373218",
|
81
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
82
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
83
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~abentley/bzr/branches-uncommitted/+merge/162925",
|
84
|
+
"date_created": "2013-05-08T04:36:40.979032+00:00", "queue_position": null},
|
85
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
86
|
+
"https://api.launchpad.net/1.0/~zkrynicki", "date_reviewed": null, "target_branch_link":
|
87
|
+
"https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev", "http_etag": "\"da81ef29a31472972766dc09425dfe6faee28718-32d9e2ca5e489269234d83ad2e80400952153cb3\"",
|
88
|
+
"date_review_requested": "2012-10-02T23:11:20.216858+00:00", "votes_collection_link":
|
89
|
+
"https://api.launchpad.net/1.0/~zkrynicki/bzr/find_ancestors/+merge/127610/votes",
|
90
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~zkrynicki/bzr/find_ancestors/+merge/127610",
|
91
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
92
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~zkrynicki/bzr/find_ancestors",
|
93
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~zkrynicki/bzr/find_ancestors/+merge/127610/all_comments",
|
94
|
+
"date_merged": null, "description": "Add a workaround for bzr-fastimport crashing,
|
95
|
+
see bug https://bugs.launchpad.net/bzr/+bug/541626\n\nAs stated, I don''t
|
96
|
+
know how correct this solution is in practice. From my limited testing it
|
97
|
+
_fixes_ the crash and\nseems to produce proper repository data. I want to
|
98
|
+
get feedback from developers that know the core bzr better than I do.", "merge_reporter_link":
|
99
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~zkrynicki/bzr/find_ancestors/+merge/127610/preview_diffs",
|
100
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~zkrynicki/bzr/find_ancestors/+merge/127610/+preview-diff/293785",
|
101
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
102
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
103
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~zkrynicki/bzr/find_ancestors/+merge/127610",
|
104
|
+
"date_created": "2012-10-02T23:11:20.216858+00:00", "queue_position": null},
|
105
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
106
|
+
"https://api.launchpad.net/1.0/~hid-iwata", "date_reviewed": null, "target_branch_link":
|
107
|
+
"https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev", "http_etag": "\"a8563ffa05a1ac89cf0197e5e20d3ece22588f54-c9226a2ceba1cb83885114e46f0e1263562529b1\"",
|
108
|
+
"date_review_requested": "2012-08-09T21:35:07.803013+00:00", "votes_collection_link":
|
109
|
+
"https://api.launchpad.net/1.0/~hid-iwata/bzr/fix-mojibake/+merge/119051/votes",
|
110
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~hid-iwata/bzr/fix-mojibake/+merge/119051",
|
111
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
112
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~hid-iwata/bzr/fix-mojibake",
|
113
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~hid-iwata/bzr/fix-mojibake/+merge/119051/all_comments",
|
114
|
+
"date_merged": null, "description": "Workaround for #777996 and #909152\n\nUnreadable
|
115
|
+
error message can be a huge blocker for newbie users.\nThis patch may not
|
116
|
+
be perfect, but I think this is better than now.", "merge_reporter_link":
|
117
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~hid-iwata/bzr/fix-mojibake/+merge/119051/preview_diffs",
|
118
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~hid-iwata/bzr/fix-mojibake/+merge/119051/+preview-diff/273920",
|
119
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
120
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
121
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~hid-iwata/bzr/fix-mojibake/+merge/119051",
|
122
|
+
"date_created": "2012-08-09T21:35:07.803013+00:00", "queue_position": null},
|
123
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
124
|
+
"https://api.launchpad.net/1.0/~mnn282", "date_reviewed": null, "target_branch_link":
|
125
|
+
"https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev", "http_etag": "\"04f1d854c8400cd31005d5fe24d98bb6925fb937-38f64b8156c1bc89693b90a936a1e57443b8eb35\"",
|
126
|
+
"date_review_requested": "2012-07-29T22:51:31.837724+00:00", "votes_collection_link":
|
127
|
+
"https://api.launchpad.net/1.0/~mnn282/bzr/auto-rename-fix/+merge/117203/votes",
|
128
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~mnn282/bzr/auto-rename-fix/+merge/117203",
|
129
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
130
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~mnn282/bzr/auto-rename-fix",
|
131
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~mnn282/bzr/auto-rename-fix/+merge/117203/all_comments",
|
132
|
+
"date_merged": null, "description": "Fixed bug with RenameMap (bzr move --auto),
|
133
|
+
also RenameMap has ability to detect files moved into new unversioned directories.",
|
134
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~mnn282/bzr/auto-rename-fix/+merge/117203/preview_diffs",
|
135
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~mnn282/bzr/auto-rename-fix/+merge/117203/+preview-diff/269535",
|
136
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
137
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
138
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~mnn282/bzr/auto-rename-fix/+merge/117203",
|
139
|
+
"date_created": "2012-07-29T22:51:31.837724+00:00", "queue_position": null},
|
140
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
141
|
+
"https://api.launchpad.net/1.0/~gz", "date_reviewed": null, "target_branch_link":
|
142
|
+
"https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev", "http_etag": "\"87fd433709d509a23a21d5c9be63a2262293d3b7-09d486ae2a43d6676f53725f6974d0c5c1a2ebf0\"",
|
143
|
+
"date_review_requested": "2012-07-27T17:35:56.144729+00:00", "votes_collection_link":
|
144
|
+
"https://api.launchpad.net/1.0/~gz/bzr/resolve_dir_removal_auto_344013/+merge/117104/votes",
|
145
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_dir_removal_auto_344013/+merge/117104",
|
146
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
147
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_dir_removal_auto_344013",
|
148
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_dir_removal_auto_344013/+merge/117104/all_comments",
|
149
|
+
"date_merged": null, "description": "Make automatic resolving treat conflicts
|
150
|
+
involving deleted directories as resolved if the directory has been subsequently
|
151
|
+
deleted.\n\nThere are two ways a user might do this:\n\n* bzr rm dir\n - In
|
152
|
+
which case resolve can just remove the conflict. Bug 138803 wants rm to check
|
153
|
+
for an clean up conflicts, that is not implemented here.\n\n* rm -rf dir\n
|
154
|
+
- In which case I think having `bzr st` report missing files after resolve
|
155
|
+
would be confusing, so the tree inventory needs updating.\n\nWhen the desired
|
156
|
+
outcome is that the directory should be kept, using --done is still needed.\n",
|
157
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_dir_removal_auto_344013/+merge/117104/preview_diffs",
|
158
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_dir_removal_auto_344013/+merge/117104/+preview-diff/269310",
|
159
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
160
|
+
null, "date_queued": null, "prerequisite_branch_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_auto_refactor",
|
161
|
+
"queued_revid": null, "merged_revno": null, "reviewed_revid": null, "web_link":
|
162
|
+
"https://code.launchpad.net/~gz/bzr/resolve_dir_removal_auto_344013/+merge/117104",
|
163
|
+
"date_created": "2012-07-27T17:35:56.144729+00:00", "queue_position": null},
|
164
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
165
|
+
"https://api.launchpad.net/1.0/~gz", "date_reviewed": null, "target_branch_link":
|
166
|
+
"https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev", "http_etag": "\"a6a3f93715cbfcd5ad6c810772d1c59ef6a0ef88-07e2d8df3b0d434c6d626a522c39cbac4b2f6c60\"",
|
167
|
+
"date_review_requested": "2012-07-27T14:47:38.993610+00:00", "votes_collection_link":
|
168
|
+
"https://api.launchpad.net/1.0/~gz/bzr/resolve_all_deprecation/+merge/117071/votes",
|
169
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_all_deprecation/+merge/117071",
|
170
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
171
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_all_deprecation",
|
172
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_all_deprecation/+merge/117071/all_comments",
|
173
|
+
"date_merged": null, "description": "Deprecate `bzr resolve --all`, it''s
|
174
|
+
the same as `bzr resolve --done` but can''t be used for a subset of files
|
175
|
+
and may give users the false impression it does something more than just wipe
|
176
|
+
the conflict list.\n\nThis is going to clash a fair bit with lp:~gz/bzr/resolve_file_not_done
|
177
|
+
and the documentation probably wants more sensible updating for both.\n",
|
178
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_all_deprecation/+merge/117071/preview_diffs",
|
179
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_all_deprecation/+merge/117071/+preview-diff/269228",
|
180
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
181
|
+
null, "date_queued": null, "prerequisite_branch_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_auto_refactor",
|
182
|
+
"queued_revid": null, "merged_revno": null, "reviewed_revid": null, "web_link":
|
183
|
+
"https://code.launchpad.net/~gz/bzr/resolve_all_deprecation/+merge/117071",
|
184
|
+
"date_created": "2012-07-27T14:47:38.993610+00:00", "queue_position": null},
|
185
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
186
|
+
"https://api.launchpad.net/1.0/~gz", "date_reviewed": null, "target_branch_link":
|
187
|
+
"https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev", "http_etag": "\"64e0fec25b2aa62bdffcec5458f59dcc11d6a18f-d8e292c04a0463ded641012a5c33aac5ccf2ba92\"",
|
188
|
+
"date_review_requested": "2012-07-27T12:29:10.053108+00:00", "votes_collection_link":
|
189
|
+
"https://api.launchpad.net/1.0/~gz/bzr/resolve_file_not_done/+merge/117052/votes",
|
190
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_file_not_done/+merge/117052",
|
191
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
192
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_file_not_done",
|
193
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_file_not_done/+merge/117052/all_comments",
|
194
|
+
"date_merged": null, "description": "Makes `bzr resolve FILE` use the same
|
195
|
+
auto logic as `bzr resolve` rather than implying `bzr resolve --done FILE`.\n\nThis
|
196
|
+
was discussed on the mailing list recently:\n\n\u003chttps://lists.ubuntu.com/archives/bazaar/2012q3/075039.html\u003e\n\nCurrently
|
197
|
+
auto is pretty limited, which makes this change less appetizing, for deleted
|
198
|
+
directories and such like I often end up running resolve with single argument
|
199
|
+
quite often, and having to remember --done now could get frustrating. However,
|
200
|
+
it''s pretty obvious if you know about the change, and making auto smarter
|
201
|
+
is something we''ve wanted for a while anyway.\n\nI''ve updated some bits
|
202
|
+
of documentation but am probably missing other bits elsewhere.\n\nThe current
|
203
|
+
testing for conflicts I don''t fully understand, some help explaining the
|
204
|
+
details there would be good, but it appears that several places where I needed
|
205
|
+
to add --done should get covered by making --auto smarter.\n", "merge_reporter_link":
|
206
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_file_not_done/+merge/117052/preview_diffs",
|
207
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_file_not_done/+merge/117052/+preview-diff/269163",
|
208
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
209
|
+
null, "date_queued": null, "prerequisite_branch_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_auto_refactor",
|
210
|
+
"queued_revid": null, "merged_revno": null, "reviewed_revid": null, "web_link":
|
211
|
+
"https://code.launchpad.net/~gz/bzr/resolve_file_not_done/+merge/117052",
|
212
|
+
"date_created": "2012-07-27T12:29:10.053108+00:00", "queue_position": null},
|
213
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
214
|
+
"https://api.launchpad.net/1.0/~gz", "date_reviewed": null, "target_branch_link":
|
215
|
+
"https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev", "http_etag": "\"93722266be2afc6102dce00d3fd37589d17dec55-54f28f235c9860af347676d273932aaf3f9efe0d\"",
|
216
|
+
"date_review_requested": "2012-07-27T12:17:10.862287+00:00", "votes_collection_link":
|
217
|
+
"https://api.launchpad.net/1.0/~gz/bzr/resolve_auto_refactor/+merge/117051/votes",
|
218
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_auto_refactor/+merge/117051",
|
219
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
220
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_auto_refactor",
|
221
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_auto_refactor/+merge/117051/all_comments",
|
222
|
+
"date_merged": null, "description": "Creates a new kind of conflict resolution
|
223
|
+
action named ''auto'', refactoring code from `WorkingTree.auto_resolve` and
|
224
|
+
deprecating that method. There should be no behaviour change.\n\nI''d like
|
225
|
+
to write some specific tests for this action type, but can''t really see a
|
226
|
+
way in to bt.test_conflicts to do that.\n\nIs there documentation other than
|
227
|
+
in conflict-types.txt that this branch should update?\n\nA followup branch
|
228
|
+
will make `bzr resolve FILE` default to --auto rather than --done.\n\nMay
|
229
|
+
also be a good idea to unify the --all switch and deprecate it.\n\nI''m not
|
230
|
+
wild about using NotImplementedError as the only mechanism of signalling a
|
231
|
+
conflict as not having been resolved. Perhaps another exception type should
|
232
|
+
be added for this?\n\nThe UI can benefit from some cleanup later, notably
|
233
|
+
`bzr resolve` gives a return code if there are pending conflicts, and there
|
234
|
+
are slightly different spellings of the results.\n\nHaving the pending conflicts
|
235
|
+
returned by the auto_resolve method is actually a little useful. In general,
|
236
|
+
conficts.resolve just returning the counts is fine, but to report the details
|
237
|
+
having the conflict objects is handy.\n", "merge_reporter_link": null, "preview_diffs_collection_link":
|
238
|
+
"https://api.launchpad.net/1.0/~gz/bzr/resolve_auto_refactor/+merge/117051/preview_diffs",
|
239
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~gz/bzr/resolve_auto_refactor/+merge/117051/+preview-diff/269320",
|
240
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
241
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
242
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~gz/bzr/resolve_auto_refactor/+merge/117051",
|
243
|
+
"date_created": "2012-07-27T12:17:10.862287+00:00", "queue_position": null},
|
244
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
245
|
+
"https://api.launchpad.net/1.0/~mnn282", "date_reviewed": null, "target_branch_link":
|
246
|
+
"https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev", "http_etag": "\"bca3641d98c11f26951875ec5b3af366a0eccfe2-5735c396abd33baff9707d1f9ce4a7ecce666817\"",
|
247
|
+
"date_review_requested": "2012-07-26T12:29:25.699141+00:00", "votes_collection_link":
|
248
|
+
"https://api.launchpad.net/1.0/~mnn282/bzr/sftp-unsupported-operation-more-info/+merge/116849/votes",
|
249
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~mnn282/bzr/sftp-unsupported-operation-more-info/+merge/116849",
|
250
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
251
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~mnn282/bzr/sftp-unsupported-operation-more-info",
|
252
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~mnn282/bzr/sftp-unsupported-operation-more-info/+merge/116849/all_comments",
|
253
|
+
"date_merged": null, "description": "Unsupported operations now have more
|
254
|
+
information in SFTP transport.", "merge_reporter_link": null, "preview_diffs_collection_link":
|
255
|
+
"https://api.launchpad.net/1.0/~mnn282/bzr/sftp-unsupported-operation-more-info/+merge/116849/preview_diffs",
|
256
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~mnn282/bzr/sftp-unsupported-operation-more-info/+merge/116849/+preview-diff/270217",
|
257
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
258
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
259
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~mnn282/bzr/sftp-unsupported-operation-more-info/+merge/116849",
|
260
|
+
"date_created": "2012-07-26T12:29:25.699141+00:00", "queue_position": null},
|
261
|
+
{"queuer_link": null, "queue_status": "Needs review", "private": false, "registrant_link":
|
262
|
+
"https://api.launchpad.net/1.0/~torkvemada", "date_reviewed": null, "target_branch_link":
|
263
|
+
"https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev", "http_etag": "\"2dd68a6d3e9f000474183df45e57600fb7929632-d3c85e80364f8d25d433d6127c78c11a34ee6aa5\"",
|
264
|
+
"date_review_requested": "2012-07-17T14:11:07.685932+00:00", "votes_collection_link":
|
265
|
+
"https://api.launchpad.net/1.0/~torkvemada/bzr/commit_hooks/+merge/115348/votes",
|
266
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~torkvemada/bzr/commit_hooks/+merge/115348",
|
267
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
268
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~torkvemada/bzr/commit_hooks",
|
269
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~torkvemada/bzr/commit_hooks/+merge/115348/all_comments",
|
270
|
+
"date_merged": null, "description": "New class of hooks: commit ones; and
|
271
|
+
the corresponding Commit.start_commit hook to enable commit metadata modification.\n\nRationale:
|
272
|
+
there''s a set of the metadata properties that are stored along with the commit
|
273
|
+
itself, but at the moment there is no way to fetch or set any of them.\nI
|
274
|
+
suppose that since the interaction with all the metadata strictly belongs
|
275
|
+
to commit itself, it''s reasonable to create the hook, allowing plugin to
|
276
|
+
modify the metadata for the Commit class.\n\nAs a proof of concept I have
|
277
|
+
implemented the ''cimage'' plugin[1], which utilizes the start_hook invented
|
278
|
+
in this diff to add the user webcam photo to commit metadata. Later the photo
|
279
|
+
can be fetched from metadata by appropriate command. Practically, all the
|
280
|
+
cimage branch commits are equipped with the stored photos so one can easily
|
281
|
+
install plugin, checkout that branch and view them.\n\n[1] http://bazaar.launchpad.net/~torkvemada/+junk/bzr-cimage/view/head:/__init__.py",
|
282
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~torkvemada/bzr/commit_hooks/+merge/115348/preview_diffs",
|
283
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~torkvemada/bzr/commit_hooks/+merge/115348/+preview-diff/297938",
|
284
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
285
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
286
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~torkvemada/bzr/commit_hooks/+merge/115348",
|
287
|
+
"date_created": "2012-07-17T14:11:07.685932+00:00", "queue_position": null},
|
288
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
289
|
+
"registrant_link": "https://api.launchpad.net/1.0/~gz", "date_reviewed": null,
|
290
|
+
"target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/2.5", "http_etag":
|
291
|
+
"\"4814830f8caa1fe97cf1989c72d4aceb2a394b26-116aaf403ed17729bce6296d46292de0f5aedf9b\"",
|
292
|
+
"date_review_requested": "2012-03-27T13:42:15.947676+00:00", "votes_collection_link":
|
293
|
+
"https://api.launchpad.net/1.0/~gz/bzr/inplace_mo_ignored_955314/+merge/99523/votes",
|
294
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~gz/bzr/inplace_mo_ignored_955314/+merge/99523",
|
295
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
296
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~gz/bzr/inplace_mo_ignored_955314",
|
297
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~gz/bzr/inplace_mo_ignored_955314/+merge/99523/all_comments",
|
298
|
+
"date_merged": null, "description": "Moves the default location for building
|
299
|
+
.mo files into the build/ directory, and adds an --inplace option for the
|
300
|
+
current behaviour when testing in a workingtree is useful. Also adds the local
|
301
|
+
locale dir containing translations to ignores for those cases.\n\nTo do testing
|
302
|
+
of translations without installing, the steps now look like:\n\n $ make
|
303
|
+
update-pot\n $ ./setup.py build_mo -i\n $ LANG=ja_JP ./bzr help branch\n\n\n\n",
|
304
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~gz/bzr/inplace_mo_ignored_955314/+merge/99523/preview_diffs",
|
305
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~gz/bzr/inplace_mo_ignored_955314/+merge/99523/+preview-diff/227708",
|
306
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
307
|
+
null, "date_queued": null, "prerequisite_branch_link": "https://api.launchpad.net/1.0/~gz/bzr/install_mo_command_941835",
|
308
|
+
"queued_revid": null, "merged_revno": null, "reviewed_revid": null, "web_link":
|
309
|
+
"https://code.launchpad.net/~gz/bzr/inplace_mo_ignored_955314/+merge/99523",
|
310
|
+
"date_created": "2012-03-27T13:42:15.947676+00:00", "queue_position": null},
|
311
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
312
|
+
"registrant_link": "https://api.launchpad.net/1.0/~gz", "date_reviewed": null,
|
313
|
+
"target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/2.5", "http_etag":
|
314
|
+
"\"372754e3cd0e36fc4c1b58806e1e86d85e9a8267-ccac60e4fb7fe0e9baa0bd3a44b5b4bfc53b0b09\"",
|
315
|
+
"date_review_requested": "2012-03-27T13:27:56.247072+00:00", "votes_collection_link":
|
316
|
+
"https://api.launchpad.net/1.0/~gz/bzr/install_mo_command_941835/+merge/99521/votes",
|
317
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~gz/bzr/install_mo_command_941835/+merge/99521",
|
318
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
319
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~gz/bzr/install_mo_command_941835",
|
320
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~gz/bzr/install_mo_command_941835/+merge/99521/all_comments",
|
321
|
+
"date_merged": null, "description": "Adds an install_mo distutils command,
|
322
|
+
and removes the current setup.py hacks related to .mo files. At the moment,
|
323
|
+
.mo files will only be installed if they were built in a previous run of the
|
324
|
+
script, because the code to locate them runs when setup.py loads, rather than
|
325
|
+
after build_mo completes.\n\nIn addition, the bzr_distutils module is moved
|
326
|
+
to tools/ as it''s only needed during the setup process and isn''t used by
|
327
|
+
bzrlib otherwise. The idea presumably was so qbzr could share the code for
|
328
|
+
it''s setup.py (as it''s the origin), but that''s yet to happen and likely
|
329
|
+
needs some more thought before it does.\n\nThe default install location is
|
330
|
+
left as \"share/locale\" for now, but that could be changed (perhaps to something
|
331
|
+
platform specific) as needed.", "merge_reporter_link": null, "preview_diffs_collection_link":
|
332
|
+
"https://api.launchpad.net/1.0/~gz/bzr/install_mo_command_941835/+merge/99521/preview_diffs",
|
333
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~gz/bzr/install_mo_command_941835/+merge/99521/+preview-diff/227917",
|
334
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
335
|
+
null, "date_queued": null, "prerequisite_branch_link": "https://api.launchpad.net/1.0/~gz/bzr/run_test_setup_in_tempdir_140874",
|
336
|
+
"queued_revid": null, "merged_revno": null, "reviewed_revid": null, "web_link":
|
337
|
+
"https://code.launchpad.net/~gz/bzr/install_mo_command_941835/+merge/99521",
|
338
|
+
"date_created": "2012-03-27T13:27:56.247072+00:00", "queue_position": null},
|
339
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
340
|
+
"registrant_link": "https://api.launchpad.net/1.0/~vila", "date_reviewed":
|
341
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
342
|
+
"http_etag": "\"00240515ae5a675ae8d20c444e179cc3e426de58-7fa99c9bcdeefae948ccba921a6629ca07cb3694\"",
|
343
|
+
"date_review_requested": "2012-03-26T16:56:34.501242+00:00", "votes_collection_link":
|
344
|
+
"https://api.launchpad.net/1.0/~vila/bzr/webdav-in-core/+merge/99371/votes",
|
345
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~vila/bzr/webdav-in-core/+merge/99371",
|
346
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
347
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~vila/bzr/webdav-in-core",
|
348
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~vila/bzr/webdav-in-core/+merge/99371/all_comments",
|
349
|
+
"date_merged": null, "description": "This merges the bzr-webdav plugin into
|
350
|
+
core.\n\nThis plugin has been quite stable for years but was broken by a recent\nchange
|
351
|
+
in bzr (related to the ssl cert verification). Bringing it into core\nis one
|
352
|
+
way to address potential issues like this and is mostly an experiment\nto
|
353
|
+
see what happen when a plugin is merged into core.", "merge_reporter_link":
|
354
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~vila/bzr/webdav-in-core/+merge/99371/preview_diffs",
|
355
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~vila/bzr/webdav-in-core/+merge/99371/+preview-diff/227353",
|
356
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
357
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
358
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~vila/bzr/webdav-in-core/+merge/99371",
|
359
|
+
"date_created": "2012-03-26T16:56:34.501242+00:00", "queue_position": null},
|
360
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
361
|
+
"registrant_link": "https://api.launchpad.net/1.0/~parthm", "date_reviewed":
|
362
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
363
|
+
"http_etag": "\"f633a069e41474cf8c0cd2fefd88a40c436c2496-15b8d886743ade1530abe5df7b6be67691709999\"",
|
364
|
+
"date_review_requested": "2012-02-26T05:32:00.890800+00:00", "votes_collection_link":
|
365
|
+
"https://api.launchpad.net/1.0/~parthm/bzr/242522-symlink-repo-to-usb-stick/+merge/94679/votes",
|
366
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~parthm/bzr/242522-symlink-repo-to-usb-stick/+merge/94679",
|
367
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
368
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~parthm/bzr/242522-symlink-repo-to-usb-stick",
|
369
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~parthm/bzr/242522-symlink-repo-to-usb-stick/+merge/94679/all_comments",
|
370
|
+
"date_merged": null, "description": "This patch updates updates transform.create_symlink
|
371
|
+
to issue a warning in case the target filesystem (e.g. fat mounted on Linux)
|
372
|
+
does not support symlinks. It catches OSError EPERM and issues a warning to
|
373
|
+
the user. The branch is created / updated but the symlink is not created.\n\nThis
|
374
|
+
patch along with https://code.launchpad.net/~parthm/bzr/81689-win-symlink-warning/+merge/93784
|
375
|
+
allow bzr to work with repos containing symlinks on file systems that don''t
|
376
|
+
allow symlinks by ignoring symlinks (i.e. not creating them at all).\n", "merge_reporter_link":
|
377
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~parthm/bzr/242522-symlink-repo-to-usb-stick/+merge/94679/preview_diffs",
|
378
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~parthm/bzr/242522-symlink-repo-to-usb-stick/+merge/94679/+preview-diff/216116",
|
379
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
380
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
381
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~parthm/bzr/242522-symlink-repo-to-usb-stick/+merge/94679",
|
382
|
+
"date_created": "2012-02-26T05:32:00.890800+00:00", "queue_position": null},
|
383
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
384
|
+
"registrant_link": "https://api.launchpad.net/1.0/~parthm", "date_reviewed":
|
385
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
386
|
+
"http_etag": "\"242908e4cd0d789220907b8dcaba8975829f09da-25fad9768082696c2c5e63d6cf972cbc17aed224\"",
|
387
|
+
"date_review_requested": "2012-03-03T06:24:38.596254+00:00", "votes_collection_link":
|
388
|
+
"https://api.launchpad.net/1.0/~parthm/bzr/81689-win-symlink-warning/+merge/93784/votes",
|
389
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~parthm/bzr/81689-win-symlink-warning/+merge/93784",
|
390
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
391
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~parthm/bzr/81689-win-symlink-warning",
|
392
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~parthm/bzr/81689-win-symlink-warning/+merge/93784/all_comments",
|
393
|
+
"date_merged": null, "description": "Hello,\n\nThis branch contains changes
|
394
|
+
to allow checkout/branch of repositories containing symlinks on Windows platform.
|
395
|
+
The approach is to simply ignore symlinks and issue a warning about unsupported
|
396
|
+
symlinks when commands like branch, status, diff and commit are run. This
|
397
|
+
is discussed https://bugs.launchpad.net/bzr/+bug/81689 with comments starting
|
398
|
+
with #28.\n\nThe patch isn''t quite ready for merge yet and I still need to
|
399
|
+
write additional tests. Just wanted to put this up here so I can improve it
|
400
|
+
based on review comments and the general approach is validated. Thanks.\n\nBelow
|
401
|
+
is the sample command interaction on Windows.\n\n=================================================================\nD:\\ext-src\u003ebrun
|
402
|
+
branch lp:~parthm/+junk/project-with-symlink\nUnable to creat symlink \"softlink\"
|
403
|
+
on this platform.\nBranched 2 revisions.\n\nD:\\ext-src\u003ecd project-with-symlink\n\nD:\\ext-src\\project-with-symlink\u003els\nhardlink
|
404
|
+
hello\n\nD:\\ext-src\\project-with-symlink\u003e..\\brun.bat st\nIgnoring
|
405
|
+
\"softlink\" as symlinks are not supported on this platform.\n\nD:\\ext-src\\project-with-symlink\u003e..\\brun.bat
|
406
|
+
diff\nIgnoring \"softlink\" as symlinks are not supported on this platform.\n\nD:\\ext-src\\project-with-symlink\u003e..\\brun.bat
|
407
|
+
ci\nCommitting to: D:/ext-src/project-with-symlink/\nmissing softlink\nIgnoring
|
408
|
+
\"softlink\" as symlinks are not supported on this platform.\nbzr: ERROR:
|
409
|
+
No changes to commit. Please ''bzr add'' the files you want to commit,\n or
|
410
|
+
use --unchanged to force an empty commit.\n=================================================================\n",
|
411
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~parthm/bzr/81689-win-symlink-warning/+merge/93784/preview_diffs",
|
412
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~parthm/bzr/81689-win-symlink-warning/+merge/93784/+preview-diff/218613",
|
413
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
414
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
415
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~parthm/bzr/81689-win-symlink-warning/+merge/93784",
|
416
|
+
"date_created": "2012-02-20T08:43:15.031473+00:00", "queue_position": null},
|
417
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
418
|
+
"registrant_link": "https://api.launchpad.net/1.0/~rom1-chal", "date_reviewed":
|
419
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
420
|
+
"http_etag": "\"3ee5161cf6dc6af64cc836994ba5e04b5df3c9f9-5bb1e5379d1a0a092d34ae47807a21da8ca27165\"",
|
421
|
+
"date_review_requested": "2011-11-08T14:34:04.719730+00:00", "votes_collection_link":
|
422
|
+
"https://api.launchpad.net/1.0/~rom1-chal/bzr/post_checkout_hook/+merge/81589/votes",
|
423
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~rom1-chal/bzr/post_checkout_hook/+merge/81589",
|
424
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
425
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~rom1-chal/bzr/post_checkout_hook",
|
426
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~rom1-chal/bzr/post_checkout_hook/+merge/81589/all_comments",
|
427
|
+
"date_merged": null, "description": "Hi, \n\nAs mentioned in IRC chan, please
|
428
|
+
find an implementation of a post_checkout hook. \n\n* Code : It is called
|
429
|
+
with bzrlib.branch.CheckoutHookParams class containing paramms of which are
|
430
|
+
: \n(checkouted branch, checkouted revision_id, created workingtree, checkout
|
431
|
+
path). It fired at the end of the Branch.create_checkout method.\n\n* Tests
|
432
|
+
: per_branch tests take into account lightweight, heavyweight and earlier
|
433
|
+
revision cehkout. \n./bzr selftest -v TestCheckoutHook\n\n* Doc : I haven''t
|
434
|
+
found the hooks document generator to test the ''bzr help hooks'' output.
|
435
|
+
\nYet, I have update the releasenotes. \n\n\nMy planned usage is the following
|
436
|
+
: \n- I have a CI server running merges from bzr-builder recipes, \n- When
|
437
|
+
a conflict is detected, it reports the conflicts and mails them to related
|
438
|
+
users. \nThe goal now is to propose to the developer to simply checkout a
|
439
|
+
branch to reproduce locally the conflicts from the recipe. \nWith the post_checkout
|
440
|
+
hook, i trigger the merge directive right after the checkout. \n\nRgds/Romain",
|
441
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~rom1-chal/bzr/post_checkout_hook/+merge/81589/preview_diffs",
|
442
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~rom1-chal/bzr/post_checkout_hook/+merge/81589/+preview-diff/188323",
|
443
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
444
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
445
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~rom1-chal/bzr/post_checkout_hook/+merge/81589",
|
446
|
+
"date_created": "2011-11-08T14:34:04.719730+00:00", "queue_position": null},
|
447
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
448
|
+
"registrant_link": "https://api.launchpad.net/1.0/~jameinel", "date_reviewed":
|
449
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/2.3",
|
450
|
+
"http_etag": "\"7a1524e49d6d1e486c42cd74dda8f14076bf936c-c6aa379fdb8651c195a24bdac513c6af47d0d129\"",
|
451
|
+
"date_review_requested": "2011-10-10T13:47:14.150158+00:00", "votes_collection_link":
|
452
|
+
"https://api.launchpad.net/1.0/~jameinel/bzr/2.3-client-reconnect-819604/+merge/78843/votes",
|
453
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.3-client-reconnect-819604/+merge/78843",
|
454
|
+
"commit_message": "Bug #819604, allow clients to reconnect if they lose a
|
455
|
+
connection at particular times.", "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
456
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.3-client-reconnect-819604",
|
457
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.3-client-reconnect-819604/+merge/78843/all_comments",
|
458
|
+
"date_merged": null, "description": "This is the rollup of the client reconnect
|
459
|
+
code (bug #819604) for bzr-2.3. The only significant tweaks vs the 2.2 version
|
460
|
+
is that ''osutils.read_bytes_from_socket'' already handled WSAECONNABORTED
|
461
|
+
and that NEWS is now split up into multiple files, rather than just being
|
462
|
+
NEWS.\n\nAgain, reviews should be done on 2.1 to start with, this is created
|
463
|
+
to handle any merge conflicts, etc that result in up-porting the code.", "merge_reporter_link":
|
464
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.3-client-reconnect-819604/+merge/78843/preview_diffs",
|
465
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.3-client-reconnect-819604/+merge/78843/+preview-diff/177143",
|
466
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
467
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
468
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~jameinel/bzr/2.3-client-reconnect-819604/+merge/78843",
|
469
|
+
"date_created": "2011-10-10T13:47:14.150158+00:00", "queue_position": null},
|
470
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
471
|
+
"registrant_link": "https://api.launchpad.net/1.0/~jameinel", "date_reviewed":
|
472
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/2.2",
|
473
|
+
"http_etag": "\"76452a7420dd822740c17b40d28e77275355322b-aa53f5bc8780a908d9c3784b3ab10d4e5e16d282\"",
|
474
|
+
"date_review_requested": "2011-10-10T13:40:35.685169+00:00", "votes_collection_link":
|
475
|
+
"https://api.launchpad.net/1.0/~jameinel/bzr/2.2-client-reconnect-819604/+merge/78842/votes",
|
476
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.2-client-reconnect-819604/+merge/78842",
|
477
|
+
"commit_message": "Bug #819604, allow bzr-2.2 to gracefully reconnect to the
|
478
|
+
server if we get a ConnectionReset at appropriate times.", "resource_type_link":
|
479
|
+
"https://api.launchpad.net/1.0/#branch_merge_proposal", "source_branch_link":
|
480
|
+
"https://api.launchpad.net/1.0/~jameinel/bzr/2.2-client-reconnect-819604",
|
481
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.2-client-reconnect-819604/+merge/78842/all_comments",
|
482
|
+
"date_merged": null, "description": "This is just a rollup of all of my changes
|
483
|
+
for the 2.1-client-reconnect (for bug #819604) but merged into bzr-2.2 and
|
484
|
+
updated for the api changes, etc.\n\nI suggest we review and approve the 2.1
|
485
|
+
series, since it is all nicely split out into logical steps, and then when
|
486
|
+
ready any changes needed there can be brought into this branch, etc.", "merge_reporter_link":
|
487
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.2-client-reconnect-819604/+merge/78842/preview_diffs",
|
488
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.2-client-reconnect-819604/+merge/78842/+preview-diff/177137",
|
489
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
490
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
491
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~jameinel/bzr/2.2-client-reconnect-819604/+merge/78842",
|
492
|
+
"date_created": "2011-10-10T13:40:35.685169+00:00", "queue_position": null},
|
493
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
494
|
+
"registrant_link": "https://api.launchpad.net/1.0/~jameinel", "date_reviewed":
|
495
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/2.1",
|
496
|
+
"http_etag": "\"ae830e2a061e9dd367a09b7933d9b8b63cfc237a-de7ad5ebed5bad69b84a44f3cf09e0f7df94b89a\"",
|
497
|
+
"date_review_requested": "2011-10-10T13:18:55.719960+00:00", "votes_collection_link":
|
498
|
+
"https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-read-reconnect-819604/+merge/78839/votes",
|
499
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-read-reconnect-819604/+merge/78839",
|
500
|
+
"commit_message": "Bug #819604, retry the request if we get ConnectionReset
|
501
|
+
while reading as well.", "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
502
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-read-reconnect-819604",
|
503
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-read-reconnect-819604/+merge/78839/all_comments",
|
504
|
+
"date_merged": null, "description": "This is the final step in the chain.\n\nThis
|
505
|
+
adds the ability to retry the request if we get a ConnectionReset while reading
|
506
|
+
the response from the server.\n\nNote that this only retries the request while
|
507
|
+
parsing the response header (ok, error, etc). Not while reading the actual
|
508
|
+
body content. However, as mentioned in the beginning, that is the use case
|
509
|
+
that we really care about. We are trying to allow the server to soft-disconnect
|
510
|
+
us, in which case it shouldn''t send any response at all.\n\n(The other thing
|
511
|
+
we could have done is upgraded the RPC to allow the server to send a ''reconnect''
|
512
|
+
message, but that wouldn''t have been compatible with older clients, especially
|
513
|
+
since they wouldn''t have been listening for that response at the end of a
|
514
|
+
previous message, etc.)\n\nNote that I''ve tested this by running bzr.dev
|
515
|
+
on devpad, and using ''bzr branch bzr+ssh://...'' and then while on devpad,
|
516
|
+
running ''kill -SIGHUP PID'' on whatever bzr is currently active. I wasn''t
|
517
|
+
able to actually stop the branch from finishing, even though I killed it in
|
518
|
+
a few different places.\n\nAnd the client appropriately reported that it got
|
519
|
+
ConnectionReset but that it was going to try again.", "merge_reporter_link":
|
520
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-read-reconnect-819604/+merge/78839/preview_diffs",
|
521
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-read-reconnect-819604/+merge/78839/+preview-diff/177132",
|
522
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
523
|
+
null, "date_queued": null, "prerequisite_branch_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-categorize-requests-819604",
|
524
|
+
"queued_revid": null, "merged_revno": null, "reviewed_revid": null, "web_link":
|
525
|
+
"https://code.launchpad.net/~jameinel/bzr/2.1-client-read-reconnect-819604/+merge/78839",
|
526
|
+
"date_created": "2011-10-10T13:18:55.719960+00:00", "queue_position": null},
|
527
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
528
|
+
"registrant_link": "https://api.launchpad.net/1.0/~jameinel", "date_reviewed":
|
529
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/2.1",
|
530
|
+
"http_etag": "\"981340a2fedb3f830ae27794c74142f99930fe9c-1996fa85b6674530d9854bd454d335ea1ca73110\"",
|
531
|
+
"date_review_requested": "2011-10-08T11:59:45.807385+00:00", "votes_collection_link":
|
532
|
+
"https://api.launchpad.net/1.0/~jameinel/bzr/2.1-categorize-requests-819604/+merge/78708/votes",
|
533
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-categorize-requests-819604/+merge/78708",
|
534
|
+
"commit_message": "Bug #819604, categorize all smart Requests as to their
|
535
|
+
safety for retrying them automatically.", "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
536
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-categorize-requests-819604",
|
537
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-categorize-requests-819604/+merge/78708/all_comments",
|
538
|
+
"date_merged": null, "description": "1) I analyzed all of the requests that
|
539
|
+
are currently registered as to whether they are safe or not to retry. I ended
|
540
|
+
up with 4 categories:\n\n# safe The request is strictly idempotent, calling
|
541
|
+
it twice results in\n# the same result as calling it one time. This
|
542
|
+
includes all read-only\n# requests, and write requests like ''put''
|
543
|
+
where the end result is\n# identical content.\n# unsafe A request
|
544
|
+
which is unsafe means that state is updated in a way that\n# replaying
|
545
|
+
that request results in a different state. For example\n# ''append''
|
546
|
+
writes more bytes to a given file. If append succeeds, it\n# moves
|
547
|
+
the file pointer.\n# semi This is a request that isn''t strictly idempotent,
|
548
|
+
but doesn''t\n# result in corruption if it is retried. This is for
|
549
|
+
things like\n# ''lock'' and ''unlock''. If you call lock, it updates
|
550
|
+
the disk\n# structure. If you fail to read the response, you won''t
|
551
|
+
be able to\n# use the lock, because you don''t have the lock token.
|
552
|
+
Calling lock\n# again will fail, because the lock is already taken.
|
553
|
+
However, we\n# can''t tell if the server received our request or
|
554
|
+
not. If it didn''t,\n# then retrying the request is fine, as it
|
555
|
+
will actually do what we\n# want. If it did, we will interrupt the
|
556
|
+
current operation, but we\n# are no worse off than interrupting
|
557
|
+
the current operation because of\n# a ConnectionReset.\n# stream This
|
558
|
+
is a request that takes a stream that cannot be restarted if\n# consumed.
|
559
|
+
This request is ''safe'' in that if we determine the\n# connection
|
560
|
+
is closed before we consume the stream, we can try\n# again.\n\n2)
|
561
|
+
The retry code will ultimately only care if something is ''unsafe'' or not,
|
562
|
+
so we could simplify this list if we wanted. Or we could extend it to split
|
563
|
+
''safe'' into differentiating between ''read-only'' and ''idempotent''.\n\nOne
|
564
|
+
interesting potential from this classification, is that we could actually
|
565
|
+
test it. Specifically, for each request, we set up a RemoteRepository in some
|
566
|
+
sort of state. We could then create a test that:\n a) for ''read-only'', after
|
567
|
+
the request is sent, there is no change on disk.\n b) for ''idempotent'' there
|
568
|
+
is a change, however, sending the request a second time, there is no change.\n
|
569
|
+
c) for ''semi'', there is some change on disk, sending the request a second
|
570
|
+
time causes a client-side failure (exception is raised)\n d) for ''stream'',
|
571
|
+
I''m not really sure\n e) for ''unsafe'' we could confirm that sending the
|
572
|
+
request once results in a change, and sending it again, results in yet-another
|
573
|
+
change.\n\nHowever, the test suite setup is non-trivial, since you need specific
|
574
|
+
arguments for every function. Which is an awful lot of scenarios to describe.\n\n3)
|
575
|
+
I decided to add this to registry, rather that putting it on the classes themselves.
|
576
|
+
Either would be fine, as we only need to lookup one request at runtime that
|
577
|
+
actually got ConnectionReset. The main reason I went this route is that I
|
578
|
+
want to make sure a human looks at every request and determines its safety.
|
579
|
+
Adding it as a class attribute tends to leave it as the default from inheritance,
|
580
|
+
which makes it a little too easy to mark something safe when it isn''t. And
|
581
|
+
if you get it wrong, this is something that only causes corruption when you
|
582
|
+
get a ConnectionReset at exactly the right time. So really hard to debug and
|
583
|
+
diagnose.\n\n4) This is one of those patches that will definitely need to
|
584
|
+
be updated to merge it to newer versions of bzr, since it touches so many
|
585
|
+
lines of code, and we are very likely to have added new RPCs since bzr 2.1.",
|
586
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-categorize-requests-819604/+merge/78708/preview_diffs",
|
587
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-categorize-requests-819604/+merge/78708/+preview-diff/177123",
|
588
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
589
|
+
null, "date_queued": null, "prerequisite_branch_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-reconnect-819604",
|
590
|
+
"queued_revid": null, "merged_revno": null, "reviewed_revid": null, "web_link":
|
591
|
+
"https://code.launchpad.net/~jameinel/bzr/2.1-categorize-requests-819604/+merge/78708",
|
592
|
+
"date_created": "2011-10-08T11:59:45.807385+00:00", "queue_position": null},
|
593
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
594
|
+
"registrant_link": "https://api.launchpad.net/1.0/~jameinel", "date_reviewed":
|
595
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/2.1",
|
596
|
+
"http_etag": "\"1ec64b6af233feab2b4c184df092dc8a60f08470-f39f37ed5228a56fb74eccd707828c41f9d7f905\"",
|
597
|
+
"date_review_requested": "2011-10-07T16:24:15.753808+00:00", "votes_collection_link":
|
598
|
+
"https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-stream-started-819604/+merge/78631/votes",
|
599
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-stream-started-819604/+merge/78631",
|
600
|
+
"commit_message": "Bug #819604, allow reconnecting with a body stream as long
|
601
|
+
as we haven''t touched the stream yet.", "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
602
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-stream-started-819604",
|
603
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-stream-started-819604/+merge/78631/all_comments",
|
604
|
+
"date_merged": null, "description": "This layers on top of my ''client reconnect''
|
605
|
+
patch for the case where we have a body stream.\n\n1) It adds a flush just
|
606
|
+
before we process the first entry of the body stream. This adds an extra write
|
607
|
+
call to ''bzr push''. However, we write after every entry in the stream, and
|
608
|
+
the first entry of the stream is actually very small. (bzrlib.repository._stream_to_byte_stream()
|
609
|
+
the first object that gets flushed is ''pack_writer.begin()'', which is just
|
610
|
+
the pack header.)\nI don''t imagine writing out the ProtocolThree headers
|
611
|
+
will be adding tons of real world overhead.\n\n2) It tracks once we start
|
612
|
+
consuming body_stream, so that we don''t do the auto-retry after that point.\n\nI
|
613
|
+
felt it was clear and clean enough to do it this way. We could arguably do
|
614
|
+
a little bit better higher up the stack, but not much, as I described in the
|
615
|
+
bug. Specifically, RemoteRepository.insert_stream is the only caller that
|
616
|
+
passes a body_stream. But it, itself, only gets a stream of records to pass.
|
617
|
+
So if we''ve started passing records, we can''t retry anyway. So the retry
|
618
|
+
logic needs to go all the way up to Fetch code.", "merge_reporter_link": null,
|
619
|
+
"preview_diffs_collection_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-stream-started-819604/+merge/78631/preview_diffs",
|
620
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-stream-started-819604/+merge/78631/+preview-diff/177119",
|
621
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
622
|
+
null, "date_queued": null, "prerequisite_branch_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-reconnect-819604",
|
623
|
+
"queued_revid": null, "merged_revno": null, "reviewed_revid": null, "web_link":
|
624
|
+
"https://code.launchpad.net/~jameinel/bzr/2.1-client-stream-started-819604/+merge/78631",
|
625
|
+
"date_created": "2011-10-07T16:24:15.753808+00:00", "queue_position": null},
|
626
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
627
|
+
"registrant_link": "https://api.launchpad.net/1.0/~gagern", "date_reviewed":
|
628
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
629
|
+
"http_etag": "\"350ed3f697525381a7e576544ee0410c360b797c-214ceae08707c853f7eab781eae81b3b6f7682e6\"",
|
630
|
+
"date_review_requested": "2011-10-07T14:34:02.837155+00:00", "votes_collection_link":
|
631
|
+
"https://api.launchpad.net/1.0/~gagern/bzr/bug869912-log-root-dir/+merge/78612/votes",
|
632
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~gagern/bzr/bug869912-log-root-dir/+merge/78612",
|
633
|
+
"commit_message": "Allow \"bzr log dir\" to filter on path even if dir names
|
634
|
+
a branch root.", "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
635
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~gagern/bzr/bug869912-log-root-dir",
|
636
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~gagern/bzr/bug869912-log-root-dir/+merge/78612/all_comments",
|
637
|
+
"date_merged": null, "description": "Make \"bzr log dir\" filter for the given
|
638
|
+
directory even if it is the root directory of its branch. Important for split
|
639
|
+
branches. Use \"bzr log -d dir\" for old behaviour of listing the complete
|
640
|
+
history of a given branch.", "merge_reporter_link": null, "preview_diffs_collection_link":
|
641
|
+
"https://api.launchpad.net/1.0/~gagern/bzr/bug869912-log-root-dir/+merge/78612/preview_diffs",
|
642
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~gagern/bzr/bug869912-log-root-dir/+merge/78612/+preview-diff/178708",
|
643
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
644
|
+
null, "date_queued": null, "prerequisite_branch_link": "https://api.launchpad.net/1.0/~gagern/bzr/bug869915-mkdir-quiet",
|
645
|
+
"queued_revid": null, "merged_revno": null, "reviewed_revid": null, "web_link":
|
646
|
+
"https://code.launchpad.net/~gagern/bzr/bug869912-log-root-dir/+merge/78612",
|
647
|
+
"date_created": "2011-10-07T14:34:02.837155+00:00", "queue_position": null},
|
648
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
649
|
+
"registrant_link": "https://api.launchpad.net/1.0/~jameinel", "date_reviewed":
|
650
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/2.1",
|
651
|
+
"http_etag": "\"a4aa8bc697c5fdfd56cfea28f36218259f470fd0-b4fd46ace5ec57b12fce84f1abad700484c4cd51\"",
|
652
|
+
"date_review_requested": "2011-10-07T13:21:05.270933+00:00", "votes_collection_link":
|
653
|
+
"https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-reconnect-819604/+merge/78597/votes",
|
654
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-reconnect-819604/+merge/78597",
|
655
|
+
"commit_message": "Start of bug #819604, allow bzr clients to reconnect if
|
656
|
+
the connection is gone when we go to write a new request.", "resource_type_link":
|
657
|
+
"https://api.launchpad.net/1.0/#branch_merge_proposal", "source_branch_link":
|
658
|
+
"https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-reconnect-819604",
|
659
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-reconnect-819604/+merge/78597/all_comments",
|
660
|
+
"date_merged": null, "description": "This is some initial work for having
|
661
|
+
clients reconnect when their bzr+ssh (or bzr://) connection gets closed underneath
|
662
|
+
them.\n\nTo start with, the trickiest bit is that it is really quite hard
|
663
|
+
to detect when things are closed. Mostly because of buffering, etc, at lots
|
664
|
+
of different levels (internal memory buffering, socket/pipe buffering, ''ssh.exe''
|
665
|
+
buffering, latency of close message from server back to client, etc.)\n\nI''ll
|
666
|
+
also clarify that this isn''t intended to handle all possible sorts of connection
|
667
|
+
failures. What we really are trying to handle is allowing a server to be upgraded
|
668
|
+
''live''. Such that the server will gently disconnect us only between complete
|
669
|
+
requests. Versus having requests terminated randomly in the middle of content.
|
670
|
+
It may help with some of those cases, and we certainly don''t want to cause
|
671
|
+
corruption, etc if one of those happens. But it isn''t the goal of *this*
|
672
|
+
change.\n\n\n\nThis specific patch has a few aspects, and does help some cases
|
673
|
+
in real-world testing.\n\n1) Backport a minimum amount of the SmartSSHClientMedium
|
674
|
+
proxies to _real_medium patch from Andrew. In bzr-2.2 Andrew updated the code
|
675
|
+
so that when spawning an ''ssh'' subprocess, we use a socketpair when possible
|
676
|
+
instead of pipes. (That way we can read without blocking, allowing us to use
|
677
|
+
large buffers, etc.)\n\nIt also meant that he shared the logic from SmartSimplePipeStreamMedium
|
678
|
+
and SmartTCPClientMedium, which I wanted to do, to avoid having to re-implement
|
679
|
+
the logic multiple times.\n\nThis is a pretty small part of the patch.\n\n2)
|
680
|
+
Update some of the lower level code so that we get ConnectionReset rather
|
681
|
+
than various IOError and ValueError when writing to a closed connection.\n\n3)
|
682
|
+
Update the _SmartClient._send_request logic. If we get a ConnectionReset while
|
683
|
+
we are trying to write the request, then we can safely retry the request.
|
684
|
+
On the assumption that as long as the server doesn''t see the final ''e''
|
685
|
+
terminal byte, it will reject the request, because it is incomplete.\n\n4)
|
686
|
+
The one caveat is if there is a ''body_stream''. body_stream is an iterable,
|
687
|
+
so we can''t just rewind it and resume it.\n\nOn the plus side, there is only
|
688
|
+
one caller RemoteStreamSink.insert_stream. In theory we could update that
|
689
|
+
caller. In practice, it *also* takes a ''stream'' object, which can''t simply
|
690
|
+
be rewound. Though we do a ''no-op'' stream just before the real content to
|
691
|
+
determine that the remote server actually supports the RPC we want to use.\n\nThat
|
692
|
+
would allow us to close the gap a little bit. So we can detect ConnectionReset
|
693
|
+
all the way to the point that we actually start streaming the content.\n\nThe
|
694
|
+
other bit that would be possible, is to update ProtocolThreeRequester.call_with_body_stream
|
695
|
+
to allow it to set a flag to indicate whether it has actually started consuming
|
696
|
+
the stream yet. Then update it to flush just before it iterates the body stream
|
697
|
+
to help force detecting closed connections. (otherwise we are likely to have
|
698
|
+
buffered at least the first part of the body_stream in local memory, since
|
699
|
+
the local buffer is 1MB and the first flush is only called after the first
|
700
|
+
chunk of the body_stream.)\n\nThis just closes a window where we won''t reconnect
|
701
|
+
during ''bzr push''.\n\n5) The next step is that (especially for sockets),
|
702
|
+
we write out the request successfully, and then notice it is closed when we
|
703
|
+
try to read back the response.\n\nHere I''m a lot more concerned about non-idempotent
|
704
|
+
requests. Because the server might have fully read the request, and sent back
|
705
|
+
a response, but we didn''t get to see the response.\n\nHowever, our RPC design
|
706
|
+
is meant to be stateless (all state is passed in the request, not assumed
|
707
|
+
to be stored on the server side). Which means things *should* be idempotent.
|
708
|
+
For something like ''put_bytes'', we may write the same content twice, but
|
709
|
+
we shouldn''t corrupt anything.\n\nThe only one I can think of is ''append_bytes'',
|
710
|
+
and the associated open_write_stream() code. (RemoteTransport.open_write_stream
|
711
|
+
uses AppendBasedFileStream as its implementation.)\n\nAnd that code shouldn''t
|
712
|
+
really be used with up-to-date bzr clients and servers. So I''m much more
|
713
|
+
ok with it just dying if it isn''t safe to retry.", "merge_reporter_link":
|
714
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-reconnect-819604/+merge/78597/preview_diffs",
|
715
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-client-reconnect-819604/+merge/78597/+preview-diff/285038",
|
716
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
717
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
718
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~jameinel/bzr/2.1-client-reconnect-819604/+merge/78597",
|
719
|
+
"date_created": "2011-10-07T13:21:05.270933+00:00", "queue_position": null},
|
720
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
721
|
+
"registrant_link": "https://api.launchpad.net/1.0/~mbp", "date_reviewed":
|
722
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
723
|
+
"http_etag": "\"4e838a0e3a96bf55bd2eff05fadc029b2456ce74-4a29b2ee55bed8cbd863805046203a13cc56f645\"",
|
724
|
+
"date_review_requested": "2011-08-01T08:04:03.770400+00:00", "votes_collection_link":
|
725
|
+
"https://api.launchpad.net/1.0/~mbp/bzr/764108-diffoptions/+merge/69966/votes",
|
726
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~mbp/bzr/764108-diffoptions/+merge/69966",
|
727
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
728
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~mbp/bzr/764108-diffoptions",
|
729
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~mbp/bzr/764108-diffoptions/+merge/69966/all_comments",
|
730
|
+
"date_merged": null, "description": "This builds on sergei''s work in https://bugs.launchpad.net/bzr/+bug/764108
|
731
|
+
to add an option to show function names within the diff, based on \u003chttps://code.launchpad.net/~maria-captains/bzr/diffoptions/+merge/54139\u003e.\n\nI
|
732
|
+
was going to finish it off for him. I haven''t looked at it for a while,
|
733
|
+
but it''s still assigned to me so I''m putting this up to get it back in circulation. There
|
734
|
+
are a lot of things we possibly could do here, but perhaps we can look for
|
735
|
+
a smaller incremental step.", "merge_reporter_link": null, "preview_diffs_collection_link":
|
736
|
+
"https://api.launchpad.net/1.0/~mbp/bzr/764108-diffoptions/+merge/69966/preview_diffs",
|
737
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~mbp/bzr/764108-diffoptions/+merge/69966/+preview-diff/135577",
|
738
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
739
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
740
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~mbp/bzr/764108-diffoptions/+merge/69966",
|
741
|
+
"date_created": "2011-08-01T08:04:03.770400+00:00", "queue_position": null},
|
742
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
743
|
+
"registrant_link": "https://api.launchpad.net/1.0/~thomir", "date_reviewed":
|
744
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
745
|
+
"http_etag": "\"3c141453eb3c786327a1d2a3d99985e7e6a791a8-bb49cded35416434816ddddec85bdb1d0f02ba32\"",
|
746
|
+
"date_review_requested": "2011-07-28T07:07:09.286543+00:00", "votes_collection_link":
|
747
|
+
"https://api.launchpad.net/1.0/~thomir/bzr/add-global-config/+merge/69592/votes",
|
748
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~thomir/bzr/add-global-config/+merge/69592",
|
749
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
750
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~thomir/bzr/add-global-config",
|
751
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~thomir/bzr/add-global-config/+merge/69592/all_comments",
|
752
|
+
"date_merged": null, "description": "Code not finished yet - working on making
|
753
|
+
a system-wide config file (/etc/bazaar/bazaar.conf under Linux).", "merge_reporter_link":
|
754
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~thomir/bzr/add-global-config/+merge/69592/preview_diffs",
|
755
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~thomir/bzr/add-global-config/+merge/69592/+preview-diff/136903",
|
756
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
757
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
758
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~thomir/bzr/add-global-config/+merge/69592",
|
759
|
+
"date_created": "2011-07-28T07:07:09.286543+00:00", "queue_position": null},
|
760
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
761
|
+
"registrant_link": "https://api.launchpad.net/1.0/~mbp", "date_reviewed":
|
762
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
763
|
+
"http_etag": "\"cc23469796a43559bdcd58ef30d36d2b76128430-39f5073f3a9df53cd172b41a2f645075a1db0f81\"",
|
764
|
+
"date_review_requested": "2011-08-01T07:12:09.618656+00:00", "votes_collection_link":
|
765
|
+
"https://api.launchpad.net/1.0/~mbp/bzr/test-errors/+merge/64485/votes", "reviewer_link":
|
766
|
+
null, "self_link": "https://api.launchpad.net/1.0/~mbp/bzr/test-errors/+merge/64485",
|
767
|
+
"commit_message": "multiple selftest improvements: print errors once; no traceback
|
768
|
+
for xfail; no empty logs (bug 499713, bug 625597)", "resource_type_link":
|
769
|
+
"https://api.launchpad.net/1.0/#branch_merge_proposal", "source_branch_link":
|
770
|
+
"https://api.launchpad.net/1.0/~mbp/bzr/test-errors", "all_comments_collection_link":
|
771
|
+
"https://api.launchpad.net/1.0/~mbp/bzr/test-errors/+merge/64485/all_comments",
|
772
|
+
"date_merged": null, "description": "A few selftest annoyances fixed:\n\n*
|
773
|
+
Errors are printed only once, as they occur, not again at the end.\n If someone
|
774
|
+
actually really likes this, the code is there and you can \n add a configuration
|
775
|
+
to turn it on. (See bug 408192, bug 625597, though \n this is not exactly
|
776
|
+
what was discussed.)\n\n* UnicodeOrBytesToBytesWriter had the somewhat confusing
|
777
|
+
behavior of\n printing the repr of the wrapped object.\n\n* The indentation
|
778
|
+
of test failures did not fit well with testtools'' behavior\n of returning
|
779
|
+
the whole traceback as part of the error string.\n\n* We shouldn''t print
|
780
|
+
the whole traceback for known failures. Just \n the reason string is enough. (Bug
|
781
|
+
499713)\n\n* To let the unicode-escaping code work, we need to pass it the
|
782
|
+
error \n as a unicode string.\n\n* Don''t attach empty log files; as a consequence
|
783
|
+
the log is not attached\n until the test completes. (However, it can still
|
784
|
+
be read from \n TestCase.get_log()).\n\n* Bugs in old subunits do not deserve
|
785
|
+
a ''known failure'' in bzr. Only\n things we could fix (without time travel)
|
786
|
+
should get that.", "merge_reporter_link": null, "preview_diffs_collection_link":
|
787
|
+
"https://api.launchpad.net/1.0/~mbp/bzr/test-errors/+merge/64485/preview_diffs",
|
788
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~mbp/bzr/test-errors/+merge/64485/+preview-diff/136214",
|
789
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
790
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
791
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~mbp/bzr/test-errors/+merge/64485",
|
792
|
+
"date_created": "2011-06-14T03:51:04.674032+00:00", "queue_position": null},
|
793
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
794
|
+
"registrant_link": "https://api.launchpad.net/1.0/~mbp", "date_reviewed":
|
795
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
796
|
+
"http_etag": "\"b4954121ea7860aa7f7dd6995ddf6b8832fbd9bd-d6a30d24eceee2ed4e19fe4e2b2f113c957a40bc\"",
|
797
|
+
"date_review_requested": "2011-05-20T15:58:40.485121+00:00", "votes_collection_link":
|
798
|
+
"https://api.launchpad.net/1.0/~mbp/bzr/help/+merge/61793/votes", "reviewer_link":
|
799
|
+
null, "self_link": "https://api.launchpad.net/1.0/~mbp/bzr/help/+merge/61793",
|
800
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
801
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~mbp/bzr/help", "all_comments_collection_link":
|
802
|
+
"https://api.launchpad.net/1.0/~mbp/bzr/help/+merge/61793/all_comments", "date_merged":
|
803
|
+
null, "description": "Better help for update and revert. (Thanks Maritza.)",
|
804
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~mbp/bzr/help/+merge/61793/preview_diffs",
|
805
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~mbp/bzr/help/+merge/61793/+preview-diff/116545",
|
806
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
807
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
808
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~mbp/bzr/help/+merge/61793",
|
809
|
+
"date_created": "2011-05-20T15:58:40.485121+00:00", "queue_position": null},
|
810
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
811
|
+
"registrant_link": "https://api.launchpad.net/1.0/~maxb", "date_reviewed":
|
812
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/2.3",
|
813
|
+
"http_etag": "\"5b66c436788b13664edb772d124acf696ccbaed5-3ef060c000720bacae715bd86e1da37855b2df0b\"",
|
814
|
+
"date_review_requested": "2011-05-20T10:05:51.684430+00:00", "votes_collection_link":
|
815
|
+
"https://api.launchpad.net/1.0/~maxb/bzr/deref-in-set-stacking/+merge/61730/votes",
|
816
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~maxb/bzr/deref-in-set-stacking/+merge/61730",
|
817
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
818
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~maxb/bzr/deref-in-set-stacking",
|
819
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~maxb/bzr/deref-in-set-stacking/+merge/61730/all_comments",
|
820
|
+
"date_merged": null, "description": "This branch adds directory service dereferencing
|
821
|
+
of the URLs passed to --stacked-on=...\n\nOne aim of this was in the hope
|
822
|
+
of making --stacked-on=lp:... work. It doesn''t yet - ironically it would
|
823
|
+
work if we still resolved lp: via XMLRPC - but now that we use the /+branch/...
|
824
|
+
syntax to trigger server side lookup, we run into the problem that Launchpad
|
825
|
+
does not *currently* allow /+branch/ for stacking locations. I hope to fix
|
826
|
+
this in Launchpad.\n\nAnother benefit is that if users have custom plugins
|
827
|
+
implementing shortcut URLs, this will ensure that we do not leak these custom
|
828
|
+
shortcuts into the branch stacking location, potentially breaking things for
|
829
|
+
users without the same set of custom plugins.", "merge_reporter_link": null,
|
830
|
+
"preview_diffs_collection_link": "https://api.launchpad.net/1.0/~maxb/bzr/deref-in-set-stacking/+merge/61730/preview_diffs",
|
831
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~maxb/bzr/deref-in-set-stacking/+merge/61730/+preview-diff/116389",
|
832
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
833
|
+
null, "date_queued": null, "prerequisite_branch_link": "https://api.launchpad.net/1.0/~maxb/bzr/normalize-lp",
|
834
|
+
"queued_revid": null, "merged_revno": null, "reviewed_revid": null, "web_link":
|
835
|
+
"https://code.launchpad.net/~maxb/bzr/deref-in-set-stacking/+merge/61730",
|
836
|
+
"date_created": "2011-05-20T10:05:51.684430+00:00", "queue_position": null},
|
837
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
838
|
+
"registrant_link": "https://api.launchpad.net/1.0/~maxb", "date_reviewed":
|
839
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/2.3",
|
840
|
+
"http_etag": "\"135c15fd445dc44cb7bec8326ccc3f9684519d20-f8045b1f510266be8719568f4a0f13c76b37c3bf\"",
|
841
|
+
"date_review_requested": "2011-05-20T09:59:15.597931+00:00", "votes_collection_link":
|
842
|
+
"https://api.launchpad.net/1.0/~maxb/bzr/normalize-lp/+merge/61729/votes",
|
843
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~maxb/bzr/normalize-lp/+merge/61729",
|
844
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
845
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~maxb/bzr/normalize-lp",
|
846
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~maxb/bzr/normalize-lp/+merge/61729/all_comments",
|
847
|
+
"date_merged": null, "description": "Fixes the bzrlib.urlutils.normalize_url
|
848
|
+
function to not mangle lp:foo URLs for lp:foolp:foo\n\nOne way to demonstrate
|
849
|
+
the bug is:\n\nbzr config -d lp:bzr wibble=blah\n\nand then check your ~/.bazaar/locations.conf",
|
850
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~maxb/bzr/normalize-lp/+merge/61729/preview_diffs",
|
851
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~maxb/bzr/normalize-lp/+merge/61729/+preview-diff/116386",
|
852
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
853
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
854
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~maxb/bzr/normalize-lp/+merge/61729",
|
855
|
+
"date_created": "2011-05-20T09:59:15.597931+00:00", "queue_position": null},
|
856
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
857
|
+
"registrant_link": "https://api.launchpad.net/1.0/~gz", "date_reviewed": null,
|
858
|
+
"target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
859
|
+
"http_etag": "\"793a2f7db300035495f305fd819a188af8bf6eee-bf671ac9e35eb776c123bcaa37a1c0986c965963\"",
|
860
|
+
"date_review_requested": "2011-05-19T15:03:13.742702+00:00", "votes_collection_link":
|
861
|
+
"https://api.launchpad.net/1.0/~gz/bzr/lazy_hook_test_cleanup_785054/+merge/61586/votes",
|
862
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~gz/bzr/lazy_hook_test_cleanup_785054/+merge/61586",
|
863
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
864
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~gz/bzr/lazy_hook_test_cleanup_785054",
|
865
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~gz/bzr/lazy_hook_test_cleanup_785054/+merge/61586/all_comments",
|
866
|
+
"date_merged": null, "description": "This branch isn''t ready to land (it
|
867
|
+
doesn''t fix the bug), but I need some help working out what''s going on with
|
868
|
+
the hooks isolation logic.\n\nThe branch is motivated by this mistake in the
|
869
|
+
existing code, which looks like a simple fix:\n\n=== modified file ''bzrlib/tests/__init__.py''\n---
|
870
|
+
old/bzrlib/tests/__init__.py 2011-05-17 17:03:58 +0000\n+++ new/bzrlib/tests/__init__.py 2011-05-19
|
871
|
+
14:53:38 +0000\n@@ -1699,7 +1699,7 @@\n def _restoreHooks(self):\n for
|
872
|
+
klass, (name, hooks) in self._preserved_hooks.items():\n setattr(klass,
|
873
|
+
name, hooks)\n- hooks._lazy_hooks = self._preserved_lazy_hooks\n+ bzrlib.hooks._lazy_hooks
|
874
|
+
= self._preserved_lazy_hooks\n \n def knownFailure(self, reason):\n \"\"\"This
|
875
|
+
test has failed for some known reason.\"\"\"\n\nAs the _preserved_lazy_hooks
|
876
|
+
dict is never restored, I''d expect the added test_lazy_hooks_unregistered_lock
|
877
|
+
to fail, but it passes with or without the change. Also, the two test_*_artificial
|
878
|
+
cases fail to do what I expect them to whatever.\n\nNot restoring the dictionary
|
879
|
+
doesn''t seem to break much in practice at the moment, but is another testcase
|
880
|
+
lifetime complication.", "merge_reporter_link": null, "preview_diffs_collection_link":
|
881
|
+
"https://api.launchpad.net/1.0/~gz/bzr/lazy_hook_test_cleanup_785054/+merge/61586/preview_diffs",
|
882
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~gz/bzr/lazy_hook_test_cleanup_785054/+merge/61586/+preview-diff/116090",
|
883
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
884
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
885
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~gz/bzr/lazy_hook_test_cleanup_785054/+merge/61586",
|
886
|
+
"date_created": "2011-05-19T15:03:13.742702+00:00", "queue_position": null},
|
887
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
888
|
+
"registrant_link": "https://api.launchpad.net/1.0/~songofacandy", "date_reviewed":
|
889
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
890
|
+
"http_etag": "\"da587f1bdf14a7c098e2e4ae5d2649e04d1004e9-91e6f9adfef932f0f3a989e35d1a1fe4c5ca8606\"",
|
891
|
+
"date_review_requested": "2011-05-04T09:25:08.708198+00:00", "votes_collection_link":
|
892
|
+
"https://api.launchpad.net/1.0/~songofacandy/bzr/i18n/+merge/59890/votes",
|
893
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~songofacandy/bzr/i18n/+merge/59890",
|
894
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
895
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~songofacandy/bzr/i18n",
|
896
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~songofacandy/bzr/i18n/+merge/59890/all_comments",
|
897
|
+
"date_merged": null, "description": "i18n implementation for bzr.", "merge_reporter_link":
|
898
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~songofacandy/bzr/i18n/+merge/59890/preview_diffs",
|
899
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~songofacandy/bzr/i18n/+merge/59890/+preview-diff/114850",
|
900
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
901
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
902
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~songofacandy/bzr/i18n/+merge/59890",
|
903
|
+
"date_created": "2011-05-04T09:25:08.708198+00:00", "queue_position": null},
|
904
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
905
|
+
"registrant_link": "https://api.launchpad.net/1.0/~jameinel", "date_reviewed":
|
906
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
907
|
+
"http_etag": "\"9995245a581c2545192c9f84797eceba2d199aaa-0802f88b9458a607d87cf65e88f8ab5c50cb8e07\"",
|
908
|
+
"date_review_requested": "2011-04-21T13:17:34.902597+00:00", "votes_collection_link":
|
909
|
+
"https://api.launchpad.net/1.0/~joke/bzr/file_permissions_authentication.conf/+merge/58666/votes",
|
910
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~joke/bzr/file_permissions_authentication.conf/+merge/58666",
|
911
|
+
"commit_message": "Bug #475501, create authentication.conf with mode 0600",
|
912
|
+
"resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
913
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~joke/bzr/file_permissions_authentication.conf",
|
914
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~joke/bzr/file_permissions_authentication.conf/+merge/58666/all_comments",
|
915
|
+
"date_merged": null, "description": "We currently don''t do much fancy with
|
916
|
+
authentication.conf permissions. Joke de Buhr reasonably pointed out that
|
917
|
+
we could create the file as 600 and avoid defaulting to having your passwords
|
918
|
+
accessible by other users on the system.\n\nI haven''t looked over the patch
|
919
|
+
at all, just trying to get it out of the In Progress queue and get a decision
|
920
|
+
on it.", "merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~joke/bzr/file_permissions_authentication.conf/+merge/58666/preview_diffs",
|
921
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~joke/bzr/file_permissions_authentication.conf/+merge/58666/+preview-diff/109840",
|
922
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
923
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
924
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~joke/bzr/file_permissions_authentication.conf/+merge/58666",
|
925
|
+
"date_created": "2011-04-21T13:17:34.902597+00:00", "queue_position": null},
|
926
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
927
|
+
"registrant_link": "https://api.launchpad.net/1.0/~sergii", "date_reviewed":
|
928
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
929
|
+
"http_etag": "\"17d35f4d63d4c1eb3d51557826e3ffa124a59955-df69e3eb885ecb05232412a737c464143a613214\"",
|
930
|
+
"date_review_requested": "2011-03-21T09:19:57.408414+00:00", "votes_collection_link":
|
931
|
+
"https://api.launchpad.net/1.0/~maria-captains/bzr/bugtracker/+merge/54170/votes",
|
932
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~maria-captains/bzr/bugtracker/+merge/54170",
|
933
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
934
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~maria-captains/bzr/bugtracker",
|
935
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~maria-captains/bzr/bugtracker/+merge/54170/all_comments",
|
936
|
+
"date_merged": null, "description": "this started in\nhttps://code.launchpad.net/~maria-captains/bzr-gtk/gcommit-fixes/+merge/48206\nwhere
|
937
|
+
I added functionality similar to \"bzr commit --fixes\" to bzr-gtk.\nIn this
|
938
|
+
patch I kept all the changes strictly in the bzr-gtk. Jelmer rightfully commented
|
939
|
+
that some of these changes belong to the bzr itself, not to the gtk plugin.\n\nAnd
|
940
|
+
I''m suggesting it here now.\n\nHere''s the problem. bzr-gtk wraps ''bzr uncommit''
|
941
|
+
to store the changeset comment of the removed changeset. On the next ''bzr
|
942
|
+
gcommit'' this comment is used to pre-fill the comment input form.\n\nBut
|
943
|
+
''bzr commit --fixes'' takes bug id''s in the form of lp:12345, but stores
|
944
|
+
them in the changeset as http://bugs.launchpad.net/bugs/12345. So, this patch
|
945
|
+
adds the functionality of reverting this transformation, and converting bug
|
946
|
+
urls back to bug ids.\n\nI''ve only implemented this reverting for UniqueIntegerBugTracker
|
947
|
+
to avoid doing extra work if you reject the patch straight away. Of course,
|
948
|
+
if you''ll consider taking it I''ll fix other classes too.\n\nAdditionally
|
949
|
+
this changeset moves one function that deals with bugs from ''bzr commit''
|
950
|
+
code to bugtracker.py to allow bzr-gtk to reuse it, instead of copying. That
|
951
|
+
function is not ''bzr commit'' specific at all.\n", "merge_reporter_link":
|
952
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~maria-captains/bzr/bugtracker/+merge/54170/preview_diffs",
|
953
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~maria-captains/bzr/bugtracker/+merge/54170/+preview-diff/99908",
|
954
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
955
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
956
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~maria-captains/bzr/bugtracker/+merge/54170",
|
957
|
+
"date_created": "2011-03-21T09:19:57.408414+00:00", "queue_position": null},
|
958
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
959
|
+
"registrant_link": "https://api.launchpad.net/1.0/~gz", "date_reviewed": null,
|
960
|
+
"target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
961
|
+
"http_etag": "\"7ed96b498c1a36d21cb63e725eaeffb76a27cc92-9d48d1550268f13d9570cc92bcd8ce5c641f310d\"",
|
962
|
+
"date_review_requested": "2011-03-21T00:30:57.041326+00:00", "votes_collection_link":
|
963
|
+
"https://api.launchpad.net/1.0/~maria-captains/bzr/diffoptions/+merge/54139/votes",
|
964
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~maria-captains/bzr/diffoptions/+merge/54139",
|
965
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
966
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~maria-captains/bzr/diffoptions",
|
967
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~maria-captains/bzr/diffoptions/+merge/54139/all_comments",
|
968
|
+
"date_merged": null, "description": "[GZ: Starting fresh review which I think
|
969
|
+
was Sergei''s intention in the earlier merge proposal:\n\u003chttps://code.launchpad.net/~maria-captains/bzr/diffoptions/+merge/52325\u003e\n]\n\nThanks,
|
970
|
+
John, for the discussion.\n\nLet me summarize:\n1. It''s not always easy to
|
971
|
+
find the \"current branch\" to be able to get its config.\n2. having \"-F
|
972
|
+
regex\" specified only globally is not flexible enough, as different branches
|
973
|
+
(e.g. one with the C code, another with the Python code) may need different
|
974
|
+
regexps.\n2.1 Actually, even one regexp per branch is not enough, as one branch
|
975
|
+
may have both python and C files.\n3. Allowing the user to specify arbitrary
|
976
|
+
diff options that affect all generated diffs is too dangerous - \"diff -w\"
|
977
|
+
will break merge bundles (and \"diff -c\" breaks bzr shelve and everything
|
978
|
+
that parses diffs).\n3.1 But \"diff -p\" seems to be safe everywhere.\n\nSo,
|
979
|
+
I took another approach. It''s more strict and more flexible at the same time.
|
980
|
+
More flexible as in the 2.1 above (regexp can be specified per file or a group
|
981
|
+
of files) and more strict as in the 3.1 above (only diff -p - really, diff
|
982
|
+
-F - is allowed).\n\nThe patch uses rules to find the regexp for a given tree
|
983
|
+
and for a given file. And runs external diff with -F regexp command-line option.\n\nPlease,
|
984
|
+
see the patch. It lacks tests and the documentation is not updated - but it
|
985
|
+
works, and shows the approach.", "merge_reporter_link": null, "preview_diffs_collection_link":
|
986
|
+
"https://api.launchpad.net/1.0/~maria-captains/bzr/diffoptions/+merge/54139/preview_diffs",
|
987
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~maria-captains/bzr/diffoptions/+merge/54139/+preview-diff/99858",
|
988
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
989
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
990
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~maria-captains/bzr/diffoptions/+merge/54139",
|
991
|
+
"date_created": "2011-03-21T00:30:57.041326+00:00", "queue_position": null},
|
992
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
993
|
+
"registrant_link": "https://api.launchpad.net/1.0/~eric97", "date_reviewed":
|
994
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
995
|
+
"http_etag": "\"74cf3fea8a39fa6a56bee9e72ece6138bc422558-1f75042bd17a1e4fb28786107ded02df3f1c276f\"",
|
996
|
+
"date_review_requested": "2011-02-17T08:38:04.572488+00:00", "votes_collection_link":
|
997
|
+
"https://api.launchpad.net/1.0/~eric97/bzr/dump-btree-api/+merge/50107/votes",
|
998
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~eric97/bzr/dump-btree-api/+merge/50107",
|
999
|
+
"commit_message": "Create a public API for generating (quasi-)text dumps of
|
1000
|
+
B-Tree index files, by turning two private methods in builtins.py into public
|
1001
|
+
methods on bzrlib.btree_index.BTreeGraphIndex.", "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1002
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~eric97/bzr/dump-btree-api",
|
1003
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~eric97/bzr/dump-btree-api/+merge/50107/all_comments",
|
1004
|
+
"date_merged": null, "description": "A review comment for another MP of mine
|
1005
|
+
(https://code.launchpad.net/~eric97/bzr/regenerate-pack-names) asked that
|
1006
|
+
my tests use API calls instead of run_bzr(''dump-btree'') to dump B-Tree index
|
1007
|
+
files. The problem is, there is no API for that; the implementation of \"bzr
|
1008
|
+
dump-btree\" lives directly in builtins, as private methods of cmd_dump_btree.\n\nThis
|
1009
|
+
MP moves those methods to bzrlib.btree_index.BTreeGraphIndex, and makes them
|
1010
|
+
public. It is a pure refactoring; it is intended that there be no change
|
1011
|
+
in functionality.", "merge_reporter_link": null, "preview_diffs_collection_link":
|
1012
|
+
"https://api.launchpad.net/1.0/~eric97/bzr/dump-btree-api/+merge/50107/preview_diffs",
|
1013
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~eric97/bzr/dump-btree-api/+merge/50107/+preview-diff/91002",
|
1014
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1015
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1016
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~eric97/bzr/dump-btree-api/+merge/50107",
|
1017
|
+
"date_created": "2011-02-17T08:38:04.572488+00:00", "queue_position": null},
|
1018
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1019
|
+
"registrant_link": "https://api.launchpad.net/1.0/~abentley", "date_reviewed":
|
1020
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1021
|
+
"http_etag": "\"909e4b92ca246da936d167783e332aa5a474a177-af560ebd1f8dcf251a71fea75ab8c8c15abc993d\"",
|
1022
|
+
"date_review_requested": "2011-02-16T22:26:39.261233+00:00", "votes_collection_link":
|
1023
|
+
"https://api.launchpad.net/1.0/~abentley/bzr/appenddir/+merge/50060/votes",
|
1024
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~abentley/bzr/appenddir/+merge/50060",
|
1025
|
+
"commit_message": "Support appenddir configuration policy. (Aaron Bentley)",
|
1026
|
+
"resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1027
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~abentley/bzr/appenddir",
|
1028
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~abentley/bzr/appenddir/+merge/50060/all_comments",
|
1029
|
+
"date_merged": null, "description": "Hi all,\n\nThis branch introduces a new
|
1030
|
+
configuration policy, \"appenddir\". This new\npolicy is similar to appendpath,
|
1031
|
+
except that it appends only the last path\nelement to the value. Here''s
|
1032
|
+
an example configuration:\n\n[/home/abentley/bzr]\npublic_branch = lp:~abentley/bzr\npublic_branch:policy
|
1033
|
+
= appenddir\n\nThis means that the public branch for \"/home/abentley/bzr/foo\"
|
1034
|
+
will be\n\"lp:~abentley/bzr/foo\", as with appendpath. But the public branch
|
1035
|
+
of\n\"/home/abentley/bzr/bar/foo\" will *also* be \"lp:~abentley/bzr/foo\",
|
1036
|
+
whereas\nappendpath would make it \"lp:~abentley/bzr/bar/foo\". While the
|
1037
|
+
appendpath\nbehaviour may be useful for some, it produces too-long branch
|
1038
|
+
names in many\ncases.\n\nMy motivating case is \"bzr-pipeline\". When a pipeline
|
1039
|
+
is created with\n\"reconfigure-pipeline\", the branch is converted into a
|
1040
|
+
lightweight checkout,\nwith branches at \".bzr/pipes/\". If the push location
|
1041
|
+
had been set with\nappendpath, a push location of \"lp:~abentley/bzr/foo\"
|
1042
|
+
would become\n\"lp:~abentley/bzr/.bzr/pipes/foo\", which is undesirable. With
|
1043
|
+
appenddir, it\nwould retain the value \"lp:~abentley/bzr/foo\". I believe
|
1044
|
+
bzr-colo has the same\nissue.\n\nWhile the new policy is syntactically compatible
|
1045
|
+
with existing config files,\ncurrent versions of bzr treat unknown configuration
|
1046
|
+
policies as internal\nerrors:\n*** Bazaar has encountered an internal error. This
|
1047
|
+
probably indicates a\n bug in Bazaar. You can help us fix it by filing
|
1048
|
+
a bug report at\n https://bugs.launchpad.net/bzr/+filebug\n including
|
1049
|
+
this traceback and a description of the problem.\n\nI would be happy to create
|
1050
|
+
a bugfix for earlier bzrs so that they emit a\nuser-friendly error when they
|
1051
|
+
encounter unknown configuration policies.", "merge_reporter_link": null, "preview_diffs_collection_link":
|
1052
|
+
"https://api.launchpad.net/1.0/~abentley/bzr/appenddir/+merge/50060/preview_diffs",
|
1053
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~abentley/bzr/appenddir/+merge/50060/+preview-diff/91064",
|
1054
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1055
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1056
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~abentley/bzr/appenddir/+merge/50060",
|
1057
|
+
"date_created": "2011-02-16T22:26:39.261233+00:00", "queue_position": null},
|
1058
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1059
|
+
"registrant_link": "https://api.launchpad.net/1.0/~eric97", "date_reviewed":
|
1060
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1061
|
+
"http_etag": "\"d8a78f3a282bb59402d0e2f4aaec89b8ddb4139c-92061684e8b76649d85b6b45a253b59c8a7ba7e6\"",
|
1062
|
+
"date_review_requested": "2011-02-15T02:32:35.928198+00:00", "votes_collection_link":
|
1063
|
+
"https://api.launchpad.net/1.0/~eric97/bzr/regenerate-pack-names/+merge/49756/votes",
|
1064
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~eric97/bzr/regenerate-pack-names/+merge/49756",
|
1065
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1066
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~eric97/bzr/regenerate-pack-names",
|
1067
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~eric97/bzr/regenerate-pack-names/+merge/49756/all_comments",
|
1068
|
+
"date_merged": null, "description": "I clobbered the pack-names file in one
|
1069
|
+
of my shared repos. (Not\nto worry; I''m 100% certain it was my screwup,
|
1070
|
+
*not* Bazaar''s.)\n\nThis MP is the result. It adds a hidden \"regenerate-pack-names\"\ncommand.\n\nIt
|
1071
|
+
does *not* actually overwrite .bzr/repository/pack-names, but\nrather writes
|
1072
|
+
its new version to \"pack-names.generated\", for the\nuser to inspect and,
|
1073
|
+
if it looks good, rename to the live\nfilename. (Yeah, I know JAM''s new
|
1074
|
+
repair-dirstate command does\nthe repairs in-place, but pack-names seems a
|
1075
|
+
far more dangerous\nfile to replace, so I wanted to build in an extra layer
|
1076
|
+
of\nparanoia.)\n\nTwo issues before it''s ready to merge:\n - Locking: Does
|
1077
|
+
this need to lock the repo? If so, read or\n write? Strictly, it should
|
1078
|
+
block other processes from even\n renaming new packs into packs/*.pack
|
1079
|
+
for the duration, but is\n that even possible? Not much point locking
|
1080
|
+
the\n rewrite-pack-names mutex, because it doesn''t in fact write\n that
|
1081
|
+
file...\n\n - So far, I''ve only tested against local file access; no\n remote
|
1082
|
+
Transports. I wonder whether there''s any point\n supporting it remotely,
|
1083
|
+
given that you need local shell\n access to rename the new file into service
|
1084
|
+
anyway.\n", "merge_reporter_link": null, "preview_diffs_collection_link":
|
1085
|
+
"https://api.launchpad.net/1.0/~eric97/bzr/regenerate-pack-names/+merge/49756/preview_diffs",
|
1086
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~eric97/bzr/regenerate-pack-names/+merge/49756/+preview-diff/90094",
|
1087
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1088
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1089
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~eric97/bzr/regenerate-pack-names/+merge/49756",
|
1090
|
+
"date_created": "2011-02-15T02:32:35.928198+00:00", "queue_position": null},
|
1091
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1092
|
+
"registrant_link": "https://api.launchpad.net/1.0/~davidstrauss", "date_reviewed":
|
1093
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1094
|
+
"http_etag": "\"e3ab47b947e98ec0a659394085e91529efe11c7b-7f04ad59a58f14a90b0ea8d5b694045c0d1360bb\"",
|
1095
|
+
"date_review_requested": null, "votes_collection_link": "https://api.launchpad.net/1.0/~davidstrauss/bzr/lcas-subtree-workaround/+merge/49578/votes",
|
1096
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~davidstrauss/bzr/lcas-subtree-workaround/+merge/49578",
|
1097
|
+
"commit_message": "This should not be committed to core.", "resource_type_link":
|
1098
|
+
"https://api.launchpad.net/1.0/#branch_merge_proposal", "source_branch_link":
|
1099
|
+
"https://api.launchpad.net/1.0/~davidstrauss/bzr/lcas-subtree-workaround",
|
1100
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~davidstrauss/bzr/lcas-subtree-workaround/+merge/49578/all_comments",
|
1101
|
+
"date_merged": null, "description": "This is not so much a merge proposal
|
1102
|
+
as much as a \"view the diff on Launchpad\" abuse of the merge proposal system.",
|
1103
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~davidstrauss/bzr/lcas-subtree-workaround/+merge/49578/preview_diffs",
|
1104
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~davidstrauss/bzr/lcas-subtree-workaround/+merge/49578/+preview-diff/89686",
|
1105
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1106
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1107
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~davidstrauss/bzr/lcas-subtree-workaround/+merge/49578",
|
1108
|
+
"date_created": "2011-02-13T23:19:45.707750+00:00", "queue_position": null},
|
1109
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1110
|
+
"registrant_link": "https://api.launchpad.net/1.0/~vila", "date_reviewed":
|
1111
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1112
|
+
"http_etag": "\"54c67cd765ca719eb7878c4dbe1a9a0d2f5f0684-d4049334c1bc51de7ecc2c13c7cf41641dcfe341\"",
|
1113
|
+
"date_review_requested": "2011-01-12T00:37:30.959338+00:00", "votes_collection_link":
|
1114
|
+
"https://api.launchpad.net/1.0/~vila/bzr/697815-repair-repo/+merge/45945/votes",
|
1115
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~vila/bzr/697815-repair-repo/+merge/45945",
|
1116
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1117
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~vila/bzr/697815-repair-repo",
|
1118
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~vila/bzr/697815-repair-repo/+merge/45945/all_comments",
|
1119
|
+
"date_merged": null, "description": "This add a script that repair repos containing
|
1120
|
+
an empty pack file.\n\nAs seen in bug #697815 this repair a broken repository
|
1121
|
+
but is an incomplete solution as the branch is left in a broken state.\n\nStill,
|
1122
|
+
I don''t feel like addressing the later but having this script easily available
|
1123
|
+
sounds like a useful thing anyway.\n\nI wanted to add some tests but... this
|
1124
|
+
script is not a command and I don''t feel like starting a new test infrastructure
|
1125
|
+
for that...\n\nSo I thought I may ask for feedback about whether it''s acceptable
|
1126
|
+
to land this first and what people think about:\n- turning it into its own
|
1127
|
+
command,\n- somehow make it part of check/reconcile\n- something else\n\n",
|
1128
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~vila/bzr/697815-repair-repo/+merge/45945/preview_diffs",
|
1129
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~vila/bzr/697815-repair-repo/+merge/45945/+preview-diff/84745",
|
1130
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1131
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1132
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~vila/bzr/697815-repair-repo/+merge/45945",
|
1133
|
+
"date_created": "2011-01-12T00:37:30.959338+00:00", "queue_position": null},
|
1134
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1135
|
+
"registrant_link": "https://api.launchpad.net/1.0/~eric97", "date_reviewed":
|
1136
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1137
|
+
"http_etag": "\"f7bbf4aec3282ab99d6ca86313926f4cf53927b5-e836e638e878d8e4114a556a7fef8e51ee0bdb97\"",
|
1138
|
+
"date_review_requested": "2011-01-08T04:59:13.073410+00:00", "votes_collection_link":
|
1139
|
+
"https://api.launchpad.net/1.0/~eric97/bzr/mutter-pid/+merge/45595/votes",
|
1140
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~eric97/bzr/mutter-pid/+merge/45595",
|
1141
|
+
"commit_message": "Make mutter() output look more like other .bzr.log entries,
|
1142
|
+
by adding PID, absolute date/time, and a pseudo-log-level of \"MUTTER\".",
|
1143
|
+
"resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1144
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~eric97/bzr/mutter-pid",
|
1145
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~eric97/bzr/mutter-pid/+merge/45595/all_comments",
|
1146
|
+
"date_merged": null, "description": "Make mutter() output look more like other
|
1147
|
+
.bzr.log entries, by adding PID, absolute date/time, and a pseudo-log-level
|
1148
|
+
of \"MUTTER\".\n\nBefore:\n\nFri 2011-01-07 23:56:35 -0500\n0.053 bazaar
|
1149
|
+
version: 2.3.0dev5\n0.053 bzr arguments: [u''rocks'']\n[...]\n0.271 encoding
|
1150
|
+
stdout as sys.stdout encoding ''UTF-8''\n0.271 Transferred: 0kB (0.0kB/s
|
1151
|
+
r:0kB w:0kB)\n0.271 return code 0\n[ 782] 2011-01-07 23:56:35.885 WARNING:
|
1152
|
+
bzr: warning: some compiled extensions could not be loaded; see \u003chttps://answers.launchpad.net/bzr/+faq/703\u003e\n\nAfter:\n\nFri
|
1153
|
+
2011-01-07 23:56:46 -0500\n[ 786] 2011-01-07 23:56:46.978 MUTTER: 0.049 bazaar
|
1154
|
+
version: 2.3.0dev5\n[ 786] 2011-01-07 23:56:46.978 MUTTER: 0.049 bzr arguments:
|
1155
|
+
[u''rocks'']\n[...]\n[ 786] 2011-01-07 23:56:47.172 MUTTER: 0.244 encoding
|
1156
|
+
stdout as sys.stdout encoding ''UTF-8''\n[ 786] 2011-01-07 23:56:47.173 MUTTER:
|
1157
|
+
0.244 Transferred: 0kB (0.0kB/s r:0kB w:0kB)\n[ 786] 2011-01-07 23:56:47.173
|
1158
|
+
MUTTER: 0.245 return code 0\n[ 786] 2011-01-07 23:56:47.173 WARNING: bzr:
|
1159
|
+
warning: some compiled extensions could not be loaded; see \u003chttps://answers.launchpad.net/bzr/+faq/703\u003e\n\n(N.B.:
|
1160
|
+
I''ve purposely avoided compiling extensions, in order to force bzr to emit
|
1161
|
+
a WARNING.)", "merge_reporter_link": null, "preview_diffs_collection_link":
|
1162
|
+
"https://api.launchpad.net/1.0/~eric97/bzr/mutter-pid/+merge/45595/preview_diffs",
|
1163
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~eric97/bzr/mutter-pid/+merge/45595/+preview-diff/80625",
|
1164
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1165
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1166
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~eric97/bzr/mutter-pid/+merge/45595",
|
1167
|
+
"date_created": "2011-01-08T04:59:13.073410+00:00", "queue_position": null},
|
1168
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1169
|
+
"registrant_link": "https://api.launchpad.net/1.0/~garyvdm", "date_reviewed":
|
1170
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1171
|
+
"http_etag": "\"d08d593ede7a1bd5fcabf8b1f749c3daa93e39b9-5e6ddd07f7ef591f531e1abf126e603a0700e915\"",
|
1172
|
+
"date_review_requested": "2010-11-18T10:00:39.093375+00:00", "votes_collection_link":
|
1173
|
+
"https://api.launchpad.net/1.0/~garyvdm/bzr/loggraphviz/+merge/41146/votes",
|
1174
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~garyvdm/bzr/loggraphviz/+merge/41146",
|
1175
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1176
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~garyvdm/bzr/loggraphviz",
|
1177
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~garyvdm/bzr/loggraphviz/+merge/41146/all_comments",
|
1178
|
+
"date_merged": null, "description": "This branch includes the loggraphviz
|
1179
|
+
module from qbzr, and is the module that implements the most of the logic
|
1180
|
+
for qlog, which I have refactored in the hopes that it may be used other plugins.\n\nI
|
1181
|
+
have implemented a proof of concept loggerhead viz view which use this. This
|
1182
|
+
is available here: lp:~garyvdm/loggerhead/loggraphviz\n\nThere is still lots
|
1183
|
+
of work that I would like to do before this actually lands. E.g.:\n* The doc
|
1184
|
+
strings need to be completed, improved, and reviewed.\n* I want to have the
|
1185
|
+
api between the State objects, and Filters, especially how one adds a filter
|
1186
|
+
to a state more clearly defined.\n* I need to mark private/internal methods
|
1187
|
+
with _.\n* I want to do a bzr-gtk viz poc. viz has a number of features that
|
1188
|
+
qlog does not, i.e. progress bar, a revision command line argument to specify
|
1189
|
+
a tip., and a limit argument. Implementing these my result in api changes.\n*
|
1190
|
+
I would like to still investigate doing partial loading of merge sorted revisions
|
1191
|
+
using bzr-history-db for the use of loggerhead. This may also result in api
|
1192
|
+
changes.\n\nSo I know this is not 100% ready, but I feel that as I have now
|
1193
|
+
done the loggerhead poc, I now feel the time is right to get some comments
|
1194
|
+
on the code.", "merge_reporter_link": null, "preview_diffs_collection_link":
|
1195
|
+
"https://api.launchpad.net/1.0/~garyvdm/bzr/loggraphviz/+merge/41146/preview_diffs",
|
1196
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~garyvdm/bzr/loggraphviz/+merge/41146/+preview-diff/70658",
|
1197
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1198
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1199
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~garyvdm/bzr/loggraphviz/+merge/41146",
|
1200
|
+
"date_created": "2010-11-18T10:00:39.093375+00:00", "queue_position": null},
|
1201
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1202
|
+
"registrant_link": "https://api.launchpad.net/1.0/~doxxx", "date_reviewed":
|
1203
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1204
|
+
"http_etag": "\"713ae8341911f617c9897d9ad8ca1348d0cf8333-4f62a238ac4718deec42870f2556acc4ae675a30\"",
|
1205
|
+
"date_review_requested": "2011-01-21T01:16:14.977422+00:00", "votes_collection_link":
|
1206
|
+
"https://api.launchpad.net/1.0/~doxxx/bzr/mergetools-commands/+merge/40924/votes",
|
1207
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~doxxx/bzr/mergetools-commands/+merge/40924",
|
1208
|
+
"commit_message": "(doxxx) Added --resolve-using=ARG option to merge and remerge
|
1209
|
+
commands to resolve conflicts using an external merge tool.", "resource_type_link":
|
1210
|
+
"https://api.launchpad.net/1.0/#branch_merge_proposal", "source_branch_link":
|
1211
|
+
"https://api.launchpad.net/1.0/~doxxx/bzr/mergetools-commands", "all_comments_collection_link":
|
1212
|
+
"https://api.launchpad.net/1.0/~doxxx/bzr/mergetools-commands/+merge/40924/all_comments",
|
1213
|
+
"date_merged": null, "description": "Building on the new bzrlib.mergetools
|
1214
|
+
module added by lp:~doxxx/bzr/mergetools, this merge proposal adds a --resolve-using=ARG
|
1215
|
+
option to the ``bzr merge`` and ``bzr remerge`` commands to invoke the specified
|
1216
|
+
merge tool for each text conflict.", "merge_reporter_link": null, "preview_diffs_collection_link":
|
1217
|
+
"https://api.launchpad.net/1.0/~doxxx/bzr/mergetools-commands/+merge/40924/preview_diffs",
|
1218
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~doxxx/bzr/mergetools-commands/+merge/40924/+preview-diff/93892",
|
1219
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1220
|
+
null, "date_queued": null, "prerequisite_branch_link": "https://api.launchpad.net/1.0/~doxxx/bzr/mergetools",
|
1221
|
+
"queued_revid": null, "merged_revno": null, "reviewed_revid": null, "web_link":
|
1222
|
+
"https://code.launchpad.net/~doxxx/bzr/mergetools-commands/+merge/40924",
|
1223
|
+
"date_created": "2010-11-16T00:43:18.073271+00:00", "queue_position": null},
|
1224
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1225
|
+
"registrant_link": "https://api.launchpad.net/1.0/~tzeentch-gm", "date_reviewed":
|
1226
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/2.2",
|
1227
|
+
"http_etag": "\"15cdbc816926afbb090d3d1a074a115392780b82-feb9e4ea0246933754ba004484361775bb1ce118\"",
|
1228
|
+
"date_review_requested": "2010-10-26T18:33:34.812866+00:00", "votes_collection_link":
|
1229
|
+
"https://api.launchpad.net/1.0/~tzeentch-gm/bzr/666897-get-file-by-path-attr-error/+merge/39395/votes",
|
1230
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~tzeentch-gm/bzr/666897-get-file-by-path-attr-error/+merge/39395",
|
1231
|
+
"commit_message": "Use Tree.path2id rather than the same method on _inventory
|
1232
|
+
member", "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1233
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~tzeentch-gm/bzr/666897-get-file-by-path-attr-error",
|
1234
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~tzeentch-gm/bzr/666897-get-file-by-path-attr-error/+merge/39395/all_comments",
|
1235
|
+
"date_merged": null, "description": "Just a small tweak to ``Tree.get_file_by_path``
|
1236
|
+
to use path2id method instead of accessing _inventory directly. This prevents
|
1237
|
+
occasional AttributeError when _inventory is None (e.g. on WorkingTree 4+).\n\nSee
|
1238
|
+
bug #666897 and discusson on ML: https://lists.ubuntu.com/archives/bazaar/2010q4/070748.html\n",
|
1239
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~tzeentch-gm/bzr/666897-get-file-by-path-attr-error/+merge/39395/preview_diffs",
|
1240
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~tzeentch-gm/bzr/666897-get-file-by-path-attr-error/+merge/39395/+preview-diff/66468",
|
1241
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1242
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1243
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~tzeentch-gm/bzr/666897-get-file-by-path-attr-error/+merge/39395",
|
1244
|
+
"date_created": "2010-10-26T18:33:34.812866+00:00", "queue_position": null},
|
1245
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1246
|
+
"registrant_link": "https://api.launchpad.net/1.0/~adam-delvecchio", "date_reviewed":
|
1247
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1248
|
+
"http_etag": "\"abba5df622c1bf6966fe30034854ad1144b8292b-2d7704e4a7f828d2750f557cb917120d6b0bb88c\"",
|
1249
|
+
"date_review_requested": "2010-10-18T02:53:21.627619+00:00", "votes_collection_link":
|
1250
|
+
"https://api.launchpad.net/1.0/~adam-delvecchio/bzr/662448-sshkey-doc/+merge/38682/votes",
|
1251
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~adam-delvecchio/bzr/662448-sshkey-doc/+merge/38682",
|
1252
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1253
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~adam-delvecchio/bzr/662448-sshkey-doc",
|
1254
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~adam-delvecchio/bzr/662448-sshkey-doc/+merge/38682/all_comments",
|
1255
|
+
"date_merged": null, "description": "Fixed bug #662448", "merge_reporter_link":
|
1256
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~adam-delvecchio/bzr/662448-sshkey-doc/+merge/38682/preview_diffs",
|
1257
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~adam-delvecchio/bzr/662448-sshkey-doc/+merge/38682/+preview-diff/64682",
|
1258
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1259
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1260
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~adam-delvecchio/bzr/662448-sshkey-doc/+merge/38682",
|
1261
|
+
"date_created": "2010-10-18T02:53:21.627619+00:00", "queue_position": null},
|
1262
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1263
|
+
"registrant_link": "https://api.launchpad.net/1.0/~mbp", "date_reviewed":
|
1264
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1265
|
+
"http_etag": "\"f59ef7e050a8bf1cf9de20e13de151191f6b8e4b-921bcff43397653cbd0a1ea32f2340f8e1e14150\"",
|
1266
|
+
"date_review_requested": "2010-10-17T10:20:18.906680+00:00", "votes_collection_link":
|
1267
|
+
"https://api.launchpad.net/1.0/~mbp/bzr/deprecation/+merge/38647/votes", "reviewer_link":
|
1268
|
+
null, "self_link": "https://api.launchpad.net/1.0/~mbp/bzr/deprecation/+merge/38647",
|
1269
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1270
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~mbp/bzr/deprecation",
|
1271
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~mbp/bzr/deprecation/+merge/38647/all_comments",
|
1272
|
+
"date_merged": null, "description": "This cleans up some old and pretty crufty
|
1273
|
+
code around AddAction and smart_add. The existing api was sufficiently complicated,
|
1274
|
+
and as far I can tell not used by plugins, so I think it''s better just to
|
1275
|
+
delete it. This is a bit cleaner on its own, but also detangles things a
|
1276
|
+
bit to allower a larger refactoring of smart_add to be smaller and to use
|
1277
|
+
an inventory delta rather than mutating the in-memory inventory. (bug 79336
|
1278
|
+
asked for this a long time ago; it was worked-around in bzr-svn but it would
|
1279
|
+
be better to give them a simpler interface).\n\nThere are essentially two
|
1280
|
+
ways callers might want to customize smart_add: a way to generate file ids
|
1281
|
+
(for example to match those in an existing tree) and to report on what''s
|
1282
|
+
being done (typically to a file). For no good reason they were tied together
|
1283
|
+
into a somewhat strange callable object callback. Instead, there are now
|
1284
|
+
just plain callables for each.\n\nBefore merging this I''ll check whether
|
1285
|
+
it impacts other things that may be adding files or implementing smart_add,
|
1286
|
+
including bzr-svn, the package importer, and bzr builder. Generally things
|
1287
|
+
that are mechanically adding files shouldn''t need to call smart_add.\n\nIt
|
1288
|
+
might be nice to have a reporter object that''s told about more actions from
|
1289
|
+
inside add and can do more than just say the files that were added. \n\n",
|
1290
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~mbp/bzr/deprecation/+merge/38647/preview_diffs",
|
1291
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~mbp/bzr/deprecation/+merge/38647/+preview-diff/64617",
|
1292
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1293
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1294
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~mbp/bzr/deprecation/+merge/38647",
|
1295
|
+
"date_created": "2010-10-17T10:20:18.906680+00:00", "queue_position": null},
|
1296
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1297
|
+
"registrant_link": "https://api.launchpad.net/1.0/~knittl", "date_reviewed":
|
1298
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1299
|
+
"http_etag": "\"e9531cc2081fe433b5c032887469783916d9ad98-232799c48d22e9b107e0a47c234a5c67746fdb89\"",
|
1300
|
+
"date_review_requested": "2010-09-23T16:15:57.900857+00:00", "votes_collection_link":
|
1301
|
+
"https://api.launchpad.net/1.0/~knittl/bzr/cat-signature/+merge/36467/votes",
|
1302
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~knittl/bzr/cat-signature/+merge/36467",
|
1303
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1304
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~knittl/bzr/cat-signature",
|
1305
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~knittl/bzr/cat-signature/+merge/36467/all_comments",
|
1306
|
+
"date_merged": null, "description": "new hidden command `cat-signature` to
|
1307
|
+
print the signature for a commit", "merge_reporter_link": null, "preview_diffs_collection_link":
|
1308
|
+
"https://api.launchpad.net/1.0/~knittl/bzr/cat-signature/+merge/36467/preview_diffs",
|
1309
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~knittl/bzr/cat-signature/+merge/36467/+preview-diff/59233",
|
1310
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1311
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1312
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~knittl/bzr/cat-signature/+merge/36467",
|
1313
|
+
"date_created": "2010-09-23T16:15:57.900857+00:00", "queue_position": null},
|
1314
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1315
|
+
"registrant_link": "https://api.launchpad.net/1.0/~vila", "date_reviewed":
|
1316
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1317
|
+
"http_etag": "\"3e3712a90a01eb8624d24078e0b0682f5d57ae91-97d3ca26d80cd27ae6c1395703f2b9898b602396\"",
|
1318
|
+
"date_review_requested": "2010-09-22T15:43:00.946711+00:00", "votes_collection_link":
|
1319
|
+
"https://api.launchpad.net/1.0/~vila/bzr/imports/+merge/36324/votes", "reviewer_link":
|
1320
|
+
null, "self_link": "https://api.launchpad.net/1.0/~vila/bzr/imports/+merge/36324",
|
1321
|
+
"commit_message": "Clarify import policy in code-style.txt", "resource_type_link":
|
1322
|
+
"https://api.launchpad.net/1.0/#branch_merge_proposal", "source_branch_link":
|
1323
|
+
"https://api.launchpad.net/1.0/~vila/bzr/imports", "all_comments_collection_link":
|
1324
|
+
"https://api.launchpad.net/1.0/~vila/bzr/imports/+merge/36324/all_comments",
|
1325
|
+
"date_merged": null, "description": "This formalize same accumulated reasons
|
1326
|
+
about why using\n import module\n module.symbol\nis better than\n from
|
1327
|
+
module import symbol\n symbol\n\nand add them to code-style.txt.", "merge_reporter_link":
|
1328
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~vila/bzr/imports/+merge/36324/preview_diffs",
|
1329
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~vila/bzr/imports/+merge/36324/+preview-diff/58839",
|
1330
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1331
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1332
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~vila/bzr/imports/+merge/36324",
|
1333
|
+
"date_created": "2010-09-22T15:43:00.946711+00:00", "queue_position": null},
|
1334
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1335
|
+
"registrant_link": "https://api.launchpad.net/1.0/~spiv", "date_reviewed":
|
1336
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1337
|
+
"http_etag": "\"b7afb5383fec403d3d01e2f05f5ca0b3631340ed-7ac0d2be9a73ff6e2fc331ac097693529985a8ad\"",
|
1338
|
+
"date_review_requested": "2010-09-22T01:33:08.589159+00:00", "votes_collection_link":
|
1339
|
+
"https://api.launchpad.net/1.0/~spiv/bzr/html-cmd-help/+merge/36244/votes",
|
1340
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~spiv/bzr/html-cmd-help/+merge/36244",
|
1341
|
+
"commit_message": "Fix rendering of HTML of command-line options such as \"--1.14\".",
|
1342
|
+
"resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1343
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~spiv/bzr/html-cmd-help",
|
1344
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~spiv/bzr/html-cmd-help/+merge/36244/all_comments",
|
1345
|
+
"date_merged": null, "description": "I noticed that the HTML rendering of
|
1346
|
+
command help was once again failing due to options with dots in them, like
|
1347
|
+
\"--1.14\". Neither plain ReST nor Sphinx''s option markup allows for dots
|
1348
|
+
in option names. Previously we were doing a rather fragile hack by looking
|
1349
|
+
for a fixed string in the output, and if so doing a crude string munging to
|
1350
|
+
make all branch format options get rendered as preformatted text.\n\nThis
|
1351
|
+
change instead subclasses optparse''s IndentedHelpFormatter to make it emit
|
1352
|
+
more appropriate Sphinx markup in the first place. Because that markup cannot
|
1353
|
+
support our options with dots in the names, I resort to using \".. describe:\"
|
1354
|
+
(i.e. a description list in HTML terms, \u003cdl\u003e etc). I also use \"..
|
1355
|
+
cssclass:\" so that I can add some simple CSS to tweak the rendering to more
|
1356
|
+
closely resemble the existing output (which when it worked was nicer than
|
1357
|
+
a raw description list).\n\nHopefully this will prove less fragile, although
|
1358
|
+
I''m not sure if that will work out to be true in practice.\n\nPerhaps instead
|
1359
|
+
we should fix bug 330494, to remove those option names? It seems a bit perverse
|
1360
|
+
to change our UI to match an oversight in our documentation tools, though.",
|
1361
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~spiv/bzr/html-cmd-help/+merge/36244/preview_diffs",
|
1362
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~spiv/bzr/html-cmd-help/+merge/36244/+preview-diff/58650",
|
1363
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1364
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1365
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~spiv/bzr/html-cmd-help/+merge/36244",
|
1366
|
+
"date_created": "2010-09-22T01:33:08.589159+00:00", "queue_position": null},
|
1367
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1368
|
+
"registrant_link": "https://api.launchpad.net/1.0/~parthm", "date_reviewed":
|
1369
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1370
|
+
"http_etag": "\"f2fac95daadb855de440b92d675d58e93153a853-f82fb9285daa59940d52f14c5293756ae2862fc0\"",
|
1371
|
+
"date_review_requested": "2010-09-18T10:44:03.693650+00:00", "votes_collection_link":
|
1372
|
+
"https://api.launchpad.net/1.0/~parthm/bzr/173274-export-hooks/+merge/35919/votes",
|
1373
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~parthm/bzr/173274-export-hooks/+merge/35919",
|
1374
|
+
"commit_message": "support for pre_export and post_export hooks.", "resource_type_link":
|
1375
|
+
"https://api.launchpad.net/1.0/#branch_merge_proposal", "source_branch_link":
|
1376
|
+
"https://api.launchpad.net/1.0/~parthm/bzr/173274-export-hooks", "all_comments_collection_link":
|
1377
|
+
"https://api.launchpad.net/1.0/~parthm/bzr/173274-export-hooks/+merge/35919/all_comments",
|
1378
|
+
"date_merged": null, "description": "=== Fixes Bug #173274 ===\nThis patch
|
1379
|
+
adds support for pre_export and post_export hooks.\n\nThe ''return _exporters[format](...)''
|
1380
|
+
call in bzrlib.export.export didn''t really return a value. Trivially fixed
|
1381
|
+
that also.\n\n", "merge_reporter_link": null, "preview_diffs_collection_link":
|
1382
|
+
"https://api.launchpad.net/1.0/~parthm/bzr/173274-export-hooks/+merge/35919/preview_diffs",
|
1383
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~parthm/bzr/173274-export-hooks/+merge/35919/+preview-diff/58492",
|
1384
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1385
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1386
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~parthm/bzr/173274-export-hooks/+merge/35919",
|
1387
|
+
"date_created": "2010-09-18T10:44:03.693650+00:00", "queue_position": null},
|
1388
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1389
|
+
"registrant_link": "https://api.launchpad.net/1.0/~spiv", "date_reviewed":
|
1390
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1391
|
+
"http_etag": "\"6236e4066144926753024e5bb3cfa362f9e31328-2067c9e3e85d1482d3397d4160bd485093aee822\"",
|
1392
|
+
"date_review_requested": "2010-08-09T08:51:31.683391+00:00", "votes_collection_link":
|
1393
|
+
"https://api.launchpad.net/1.0/~spiv/bzr/stacked-2a-reconcile/+merge/32074/votes",
|
1394
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~spiv/bzr/stacked-2a-reconcile/+merge/32074",
|
1395
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1396
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~spiv/bzr/stacked-2a-reconcile",
|
1397
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~spiv/bzr/stacked-2a-reconcile/+merge/32074/all_comments",
|
1398
|
+
"date_merged": null, "description": "See description of bug 615236; GCCHKPacker
|
1399
|
+
got fixed at some point to take parent inventories for stacking into account,
|
1400
|
+
but the GCCHKReconcilePacker didn''t get a corresponding change. This patch
|
1401
|
+
makes them share the relevant code.\n\nProbably this should have a test before
|
1402
|
+
merging, but I''d like to get feedback on whether my understanding of the
|
1403
|
+
code is correct, if anyone knows :)", "merge_reporter_link": null, "preview_diffs_collection_link":
|
1404
|
+
"https://api.launchpad.net/1.0/~spiv/bzr/stacked-2a-reconcile/+merge/32074/preview_diffs",
|
1405
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~spiv/bzr/stacked-2a-reconcile/+merge/32074/+preview-diff/49389",
|
1406
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1407
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1408
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~spiv/bzr/stacked-2a-reconcile/+merge/32074",
|
1409
|
+
"date_created": "2010-08-09T08:51:31.683391+00:00", "queue_position": null},
|
1410
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1411
|
+
"registrant_link": "https://api.launchpad.net/1.0/~mbp", "date_reviewed":
|
1412
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/2.0",
|
1413
|
+
"http_etag": "\"9e85fb267b8df55e84b20ecc22dd8e14927516bb-d758a7b268439f05215dea597516969de89bfc50\"",
|
1414
|
+
"date_review_requested": null, "votes_collection_link": "https://api.launchpad.net/1.0/~mbp/bzr/32669-2.0-symlink-branch/+merge/30241/votes",
|
1415
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~mbp/bzr/32669-2.0-symlink-branch/+merge/30241",
|
1416
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1417
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~mbp/bzr/32669-2.0-symlink-branch",
|
1418
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~mbp/bzr/32669-2.0-symlink-branch/+merge/30241/all_comments",
|
1419
|
+
"date_merged": null, "description": "This fixes ''bzr add SYMLINK_TO_BRANCH''
|
1420
|
+
(bug 32669) to add the symlink, rather than running add in the referent branch. The
|
1421
|
+
basic fix is that when you say \"open_containing_from_transport\", we shouldn''t
|
1422
|
+
follow a symlink in the last part.\n\n", "merge_reporter_link": null, "preview_diffs_collection_link":
|
1423
|
+
"https://api.launchpad.net/1.0/~mbp/bzr/32669-2.0-symlink-branch/+merge/30241/preview_diffs",
|
1424
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~mbp/bzr/32669-2.0-symlink-branch/+merge/30241/+preview-diff/45468",
|
1425
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1426
|
+
null, "date_queued": null, "prerequisite_branch_link": "https://api.launchpad.net/1.0/~mbp/bzr/2.0-stat-symlink",
|
1427
|
+
"queued_revid": null, "merged_revno": null, "reviewed_revid": null, "web_link":
|
1428
|
+
"https://code.launchpad.net/~mbp/bzr/32669-2.0-symlink-branch/+merge/30241",
|
1429
|
+
"date_created": "2010-07-19T08:46:55.530586+00:00", "queue_position": null},
|
1430
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1431
|
+
"registrant_link": "https://api.launchpad.net/1.0/~gagern", "date_reviewed":
|
1432
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1433
|
+
"http_etag": "\"662256264b0c8246fd1c0db7de88e0b9000e98ab-c4403f99fc0dffa4c99b102309008dba3b95cfa0\"",
|
1434
|
+
"date_review_requested": "2010-06-30T16:04:17.068096+00:00", "votes_collection_link":
|
1435
|
+
"https://api.launchpad.net/1.0/~gagern/bzr/log_branch_from_revspec/+merge/28544/votes",
|
1436
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~gagern/bzr/log_branch_from_revspec/+merge/28544",
|
1437
|
+
"commit_message": "Make the log command take its branch from the RevisionInfo.",
|
1438
|
+
"resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1439
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~gagern/bzr/log_branch_from_revspec",
|
1440
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~gagern/bzr/log_branch_from_revspec/+merge/28544/all_comments",
|
1441
|
+
"date_merged": null, "description": "This makes the bzr log builtin take the
|
1442
|
+
branch from the RevisionInfo, thereby allowing things like \"bzr log -r -1:some/branch\"",
|
1443
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~gagern/bzr/log_branch_from_revspec/+merge/28544/preview_diffs",
|
1444
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~gagern/bzr/log_branch_from_revspec/+merge/28544/+preview-diff/42170",
|
1445
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1446
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1447
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~gagern/bzr/log_branch_from_revspec/+merge/28544",
|
1448
|
+
"date_created": "2010-06-25T23:14:06.537136+00:00", "queue_position": null},
|
1449
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1450
|
+
"registrant_link": "https://api.launchpad.net/1.0/~garyvdm", "date_reviewed":
|
1451
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1452
|
+
"http_etag": "\"23916ee8b4ab83d6aef033dfae9c87e0b08ef57e-dea792c4f24449def201c07f93b8be4aa0205383\"",
|
1453
|
+
"date_review_requested": "2010-06-04T13:54:19.605603+00:00", "votes_collection_link":
|
1454
|
+
"https://api.launchpad.net/1.0/~garyvdm/bzr/test_no_pyqt_import/+merge/26807/votes",
|
1455
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~garyvdm/bzr/test_no_pyqt_import/+merge/26807",
|
1456
|
+
"commit_message": "Check the PyQt4 is not imported for bzr status.", "resource_type_link":
|
1457
|
+
"https://api.launchpad.net/1.0/#branch_merge_proposal", "source_branch_link":
|
1458
|
+
"https://api.launchpad.net/1.0/~garyvdm/bzr/test_no_pyqt_import", "all_comments_collection_link":
|
1459
|
+
"https://api.launchpad.net/1.0/~garyvdm/bzr/test_no_pyqt_import/+merge/26807/all_comments",
|
1460
|
+
"date_merged": null, "description": "This makes test_import_tariff.TestImportTariffs.test_simple_local
|
1461
|
+
check that PyQt4 is not imported when bzr st is run.\n\nIt also has a drive
|
1462
|
+
by fix to make test_import_tariff.TestImportTariffs.test_simple_local pass
|
1463
|
+
the new ''BZR_DISABLE_PLUGINS'' and ''BZR_PLUGINS_AT'' envars to the supprocess
|
1464
|
+
used in the test. \n\n(This should probably be move to run_bzr_subprocess,
|
1465
|
+
but I''ll do that in another proposal.)", "merge_reporter_link": null, "preview_diffs_collection_link":
|
1466
|
+
"https://api.launchpad.net/1.0/~garyvdm/bzr/test_no_pyqt_import/+merge/26807/preview_diffs",
|
1467
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~garyvdm/bzr/test_no_pyqt_import/+merge/26807/+preview-diff/38064",
|
1468
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1469
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1470
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~garyvdm/bzr/test_no_pyqt_import/+merge/26807",
|
1471
|
+
"date_created": "2010-06-04T13:54:19.605603+00:00", "queue_position": null},
|
1472
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1473
|
+
"registrant_link": "https://api.launchpad.net/1.0/~philip-peitsch", "date_reviewed":
|
1474
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1475
|
+
"http_etag": "\"b3adc3ee3e6be3346d30c3382476a2a579eb81f8-516aca7da527dd95912b3c7f212c3a43fbf60559\"",
|
1476
|
+
"date_review_requested": "2010-06-01T05:50:42.958814+00:00", "votes_collection_link":
|
1477
|
+
"https://api.launchpad.net/1.0/~philip-peitsch/bzr/annotate-ghost-revs/+merge/26460/votes",
|
1478
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~philip-peitsch/bzr/annotate-ghost-revs/+merge/26460",
|
1479
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1480
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~philip-peitsch/bzr/annotate-ghost-revs",
|
1481
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~philip-peitsch/bzr/annotate-ghost-revs/+merge/26460/all_comments",
|
1482
|
+
"date_merged": null, "description": "I modified the indenting from line 232-238
|
1483
|
+
so that if the origin is not in the revisions, it returns ''?'' for the rev
|
1484
|
+
number, author and date. This prevents it crashing if ghost revisions are
|
1485
|
+
involved... though this doesn''t really help if one is interested in the data
|
1486
|
+
in these ghost revisions.", "merge_reporter_link": null, "preview_diffs_collection_link":
|
1487
|
+
"https://api.launchpad.net/1.0/~philip-peitsch/bzr/annotate-ghost-revs/+merge/26460/preview_diffs",
|
1488
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~philip-peitsch/bzr/annotate-ghost-revs/+merge/26460/+preview-diff/38020",
|
1489
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1490
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1491
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~philip-peitsch/bzr/annotate-ghost-revs/+merge/26460",
|
1492
|
+
"date_created": "2010-06-01T05:50:42.958814+00:00", "queue_position": null},
|
1493
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1494
|
+
"registrant_link": "https://api.launchpad.net/1.0/~parthm", "date_reviewed":
|
1495
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1496
|
+
"http_etag": "\"370c11db7e3e3902278fadabb133e9b58b947078-725e2f2d5ddfe8c07c5e071241a8b0643319b442\"",
|
1497
|
+
"date_review_requested": "2010-06-21T06:46:03.993736+00:00", "votes_collection_link":
|
1498
|
+
"https://api.launchpad.net/1.0/~parthm/bzr/300062-better-handling-for-invalid-ignore-pattern/+merge/26400/votes",
|
1499
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~parthm/bzr/300062-better-handling-for-invalid-ignore-pattern/+merge/26400",
|
1500
|
+
"commit_message": "Improved handling of invalid ignore patterns by add, ignore,
|
1501
|
+
ignored and status.", "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1502
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~parthm/bzr/300062-better-handling-for-invalid-ignore-pattern",
|
1503
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~parthm/bzr/300062-better-handling-for-invalid-ignore-pattern/+merge/26400/all_comments",
|
1504
|
+
"date_merged": null, "description": "=== Fixes Bug #300062 ===\n\nThis started
|
1505
|
+
out as a simple bug fix to ensure that ''bzr ignore'' handles invalid patterns
|
1506
|
+
correctly but as invalid patterns impacted other commands this patch ended
|
1507
|
+
up fixing those as well. bzr can encounter invalid patterns in either .bzrignore
|
1508
|
+
file or .bazaar/ignore file. These could earlier get in either by using ''bzr
|
1509
|
+
ignore'' or by editing the files directly. The former is now fixed. This patch
|
1510
|
+
fixes the following:\n1. ''bzr ignore'' when supplied with possibly multiple
|
1511
|
+
patterns, filters out invalid patters and only adds valid patterns to .bzrignore\n\n2.
|
1512
|
+
''bzr status'' checks ignore patterns before showing status. This was crashing
|
1513
|
+
if invalid patterns were present. ''bzr status'' now issues a warning if invalid
|
1514
|
+
pattern(s) are seen and does not crash. In order to avoid any performance
|
1515
|
+
penalty, `status` works as before, but if it sees sees re.error then it parser
|
1516
|
+
both ignore files and prints out the bad pattern(s).\n\n3. ''bzr add'' checks
|
1517
|
+
ignore patterns before adding files. This was crashing if invalid patterns
|
1518
|
+
were present. ''bzr add'' now exists with an error message indicating invalid
|
1519
|
+
patterns. Initially I was trying to decide between a warning or error for
|
1520
|
+
this but decided that its better for `add` to not be too smart as it might
|
1521
|
+
end up adding files that were meant to be ignored.\n\nImplementations Notes\n=====================\nAs
|
1522
|
+
`re` is lazy by default. I have added a function `bzrlib.lazy_regex.eager_re_compile`
|
1523
|
+
that is used by `bzrlib.globbing.is_pattern_valid` which in turn is used by
|
1524
|
+
to create `bzrlib.globbing.filter_invalid_patterns`. This is used by `ignore`
|
1525
|
+
command to ensure that no junk enters .bzrignore.\n\n`bzrlib.ignores` has
|
1526
|
+
two new functions, `get_pattern_errors` gives information about bad patterns
|
1527
|
+
in .bzrignore and .bazaar/ignore. `show_pattern_errors` is used to display
|
1528
|
+
warning about bad patterns to the user. `show_pattern_errors` is used by `status`.
|
1529
|
+
`get_pattern_errors` is used by `add` which raises error `InvalidIgnorePattern`.\n\nI
|
1530
|
+
noticed that imports in bzrlib.status and bzrlib.ignores were not lazy. So
|
1531
|
+
I have made these lazy and I had to add a few imports to these files.\n\nTests
|
1532
|
+
have been added as needed.\n", "merge_reporter_link": null, "preview_diffs_collection_link":
|
1533
|
+
"https://api.launchpad.net/1.0/~parthm/bzr/300062-better-handling-for-invalid-ignore-pattern/+merge/26400/preview_diffs",
|
1534
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~parthm/bzr/300062-better-handling-for-invalid-ignore-pattern/+merge/26400/+preview-diff/42161",
|
1535
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1536
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1537
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~parthm/bzr/300062-better-handling-for-invalid-ignore-pattern/+merge/26400",
|
1538
|
+
"date_created": "2010-05-31T06:14:05.982023+00:00", "queue_position": null},
|
1539
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1540
|
+
"registrant_link": "https://api.launchpad.net/1.0/~ian-clatworthy", "date_reviewed":
|
1541
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1542
|
+
"http_etag": "\"b633802bee4079637e2cbaf838f5e34a8bec7112-922faa99a4fbec76451a4a64328d515c4449c93c\"",
|
1543
|
+
"date_review_requested": "2010-05-26T04:31:45.124765+00:00", "votes_collection_link":
|
1544
|
+
"https://api.launchpad.net/1.0/~ian-clatworthy/bzr/sphinx-only/+merge/26011/votes",
|
1545
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~ian-clatworthy/bzr/sphinx-only/+merge/26011",
|
1546
|
+
"commit_message": "Drop support for generating docs via docutils - Sphinx
|
1547
|
+
only now.", "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1548
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~ian-clatworthy/bzr/sphinx-only",
|
1549
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~ian-clatworthy/bzr/sphinx-only/+merge/26011/all_comments",
|
1550
|
+
"date_merged": null, "description": "This patch removes support for generating
|
1551
|
+
docs via docutils. Once this lands, Sphinx is required for generating docs.\n\nAs
|
1552
|
+
well as greatly simplifying the Makefile, moving to a single system for doc
|
1553
|
+
generation removes numerous bugs, e.g. it makes PDF generation of the User
|
1554
|
+
Reference possible.", "merge_reporter_link": null, "preview_diffs_collection_link":
|
1555
|
+
"https://api.launchpad.net/1.0/~ian-clatworthy/bzr/sphinx-only/+merge/26011/preview_diffs",
|
1556
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~ian-clatworthy/bzr/sphinx-only/+merge/26011/+preview-diff/36317",
|
1557
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1558
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1559
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~ian-clatworthy/bzr/sphinx-only/+merge/26011",
|
1560
|
+
"date_created": "2010-05-26T04:31:45.124765+00:00", "queue_position": null},
|
1561
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1562
|
+
"registrant_link": "https://api.launchpad.net/1.0/~myfreeweb", "date_reviewed":
|
1563
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1564
|
+
"http_etag": "\"45d4479892af320a635251faa03fc281ed627840-2ae044d1d30654d344bbd19783c6c905e683d32e\"",
|
1565
|
+
"date_review_requested": "2010-05-10T12:42:28.625852+00:00", "votes_collection_link":
|
1566
|
+
"https://api.launchpad.net/1.0/~myfreeweb/bzr/osx-unicode-paths-fix/+merge/24988/votes",
|
1567
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~myfreeweb/bzr/osx-unicode-paths-fix/+merge/24988",
|
1568
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1569
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~myfreeweb/bzr/osx-unicode-paths-fix",
|
1570
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~myfreeweb/bzr/osx-unicode-paths-fix/+merge/24988/all_comments",
|
1571
|
+
"date_merged": null, "description": "Please merge this. It is a fix for #172383
|
1572
|
+
and #102935", "merge_reporter_link": null, "preview_diffs_collection_link":
|
1573
|
+
"https://api.launchpad.net/1.0/~myfreeweb/bzr/osx-unicode-paths-fix/+merge/24988/preview_diffs",
|
1574
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~myfreeweb/bzr/osx-unicode-paths-fix/+merge/24988/+preview-diff/33876",
|
1575
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1576
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1577
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~myfreeweb/bzr/osx-unicode-paths-fix/+merge/24988",
|
1578
|
+
"date_created": "2010-05-10T12:42:28.625852+00:00", "queue_position": null},
|
1579
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1580
|
+
"registrant_link": "https://api.launchpad.net/1.0/~j-johan-edwards", "date_reviewed":
|
1581
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1582
|
+
"http_etag": "\"774a06efaebf13670c70d09c1b6baa504c93f754-8e47fb95746fb12c7bbabb246406ec1107e93d29\"",
|
1583
|
+
"date_review_requested": "2010-05-09T13:51:51.147003+00:00", "votes_collection_link":
|
1584
|
+
"https://api.launchpad.net/1.0/~j-johan-edwards/bzr/xdg_basedir_compliance/+merge/24954/votes",
|
1585
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~j-johan-edwards/bzr/xdg_basedir_compliance/+merge/24954",
|
1586
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1587
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~j-johan-edwards/bzr/xdg_basedir_compliance",
|
1588
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~j-johan-edwards/bzr/xdg_basedir_compliance/+merge/24954/all_comments",
|
1589
|
+
"date_merged": null, "description": "This branch moves the default bzr configuration
|
1590
|
+
path from $HOME/.bazaar to $XDG_CONFIG_HOME/bazaar.\n\nThe migration of old
|
1591
|
+
configuration files is silent. However, to obey the principle of least surprise,
|
1592
|
+
the old configuration files are left in place, and a file is written there
|
1593
|
+
to alert the user of the new, actively-used location.", "merge_reporter_link":
|
1594
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~j-johan-edwards/bzr/xdg_basedir_compliance/+merge/24954/preview_diffs",
|
1595
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~j-johan-edwards/bzr/xdg_basedir_compliance/+merge/24954/+preview-diff/33799",
|
1596
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1597
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1598
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~j-johan-edwards/bzr/xdg_basedir_compliance/+merge/24954",
|
1599
|
+
"date_created": "2010-05-09T13:51:51.147003+00:00", "queue_position": null},
|
1600
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1601
|
+
"registrant_link": "https://api.launchpad.net/1.0/~xnox", "date_reviewed":
|
1602
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1603
|
+
"http_etag": "\"533d2b5be7752dd1bb97b622107fe458834203be-7ce5d196077aa26332e9f14e492a1e581b791267\"",
|
1604
|
+
"date_review_requested": "2010-04-26T01:30:03.292603+00:00", "votes_collection_link":
|
1605
|
+
"https://api.launchpad.net/1.0/~xnox/bzr/bug.569934/+merge/24093/votes", "reviewer_link":
|
1606
|
+
null, "self_link": "https://api.launchpad.net/1.0/~xnox/bzr/bug.569934/+merge/24093",
|
1607
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1608
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~xnox/bzr/bug.569934",
|
1609
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~xnox/bzr/bug.569934/+merge/24093/all_comments",
|
1610
|
+
"date_merged": null, "description": "version-info rio parser has a hook. Plugins
|
1611
|
+
such as bzr-svn hook into that to add additional information about revisions.
|
1612
|
+
python parser doesn''t have a hook, and you shouldn''t expect plugin writters
|
1613
|
+
to hook into every single parsers. This branch changes python parser to use
|
1614
|
+
rio parser to get revision information including stuff added by hooks.\n\nFor
|
1615
|
+
example see bug #569934.", "merge_reporter_link": null, "preview_diffs_collection_link":
|
1616
|
+
"https://api.launchpad.net/1.0/~xnox/bzr/bug.569934/+merge/24093/preview_diffs",
|
1617
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~xnox/bzr/bug.569934/+merge/24093/+preview-diff/31183",
|
1618
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1619
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1620
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~xnox/bzr/bug.569934/+merge/24093",
|
1621
|
+
"date_created": "2010-04-26T01:30:03.292603+00:00", "queue_position": null},
|
1622
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1623
|
+
"registrant_link": "https://api.launchpad.net/1.0/~garyvdm", "date_reviewed":
|
1624
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1625
|
+
"http_etag": "\"56da982ef0c30ebcce1095a3a6698a1982103513-509e18f284d929f005ea86b0dd92a91b5d4977f0\"",
|
1626
|
+
"date_review_requested": "2010-04-25T15:40:21.593200+00:00", "votes_collection_link":
|
1627
|
+
"https://api.launchpad.net/1.0/~garyvdm/bzr/diff_using_gui/+merge/24076/votes",
|
1628
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~garyvdm/bzr/diff_using_gui/+merge/24076",
|
1629
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1630
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~garyvdm/bzr/diff_using_gui",
|
1631
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~garyvdm/bzr/diff_using_gui/+merge/24076/all_comments",
|
1632
|
+
"date_merged": null, "description": "This makes \"diff --using\" work better
|
1633
|
+
with gui diff apps. \n\nThis allows one to either run the diff command once,
|
1634
|
+
with a list of files to diff, e.g.:\nbzr diff --using \"meld [--diff]\"\n\nor
|
1635
|
+
to run the command once per file, but run the processes simultaneously, e.g.:\nbzr
|
1636
|
+
diff --using \"WinMergeU.exe /s \u0026\"\n\nThis fixes Bug 490212.", "merge_reporter_link":
|
1637
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~garyvdm/bzr/diff_using_gui/+merge/24076/preview_diffs",
|
1638
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~garyvdm/bzr/diff_using_gui/+merge/24076/+preview-diff/39977",
|
1639
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1640
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1641
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~garyvdm/bzr/diff_using_gui/+merge/24076",
|
1642
|
+
"date_created": "2010-04-25T15:40:21.593200+00:00", "queue_position": null},
|
1643
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1644
|
+
"registrant_link": "https://api.launchpad.net/1.0/~gagern", "date_reviewed":
|
1645
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1646
|
+
"http_etag": "\"4ef6606b2b3854e4557a1d0330d6559450e66c85-e67cea3fbd5e1572963a11a5f398a57320f27442\"",
|
1647
|
+
"date_review_requested": "2010-04-22T13:02:53.050820+00:00", "votes_collection_link":
|
1648
|
+
"https://api.launchpad.net/1.0/~gagern/bzr/encodingSafeTests/+merge/23925/votes",
|
1649
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~gagern/bzr/encodingSafeTests/+merge/23925",
|
1650
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1651
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~gagern/bzr/encodingSafeTests",
|
1652
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~gagern/bzr/encodingSafeTests/+merge/23925/all_comments",
|
1653
|
+
"date_merged": null, "description": "Ensure tests won''t cause the whole selftest
|
1654
|
+
to abort even if UnicodeErrors occur when formatting some test result.\n\nI
|
1655
|
+
had proposed this in 2008: http://thread.gmane.org/gmane.comp.version-control.bazaar-ng.general/43607\nBack
|
1656
|
+
then, John Arbash Meinel and Martin Pool had approved it, but Martin Pool
|
1657
|
+
later voted resubmit, as the feature failed its own test cases.\n\nI''ve updated
|
1658
|
+
it to current bzr.dev, and selftests work for me now. Do you want this patch?",
|
1659
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~gagern/bzr/encodingSafeTests/+merge/23925/preview_diffs",
|
1660
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~gagern/bzr/encodingSafeTests/+merge/23925/+preview-diff/30816",
|
1661
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1662
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1663
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~gagern/bzr/encodingSafeTests/+merge/23925",
|
1664
|
+
"date_created": "2010-04-22T13:02:53.050820+00:00", "queue_position": null},
|
1665
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1666
|
+
"registrant_link": "https://api.launchpad.net/1.0/~spiv", "date_reviewed":
|
1667
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1668
|
+
"http_etag": "\"ad805cfb1c6dec3c92129a3336f61cd68d74adfe-99ac1310a1ba7e01d12c6ac2136dd977d5f90521\"",
|
1669
|
+
"date_review_requested": "2010-04-20T14:01:55.882011+00:00", "votes_collection_link":
|
1670
|
+
"https://api.launchpad.net/1.0/~spiv/bzr/push-relock/+merge/23767/votes",
|
1671
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~spiv/bzr/push-relock/+merge/23767",
|
1672
|
+
"commit_message": "Avoid relocking in cmd_push.", "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1673
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~spiv/bzr/push-relock",
|
1674
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~spiv/bzr/push-relock/+merge/23767/all_comments",
|
1675
|
+
"date_merged": null, "description": "This fixes more relock warnings, this
|
1676
|
+
time in cmd_push.\n\nThis one is a bit uglier than the previous patches: most
|
1677
|
+
of the time cmd_push just needs a read-lock on br_from (the source branch),
|
1678
|
+
but occasionally it wants to set the remembered push location. And sometimes
|
1679
|
+
it won''t know that it will want to until after reading the branch.conf --
|
1680
|
+
i.e. after the read-lock has been acquired.\n\nUnfortunately, we don''t have
|
1681
|
+
an API to upgrade a read lock to write lock, so instead this patch opens a
|
1682
|
+
separate instance of the (already read-locked) branch so it can write-lock
|
1683
|
+
that and set the push location. That second instance is then discarded. The
|
1684
|
+
downside, as explained in the comment, is that the read-locked version will
|
1685
|
+
not see the update, but in this case I don''t think that matters.\n", "merge_reporter_link":
|
1686
|
+
null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~spiv/bzr/push-relock/+merge/23767/preview_diffs",
|
1687
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~spiv/bzr/push-relock/+merge/23767/+preview-diff/30140",
|
1688
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1689
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1690
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~spiv/bzr/push-relock/+merge/23767",
|
1691
|
+
"date_created": "2010-04-20T14:01:55.882011+00:00", "queue_position": null},
|
1692
|
+
{"queuer_link": "https://api.launchpad.net/1.0/~lifeless", "queue_status":
|
1693
|
+
"Work in progress", "private": false, "registrant_link": "https://api.launchpad.net/1.0/~lifeless",
|
1694
|
+
"date_reviewed": null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1695
|
+
"http_etag": "\"c4ebd27f5662dbd733255c11f378a342dddb59e4-3bd91d6607de89177a6de5fd1cd0d9a73965f530\"",
|
1696
|
+
"date_review_requested": "2010-04-15T11:57:06.267777+00:00", "votes_collection_link":
|
1697
|
+
"https://api.launchpad.net/1.0/~lifeless/bzr/broken/+merge/23476/votes", "reviewer_link":
|
1698
|
+
null, "self_link": "https://api.launchpad.net/1.0/~lifeless/bzr/broken/+merge/23476",
|
1699
|
+
"commit_message": "You, surfs up.", "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1700
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~lifeless/bzr/broken",
|
1701
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~lifeless/bzr/broken/+merge/23476/all_comments",
|
1702
|
+
"date_merged": null, "description": "Testing pqm, this branch is deliberately
|
1703
|
+
broken.", "merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~lifeless/bzr/broken/+merge/23476/preview_diffs",
|
1704
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~lifeless/bzr/broken/+merge/23476/+preview-diff/29337",
|
1705
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1706
|
+
null, "date_queued": "2010-04-15T23:53:59.630180+00:00", "prerequisite_branch_link":
|
1707
|
+
null, "queued_revid": "\u003cemail address hidden\u003e", "merged_revno":
|
1708
|
+
null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~lifeless/bzr/broken/+merge/23476",
|
1709
|
+
"date_created": "2010-04-15T11:57:06.267777+00:00", "queue_position": 69},
|
1710
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1711
|
+
"registrant_link": "https://api.launchpad.net/1.0/~mbp", "date_reviewed":
|
1712
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1713
|
+
"http_etag": "\"953e7d167d2e2c05ee97ca595c9b96946e697923-54559dc25a75c51238eaa4f14b7c182eef1abd40\"",
|
1714
|
+
"date_review_requested": "2010-03-30T05:59:22.389683+00:00", "votes_collection_link":
|
1715
|
+
"https://api.launchpad.net/1.0/~mbp/bzr/484558-merge-directory/+merge/22430/votes",
|
1716
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~mbp/bzr/484558-merge-directory/+merge/22430",
|
1717
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1718
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~mbp/bzr/484558-merge-directory",
|
1719
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~mbp/bzr/484558-merge-directory/+merge/22430/all_comments",
|
1720
|
+
"date_merged": null, "description": "According to https://bugs.edge.launchpad.net/bzr/+bug/484558
|
1721
|
+
openbsd''s sftp server may hang if you try to read from a directory. The
|
1722
|
+
user who originally reported this can''t reproduce the error in trunk, but
|
1723
|
+
on the whole I think this is still worth merging; it may occur in other cases.",
|
1724
|
+
"merge_reporter_link": null, "preview_diffs_collection_link": "https://api.launchpad.net/1.0/~mbp/bzr/484558-merge-directory/+merge/22430/preview_diffs",
|
1725
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~mbp/bzr/484558-merge-directory/+merge/22430/+preview-diff/26477",
|
1726
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1727
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1728
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~mbp/bzr/484558-merge-directory/+merge/22430",
|
1729
|
+
"date_created": "2010-03-30T05:59:22.389683+00:00", "queue_position": null},
|
1730
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1731
|
+
"registrant_link": "https://api.launchpad.net/1.0/~henninge", "date_reviewed":
|
1732
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1733
|
+
"http_etag": "\"1c88e4156d313207c042ad72946a800d8a3ab02f-02899371083256bac6b62fa0d2031195bfe1faae\"",
|
1734
|
+
"date_review_requested": "2010-02-20T21:35:14.575841+00:00", "votes_collection_link":
|
1735
|
+
"https://api.launchpad.net/1.0/~henninge/bzr/bug-522195-contextmanagers/+merge/19788/votes",
|
1736
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~henninge/bzr/bug-522195-contextmanagers/+merge/19788",
|
1737
|
+
"commit_message": "Added context managers for read and write locks to Branch,
|
1738
|
+
Tree, MutableTree, and Repository classes.", "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1739
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~henninge/bzr/bug-522195-contextmanagers",
|
1740
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~henninge/bzr/bug-522195-contextmanagers/+merge/19788/all_comments",
|
1741
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
1742
|
+
"https://api.launchpad.net/1.0/~henninge/bzr/bug-522195-contextmanagers/+merge/19788/preview_diffs",
|
1743
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~henninge/bzr/bug-522195-contextmanagers/+merge/19788/+preview-diff/19489",
|
1744
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1745
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1746
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~henninge/bzr/bug-522195-contextmanagers/+merge/19788",
|
1747
|
+
"date_created": "2010-02-20T21:35:14.575841+00:00", "queue_position": null},
|
1748
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1749
|
+
"registrant_link": "https://api.launchpad.net/1.0/~gz", "date_reviewed": null,
|
1750
|
+
"target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1751
|
+
"http_etag": "\"f81763809ee15217aa5b654efcd7100befe23b95-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
1752
|
+
"date_review_requested": "2010-02-16T20:09:31.749488+00:00", "votes_collection_link":
|
1753
|
+
"https://api.launchpad.net/1.0/~gz/bzr/test_ssh_client_medium_eintr__read_bytes/+merge/19439/votes",
|
1754
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~gz/bzr/test_ssh_client_medium_eintr__read_bytes/+merge/19439",
|
1755
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1756
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~gz/bzr/test_ssh_client_medium_eintr__read_bytes",
|
1757
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~gz/bzr/test_ssh_client_medium_eintr__read_bytes/+merge/19439/all_comments",
|
1758
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
1759
|
+
"https://api.launchpad.net/1.0/~gz/bzr/test_ssh_client_medium_eintr__read_bytes/+merge/19439/preview_diffs",
|
1760
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~gz/bzr/test_ssh_client_medium_eintr__read_bytes/+merge/19439/+preview-diff/18694",
|
1761
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1762
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1763
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~gz/bzr/test_ssh_client_medium_eintr__read_bytes/+merge/19439",
|
1764
|
+
"date_created": "2010-02-16T20:09:31.749488+00:00", "queue_position": null},
|
1765
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1766
|
+
"registrant_link": "https://api.launchpad.net/1.0/~spiv", "date_reviewed":
|
1767
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1768
|
+
"http_etag": "\"d5cad22f741a1aa55f7ca2d6dead6d3fee60e9bc-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
1769
|
+
"date_review_requested": "2010-02-13T01:29:20.594254+00:00", "votes_collection_link":
|
1770
|
+
"https://api.launchpad.net/1.0/~spiv/bzr/better-news-merge/+merge/19247/votes",
|
1771
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~spiv/bzr/better-news-merge/+merge/19247",
|
1772
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1773
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~spiv/bzr/better-news-merge",
|
1774
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~spiv/bzr/better-news-merge/+merge/19247/all_comments",
|
1775
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
1776
|
+
"https://api.launchpad.net/1.0/~spiv/bzr/better-news-merge/+merge/19247/preview_diffs",
|
1777
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~spiv/bzr/better-news-merge/+merge/19247/+preview-diff/30136",
|
1778
|
+
"supersedes_link": "https://api.launchpad.net/1.0/~spiv/bzr/better-news-merge/+merge/19169",
|
1779
|
+
"address": "\u003cemail address hidden\u003e", "superseded_by_link": null,
|
1780
|
+
"date_queued": null, "prerequisite_branch_link": null, "queued_revid": null,
|
1781
|
+
"merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~spiv/bzr/better-news-merge/+merge/19247",
|
1782
|
+
"date_created": "2010-02-13T01:29:20.594254+00:00", "queue_position": null},
|
1783
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1784
|
+
"registrant_link": "https://api.launchpad.net/1.0/~mbp", "date_reviewed":
|
1785
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1786
|
+
"http_etag": "\"c9bfd2d64774bcf04447e1c15e684cafc980f6ea-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
1787
|
+
"date_review_requested": "2010-02-06T10:54:37.700413+00:00", "votes_collection_link":
|
1788
|
+
"https://api.launchpad.net/1.0/~mbp/bzr/remove-controlfiles/+merge/18752/votes",
|
1789
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~mbp/bzr/remove-controlfiles/+merge/18752",
|
1790
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1791
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~mbp/bzr/remove-controlfiles",
|
1792
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~mbp/bzr/remove-controlfiles/+merge/18752/all_comments",
|
1793
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
1794
|
+
"https://api.launchpad.net/1.0/~mbp/bzr/remove-controlfiles/+merge/18752/preview_diffs",
|
1795
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~mbp/bzr/remove-controlfiles/+merge/18752/+preview-diff/30497",
|
1796
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1797
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1798
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~mbp/bzr/remove-controlfiles/+merge/18752",
|
1799
|
+
"date_created": "2010-02-06T10:54:37.700413+00:00", "queue_position": null},
|
1800
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1801
|
+
"registrant_link": "https://api.launchpad.net/1.0/~garyvdm", "date_reviewed":
|
1802
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1803
|
+
"http_etag": "\"634b5666e86efeab81b4e0952895c07960d5de7c-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
1804
|
+
"date_review_requested": "2010-01-09T17:10:20.537260+00:00", "votes_collection_link":
|
1805
|
+
"https://api.launchpad.net/1.0/~garyvdm/bzr/unicode_bom_detect/+merge/17076/votes",
|
1806
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~garyvdm/bzr/unicode_bom_detect/+merge/17076",
|
1807
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1808
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~garyvdm/bzr/unicode_bom_detect",
|
1809
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~garyvdm/bzr/unicode_bom_detect/+merge/17076/all_comments",
|
1810
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
1811
|
+
"https://api.launchpad.net/1.0/~garyvdm/bzr/unicode_bom_detect/+merge/17076/preview_diffs",
|
1812
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~garyvdm/bzr/unicode_bom_detect/+merge/17076/+preview-diff/13051",
|
1813
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1814
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1815
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~garyvdm/bzr/unicode_bom_detect/+merge/17076",
|
1816
|
+
"date_created": "2010-01-09T17:10:20.537260+00:00", "queue_position": null},
|
1817
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1818
|
+
"registrant_link": "https://api.launchpad.net/1.0/~ian-clatworthy", "date_reviewed":
|
1819
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1820
|
+
"http_etag": "\"204bb82b6d82b36c03ee9a13414b37805de5191c-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
1821
|
+
"date_review_requested": "2010-01-02T07:12:48.536452+00:00", "votes_collection_link":
|
1822
|
+
"https://api.launchpad.net/1.0/~ian-clatworthy/bzr/411413-plugin-disable/+merge/16719/votes",
|
1823
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~ian-clatworthy/bzr/411413-plugin-disable/+merge/16719",
|
1824
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1825
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~ian-clatworthy/bzr/411413-plugin-disable",
|
1826
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~ian-clatworthy/bzr/411413-plugin-disable/+merge/16719/all_comments",
|
1827
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
1828
|
+
"https://api.launchpad.net/1.0/~ian-clatworthy/bzr/411413-plugin-disable/+merge/16719/preview_diffs",
|
1829
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~ian-clatworthy/bzr/411413-plugin-disable/+merge/16719/+preview-diff/13398",
|
1830
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1831
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1832
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~ian-clatworthy/bzr/411413-plugin-disable/+merge/16719",
|
1833
|
+
"date_created": "2010-01-02T07:12:48.536452+00:00", "queue_position": null},
|
1834
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1835
|
+
"registrant_link": "https://api.launchpad.net/1.0/~guilhem-bichot", "date_reviewed":
|
1836
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1837
|
+
"http_etag": "\"af6b14067705c4dd83a0062d44745d13690b8a84-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
1838
|
+
"date_review_requested": "2009-12-07T10:07:01.795106+00:00", "votes_collection_link":
|
1839
|
+
"https://api.launchpad.net/1.0/~guilhem-bichot/bzr/bzr-pull-verbose-shows-tip-before-pull/+merge/15741/votes",
|
1840
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~guilhem-bichot/bzr/bzr-pull-verbose-shows-tip-before-pull/+merge/15741",
|
1841
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1842
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~guilhem-bichot/bzr/bzr-pull-verbose-shows-tip-before-pull",
|
1843
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~guilhem-bichot/bzr/bzr-pull-verbose-shows-tip-before-pull/+merge/15741/all_comments",
|
1844
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
1845
|
+
"https://api.launchpad.net/1.0/~guilhem-bichot/bzr/bzr-pull-verbose-shows-tip-before-pull/+merge/15741/preview_diffs",
|
1846
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~guilhem-bichot/bzr/bzr-pull-verbose-shows-tip-before-pull/+merge/15741/+preview-diff/9715",
|
1847
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1848
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1849
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~guilhem-bichot/bzr/bzr-pull-verbose-shows-tip-before-pull/+merge/15741",
|
1850
|
+
"date_created": "2009-12-07T10:07:01.795106+00:00", "queue_position": null},
|
1851
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1852
|
+
"registrant_link": "https://api.launchpad.net/1.0/~mbp", "date_reviewed":
|
1853
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1854
|
+
"http_etag": "\"2ccc8b8fccee9249cb0074d2173da065b4af804a-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
1855
|
+
"date_review_requested": "2009-11-27T05:16:05.670219+00:00", "votes_collection_link":
|
1856
|
+
"https://api.launchpad.net/1.0/~mbp/bzr/remove-logging/+merge/15306/votes",
|
1857
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~mbp/bzr/remove-logging/+merge/15306",
|
1858
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1859
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~mbp/bzr/remove-logging",
|
1860
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~mbp/bzr/remove-logging/+merge/15306/all_comments",
|
1861
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
1862
|
+
"https://api.launchpad.net/1.0/~mbp/bzr/remove-logging/+merge/15306/preview_diffs",
|
1863
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~mbp/bzr/remove-logging/+merge/15306/+preview-diff/8247",
|
1864
|
+
"supersedes_link": "https://api.launchpad.net/1.0/~mbp/bzr/remove-logging/+merge/14942",
|
1865
|
+
"address": "\u003cemail address hidden\u003e", "superseded_by_link": null,
|
1866
|
+
"date_queued": null, "prerequisite_branch_link": null, "queued_revid": null,
|
1867
|
+
"merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~mbp/bzr/remove-logging/+merge/15306",
|
1868
|
+
"date_created": "2009-11-27T05:16:05.670219+00:00", "queue_position": null},
|
1869
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1870
|
+
"registrant_link": "https://api.launchpad.net/1.0/~declanmg", "date_reviewed":
|
1871
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1872
|
+
"http_etag": "\"506c1edc2be26629befcdf74a35b997895be86da-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
1873
|
+
"date_review_requested": null, "votes_collection_link": "https://api.launchpad.net/1.0/~declanmg/bzr/264275-fix/+merge/15175/votes",
|
1874
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~declanmg/bzr/264275-fix/+merge/15175",
|
1875
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1876
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~declanmg/bzr/264275-fix",
|
1877
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~declanmg/bzr/264275-fix/+merge/15175/all_comments",
|
1878
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
1879
|
+
"https://api.launchpad.net/1.0/~declanmg/bzr/264275-fix/+merge/15175/preview_diffs",
|
1880
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~declanmg/bzr/264275-fix/+merge/15175/+preview-diff/7873",
|
1881
|
+
"supersedes_link": "https://api.launchpad.net/1.0/~declanmg/bzr/264275-fix/+merge/14688",
|
1882
|
+
"address": "\u003cemail address hidden\u003e", "superseded_by_link": null,
|
1883
|
+
"date_queued": null, "prerequisite_branch_link": null, "queued_revid": null,
|
1884
|
+
"merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~declanmg/bzr/264275-fix/+merge/15175",
|
1885
|
+
"date_created": "2009-11-23T23:01:52.242185+00:00", "queue_position": null},
|
1886
|
+
{"queuer_link": null, "queue_status": "Work in progress", "private": false,
|
1887
|
+
"registrant_link": "https://api.launchpad.net/1.0/~jameinel", "date_reviewed":
|
1888
|
+
null, "target_branch_link": "https://api.launchpad.net/1.0/~bzr-pqm/bzr/bzr.dev",
|
1889
|
+
"http_etag": "\"7c35de184454331b889a9f3233355db6e8159bc3-a937886b945c686cf74d68d2f7a4aef8814e0098\"",
|
1890
|
+
"date_review_requested": "2009-10-23T15:05:39.357340+00:00", "votes_collection_link":
|
1891
|
+
"https://api.launchpad.net/1.0/~jameinel/bzr/2.1-remove-win32-build/+merge/13848/votes",
|
1892
|
+
"reviewer_link": null, "self_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-remove-win32-build/+merge/13848",
|
1893
|
+
"commit_message": null, "resource_type_link": "https://api.launchpad.net/1.0/#branch_merge_proposal",
|
1894
|
+
"source_branch_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-remove-win32-build",
|
1895
|
+
"all_comments_collection_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-remove-win32-build/+merge/13848/all_comments",
|
1896
|
+
"date_merged": null, "description": null, "merge_reporter_link": null, "preview_diffs_collection_link":
|
1897
|
+
"https://api.launchpad.net/1.0/~jameinel/bzr/2.1-remove-win32-build/+merge/13848/preview_diffs",
|
1898
|
+
"preview_diff_link": "https://api.launchpad.net/1.0/~jameinel/bzr/2.1-remove-win32-build/+merge/13848/+preview-diff/4833",
|
1899
|
+
"supersedes_link": null, "address": "\u003cemail address hidden\u003e", "superseded_by_link":
|
1900
|
+
null, "date_queued": null, "prerequisite_branch_link": null, "queued_revid":
|
1901
|
+
null, "merged_revno": null, "reviewed_revid": null, "web_link": "https://code.launchpad.net/~jameinel/bzr/2.1-remove-win32-build/+merge/13848",
|
1902
|
+
"date_created": "2009-10-23T15:05:39.357340+00:00", "queue_position": null}]}'
|
1903
|
+
http_version:
|
1904
|
+
recorded_at: Sun, 18 May 2014 23:49:08 GMT
|
1905
|
+
recorded_with: VCR 2.9.0
|