Show More
@@ -2370,7 +2370,7 b' def grep(ui, repo, pattern, *pats, **opt' | |||||
2370 | try: |
|
2370 | try: | |
2371 | regexp = util.re.compile(pattern, reflags) |
|
2371 | regexp = util.re.compile(pattern, reflags) | |
2372 | except re.error as inst: |
|
2372 | except re.error as inst: | |
2373 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) |
|
2373 | ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)) | |
2374 | return 1 |
|
2374 | return 1 | |
2375 | sep, eol = ':', '\n' |
|
2375 | sep, eol = ':', '\n' | |
2376 | if opts.get('print0'): |
|
2376 | if opts.get('print0'): |
@@ -1591,7 +1591,8 b' def debugobsolete(ui, repo, precursor=No' | |||||
1591 | metadata=metadata, ui=ui) |
|
1591 | metadata=metadata, ui=ui) | |
1592 | tr.close() |
|
1592 | tr.close() | |
1593 | except ValueError as exc: |
|
1593 | except ValueError as exc: | |
1594 |
raise error.Abort(_('bad obsmarker input: %s') % |
|
1594 | raise error.Abort(_('bad obsmarker input: %s') % | |
|
1595 | pycompat.bytestr(exc)) | |||
1595 | finally: |
|
1596 | finally: | |
1596 | tr.release() |
|
1597 | tr.release() | |
1597 | finally: |
|
1598 | finally: |
General Comments 0
You need to be logged in to leave comments.
Login now