##// END OF EJS Templates
convert/p4: win32 fixes...
Patrick Mezard -
r8063:ee8d9b93 default
parent child Browse files
Show More
@@ -45,7 +45,7 b' class p4_source(converter_source):'
45
45
46 def _parse_view(self, path):
46 def _parse_view(self, path):
47 "Read changes affecting the path"
47 "Read changes affecting the path"
48 cmd = "p4 -G changes -s submitted '%s'" % path
48 cmd = 'p4 -G changes -s submitted "%s"' % path
49 stdout = util.popen(cmd)
49 stdout = util.popen(cmd)
50 for d in loaditer(stdout):
50 for d in loaditer(stdout):
51 c = d.get("change", None)
51 c = d.get("change", None)
@@ -64,7 +64,7 b' class p4_source(converter_source):'
64 else:
64 else:
65 views = {"//": ""}
65 views = {"//": ""}
66 else:
66 else:
67 cmd = "p4 -G client -o '%s'" % path
67 cmd = 'p4 -G client -o "%s"' % path
68 clientspec = marshal.load(util.popen(cmd))
68 clientspec = marshal.load(util.popen(cmd))
69
69
70 views = {}
70 views = {}
@@ -139,7 +139,7 b' class p4_source(converter_source):'
139 return self.heads
139 return self.heads
140
140
141 def getfile(self, name, rev):
141 def getfile(self, name, rev):
142 cmd = "p4 -G print '%s#%s'" % (self.depotname[name], rev)
142 cmd = 'p4 -G print "%s#%s"' % (self.depotname[name], rev)
143 stdout = util.popen(cmd)
143 stdout = util.popen(cmd)
144
144
145 mode = None
145 mode = None
@@ -63,9 +63,9 b" hg -R dst log --template 'rev=#rev# desc"
63
63
64 echo % interesting names
64 echo % interesting names
65 echo dddd > "d d"
65 echo dddd > "d d"
66 mkdir " e "
66 mkdir " e"
67 echo fff >" e /f "
67 echo fff >" e/ f"
68 p4 add "d d" " e /f "
68 p4 add "d d" " e/ f"
69 p4 submit -d "add d e f"
69 p4 submit -d "add d e f"
70
70
71 echo % convert again
71 echo % convert again
@@ -62,10 +62,10 b' rev=1 desc="change a" tags="" files="a"'
62 rev=0 desc="initial" tags="" files="a b/c"
62 rev=0 desc="initial" tags="" files="a b/c"
63 % interesting names
63 % interesting names
64 //depot/test-mercurial-import/d d#1 - opened for add
64 //depot/test-mercurial-import/d d#1 - opened for add
65 //depot/test-mercurial-import/ e /f #1 - opened for add
65 //depot/test-mercurial-import/ e/ f#1 - opened for add
66 Submitting change 5.
66 Submitting change 5.
67 Locking 2 files ...
67 Locking 2 files ...
68 add //depot/test-mercurial-import/ e /f #1
68 add //depot/test-mercurial-import/ e/ f#1
69 add //depot/test-mercurial-import/d d#1
69 add //depot/test-mercurial-import/d d#1
70 Change 5 submitted.
70 Change 5 submitted.
71 % convert again
71 % convert again
@@ -80,7 +80,7 b' scanning source...'
80 sorting...
80 sorting...
81 converting...
81 converting...
82 0 add d e f
82 0 add d e f
83 rev=4 desc="add d e f" tags="tip" files=" e /f d d"
83 rev=4 desc="add d e f" tags="tip" files=" e/ f d d"
84 rev=3 desc="change a b/c" tags="" files="a b/c"
84 rev=3 desc="change a b/c" tags="" files="a b/c"
85 rev=2 desc="change b/c" tags="" files="b/c"
85 rev=2 desc="change b/c" tags="" files="b/c"
86 rev=1 desc="change a" tags="" files="a"
86 rev=1 desc="change a" tags="" files="a"
General Comments 0
You need to be logged in to leave comments. Login now