comparison mercurial/patch.py @ 26548:25a58881efdd

extract: simplify parents assignement We move to the more standard style of: value = default if special: value = other This is more consistent and compact.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 06 Oct 2015 02:04:06 -0700
parents b9be8ab6e628
children 1a680ccdb09a
comparison
equal deleted inserted replaced
26547:b9be8ab6e628 26548:25a58881efdd
269 data['user'] = user 269 data['user'] = user
270 data['date'] = date 270 data['date'] = date
271 data['branch'] = branch 271 data['branch'] = branch
272 return data 272 return data
273 273
274 p1 = p2 = None
274 if parents: 275 if parents:
275 p1 = parents.pop(0) 276 p1 = parents.pop(0)
276 else: 277 if parents:
277 p1 = None 278 p2 = parents.pop(0)
278
279 if parents:
280 p2 = parents.pop(0)
281 else:
282 p2 = None
283 279
284 data['filename'] = tmpname 280 data['filename'] = tmpname
285 data['message'] = message 281 data['message'] = message
286 data['user'] = user 282 data['user'] = user
287 data['date'] = date 283 data['date'] = date