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

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1746
revision-id: jelmer at samba.org-20080831232029-rjzu135jh0ou3r05
parent: jelmer at samba.org-20080831230133-kx6785goz18qxv8q
parent: jelmer at samba.org-20080831231630-2ofs47zet20wdhkc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2008-09-01 01:20:29 +0200
message:
  Merge 0.4.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  stdbool.h                      stdbool.h-20080727235015-yn3xnbkxaaluvzd0-1
  tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 1669.1.23
    revision-id: jelmer at samba.org-20080831231630-2ofs47zet20wdhkc
    parent: jelmer at samba.org-20080831193939-8iirm9frsmq29c95
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-09-01 01:16:30 +0200
    message:
      Fix pull into subversion working copies.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 1669.1.22
    revision-id: jelmer at samba.org-20080831193939-8iirm9frsmq29c95
    parent: jelmer at samba.org-20080831185749-62h5j0e8b8hxedum
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2008-08-31 21:39:39 +0200
    message:
      Add NEWS entry about fixed stdbool.h.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
    ------------------------------------------------------------
    revno: 1669.1.21
    revision-id: jelmer at samba.org-20080831185749-62h5j0e8b8hxedum
    parent: jelmer at samba.org-20080831183105-6frofg6ba1tq0uo8
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2008-08-31 20:57:49 +0200
    message:
      make sure bool is a char.
    modified:
      stdbool.h                      stdbool.h-20080727235015-yn3xnbkxaaluvzd0-1
=== modified file 'NEWS'
--- a/NEWS	2008-08-31 18:31:26 +0000
+++ b/NEWS	2008-08-31 23:20:29 +0000
@@ -50,8 +50,13 @@
    * 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).
+   * Avoid explicit revnum reporting for inventory entries during fetch.
+     (It caused severe speed regressions and is not necessary).
+
+   * Fix size of bool variable in replacement stdbool.h. This was 
+     causing strange errors on Windows, most notably slow fetches.
+
+   * Fix pull into Subversion working copies.
 
   FEATURES
 

=== modified file 'stdbool.h'
--- a/stdbool.h	2008-08-28 14:46:26 +0000
+++ b/stdbool.h	2008-08-31 23:20:29 +0000
@@ -2,7 +2,9 @@
 #ifndef _STDBOOL_H_
 #define _STDBOOL_H_
 
-typedef enum { false, true } bool;
+typedef char bool;
+#define true 1
+#define false 0
 
 #endif
 

=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py	2008-08-31 17:34:49 +0000
+++ b/tests/test_workingtree.py	2008-08-31 23:20:29 +0000
@@ -346,6 +346,18 @@
         tree.basis_tree()
         delta = tree.changes_from(tree.basis_tree())
         self.assertEqual("bl", delta.modified[0][0])
+
+    def test_pull(self):
+        repos_url = self.make_client('a', 'dc')
+
+        dc = self.get_commit_editor(repos_url)
+        dc.add_dir("bar")
+        dc.close()
+
+        tree = WorkingTree.open("dc")
+        br = Branch.open(repos_url)
+        tree.pull(br)
+        self.assertEquals(tree.last_revision(), br.last_revision())
  
     def test_working_inventory(self):
         self.make_client('a', 'dc')

=== modified file 'workingtree.py'
--- a/workingtree.py	2008-08-31 23:01:33 +0000
+++ b/workingtree.py	2008-08-31 23:20:29 +0000
@@ -528,7 +528,7 @@
         if stop_revision is None:
             stop_revision = self.branch.last_revision()
         revnumber = self.branch.lookup_revision_id(stop_revision)
-        fetched = self._update(revnumbe)
+        fetched = self._update(revnumber)
         self.base_revnum = fetched
         self.base_revid = self.branch.generate_revision_id(fetched)
         self.base_tree = None