equal
deleted
inserted
replaced
5394 return hg.updatetotally(ui, repo, checkout, brev) |
5394 return hg.updatetotally(ui, repo, checkout, brev) |
5395 except error.UpdateAbort as inst: |
5395 except error.UpdateAbort as inst: |
5396 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst) |
5396 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst) |
5397 hint = inst.hint |
5397 hint = inst.hint |
5398 raise error.UpdateAbort(msg, hint=hint) |
5398 raise error.UpdateAbort(msg, hint=hint) |
5399 if modheads is not None and modheads > 1: |
5399 if ui.quiet: |
|
5400 pass # we won't report anything so the other clause are useless. |
|
5401 elif modheads is not None and modheads > 1: |
5400 currentbranchheads = len(repo.branchheads()) |
5402 currentbranchheads = len(repo.branchheads()) |
5401 if currentbranchheads == modheads: |
5403 if currentbranchheads == modheads: |
5402 ui.status( |
5404 ui.status( |
5403 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n") |
5405 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n") |
5404 ) |
5406 ) |