5205 try: |
5205 try: |
5206 txnname = 'unbundle' |
5206 txnname = 'unbundle' |
5207 if not isinstance(gen, bundle2.unbundle20): |
5207 if not isinstance(gen, bundle2.unbundle20): |
5208 txnname = 'unbundle\n%s' % util.hidepassword(url) |
5208 txnname = 'unbundle\n%s' % util.hidepassword(url) |
5209 with repo.transaction(txnname) as tr: |
5209 with repo.transaction(txnname) as tr: |
5210 if isinstance(gen, bundle2.unbundle20): |
5210 op = bundle2.applybundle(repo, gen, tr, source='unbundle', |
5211 op = bundle2.applybundle(repo, gen, tr, |
5211 url=url) |
5212 source='unbundle', |
|
5213 url=url) |
|
5214 else: |
|
5215 op = bundle2.applybundle1(repo, gen, tr, |
|
5216 source='unbundle', url=url) |
|
5217 except error.BundleUnknownFeatureError as exc: |
5212 except error.BundleUnknownFeatureError as exc: |
5218 raise error.Abort( |
5213 raise error.Abort( |
5219 _('%s: unknown bundle feature, %s') % (fname, exc), |
5214 _('%s: unknown bundle feature, %s') % (fname, exc), |
5220 hint=_("see https://mercurial-scm.org/" |
5215 hint=_("see https://mercurial-scm.org/" |
5221 "wiki/BundleFeature for more " |
5216 "wiki/BundleFeature for more " |