amend: prevent loss of bookmark on failed amend
The active bookmark were moved to the temporary commit. When the transaction
were rollbacked, the bookmark were lost.
We now temporarly disable the bookmark to prevent this effect.
amend: invalidate dirstate in case of failure (
issue3670)
The temporary commit created by amend update the dirstate. If the final commit
fails, we need to invalidate the change made to the dirstate, otherwise the
release of the wlock will write the dirstate created after the rollbacked
temporary commit.
This dirstate writing logic should probably be handled in the same object than
the transaction one. However such change are too big for stable.
i18n-ru: synchonized with
777084ac8416
paper: sanity-check page feed links
filelog has feeds in header, but not in menu bar
help has header feeds pointing to tags
zeroconf: use port from server instead of picking port from config (
issue3746)
In order to get the port, wrap create server instead of
hgweb_mod/hgwebdir_mod.
scmutil: don't try to match modes on filesystems without modes (
issue3740)
hgwebdir: honor web.templates and web.static for static files (
issue3734)
zeroconf: use port from server instead of picking port from config (
issue3746)
In order to get the port, wrap create server instead of
hgweb_mod/hgwebdir_mod.
branchmap: enable caching for filtered version too
The `_branchcache` attribute is turned into a dictionary. Key are filter name and
value is a `branchcache` object. Unfiltered version is cached as `None` filter.
The attribute is renamed to `_branchcaches` to avoid confusion with the previous
one. Both old and new contents are dictionary even if their contents are
different. I prefer possible extension code to crash right away instead of just
messing the wrong dictionary.
As all different caches work isolated to each other, this code keeps the
previous behavior of using the unfiltered cache we nothing is filtered. This
is a cheap way to have cache collaborate and nullify potential impact in the
default case.