Page MenuHomePhabricator

Never use "{branches}" in Mercurial
ClosedPublic

Authored by epriestley on Jun 10 2014, 2:10 PM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 6 2024, 2:56 AM
Unknown Object (File)
Jan 31 2024, 2:37 PM
Unknown Object (File)
Jan 17 2024, 11:32 PM
Unknown Object (File)
Dec 22 2023, 7:00 AM
Unknown Object (File)
Dec 17 2023, 6:36 AM
Unknown Object (File)
Nov 28 2023, 1:17 AM
Unknown Object (File)
Nov 23 2023, 1:06 PM
Unknown Object (File)
Nov 13 2023, 10:17 AM
Subscribers

Details

Summary

Fixes T5304. Mercurial features a "{branches}" template keyword, documented as:

branches      List of strings. The name of the branch on which the
              changeset was committed. Will be empty if the branch name
              was default.

At some time long in the past, I misinterpreted this to mean "list of branches where the branch head is a descendant of the commit". It is more like "list of zero or one elements, possibly containing the name of the branch the commit was originally made to, if that branch was not 'default'".

In fact, it seems like this is because a very long time in the past, Mercurial worked roughly like I expected:

Ages ago (2005), we had a very different and ultimately unworkable
approach to named branches that worked vaguely like .hgtags and allowed
multiple branch names per revision.

http://marc.info/?l=mercurial-devel&m=129883069414855

This appears to be deprecated in modern Mercurial (it's not in the modern web documentation) although I can't find a commit about it so maybe that's just a documentation issue.

In any case, {branches} seems to never be useful: {branch} provides the same information without the awkward "default-if-empty" case.

Switch from {branches} to either {branch} (where that's good enough, notably in the hook engine) or (descendants(%s) and head()), which is equivalent to --contains in Git.

This fixes pushing to branches with spaces in their names, and makes the "Branches" / "Contains" queries moderately more consistent.

Test Plan
  • Pushed to a Mercurial branch with a space in it.
  • Viewed list of branches in a Mercurial repository.
  • Viewed containing branches of a Mercurial commit in Diffusion.

Diff Detail

Repository
rP Phabricator
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

epriestley retitled this revision from to Never use "{branches}" in Mercurial.
epriestley updated this object.
epriestley edited the test plan for this revision. (Show Details)
epriestley added a reviewer: btrahan.
src/applications/diffusion/conduit/ConduitAPI_diffusion_branchquery_Method.php
87–91

This also fixes the issue where we'll return branch heads which do not actually descend from the commit.

btrahan edited edge metadata.
This revision is now accepted and ready to land.Jun 20 2014, 5:17 PM
epriestley updated this revision to Diff 23142.

Closed by commit rP5660684d7f44 (authored by @epriestley).