##// END OF EJS Templates
sidedata: return enough data to set the proper flag in the future...
marmoute -
r46326:53c265a6 default
parent child Browse files
Show More
@@ -803,7 +803,7 b' def decode_files_sidedata(sidedata):'
803 def _getsidedata(srcrepo, rev):
803 def _getsidedata(srcrepo, rev):
804 ctx = srcrepo[rev]
804 ctx = srcrepo[rev]
805 files = compute_all_files_changes(ctx)
805 files = compute_all_files_changes(ctx)
806 return encode_files_sidedata(files)
806 return encode_files_sidedata(files), files.has_copies_info
807
807
808
808
809 def getsidedataadder(srcrepo, destrepo):
809 def getsidedataadder(srcrepo, destrepo):
@@ -881,18 +881,19 b' def _get_worker_sidedata_adder(srcrepo, '
881 staging = {}
881 staging = {}
882
882
883 def sidedata_companion(revlog, rev):
883 def sidedata_companion(revlog, rev):
884 sidedata = {}
884 data = {}, False
885 if util.safehasattr(revlog, b'filteredrevs'): # this is a changelog
885 if util.safehasattr(revlog, b'filteredrevs'): # this is a changelog
886 # Is the data previously shelved ?
886 # Is the data previously shelved ?
887 sidedata = staging.pop(rev, None)
887 sidedata = staging.pop(rev, None)
888 if sidedata is None:
888 if sidedata is None:
889 # look at the queued result until we find the one we are lookig
889 # look at the queued result until we find the one we are lookig
890 # for (shelve the other ones)
890 # for (shelve the other ones)
891 r, sidedata = sidedataq.get()
891 r, data = sidedataq.get()
892 while r != rev:
892 while r != rev:
893 staging[r] = sidedata
893 staging[r] = data
894 r, sidedata = sidedataq.get()
894 r, sidedata = sidedataq.get()
895 tokens.release()
895 tokens.release()
896 sidedataq, has_copies_info = data
896 return False, (), sidedata
897 return False, (), sidedata
897
898
898 return sidedata_companion
899 return sidedata_companion
@@ -906,7 +907,7 b' def _get_simple_sidedata_adder(srcrepo, '
906 def sidedatacompanion(revlog, rev):
907 def sidedatacompanion(revlog, rev):
907 sidedata = {}
908 sidedata = {}
908 if util.safehasattr(revlog, 'filteredrevs'): # this is a changelog
909 if util.safehasattr(revlog, 'filteredrevs'): # this is a changelog
909 sidedata = _getsidedata(srcrepo, rev)
910 sidedata, has_copies_info = _getsidedata(srcrepo, rev)
910 return False, (), sidedata
911 return False, (), sidedata
911
912
912 return sidedatacompanion
913 return sidedatacompanion
General Comments 0
You need to be logged in to leave comments. Login now