[issue15917] hg hook to detect unmerged changesets

Change by Inada Naoki : -- resolution: -> out of date stage: patch review -> resolved status: open -> closed ___ Python tracker ___ ___

[issue15917] hg hook to detect unmerged changesets

Martin v. Löwis added the comment: hg log -r 'head()-parents(merge())-closed()' --template '{branch}\n' works for me. Alternatively, hg log -r 'head()-parents(merge())-closed()-branch(2.7)-branch(default)' should come out empty. -- ___ Python track

[issue15917] hg hook to detect unmerged changesets

Ezio Melotti added the comment: > Wouldn't it be simpler to find all topological heads in the new csets > (a topological head is a cset without any child), and check that none > of them is on a 3.* branch? Indeed -- I was looking at this again and it occurred to me that checking that the only t

[issue15917] hg hook to detect unmerged changesets

Ezio Melotti added the comment: It happened once already. It shouldn't be too difficult to add, but it might make the code more complicated and more likely to fail in some situation. -- ___ Python tracker ___

[issue15917] hg hook to detect unmerged changesets

Terry J. Reedy added the comment: +1 Would it be easy to check that no 2.7 commit is merged with anything in another branch? (I have not seen anyone do such a wrong merge, but I expect it will happen someday.) -- nosy: +terry.reedy ___ Python tracke

[issue15917] hg hook to detect unmerged changesets

Senthil Kumaran added the comment: Reviewed the patch - the logic looks okay to me - namely verifying that the changeset the merged with the next +0.1, 3.x branch or default. I tested. 2.7 -> push -> success. 3.1 -> push -> fail -> merge to 3.2 -> fail -> merge to default -> success. Looks li

[issue15917] hg hook to detect unmerged changesets

Changes by R. David Murray : -- nosy: +r.david.murray ___ Python tracker ___ ___ Python-bugs-list mailing list Unsubscribe: http://ma

[issue15917] hg hook to detect unmerged changesets

Ezio Melotti added the comment: > I might be wrong, but the logic in your hook looks a bit complicated. This might be true. The logic I followed is that once a cset is merged, it becomes a parent of another cset (either in the same branch or in the "next" one). So, if the cset is in 3.x and

[issue15917] hg hook to detect unmerged changesets

Antoine Pitrou added the comment: I might be wrong, but the logic in your hook looks a bit complicated. Wouldn't it be simpler to find all topological heads in the new csets (a topological head is a cset without any child), and check that none of them is on a 3.* branch? Finding topological h

[issue15917] hg hook to detect unmerged changesets

Ezio Melotti added the comment: Attached a set up script to reproduce a test environment for the hook. Create an empty dir and run ``sh setup.sh`` in it. This will: 1) create a 'c1' subdir which is a cpython-like repo with the branches 2.7, 3.1, 3.2, default; 2) download and set up the hoo

[issue15917] hg hook to detect unmerged changesets

Christian Heimes added the comment: +1 for the feature -- nosy: +christian.heimes ___ Python tracker ___ ___ Python-bugs-list mailing

[issue15917] hg hook to detect unmerged changesets

Jesús Cea Avión added the comment: We need something like this. I can not review, I am not familiar with mercurial hooks internals. -- ___ Python tracker ___ ___

[issue15917] hg hook to detect unmerged changesets

Changes by Jesús Cea Avión : -- nosy: +jcea ___ Python tracker ___ ___ Python-bugs-list mailing list Unsubscribe: http://mail.python.

[issue15917] hg hook to detect unmerged changesets

New submission from Ezio Melotti: The attached Mercurial hook checks that all the changesets in a 3.x branch are merged with either another cset in the same branch or a cset in the following 3.x branch. This is to detect and prevent situations where people commit something on e.g. 3.2 and pus