import: simplify status reporting logic (and make it more I18N-friendly)
The old code printed (with ui.status()) the changeset ID created by patch N after committing patch N+1, e.g. applying patch1 applying patch2 applied 1d4bd90af0e4 where 1d4bd90af0e4 is the changeset ID resulting from patch1. That's just weird. It's also inconsistent: we only reported the changeset ID when applying >1 patches. And it's inconsistent with 'commit', which only tells you the new changeset ID in verbose mode. Finally, the existing code was I18N-hostile, since it concatenated translated strings. The new way is to print the just-created changeset ID with ui.note() immediately after committing it. It also clarifies what the user message is for easier I18N.
Showing
- mercurial/commands.py 8 additions, 11 deletionsmercurial/commands.py
- tests/test-import-bypass.t 0 additions, 2 deletionstests/test-import-bypass.t
- tests/test-import.t 11 additions, 3 deletionstests/test-import.t
- tests/test-patch-offset.t 1 addition, 0 deletionstests/test-patch-offset.t
- tests/test-patch.t 1 addition, 1 deletiontests/test-patch.t
Loading
Please register or sign in to comment