D6588: abort: added support for merge

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Thu Jul 4 11:00:37 EDT 2019


pulkit added inline comments.

INLINE COMMENTS

> hg.py:964
> +        ui = repo.ui
> +        stats = abortmerge(ui, repo, labels=labels, asflag=True)
>  

we can directly pass repo.ui here. No need to have a ui variable

> hg.py:964
> +        ui = repo.ui
> +        stats = abortmerge(ui, repo, labels=labels, asflag=True)
>  

we actually don't need stats back here is we call `_showstats()` in abort merge. The stats related lines below can be moved to if condition above. Hence removing the asflag argument.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6588/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6588

To: taapas1128, #hg-reviewers
Cc: pulkit, mercurial-devel


More information about the Mercurial-devel mailing list