Show More
@@ -92,16 +92,18 b' class Imerge(object):' | |||||
92 |
|
92 | |||
93 | if not os.path.isdir(self.path): |
|
93 | if not os.path.isdir(self.path): | |
94 | os.mkdir(self.path) |
|
94 | os.mkdir(self.path) | |
95 |
|
|
95 | statusfile = self.opener('status', 'wb') | |
96 |
|
96 | |||
97 | out = [hex(n.node()) for n in self.parents] |
|
97 | out = [hex(n.node()) for n in self.parents] | |
98 | out.append(str(len(self.conflicts))) |
|
98 | out.append(str(len(self.conflicts))) | |
99 |
|
|
99 | conflicts = self.conflicts.items() | |
100 | out.append(f) |
|
100 | conflicts.sort() | |
101 | out.extend(self.conflicts[f]) |
|
101 | for fw, fd_fo in conflicts: | |
|
102 | out.append(fw) | |||
|
103 | out.extend(fd_fo) | |||
102 | out.extend(self.resolved) |
|
104 | out.extend(self.resolved) | |
103 |
|
105 | |||
104 |
|
|
106 | statusfile.write('\0'.join(out)) | |
105 |
|
107 | |||
106 | def remaining(self): |
|
108 | def remaining(self): | |
107 | return [f for f in self.conflicts if f not in self.resolved] |
|
109 | return [f for f in self.conflicts if f not in self.resolved] | |
@@ -164,7 +166,8 b' class Imerge(object):' | |||||
164 | if fn not in self.conflicts: |
|
166 | if fn not in self.conflicts: | |
165 | raise util.Abort('%s is not in the merge set' % fn) |
|
167 | raise util.Abort('%s is not in the merge set' % fn) | |
166 | resolved[fn] = True |
|
168 | resolved[fn] = True | |
167 |
self.resolved = |
|
169 | self.resolved = resolved.keys() | |
|
170 | self.resolved.sort() | |||
168 | self.save() |
|
171 | self.save() | |
169 | return 0 |
|
172 | return 0 | |
170 |
|
173 | |||
@@ -174,7 +177,8 b' class Imerge(object):' | |||||
174 | if fn not in resolved: |
|
177 | if fn not in resolved: | |
175 | raise util.Abort('%s is not resolved' % fn) |
|
178 | raise util.Abort('%s is not resolved' % fn) | |
176 | del resolved[fn] |
|
179 | del resolved[fn] | |
177 |
self.resolved = |
|
180 | self.resolved = resolved.keys() | |
|
181 | self.resolved.sort() | |||
178 | self.save() |
|
182 | self.save() | |
179 | return 0 |
|
183 | return 0 | |
180 |
|
184 | |||
@@ -264,7 +268,8 b' def dispatch(im, args, opts):' | |||||
264 | if not cmd: |
|
268 | if not cmd: | |
265 | raise cmdutil.UnknownCommand('imerge ' + c) |
|
269 | raise cmdutil.UnknownCommand('imerge ' + c) | |
266 | if len(cmd) > 1: |
|
270 | if len(cmd) > 1: | |
267 | raise cmdutil.AmbiguousCommand('imerge ' + c, sorted(cmd)) |
|
271 | cmd.sort() | |
|
272 | raise cmdutil.AmbiguousCommand('imerge ' + c, cmd) | |||
268 | cmd = cmd[0] |
|
273 | cmd = cmd[0] | |
269 |
|
274 | |||
270 | func = subcmdtable[cmd] |
|
275 | func = subcmdtable[cmd] |
General Comments 0
You need to be logged in to leave comments.
Login now