##// END OF EJS Templates
revert: option to choose what to keep, not what to discard...
revert: option to choose what to keep, not what to discard I know the you (the reader) are probably tired of discussing how `hg revert -i -r .` should behave and so am I. And I know I'm one of the people who argued that showing the diff from the working copy to the parent was confusing. I think it is less confusing now that we show the diff from the parent to the working copy, but I still find it confusing. I think showing the diff of hunks to keep might make it easier to understand. So that's what this patch provides an option for. One argument doing it this way is that most people seem to find `hg split` natural. I suspect that is because it shows the forward diff (from parent commit to the commit) and asks you what to put in the first commit. I think the new "keep" mode for revert (this patch) matches that. In "keep" mode, all the changes are still selected by default. That means that `hg revert -i` followed by 'A' (keep all) (or 'c' in curses) will be different from `hg revert -a`. That's mostly because that was simplest. It can also be argued that it's safest. But it can also be argued that it should be consistent with `hg revert -a`. Note that in this mode, you can edit the hunks and it will do what you expect (e.g. add new lines to your file if you added a new lines when editing). The test case shows that that works. Differential Revision: https://phab.mercurial-scm.org/D6125

File last commit:

r26781:1aee2ab0 default
r42154:c1d83d91 default
Show More
hgweb.txt
86 lines | 3.3 KiB | text/plain | TextLexer
Matt Mackall
help: add some help for hgweb.config files
r10999 Mercurial's internal web server, hgweb, can serve either a single
Mads Kiilerich
help: improve hgweb help...
r17104 repository, or a tree of repositories. In the second case, repository
paths and global options can be defined using a dedicated
configuration file common to :hg:`serve`, ``hgweb.wsgi``,
``hgweb.cgi`` and ``hgweb.fcgi``.
Matt Mackall
help: add some help for hgweb.config files
r10999
Mads Kiilerich
help: improve hgweb help...
r17104 This file uses the same syntax as other Mercurial configuration files
but recognizes only the following sections:
Matt Mackall
help: add some help for hgweb.config files
r10999
- web
- paths
- collections
Mads Kiilerich
fix trivial spelling errors
r17424 The ``web`` options are thoroughly described in :hg:`help config`.
Mads Kiilerich
help: improve hgweb help...
r17104
The ``paths`` section maps URL paths to paths of repositories in the
filesystem. hgweb will not expose the filesystem directly - only
Mercurial repositories can be published and only according to the
configuration.
Matt Mackall
help: add some help for hgweb.config files
r10999
Mads Kiilerich
help: improve hgweb help...
r17104 The left hand side is the path in the URL. Note that hgweb reserves
subpaths like ``rev`` or ``file``, try using different names for
nested repositories to avoid confusing effects.
The right hand side is the path in the filesystem. If the specified
path ends with ``*`` or ``**`` the filesystem will be searched
recursively for repositories below that point.
With ``*`` it will not recurse into the repositories it finds (except for
``.hg/patches``).
With ``**`` it will also search inside repository working directories
and possibly find subrepositories.
In this example::
Matt Mackall
help: add some help for hgweb.config files
r10999
[paths]
Mads Kiilerich
help: improve hgweb help...
r17104 /projects/a = /srv/tmprepos/a
/projects/b = c:/repos/b
/ = /srv/repos/*
/user/bob = /home/bob/repos/**
Matt Mackall
help: add some help for hgweb.config files
r10999
- The first two entries make two repositories in different directories
appear under the same directory in the web interface
Mads Kiilerich
help: improve hgweb help...
r17104 - The third entry will publish every Mercurial repository found in
``/srv/repos/``, for instance the repository ``/srv/repos/quux/``
will appear as ``http://server/quux/``
- The fourth entry will publish both ``http://server/user/bob/quux/``
and ``http://server/user/bob/quux/testsubrepo/``
Matt Mackall
help: add some help for hgweb.config files
r10999
Javi Merino
help/hgweb: fix spelling error
r17333 The ``collections`` section is deprecated and has been superseded by
Mads Kiilerich
help: improve hgweb help...
r17104 ``paths``.
Gregory Szorc
help.hgweb: add a section describing URLs and common parameters...
r24079
URLs and Common Arguments
=========================
URLs under each repository have the form ``/{command}[/{arguments}]``
where ``{command}`` represents the name of a command or handler and
``{arguments}`` represents any number of additional URL parameters
to that command.
The web server has a default style associated with it. Styles map to
a collection of named templates. Each template is used to render a
specific piece of data, such as a changeset or diff.
The style for the current request can be overwritten two ways. First,
if ``{command}`` contains a hyphen (``-``), the text before the hyphen
defines the style. For example, ``/atom-log`` will render the ``log``
command handler with the ``atom`` style. The second way to set the
style is with the ``style`` query string argument. For example,
``/log?style=atom``. The hyphenated URL parameter is preferred.
Not all templates are available for all styles. Attempting to use
a style that doesn't have all templates defined may result in an error
rendering the page.
Many commands take a ``{revision}`` URL parameter. This defines the
changeset to operate on. This is commonly specified as the short,
Mads Kiilerich
spelling: trivial spell checking
r26781 12 digit hexadecimal abbreviation for the full 40 character unique
Gregory Szorc
help.hgweb: add a section describing URLs and common parameters...
r24079 revision identifier. However, any value described by
:hg:`help revisions` typically works.
Gregory Szorc
help: add web commands to help documentation...
r24080
Commands and URLs
=================
The following web commands and their URLs are available:
.. webcommandsmarker