Mercurial > hg
comparison tests/test-patch.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 | d60e4f227d75 |
| children | 75be14993fda |
comparison
equal
deleted
inserted
replaced
| 15193:a84e3ed661cb | 15194:0705f2ac79d6 |
|---|---|
| 35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 36 | 36 |
| 37 $ hg --cwd b import -v ../a.diff | 37 $ hg --cwd b import -v ../a.diff |
| 38 applying ../a.diff | 38 applying ../a.diff |
| 39 Using custom patch | 39 Using custom patch |
| 40 | 40 applied to working directory |
| 41 | 41 |
| 42 Issue2417: hg import with # comments in description | 42 Issue2417: hg import with # comments in description |
| 43 | 43 |
| 44 Prepare source repo and patch: | 44 Prepare source repo and patch: |
| 45 | 45 |