Mercurial > hg
changeset 25018:93e015a3d1ea
commit: add ui.allowemptycommit config option
This adds a config flag that enables a user to make empty commits.
This is useful in a number of cases.
For instance, automation that creates release branches via
bookmarks may want to make empty commits to that release bookmark so that it
can't be fast-forwarded and so it can record information about the release
bookmark's creation. This is already possible with named branches, so making it
possible for bookmarks makes sense.
Another case we've wanted it is for mirroring repositories into Mercurial. We
have automation that syncs commits into hg by running things from the command
line. The ability to produce empty commits is useful for syncing unusual commits
from other VCS's.
In general, allowing the user to create the DAG as they see fit seems useful,
and when I mentioned this in IRC more than one person piped up and said they
were already hacking around this limitation by using mq, import, and
commit-dummy-change-then-amend-the-content-away style solutions.
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Mon, 11 May 2015 16:18:28 -0700 |
| parents | 4e857213d2d1 |
| children | 672e0558aed1 |
| files | mercurial/localrepo.py tests/test-commit.t |
| diffstat | 2 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Mon May 11 16:16:22 2015 -0700 +++ b/mercurial/localrepo.py Mon May 11 16:18:28 2015 -0700 @@ -1463,7 +1463,8 @@ text, user, date, extra) allowemptycommit = (wctx.branch() != wctx.p1().branch() or force - or extra.get('close') or merge or cctx.files()) + or extra.get('close') or merge or cctx.files() + or self.ui.configbool('ui', 'allowemptycommit')) if not allowemptycommit: return None
--- a/tests/test-commit.t Mon May 11 16:16:22 2015 -0700 +++ b/tests/test-commit.t Mon May 11 16:18:28 2015 -0700 @@ -544,6 +544,18 @@ 0 0 6 ..... 0 26d3ca0dfd18 000000000000 000000000000 (re) 1 6 7 ..... 1 d267bddd54f7 26d3ca0dfd18 000000000000 (re) +Test making empty commits + $ hg commit --config ui.allowemptycommit=True -m "empty commit" + $ hg log -r . -v --stat + changeset: 2:d809f3644287 + tag: tip + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + description: + empty commit + + + verify pathauditor blocks evil filepaths $ cat > evil-commit.py <<EOF > from mercurial import ui, hg, context, node @@ -568,7 +580,7 @@ #endif $ hg rollback -f - repository tip rolled back to revision 1 (undo commit) + repository tip rolled back to revision 2 (undo commit) $ cat > evil-commit.py <<EOF > from mercurial import ui, hg, context, node > notrc = "HG~1/hgrc" @@ -586,7 +598,7 @@ [255] $ hg rollback -f - repository tip rolled back to revision 1 (undo commit) + repository tip rolled back to revision 2 (undo commit) $ cat > evil-commit.py <<EOF > from mercurial import ui, hg, context, node > notrc = "HG8B6C~2/hgrc"