mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
d678fe1702
Summary: `ascii` was used as the default / fallback, which is not a user-friendly choice. Nowadays utf-8 dominates: - Rust stdlib is utf-8. - Ruby since 1.9 is utf-8 by default. - Python 3 is unicode by default. - Windows 10 adds utf-8 code page. Given the fact that: - Our CI sets HGENCODING to utf-8 - Nuclide passes `--encoding=utf-8` to every command. - Some people have messed up with `LC_*` and complained about hg crashes. - utf-8 is a super set of ascii, nobody complains that they want `ascii` encoding and the `utf-8` encoding messed their setup up. Let's just use `utf-8` as the default encoding. More aggressively, if someone sets `ascii` as the encoding, it's almost always a mistake. Auto-correct that to `utf-8` too. This should also make future integration with Rust easier (where it's enforced utf-8 and does not have an option to change the encoding). In the future we might just drop the flexibility of choosing customized encoding, so this diff autofixes `ascii` to `utf-8`, instead of allowing `ascii` to be set. We cannot enforce `utf-8` yet, because of Windows. Here is our encoding strategy vs the upstream's: | item | upstream | | ours | ours | | | current | ideal | current | ideal | | CLI argv | bytes | bytes | utf-8 [1] | utf-8 | | path | bytes | auto [3] | migrating [2] | utf-8 | | commit message | utf-8 | utf-8 | utf-8 | utf-8 | | bookmark name | utf-8 | utf-8 | utf-8 | utf-8 | | file content | bytes | bytes | bytes | bytes | [1]: Argv was accidentally enforced utf-8 for command-line arguments by a Rust wrapper. But it simplified a lot of things and is kind of ok: everything that can be passed as CLI arguments are utf-8: -M commit message, -b bookmark, paths, etc. There is no "file content" passed via CLI arguments. [2]: Path is controversial, because it's possible for systems to have non-utf8 paths. The upstream behavior is incorrect if a repo gets shared among different encoding systems (ex. both Linux and Windows). We have to know the encoding of paths to be able to convert them suitable for the local system. One way is to enforce UTF-8 for paths. The other is to keep encoding information stored with individual paths (like Ruby strings). The UTF-8 approach is much simpler with the tradeoff that non-utf-8 paths become unsupported, which seems to be a reasonable trade-off. [3]: See https://www.mercurial-scm.org/wiki/WindowsUTF8Plan. Reviewed By: singhsrb Differential Revision: D17098991 fbshipit-source-id: c0ff1e586a887233bd43cdb854fb3538aa9b70c2
298 lines
6.0 KiB
Perl
298 lines
6.0 KiB
Perl
$ hg init
|
|
$ cat << EOF > a
|
|
> Small Mathematical Series.
|
|
> One
|
|
> Two
|
|
> Three
|
|
> Four
|
|
> Five
|
|
> Hop we are done.
|
|
> EOF
|
|
$ hg add a
|
|
$ hg commit -m ancestor
|
|
$ cat << EOF > a
|
|
> Small Mathematical Series.
|
|
> 1
|
|
> 2
|
|
> 3
|
|
> 4
|
|
> 5
|
|
> Hop we are done.
|
|
> EOF
|
|
$ hg commit -m branch1
|
|
$ hg co 0
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cat << EOF > a
|
|
> Small Mathematical Series.
|
|
> 1
|
|
> 2
|
|
> 3
|
|
> 6
|
|
> 8
|
|
> Hop we are done.
|
|
> EOF
|
|
$ hg commit -m branch2
|
|
|
|
$ hg merge 1
|
|
merging a
|
|
warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
|
|
$ hg id
|
|
618808747361+c0c68e4fe667+ tip
|
|
|
|
$ echo "[commands]" >> $HGRCPATH
|
|
$ echo "status.verbose=true" >> $HGRCPATH
|
|
$ hg status
|
|
M a
|
|
? a.orig
|
|
# The repository is in an unfinished *merge* state.
|
|
|
|
# Unresolved merge conflicts:
|
|
#
|
|
# a
|
|
#
|
|
# To mark files as resolved: hg resolve --mark FILE
|
|
|
|
# To continue: hg commit
|
|
# To abort: hg update --clean . (warning: this will discard uncommitted changes)
|
|
|
|
|
|
$ cat a
|
|
Small Mathematical Series.
|
|
1
|
|
2
|
|
3
|
|
<<<<<<< working copy: 618808747361 - test: branch2
|
|
6
|
|
8
|
|
=======
|
|
4
|
|
5
|
|
>>>>>>> merge rev: c0c68e4fe667 - test: branch1
|
|
Hop we are done.
|
|
|
|
$ hg status --config commands.status.verbose=0
|
|
M a
|
|
? a.orig
|
|
|
|
Verify custom conflict markers
|
|
|
|
$ hg up -q --clean .
|
|
$ cat <<EOF >> .hg/hgrc
|
|
> [ui]
|
|
> mergemarkertemplate = '{author} {rev}'
|
|
> EOF
|
|
|
|
$ hg merge 1
|
|
merging a
|
|
warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
|
|
$ cat a
|
|
Small Mathematical Series.
|
|
1
|
|
2
|
|
3
|
|
<<<<<<< working copy: test 2
|
|
6
|
|
8
|
|
=======
|
|
4
|
|
5
|
|
>>>>>>> merge rev: test 1
|
|
Hop we are done.
|
|
|
|
Verify line splitting of custom conflict marker which causes multiple lines
|
|
|
|
$ hg up -q --clean .
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [ui]
|
|
> mergemarkertemplate={author} {rev}\nfoo\nbar\nbaz
|
|
> EOF
|
|
|
|
$ hg -q merge 1
|
|
warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
|
|
[1]
|
|
|
|
$ cat a
|
|
Small Mathematical Series.
|
|
1
|
|
2
|
|
3
|
|
<<<<<<< working copy: test 2
|
|
6
|
|
8
|
|
=======
|
|
4
|
|
5
|
|
>>>>>>> merge rev: test 1
|
|
Hop we are done.
|
|
|
|
Verify line trimming of custom conflict marker using multi-byte characters
|
|
|
|
$ hg up -q --clean .
|
|
$ $PYTHON <<EOF
|
|
> fp = open('logfile', 'w')
|
|
> fp.write('12345678901234567890123456789012345678901234567890' +
|
|
> '1234567890') # there are 5 more columns for 80 columns
|
|
>
|
|
> # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes
|
|
> fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8'))
|
|
>
|
|
> fp.close()
|
|
> EOF
|
|
$ hg add logfile
|
|
$ hg --encoding utf-8 commit --logfile logfile
|
|
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [ui]
|
|
> mergemarkertemplate={desc|firstline}
|
|
> EOF
|
|
|
|
$ hg -q --encoding utf-8 merge 1
|
|
warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
|
|
[1]
|
|
|
|
$ cat a
|
|
Small Mathematical Series.
|
|
1
|
|
2
|
|
3
|
|
<<<<<<< working copy: 1234567890123456789012345678901234567890123456789012345...
|
|
6
|
|
8
|
|
=======
|
|
4
|
|
5
|
|
>>>>>>> merge rev: branch1
|
|
Hop we are done.
|
|
|
|
Verify basic conflict markers
|
|
|
|
$ hg up -q --clean 2
|
|
$ printf "\n[ui]\nmergemarkers=basic\n" >> .hg/hgrc
|
|
|
|
$ hg merge 1
|
|
merging a
|
|
warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
|
|
$ cat a
|
|
Small Mathematical Series.
|
|
1
|
|
2
|
|
3
|
|
<<<<<<< working copy
|
|
6
|
|
8
|
|
=======
|
|
4
|
|
5
|
|
>>>>>>> merge rev
|
|
Hop we are done.
|
|
|
|
internal:merge3
|
|
|
|
$ hg up -q --clean .
|
|
|
|
$ hg merge 1 --tool internal:merge3
|
|
merging a
|
|
warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
$ cat a
|
|
Small Mathematical Series.
|
|
<<<<<<< working copy
|
|
1
|
|
2
|
|
3
|
|
6
|
|
8
|
|
||||||| base
|
|
One
|
|
Two
|
|
Three
|
|
Four
|
|
Five
|
|
=======
|
|
1
|
|
2
|
|
3
|
|
4
|
|
5
|
|
>>>>>>> merge rev
|
|
Hop we are done.
|
|
|
|
Add some unconflicting changes on each head, to make sure we really
|
|
are merging, unlike :local and :other
|
|
|
|
$ hg up -C
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
updated to "e0693e20f496: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88" (esc)
|
|
1 other heads for branch "default"
|
|
$ printf "\n\nEnd of file\n" >> a
|
|
$ hg ci -m "Add some stuff at the end"
|
|
$ hg up -r 1
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ printf "Start of file\n\n\n" > tmp
|
|
$ cat a >> tmp
|
|
$ mv tmp a
|
|
$ hg ci -m "Add some stuff at the beginning"
|
|
|
|
Now test :merge-other and :merge-local
|
|
|
|
$ hg merge
|
|
merging a
|
|
warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
|
|
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
$ hg resolve --tool :merge-other a
|
|
merging a
|
|
(no more unresolved files)
|
|
$ cat a
|
|
Start of file
|
|
|
|
|
|
Small Mathematical Series.
|
|
1
|
|
2
|
|
3
|
|
6
|
|
8
|
|
Hop we are done.
|
|
|
|
|
|
End of file
|
|
|
|
$ hg up -C
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
updated to "18b51d585961: Add some stuff at the beginning"
|
|
1 other heads for branch "default"
|
|
$ hg merge --tool :merge-local
|
|
merging a
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ cat a
|
|
Start of file
|
|
|
|
|
|
Small Mathematical Series.
|
|
1
|
|
2
|
|
3
|
|
4
|
|
5
|
|
Hop we are done.
|
|
|
|
|
|
End of file
|