Mercurial > hg > gcmultimerge

comparison multimerge.py @ 64:c4b8d934d7ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix list of event fields to compare for equality.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 11 Jul 2016 14:04:50 +0300
parents 6e38692e341f
children 1eefa9b5e945
comparison
equal deleted inserted replaced
63:6e38692e341f 64:c4b8d934d7ab
123 if event["gcm_id"] == id: 123 if event["gcm_id"] == id:
124 return event 124 return event
125 return None 125 return None
126 126
127 127
128 gcm_no_compare_fields = [u"id", u"iCalUID"] 128 gcm_no_compare_fields = [u"id", u"iCalUID", "etag", "sequence", "created", "htmlLink", "gcm_cal_id", "organizer", "updated"]
129 129
130 def gcm_compare_events(ev1, ev2): 130 def gcm_compare_events(ev1, ev2):
131 for field in ev1: 131 for field in ev1:
132 if not field in gcm_no_compare_fields and ev1[field] != ev2[field]: 132 if not field in gcm_no_compare_fields and ev1[field] != ev2[field]:
133 return False 133 return False