[RFC] Conditionalize format warnings
Matthew D. Fuller
fullermd at over-yonder.net
Tue Apr 17 03:26:13 BST 2007
On Tue, Apr 10, 2007 at 01:41:56PM +1000 I heard the voice of
Martin Pool, and lo! it spake thus:
>
> _check_supported gets passed a parameter 'basedir' (a url), which
> should be enough to find the location's config.
So it does. Updated bundle attached.
This seems to cover it. It still kinda bugs me that we're checking a
Branch config to determine whether to warn about a WorkingTree format,
but I guess the world is an imperfect place ("screws fall out all the
time").
--
Matthew Fuller (MF4839) | fullermd at over-yonder.net
Systems/Network Administrator | http://www.over-yonder.net/~fullermd/
On the Internet, nobody can hear you scream.
-------------- next part --------------
# Bazaar revision bundle v0.9
#
# message:
# Actually, I can do away with all the _get_format_warning() methods
# altogether, and do the whole thing directly in the Config class.
#
# committer: Matthew Fuller <fullermd at over-yonder.net>
# date: Mon 2007-04-16 21:19:32.522000074 -0500
=== modified file bzrlib/bzrdir.py // last-changed:fullermd at over-yonder.net-200
... 70417021504-pm0frxymet9s23x9
--- bzrlib/bzrdir.py
+++ bzrlib/bzrdir.py
@@ -40,6 +40,8 @@
import bzrlib
from bzrlib import (
+ branch,
+ config,
errors,
lockable_files,
lockdir,
@@ -58,6 +60,7 @@
sha_strings,
sha_string,
)
+from bzrlib.branch import Branch
from bzrlib.store.revision.text import TextRevisionStore
from bzrlib.store.text import TextStore
from bzrlib.store.versioned import WeaveStore
@@ -139,9 +142,16 @@
raise errors.UnsupportedFormatError(format=format)
if recommend_upgrade \
and getattr(format, 'upgrade_recommended', False):
- ui.ui_factory.recommend_upgrade(
- format.get_format_description(),
- basedir)
+ # Warnings may be disabled by config
+ if basedir is not None:
+ branch = Branch.open(basedir)
+ fwarn = config.BranchConfig(branch).get_format_warning()
+ else:
+ fwarn = config.GlobalConfig().get_format_warning()
+ if fwarn == "yes":
+ ui.ui_factory.recommend_upgrade(
+ format.get_format_description(),
+ basedir)
def clone(self, url, revision_id=None, force_new_repo=False):
"""Clone this bzrdir and its contents to url verbatim.
=== modified file bzrlib/config.py
--- bzrlib/config.py
+++ bzrlib/config.py
@@ -29,6 +29,7 @@
create_signatures=always|never|when-required(default)
gpg_signing_command=name-of-program
log_format=name-of-format
+format_warning=no|yes(default)
in locations.conf, you specify the url of a branch and options for it.
Wildcards may be used - * and ? as normal in shell completion. Options
@@ -52,6 +53,8 @@
branch is configured to require them.
log_format - this option sets the default log format. Possible values are
long, short, line, or a plugin can register new formats.
+format_warning - this option allows you to disable warnings for outdated
+ formats.
In bazaar.conf you can also define aliases in the ALIASES sections, example
@@ -272,6 +275,16 @@
def _get_nickname(self):
return None
+ def get_format_warning(self):
+ """Warn for outdated formats?"""
+ dowarn = self.get_user_option('format_warning')
+ if dowarn is None or dowarn.lower() == "yes":
+ return "yes"
+ if dowarn.lower() == "no":
+ return "no"
+ raise AssertionError("Unknown format_warning value '%s' in %s"
+ % (dowarn, self._get_filename()))
+
class IniBasedConfig(Config):
"""A configuration policy that draws from ini files."""
=== modified directory // last-changed:fullermd at over-yonder.net-20070417021932
... -v5cirxnabculiq72
# revision id: fullermd at over-yonder.net-20070417021932-v5cirxnabculiq72
# sha1: 91e39968cbf40aa54e7393aaf531990232400b66
# inventory sha1: 9d11b18c999d83e5678a770d718b5c701b5d2584
# parent ids:
# fullermd at over-yonder.net-20070417021504-pm0frxymet9s23x9
# base id: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
# properties:
# branch-nick: conditionalize-format-warning
# message:
# Use BranchConfig when we're given a location instead of checking
# LocationConfig manually.
#
# committer: Matthew Fuller <fullermd at over-yonder.net>
# date: Mon 2007-04-16 21:15:04.944000006 -0500
=== modified file bzrlib/bzrdir.py // encoding:base64
LS0tIGJ6cmxpYi9ienJkaXIucHkKKysrIGJ6cmxpYi9ienJkaXIucHkKQEAgLTQwLDYgKzQwLDcg
QEAKIAogaW1wb3J0IGJ6cmxpYgogZnJvbSBienJsaWIgaW1wb3J0ICgKKyAgICBicmFuY2gsCiAg
ICAgY29uZmlnLAogICAgIGVycm9ycywKICAgICBsb2NrYWJsZV9maWxlcywKQEAgLTU5LDYgKzYw
LDcgQEAKICAgICBzaGFfc3RyaW5ncywKICAgICBzaGFfc3RyaW5nLAogICAgICkKK2Zyb20gYnpy
bGliLmJyYW5jaCBpbXBvcnQgQnJhbmNoCiBmcm9tIGJ6cmxpYi5zdG9yZS5yZXZpc2lvbi50ZXh0
IGltcG9ydCBUZXh0UmV2aXNpb25TdG9yZQogZnJvbSBienJsaWIuc3RvcmUudGV4dCBpbXBvcnQg
VGV4dFN0b3JlCiBmcm9tIGJ6cmxpYi5zdG9yZS52ZXJzaW9uZWQgaW1wb3J0IFdlYXZlU3RvcmUK
QEAgLTE0MSwxNCArMTQzLDExIEBACiAgICAgICAgIGlmIHJlY29tbWVuZF91cGdyYWRlIFwKICAg
ICAgICAgICAgIGFuZCBnZXRhdHRyKGZvcm1hdCwgJ3VwZ3JhZGVfcmVjb21tZW5kZWQnLCBGYWxz
ZSk6CiAgICAgICAgICAgICAjIFdhcm5pbmdzIG1heSBiZSBkaXNhYmxlZCBieSBjb25maWcKLSAg
ICAgICAgICAgIGZ3YXJuID0gY29uZmlnLkdsb2JhbENvbmZpZygpLmdldF9mb3JtYXRfd2Fybmlu
ZygpCiAgICAgICAgICAgICBpZiBiYXNlZGlyIGlzIG5vdCBOb25lOgotICAgICAgICAgICAgICAg
ICMgQnlwYXNzIHRoZSBub24tdW5kZXJzY29yZSBnZXRfZm9ybWF0X3dhcm5pbmcoKSBzbyB3ZQot
ICAgICAgICAgICAgICAgICMgY2FuIHRlbGwgaWYgb25lIGlzIGFjdHVhbGx5IHNldDsgaXQgc2hv
dWxkIG92ZXJyaWRlIHRoZQotICAgICAgICAgICAgICAgICMgZ2xvYmFsIGlmIGl0IGlzLgotICAg
ICAgICAgICAgICAgIGx3YXJuID0gY29uZmlnLkxvY2F0aW9uQ29uZmlnKGJhc2VkaXIpLl9nZXRf
Zm9ybWF0X3dhcm5pbmcoKQotICAgICAgICAgICAgICAgIGlmIGx3YXJuIGlzIG5vdCBOb25lOgot
ICAgICAgICAgICAgICAgICAgICBmd2FybiA9IGx3YXJuLmxvd2VyKCkKKyAgICAgICAgICAgICAg
ICBicmFuY2ggPSBCcmFuY2gub3BlbihiYXNlZGlyKQorICAgICAgICAgICAgICAgIGZ3YXJuID0g
Y29uZmlnLkJyYW5jaENvbmZpZyhicmFuY2gpLmdldF9mb3JtYXRfd2FybmluZygpCisgICAgICAg
ICAgICBlbHNlOgorICAgICAgICAgICAgICAgIGZ3YXJuID0gY29uZmlnLkdsb2JhbENvbmZpZygp
LmdldF9mb3JtYXRfd2FybmluZygpCiAgICAgICAgICAgICBpZiBmd2FybiA9PSAieWVzIjoKICAg
ICAgICAgICAgICAgICB1aS51aV9mYWN0b3J5LnJlY29tbWVuZF91cGdyYWRlKAogICAgICAgICAg
ICAgICAgICAgICBmb3JtYXQuZ2V0X2Zvcm1hdF9kZXNjcmlwdGlvbigpLAoK
=== modified file bzrlib/config.py // encoding:base64
LS0tIGJ6cmxpYi9jb25maWcucHkKKysrIGJ6cmxpYi9jb25maWcucHkKQEAgLTcwMSw2ICs3MDEs
OSBAQAogICAgICAgICAiIiJTZWUgQ29uZmlnLmxvZ19mb3JtYXQuIiIiCiAgICAgICAgIHJldHVy
biBzZWxmLl9nZXRfYmVzdF92YWx1ZSgnX2xvZ19mb3JtYXQnKQogCisgICAgZGVmIF9nZXRfZm9y
bWF0X3dhcm5pbmcoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLl9nZXRfYmVzdF92YWx1ZSgn
X2dldF9mb3JtYXRfd2FybmluZycpCisKIAogZGVmIGVuc3VyZV9jb25maWdfZGlyX2V4aXN0cyhw
YXRoPU5vbmUpOgogICAgICIiIk1ha2Ugc3VyZSBhIGNvbmZpZ3VyYXRpb24gZGlyZWN0b3J5IGV4
aXN0cy4KCg==
=== modified directory // last-changed:fullermd at over-yonder.net-20070417021504
... -pm0frxymet9s23x9
# revision id: fullermd at over-yonder.net-20070417021504-pm0frxymet9s23x9
# sha1: 3948751cf9be00423c30034ae3bce4bc9bbe1397
# inventory sha1: 13bd1c7e050e935a8fd031e1d6583bb86d2d6d49
# parent ids:
# fullermd at over-yonder.net-20070417012620-ahz3g0envecm5gg6
# properties:
# branch-nick: conditionalize-format-warning
# message:
# Rearrange the code so that we don't bother checking for a config
# setting disabling the format warning, until we're sure we're otherwise
# going to warn anyway.
#
# committer: Matthew Fuller <fullermd at over-yonder.net>
# date: Mon 2007-04-16 20:26:20.908999920 -0500
=== modified file bzrlib/bzrdir.py // encoding:base64
LS0tIGJ6cmxpYi9ienJkaXIucHkKKysrIGJ6cmxpYi9ienJkaXIucHkKQEAgLTEzOCwyMCArMTM4
LDIxIEBACiAgICAgICAgIGlmIG5vdCBhbGxvd191bnN1cHBvcnRlZCBhbmQgbm90IGZvcm1hdC5p
c19zdXBwb3J0ZWQoKToKICAgICAgICAgICAgICMgc2VlIG9wZW5fZG93bmxldmVsIHRvIG9wZW4g
bGVnYWN5IGJyYW5jaGVzLgogICAgICAgICAgICAgcmFpc2UgZXJyb3JzLlVuc3VwcG9ydGVkRm9y
bWF0RXJyb3IoZm9ybWF0PWZvcm1hdCkKLSAgICAgICAgZndhcm4gPSBjb25maWcuR2xvYmFsQ29u
ZmlnKCkuZ2V0X2Zvcm1hdF93YXJuaW5nKCkKLSAgICAgICAgaWYgYmFzZWRpciBpcyBub3QgTm9u
ZToKLSAgICAgICAgICAgICMgQnlwYXNzIHRoZSBub24tdW5kZXJzY29yZSBnZXRfZm9ybWF0X3dh
cm5pbmcoKSBzbyB3ZSBjYW4KLSAgICAgICAgICAgICMgdGVsbCBpZiBvbmUgaXMgYWN0dWFsbHkg
c2V0OyBpdCBzaG91bGQgb3ZlcnJpZGUgdGhlIGdsb2JhbAotICAgICAgICAgICAgIyBpZiBpdCBp
cy4KLSAgICAgICAgICAgIGx3YXJuID0gY29uZmlnLkxvY2F0aW9uQ29uZmlnKGJhc2VkaXIpLl9n
ZXRfZm9ybWF0X3dhcm5pbmcoKQotICAgICAgICAgICAgaWYgbHdhcm4gaXMgbm90IE5vbmU6Ci0g
ICAgICAgICAgICAgICAgZndhcm4gPSBsd2Fybi5sb3dlcigpCiAgICAgICAgIGlmIHJlY29tbWVu
ZF91cGdyYWRlIFwKLSAgICAgICAgICAgIGFuZCBmd2FybiA9PSAieWVzIiBcCiAgICAgICAgICAg
ICBhbmQgZ2V0YXR0cihmb3JtYXQsICd1cGdyYWRlX3JlY29tbWVuZGVkJywgRmFsc2UpOgotICAg
ICAgICAgICAgdWkudWlfZmFjdG9yeS5yZWNvbW1lbmRfdXBncmFkZSgKLSAgICAgICAgICAgICAg
ICBmb3JtYXQuZ2V0X2Zvcm1hdF9kZXNjcmlwdGlvbigpLAotICAgICAgICAgICAgICAgIGJhc2Vk
aXIpCisgICAgICAgICAgICAjIFdhcm5pbmdzIG1heSBiZSBkaXNhYmxlZCBieSBjb25maWcKKyAg
ICAgICAgICAgIGZ3YXJuID0gY29uZmlnLkdsb2JhbENvbmZpZygpLmdldF9mb3JtYXRfd2Fybmlu
ZygpCisgICAgICAgICAgICBpZiBiYXNlZGlyIGlzIG5vdCBOb25lOgorICAgICAgICAgICAgICAg
ICMgQnlwYXNzIHRoZSBub24tdW5kZXJzY29yZSBnZXRfZm9ybWF0X3dhcm5pbmcoKSBzbyB3ZQor
ICAgICAgICAgICAgICAgICMgY2FuIHRlbGwgaWYgb25lIGlzIGFjdHVhbGx5IHNldDsgaXQgc2hv
dWxkIG92ZXJyaWRlIHRoZQorICAgICAgICAgICAgICAgICMgZ2xvYmFsIGlmIGl0IGlzLgorICAg
ICAgICAgICAgICAgIGx3YXJuID0gY29uZmlnLkxvY2F0aW9uQ29uZmlnKGJhc2VkaXIpLl9nZXRf
Zm9ybWF0X3dhcm5pbmcoKQorICAgICAgICAgICAgICAgIGlmIGx3YXJuIGlzIG5vdCBOb25lOgor
ICAgICAgICAgICAgICAgICAgICBmd2FybiA9IGx3YXJuLmxvd2VyKCkKKyAgICAgICAgICAgIGlm
IGZ3YXJuID09ICJ5ZXMiOgorICAgICAgICAgICAgICAgIHVpLnVpX2ZhY3RvcnkucmVjb21tZW5k
X3VwZ3JhZGUoCisgICAgICAgICAgICAgICAgICAgIGZvcm1hdC5nZXRfZm9ybWF0X2Rlc2NyaXB0
aW9uKCksCisgICAgICAgICAgICAgICAgICAgIGJhc2VkaXIpCiAKICAgICBkZWYgY2xvbmUoc2Vs
ZiwgdXJsLCByZXZpc2lvbl9pZD1Ob25lLCBmb3JjZV9uZXdfcmVwbz1GYWxzZSk6CiAgICAgICAg
ICIiIkNsb25lIHRoaXMgYnpyZGlyIGFuZCBpdHMgY29udGVudHMgdG8gdXJsIHZlcmJhdGltLgoK
=== modified directory // last-changed:fullermd at over-yonder.net-20070417012620
... -ahz3g0envecm5gg6
# revision id: fullermd at over-yonder.net-20070417012620-ahz3g0envecm5gg6
# sha1: 958d8e97ed459e2b1651fc2c5af85654f15ca888
# inventory sha1: 39dd89c0e43aad401894995a8c4e3d711d8bd63c
# parent ids:
# fullermd at over-yonder.net-20070417012216-cydtxagpvghfexo6
# properties:
# branch-nick: conditionalize-format-warning
# message:
# Check the LocationConfig and override the Global setting for format
# warnings if it's set.
#
# committer: Matthew Fuller <fullermd at over-yonder.net>
# date: Mon 2007-04-16 20:22:16.529000044 -0500
=== modified file bzrlib/bzrdir.py // encoding:base64
LS0tIGJ6cmxpYi9ienJkaXIucHkKKysrIGJ6cmxpYi9ienJkaXIucHkKQEAgLTEzOSw2ICsxMzks
MTMgQEAKICAgICAgICAgICAgICMgc2VlIG9wZW5fZG93bmxldmVsIHRvIG9wZW4gbGVnYWN5IGJy
YW5jaGVzLgogICAgICAgICAgICAgcmFpc2UgZXJyb3JzLlVuc3VwcG9ydGVkRm9ybWF0RXJyb3Io
Zm9ybWF0PWZvcm1hdCkKICAgICAgICAgZndhcm4gPSBjb25maWcuR2xvYmFsQ29uZmlnKCkuZ2V0
X2Zvcm1hdF93YXJuaW5nKCkKKyAgICAgICAgaWYgYmFzZWRpciBpcyBub3QgTm9uZToKKyAgICAg
ICAgICAgICMgQnlwYXNzIHRoZSBub24tdW5kZXJzY29yZSBnZXRfZm9ybWF0X3dhcm5pbmcoKSBz
byB3ZSBjYW4KKyAgICAgICAgICAgICMgdGVsbCBpZiBvbmUgaXMgYWN0dWFsbHkgc2V0OyBpdCBz
aG91bGQgb3ZlcnJpZGUgdGhlIGdsb2JhbAorICAgICAgICAgICAgIyBpZiBpdCBpcy4KKyAgICAg
ICAgICAgIGx3YXJuID0gY29uZmlnLkxvY2F0aW9uQ29uZmlnKGJhc2VkaXIpLl9nZXRfZm9ybWF0
X3dhcm5pbmcoKQorICAgICAgICAgICAgaWYgbHdhcm4gaXMgbm90IE5vbmU6CisgICAgICAgICAg
ICAgICAgZndhcm4gPSBsd2Fybi5sb3dlcigpCiAgICAgICAgIGlmIHJlY29tbWVuZF91cGdyYWRl
IFwKICAgICAgICAgICAgIGFuZCBmd2FybiA9PSAieWVzIiBcCiAgICAgICAgICAgICBhbmQgZ2V0
YXR0cihmb3JtYXQsICd1cGdyYWRlX3JlY29tbWVuZGVkJywgRmFsc2UpOgoK
=== modified directory // last-changed:fullermd at over-yonder.net-20070417012216
... -cydtxagpvghfexo6
# revision id: fullermd at over-yonder.net-20070417012216-cydtxagpvghfexo6
# sha1: db0d509d95c481ec46f09d8b561b56d1e8dbb50a
# inventory sha1: 6cc59fadbaf2bbc389604e5b3a76d6df7e471855
# parent ids:
# fullermd at over-yonder.net-20070406111010-kbchkq0zgfz26jd4
# properties:
# branch-nick: conditionalize-format-warning
# message:
# Add a config param to allow disabling warnings for outdated formats.
#
# committer: Matthew Fuller <fullermd at over-yonder.net>
# date: Fri 2007-04-06 06:10:10.085999966 -0500
=== modified file bzrlib/bzrdir.py // encoding:base64
LS0tIGJ6cmxpYi9ienJkaXIucHkKKysrIGJ6cmxpYi9ienJkaXIucHkKQEAgLTQwLDYgKzQwLDcg
QEAKIAogaW1wb3J0IGJ6cmxpYgogZnJvbSBienJsaWIgaW1wb3J0ICgKKyAgICBjb25maWcsCiAg
ICAgZXJyb3JzLAogICAgIGxvY2thYmxlX2ZpbGVzLAogICAgIGxvY2tkaXIsCkBAIC0xMzcsNyAr
MTM4LDkgQEAKICAgICAgICAgaWYgbm90IGFsbG93X3Vuc3VwcG9ydGVkIGFuZCBub3QgZm9ybWF0
LmlzX3N1cHBvcnRlZCgpOgogICAgICAgICAgICAgIyBzZWUgb3Blbl9kb3dubGV2ZWwgdG8gb3Bl
biBsZWdhY3kgYnJhbmNoZXMuCiAgICAgICAgICAgICByYWlzZSBlcnJvcnMuVW5zdXBwb3J0ZWRG
b3JtYXRFcnJvcihmb3JtYXQ9Zm9ybWF0KQorICAgICAgICBmd2FybiA9IGNvbmZpZy5HbG9iYWxD
b25maWcoKS5nZXRfZm9ybWF0X3dhcm5pbmcoKQogICAgICAgICBpZiByZWNvbW1lbmRfdXBncmFk
ZSBcCisgICAgICAgICAgICBhbmQgZndhcm4gPT0gInllcyIgXAogICAgICAgICAgICAgYW5kIGdl
dGF0dHIoZm9ybWF0LCAndXBncmFkZV9yZWNvbW1lbmRlZCcsIEZhbHNlKToKICAgICAgICAgICAg
IHVpLnVpX2ZhY3RvcnkucmVjb21tZW5kX3VwZ3JhZGUoCiAgICAgICAgICAgICAgICAgZm9ybWF0
LmdldF9mb3JtYXRfZGVzY3JpcHRpb24oKSwKCg==
=== modified file bzrlib/config.py // encoding:base64
LS0tIGJ6cmxpYi9jb25maWcucHkKKysrIGJ6cmxpYi9jb25maWcucHkKQEAgLTI5LDYgKzI5LDcg
QEAKIGNyZWF0ZV9zaWduYXR1cmVzPWFsd2F5c3xuZXZlcnx3aGVuLXJlcXVpcmVkKGRlZmF1bHQp
CiBncGdfc2lnbmluZ19jb21tYW5kPW5hbWUtb2YtcHJvZ3JhbQogbG9nX2Zvcm1hdD1uYW1lLW9m
LWZvcm1hdAorZm9ybWF0X3dhcm5pbmc9bm98eWVzKGRlZmF1bHQpCiAKIGluIGxvY2F0aW9ucy5j
b25mLCB5b3Ugc3BlY2lmeSB0aGUgdXJsIG9mIGEgYnJhbmNoIGFuZCBvcHRpb25zIGZvciBpdC4K
IFdpbGRjYXJkcyBtYXkgYmUgdXNlZCAtICogYW5kID8gYXMgbm9ybWFsIGluIHNoZWxsIGNvbXBs
ZXRpb24uIE9wdGlvbnMKQEAgLTUyLDYgKzUzLDggQEAKICAgICAgICAgICAgICAgICAgICAgYnJh
bmNoIGlzIGNvbmZpZ3VyZWQgdG8gcmVxdWlyZSB0aGVtLgogbG9nX2Zvcm1hdCAtIHRoaXMgb3B0
aW9uIHNldHMgdGhlIGRlZmF1bHQgbG9nIGZvcm1hdC4gIFBvc3NpYmxlIHZhbHVlcyBhcmUKICAg
ICAgICAgICAgICBsb25nLCBzaG9ydCwgbGluZSwgb3IgYSBwbHVnaW4gY2FuIHJlZ2lzdGVyIG5l
dyBmb3JtYXRzLgorZm9ybWF0X3dhcm5pbmcgLSB0aGlzIG9wdGlvbiBhbGxvd3MgeW91IHRvIGRp
c2FibGUgd2FybmluZ3MgZm9yIG91dGRhdGVkCisgICAgICAgICAgICAgICAgIGZvcm1hdHMuCiAK
IEluIGJhemFhci5jb25mIHlvdSBjYW4gYWxzbyBkZWZpbmUgYWxpYXNlcyBpbiB0aGUgQUxJQVNF
UyBzZWN0aW9ucywgZXhhbXBsZQogCkBAIC0yNzIsNiArMjc1LDE5IEBACiAgICAgZGVmIF9nZXRf
bmlja25hbWUoc2VsZik6CiAgICAgICAgIHJldHVybiBOb25lCiAKKyAgICBkZWYgZ2V0X2Zvcm1h
dF93YXJuaW5nKHNlbGYpOgorICAgICAgICAiIiJXYXJuIGZvciBvdXRkYXRlZCBmb3JtYXRzPyIi
IgorICAgICAgICBkb3dhcm4gPSBzZWxmLl9nZXRfZm9ybWF0X3dhcm5pbmcoKQorICAgICAgICBp
ZiBkb3dhcm4gaXMgTm9uZSBvciBkb3dhcm4ubG93ZXIoKSA9PSAieWVzIjoKKyAgICAgICAgICAg
IHJldHVybiAieWVzIgorICAgICAgICBpZiBkb3dhcm4ubG93ZXIoKSA9PSAibm8iOgorICAgICAg
ICAgICAgcmV0dXJuICJubyIKKyAgICAgICAgcmFpc2UgQXNzZXJ0aW9uRXJyb3IoIlVua25vd24g
Zm9ybWF0X3dhcm5pbmcgdmFsdWUgJyVzJyBpbiAlcyIKKyAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgJSAoZG93YXJuLCBzZWxmLl9nZXRfZmlsZW5hbWUoKSkpCisKKyAgICBkZWYgX2dldF9m
b3JtYXRfd2FybmluZyhzZWxmKToKKyAgICAgICAgcmV0dXJuIE5vbmUKKwogCiBjbGFzcyBJbmlC
YXNlZENvbmZpZyhDb25maWcpOgogICAgICIiIkEgY29uZmlndXJhdGlvbiBwb2xpY3kgdGhhdCBk
cmF3cyBmcm9tIGluaSBmaWxlcy4iIiIKQEAgLTM5OSw2ICs0MTUsOSBAQAogICAgIGRlZiBfZ2V0
X25pY2tuYW1lKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5nZXRfdXNlcl9vcHRpb24oJ25p
Y2tuYW1lJykKIAorICAgIGRlZiBfZ2V0X2Zvcm1hdF93YXJuaW5nKHNlbGYpOgorICAgICAgICBy
ZXR1cm4gc2VsZi5nZXRfdXNlcl9vcHRpb24oJ2Zvcm1hdF93YXJuaW5nJykKKwogCiBjbGFzcyBH
bG9iYWxDb25maWcoSW5pQmFzZWRDb25maWcpOgogICAgICIiIlRoZSBjb25maWd1cmF0aW9uIHRo
YXQgc2hvdWxkIGJlIHVzZWQgZm9yIGEgc3BlY2lmaWMgbG9jYXRpb24uIiIiCgo=
=== modified directory // last-changed:fullermd at over-yonder.net-20070406111010
... -kbchkq0zgfz26jd4
# revision id: fullermd at over-yonder.net-20070406111010-kbchkq0zgfz26jd4
# sha1: 5d7ff824662b3a33be3e08df4753e5b74e488114
# inventory sha1: 22ff7aa4dadb6b000590ede369b3a6b2e19120ec
# parent ids:
# pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
# properties:
# branch-nick: conditionalize-format-warning
More information about the bazaar
mailing list