We have a list of summary callbacks which are run after the transaction is
closed to show what has changed and what not. This patch makes it possible to
register those callbacks as transaction validators so that we can show summary
before committing the transaction and prompt user to accept the changes.
The goal of this is to implement pull --confirm.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/scmutil.py (24 lines) |
| # a list of (repo, revs, match) prefetch functions | # a list of (repo, revs, match) prefetch functions | ||||
| fileprefetchhooks = util.hooks() | fileprefetchhooks = util.hooks() | ||||
| # A marker that tells the evolve extension to suppress its own reporting | # A marker that tells the evolve extension to suppress its own reporting | ||||
| _reportstroubledchangesets = True | _reportstroubledchangesets = True | ||||
| def registersummarycallback(repo, otr, txnname=b''): | def registersummarycallback(repo, otr, txnname=b'', as_validator=False): | ||||
| """register a callback to issue a summary after the transaction is closed | """register a callback to issue a summary after the transaction is closed | ||||
| If as_validator is true, then the callbacks are registered as transaction | |||||
| validators instead | |||||
| """ | """ | ||||
| def txmatch(sources): | def txmatch(sources): | ||||
| return any(txnname.startswith(source) for source in sources) | return any(txnname.startswith(source) for source in sources) | ||||
| categories = [] | categories = [] | ||||
| def reportsummary(func): | def reportsummary(func): | ||||
| def wrapped(tr): | def wrapped(tr): | ||||
| repo = reporef() | repo = reporef() | ||||
| if filtername: | if filtername: | ||||
| assert repo is not None # help pytype | assert repo is not None # help pytype | ||||
| repo = repo.filtered(filtername) | repo = repo.filtered(filtername) | ||||
| func(repo, tr) | func(repo, tr) | ||||
| newcat = b'%02i-txnreport' % len(categories) | newcat = b'%02i-txnreport' % len(categories) | ||||
| if as_validator: | |||||
| otr.addvalidator(newcat, wrapped) | |||||
| else: | |||||
| otr.addpostclose(newcat, wrapped) | otr.addpostclose(newcat, wrapped) | ||||
| categories.append(newcat) | categories.append(newcat) | ||||
| return wrapped | return wrapped | ||||
| @reportsummary | @reportsummary | ||||
| def reportchangegroup(repo, tr): | def reportchangegroup(repo, tr): | ||||
| cgchangesets = tr.changes.get(b'changegroup-count-changesets', 0) | cgchangesets = tr.changes.get(b'changegroup-count-changesets', 0) | ||||
| cgrevisions = tr.changes.get(b'changegroup-count-revisions', 0) | cgrevisions = tr.changes.get(b'changegroup-count-revisions', 0) | ||||
| cgfiles = tr.changes.get(b'changegroup-count-files', 0) | cgfiles = tr.changes.get(b'changegroup-count-files', 0) | ||||
| cgheads = tr.changes.get(b'changegroup-count-heads', 0) | cgheads = tr.changes.get(b'changegroup-count-heads', 0) | ||||
| if cgchangesets or cgrevisions or cgfiles: | if cgchangesets or cgrevisions or cgfiles: | ||||
| htext = b"" | htext = b"" | ||||
| if cgheads: | if cgheads: | ||||
| htext = _(b" (%+d heads)") % cgheads | htext = _(b" (%+d heads)") % cgheads | ||||
| msg = _(b"added %d changesets with %d changes to %d files%s\n") | msg = _(b"added %d changesets with %d changes to %d files%s\n") | ||||
| if as_validator: | |||||
| msg = _(b"adding %d changesets with %d changes to %d files%s\n") | |||||
| assert repo is not None # help pytype | assert repo is not None # help pytype | ||||
| repo.ui.status(msg % (cgchangesets, cgrevisions, cgfiles, htext)) | repo.ui.status(msg % (cgchangesets, cgrevisions, cgfiles, htext)) | ||||
| if txmatch(_reportobsoletedsource): | if txmatch(_reportobsoletedsource): | ||||
| @reportsummary | @reportsummary | ||||
| def reportobsoleted(repo, tr): | def reportobsoleted(repo, tr): | ||||
| obsoleted = obsutil.getobsoleted(repo, tr) | obsoleted = obsutil.getobsoleted(repo, tr) | ||||
| newmarkers = len(tr.changes.get(b'obsmarkers', ())) | newmarkers = len(tr.changes.get(b'obsmarkers', ())) | ||||
| if newmarkers: | if newmarkers: | ||||
| repo.ui.status(_(b'%i new obsolescence markers\n') % newmarkers) | repo.ui.status(_(b'%i new obsolescence markers\n') % newmarkers) | ||||
| if obsoleted: | if obsoleted: | ||||
| repo.ui.status(_(b'obsoleted %i changesets\n') % len(obsoleted)) | msg = _(b'obsoleted %i changesets\n') | ||||
| if as_validator: | |||||
| msg = _(b'obsoleting %i changesets\n') | |||||
| repo.ui.status(msg % len(obsoleted)) | |||||
| if obsolete.isenabled( | if obsolete.isenabled( | ||||
| repo, obsolete.createmarkersopt | repo, obsolete.createmarkersopt | ||||
| ) and repo.ui.configbool( | ) and repo.ui.configbool( | ||||
| b'experimental', b'evolution.report-instabilities' | b'experimental', b'evolution.report-instabilities' | ||||
| ): | ): | ||||
| instabilitytypes = [ | instabilitytypes = [ | ||||
| (b'orphan', b'orphan'), | (b'orphan', b'orphan'), | ||||
| return | return | ||||
| published = [ | published = [ | ||||
| rev | rev | ||||
| for rev, (old, new) in pycompat.iteritems(phasetracking) | for rev, (old, new) in pycompat.iteritems(phasetracking) | ||||
| if new == phases.public and rev < origrepolen | if new == phases.public and rev < origrepolen | ||||
| ] | ] | ||||
| if not published: | if not published: | ||||
| return | return | ||||
| repo.ui.status( | msg = _(b'%d local changesets published\n') | ||||
| _(b'%d local changesets published\n') % len(published) | if as_validator: | ||||
| ) | msg = _(b'%d local changesets will be published\n') | ||||
| repo.ui.status(msg % len(published)) | |||||
| def getinstabilitymessage(delta, instability): | def getinstabilitymessage(delta, instability): | ||||
| """function to return the message to show warning about new instabilities | """function to return the message to show warning about new instabilities | ||||
| exists as a separate function so that extension can wrap to show more | exists as a separate function so that extension can wrap to show more | ||||
| information like how to fix instabilities""" | information like how to fix instabilities""" | ||||
| if delta > 0: | if delta > 0: | ||||