Rev 1029: merge 0.4. in file:///data/jelmer/bzr-svn/pyrex/
Jelmer Vernooij
jelmer at samba.org
Fri Mar 21 22:45:39 GMT 2008
At file:///data/jelmer/bzr-svn/pyrex/
------------------------------------------------------------
revno: 1029
revision-id: jelmer at samba.org-20080321224537-io5qh96elw3lxhzs
parent: jelmer at samba.org-20080321190335-mqy0tnds0r65b8h0
parent: jelmer at samba.org-20080321224326-k9fj54i1gc2ugmhw
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Fri 2008-03-21 23:45:37 +0100
message:
merge 0.4.
modified:
AUTHORS AUTHORS-20060508114718-4c90c0062645106d
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
NEWS news-20061231030336-h9fhq245ie0de8bs-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_revids.py test_revids.py-20070516230044-d7x872cqi7xb4eow-1
------------------------------------------------------------
revno: 950.1.19
revision-id: jelmer at samba.org-20080321224326-k9fj54i1gc2ugmhw
parent: jelmer at samba.org-20080321224148-xg8qm2xcml0fm6wp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 23:43:26 +0100
message:
Allow more characters.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
------------------------------------------------------------
revno: 950.1.18
revision-id: jelmer at samba.org-20080321224148-xg8qm2xcml0fm6wp
parent: jelmer at samba.org-20080321203334-sk393a080u8a424w
parent: jelmer at samba.org-20080321220845-v50bgo6bywij8x1e
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 23:41:48 +0100
message:
merge 0.4.8.
modified:
AUTHORS AUTHORS-20060508114718-4c90c0062645106d
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
NEWS news-20061231030336-h9fhq245ie0de8bs-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_revids.py test_revids.py-20070516230044-d7x872cqi7xb4eow-1
------------------------------------------------------------
revno: 878.1.39
tags: bzr-svn-0.4.8
revision-id: jelmer at samba.org-20080321220845-v50bgo6bywij8x1e
parent: jelmer at samba.org-20080321212852-cryaibyigqibtjam
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Fri 2008-03-21 23:08:45 +0100
message:
Fix remaining tests.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
------------------------------------------------------------
revno: 878.1.38
revision-id: jelmer at samba.org-20080321212852-cryaibyigqibtjam
parent: jelmer at samba.org-20080321203943-7c1auf0uprfpyqul
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Fri 2008-03-21 22:28:52 +0100
message:
Fix more tests.
modified:
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_revids.py test_revids.py-20070516230044-d7x872cqi7xb4eow-1
------------------------------------------------------------
revno: 878.1.37
revision-id: jelmer at samba.org-20080321203943-7c1auf0uprfpyqul
parent: jelmer at samba.org-20080321203707-c85mtyl2tab4axkx
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Fri 2008-03-21 21:39:43 +0100
message:
Merge another test fix.
modified:
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 878.1.36
revision-id: jelmer at samba.org-20080321203707-c85mtyl2tab4axkx
parent: jelmer at samba.org-20080321135611-opp27hno5n3gabt8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Fri 2008-03-21 21:37:07 +0100
message:
Merge 0.4.
modified:
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 878.1.35
revision-id: jelmer at samba.org-20080321135611-opp27hno5n3gabt8
parent: jelmer at samba.org-20080321131049-ywoyv74pwlskq257
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Fri 2008-03-21 14:56:11 +0100
message:
Return tuples in parent determine functions.
modified:
repository.py repository.py-20060306123302-1f8c5069b3fe0265
------------------------------------------------------------
revno: 878.1.34
revision-id: jelmer at samba.org-20080321131049-ywoyv74pwlskq257
parent: jelmer at samba.org-20080312190445-3ba6xgya7m0nzvz2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Fri 2008-03-21 14:10:49 +0100
message:
Cherrypick test symlink improvement.
modified:
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 878.1.33
revision-id: jelmer at samba.org-20080312190445-3ba6xgya7m0nzvz2
parent: jelmer at samba.org-20080312165346-0nj31c5lv6a7nchi
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Wed 2008-03-12 20:04:45 +0100
message:
Deal with newer versions of bzr passing in unicode strings.
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
------------------------------------------------------------
revno: 878.1.32
revision-id: jelmer at samba.org-20080312165346-0nj31c5lv6a7nchi
parent: jelmer at samba.org-20080312164804-579nv50cj019ehs4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Wed 2008-03-12 17:53:46 +0100
message:
Fix line wrapping
modified:
AUTHORS AUTHORS-20060508114718-4c90c0062645106d
------------------------------------------------------------
revno: 878.1.31
revision-id: jelmer at samba.org-20080312164804-579nv50cj019ehs4
parent: jelmer at samba.org-20080312161205-d9d1lj8ljvjmilf9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Wed 2008-03-12 17:48:04 +0100
message:
Add bug #
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
------------------------------------------------------------
revno: 878.1.30
revision-id: jelmer at samba.org-20080312161205-d9d1lj8ljvjmilf9
parent: jelmer at samba.org-20080312151424-slxtuacqbs0c6ods
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Wed 2008-03-12 17:12:05 +0100
message:
Allow overriding tests to run.
modified:
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
------------------------------------------------------------
revno: 878.1.29
revision-id: jelmer at samba.org-20080312151424-slxtuacqbs0c6ods
parent: jelmer at samba.org-20080311200056-aiwgs3z6grrfzyrk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Wed 2008-03-12 16:14:24 +0100
message:
Cherrypick some formatting fixes from the 0.4 branch
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
auth.py auth.py-20071209174622-w8d42k6nm5yhxvi8-1
cache.py cache.py-20070520185908-qbtlcet08bllgs0f-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
errors.py errors.py-20061226172623-w1sbj8ynpo0eojqp-1
format.py format.py-20070917005147-94kb7zysotf82kqw-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
------------------------------------------------------------
revno: 950.1.17
revision-id: jelmer at samba.org-20080321203334-sk393a080u8a424w
parent: jelmer at samba.org-20080321200216-f02az3w8p2tyuw27
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 21:33:34 +0100
message:
Fix another test.
modified:
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 950.1.16
revision-id: jelmer at samba.org-20080321200216-f02az3w8p2tyuw27
parent: jelmer at samba.org-20080321185710-2t0sfckz99oygfr8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 21:02:16 +0100
message:
Fix bug in the mapping code.
modified:
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
=== modified file 'AUTHORS'
--- a/AUTHORS 2008-03-12 15:01:25 +0000
+++ b/AUTHORS 2008-03-21 22:41:48 +0000
@@ -6,6 +6,6 @@
Lukás Lalinský, Kevin Light, Roland Mas, John Arbash Meinel, Stefan Metzmacher,
Andrew Mitchell, Gustavo Niemeyer, Martin Pool, Garrett Rooney, Johan Rydberg,
Peter Samuelson, Mark Shuttleworth, Adeodato Simó, Mikhail Sobolev,
-Reinhard Tartler and Adrian Wilkins for comments, code reviews, funding, bug reports, testing,
-committing patches/bundles and generally keeping up while I was asking
-annoying questions.
+Reinhard Tartler and Adrian Wilkins for comments, code reviews, funding, bug
+reports, testing, committing patches/bundles and generally keeping up while I
+was asking annoying questions.
=== modified file 'Makefile'
--- a/Makefile 2008-03-21 15:49:19 +0000
+++ b/Makefile 2008-03-21 22:45:37 +0000
@@ -27,10 +27,10 @@
$(TMP_PLUGINS_DIR):
mkdir -p $@
-$(TMP_PLUGINS_DIR)/svn: build-inplace $(TMP_PLUGINS_DIR)
+$(TMP_PLUGINS_DIR)/svn: $(TMP_PLUGINS_DIR)
ln -sf $@ ..
-check:: $(TMP_PLUGINS_DIR)/svn
+check:: build-inplace $(TMP_PLUGINS_DIR)/svn
BZR_PLUGIN_PATH=$(TMP_PLUGINS_DIR) $(DEBUGGER) $(PYTHON) $(BZR) selftest $(TEST_OPTIONS) $(TESTS)
check-verbose::
=== modified file 'NEWS'
--- a/NEWS 2008-03-21 19:03:35 +0000
+++ b/NEWS 2008-03-21 22:45:37 +0000
@@ -30,7 +30,7 @@
* Allow multiple mappings to be available at the same time.
-bzr-svn 0.4.8 2008-03-11
+bzr-svn 0.4.8 2008-03-21
BUG FIXES
=== modified file 'commit.py'
--- a/commit.py 2008-03-21 19:03:35 +0000
+++ b/commit.py 2008-03-21 22:45:37 +0000
@@ -40,8 +40,10 @@
def is_valid_property_name(prop):
- for c in prop:
- if not c.isalnum() and not c in "-:":
+ if not prop[0].isalnum() and not prop[0] in ":_":
+ return False
+ for c in prop[1:]:
+ if not c.isalnum() and not c in "-:._":
return False
return True
=== modified file 'fetch.py'
--- a/fetch.py 2008-03-18 23:27:43 +0000
+++ b/fetch.py 2008-03-21 22:45:37 +0000
@@ -102,6 +102,8 @@
self.id_map = self.source.transform_fileid_map(self.source.uuid,
self.revnum, self.branch_path, changes, renames,
self.mapping)
+ self._bzr_merges = ()
+ self._svk_merges = ()
self._premature_deletes = set()
self.old_inventory = prev_inventory
self.inventory = prev_inventory.copy()
=== modified file 'mapping.py'
--- a/mapping.py 2008-03-16 05:41:30 +0000
+++ b/mapping.py 2008-03-21 22:45:37 +0000
@@ -136,9 +136,9 @@
"""
if ' ' in line:
mutter('invalid revision id %r in merged property, skipping' % line)
- return []
+ return ()
- return filter(lambda x: x != "", line.split("\t"))
+ return tuple(filter(lambda x: x != "", line.split("\t")))
def parse_svn_revprops(svn_revprops, rev):
if svn_revprops.has_key(constants.PROP_REVISION_AUTHOR):
@@ -532,12 +532,11 @@
fileprops.get(SVN_PROP_BZR_REVISION_INFO, ""), rev)
def get_rhs_parents(self, branch_path, revprops, fileprops):
- rhs_parents = []
bzr_merges = fileprops.get(SVN_PROP_BZR_ANCESTRY+str(self.scheme), None)
if bzr_merges is not None:
return parse_merge_property(bzr_merges.splitlines()[-1])
- return []
+ return ()
def get_rhs_ancestors(self, branch_path, revprops, fileprops):
ancestry = []
@@ -562,20 +561,19 @@
return svnprops
- def export_revision(self, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges,
- fileprops):
+ def export_revision(self, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, old_fileprops):
# Keep track of what Subversion properties to set later on
fileprops = {}
fileprops[SVN_PROP_BZR_REVISION_INFO] = generate_revision_metadata(
timestamp, timezone, committer, revprops)
if len(merges) > 0:
- fileprops.update(self._record_merges(merges, fileprops))
+ fileprops.update(self._record_merges(merges, old_fileprops))
# Set appropriate property if revision id was specified by
# caller
if revision_id is not None:
- old = fileprops.get(SVN_PROP_BZR_REVISION_ID+str(self.scheme), "")
+ old = old_fileprops.get(SVN_PROP_BZR_REVISION_ID+str(self.scheme), "")
fileprops[SVN_PROP_BZR_REVISION_ID+str(self.scheme)] = old + "%d %s\n" % (revno, revision_id)
return ({}, fileprops)
@@ -753,7 +751,6 @@
self.fileprops.import_revision(svn_revprops, fileprops, rev)
self.revprops.import_revision(svn_revprops, fileprops, rev)
-
class BzrSvnMappingRegistry(registry.Registry):
"""Registry for the various Bzr<->Svn mappings."""
def register(self, key, factory, help):
=== modified file 'repository.py'
--- a/repository.py 2008-03-21 19:03:35 +0000
+++ b/repository.py 2008-03-21 22:45:37 +0000
@@ -447,11 +447,11 @@
def revision_parents(self, revision_id, svn_fileprops=None,
svn_revprops=None):
"""See Repository.revision_parents()."""
- parent_ids = []
+ parent_ids = ()
(branch, revnum, mapping) = self.lookup_revision_id(revision_id)
mainline_parent = self._mainline_revision_parent(branch, revnum, mapping)
if mainline_parent is not None:
- parent_ids.append(mainline_parent)
+ parent_ids += (mainline_parent,)
if svn_fileprops is None:
svn_fileprops = lazy_dict(lambda: self.branchprop_list.get_changed_properties(branch, revnum))
@@ -460,10 +460,10 @@
svn_revprops = lazy_dict(lambda: self.transport.revprop_list(revnum))
extra_rhs_parents = mapping.get_rhs_parents(branch, svn_revprops, svn_fileprops)
- parent_ids.extend(extra_rhs_parents)
+ parent_ids += extra_rhs_parents
- if extra_rhs_parents == []:
- parent_ids.extend(self._svk_merged_revisions(branch, revnum, mapping, svn_fileprops))
+ if extra_rhs_parents == ():
+ parent_ids += tuple(self._svk_merged_revisions(branch, revnum, mapping, svn_fileprops))
return parent_ids
=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py 2008-03-17 20:59:03 +0000
+++ b/tests/test_commit.py 2008-03-21 22:45:37 +0000
@@ -131,7 +131,7 @@
wt.commit(message="data")
self.assertEqual("some-ghost-revision\n",
self.client_get_prop(repos_url, "bzr:ancestry:v3-none", 1))
- self.assertEqual([wt.branch.generate_revision_id(0), "some-ghost-revision"],
+ self.assertEqual((wt.branch.generate_revision_id(0), "some-ghost-revision"),
wt.branch.repository.revision_parents(
wt.branch.last_revision()))
=== modified file 'tests/test_push.py'
--- a/tests/test_push.py 2008-03-21 15:49:19 +0000
+++ b/tests/test_push.py 2008-03-21 22:45:37 +0000
@@ -644,6 +644,9 @@
check(copybranch)
def test_push_non_lhs_parent(self):
+ from bzrlib.debug import debug_flags
+ debug_flags.add("commit")
+ debug_flags.add("fetch")
repos_url = self.make_client("a", "dc")
bzrwt = BzrDir.create_standalone_workingtree("c",
format=format.get_rich_root_format())
@@ -745,7 +748,7 @@
bzrwt.add_pending_merge(merge_revid)
self.assertEquals(bzrwt.get_parent_ids()[1], merge_revid)
revid2 = bzrwt.commit("Merge something", rev_id="mergerevid")
- bzr_parents = bzrwt.branch.repository.revision_parents(revid2)
+ bzr_parents = bzrwt.branch.repository.get_revision(revid2).parent_ids
trunk = Branch.open(repos_url + "/trunk")
trunk.pull(bzrwt.branch)
@@ -755,7 +758,7 @@
self.assertEquals([revid1, revid2], trunk.revision_history())
self.client_update("dc")
self.assertEquals(
- '1 initialrevid\n',
+ '1 initialrevid\n2 mergerevid\n',
self.client_get_prop("dc/trunk", SVN_PROP_BZR_REVISION_ID+"trunk0"))
=== modified file 'tests/test_repos.py'
--- a/tests/test_repos.py 2008-03-21 19:03:35 +0000
+++ b/tests/test_repos.py 2008-03-21 22:45:37 +0000
@@ -485,14 +485,14 @@
self.client_commit("dc", "Second Message")
repository = Repository.open("svn+%s" % repos_url)
mapping = repository.get_mapping()
- self.assertEqual([],
+ self.assertEqual((),
repository.revision_parents(
repository.generate_revision_id(0, "", mapping)))
- self.assertEqual([repository.generate_revision_id(0, "", mapping)],
+ self.assertEqual((repository.generate_revision_id(0, "", mapping),),
repository.revision_parents(
repository.generate_revision_id(1, "", mapping)))
- self.assertEqual([
- repository.generate_revision_id(1, "", mapping)],
+ self.assertEqual((
+ repository.generate_revision_id(1, "", mapping),),
repository.revision_parents(
repository.generate_revision_id(2, "", mapping)))
@@ -519,14 +519,14 @@
self.client_commit("dc", "Second Message")
repository = Repository.open("svn+%s" % repos_url)
mapping = repository.get_mapping()
- self.assertEqual([],
+ self.assertEqual((),
repository.revision_parents(
repository.generate_revision_id(0, "", mapping)))
- self.assertEqual([repository.generate_revision_id(0, "", mapping)],
+ self.assertEqual((repository.generate_revision_id(0, "", mapping),),
repository.revision_parents(
repository.generate_revision_id(1, "", mapping)))
- self.assertEqual([repository.generate_revision_id(1, "", mapping),
- "ghostparent"],
+ self.assertEqual((repository.generate_revision_id(1, "", mapping),
+ "ghostparent"),
repository.revision_parents(
repository.generate_revision_id(2, "", mapping)))
@@ -544,8 +544,8 @@
"%s:/branches/foo:1\n" % repository.uuid)
self.client_commit("dc", "Second Message")
mapping = repository.get_mapping()
- self.assertEqual([repository.generate_revision_id(1, "trunk", mapping),
- repository.generate_revision_id(1, "branches/foo", mapping)],
+ self.assertEqual((repository.generate_revision_id(1, "trunk", mapping),
+ repository.generate_revision_id(1, "branches/foo", mapping)),
repository.revision_parents(
repository.generate_revision_id(2, "trunk", mapping)))
@@ -564,7 +564,7 @@
mapping = repository.get_mapping()
rev = repository.get_revision(
repository.generate_revision_id(2, "", mapping))
- self.assertEqual([repository.generate_revision_id(1, "", mapping)],
+ self.assertEqual((repository.generate_revision_id(1, "", mapping),),
rev.parent_ids)
self.assertEqual(rev.revision_id,
repository.generate_revision_id(2, "", mapping))
@@ -587,7 +587,7 @@
mapping = repository.get_mapping()
revid = mapping.generate_revision_id(repository.uuid, 2, "")
rev = repository.get_revision("myrevid")
- self.assertEqual([repository.generate_revision_id(1, "", mapping)],
+ self.assertEqual((repository.generate_revision_id(1, "", mapping),),
rev.parent_ids)
self.assertEqual(rev.revision_id,
repository.generate_revision_id(2, "", mapping))
@@ -1174,13 +1174,13 @@
def test_get_parent_ids(self):
mapping = self.repos.get_mapping()
- self.assertEqual([self.repos.generate_revision_id(0, "", mapping)], self.tree.get_parent_ids())
+ self.assertEqual((self.repos.generate_revision_id(0, "", mapping),), self.tree.get_parent_ids())
def test_get_parent_ids_zero(self):
mapping = self.repos.get_mapping()
tree = self.repos.revision_tree(
self.repos.generate_revision_id(0, "", mapping))
- self.assertEqual([], tree.get_parent_ids())
+ self.assertEqual((), tree.get_parent_ids())
def test_get_revision_id(self):
mapping = self.repos.get_mapping()
=== modified file 'tests/test_revids.py'
--- a/tests/test_revids.py 2008-02-04 16:16:22 +0000
+++ b/tests/test_revids.py 2008-03-21 22:41:48 +0000
@@ -85,5 +85,3 @@
revidmap.insert_revid("bla", "mypath", 200, 42, "brainslug")
self.assertEquals(None,
revidmap.lookup_branch_revnum(42, "mypath", "brainslug"))
-
-
More information about the bazaar-commits
mailing list