Mercurial > hg
changeset 19187:012be6c12ad8 stable
merge with i18n
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 13 May 2013 17:36:06 -0500 |
| parents | 8bed40e02c3b (diff) 36e0260867fb (current diff) |
| children | ddc7a6be2021 |
| files | |
| diffstat | 4 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Fri May 10 14:39:09 2013 -0300 +++ b/mercurial/commands.py Mon May 13 17:36:06 2013 -0500 @@ -943,6 +943,9 @@ Returns 0 on success. """ + if label: + label = label.strip() + if not opts.get('clean') and not label: ui.write("%s\n" % repo.dirstate.branch()) return
--- a/mercurial/help/config.txt Fri May 10 14:39:09 2013 -0300 +++ b/mercurial/help/config.txt Mon May 13 17:36:06 2013 -0500 @@ -85,6 +85,9 @@ be read. Mercurial checks each of these locations in the specified order until one or more configuration files are detected. +.. note:: The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial`` + is used when running 32-bit Python on 64-bit Windows. + Syntax ======
--- a/mercurial/pathencode.c Fri May 10 14:39:09 2013 -0300 +++ b/mercurial/pathencode.c Mon May 13 17:36:06 2013 -0500 @@ -696,7 +696,7 @@ return 0; } -#define MAXENCODE 4096 * 3 +#define MAXENCODE 4096 * 4 static PyObject *hashencode(const char *src, Py_ssize_t len) {
--- a/tests/test-branches.t Fri May 10 14:39:09 2013 -0300 +++ b/tests/test-branches.t Mon May 13 17:36:06 2013 -0500 @@ -68,6 +68,18 @@ abort: '\n' cannot be used in a name [255] +trailing or leading spaces should be stripped before testing duplicates + + $ hg branch 'b ' + abort: a branch of the same name already exists + (use 'hg update' to switch to it) + [255] + + $ hg branch ' b' + abort: a branch of the same name already exists + (use 'hg update' to switch to it) + [255] + verify update will accept invalid legacy branch names $ hg init test-invalid-branch-name