Mercurial > hg
view hgext/graphlog.py @ 44651:00e0c5c06ed5
pycompat: change argv conversion semantics
Use of os.fsencode() to convert Python's sys.argv back to bytes
was not correct because it isn't the logically inverse operation
from what CPython was doing under the hood.
This commit changes the logic for doing the str -> bytes
conversion. This required a separate implementation for
POSIX and Windows.
The Windows behavior is arguably not ideal. The previous
behavior on Windows was leading to failing tests, such as
test-http-branchmap.t, which defines a utf-8 branch name
via a command argument. Previously, Mercurial's argument
parser looked to be receiving wchar_t bytes in some cases.
After this commit, behavior on Windows is compatible with
Python 2, where CPython did not implement `int wmain()` and
Windows was performing a Unicode to ANSI conversion on the
wchar_t native command line.
Arguably better behavior on Windows would be for Mercurial to
preserve the original Unicode sequence coming from Python and
to wrap this in a bytes-like type so we can round trip safely.
But, this would be new, backwards incompatible behavior. My
goal for this commit was to converge Mercurial behavior on
Python 3 on Windows to fix busted tests. And I believe I was
successful, as this commit fixes 9 tests on my Windows
machine and 14 tests in the AWS CI environment!
Differential Revision: https://phab.mercurial-scm.org/D8337
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sat, 28 Mar 2020 12:18:58 -0700 |
parents | 9f70512ae2cf |
children | 6000f5b25c9b |
line wrap: on
line source
# ASCII graph log extension for Mercurial # # Copyright 2007 Joel Rosdahl <joel@rosdahl.net> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. '''command to view revision graphs from a shell (DEPRECATED) The functionality of this extension has been include in core Mercurial since version 2.3. Please use :hg:`log -G ...` instead. This extension adds a --graph option to the incoming, outgoing and log commands. When this options is given, an ASCII representation of the revision graph is also shown. ''' from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( cmdutil, commands, registrar, ) cmdtable = {} command = registrar.command(cmdtable) # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. testedwith = b'ships-with-hg-core' @command( b'glog', [ ( b'f', b'follow', None, _( b'follow changeset history, or file history across copies and renames' ), ), ( b'', b'follow-first', None, _(b'only follow the first parent of merge changesets (DEPRECATED)'), ), ( b'd', b'date', b'', _(b'show revisions matching date spec'), _(b'DATE'), ), (b'C', b'copies', None, _(b'show copied files')), ( b'k', b'keyword', [], _(b'do case-insensitive search for a given text'), _(b'TEXT'), ), ( b'r', b'rev', [], _(b'show the specified revision or revset'), _(b'REV'), ), ( b'', b'removed', None, _(b'include revisions where files were removed'), ), (b'm', b'only-merges', None, _(b'show only merges (DEPRECATED)')), (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')), ( b'', b'only-branch', [], _( b'show only changesets within the given named branch (DEPRECATED)' ), _(b'BRANCH'), ), ( b'b', b'branch', [], _(b'show changesets within the given named branch'), _(b'BRANCH'), ), ( b'P', b'prune', [], _(b'do not display revision or any of its ancestors'), _(b'REV'), ), ] + cmdutil.logopts + cmdutil.walkopts, _(b'[OPTION]... [FILE]'), helpcategory=command.CATEGORY_CHANGE_NAVIGATION, inferrepo=True, ) def glog(ui, repo, *pats, **opts): """show revision history alongside an ASCII revision graph Print a revision history alongside a revision graph drawn with ASCII characters. Nodes printed as an @ character are parents of the working directory. This is an alias to :hg:`log -G`. """ opts['graph'] = True return commands.log(ui, repo, *pats, **opts)