450741 - need a way to allow a single head per branch on an hg repo

Status: RESOLVED FIXED

(Developer Services :: Mercurial: hg.mozilla.org, defect)

Description

[[e-mail] (:bhearsum)]

Attachment: allow single head per branch

Since we're going with permanent named branches in our existing repositories this hook needs to be updated.

I've tested this patch locally and it seems to work as intended...note that we only test active branches. Inactive branches seem to list two heads with 'hg heads -r $branch' when we have more than one active branch...

Comment 1

[Benjamin Smedberg]

Comment on attachment 333924 [details] [diff] [review]
allow single head per branch

I think there's got to be a better way to do this as a python hook instead of a shell hook, but I'm going to ask djc for review in either case.

Comment 2

[Dirkjan Ochtman (:djc)]

For the shell version, you should probably use hg branches -aq (-q is a global option only listed with hg help -v branches) rather than the awk construction (I think hg branch names can contain spaces), but I agree with bsmedberg that using a Python hook might be better.

Comment 3

[[e-mail] (:bhearsum)]

Attachment: python hook for single-head-per-branch

It seems that branchheads() only returns one head for inactive branches. As I found out, 'hg heads -r $branch' and 'hg heads $branch' do different things. I bet I probably shouldn't have used '-r' in the shell version.

In any case, how does this look?

Comment 4

[Dirkjan Ochtman (:djc)]

Yes, after some testing, that seems fine. You may want to break after setting err = True, since the rest of the loop is useless anyway. Similarly, you could simplify to just one error message (set err = '' at the start, then err = branchname when it has multiple heads), which might be better. Otherwise, seems nice!

Comment 5

[Dirkjan Ochtman (:djc)]

Or should I say r+djc? ;)

Comment 6

[[e-mail] (:bhearsum)]

Attachment: [checked in] address djc's comments, change example hgrc

Comment 7

[[e-mail] (:bhearsum)]

Comment on attachment 333959 [details] [diff] [review]
[checked in] address djc's comments, change example hgrc

Dunno who should review this. Benjamin? djc?

Comment 8

[[e-mail] (:bhearsum)]

Comment on attachment 333959 [details] [diff] [review]
[checked in] address djc's comments, change example hgrc

changeset:   9:d1ffa7f6da59

Comment 9

[[e-mail] (:bhearsum)]

I'm planning to do a named branch for 3.1a2. I filed bug 452431 to get this deployed on m-c, comm-central, and the l10n repositories.