Mercurial > hg > cc > cirrus_work
diff bin/merge_date.py @ 109:52c6a9b0fc8c
loosen must-match criterion in the both-messy case
| author | Henry Thompson <ht@markup.co.uk> |
|---|---|
| date | Tue, 19 Sep 2023 19:29:41 +0100 |
| parents | 40c460fed99f |
| children | 4a52585a1aac |
line wrap: on
line diff
--- a/bin/merge_date.py Tue Sep 19 19:28:34 2023 +0100 +++ b/bin/merge_date.py Tue Sep 19 19:29:41 2023 +0100 @@ -111,10 +111,8 @@ for xp in (xkey, xdate, xurl)))) messyU, xkey1, xkey2 = keys(xkey) if messyD: - noMatch = (ddate != xdate or - not dkey.startswith(xkey1) or - (xkey2 is not None and dkey!=xkey2) or - durl!=xurl) + noMatch = (not dkey.startswith(xkey1) or + (xkey2 is not None and dkey!=xkey2)) if messyU: # better match if noMatch: @@ -163,10 +161,13 @@ " dkey: %s\n" " xdate: %s\n" " ddate: %s\n" + " xurl: %s\n" + " durl: %s\n" "dfq: %s\n" "k1, k2: |%s|%s|\n" "FN: %s XCNT: %s DCNT: %s\n" "xl: %s"%(messyD, messyU, xkey, dkey, xdate, ddate, + xurl, durl, (b'\n '.join(dfq)).decode('ascii'), xkey1, xkey2, FN, XCNT, DCNT, xl)) NF.write(xl)