Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/unionrepo.py @ 24803:e89f909edffa stable 3.4-rc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default into stable for 3.4 freeze
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Apr 2015 20:57:51 -0500
parents 76f6ae06ddf5
children e4f75c93f073
comparison
equal deleted inserted replaced
24753:612ed41ae359 24803:e89f909edffa
158 return filelog.filelog.revision(self, nodeorrev) 158 return filelog.filelog.revision(self, nodeorrev)
159 159
160 def baserevdiff(self, rev1, rev2): 160 def baserevdiff(self, rev1, rev2):
161 return filelog.filelog.revdiff(self, rev1, rev2) 161 return filelog.filelog.revdiff(self, rev1, rev2)
162 162
163 def _file(self, f): 163 def iscensored(self, rev):
164 self._repo.file(f) 164 """Check if a revision is censored."""
165 if rev <= self.repotiprev:
166 return filelog.filelog.iscensored(self, rev)
167 return self.revlog2.iscensored(rev)
165 168
166 class unionpeer(localrepo.localpeer): 169 class unionpeer(localrepo.localpeer):
167 def canpush(self): 170 def canpush(self):
168 return False 171 return False
169 172