Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip apostrophes from an error messages
authorDirkjan Ochtman <dirkjan@ochtman.nl>
Sun, 07 Feb 2010 15:09:02 +0100
changeset 10371 eacfff116e17
parent 10370 c050b7e4e778
child 10372 27d542bc0f5b
strip apostrophes from an error messages
mercurial/localrepo.py file | annotate | diff | comparison | revisions
tests/test-push-warn.out file | annotate | diff | comparison | revisions 
--- 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
hg-stable