Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 21959:dccbf52ffe9f stable
commands: make the warning message for "patch --partial" translatable
This patch makes the warning message for "patch --partial"
translatable: this message was introduced by bee0e1cffdd3, and there is
no reason to prevent this from being translatable.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Fri, 01 Aug 2014 02:14:24 +0900 |
| parents | 2122b82b6987 |
| children | c2863cfe8a8a f72b71ba756b |
comparison
equal
deleted
inserted
replaced
| 21958:9663a7855798 | 21959:dccbf52ffe9f |
|---|---|
| 3880 parents = repo.parents() | 3880 parents = repo.parents() |
| 3881 else: | 3881 else: |
| 3882 parents = [repo[node]] | 3882 parents = [repo[node]] |
| 3883 if rej: | 3883 if rej: |
| 3884 ui.write_err(_("patch applied partially\n")) | 3884 ui.write_err(_("patch applied partially\n")) |
| 3885 ui.write_err(("(fix the .rej files and run " | 3885 ui.write_err(_("(fix the .rej files and run " |
| 3886 "`hg commit --amend`)\n")) | 3886 "`hg commit --amend`)\n")) |
| 3887 ret = 1 | 3887 ret = 1 |
| 3888 break | 3888 break |
| 3889 | 3889 |
| 3890 if not haspatch: | 3890 if not haspatch: |
| 3891 raise util.Abort(_('%s: no diffs found') % patchurl) | 3891 raise util.Abort(_('%s: no diffs found') % patchurl) |