Mercurial > hg > gcmultimerge

comparison multimerge.py @ 66:b08d159e35c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sanitize gcm_no_compare_fields[]
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 11 Jul 2016 18:40:17 +0300
parents 1eefa9b5e945
children c582522d2dcc
comparison
equal deleted inserted replaced
65:1eefa9b5e945 66:b08d159e35c7
30 30
31 31
32 ### 32 ###
33 ### Misc. helper functions 33 ### Misc. helper functions
34 ### 34 ###
35 gcm_no_compare_fields = [
36 "id", "iCalUID", "etag", "sequence", "gcm_cal_id",
37 "created", "updated", "htmlLink", "organizer",
38 ]
39
35 40
36 ## Wrapper for print() that does not break when redirecting stdin/out 41 ## Wrapper for print() that does not break when redirecting stdin/out
37 ## because of piped output not having a defined encoding. We default 42 ## because of piped output not having a defined encoding. We default
38 ## to UTF-8 encoding in output here. 43 ## to UTF-8 encoding in output here.
39 def gcm_print(smsg): 44 def gcm_print(smsg):
123 if event["gcm_id"] == id: 128 if event["gcm_id"] == id:
124 return event 129 return event
125 return None 130 return None
126 131
127 132
128 gcm_no_compare_fields = [u"id", u"iCalUID", "etag", "sequence", "created", "htmlLink", "gcm_cal_id", "organizer", "updated"]
129 133
130 def gcm_compare_events(ev1, ev2): 134 def gcm_compare_events(ev1, ev2):
131 for field in ev1: 135 for field in ev1:
132 if not field in gcm_no_compare_fields and ev1[field] != ev2[field]: 136 if not field in gcm_no_compare_fields and ev1[field] != ev2[field]:
133 return False 137 return False