Mercurial > hg
comparison mercurial/destutil.py @ 32698:1b5c61d38a52
update: show the commit to which we updated in case of multiple heads (BC)
Currently when we have multiple heads on the same branch, update tells us that
there some more heads for the current branch but does not tells us the head to
which the repository has been updated to. It makes more sense showing the
head we updated to and then telling there are some more heads.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Tue, 06 Jun 2017 22:17:39 +0530 |
| parents | b9942bc6b292 |
| children | 4f49810a1011 |
comparison
equal
deleted
inserted
replaced
| 32697:19b9fc40cc51 | 32698:1b5c61d38a52 |
|---|---|
| 389 (len(otherheads))) | 389 (len(otherheads))) |
| 390 else: | 390 else: |
| 391 ui.warn(_('(committing will reopen branch "%s")\n') % | 391 ui.warn(_('(committing will reopen branch "%s")\n') % |
| 392 (currentbranch)) | 392 (currentbranch)) |
| 393 elif otherheads: | 393 elif otherheads: |
| 394 curhead = repo['.'] | |
| 395 ui.status(_('updated to "%s: %s"\n') % (curhead, | |
| 396 curhead.description().split('\n')[0])) | |
| 394 ui.status(_('%i other heads for branch "%s"\n') % | 397 ui.status(_('%i other heads for branch "%s"\n') % |
| 395 (len(otherheads), currentbranch)) | 398 (len(otherheads), currentbranch)) |
| 396 | 399 |
| 397 def statusotherdests(ui, repo): | 400 def statusotherdests(ui, repo): |
| 398 """Print message about other head""" | 401 """Print message about other head""" |