Mercurial > hg
annotate tests/test-eol-tag.t @ 41977:4ea21df312ec stable 4.9.1
record: prevent commits that don't pick up dirty subrepo changes (issue6102)
This path covers interactive mode for commit, amend, and shelve, as well as the
deprecated record extension. Since shelf creation uses commit without -S in the
non-interactive case, aborting here should be OK. (I didn't check what happens
to non interactive shelve creation if `ui.commitsubrepos=True` is set.)
subrepoutil.precommit() will abort on a dirty subrepo if the config option isn't
set, but the hint recommends using --subrepos to commit. Since only the commit
command currently supports that option, the error has to be raised here to omit
the hint.
Doing the check before asking about all of the hunks in the MQ test seems like
an improvement on its own. There's probably an additional check on this path
that can be removed.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 16 Mar 2019 14:40:21 -0400 |
parents | 2fc86d92c4a9 |
children |
rev | line source |
---|---|
26420
2fc86d92c4a9
urls: bulk-change BTS urls to new location
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
1 https://bz.mercurial-scm.org/2493 |
12974
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
2 |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
3 Testing tagging with the EOL extension |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
4 |
13519
43b3b761d9d1
tests: don't overwrite HGRCPATH
Martin Geisler <mg@aragost.com>
parents:
12974
diff
changeset
|
5 $ cat >> $HGRCPATH <<EOF |
12974
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
6 > [extensions] |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
7 > eol = |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
8 > |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
9 > [eol] |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
10 > native = CRLF |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
11 > EOF |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
12 |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
13 setup repository |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
14 |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
15 $ hg init repo |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
16 $ cd repo |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
17 $ cat > .hgeol <<EOF |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
18 > [patterns] |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
19 > ** = native |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
20 > EOF |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
21 $ printf "first\r\nsecond\r\nthird\r\n" > a.txt |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
22 $ hg commit --addremove -m 'checkin' |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
23 adding .hgeol |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
24 adding a.txt |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
25 |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
26 Tag: |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
27 |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
28 $ hg tag 1.0 |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
29 |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
30 Rewrite .hgtags file as it would look on a new checkout: |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
31 |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
32 $ hg update -q null |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
33 $ hg update -q |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
34 |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
35 Touch .hgtags file again: |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
36 |
75e4fade4ad9
eol: exclude .hgtags file from eol translation (issue2493)
Colin Caughie <c.caughie@indigovision.com>
parents:
diff
changeset
|
37 $ hg tag 2.0 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
13521
diff
changeset
|
38 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
13521
diff
changeset
|
39 $ cd .. |