Mercurial > hg
comparison mercurial/subrepo.py @ 12209:affec9fb56ef
subrepos: handle diff nodeids in subrepos, not before
Subversion nodeids are integer revisions.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Fri, 10 Sep 2010 22:52:00 +0200 |
| parents | ecab10820983 |
| children | 21eb85e9ea94 |
comparison
equal
deleted
inserted
replaced
| 12208:482443557cad | 12209:affec9fb56ef |
|---|---|
| 303 return [], [], [], [], [], [], [] | 303 return [], [], [], [], [], [], [] |
| 304 | 304 |
| 305 def diff(self, diffopts, node2, match, prefix, **opts): | 305 def diff(self, diffopts, node2, match, prefix, **opts): |
| 306 try: | 306 try: |
| 307 node1 = node.bin(self._state[1]) | 307 node1 = node.bin(self._state[1]) |
| 308 # We currently expect node2 to come from substate and be | |
| 309 # in hex format | |
| 310 node2 = node.bin(node2) | |
| 308 cmdutil.diffordiffstat(self._repo.ui, self._repo, diffopts, | 311 cmdutil.diffordiffstat(self._repo.ui, self._repo, diffopts, |
| 309 node1, node2, match, | 312 node1, node2, match, |
| 310 prefix=os.path.join(prefix, self._path), | 313 prefix=os.path.join(prefix, self._path), |
| 311 listsubrepos=True, **opts) | 314 listsubrepos=True, **opts) |
| 312 except error.RepoLookupError, inst: | 315 except error.RepoLookupError, inst: |