Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/patch.py @ 26549:1a680ccdb09a
extract: assign message only once
This return is shared between the two cases. We can move it earlier.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 06 Oct 2015 02:04:46 -0700 |
| parents | 25a58881efdd |
| children | 72782f60dbc9 |
comparison
equal
deleted
inserted
replaced
| 26548:25a58881efdd | 26549:1a680ccdb09a |
|---|---|
| 260 os.unlink(tmpname) | 260 os.unlink(tmpname) |
| 261 raise | 261 raise |
| 262 | 262 |
| 263 if subject and not message.startswith(subject): | 263 if subject and not message.startswith(subject): |
| 264 message = '%s\n%s' % (subject, message) | 264 message = '%s\n%s' % (subject, message) |
| 265 data['message'] = message | |
| 265 tmpfp.close() | 266 tmpfp.close() |
| 266 if not diffs_seen: | 267 if not diffs_seen: |
| 267 os.unlink(tmpname) | 268 os.unlink(tmpname) |
| 268 data['message'] = message | |
| 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 |
| 276 p1 = parents.pop(0) | 276 p1 = parents.pop(0) |
| 277 if parents: | 277 if parents: |
| 278 p2 = parents.pop(0) | 278 p2 = parents.pop(0) |
| 279 | 279 |
| 280 data['filename'] = tmpname | 280 data['filename'] = tmpname |
| 281 data['message'] = message | |
| 282 data['user'] = user | 281 data['user'] = user |
| 283 data['date'] = date | 282 data['date'] = date |
| 284 data['branch'] = branch | 283 data['branch'] = branch |
| 285 data['nodeid'] = nodeid | 284 data['nodeid'] = nodeid |
| 286 data['p1'] = p1 | 285 data['p1'] = p1 |