##// END OF EJS Templates
repair: setup hookargs when processing bundle2s...
Eric Sumner -
r24170:fbc4d550 default
parent child Browse files
Show More
@@ -181,6 +181,8 b' def strip(ui, repo, nodelist, backup=Tru'
181 repo.ui.pushbuffer()
181 repo.ui.pushbuffer()
182 if isinstance(gen, bundle2.unbundle20):
182 if isinstance(gen, bundle2.unbundle20):
183 tr = repo.transaction('strip')
183 tr = repo.transaction('strip')
184 tr.hookargs = {'source': 'strip',
185 'url': 'bundle:' + vfs.join(chgrpfile)}
184 try:
186 try:
185 bundle2.processbundle(repo, gen, lambda: tr)
187 bundle2.processbundle(repo, gen, lambda: tr)
186 tr.close()
188 tr.close()
@@ -165,5 +165,47 b' pull --rebase works when a specific revi'
165 |
165 |
166 o 0: 'C1'
166 o 0: 'C1'
167
167
168 pull --rebase works with bundle2 turned on
168
169
169
170 $ cd ../a
171 $ echo R4 > R4
172 $ hg ci -Am R4
173 adding R4
174 $ hg tglog
175 @ 5: 'R4'
176 |
177 o 4: 'R3'
178 |
179 o 3: 'R2'
180 |
181 o 2: 'R1'
182 |
183 o 1: 'C2'
184 |
185 o 0: 'C1'
186
187 $ cd ../c
188 $ hg pull --rebase --config experimental.bundle2-exp=True --config experimental.strip-bundle2-version=02
189 pulling from $TESTTMP/a (glob)
190 searching for changes
191 adding changesets
192 adding manifests
193 adding file changes
194 added 1 changesets with 1 changes to 1 files (+1 heads)
195 rebasing 5:518d153c0ba3 "L1"
196 saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-backup.hg (glob)
197 $ hg tglog
198 @ 6: 'L1'
199 |
200 o 5: 'R4'
201 |
202 o 4: 'R3'
203 |
204 o 3: 'R2'
205 |
206 o 2: 'R1'
207 |
208 o 1: 'C2'
209 |
210 o 0: 'C1'
211
General Comments 0
You need to be logged in to leave comments. Login now