311 self.ui.debug("Info: %s %s %s %s\n" % (frompath, froment, ent, entrypath)) |
311 self.ui.debug("Info: %s %s %s %s\n" % (frompath, froment, ent, entrypath)) |
312 |
312 |
313 fromkind = svn.ra.check_path(self.ra, entrypath, fromrev) |
313 fromkind = svn.ra.check_path(self.ra, entrypath, fromrev) |
314 if fromkind == svn.core.svn_node_file: # a deleted file |
314 if fromkind == svn.core.svn_node_file: # a deleted file |
315 entries.append(self.recode(entry)) |
315 entries.append(self.recode(entry)) |
316 else: |
316 elif fromkind == svn.core.svn_node_dir: |
317 # print "Deleted/moved non-file:", revnum, path, ent |
317 # print "Deleted/moved non-file:", revnum, path, ent |
318 # children = self._find_children(path, revnum - 1) |
318 # children = self._find_children(path, revnum - 1) |
319 # print "find children %s@%d from %d action %s" % (path, revnum, ent.copyfrom_rev, ent.action) |
319 # print "find children %s@%d from %d action %s" % (path, revnum, ent.copyfrom_rev, ent.action) |
320 # Sometimes this is tricky. For example: in |
320 # Sometimes this is tricky. For example: in |
321 # The Subversion Repository revision 6940 a dir |
321 # The Subversion Repository revision 6940 a dir |
341 if entry in copies: |
341 if entry in copies: |
342 # deleted file within a copy |
342 # deleted file within a copy |
343 del copies[entry] |
343 del copies[entry] |
344 else: |
344 else: |
345 entries.append(entry) |
345 entries.append(entry) |
|
346 else: |
|
347 self.ui.debug('unknown path in revision %d: %s\n' % \ |
|
348 (revnum, path)) |
346 elif kind == svn.core.svn_node_dir: |
349 elif kind == svn.core.svn_node_dir: |
347 # Should probably synthesize normal file entries |
350 # Should probably synthesize normal file entries |
348 # and handle as above to clean up copy/rename handling. |
351 # and handle as above to clean up copy/rename handling. |
349 |
352 |
350 # If the directory just had a prop change, |
353 # If the directory just had a prop change, |