Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/subrepo.py @ 17968:a9f4a6076740

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: use posixpath when diffing, for consistent paths This fixes a Windows failure in test-subrepo-recursion.t introduced by c84ef0047a94.
author Bryan O'Sullivan <bryano@fb.com>
date Tue, 27 Nov 2012 14:58:00 -0800
parents 17c030014ddf
children 54f063acc5ea
comparison
equal deleted inserted replaced
17967:0e2850a6fcdd 17968:a9f4a6076740
444 # in hex format 444 # in hex format
445 if node2 is not None: 445 if node2 is not None:
446 node2 = node.bin(node2) 446 node2 = node.bin(node2)
447 cmdutil.diffordiffstat(self._repo.ui, self._repo, diffopts, 447 cmdutil.diffordiffstat(self._repo.ui, self._repo, diffopts,
448 node1, node2, match, 448 node1, node2, match,
449 prefix=os.path.join(prefix, self._path), 449 prefix=posixpath.join(prefix, self._path),
450 listsubrepos=True, **opts) 450 listsubrepos=True, **opts)
451 except error.RepoLookupError, inst: 451 except error.RepoLookupError, inst:
452 self._repo.ui.warn(_('warning: error "%s" in subrepository "%s"\n') 452 self._repo.ui.warn(_('warning: error "%s" in subrepository "%s"\n')
453 % (inst, subrelpath(self))) 453 % (inst, subrelpath(self)))
454 454