Mercurial > public > mercurial-scm > hg

comparison mercurial/hgweb.py @ 1626:f2b1df3dbcbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make the order of the arguments for filterfiles consistent fix a bug where the order was reversed
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 18 Jan 2006 16:55:05 +0100
parents 1ba0d7041ac4
children 11cd38286fdb
comparison
equal deleted inserted replaced
1625:e1bcf7fa983f 1626:f2b1df3dbcbb
224 def showtag(self, t1, node=nullid, **args): 224 def showtag(self, t1, node=nullid, **args):
225 for t in self.repo.nodetags(node): 225 for t in self.repo.nodetags(node):
226 yield self.t(t1, tag=t, **args) 226 yield self.t(t1, tag=t, **args)
227 227
228 def diff(self, node1, node2, files): 228 def diff(self, node1, node2, files):
229 def filterfiles(list, files): 229 def filterfiles(filters, files):
230 l = [x for x in list if x in files] 230 l = [x for x in list if x in filters]
231 231
232 for f in files: 232 for t in filters:
233 if f[-1] != os.sep: 233 if t[-1] != os.sep:
234 f += os.sep 234 t += os.sep
235 l += [x for x in list if x.startswith(f)] 235 l += [x for x in files if x.startswith(t)]
236 return l 236 return l
237 237
238 parity = [0] 238 parity = [0]
239 def diffblock(diff, f, fn): 239 def diffblock(diff, f, fn):
240 yield self.t("diffblock", 240 yield self.t("diffblock",
265 date1 = util.datestr(change1[2]) 265 date1 = util.datestr(change1[2])
266 date2 = util.datestr(change2[2]) 266 date2 = util.datestr(change2[2])
267 267
268 modified, added, removed, deleted, unknown = r.changes(node1, node2) 268 modified, added, removed, deleted, unknown = r.changes(node1, node2)
269 if files: 269 if files:
270 modified, added, removed = map(lambda x: filterfiles(x, files), 270 modified, added, removed = map(lambda x: filterfiles(files, x),
271 (modified, added, removed)) 271 (modified, added, removed))
272 272
273 for f in modified: 273 for f in modified:
274 to = r.file(f).read(mmap1[f]) 274 to = r.file(f).read(mmap1[f])
275 tn = r.file(f).read(mmap2[f]) 275 tn = r.file(f).read(mmap2[f])