comparison tests/test-patch-offset.t @ 15194:0705f2ac79d6

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.
author Greg Ward <greg@gerg.ca>
date Sat, 01 Oct 2011 21:30:49 -0400
parents e68cd3a90599
children f2719b387380
comparison
equal deleted inserted replaced
15193:a84e3ed661cb 15194:0705f2ac79d6
67 patching file a 67 patching file a
68 Hunk #1 succeeded at 43 (offset 34 lines). 68 Hunk #1 succeeded at 43 (offset 34 lines).
69 Hunk #2 succeeded at 87 (offset 34 lines). 69 Hunk #2 succeeded at 87 (offset 34 lines).
70 Hunk #3 succeeded at 109 (offset 34 lines). 70 Hunk #3 succeeded at 109 (offset 34 lines).
71 a 71 a
72 created 189885cecb41
72 73
73 compare imported changes against reference file 74 compare imported changes against reference file
74 75
75 $ python ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A 76 $ python ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A
76 $ diff aref a 77 $ diff aref a