Mercurial > evolve
changeset 5792:5d00679d78aa
evolve: rely on ctx.__bytes__() for formatting instead of using ctx.hex()[:12]
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 23 Feb 2021 06:31:01 +0800 |
| parents | 2e1747baf550 |
| children | ccc558c9c736 |
| files | hgext3rd/evolve/evolvecmd.py |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Tue Feb 23 06:06:06 2021 +0800 +++ b/hgext3rd/evolve/evolvecmd.py Tue Feb 23 06:31:01 2021 +0800 @@ -588,11 +588,11 @@ assert local != other if local not in repo[None].parents(): repo.ui.note(_(b"updating to \"local\" side of the conflict: %s\n") % - local.hex()[:12]) + local) compat.update(local) # merging the two content-divergent changesets repo.ui.note(_(b"merging \"other\" %s changeset '%s'\n") % - (TROUBLES['CONTENTDIVERGENT'], other.hex()[:12])) + (TROUBLES['CONTENTDIVERGENT'], other)) if progresscb: progresscb() with state.saver(evolvestate): @@ -1722,7 +1722,7 @@ compat.clean_update(pctx) ui.status(_(b'evolve aborted\n')) ui.status(_(b'working directory is now at %s\n') - % pctx.hex()[:12]) + % pctx) evolvestate.delete() return 0 return abortevolve(ui, repo, evolvestate) @@ -1981,7 +1981,7 @@ compat.clean_update(pctx) ui.status(_(b'evolve aborted\n')) ui.status(_(b'working directory is now at %s\n') - % pctx.hex()[:12]) + % pctx) evolvestate.delete() return 0 return abortevolve(ui, repo, evolvestate)