Show More
@@ -180,7 +180,7 b' def debugbuilddag(ui, repo, text=None,' | |||||
180 | ui.progress(_('building'), id, unit=_('revisions'), total=total) |
|
180 | ui.progress(_('building'), id, unit=_('revisions'), total=total) | |
181 | for type, data in dagparser.parsedag(text): |
|
181 | for type, data in dagparser.parsedag(text): | |
182 | if type == 'n': |
|
182 | if type == 'n': | |
183 | ui.note(('node %s\n' % str(data))) |
|
183 | ui.note(('node %s\n' % pycompat.bytestr(data))) | |
184 | id, ps = data |
|
184 | id, ps = data | |
185 |
|
185 | |||
186 | files = [] |
|
186 | files = [] |
@@ -389,14 +389,14 b' def _abssource(repo, push=False, abort=T' | |||||
389 | if util.safehasattr(repo, '_subparent'): |
|
389 | if util.safehasattr(repo, '_subparent'): | |
390 | source = util.url(repo._subsource) |
|
390 | source = util.url(repo._subsource) | |
391 | if source.isabs(): |
|
391 | if source.isabs(): | |
392 | return str(source) |
|
392 | return pycompat.bytestr(source) | |
393 | source.path = posixpath.normpath(source.path) |
|
393 | source.path = posixpath.normpath(source.path) | |
394 | parent = _abssource(repo._subparent, push, abort=False) |
|
394 | parent = _abssource(repo._subparent, push, abort=False) | |
395 | if parent: |
|
395 | if parent: | |
396 | parent = util.url(util.pconvert(parent)) |
|
396 | parent = util.url(util.pconvert(parent)) | |
397 | parent.path = posixpath.join(parent.path or '', source.path) |
|
397 | parent.path = posixpath.join(parent.path or '', source.path) | |
398 | parent.path = posixpath.normpath(parent.path) |
|
398 | parent.path = posixpath.normpath(parent.path) | |
399 | return str(parent) |
|
399 | return pycompat.bytestr(parent) | |
400 | else: # recursion reached top repo |
|
400 | else: # recursion reached top repo | |
401 | if util.safehasattr(repo, '_subtoppath'): |
|
401 | if util.safehasattr(repo, '_subtoppath'): | |
402 | return repo._subtoppath |
|
402 | return repo._subtoppath |
@@ -17,6 +17,7 b' from .node import (' | |||||
17 |
|
17 | |||
18 | from . import ( |
|
18 | from . import ( | |
19 | error, |
|
19 | error, | |
|
20 | pycompat, | |||
20 | revlog, |
|
21 | revlog, | |
21 | scmutil, |
|
22 | scmutil, | |
22 | util, |
|
23 | util, | |
@@ -105,7 +106,8 b' class verifier(object):' | |||||
105 | if self.lrugetctx(l)[f].filenode() == node] |
|
106 | if self.lrugetctx(l)[f].filenode() == node] | |
106 | except Exception: |
|
107 | except Exception: | |
107 | pass |
|
108 | pass | |
108 |
self.warn(_(" (expected %s)") % " ".join |
|
109 | self.warn(_(" (expected %s)") % " ".join | |
|
110 | (map(pycompat.bytestr, linkrevs))) | |||
109 | lr = None # can't be trusted |
|
111 | lr = None # can't be trusted | |
110 |
|
112 | |||
111 | try: |
|
113 | try: |
General Comments 0
You need to be logged in to leave comments.
Login now