At file:///data/jelmer/bzr-svn/trunk/
------------------------------------------------------------
revno: 1956
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: trunk
timestamp: Sat 2008-11-01 21:17:37 +0100
message:
Merge trunk.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
remote.py format.py-20060406233823-b6fa009fe35dfde7
subvertpy/subvertpy/client.c client.pyx-20080313235339-wbyjbw2namuiql8f-1
subvertpy/subvertpy/editor.c editor.c-20080602191336-frj7az1sdk13o1tw-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 1929.1.20
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: trunk
timestamp: Thu 2008-10-30 22:21:27 +0100
message:
Merge 0.4.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
remote.py format.py-20060406233823-b6fa009fe35dfde7
subvertpy/subvertpy/client.c
client.pyx-20080313235339-wbyjbw2namuiql8f-1
subvertpy/subvertpy/editor.c editor.c-20080602191336-frj7az1sdk13o1tw-1
tests/test_push.py
test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 1669.1.62
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Thu 2008-10-30 21:50:59 +0100
message:
Merge win32 fixes from John.
modified:
client.c
client.pyx-20080313235339-wbyjbw2namuiql8f-1
editor.c editor.c-20080602191336-frj7az1sdk13o1tw-1
------------------------------------------------------------
revno: 1669.7.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
branch nick: 0.4.13-win32
timestamp: Thu 2008-10-30 14:12:11 -0500
message:
We can't point directly at dll imported functions.
So instead, create an 'initeditor()' function which initializes those
members, and then call it when the module is loaded.
modified:
client.c
client.pyx-20080313235339-wbyjbw2namuiql8f-1
editor.c
editor.c-20080602191336-frj7az1sdk13o1tw-1
------------------------------------------------------------
revno: 1669.1.61
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Fri 2008-10-10 20:04:16 +0200
message:
Don't assume root path can't change; Microsoft's CodePlex site does this.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
logwalker.py
logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
------------------------------------------------------------
revno: 1669.1.60
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Fri 2008-10-10 20:02:22 +0200
message:
Fix format name.
modified:
remote.py format.py-20060406233823-b6fa009fe35dfde7
------------------------------------------------------------
revno: 1669.1.59
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Fri 2008-10-10 19:25:49 +0200
message:
Add bug #
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
------------------------------------------------------------
revno: 1669.1.58
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Fri 2008-10-10 19:09:00 +0200
message:
Cope with pushing files changed into directories.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
tests/test_push.py
test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 1669.1.57
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Fri 2008-10-10 18:39:28 +0200
message:
Convert svn errors while stacking.
modified:
versionedfiles.py
versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
------------------------------------------------------------
revno: 1669.1.56
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Fri 2008-10-10 04:14:27 +0200
message:
Mention 1.9 compatibility.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
=== modified file 'NEWS'
--- a/NEWS 2008-10-06 15:08:38 +0000
+++ b/NEWS 2008-10-30 21:21:27 +0000
@@ -60,6 +60,15 @@
+ Standard commit code provides commit notification. (#79333)
+ BUG FIXES
+
+ * Fix compatibility with Bazaar 1.9. (#279444)
+
+ * Cope with pushing files changed into directories. (#277369)
+
+ * Don't assume root path can't change; Microsoft's CodePlex site
+ does this. (#278930)
+
bzr-svn 0.4.13 2008-09-24
BUG FIXES
=== modified file 'commit.py'
--- a/commit.py 2008-10-15 20:09:44 +0000
+++ b/commit.py 2008-10-30 21:21:27 +0000
@@ -163,7 +163,8 @@
# Loop over entries of file_id in old_inv
# remove if they no longer exist with the same name
# or parents
- if file_id in old_inv:
+ if (file_id in old_inv and
+ old_inv[file_id].kind == 'directory'):
for child_name in old_inv[file_id].children:
child_ie = old_inv.get_child(file_id, child_name)
# remove if...
=== modified file 'remote.py'
--- a/remote.py 2008-10-02 21:18:28 +0000
+++ b/remote.py 2008-10-30 21:21:27 +0000
@@ -90,7 +90,7 @@
def cloning_metadir(self, stacked=False):
"""Produce a metadir suitable for cloning with."""
if stacked:
- return bzrlib.bzrdir.format_registry.make_bzrdir("1.6-rich-root")
+ return bzrlib.bzrdir.format_registry.make_bzrdir("1.6.1-rich-root")
else:
return bzrlib.bzrdir.format_registry.make_bzrdir("rich-root-pack")
=== modified file 'subvertpy/subvertpy/client.c'
--- a/subvertpy/subvertpy/client.c 2008-10-02 20:22:45 +0000
+++ b/subvertpy/subvertpy/client.c 2008-10-30 21:21:27 +0000
@@ -803,6 +803,8 @@
void initclient(void)
{
+ extern void initeditor(void);
+
PyObject *mod;
if (PyType_Ready(&Client_Type) < 0)
@@ -814,6 +816,8 @@
if (PyType_Ready(&ConfigItem_Type) < 0)
return;
+ initeditor();
+
/* Make sure APR is initialized */
apr_initialize();
=== modified file 'subvertpy/subvertpy/editor.c'
--- a/subvertpy/subvertpy/editor.c 2008-10-02 20:22:45 +0000
+++ b/subvertpy/subvertpy/editor.c 2008-10-30 21:21:27 +0000
@@ -137,7 +137,7 @@
/* Methods to implement standard operations */
- (destructor)PyObject_Del, /* destructor tp_dealloc; */
+ NULL, // done in initeditor() (destructor)PyObject_Del, /*
destructor tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
@@ -235,7 +235,7 @@
/* Methods to implement standard operations */
- (destructor)PyObject_Del, /* destructor tp_dealloc; */
+ NULL, // Done in initeditor() (destructor)PyObject_Del, /*
destructor tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
@@ -492,7 +492,7 @@
/* Methods to implement standard operations */
- (destructor)PyObject_Del, /* destructor tp_dealloc; */
+ NULL, // Done in initeditor() (destructor)PyObject_Del, /*
destructor tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
@@ -688,3 +688,9 @@
};
+void initeditor(void)
+{
+ TxDeltaWindowHandler_Type.tp_dealloc = (destructor)PyObject_Del;
+ FileEditor_Type.tp_dealloc = (destructor)PyObject_Del;
+ DirectoryEditor_Type.tp_dealloc = (destructor)PyObject_Del;
+}
=== modified file 'tests/test_push.py'
--- a/tests/test_push.py 2008-10-02 21:18:28 +0000
+++ b/tests/test_push.py 2008-10-30 21:21:27 +0000
@@ -699,6 +699,20 @@
self.assertEquals(u"Do á commït",
Repository.open(repos_url).get_revision(revid1).message)
+ def test_kind_change_file_to_directory(self):
+ repos_url = self.make_repository("a")
+ bzrwt = BzrDir.create_standalone_workingtree("c",
+ format=format.get_rich_root_format())
+ self.build_tree({'c/foo.txt': "foo"})
+ bzrwt.add("foo.txt")
+ revid1 = bzrwt.commit(u"somecommit")
+ os.remove("c/foo.txt")
+ self.build_tree({"c/foo.txt/bar": "contents"})
+ bzrwt.add("foo.txt")
+ revid2 = bzrwt.commit(u"somecommit")
+ newdir = BzrDir.open(repos_url+"/trunk")
+ newdir.import_branch(bzrwt.branch)
+
def test_multiple_part_exists(self):
repos_url = self.make_repository("a")
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
