Mercurial > public > mercurial-scm > hg
comparison mercurial/context.py @ 9136:31177742f54a
for calls expecting bool args, pass bool instead of int
str.splitlines and email.message.as_string both expect a bool argument
defaulting at False: replace f(1) by f(True) and f(0) by f()
| author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
|---|---|
| date | Mon, 13 Jul 2009 09:50:26 +0900 |
| parents | bbc78cb1bf15 |
| children | f57640bf10d4 |
comparison
equal
deleted
inserted
replaced
| 9135:df881932362f | 9136:31177742f54a |
|---|---|
| 441 needed[p] -= 1 | 441 needed[p] -= 1 |
| 442 if not needed[p]: | 442 if not needed[p]: |
| 443 del hist[p] | 443 del hist[p] |
| 444 hist[f] = curr | 444 hist[f] = curr |
| 445 | 445 |
| 446 return zip(hist[f][0], hist[f][1].splitlines(1)) | 446 return zip(hist[f][0], hist[f][1].splitlines(True)) |
| 447 | 447 |
| 448 def ancestor(self, fc2): | 448 def ancestor(self, fc2): |
| 449 """ | 449 """ |
| 450 find the common ancestor file context, if any, of self, and fc2 | 450 find the common ancestor file context, if any, of self, and fc2 |
| 451 """ | 451 """ |