Mercurial > hg
changeset 29973:4ddb05751b12
discovery: use single quotes in use warning
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Tue, 20 Sep 2016 23:47:30 +0000 |
| parents | 392edab93b8a |
| children | 7109d5ddeb0c |
| files | mercurial/discovery.py tests/test-bookmarks-pushpull.t tests/test-obsolete-checkheads.t tests/test-phases-exchange.t tests/test-push-warn.t tests/test-subrepo.t |
| diffstat | 6 files changed, 26 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/discovery.py Tue Sep 20 23:47:02 2016 +0000 +++ b/mercurial/discovery.py Tue Sep 20 23:47:30 2016 +0000 @@ -401,7 +401,7 @@ errormsg = (_("push creates new branch '%s' " "with multiple heads") % (branch)) hint = _("merge or" - " see \"hg help push\" for details about" + " see 'hg help push' for details about" " pushing new heads") elif len(newhs) > len(oldhs): # remove bookmarked or existing remote heads from the new heads list @@ -420,11 +420,11 @@ ) % short(dhs[0]) if unsyncedheads: hint = _("pull and merge or" - " see \"hg help push\" for details about" + " see 'hg help push' for details about" " pushing new heads") else: hint = _("merge or" - " see \"hg help push\" for details about" + " see 'hg help push' for details about" " pushing new heads") if branch is None: repo.ui.note(_("new remote heads:\n"))
--- a/tests/test-bookmarks-pushpull.t Tue Sep 20 23:47:02 2016 +0000 +++ b/tests/test-bookmarks-pushpull.t Tue Sep 20 23:47:30 2016 +0000 @@ -427,7 +427,7 @@ pushing to http://localhost:$HGPORT2/ searching for changes abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] $ hg -R ../a book @ 1:0d2164f0ce0d @@ -443,7 +443,7 @@ pushing to http://localhost:$HGPORT2/ searching for changes abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] $ hg -R ../a book @ 1:0d2164f0ce0d @@ -733,7 +733,7 @@ searching for changes remote has heads on branch 'default' that are not known locally: a2a606d9ff1b abort: push creates new remote head 54694f811df9 with bookmark 'X'! - (pull and merge or see "hg help push" for details about pushing new heads) + (pull and merge or see 'hg help push' for details about pushing new heads) [255] $ cd ../addmarks
--- a/tests/test-obsolete-checkheads.t Tue Sep 20 23:47:02 2016 +0000 +++ b/tests/test-obsolete-checkheads.t Tue Sep 20 23:47:30 2016 +0000 @@ -93,7 +93,7 @@ pushing to $TESTTMP/remote (glob) searching for changes abort: push creates new remote head 71e3228bffe1! - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] old head is now public (public remote version) @@ -153,7 +153,7 @@ pushing to $TESTTMP/remote (glob) searching for changes abort: push creates new remote head d7d41ccbd4de! - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255]
--- a/tests/test-phases-exchange.t Tue Sep 20 23:47:02 2016 +0000 +++ b/tests/test-phases-exchange.t Tue Sep 20 23:47:30 2016 +0000 @@ -920,7 +920,7 @@ pushing to ../mu searching for changes abort: push creates new remote head 435b5d83910c! - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] $ hg push -fr 435b5d83910c ../mu # because the push will create new visible head pushing to ../mu
--- a/tests/test-push-warn.t Tue Sep 20 23:47:02 2016 +0000 +++ b/tests/test-push-warn.t Tue Sep 20 23:47:30 2016 +0000 @@ -32,7 +32,7 @@ searching for changes remote has heads on branch 'default' that are not known locally: 1c9246a22a0a abort: push creates new remote head 1e108cc5548c! - (pull and merge or see "hg help push" for details about pushing new heads) + (pull and merge or see 'hg help push' for details about pushing new heads) [255] $ hg push --debug ../a @@ -50,7 +50,7 @@ new remote heads on branch 'default': 1e108cc5548c abort: push creates new remote head 1e108cc5548c! - (pull and merge or see "hg help push" for details about pushing new heads) + (pull and merge or see 'hg help push' for details about pushing new heads) [255] $ hg pull ../a @@ -66,7 +66,7 @@ pushing to ../a searching for changes abort: push creates new remote head 1e108cc5548c! - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] $ hg merge @@ -119,7 +119,7 @@ pushing to ../c searching for changes abort: push creates new remote head 6346d66eb9f5! - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] $ hg push -r 2 ../c @@ -132,7 +132,7 @@ pushing to ../c searching for changes abort: push creates new remote head a5dda829a167! - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] $ hg push -v -r 3 -r 4 ../c @@ -142,7 +142,7 @@ a5dda829a167 ee8fbc7a0295 abort: push creates new remote head a5dda829a167! - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] $ hg push -v -f -r 3 -r 4 ../c @@ -276,7 +276,7 @@ pushing to ../f searching for changes abort: push creates new remote head 0b715ef6ff8f on branch 'a'! - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] Push replacement head on existing branches: @@ -381,7 +381,7 @@ pushing to ../f searching for changes abort: push creates new branch 'f' with multiple heads - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] $ hg push --branch f --new-branch --force ../f pushing to ../f @@ -425,7 +425,7 @@ searching for changes remote has heads on branch 'default' that are not known locally: 534543e22c29 764f8ec07b96 afe7cc7679f5 ce4212fc8847 abort: push creates new remote head 97bd0c84d346! - (pull and merge or see "hg help push" for details about pushing new heads) + (pull and merge or see 'hg help push' for details about pushing new heads) [255] $ hg -R h up -q 0; echo x > h/b; hg -R h ci -qAmx $ hg -R i push h @@ -433,7 +433,7 @@ searching for changes remote has heads on branch 'default' that are not known locally: 18ddb72c4590 534543e22c29 764f8ec07b96 afe7cc7679f5 and 1 others abort: push creates new remote head 97bd0c84d346! - (pull and merge or see "hg help push" for details about pushing new heads) + (pull and merge or see 'hg help push' for details about pushing new heads) [255] $ hg -R i push h -v pushing to h @@ -442,7 +442,7 @@ new remote heads on branch 'default': 97bd0c84d346 abort: push creates new remote head 97bd0c84d346! - (pull and merge or see "hg help push" for details about pushing new heads) + (pull and merge or see 'hg help push' for details about pushing new heads) [255] @@ -513,7 +513,7 @@ pushing to ../l searching for changes abort: push creates new remote head 451211cc22b0 on branch 'a'! - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] $ cd .. @@ -763,14 +763,14 @@ pushing to inner searching for changes abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'! - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] $ hg push inner -r4 -r5 pushing to inner searching for changes abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'! - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] $ hg in inner @@ -786,7 +786,7 @@ searching for changes running fail-push hook abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'! - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] $ cd ..
--- a/tests/test-subrepo.t Tue Sep 20 23:47:02 2016 +0000 +++ b/tests/test-subrepo.t Tue Sep 20 23:47:30 2016 +0000 @@ -516,7 +516,7 @@ pushing subrepo s to $TESTTMP/t/s searching for changes abort: push creates new remote head 12a213df6fa9! (in subrepo s) - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] $ hg push -f pushing to $TESTTMP/t (glob) @@ -952,7 +952,7 @@ $ hg -R repo2 ci -m3 $ hg -q -R repo2 push abort: push creates new remote head cc505f09a8b2! (in subrepo s) - (merge or see "hg help push" for details about pushing new heads) + (merge or see 'hg help push' for details about pushing new heads) [255] $ hg -R repo update 0 files updated, 0 files merged, 0 files removed, 0 files unresolved