##// END OF EJS Templates
pull: use `stepsdone` instead of `todosteps`...
Pierre-Yves David -
r22937:92bf9abc default
parent child Browse files
Show More
@@ -802,9 +802,8 b' class pulloperation(object):'
802 self.remotebookmarks = None
802 self.remotebookmarks = None
803 # result of changegroup pulling (used as return code by pull)
803 # result of changegroup pulling (used as return code by pull)
804 self.cgresult = None
804 self.cgresult = None
805 # list of step remaining todo (related to future bundle2 usage)
805 # list of step already done
806 self.todosteps = set(['changegroup', 'phases', 'obsmarkers',
806 self.stepsdone = set()
807 'bookmarks'])
808
807
809 @util.propertycache
808 @util.propertycache
810 def pulledsubset(self):
809 def pulledsubset(self):
@@ -917,7 +916,7 b' def _pullbundle2(pullop):'
917 remotecaps = bundle2.bundle2caps(pullop.remote)
916 remotecaps = bundle2.bundle2caps(pullop.remote)
918 kwargs = {'bundlecaps': caps20to10(pullop.repo)}
917 kwargs = {'bundlecaps': caps20to10(pullop.repo)}
919 # pulling changegroup
918 # pulling changegroup
920 pullop.todosteps.remove('changegroup')
919 pullop.stepsdone.add('changegroup')
921
920
922 kwargs['common'] = pullop.common
921 kwargs['common'] = pullop.common
923 kwargs['heads'] = pullop.heads or pullop.rheads
922 kwargs['heads'] = pullop.heads or pullop.rheads
@@ -934,7 +933,7 b' def _pullbundle2(pullop):'
934 remoteversions = bundle2.obsmarkersversion(remotecaps)
933 remoteversions = bundle2.obsmarkersversion(remotecaps)
935 if obsolete.commonversion(remoteversions) is not None:
934 if obsolete.commonversion(remoteversions) is not None:
936 kwargs['obsmarkers'] = True
935 kwargs['obsmarkers'] = True
937 pullop.todosteps.remove('obsmarkers')
936 pullop.stepsdone.add('obsmarkers')
938 _pullbundle2extraprepare(pullop, kwargs)
937 _pullbundle2extraprepare(pullop, kwargs)
939 if kwargs.keys() == ['format']:
938 if kwargs.keys() == ['format']:
940 return # nothing to pull
939 return # nothing to pull
@@ -968,9 +967,9 b' def _pullchangeset(pullop):'
968 # We delay the open of the transaction as late as possible so we
967 # We delay the open of the transaction as late as possible so we
969 # don't open transaction for nothing or you break future useful
968 # don't open transaction for nothing or you break future useful
970 # rollback call
969 # rollback call
971 if 'changegroup' not in pullop.todosteps:
970 if 'changegroup' in pullop.stepsdone:
972 return
971 return
973 pullop.todosteps.remove('changegroup')
972 pullop.stepsdone.add('changegroup')
974 if not pullop.fetch:
973 if not pullop.fetch:
975 pullop.repo.ui.status(_("no changes found\n"))
974 pullop.repo.ui.status(_("no changes found\n"))
976 pullop.cgresult = 0
975 pullop.cgresult = 0
@@ -999,14 +998,16 b' def _pullchangeset(pullop):'
999
998
1000 def _pullphase(pullop):
999 def _pullphase(pullop):
1001 # Get remote phases data from remote
1000 # Get remote phases data from remote
1002 if 'phases' not in pullop.todosteps:
1001 if 'phases' in pullop.stepsdone:
1003 return
1002 return
1004 remotephases = pullop.remote.listkeys('phases')
1003 remotephases = pullop.remote.listkeys('phases')
1005 _pullapplyphases(pullop, remotephases)
1004 _pullapplyphases(pullop, remotephases)
1006
1005
1007 def _pullapplyphases(pullop, remotephases):
1006 def _pullapplyphases(pullop, remotephases):
1008 """apply phase movement from observed remote state"""
1007 """apply phase movement from observed remote state"""
1009 pullop.todosteps.remove('phases')
1008 if 'phases' in pullop.stepsdone:
1009 return
1010 pullop.stepsdone.add('phases')
1010 publishing = bool(remotephases.get('publishing', False))
1011 publishing = bool(remotephases.get('publishing', False))
1011 if remotephases and not publishing:
1012 if remotephases and not publishing:
1012 # remote is new and unpublishing
1013 # remote is new and unpublishing
@@ -1039,9 +1040,9 b' def _pullapplyphases(pullop, remotephase'
1039
1040
1040 def _pullbookmarks(pullop):
1041 def _pullbookmarks(pullop):
1041 """process the remote bookmark information to update the local one"""
1042 """process the remote bookmark information to update the local one"""
1042 if 'bookmarks' not in pullop.todosteps:
1043 if 'bookmarks' in pullop.stepsdone:
1043 return
1044 return
1044 pullop.todosteps.remove('bookmarks')
1045 pullop.stepsdone.add('bookmarks')
1045 repo = pullop.repo
1046 repo = pullop.repo
1046 remotebookmarks = pullop.remotebookmarks
1047 remotebookmarks = pullop.remotebookmarks
1047 bookmod.updatefromremote(repo.ui, repo, remotebookmarks,
1048 bookmod.updatefromremote(repo.ui, repo, remotebookmarks,
@@ -1057,9 +1058,9 b' def _pullobsolete(pullop):'
1057 a new transaction have been created (when applicable).
1058 a new transaction have been created (when applicable).
1058
1059
1059 Exists mostly to allow overriding for experimentation purpose"""
1060 Exists mostly to allow overriding for experimentation purpose"""
1060 if 'obsmarkers' not in pullop.todosteps:
1061 if 'obsmarkers' in pullop.stepsdone:
1061 return
1062 return
1062 pullop.todosteps.remove('obsmarkers')
1063 pullop.stepsdone.add('obsmarkers')
1063 tr = None
1064 tr = None
1064 if obsolete._enabled:
1065 if obsolete._enabled:
1065 pullop.repo.ui.debug('fetching remote obsolete markers\n')
1066 pullop.repo.ui.debug('fetching remote obsolete markers\n')
General Comments 0
You need to be logged in to leave comments. Login now