Mercurial > hg-stable
changeset 10371:eacfff116e17
strip apostrophes from an error messages
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Sun, 07 Feb 2010 15:09:02 +0100 |
| parents | c050b7e4e778 |
| children | 27d542bc0f5b |
| files | mercurial/localrepo.py tests/test-push-warn.out |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Sun Feb 07 14:53:17 2010 +0100 +++ b/mercurial/localrepo.py Sun Feb 07 15:09:02 2010 +0100 @@ -1564,7 +1564,7 @@ newbranches = list(set(localbrheads) - set(remotebrheads)) if newbranches: # new branch requires --force - branchnames = ', '.join("'%s'" % b for b in newbranches) + branchnames = ', '.join("%s" % b for b in newbranches) self.ui.warn(_("abort: push creates " "new remote branches: %s!\n") % branchnames)
--- a/tests/test-push-warn.out Sun Feb 07 14:53:17 2010 +0100 +++ b/tests/test-push-warn.out Sun Feb 07 15:09:02 2010 +0100 @@ -84,23 +84,23 @@ % push on existing branch and new branch pushing to ../f searching for changes -abort: push creates new remote branches: 'c'! +abort: push creates new remote branches: c! (use 'hg push -f' to force) 1 pushing to ../f searching for changes -abort: push creates new remote branches: 'c'! +abort: push creates new remote branches: c! (use 'hg push -f' to force) 1 % multiple new branches pushing to ../f searching for changes -abort: push creates new remote branches: 'c', 'd'! +abort: push creates new remote branches: c, d! (use 'hg push -f' to force) 1 pushing to ../f searching for changes -abort: push creates new remote branches: 'd'! +abort: push creates new remote branches: d! (use 'hg push -f' to force) 1 % fail on multiple head push