Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/hg.py @ 33:98633e60067c
Support for 0, 1, or 2 diff revs
author | mpm@selenic.com |
---|---|
date | Sat, 07 May 2005 09:27:52 -0800 |
parents | 6a4d8718bee0 |
children | a8811676c85a |
comparison
equal
deleted
inserted
replaced
32:6a4d8718bee0 | 33:98633e60067c |
---|---|
515 c = dc[fn] | 515 c = dc[fn] |
516 del dc[fn] | 516 del dc[fn] |
517 if not c: | 517 if not c: |
518 if fcmp(fn): | 518 if fcmp(fn): |
519 changed.append(fn) | 519 changed.append(fn) |
520 if c[1] != s.st_size: | 520 elif c[1] != s.st_size: |
521 changed.append(fn) | 521 changed.append(fn) |
522 elif c[0] != s.st_mode or c[2] != s.st_mtime: | 522 elif c[0] != s.st_mode or c[2] != s.st_mtime: |
523 if fcmp(fn): | 523 if fcmp(fn): |
524 changed.append(fn) | 524 changed.append(fn) |
525 else: | 525 else: |
530 deleted.sort() | 530 deleted.sort() |
531 | 531 |
532 return (changed, added, deleted) | 532 return (changed, added, deleted) |
533 | 533 |
534 def diffrevs(self, node1, node2): | 534 def diffrevs(self, node1, node2): |
535 changed, added = [], [], [] | 535 changed, added = [], [] |
536 | 536 |
537 change = self.changelog.read(node1) | 537 change = self.changelog.read(node1) |
538 mf1 = self.manifest.read(change[0]) | 538 mf1 = self.manifest.read(change[0]) |
539 change = self.changelog.read(revs[1]) | 539 change = self.changelog.read(node2) |
540 mf2 = self.manifest.read(change[0]) | 540 mf2 = self.manifest.read(change[0]) |
541 | 541 |
542 for fn in mf2: | 542 for fn in mf2: |
543 if mf1.has_key(fn): | 543 if mf1.has_key(fn): |
544 if mf1[fn] != mf2[fn]: | 544 if mf1[fn] != mf2[fn]: |