╭─────────────╮ │scroll to top│ ╰─────────────╯ ╭ try.zig ──────────────────────────────────────────────────────╮ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ╰───────────────────────────────────────────────────────────────╯
╭────╮ ╭ clone ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─╮ │http│ ssh │ │ ╰────╯ ╰ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─╯
1264 .behind_master = true, 1265 }, 1266 .{ 1267 .title = "Cache parsed manifests between commands", 1268 .description = "Keep parsed manifests in the command `Context` so consecutive operations do not repeat identical filesystem and parsing work.", 1269 .labels = "performance cache", 1270 .status = .closed, 1271 }, 1272 .{ 1273 .title = "Add structured output to the inspect command", 1274 .description = "Add a stable JSON representation of `inspect` results for scripts and editor integrations.", 1275 .labels = "enhancement cli", 1276 .status = .open, 1277 .removed_path = "docs/dev/contribute.md", 1278 }, 1279 .{ 1280 .title = "Edit an adjacent line in alpha.txt", 1281 .description = "This patch can be cleanly merged by haxy, while git throws a **merge conflict**!", 1282 .labels = "merge", 1283 .status = .open, 1284 .alpha_edit = .{ .line = 2, .text = "adjust alpha beside the latest scatter edit" }, 1285 }, 1286 .{ 1287 .title = "Edit a conflicting line in alpha.txt", 1288 .description = "Both source and squash merges conflict with a different edit to the *same line* on master.", 1289 .labels = "merge", 1290 .status = .open, 1291 .alpha_edit = .{ .line = 3, .text = "replace alpha with a conflicting edit" }, 1292 }, 1293 }; 1294 1295 const users_dir = try std.Io.Dir.path.join(allocator, &.{ server_path, "users" }); 1296 defer allocator.free(users_dir); 1297 const patch_author = evt.CommitAuthor{ .name = "admin", .email = "admin@example.test" }; 1298 var patch_ids: [patch_data.len][evt.event_id_size]u8 = undefined; 1299 for (patch_data, 0..) |patch, i| { 1300 const timestamp = seedTimestamp(now, i, patch_data.len, 25 * std.time.s_per_day, 3 * std.time.s_per_hour); 1301 patch_ids[i] = evt.EventWithId.randomId(random); 1302 const patch_hex = std.fmt.bytesToHex(patch_ids[i], .lower); 1303 const path = try fork.create(.{}, io, allocator, users_dir, .{ 1304 .id = patch_hex, 1305 .user_id = user_id.*, 1306 .repo_id = repo_id.*, 1307 .repo_user_id = repo_user_id.*, 1308 .title = patch.title, 1309 .description = patch.description, 1310 .labels = patch.labels, 1311 .target_branch = "master", 1312 .author = patch_author, 1313 .timestamp = timestamp, 1314 }); 1315 allocator.free(path); 1316 1317 // prepare the patch's base and file contents, then seed its commits and revision 1318 { 1319 var arena = std.heap.ArenaAllocator.init(allocator); 1320 defer arena.deinit(); 1321 const aa = arena.allocator(); 1322 var base_oid = (try target_repo.readRef(io, .{ .kind = .head, .name = "master" })) orelse return error.NotFound; 1323 if (patch.alpha_edit != null or patch.behind_master) { 1324 // v30 precedes the last scatter commit, even after the sample merge 1325 const tag_oid = (try target_repo.readRef(io, .{ .kind = .tag, .name = "v30" })) orelse return error.NotFound; 1326 var moment = try target_repo.core.latestMoment(); 1327 const state = rp.Repo(.xit, .{}).State(.read_only){ .core = &target_repo.core, .extra = .{ .moment = &moment } }; 1328 var tag = try obj.Object(.xit, .{}).init(state, io, allocator, &tag_oid); 1329 defer tag.deinit(); 1330 base_oid = switch (tag.content) { 1331 .tag => |value| value.target, 1332 else => return error.InvalidObject, 1333 }; 1334 } 1335 var contents: [3][]const u8 = undefined; 1336 const file_path: []const u8, const count: usize = if (patch.alpha_edit) |edit| blk: { 1337 // rev 29 first changes line 4; edit that line or the one above it 1338 contents[0] = try scatterContent(aa, 0, 28, edit); 1339 break :blk .{ "src/alpha.txt", 1 }; 1340 } else blk: { 1341 var writer = std.Io.Writer.Allocating.init(allocator); 1342 defer writer.deinit(); 1343 for (&contents, 0..) |*content, part| { 1344 try writer.writer.print("{s}: part {d}\n", .{ patch.title, part + 1 }); 1345 content.* = try aa.dupe(u8, writer.written()); 1346 } 1347 break :blk .{ "patch.txt", contents.len }; 1348 }; 1349 try seedPatchRevision(io, allocator, users_dir, user_id, &patch_ids[i], patch.title, patch_author, timestamp + 1, random, base_oid, file_path, contents[0..count], patch.removed_path); 1350 } 1351 const status = patch.status orelse continue; 1352 try pch.publish(.{}, io, allocator, .{ .users_dir = users_dir }, admin_repo, target_repo, .{ 1353 .id = patch_hex, 1354 .user_id = user_id.*, 1355 .repo_id = repo_id.*, 1356 .author = patch_author, 1357 .timestamp = timestamp + 6, 1358 }); 1359 1360 if (status == .merged) { 1361 try pch.mergeAndRemoveFork(.{}, io, allocator, .{ .users_dir = users_dir }, target_repo, .{ 1362 .id = patch_hex, 1363 .revision = .source, 1364 .author = patch_author, 1365 .timestamp = timestamp + 7, 1366 }); 1367 } else if (status != .open) { 1368 try evt.Patch.update(.{ .server = .{ .users_dir = users_dir } }, .xit, .{}, io, allocator, target_repo, &patch_ids[i], .{ .status = status }, patch_author); 1369 } 1370 } 1371 1372 // seed a small comment tree on the newest patch 1373 var comment_ids: [5][evt.event_id_size]u8 = undefined; 1374 for (&comment_ids) |*id| id.* = evt.EventWithId.randomId(random); 1375 const comment_bodies = [_][]const u8{ 1376 "This also needs to preserve the **executable bit** for files nested inside generated directories.", 1377 "I tested both paths:\n\n- the archive path\n- the direct-copy path\n\nBoth currently lose the mode.", 1378 "The `ArchiveWriter` is the right place to centralize it, since every exporter already goes through that layer.", 1379 "Please include a regression fixture with a *mix* of executable and ordinary files.", 1380 "I'll add that fixture and cover both supported archive formats:\n\n1. tar\n2. zip", 1381 }; 1382 var comments: [comment_ids.len]evt.EventWithId = undefined; 1383 for (&comments, 0..) |*comment, i| { 1384 comment.* = .{ 1385 .id = std.fmt.bytesToHex(comment_ids[i], .lower), 1386 .timestamp = seedTimestamp(now, i, comments.len, 2 * std.time.s_per_hour, 45), 1387 .author = .{ .name = if (i % 2 == 0) "alice" else "bobby", .email = if (i % 2 == 0) "alice@example.test" else "bobby@example.test" }, 1388 .event = .{ .comment = .{ 1389 .thread_id = std.fmt.bytesToHex(patch_ids[patch_ids.len - 1], .lower), 1390 .parent_id = switch (i) { 1391 0, 1 => std.fmt.bytesToHex(patch_ids[patch_ids.len - 1], .lower), 1392 2, 4 => std.fmt.bytesToHex(comment_ids[0], .lower), 1393 3 => std.fmt.bytesToHex(comment_ids[2], .lower), 1394 else => unreachable, 1395 }, 1396 .body = comment_bodies[i], 1397 } }, 1398 }; 1399 } 1400 try evt.consume(.{ .server = .{ .users_dir = users_dir } }, .repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &comments); 1401 1402 // create divergent metadata edits on the next three patches 1403 var patch_arena = std.heap.ArenaAllocator.init(allocator); 1404 defer patch_arena.deinit(); 1405 const moment = try evt.currentMoment(.{}, target_repo); 1406 var values: [3]evt.Patch = undefined; 1407 for (1..4) |i| { 1408 const record = (try evt.Patch.readById(evt.EventDB(.sha1), .sha1, moment, &patch_arena, &patch_ids[i])) orelse return error.NotFound; 1409 values[i - 1] = record.event; 1410 } 1411 var ours_values = values; 1412 ours_values[0].title = "Drop the legacy configuration loader"; 1413 ours_values[0].labels = "cleanup config breaking"; 1414 const closed_description = try longDescription( 1415 patch_arena.allocator(), 1416 "## Summary\n\nCache parsed manifests for the lifetime of a command invocation and invalidate entries when their files change.", 1417 ); 1418 ours_values[1].description = closed_description; 1419 ours_values[2].description = "Add JSON output to `inspect` with versioned field names and deterministic object ordering."; 1420 var theirs_values = values; 1421 theirs_values[0].title = "Delete compatibility configuration support"; 1422 theirs_values[0].labels = "config maintenance"; 1423 theirs_values[1].description = "Keep a process-wide manifest cache shared by **every** command and refresh it after writes."; 1424 theirs_values[2].description = "Expose `inspect` results as newline-delimited JSON so callers can stream large repositories."; 1425 1426 const seed_tip = (try target_repo.readRef(io, evt.events_ref)) orelse return error.NotFound; 1427 const other_ref = xit.ref.Ref{ .kind = .head, .name = "haxy/patch-other" }; 1428 var ours = [_]evt.EventWithId{ 1429 .{ 1430 .id = std.fmt.bytesToHex(patch_ids[1], .lower), 1431 .timestamp = now - 30 * std.time.s_per_min, 1432 .author = .{ .name = "alice", .email = "alice@example.test" }, 1433 .event = .{ .patch = ours_values[0] }, 1434 }, 1435 .{ 1436 .id = std.fmt.bytesToHex(patch_ids[2], .lower), 1437 .timestamp = now - 29 * std.time.s_per_min, 1438 .author = .{ .name = "alice", .email = "alice@example.test" }, 1439 .event = .{ .patch = ours_values[1] }, 1440 }, 1441 .{ 1442 .id = std.fmt.bytesToHex(patch_ids[3], .lower), 1443 .timestamp = now - 28 * std.time.s_per_min, 1444 .author = .{ .name = "alice", .email = "alice@example.test" }, 1445 .event = .{ .patch = ours_values[2] }, 1446 }, 1447 }; 1448 1449 var theirs = ours; 1450 theirs[0].timestamp = now - 25 * std.time.s_per_min; 1451 theirs[0].author = .{ .name = "bobby", .email = "bobby@example.test" }; 1452 theirs[0].event.patch = theirs_values[0]; 1453 theirs[1].timestamp = now - 24 * std.time.s_per_min; 1454 theirs[1].author = .{ .name = "bobby", .email = "bobby@example.test" }; 1455 theirs[1].event.patch = theirs_values[1]; 1456 theirs[2].timestamp = now - 23 * std.time.s_per_min; 1457 theirs[2].author = .{ .name = "bobby", .email = "bobby@example.test" }; 1458 theirs[2].event.patch = theirs_values[2]; 1459 1460 try evt.consume(.{ .server = .{ .users_dir = users_dir } }, .repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &ours); 1461 try commitEventsAtRef(io, allocator, target_repo, other_ref, &theirs, seed_tip); 1462 { 1463 var merge = try target_repo.mergeAtRef(io, allocator, .{ .kind = .full, .action = .{ .new = .{ .source = &.{.{ .ref = other_ref }} } } }, evt.events_ref, null); 1464 defer merge.deinit(); 1465 if (merge.result != .success) return error.MergeFailed; 1466 } 1467 try target_repo.removeBranch(io, .{ .name = other_ref.name }); 1468 try evt.consume(.{ .server = .{ .users_dir = users_dir } }, .repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &.{}); 1469 try pch.writeBranchPatch(.{ .server = .{ .users_dir = users_dir } }, .xit, .{}, io, allocator, target_repo, std.fmt.bytesToHex(evt.EventWithId.randomId(random), .lower), .{ 1470 .title = "Merge the existing feature branch", 1471 .description = "This patch tracks the `feature` branch in this repo without creating a fork.", 1472 .labels = "feature", 1473 .source_branch = "feature", 1474 .target_branch = "master", 1475 }, null, patch_author); 1476 1477 // a push onto the branch that patch tracks, so the undo tab shows the 1478 // action and the patch refresh it sets off 1479 try seedPush(io, allocator, target_repo, users_dir, patch_author, now - 15); 1480 try pch.refreshBranches(.{ .server = .{ .users_dir = users_dir } }, .xit, .{}, io, allocator, target_repo, null, null); 1481 return patch_ids[patch_ids.len - 1]; 1482 } 1483 1484 // stand in for a client push, which the fixture has no server to receive: one 1485 // transaction moves the branch, refreshes the patches tracking it and records 1486 // the action, the way receive-pack does 1487 fn seedPush(io: std.Io, allocator: std.mem.Allocator, repo: *rp.Repo(.xit, .{}), users_dir: []const u8, author: evt.CommitAuthor, timestamp: u64) !void { 1488 const Repo = rp.Repo(.xit, .{}); 1489 const DB = Repo.DB; 1490 const Ctx = struct { 1491 core: *Repo.Core, 1492 io: std.Io, 1493 allocator: std.mem.Allocator, 1494 users_dir: []const u8, 1495 author: evt.CommitAuthor, 1496 timestamp: u64, 1497 1498 pub fn run(ctx: @This(), cursor: *DB.Cursor(.read_write)) !void { 1499 const opts: rp.RepoOpts(.xit) = .{}; 1500 var moment = try DB.HashMap(.read_write).init(cursor.*); 1501 const state = Repo.State(.read_write){ .core = ctx.core, .extra = .{ .moment = &moment } }; 1502 var arena = std.heap.ArenaAllocator.init(ctx.allocator); 1503 defer arena.deinit(); 1504 const aa = arena.allocator(); 1505 1506 // a null tree keeps the parent's content, so the branch advances 1507 // without the fixture having to build one 1508 const author_line = try aa.print("{s} <{s}>", .{ ctx.author.name, ctx.author.email }); 1509 const feature_old = (try rf.readRecur(.xit, opts, state.readOnly(), ctx.io, .{ .ref = .{ .kind = .head, .name = "feature" } })) orelse return error.NotFound; 1510 const feature_new = try obj.writeCommit(.xit, opts, state, ctx.io, ctx.allocator, .{ 1511 .message = "Revise the feature branch", 1512 .author = author_line, 1513 .timestamp = ctx.timestamp, 1514 }, null, .{ .kind = .head, .name = "feature" }); 1515 1516 // a branch the push creates has no old tip, so its range is open 1517 try bch.add(.xit, opts, state, ctx.io, .{ .name = "docs" }); 1518 const docs_new = (try rf.readRecur(.xit, opts, state.readOnly(), ctx.io, .{ .ref = .{ .kind = .head, .name = "docs" } })) orelse return error.NotFound; 1519 1520 const updates = [_]xit.net_server_receive_pack.AppliedRefUpdate{ 1521 .{ 1522 .ref_name = try aa.dupe(u8, "refs/heads/feature"), 1523 .old_oid = try aa.dupe(u8, &feature_old), 1524 .new_oid = try aa.dupe(u8, &feature_new), 1525 }, 1526 .{ 1527 .ref_name = try aa.dupe(u8, "refs/heads/docs"), 1528 .old_oid = try aa.dupe(u8, &@as([hash.hexLen(opts.hash)]u8, @splat('0'))), 1529 .new_oid = try aa.dupe(u8, &docs_new), 1530 }, 1531 }; 1532 1533 // receive-pack patches the new tips before the branches refresh 1534 try xit.patch.writePatches(opts, state, ctx.io, ctx.allocator, &.{ feature_new, docs_new }, null); 1535 _ = try pch.refreshBranchesInTransaction(.{ .server = .{ .users_dir = ctx.users_dir } }, opts, state, &moment, ctx.io, ctx.allocator, &updates, null, null); 1536 try push.writeUndo(opts, state, ctx.io, ctx.allocator, ctx.author, &updates); 1537 } 1538 }; 1539 1540 try transaction(io, repo, Ctx{ .core = &repo.core, .io = io, .allocator = allocator, .users_dir = users_dir, .author = author, .timestamp = timestamp }); 1541 } 1542 1543 // commit `events` onto `ref`, rooted at `parent`, as one transaction. 1544 // consume always roots a new branch at nothing, so the divergent fixtures 1545 // write their side branch here instead. nothing is consumed, so it records 1546 // xit's own commit action rather than one of haxy's event actions 1547 fn commitEventsAtRef( 1548 io: std.Io, 1549 allocator: std.mem.Allocator, 1550 repo: *rp.Repo(.xit, .{}), 1551 ref: xit.ref.Ref, 1552 events: []const evt.EventWithId, 1553 parent: [hash.hexLen(.sha1)]u8, 1554 ) !void { 1555 const Repo = rp.Repo(.xit, .{}); 1556 const DB = Repo.DB; 1557 const Ctx = struct { 1558 core: *Repo.Core, 1559 io: std.Io, 1560 allocator: std.mem.Allocator, 1561 ref: xit.ref.Ref, 1562 events: []const evt.EventWithId, 1563 parent: [hash.hexLen(.sha1)]u8, 1564 1565 pub fn run(ctx: @This(), cursor: *DB.Cursor(.read_write)) !void { 1566 const opts: rp.RepoOpts(.xit) = .{}; 1567 var moment = try DB.HashMap(.read_write).init(cursor.*); 1568 const state = Repo.State(.read_write){ .core = ctx.core, .extra = .{ .moment = &moment } }; 1569 try evt.commitEvents(.xit, opts, state, ctx.io, ctx.allocator, ctx.ref, ctx.events, .{ctx.parent}); 1570 const tip = (try xit.ref.readRecur(.xit, opts, state.readOnly(), ctx.io, .{ .ref = ctx.ref })) orelse return error.NotFound; 1571 try xit.undo.write(opts, state, std.Io.Timestamp.now(ctx.io, .real).toSeconds(), .{ 1572 .commit = try .init("seed conflicting events", tip, opts.max_read_size), 1573 }); 1574 } 1575 }; 1576 1577 try transaction(io, repo, Ctx{ 1578 .core = &repo.core, 1579 .io = io, 1580 .allocator = allocator, 1581 .ref = ref, 1582 .events = events, 1583 .parent = parent, 1584 }); 1585 } 1586 1587 // append `ctx` to the repo's history as one transaction. the fixtures write a 1588 // few states the normal paths have no way to produce 1589 // fixtures commit directly, so the ref tips are indexed by hand. a fork gets 1590 // no commit index, as in production. 1591 const Reindex = struct { 1592 io: std.Io, 1593 allocator: std.mem.Allocator, 1594 core: *rp.Repo(.xit, .{}).Core, 1595 commits: bool, 1596 1597 pub fn run(ctx: @This(), cursor: *rp.Repo(.xit, .{}).DB.Cursor(.read_write)) !void { 1598 var moment = try rp.Repo(.xit, .{}).DB.HashMap(.read_write).init(cursor.*); 1599 const state = rp.Repo(.xit, .{}).State(.read_write){ .core = ctx.core, .extra = .{ .moment = &moment } }; 1600 _ = try find.refreshInTransaction(.{}, state, &moment, ctx.io, ctx.allocator, null); 1601 if (ctx.commits) _ = try srch_cmmt.refreshInTransaction(.{}, state, &moment, ctx.io, ctx.allocator, &.{}, null); 1602 } 1603 }; 1604 1605 fn transaction(io: std.Io, repo: *rp.Repo(.xit, .{}), ctx: anytype) !void { 1606 const DB = rp.Repo(.xit, .{}).DB; 1607 try repo.core.db_file.lock(io, .exclusive); 1608 defer repo.core.db_file.unlock(io); 1609 1610 const history = try DB.ArrayList(.read_write).init(repo.core.db.rootCursor()); 1611 try history.appendContext(.{ .slot = try history.getSlot(-1) }, ctx); 1612 } 1613 1614 // recursively copy the contents of src_dir into dest_dir 1615 fn copyDir(io: std.Io, src_dir: std.Io.Dir, dest_dir: std.Io.Dir) !void { 1616 var iter = src_dir.iterate(); 1617 while (try iter.next(io)) |entry| { 1618 switch (entry.kind) { 1619 .file => try src_dir.copyFile(entry.name, dest_dir, entry.name, io, .{}), 1620 .directory => { 1621 try dest_dir.createDirPath(io, entry.name); 1622 var dest_entry_dir = try dest_dir.openDir(io, entry.name, .{ .access_sub_paths = true, .iterate = true, .follow_symlinks = false }); 1623 defer dest_entry_dir.close(io); 1624 var src_entry_dir = try src_dir.openDir(io, entry.name, .{ .access_sub_paths = true, .iterate = true, .follow_symlinks = false }); 1625 defer src_entry_dir.close(io); 1626 try copyDir(io, src_entry_dir, dest_entry_dir); 1627 }, 1628 else => {}, 1629 } 1630 } 1631 } 1632