Mercurial > hg

comparison tests/test-import-bypass.t @ 15194:0705f2ac79d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 59e8bc22506e
children 62dc0e7ab092
comparison
equal deleted inserted replaced
15193:a84e3ed661cb 15194:0705f2ac79d6
169 $ hg up 0 169 $ hg up 0
170 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 170 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
171 $ hg import --bypass ../patch1.diff ../patch2.diff 171 $ hg import --bypass ../patch1.diff ../patch2.diff
172 applying ../patch1.diff 172 applying ../patch1.diff
173 applying ../patch2.diff 173 applying ../patch2.diff
174 applied 16581080145e
175 $ shortlog 174 $ shortlog
176 o 3:bc8ca3f8a7c4 test 0 0 - default - addf 175 o 3:bc8ca3f8a7c4 test 0 0 - default - addf
177 | 176 |
178 o 2:16581080145e test 0 0 - default - adde 177 o 2:16581080145e test 0 0 - default - adde
179 | 178 |
194 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 193 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
195 $ cd repo-multi2 194 $ cd repo-multi2
196 $ hg import --bypass --exact ../patch1.diff ../patch2.diff 195 $ hg import --bypass --exact ../patch1.diff ../patch2.diff
197 applying ../patch1.diff 196 applying ../patch1.diff
198 applying ../patch2.diff 197 applying ../patch2.diff
199 applied 16581080145e
200 $ shortlog 198 $ shortlog
201 o 3:d60cb8989666 test 0 0 - foo - addf 199 o 3:d60cb8989666 test 0 0 - foo - addf
202 | 200 |
203 | o 2:16581080145e test 0 0 - default - adde 201 | o 2:16581080145e test 0 0 - default - adde
204 | | 202 | |