Mercurial > hg
changeset 20245:4edd179fefb8
help: branch names primarily denote the tipmost unclosed branch head
Was the behavior correct and the description wrong so it should be updated as
in this patch? Or should the code work as the documentation says?
Both ways could make some sense ... but none of them are obvious in all cases.
One place where it currently cause problems is when the current revision has
another branch head that is closer to tip but closed. 'hg rebase' refuses to
rebase to that as it only see the tip-most unclosed branch head which is the
current revision.
/me kind of likes named branches, but no so much how branch closing works ...
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 21 Nov 2013 15:17:18 -0500 |
| parents | 47d0843647d1 |
| children | e4dc4c89b03a |
| files | mercurial/branchmap.py mercurial/help/revisions.txt mercurial/localrepo.py tests/test-help.t |
| diffstat | 4 files changed, 15 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/branchmap.py Sun Jan 12 23:28:21 2014 +0100 +++ b/mercurial/branchmap.py Thu Nov 21 15:17:18 2013 -0500 @@ -167,6 +167,8 @@ return False def _branchtip(self, heads): + '''Return tuple with last open head in heads and false, + otherwise return last closed head and true.''' tip = heads[-1] closed = True for h in reversed(heads): @@ -177,6 +179,9 @@ return tip, closed def branchtip(self, branch): + '''Return the tipmost open head on branch head, otherwise return the + tipmost closed head on branch. + Raise KeyError for unknown branch.''' return self._branchtip(self[branch])[0] def branchheads(self, branch, closed=False):
--- a/mercurial/help/revisions.txt Sun Jan 12 23:28:21 2014 +0100 +++ b/mercurial/help/revisions.txt Thu Nov 21 15:17:18 2013 -0500 @@ -14,9 +14,9 @@ Any other string is treated as a bookmark, tag, or branch name. A bookmark is a movable pointer to a revision. A tag is a permanent name -associated with a revision. A branch name denotes the tipmost revision -of that branch. Bookmark, tag, and branch names must not contain the ":" -character. +associated with a revision. A branch name denotes the tipmost open branch head +of that branch - or if they are all closed, the tipmost closed head of the +branch. Bookmark, tag, and branch names must not contain the ":" character. The reserved name "tip" always identifies the most recent revision.
--- a/mercurial/localrepo.py Sun Jan 12 23:28:21 2014 +0100 +++ b/mercurial/localrepo.py Thu Nov 21 15:17:18 2013 -0500 @@ -655,7 +655,8 @@ return sorted(marks) def branchmap(self): - '''returns a dictionary {branch: [branchheads]}''' + '''returns a dictionary {branch: [branchheads]} with branchheads + ordered by increasing revision number''' branchmap.updatecache(self) return self._branchcaches[self.filtername]
--- a/tests/test-help.t Sun Jan 12 23:28:21 2014 +0100 +++ b/tests/test-help.t Thu Nov 21 15:17:18 2013 -0500 @@ -723,7 +723,8 @@ Any other string is treated as a bookmark, tag, or branch name. A bookmark is a movable pointer to a revision. A tag is a permanent name associated - with a revision. A branch name denotes the tipmost revision of that + with a revision. A branch name denotes the tipmost open branch head of + that branch - or if they are all closed, the tipmost closed head of the branch. Bookmark, tag, and branch names must not contain the ":" character. @@ -1878,9 +1879,9 @@ <p> Any other string is treated as a bookmark, tag, or branch name. A bookmark is a movable pointer to a revision. A tag is a permanent name - associated with a revision. A branch name denotes the tipmost revision - of that branch. Bookmark, tag, and branch names must not contain the ":" - character. + associated with a revision. A branch name denotes the tipmost open branch head + of that branch - or if they are all closed, the tipmost closed head of the + branch. Bookmark, tag, and branch names must not contain the ":" character. </p> <p> The reserved name "tip" always identifies the most recent revision.