Mercurial > hg
view tests/test-bookmarks-merge.t @ 31499:31d2ddfd338c
color: sync text attributes and buffered text output on Windows (issue5508)
I originally noticed that log output wasn't being colored after 3a4c0905f357,
but there were other complications too. With a bunch of untracked files, only
the first 1K of characters were colored pink, and the rest were normal white. A
single modified file at the top would also be colored pink.
Line buffering and full buffering are treated as the same thing in Windows [1],
meaning the stream is either buffered or not. I can't find any explicit
documentation to say stdout is unbuffered by default when attached to a console
(but some internet postings indicated that is the case[2]). Therefore, it seems
that explicit flushes are better than just not reopening stdout.
NB: pager is now on by default, and needs to be disabled to see any color on
Windows.
[1] https://msdn.microsoft.com/en-us/library/86cebhfs(v=vs.140).aspx
[2] https://sourceforge.net/p/mingw/mailman/message/27121137/
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 19 Mar 2017 12:44:45 -0400 |
parents | 10f15e34d86c |
children | 8197b395710e |
line wrap: on
line source
# init $ hg init $ echo a > a $ hg add a $ hg commit -m'a' $ echo b > b $ hg add b $ hg commit -m'b' $ hg up -C 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo c > c $ hg add c $ hg commit -m'c' created new head # test merging of diverged bookmarks $ hg bookmark -r 1 "c@diverge" $ hg bookmark -r 1 b $ hg bookmark c $ hg bookmarks b 1:d2ae7f538514 * c 2:d36c0562f908 c@diverge 1:d2ae7f538514 $ hg merge "c@diverge" 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg commit -m'merge' $ hg bookmarks b 1:d2ae7f538514 * c 3:b8f96cf4688b $ hg up -C 3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark c) $ echo d > d $ hg add d $ hg commit -m'd' $ hg up -C 3 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo e > e $ hg add e $ hg commit -m'e' created new head $ hg up -C 5 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg bookmark e $ hg bookmarks b 1:d2ae7f538514 c 3:b8f96cf4688b * e 5:26bee9c5bcf3 # the picked side is bookmarked $ hg up -C 4 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (leaving bookmark e) $ hg merge abort: heads are bookmarked - please merge with an explicit rev (run 'hg heads' to see all heads) [255] # our revision is bookmarked $ hg up -C e 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (activating bookmark e) $ hg merge abort: no matching bookmark to merge - please merge with an explicit rev or bookmark (run 'hg heads' to see all heads) [255] # merge bookmark heads $ hg up -C 4 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (leaving bookmark e) $ echo f > f $ hg commit -Am "f" adding f $ hg bookmarks -r 4 "e@diverged" $ hg up -q -C "e@diverged" $ hg merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg parents changeset: 4:a0546fcfe0fb bookmark: e@diverged user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: d changeset: 5:26bee9c5bcf3 bookmark: e parent: 3:b8f96cf4688b user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: e $ hg up -C e 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (activating bookmark e) $ hg bookmarks b 1:d2ae7f538514 c 3:b8f96cf4688b * e 5:26bee9c5bcf3 e@diverged 4:a0546fcfe0fb $ hg merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg commit -m'merge' $ hg bookmarks b 1:d2ae7f538514 c 3:b8f96cf4688b * e 7:ca784329f0ba # test warning when all heads are inactive bookmarks $ hg up -C 6 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (leaving bookmark e) $ echo g > g $ hg commit -Am 'g' adding g $ hg bookmark -i g $ hg bookmarks b 1:d2ae7f538514 c 3:b8f96cf4688b e 7:ca784329f0ba g 8:04dd21731d95 $ hg heads changeset: 8:04dd21731d95 bookmark: g tag: tip parent: 6:be381d1126a0 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: g changeset: 7:ca784329f0ba bookmark: e parent: 5:26bee9c5bcf3 parent: 4:a0546fcfe0fb user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: merge $ hg merge abort: heads are bookmarked - please merge with an explicit rev (run 'hg heads' to see all heads) [255]