Rev 3724: Merge bzr 1.7-final into bzr.dev in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

John Arbash Meinel john at arbash-meinel.com
Tue Sep 23 19:30:41 BST 2008


At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 3724
revision-id: john at arbash-meinel.com-20080923182832-gcuz5seo3xv2algc
parent: pqm at pqm.ubuntu.com-20080922180718-n946121e40ql2bb3
parent: pqm at pqm.ubuntu.com-20080923164635-it2hzrn39wpbhh9e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2008-09-23 13:28:32 -0500
message:
  Merge bzr 1.7-final into bzr.dev
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 3697.7.3
    revision-id: pqm at pqm.ubuntu.com-20080923164635-it2hzrn39wpbhh9e
    parent: pqm at pqm.ubuntu.com-20080917234114-mx3kwcbibtdfzc02
    parent: john at arbash-meinel.com-20080923161454-eoft8u1jcqqji9cg
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: 1.7
    timestamp: Tue 2008-09-23 17:46:35 +0100
    message:
      (jam) bring in Mark Hammonds setup tweaks, release bzr 1.7 final
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3697.10.3
        revision-id: john at arbash-meinel.com-20080923161454-eoft8u1jcqqji9cg
        parent: john at arbash-meinel.com-20080923161207-5cvoirch1q0zm81t
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 1.7rc2
        timestamp: Tue 2008-09-23 11:14:54 -0500
        message:
          Update NEWS, release 1.7 final
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
        ------------------------------------------------------------
        revno: 3697.10.2
        revision-id: john at arbash-meinel.com-20080923161207-5cvoirch1q0zm81t
        parent: john at arbash-meinel.com-20080923161049-zqvuu0wzew3ilrk5
        parent: mhammond at skippinet.com.au-20080903131033-77635gwnys1nr877
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 1.7rc2
        timestamp: Tue 2008-09-23 11:12:07 -0500
        message:
          Include localization files that are found in plugins we are installing.
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
            ------------------------------------------------------------
            revno: 3684.3.1
            revision-id: mhammond at skippinet.com.au-20080903131033-77635gwnys1nr877
            parent: pqm at pqm.ubuntu.com-20080903094659-lkj3i4hd83d35fov
            committer: Mark Hammond <mhammond at skippinet.com.au>
            branch nick: bzr.binaries.17
            timestamp: Wed 2008-09-03 23:10:33 +1000
            message:
              pickup l10n files from plugins.
            modified:
              setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3697.10.1
        revision-id: john at arbash-meinel.com-20080923161049-zqvuu0wzew3ilrk5
        parent: pqm at pqm.ubuntu.com-20080917234114-mx3kwcbibtdfzc02
        parent: mhammond at skippinet.com.au-20080919040809-6uyf76hisqk38civ
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 1.7rc2
        timestamp: Tue 2008-09-23 11:10:49 -0500
        message:
          Include docutils as part of the qbzr setup
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3697.9.1
        revision-id: mhammond at skippinet.com.au-20080919040809-6uyf76hisqk38civ
        parent: pqm at pqm.ubuntu.com-20080917234114-mx3kwcbibtdfzc02
        committer: Mark Hammond <mhammond at skippinet.com.au>
        branch nick: bzr.binaries.17
        timestamp: Fri 2008-09-19 14:08:09 +1000
        message:
           include docutils for tbzr to use formatting bzr help topics as HTML
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 3697.7.2
    revision-id: pqm at pqm.ubuntu.com-20080917234114-mx3kwcbibtdfzc02
    parent: pqm at pqm.ubuntu.com-20080917051135-akewztrabntc2sec
    parent: john at arbash-meinel.com-20080917230918-l3hozsoph343oj87
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: 1.7
    timestamp: Thu 2008-09-18 00:41:14 +0100
    message:
      (jam) Prepare 1.7rc2
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3697.8.2
        revision-id: john at arbash-meinel.com-20080917230918-l3hozsoph343oj87
        parent: john at arbash-meinel.com-20080917230733-rg4y53rt8hmbok8f
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 1.7rc2
        timestamp: Wed 2008-09-17 18:09:18 -0500
        message:
          NEWS summary for 1.7rc2
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3697.8.1
        revision-id: john at arbash-meinel.com-20080917230733-rg4y53rt8hmbok8f
        parent: pqm at pqm.ubuntu.com-20080917051135-akewztrabntc2sec
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 1.7rc2
        timestamp: Wed 2008-09-17 18:07:33 -0500
        message:
          NEWS entry for #261315
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3697.7.1
    revision-id: pqm at pqm.ubuntu.com-20080917051135-akewztrabntc2sec
    parent: pqm at pqm.ubuntu.com-20080916224734-ggoasnd8egrezi9t
    parent: mbp at sourcefrog.net-20080917043324-gpo0wyot7r43hgkp
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: 1.7
    timestamp: Wed 2008-09-17 06:11:35 +0100
    message:
      (mbp) #261315 add Branch.get_stacked_on_url rpc and fallback
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
      bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
      bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2008-09-22 16:12:36 +0000
