Rev 1123: merge 0.4. in http://people.samba.org/bzr/jelmer/bzr-svn/cext

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/cext

------------------------------------------------------------
revno: 1123
revision-id: jelmer at samba.org-20080704064218-ue4um6q07fv03364
parent: jelmer at samba.org-20080704054910-7911dj1l7fb58qxe
parent: jelmer at samba.org-20080704064143-drswm948f45gra9i
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Fri 2008-07-04 08:42:18 +0200
message:
  merge 0.4.
modified:
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 950.3.374
    revision-id: jelmer at samba.org-20080704064143-drswm948f45gra9i
    parent: jelmer at samba.org-20080704064052-qbuje3mz3nkh1j6e
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-07-04 08:41:43 +0200
    message:
      Fix update of base tree.
    modified:
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 950.3.373
    revision-id: jelmer at samba.org-20080704064052-qbuje3mz3nkh1j6e
    parent: jelmer at samba.org-20080704054804-fn8ankcj4t0jimmr
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-07-04 08:40:52 +0200
    message:
      Fix locking in update.
    modified:
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'workingtree.py'
--- a/workingtree.py	2008-07-04 05:49:10 +0000
+++ b/workingtree.py	2008-07-04 06:42:18 +0000
@@ -156,9 +156,9 @@
         if revnum is None:
             # FIXME: should be able to use -1 here
             revnum = self.branch.get_revnum()
-        adm = self._get_wc()
+        adm = self._get_wc(write_lock=True)
         try:
-            conn = self.branch.repository.transport.get_connection()
+            conn = self.branch.repository.transport.connections.get(bzr_to_svn_url(self.branch.base))
             try:
                 update_wc(adm, self.basedir, conn, revnum)
             finally:
@@ -479,7 +479,7 @@
                 try:
                     wc.add(os.path.join(self.basedir, f))
                     if ids is not None:
-                        self._change_fileid_mapping(ids.next(), f, adm)
+                        self._change_fileid_mapping(ids.next(), f, wc)
                 except SubversionException, (_, num):
                     if num == ERR_ENTRY_EXISTS:
                         continue