This is an archive of the discontinued Mercurial Phabricator instance.

convert-bazaar: use breezy package instead of old bzr one
ClosedPublic

Authored by Alphare on Apr 26 2021, 5:03 PM.

Download Raw Diff

Details

Reviewers

durin42
pulkit

Group Reviewers

hg-reviewers

Commits

rHG26127236b229: convert-bazaar: use breezy package instead of old bzr one

Summary

Breezy is the most recent of the two, and works on Python 3 while being
compatible with the (old) Bazaar file format.

This patch contains a variety of unicode <-> bytes changes, API breakage fixing,
restoring failing imports and changing the executable from bzr to brz.

I recommend using the debian packages for brz and python3-breezy (3.1+),
because the pip package seems to be haunted by radioactive dragons.

Diff Detail

Repository

rHG Mercurial

Branch

stable

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

Alphare created this revision.Apr 26 2021, 5:03 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptApr 26 2021, 5:03 PM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

I broke something, sorry for the noise.

✅ refresh by Heptapod after a successful CI run (🐙 💚)
⚠ This patch is intended for stable ⚠

Just to be clear, this is now good to review.

I'm getting conflicts in the hghave part, but otherwise LGTM

This revision now requires changes to proceed.May 6 2021, 3:17 PM

Alphare updated this revision to Diff 28428.Jun 3 2021, 4:44 AM

pulkit accepted this revision.Jun 4 2021, 6:00 AM

Alphare added a commit: rHG26127236b229: convert-bazaar: use breezy package instead of old bzr one.Jun 7 2021, 3:44 AM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHG26127236b229: convert-bazaar: use breezy package instead of old bzr one (authored by Alphare). · Explain Why

This revision was automatically updated to reflect the committed changes.

martinvonz mentioned this in D10884: ui: add a context manager for silencing the ui (pushbuffer+popbuffer).Jun 21 2021, 11:21 AM

Revision Contents
Changeset List

			Path	Packages
