[PATCH 0 of 2 stable] keyword: make it work with transplant by fixing monkeypatch logic for diff (2nd try with test)

Christian Ebert blacktrash at gmx.net
Wed Dec 23 06:05:57 CST 2009


Hi,

These 2 patches fix a flaw in the monkeypatch logic of diff that
became apparent when hg transplant --branch. Commands that work
with diff and patch should never expand keywords when reading
from filelog. However this happened unintentionally when
comparing 2 explicitly given revisions.

The solution: simply do not monkeypatch diff when in restricted
mode.

Finally, add transplant to the commands that trigger restricted
mode and test the scenario.

These patches are against stable. Patch queue against crew (with
slightly differing line offsets) at:
http://www.blacktrash.org/hg/hg-queue/
crew mirror with patches on top:
http://www.blacktrash.org/hg/hg-crew-mq/

c


More information about the Mercurial-devel mailing list