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().

     1

#!/usr/bin/env python

     2

#

     3

# mercurial - scalable distributed SCM

     4

#

     5

# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>

     6

#

     7

# This software may be used and distributed according to the terms of the

     8

# GNU General Public License version 2 or any later version.

     9

    10

import os

    11

import sys

    12

    13

if os.environ.get('HGUNICODEPEDANTRY', False):

    14

    reload(sys)

    15

    sys.setdefaultencoding("undefined")

    16

    17

    18

libdir = '@LIBDIR@'

    19

    20

if libdir != '@' 'LIBDIR' '@':

    21

    if not os.path.isabs(libdir):

    22

        libdir = os.path.join(os.path.dirname(os.path.realpath(__file__)),

    23

                              libdir)

    24

        libdir = os.path.abspath(libdir)

    25

    sys.path.insert(0, libdir)

    26

    27

# enable importing on demand to reduce startup time

    28

try:

    29

    from mercurial import demandimport; demandimport.enable()

    30

except ImportError:

    31

    import sys

    32

    sys.stderr.write("abort: couldn't find mercurial libraries in [%s]\n" %

    33

                     ' '.join(sys.path))

    34

    sys.stderr.write("(check your install and PYTHONPATH)\n")

    35

    sys.exit(-1)

    36

    37

import mercurial.util

    38

import mercurial.dispatch

    39

    40

for fp in (sys.stdin, sys.stdout, sys.stderr):

    41

    mercurial.util.setbinary(fp)

    42

    43

mercurial.dispatch.run()