##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

posix: always seek to EOF when opening a file in append mode...
posix: always seek to EOF when opening a file in append mode Python 3 already does this, so skip it there. Consider the program: #include <stdio.h> int main() { FILE *f = fopen("narf", "w"); fprintf(f, "narf\n"); fclose(f); f = fopen("narf", "a"); printf("%ld\n", ftell(f)); fprintf(f, "troz\n"); printf("%ld\n", ftell(f)); return 0; } on macOS, FreeBSD, and Linux with glibc, this program prints 5 10 but on musl libc (Alpine Linux and probably others) this prints 0 10 By my reading of https://pubs.opengroup.org/onlinepubs/009695399/functions/fopen.html this is technically correct, specifically: > Opening a file with append mode (a as the first character in the > mode argument) shall cause all subsequent writes to the file to be > forced to the then current end-of-file, regardless of intervening > calls to fseek(). in other words, the file position doesn't really matter in append-mode files, and we can't depend on it being at all meaningful unless we perform a seek() before tell() after open(..., 'a'). Experimentally after a .write() we can do a .tell() and it'll always be reasonable, but I'm unclear from reading the specification if that's a smart thing to rely on. This matches what we do on Windows and what Python 3 does for free, so let's just be consistent. Thanks to Yuya for the idea.
Meirambek Omyrzak - - Load All Authors

File last commit:

r39525:f1186c29 default
r42778:97ada9b8 5.0.2 stable
Show More
test-excessive-merge.t
101 lines | 2.7 KiB | text/troff | Tads3Lexer
/ tests / test-excessive-merge.t
History | Source | Raw |Copy content |Copy permalink
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 $ hg init
$ echo foo > a
$ echo foo > b
$ hg add a b
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg ci -m "test"
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974
$ echo blah > a
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg ci -m "branch a"
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974
$ hg co 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo blah > b
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg ci -m "branch b"
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 created new head
$ HGMERGE=true hg merge 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg ci -m "merge b/a -> blah"
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974
$ hg co 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ HGMERGE=true hg merge 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg ci -m "merge a/b -> blah"
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 created new head
$ hg log
Martin Geisler
tests: remove unneeded -d flags...
 r12156 changeset: 4:2ee31f665a86
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 tag: tip
Martin Geisler
tests: remove unneeded -d flags...
 r12156 parent: 1:96155394af80
parent: 2:92cc4c306b19
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 user: test
Martin Geisler
tests: remove unneeded -d flags...
 r12156 date: Thu Jan 01 00:00:00 1970 +0000
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 summary: merge a/b -> blah
Martin Geisler
tests: remove unneeded -d flags...
 r12156 changeset: 3:e16a66a37edd
parent: 2:92cc4c306b19
parent: 1:96155394af80
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 user: test
Martin Geisler
tests: remove unneeded -d flags...
 r12156 date: Thu Jan 01 00:00:00 1970 +0000
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 summary: merge b/a -> blah
Martin Geisler
tests: remove unneeded -d flags...
 r12156 changeset: 2:92cc4c306b19
parent: 0:5e0375449e74
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 user: test
Martin Geisler
tests: remove unneeded -d flags...
 r12156 date: Thu Jan 01 00:00:00 1970 +0000
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 summary: branch b
Martin Geisler
tests: remove unneeded -d flags...
 r12156 changeset: 1:96155394af80
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 user: test
Martin Geisler
tests: remove unneeded -d flags...
 r12156 date: Thu Jan 01 00:00:00 1970 +0000
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 summary: branch a
Martin Geisler
tests: remove unneeded -d flags...
 r12156 changeset: 0:5e0375449e74
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 user: test
Martin Geisler
tests: remove unneeded -d flags...
 r12156 date: Thu Jan 01 00:00:00 1970 +0000
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974 summary: test
Sune Foldager
debugindex etc.: add --changelog and --manifest options...
 r14323 $ hg debugindex --changelog
Gregory Szorc
debugcommands: drop offset and length from debugindex by default...
 r37301 rev linkrev nodeid p1 p2
0 0 5e0375449e74 000000000000 000000000000
1 1 96155394af80 5e0375449e74 000000000000
2 2 92cc4c306b19 5e0375449e74 000000000000
3 3 e16a66a37edd 92cc4c306b19 96155394af80
4 4 2ee31f665a86 96155394af80 92cc4c306b19
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974
revision 1
$ hg manifest --debug 1
79d7492df40aa0fa093ec4209be78043c181f094 644 a
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b
revision 2
$ hg manifest --debug 2
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 a
79d7492df40aa0fa093ec4209be78043c181f094 644 b
revision 3
$ hg manifest --debug 3
79d7492df40aa0fa093ec4209be78043c181f094 644 a
79d7492df40aa0fa093ec4209be78043c181f094 644 b
revision 4
$ hg manifest --debug 4
79d7492df40aa0fa093ec4209be78043c181f094 644 a
79d7492df40aa0fa093ec4209be78043c181f094 644 b
Sune Foldager
tests: fix deprecated use of hg debugdata/debugindex...
 r14182 $ hg debugindex a
Gregory Szorc
debugcommands: drop offset and length from debugindex by default...
 r37301 rev linkrev nodeid p1 p2
0 0 2ed2a3912a0b 000000000000 000000000000
1 1 79d7492df40a 2ed2a3912a0b 000000000000
Pradeepkumar Gayam
tests: unify test-excessive-merge
 r11974
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
 r39525 checked 5 changesets with 4 changes to 2 files