Mercurial > hg
comparison mercurial/discovery.py @ 11493:cc4e2a7ca23f
Merge with stable
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Fri, 02 Jul 2010 11:30:57 +0200 |
| parents | d420ff348c49 |
| children | 7ecf4a082c5f |
comparison
equal
deleted
inserted
replaced
| 11428:8b452fe4bf50 | 11493:cc4e2a7ca23f |
|---|---|
| 278 | 278 |
| 279 # 2. Check for new branches on the remote. | 279 # 2. Check for new branches on the remote. |
| 280 remotemap = remote.branchmap() | 280 remotemap = remote.branchmap() |
| 281 newbranches = branches - set(remotemap) | 281 newbranches = branches - set(remotemap) |
| 282 if newbranches and not newbranch: # new branch requires --new-branch | 282 if newbranches and not newbranch: # new branch requires --new-branch |
| 283 branchnames = ', '.join("%s" % b for b in newbranches) | 283 branchnames = ', '.join(sorted(newbranches)) |
| 284 repo.ui.warn(_("abort: push creates " | 284 repo.ui.warn(_("abort: push creates " |
| 285 "new remote branches: %s!\n") | 285 "new remote branches: %s!\n") |
| 286 % branchnames) | 286 % branchnames) |
| 287 repo.ui.status(_("(use 'hg push --new-branch' to create new " | 287 repo.ui.status(_("(use 'hg push --new-branch' to create new " |
| 288 "remote branches)\n")) | 288 "remote branches)\n")) |