Fast-Export

mirror of https://github.com/frej/fast-export.git synced 2025-10-31 16:35:48 +01:00

Files

chrisjbillington b961f146df Support Python 3

Port hg-fast-import to Python 2/3 polyglot code.

Since mercurial accepts and returns bytestrings for all repository data,
the approach I've taken here is to use bytestrings throughout the
hg-fast-import code. All strings pertaining to repository data are
bytestrings. This means the code is using the same string datatype for
this data on Python 3 as it did (and still does) on Python 2.

Repository data coming from subprocess calls to git, or read from files,
is also left as the bytestrings either returned from
subprocess.check_output or as read from the file in 'rb' mode.

Regexes and string literals that are used with repository data have
all had a b'' prefix added.

When repository data is used in error/warning messages, it is decoded
with the UTF8 codec for printing.

With this patch, hg-fast-export.py writes binary output to
sys.stdout.buffer on Python 3 - on Python 2 this doesn't exist and it
still uses sys.stdout.

The only strings that are left as "native" strings and not coerced to
bytestrings are filepaths passed in on the command line, and dictionary
keys for internal data structures used by hg-fast-import.py, that do
not originate in repository data.

Mapping files are read in 'rb' mode, and thus bytestrings are read from
them. When an encoding is given, their contents are decoded with that
encoding, but then immediately encoded again with UTF8 and they are
returned as the resulting bytestrings

Other necessary changes were:

 - indexing byestrings with a single index returns an integer on Python.
   These indexing operations have been replaced with a one-element
   slice: x[0] -> x[0:1] or x[-1] -> [-1:] so at to return a bytestring.

 - raw_hash.encode('hex_codec') replaced with binascii.hexlify(raw_hash)

 - str(integer) -> b'%d' % integer

 - 'string_escape' codec replaced with 'unicode_escape' (which was
    backported to python 2.7). Strings decoded with this codec were then
    immediately re-encoded with UTF8.

 - Calls to map() intended to execute their contents immediately were
   unwrapped or converted to list comprehensions, since map() is an
   iterator and does not execute until iterated over.

hg-fast-export.sh has been modified to not require Python 2. Instead, if
PYTHON has not been defined, it checks python2, python, then python3,
and uses the first one that exists and can import the mercurial module.

2020-02-13 14:35:19 -05:00

__init__.py

Support Python 3

2020-02-13 14:35:19 -05:00

README.md

Add additional options to branch_name_in_commit plugin

2020-02-07 20:48:49 -05:00

README.md

Branch Name in Commit Message

Mercurial has a much stronger notion of branches than Git, and some parties may not wish to lose the branch information during the migration to Git. You can use this plugin to either prepend or append the branch name from the mercurial commit into the commit message in Git.

Valid arguments are:

start: write the branch name at the start of the commit
end: write the branch name at the end of the commit
sameline: if start specified, put a colon and a space after the branch name, such that the commit message reads branch_name: first line of commit message. Otherwise, the branch name is on the first line of the commit message by itself.
skipmaster: Don't write the branch name if the branch is master.

To use the plugin, add --plugin branch_name_in_commit=<comma_separated_list_of_args>.