Mercurial > hg
view mercurial/cffi/bdiffbuild.py @ 38456:1cac2e8c7624
scmutil: move construction of instability count message to separate fn
When the commad we are running, introduces new instabilities, we show a message
like `5 new orphan changesets`, `2 new content-divergent changesets`, `1 new
phase-divergent changesets` etc which is very nice.
Now taking a step ahead, we want users to show how to fix them too. Something
like:
`5 new orphan changesets (run 'hg evolve' to resolve/stabilize them)`
`2 new content-divergent changesets (run 'hg evolve --content-divergent' to
resolve them)`
and maybe telling user a way to understand more about those new instabilities
like `hg evolve --list` or `hg log -r 'orphan()'` something like that.
The idea came from issue5855 which I want to fix because fixing that will result
in a nice UI.
Taking the construction logic out will allow extensions like evolve (maybe
rebase too) to wrap that and add information about how to resolve and how to
understand the instability more.
Differential Revision: https://phab.mercurial-scm.org/D3734
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Fri, 15 Jun 2018 00:50:48 +0530 |
parents | 0585337ea787 |
children | 2372284d9457 |
line wrap: on
line source
from __future__ import absolute_import import cffi import os ffi = cffi.FFI() with open(os.path.join(os.path.join(os.path.dirname(__file__), '..'), 'bdiff.c')) as f: ffi.set_source("mercurial.cffi._bdiff", f.read(), include_dirs=['mercurial']) ffi.cdef(""" struct bdiff_line { int hash, n, e; ssize_t len; const char *l; }; struct bdiff_hunk; struct bdiff_hunk { int a1, a2, b1, b2; struct bdiff_hunk *next; }; int bdiff_splitlines(const char *a, ssize_t len, struct bdiff_line **lr); int bdiff_diff(struct bdiff_line *a, int an, struct bdiff_line *b, int bn, struct bdiff_hunk *base); void bdiff_freehunks(struct bdiff_hunk *l); void free(void*); """) if __name__ == '__main__': ffi.compile()