Show More
@@ -77,7 +77,7 b' def localsub(s, a, b=None):' | |||||
77 | return u.encode(_encoding, _encodingmode) |
|
77 | return u.encode(_encoding, _encodingmode) | |
78 | except UnicodeDecodeError, inst: |
|
78 | except UnicodeDecodeError, inst: | |
79 | sub = s[max(0, inst.start-10), inst.start+10] |
|
79 | sub = s[max(0, inst.start-10), inst.start+10] | |
80 |
raise Abort(_("decoding near '%s': %s! |
|
80 | raise Abort(_("decoding near '%s': %s!") % (sub, inst)) | |
81 |
|
81 | |||
82 | # used by parsedate |
|
82 | # used by parsedate | |
83 | defaultdateformats = ( |
|
83 | defaultdateformats = ( | |
@@ -650,7 +650,7 b' def audit_path(path):' | |||||
650 | parts = os.path.normcase(path).split(os.sep) |
|
650 | parts = os.path.normcase(path).split(os.sep) | |
651 | if (os.path.splitdrive(path)[0] or parts[0] in ('.hg', '') |
|
651 | if (os.path.splitdrive(path)[0] or parts[0] in ('.hg', '') | |
652 | or os.pardir in parts): |
|
652 | or os.pardir in parts): | |
653 |
raise Abort(_("path contains illegal component: %s |
|
653 | raise Abort(_("path contains illegal component: %s") % path) | |
654 |
|
654 | |||
655 | def _makelock_file(info, pathname): |
|
655 | def _makelock_file(info, pathname): | |
656 | ld = os.open(pathname, os.O_CREAT | os.O_WRONLY | os.O_EXCL) |
|
656 | ld = os.open(pathname, os.O_CREAT | os.O_WRONLY | os.O_EXCL) |
@@ -284,19 +284,14 b' M d1/b' | |||||
284 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
284 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
285 | # check illegal path components |
|
285 | # check illegal path components | |
286 | abort: path contains illegal component: .hg/foo |
|
286 | abort: path contains illegal component: .hg/foo | |
287 |
|
||||
288 | abort: ../foo not under root |
|
287 | abort: ../foo not under root | |
289 | abort: path contains illegal component: .hg/foo |
|
288 | abort: path contains illegal component: .hg/foo | |
290 |
|
||||
291 | ! d1/d11/a1 |
|
289 | ! d1/d11/a1 | |
292 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
290 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
293 | abort: path contains illegal component: .hg/a1 |
|
291 | abort: path contains illegal component: .hg/a1 | |
294 |
|
||||
295 | abort: ../a1 not under root |
|
292 | abort: ../a1 not under root | |
296 | abort: path contains illegal component: .hg/a1 |
|
293 | abort: path contains illegal component: .hg/a1 | |
297 |
|
||||
298 | ! d1/d11/a1 |
|
294 | ! d1/d11/a1 | |
299 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
295 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
300 | abort: path contains illegal component: .hg/foo |
|
296 | abort: path contains illegal component: .hg/foo | |
301 |
|
||||
302 | abort: ../../../foo not under root |
|
297 | abort: ../../../foo not under root |
@@ -164,7 +164,6 b' hg debugwalk .hg' | |||||
164 | hg debugwalk ../.hg |
|
164 | hg debugwalk ../.hg | |
165 | abort: path contains illegal component: .hg |
|
165 | abort: path contains illegal component: .hg | |
166 |
|
166 | |||
167 |
|
||||
168 | cd .. |
|
167 | cd .. | |
169 |
|
168 | |||
170 | hg debugwalk -Ibeans |
|
169 | hg debugwalk -Ibeans | |
@@ -197,15 +196,12 b' abort: beans/../.. not under root' | |||||
197 | hg debugwalk .hg |
|
196 | hg debugwalk .hg | |
198 | abort: path contains illegal component: .hg |
|
197 | abort: path contains illegal component: .hg | |
199 |
|
198 | |||
200 |
|
||||
201 | hg debugwalk beans/../.hg |
|
199 | hg debugwalk beans/../.hg | |
202 | abort: path contains illegal component: .hg |
|
200 | abort: path contains illegal component: .hg | |
203 |
|
201 | |||
204 |
|
||||
205 | hg debugwalk beans/../.hg/data |
|
202 | hg debugwalk beans/../.hg/data | |
206 | abort: path contains illegal component: .hg/data |
|
203 | abort: path contains illegal component: .hg/data | |
207 |
|
204 | |||
208 |
|
||||
209 | hg debugwalk beans/.hg |
|
205 | hg debugwalk beans/.hg | |
210 | beans/.hg: No such file or directory |
|
206 | beans/.hg: No such file or directory | |
211 |
|
207 |
General Comments 0
You need to be logged in to leave comments.
Login now