Show More
@@ -26,6 +26,7 class monotone_source(converter_source, | |||||
26 | self.add_file_re = re.compile(space + "add_file" + name + "content" + revision) |
|
26 | self.add_file_re = re.compile(space + "add_file" + name + "content" + revision) | |
27 | self.patch_re = re.compile(space + "patch" + name + "from" + revision + "to" + revision) |
|
27 | self.patch_re = re.compile(space + "patch" + name + "from" + revision + "to" + revision) | |
28 | self.rename_re = re.compile(space + "rename" + name + "to" + name) |
|
28 | self.rename_re = re.compile(space + "rename" + name + "to" + name) | |
|
29 | self.delete_re = re.compile(space + "delete" + name) | |||
29 | self.tag_re = re.compile(space + "tag" + name + "revision" + revision) |
|
30 | self.tag_re = re.compile(space + "tag" + name + "revision" + revision) | |
30 | self.cert_re = re.compile(lines + space + "name" + name + "value" + value) |
|
31 | self.cert_re = re.compile(lines + space + "name" + name + "value" + value) | |
31 |
|
32 | |||
@@ -137,6 +138,9 class monotone_source(converter_source, | |||||
137 | # Delete/rename is handled later when the convert engine |
|
138 | # Delete/rename is handled later when the convert engine | |
138 | # discovers an IOError exception from getfile, |
|
139 | # discovers an IOError exception from getfile, | |
139 | # but only if we add the "from" file to the list of changes. |
|
140 | # but only if we add the "from" file to the list of changes. | |
|
141 | m = self.delete_re.match(e) | |||
|
142 | if m: | |||
|
143 | files[m.group(1)] = rev | |||
140 | m = self.rename_re.match(e) |
|
144 | m = self.rename_re.match(e) | |
141 | if m: |
|
145 | if m: | |
142 | toname = m.group(2) |
|
146 | toname = m.group(2) |
@@ -69,7 +69,6 cd repo.mtn-hg | |||||
69 | hg up -C |
|
69 | hg up -C | |
70 | glog |
|
70 | glog | |
71 | echo % manifest |
|
71 | echo % manifest | |
72 | # BUG: c and dir/b should not appear here |
|
|||
73 | hg manifest |
|
72 | hg manifest | |
74 | echo % contents |
|
73 | echo % contents | |
75 | cat dir/a |
|
74 | cat dir/a |
@@ -32,18 +32,16 scanning source... | |||||
32 | sorting... |
|
32 | sorting... | |
33 | converting... |
|
33 | converting... | |
34 | 0 update2 |
|
34 | 0 update2 | |
35 |
|
|
35 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
36 | @ 2 "update2" files: bin bin2 e |
|
36 | @ 2 "update2" files: bin bin2 dir/b e | |
37 | | |
|
37 | | | |
38 | o 1 "update1" files: a bin dir/a dir/b |
|
38 | o 1 "update1" files: a bin c dir/a dir/b | |
39 | | |
|
39 | | | |
40 | o 0 "initialize" files: a bin c dir/b |
|
40 | o 0 "initialize" files: a bin c dir/b | |
41 |
|
41 | |||
42 | % manifest |
|
42 | % manifest | |
43 | bin2 |
|
43 | bin2 | |
44 | c |
|
|||
45 | dir/a |
|
44 | dir/a | |
46 | dir/b |
|
|||
47 | e |
|
45 | e | |
48 | % contents |
|
46 | % contents | |
49 | a |
|
47 | a |
General Comments 0
You need to be logged in to leave comments.
Login now