Mercurial > hg
comparison mercurial/localrepo.py @ 10371:eacfff116e17
strip apostrophes from an error messages
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Sun, 07 Feb 2010 15:09:02 +0100 |
| parents | 0d64b30b35c3 |
| children | 9be6c5900c07 |
comparison
equal
deleted
inserted
replaced
| 10370:c050b7e4e778 | 10371:eacfff116e17 |
|---|---|
| 1562 branch = self[n].branch() | 1562 branch = self[n].branch() |
| 1563 localbrheads.setdefault(branch, []).append(n) | 1563 localbrheads.setdefault(branch, []).append(n) |
| 1564 | 1564 |
| 1565 newbranches = list(set(localbrheads) - set(remotebrheads)) | 1565 newbranches = list(set(localbrheads) - set(remotebrheads)) |
| 1566 if newbranches: # new branch requires --force | 1566 if newbranches: # new branch requires --force |
| 1567 branchnames = ', '.join("'%s'" % b for b in newbranches) | 1567 branchnames = ', '.join("%s" % b for b in newbranches) |
| 1568 self.ui.warn(_("abort: push creates " | 1568 self.ui.warn(_("abort: push creates " |
| 1569 "new remote branches: %s!\n") | 1569 "new remote branches: %s!\n") |
| 1570 % branchnames) | 1570 % branchnames) |
| 1571 # propose 'push -b .' in the msg too? | 1571 # propose 'push -b .' in the msg too? |
| 1572 self.ui.status(_("(use 'hg push -f' to force)\n")) | 1572 self.ui.status(_("(use 'hg push -f' to force)\n")) |