{"header":{"message":"[2/2] Pull code cleanup v1","description":"For some reason it didn't record this as part of the other change\n","timestamp":"2024-04-07T13:57:22.338517Z","authors":[{}]},"hash":"M32SWK6ZR3ZXXQCCGFCE4DZQIDKUGHESHECI6R2Q5WQLRWV52NTAC","authors":[{"login":"dblsaiko","key":"CFbqMkwG4nTc9WA817hB7d94hHr5XwgvDXAtY7hfzw8m"}],"deps":{"hashes":[["M32SWK6ZR3ZXXQCCGFCE4DZQIDKUGHESHECI6R2Q5WQLRWV52NTAC","[2/2] Pull code cleanup v1"],["AA",null],["JGN2BVS5RYX6EFOG7WJGIPTSWG3KE757J5BUGCC64QWCUSXZKZPQC","Pull code cleanup v1"],["HKHMES6TWN5F7VTIC6GRV7ZBUCZ7KQUCSCKIA7PV2T5HKK4FD2FAC","Solving conflicts"],["EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","Updating Pijul with the latest changes in Libpijul"],["JUYSZJSHULJFR4HUJF72TEKKFMBPG4ZOGAGOJ2BX6P3D4DRZAU5QC","Migrate from `pijul::progress` to `pijul_interaction::progress`"],["3E2KY6Y4SQ2UO6PLA4K3MQKHIRHSQCBAJIPJT7NQ6BIETMAQX5QAC","Deterministic ordering of pulled patches"],["PYTC7DPVCWKYDXXBY44BBNB4DHZ3N4OQW3EOEQ7H6Z5P5XBG2EIAC","Partial clones: including all the subtree of a directory when selecting patches"],["ZWVYH7WPYOGDKWODFSAJ6R5U64DON2AVVJ2XZJKHAOMLJEFTYF3QC","Pulling local tags"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["ABQDWHNGSBF2REQDCGXSBFAU4RUMXYAF2KHJ5O3D32M7Z3A3FEDAC","Migrate from `pijul::repository` to `pijul-repository`"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["C5XGFNKIX3RM6KOKRYTECBDDRDAE33JWIVJAJJTEFKFXQNXHEKHQC","Simplify return type for remote get_id"],["4XLHUME7YLJV6XUZBOW7PX62TCJXIWW2CPITXO5GZOULWGXRVDZAC","Fixing a interlocking when cloning from a particular patch"],["27RZYCM3XP72CW7FYGE373YAFD6EEZOZ4YAHEKV6JE5L6Z5N3JNAC","Pushing/pulling from/to Nest discussions again"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["RM225IDQR36MNBMN7OT2R562M4FUD6L34RY7A3WDBBETZIIDKZ5AC","Exchanging tagged states over SSH"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["LKIKT4FRKVZAYITMKO23RRFZG25UFX7J6GBOOUQOD24YBRNLHLOAC","[2/?] Clean up change file name handling"],["HXEIH4UQ6EX3MAY33JK4WQUE5GUSZ673OX57JKNFXC2N2QLTXKXAC","Pulling more than 100 changes at once"],["4HTHYIA3GLMUBUMAI7CQMZA4KE47EUXOP24XLUEYFRMOG57CJLMAC","Fixing HTTP download"],["UDGL7ER2R6SY2CBSPA4O4ULQ5PCUDWQBGYOWTN3MQGSS5L2EI2LQC","Clean up change file name handling"],["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","Pushing to, and pulling from the local repository"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","Feedback on network stuff"],["2GQCLJZGIXMTKDVMYIIQJDOR5EXGBZS5FKH2S4DTN25WKKBUMQQQC","Displaying errors returned by the server in the protocol"],["C3L2TLQWREYOM3YHL37L7PS74YGLHBEDQRSCVMYIU6HKBEPNN2SAC","When downloading changes, check whether we have their dependencies and download them too"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC","Change completions (where the whole progress bar story started)"],["DO2Y5TY5JQISUHCVNPI2FXO7WWZVJQ3LGPWF4DNADMGZRIO6PT2QC","Tag synchronisation"],["UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","Fixing SSH asynchronicity issues"],["5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","Fixing the Git feature"],["XQHABMC2FOMH7SZIYVYAR5MNH2DK2AOUCX2RJKZM3PDG2H5JIXYQC","Do not block when there is no patch to pull"],["G7HJHNFDZCGOPGVETNYK7BDDPJXHEIPGZJEJXBGBXSWPWEX3BIQQC","Migrate from `pijul_interaction::progress` to `pijul_interaction`"],["ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","Tag transactions (including a massive refactoring of errors)"],["IBPVOKM5MXTGB2P7LCD75MISAYUNDPEKQAUEVCXJJWLWCX2TJZBAC","Fixing a bug in patch download"],["K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","Styling progress bars"],["TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","Fixing a bug when downloading changes, and making change download more efficient (more async)"],["BNPSVXIC72C3WT33YKCH766OBLLNCS7POX6U6JXZSQQPJF2M22MQC","Friendlier progress bars"],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"],["X6YFD4WVMUYJCR5IYPJH6UKYVWSA7DKBRVJ6XQFXHOE2TRYUTAHAC","Do not download changes if we already have them"],["L2VH4BYK3IULLGBHXMZJWKRKDQY43QEMQRTXFJCNRDE7PODLXWTAC","Downloading changelists from channels without an id (Nest discussions)"],["QWIYNMI5SOTLRPYE4O3AG7R75JXM2TB3ZADU646PG6ACPBGSYUYAC","Formatting + big-endian Sanakirja"],["3WO4H2MMMQTYKCPBWYE67IRAEX7DFA2XAOMIKICA6BYDN23K6DQQC","Fixing async issues in downloads"]],"deps":["JGN2BVS5RYX6EFOG7WJGIPTSWG3KE757J5BUGCC64QWCUSXZKZPQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","HXEIH4UQ6EX3MAY33JK4WQUE5GUSZ673OX57JKNFXC2N2QLTXKXAC","X6YFD4WVMUYJCR5IYPJH6UKYVWSA7DKBRVJ6XQFXHOE2TRYUTAHAC","MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","2GQCLJZGIXMTKDVMYIIQJDOR5EXGBZS5FKH2S4DTN25WKKBUMQQQC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","3WO4H2MMMQTYKCPBWYE67IRAEX7DFA2XAOMIKICA6BYDN23K6DQQC","BNPSVXIC72C3WT33YKCH766OBLLNCS7POX6U6JXZSQQPJF2M22MQC","2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","L2VH4BYK3IULLGBHXMZJWKRKDQY43QEMQRTXFJCNRDE7PODLXWTAC","EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","C5XGFNKIX3RM6KOKRYTECBDDRDAE33JWIVJAJJTEFKFXQNXHEKHQC","27RZYCM3XP72CW7FYGE373YAFD6EEZOZ4YAHEKV6JE5L6Z5N3JNAC","ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","RM225IDQR36MNBMN7OT2R562M4FUD6L34RY7A3WDBBETZIIDKZ5AC","DO2Y5TY5JQISUHCVNPI2FXO7WWZVJQ3LGPWF4DNADMGZRIO6PT2QC","ZWVYH7WPYOGDKWODFSAJ6R5U64DON2AVVJ2XZJKHAOMLJEFTYF3QC","4XLHUME7YLJV6XUZBOW7PX62TCJXIWW2CPITXO5GZOULWGXRVDZAC","C3L2TLQWREYOM3YHL37L7PS74YGLHBEDQRSCVMYIU6HKBEPNN2SAC","XQHABMC2FOMH7SZIYVYAR5MNH2DK2AOUCX2RJKZM3PDG2H5JIXYQC","IBPVOKM5MXTGB2P7LCD75MISAYUNDPEKQAUEVCXJJWLWCX2TJZBAC","4HTHYIA3GLMUBUMAI7CQMZA4KE47EUXOP24XLUEYFRMOG57CJLMAC","3E2KY6Y4SQ2UO6PLA4K3MQKHIRHSQCBAJIPJT7NQ6BIETMAQX5QAC","QWIYNMI5SOTLRPYE4O3AG7R75JXM2TB3ZADU646PG6ACPBGSYUYAC","JUYSZJSHULJFR4HUJF72TEKKFMBPG4ZOGAGOJ2BX6P3D4DRZAU5QC","ABQDWHNGSBF2REQDCGXSBFAU4RUMXYAF2KHJ5O3D32M7Z3A3FEDAC","G7HJHNFDZCGOPGVETNYK7BDDPJXHEIPGZJEJXBGBXSWPWEX3BIQQC","HKHMES6TWN5F7VTIC6GRV7ZBUCZ7KQUCSCKIA7PV2T5HKK4FD2FAC","PYTC7DPVCWKYDXXBY44BBNB4DHZ3N4OQW3EOEQ7H6Z5P5XBG2EIAC","UDGL7ER2R6SY2CBSPA4O4ULQ5PCUDWQBGYOWTN3MQGSS5L2EI2LQC","LKIKT4FRKVZAYITMKO23RRFZG25UFX7J6GBOOUQOD24YBRNLHLOAC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1266,"ins":{"up_context":[{"change":2,"pos":1267}],"down_context":[{"change":2,"pos":8137}],"flag":"BLOCK","start":0,"end":13536,"inode":{"change":3,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2393},"to":{"change":2,"start":3037,"end":3096},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":437},"to":{"change":3,"start":2392,"end":2393},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":17461},"to":{"change":3,"start":2392,"end":2393},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2392},"to":{"change":3,"start":2392,"end":2393},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":17386},"to":{"change":3,"start":2312,"end":2330},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2312},"to":{"change":3,"start":2312,"end":2330},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3036},"to":{"change":3,"start":17364,"end":17386},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":17364},"to":{"change":3,"start":17364,"end":17386},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":17334},"to":{"change":2,"start":2981,"end":3036},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":2980},"to":{"change":3,"start":17305,"end":17334},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2289},"to":{"change":3,"start":17305,"end":17334},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":17304},"to":{"change":2,"start":2153,"end":2980},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":539},"to":{"change":3,"start":17273,"end":17304},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":17273},"to":{"change":3,"start":17273,"end":17304},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":2152},"to":{"change":3,"start":504,"end":539},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":504},"to":{"change":3,"start":504,"end":539},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1581},"to":{"change":2,"start":1499,"end":2152},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1528},"to":{"change":3,"start":1528,"end":1581},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1191},"to":{"change":3,"start":7755,"end":7756},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":493},"to":{"change":3,"start":3302,"end":3309},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3302},"to":{"change":3,"start":3302,"end":3309},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":8136},"to":{"change":3,"start":3532,"end":3533},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":118},"to":{"change":3,"start":3532,"end":3533},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":8015},"to":{"change":2,"start":8016,"end":8136},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":70881},"to":{"change":2,"start":8015,"end":8015},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3818},"to":{"change":3,"start":18846,"end":18895},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":20381},"to":{"change":2,"start":5695,"end":6060},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":373},"to":{"change":3,"start":18896,"end":20381},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":6061},"to":{"change":2,"start":6062,"end":7077},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":79733},"to":{"change":2,"start":6061,"end":6061},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":373},"to":{"change":3,"start":79731,"end":79733},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":4202},"to":{"change":3,"start":79731,"end":79733},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":6060},"to":{"change":3,"start":79731,"end":79733},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":20381},"to":{"change":3,"start":79731,"end":79733},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":79731},"to":{"change":3,"start":79731,"end":79733},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":79713},"to":{"change":3,"start":303,"end":373},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":4145},"to":{"change":3,"start":79707,"end":79713},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":79707},"to":{"change":3,"start":79707,"end":79713},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":8665},"to":{"change":3,"start":4132,"end":4145},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4132},"to":{"change":3,"start":4132,"end":4145},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4046},"to":{"change":3,"start":8429,"end":8665},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":302},"to":{"change":3,"start":3850,"end":4046},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3850},"to":{"change":3,"start":3850,"end":4046},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3850},"to":{"change":3,"start":192,"end":302},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2676},"to":{"change":3,"start":3818,"end":3850},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":18895},"to":{"change":3,"start":3818,"end":3850},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3818},"to":{"change":3,"start":3818,"end":3850},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":191},"to":{"change":3,"start":3780,"end":3818},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3780},"to":{"change":3,"start":3780,"end":3818},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3716},"to":{"change":3,"start":119,"end":191},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":78715},"to":{"change":3,"start":3406,"end":3716},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":3405},"to":{"change":3,"start":78682,"end":78715},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":78682},"to":{"change":3,"start":78682,"end":78715},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":118},"to":{"change":3,"start":3339,"end":3405},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3339},"to":{"change":3,"start":3339,"end":3405},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3339},"to":{"change":3,"start":99,"end":118},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2620},"to":{"change":3,"start":3309,"end":3339},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3309},"to":{"change":3,"start":3309,"end":3339},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":18845},"to":{"change":3,"start":2613,"end":2620},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2613},"to":{"change":3,"start":2613,"end":2620},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2588},"to":{"change":3,"start":18826,"end":18845},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3266},"to":{"change":3,"start":2523,"end":2588},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2522},"to":{"change":3,"start":3137,"end":3266},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3137},"to":{"change":3,"start":3137,"end":3266},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2996},"to":{"change":3,"start":2358,"end":2522},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2981},"to":{"change":3,"start":2981,"end":2996},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":78607},"to":{"change":3,"start":78607,"end":78608},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":950},"to":{"change":3,"start":78599,"end":78607},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2909},"to":{"change":3,"start":78599,"end":78607},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":78599},"to":{"change":3,"start":78599,"end":78607},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2837},"to":{"change":3,"start":2894,"end":2909},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2894},"to":{"change":3,"start":2894,"end":2909},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1999},"to":{"change":3,"start":2742,"end":2837},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":8609},"to":{"change":3,"start":2742,"end":2837},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2894},"to":{"change":3,"start":2742,"end":2837},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":78459},"to":{"change":3,"start":1845,"end":1999},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":8409},"to":{"change":3,"start":78449,"end":78459},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":8428},"to":{"change":3,"start":78449,"end":78459},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":78449},"to":{"change":3,"start":78449,"end":78459},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":18825},"to":{"change":3,"start":8395,"end":8409},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8395},"to":{"change":3,"start":8395,"end":8409},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8353},"to":{"change":3,"start":18771,"end":18825},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":917},"to":{"change":3,"start":8264,"end":8353},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8264},"to":{"change":3,"start":8264,"end":8353},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8218},"to":{"change":3,"start":872,"end":917},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":78339},"to":{"change":3,"start":8208,"end":8218},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":871},"to":{"change":3,"start":78300,"end":78339},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2988},"to":{"change":3,"start":78300,"end":78339},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":78300},"to":{"change":3,"start":78300,"end":78339},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":77979},"to":{"change":3,"start":691,"end":871},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":77917},"to":{"change":3,"start":77917,"end":77979},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2741},"to":{"change":3,"start":77783,"end":77897},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":4954},"to":{"change":3,"start":77783,"end":77897},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":77783},"to":{"change":3,"start":77783,"end":77897},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":77726},"to":{"change":3,"start":4875,"end":4954},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2671},"to":{"change":3,"start":77704,"end":77726},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":5694},"to":{"change":3,"start":77704,"end":77726},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":77704},"to":{"change":3,"start":77704,"end":77726},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":76443},"to":{"change":2,"start":5645,"end":5694},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":5644},"to":{"change":3,"start":76429,"end":76443},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":76429},"to":{"change":3,"start":76429,"end":76443},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":76261},"to":{"change":2,"start":5586,"end":5644},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":5585},"to":{"change":3,"start":76247,"end":76261},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":76247},"to":{"change":3,"start":76247,"end":76261},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":76077},"to":{"change":2,"start":3996,"end":5585},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":3376},"to":{"change":3,"start":76076,"end":76077},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":76076},"to":{"change":3,"start":76076,"end":76077},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":288},"to":{"change":3,"start":2835,"end":2902},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2835},"to":{"change":3,"start":2835,"end":2902},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2788},"to":{"change":3,"start":202,"end":288},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":228},"to":{"change":3,"start":2787,"end":2788},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":75363},"to":{"change":3,"start":2787,"end":2788},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":75038},"to":{"change":3,"start":2057,"end":2107},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":18533},"to":{"change":3,"start":74981,"end":75038},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":74981},"to":{"change":3,"start":74981,"end":75038},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3995},"to":{"change":3,"start":18509,"end":18533},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":74955},"to":{"change":3,"start":18509,"end":18533},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":74912},"to":{"change":2,"start":3956,"end":3995},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":721},"to":{"change":3,"start":74895,"end":74912},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":74895},"to":{"change":3,"start":74895,"end":74912},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":74849},"to":{"change":3,"start":676,"end":721},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":855},"to":{"change":3,"start":74830,"end":74849},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2056},"to":{"change":3,"start":74830,"end":74849},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":74830},"to":{"change":3,"start":74830,"end":74849},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":74770},"to":{"change":3,"start":1987,"end":2056},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":882},"to":{"change":3,"start":74748,"end":74770},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2757},"to":{"change":3,"start":74748,"end":74770},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":74748},"to":{"change":3,"start":74748,"end":74770},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2117},"to":{"change":3,"start":2736,"end":2757},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2736},"to":{"change":3,"start":2736,"end":2757},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1844},"to":{"change":3,"start":2050,"end":2117},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2050},"to":{"change":3,"start":2050,"end":2117},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2050},"to":{"change":3,"start":1789,"end":1844},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1788},"to":{"change":3,"start":2029,"end":2050},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":8207},"to":{"change":3,"start":2029,"end":2050},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2736},"to":{"change":3,"start":2029,"end":2050},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":74687},"to":{"change":3,"start":1717,"end":1788},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":9489},"to":{"change":3,"start":74677,"end":74687},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":74677},"to":{"change":3,"start":74677,"end":74687},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":74612},"to":{"change":3,"start":9439,"end":9489},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":7944},"to":{"change":3,"start":74515,"end":74612},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":74515},"to":{"change":3,"start":74515,"end":74612},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":18508},"to":{"change":3,"start":7914,"end":7944},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7914},"to":{"change":3,"start":7914,"end":7944},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7876},"to":{"change":3,"start":18458,"end":18508},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":641},"to":{"change":3,"start":7808,"end":7876},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":685},"to":{"change":3,"start":7808,"end":7876},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9404},"to":{"change":3,"start":7808,"end":7876},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":74338},"to":{"change":3,"start":579,"end":641},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":8126},"to":{"change":3,"start":74269,"end":74338},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":74269},"to":{"change":3,"start":74269,"end":74338},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":73321},"to":{"change":3,"start":8043,"end":8126},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":564},"to":{"change":3,"start":73272,"end":73321},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1567},"to":{"change":3,"start":73272,"end":73321},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":8042},"to":{"change":3,"start":73272,"end":73321},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":73272},"to":{"change":3,"start":73272,"end":73321},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":73272},"to":{"change":3,"start":1436,"end":1567},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":73235},"to":{"change":3,"start":73235,"end":73272},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2028},"to":{"change":3,"start":73084,"end":73215},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":4874},"to":{"change":3,"start":73084,"end":73215},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":73084},"to":{"change":3,"start":73084,"end":73215},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":73029},"to":{"change":3,"start":4797,"end":4874},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1960},"to":{"change":3,"start":73007,"end":73029},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":73007},"to":{"change":3,"start":73007,"end":73029},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":3758},"to":{"change":3,"start":1873,"end":1960},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3955},"to":{"change":3,"start":1873,"end":1960},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":73007},"to":{"change":3,"start":1873,"end":1960},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":72935},"to":{"change":2,"start":3954,"end":3955},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":344},"to":{"change":3,"start":72925,"end":72935},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1872},"to":{"change":3,"start":72925,"end":72935},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3953},"to":{"change":3,"start":72925,"end":72935},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":7807},"to":{"change":3,"start":72925,"end":72935},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":72925},"to":{"change":3,"start":72925,"end":72935},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":18457},"to":{"change":2,"start":3893,"end":3953},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1403},"to":{"change":3,"start":18439,"end":18457},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3892},"to":{"change":3,"start":18439,"end":18457},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":18439},"to":{"change":3,"start":18439,"end":18457},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":72023},"to":{"change":2,"start":3563,"end":3892},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3562},"to":{"change":3,"start":72022,"end":72023},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":3587},"to":{"change":3,"start":72022,"end":72023},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":72022},"to":{"change":3,"start":72022,"end":72023},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":572},"to":{"change":2,"start":3510,"end":3562},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3509},"to":{"change":3,"start":571,"end":572},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":571},"to":{"change":3,"start":571,"end":572},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":495},"to":{"change":2,"start":3279,"end":3509},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3278},"to":{"change":3,"start":494,"end":495},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":72022},"to":{"change":3,"start":494,"end":495},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":71943},"to":{"change":2,"start":3197,"end":3278},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3196},"to":{"change":3,"start":71942,"end":71943},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":71942},"to":{"change":3,"start":71942,"end":71943},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2510},"to":{"change":2,"start":3159,"end":3196},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2509},"to":{"change":3,"start":2509,"end":2510},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":140},"to":{"change":3,"start":2371,"end":2453},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3446},"to":{"change":3,"start":2371,"end":2453},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3158},"to":{"change":3,"start":71042,"end":71101},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":71042},"to":{"change":3,"start":71042,"end":71101},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":71005},"to":{"change":2,"start":3125,"end":3158},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3124},"to":{"change":3,"start":70984,"end":71005},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":70984},"to":{"change":3,"start":70984,"end":71005},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":70953},"to":{"change":2,"start":3097,"end":3124},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1471},"to":{"change":3,"start":70934,"end":70953},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":4796},"to":{"change":3,"start":70934,"end":70953},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":70934},"to":{"change":3,"start":70934,"end":70953},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":3309},"to":{"change":3,"start":4721,"end":4796},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":70881},"to":{"change":3,"start":4721,"end":4796},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2228},"to":{"change":3,"start":70880,"end":70881},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":8014},"to":{"change":3,"start":70880,"end":70881},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":70880},"to":{"change":3,"start":70880,"end":70881},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1957},"to":{"change":2,"start":7898,"end":8014},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":7897},"to":{"change":3,"start":1956,"end":1957},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1956},"to":{"change":3,"start":1956,"end":1957},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":74},"to":{"change":2,"start":7886,"end":7897},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":218},"to":{"change":3,"start":60,"end":74},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2312},"to":{"change":3,"start":60,"end":74},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":7885},"to":{"change":3,"start":60,"end":74},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":60},"to":{"change":3,"start":60,"end":74},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3630},"to":{"change":2,"start":7379,"end":7885},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":7378},"to":{"change":3,"start":3629,"end":3630},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3629},"to":{"change":3,"start":3629,"end":3630},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":590},"to":{"change":2,"start":7078,"end":7378},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":7077},"to":{"change":3,"start":589,"end":590},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":70880},"to":{"change":3,"start":589,"end":590},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1405},"to":{"change":3,"start":295,"end":314},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":7756},"to":{"change":3,"start":3637,"end":3665},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1191},"to":{"change":3,"start":3637,"end":3665},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":294},"to":{"change":3,"start":1167,"end":1191},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1167},"to":{"change":3,"start":1167,"end":1191},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":120},"to":{"change":3,"start":120,"end":294},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":119},"to":{"change":3,"start":119,"end":120},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3096},"to":{"change":3,"start":109,"end":119},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":109},"to":{"change":3,"start":109,"end":119},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":258},"to":{"change":3,"start":0,"end":1},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":592},"to":{"change":3,"start":0,"end":1},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":1498},"to":{"change":3,"start":0,"end":1},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2868},"to":{"change":3,"start":0,"end":1},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":69159},"to":{"change":3,"start":0,"end":1},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":127},"to":{"change":2,"start":1268,"end":1498},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":1267},"to":{"change":3,"start":126,"end":127},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":544},"to":{"change":3,"start":126,"end":127},"introduced_by":3}],"inode":{"change":3,"pos":52474}},"ins_contents":[{"Add":""},{"Add":" let mut ws = ApplyWorkspace::new();"},{"Add":""},{"Add":" while let Some(h) = stream.try_next().await? {"},{"Add":" debug!(\"to_apply: {:?}\", h);"},{"Add":""},{"Add":" let mut touches_inodes = inodes.is_empty();"},{"Add":""},{"Add":" debug!(\"inodes = {:?}\", inodes);"},{"Add":""},{"Add":" if !touches_inodes {"},{"Add":" if let CS::Change(ref h) = h {"},{"Add":" let changes = repo.changes.get_changes(h)?;"},{"Add":""},{"Add":" touches_inodes |= changes.iter().any(|c| {"},{"Add":" c.iter().any(|c| {"},{"Add":" let inode = c.inode();"},{"Add":" debug!(\"inode = {:?}\", inode);"},{"Add":" inodes.contains(&Position {"},{"Add":" change: inode.change.unwrap_or(*h),"},{"Add":" pos: inode.pos,"},{"Add":" })"},{"Add":" })"},{"Add":" })"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" if !touches_inodes {"},{"Add":" touches_inodes |= inodes.iter().any(|i| CS::Change(i.change) == h);"},{"Add":" }"},{"Add":""},{"Add":" if !touches_inodes {"},{"Add":" continue;"},{"Add":" }"},{"Add":""},{"Add":" to_apply_inodes.insert(h);"},{"Add":""},{"Add":" if let Some(apply_bar) = &apply_bar {"},{"Add":" info!(\"Applying {:?}\", h);"},{"Add":" apply_bar.inc(1);"},{"Add":" debug!(\"apply\");"},{"Add":""},{"Add":" if let CS::Change(ref h) = h {"},{"Add":" let mut channel = channel.write();"},{"Add":" txn.apply_change_rec_ws(&repo.changes, &mut channel, h, &mut ws)?;"},{"Add":" }"},{"Add":""},{"Add":" debug!(\"applied\");"},{"Add":" } else {"},{"Add":" debug!(\"not applying {:?}\", h)"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" Ok(())"},{"Add":" })"},{"Add":" .await?;"},{"Add":" }"},{"Add":""},{"Add":" let mut result = Vec::with_capacity(to_apply_inodes.len());"},{"Add":" for h in to_apply {"},{"Add":" if to_apply_inodes.contains(&h) {"},{"Add":" result.push(*h)"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" debug!(\"finished\");"},{"Add":" Ok(result)"},{"Add":" }"},{"Add":""},{"Add":" pub async fn clone_tag("},{"Add":" &mut self,"},{"Add":" repo: &Repository,"},{"Add":" txn: &mut T,"},{"Add":" channel: &ChannelRef,"},{"Add":" tag: &[Hash],"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" let download_bar = ProgressBar::new(tag.len() as u64, DOWNLOAD_MESSAGE)?;"},{"Add":""},{"Add":" let mut hashes = Vec::new();"},{"Add":""},{"Add":" {"},{"Add":" let txn = &mut *txn;"},{"Add":" let hashes = &mut hashes;"},{"Add":""},{"Add":" self.download_changes_with(download_bar, &repo.changes_dir, false, |cx| async move {"},{"Add":" let stream = download_changes_rec(&cx, repo, tag.iter().cloned().map(CS::Change));"},{"Add":" pin_mut!(stream);"},{"Add":""},{"Add":" let mut ws = ApplyWorkspace::new();"},{"Add":""},{"Add":" while let Some(cs) = stream.try_next().await? {"},{"Add":" if let CS::Change(hash) = cs {"},{"Add":" let mut channel = channel.write();"},{"Add":" txn.apply_change_rec_ws(&repo.changes, &mut channel, &hash, &mut ws)?;"},{"Add":" }"},{"Add":""},{"Add":" hashes.push(cs);"},{"Add":" }"},{"Add":""},{"Add":" Ok(())"},{"Add":" })"},{"Add":" .await?;"},{"Add":" }"},{"Add":""},{"Add":" self.complete_changes(repo, txn, channel, &hashes, false)"},{"Add":" .await?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub async fn clone_state("},{"Add":" &mut self,"},{"Add":" repo: &mut Repository,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut ChannelRef,"},{"Add":" state: Merkle,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" let id = if let Some(id) = self.get_id(txn).await? {"},{"Add":" id"},{"Add":" } else {"},{"Add":" return Ok(());"},{"Add":" };"},{"Add":" self.update_changelist(txn, &[]).await?;"},{"Add":" let remote = txn.open_or_create_remote(id, self.name().unwrap()).unwrap();"},{"Add":" let mut to_pull = Vec::new();"},{"Add":" let mut found = false;"},{"Add":" for x in txn.iter_remote(&remote.lock().remote, 0)? {"},{"Add":" let (n, p) = x?;"},{"Add":" debug!(\"{:?} {:?}\", n, p);"},{"Add":" to_pull.push(CS::Change(p.a.into()));"},{"Add":" if p.b == state {"},{"Add":" found = true;"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" if !found {"},{"Add":" bail!(\"State not found: {:?}\", state)"},{"Add":" }"},{"Add":" self.pull(repo, txn, channel, &to_pull, &HashSet::new(), true)"},{"Add":" .await?;"},{"Add":" self.update_identities(repo, &remote).await?;"},{"Add":""},{"Add":" self.complete_changes(repo, txn, channel, &to_pull, false)"},{"Add":" .await?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub async fn complete_changes("},{"Add":" &mut self,"},{"Add":" repo: &pijul_repository::Repository,"},{"Add":" txn: &T,"},{"Add":" local_channel: &ChannelRef,"},{"Add":" changes: &[CS],"},{"Add":" full: bool,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" debug!(\"complete changes {:?}\", changes);"},{"Add":""},{"Add":" let download_bar = ProgressBar::new(changes.len() as u64, DOWNLOAD_MESSAGE)?;"},{"Add":" let _completion_spinner = Spinner::new(COMPLETE_MESSAGE)?;"},{"Add":""},{"Add":" self.download_changes_with(download_bar, &repo.changes_dir, true, |cx| async move {"},{"Add":" let mut waiting = Vec::new();"},{"Add":""},{"Add":" for c in changes {"},{"Add":" let CS::Change(c) = c else { continue };"},{"Add":""},{"Add":" let sc = c.into();"},{"Add":""},{"Add":" if repo"},{"Add":" .changes"},{"Add":" .has_contents(*c, txn.get_internal(&sc)?.cloned())"},{"Add":" {"},{"Add":" debug!(\"has contents {:?}\", c);"},{"Add":" continue;"},{"Add":" }"},{"Add":""},{"Add":" if full {"},{"Add":" waiting.push(cx.download(CS::Change(*c))?);"},{"Add":" continue;"},{"Add":" }"},{"Add":""},{"Add":" let Some(&change) = txn.get_internal(&sc)? else {"},{"Add":" debug!(\"could not find internal for {:?}\", sc);"},{"Add":" continue;"},{"Add":" };"},{"Add":""},{"Add":" // Check if at least one non-empty vertex from c is still alive."},{"Add":" let v = libpijul::pristine::Vertex {"},{"Add":" change,"},{"Add":" start: ChangePosition(0u64.into()),"},{"Add":" end: ChangePosition(0u64.into()),"},{"Add":" };"},{"Add":""},{"Add":" let channel = local_channel.read();"},{"Add":" let graph = txn.graph(&channel);"},{"Add":""},{"Add":" for x in txn.iter_graph(graph, Some(&v))? {"},{"Add":" let (v, e) = x?;"},{"Add":" if v.change > change {"},{"Add":" break;"},{"Add":" } else if e.flag().is_alive_parent() {"},{"Add":" waiting.push(cx.download(CS::Change(*c))?);"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" for w in waiting {"},{"Add":" w.await?;"},{"Add":" }"},{"Add":""},{"Add":" Ok(())"},{"Add":" })"},{"Add":" .await?;"},{"Add":""},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub async fn clone_channel("},{"Add":" &mut self,"},{"Add":" repo: &mut Repository,"},{"Add":" txn: &mut T,"},{"Add":" local_channel: &mut ChannelRef,"},{"Add":" path: &[String],"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" let (inodes, remote_changes) = if let Some(x) = self.update_changelist(txn, path).await? {"},{"Add":" x"},{"Add":" } else {"},{"Add":" bail!(\"Channel not found\")"},{"Add":" };"},{"Add":" let mut pullable = Vec::new();"},{"Add":" {"},{"Add":" let rem = remote_changes.lock();"},{"Add":" for x in txn.iter_remote(&rem.remote, 0)? {"},{"Add":" let (_, p) = x?;"},{"Add":" pullable.push(CS::Change(p.a.into()))"},{"Add":" }"},{"Add":" }"},{"Add":" self.pull(repo, txn, local_channel, &pullable, &inodes, true)"},{"Add":" .await?;"},{"Add":" self.update_identities(repo, &remote_changes).await?;"},{"Add":""},{"Add":" self.complete_changes(repo, txn, local_channel, &pullable, false)"},{"Add":" .await?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"lazy_static! {"},{"Add":" static ref CHANGELIST_LINE: Regex = Regex::new("},{"Add":" r#\"(?P[0-9]+)\\.(?P[A-Za-z0-9]+)\\.(?P[A-Za-z0-9]+)(?P\\.)?\"#"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" static ref PATHS_LINE: Regex ="},{"Add":" Regex::new(r#\"(?P[A-Za-z0-9]+)\\.(?P[0-9]+)\"#).unwrap();"},{"Add":"}"},{"Add":""},{"Add":"enum ListLine {"},{"Add":" Change {"},{"Add":" n: u64,"},{"Add":" h: Hash,"},{"Add":" m: Merkle,"},{"Add":" tag: bool,"},{"Add":" },"},{"Add":" Position(Position),"},{"Add":" Error(String),"},{"Add":"}"},{"Add":""},{"Add":"fn parse_line(data: &str) -> Result {"},{"Add":" debug!(\"data = {:?}\", data);"},{"Add":" if let Some(caps) = CHANGELIST_LINE.captures(data) {"},{"Add":" if let (Some(h), Some(m)) = ("},{"Add":" Hash::from_base32(caps.name(\"hash\").unwrap().as_str().as_bytes()),"},{"Add":" Merkle::from_base32(caps.name(\"merkle\").unwrap().as_str().as_bytes()),"},{"Add":" ) {"},{"Add":" return Ok(ListLine::Change {"},{"Add":" n: caps.name(\"num\").unwrap().as_str().parse().unwrap(),"},{"Add":" h,"},{"Add":" m,"},{"Add":" tag: caps.name(\"tag\").is_some(),"},{"Add":" });"},{"Add":" }"},{"Add":" }"},{"Add":" if data.starts_with(\"error:\") {"},{"Add":" return Ok(ListLine::Error(data.split_at(6).1.to_string()));"},{"Add":" }"},{"Add":" if let Some(caps) = PATHS_LINE.captures(data) {"},{"Add":" return Ok(ListLine::Position(Position {"},{"Add":" change: Hash::from_base32(caps.name(\"hash\").unwrap().as_str().as_bytes()).unwrap(),"},{"Add":" pos: ChangePosition("},{"Add":" caps.name(\"num\")"},{"Add":" .unwrap()"},{"Add":" .as_str()"},{"Add":" .parse::()"},{"Add":" .unwrap()"},{"Add":" .into(),"},{"Add":" ),"},{"Add":" }));"},{"Add":" }"},{"Add":" debug!(\"offending line: {:?}\", data);"},{"Add":" bail!(\"Protocol error\")"},{"Add":"}"},{"Add":""},{"Add":"/// Compare the remote set (theirs_ge_dichotomy) with our current"},{"Add":"/// version of that (ours_ge_dichotomy) and return the changes in our"},{"Add":"/// current version that are not in the remote anymore."},{"Add":"fn remote_unrecs("},{"Add":" txn: &T,"},{"Add":" current_channel: &ChannelRef,"},{"Add":" ours_ge_dichotomy: &[(u64, CS)],"},{"Add":" theirs_ge_dichotomy_set: &HashSet,"},{"Add":") -> Result, anyhow::Error> {"},{"Add":" let mut remote_unrecs = Vec::new();"},{"Add":" for (n, hash) in ours_ge_dichotomy {"},{"Add":" debug!(\"ours_ge_dichotomy: {:?} {:?}\", n, hash);"},{"Add":" if theirs_ge_dichotomy_set.contains(hash) {"},{"Add":" // If this change is still present in the remote, skip"},{"Add":" debug!(\"still present\");"},{"Add":" continue;"},{"Add":" } else {"},{"Add":" let has_it = match hash {"},{"Add":" CS::Change(hash) => txn.get_revchanges(¤t_channel, &hash)?.is_some(),"},{"Add":" CS::State(state) => {"},{"Add":" let ch = current_channel.read();"},{"Add":" if let Some(n) = txn.channel_has_state(txn.states(&*ch), &state.into())? {"},{"Add":" txn.is_tagged(txn.tags(&*ch), n.into())?"},{"Add":" } else {"},{"Add":" false"},{"Add":" }"},{"Add":" }"},{"Add":" };"},{"Add":" if has_it {"},{"Add":" remote_unrecs.push((*n, *hash))"},{"Add":" } else {"},{"Add":" // If this unrecord wasn't in our current channel, skip"},{"Add":" continue;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(remote_unrecs)"},{"Add":"}"},{"Add":""},{"Add":"fn try_stream(op: C) -> impl Stream>"},{"Add":"where"},{"Add":" C: FnOnce(mpsc::Sender>) -> F,"},{"Add":" F: Future>,"},{"Add":"{"},{"Add":" stream(|sender| {"},{"Add":" let fut = op(sender.clone());"},{"Add":""},{"Add":" async move {"},{"Add":" if let Err(e) = fut.await {"},{"Add":" let _ = sender.send(Err(e));"},{"Add":" }"},{"Add":" }"},{"Add":" })"},{"Add":"}"},{"Add":""},{"Add":"fn stream(op: C) -> impl Stream"},{"Add":"where"},{"Add":" C: FnOnce(mpsc::Sender) -> F,"},{"Add":" F: Future,"},{"Add":"{"},{"Add":" struct Impl {"},{"Add":" fut: Once,"},{"Add":" rx: mpsc::Receiver,"},{"Add":" }"},{"Add":""},{"Add":" impl Stream for Impl"},{"Add":" where"},{"Add":" F: Future,"},{"Add":" {"},{"Add":" type Item = T;"},{"Add":""},{"Add":" fn poll_next("},{"Add":" self: Pin<&mut Self>,"},{"Add":" cx: &mut std::task::Context<'_>,"},{"Add":" ) -> Poll> {"},{"Add":" let (fut, mut rx) = unsafe {"},{"Add":" let this = self.get_unchecked_mut();"},{"Add":" (Pin::new_unchecked(&mut this.fut), Pin::new(&mut this.rx))"},{"Add":" };"},{"Add":""},{"Add":" match (fut.poll_next(cx), rx.poll_recv(cx)) {"},{"Add":" (_, Poll::Ready(Some(v))) => Poll::Ready(Some(v)),"},{"Add":" (Poll::Ready(_), Poll::Ready(None)) => Poll::Ready(None),"},{"Add":" _ => Poll::Pending,"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" let (tx, rx) = mpsc::channel(1);"},{"Add":""},{"Add":" Impl {"},{"Add":" fut: stream::once(op(tx)),"},{"Add":" rx,"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn download_changes_rec<'a, I>("},{"Add":" cx: &'a DownloadContext,"},{"Add":" repo: &'a Repository,"},{"Add":" items: I,"},{"Add":") -> impl Stream> + 'a"},{"Add":"where"},{"Add":" I: IntoIterator + 'a,"},{"Add":" I::Item: Borrow,"},{"Add":"{"},{"Add":" try_stream(move |sender| async move {"},{"Add":" let mut tasks = FuturesUnordered::new();"},{"Add":""},{"Add":" // there is probably a way to model this using futures, but I"},{"Add":" // couldn't find a nice way to do it"},{"Add":" // so here, have three funny collections"},{"Add":""},{"Add":" let mut pending_deps = HashMap::>::new();"},{"Add":" let mut rev_deps = HashMap::>::new();"},{"Add":" let mut fetched = HashSet::new();"},{"Add":""},{"Add":" let make_download_job = |cs| async move {"},{"Add":" match cx.download(cs) {"},{"Add":" Ok(v) => (cs, v.await),"},{"Add":" Err(e) => (cs, Err(e)),"},{"Add":" }"},{"Add":" };"},{"Add":""},{"Add":" for item in items {"},{"Add":" let item = *item.borrow();"},{"Add":" tasks.push(make_download_job(item));"},{"Add":""},{"Add":" if let CS::Change(hash) = item {"},{"Add":" rev_deps.insert(hash, Vec::new());"},{"Add":" }"},{"Add":" }"},{"Add":""}],"del_contents":[{"Del":" Ok(())\n })\n .await?;\n"},{"Del":"\n"},{"Del":" }\n"},{"Del":" }\n"},{"Del":" debug!(\"not applying {:?}\", h)\n"},{"Del":" } else {\n"},{"Del":" }\n }\n\n if !touches_inodes {\n touches_inodes |= inodes.iter().any(|i| CS::Change(i.change) == h);\n }\n\n if !touches_inodes {\n continue;\n }\n\n to_apply_inodes.insert(h);\n\n if let Some(apply_bar) = &apply_bar {\n info!(\"Applying {:?}\", h);\n apply_bar.inc(1);\n debug!(\"apply\");\n\n if let CS::Change(ref h) = h {\n let mut channel = channel.write();\n txn.apply_change_rec_ws(&repo.changes, &mut channel, h, &mut ws)?;\n }\n\n debug!(\"applied\");\n"},{"Del":" })\n"},{"Del":" })\n"},{"Del":"\n if !touches_inodes {\n if let CS::Change(ref h) = h {\n let changes = repo.changes.get_changes(h)?;\n\n touches_inodes |= changes.iter().any(|c| {\n c.iter().any(|c| {\n let inode = c.inode();\n debug!(\"inode = {:?}\", inode);\n inodes.contains(&Position {\n change: inode.change.unwrap_or(*h),\n pos: inode.pos,\n })\n"},{"Del":" debug!(\"inodes = {:?}\", inodes);\n"},{"Del":"\n"},{"Del":" }\n\n"},{"Del":"\n"},{"Del":" if let CS::Change(hash) = item {\n rev_deps.insert(hash, Vec::new());\n }\n }\n"},{"Del":""},{"Del":" tag: caps.name(\"tag\").is_some(),\n"},{"Del":"}\n\nfn try_stream(op: C) -> impl Stream>\nwhere\n C: FnOnce(mpsc::Sender>) -> F,\n F: Future>,\n{\n stream(|sender| {\n let fut = op(sender.clone());\n\n async move {\n if let Err(e) = fut.await {\n let _ = sender.send(Err(e));\n }\n }\n })\n"},{"Del":"}\n\n/// Compare the remote set (theirs_ge_dichotomy) with our current\n/// version of that (ours_ge_dichotomy) and return the changes in our\n/// current version that are not in the remote anymore.\nfn remote_unrecs(\n txn: &T,\n current_channel: &ChannelRef,\n ours_ge_dichotomy: &[(u64, CS)],\n theirs_ge_dichotomy_set: &HashSet,\n) -> Result, anyhow::Error> {\n let mut remote_unrecs = Vec::new();\n for (n, hash) in ours_ge_dichotomy {\n debug!(\"ours_ge_dichotomy: {:?} {:?}\", n, hash);\n if theirs_ge_dichotomy_set.contains(hash) {\n // If this change is still present in the remote, skip\n debug!(\"still present\");\n continue;\n } else {\n let has_it = match hash {\n CS::Change(hash) => txn.get_revchanges(¤t_channel, &hash)?.is_some(),\n CS::State(state) => {\n let ch = current_channel.read();\n if let Some(n) = txn.channel_has_state(txn.states(&*ch), &state.into())? {\n txn.is_tagged(txn.tags(&*ch), n.into())?\n } else {\n false\n }\n }\n };\n if has_it {\n remote_unrecs.push((*n, *hash))\n } else {\n // If this unrecord wasn't in our current channel, skip\n continue;\n }\n }\n }\n Ok(remote_unrecs)\n"},{"Del":"\nfn stream(op: C) -> impl Stream\nwhere\n C: FnOnce(mpsc::Sender) -> F,\n F: Future,\n{\n struct Impl {\n fut: Once,\n rx: mpsc::Receiver,\n }\n\n impl Stream for Impl\n where\n F: Future,\n {\n type Item = T;\n\n fn poll_next(\n self: Pin<&mut Self>,\n cx: &mut std::task::Context<'_>,\n ) -> Poll> {\n let (fut, mut rx) = unsafe {\n let this = self.get_unchecked_mut();\n (Pin::new_unchecked(&mut this.fut), Pin::new(&mut this.rx))\n };\n\n match (fut.poll_next(cx), rx.poll_recv(cx)) {\n (_, Poll::Ready(Some(v))) => Poll::Ready(Some(v)),\n (Poll::Ready(_), Poll::Ready(None)) => Poll::Ready(None),\n _ => Poll::Pending,\n }\n }\n }\n\n let (tx, rx) = mpsc::channel(1);\n\n Impl {\n fut: stream::once(op(tx)),\n rx,\n }\n}\n"},{"Del":""},{"Del":"}\n"},{"Del":" debug!(\"offending line: {:?}\", data);\n bail!(\"Protocol error\")\n"},{"Del":" }\n"},{"Del":" }));\n"},{"Del":" pos: ChangePosition(\n caps.name(\"num\")\n .unwrap()\n .as_str()\n .parse::()\n .unwrap()\n .into(),\n ),\n"},{"Del":" if let Some(caps) = PATHS_LINE.captures(data) {\n return Ok(ListLine::Position(Position {\n change: Hash::from_base32(caps.name(\"hash\").unwrap().as_str().as_bytes()).unwrap(),\n"},{"Del":" if data.starts_with(\"error:\") {\n return Ok(ListLine::Error(data.split_at(6).1.to_string()));\n }\n"},{"Del":" });\n }\n }\n"},{"Del":" h,\n m,\n"},{"Del":" n: caps.name(\"num\").unwrap().as_str().parse().unwrap(),\n"},{"Del":" if let Some(caps) = CHANGELIST_LINE.captures(data) {\n if let (Some(h), Some(m)) = (\n Hash::from_base32(caps.name(\"hash\").unwrap().as_str().as_bytes()),\n Merkle::from_base32(caps.name(\"merkle\").unwrap().as_str().as_bytes()),\n ) {\n return Ok(ListLine::Change {\n"},{"Del":" debug!(\"data = {:?}\", data);\n"},{"Del":"}\n\nfn parse_line(data: &str) -> Result {\n"},{"Del":" Error(String),\n"},{"Del":" Position(Position),\n"},{"Del":" },\n"},{"Del":" tag: bool,\n"},{"Del":" Change {\n n: u64,\n h: Hash,\n m: Merkle,\n"},{"Del":" static ref PATHS_LINE: Regex =\n Regex::new(r#\"(?P[A-Za-z0-9]+)\\.(?P[0-9]+)\"#).unwrap();\n}\n\nenum ListLine {\n"},{"Del":" static ref CHANGELIST_LINE: Regex = Regex::new(\n r#\"(?P[0-9]+)\\.(?P[A-Za-z0-9]+)\\.(?P[A-Za-z0-9]+)(?P\\.)?\"#\n )\n .unwrap();\n"},{"Del":"lazy_static! {\n"},{"Del":"\n"},{"Del":" }\n}\n"},{"Del":" Ok(())\n"},{"Del":" self.complete_changes(repo, txn, local_channel, &pullable, false)\n .await?;\n"},{"Del":" self.pull(repo, txn, local_channel, &pullable, &inodes, true)\n .await?;\n self.update_identities(repo, &remote_changes).await?;\n\n"},{"Del":" }\n"},{"Del":" }\n"},{"Del":" pullable.push(CS::Change(p.a.into()))\n"},{"Del":" for x in txn.iter_remote(&rem.remote, 0)? {\n let (_, p) = x?;\n"},{"Del":" let rem = remote_changes.lock();\n"},{"Del":" {\n"},{"Del":" let mut pullable = Vec::new();\n"},{"Del":" let (inodes, remote_changes) = if let Some(x) = self.update_changelist(txn, path).await? {\n x\n } else {\n bail!(\"Channel not found\")\n };\n"},{"Del":" path: &[String],\n ) -> Result<(), anyhow::Error> {\n"},{"Del":" &mut self,\n repo: &mut Repository,\n txn: &mut T,\n local_channel: &mut ChannelRef,\n"},{"Del":" pub async fn clone_channel(\n"},{"Del":" Ok(())\n }\n\n"},{"Del":"\n Ok(())\n })\n .await?;\n\n"},{"Del":" }\n"},{"Del":"\n for w in waiting {\n w.await?;\n"},{"Del":" }\n"},{"Del":" self.download_changes_with(download_bar, &repo.changes_dir, true, |cx| async move {\n let mut waiting = Vec::new();\n\n for c in changes {\n let CS::Change(c) = c else { continue };\n\n let sc = c.into();\n\n if repo\n .changes\n .has_contents(*c, txn.get_internal(&sc)?.cloned())\n {\n debug!(\"has contents {:?}\", c);\n continue;\n }\n\n if full {\n waiting.push(cx.download(CS::Change(*c))?);\n continue;\n }\n\n let Some(&change) = txn.get_internal(&sc)? else {\n debug!(\"could not find internal for {:?}\", sc);\n continue;\n };\n\n // Check if at least one non-empty vertex from c is still alive.\n let v = libpijul::pristine::Vertex {\n change,\n start: ChangePosition(0u64.into()),\n end: ChangePosition(0u64.into()),\n };\n\n let channel = local_channel.read();\n let graph = txn.graph(&channel);\n\n for x in txn.iter_graph(graph, Some(&v))? {\n let (v, e) = x?;\n if v.change > change {\n break;\n } else if e.flag().is_alive_parent() {\n waiting.push(cx.download(CS::Change(*c))?);\n break;\n }\n }\n"},{"Del":"\n"},{"Del":" let _completion_spinner = Spinner::new(COMPLETE_MESSAGE)?;\n"},{"Del":" let download_bar = ProgressBar::new(changes.len() as u64, DOWNLOAD_MESSAGE)?;\n"},{"Del":"\n"},{"Del":" debug!(\"complete changes {:?}\", changes);\n"},{"Del":" full: bool,\n ) -> Result<(), anyhow::Error> {\n"},{"Del":" changes: &[CS],\n"},{"Del":" local_channel: &ChannelRef,\n"},{"Del":" txn: &T,\n"},{"Del":" repo: &pijul_repository::Repository,\n"},{"Del":" &mut self,\n"},{"Del":" pub async fn complete_changes(\n"},{"Del":" Ok(())\n }\n\n"},{"Del":" .await?;\n"},{"Del":" self.complete_changes(repo, txn, channel, &to_pull, false)\n"},{"Del":" self.update_identities(repo, &remote).await?;\n\n"},{"Del":" .await?;\n"},{"Del":" self.pull(repo, txn, channel, &to_pull, &HashSet::new(), true)\n"},{"Del":" }\n"},{"Del":" bail!(\"State not found: {:?}\", state)\n"},{"Del":" found = true;\n break;\n }\n }\n if !found {\n"},{"Del":" if p.b == state {\n"},{"Del":" to_pull.push(CS::Change(p.a.into()));\n"},{"Del":" let (n, p) = x?;\n debug!(\"{:?} {:?}\", n, p);\n"},{"Del":" for x in txn.iter_remote(&remote.lock().remote, 0)? {\n"},{"Del":" let mut to_pull = Vec::new();\n let mut found = false;\n"},{"Del":" let remote = txn.open_or_create_remote(id, self.name().unwrap()).unwrap();\n"},{"Del":" self.update_changelist(txn, &[]).await?;\n"},{"Del":" let id = if let Some(id) = self.get_id(txn).await? {\n id\n } else {\n return Ok(());\n };\n"},{"Del":" ) -> Result<(), anyhow::Error> {\n"},{"Del":" &mut self,\n repo: &mut Repository,\n txn: &mut T,\n channel: &mut ChannelRef,\n state: Merkle,\n"},{"Del":" pub async fn clone_state(\n"},{"Del":" Ok(())\n }\n\n"},{"Del":" self.complete_changes(repo, txn, channel, &hashes, false)\n .await?;\n"},{"Del":"\n"},{"Del":" }\n"},{"Del":"\n Ok(())\n })\n .await?;\n"},{"Del":" }\n"},{"Del":" while let Some(cs) = stream.try_next().await? {\n if let CS::Change(hash) = cs {\n let mut channel = channel.write();\n txn.apply_change_rec_ws(&repo.changes, &mut channel, &hash, &mut ws)?;\n }\n\n hashes.push(cs);\n"},{"Del":"\n"},{"Del":" let mut ws = ApplyWorkspace::new();\n"},{"Del":"\n"},{"Del":" self.download_changes_with(download_bar, &repo.changes_dir, false, |cx| async move {\n let stream = download_changes_rec(&cx, repo, tag.iter().cloned().map(CS::Change));\n pin_mut!(stream);\n"},{"Del":"\n"},{"Del":" {\n let txn = &mut *txn;\n let hashes = &mut hashes;\n"},{"Del":"\n"},{"Del":" let mut hashes = Vec::new();\n"},{"Del":"\n"},{"Del":" let download_bar = ProgressBar::new(tag.len() as u64, DOWNLOAD_MESSAGE)?;\n"},{"Del":" tag: &[Hash],\n ) -> Result<(), anyhow::Error> {\n"},{"Del":" channel: &ChannelRef,\n"},{"Del":" txn: &mut T,\n"},{"Del":" repo: &Repository,\n"},{"Del":" &mut self,\n"},{"Del":" pub async fn clone_tag(\n"},{"Del":"\n"},{"Del":" for item in items {\n let item = *item.borrow();\n tasks.push(make_download_job(item));\n"},{"Del":"\n"},{"Del":" };\n"},{"Del":" }\n"},{"Del":" // there is probably a way to model this using futures, but I\n // couldn't find a nice way to do it\n // so here, have three funny collections\n\n let mut pending_deps = HashMap::>::new();\n let mut rev_deps = HashMap::>::new();\n let mut fetched = HashSet::new();\n\n let make_download_job = |cs| async move {\n match cx.download(cs) {\n Ok(v) => (cs, v.await),\n Err(e) => (cs, Err(e)),\n"},{"Del":"\n"},{"Del":"fn download_changes_rec<'a, I>(\n cx: &'a DownloadContext,\n repo: &'a Repository,\n items: I,\n) -> impl Stream> + 'a\nwhere\n I: IntoIterator + 'a,\n I::Item: Borrow,\n{\n try_stream(move |sender| async move {\n let mut tasks = FuturesUnordered::new();\n"},{"Del":"\n"},{"Del":" Ok(result)\n"},{"Del":" debug!(\"finished\");\n"},{"Del":" }\n }\n"},{"Del":" let mut result = Vec::with_capacity(to_apply_inodes.len());\n for h in to_apply {\n if to_apply_inodes.contains(&h) {\n result.push(*h)\n"},{"Del":"\n"},{"Del":" }\n"},{"Del":"\n"},{"Del":" let mut ws = ApplyWorkspace::new();\n\n while let Some(h) = stream.try_next().await? {\n debug!(\"to_apply: {:?}\", h);\n\n let mut touches_inodes = inodes.is_empty();\n"},{"Del":"\n"}]}}],"owner":"dblsaiko","repo":"pijul","token":"yfmReeWtNP5I+6cJSrzyEHQgjNuWQ3xxZcFfA03rHeY=","login":null}

…

Dependencies

Change contents