##// END OF EJS Templates
pull: perform the todostep inside functions handling old way of pulling...
Pierre-Yves David -
r22653:d94f5bec default
parent child Browse files
Show More
@@ -852,12 +852,9 b' def pull(repo, remote, heads=None, force'
852 if (pullop.repo.ui.configbool('experimental', 'bundle2-exp', False)
852 if (pullop.repo.ui.configbool('experimental', 'bundle2-exp', False)
853 and pullop.remote.capable('bundle2-exp')):
853 and pullop.remote.capable('bundle2-exp')):
854 _pullbundle2(pullop)
854 _pullbundle2(pullop)
855 if 'changegroup' in pullop.todosteps:
855 _pullchangeset(pullop)
856 _pullchangeset(pullop)
856 _pullphase(pullop)
857 if 'phases' in pullop.todosteps:
857 _pullobsolete(pullop)
858 _pullphase(pullop)
859 if 'obsmarkers' in pullop.todosteps:
860 _pullobsolete(pullop)
861 pullop.closetransaction()
858 pullop.closetransaction()
862 finally:
859 finally:
863 pullop.releasetransaction()
860 pullop.releasetransaction()
@@ -940,6 +937,8 b' def _pullchangeset(pullop):'
940 # We delay the open of the transaction as late as possible so we
937 # We delay the open of the transaction as late as possible so we
941 # don't open transaction for nothing or you break future useful
938 # don't open transaction for nothing or you break future useful
942 # rollback call
939 # rollback call
940 if 'changegroup' not in pullop.todosteps:
941 return
943 pullop.todosteps.remove('changegroup')
942 pullop.todosteps.remove('changegroup')
944 if not pullop.fetch:
943 if not pullop.fetch:
945 pullop.repo.ui.status(_("no changes found\n"))
944 pullop.repo.ui.status(_("no changes found\n"))
@@ -969,6 +968,8 b' def _pullchangeset(pullop):'
969
968
970 def _pullphase(pullop):
969 def _pullphase(pullop):
971 # Get remote phases data from remote
970 # Get remote phases data from remote
971 if 'phases' not in pullop.todosteps:
972 return
972 remotephases = pullop.remote.listkeys('phases')
973 remotephases = pullop.remote.listkeys('phases')
973 _pullapplyphases(pullop, remotephases)
974 _pullapplyphases(pullop, remotephases)
974
975
@@ -1013,6 +1014,8 b' def _pullobsolete(pullop):'
1013 a new transaction have been created (when applicable).
1014 a new transaction have been created (when applicable).
1014
1015
1015 Exists mostly to allow overriding for experimentation purpose"""
1016 Exists mostly to allow overriding for experimentation purpose"""
1017 if 'obsmarkers' not in pullop.todosteps:
1018 return
1016 pullop.todosteps.remove('obsmarkers')
1019 pullop.todosteps.remove('obsmarkers')
1017 tr = None
1020 tr = None
1018 if obsolete._enabled:
1021 if obsolete._enabled:
General Comments 0
You need to be logged in to leave comments. Login now