| hg-reviewers |
The itervalues() exists because branchcache() had a dict interface. Since it no
longer has a dict interface, it makes sense to have better function names.
If a person does not understand how branchcache stores info, it will be hard for
them to guess what itervalues() does.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/mq.py (2 lines) | |||
| M | mercurial/branchmap.py (9 lines) | |||
| M | mercurial/bundle2.py (2 lines) | |||
| M | mercurial/revset.py (2 lines) |
| def push(self, repo, patch=None, force=False, list=False, mergeq=None, | def push(self, repo, patch=None, force=False, list=False, mergeq=None, | ||||
| all=False, move=False, exact=False, nobackup=False, | all=False, move=False, exact=False, nobackup=False, | ||||
| keepchanges=False): | keepchanges=False): | ||||
| self.checkkeepchanges(keepchanges, force) | self.checkkeepchanges(keepchanges, force) | ||||
| diffopts = self.diffopts() | diffopts = self.diffopts() | ||||
| with repo.wlock(): | with repo.wlock(): | ||||
| heads = [] | heads = [] | ||||
| for hs in repo.branchmap().itervalues(): | for hs in repo.branchmap().iterheads(): | ||||
| heads.extend(hs) | heads.extend(hs) | ||||
| if not heads: | if not heads: | ||||
| heads = [nullid] | heads = [nullid] | ||||
| if repo.dirstate.p1() not in heads and not exact: | if repo.dirstate.p1() not in heads and not exact: | ||||
| self.ui.status(_("(working directory not at a head)\n")) | self.ui.status(_("(working directory not at a head)\n")) | ||||
| if not self.series: | if not self.series: | ||||
| self.ui.warn(_('no patches in series\n')) | self.ui.warn(_('no patches in series\n')) | ||||
| return self.entries[key] | return self.entries[key] | ||||
| def setdefault(self, *args): | def setdefault(self, *args): | ||||
| return self.entries.setdefault(*args) | return self.entries.setdefault(*args) | ||||
| def iteritems(self): | def iteritems(self): | ||||
| return self.entries.iteritems() | return self.entries.iteritems() | ||||
| def itervalues(self): | |||||
| return self.entries.itervalues() | |||||
| @classmethod | @classmethod | ||||
| def fromfile(cls, repo): | def fromfile(cls, repo): | ||||
| f = None | f = None | ||||
| try: | try: | ||||
| f = repo.cachevfs(cls._filename(repo)) | f = repo.cachevfs(cls._filename(repo)) | ||||
| lineiter = iter(f) | lineiter = iter(f) | ||||
| cachekey = next(lineiter).rstrip('\n').split(" ", 2) | cachekey = next(lineiter).rstrip('\n').split(" ", 2) | ||||
| last, lrev = cachekey[:2] | last, lrev = cachekey[:2] | ||||
| if not closed: | if not closed: | ||||
| heads = list(self.iteropen(heads)) | heads = list(self.iteropen(heads)) | ||||
| return heads | return heads | ||||
| def iterbranches(self): | def iterbranches(self): | ||||
| for bn, heads in self.iteritems(): | for bn, heads in self.iteritems(): | ||||
| yield (bn, heads) + self._branchtip(heads) | yield (bn, heads) + self._branchtip(heads) | ||||
| def iterheads(self): | |||||
| """ returns all the heads """ | |||||
| return self.entries.itervalues() | |||||
| def copy(self): | def copy(self): | ||||
| """return an deep copy of the branchcache object""" | """return an deep copy of the branchcache object""" | ||||
| return branchcache( | return branchcache( | ||||
| self.entries, self.tipnode, self.tiprev, self.filteredhash, | self.entries, self.tipnode, self.tiprev, self.filteredhash, | ||||
| self._closednodes) | self._closednodes) | ||||
| def write(self, repo): | def write(self, repo): | ||||
| try: | try: | ||||
| if tiprev > self.tiprev: | if tiprev > self.tiprev: | ||||
| self.tipnode = cl.node(tiprev) | self.tipnode = cl.node(tiprev) | ||||
| self.tiprev = tiprev | self.tiprev = tiprev | ||||
| if not self.validfor(repo): | if not self.validfor(repo): | ||||
| # cache key are not valid anymore | # cache key are not valid anymore | ||||
| self.tipnode = nullid | self.tipnode = nullid | ||||
| self.tiprev = nullrev | self.tiprev = nullrev | ||||
| for heads in self.itervalues(): | for heads in self.iterheads(): | ||||
| tiprev = max(cl.rev(node) for node in heads) | tiprev = max(cl.rev(node) for node in heads) | ||||
| if tiprev > self.tiprev: | if tiprev > self.tiprev: | ||||
| self.tipnode = cl.node(tiprev) | self.tipnode = cl.node(tiprev) | ||||
| self.tiprev = tiprev | self.tiprev = tiprev | ||||
| self.filteredhash = scmutil.filteredhash(repo, self.tiprev) | self.filteredhash = scmutil.filteredhash(repo, self.tiprev) | ||||
| duration = util.timer() - starttime | duration = util.timer() - starttime | ||||
| repo.ui.log('branchcache', 'updated %s branch cache in %.4f seconds\n', | repo.ui.log('branchcache', 'updated %s branch cache in %.4f seconds\n', | ||||
| heads.append(h) | heads.append(h) | ||||
| h = inpart.read(20) | h = inpart.read(20) | ||||
| assert not h | assert not h | ||||
| # trigger a transaction so that we are guaranteed to have the lock now. | # trigger a transaction so that we are guaranteed to have the lock now. | ||||
| if op.ui.configbool('experimental', 'bundle2lazylocking'): | if op.ui.configbool('experimental', 'bundle2lazylocking'): | ||||
| op.gettransaction() | op.gettransaction() | ||||
| currentheads = set() | currentheads = set() | ||||
| for ls in op.repo.branchmap().itervalues(): | for ls in op.repo.branchmap().iterheads(): | ||||
| currentheads.update(ls) | currentheads.update(ls) | ||||
| for h in heads: | for h in heads: | ||||
| if h not in currentheads: | if h not in currentheads: | ||||
| raise error.PushRaced('remote repository changed while pushing - ' | raise error.PushRaced('remote repository changed while pushing - ' | ||||
| 'please try again') | 'please try again') | ||||
| @parthandler('check:phases') | @parthandler('check:phases') | ||||
| @predicate('head()', safe=True) | @predicate('head()', safe=True) | ||||
| def head(repo, subset, x): | def head(repo, subset, x): | ||||
| """Changeset is a named branch head. | """Changeset is a named branch head. | ||||
| """ | """ | ||||
| # i18n: "head" is a keyword | # i18n: "head" is a keyword | ||||
| getargs(x, 0, 0, _("head takes no arguments")) | getargs(x, 0, 0, _("head takes no arguments")) | ||||
| hs = set() | hs = set() | ||||
| cl = repo.changelog | cl = repo.changelog | ||||
| for ls in repo.branchmap().itervalues(): | for ls in repo.branchmap().iterheads(): | ||||
| hs.update(cl.rev(h) for h in ls) | hs.update(cl.rev(h) for h in ls) | ||||
| return subset & baseset(hs) | return subset & baseset(hs) | ||||
| @predicate('heads(set)', safe=True, takeorder=True) | @predicate('heads(set)', safe=True, takeorder=True) | ||||
| def heads(repo, subset, x, order): | def heads(repo, subset, x, order): | ||||
| """Members of set with no children in set. | """Members of set with no children in set. | ||||
| """ | """ | ||||
| # argument set should never define order | # argument set should never define order | ||||