equal
deleted
inserted
replaced
87 for phasenumber, phase in phases.phasenames.items(): |
87 for phasenumber, phase in phases.phasenames.items(): |
88 if phase == b'secret' or not csetres[b'nodesbyphase'][phase]: |
88 if phase == b'secret' or not csetres[b'nodesbyphase'][phase]: |
89 continue |
89 continue |
90 |
90 |
91 phases.advanceboundary( |
91 phases.advanceboundary( |
92 repo, tr, phasenumber, csetres[b'nodesbyphase'][phase], |
92 repo, |
|
93 tr, |
|
94 phasenumber, |
|
95 csetres[b'nodesbyphase'][phase], |
93 ) |
96 ) |
94 |
97 |
95 # Write bookmark updates. |
98 # Write bookmark updates. |
96 bookmarks.updatefromremote( |
99 bookmarks.updatefromremote( |
97 repo.ui, |
100 repo.ui, |
187 |
190 |
188 |
191 |
189 def _fetchrawstorefiles(repo, remote): |
192 def _fetchrawstorefiles(repo, remote): |
190 with remote.commandexecutor() as e: |
193 with remote.commandexecutor() as e: |
191 objs = e.callcommand( |
194 objs = e.callcommand( |
192 b'rawstorefiledata', {b'files': [b'changelog', b'manifestlog'],} |
195 b'rawstorefiledata', |
|
196 { |
|
197 b'files': [b'changelog', b'manifestlog'], |
|
198 }, |
193 ).result() |
199 ).result() |
194 |
200 |
195 # First object is a summary of files data that follows. |
201 # First object is a summary of files data that follows. |
196 overall = next(objs) |
202 overall = next(objs) |
197 |
203 |
744 continue |
750 continue |
745 |
751 |
746 with remote.commandexecutor() as e: |
752 with remote.commandexecutor() as e: |
747 args = { |
753 args = { |
748 b'revisions': [ |
754 b'revisions': [ |
749 {b'type': b'changesetexplicit', b'nodes': batch,} |
755 { |
|
756 b'type': b'changesetexplicit', |
|
757 b'nodes': batch, |
|
758 } |
750 ], |
759 ], |
751 b'fields': fields, |
760 b'fields': fields, |
752 b'haveparents': haveparents, |
761 b'haveparents': haveparents, |
753 } |
762 } |
754 |
763 |