Mercurial > hg
annotate tests/test-hybridencode.py @ 14050:9e8a9d45945c stable
subrepo: handle svn tracked/unknown directory collisions
This happens more often than expected. Say you have an svn subrepository with
python code. Python would have generated unknown .pyc files. Now, you rebase
this setup on a revision where a directory containing python code does not
exist. Subversion is first asked to remove this directory when updating, but
will not because it contains untracked items. Then it will have to bring back
the directory after the merge but will fail because it now collides with an
untracked directory.
Using --force is not very elegant and only works with svn >= 1.5 but the only
alternative I can think of is to write our own purge command for subversion.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 04 Mar 2011 14:00:49 +0100 |
parents | 4c50552fc9bc |
children | 81b115385bc7 |
rev | line source |
---|---|
7275
c00cdac22d3c
add new test-hybridencode.py
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
1 from mercurial import store |
c00cdac22d3c
add new test-hybridencode.py
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
2 |
12687
34d8247a4595
store: encode first period or space in filenames (issue1713)
Adrian Buehlmann <adrian@cadifra.com>
parents:
8659
diff
changeset
|
3 auxencode = lambda f: store._auxencode(f, True) |
34d8247a4595
store: encode first period or space in filenames (issue1713)
Adrian Buehlmann <adrian@cadifra.com>
parents:
8659
diff
changeset
|
4 hybridencode = lambda f: store._hybridencode(f, auxencode) |
34d8247a4595
store: encode first period or space in filenames (issue1713)
Adrian Buehlmann <adrian@cadifra.com>
parents:
8659
diff
changeset
|
5 |
34d8247a4595
store: encode first period or space in filenames (issue1713)
Adrian Buehlmann <adrian@cadifra.com>
parents:
8659
diff
changeset
|
6 enc = hybridencode # used for 'dotencode' repo format |
7275
c00cdac22d3c
add new test-hybridencode.py
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
7 |
c00cdac22d3c
add new test-hybridencode.py
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
8 def show(s): |
c00cdac22d3c
add new test-hybridencode.py
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
9 print "A = '%s'" % s |
c00cdac22d3c
add new test-hybridencode.py
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
10 print "B = '%s'" % enc(s) |
c00cdac22d3c
add new test-hybridencode.py
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
11 print |
c00cdac22d3c
add new test-hybridencode.py
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
12 |
c00cdac22d3c
add new test-hybridencode.py
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
13 show('data/aux.bla/bla.aux/prn/PRN/lpt/com3/nul/coma/foo.NUL/normal.c.i') |
c00cdac22d3c
add new test-hybridencode.py
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
14 |
8659
1a6d702e059d
test-hybridencode: break long string literals
Martin Geisler <mg@lazybytes.net>
parents:
7515
diff
changeset
|
15 show('data/AUX/SECOND/X.PRN/FOURTH/FI:FTH/SIXTH/SEVENTH/EIGHTH/NINETH/' |
1a6d702e059d
test-hybridencode: break long string literals
Martin Geisler <mg@lazybytes.net>
parents:
7515
diff
changeset
|
16 'TENTH/ELEVENTH/LOREMIPSUM.TXT.i') |
1a6d702e059d
test-hybridencode: break long string literals
Martin Geisler <mg@lazybytes.net>
parents:
7515
diff
changeset
|
17 show('data/enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/' |
1a6d702e059d
test-hybridencode: break long string literals
Martin Geisler <mg@lazybytes.net>
parents:
7515
diff
changeset
|
18 'wsdlExtension/src/main/java/META-INF/services/org.netbeans.modules' |
1a6d702e059d
test-hybridencode: break long string literals
Martin Geisler <mg@lazybytes.net>
parents:
7515
diff
changeset
|
19 '.xml.wsdl.bindingsupport.spi.ExtensibilityElementTemplateProvider.i') |
1a6d702e059d
test-hybridencode: break long string literals
Martin Geisler <mg@lazybytes.net>
parents:
7515
diff
changeset
|
20 show('data/AUX.THE-QUICK-BROWN-FOX-JU:MPS-OVER-THE-LAZY-DOG-THE-QUICK-' |
1a6d702e059d
test-hybridencode: break long string literals
Martin Geisler <mg@lazybytes.net>
parents:
7515
diff
changeset
|
21 'BROWN-FOX-JUMPS-OVER-THE-LAZY-DOG.TXT.i') |
1a6d702e059d
test-hybridencode: break long string literals
Martin Geisler <mg@lazybytes.net>
parents:
7515
diff
changeset
|
22 show('data/Project Planning/Resources/AnotherLongDirectoryName/' |
1a6d702e059d
test-hybridencode: break long string literals
Martin Geisler <mg@lazybytes.net>
parents:
7515
diff
changeset
|
23 'Followedbyanother/AndAnother/AndThenAnExtremelyLongFileName.txt') |
1a6d702e059d
test-hybridencode: break long string literals
Martin Geisler <mg@lazybytes.net>
parents:
7515
diff
changeset
|
24 show('data/Project.Planning/Resources/AnotherLongDirectoryName/' |
1a6d702e059d
test-hybridencode: break long string literals
Martin Geisler <mg@lazybytes.net>
parents:
7515
diff
changeset
|
25 'Followedbyanother/AndAnother/AndThenAnExtremelyLongFileName.txt') |
12687
34d8247a4595
store: encode first period or space in filenames (issue1713)
Adrian Buehlmann <adrian@cadifra.com>
parents:
8659
diff
changeset
|
26 show('data/foo.../foo / /a./_. /__/.x../ bla/.FOO/something.i') |
34d8247a4595
store: encode first period or space in filenames (issue1713)
Adrian Buehlmann <adrian@cadifra.com>
parents:
8659
diff
changeset
|
27 |