Mercurial > hg
annotate tests/test-username-newline.t @ 22287:f3ac9677fa2b
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
Code paths below expect "hg.updaterepo" (or "hg.update" using it) to
execute linear merging:
- "update" in commands
- "postincoming" in commands, used for:
- "hg pull --update"
- "hg unbundle --update"
- "hgsubrepo.get" in subrepo
For linear merging with largefiles, standins should be updated
according to (possibly dirty) largefiles before "merge.update"
invocation to detect conflicts correctly.
Before this patch, only the "update" command can execute linear merging
correctly, because largefiles extension takes care of only it.
This patch moves "updatestandin" invocation from "overrideupdate" ("hg
update" wrapper) to "_hgupdaterepo" ("hg.updaterepo" wrapper) to
execute linear merging in "hg.updaterepo" correctly.
This is also a preparation to centralize the logic of updating
largefiles in the working directory into the function wrapping
"merge.update" in the subsequent patch.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sun, 24 Aug 2014 23:47:26 +0900 |
parents | 3b165c127690 |
children | 5ac845ca059a |
rev | line source |
---|---|
12301
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
1 $ hg init |
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
2 $ touch a |
7035
9d023ef7b467
forbid username with '\n' at the changelog level
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
3 |
12301
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
4 $ unset HGUSER |
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
5 $ echo "[ui]" >> .hg/hgrc |
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
6 $ echo "username= foo" >> .hg/hgrc |
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
7 $ echo " bar1" >> .hg/hgrc |
7035
9d023ef7b467
forbid username with '\n' at the changelog level
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
8 |
12301
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
9 $ hg ci -Am m |
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
10 adding a |
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
11 abort: username 'foo\nbar1' contains a newline |
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
12 |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12301
diff
changeset
|
13 [255] |
12301
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
14 $ rm .hg/hgrc |
7035
9d023ef7b467
forbid username with '\n' at the changelog level
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
15 |
12301
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
16 $ HGUSER=`(echo foo; echo bar2)` hg ci -Am m |
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
17 abort: username 'foo\nbar2' contains a newline |
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
18 |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12301
diff
changeset
|
19 [255] |
12301
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
20 $ hg ci -Am m -u "`(echo foo; echo bar3)`" |
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
21 transaction abort! |
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
22 rollback completed |
3a082866422a
tests: unify test-username-newline
Adrian Buehlmann <adrian@cadifra.com>
parents:
7035
diff
changeset
|
23 abort: username 'foo\nbar3' contains a newline! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12301
diff
changeset
|
24 [255] |
7035
9d023ef7b467
forbid username with '\n' at the changelog level
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
25 |