equal
deleted
inserted
replaced
305 fp.close() |
305 fp.close() |
306 |
306 |
307 dest_repo.ui.setconfig('paths', 'default', abspath) |
307 dest_repo.ui.setconfig('paths', 'default', abspath) |
308 |
308 |
309 if update: |
309 if update: |
310 dest_repo.ui.status(_("updating working directory\n")) |
|
311 if update is not True: |
310 if update is not True: |
312 checkout = update |
311 checkout = update |
313 for test in (checkout, 'default', 'tip'): |
312 for test in (checkout, 'default', 'tip'): |
314 if test is None: |
313 if test is None: |
315 continue |
314 continue |
316 try: |
315 try: |
317 uprev = dest_repo.lookup(test) |
316 uprev = dest_repo.lookup(test) |
318 break |
317 break |
319 except error.RepoLookupError: |
318 except error.RepoLookupError: |
320 continue |
319 continue |
|
320 bn = dest_repo[uprev].branch() |
|
321 dest_repo.ui.status(_("updating to branch %s\n") % bn) |
321 _update(dest_repo, uprev) |
322 _update(dest_repo, uprev) |
322 |
323 |
323 return src_repo, dest_repo |
324 return src_repo, dest_repo |
324 finally: |
325 finally: |
325 release(src_lock, dest_lock) |
326 release(src_lock, dest_lock) |