equal
deleted
inserted
replaced
250 import collections |
250 import collections |
251 import struct |
251 import struct |
252 |
252 |
253 from mercurial import ( |
253 from mercurial import ( |
254 commands, |
254 commands, |
|
255 error, |
255 localrepo, |
256 localrepo, |
256 error, |
257 logcmdutil, |
257 node as nodemod, |
258 node as nodemod, |
258 pycompat, |
259 pycompat, |
259 scmutil, |
260 scmutil, |
260 ) |
261 ) |
261 |
262 |
262 try: |
263 from mercurial.utils.stringutil import forcebytestr |
263 from mercurial.utils.stringutil import forcebytestr |
|
264 except ImportError: |
|
265 # hg <= 4.5 (f99d64e8a4e4) |
|
266 from mercurial.util import forcebytestr |
|
267 |
264 |
268 from mercurial.i18n import _ |
265 from mercurial.i18n import _ |
269 |
266 |
270 from . import ( |
267 from . import ( |
271 compat, |
268 compat, |
316 if sorting is None: |
313 if sorting is None: |
317 valid_method = b', '.join(sorted(_methodmap)) |
314 valid_method = b', '.join(sorted(_methodmap)) |
318 raise error.Abort(b'unknown sorting method: "%s"' % method, |
315 raise error.Abort(b'unknown sorting method: "%s"' % method, |
319 hint=b'pick one of: %s' % valid_method) |
316 hint=b'pick one of: %s' % valid_method) |
320 |
317 |
321 displayer = compat.changesetdisplayer(ui, repo, pycompat.byteskwargs(opts), |
318 displayer = logcmdutil.changesetdisplayer(ui, repo, |
322 buffered=True) |
319 pycompat.byteskwargs(opts), |
|
320 buffered=True) |
323 kwargs = {} |
321 kwargs = {} |
324 if opts['limit']: |
322 if opts['limit']: |
325 kwargs['limit'] = int(opts['limit']) |
323 kwargs['limit'] = int(opts['limit']) |
326 for r in sorting(repo, revs, **kwargs): |
324 for r in sorting(repo, revs, **kwargs): |
327 ctx = repo[r] |
325 ctx = repo[r] |