+++ b/NEWS	2008-09-23 18:28:32 +0000
@@ -71,8 +71,30 @@
   INTERNALS:
 
 
-bzr 1.7rc2 IN DEVELOPMENT
--------------------------
+bzr 1.7 2008-09-23
+------------------
+
+This release includes many bug fixes and a few performance and feature
+improvements.  ``bzr rm`` will now scan for missing files and remove them,
+like how ``bzr add`` scans for unknown files and adds them. A bit more
+polish has been applied to the stacking code. The b-tree indexing code has
+been brought in, with an eye on using it in a future repository format.
+There are only minor installer changes since bzr-1.7rc2.
+
+  FEATURES
+
+    * Some small updates to the win32 installer. Include localization
+      files found in plugins, and include the builtin distutils as part of
+      packaging qbzr. (Mark Hammond)
+
+
+bzr 1.7rc2 2008-09-17
+---------------------
+
+A few bug fixes from 1.7rc1. The biggest change is a new
+``RemoteBranch.get_stacked_on_url`` rpc. This allows clients that are
+trying to access a Stacked branch over the smart protocol, to properly
+connect to the stacked-on location.
 
   BUG FIXES:
 
@@ -80,12 +102,15 @@
       repository now preserves the repository format.
       (Andrew Bennetts, #269214)
 
-    * Fix '_in_buffer' AttributeError when using the -Dhpss debug flag.
-      (Andrew Bennetts)
+   * Branching from a stacked branch via ``bzr+ssh`` can properly connect
+     to the stacked-on branch.  (Martin Pool, #261315)
 
     * ``bzr init`` no longer re-opens the BzrDir multiple times.
       (Vincent Ladeuil)
 
+    * Fix '_in_buffer' AttributeError when using the -Dhpss debug flag.
+      (Andrew Bennetts)
+
 
 bzr 1.7rc1 2008-09-09
 ---------------------

=== modified file 'setup.py'
--- a/setup.py	2008-09-04 12:03:01 +0000
+++ b/setup.py	2008-09-23 16:12:07 +0000
@@ -351,6 +351,7 @@
     excludes.append('PyQt4.elementtree.ElementTree')
     includes.append('sip') # extension module required for Qt.
     packages.append('pygments') # colorizer for qbzr
+    packages.append('docutils') # html formatting
     # but we can avoid many Qt4 Dlls.
     dll_excludes.extend(
         """QtAssistantClient4.dll QtCLucene4.dll QtDesigner4.dll
@@ -509,7 +510,7 @@
             plugins = set(dirs)
         x = []
         for i in files:
-            if os.path.splitext(i)[1] not in [".py", ".pyd", ".dll"]:
+            if os.path.splitext(i)[1] not in [".py", ".pyd", ".dll", ".mo"]:
                 continue
             if i == '__init__.py' and root == 'bzrlib/plugins':
                 continue



More information about the bazaar-commits mailing list