hgext/convert/subversion.py
changeset 4790 2b5723a5b186
parent 4789 772687e437e5
child 4791 9f20f4b205ba
equal deleted inserted replaced
4789:772687e437e5 4790:2b5723a5b186
   185             # so we roll the parser back to the last revision where this branch appeared
   185             # so we roll the parser back to the last revision where this branch appeared
   186             revnum = self.revnum(self.child_rev)
   186             revnum = self.revnum(self.child_rev)
   187             if revnum > from_revnum:
   187             if revnum > from_revnum:
   188                 from_revnum = revnum
   188                 from_revnum = revnum
   189 
   189 
   190         self.ui.debug('Fetching revisions %d to %d\n' % (from_revnum, to_revnum))
   190         self.ui.note('fetching revision log from %d to %d\n' % \
       
   191                      (from_revnum, to_revnum))
   191 
   192 
   192         def get_entry_from_path(path, module=self.module):
   193         def get_entry_from_path(path, module=self.module):
   193             # Given the repository url of this wc, say
   194             # Given the repository url of this wc, say
   194             #   "http://server/plone/CMFPlone/branches/Plone-2_0-branch"
   195             #   "http://server/plone/CMFPlone/branches/Plone-2_0-branch"
   195             # extract the "entry" portion (a relative path) from what
   196             # extract the "entry" portion (a relative path) from what
   217         def rcvr2(orig_paths, revnum, author, date, message, pool, better_paths = None):
   218         def rcvr2(orig_paths, revnum, author, date, message, pool, better_paths = None):
   218             if not self.is_blacklisted(revnum):
   219             if not self.is_blacklisted(revnum):
   219                 received.append((orig_paths, revnum, author, date, message))
   220                 received.append((orig_paths, revnum, author, date, message))
   220            
   221            
   221         def after_received(orig_paths, revnum, author, date, message):
   222         def after_received(orig_paths, revnum, author, date, message):
       
   223             self.ui.note("parsing revision %d\n" % revnum)
       
   224             if orig_paths is None:
       
   225                 return
       
   226 
   222             if revnum in self.modulemap:
   227             if revnum in self.modulemap:
   223                 new_module = self.modulemap[revnum]
   228                 new_module = self.modulemap[revnum]
   224                 if new_module != self.module:
   229                 if new_module != self.module:
   225                     self.module = new_module
   230                     self.module = new_module
   226                     self.reparent(self.module)
   231                     self.reparent(self.module)
   227 
   232 
   228             copyfrom = {} # Map of entrypath, revision for finding source of deleted revisions.
   233             copyfrom = {} # Map of entrypath, revision for finding source of deleted revisions.
   229             copies = {}
   234             copies = {}
   230             entries = []
   235             entries = []
   231             self.ui.debug("Parsing revision %d\n" % revnum)
       
   232             if orig_paths is None:
       
   233                 return
       
   234 
       
   235             rev = self.rev(revnum)
   236             rev = self.rev(revnum)
   236             try:
   237             try:
   237                 branch = self.module.split("/")[-1]
   238                 branch = self.module.split("/")[-1]
   238                 if branch == 'trunk':
   239                 if branch == 'trunk':
   239                     branch = ''
   240                     branch = ''