Mercurial > hg
view tests/testlib/push-checkheads-util.sh @ 46100:a771ffc378a8
simplemerge: write output only once it's complete
`simplemerge()` can write either to `ui.fout` or to the file context
(for in-memory merge). This patch simplifies the code a bit by making
it build the output the same way regardless of where it's written, and
then writes the whole output at once. I don't think it will be a
problem that we don't output anything until the whole file is merged
even if the file is large.
Differential Revision: https://phab.mercurial-scm.org/D9550
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 09 Dec 2020 00:00:19 -0800 |
parents | ed84a4d48910 |
children | 053a5bf508da |
line wrap: on
line source
# setup config and various utility to test new heads checks on push cat >> $HGRCPATH <<EOF [command-templates] # simpler log output log ="{node|short} ({phase}): {desc}\n" [phases] # non publishing server publish=False [extensions] # we need to strip some changeset for some test cases strip= [experimental] # enable evolution evolution=all [alias] # fix date used to create obsolete markers. debugobsolete=debugobsolete -d '0 0' EOF mkcommit() { echo "$1" > "$1" hg add "$1" hg ci -m "$1" } getid() { hg log --hidden --template '{node}\n' --rev "$1" } setuprepos() { echo creating basic server and client repo hg init server cd server mkcommit root hg phase --public . mkcommit A0 cd .. hg clone server client }