view tests/test-bookmarks-current @ 11715:4f9dfb54c8b5 stable

qpush --move: move the right patch even with comment lines

88fc876a4833 caused that we find the index of the moving patch in self.series
but look it up in self.full_series. The difference between these is that
full_series also contains comment lines, and we thus moved the wrong patch.

Use back self.full_series to find the moving patch, but take care of striping
the patch guard markers before comparing the patch name. Test cases have been
added for comments and empty lines in self.full_series, and for the case of
guarded patches.

Original patch contributed by Mads Kiilerich <[e-mail]>

#!/bin/sh

echo "[extensions]" >> $HGRCPATH
echo "bookmarks=" >> $HGRCPATH

echo "[bookmarks]" >> $HGRCPATH
echo "track.current = True" >> $HGRCPATH

hg init

echo % no bookmarks
hg bookmarks

echo % set bookmark X
hg bookmark X

echo % list bookmarks
hg bookmark

echo % list bookmarks with color
hg --config extensions.color= --config color.mode=ansi \
    bookmark --color=always

echo % update to bookmark X
hg update X

echo % list bookmarks
hg bookmarks

echo % rename
hg bookmark -m X Z

echo % list bookmarks
hg bookmarks

echo % new bookmark Y
hg bookmark Y

echo % list bookmarks
hg bookmark

echo % commit
echo 'b' > b
hg add b
hg commit -m'test'

echo % list bookmarks
hg bookmark

echo % delete bookmarks
hg bookmark -d Y
hg bookmark -d Z

echo % list bookmarks
hg bookmark

echo % update to tip
hg update tip

echo % set bookmark Y using -r .
hg bookmark -r . Y

echo % list bookmarks
hg bookmark