Mercurial > hg-stable
changeset 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 |
| files | hgext/histedit.py tests/test-histedit-bookmark-motion.t |
| diffstat | 2 files changed, 11 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/histedit.py Wed Oct 10 06:20:14 2012 +0200 +++ b/hgext/histedit.py Wed Oct 10 05:54:38 2012 +0200 @@ -695,14 +695,12 @@ return while new in replacemap: new = replacemap[new] - ui.note(_('histedit: %s to %s\n') % (node.short(old), - node.short(new))) octx = repo[old] marks = octx.bookmarks() if marks: - ui.note(_('histedit: moving bookmarks %s\n') % - ', '.join(marks)) for mark in marks: + ui.note(_('histedit: moving bookmarks %s from %s to %s\n') + % (mark, octx, node.short(new))) repo._bookmarks[mark] = new bookmarks.write(repo)
--- a/tests/test-histedit-bookmark-motion.t Wed Oct 10 06:20:14 2012 +0200 +++ b/tests/test-histedit-bookmark-motion.t Wed Oct 10 05:54:38 2012 +0200 @@ -85,16 +85,12 @@ > EOF $ hg histedit 1 --commands commands.txt --verbose | grep histedit histedit: Should update metadata for the following changes: - histedit: 055a42cdd887 to ae467701c500 - histedit: moving bookmarks three - histedit: 177f92b77385 to d36c0562f908 - histedit: moving bookmarks also-two, two - histedit: 652413bf663e to 0efacef7cb48 - histedit: moving bookmarks five - histedit: d2ae7f538514 to cb9a9f314b8b - histedit: moving bookmarks will-move-backwards - histedit: e860deea161a to ae467701c500 - histedit: moving bookmarks four + histedit: moving bookmarks three from 055a42cdd887 to ae467701c500 + histedit: moving bookmarks also-two from 177f92b77385 to d36c0562f908 + histedit: moving bookmarks two from 177f92b77385 to d36c0562f908 + histedit: moving bookmarks five from 652413bf663e to 0efacef7cb48 + histedit: moving bookmarks will-move-backwards from d2ae7f538514 to cb9a9f314b8b + histedit: moving bookmarks four from e860deea161a to ae467701c500 saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-backup.hg (glob) saved backup bundle to $TESTTMP/r/.hg/strip-backup/34a9919932c1-backup.hg (glob) $ hg log --graph @@ -147,11 +143,9 @@ > EOF $ hg histedit 1 --commands commands.txt --verbose | grep histedit histedit: Should update metadata for the following changes: - histedit: 0efacef7cb48 to 1be9c35b4cb2 - histedit: moving bookmarks five - histedit: 0efacef7cb48 to 7c044e3e33a9 - histedit: ae467701c500 to 1be9c35b4cb2 - histedit: moving bookmarks four, three + histedit: moving bookmarks five from 0efacef7cb48 to 1be9c35b4cb2 + histedit: moving bookmarks four from ae467701c500 to 1be9c35b4cb2 + histedit: moving bookmarks three from ae467701c500 to 1be9c35b4cb2 saved backup bundle to $TESTTMP/r/.hg/strip-backup/ae467701c500-backup.hg (glob) We expect 'five' to stay at tip, since the tipmost bookmark is most