D6416: changelog: optionally store added and removed files in changeset extras

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf385ba70e4af: changelog: optionally store added and removed files in changeset extras (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6417: context: get filesadded() and filesremoved() from changeset if configured

This revision was automatically updated to reflect the committed changes. Closed by commit rHG602469a91550: context: get filesadded() and filesremoved() from changeset if configured (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6369: templatekw: make {file_*} compare to both merge parents (issue4292)

This revision was automatically updated to reflect the committed changes. Closed by commit rHG0c72eddb4be5: templatekw: make {file_*} compare to both merge parents (issue4292) (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6465: narrowspec: use vfs.tryread() instead of reimplementing

This revision was automatically updated to reflect the committed changes. Closed by commit rHG0c0a22f5b0b5: narrowspec: use vfs.tryread() instead of reimplementing (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6467: doc: fix description of "predecessors" to match reality

av6 added a comment. This change looks good, but I have doubts about "visible" in the docstring. https://phab.mercurial-scm.org/rHG1858fc2327ef7b631941e37550738f1fc4217bfb does say that this template keyword respects repo filtering, but I've encountered instances where it shows hidden

D6472: merge: simplify initialization of "pas"

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6472 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py

D6471: merge: reorder some initialization to make more sense

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This puts the closely related definitions of "pl", "p1", "p2", "pas" close together, and moves the definition of "overwrite" away and closer to where it's

D6470: mixedrepostorecache: fix a silly redundant updating of set

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6470 AFFECTED FILES mercurial/localrepo.py CHANGE DETAILS diff --git a/mercurial/localrepo.py