equal
deleted
inserted
replaced
2563 |
2563 |
2564 if not message: |
2564 if not message: |
2565 ph = patchheader(q.join(parent), q.plainmode) |
2565 ph = patchheader(q.join(parent), q.plainmode) |
2566 message, user = ph.message, ph.user |
2566 message, user = ph.message, ph.user |
2567 for msg in messages: |
2567 for msg in messages: |
2568 message.append('* * *') |
2568 if msg: |
2569 message.extend(msg) |
2569 if message: |
|
2570 message.append('* * *') |
|
2571 message.extend(msg) |
2570 message = '\n'.join(message) |
2572 message = '\n'.join(message) |
2571 |
2573 |
2572 if opts.get('edit'): |
2574 if opts.get('edit'): |
2573 message = ui.edit(message, user or ui.username()) |
2575 message = ui.edit(message, user or ui.username()) |
2574 |
2576 |