Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 2963:a8546e40070a
fix incoming -p
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Sun, 20 Aug 2006 02:21:51 -0300 |
| parents | ff3ea21a981a |
| children | 890e285c52a1 fb493241d7f6 |
comparison
equal
deleted
inserted
replaced
| 2962:882e703eaa94 | 2963:a8546e40070a |
|---|---|
| 1736 if opts['no_merges'] and len(parents) == 2: | 1736 if opts['no_merges'] and len(parents) == 2: |
| 1737 continue | 1737 continue |
| 1738 displayer.show(changenode=n) | 1738 displayer.show(changenode=n) |
| 1739 if opts['patch']: | 1739 if opts['patch']: |
| 1740 prev = (parents and parents[0]) or nullid | 1740 prev = (parents and parents[0]) or nullid |
| 1741 patch.diff(repo, other, prev, n) | 1741 patch.diff(other, prev, n, fp=repo.ui) |
| 1742 ui.write("\n") | 1742 ui.write("\n") |
| 1743 finally: | 1743 finally: |
| 1744 if hasattr(other, 'close'): | 1744 if hasattr(other, 'close'): |
| 1745 other.close() | 1745 other.close() |
| 1746 if cleanup: | 1746 if cleanup: |