equal
deleted
inserted
replaced
3897 return |
3897 return |
3898 if optupdate: |
3898 if optupdate: |
3899 try: |
3899 try: |
3900 return hg.updatetotally(ui, repo, checkout, brev) |
3900 return hg.updatetotally(ui, repo, checkout, brev) |
3901 except error.UpdateAbort as inst: |
3901 except error.UpdateAbort as inst: |
3902 msg = _("not updating: %s") % str(inst) |
3902 msg = _("not updating: %s") % util.forcebytestr(inst) |
3903 hint = inst.hint |
3903 hint = inst.hint |
3904 raise error.UpdateAbort(msg, hint=hint) |
3904 raise error.UpdateAbort(msg, hint=hint) |
3905 if modheads > 1: |
3905 if modheads > 1: |
3906 currentbranchheads = len(repo.branchheads()) |
3906 currentbranchheads = len(repo.branchheads()) |
3907 if currentbranchheads == modheads: |
3907 if currentbranchheads == modheads: |