M			contrib/import-checker.py (2 lines)
M			hgext/convert/bzr.py (108 lines)
M			tests/hghave.py (34 lines)
M			tests/test-convert-bzr-114.t (16 lines)
M			tests/test-convert-bzr-directories.t (72 lines)
M			tests/test-convert-bzr-ghosts.t (11 lines)
M			tests/test-convert-bzr-merges.t (30 lines)
M			tests/test-convert-bzr-treeroot.t (11 lines)
M			tests/test-convert-bzr.t (81 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	27162		Apr 26 2021, 5:03 PM	★	★
Diff 2	27164		Apr 27 2021, 12:03 PM	★	★
Diff 3	28428		Jun 3 2021, 4:44 AM	★	★
Diff 4	28465	rHG26127236b22970a1e63fab0f77adeafb0c282ba3	Apr 26 2021, 4:59 PM	★	★

Commit	Parents	Author	Summary	Date
206fdff3ebc1	bc6fa400da9f	Raphaël Gomès		Apr 26 2021, 4:59 PM

	Status	Author	Revision
	Closed	Alphare	D10513 convert-bazaar: use breezy package instead of old bzr one
	Closed	Alphare	D10512 bzr: only support bzr conversion on Python3

Diff 27162

contrib/import-checker.py

	basehttpserver = None			basehttpserver = None
	import zlib			import zlib

	import testparseutil			import testparseutil

	# Whitelist of modules that symbols can be directly imported from.			# Whitelist of modules that symbols can be directly imported from.
	allowsymbolimports = (			allowsymbolimports = (
	'__future__',			'__future__',
	'bzrlib',			'breezy',
	'hgclient',			'hgclient',
	'mercurial',			'mercurial',
	'mercurial.hgweb.common',			'mercurial.hgweb.common',
	'mercurial.hgweb.request',			'mercurial.hgweb.request',
	'mercurial.i18n',			'mercurial.i18n',
	'mercurial.interfaces',			'mercurial.interfaces',
	'mercurial.node',			'mercurial.node',
	'mercurial.pycompat',			'mercurial.pycompat',

hgext/convert/bzr.py

	# bzr.py - bzr support for the convert extension			# bzr.py - bzr support for the convert extension
	#			#
	# Copyright 2008, 2009 Marek Kubica <marek@xivilization.net> and others			# Copyright 2008, 2009 Marek Kubica <marek@xivilization.net> and others
	#			#
	# This software may be used and distributed according to the terms of the			# This software may be used and distributed according to the terms of the
	# GNU General Public License version 2 or any later version.			# GNU General Public License version 2 or any later version.

	# This module is for handling 'bzr', that was formerly known as Bazaar-NG;			# This module is for handling Breezy imports or `brz`, but it's also compatible
	# it cannot access 'bar' repositories, but they were never used very much			# with Bazaar or `bzr`, that was formerly known as Bazaar-NG;
				# it cannot access `bar` repositories, but they were never used very much.
	from __future__ import absolute_import			from __future__ import absolute_import

	import os			import os

	from mercurial.i18n import _			from mercurial.i18n import _
	from mercurial import (			from mercurial import (
	demandimport,			demandimport,
	error,			error,
	pycompat,			pycompat,
	)			)
	from . import common			from . import common

				if not pycompat.ispy3:
				msg = _(b"Bazaar/Breezy conversion is only available on Python 3")
				raise error.Abort(msg)

	# these do not work with demandimport, blacklist			# these do not work with demandimport, blacklist
	demandimport.IGNORES.update(			demandimport.IGNORES.update(
	[			[
	b'bzrlib.transactions',			b'breezy.transactions',
	b'bzrlib.urlutils',			b'breezy.urlutils',
	b'ElementPath',			b'ElementPath',
	]			]
	)			)

	try:			try:
	# bazaar imports			# bazaar imports
	import bzrlib.bzrdir			import breezy.bzr.bzrdir
	import bzrlib.errors			import breezy.errors
	import bzrlib.revision			import breezy.revision
	import bzrlib.revisionspec			import breezy.revisionspec

	bzrdir = bzrlib.bzrdir			bzrdir = breezy.bzr.bzrdir
	errors = bzrlib.errors			errors = breezy.errors
	revision = bzrlib.revision			revision = breezy.revision
	revisionspec = bzrlib.revisionspec			revisionspec = breezy.revisionspec
	revisionspec.RevisionSpec			revisionspec.RevisionSpec
	except ImportError:			except ImportError:
	pass			pass

	supportedkinds = (b'file', b'symlink')			supportedkinds = ('file', 'symlink')


	class bzr_source(common.converter_source):			class bzr_source(common.converter_source):
	"""Reads Bazaar repositories by using the Bazaar Python libraries"""			"""Reads Bazaar repositories by using the Bazaar Python libraries"""

	def __init__(self, ui, repotype, path, revs=None):			def __init__(self, ui, repotype, path, revs=None):
	super(bzr_source, self).__init__(ui, repotype, path, revs=revs)			super(bzr_source, self).__init__(ui, repotype, path, revs=revs)

	if not os.path.exists(os.path.join(path, b'.bzr')):			if not os.path.exists(os.path.join(path, b'.bzr')):
	raise common.NoRepo(			raise common.NoRepo(
	_(b'%s does not look like a Bazaar repository') % path			_(b'%s does not look like a Bazaar repository') % path
	)			)

	try:			try:
	# access bzrlib stuff			# access breezy stuff
	bzrdir			bzrdir
	except NameError:			except NameError:
	raise common.NoRepo(_(b'Bazaar modules could not be loaded'))			raise common.NoRepo(_(b'Bazaar modules could not be loaded'))

	path = os.path.abspath(path)			path = os.path.abspath(path)
	self._checkrepotype(path)			self._checkrepotype(path)
	try:			try:
	self.sourcerepo = bzrdir.BzrDir.open(path).open_repository()			self.sourcerepo = bzrdir.BzrDir.open(path.decode()).open_repository()
	except errors.NoRepositoryPresent:			except errors.NoRepositoryPresent:
	raise common.NoRepo(			raise common.NoRepo(
	_(b'%s does not look like a Bazaar repository') % path			_(b'%s does not look like a Bazaar repository') % path
	)			)
	self._parentids = {}			self._parentids = {}
	self._saverev = ui.configbool(b'convert', b'bzr.saverev')			self._saverev = ui.configbool(b'convert', b'bzr.saverev')

	def _checkrepotype(self, path):			def _checkrepotype(self, path):
	# Lightweight checkouts detection is informational but probably			# Lightweight checkouts detection is informational but probably
	# fragile at API level. It should not terminate the conversion.			# fragile at API level. It should not terminate the conversion.
	try:			try:
	dir = bzrdir.BzrDir.open_containing(path)[0]			dir = bzrdir.BzrDir.open_containing(path.decode())[0]
	try:			try:
	tree = dir.open_workingtree(recommend_upgrade=False)			tree = dir.open_workingtree(recommend_upgrade=False)
	branch = tree.branch			branch = tree.branch
	except (errors.NoWorkingTree, errors.NotLocalUrl):			except (errors.NoWorkingTree, errors.NotLocalUrl):
	tree = None			tree = None
	branch = dir.open_branch()			branch = dir.open_branch()
	if (			if (
	tree is not None			tree is not None
	and tree.bzrdir.root_transport.base			and tree.controldir.root_transport.base
	!= branch.bzrdir.root_transport.base			!= branch.controldir.root_transport.base
	):			):
	self.ui.warn(			self.ui.warn(
	_(			_(
	b'warning: lightweight checkouts may cause '			b'warning: lightweight checkouts may cause '
	b'conversion failures, try with a regular '			b'conversion failures, try with a regular '
	b'branch instead.\n'			b'branch instead.\n'
	)			)
	)			)
	def getheads(self):			def getheads(self):
	if not self.revs:			if not self.revs:
	# Set using=True to avoid nested repositories (see issue3254)			# Set using=True to avoid nested repositories (see issue3254)
	heads = sorted([b.last_revision() for b in self._bzrbranches()])			heads = sorted([b.last_revision() for b in self._bzrbranches()])
	else:			else:
	revid = None			revid = None
	for branch in self._bzrbranches():			for branch in self._bzrbranches():
	try:			try:
	r = revisionspec.RevisionSpec.from_string(self.revs[0])			r = revisionspec.RevisionSpec.from_string(self.revs[0].decode())
	info = r.in_history(branch)			info = r.in_history(branch)
	except errors.BzrError:			except errors.BzrError:
	pass			pass
	revid = info.rev_id			revid = info.rev_id
	if revid is None:			if revid is None:
	raise error.Abort(			raise error.Abort(
	_(b'%s is not a valid revision') % self.revs[0]			_(b'%s is not a valid revision') % self.revs[0]
	)			)
	heads = [revid]			heads = [revid]
	# Empty repositories return 'null:', which cannot be retrieved			# Empty repositories return 'null:', which cannot be retrieved
	heads = [h for h in heads if h != b'null:']			heads = [h for h in heads if h != b'null:']
	return heads			return heads

	def getfile(self, name, rev):			def getfile(self, name, rev):
				name = name.decode()
	revtree = self.sourcerepo.revision_tree(rev)			revtree = self.sourcerepo.revision_tree(rev)
	fileid = revtree.path2id(name.decode(self.encoding or b'utf-8'))
	kind = None			try:
	if fileid is not None:			kind = revtree.kind(name)
	kind = revtree.kind(fileid)			except breezy.errors.NoSuchFile:
				return None, None
	if kind not in supportedkinds:			if kind not in supportedkinds:
	# the file is not available anymore - was deleted			# the file is not available anymore - was deleted
	return None, None			return None, None
	mode = self._modecache[(name, rev)]			mode = self._modecache[(name.encode(), rev)]
	if kind == b'symlink':			if kind == 'symlink':
	target = revtree.get_symlink_target(fileid)			target = revtree.get_symlink_target(name)
	if target is None:			if target is None:
	raise error.Abort(			raise error.Abort(
	_(b'%s.%s symlink has no target') % (name, rev)			_(b'%s.%s symlink has no target') % (name, rev)
	)			)
	return target, mode			return target.encode(), mode
	else:			else:
	sio = revtree.get_file(fileid)			sio = revtree.get_file(name)
	return sio.read(), mode			return sio.read(), mode

	def getchanges(self, version, full):			def getchanges(self, version, full):
	if full:			if full:
	raise error.Abort(_(b"convert from cvs does not support --full"))			raise error.Abort(_(b"convert from cvs does not support --full"))
	self._modecache = {}			self._modecache = {}
	self._revtree = self.sourcerepo.revision_tree(version)			self._revtree = self.sourcerepo.revision_tree(version)
	# get the parentids from the cache			# get the parentids from the cache
	parentids = self._parentids.pop(version)			parentids = self._parentids.pop(version)
	# only diff against first parent id			# only diff against first parent id
	prevtree = self.sourcerepo.revision_tree(parentids[0])			prevtree = self.sourcerepo.revision_tree(parentids[0])
	files, changes = self._gettreechanges(self._revtree, prevtree)			files, changes = self._gettreechanges(self._revtree, prevtree)
	return files, changes, set()			return files, changes, set()

	def getcommit(self, version):			def getcommit(self, version):
	rev = self.sourcerepo.get_revision(version)			rev = self.sourcerepo.get_revision(version)
	# populate parent id cache			# populate parent id cache
	if not rev.parent_ids:			if not rev.parent_ids:
	parents = []			parents = []
	self._parentids[version] = (revision.NULL_REVISION,)			self._parentids[version] = (revision.NULL_REVISION,)
	else:			else:
	parents = self._filterghosts(rev.parent_ids)			parents = self._filterghosts(rev.parent_ids)
	self._parentids[version] = parents			self._parentids[version] = parents

	branch = self.recode(rev.properties.get(b'branch-nick', u'default'))			branch = rev.properties.get('branch-nick', 'default')
	if branch == b'trunk':			if branch == 'trunk':
	branch = b'default'			branch = 'default'
	return common.commit(			return common.commit(
	parents=parents,			parents=parents,
	date=b'%d %d' % (rev.timestamp, -rev.timezone),			date=b'%d %d' % (rev.timestamp, -rev.timezone),
	author=self.recode(rev.committer),			author=self.recode(rev.committer),
	desc=self.recode(rev.message),			desc=self.recode(rev.message),
	branch=branch,			branch=branch.encode('utf8'),
	rev=version,			rev=version,
	saverev=self._saverev,			saverev=self._saverev,
	)			)

	def gettags(self):			def gettags(self):
	bytetags = {}			bytetags = {}
	for branch in self._bzrbranches():			for branch in self._bzrbranches():
	if not branch.supports_tags():			if not branch.supports_tags():
	# Fall back to the deprecated attribute for legacy installations.			# Fall back to the deprecated attribute for legacy installations.
	try:			try:
	inventory = origin.root_inventory			inventory = origin.root_inventory
	except AttributeError:			except AttributeError:
	inventory = origin.inventory			inventory = origin.inventory

	# Process the entries by reverse lexicographic name order to			# Process the entries by reverse lexicographic name order to
	# handle nested renames correctly, most specific first.			# handle nested renames correctly, most specific first.

				def key(c):
				return c.path[0] or c.path[1] or ""

	curchanges = sorted(			curchanges = sorted(
	current.iter_changes(origin),			current.iter_changes(origin),
	key=lambda c: c[1][0] or c[1][1],			key=key,
	reverse=True,			reverse=True,
	)			)
	for (			for change in curchanges:
	fileid,			paths = change.path
	paths,			kind = change.kind
	changed_content,			executable = change.executable
	versioned,
	parent,
	name,
	kind,
	executable,
	) in curchanges:

	if paths[0] == u'' or paths[1] == u'':			if paths[0] == u'' or paths[1] == u'':
	# ignore changes to tree root			# ignore changes to tree root
	continue			continue

	# bazaar tracks directories, mercurial does not, so			# bazaar tracks directories, mercurial does not, so
	# we have to rename the directory contents			# we have to rename the directory contents
	if kind[1] == b'directory':			if kind[1] == 'directory':
	if kind[0] not in (None, b'directory'):			if kind[0] not in (None, 'directory'):
	# Replacing 'something' with a directory, record it			# Replacing 'something' with a directory, record it
	# so it can be removed.			# so it can be removed.
	changes.append((self.recode(paths[0]), revid))			changes.append((self.recode(paths[0]), revid))

	if kind[0] == b'directory' and None not in paths:			if kind[0] == 'directory' and None not in paths:
	renaming = paths[0] != paths[1]			renaming = paths[0] != paths[1]
	# neither an add nor an delete - a move			# neither an add nor an delete - a move
	# rename all directory contents manually			# rename all directory contents manually
	subdir = inventory.path2id(paths[0])			subdir = inventory.path2id(paths[0])
	# get all child-entries of the directory			# get all child-entries of the directory
	for name, entry in inventory.iter_entries(subdir):			for name, entry in inventory.iter_entries(subdir):
	# hg does not track directory renames			# hg does not track directory renames
	if entry.kind == b'directory':			if entry.kind == 'directory':
	continue			continue
	frompath = self.recode(paths[0] + b'/' + name)			frompath = self.recode(paths[0] + '/' + name)
	if frompath in seen:			if frompath in seen:
	# Already handled by a more specific change entry			# Already handled by a more specific change entry
	# This is important when you have:			# This is important when you have:
	# a => b			# a => b
	# a/c => a/c			# a/c => a/c
	# Here a/c must not be renamed into b/c			# Here a/c must not be renamed into b/c
	continue			continue
	seen.add(frompath)			seen.add(frompath)
	if not renaming:			if not renaming:
	continue			continue
	topath = self.recode(paths[1] + b'/' + name)			topath = self.recode(paths[1] + '/' + name)
	# register the files as changed			# register the files as changed
	changes.append((frompath, revid))			changes.append((frompath, revid))
	changes.append((topath, revid))			changes.append((topath, revid))
	# add to mode cache			# add to mode cache
	mode = (			mode = (
	(entry.executable and b'x')			(entry.executable and b'x')
	or (entry.kind == b'symlink' and b's')			or (entry.kind == 'symlink' and b's')
	or b''			or b''
	)			)
	self._modecache[(topath, revid)] = mode			self._modecache[(topath, revid)] = mode
	# register the change as move			# register the change as move
	renames[topath] = frompath			renames[topath] = frompath

	# no further changes, go to the next change			# no further changes, go to the next change
	continue			continue

	# renamed			# renamed
	if path and path != topath:			if path and path != topath:
	renames[topath] = path			renames[topath] = path
	changes.append((path, revid))			changes.append((path, revid))

	# populate the mode cache			# populate the mode cache
	kind, executable = [e[1] for e in (kind, executable)]			kind, executable = [e[1] for e in (kind, executable)]
	mode = (executable and b'x') or (kind == b'symlink' and b'l') or b''			mode = (executable and b'x') or (kind == 'symlink' and b'l') or b''
	self._modecache[(topath, revid)] = mode			self._modecache[(topath, revid)] = mode
	changes.append((topath, revid))			changes.append((topath, revid))

	return changes, renames			return changes, renames

	def _filterghosts(self, ids):			def _filterghosts(self, ids):
	"""Filters out ghost revisions which hg does not support, see			"""Filters out ghost revisions which hg does not support, see
	<http://bazaar-vcs.org/GhostRevision>			<http://bazaar-vcs.org/GhostRevision>
	"""			"""
	parentmap = self.sourcerepo.get_parent_map(ids)			parentmap = self.sourcerepo.get_parent_map(ids)
	parents = tuple([parent for parent in ids if parent in parentmap])			parents = tuple([parent for parent in ids if parent in parentmap])
	return parents			return parents

tests/hghave.py

	return (ignorestatus or not ret) and r.search(s)			return (ignorestatus or not ret) and r.search(s)


	@check("baz", "GNU Arch baz client")			@check("baz", "GNU Arch baz client")
	def has_baz():			def has_baz():
	return matchoutput('baz --version 2>&1', br'baz Bazaar version')			return matchoutput('baz --version 2>&1', br'baz Bazaar version')


	@check("bzr", "Canonical's Bazaar client")			@check("bzr", "Breezy library and executable version >= 3.1")
	def has_bzr():			def has_bzr():
	if not is_not_python2:			if not is_not_python2:
	return False			return False
	try:			try:
	import bzrlib			# Test the Breezy python lib
	import bzrlib.bzrdir			import breezy
	import bzrlib.errors			import breezy.bzr.bzrdir
	import bzrlib.revision			import breezy.errors
	import bzrlib.revisionspec			import breezy.revision
				import breezy.revisionspec

	bzrlib.revisionspec.RevisionSpec			breezy.revisionspec.RevisionSpec
	return bzrlib.__doc__ is not None			if breezy.__doc__ is None or breezy.version_info[:2] < (3, 1):
	except (AttributeError, ImportError):
	return False			return False
				except (AttributeError, ImportError):

	@checkvers("bzr", "Canonical's Bazaar client >= %s", (1.14,))
	def has_bzr_range(v):
	major, minor = v.split('rc')[0].split('.')[0:2]
	try:
	import bzrlib

	return bzrlib.__doc__ is not None and bzrlib.version_info[:2] >= (
	int(major),
	int(minor),
	)
	except ImportError:
	return False			return False
				# Test the executable
				return matchoutput('brz --version 2>&1', br'Breezy $brz$ ')


	@check("chg", "running with chg")			@check("chg", "running with chg")
	def has_chg():			def has_chg():
	return 'CHGHG' in os.environ			return 'CHGHG' in os.environ


	@check("rhg", "running with rhg as 'hg'")			@check("rhg", "running with rhg as 'hg'")

tests/test-convert-bzr-114.t

	#require bzr bzr114			#require bzr

	$ . "$TESTDIR/bzr-definitions"			$ . "$TESTDIR/bzr-definitions"

	The file/directory replacement can only be reproduced on			The file/directory replacement can only be reproduced on
	bzr >= 1.4. Merge it back in test-convert-bzr-directories once			bzr >= 1.4. Merge it back in test-convert-bzr-directories once
	this version becomes mainstream.			this version becomes mainstream.
	replace file with dir			replace file with dir

	$ mkdir test-replace-file-with-dir			$ mkdir test-replace-file-with-dir
	$ cd test-replace-file-with-dir			$ cd test-replace-file-with-dir
	$ bzr init -q source			$ brz init -q source
	$ cd source			$ cd source
	$ echo d > d			$ echo d > d
	$ bzr add -q d			$ brz add -q d
	$ bzr commit -q -m 'add d file'			$ brz commit -q -m 'add d file'
	$ rm d			$ rm d
	$ mkdir d			$ mkdir d
	$ bzr add -q d			$ brz add -q d
	$ bzr commit -q -m 'replace with d dir'			$ brz commit -q -m 'replace with d dir'
	$ echo a > d/a			$ echo a > d/a
	$ bzr add -q d/a			$ brz add -q d/a
	$ bzr commit -q -m 'add d/a'			$ brz commit -q -m 'add d/a'
	$ cd ..			$ cd ..
	$ hg convert source source-hg			$ hg convert source source-hg
	initializing destination source-hg repository			initializing destination source-hg repository
	scanning source...			scanning source...
	sorting...			sorting...
	converting...			converting...
	2 add d file			2 add d file
	1 replace with d dir			1 replace with d dir
	0 add d/a			0 add d/a
	$ manifest source-hg tip			$ manifest source-hg tip
	% manifest of tip			% manifest of tip
	644 d/a			644 d/a
	$ cd source-hg			$ cd source-hg
	$ hg update			$ hg update
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ cd ../..			$ cd ../..

tests/test-convert-bzr-directories.t

	#require bzr			#require bzr

	$ . "$TESTDIR/bzr-definitions"			$ . "$TESTDIR/bzr-definitions"

	Work around https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=944379			Work around https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=944379
	$ mkdir -p "${HOME}/.config/breezy"			$ mkdir -p "${HOME}/.config/breezy"

	empty directory			empty directory

	$ mkdir test-empty			$ mkdir test-empty
	$ cd test-empty			$ cd test-empty
	$ bzr init -q source			$ brz init -q source
	$ cd source			$ cd source
	$ echo content > a			$ echo content > a
	$ bzr add -q a			$ brz add -q a
	$ bzr commit -q -m 'Initial add'			$ brz commit -q -m 'Initial add'
	$ mkdir empty			$ mkdir empty
	$ bzr add -q empty			$ brz add -q empty
	$ bzr commit -q -m 'Empty directory added'			$ brz commit -q -m 'Empty directory added'
	$ echo content > empty/something			$ echo content > empty/something
	$ bzr add -q empty/something			$ brz add -q empty/something
	$ bzr commit -q -m 'Added file into directory'			$ brz commit -q -m 'Added file into directory'
	$ cd ..			$ cd ..
	$ hg convert source source-hg			$ hg convert source source-hg
	initializing destination source-hg repository			initializing destination source-hg repository
	scanning source...			scanning source...
	sorting...			sorting...
	converting...			converting...
	2 Initial add			2 Initial add
	1 Empty directory added			1 Empty directory added
	0 Added file into directory			0 Added file into directory
	$ manifest source-hg 1			$ manifest source-hg 1
	% manifest of 1			% manifest of 1
	644 a			644 a
	$ manifest source-hg tip			$ manifest source-hg tip
	% manifest of tip			% manifest of tip
	644 a			644 a
	644 empty/something			644 empty/something
	$ cd ..			$ cd ..

	directory renames			directory renames

	$ mkdir test-dir-rename			$ mkdir test-dir-rename
	$ cd test-dir-rename			$ cd test-dir-rename
	$ bzr init -q source			$ brz init -q source
	$ cd source			$ cd source
	$ mkdir tpyo			$ mkdir tpyo
	$ echo content > tpyo/something			$ echo content > tpyo/something
	$ bzr add -q tpyo			$ brz add -q tpyo
	$ bzr commit -q -m 'Added directory'			$ brz commit -q -m 'Added directory'
	$ bzr mv tpyo typo			$ brz mv tpyo typo
	tpyo => typo			tpyo => typo
	$ bzr commit -q -m 'Oops, typo'			$ brz commit -q -m 'Oops, typo'
	$ cd ..			$ cd ..
	$ hg convert source source-hg			$ hg convert source source-hg
	initializing destination source-hg repository			initializing destination source-hg repository
	scanning source...			scanning source...
	sorting...			sorting...
	converting...			converting...
	1 Added directory			1 Added directory
	0 Oops, typo			0 Oops, typo
	$ manifest source-hg 0			$ manifest source-hg 0
	% manifest of 0			% manifest of 0
	644 tpyo/something			644 tpyo/something
	$ manifest source-hg tip			$ manifest source-hg tip
	% manifest of tip			% manifest of tip
	644 typo/something			644 typo/something
	$ cd ..			$ cd ..

	nested directory renames			nested directory renames

	$ mkdir test-nested-dir-rename			$ mkdir test-nested-dir-rename
	$ cd test-nested-dir-rename			$ cd test-nested-dir-rename
	$ bzr init -q source			$ brz init -q source
	$ cd source			$ cd source
	$ mkdir -p firstlevel/secondlevel/thirdlevel			$ mkdir -p firstlevel/secondlevel/thirdlevel
	$ echo content > firstlevel/secondlevel/file			$ echo content > firstlevel/secondlevel/file
	$ echo this_needs_to_be_there_too > firstlevel/secondlevel/thirdlevel/stuff			$ echo this_needs_to_be_there_too > firstlevel/secondlevel/thirdlevel/stuff
	$ bzr add -q firstlevel			$ brz add -q firstlevel
	$ bzr commit -q -m 'Added nested directories'			$ brz commit -q -m 'Added nested directories'
	$ bzr mv firstlevel/secondlevel secondlevel			$ brz mv firstlevel/secondlevel secondlevel
	firstlevel/secondlevel => secondlevel			firstlevel/secondlevel => secondlevel
	$ bzr commit -q -m 'Moved secondlevel one level up'			$ brz commit -q -m 'Moved secondlevel one level up'
	$ cd ..			$ cd ..
	$ hg convert source source-hg			$ hg convert source source-hg
	initializing destination source-hg repository			initializing destination source-hg repository
	scanning source...			scanning source...
	sorting...			sorting...
	converting...			converting...
	1 Added nested directories			1 Added nested directories
	0 Moved secondlevel one level up			0 Moved secondlevel one level up
	$ manifest source-hg tip			$ manifest source-hg tip
	% manifest of tip			% manifest of tip
	644 secondlevel/file			644 secondlevel/file
	644 secondlevel/thirdlevel/stuff			644 secondlevel/thirdlevel/stuff
	$ cd ..			$ cd ..

	directory remove			directory remove

	$ mkdir test-dir-remove			$ mkdir test-dir-remove
	$ cd test-dir-remove			$ cd test-dir-remove
	$ bzr init -q source			$ brz init -q source
	$ cd source			$ cd source
	$ mkdir src			$ mkdir src
	$ echo content > src/sourcecode			$ echo content > src/sourcecode
	$ bzr add -q src			$ brz add -q src
	$ bzr commit -q -m 'Added directory'			$ brz commit -q -m 'Added directory'
	$ bzr rm -q src			$ brz rm -q src
	$ bzr commit -q -m 'Removed directory'			$ brz commit -q -m 'Removed directory'
	$ cd ..			$ cd ..
	$ hg convert source source-hg			$ hg convert source source-hg
	initializing destination source-hg repository			initializing destination source-hg repository
	scanning source...			scanning source...
	sorting...			sorting...
	converting...			converting...
	1 Added directory			1 Added directory
	0 Removed directory			0 Removed directory
	$ manifest source-hg 0			$ manifest source-hg 0
	% manifest of 0			% manifest of 0
	644 src/sourcecode			644 src/sourcecode
	$ manifest source-hg tip			$ manifest source-hg tip
	% manifest of tip			% manifest of tip
	$ cd ..			$ cd ..

	directory replace			directory replace

	$ mkdir test-dir-replace			$ mkdir test-dir-replace
	$ cd test-dir-replace			$ cd test-dir-replace
	$ bzr init -q source			$ brz init -q source
	$ cd source			$ cd source
	$ mkdir first second			$ mkdir first second
	$ echo content > first/file			$ echo content > first/file
	$ echo morecontent > first/dummy			$ echo morecontent > first/dummy
	$ echo othercontent > second/something			$ echo othercontent > second/something
	$ bzr add -q first second			$ brz add -q first second
	$ bzr commit -q -m 'Initial layout'			$ brz commit -q -m 'Initial layout'
	$ bzr mv first/file second/file			$ brz mv first/file second/file
	first/file => second/file			first/file => second/file
	$ bzr mv first third			$ brz mv first third
	first => third			first => third
	$ bzr commit -q -m 'Some conflicting moves'			$ brz commit -q -m 'Some conflicting moves'
	$ cd ..			$ cd ..
	$ hg convert source source-hg			$ hg convert source source-hg
	initializing destination source-hg repository			initializing destination source-hg repository
	scanning source...			scanning source...
	sorting...			sorting...
	converting...			converting...
	1 Initial layout			1 Initial layout
	0 Some conflicting moves			0 Some conflicting moves
	$ manifest source-hg tip			$ manifest source-hg tip
	% manifest of tip			% manifest of tip
	644 second/file			644 second/file
	644 second/something			644 second/something
	644 third/dummy			644 third/dummy
	$ cd ..			$ cd ..

	divergent nested renames (issue3089)			divergent nested renames (issue3089)

	$ mkdir test-divergent-renames			$ mkdir test-divergent-renames
	$ cd test-divergent-renames			$ cd test-divergent-renames
	$ bzr init -q source			$ brz init -q source
	$ cd source			$ cd source
	$ mkdir -p a/c			$ mkdir -p a/c
	$ echo a > a/fa			$ echo a > a/fa
	$ echo c > a/c/fc			$ echo c > a/c/fc
	$ bzr add -q a			$ brz add -q a
	$ bzr commit -q -m 'Initial layout'			$ brz commit -q -m 'Initial layout'
	$ bzr mv a b			$ brz mv a b
	a => b			a => b
	$ mkdir a			$ mkdir a
	$ bzr add a			$ brz add a
	add(ed\|ing) a (re)			add(ed\|ing) a (re)
	$ bzr mv b/c a/c			$ brz mv b/c a/c
	b/c => a/c			b/c => a/c
	$ bzr status			$ brz status
	added:			added:
	a/			a/
	renamed:			renamed:
	a/? => b/? (re)			a/? => b/? (re)
	a/c/? => a/c/? (re)			a/c/? => a/c/? (re)
	$ bzr commit -q -m 'Divergent renames'			$ brz commit -q -m 'Divergent renames'
	$ cd ..			$ cd ..
	$ hg convert source source-hg			$ hg convert source source-hg
	initializing destination source-hg repository			initializing destination source-hg repository
	scanning source...			scanning source...
	sorting...			sorting...
	converting...			converting...
	1 Initial layout			1 Initial layout
	0 Divergent renames			0 Divergent renames
	$ hg -R source-hg st -C --change 1			$ hg -R source-hg st -C --change 1
	A b/fa			A b/fa
	a/fa			a/fa
	R a/fa			R a/fa
	$ hg -R source-hg manifest -r 1			$ hg -R source-hg manifest -r 1
	a/c/fc			a/c/fc
	b/fa			b/fa
	$ cd ..			$ cd ..

tests/test-convert-bzr-ghosts.t

	#require bzr			#require bzr

	$ . "$TESTDIR/bzr-definitions"			$ . "$TESTDIR/bzr-definitions"
	$ cat > ghostcreator.py <<EOF			$ cat > ghostcreator.py <<EOF
	> import sys			> import sys
	> from bzrlib import workingtree			> from breezy import workingtree
				> from breezy.bzr import bzrdir
	> wt = workingtree.WorkingTree.open('.')			> wt = workingtree.WorkingTree.open('.')
	>			>
	> message, ghostrev = sys.argv[1:]			> message, ghostrev = sys.argv[1:]
	> wt.set_parent_ids(wt.get_parent_ids() + [ghostrev])			> wt.set_parent_ids(wt.get_parent_ids() + [ghostrev.encode()])
	> wt.commit(message)			> wt.commit(message)
	> EOF			> EOF

	ghost revisions			ghost revisions

	$ mkdir test-ghost-revisions			$ mkdir test-ghost-revisions
	$ cd test-ghost-revisions			$ cd test-ghost-revisions
	$ bzr init -q source			$ brz init -q source
	$ cd source			$ cd source
	$ echo content > somefile			$ echo content > somefile
	$ bzr add -q somefile			$ brz add -q somefile
	$ bzr commit -q -m 'Initial layout setup'			$ brz commit -q -m 'Initial layout setup'
	$ echo morecontent >> somefile			$ echo morecontent >> somefile
	$ "$PYTHON" ../../ghostcreator.py 'Commit with ghost revision' ghostrev			$ "$PYTHON" ../../ghostcreator.py 'Commit with ghost revision' ghostrev
	$ cd ..			$ cd ..
	$ hg convert source source-hg			$ hg convert source source-hg
	initializing destination source-hg repository			initializing destination source-hg repository
	scanning source...			scanning source...
	sorting...			sorting...
	converting...			converting...

tests/test-convert-bzr-merges.t

	#require bzr			#require bzr

	N.B. bzr 1.13 has a bug that breaks this test. If you see this			N.B. bzr 1.13 has a bug that breaks this test. If you see this
	test fail, check your bzr version. Upgrading to bzr 1.13.1			test fail, check your bzr version. Upgrading to bzr 1.13.1
	should fix it.			should fix it.

	$ . "$TESTDIR/bzr-definitions"			$ . "$TESTDIR/bzr-definitions"

	test multiple merges at once			test multiple merges at once

	$ mkdir test-multimerge			$ mkdir test-multimerge
	$ cd test-multimerge			$ cd test-multimerge
	$ bzr init -q source			$ brz init -q source
	$ cd source			$ cd source
	$ echo content > file			$ echo content > file
	$ echo text > rename_me			$ echo text > rename_me
	$ bzr add -q file rename_me			$ brz add -q file rename_me
	$ bzr commit -q -m 'Initial add' '--commit-time=2009-10-10 08:00:00 +0100'			$ brz commit -q -m 'Initial add' '--commit-time=2009-10-10 08:00:00 +0100'
	$ cd ..			$ cd ..
	$ bzr branch -q source source-branch1			$ brz branch -q source source-branch1
	$ cd source-branch1			$ cd source-branch1
	$ echo morecontent >> file			$ echo morecontent >> file
	$ echo evenmorecontent > file-branch1			$ echo evenmorecontent > file-branch1
	$ bzr add -q file-branch1			$ brz add -q file-branch1
	$ bzr commit -q -m 'Added branch1 file' '--commit-time=2009-10-10 08:00:01 +0100'			$ brz commit -q -m 'Added branch1 file' '--commit-time=2009-10-10 08:00:01 +0100'
	$ cd ../source			$ cd ../source
	$ sleep 1			$ sleep 1
	$ echo content > file-parent			$ echo content > file-parent
	$ bzr add -q file-parent			$ brz add -q file-parent
	$ bzr commit -q -m 'Added parent file' '--commit-time=2009-10-10 08:00:02 +0100'			$ brz commit -q -m 'Added parent file' '--commit-time=2009-10-10 08:00:02 +0100'
	$ cd ..			$ cd ..
	$ bzr branch -q source source-branch2			$ brz branch -q source source-branch2
	$ cd source-branch2			$ cd source-branch2
	$ echo somecontent > file-branch2			$ echo somecontent > file-branch2
	$ bzr add -q file-branch2			$ brz add -q file-branch2
	$ bzr mv -q rename_me renamed			$ brz mv -q rename_me renamed
	$ echo change > renamed			$ echo change > renamed
	$ bzr commit -q -m 'Added brach2 file' '--commit-time=2009-10-10 08:00:03 +0100'			$ brz commit -q -m 'Added brach2 file' '--commit-time=2009-10-10 08:00:03 +0100'
	$ sleep 1			$ sleep 1
	$ cd ../source			$ cd ../source
	$ bzr merge -q ../source-branch1			$ brz merge -q ../source-branch1
	$ bzr merge -q --force ../source-branch2			$ brz merge -q --force ../source-branch2
	$ bzr commit -q -m 'Merged branches' '--commit-time=2009-10-10 08:00:04 +0100'			$ brz commit -q -m 'Merged branches' '--commit-time=2009-10-10 08:00:04 +0100'
	$ cd ..			$ cd ..

	BUG: file-branch2 should not be added in rev 4, and the rename_me -> renamed			BUG: file-branch2 should not be added in rev 4, and the rename_me -> renamed
	move should be recorded in the fixup merge.			move should be recorded in the fixup merge.
	$ hg convert --datesort --config convert.bzr.saverev=False source source-hg			$ hg convert --datesort --config convert.bzr.saverev=False source source-hg
	initializing destination source-hg repository			initializing destination source-hg repository
	scanning source...			scanning source...
	sorting...			sorting...

tests/test-convert-bzr-treeroot.t

	#require bzr			#require bzr

	$ . "$TESTDIR/bzr-definitions"			$ . "$TESTDIR/bzr-definitions"
	$ cat > treeset.py <<EOF			$ cat > treeset.py <<EOF
	> import sys			> import sys
	> from bzrlib import workingtree			> from breezy import workingtree
				> from breezy.bzr import bzrdir
	> wt = workingtree.WorkingTree.open('.')			> wt = workingtree.WorkingTree.open('.')
	>			>
	> message, rootid = sys.argv[1:]			> message, rootid = sys.argv[1:]
	> wt.set_root_id('tree_root-%s' % rootid)			> wt.set_root_id(b'tree_root-%s' % rootid.encode())
	> wt.commit(message)			> wt.commit(message)
	> EOF			> EOF

	change the id of the tree root			change the id of the tree root

	$ mkdir test-change-treeroot-id			$ mkdir test-change-treeroot-id
	$ cd test-change-treeroot-id			$ cd test-change-treeroot-id
	$ bzr init -q source			$ brz init -q source
	$ cd source			$ cd source
	$ echo content > file			$ echo content > file
	$ bzr add -q file			$ brz add -q file
	$ bzr commit -q -m 'Initial add'			$ brz commit -q -m 'Initial add'
	$ "$PYTHON" ../../treeset.py 'Changed root' new			$ "$PYTHON" ../../treeset.py 'Changed root' new
	$ cd ..			$ cd ..
	$ hg convert source source-hg			$ hg convert source source-hg
	initializing destination source-hg repository			initializing destination source-hg repository
	scanning source...			scanning source...
	sorting...			sorting...
	converting...			converting...
	1 Initial add			1 Initial add
	0 Changed root			0 Changed root
	$ manifest source-hg tip			$ manifest source-hg tip
	% manifest of tip			% manifest of tip
	644 file			644 file

	$ cd ..			$ cd ..

tests/test-convert-bzr.t

	#require bzr			#require bzr

	$ . "$TESTDIR/bzr-definitions"			$ . "$TESTDIR/bzr-definitions"

	create and rename on the same file in the same step			create and rename on the same file in the same step

	$ mkdir test-createandrename			$ mkdir test-createandrename
	$ cd test-createandrename			$ cd test-createandrename
	$ bzr init -q source			$ brz init -q source

	test empty repo conversion (issue3233)			test empty repo conversion (issue3233)

	$ hg convert source source-hg			$ hg convert source source-hg
	initializing destination source-hg repository			initializing destination source-hg repository
	scanning source...			scanning source...
	sorting...			sorting...
	converting...			converting...

	back to the rename stuff			back to the rename stuff

	$ cd source			$ cd source
	$ echo a > a			$ echo a > a
	$ echo c > c			$ echo c > c
	$ echo e > e			$ echo e > e
	$ bzr add -q a c e			$ brz add -q a c e
	$ bzr commit -q -m 'Initial add: a, c, e'			$ brz commit -q -m 'Initial add: a, c, e'
	$ bzr mv a b			$ brz mv a b
	a => b			a => b
	$ bzr mv c d			$ brz mv c d
	c => d			c => d
	$ bzr mv e f			$ brz mv e f
	e => f			e => f
	$ echo a2 >> a			$ echo a2 >> a
	$ mkdir e			$ mkdir e
	$ bzr add -q a e			$ brz add -q a e
	$ bzr commit -q -m 'rename a into b, create a, rename c into d'			$ brz commit -q -m 'rename a into b, create a, rename c into d'
	$ cd ..			$ cd ..
	$ hg convert source source-hg			$ hg convert source source-hg
	scanning source...			scanning source...
	sorting...			sorting...
	converting...			converting...
	1 Initial add: a, c, e			1 Initial add: a, c, e
	0 rename a into b, create a, rename c into d			0 rename a into b, create a, rename c into d
	$ glog -R source-hg			$ glog -R source-hg
	0 rename a into b, create a, rename c into d			0 rename a into b, create a, rename c into d
	$ hg -R source-filemap-hg manifest -r tip			$ hg -R source-filemap-hg manifest -r tip
	b			b
	d			d
	f			f

	convert from lightweight checkout			convert from lightweight checkout

	$ bzr checkout --lightweight source source-light			$ brz checkout --lightweight source source-light
	$ hg convert -s bzr source-light source-light-hg			$ hg convert -s bzr source-light source-light-hg
	initializing destination source-light-hg repository			initializing destination source-light-hg repository
	warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.			warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.
	$TESTTMP/test-createandrename/source-light does not look like a Bazaar repository			$TESTTMP/test-createandrename/source-light does not look like a Bazaar repository
	abort: source-light: missing or unsupported repository			abort: source-light: missing or unsupported repository
	[255]			[255]

	extract timestamps that look just like hg's {date\|isodate}:			extract timestamps that look just like hg's {date\|isodate}:
	yyyy-mm-dd HH:MM zzzz (no seconds!)			yyyy-mm-dd HH:MM zzzz (no seconds!)
	compare timestamps			compare timestamps

	$ cd source			$ cd source
	$ bzr log \| \			$ brz log \| \
	> sed '/timestamp/!d;s/.\{15\}$[0-9: -]\{16\}$:.. $.[0-9]\{4\}$/\1 \2/' \			> sed '/timestamp/!d;s/.\{15\}$[0-9: -]\{16\}$:.. $.[0-9]\{4\}$/\1 \2/' \
	> > ../bzr-timestamps			> > ../bzr-timestamps
	$ cd ..			$ cd ..
	$ hg -R source-hg log --template "{date\|isodate}\n" > hg-timestamps			$ hg -R source-hg log --template "{date\|isodate}\n" > hg-timestamps
	$ cmp bzr-timestamps hg-timestamps \|\| diff -u bzr-timestamps hg-timestamps			$ cmp bzr-timestamps hg-timestamps \|\| diff -u bzr-timestamps hg-timestamps
	$ cd ..			$ cd ..

	merge			merge

	$ mkdir test-merge			$ mkdir test-merge
	$ cd test-merge			$ cd test-merge
	$ cat > helper.py <<EOF			$ cat > helper.py <<EOF
	> import sys			> import sys
	> from bzrlib import workingtree			> from breezy import workingtree
				> from breezy.bzr import bzrdir
	> wt = workingtree.WorkingTree.open('.')			> wt = workingtree.WorkingTree.open('.')
	>			>
	> message, stamp = sys.argv[1:]			> message, stamp = sys.argv[1:]
	> wt.commit(message, timestamp=int(stamp))			> wt.commit(message, timestamp=int(stamp))
	> EOF			> EOF
	$ bzr init -q source			$ brz init -q source
	$ cd source			$ cd source
	$ echo content > a			$ echo content > a
	$ echo content2 > b			$ echo content2 > b
	$ bzr add -q a b			$ brz add -q a b
	$ bzr commit -q -m 'Initial add'			$ brz commit -q -m 'Initial add'
	$ cd ..			$ cd ..
	$ bzr branch -q source source-improve			$ brz branch -q source source-improve
	$ cd source			$ cd source
	$ echo more >> a			$ echo more >> a
	$ "$PYTHON" ../helper.py 'Editing a' 100			$ "$PYTHON" ../helper.py 'Editing a' 100
	$ cd ../source-improve			$ cd ../source-improve
	$ echo content3 >> b			$ echo content3 >> b
	$ "$PYTHON" ../helper.py 'Editing b' 200			$ "$PYTHON" ../helper.py 'Editing b' 200
	$ cd ../source			$ cd ../source
	$ bzr merge -q ../source-improve			$ brz merge -q ../source-improve
	$ bzr commit -q -m 'Merged improve branch'			$ brz commit -q -m 'Merged improve branch'
	$ cd ..			$ cd ..
	$ hg convert --datesort source source-hg			$ hg convert --datesort source source-hg
	initializing destination source-hg repository			initializing destination source-hg repository
	scanning source...			scanning source...
	sorting...			sorting...
	converting...			converting...
	3 Initial add			3 Initial add
	2 Editing a			2 Editing a
	$ cd ..			$ cd ..

	#if symlink execbit			#if symlink execbit

	symlinks and executable files			symlinks and executable files

	$ mkdir test-symlinks			$ mkdir test-symlinks
	$ cd test-symlinks			$ cd test-symlinks
	$ bzr init -q source			$ brz init -q source
	$ cd source			$ cd source
	$ touch program			$ touch program
	$ chmod +x program			$ chmod +x program
	$ ln -s program altname			$ ln -s program altname
	$ mkdir d			$ mkdir d
	$ echo a > d/a			$ echo a > d/a
	$ ln -s a syma			$ ln -s a syma
	$ bzr add -q altname program syma d/a			$ brz add -q altname program syma d/a
	$ bzr commit -q -m 'Initial setup'			$ brz commit -q -m 'Initial setup'
	$ touch newprog			$ touch newprog
	$ chmod +x newprog			$ chmod +x newprog
	$ rm altname			$ rm altname
	$ ln -s newprog altname			$ ln -s newprog altname
	$ chmod -x program			$ chmod -x program
	$ bzr add -q newprog			$ brz add -q newprog
	$ bzr commit -q -m 'Symlink changed, x bits changed'			$ brz commit -q -m 'Symlink changed, x bits changed'
	$ cd ..			$ cd ..
	$ hg convert source source-hg			$ hg convert source source-hg
	initializing destination source-hg repository			initializing destination source-hg repository
	scanning source...			scanning source...
	sorting...			sorting...
	converting...			converting...
	1 Initial setup			1 Initial setup
	0 Symlink changed, x bits changed			0 Symlink changed, x bits changed
	$ hg cat syma; echo			$ hg cat syma; echo
	a			a
	$ cd ../..			$ cd ../..

	#endif			#endif

	Multiple branches			Multiple branches

	$ bzr init-repo -q --no-trees repo			$ brz init-repo -q --no-trees repo
	$ bzr init -q repo/trunk			$ brz init -q repo/trunk
	$ bzr co repo/trunk repo-trunk			$ brz co repo/trunk repo-trunk
	$ cd repo-trunk			$ cd repo-trunk
	$ echo a > a			$ echo a > a
	$ bzr add -q a			$ brz add -q a
	$ bzr ci -qm adda			$ brz ci -qm adda
	$ bzr tag trunk-tag			$ brz tag trunk-tag
	Created tag trunk-tag.			Created tag trunk-tag.
	$ bzr switch -b branch			$ brz switch -b branch
	Tree is up to date at revision 1.			Tree is up to date at revision 1.
	Switched to branch*repo/branch/ (glob)			Switched to branch*repo/branch/ (glob)
	$ sleep 1
	$ echo b > b			$ echo b > b
	$ bzr add -q b			$ brz add -q b
	$ bzr ci -qm addb			$ brz ci -qm addb
	$ bzr tag branch-tag			$ brz tag branch-tag
	Created tag branch-tag.			Created tag branch-tag.
	$ bzr switch --force ../repo/trunk			$ brz switch --force ../repo/trunk
	Updated to revision 1.			Updated to revision 1.
	Switched to branch*/repo/trunk/ (glob)			Switched to branch*/repo/trunk/ (glob)
	$ sleep 1
	$ echo a >> a			$ echo a >> a
	$ bzr ci -qm changea			$ brz ci -qm changea
	$ cd ..			$ cd ..
	$ hg convert --datesort repo repo-bzr			$ hg convert --datesort repo repo-bzr
	initializing destination repo-bzr repository			initializing destination repo-bzr repository
	scanning source...			scanning source...
	sorting...			sorting...
	converting...			converting...
	2 adda			2 adda
	1 addb			1 addb

	$ hg -R repo-bzr tags			$ hg -R repo-bzr tags
	tip 3:* (glob)			tip 3:* (glob)
	branch-tag 1:* (glob)			branch-tag 1:* (glob)
	trunk-tag 0:* (glob)			trunk-tag 0:* (glob)

	Nested repositories (issue3254)			Nested repositories (issue3254)

	$ bzr init-repo -q --no-trees repo/inner			$ brz init-repo -q --no-trees repo/inner
	$ bzr init -q repo/inner/trunk			$ brz init -q repo/inner/trunk
	$ bzr co repo/inner/trunk inner-trunk			$ brz co repo/inner/trunk inner-trunk
	$ cd inner-trunk			$ cd inner-trunk
	$ echo b > b			$ echo b > b
	$ bzr add -q b			$ brz add -q b
	$ bzr ci -qm addb			$ brz ci -qm addb
	$ cd ..			$ cd ..
	$ hg convert --datesort repo noinner-bzr			$ hg convert --datesort repo noinner-bzr
	initializing destination noinner-bzr repository			initializing destination noinner-bzr repository
	scanning source...			scanning source...
	sorting...			sorting...
	converting...			converting...
	2 adda			2 adda
	1 addb			1 addb
	0 changea			0 changea
	updating tags			updating tags