Mercurial > hg
annotate tests/test-execute-bit.t @ 23575:a2f139d25845
subrepo: drop the 'ui' parameter to archive()
The current state of subrepo methods is to pass a 'ui' object to some methods,
which has the effect of overriding the subrepo configuration since it is the
root repo's 'ui' that is passed along as deep as there are subrepos. Other
subrepo method are *not* passed the root 'ui', and instead delegate to their
repo object's 'ui'. Even in the former case where the root 'ui' is available,
some methods are inconsistent in their use of both the root 'ui' and the local
repo's 'ui'. (Consider hg._incoming() uses the root 'ui' for path expansion
and some status messages, but also calls bundlerepo.getremotechanges(), which
eventually calls discovery.findcommonincoming(), which calls
setdiscovery.findcommonheads(), which calls status() on the local repo 'ui'.)
This inconsistency with respect to the configured output level is probably
always hidden, because --verbose, --debug and --quiet, along with their 'ui.xxx'
equivalents in the global and user level hgrc files are propagated from the
parent repo to the subrepo via 'baseui'. The 'ui.xxx' settings in the parent
repo hgrc file are not propagated, but that seems like an unusual thing to set
on a per repo config file. Any 'ui.xxx' options changed by --config are also
not propagated, because they are set on repo.ui by dispatch.py, not repo.baseui.
The goal here is to cleanup the subrepo methods by dropping the 'ui' parameter,
which in turn prevents mixing subtly different 'ui' instances on a given subrepo
level. Some methods use more than just the output level settings in 'ui' (add
for example ends up calling scmutil.checkportabilityalert() with both the root
and local repo's 'ui' at different points). This series just goes for the low
hanging fruit and switches methods that only use the output level.
If we really care about not letting a subrepo config override the root repo's
output level, we can propagate the verbose, debug and quiet settings to the
subrepo in the same way 'ui.commitsubrepos' is in hgsubrepo.__init__.
Archive only uses the 'ui' object to call its progress() method, and gitsubrepo
calls status().
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 13 Dec 2014 14:53:46 -0500 |
parents | 7a9cbb315d84 |
children | b7fde9237c92 |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
18334
diff
changeset
|
1 #require execbit |
5490
bf2bb53e5d2b
See if execute bit is honoured when we go back in time
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 |
12190
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
3 $ hg init |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
4 $ echo a > a |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
5 $ hg ci -Am'not executable' |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
6 adding a |
5495
363ba35f55bd
test-execute-bit: skip if execute-bit is not supported
Patrick Mezard <pmezard@gmail.com>
parents:
5490
diff
changeset
|
7 |
12190
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
8 $ chmod +x a |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
9 $ hg ci -m'executable' |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
10 $ hg id |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
11 79abf14474dc tip |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
12 |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
13 Make sure we notice the change of mode if the cached size == -1: |
5490
bf2bb53e5d2b
See if execute bit is honoured when we go back in time
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 |
12190
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
15 $ hg rm a |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
16 $ hg revert -r 0 a |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
17 $ hg debugstate |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
18 n 0 -1 unset a |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
19 $ hg status |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
20 M a |
5490
bf2bb53e5d2b
See if execute bit is honoured when we go back in time
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
21 |
12190
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
22 $ hg up 0 |
18334
44bda93df90e
merge: changing the mode of a file is also an update
Mads Kiilerich <mads@kiilerich.com>
parents:
12190
diff
changeset
|
23 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12190
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
24 $ hg id |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
25 d69afc33ff8a |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
26 $ test -x a && echo executable -- bad || echo not executable -- good |
9231c629ec10
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com>
parents:
6158
diff
changeset
|
27 not executable -- good |
6158
23ffe82615d8
repo.status: also compare flags for files in the lookup list.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5495
diff
changeset
|
28 |