[MERGE] init remote branches
Wouter van Heyst
larstiq at larstiq.dyndns.org
Thu Jul 13 21:48:25 BST 2006
Attached is an updated bundle after some more review from John on irc.
The branch is also up-to-date now.
Wouter van Heyst
-------------- next part --------------
# Bazaar revision bundle v0.8
#
# message:
# clean up imports (and get if collapsing right)
# committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
# date: Thu 2006-07-13 22:30:01.974652052 +0200
=== modified file NEWS // last-changed:larstiq at larstiq.dyndns.org-2006071318180
... 0-4e8c4f9326597d7f
--- NEWS
+++ NEWS
@@ -101,6 +101,9 @@
were removed. So it is safe to uncommit after a merge, fix something,
and commit again. (John Arbash Meinel, #32526, #31426)
+ * 'bzr init' now also works on remote locations.
+ (Wouter van Heyst, #48904)
+
BUG FIXES:
* Fix shadowed definition of TestLocationConfig that caused some
=== modified file bzrlib/builtins.py
--- bzrlib/builtins.py
+++ bzrlib/builtins.py
@@ -24,9 +24,9 @@
import sys
import bzrlib
+from bzrlib import (branch, bundle, bzrdir, config, errors, log, osutils,
+ repository, transport, ui, urlutils)
from bzrlib.branch import Branch, BranchReferenceFormat
-from bzrlib import (bundle, branch, bzrdir, errors, osutils, ui, config,
- repository, log)
from bzrlib.bundle import read_bundle_from_url
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
from bzrlib.conflicts import ConflictList
@@ -42,7 +42,6 @@
from bzrlib.revisionspec import RevisionSpec
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
from bzrlib.transport.local import LocalTransport
-import bzrlib.urlutils as urlutils
from bzrlib.workingtree import WorkingTree
@@ -516,7 +515,6 @@
create_prefix=False, verbose=False):
# FIXME: Way too big! Put this into a function called from the
# command.
- from bzrlib.transport import get_transport
br_from = Branch.open_containing('.')[0]
stored_loc = br_from.get_push_location()
@@ -529,8 +527,8 @@
self.outf.write("Using saved location: %s\n" % display_url)
location = stored_loc
- transport = get_transport(location)
- location_url = transport.base
+ to_transport = transport.get_transport(location)
+ location_url = to_transport.base
old_rh = []
try:
@@ -538,28 +536,28 @@
br_to = dir_to.open_branch()
except NotBranchError:
# create a branch.
- transport = transport.clone('..')
+ to_transport = to_transport.clone('..')
if not create_prefix:
try:
- relurl = transport.relpath(location_url)
+ relurl = to_transport.relpath(location_url)
mutter('creating directory %s => %s', location_url, relurl)
- transport.mkdir(relurl)
+ to_transport.mkdir(relurl)
except NoSuchFile:
raise BzrCommandError("Parent directory of %s "
"does not exist." % location)
else:
- current = transport.base
- needed = [(transport, transport.relpath(location_url))]
+ current = to_transport.base
+ needed = [(to_transport, to_transport.relpath(location_url))]
while needed:
try:
- transport, relpath = needed[-1]
- transport.mkdir(relpath)
+ to_transport, relpath = needed[-1]
+ to_transport.mkdir(relpath)
needed.pop()
except NoSuchFile:
- new_transport = transport.clone('..')
+ new_transport = to_transport.clone('..')
needed.append((new_transport,
- new_transport.relpath(transport.base)))
- if new_transport.base == transport.base:
+ new_transport.relpath(to_transport.base)))
+ if new_transport.base == to_transport.base:
raise BzrCommandError("Could not create "
"path prefix.")
dir_to = br_from.bzrdir.clone(location_url,
@@ -618,7 +616,6 @@
aliases = ['get', 'clone']
def run(self, from_location, to_location=None, revision=None, basis=None):
- from bzrlib.transport import get_transport
if revision is None:
revision = [None]
elif len(revision) > 1:
@@ -651,7 +648,7 @@
else:
name = os.path.basename(to_location) + '\n'
- to_transport = get_transport(to_location)
+ to_transport = transport.get_transport(to_location)
try:
to_transport.mkdir('.')
except errors.FileExists:
@@ -1016,14 +1013,20 @@
format = get_format_type('default')
if location is None:
location = u'.'
- else:
- # The path has to exist to initialize a
- # branch inside of it.
- # Just using os.mkdir, since I don't
- # believe that we want to create a bunch of
- # locations if the user supplies an extended path
- if not os.path.exists(location):
- os.mkdir(location)
+
+ to_transport = transport.get_transport(location)
+
+ # The path has to exist to initialize a
+ # branch inside of it.
+ # Just using os.mkdir, since I don't
+ # believe that we want to create a bunch of
+ # locations if the user supplies an extended path
+ # TODO: create-prefix
+ try:
+ to_transport.mkdir('.')
+ except errors.FileExists:
+ pass
+
try:
existing_bzrdir = bzrdir.BzrDir.open(location)
except NotBranchError:
@@ -1031,10 +1034,10 @@
bzrdir.BzrDir.create_branch_convenience(location, format=format)
else:
if existing_bzrdir.has_branch():
- if existing_bzrdir.has_workingtree():
- raise errors.AlreadyBranchError(location)
- else:
- raise errors.BranchExistsWithoutWorkingTree(location)
+ if (isinstance(to_transport, LocalTransport)
+ and not existing_bzrdir.has_workingtree()):
+ raise errors.BranchExistsWithoutWorkingTree(location)
+ raise errors.AlreadyBranchError(location)
else:
existing_bzrdir.create_branch()
existing_bzrdir.create_workingtree()
@@ -1066,13 +1069,19 @@
' a working tree')]
aliases = ["init-repo"]
def run(self, location, format=None, trees=False):
- from bzrlib.transport import get_transport
if format is None:
format = get_format_type('default')
- transport = get_transport(location)
- if not transport.has('.'):
- transport.mkdir('')
- newdir = format.initialize_on_transport(transport)
+
+ if location is None:
+ location = '.'
+
+ to_transport = transport.get_transport(location)
+ try:
+ to_transport.mkdir('.')
+ except errors.FileExists:
+ pass
+
+ newdir = format.initialize_on_transport(to_transport)
repo = newdir.create_repository(shared=True)
repo.set_make_working_trees(trees)
=== modified file bzrlib/tests/blackbox/test_init.py // last-changed:larstiq at la
... rstiq.dyndns.org-20060713195925-84e5f2407c42b225
--- bzrlib/tests/blackbox/test_init.py
+++ bzrlib/tests/blackbox/test_init.py
@@ -22,6 +22,7 @@
from bzrlib.bzrdir import BzrDirMetaFormat1
from bzrlib.tests.blackbox import ExternalBase
+from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
from bzrlib.workingtree import WorkingTree
@@ -104,3 +105,31 @@
"""Init creates no default ignore rules."""
self.run_bzr('init')
self.assertFalse(os.path.exists('.bzrignore'))
+
+
+class TestSFTPInit(TestCaseWithSFTPServer):
+
+ def test_init(self):
+ # init on a remote url should succeed.
+ out, err = self.run_bzr('init', self.get_url())
+ self.assertEqual('', out)
+ self.assertEqual('', err)
+
+ def test_init_existing_branch(self):
+ # when there is already a branch present, make mention
+ self.make_branch('.')
+
+ # rely on SFTPServer get_url() pointing at '.'
+ out, err = self.run_bzr_error(['Already a branch'], 'init', self.get_url())
+
+ # make sure using 'bzr checkout' is not suggested
+ # for remote locations missing a working tree
+ self.assertFalse(re.search(r'checkout', err))
+
+ def test_init_existing_branch_with_workingtree(self):
+ # don't distinguish between the branch having a working tree or not
+ # when the branch itself is remote.
+ self.make_branch_and_tree('.')
+
+ # rely on SFTPServer get_url() pointing at '.'
+ self.run_bzr_error(['Already a branch'], 'init', self.get_url())
# revision id: larstiq at larstiq.dyndns.org-20060713203001-82f7488cfc8cff5f
# sha1: 3ad9dda0b9b1b9df62adc44192d4ee8f78ec40c4
# inventory sha1: 2916b4b00e4c4cb8b111448ef0ebf61569282b40
# parent ids:
# larstiq at larstiq.dyndns.org-20060713195925-84e5f2407c42b225
# base id: pqm at pqm.ubuntu.com-20060713133754-64c134fffd39fd99
# properties:
# branch-nick: remote-init
# message:
# review fixes, rename transport variable to to_transport
# committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
# date: Thu 2006-07-13 21:59:25.755158901 +0200
=== modified file bzrlib/builtins.py // encoding:base64
LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC00MSw3ICs0
MSw3IEBACiBmcm9tIGJ6cmxpYi5yZXZpc2lvbiBpbXBvcnQgY29tbW9uX2FuY2VzdG9yCiBmcm9t
IGJ6cmxpYi5yZXZpc2lvbnNwZWMgaW1wb3J0IFJldmlzaW9uU3BlYwogZnJvbSBienJsaWIudHJh
Y2UgaW1wb3J0IG11dHRlciwgbm90ZSwgbG9nX2Vycm9yLCB3YXJuaW5nLCBpc19xdWlldCwgaW5m
bwotaW1wb3J0IGJ6cmxpYi50cmFuc3BvcnQKK2Zyb20gYnpybGliIGltcG9ydCB0cmFuc3BvcnQK
IGZyb20gYnpybGliLnRyYW5zcG9ydC5sb2NhbCBpbXBvcnQgTG9jYWxUcmFuc3BvcnQKIGltcG9y
dCBienJsaWIudXJsdXRpbHMgYXMgdXJsdXRpbHMKIGZyb20gYnpybGliLndvcmtpbmd0cmVlIGlt
cG9ydCBXb3JraW5nVHJlZQpAQCAtNTI5LDggKzUyOSw4IEBACiAgICAgICAgICAgICAgICAgc2Vs
Zi5vdXRmLndyaXRlKCJVc2luZyBzYXZlZCBsb2NhdGlvbjogJXNcbiIgJSBkaXNwbGF5X3VybCkK
ICAgICAgICAgICAgICAgICBsb2NhdGlvbiA9IHN0b3JlZF9sb2MKIAotICAgICAgICB0cmFuc3Bv
cnQgPSBienJsaWIudHJhbnNwb3J0LmdldF90cmFuc3BvcnQobG9jYXRpb24pCi0gICAgICAgIGxv
Y2F0aW9uX3VybCA9IHRyYW5zcG9ydC5iYXNlCisgICAgICAgIHRvX3RyYW5zcG9ydCA9IHRyYW5z
cG9ydC5nZXRfdHJhbnNwb3J0KGxvY2F0aW9uKQorICAgICAgICBsb2NhdGlvbl91cmwgPSB0b190
cmFuc3BvcnQuYmFzZQogCiAgICAgICAgIG9sZF9yaCA9IFtdCiAgICAgICAgIHRyeToKQEAgLTUz
OCwyOCArNTM4LDI4IEBACiAgICAgICAgICAgICBicl90byA9IGRpcl90by5vcGVuX2JyYW5jaCgp
CiAgICAgICAgIGV4Y2VwdCBOb3RCcmFuY2hFcnJvcjoKICAgICAgICAgICAgICMgY3JlYXRlIGEg
YnJhbmNoLgotICAgICAgICAgICAgdHJhbnNwb3J0ID0gdHJhbnNwb3J0LmNsb25lKCcuLicpCisg
ICAgICAgICAgICB0b190cmFuc3BvcnQgPSB0b190cmFuc3BvcnQuY2xvbmUoJy4uJykKICAgICAg
ICAgICAgIGlmIG5vdCBjcmVhdGVfcHJlZml4OgogICAgICAgICAgICAgICAgIHRyeToKLSAgICAg
ICAgICAgICAgICAgICAgcmVsdXJsID0gdHJhbnNwb3J0LnJlbHBhdGgobG9jYXRpb25fdXJsKQor
ICAgICAgICAgICAgICAgICAgICByZWx1cmwgPSB0b190cmFuc3BvcnQucmVscGF0aChsb2NhdGlv
bl91cmwpCiAgICAgICAgICAgICAgICAgICAgIG11dHRlcignY3JlYXRpbmcgZGlyZWN0b3J5ICVz
ID0+ICVzJywgbG9jYXRpb25fdXJsLCByZWx1cmwpCi0gICAgICAgICAgICAgICAgICAgIHRyYW5z
cG9ydC5ta2RpcihyZWx1cmwpCisgICAgICAgICAgICAgICAgICAgIHRvX3RyYW5zcG9ydC5ta2Rp
cihyZWx1cmwpCiAgICAgICAgICAgICAgICAgZXhjZXB0IE5vU3VjaEZpbGU6CiAgICAgICAgICAg
ICAgICAgICAgIHJhaXNlIEJ6ckNvbW1hbmRFcnJvcigiUGFyZW50IGRpcmVjdG9yeSBvZiAlcyAi
CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiZG9lcyBub3QgZXhp
c3QuIiAlIGxvY2F0aW9uKQogICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICBjdXJy
ZW50ID0gdHJhbnNwb3J0LmJhc2UKLSAgICAgICAgICAgICAgICBuZWVkZWQgPSBbKHRyYW5zcG9y
dCwgdHJhbnNwb3J0LnJlbHBhdGgobG9jYXRpb25fdXJsKSldCisgICAgICAgICAgICAgICAgY3Vy
cmVudCA9IHRvX3RyYW5zcG9ydC5iYXNlCisgICAgICAgICAgICAgICAgbmVlZGVkID0gWyh0b190
cmFuc3BvcnQsIHRvX3RyYW5zcG9ydC5yZWxwYXRoKGxvY2F0aW9uX3VybCkpXQogICAgICAgICAg
ICAgICAgIHdoaWxlIG5lZWRlZDoKICAgICAgICAgICAgICAgICAgICAgdHJ5OgotICAgICAgICAg
ICAgICAgICAgICAgICAgdHJhbnNwb3J0LCByZWxwYXRoID0gbmVlZGVkWy0xXQotICAgICAgICAg
ICAgICAgICAgICAgICAgdHJhbnNwb3J0Lm1rZGlyKHJlbHBhdGgpCisgICAgICAgICAgICAgICAg
ICAgICAgICB0b190cmFuc3BvcnQsIHJlbHBhdGggPSBuZWVkZWRbLTFdCisgICAgICAgICAgICAg
ICAgICAgICAgICB0b190cmFuc3BvcnQubWtkaXIocmVscGF0aCkKICAgICAgICAgICAgICAgICAg
ICAgICAgIG5lZWRlZC5wb3AoKQogICAgICAgICAgICAgICAgICAgICBleGNlcHQgTm9TdWNoRmls
ZToKLSAgICAgICAgICAgICAgICAgICAgICAgIG5ld190cmFuc3BvcnQgPSB0cmFuc3BvcnQuY2xv
bmUoJy4uJykKKyAgICAgICAgICAgICAgICAgICAgICAgIG5ld190cmFuc3BvcnQgPSB0b190cmFu
c3BvcnQuY2xvbmUoJy4uJykKICAgICAgICAgICAgICAgICAgICAgICAgIG5lZWRlZC5hcHBlbmQo
KG5ld190cmFuc3BvcnQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBu
ZXdfdHJhbnNwb3J0LnJlbHBhdGgodHJhbnNwb3J0LmJhc2UpKSkKLSAgICAgICAgICAgICAgICAg
ICAgICAgIGlmIG5ld190cmFuc3BvcnQuYmFzZSA9PSB0cmFuc3BvcnQuYmFzZToKKyAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ld190cmFuc3BvcnQucmVscGF0aCh0b190
cmFuc3BvcnQuYmFzZSkpKQorICAgICAgICAgICAgICAgICAgICAgICAgaWYgbmV3X3RyYW5zcG9y
dC5iYXNlID09IHRvX3RyYW5zcG9ydC5iYXNlOgogICAgICAgICAgICAgICAgICAgICAgICAgICAg
IHJhaXNlIEJ6ckNvbW1hbmRFcnJvcigiQ291bGQgbm90IGNyZWF0ZSAiCiAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJwYXRoIHByZWZpeC4iKQogICAg
ICAgICAgICAgZGlyX3RvID0gYnJfZnJvbS5ienJkaXIuY2xvbmUobG9jYXRpb25fdXJsLApAQCAt
NjUwLDcgKzY1MCw3IEBACiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgIG5hbWUg
PSBvcy5wYXRoLmJhc2VuYW1lKHRvX2xvY2F0aW9uKSArICdcbicKIAotICAgICAgICAgICAgdG9f
dHJhbnNwb3J0ID0gYnpybGliLnRyYW5zcG9ydC5nZXRfdHJhbnNwb3J0KHRvX2xvY2F0aW9uKQor
ICAgICAgICAgICAgdG9fdHJhbnNwb3J0ID0gdHJhbnNwb3J0LmdldF90cmFuc3BvcnQodG9fbG9j
YXRpb24pCiAgICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICAgdG9fdHJhbnNwb3J0Lm1r
ZGlyKCcuJykKICAgICAgICAgICAgIGV4Y2VwdCBlcnJvcnMuRmlsZUV4aXN0czoKQEAgLTEwMTYs
NyArMTAxNiw3IEBACiAgICAgICAgIGlmIGxvY2F0aW9uIGlzIE5vbmU6CiAgICAgICAgICAgICBs
b2NhdGlvbiA9IHUnLicKIAotICAgICAgICB0cmFuc3BvcnQgPSBienJsaWIudHJhbnNwb3J0Lmdl
dF90cmFuc3BvcnQobG9jYXRpb24pCisgICAgICAgIHRvX3RyYW5zcG9ydCA9IHRyYW5zcG9ydC5n
ZXRfdHJhbnNwb3J0KGxvY2F0aW9uKQogCiAgICAgICAgICMgVGhlIHBhdGggaGFzIHRvIGV4aXN0
IHRvIGluaXRpYWxpemUgYQogICAgICAgICAjIGJyYW5jaCBpbnNpZGUgb2YgaXQuCkBAIC0xMDI1
LDcgKzEwMjUsNyBAQAogICAgICAgICAjIGxvY2F0aW9ucyBpZiB0aGUgdXNlciBzdXBwbGllcyBh
biBleHRlbmRlZCBwYXRoCiAgICAgICAgICMgVE9ETzogY3JlYXRlLXByZWZpeAogICAgICAgICB0
cnk6Ci0gICAgICAgICAgICB0cmFuc3BvcnQubWtkaXIoJy4nKQorICAgICAgICAgICAgdG9fdHJh
bnNwb3J0Lm1rZGlyKCcuJykKICAgICAgICAgZXhjZXB0IEZpbGVFeGlzdHM6CiAgICAgICAgICAg
ICBwYXNzCiAgICAgICAgICAgICAgICAgICAgIApAQCAtMTAzNiw3ICsxMDM2LDcgQEAKICAgICAg
ICAgICAgIGJ6cmRpci5CenJEaXIuY3JlYXRlX2JyYW5jaF9jb252ZW5pZW5jZShsb2NhdGlvbiwg
Zm9ybWF0PWZvcm1hdCkKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIGlmIGV4aXN0aW5nX2J6
cmRpci5oYXNfYnJhbmNoKCk6Ci0gICAgICAgICAgICAgICAgaWYgaXNpbnN0YW5jZSh0cmFuc3Bv
cnQsIExvY2FsVHJhbnNwb3J0KToKKyAgICAgICAgICAgICAgICBpZiBpc2luc3RhbmNlKHRvX3Ry
YW5zcG9ydCwgTG9jYWxUcmFuc3BvcnQpOgogICAgICAgICAgICAgICAgICAgICBpZiBub3QgZXhp
c3RpbmdfYnpyZGlyLmhhc193b3JraW5ndHJlZSgpOgogICAgICAgICAgICAgICAgICAgICAgICAg
cmFpc2UgZXJyb3JzLkJyYW5jaEV4aXN0c1dpdGhvdXRXb3JraW5nVHJlZShsb2NhdGlvbikKICAg
ICAgICAgICAgICAgICByYWlzZSBlcnJvcnMuQWxyZWFkeUJyYW5jaEVycm9yKGxvY2F0aW9uKQpA
QCAtMTA3NywxMyArMTA3NywxMyBAQAogICAgICAgICBpZiBsb2NhdGlvbiBpcyBOb25lOgogICAg
ICAgICAgICAgbG9jYXRpb24gPSAnLicKIAotICAgICAgICB0cmFuc3BvcnQgPSBienJsaWIudHJh
bnNwb3J0LmdldF90cmFuc3BvcnQobG9jYXRpb24pCisgICAgICAgIHRvX3RyYW5zcG9ydCA9IHRy
YW5zcG9ydC5nZXRfdHJhbnNwb3J0KGxvY2F0aW9uKQogICAgICAgICB0cnk6Ci0gICAgICAgICAg
ICB0cmFuc3BvcnQubWtkaXIoJy4nKQorICAgICAgICAgICAgdG9fdHJhbnNwb3J0Lm1rZGlyKCcu
JykKICAgICAgICAgZXhjZXB0IEZpbGVFeGlzdHM6CiAgICAgICAgICAgICBwYXNzCiAKLSAgICAg
ICAgbmV3ZGlyID0gZm9ybWF0LmluaXRpYWxpemVfb25fdHJhbnNwb3J0KHRyYW5zcG9ydCkKKyAg
ICAgICAgbmV3ZGlyID0gZm9ybWF0LmluaXRpYWxpemVfb25fdHJhbnNwb3J0KHRvX3RyYW5zcG9y
dCkKICAgICAgICAgcmVwbyA9IG5ld2Rpci5jcmVhdGVfcmVwb3NpdG9yeShzaGFyZWQ9VHJ1ZSkK
ICAgICAgICAgcmVwby5zZXRfbWFrZV93b3JraW5nX3RyZWVzKHRyZWVzKQogCgo=
=== modified file bzrlib/tests/blackbox/test_init.py // encoding:base64
LS0tIGJ6cmxpYi90ZXN0cy9ibGFja2JveC90ZXN0X2luaXQucHkKKysrIGJ6cmxpYi90ZXN0cy9i
bGFja2JveC90ZXN0X2luaXQucHkKQEAgLTEwNiw2ICsxMDYsNyBAQAogICAgICAgICBzZWxmLnJ1
bl9ienIoJ2luaXQnKQogICAgICAgICBzZWxmLmFzc2VydEZhbHNlKG9zLnBhdGguZXhpc3RzKCcu
YnpyaWdub3JlJykpCiAKKwogY2xhc3MgVGVzdFNGVFBJbml0KFRlc3RDYXNlV2l0aFNGVFBTZXJ2
ZXIpOgogCiAgICAgZGVmIHRlc3RfaW5pdChzZWxmKToKQEAgLTExOSw5ICsxMjAsNyBAQAogICAg
ICAgICBzZWxmLm1ha2VfYnJhbmNoKCcuJykKIAogICAgICAgICAjIHJlbHkgb24gU0ZUUFNlcnZl
ciBnZXRfdXJsKCkgcG9pbnRpbmcgYXQgJy4nCi0gICAgICAgIG91dCwgZXJyID0gc2VsZi5ydW5f
YnpyKCdpbml0Jywgc2VsZi5nZXRfdXJsKCksIHJldGNvZGU9MykKLSAgICAgICAgc2VsZi5hc3Nl
cnRDb250YWluc1JlKGVyciwgJ0FscmVhZHkgYSBicmFuY2gnKQotICAgICAgICBzZWxmLnJ1bl9i
enJfZXJyb3IoWydBbHJlYWR5IGEgYnJhbmNoJ10sICdpbml0Jywgc2VsZi5nZXRfdXJsKCkpCisg
ICAgICAgIG91dCwgZXJyID0gc2VsZi5ydW5fYnpyX2Vycm9yKFsnQWxyZWFkeSBhIGJyYW5jaCdd
LCAnaW5pdCcsIHNlbGYuZ2V0X3VybCgpKQogCiAgICAgICAgICMgbWFrZSBzdXJlIHVzaW5nICdi
enIgY2hlY2tvdXQnIGlzIG5vdCBzdWdnZXN0ZWQKICAgICAgICAgIyBmb3IgcmVtb3RlIGxvY2F0
aW9ucyBtaXNzaW5nIGEgd29ya2luZyB0cmVlCgo=
# revision id: larstiq at larstiq.dyndns.org-20060713195925-84e5f2407c42b225
# sha1: 4422c0eef8239b61e67efaa7e533e447c5ee14b9
# inventory sha1: 81076bb46c67b703776011bb8fc12aff5df4c0b9
# parent ids:
# larstiq at larstiq.dyndns.org-20060713181800-4e8c4f9326597d7f
# properties:
# branch-nick: remote-init
# message:
# [merge] bzr.dev 1863
# committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
# date: Thu 2006-07-13 20:18:00.404706955 +0200
=== modified file NEWS // encoding:base64
LS0tIE5FV1MKKysrIE5FV1MKQEAgLTEwMSw2ICsxMDEsOSBAQAogICAgICB3ZXJlIHJlbW92ZWQu
IFNvIGl0IGlzIHNhZmUgdG8gdW5jb21taXQgYWZ0ZXIgYSBtZXJnZSwgZml4IHNvbWV0aGluZywK
ICAgICAgYW5kIGNvbW1pdCBhZ2Fpbi4gKEpvaG4gQXJiYXNoIE1laW5lbCwgIzMyNTI2LCAjMzE0
MjYpCiAKKyAgICogJ2J6ciBpbml0JyBub3cgYWxzbyB3b3JrcyBvbiByZW1vdGUgbG9jYXRpb25z
LgorICAgICAoV291dGVyIHZhbiBIZXlzdCwgIzQ4OTA0KQorCiAgIEJVRyBGSVhFUzoKIAogICAg
ICogRml4IHNoYWRvd2VkIGRlZmluaXRpb24gb2YgVGVzdExvY2F0aW9uQ29uZmlnIHRoYXQgY2F1
c2VkIHNvbWUgCgo=
=== modified file bzrlib/builtins.py // encoding:base64
LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC0zMywxNCAr
MzMsMTUgQEAKIGZyb20gYnpybGliLmNvbW1hbmRzIGltcG9ydCBDb21tYW5kLCBkaXNwbGF5X2Nv
bW1hbmQKIGZyb20gYnpybGliLmVycm9ycyBpbXBvcnQgKEJ6ckVycm9yLCBCenJDaGVja0Vycm9y
LCBCenJDb21tYW5kRXJyb3IsIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgTm90QnJhbmNo
RXJyb3IsIERpdmVyZ2VkQnJhbmNoZXMsIE5vdENvbmZsaWN0ZWQsCi0gICAgICAgICAgICAgICAg
ICAgICAgICAgICBOb1N1Y2hGaWxlLCBOb1dvcmtpbmdUcmVlLCBGaWxlSW5Xcm9uZ0JyYW5jaCwK
LSAgICAgICAgICAgICAgICAgICAgICAgICAgIE5vdFZlcnNpb25lZEVycm9yLCBOb3RBQnVuZGxl
KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgTm9TdWNoRmlsZSwgTm9Xb3JraW5nVHJlZSwg
RmlsZUV4aXN0cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIEZpbGVJbldyb25nQnJhbmNo
LCBOb3RWZXJzaW9uZWRFcnJvciwgTm90QUJ1bmRsZSkKIGZyb20gYnpybGliLm1lcmdlIGltcG9y
dCBNZXJnZTNNZXJnZXIKIGZyb20gYnpybGliLm9wdGlvbiBpbXBvcnQgT3B0aW9uCiBmcm9tIGJ6
cmxpYi5wcm9ncmVzcyBpbXBvcnQgRHVtbXlQcm9ncmVzcywgUHJvZ3Jlc3NQaGFzZQogZnJvbSBi
enJsaWIucmV2aXNpb24gaW1wb3J0IGNvbW1vbl9hbmNlc3RvcgogZnJvbSBienJsaWIucmV2aXNp
b25zcGVjIGltcG9ydCBSZXZpc2lvblNwZWMKIGZyb20gYnpybGliLnRyYWNlIGltcG9ydCBtdXR0
ZXIsIG5vdGUsIGxvZ19lcnJvciwgd2FybmluZywgaXNfcXVpZXQsIGluZm8KK2ltcG9ydCBienJs
aWIudHJhbnNwb3J0CiBmcm9tIGJ6cmxpYi50cmFuc3BvcnQubG9jYWwgaW1wb3J0IExvY2FsVHJh
bnNwb3J0CiBpbXBvcnQgYnpybGliLnVybHV0aWxzIGFzIHVybHV0aWxzCiBmcm9tIGJ6cmxpYi53
b3JraW5ndHJlZSBpbXBvcnQgV29ya2luZ1RyZWUKQEAgLTUxNiw3ICs1MTcsNiBAQAogICAgICAg
ICAgICAgY3JlYXRlX3ByZWZpeD1GYWxzZSwgdmVyYm9zZT1GYWxzZSk6CiAgICAgICAgICMgRklY
TUU6IFdheSB0b28gYmlnISAgUHV0IHRoaXMgaW50byBhIGZ1bmN0aW9uIGNhbGxlZCBmcm9tIHRo
ZQogICAgICAgICAjIGNvbW1hbmQuCi0gICAgICAgIGZyb20gYnpybGliLnRyYW5zcG9ydCBpbXBv
cnQgZ2V0X3RyYW5zcG9ydAogICAgICAgICAKICAgICAgICAgYnJfZnJvbSA9IEJyYW5jaC5vcGVu
X2NvbnRhaW5pbmcoJy4nKVswXQogICAgICAgICBzdG9yZWRfbG9jID0gYnJfZnJvbS5nZXRfcHVz
aF9sb2NhdGlvbigpCkBAIC01MjksNyArNTI5LDcgQEAKICAgICAgICAgICAgICAgICBzZWxmLm91
dGYud3JpdGUoIlVzaW5nIHNhdmVkIGxvY2F0aW9uOiAlc1xuIiAlIGRpc3BsYXlfdXJsKQogICAg
ICAgICAgICAgICAgIGxvY2F0aW9uID0gc3RvcmVkX2xvYwogCi0gICAgICAgIHRyYW5zcG9ydCA9
IGdldF90cmFuc3BvcnQobG9jYXRpb24pCisgICAgICAgIHRyYW5zcG9ydCA9IGJ6cmxpYi50cmFu
c3BvcnQuZ2V0X3RyYW5zcG9ydChsb2NhdGlvbikKICAgICAgICAgbG9jYXRpb25fdXJsID0gdHJh
bnNwb3J0LmJhc2UKIAogICAgICAgICBvbGRfcmggPSBbXQpAQCAtNjE4LDcgKzYxOCw2IEBACiAg
ICAgYWxpYXNlcyA9IFsnZ2V0JywgJ2Nsb25lJ10KIAogICAgIGRlZiBydW4oc2VsZiwgZnJvbV9s
b2NhdGlvbiwgdG9fbG9jYXRpb249Tm9uZSwgcmV2aXNpb249Tm9uZSwgYmFzaXM9Tm9uZSk6Ci0g
ICAgICAgIGZyb20gYnpybGliLnRyYW5zcG9ydCBpbXBvcnQgZ2V0X3RyYW5zcG9ydAogICAgICAg
ICBpZiByZXZpc2lvbiBpcyBOb25lOgogICAgICAgICAgICAgcmV2aXNpb24gPSBbTm9uZV0KICAg
ICAgICAgZWxpZiBsZW4ocmV2aXNpb24pID4gMToKQEAgLTY1MSw3ICs2NTAsNyBAQAogICAgICAg
ICAgICAgZWxzZToKICAgICAgICAgICAgICAgICBuYW1lID0gb3MucGF0aC5iYXNlbmFtZSh0b19s
b2NhdGlvbikgKyAnXG4nCiAKLSAgICAgICAgICAgIHRvX3RyYW5zcG9ydCA9IGdldF90cmFuc3Bv
cnQodG9fbG9jYXRpb24pCisgICAgICAgICAgICB0b190cmFuc3BvcnQgPSBienJsaWIudHJhbnNw
b3J0LmdldF90cmFuc3BvcnQodG9fbG9jYXRpb24pCiAgICAgICAgICAgICB0cnk6CiAgICAgICAg
ICAgICAgICAgdG9fdHJhbnNwb3J0Lm1rZGlyKCcuJykKICAgICAgICAgICAgIGV4Y2VwdCBlcnJv
cnMuRmlsZUV4aXN0czoKQEAgLTEwMTYsMTQgKzEwMTUsMjAgQEAKICAgICAgICAgICAgIGZvcm1h
dCA9IGdldF9mb3JtYXRfdHlwZSgnZGVmYXVsdCcpCiAgICAgICAgIGlmIGxvY2F0aW9uIGlzIE5v
bmU6CiAgICAgICAgICAgICBsb2NhdGlvbiA9IHUnLicKLSAgICAgICAgZWxzZToKLSAgICAgICAg
ICAgICMgVGhlIHBhdGggaGFzIHRvIGV4aXN0IHRvIGluaXRpYWxpemUgYQotICAgICAgICAgICAg
IyBicmFuY2ggaW5zaWRlIG9mIGl0LgotICAgICAgICAgICAgIyBKdXN0IHVzaW5nIG9zLm1rZGly
LCBzaW5jZSBJIGRvbid0Ci0gICAgICAgICAgICAjIGJlbGlldmUgdGhhdCB3ZSB3YW50IHRvIGNy
ZWF0ZSBhIGJ1bmNoIG9mCi0gICAgICAgICAgICAjIGxvY2F0aW9ucyBpZiB0aGUgdXNlciBzdXBw
bGllcyBhbiBleHRlbmRlZCBwYXRoCi0gICAgICAgICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMo
bG9jYXRpb24pOgotICAgICAgICAgICAgICAgIG9zLm1rZGlyKGxvY2F0aW9uKQorCisgICAgICAg
IHRyYW5zcG9ydCA9IGJ6cmxpYi50cmFuc3BvcnQuZ2V0X3RyYW5zcG9ydChsb2NhdGlvbikKKwor
ICAgICAgICAjIFRoZSBwYXRoIGhhcyB0byBleGlzdCB0byBpbml0aWFsaXplIGEKKyAgICAgICAg
IyBicmFuY2ggaW5zaWRlIG9mIGl0LgorICAgICAgICAjIEp1c3QgdXNpbmcgb3MubWtkaXIsIHNp
bmNlIEkgZG9uJ3QKKyAgICAgICAgIyBiZWxpZXZlIHRoYXQgd2Ugd2FudCB0byBjcmVhdGUgYSBi
dW5jaCBvZgorICAgICAgICAjIGxvY2F0aW9ucyBpZiB0aGUgdXNlciBzdXBwbGllcyBhbiBleHRl
bmRlZCBwYXRoCisgICAgICAgICMgVE9ETzogY3JlYXRlLXByZWZpeAorICAgICAgICB0cnk6Cisg
ICAgICAgICAgICB0cmFuc3BvcnQubWtkaXIoJy4nKQorICAgICAgICBleGNlcHQgRmlsZUV4aXN0
czoKKyAgICAgICAgICAgIHBhc3MKKyAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgIHRyeToK
ICAgICAgICAgICAgIGV4aXN0aW5nX2J6cmRpciA9IGJ6cmRpci5CenJEaXIub3Blbihsb2NhdGlv
bikKICAgICAgICAgZXhjZXB0IE5vdEJyYW5jaEVycm9yOgpAQCAtMTAzMSwxMCArMTAzNiwxMCBA
QAogICAgICAgICAgICAgYnpyZGlyLkJ6ckRpci5jcmVhdGVfYnJhbmNoX2NvbnZlbmllbmNlKGxv
Y2F0aW9uLCBmb3JtYXQ9Zm9ybWF0KQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgaWYgZXhp
c3RpbmdfYnpyZGlyLmhhc19icmFuY2goKToKLSAgICAgICAgICAgICAgICBpZiBleGlzdGluZ19i
enJkaXIuaGFzX3dvcmtpbmd0cmVlKCk6Ci0gICAgICAgICAgICAgICAgICAgIHJhaXNlIGVycm9y
cy5BbHJlYWR5QnJhbmNoRXJyb3IobG9jYXRpb24pCi0gICAgICAgICAgICAgICAgZWxzZToKLSAg
ICAgICAgICAgICAgICAgICAgcmFpc2UgZXJyb3JzLkJyYW5jaEV4aXN0c1dpdGhvdXRXb3JraW5n
VHJlZShsb2NhdGlvbikKKyAgICAgICAgICAgICAgICBpZiBpc2luc3RhbmNlKHRyYW5zcG9ydCwg
TG9jYWxUcmFuc3BvcnQpOgorICAgICAgICAgICAgICAgICAgICBpZiBub3QgZXhpc3RpbmdfYnpy
ZGlyLmhhc193b3JraW5ndHJlZSgpOgorICAgICAgICAgICAgICAgICAgICAgICAgcmFpc2UgZXJy
b3JzLkJyYW5jaEV4aXN0c1dpdGhvdXRXb3JraW5nVHJlZShsb2NhdGlvbikKKyAgICAgICAgICAg
ICAgICByYWlzZSBlcnJvcnMuQWxyZWFkeUJyYW5jaEVycm9yKGxvY2F0aW9uKQogICAgICAgICAg
ICAgZWxzZToKICAgICAgICAgICAgICAgICBleGlzdGluZ19ienJkaXIuY3JlYXRlX2JyYW5jaCgp
CiAgICAgICAgICAgICAgICAgZXhpc3RpbmdfYnpyZGlyLmNyZWF0ZV93b3JraW5ndHJlZSgpCkBA
IC0xMDY2LDEyICsxMDcxLDE4IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcgYSB3
b3JraW5nIHRyZWUnKV0KICAgICBhbGlhc2VzID0gWyJpbml0LXJlcG8iXQogICAgIGRlZiBydW4o
c2VsZiwgbG9jYXRpb24sIGZvcm1hdD1Ob25lLCB0cmVlcz1GYWxzZSk6Ci0gICAgICAgIGZyb20g
YnpybGliLnRyYW5zcG9ydCBpbXBvcnQgZ2V0X3RyYW5zcG9ydAogICAgICAgICBpZiBmb3JtYXQg
aXMgTm9uZToKICAgICAgICAgICAgIGZvcm1hdCA9IGdldF9mb3JtYXRfdHlwZSgnZGVmYXVsdCcp
Ci0gICAgICAgIHRyYW5zcG9ydCA9IGdldF90cmFuc3BvcnQobG9jYXRpb24pCi0gICAgICAgIGlm
IG5vdCB0cmFuc3BvcnQuaGFzKCcuJyk6Ci0gICAgICAgICAgICB0cmFuc3BvcnQubWtkaXIoJycp
CisKKyAgICAgICAgaWYgbG9jYXRpb24gaXMgTm9uZToKKyAgICAgICAgICAgIGxvY2F0aW9uID0g
Jy4nCisKKyAgICAgICAgdHJhbnNwb3J0ID0gYnpybGliLnRyYW5zcG9ydC5nZXRfdHJhbnNwb3J0
KGxvY2F0aW9uKQorICAgICAgICB0cnk6CisgICAgICAgICAgICB0cmFuc3BvcnQubWtkaXIoJy4n
KQorICAgICAgICBleGNlcHQgRmlsZUV4aXN0czoKKyAgICAgICAgICAgIHBhc3MKKwogICAgICAg
ICBuZXdkaXIgPSBmb3JtYXQuaW5pdGlhbGl6ZV9vbl90cmFuc3BvcnQodHJhbnNwb3J0KQogICAg
ICAgICByZXBvID0gbmV3ZGlyLmNyZWF0ZV9yZXBvc2l0b3J5KHNoYXJlZD1UcnVlKQogICAgICAg
ICByZXBvLnNldF9tYWtlX3dvcmtpbmdfdHJlZXModHJlZXMpCgo=
=== modified file bzrlib/tests/blackbox/test_init.py // encoding:base64
LS0tIGJ6cmxpYi90ZXN0cy9ibGFja2JveC90ZXN0X2luaXQucHkKKysrIGJ6cmxpYi90ZXN0cy9i
bGFja2JveC90ZXN0X2luaXQucHkKQEAgLTIyLDYgKzIyLDcgQEAKIAogZnJvbSBienJsaWIuYnpy
ZGlyIGltcG9ydCBCenJEaXJNZXRhRm9ybWF0MQogZnJvbSBienJsaWIudGVzdHMuYmxhY2tib3gg
aW1wb3J0IEV4dGVybmFsQmFzZQorZnJvbSBienJsaWIudGVzdHMudGVzdF9zZnRwX3RyYW5zcG9y
dCBpbXBvcnQgVGVzdENhc2VXaXRoU0ZUUFNlcnZlcgogZnJvbSBienJsaWIud29ya2luZ3RyZWUg
aW1wb3J0IFdvcmtpbmdUcmVlCiAKIApAQCAtMTA0LDMgKzEwNSwzMiBAQAogICAgICAgICAiIiJJ
bml0IGNyZWF0ZXMgbm8gZGVmYXVsdCBpZ25vcmUgcnVsZXMuIiIiCiAgICAgICAgIHNlbGYucnVu
X2J6cignaW5pdCcpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2Uob3MucGF0aC5leGlzdHMoJy5i
enJpZ25vcmUnKSkKKworY2xhc3MgVGVzdFNGVFBJbml0KFRlc3RDYXNlV2l0aFNGVFBTZXJ2ZXIp
OgorCisgICAgZGVmIHRlc3RfaW5pdChzZWxmKToKKyAgICAgICAgIyBpbml0IG9uIGEgcmVtb3Rl
IHVybCBzaG91bGQgc3VjY2VlZC4KKyAgICAgICAgb3V0LCBlcnIgPSBzZWxmLnJ1bl9ienIoJ2lu
aXQnLCBzZWxmLmdldF91cmwoKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnJywgb3V0KQor
ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCcnLCBlcnIpCisgICAgCisgICAgZGVmIHRlc3RfaW5p
dF9leGlzdGluZ19icmFuY2goc2VsZik6CisgICAgICAgICMgd2hlbiB0aGVyZSBpcyBhbHJlYWR5
IGEgYnJhbmNoIHByZXNlbnQsIG1ha2UgbWVudGlvbgorICAgICAgICBzZWxmLm1ha2VfYnJhbmNo
KCcuJykKKworICAgICAgICAjIHJlbHkgb24gU0ZUUFNlcnZlciBnZXRfdXJsKCkgcG9pbnRpbmcg
YXQgJy4nCisgICAgICAgIG91dCwgZXJyID0gc2VsZi5ydW5fYnpyKCdpbml0Jywgc2VsZi5nZXRf
dXJsKCksIHJldGNvZGU9MykKKyAgICAgICAgc2VsZi5hc3NlcnRDb250YWluc1JlKGVyciwgJ0Fs
cmVhZHkgYSBicmFuY2gnKQorICAgICAgICBzZWxmLnJ1bl9ienJfZXJyb3IoWydBbHJlYWR5IGEg
YnJhbmNoJ10sICdpbml0Jywgc2VsZi5nZXRfdXJsKCkpCisKKyAgICAgICAgIyBtYWtlIHN1cmUg
dXNpbmcgJ2J6ciBjaGVja291dCcgaXMgbm90IHN1Z2dlc3RlZAorICAgICAgICAjIGZvciByZW1v
dGUgbG9jYXRpb25zIG1pc3NpbmcgYSB3b3JraW5nIHRyZWUKKyAgICAgICAgc2VsZi5hc3NlcnRG
YWxzZShyZS5zZWFyY2gocidjaGVja291dCcsIGVycikpCisKKyAgICBkZWYgdGVzdF9pbml0X2V4
aXN0aW5nX2JyYW5jaF93aXRoX3dvcmtpbmd0cmVlKHNlbGYpOgorICAgICAgICAjIGRvbid0IGRp
c3Rpbmd1aXNoIGJldHdlZW4gdGhlIGJyYW5jaCBoYXZpbmcgYSB3b3JraW5nIHRyZWUgb3Igbm90
CisgICAgICAgICMgd2hlbiB0aGUgYnJhbmNoIGl0c2VsZiBpcyByZW1vdGUuCisgICAgICAgIHNl
bGYubWFrZV9icmFuY2hfYW5kX3RyZWUoJy4nKQorCisgICAgICAgICMgcmVseSBvbiBTRlRQU2Vy
dmVyIGdldF91cmwoKSBwb2ludGluZyBhdCAnLicKKyAgICAgICAgc2VsZi5ydW5fYnpyX2Vycm9y
KFsnQWxyZWFkeSBhIGJyYW5jaCddLCAnaW5pdCcsIHNlbGYuZ2V0X3VybCgpKQoK
# revision id: larstiq at larstiq.dyndns.org-20060713181800-4e8c4f9326597d7f
# sha1: a7e718df49eac2e7f4b5dc5306445e96ec15cca1
# inventory sha1: ba540f60700bac9a247285a74e96e72928c759d8
# parent ids:
# larstiq at larstiq.dyndns.org-20060708135701-2287cf5609d52f94
# pqm at pqm.ubuntu.com-20060713133754-64c134fffd39fd99
# properties:
# branch-nick: remote-init
# message:
# cleanup
# committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
# date: Sat 2006-07-08 15:57:01.208614111 +0200
=== modified file bzrlib/builtins.py // encoding:base64
LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC0zMSwxNSAr
MzEsMTUgQEAKIGZyb20gYnpybGliLmNvbW1hbmRzIGltcG9ydCBDb21tYW5kLCBkaXNwbGF5X2Nv
bW1hbmQKIGZyb20gYnpybGliLmVycm9ycyBpbXBvcnQgKEJ6ckVycm9yLCBCenJDaGVja0Vycm9y
LCBCenJDb21tYW5kRXJyb3IsIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgTm90QnJhbmNo
RXJyb3IsIERpdmVyZ2VkQnJhbmNoZXMsIE5vdENvbmZsaWN0ZWQsCi0gICAgICAgICAgICAgICAg
ICAgICAgICAgICBOb1N1Y2hGaWxlLCBOb1dvcmtpbmdUcmVlLCBGaWxlSW5Xcm9uZ0JyYW5jaCwK
LSAgICAgICAgICAgICAgICAgICAgICAgICAgIE5vdFZlcnNpb25lZEVycm9yLCBOb3RBQnVuZGxl
KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgTm9TdWNoRmlsZSwgTm9Xb3JraW5nVHJlZSwg
RmlsZUV4aXN0cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIEZpbGVJbldyb25nQnJhbmNo
LCBOb3RWZXJzaW9uZWRFcnJvciwgTm90QUJ1bmRsZSkKIGZyb20gYnpybGliLm1lcmdlIGltcG9y
dCBNZXJnZTNNZXJnZXIKIGZyb20gYnpybGliLm9wdGlvbiBpbXBvcnQgT3B0aW9uCiBmcm9tIGJ6
cmxpYi5wcm9ncmVzcyBpbXBvcnQgRHVtbXlQcm9ncmVzcywgUHJvZ3Jlc3NQaGFzZQogZnJvbSBi
enJsaWIucmV2aXNpb24gaW1wb3J0IGNvbW1vbl9hbmNlc3RvcgogZnJvbSBienJsaWIucmV2aXNp
b25zcGVjIGltcG9ydCBSZXZpc2lvblNwZWMKIGZyb20gYnpybGliLnRyYWNlIGltcG9ydCBtdXR0
ZXIsIG5vdGUsIGxvZ19lcnJvciwgd2FybmluZywgaXNfcXVpZXQsIGluZm8KLWltcG9ydCAgYnpy
bGliLnRyYW5zcG9ydAoraW1wb3J0IGJ6cmxpYi50cmFuc3BvcnQKIGZyb20gYnpybGliLnRyYW5z
cG9ydC5sb2NhbCBpbXBvcnQgTG9jYWxUcmFuc3BvcnQKIGltcG9ydCBienJsaWIudXJsdXRpbHMg
YXMgdXJsdXRpbHMKIGZyb20gYnpybGliLndvcmtpbmd0cmVlIGltcG9ydCBXb3JraW5nVHJlZQpA
QCAtMTAwNiwxNyArMTAwNiwyMSBAQAogICAgIGRlZiBydW4oc2VsZiwgbG9jYXRpb249Tm9uZSwg
Zm9ybWF0PU5vbmUpOgogICAgICAgICBpZiBmb3JtYXQgaXMgTm9uZToKICAgICAgICAgICAgIGZv
cm1hdCA9IGdldF9mb3JtYXRfdHlwZSgnZGVmYXVsdCcpCi0gICAgICAgIHRyYW5zcG9ydCA9IGJ6
cmxpYi50cmFuc3BvcnQuZ2V0X3RyYW5zcG9ydChsb2NhdGlvbikKICAgICAgICAgaWYgbG9jYXRp
b24gaXMgTm9uZToKICAgICAgICAgICAgIGxvY2F0aW9uID0gdScuJwotICAgICAgICBlbHNlOgot
ICAgICAgICAgICAgIyBUaGUgcGF0aCBoYXMgdG8gZXhpc3QgdG8gaW5pdGlhbGl6ZSBhCi0gICAg
ICAgICAgICAjIGJyYW5jaCBpbnNpZGUgb2YgaXQuCi0gICAgICAgICAgICAjIEp1c3QgdXNpbmcg
b3MubWtkaXIsIHNpbmNlIEkgZG9uJ3QKLSAgICAgICAgICAgICMgYmVsaWV2ZSB0aGF0IHdlIHdh
bnQgdG8gY3JlYXRlIGEgYnVuY2ggb2YKLSAgICAgICAgICAgICMgbG9jYXRpb25zIGlmIHRoZSB1
c2VyIHN1cHBsaWVzIGFuIGV4dGVuZGVkIHBhdGgKLSAgICAgICAgICAgIGlmIG5vdCB0cmFuc3Bv
cnQuaGFzKCcuJyk6Ci0gICAgICAgICAgICAgICAgdHJhbnNwb3J0Lm1rZGlyKCcnKQorCisgICAg
ICAgIHRyYW5zcG9ydCA9IGJ6cmxpYi50cmFuc3BvcnQuZ2V0X3RyYW5zcG9ydChsb2NhdGlvbikK
KworICAgICAgICAjIFRoZSBwYXRoIGhhcyB0byBleGlzdCB0byBpbml0aWFsaXplIGEKKyAgICAg
ICAgIyBicmFuY2ggaW5zaWRlIG9mIGl0LgorICAgICAgICAjIEp1c3QgdXNpbmcgb3MubWtkaXIs
IHNpbmNlIEkgZG9uJ3QKKyAgICAgICAgIyBiZWxpZXZlIHRoYXQgd2Ugd2FudCB0byBjcmVhdGUg
YSBidW5jaCBvZgorICAgICAgICAjIGxvY2F0aW9ucyBpZiB0aGUgdXNlciBzdXBwbGllcyBhbiBl
eHRlbmRlZCBwYXRoCisgICAgICAgICMgVE9ETzogY3JlYXRlLXByZWZpeAorICAgICAgICB0cnk6
CisgICAgICAgICAgICB0cmFuc3BvcnQubWtkaXIoJy4nKQorICAgICAgICBleGNlcHQgRmlsZUV4
aXN0czoKKyAgICAgICAgICAgIHBhc3MKICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgIHRy
eToKICAgICAgICAgICAgIGV4aXN0aW5nX2J6cmRpciA9IGJ6cmRpci5CenJEaXIub3Blbihsb2Nh
dGlvbikKQEAgLTEwNjIsOSArMTA2NiwxNiBAQAogICAgIGRlZiBydW4oc2VsZiwgbG9jYXRpb24s
IGZvcm1hdD1Ob25lLCB0cmVlcz1GYWxzZSk6CiAgICAgICAgIGlmIGZvcm1hdCBpcyBOb25lOgog
ICAgICAgICAgICAgZm9ybWF0ID0gZ2V0X2Zvcm1hdF90eXBlKCdkZWZhdWx0JykKKworICAgICAg
ICBpZiBsb2NhdGlvbiBpcyBOb25lOgorICAgICAgICAgICAgbG9jYXRpb24gPSAnLicKKwogICAg
ICAgICB0cmFuc3BvcnQgPSBienJsaWIudHJhbnNwb3J0LmdldF90cmFuc3BvcnQobG9jYXRpb24p
Ci0gICAgICAgIGlmIG5vdCB0cmFuc3BvcnQuaGFzKCcuJyk6Ci0gICAgICAgICAgICB0cmFuc3Bv
cnQubWtkaXIoJycpCisgICAgICAgIHRyeToKKyAgICAgICAgICAgIHRyYW5zcG9ydC5ta2Rpcign
LicpCisgICAgICAgIGV4Y2VwdCBGaWxlRXhpc3RzOgorICAgICAgICAgICAgcGFzcworCiAgICAg
ICAgIG5ld2RpciA9IGZvcm1hdC5pbml0aWFsaXplX29uX3RyYW5zcG9ydCh0cmFuc3BvcnQpCiAg
ICAgICAgIHJlcG8gPSBuZXdkaXIuY3JlYXRlX3JlcG9zaXRvcnkoc2hhcmVkPVRydWUpCiAgICAg
ICAgIHJlcG8uc2V0X21ha2Vfd29ya2luZ190cmVlcyh0cmVlcykKCg==
=== modified file bzrlib/tests/blackbox/test_init.py // encoding:base64
LS0tIGJ6cmxpYi90ZXN0cy9ibGFja2JveC90ZXN0X2luaXQucHkKKysrIGJ6cmxpYi90ZXN0cy9i
bGFja2JveC90ZXN0X2luaXQucHkKQEAgLTExNyw2ICsxMTcsMTEgQEAKICAgICAgICAgIyByZWx5
IG9uIFNGVFBTZXJ2ZXIgZ2V0X3VybCgpIHBvaW50aW5nIGF0ICcuJwogICAgICAgICBvdXQsIGVy
ciA9IHNlbGYucnVuX2J6cignaW5pdCcsIHNlbGYuZ2V0X3VybCgpLCByZXRjb2RlPTMpCiAgICAg
ICAgIHNlbGYuYXNzZXJ0Q29udGFpbnNSZShlcnIsICdBbHJlYWR5IGEgYnJhbmNoJykKKyAgICAg
ICAgc2VsZi5ydW5fYnpyX2Vycm9yKFsnQWxyZWFkeSBhIGJyYW5jaCddLCAnaW5pdCcsIHNlbGYu
Z2V0X3VybCgpKQorCisgICAgICAgICMgbWFrZSBzdXJlIHVzaW5nICdienIgY2hlY2tvdXQnIGlz
IG5vdCBzdWdnZXN0ZWQKKyAgICAgICAgIyBmb3IgcmVtb3RlIGxvY2F0aW9ucyBtaXNzaW5nIGEg
d29ya2luZyB0cmVlCisgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UocmUuc2VhcmNoKHInY2hlY2tv
dXQnLCBlcnIpKQogCiAgICAgZGVmIHRlc3RfaW5pdF9leGlzdGluZ19icmFuY2hfd2l0aF93b3Jr
aW5ndHJlZShzZWxmKToKICAgICAgICAgIyBkb24ndCBkaXN0aW5ndWlzaCBiZXR3ZWVuIHRoZSBi
cmFuY2ggaGF2aW5nIGEgd29ya2luZyB0cmVlIG9yIG5vdApAQCAtMTI0LDUgKzEyOSw0IEBACiAg
ICAgICAgIHNlbGYubWFrZV9icmFuY2hfYW5kX3RyZWUoJy4nKQogCiAgICAgICAgICMgcmVseSBv
biBTRlRQU2VydmVyIGdldF91cmwoKSBwb2ludGluZyBhdCAnLicKLSAgICAgICAgb3V0LCBlcnIg
PSBzZWxmLnJ1bl9ienIoJ2luaXQnLCBzZWxmLmdldF91cmwoKSwgcmV0Y29kZT0zKQotICAgICAg
ICBzZWxmLmFzc2VydEZhbHNlKHJlLnNlYXJjaChyJ2NoZWNrb3V0JywgZXJyKSkKKyAgICAgICAg
c2VsZi5ydW5fYnpyX2Vycm9yKFsnQWxyZWFkeSBhIGJyYW5jaCddLCAnaW5pdCcsIHNlbGYuZ2V0
X3VybCgpKQoK
# revision id: larstiq at larstiq.dyndns.org-20060708135701-2287cf5609d52f94
# sha1: cfd6e079a5c6ae8a24292b748732ef7a67808f7b
# inventory sha1: 1ddc0deceed534b90f4004b81a0d81a5123459bc
# parent ids:
# larstiq at larstiq.dyndns.org-20060702164837-f605fe8406da8038
# properties:
# branch-nick: remote-init
# message:
# more review comments
# committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
# date: Sun 2006-07-02 18:48:37.698283911 +0200
=== modified file bzrlib/builtins.py // encoding:base64
LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC0zOSw3ICsz
OSw3IEBACiBmcm9tIGJ6cmxpYi5yZXZpc2lvbiBpbXBvcnQgY29tbW9uX2FuY2VzdG9yCiBmcm9t
IGJ6cmxpYi5yZXZpc2lvbnNwZWMgaW1wb3J0IFJldmlzaW9uU3BlYwogZnJvbSBienJsaWIudHJh
Y2UgaW1wb3J0IG11dHRlciwgbm90ZSwgbG9nX2Vycm9yLCB3YXJuaW5nLCBpc19xdWlldCwgaW5m
bwotZnJvbSBienJsaWIudHJhbnNwb3J0IGltcG9ydCBnZXRfdHJhbnNwb3J0CitpbXBvcnQgIGJ6
cmxpYi50cmFuc3BvcnQKIGZyb20gYnpybGliLnRyYW5zcG9ydC5sb2NhbCBpbXBvcnQgTG9jYWxU
cmFuc3BvcnQKIGltcG9ydCBienJsaWIudXJsdXRpbHMgYXMgdXJsdXRpbHMKIGZyb20gYnpybGli
Lndvcmtpbmd0cmVlIGltcG9ydCBXb3JraW5nVHJlZQpAQCAtNTI0LDcgKzUyNCw3IEBACiAgICAg
ICAgICAgICAgICAgc2VsZi5vdXRmLndyaXRlKCJVc2luZyBzYXZlZCBsb2NhdGlvbjogJXNcbiIg
JSBkaXNwbGF5X3VybCkKICAgICAgICAgICAgICAgICBsb2NhdGlvbiA9IHN0b3JlZF9sb2MKIAot
ICAgICAgICB0cmFuc3BvcnQgPSBnZXRfdHJhbnNwb3J0KGxvY2F0aW9uKQorICAgICAgICB0cmFu
c3BvcnQgPSBienJsaWIudHJhbnNwb3J0LmdldF90cmFuc3BvcnQobG9jYXRpb24pCiAgICAgICAg
IGxvY2F0aW9uX3VybCA9IHRyYW5zcG9ydC5iYXNlCiAKICAgICAgICAgb2xkX3JoID0gW10KQEAg
LTY0NSw3ICs2NDUsNyBAQAogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICBuYW1l
ID0gb3MucGF0aC5iYXNlbmFtZSh0b19sb2NhdGlvbikgKyAnXG4nCiAKLSAgICAgICAgICAgIHRv
X3RyYW5zcG9ydCA9IGdldF90cmFuc3BvcnQodG9fbG9jYXRpb24pCisgICAgICAgICAgICB0b190
cmFuc3BvcnQgPSBienJsaWIudHJhbnNwb3J0LmdldF90cmFuc3BvcnQodG9fbG9jYXRpb24pCiAg
ICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICAgdG9fdHJhbnNwb3J0Lm1rZGlyKCcuJykK
ICAgICAgICAgICAgIGV4Y2VwdCBlcnJvcnMuRmlsZUV4aXN0czoKQEAgLTEwMDYsNyArMTAwNiw3
IEBACiAgICAgZGVmIHJ1bihzZWxmLCBsb2NhdGlvbj1Ob25lLCBmb3JtYXQ9Tm9uZSk6CiAgICAg
ICAgIGlmIGZvcm1hdCBpcyBOb25lOgogICAgICAgICAgICAgZm9ybWF0ID0gZ2V0X2Zvcm1hdF90
eXBlKCdkZWZhdWx0JykKLSAgICAgICAgdHJhbnNwb3J0ID0gZ2V0X3RyYW5zcG9ydChsb2NhdGlv
bikKKyAgICAgICAgdHJhbnNwb3J0ID0gYnpybGliLnRyYW5zcG9ydC5nZXRfdHJhbnNwb3J0KGxv
Y2F0aW9uKQogICAgICAgICBpZiBsb2NhdGlvbiBpcyBOb25lOgogICAgICAgICAgICAgbG9jYXRp
b24gPSB1Jy4nCiAgICAgICAgIGVsc2U6CkBAIC0xMDYyLDcgKzEwNjIsNyBAQAogICAgIGRlZiBy
dW4oc2VsZiwgbG9jYXRpb24sIGZvcm1hdD1Ob25lLCB0cmVlcz1GYWxzZSk6CiAgICAgICAgIGlm
IGZvcm1hdCBpcyBOb25lOgogICAgICAgICAgICAgZm9ybWF0ID0gZ2V0X2Zvcm1hdF90eXBlKCdk
ZWZhdWx0JykKLSAgICAgICAgdHJhbnNwb3J0ID0gZ2V0X3RyYW5zcG9ydChsb2NhdGlvbikKKyAg
ICAgICAgdHJhbnNwb3J0ID0gYnpybGliLnRyYW5zcG9ydC5nZXRfdHJhbnNwb3J0KGxvY2F0aW9u
KQogICAgICAgICBpZiBub3QgdHJhbnNwb3J0LmhhcygnLicpOgogICAgICAgICAgICAgdHJhbnNw
b3J0Lm1rZGlyKCcnKQogICAgICAgICBuZXdkaXIgPSBmb3JtYXQuaW5pdGlhbGl6ZV9vbl90cmFu
c3BvcnQodHJhbnNwb3J0KQoK
=== modified file bzrlib/tests/blackbox/test_init.py // encoding:base64
LS0tIGJ6cmxpYi90ZXN0cy9ibGFja2JveC90ZXN0X2luaXQucHkKKysrIGJ6cmxpYi90ZXN0cy9i
bGFja2JveC90ZXN0X2luaXQucHkKQEAgLTExMiwxMSArMTEyLDEzIEBACiAgICAgCiAgICAgZGVm
IHRlc3RfaW5pdF9leGlzdGluZ19icmFuY2goc2VsZik6CiAgICAgICAgICMgd2hlbiB0aGVyZSBp
cyBhbHJlYWR5IGEgYnJhbmNoIHByZXNlbnQsIG1ha2UgbWVudGlvbgotICAgICAgICBzZWxmLnJ1
bl9ienIoJ2luaXQnLCBzZWxmLmdldF91cmwoKSkKKyAgICAgICAgc2VsZi5tYWtlX2JyYW5jaCgn
LicpCisKKyAgICAgICAgIyByZWx5IG9uIFNGVFBTZXJ2ZXIgZ2V0X3VybCgpIHBvaW50aW5nIGF0
ICcuJwogICAgICAgICBvdXQsIGVyciA9IHNlbGYucnVuX2J6cignaW5pdCcsIHNlbGYuZ2V0X3Vy
bCgpLCByZXRjb2RlPTMpCiAgICAgICAgIHNlbGYuYXNzZXJ0Q29udGFpbnNSZShlcnIsICdBbHJl
YWR5IGEgYnJhbmNoJykKIAotICAgIGRlZiB0ZXN0X2luaXRfc29tZXRoaW5nKHNlbGYpOgorICAg
IGRlZiB0ZXN0X2luaXRfZXhpc3RpbmdfYnJhbmNoX3dpdGhfd29ya2luZ3RyZWUoc2VsZik6CiAg
ICAgICAgICMgZG9uJ3QgZGlzdGluZ3Vpc2ggYmV0d2VlbiB0aGUgYnJhbmNoIGhhdmluZyBhIHdv
cmtpbmcgdHJlZSBvciBub3QKICAgICAgICAgIyB3aGVuIHRoZSBicmFuY2ggaXRzZWxmIGlzIHJl
bW90ZS4KICAgICAgICAgc2VsZi5tYWtlX2JyYW5jaF9hbmRfdHJlZSgnLicpCgo=
# revision id: larstiq at larstiq.dyndns.org-20060702164837-f605fe8406da8038
# sha1: bd7fdab5b720d963a29ae8690db48ab60988bdb4
# inventory sha1: 02582aa7193e2f261c7f48a493a8ebce478a8aa5
# parent ids:
# larstiq at larstiq.dyndns.org-20060702161805-25638faa09cd04bd
# properties:
# branch-nick: remote-init
# message:
# more review comments
# committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
# date: Sun 2006-07-02 18:18:05.707833052 +0200
=== modified file bzrlib/tests/blackbox/test_init.py // encoding:base64
LS0tIGJ6cmxpYi90ZXN0cy9ibGFja2JveC90ZXN0X2luaXQucHkKKysrIGJ6cmxpYi90ZXN0cy9i
bGFja2JveC90ZXN0X2luaXQucHkKQEAgLTEwNSwxNiArMTA1LDIyIEBACiBjbGFzcyBUZXN0U0ZU
UEluaXQoVGVzdENhc2VXaXRoU0ZUUFNlcnZlcik6CiAKICAgICBkZWYgdGVzdF9pbml0KHNlbGYp
OgotICAgICAgICB1cmwgPSBzZWxmLmdldF91cmwoKQotICAgICAgICBvdXQsIGVyciA9IHNlbGYu
cnVuX2J6cignaW5pdCcsIHVybCkKKyAgICAgICAgIyBpbml0IG9uIGEgcmVtb3RlIHVybCBzaG91
bGQgc3VjY2VlZC4KKyAgICAgICAgb3V0LCBlcnIgPSBzZWxmLnJ1bl9ienIoJ2luaXQnLCBzZWxm
LmdldF91cmwoKSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnJywgb3V0KQogICAgICAgICBz
ZWxmLmFzc2VydEVxdWFsKCcnLCBlcnIpCi0KLSAgICAgICAgb3V0LCBlcnIgPSBzZWxmLnJ1bl9i
enIoJ2luaXQnLCB1cmwsIHJldGNvZGU9MykKKyAgICAKKyAgICBkZWYgdGVzdF9pbml0X2V4aXN0
aW5nX2JyYW5jaChzZWxmKToKKyAgICAgICAgIyB3aGVuIHRoZXJlIGlzIGFscmVhZHkgYSBicmFu
Y2ggcHJlc2VudCwgbWFrZSBtZW50aW9uCisgICAgICAgIHNlbGYucnVuX2J6cignaW5pdCcsIHNl
bGYuZ2V0X3VybCgpKQorICAgICAgICBvdXQsIGVyciA9IHNlbGYucnVuX2J6cignaW5pdCcsIHNl
bGYuZ2V0X3VybCgpLCByZXRjb2RlPTMpCiAgICAgICAgIHNlbGYuYXNzZXJ0Q29udGFpbnNSZShl
cnIsICdBbHJlYWR5IGEgYnJhbmNoJykKIAotICAgICAgICBzZWxmLnJ1bl9ienIoJ2NoZWNrb3V0
JywgJy4nKQotICAgICAgICAjIHdoZW4gdGhlIHRyYW5zcG9ydCBpcyBub3QgbG9jYWwsIGRvbid0
IGRpc3Rpbmd1aXNoIGJldHdlZW4gdGhlIGJyYW5jaAotICAgICAgICAjIGhhdmluZyBhIHdvcmtp
bmcgdHJlZSBvciBub3QuCi0gICAgICAgIG91dCwgZXJyID0gc2VsZi5ydW5fYnpyKCdpbml0Jywg
dXJsLCByZXRjb2RlPTMpCisgICAgZGVmIHRlc3RfaW5pdF9zb21ldGhpbmcoc2VsZik6CisgICAg
ICAgICMgZG9uJ3QgZGlzdGluZ3Vpc2ggYmV0d2VlbiB0aGUgYnJhbmNoIGhhdmluZyBhIHdvcmtp
bmcgdHJlZSBvciBub3QKKyAgICAgICAgIyB3aGVuIHRoZSBicmFuY2ggaXRzZWxmIGlzIHJlbW90
ZS4KKyAgICAgICAgc2VsZi5tYWtlX2JyYW5jaF9hbmRfdHJlZSgnLicpCisKKyAgICAgICAgIyBy
ZWx5IG9uIFNGVFBTZXJ2ZXIgZ2V0X3VybCgpIHBvaW50aW5nIGF0ICcuJworICAgICAgICBvdXQs
IGVyciA9IHNlbGYucnVuX2J6cignaW5pdCcsIHNlbGYuZ2V0X3VybCgpLCByZXRjb2RlPTMpCiAg
ICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UocmUuc2VhcmNoKHInY2hlY2tvdXQnLCBlcnIpKQoK
# revision id: larstiq at larstiq.dyndns.org-20060702161805-25638faa09cd04bd
# sha1: 111d3a61ef4471a69bc952b7f5503698ab4577a8
# inventory sha1: 5c02ba5a45c285625ad4c5ff305cdfdcdccbf4eb
# parent ids:
# larstiq at larstiq.dyndns.org-20060702160708-e3a6a0e9adff50d0
# properties:
# branch-nick: remote-init
# message:
# move function local imports of get_transport to the top
# committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
# date: Sun 2006-07-02 18:07:08.325299978 +0200
=== modified file bzrlib/builtins.py // encoding:base64
LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC0zOSw2ICsz
OSw3IEBACiBmcm9tIGJ6cmxpYi5yZXZpc2lvbiBpbXBvcnQgY29tbW9uX2FuY2VzdG9yCiBmcm9t
IGJ6cmxpYi5yZXZpc2lvbnNwZWMgaW1wb3J0IFJldmlzaW9uU3BlYwogZnJvbSBienJsaWIudHJh
Y2UgaW1wb3J0IG11dHRlciwgbm90ZSwgbG9nX2Vycm9yLCB3YXJuaW5nLCBpc19xdWlldCwgaW5m
bworZnJvbSBienJsaWIudHJhbnNwb3J0IGltcG9ydCBnZXRfdHJhbnNwb3J0CiBmcm9tIGJ6cmxp
Yi50cmFuc3BvcnQubG9jYWwgaW1wb3J0IExvY2FsVHJhbnNwb3J0CiBpbXBvcnQgYnpybGliLnVy
bHV0aWxzIGFzIHVybHV0aWxzCiBmcm9tIGJ6cmxpYi53b3JraW5ndHJlZSBpbXBvcnQgV29ya2lu
Z1RyZWUKQEAgLTUxMSw3ICs1MTIsNiBAQAogICAgICAgICAgICAgY3JlYXRlX3ByZWZpeD1GYWxz
ZSwgdmVyYm9zZT1GYWxzZSk6CiAgICAgICAgICMgRklYTUU6IFdheSB0b28gYmlnISAgUHV0IHRo
aXMgaW50byBhIGZ1bmN0aW9uIGNhbGxlZCBmcm9tIHRoZQogICAgICAgICAjIGNvbW1hbmQuCi0g
ICAgICAgIGZyb20gYnpybGliLnRyYW5zcG9ydCBpbXBvcnQgZ2V0X3RyYW5zcG9ydAogICAgICAg
ICAKICAgICAgICAgYnJfZnJvbSA9IEJyYW5jaC5vcGVuX2NvbnRhaW5pbmcoJy4nKVswXQogICAg
ICAgICBzdG9yZWRfbG9jID0gYnJfZnJvbS5nZXRfcHVzaF9sb2NhdGlvbigpCkBAIC02MTMsNyAr
NjEzLDYgQEAKICAgICBhbGlhc2VzID0gWydnZXQnLCAnY2xvbmUnXQogCiAgICAgZGVmIHJ1bihz
ZWxmLCBmcm9tX2xvY2F0aW9uLCB0b19sb2NhdGlvbj1Ob25lLCByZXZpc2lvbj1Ob25lLCBiYXNp
cz1Ob25lKToKLSAgICAgICAgZnJvbSBienJsaWIudHJhbnNwb3J0IGltcG9ydCBnZXRfdHJhbnNw
b3J0CiAgICAgICAgIGlmIHJldmlzaW9uIGlzIE5vbmU6CiAgICAgICAgICAgICByZXZpc2lvbiA9
IFtOb25lXQogICAgICAgICBlbGlmIGxlbihyZXZpc2lvbikgPiAxOgpAQCAtMTAwNSw3ICsxMDA0
LDYgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0eXBlPWdldF9mb3JtYXRfdHlwZSks
CiAgICAgICAgICAgICAgICAgICAgICBdCiAgICAgZGVmIHJ1bihzZWxmLCBsb2NhdGlvbj1Ob25l
LCBmb3JtYXQ9Tm9uZSk6Ci0gICAgICAgIGZyb20gYnpybGliLnRyYW5zcG9ydCBpbXBvcnQgZ2V0
X3RyYW5zcG9ydAogICAgICAgICBpZiBmb3JtYXQgaXMgTm9uZToKICAgICAgICAgICAgIGZvcm1h
dCA9IGdldF9mb3JtYXRfdHlwZSgnZGVmYXVsdCcpCiAgICAgICAgIHRyYW5zcG9ydCA9IGdldF90
cmFuc3BvcnQobG9jYXRpb24pCkBAIC0xMDYyLDcgKzEwNjAsNiBAQAogICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAnIGEgd29ya2luZyB0cmVlJyldCiAgICAgYWxpYXNlcyA9IFsiaW5pdC1y
ZXBvIl0KICAgICBkZWYgcnVuKHNlbGYsIGxvY2F0aW9uLCBmb3JtYXQ9Tm9uZSwgdHJlZXM9RmFs
c2UpOgotICAgICAgICBmcm9tIGJ6cmxpYi50cmFuc3BvcnQgaW1wb3J0IGdldF90cmFuc3BvcnQK
ICAgICAgICAgaWYgZm9ybWF0IGlzIE5vbmU6CiAgICAgICAgICAgICBmb3JtYXQgPSBnZXRfZm9y
bWF0X3R5cGUoJ2RlZmF1bHQnKQogICAgICAgICB0cmFuc3BvcnQgPSBnZXRfdHJhbnNwb3J0KGxv
Y2F0aW9uKQoK
# revision id: larstiq at larstiq.dyndns.org-20060702160708-e3a6a0e9adff50d0
# sha1: c68acf3a782a51bbd68bf64a2450bbf89a613acd
# inventory sha1: ac5f8a67f12e2c0b4300ce39e44f6b0307198e23
# parent ids:
# larstiq at larstiq.dyndns.org-20060702154600-848abd3894fadfc1
# properties:
# branch-nick: remote-init
# message:
# Allow bzr init to create remote branches
# committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
# date: Sun 2006-07-02 17:46:00.034646034 +0200
=== modified file NEWS // encoding:base64
LS0tIE5FV1MKKysrIE5FV1MKQEAgLTcxLDYgKzcxLDkgQEAKICAgICogJ2J6ciByZXZlcnQgRElS
RUNUT1JZJyBub3cgcmV2ZXJ0cyB0aGUgY29udGVudHMgb2YgdGhlIGRpcmVjdG9yeSBhcyB3ZWxs
LgogICAgICAoQWFyb24gQmVudGxleSkKIAorICAgKiAnYnpyIGluaXQnIG5vdyBhbHNvIHdvcmtz
IG9uIHJlbW90ZSBsb2NhdGlvbnMuCisgICAgIChXb3V0ZXIgdmFuIEhleXN0KQorCiAgIEJVRyBG
SVhFUzoKIAogICAgICogRml4IHNoYWRvd2VkIGRlZmluaXRpb24gb2YgVGVzdExvY2F0aW9uQ29u
ZmlnIHRoYXQgY2F1c2VkIHNvbWUgCgo=
=== modified file bzrlib/builtins.py // encoding:base64
LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC0xMDA1LDgg
KzEwMDUsMTAgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0eXBlPWdldF9mb3JtYXRf
dHlwZSksCiAgICAgICAgICAgICAgICAgICAgICBdCiAgICAgZGVmIHJ1bihzZWxmLCBsb2NhdGlv
bj1Ob25lLCBmb3JtYXQ9Tm9uZSk6CisgICAgICAgIGZyb20gYnpybGliLnRyYW5zcG9ydCBpbXBv
cnQgZ2V0X3RyYW5zcG9ydAogICAgICAgICBpZiBmb3JtYXQgaXMgTm9uZToKICAgICAgICAgICAg
IGZvcm1hdCA9IGdldF9mb3JtYXRfdHlwZSgnZGVmYXVsdCcpCisgICAgICAgIHRyYW5zcG9ydCA9
IGdldF90cmFuc3BvcnQobG9jYXRpb24pCiAgICAgICAgIGlmIGxvY2F0aW9uIGlzIE5vbmU6CiAg
ICAgICAgICAgICBsb2NhdGlvbiA9IHUnLicKICAgICAgICAgZWxzZToKQEAgLTEwMTUsOCArMTAx
Nyw5IEBACiAgICAgICAgICAgICAjIEp1c3QgdXNpbmcgb3MubWtkaXIsIHNpbmNlIEkgZG9uJ3QK
ICAgICAgICAgICAgICMgYmVsaWV2ZSB0aGF0IHdlIHdhbnQgdG8gY3JlYXRlIGEgYnVuY2ggb2YK
ICAgICAgICAgICAgICMgbG9jYXRpb25zIGlmIHRoZSB1c2VyIHN1cHBsaWVzIGFuIGV4dGVuZGVk
IHBhdGgKLSAgICAgICAgICAgIGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhsb2NhdGlvbik6Ci0gICAg
ICAgICAgICAgICAgb3MubWtkaXIobG9jYXRpb24pCisgICAgICAgICAgICBpZiBub3QgdHJhbnNw
b3J0LmhhcygnLicpOgorICAgICAgICAgICAgICAgIHRyYW5zcG9ydC5ta2RpcignJykKKyAgICAg
ICAgICAgICAgICAgICAgCiAgICAgICAgIHRyeToKICAgICAgICAgICAgIGV4aXN0aW5nX2J6cmRp
ciA9IGJ6cmRpci5CenJEaXIub3Blbihsb2NhdGlvbikKICAgICAgICAgZXhjZXB0IE5vdEJyYW5j
aEVycm9yOgpAQCAtMTAyNCwxMCArMTAyNywxMCBAQAogICAgICAgICAgICAgYnpyZGlyLkJ6ckRp
ci5jcmVhdGVfYnJhbmNoX2NvbnZlbmllbmNlKGxvY2F0aW9uLCBmb3JtYXQ9Zm9ybWF0KQogICAg
ICAgICBlbHNlOgogICAgICAgICAgICAgaWYgZXhpc3RpbmdfYnpyZGlyLmhhc19icmFuY2goKToK
LSAgICAgICAgICAgICAgICBpZiBleGlzdGluZ19ienJkaXIuaGFzX3dvcmtpbmd0cmVlKCk6Ci0g
ICAgICAgICAgICAgICAgICAgIHJhaXNlIGVycm9ycy5BbHJlYWR5QnJhbmNoRXJyb3IobG9jYXRp
b24pCi0gICAgICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICAgICAgcmFpc2UgZXJy
b3JzLkJyYW5jaEV4aXN0c1dpdGhvdXRXb3JraW5nVHJlZShsb2NhdGlvbikKKyAgICAgICAgICAg
ICAgICBpZiBpc2luc3RhbmNlKHRyYW5zcG9ydCwgTG9jYWxUcmFuc3BvcnQpOgorICAgICAgICAg
ICAgICAgICAgICBpZiBub3QgZXhpc3RpbmdfYnpyZGlyLmhhc193b3JraW5ndHJlZSgpOgorICAg
ICAgICAgICAgICAgICAgICAgICAgcmFpc2UgZXJyb3JzLkJyYW5jaEV4aXN0c1dpdGhvdXRXb3Jr
aW5nVHJlZShsb2NhdGlvbikKKyAgICAgICAgICAgICAgICByYWlzZSBlcnJvcnMuQWxyZWFkeUJy
YW5jaEVycm9yKGxvY2F0aW9uKQogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICBl
eGlzdGluZ19ienJkaXIuY3JlYXRlX2JyYW5jaCgpCiAgICAgICAgICAgICAgICAgZXhpc3Rpbmdf
YnpyZGlyLmNyZWF0ZV93b3JraW5ndHJlZSgpCgo=
=== modified file bzrlib/tests/blackbox/test_init.py // encoding:base64
LS0tIGJ6cmxpYi90ZXN0cy9ibGFja2JveC90ZXN0X2luaXQucHkKKysrIGJ6cmxpYi90ZXN0cy9i
bGFja2JveC90ZXN0X2luaXQucHkKQEAgLTIyLDYgKzIyLDcgQEAKIAogZnJvbSBienJsaWIuYnpy
ZGlyIGltcG9ydCBCenJEaXJNZXRhRm9ybWF0MQogZnJvbSBienJsaWIudGVzdHMuYmxhY2tib3gg
aW1wb3J0IEV4dGVybmFsQmFzZQorZnJvbSBienJsaWIudGVzdHMudGVzdF9zZnRwX3RyYW5zcG9y
dCBpbXBvcnQgVGVzdENhc2VXaXRoU0ZUUFNlcnZlcgogZnJvbSBienJsaWIud29ya2luZ3RyZWUg
aW1wb3J0IFdvcmtpbmdUcmVlCiAKIApAQCAtMTAwLDMgKzEwMSwyMCBAQAogICAgICAgICAjIHN1
Z2dlc3RzIHVzaW5nIGNoZWNrb3V0CiAgICAgICAgIHNlbGYuYXNzZXJ0Q29udGFpbnNSZShlcnIs
ICdvbnRhaW5zIGEgYnJhbmNoLipidXQgbm8gd29ya2luZyB0cmVlLipjaGVja291dCcpCiAKKwor
Y2xhc3MgVGVzdFNGVFBJbml0KFRlc3RDYXNlV2l0aFNGVFBTZXJ2ZXIpOgorCisgICAgZGVmIHRl
c3RfaW5pdChzZWxmKToKKyAgICAgICAgdXJsID0gc2VsZi5nZXRfdXJsKCkKKyAgICAgICAgb3V0
LCBlcnIgPSBzZWxmLnJ1bl9ienIoJ2luaXQnLCB1cmwpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1
YWwoJycsIG91dCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnJywgZXJyKQorCisgICAgICAg
IG91dCwgZXJyID0gc2VsZi5ydW5fYnpyKCdpbml0JywgdXJsLCByZXRjb2RlPTMpCisgICAgICAg
IHNlbGYuYXNzZXJ0Q29udGFpbnNSZShlcnIsICdBbHJlYWR5IGEgYnJhbmNoJykKKworICAgICAg
ICBzZWxmLnJ1bl9ienIoJ2NoZWNrb3V0JywgJy4nKQorICAgICAgICAjIHdoZW4gdGhlIHRyYW5z
cG9ydCBpcyBub3QgbG9jYWwsIGRvbid0IGRpc3Rpbmd1aXNoIGJldHdlZW4gdGhlIGJyYW5jaAor
ICAgICAgICAjIGhhdmluZyBhIHdvcmtpbmcgdHJlZSBvciBub3QuCisgICAgICAgIG91dCwgZXJy
ID0gc2VsZi5ydW5fYnpyKCdpbml0JywgdXJsLCByZXRjb2RlPTMpCisgICAgICAgIHNlbGYuYXNz
ZXJ0RmFsc2UocmUuc2VhcmNoKHInY2hlY2tvdXQnLCBlcnIpKQoK
# revision id: larstiq at larstiq.dyndns.org-20060702154600-848abd3894fadfc1
# sha1: 1b9ff80b42393bbd22d05b0c4a6538a08787f002
# inventory sha1: 62b4553333820aff78825ed00b8b7bbd144729f2
# parent ids:
# pqm at pqm.ubuntu.com-20060702004915-501855cc9fc14e10
# properties:
# branch-nick: remote-init
More information about the bazaar
mailing list