Rev 4872: Merge the additional fixes for edge references in http://bazaar.launchpad.net/~vila/bzr/2.1-integration/

Thu Dec 2 11:42:32 GMT 2010

At http://bazaar.launchpad.net/~vila/bzr/2.1-integration/

------------------------------------------------------------
revno: 4872 [merge]
revision-id: v.ladeuil+lp at free.fr-20101202114231-sbxxwd0czlwh2xo1
parent: pqm at pqm.ubuntu.com-20101202083935-zdejub2adb1w1eau
parent: v.ladeuil+lp at free.fr-20101202095227-ju4td1hl0b10szc3
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.1.4-dev
timestamp: Thu 2010-12-02 12:42:31 +0100
message:
  Merge the additional fixes for edge references
modified:
  bzrlib/_patiencediff_c.c       _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
  bzrlib/plugins/launchpad/lp_api.py lp_api.py-20090704082908-79il6zl4gugwl3wz-1
  bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
  bzrlib/tests/per_bzrdir/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/per_workingtree/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
  doc/developers/bug-handling.txt bughandling.txt-20090615072247-mplym00zjq2n4s61-1
  doc/developers/content-filtering.txt contentfiltering.txt-20090825034801-16mynkm76jpmi4tp-1
  doc/developers/ec2.txt         ec2windows.txt-20090219062112-2ga0nqpcm7n02njf-1
  doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
  doc/en/whats-new/whats-new-in-2.1.txt whatsnewin2.1.txt-20100219022615-9hp8102qyo9brhla-1
-------------- next part --------------
=== modified file 'bzrlib/_patiencediff_c.c'

--- a/bzrlib/_patiencediff_c.c	2010-03-11 00:13:08 +0000
+++ b/bzrlib/_patiencediff_c.c	2010-12-02 09:42:45 +0000
@@ -47,8 +47,8 @@
 
 
 /* malloc returns NULL on some platforms if you try to allocate nothing,
- * causing <https://bugs.edge.launchpad.net/bzr/+bug/511267> and
- * <https://bugs.edge.launchpad.net/bzr/+bug/331095>.  On glibc it passes, but
+ * causing <https://bugs.launchpad.net/bzr/+bug/511267> and
+ * <https://bugs.launchpad.net/bzr/+bug/331095>.  On glibc it passes, but
  * let's make it fail to aid testing. */
 #define guarded_malloc(x) ( (x) ? malloc(x) : NULL )
 

=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2010-04-15 08:50:40 +0000
+++ b/bzrlib/bzrdir.py	2010-11-26 18:10:01 +0000
@@ -3109,7 +3109,7 @@
         # XXX: It's a bit ugly that the network name is here, because we'd
         # like to believe that format objects are stateless or at least
         # immutable,  However, we do at least avoid mutating the name after
-        # it's returned.  See <https://bugs.edge.launchpad.net/bzr/+bug/504102>
+        # it's returned.  See <https://bugs.launchpad.net/bzr/+bug/504102>
         self._network_name = None
 
     def __repr__(self):

=== modified file 'bzrlib/lockdir.py'
--- a/bzrlib/lockdir.py	2010-11-30 17:44:35 +0000
+++ b/bzrlib/lockdir.py	2010-11-30 20:42:42 +0000
@@ -582,7 +582,7 @@
                     deadline_str = time.strftime('%H:%M:%S',
                                                  time.localtime(deadline))
                 lock_url = self.transport.abspath(self.path)
-                # See <https://bugs.edge.launchpad.net/bzr/+bug/250451>
+                # See <https://bugs.launchpad.net/bzr/+bug/250451>
                 # the URL here is sometimes not one that is useful to the
                 # user, perhaps being wrapped in a lp-%d or chroot decorator,
                 # especially if this error is issued from the server.

