##// END OF EJS Templates
Merge
Bryan O'Sullivan -
r17713:2c638277 merge default
parent child Browse files
Show More
@@ -116,6 +116,7 b' for i in [0, 1]:'
116 116 utestpats[i].append((p, m))
117 117
118 118 utestfilters = [
119 (r"<<(\S+)((.|\n)*?\n > \1)", rephere),
119 120 (r"( *)(#([^\n]*\S)?)", repcomment),
120 121 ]
121 122
@@ -5,7 +5,8 b''
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 import getopt
8 import getopt, util
9 from i18n import _
9 10
10 11 def gnugetopt(args, options, longoptions):
11 12 """Parse options mostly like getopt.gnu_getopt.
@@ -105,7 +106,11 b' def fancyopts(args, options, state, gnu='
105 106 if t is type(fancyopts):
106 107 state[name] = defmap[name](val)
107 108 elif t is type(1):
108 state[name] = int(val)
109 try:
110 state[name] = int(val)
111 except ValueError:
112 raise util.Abort(_('invalid value %r for option %s, '
113 'expected int') % (val, opt))
109 114 elif t is type(''):
110 115 state[name] = val
111 116 elif t is type([]):
@@ -162,19 +162,6 b''
162 162 tests/autodiff.py:0:
163 163 > ui.write('data lost for: %s\n' % fn)
164 164 warning: unwrapped ui message
165 tests/test-convert-mtn.t:0:
166 > > function get_passphrase(keypair_id)
167 don't use 'function', use old style
168 tests/test-import-git.t:0:
169 > > Mc\${NkU|\`?^000jF3jhEB
170 ^ must be quoted
171 tests/test-import.t:0:
172 > > diff -Naur proj-orig/foo proj-new/foo
173 don't use 'diff -N'
174 don't use 'diff -N'
175 tests/test-schemes.t:0:
176 > > z = file:\$PWD/
177 don't use $PWD, use `pwd`
178 165 tests/test-ui-color.py:0:
179 166 > testui.warn('warning\n')
180 167 warning: unwrapped ui message
@@ -117,3 +117,43 b' Non fncache repo:'
117 117 .hg/undo.dirstate
118 118 $ cd ..
119 119
120 #if no-windows
121
122 Encoding of reserved / long paths in the store
123
124 $ hg init r2
125 $ cd r2
126 $ cat <<EOF > .hg/hgrc
127 > [ui]
128 > portablefilenames = ignore
129 > EOF
130
131 $ DIR="bla.aux/prn/PRN/lpt/com3/nul/coma/foo.NUL"
132 $ mkdir -p "$DIR"
133 $ echo foo > "$DIR/normal.c"
134 $ DIR="AUX/SECOND/X.PRN/FOURTH/FI:FTH/SIXTH/SEVENTH/EIGHTH/NINETH/TENTH/ELEVENTH"
135 $ mkdir -p "$DIR"
136 $ echo foo > "$DIR/LOREMIPSUM.TXT"
137 $ DIR="enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/wsdlExtension/src/main/java/META-INF/services"
138 $ mkdir -p "$DIR"
139 $ echo foo > "$DIR/org.netbeans.modules.xml.wsdl.bindingsupport.spi.ExtensibilityElementTemplateProvider"
140 $ DIR="Project Planning/Resources/AnotherLongDirectoryName/Followedbyanother/AndAnother"
141 $ mkdir -p "$DIR"
142 $ echo foo > "$DIR/AndThenAnExtremelyLongFileName.txt"
143 $ DIR="12345678/12345678/12345678/12345678/12345678/12345678/12345678/12345"
144 $ mkdir -p "$DIR"
145 $ echo foo > "$DIR/xxxxxxxxx-xxxxxxxxx-xxxxxxxxx-123456789-12.3456789-12345-ABCDEFGHIJKLMNOPRSTUVWXYZ-abcdefghjiklmnopqrstuvwxyz"
146 $ hg ci -qAm1
147 $ find .hg/store -name *.i | sort
148 .hg/store/00changelog.i
149 .hg/store/00manifest.i
150 .hg/store/data/bla.aux/pr~6e/_p_r_n/lpt/co~6d3/nu~6c/coma/foo._n_u_l/normal.c.i
151 .hg/store/dh/12345678/12345678/12345678/12345678/12345678/12345678/12345678/12345/xxxxxx168e07b38e65eff86ab579afaaa8e30bfbe0f35f.i
152 .hg/store/dh/au~78/second/x.prn/fourth/fi~3afth/sixth/seventh/eighth/nineth/tenth/loremia20419e358ddff1bf8751e38288aff1d7c32ec05.i
153 .hg/store/dh/enterpri/openesba/contrib-/corba-bc/netbeans/wsdlexte/src/main/java/org.net7018f27961fdf338a598a40c4683429e7ffb9743.i
154 .hg/store/dh/project_/resource/anotherl/followed/andanoth/andthenanextremelylongfilename0d8e1f4187c650e2f1fdca9fd90f786bc0976b6b.i
155
156 $ cd ..
157
158 #endif
159
@@ -602,6 +602,9 b' test -p0'
602 602 $ echo a > a
603 603 $ hg ci -Am t
604 604 adding a
605 $ hg import -p foo
606 abort: invalid value 'foo' for option -p, expected int
607 [255]
605 608 $ hg import -p0 - << EOF
606 609 > foobar
607 610 > --- a Sat Apr 12 22:43:58 2008 -0400
General Comments 0
You need to be logged in to leave comments. Login now