Mercurial > hg
view tests/test-mq-pull-from-bundle.t @ 40757:2f14d1bbc9a7
match: remove obsolete catching of OverflowError
Since 0f6a1bdf89fb (match: handle large regexes, 2007-08-19), we catch
an OverflowError from the regex engine and split up the regex if that
happens. In 59a9dc9562e2 (ignore: split up huge patterns, 2008-02-11),
that was extended to raise an OverflowError in our code even if the
regex engine doesn't raise it. It's unclear if there was a range of
regex sizes where the OverflowError would be raised from the regex
engine but that were still below the limit we added in our
code. Either way, both limitations were probably removed in Python
2.7.4 when the regex code width was extended from 16bit to 32bit (or
Py_UCS4) integer (thanks to Yuya for finding that out).
If at least the first limitation was removed, we no longer should be
using OverflowError for flow control, so this patch changes that.
Differential Revision: https://phab.mercurial-scm.org/D5309
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 28 Nov 2018 10:12:50 -0800 |
parents | 89630d0b3e23 |
children |
line wrap: on
line source
#require repobundlerepo $ cat <<EOF >> $HGRCPATH > [extensions] > mq= > [alias] > tlog = log --template "{rev}: {node|short} {desc}\\n" > theads = heads --template "{rev}: {desc}\\n" > tincoming = incoming --template "{rev}: {desc}\\n" > EOF Setup main: $ hg init base $ cd base $ echo "One" > one $ hg add adding one $ hg ci -m "main: one added" $ echo "++" >> one $ hg ci -m "main: one updated" Bundle main: $ hg bundle --base=null ../main.hg 2 changesets found $ cd .. Incoming to fresh repo: $ hg init fresh $ hg -R fresh tincoming main.hg comparing with main.hg 0: main: one added 1: main: one updated $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true $ hg -R fresh tincoming bundle:fresh+main.hg comparing with bundle:fresh+main.hg 0: main: one added 1: main: one updated Setup queue: $ cd base $ hg qinit -c $ hg qnew -m "patch: two added" two.patch $ echo two > two $ hg add adding two $ hg qrefresh $ hg qcommit -m "queue: two.patch added" $ hg qpop -a popping two.patch patch queue now empty Bundle queue: $ hg -R .hg/patches bundle --base=null ../queue.hgq 1 changesets found $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true $ cd .. Clone base: $ hg clone base copy updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd copy $ hg qinit -c Incoming queue bundle: $ hg -R .hg/patches tincoming ../queue.hgq comparing with ../queue.hgq 0: queue: two.patch added $ test -f .hg/hg-bundle* && echo 'temp. bundle file remained' || true Pull queue bundle: $ hg -R .hg/patches pull --update ../queue.hgq pulling from ../queue.hgq requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 3 changes to 3 files new changesets d7553909353d (1 drafts) merging series 2 files updated, 1 files merged, 0 files removed, 0 files unresolved $ test -f .hg/patches/hg-bundle* && echo 'temp. bundle file remained' || true $ hg -R .hg/patches theads 0: queue: two.patch added $ hg -R .hg/patches tlog 0: d7553909353d queue: two.patch added $ hg qseries two.patch $ cd .. Clone base again: $ hg clone base copy2 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd copy2 $ hg qinit -c Unbundle queue bundle: $ hg -R .hg/patches unbundle --update ../queue.hgq adding changesets adding manifests adding file changes added 1 changesets with 3 changes to 3 files new changesets d7553909353d (1 drafts) merging series 2 files updated, 1 files merged, 0 files removed, 0 files unresolved $ hg -R .hg/patches theads 0: queue: two.patch added $ hg -R .hg/patches tlog 0: d7553909353d queue: two.patch added $ hg qseries two.patch $ cd ..