Mercurial > hg
view tests/test-mq-qdelete.t @ 13047:6c375e07d673
branch: operate on branch names in local string space where possible
Previously, branch names were ideally manipulated as UTF-8 strings,
because they were stored as UTF-8 in the dirstate and the changelog
and could not be safely converted to the local encoding and back.
However, only about 80% of branch name code was actually using the
right encoding conventions. This patch uses the localstr addition to
allow working on branch names as local strings, which simplifies
handling so that the previously incorrect code becomes correct.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 24 Nov 2010 15:56:32 -0600 |
parents | 97d7ee445e98 |
children | d7b4d421b56c |
line wrap: on
line source
$ echo "[extensions]" >> $HGRCPATH $ echo "mq=" >> $HGRCPATH $ hg init a $ cd a $ echo 'base' > base $ hg ci -Ambase -d '1 0' adding base $ hg qnew -d '1 0' a $ hg qnew -d '1 0' b $ hg qnew -d '1 0' c $ hg qdel abort: qdelete requires at least one revision or patch name [255] $ hg qdel c abort: cannot delete applied patch c [255] $ hg qpop popping c now at: b Delete the same patch twice in one command (issue2427) $ hg qdel c c $ hg qseries a b $ ls .hg/patches a b series status $ hg qpop popping b now at: a $ hg qdel -k 1 $ ls .hg/patches a b series status $ hg qdel -r a patch a finalized without changeset message $ hg qapplied $ hg log --template '{rev} {desc}\n' 1 [mq]: a 0 base $ hg qnew d $ hg qnew e $ hg qnew f $ hg qdel -r e abort: cannot delete revision 3 above applied patches [255] $ hg qdel -r qbase:e patch d finalized without changeset message patch e finalized without changeset message $ hg qapplied f $ hg log --template '{rev} {desc}\n' 4 [mq]: f 3 [mq]: e 2 [mq]: d 1 [mq]: a 0 base $ cd .. $ hg init b $ cd b $ echo 'base' > base $ hg ci -Ambase -d '1 0' adding base $ hg qfinish abort: no revisions specified [255] $ hg qfinish -a no patches applied $ hg qnew -d '1 0' a $ hg qnew -d '1 0' b $ hg qnew c # XXX fails to apply by /usr/bin/patch if we put a date $ hg qfinish 0 abort: revision 0 is not managed [255] $ hg qfinish b abort: cannot delete revision 2 above applied patches [255] $ hg qpop popping c now at: b $ hg qfinish -a c abort: unknown revision 'c'! [255] $ hg qpush applying c patch c is empty now at: c $ hg qfinish qbase:b patch a finalized without changeset message patch b finalized without changeset message $ hg qapplied c $ hg log --template '{rev} {desc}\n' 3 imported patch c 2 [mq]: b 1 [mq]: a 0 base $ hg qfinish -a c patch c finalized without changeset message $ hg qapplied $ hg log --template '{rev} {desc}\n' 3 imported patch c 2 [mq]: b 1 [mq]: a 0 base $ ls .hg/patches series status qdel -k X && hg qimp -e X used to trigger spurious output with versioned queues $ hg init --mq $ hg qimport -r 3 $ hg qpop popping 3.diff patch queue now empty $ hg qdel -k 3.diff $ hg qimp -e 3.diff adding 3.diff to series file $ hg qfinish -a no patches applied