pycompat: use os.fsencode() to re-encode sys.argv
Historically, the previous code made sense, as Py_EncodeLocale() and
fs.fsencode() could possibly use different encodings. However, this is not the
case anymore for Python 3.2, which uses the locale encoding as the filesystem
encoding (this is not true for later Python versions, but see below). See
https://vstinner.github.io/painful-history-python-filesystem-encoding.html for
a source and more background information.
Using os.fsencode() is safer, as the documentation for sys.argv says that it can
be used to get the original bytes. When doing further changes, the Python
developers will take care that this continues to work.
One concrete case where os.fsencode() is more correct is when enabling Python's
UTF-8 mode. Py_DecodeLocale() will use UTF-8 in this case. Our previous code
would have encoded it using the locale encoding (which might be different),
whereas os.fsencode() will encode it with UTF-8.
Since we don’t claim to support the UTF-8 mode, this is not really a bug and the
patch can go to the default branch. It might be a good idea to not commit this
to the stable branch, as it could in theory introduce regressions.
#testcases abortcommand abortflag
#if abortflag
$ cat >> $HGRCPATH <<EOF
> [alias]
> abort = histedit --abort
> EOF
#endif
$ . "$TESTDIR/histedit-helpers.sh"
Enable extension used by this test
$ cat >>$HGRCPATH <<EOF
> [extensions]
> histedit=
> EOF
=================================
Test backup-bundle config option|
=================================
Repo setup:
$ hg init foo
$ cd foo
$ echo first>file
$ hg ci -qAm one
$ echo second>>file
$ hg ci -m two
$ echo third>>file
$ hg ci -m three
$ echo forth>>file
$ hg ci -m four
$ hg log -G --style compact
@ 3[tip] 7d5187087c79 1970-01-01 00:00 +0000 test
| four
|
o 2 80d23dfa866d 1970-01-01 00:00 +0000 test
| three
|
o 1 6153eb23e623 1970-01-01 00:00 +0000 test
| two
|
o 0 36b4bdd91f5b 1970-01-01 00:00 +0000 test
one
Test when `backup-bundle` config option is enabled:
$ hg histedit -r '36b4bdd91f5b' --commands - << EOF
> pick 36b4bdd91f5b 0 one
> pick 6153eb23e623 1 two
> roll 80d23dfa866d 2 three
> edit 7d5187087c79 3 four
> EOF
merging file
Editing (7d5187087c79), you may commit or record as needed now.
(hg histedit --continue to resume)
[1]
$ hg abort
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/foo/.hg/strip-backup/1d8f701c7b35-cf7be322-backup.hg
saved backup bundle to $TESTTMP/foo/.hg/strip-backup/5c0056670bce-b54b65d0-backup.hg
Test when `backup-bundle` config option is not enabled
Enable config option:
$ cat >>$HGRCPATH <<EOF
> [rewrite]
> backup-bundle = False
> EOF
$ hg histedit -r '36b4bdd91f5b' --commands - << EOF
> pick 36b4bdd91f5b 0 one
> pick 6153eb23e623 1 two
> roll 80d23dfa866d 2 three
> edit 7d5187087c79 3 four
> EOF
merging file
Editing (7d5187087c79), you may commit or record as needed now.
(hg histedit --continue to resume)
[1]
$ hg abort
1 files updated, 0 files merged, 0 files removed, 0 files unresolved