de505df5 Andy McCall 1 month ago ↶
1
2
3
4
use super :: history:: { render_files, FileRows} ;
5
use super :: settings:: { csrf, require} ;
6
use super :: { filters, lookup, lookup_role, Error, Page, RepoShell, Shell} ;
7
use crate :: auth:: { Access, Role, Viewer} ;
8
use crate :: db:: { self , accounts, proposals as pdb} ;
9
use crate :: render:: { self , diff} ;
10
use crate :: repos:: proposals:: { self as pl, Projection, Source} ;
11
use crate :: repos:: view:: { self , ChangeView, ConflictView} ;
12
use crate :: repos:: RepoName;
13
use crate :: Shared;
14
use askama:: Template;
15
use axum:: extract:: { Form, Path, Query, State} ;
16
use axum:: response:: { IntoResponse, Redirect, Response} ;
17
use hub_api:: { Approval, ProposalSource, ProposalState} ;
18
use oxy_core:: hash:: ChangeHash;
19
use serde:: Deserialize;
20
use std:: collections:: { BTreeMap, HashMap} ;
21
22
23
24
# [ derive ( Template ) ]
25
# [ template ( path = " proposals.html" ) ]
26
pub struct ProposalsPage {
27
shell : Shell,
28
repo : RepoShell,
29
rows : Vec< pdb:: ProposalRow> ,
30
filter : String,
31
counts : ( usize , usize , usize ) ,
32
bookmarks : Vec< String> ,
33
}
34
35
# [ derive ( Deserialize ) ]
36
pub struct ListQuery {
37
state : Option< String> ,
38
}
39
40
pub async fn list (
41
State( app ) : State< Shared> ,
42
viewer : Viewer,
43
Path( (owner , name ) ) : Path< ( String, String) > ,
44
Query( q) : Query< ListQuery> ,
45
) -> Result< Page< ProposalsPage> , Error> {
46
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposals" ) , & viewer) ;
47
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
48
let all = pdb:: list( & app.db, row.id, & [ ] ) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
49
let counts = (
50
all.iter ( ) .filter ( | p | p.is_open ( ) ) .count ( ) ,
51
all.iter ( ) .filter ( | p | p.state = = " landed" ) .count ( ) ,
52
all.iter ( ) .filter ( | p | p.state = = " closed" ) .count ( ) ,
53
) ;
54
let filter = q.state.unwrap_or_else ( | | " open" .into ( ) ) ;
55
let rows = all
56
.into_iter ( )
57
.filter ( | p | match filter.as_str ( ) {
58
" open" => p.is_open ( ) ,
59
" landed" => p.state = = " landed" ,
60
" closed" => p.state = = " closed" ,
61
_ => true ,
62
} )
63
.collect ( ) ;
64
let bookmarks = app
65
.repos
66
.read ( & repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) )
67
.await
68
.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
69
Ok ( Page( ProposalsPage { shell, repo: RepoShell:: new( & app, & row, " proposals" ) .with_role ( role) , rows, filter, counts, bookmarks } ) )
70
}
71
72
73
74
# [ derive ( Template ) ]
75
# [ template ( path = " proposal_new.html" ) ]
76
pub struct NewProposalPage {
77
shell : Shell,
78
repo : RepoShell,
79
bookmarks : Vec< String> ,
80
source : String,
81
target : String,
82
error : Option< String> ,
83
84
preview : Vec< ChangeView> ,
85
conflicted : bool ,
86
}
87
88
# [ derive ( Deserialize ) ]
89
pub struct NewQuery {
90
source : Option< String> ,
91
target : Option< String> ,
92
}
93
94
95
fn parse_source ( app : & Shared, repo : & RepoName, source : & str ) -> Option< ( Option< RepoName> , String) > {
96
if let Some ( ( slug, bookmark) ) = source.split_once ( ' :' ) {
97
let fork = RepoName:: parse( slug) ? ;
98
if ! app.repos.exists ( & fork) | | fork = = * repo {
99
return None ;
100
}
101
return Some ( ( Some ( fork) , bookmark.to_string ( ) ) ) ;
102
}
103
crate :: repos:: names:: valid_segment( source) .then ( | | ( None , source.to_string ( ) ) )
104
}
105
106
async fn preview_for (
107
app : & Shared,
108
repo : & RepoName,
109
target : & str ,
110
source : & str ,
111
) -> Result< ( Vec< ChangeView> , bool ) , crate:: repos:: RepoError> {
112
let Some ( ( fork, bookmark) ) = parse_source ( app, repo, source) else { return Ok ( ( vec! [ ] , false ) ) } ;
113
let target = target.to_string ( ) ;
114
let fork_dir = fork.as_ref ( ) .map ( | f | app.repos.dir ( f) ) ;
115
app.repos
116
.read ( repo, move | r, cache| {
117
let projection = match & fork_dir {
118
Some ( dir) => {
119
let fork_repo = oxy_core:: repo:: Repo:: open( dir) ? ;
120
let heads = fork_repo.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
121
pl:: project( r, cache, & target, Source:: Fork { fork: & fork_repo, heads } ) ?
122
}
123
None => {
124
let heads = r.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
125
pl:: project( r, cache, & target, Source:: Bookmark( heads) ) ?
126
}
127
} ;
128
Ok ( ( projection.changes, projection.conflicted) )
129
} )
130
.await
131
}
132
133
pub async fn new_form (
134
State( app ) : State< Shared> ,
135
viewer : Viewer,
136
Path( (owner , name ) ) : Path< ( String, String) > ,
137
Query( q) : Query< NewQuery> ,
138
) -> Result< Page< NewProposalPage> , Error> {
139
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposals/new" ) , & viewer) ;
140
require ( & viewer, & shell) ? ;
141
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
142
let bookmarks = app
143
.repos
144
.read ( & repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) )
145
.await
146
.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
147
let target = q.target.unwrap_or_else ( | | row.default_bookmark.clone ( ) ) ;
148
let source = q.source.unwrap_or_default ( ) ;
149
let ( preview, conflicted) =
150
if source.is_empty ( ) { ( vec! [ ] , false ) } else { preview_for ( & app, & repo, & target, & source) .await.unwrap_or ( ( vec! [ ] , false ) ) } ;
151
Ok ( Page( NewProposalPage {
152
shell,
153
repo: RepoShell:: new( & app, & row, " proposals" ) .with_role ( role) ,
154
bookmarks,
155
source,
156
target,
157
error: None ,
158
preview,
159
conflicted,
160
} ) )
161
}
162
163
# [ derive ( Deserialize ) ]
164
pub struct NewForm {
165
#[serde(rename = "_csrf")]
166
csrf_token : String,
167
title : String,
168
#[serde(default)]
169
body : String,
170
target : String,
171
source : String,
172
#[serde(default)]
173
draft : Option< String> ,
174
}
175
176
pub async fn create (
177
State( app ) : State< Shared> ,
178
viewer : Viewer,
179
Path( (owner , name ) ) : Path< ( String, String) > ,
180
Form( f) : Form< NewForm> ,
181
) -> Result< Response, Error> {
182
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposals/new" ) , & viewer) ;
183
let me = require ( & viewer, & shell) ? ;
184
csrf ( & viewer, & f.csrf_token, & shell) ? ;
185
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
186
let bookmarks = app
187
.repos
188
.read ( & repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) )
189
.await
190
.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
191
let fail = | msg : & str , preview : Vec< ChangeView> | {
192
Page( NewProposalPage {
193
shell: shell.clone ( ) ,
194
repo: RepoShell:: new( & app, & row, " proposals" ) .with_role ( role) ,
195
bookmarks: bookmarks.clone ( ) ,
196
source: f.source.clone ( ) ,
197
target: f.target.clone ( ) ,
198
error: Some ( msg.into ( ) ) ,
199
preview,
200
conflicted: false ,
201
} )
202
.into_response ( )
203
} ;
204
if f.title.trim ( ) .is_empty ( ) {
205
return Ok ( fail ( " Give the proposal a title." , vec! [ ] ) ) ;
206
}
207
if ! bookmarks.contains ( & f.target) {
208
return Ok ( fail ( " Pick a target bookmark of this repository." , vec! [ ] ) ) ;
209
}
210
let Some ( ( fork, bookmark) ) = parse_source ( & app, & repo, f.source.trim ( ) ) else {
211
return Ok ( fail ( " The source is a bookmark of this repository, or owner/name:bookmark of a fork." , vec! [ ] ) ) ;
212
} ;
213
if fork.is_none ( ) & & bookmark = = f.target {
214
return Ok ( fail ( " The source and the target are the same bookmark." , vec! [ ] ) ) ;
215
}
216
let ( preview, _ ) = preview_for ( & app, & repo, & f.target, f.source.trim ( ) ) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
217
if preview.is_empty ( ) {
218
return Ok ( fail ( " The source adds nothing to the target." , vec! [ ] ) ) ;
219
}
220
let source_repo_id = match & fork {
221
Some ( fk) => db:: repos:: get( & app.db, & fk.owner, & fk.name) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? .map ( | r | r.id ) ,
222
None => None ,
223
} ;
224
let created = pdb:: create(
225
& app.db,
226
pdb:: NewProposal {
227
repo_id: row.id,
228
title: f.title.trim ( ) ,
229
body: f.body.trim ( ) ,
230
author_id: Some ( me.account.id) ,
231
author: & me.account.username,
232
draft: f.draft.is_some ( ) ,
233
target: & f.target,
234
source_kind: if fork.is_some ( ) { " fork" } else { " bookmark" } ,
235
source_repo_id,
236
source_bookmark: & bookmark,
237
source_changes: " " ,
238
} ,
239
)
240
.await
241
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
242
pdb:: add_event( & app.db, created.id, & me.account.username, " opened" , " " ) .await.ok ( ) ;
243
accounts:: audit( & app.db, Some ( & me.account) , " proposal.opened" , & format! ( " {owner} /{name} #{} " , created.number) , & f.title) .await.ok ( ) ;
18e381ea Andy McCall 1 month ago ↶
244
db:: notify:: index( & app.db, " proposal" , row.id, created.id, created.number, & created.title, & created.body) .await.ok ( ) ;
245
let url = format! ( " /{owner} /{name} /proposal/{} " , created.number) ;
246
crate :: notify:: deliver(
247
& app,
248
crate :: notify:: Event {
249
kind: " proposal.opened" ,
250
title: format! ( " {owner} /{name} #{} : {} " , created.number, created.title) ,
251
url: url.clone ( ) ,
252
actor: & me.account,
253
repo_id: row.id,
254
thread: Some ( ( " proposal" , created.id) ) ,
255
mention_text: & f.body,
256
direct: vec! [ ] ,
257
} ,
258
)
259
.await;
260
Ok ( Redirect:: to( & url) .into_response ( ) )
de505df5 Andy McCall 1 month ago ↶
261
}
262
263
264
265
266
pub struct CommentView {
267
pub row : pdb:: CommentRow,
268
pub body_html : String,
269
pub line : Option< usize > ,
270
}
271
272
pub struct ReviewView {
273
pub row : pdb:: ReviewRow,
274
pub body_html : String,
275
pub sealed : bool ,
276
}
277
278
279
pub struct Loaded {
280
pub row : pdb:: ProposalRow,
281
pub changes : Vec< ChangeView> ,
282
pub hashes : Vec< ChangeHash> ,
283
pub heads : Vec< ChangeHash> ,
284
pub state : String,
285
pub target_state : String,
286
pub conflicted : bool ,
287
pub conflicts : Vec< ConflictView> ,
288
pub files : Vec< FileRows> ,
289
290
pub atoms : HashMap< ( String, usize ) , ( String, u32 ) > ,
291
pub sealing_keys : Vec< String> ,
292
pub touched : Vec< String> ,
293
pub owners : Vec< String> ,
294
pub landed_already : bool ,
295
}
296
297
298
pub async fn load ( app : & Shared, repo : & RepoName, row : pdb:: ProposalRow) -> Result< Loaded, crate:: repos:: RepoError> {
299
let fork_dir = match ( row.source_kind.as_str ( ) , row.source_repo_id) {
300
( " fork" , Some ( id) ) => {
301
db:: repos:: get_by_id( & app.db, id) .await.ok ( ) .flatten ( ) .and_then ( | r | RepoName:: new( & r.owner, & r.name) ) .map ( | n | app.repos.dir ( & n) )
302
}
303
_ => None ,
304
} ;
305
let r2 = row.clone ( ) ;
306
let loaded = app
307
.repos
308
.read ( repo, move | r, cache| {
309
let source = match ( r2.source_kind.as_str ( ) , & fork_dir) {
310
( " changes" , _ ) => Source:: Changes( r2.source_changes ( ) .iter ( ) .filter_map ( | h | ChangeHash:: from_hex( h) ) .collect ( ) ) ,
311
( " fork" , Some ( dir) ) => {
312
let fork_repo = oxy_core:: repo:: Repo:: open( dir) ? ;
313
let heads =
314
fork_repo.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = r2.source_bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
315
316
let fork_state = fork_repo.load_state ( & heads) ? ;
317
let missing: Vec< ChangeHash> = fork_state.changes ( ) .map ( | ( h , _) | * h) .filter ( | h | ! r.store ( ) .has ( h) ) .collect ( ) ;
318
if ! missing.is_empty ( ) {
319
r.import_bundle ( & fork_repo.bundle_for ( & missing) ? , r.current_policy ( ) ? .is_some ( ) ) ? ;
320
}
321
Source:: Changes( heads)
322
}
323
_ => {
324
let heads = r.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = r2.source_bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
325
Source:: Bookmark( heads)
326
}
327
} ;
328
let p: Projection = pl:: project( r, cache, & r2.target, source) ? ;
329
let target_loaded = cache.load ( r, & p.target_heads) ? ;
330
let files = render_files ( & p.files, & p.bases) ;
331
let mut atoms = HashMap:: new( ) ;
332
for f in & files {
333
for l in & f.lines {
334
if let Some ( n) = l.new_no {
335
if let Some ( ( h, i) ) = pl:: atom_at( & p.loaded, & f.path, n as usize ) {
336
atoms.insert ( ( f.path.clone ( ) , n as usize ) , ( h.to_hex ( ) , i) ) ;
337
}
338
}
339
}
340
}
341
let touched: Vec< String> = p.files.iter ( ) .map ( | f | f.path.clone ( ) ) .collect ( ) ;
342
let owners = pl:: owners_for( & target_loaded, & touched) ;
343
let sealing = pl:: sealing_keys( r, & p.hashes) ? .into_iter ( ) .map ( | k | k.to_hex ( ) ) .collect ( ) ;
344
let landed_already = ! p.hashes.is_empty ( ) & & p.hashes.iter ( ) .all ( | h | target_loaded.state.contains ( h) ) ;
345
Ok ( Loaded {
346
row: r2,
347
changes: p.changes,
348
hashes: p.hashes,
349
heads: p.heads,
350
state: p.state.to_hex ( ) ,
351
target_state: p.target_state.to_hex ( ) ,
352
conflicted: p.conflicted,
353
conflicts: p.conflicts,
354
files,
355
atoms,
356
sealing_keys: sealing,
357
touched,
358
owners,
359
landed_already,
360
} )
361
} )
362
.await? ;
363
364
let heads_csv = loaded.heads.iter ( ) .map ( | h | h.to_hex ( ) ) .collect:: < Vec< _ > > ( ) .join ( " ," ) ;
365
let changes_csv = loaded.hashes.iter ( ) .map ( | h | h.to_hex ( ) ) .collect:: < Vec< _ > > ( ) .join ( " ," ) ;
366
pdb:: set_projection( & app.db, loaded.row.id, & loaded.state, & heads_csv, & loaded.target_state, & changes_csv, loaded.conflicted)
367
.await
368
.ok ( ) ;
369
Ok ( loaded)
370
}
371
372
373
pub struct Verdict {
374
pub reviews : Vec< ReviewView> ,
375
pub approvals : Vec< Approval> ,
376
pub blockers : Vec< String> ,
377
pub depends_on : Vec< i64 > ,
378
pub requirements : pdb:: Requirements,
379
}
380
381
pub async fn verdict ( app : & Shared, loaded : & Loaded, repo_id : i64 ) -> Result< Verdict, sqlx:: Error> {
382
let rows = pdb:: reviews( & app.db, loaded.row.id) .await? ;
383
let links = accounts:: identity_accounts( & app.db) .await? ;
384
let sealed_accounts: Vec< String> = links.iter ( ) .filter ( | ( k , _) | loaded.sealing_keys.contains ( k) ) .map ( | ( _, u ) | u.clone ( ) ) .collect ( ) ;
385
386
let mut latest: BTreeMap< String, & pdb:: ReviewRow> = BTreeMap:: new( ) ;
387
for r in & rows {
388
latest.insert ( r.author.clone ( ) , r) ;
389
}
390
let mut approvals = Vec :: new( ) ;
391
for ( who, r) in & latest {
392
if r.verdict = = " approve" {
393
let sealed = sealed_accounts.contains ( who) ;
394
let key = links.iter ( ) .find ( | ( k , u ) | u = = who & & loaded.sealing_keys.contains ( k) ) .map ( | ( k , _) | k.clone ( ) ) ;
395
approvals.push ( Approval { account: who.clone ( ) , sealed, key } ) ;
396
}
397
}
398
let reviews = rows
399
.iter ( )
400
.map ( | r | ReviewView {
401
row: r.clone ( ) ,
402
body_html: render:: markdown:: render( & r.body, " /" , " /" ) ,
403
sealed: r.verdict = = " approve" & & sealed_accounts.contains ( & r.author) ,
404
} )
405
.collect ( ) ;
406
let requirements = pdb:: requirements( & app.db, repo_id) .await? ;
407
let mut blockers = Vec :: new( ) ;
408
if loaded.row.state = = " draft" {
409
blockers.push ( " the proposal is a draft" .into ( ) ) ;
410
}
411
if loaded.hashes.is_empty ( ) {
412
blockers.push ( " the proposal adds no changes" .into ( ) ) ;
413
}
414
let sealed_count = approvals.iter ( ) .filter ( | a | a.sealed ) .count ( ) as i64 ;
415
if sealed_count < requirements.required_approvals {
416
blockers.push ( format! ( " {sealed_count} of {} required sealed approvals" , requirements.required_approvals) ) ;
417
}
418
if requirements.require_owners {
419
let missing: Vec< & String> = loaded.owners.iter ( ) .filter ( | o | ! approvals.iter ( ) .any ( | a | a.sealed & & & a.account = = * o ) ) .collect ( ) ;
420
if ! missing.is_empty ( ) {
421
blockers.push ( format! ( " code owners still to approve: {} " , missing.iter ( ) .map ( | s | s.as_str ( ) ) .collect:: < Vec< _ > > ( ) .join ( " , " ) ) ) ;
422
}
423
}
424
if loaded.conflicted & & ! requirements.allow_conflicts {
425
blockers.push ( " landing would carry conflicts, which this repository refuses" .into ( ) ) ;
426
}
427
let requesting: Vec< & String> = latest.iter ( ) .filter ( | ( _, r ) | r.verdict = = " changes" ) .map ( | ( who , _) | who ) .collect ( ) ;
428
if ! requesting.is_empty ( ) {
429
blockers.push ( format! ( " changes requested by {} " , requesting.iter ( ) .map ( | s | s.as_str ( ) ) .collect:: < Vec< _ > > ( ) .join ( " , " ) ) ) ;
430
}
431
432
let mut depends_on = Vec :: new( ) ;
433
for other in pdb:: list( & app.db, repo_id, & [ " open" , " draft" ] ) .await? {
434
if other.id = = loaded.row.id | | other.number > loaded.row.number {
435
continue ;
436
}
437
let theirs = other.projected_changes ( ) ;
438
if ! theirs.is_empty ( ) & & theirs.iter ( ) .all ( | h | loaded.hashes.iter ( ) .any ( | m | m.to_hex ( ) = = * h ) ) {
439
depends_on.push ( other.number) ;
440
}
441
}
442
if ! depends_on.is_empty ( ) {
443
blockers.push ( format! ( " depends on {} " , depends_on.iter ( ) .map ( | n | format! ( " #{n} " ) ) .collect:: < Vec< _ > > ( ) .join ( " , " ) ) ) ;
444
}
445
Ok ( Verdict { reviews, approvals, blockers, depends_on, requirements } )
446
}
447
448
# [ derive ( Template ) ]
449
# [ template ( path = " proposal.html" ) ]
450
pub struct ProposalPage {
451
shell : Shell,
452
repo : RepoShell,
453
p : pdb:: ProposalRow,
454
body_html : String,
455
tab : String,
456
changes : Vec< ChangeView> ,
457
files : Vec< FileRows> ,
458
conflicts : Vec< ConflictView> ,
459
conflicted : bool ,
460
comments : Vec< CommentView> ,
461
462
placed : HashMap< ( String, usize ) , Vec< usize > > ,
463
outdated : Vec< usize > ,
464
reviews : Vec< ReviewView> ,
465
approvals : Vec< Approval> ,
466
blockers : Vec< String> ,
467
depends_on : Vec< i64 > ,
468
events : Vec< pdb:: EventRow> ,
469
owners : Vec< String> ,
470
requirements : pdb:: Requirements,
471
landed_already : bool ,
472
can_edit : bool ,
473
can_land : bool ,
474
hub_can_land : bool ,
475
notice : Option< String> ,
476
error : Option< String> ,
477
heads : Vec< String> ,
478
state_hash : String,
479
source_label : String,
480
api_url : String,
18e381ea Andy McCall 1 month ago ↶
481
labels : Vec< db:: issues:: Label> ,
482
all_labels : Vec< db:: issues:: Label> ,
de505df5 Andy McCall 1 month ago ↶
483
}
484
485
# [ derive ( Deserialize ) ]
486
pub struct DetailQuery {
487
tab : Option< String> ,
488
}
489
490
491
492
# [ allow ( clippy::too_many_arguments ) ]
493
async fn detail (
494
app : & Shared,
495
shell : Shell,
496
viewer : & Viewer,
497
owner : & str ,
498
name : & str ,
499
number : i64 ,
500
tab : String,
501
notice : Option< String> ,
502
error : Option< String> ,
503
) -> Result< Page< ProposalPage> , Error> {
504
let ( repo, row, role) = lookup ( app, & shell, viewer, owner, name) .await? ;
505
let p = pdb:: get( & app.db, row.id, number)
506
.await
507
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
508
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
509
let loaded = load ( app, & repo, p) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
510
511
if loaded.landed_already & & loaded.row.is_open ( ) {
512
pdb:: set_state( & app.db, loaded.row.id, " landed" , & loaded.target_state) .await.ok ( ) ;
513
pdb:: add_event( & app.db, loaded.row.id, " " , " landed" , " every change reached the target" ) .await.ok ( ) ;
514
}
515
let p = pdb:: get( & app.db, row.id, number) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? .unwrap_or ( loaded.row.clone ( ) ) ;
516
let v = verdict ( app, & loaded, row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
517
let comment_rows = pdb:: comments( & app.db, loaded.row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
518
let events = pdb:: events( & app.db, loaded.row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
519
520
let mut by_atom: HashMap< ( String, String, u32 ) , usize > = HashMap:: new( ) ;
521
for ( ( path, line) , ( h, i) ) in & loaded.atoms {
522
by_atom.insert ( ( path.clone ( ) , h.clone ( ) , * i) , * line) ;
523
}
524
let mut comments = Vec :: new( ) ;
525
let mut placed: HashMap< ( String, usize ) , Vec< usize > > = HashMap:: new( ) ;
526
let mut outdated = Vec :: new( ) ;
527
for ( idx, c) in comment_rows.into_iter ( ) .enumerate ( ) {
528
let line = if c.anchor_change.is_empty ( ) {
529
None
530
} else {
531
by_atom.get ( & ( c.path.clone ( ) , c.anchor_change.clone ( ) , c.anchor_index as u32 ) ) .copied ( )
532
} ;
533
if ! c.anchor_change.is_empty ( ) {
534
match line {
535
Some ( l) => placed.entry ( ( c.path.clone ( ) , l) ) .or_default ( ) .push ( idx) ,
536
None => outdated.push ( idx) ,
537
}
538
}
539
comments.push ( CommentView { body_html: render:: markdown:: render( & c.body, " /" , " /" ) , row: c, line } ) ;
540
}
541
let mut changes = loaded.changes.clone ( ) ;
542
super :: attribute( app, & mut changes.iter_mut ( ) .collect:: < Vec< _ > > ( ) ) .await;
543
let me = viewer.account ( ) ;
544
let can_edit = me.is_some_and ( | a | Some ( a.id) = = p.author_id | | role > = Role:: Maintain) ;
545
let can_land = role > = Role:: Write & & p.is_open ( ) & & v.blockers.is_empty ( ) ;
14530604 Andy McCall 1 month ago ↶
546
let delegated = match viewer.account ( ) {
547
Some ( a) => super :: edit:: delegated_identity( app, a.id) .await.is_some ( ) ,
548
None => false ,
549
} ;
550
let hub_can_land = delegated | | app.repos.read ( & repo, | r , _| Ok ( r.current_policy ( ) ? .is_none ( ) ) ) .await.unwrap_or ( false ) ;
de505df5 Andy McCall 1 month ago ↶
551
let source_label = match p.source_kind.as_str ( ) {
552
" fork" => format! (
553
" fork {} " ,
554
db:: repos:: get_by_id( & app.db, p.source_repo_id.unwrap_or ( 0 ) )
555
.await
556
.ok ( )
557
.flatten ( )
558
.map ( | r | format! ( " {} :{} " , r.slug ( ) , p.source_bookmark) )
559
.unwrap_or_default ( )
560
) ,
561
" changes" => format! ( " {} changes" , p.source_changes ( ) .len ( ) ) ,
562
_ => p.source_bookmark.clone ( ) ,
563
} ;
564
Ok ( Page( ProposalPage {
565
shell,
566
repo: RepoShell:: new( app, & row, " proposals" ) .with_role ( role) ,
18e381ea Andy McCall 1 month ago ↶
567
body_html: super :: issues:: markdown( app, row.id, & format! ( " /{owner} /{name} " ) , & p.body) .await,
de505df5 Andy McCall 1 month ago ↶
568
p,
569
tab,
570
changes,
571
files: loaded.files,
572
conflicts: loaded.conflicts,
573
conflicted: loaded.conflicted,
574
comments,
575
placed,
576
outdated,
577
reviews: v.reviews,
578
approvals: v.approvals,
579
blockers: v.blockers,
580
depends_on: v.depends_on,
581
events,
582
owners: loaded.owners,
583
requirements: v.requirements,
584
landed_already: loaded.landed_already,
585
can_edit,
586
can_land,
587
hub_can_land,
588
notice,
589
error,
590
heads: loaded.heads.iter ( ) .map ( | h | h.to_hex ( ) ) .collect ( ) ,
591
state_hash: loaded.state,
592
source_label,
593
api_url: format! ( " {} /api/v1/repos/{owner} /{name} /proposals/{number} " , app.config.base_url ( ) ) ,
18e381ea Andy McCall 1 month ago ↶
594
labels: db:: issues:: proposal_labels( & app.db, loaded.row.id) .await.unwrap_or_default ( ) ,
595
all_labels: db:: issues:: labels( & app.db, row.id) .await.unwrap_or_default ( ) ,
de505df5 Andy McCall 1 month ago ↶
596
} ) )
597
}
598
599
pub async fn show (
600
State( app ) : State< Shared> ,
601
viewer : Viewer,
602
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
603
Query( q) : Query< DetailQuery> ,
604
) -> Result< Page< ProposalPage> , Error> {
605
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
606
detail ( & app, shell, & viewer, & owner, & name, number, q.tab.unwrap_or_else ( | | " conversation" .into ( ) ) , None , None ) .await
607
}
608
609
610
611
# [ derive ( Deserialize ) ]
612
pub struct CommentForm {
613
#[serde(rename = "_csrf")]
614
csrf_token : String,
615
body : String,
616
#[serde(default)]
617
path : String,
618
#[serde(default)]
619
line : Option< usize > ,
620
}
621
622
pub async fn comment (
623
State( app ) : State< Shared> ,
624
viewer : Viewer,
625
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
626
Form( f) : Form< CommentForm> ,
627
) -> Result< Page< ProposalPage> , Error> {
628
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
629
let me = require ( & viewer, & shell) ? ;
630
csrf ( & viewer, & f.csrf_token, & shell) ? ;
631
let ( repo, row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
632
let p = pdb:: get( & app.db, row.id, number)
633
.await
634
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
635
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
636
if f.body.trim ( ) .is_empty ( ) {
637
return detail (
638
& app,
639
shell,
640
& viewer,
641
& owner,
642
& name,
643
number,
644
" conversation" .into ( ) ,
645
None ,
646
Some ( " An empty comment says nothing." .into ( ) ) ,
647
)
648
.await;
649
}
650
let anchor = match ( f.path.trim ( ) , f.line) {
651
( " " , _ ) | ( _ , None ) => None ,
652
( path, Some ( line) ) => {
653
let loaded = load ( & app, & repo, p.clone ( ) ) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
654
loaded.atoms.get ( & ( path.to_string ( ) , line) ) .cloned ( )
655
}
656
} ;
657
let tab = if anchor.is_some ( ) { " files" } else { " conversation" } ;
658
pdb:: add_comment(
659
& app.db,
660
p.id,
661
Some ( me.account.id) ,
662
& me.account.username,
663
f.body.trim ( ) ,
664
f.path.trim ( ) ,
665
anchor.as_ref ( ) .map ( | ( h , i ) | ( h.as_str ( ) , * i as i64 ) ) ,
666
)
667
.await
668
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
669
detail ( & app, shell, & viewer, & owner, & name, number, tab.into ( ) , None , None ) .await
670
}
671
672
# [ derive ( Deserialize ) ]
673
pub struct ReviewForm {
674
#[serde(rename = "_csrf")]
675
csrf_token : String,
676
verdict : String,
677
#[serde(default)]
678
body : String,
679
}
680
681
pub async fn review (
682
State( app ) : State< Shared> ,
683
viewer : Viewer,
684
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
685
Form( f) : Form< ReviewForm> ,
686
) -> Result< Page< ProposalPage> , Error> {
687
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
688
let me = require ( & viewer, & shell) ? ;
689
csrf ( & viewer, & f.csrf_token, & shell) ? ;
690
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
691
let p = pdb:: get( & app.db, row.id, number)
692
.await
693
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
694
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
695
if ! matches! ( f.verdict.as_str ( ) , " comment" | " changes" | " approve" ) {
696
return Err ( Error:: bad( shell, " a review is comment, changes or approve" ) ) ;
697
}
698
if f.verdict = = " approve" & & Some ( me.account.id) = = p.author_id {
699
return detail (
700
& app,
701
shell,
702
& viewer,
703
& owner,
704
& name,
705
number,
706
" conversation" .into ( ) ,
707
None ,
708
Some ( " You cannot approve your own proposal." .into ( ) ) ,
709
)
710
.await;
711
}
712
pdb:: add_review( & app.db, p.id, me.account.id, & me.account.username, & f.verdict, f.body.trim ( ) )
713
.await
714
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
715
pdb:: add_event( & app.db, p.id, & me.account.username, & format! ( " review.{} " , f.verdict) , " " ) .await.ok ( ) ;
716
let notice = if f.verdict = = " approve" {
717
Some ( format! (
718
" Approval recorded. It counts once you seal the changes: oxy seal --proposal {} /{owner} /{name} /proposal/{number} " ,
719
app.config.base_url ( )
720
) )
721
} else {
722
None
723
} ;
724
detail ( & app, shell, & viewer, & owner, & name, number, " conversation" .into ( ) , notice, None ) .await
725
}
726
727
# [ derive ( Deserialize ) ]
728
pub struct EditForm {
729
#[serde(rename = "_csrf")]
730
csrf_token : String,
731
title : String,
732
#[serde(default)]
733
body : String,
734
target : String,
735
}
736
737
pub async fn edit (
738
State( app ) : State< Shared> ,
739
viewer : Viewer,
740
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
741
Form( f) : Form< EditForm> ,
742
) -> Result< Page< ProposalPage> , Error> {
743
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
744
let me = require ( & viewer, & shell) ? ;
745
csrf ( & viewer, & f.csrf_token, & shell) ? ;
746
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
747
let p = pdb:: get( & app.db, row.id, number)
748
.await
749
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
750
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
751
if Some ( me.account.id) ! = p.author_id & & role < Role:: Maintain {
752
return Err ( Error:: not_found( shell) ) ;
753
}
754
let target = if crate :: repos:: names:: valid_segment( f.target.trim ( ) ) { f.target.trim ( ) } else { & p.target } ;
755
pdb:: edit( & app.db, p.id, f.title.trim ( ) , f.body.trim ( ) , target) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
756
pdb:: add_event( & app.db, p.id, & me.account.username, " edited" , " " ) .await.ok ( ) ;
757
detail ( & app, shell, & viewer, & owner, & name, number, " conversation" .into ( ) , Some ( " Saved." .into ( ) ) , None ) .await
758
}
759
760
# [ derive ( Deserialize ) ]
761
pub struct StateForm {
762
#[serde(rename = "_csrf")]
763
csrf_token : String,
764
action : String,
765
}
766
767
pub async fn state (
768
State( app ) : State< Shared> ,
769
viewer : Viewer,
770
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
771
Form( f) : Form< StateForm> ,
772
) -> Result< Page< ProposalPage> , Error> {
773
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
774
let me = require ( & viewer, & shell) ? ;
775
csrf ( & viewer, & f.csrf_token, & shell) ? ;
776
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
777
let p = pdb:: get( & app.db, row.id, number)
778
.await
779
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
780
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
781
if Some ( me.account.id) ! = p.author_id & & role < Role:: Triage {
782
return Err ( Error:: not_found( shell) ) ;
783
}
784
let new_state = match ( f.action.as_str ( ) , p.state.as_str ( ) ) {
785
( " close" , " open" | " draft" ) => " closed" ,
786
( " reopen" , " closed" ) => " open" ,
787
( " ready" , " draft" ) => " open" ,
788
( " draft" , " open" ) => " draft" ,
789
_ => return Err ( Error:: bad( shell, " that transition is not possible" ) ) ,
790
} ;
791
pdb:: set_state( & app.db, p.id, new_state, " " ) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
792
pdb:: add_event( & app.db, p.id, & me.account.username, new_state, " " ) .await.ok ( ) ;
793
detail ( & app, shell, & viewer, & owner, & name, number, " conversation" .into ( ) , None , None ) .await
794
}
795
796
pub async fn resolve_comment (
797
State( app ) : State< Shared> ,
798
viewer : Viewer,
799
Path( (owner , name , number , id ) ) : Path< ( String, String, i64 , i64 ) > ,
800
Form( f) : Form< super:: session:: CsrfForm> ,
801
) -> Result< Page< ProposalPage> , Error> {
802
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
803
require ( & viewer, & shell) ? ;
804
csrf ( & viewer, & f.csrf, & shell) ? ;
805
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
806
let p = pdb:: get( & app.db, row.id, number)
807
.await
808
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
809
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
810
let current: Option< bool > = sqlx:: query_scalar( " SELECT resolved FROM proposal_comments WHERE id = ? AND proposal_id = ?" )
811
.bind ( id)
812
.bind ( p.id)
813
.fetch_optional ( & app.db)
814
.await
815
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
816
if let Some ( r) = current {
817
pdb:: set_comment_resolved( & app.db, id, ! r) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
818
}
819
detail ( & app, shell, & viewer, & owner, & name, number, " files" .into ( ) , None , None ) .await
820
}
821
822
823
824
pub async fn land (
825
State( app ) : State< Shared> ,
826
viewer : Viewer,
827
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
828
Form( f) : Form< super:: session:: CsrfForm> ,
829
) -> Result< Page< ProposalPage> , Error> {
830
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
831
let me = require ( & viewer, & shell) ? ;
832
csrf ( & viewer, & f.csrf, & shell) ? ;
833
let ( repo, row, _ ) = lookup_role ( & app, & shell, & viewer, & owner, & name, Access:: Write) .await? ;
834
let p = pdb:: get( & app.db, row.id, number)
835
.await
836
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
837
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
838
let loaded = load ( & app, & repo, p.clone ( ) ) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
839
let v = verdict ( & app, & loaded, row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
840
if ! p.is_open ( ) | | ! v.blockers.is_empty ( ) {
841
return detail (
842
& app,
843
shell,
844
& viewer,
845
& owner,
846
& name,
847
number,
848
" conversation" .into ( ) ,
849
None ,
850
Some ( format! ( " Cannot land: {} " , v.blockers.join ( " ; " ) ) ) ,
851
)
852
.await;
853
}
854
let target = p.target.clone ( ) ;
855
let heads = loaded.heads.clone ( ) ;
14530604 Andy McCall 1 month ago ↶
856
857
858
859
860
let result = match super :: edit:: signer_for( & app, me.account.id) .await {
861
Ok ( signer) => crate :: repos:: edits:: move_bookmark( & app.repos, & repo, target.clone ( ) , heads.clone ( ) , signer) .await.map ( | _| pl:: state_ref( & heads) .to_hex ( ) ) ,
862
Err ( why) => {
863
app.repos
864
.write ( & repo, move | r, _ | {
865
if r.current_policy ( ) ? .is_some ( ) {
866
return Err ( crate :: repos:: RepoError:: Oxy( oxy_core:: repo:: RepoError:: Msg( format! (
867
" this repository has a trust policy, so the landing must be signed by a key it authorises. Land from a client with oxy proposal land, or delegate to the hub. {why} "
868
) ) ) ) ;
869
}
870
r.bookmark_set ( & target, & heads) ? ;
871
Ok ( pl:: state_ref( & heads) .to_hex ( ) )
872
} )
873
.await
874
}
875
} ;
de505df5 Andy McCall 1 month ago ↶
876
match result {
877
Ok ( state) => {
878
pdb:: set_state( & app.db, p.id, " landed" , & state) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
879
pdb:: add_event( & app.db, p.id, & me.account.username, " landed" , " from the hub" ) .await.ok ( ) ;
18e381ea Andy McCall 1 month ago ↶
880
crate :: notify:: deliver(
881
& app,
882
crate :: notify:: Event {
883
kind: " proposal.landed" ,
884
title: format! ( " {owner} /{name} #{number} : {} landed" , p.title) ,
885
url: format! ( " /{owner} /{name} /proposal/{number} " ) ,
886
actor: & me.account,
887
repo_id: row.id,
888
thread: Some ( ( " proposal" , p.id) ) ,
889
mention_text: " " ,
890
direct: p.author_id.into_iter ( ) .collect ( ) ,
891
} ,
892
)
893
.await;
894
if p.target = = row.default_bookmark {
895
let messages: Vec< ( String, String) > =
896
loaded.changes.iter ( ) .map ( | c | ( c.hash.clone ( ) , format! ( " {} \n {} " , c.title, c.body) ) ) .collect ( ) ;
897
super :: issues:: close_from_messages( & app, & row, & messages) .await;
898
}
de505df5 Andy McCall 1 month ago ↶
899
accounts:: audit( & app.db, Some ( & me.account) , " proposal.landed" , & format! ( " {owner} /{name} #{number} " ) , " " ) .await.ok ( ) ;
900
db:: repos:: record_push(
901
& app.db,
902
row.id,
903
Some ( ( me.account.id, me.account.username.as_str ( ) ) ) ,
904
& [ db:: repos:: PushOutcome {
905
reference: p.target.clone ( ) ,
906
ok: true ,
907
reason: format! ( " landed #{number} " ) ,
908
old_state: loaded.target_state.clone ( ) ,
909
new_state: state,
910
heads: loaded.heads.len ( ) as i64 ,
911
changes: loaded.hashes.len ( ) as i64 ,
912
} ] ,
913
)
914
.await
915
.ok ( ) ;
916
detail ( & app, shell, & viewer, & owner, & name, number, " conversation" .into ( ) , Some ( " Landed." .into ( ) ) , None ) .await
917
}
918
Err ( e) => detail ( & app, shell, & viewer, & owner, & name, number, " conversation" .into ( ) , None , Some ( e.to_string ( ) ) ) .await,
919
}
920
}
921
18e381ea Andy McCall 1 month ago ↶
922
# [ derive ( Deserialize ) ]
923
pub struct LabelsForm {
924
#[serde(rename = "_csrf")]
925
csrf_token : String,
926
#[serde(default)]
927
label : Vec< i64 > ,
928
}
929
930
pub async fn set_labels (
931
State( app ) : State< Shared> ,
932
viewer : Viewer,
933
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
934
axum_extra:: extract:: Form( f) : axum_extra:: extract:: Form< LabelsForm> ,
935
) -> Result< Page< ProposalPage> , Error> {
936
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
937
require ( & viewer, & shell) ? ;
938
csrf ( & viewer, & f.csrf_token, & shell) ? ;
939
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
940
if role < Role:: Triage {
941
return Err ( Error:: not_found( shell) ) ;
942
}
943
let p = pdb:: get( & app.db, row.id, number)
944
.await
945
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
946
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
947
for l in db:: issues:: labels( & app.db, row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? {
948
db:: issues:: set_proposal_label( & app.db, p.id, l.id, f.label.contains ( & l.id) ) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
949
}
950
detail ( & app, shell, & viewer, & owner, & name, number, " conversation" .into ( ) , None , None ) .await
951
}
952
de505df5 Andy McCall 1 month ago ↶
953
954
955
pub async fn to_api ( app : & Shared, owner : & str , name : & str , loaded : & Loaded, v : & Verdict, source_url : Option< String> ) -> hub_api:: Proposal {
956
let p = & loaded.row;
957
hub_api:: Proposal {
958
number: p.number,
959
title: p.title.clone ( ) ,
960
body: p.body.clone ( ) ,
961
author: p.author.clone ( ) ,
962
state: ProposalState:: parse( & p.state) .unwrap_or ( ProposalState:: Open) ,
963
target: p.target.clone ( ) ,
964
source: match p.source_kind.as_str ( ) {
965
" fork" => {
966
let ( o, n) = source_url
967
.as_deref ( )
968
.and_then ( | u | u.rsplit_once ( ' /' ) )
969
.and_then ( | ( b , n ) | b.rsplit_once ( ' /' ) .map ( | ( _, o ) | ( o.to_string ( ) , n.to_string ( ) ) ) )
970
.unwrap_or_default ( ) ;
971
ProposalSource:: Fork { owner: o, name: n, bookmark: p.source_bookmark.clone ( ) }
972
}
973
" changes" => ProposalSource:: Changes { hashes: p.source_changes ( ) } ,
974
_ => ProposalSource:: Bookmark { bookmark: p.source_bookmark.clone ( ) } ,
975
} ,
976
changes: loaded
977
.changes
978
.iter ( )
979
.map ( | c | hub_api:: ChangeSummary {
980
hash: c.hash.clone ( ) ,
981
message: if c.body.is_empty ( ) { c.title.clone ( ) } else { format! ( " {} \n \n {} " , c.title, c.body) } ,
982
author: hub_api:: Author {
983
name: c.author.name.clone ( ) ,
984
email: c.author.email.clone ( ) ,
985
key: c.author.key.clone ( ) ,
986
account: c.author.account.clone ( ) ,
987
} ,
988
when_ms: c.when_ms,
989
deps: c.deps.clone ( ) ,
990
head: c.head,
991
signature: match & c.signature {
992
view:: SigView:: Unsigned => hub_api:: Signature:: Unsigned,
993
view:: SigView:: Valid { key, sealed, revoked, .. } => {
994
hub_api:: Signature:: Valid { key: key.clone ( ) , sealed: * sealed, revoked: * revoked }
995
}
996
view:: SigView:: Invalid( why) => hub_api:: Signature:: Invalid { reason: why.clone ( ) } ,
997
} ,
998
} )
999
.collect ( ) ,
1000
projected_heads: loaded.heads.iter ( ) .map ( | h | h.to_hex ( ) ) .collect ( ) ,
1001
projected_state: Some ( loaded.state.clone ( ) ) ,
1002
conflicted: loaded.conflicted,
1003
approvals: v.approvals.clone ( ) ,
1004
landable: p.is_open ( ) & & v.blockers.is_empty ( ) ,
1005
blockers: v.blockers.clone ( ) ,
1006
created_ms: p.created_ms,
1007
updated_ms: p.updated_ms,
1008
url: format! ( " {} /{owner} /{name} /proposal/{} " , app.config.base_url ( ) , p.number) ,
1009
repository_url: format! ( " {} /{owner} /{name} " , app.config.base_url ( ) ) ,
1010
source_url,
1011
}
1012
}
1013
1014
1015
pub fn key ( path : & str , line : impl filters:: Num) -> ( String, usize ) {
1016
( path.to_string ( ) , line.as_u64 ( ) as usize )
1017
}
1018
1019
# [ allow ( dead_code ) ]
1020
fn _unused ( _ : & diff:: Line, _ : & ConflictView, _ : & Role) { }