Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 43735:7eb701e355bd
merge with stable
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Fri, 22 Nov 2019 21:42:04 +0900 |
| parents | f965b1027fb0 88a306478556 |
| children | 9c83d28776af |
comparison
equal
deleted
inserted
replaced
| 43733:8ca92bcb3083 | 43735:7eb701e355bd |
|---|---|
| 1566 node = bin(changeid) | 1566 node = bin(changeid) |
| 1567 rev = self.changelog.rev(node) | 1567 rev = self.changelog.rev(node) |
| 1568 else: | 1568 else: |
| 1569 raise error.ProgrammingError( | 1569 raise error.ProgrammingError( |
| 1570 b"unsupported changeid '%s' of type %s" | 1570 b"unsupported changeid '%s' of type %s" |
| 1571 % (changeid, pycompat.sysstr(type(changeid))) | 1571 % (changeid, pycompat.bytestr(type(changeid))) |
| 1572 ) | 1572 ) |
| 1573 | 1573 |
| 1574 return context.changectx(self, rev, node) | 1574 return context.changectx(self, rev, node) |
| 1575 | 1575 |
| 1576 except (error.FilteredIndexError, error.FilteredLookupError): | 1576 except (error.FilteredIndexError, error.FilteredLookupError): |
| 2084 # This will have to be fixed before we remove the experimental | 2084 # This will have to be fixed before we remove the experimental |
| 2085 # gating. | 2085 # gating. |
| 2086 tracktags(tr2) | 2086 tracktags(tr2) |
| 2087 repo = reporef() | 2087 repo = reporef() |
| 2088 | 2088 |
| 2089 r = repo.ui.configsuboptions( | 2089 singleheadopt = (b'experimental', b'single-head-per-branch') |
| 2090 b'experimental', b'single-head-per-branch' | 2090 singlehead = repo.ui.configbool(*singleheadopt) |
| 2091 ) | |
| 2092 singlehead, singleheadsub = r | |
| 2093 if singlehead: | 2091 if singlehead: |
| 2092 singleheadsub = repo.ui.configsuboptions(*singleheadopt)[1] | |
| 2094 accountclosed = singleheadsub.get( | 2093 accountclosed = singleheadsub.get( |
| 2095 b"account-closed-heads", False | 2094 b"account-closed-heads", False |
| 2096 ) | 2095 ) |
| 2097 scmutil.enforcesinglehead(repo, tr2, desc, accountclosed) | 2096 scmutil.enforcesinglehead(repo, tr2, desc, accountclosed) |
| 2098 if hook.hashook(repo.ui, b'pretxnclose-bookmark'): | 2097 if hook.hashook(repo.ui, b'pretxnclose-bookmark'): |