comparison hgext/convert/p4.py @ 24395:216fa1ba9993

convert: optimize convert of files that are unmodified from p2 in merges Conversion of a merge starts with p1 and re-adds the files that were changed in the merge or came unmodified from p2. Files that are unmodified from p1 will thus not be touched and take no time. Files that are unmodified from p2 would be retrieved and rehashed. They would end up getting the same hash as in p2 and end up reusing the filelog entry and look like the p1 case ... but it was slow. Instead, make getchanges also return 'files that are unmodified from p2' so the sink can reuse the existing p2 entry instead of calling getfile. Reuse of filelog entries can make a big difference when files are big and with long revlong chains so they take time to retrieve and hash, or when using an expensive custom getfile function (think http://mercurial.selenic.com/wiki/ConvertExtension#Customization with a code reformatter). This in combination with changes to reuse filectx entries in localrepo._filecommit make 'unchanged from p2' almost as fast as 'unchanged from p1'. This is so far only implemented for the combination of hg source and hg sink. This is a refactoring/optimization. It is covered by existing tests and show no changes - which is a good thing.
author Mads Kiilerich <madski@unity3d.com>
date Thu, 19 Mar 2015 17:40:19 +0100
parents 35ab037de989
children 501c51d60792 baea47cafe75
comparison
equal deleted inserted replaced
24394:03163826b4e6 24395:216fa1ba9993
193 return contents, mode 193 return contents, mode
194 194
195 def getchanges(self, rev, full): 195 def getchanges(self, rev, full):
196 if full: 196 if full:
197 raise util.Abort(_("convert from p4 do not support --full")) 197 raise util.Abort(_("convert from p4 do not support --full"))
198 return self.files[rev], {} 198 return self.files[rev], {}, set()
199 199
200 def getcommit(self, rev): 200 def getcommit(self, rev):
201 return self.changeset[rev] 201 return self.changeset[rev]
202 202
203 def gettags(self): 203 def gettags(self):