Mercurial > hg
comparison hgext/histedit.py @ 17750:bb6149f1db83
histedit: update bookmark movement notice
New format is:
histedit: moving bookmarks <bookmark> from <old> to <new>
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Wed, 10 Oct 2012 05:54:38 +0200 |
| parents | 40601f2b7608 |
| children | fec69c72e2b4 |
comparison
equal
deleted
inserted
replaced
| 17749:40601f2b7608 | 17750:bb6149f1db83 |
|---|---|
| 693 if old in tmpnodes or old in created: | 693 if old in tmpnodes or old in created: |
| 694 # can't have any metadata we'd want to update | 694 # can't have any metadata we'd want to update |
| 695 return | 695 return |
| 696 while new in replacemap: | 696 while new in replacemap: |
| 697 new = replacemap[new] | 697 new = replacemap[new] |
| 698 ui.note(_('histedit: %s to %s\n') % (node.short(old), | |
| 699 node.short(new))) | |
| 700 octx = repo[old] | 698 octx = repo[old] |
| 701 marks = octx.bookmarks() | 699 marks = octx.bookmarks() |
| 702 if marks: | 700 if marks: |
| 703 ui.note(_('histedit: moving bookmarks %s\n') % | |
| 704 ', '.join(marks)) | |
| 705 for mark in marks: | 701 for mark in marks: |
| 702 ui.note(_('histedit: moving bookmarks %s from %s to %s\n') | |
| 703 % (mark, octx, node.short(new))) | |
| 706 repo._bookmarks[mark] = new | 704 repo._bookmarks[mark] = new |
| 707 bookmarks.write(repo) | 705 bookmarks.write(repo) |
| 708 | 706 |
| 709 # We assume that bookmarks on the tip should remain | 707 # We assume that bookmarks on the tip should remain |
| 710 # tipmost, but bookmarks on non-tip changesets should go | 708 # tipmost, but bookmarks on non-tip changesets should go |