Mercurial > hg
view hgext/highlight/__init__.py @ 42050:03f6480bfdda
unshelve: disable unshelve during merge (issue5123)
As stated in the issue5123, unshelve can destroy the second parent of
the context when tried to unshelve with an uncommitted merge. This
patch makes unshelve to abort when called with an uncommitted merge.
See how shelve.mergefiles works. Commit structure looks like this:
```
... -> pctx -> tmpwctx -> shelvectx
/
/
second
merge parent
pctx = parent before merging working context(first merge parent)
tmpwctx = commited working directory after merge(with two parents)
shelvectx = shelved context
```
shelve.mergefiles first updates to pctx then it reverts shelvectx to pctx with:
```
cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(),
*pathtofiles(repo, files),
**{'no_backup': True})
```
Reverting tmpwctx files that were merged from second parent to pctx makes them
added because they are not in pctx.
Changing this revert operation is crucial to restore parents after unshelve.
This is a complicated issue as this is not fixing a regression. Thus, for the
time being, unshelve during an uncommitted merge can be aborted.
(Details taken from http://mercurial.808500.n3.nabble.com/PATCH-V3-shelve-restore-parents-after-unshelve-issue5123-tt4036858.html#a4037408)
Differential Revision: https://phab.mercurial-scm.org/D6169
author | Navaneeth Suresh <navaneeths1998@gmail.com> |
---|---|
date | Mon, 25 Mar 2019 12:33:41 +0530 |
parents | 28a4fb793ba1 |
children | a7abc6081bc5 |
line wrap: on
line source
# highlight - syntax highlighting in hgweb, based on Pygments # # Copyright 2008, 2009 Patrick Mezard <pmezard@gmail.com> and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. # # The original module was split in an interface and an implementation # file to defer pygments loading and speedup extension setup. """syntax highlighting for hgweb (requires Pygments) It depends on the Pygments syntax highlighting library: http://pygments.org/ There are the following configuration options:: [web] pygments_style = <style> (default: colorful) highlightfiles = <fileset> (default: size('<5M')) highlightonlymatchfilename = <bool> (default False) ``highlightonlymatchfilename`` will only highlight files if their type could be identified by their filename. When this is not enabled (the default), Pygments will try very hard to identify the file type from content and any match (even matches with a low confidence score) will be used. """ from __future__ import absolute_import from . import highlight from mercurial.hgweb import ( webcommands, webutil, ) from mercurial import ( extensions, ) # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. testedwith = 'ships-with-hg-core' def pygmentize(web, field, fctx, tmpl): style = web.config('web', 'pygments_style', 'colorful') expr = web.config('web', 'highlightfiles', "size('<5M')") filenameonly = web.configbool('web', 'highlightonlymatchfilename', False) ctx = fctx.changectx() m = ctx.matchfileset(expr) if m(fctx.path()): highlight.pygmentize(field, fctx, style, tmpl, guessfilenameonly=filenameonly) def filerevision_highlight(orig, web, fctx): mt = web.res.headers['Content-Type'] # only pygmentize for mimetype containing 'html' so we both match # 'text/html' and possibly 'application/xhtml+xml' in the future # so that we don't have to touch the extension when the mimetype # for a template changes; also hgweb optimizes the case that a # raw file is sent using rawfile() and doesn't call us, so we # can't clash with the file's content-type here in case we # pygmentize a html file if 'html' in mt: pygmentize(web, 'fileline', fctx, web.tmpl) return orig(web, fctx) def annotate_highlight(orig, web): mt = web.res.headers['Content-Type'] if 'html' in mt: fctx = webutil.filectx(web.repo, web.req) pygmentize(web, 'annotateline', fctx, web.tmpl) return orig(web) def generate_css(web): pg_style = web.config('web', 'pygments_style', 'colorful') fmter = highlight.HtmlFormatter(style=pg_style) web.res.headers['Content-Type'] = 'text/css' web.res.setbodybytes(''.join([ '/* pygments_style = %s */\n\n' % pg_style, fmter.get_style_defs(''), ])) return web.res.sendresponse() def extsetup(ui): # monkeypatch in the new version extensions.wrapfunction(webcommands, '_filerevision', filerevision_highlight) extensions.wrapfunction(webcommands, 'annotate', annotate_highlight) webcommands.highlightcss = generate_css webcommands.__all__.append('highlightcss')