且构网

分享程序员开发的那些事...
且构网 - 分享程序员编程开发的那些事

Mercurial子存储库:防止意外的递归提交和推送

更新时间:2023-12-02 09:11:10

Mercurial 2.0会自动阻止您提交子存储库,除非您手动为commit指定--subrepos(或-S)自变量.>

例如,当子存储库中有待处理的更改时,您尝试执行提交,则会收到以下消息:

# hg commit -m 'change main repo'
abort: uncommitted changes in subrepo hello
(use --subrepos for recursive commit)

但是,可以通过在命令中添加--subrepos来成功执行提交:

# hg commit --subrepos -m 'commit subrepos'
committing subrepository hello

一些仍需注意的事情:如果您更改了子存储库当前的版本,但没有更改子存储库的内容,Mercurial会很乐意提交没有--subrepos标志的版本更改.此外,递归推送仍会在没有警告的情况下执行.

I work on a team where we have a code in a mercurial repository with several subrepositories:

main/
main/subrepo1/
main/subrepo1/subrepo2/

The default behavior of Mercurial is that when a hg commit is performed in "main", any outstanding changes in the subrepositories "subrepo1" and "subrepo2" will also be committed. Similarly, when "main" is pushed, any outgoing commits in "subrepo1" and "subrepo2" will also be pushed.

We find that people frequently inadvertently commit and push changes in their subrepositories (because they forgot they had made changes, and hg status by default does not show recursive changes). We also find that such global commits / pushes are almost always accidental in our team.

Mercurial 1.7 recently improved the situation with hg status -S and hg outgoing -S, which show changes in subrepositories; but still, this requires people to be paying attention.

Is there a way in Mercurial to make hg commit and hg push abort if there are changes/commits in subrepostories that would otherwise be committed/pushed?

Mercurial 2.0 automatically prevents you from committing subrepositories unless you manually specify the --subrepos (or, alternatively, -S) argument to commit.

For example, you try to perform a commit while there are pending changes in a subrepository, you get the following message:

# hg commit -m 'change main repo'
abort: uncommitted changes in subrepo hello
(use --subrepos for recursive commit)

You can successfully perform the commit, however, by adding --subrepos to the command:

# hg commit --subrepos -m 'commit subrepos'
committing subrepository hello

Some things to still be careful about: If you have changed the revision a subrepository is currently at, but not the contents of the subrepository, Mercurial will happily commit the version change without the --subrepos flag. Further, recursive pushes are still performed without warning.