check-code: drop unneeded ignore patterns

The exceptions seem to have disappeared.

--HG--
extra : rebase_source : d2093918611be39b656794c2c6b7b211528a82e9
check-code: document last ignore regexp

For easier remembering to delete when it is not needed anymore.

--HG--
extra : rebase_source : 9976efb9d4c7c306cd9c1d80290d6edaeb10428d
help: document about {extras} template keyword

This adds text about the "extras" template keyword, similar to that proposed by
Yuya Nishihara previously.

--HG--
extra : rebase_source : 11c78a2cb977e1530312cf5f4ca540d9a128d237
help: adding example 'extras' printing to 'hg help templates'

--HG--
extra : rebase_source : b74ee0a8317161f90cebfe9b64290e43263e93f4
template: change extras to use showlist rather than manual templ call.

This enables start_extras and end_extras in template maps.

--HG--
extra : rebase_source : 215c2b07e9bee4c5b3ae03430147d45109aacc4a
run-tests: remove code that creates a dummy 'diffstat'

This was introduced in fb1d7a42663c for an old test that is no longer the same.

--HG--
extra : rebase_source : 022a2a005ae5498ff150b9c526ee6ceb5c42802e
run-tests: remove files that we potentially create outside of $TMPDIR

--HG--
extra : rebase_source : 794c362572b4099d5262875f9dfbd00119842a04
transplant: use peer of source repository as "remote" for "repo.pull()"

Before this patch, transplant with "--merge" option fails with
traceback unexpectedly, if it causes pull from the source repository
on the local host.

"discovery.findcommonincoming()" invokes "capable()" method on the
object given from "localrepository.pull()", but it is
"localrepository" object in this case and doesn't have such method.

This patch uses peer object of source repository as "remote" argument
for "localrepository.pull()" invocation like other invocations of it
in transplant.py.

--HG--
extra : rebase_source : 23f37c3eea8cbe967056e1714307a3daacb1e7cc
hgweb: remove unused argument of entries function in filelog

This doesn't change the behavior as the argument wasn't used anyway.
hgweb: always compute all entries and latestentry in filelog

This is the same thing which was done for changelog earlier, and it doesn't
affect performance at all. This change will make it possible to get the first
entry of the next page easily without computing the list twice.
hgweb: use semantically suitable filelog.revs in filelog

The functions are equivalent in behaviour, so no behavior change.
bookmarks: add function to centralize the logic to compare bookmarks

This patch adds "compare()" function to centralize the logic to
compare bookmarks between two repositories.

--HG--
extra : rebase_source : 928372b632772170a814b8647eb5adc345a44e8c
bookmarks: rewrite "updatefromremote()" by "compare()"

To update entries in bmstore "localmarks", this patch uses
"bin(changesetid)" instead of "repo[changesetid].node()" used in
original "updatefromremote()" implementation, because the former is
cheaper than the latter.

--HG--
extra : rebase_source : eacbe38ea53baa8b29b22e6a8ea15a5ce65f8441
bookmarks: rewrite pushing local bookmarks in "commands.push()" by "compare()"

This patch adds "pushtoremote()", which uses "compare()" to compare
bookmarks between the local and the remote repositories, to replace
pushing local bookmarks in "commands.push()".

--HG--
extra : rebase_source : 6f81e5a163a4438016b88ca200ec99af24f99b31
bookmarks: rewrite pushing bookmarks in "localrepository.push()" by "compare()"

This patch adds "updateremote()", which uses "compare()" to compare
bookmarks between the local and the remote repositories, to replace
pushing local bookmarks in "localrepository.push()".

--HG--
extra : rebase_source : 12b0f38574cc1305a3d64448650fd7e71043c355
Merge with stable.
obsolete: do not accept duplicated marker during exchange

Before this patch, duplicated obsolescence markers could slip into an
obstore if the bookmark was unknown locally and duplicated in the
incoming obsolescence stream.

Existing duplicate markers will not be automatically removed but
they'll stop propagating. Having a few duplicated markers is harmless
and people have been warned evolution is <blink>experimental</blink>
anyway.

--HG--
extra : rebase_source : 487b55ddc2ffa30c393d9ecbc5fd1449e4828502
obsolete: add __eq__ and __hash__ to marker to make set() deduplication work

--HG--
extra : rebase_source : 21b4510573c914d4fae6aecb7982c2f44cb940c5
subsettable: move from repoview to branchmap, the only place it's used

This is a step towards breaking an import cycle between revset and
repoview. Import cycles happened to work in Python 2 with implicit
relative imports, but breaks on Python 3 when we start using explicit
relative imports via 2to3 rewrite rules.

--HG--
extra : rebase_source : cc4c40899a79a39126769105751e7ae04f65fc38
pathutil: tease out a new library to break an import cycle from canonpath use

--HG--
extra : rebase_source : 22cf63bf009c4fd99ad89bd13a73f05ffbe438f3