Show More
@@ -328,9 +328,6 b' class convert_cvs(converter_source):' | |||||
328 | self.ui.warn(_("cvs server: %s\n") % line[2:]) |
|
328 | self.ui.warn(_("cvs server: %s\n") % line[2:]) | |
329 | elif line.startswith("Remove"): |
|
329 | elif line.startswith("Remove"): | |
330 | l = self.readp.readline() |
|
330 | l = self.readp.readline() | |
331 | l = self.readp.readline() |
|
|||
332 | if l != "ok\n": |
|
|||
333 | raise util.Abort(_("unknown CVS response: %s") % l) |
|
|||
334 | else: |
|
331 | else: | |
335 | raise util.Abort(_("unknown CVS response: %s") % line) |
|
332 | raise util.Abort(_("unknown CVS response: %s") % line) | |
336 |
|
333 |
@@ -734,7 +734,7 b' class memctx(object):' | |||||
734 | parents = [(p or nullid) for p in parents] |
|
734 | parents = [(p or nullid) for p in parents] | |
735 | p1, p2 = parents |
|
735 | p1, p2 = parents | |
736 | self._parents = [changectx(self._repo, p) for p in (p1, p2)] |
|
736 | self._parents = [changectx(self._repo, p) for p in (p1, p2)] | |
737 |
files = util.sort( |
|
737 | files = util.sort(util.unique(files)) | |
738 | self._status = [files, [], [], [], []] |
|
738 | self._status = [files, [], [], [], []] | |
739 | self._filectxfn = filectxfn |
|
739 | self._filectxfn = filectxfn | |
740 |
|
740 |
@@ -61,6 +61,9 b' def auxencode(path):' | |||||
61 | # encode third letter ('aux' -> 'au~78') |
|
61 | # encode third letter ('aux' -> 'au~78') | |
62 | ec = "~%02x" % ord(n[2]) |
|
62 | ec = "~%02x" % ord(n[2]) | |
63 | n = n[0:2] + ec + n[3:] |
|
63 | n = n[0:2] + ec + n[3:] | |
|
64 | if n[-1] in '. ': | |||
|
65 | # encode last period or space ('foo...' -> 'foo..~2e') | |||
|
66 | n = n[:-1] + "~%02x" % ord(n[-1]) | |||
64 | res.append(n) |
|
67 | res.append(n) | |
65 | return '/'.join(res) |
|
68 | return '/'.join(res) | |
66 |
|
69 | |||
@@ -111,6 +114,9 b' def hybridencode(path):' | |||||
111 | sdirs = [] |
|
114 | sdirs = [] | |
112 | for p in parts[:-1]: |
|
115 | for p in parts[:-1]: | |
113 | d = p[:DIR_PREFIX_LEN] |
|
116 | d = p[:DIR_PREFIX_LEN] | |
|
117 | if d[-1] in '. ': | |||
|
118 | # Windows can't access dirs ending in period or space | |||
|
119 | d = d[:-1] + '_' | |||
114 | t = '/'.join(sdirs) + '/' + d |
|
120 | t = '/'.join(sdirs) + '/' + d | |
115 | if len(t) > _MAX_SHORTENED_DIRS_LEN: |
|
121 | if len(t) > _MAX_SHORTENED_DIRS_LEN: | |
116 | break |
|
122 | break |
@@ -14,3 +14,6 b" show('data/aux.bla/bla.aux/prn/PRN/lpt/c" | |||||
14 | show('data/AUX/SECOND/X.PRN/FOURTH/FI:FTH/SIXTH/SEVENTH/EIGHTH/NINETH/TENTH/ELEVENTH/LOREMIPSUM.TXT.i') |
|
14 | show('data/AUX/SECOND/X.PRN/FOURTH/FI:FTH/SIXTH/SEVENTH/EIGHTH/NINETH/TENTH/ELEVENTH/LOREMIPSUM.TXT.i') | |
15 | show('data/enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/wsdlExtension/src/main/java/META-INF/services/org.netbeans.modules.xml.wsdl.bindingsupport.spi.ExtensibilityElementTemplateProvider.i') |
|
15 | show('data/enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/wsdlExtension/src/main/java/META-INF/services/org.netbeans.modules.xml.wsdl.bindingsupport.spi.ExtensibilityElementTemplateProvider.i') | |
16 | show('data/AUX.THE-QUICK-BROWN-FOX-JU:MPS-OVER-THE-LAZY-DOG-THE-QUICK-BROWN-FOX-JUMPS-OVER-THE-LAZY-DOG.TXT.i') |
|
16 | show('data/AUX.THE-QUICK-BROWN-FOX-JU:MPS-OVER-THE-LAZY-DOG-THE-QUICK-BROWN-FOX-JUMPS-OVER-THE-LAZY-DOG.TXT.i') | |
|
17 | show('data/Project Planning/Resources/AnotherLongDirectoryName/Followedbyanother/AndAnother/AndThenAnExtremelyLongFileName.txt') | |||
|
18 | show('data/Project.Planning/Resources/AnotherLongDirectoryName/Followedbyanother/AndAnother/AndThenAnExtremelyLongFileName.txt') | |||
|
19 | show('data/foo.../foo / /a./_. /__/.x../ bla/something.i') |
@@ -10,3 +10,12 b" B = 'dh/enterpri/openesba/contrib-/corba" | |||||
10 | A = 'data/AUX.THE-QUICK-BROWN-FOX-JU:MPS-OVER-THE-LAZY-DOG-THE-QUICK-BROWN-FOX-JUMPS-OVER-THE-LAZY-DOG.TXT.i' |
|
10 | A = 'data/AUX.THE-QUICK-BROWN-FOX-JU:MPS-OVER-THE-LAZY-DOG-THE-QUICK-BROWN-FOX-JUMPS-OVER-THE-LAZY-DOG.TXT.i' | |
11 | B = 'dh/au~78.the-quick-brown-fox-ju~3amps-over-the-lazy-dog-the-quick-brown-fox-jud4dcadd033000ab2b26eb66bae1906bcb15d4a70.i' |
|
11 | B = 'dh/au~78.the-quick-brown-fox-ju~3amps-over-the-lazy-dog-the-quick-brown-fox-jud4dcadd033000ab2b26eb66bae1906bcb15d4a70.i' | |
12 |
|
12 | |||
|
13 | A = 'data/Project Planning/Resources/AnotherLongDirectoryName/Followedbyanother/AndAnother/AndThenAnExtremelyLongFileName.txt' | |||
|
14 | B = 'dh/project_/resource/anotherl/followed/andanoth/andthenanextremelylongfilenaf93030515d9849cfdca52937c2204d19f83913e5.txt' | |||
|
15 | ||||
|
16 | A = 'data/Project.Planning/Resources/AnotherLongDirectoryName/Followedbyanother/AndAnother/AndThenAnExtremelyLongFileName.txt' | |||
|
17 | B = 'dh/project_/resource/anotherl/followed/andanoth/andthenanextremelylongfilena0fd7c506f5c9d58204444fc67e9499006bd2d445.txt' | |||
|
18 | ||||
|
19 | A = 'data/foo.../foo / /a./_. /__/.x../ bla/something.i' | |||
|
20 | B = 'data/foo..~2e/foo ~20/~20/a~2e/__.~20/____/.x.~2e/ bla/something.i' | |||
|
21 |
General Comments 0
You need to be logged in to leave comments.
Login now