ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-16 02:22:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ignore hashes while comparing file updates.

Browse Source
This commit is contained in:
C. Guy Yarvin 2014-08-04 17:38:38 -07:00
parent 9b6b5d5c1e
commit d341ec529f
1 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
v/unix.c
View File

@ -741,6 +741,7 @@ _unix_dir_ankh_file(u2_noun pam, u2_noun wib, u2_noun baw, u2_noun woz)
}
return pam;
}
/* _unix_dir_ankh(): resolve directory to new style ankh.
*/
static u2_noun
@ -808,6 +809,78 @@ _unix_desk_peek(u2_noun hox,
}
}
/* _unix_ankh_sing_map(): compare ankh maps for u2_ankh_sing().
*/
static u2_bean _unix_ankh_sing_in(u2_noun, u2_noun);
static u2_bean
_unix_ankh_sing_map(u2_noun mun, u2_noun mur) // retain
{
u2_noun n_mun, l_mun, r_mun;
u2_noun n_mur, l_mur, r_mur;
if ( (u2_nul == mun) && (u2_nul == mur) ) { return u2_yes; }
if ( (u2_nul == mun) || (u2_nul == mur) ) { return u2_no; }
u2_cx_trel(mun, &n_mun, &l_mun, &r_mun);
u2_cx_trel(mur, &n_mur, &l_mur, &r_mur);
if ( (u2_no == (u2_sing(u2h(n_mun), u2h(n_mur)))) ||
(u2_no == _unix_ankh_sing_in(u2t(n_mun), u2t(n_mur))) ||
(u2_no == _unix_ankh_sing_map(l_mun, l_mur)) ||
(u2_no == _unix_ankh_sing_map(r_mun, r_mur)) )
{
return u2_no;
} else return u2_yes;
}
/* _unix_node_sing(): test node equality.
*/
static u2_bean
_unix_node_sing(u2_noun xud, u2_noun bud)
{
if ( (u2_nul == xud) && (u2_nul == bud) ) { return u2_yes; }
if ( (u2_nul == xud) || (u2_nul == bud) ) { return u2_no; }
return u2_sing(u2t(u2t(xud)), u2t(u2t(bud)));
}
/* _unix_ankh_sing_in(): stupid ankh test which ignores broken hash.
*/
static u2_bean
_unix_ankh_sing_in(u2_noun xun, u2_noun bur) // retain
{
u2_noun p_xun, q_xun, r_xun;
u2_noun p_bur, q_bur, r_bur;
u2_cx_trel(xun, &p_xun, &q_xun, &r_xun);
u2_cx_trel(bur, &p_bur, &q_bur, &r_bur);
if ( u2_no == _unix_node_sing(q_xun, q_bur) ) {
return u2_no;
}
return _unix_ankh_sing_map(r_xun, r_bur);
}
/* _unix_ankh_sing(): full ankh compare.
*/
static u2_bean
_unix_ankh_sing(u2_noun xun, u2_noun bur) // retain
{
if ( u2_yes == u2_sing(xun, bur) ) {
return u2_yes;
} else {
if ( u2_no == _unix_ankh_sing_in(xun, bur) ) {
// fprintf(stderr, "uas: no, no (%x, %x)\r\n", u2_mug(xun), u2_mug(bur));
return u2_no;
}
else {
// fprintf(stderr, "uas: no, yes\r\n");
return u2_yes;
}
}
}
/* _unix_desk_sync_into(): sync external changes to desk.
*/
static void
@ -821,7 +894,9 @@ _unix_desk_sync_into(u2_noun who,
xun = _unix_dir_ankh(dir_u);
bur = _unix_desk_peek(hox, u2k(syd), u2k(u2A->wen));
if ( u2_no == u2_sing(xun, bur) ) {
if ( (u2_no == u2_sing(xun, bur)) &&
(u2_no == _unix_ankh_sing(xun, bur)) )
{
doz = u2_dc("cost", xun, bur);
pax = u2nq(u2_blip, c3__sync, u2k(u2A->sen), u2_nul);