=== modified file 'bzrlib/plugins/launchpad/lp_api.py'
--- a/bzrlib/plugins/launchpad/lp_api.py	2010-03-03 22:59:21 +0000
+++ b/bzrlib/plugins/launchpad/lp_api.py	2010-11-26 18:10:01 +0000
@@ -39,7 +39,6 @@
     raise errors.DependencyNotPresent('launchpadlib', e)
 
 from launchpadlib.launchpad import (
-    EDGE_SERVICE_ROOT,
     STAGING_SERVICE_ROOT,
     Launchpad,
     )
@@ -72,7 +71,6 @@
 
 LAUNCHPAD_API_URLS = {
     'production': 'https://api.launchpad.net/beta/',
-    'edge': EDGE_SERVICE_ROOT,
     'staging': STAGING_SERVICE_ROOT,
     'dev': 'https://api.launchpad.dev/beta/',
     }
@@ -81,8 +79,8 @@
 def _get_api_url(service):
     """Return the root URL of the Launchpad API.
 
-    e.g. For the 'edge' Launchpad service, this function returns
-    launchpadlib.launchpad.EDGE_SERVICE_ROOT.
+    e.g. For the 'staging' Launchpad service, this function returns
+    launchpadlib.launchpad.STAGING_SERVICE_ROOT.
 
     :param service: A `LaunchpadService` object.
     :return: A URL as a string.

=== modified file 'bzrlib/tests/blackbox/test_shelve.py'
--- a/bzrlib/tests/blackbox/test_shelve.py	2010-02-17 17:11:16 +0000
+++ b/bzrlib/tests/blackbox/test_shelve.py	2010-11-26 16:31:45 +0000
@@ -68,7 +68,7 @@
         self.assertIs(None, tree.get_shelf_manager().last_shelf())
 
     def test_unshelve_keep(self):
-        # https://bugs.edge.launchpad.net/bzr/+bug/492091
+        # https://bugs.launchpad.net/bzr/+bug/492091
         tree = self.make_branch_and_tree('.')
         # shelve apparently unhappy working with a tree with no root yet
         tree.commit('make root')

=== modified file 'bzrlib/tests/per_bzrdir/test_bzrdir.py'
--- a/bzrlib/tests/per_bzrdir/test_bzrdir.py	2010-02-17 17:11:16 +0000
+++ b/bzrlib/tests/per_bzrdir/test_bzrdir.py	2010-11-26 16:31:45 +0000
@@ -1179,7 +1179,7 @@
         # for remote formats, there must be no prior assumption about the
         # network name to use - it's possible that this may somehow have got
         # in through an unisolated test though - see
-        # <https://bugs.edge.launchpad.net/bzr/+bug/504102>
+        # <https://bugs.launchpad.net/bzr/+bug/504102>
         self.assertEquals(getattr(self.bzrdir_format,
             '_network_name', None),
             None)

=== modified file 'bzrlib/tests/per_workingtree/test_workingtree.py'
--- a/bzrlib/tests/per_workingtree/test_workingtree.py	2010-01-13 23:06:42 +0000
+++ b/bzrlib/tests/per_workingtree/test_workingtree.py	2010-11-26 16:31:45 +0000
@@ -611,7 +611,7 @@
         rev1 = wt.commit('first master commit')
         self.build_tree_contents([('wt/a', 'new content')])
         rev2 = wt.commit('second master commit')
-        # https://bugs.edge.launchpad.net/bzr/+bug/45719/comments/20
+        # https://bugs.launchpad.net/bzr/+bug/45719/comments/20
         # when adding 'update -r' we should make sure all wt formats support
         # it
         conflicts = wt.update(revision=rev1)

=== modified file 'bzrlib/ui/text.py'
--- a/bzrlib/ui/text.py	2010-05-26 02:19:33 +0000
+++ b/bzrlib/ui/text.py	2010-11-26 18:10:01 +0000
@@ -153,7 +153,7 @@
         """Construct and return a new ProgressView subclass for this UI.
         """
         # with --quiet, never any progress view
-        # <https://bugs.edge.launchpad.net/bzr/+bug/320035>.  Otherwise if the
+        # <https://bugs.launchpad.net/bzr/+bug/320035>.  Otherwise if the
         # user specifically requests either text or no progress bars, always
         # do that.  otherwise, guess based on $TERM and tty presence.
         if self.is_quiet():

=== modified file 'doc/developers/bug-handling.txt'
--- a/doc/developers/bug-handling.txt	2010-01-12 02:00:23 +0000
+++ b/doc/developers/bug-handling.txt	2010-12-02 09:42:45 +0000
@@ -19,14 +19,14 @@
 Links
 *****
 
-* `bzr bugs home page <https://bugs.edge.launchpad.net/bzr>`_.
-
-* `Critical bugs <https://bugs.edge.launchpad.net/bzr/+bugs?search=Search&field.importance=Critical&field.status=New&field.status=Incomplete&field.status=Confirmed&field.status=Triaged&field.status=In+Progress&field.status=Fix+Committed>`_.
-
-* `Open bugs by importance <https://bugs.edge.launchpad.net/bzr/+bugs>`_.
+* `bzr bugs home page <https://bugs.launchpad.net/bzr>`_.
+
+* `Critical bugs <https://bugs.launchpad.net/bzr/+bugs?search=Search&field.importance=Critical&field.status=New&field.status=Incomplete&field.status=Confirmed&field.status=Triaged&field.status=In+Progress&field.status=Fix+Committed>`_.
+
+* `Open bugs by importance <https://bugs.launchpad.net/bzr/+bugs>`_.
 
 * `Open bugs most recently changed first
-  <https://bugs.edge.launchpad.net/bzr/+bugs?field.searchtext=&orderby=-date_last_updated&search=Search&field.status%3Alist=NEW&field.status%3Alist=INCOMPLETE_WITH_RESPONSE&field.status%3Alist=INCOMPLETE_WITHOUT_RESPONSE&field.status%3Alist=CONFIRMED&field.status%3Alist=TRIAGED&field.status%3Alist=INPROGRESS&field.status%3Alist=FIXCOMMITTED&field.assignee=&field.bug_reporter=&field.omit_dupes=on&field.has_patch=&field.has_no_package=>`_.
+  <https://bugs.launchpad.net/bzr/+bugs?field.searchtext=&orderby=-date_last_updated&search=Search&field.status%3Alist=NEW&field.status%3Alist=INCOMPLETE_WITH_RESPONSE&field.status%3Alist=INCOMPLETE_WITHOUT_RESPONSE&field.status%3Alist=CONFIRMED&field.status%3Alist=TRIAGED&field.status%3Alist=INPROGRESS&field.status%3Alist=FIXCOMMITTED&field.assignee=&field.bug_reporter=&field.omit_dupes=on&field.has_patch=&field.has_no_package=>`_.
 
 
 Generalities
@@ -226,7 +226,7 @@
 ***************
 
 It's possible to target a bug to a milestone, eg
-<https://bugs.edge.launchpad.net/bzr/+milestone/1.16>.  We use this to help the
+<https://bugs.launchpad.net/bzr/+milestone/1.16>.  We use this to help the
 release manager know what **must** be merged to make the release.
 
 Therefore, we don't target bugs that we'd like to have fixed or that could
@@ -308,16 +308,18 @@
     virtual filesystem for http, sftp, etc
 
 trivial
-    should be very easy to fix (10-20 minutes) and easily landed: typically just spelling errors and the like
+    should be very easy to fix (10-20 minutes) and easily landed: typically 
+    just spelling errors and the like
 
 ui
     bugs relating to the bzr user interface, e.g. confusing error messages.
 
 win32
-    bugs that mainly affects Windows. Also there is cygwin and win98 tags for marking specific bugs.
+    bugs that mainly affects Windows. Also there is cygwin and win98 tags for 
+    marking specific bugs.
 
 You can see the full list of tags in use at
-<https://bugs.edge.launchpad.net/bzr/+bugs>.  As of September 2008 the
-list is on the right.
+<https://bugs.launchpad.net/bzr/+bugs>.  As of September 2008 the
+list is on the right. 
 
 .. vim: ft=rst

=== modified file 'doc/developers/content-filtering.txt'
--- a/doc/developers/content-filtering.txt	2009-12-02 20:34:07 +0000
+++ b/doc/developers/content-filtering.txt	2010-12-02 09:42:45 +0000
@@ -59,7 +59,7 @@
 which that cache is valid.  This implies that the stored size will
 in general be different to the size in the packed stat.  (However, it
 may not always do this correctly - see
-<https://bugs.edge.launchpad.net/bzr/+bug/418439>.)
+<https://bugs.launchpad.net/bzr/+bug/418439>.)
 
 The dirstate is given a SHA1Provider instance by its tree.  This class
 can calculate the (canonical) hash and size given a filename.  This

=== modified file 'doc/developers/ec2.txt'
--- a/doc/developers/ec2.txt	2009-12-02 20:34:07 +0000
+++ b/doc/developers/ec2.txt	2010-12-02 09:42:45 +0000
@@ -125,9 +125,9 @@
 * Install the rdesktop client, to actually access the machine.
 
 * Possibly read some of the `EC2 documentation`_ for background.
-
-.. _`bug 330930`: https://bugs.edge.launchpad.net/ubuntu/+bug/330930
-.. _`Amazon EC2 API tools`:
+   
+.. _`bug 330930`: https://bugs.launchpad.net/ubuntu/+bug/330930 
+.. _`Amazon EC2 API tools`: 
      http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88
 .. _`EC2 documentation`: http://aws.amazon.com/
 .. _`ami-bdfe19d4`:

=== modified file 'doc/developers/releasing.txt'
--- a/doc/developers/releasing.txt	2009-12-02 20:34:07 +0000
+++ b/doc/developers/releasing.txt	2010-12-02 09:52:27 +0000
@@ -47,7 +47,7 @@
    general development continues on the trunk, and only
    specifically-targeted fixes go into the release branch.
 
-#. Add milestones at <https://edge.launchpad.net/bzr/x.y/+addmilestone> to
+#. Add milestones at <https://launchpad.net/bzr/2.0/+addmilestone> to
    that series for the beta release, release candidate and the final release,
    and their expected dates.
 
@@ -117,7 +117,7 @@
      ./tools/check-newsbugs.py NEWS
 
    (But note there can be some false positives, and this script may be
-   flaky <https://bugs.edge.launchpad.net/bzr/+bug/354985>.  Don't let
+   flaky <https://bugs.launchpad.net/bzr/+bug/354985>.  Don't let
    this slow you down too much.)
 
 #. Summarize into one or two paragraphs what's new in this release.

=== modified file 'doc/en/whats-new/whats-new-in-2.1.txt'
--- a/doc/en/whats-new/whats-new-in-2.1.txt	2010-02-19 05:08:31 +0000
+++ b/doc/en/whats-new/whats-new-in-2.1.txt	2010-12-02 09:21:11 +0000
@@ -62,6 +62,16 @@
 or just say ``today`` (instead of saying ``date:today``). Prefixes
 are now only required if the revision spec could be ambiguous.
 
+Launchpad compatibility
+-----------------------
+
+Launchpad has `announced
+<http://blog.launchpad.net/general/edge-is-deprecated>`_ that the
+``edge.launchpad.net`` instance is deprecated and may be shut down in the
+future . Bazaar has therefore been updated in this release to talk to the main
+(``launchpad.net``) servers, rather than the ``edge`` ones (the same code is
+running on both servers during the interim).
+
 
 New ignore patterns
 -------------------

