Rev 1740: Merge 0.4. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1740
revision-id: jelmer at samba.org-20080831183126-0536fzj7gkbrfu3n
parent: jelmer at samba.org-20080831173449-c53y7vv3g58ljoir
parent: jelmer at samba.org-20080831183105-6frofg6ba1tq0uo8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-08-31 20:31:26 +0200
message:
  Merge 0.4.
modified:
  AUTHORS                        AUTHORS-20060508114718-4c90c0062645106d
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
    ------------------------------------------------------------
    revno: 1669.1.20
    revision-id: jelmer at samba.org-20080831183105-6frofg6ba1tq0uo8
    parent: jelmer at samba.org-20080831155123-i8f3it1nbdyi3bux
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2008-08-31 20:31:05 +0200
    message:
      Disable explicit reporting of revnum for all inventory entries.
    modified:
      AUTHORS                        AUTHORS-20060508114718-4c90c0062645106d
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
    ------------------------------------------------------------
    revno: 1669.1.19
    revision-id: jelmer at samba.org-20080831155123-i8f3it1nbdyi3bux
    parent: jelmer at samba.org-20080831142026-lhix2s9qpgp8vbv0
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2008-08-31 17:51:23 +0200
    message:
      Improve mutters.
    modified:
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
    ------------------------------------------------------------
    revno: 1669.1.18
    revision-id: jelmer at samba.org-20080831142026-lhix2s9qpgp8vbv0
    parent: jelmer at samba.org-20080831141955-q7spyujgevjfdrgj
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2008-08-31 16:20:26 +0200
    message:
      Add more mutters.
    modified:
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
    ------------------------------------------------------------
    revno: 1669.1.17
    revision-id: jelmer at samba.org-20080831141955-q7spyujgevjfdrgj
    parent: jelmer at samba.org-20080831133914-0agydumldcdsowza
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2008-08-31 16:19:55 +0200
    message:
      Make sure we don't set the push location from a read transaction.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
=== modified file 'AUTHORS'
--- a/AUTHORS	2008-08-31 13:29:41 +0000
+++ b/AUTHORS	2008-08-31 18:31:05 +0000
@@ -8,6 +8,7 @@
 Erik Bågfors
 Alexander Belchenko
 Andrew Bennetts
+Wouter Bolsterlee
 Alexey Borzenkov
 Andrew Cowie
 Aaron Bentley

=== modified file 'NEWS'
--- a/NEWS	2008-08-31 13:44:01 +0000
+++ b/NEWS	2008-08-31 18:31:26 +0000
@@ -50,6 +50,9 @@
    * Fix forward declarations of Python types, fixes 
      compilation on mingw. (#263284)
 
+   * Disable explicit revnum reporting for inventory entries during fetch.
+     (It caused speed regressions and is not necessary).
+
   FEATURES
 
    * Use native Windows password prompter on Windows. (#263287)

=== modified file '__init__.py'
--- a/__init__.py	2008-08-31 15:56:28 +0000
+++ b/__init__.py	2008-08-31 18:31:26 +0000
@@ -431,11 +431,11 @@
                     target_branch.unlock()
             except NotBranchError:
                 target_branch = bzrdir.import_branch(source_branch, revision_id, _push_merged=merged)
-            # We successfully created the target, remember it
-            if source_branch.get_push_location() is None or remember:
-                source_branch.set_push_location(target_branch.base)
         finally:
             source_branch.unlock()
+        # We successfully created the target, remember it
+        if source_branch.get_push_location() is None or remember:
+            source_branch.set_push_location(target_branch.base)
 
 register_command(cmd_svn_push)
 

=== modified file 'fetch.py'
--- a/fetch.py	2008-08-30 21:26:08 +0000
+++ b/fetch.py	2008-08-31 18:31:26 +0000
@@ -585,11 +585,6 @@
 def report_inventory_contents(reporter, inv, revnum, start_empty):
     try:
         reporter.set_path("", revnum, start_empty)
-
-        # Report status of existing paths
-        for path, entry in inv.iter_entries():
-            if path != "":
-                reporter.set_path(path.encode("utf-8"), revnum, start_empty)
     except:
         reporter.abort()
         raise
@@ -761,10 +756,12 @@
                             assert revmeta.revnum > parent_revnum or start_empty
 
                             if parent_branch != revmeta.branch_path:
+                                self.source.transport.mutter("svn switch -r%d:%d -> %s" % (parent_revnum, revmeta.revnum, revmeta.branch_path))
                                 reporter = conn.do_switch(revmeta.revnum, "", True, 
                                     _url_escape_uri(urlutils.join(repos_root, revmeta.branch_path)), 
                                     editor)
                             else:
+                                self.source.transport.mutter("svn update -r%d:%d" % (parent_revnum, revmeta.revnum))
                                 reporter = conn.do_update(revmeta.revnum, "", True, editor)
 
                             report_inventory_contents(reporter, parent_inv, parent_revnum, start_empty)