hgext/convert/subversion.py
changeset 4768 739fd34f5d66
parent 4767 d305852a5ec8
child 4769 03844af5ebcd
equal deleted inserted replaced
4767:d305852a5ec8 4768:739fd34f5d66
   158         svn_url = self.base + module
   158         svn_url = self.base + module
   159         self.ui.debug("reparent to %s\n" % svn_url.encode(self.encoding))
   159         self.ui.debug("reparent to %s\n" % svn_url.encode(self.encoding))
   160         svn.ra.reparent(self.ra, svn_url.encode(self.encoding))
   160         svn.ra.reparent(self.ra, svn_url.encode(self.encoding))
   161 
   161 
   162     def _fetch_revisions(self, from_revnum = 0, to_revnum = 347, pb=None):
   162     def _fetch_revisions(self, from_revnum = 0, to_revnum = 347, pb=None):
       
   163         # batching is broken for branches
       
   164         to_revnum = 0
   163         if not hasattr(self, 'child_rev'):
   165         if not hasattr(self, 'child_rev'):
   164             self.child_rev = from_revnum
   166             self.child_rev = from_revnum
   165             self.child_cset = self.commits.get(self.child_rev)
   167             self.child_cset = self.commits.get(self.child_rev)
   166         else:
   168         else:
   167             self.commits[self.child_rev] = self.child_cset
   169             self.commits[self.child_rev] = self.child_cset
       
   170             # batching broken
       
   171             return
       
   172             # if the branch was created in the middle of the last batch,
       
   173             # svn log will complain that the path doesn't exist in this batch
       
   174             # so we roll the parser back to the last revision where this branch appeared
       
   175             revnum = self.revnum(self.child_rev)
       
   176             if revnum > from_revnum:
       
   177                 from_revnum = revnum
   168 
   178 
   169         self.ui.debug('Fetching revisions %d to %d\n' % (from_revnum, to_revnum))
   179         self.ui.debug('Fetching revisions %d to %d\n' % (from_revnum, to_revnum))
   170 
   180 
   171         def get_entry_from_path(path, module=self.module):
   181         def get_entry_from_path(path, module=self.module):
   172             # Given the repository url of this wc, say
   182             # Given the repository url of this wc, say