Mercurial > hg
view tests/test-branchmap @ 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 <mads@kiilerich.com>
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Sat, 10 Jul 2010 21:23:00 +0200 |
parents | 7bb004fc14ec |
children |
line wrap: on
line source
#!/bin/sh hgserve() { hg serve -a localhost -p $HGPORT1 -d --pid-file=hg.pid -E errors.log -v $@ \ | sed -e 's/:[0-9][0-9]*//g' -e 's/http:\/\/[^/]*\//http:\/\/localhost\//' cat hg.pid >> "$DAEMON_PIDS" } hg init a hg --encoding utf-8 -R a branch æ echo foo > a/foo hg -R a ci -Am foo hgserve -R a --config web.push_ssl=False --config web.allow_push=* --encoding latin1 hg --encoding utf-8 clone http://localhost:$HGPORT1 b hg --encoding utf-8 -R b log echo bar >> b/foo hg -R b ci -m bar hg --encoding utf-8 -R b push | sed "s/$HGPORT1/PORT/" hg -R a --encoding utf-8 log kill `cat hg.pid` # verify 7e7d56fe4833 (encoding fallback in branchmap to maintain compatibility with 1.3.x) cat <<EOF > oldhg import sys from mercurial import ui, hg, commands class StdoutWrapper(object): def __init__(self, stdout): self._file = stdout def write(self, data): if data == '47\n': # latin1 encoding is one %xx (3 bytes) shorter data = '44\n' elif data.startswith('%C3%A6 '): # translate to latin1 encoding data = '%%E6 %s' % data[7:] self._file.write(data) def __getattr__(self, name): return getattr(self._file, name) sys.stdout = StdoutWrapper(sys.stdout) sys.stderr = StdoutWrapper(sys.stderr) myui = ui.ui() repo = hg.repository(myui, 'a') commands.serve(myui, repo, stdio=True) EOF echo baz >> b/foo hg -R b ci -m baz hg push -R b -e 'python oldhg' ssh://dummy/ --encoding latin1