Changeset 1367 in tailor

Timestamp:

04/28/07 16:37:47 (6 years ago)

Author:

Wouter van Heyst <larstiq@…>

Hash name:

20070428143747-143c3-63debe9f6f89a781c9c93b078efb73722bfefcf3

Message:

bazaar-ng-renaming
What was formerly know as Bazaar-NG is no longer the next generation, but the current one.
See  http://bazaar-vcs.org/Baz1x and  http://bazaar-vcs.org/Branding.

Files:

• README (modified) (6 diffs)
• setup.py (modified) (1 diff)
• vcpx/tests/tailor.py (modified) (7 diffs)
• vcpx/repository/bzr.py (modified) (4 diffs)

README

@@ -11 +11 @@
 =====
 
-Tailor is a tool to migrate changesets between ArX_, Bazaar_,
-`Bazaar-NG`_, CVS_, Codeville_, Darcs_, Git_, Mercurial_, Monotone_,
+Tailor is a tool to migrate changesets between ArX_, Baz_,
+`Bazaar`_, CVS_, Codeville_, Darcs_, Git_, Mercurial_, Monotone_,
 Perforce_, Subversion_ and Tla_ [#]_ repositories.
 
@@ -53 +53 @@
        get pending changes and build tailor ChangeSets out of them.
 
-       To the opposite, Bazaar (1.0, not Bazaar-NG), Perforce and Tla
+       To the opposite, Baz (1.0, not Bazaar), Perforce and Tla
        are supported only as source systems.
 
 .. _arx: http://www.nongnu.org/arx/
-.. _bazaar: http://bazaar.canonical.com/
-.. _bazaar-ng: http://www.bazaar-ng.org/
+.. _baz: http://bazaar-vcs.org/Baz1x
+.. _bazaar: http://bazaar-vcs.org/
 .. _codeville: http://www.codeville.org/
 .. _cvs: http://www.nongnu.org/cvs/
@@ -274 +274 @@
 
 c) ArX and Codeville are (currently) only supported as *target*;
-   Bazaar and Tla only as *source*.
+   Baz and Tla only as *source*.
 
 d) Specifying ``--subdir .`` may not work, in particular when dealing
@@ -381 +381 @@
 and create a new Mercurial repository in ``~/mypxlib/migrated``.
 
-On final example to show the syntax of Bazaar sources::
+On final example to show the syntax of Baz sources::
 
     [project]
@@ -952 +952 @@
     $ ./tester
 
-will migrate the history from a darcs repository to a bazaar-ng one,
+will migrate the history from a darcs repository to a Bazaar one,
 forcing the author to a well-known name :-)
 
@@ -1110 +1110 @@
 ArX_ support was contributed by `Walter Landry <wlandry@ucsd.edu>`_.
 
-Bazaar-NG support
+Bazaar support
 -----------------
 
-`Bazaar-NG`_ support was contributed by `Johan Rydberg
+`Bazaar`_ support was contributed by `Johan Rydberg
 <jrydberg@gnu.org>`_.  Nowadays it's being maintained by `Lalo Martins
 <lalo.martins@gmail.com>`_.

setup.py

@@ -22 +22 @@
 a own branch of a product.
 
-Tailor is able to fetch the history from Arch, Bazaar-NG, CVS, Darcs
-Monotone or Subversion and rewrite it over Bazaar-NG, CVS, Darcs, Git,
+Tailor is able to fetch the history from Arch, Bazaar, CVS, Darcs
+Monotone or Subversion and rewrite it over Bazaar, CVS, Darcs, Git,
 Mercurial, Monotone and Subversion.
 """,

vcpx/tests/tailor.py

@@ -202 +202 @@
 
 
-[bazaarng2darcs]
+[bazaar2darcs]
 source = bzr:oodoctest
 target = darcs:oodoctest
-root-directory = %(testdir)s/bazaarng2darcs
+root-directory = %(testdir)s/bazaar2darcs
 start-revision = INITIAL
 
@@ -393 +393 @@
         self.assertEqual(tailorizer.source.subdir, 'pxlib')
 
-    def testDarcsAndBazaarng(self):
-        "Test darcs to bazaar-ng and the other way around"
+    def testDarcsAndBazaar(self):
+        "Test darcs to Bazaar and the other way around"
 
         self.tailorize('darcs2bzr')
@@ -422 +422 @@
 
 
-class Bazaarng(OperationalTest):
-    "Test the BazaarNG source backend"
-
-    def testBazaarngAndPython23(self):
+class Bazaar(OperationalTest):
+    "Test the Bazaar source backend"
+
+    def testBazaarAndPython23(self):
         "Test we detect early when running under Python < 2.4"
 
@@ -432 +432 @@
         if version_info < (2,4):
             try:
-                self.tailorize('bazaarng2darcs')
+                self.tailorize('bazaar2darcs')
             except TailorException, e:
-                self.assert_("Bazaar-NG backend requires Python 2.4"
+                self.assert_("Bazaar backend requires Python 2.4"
                              in str(e))
             else:
                 self.fail("Expected a specific TailorException")
 
-    def testBazaarngToDarcs(self):
-        "Test bazaar-ng to darcs"
+    def testBazaarToDarcs(self):
+        "Test bazaar to darcs"
 
         try:
-            self.tailorize('bazaarng2darcs')
+            self.tailorize('bazaar2darcs')
         except TailorException, e:
             from sys import version_info
@@ -482 +482 @@
         self.tailorize('cvs2hg')
 
-    def testCvsToBazaarng(self):
-        "Test CVS to bazaar-ng"
+    def testCvsToBazaar(self):
+        "Test CVS to Bazaar"
 
         self.tailorize('cvs2bzr')
@@ -614 +614 @@
             self.failIf(cvs.exit_status, "%r failed" % cvs._last_command)
 
-    def testCvsConvertDirectoryAddToBazaarng(self):
+    def testCvsConvertDirectoryAddToBazaar(self):
         """Test that we can handle directory adds in the cvs module to bzr."""
 
@@ -620 +620 @@
         t()
 
-    def testCvspsConvertDirectoryAddToBazaarng(self):
+    def testCvspsConvertDirectoryAddToBazaar(self):
         """Test that we can handle directory adds in the cvsps module to bzr."""
 

vcpx/repository/bzr.py

@@ -1 +1 @@
 # -*- mode: python; coding: utf-8 -*-
-# :Progetto: vcpx -- bazaar-ng support using the bzrlib instead of the frontend
+# :Progetto: vcpx -- Bazaar support using the bzrlib instead of the frontend
 # :Creato:   Fri Aug 19 01:06:08 CEST 2005
 # :Autore:   Johan Rydberg <jrydberg@gnu.org>
@@ -10 +10 @@
 
 """
-This module implements the backends for Bazaar-NG.
+This module implements the backends for Bazaar.
 """
 
@@ -17 +17 @@
 
 from sys import version_info
-assert version_info >= (2,4), "Bazaar-NG backend requires Python 2.4"
+assert version_info >= (2,4), "Bazaar backend requires Python 2.4"
 del version_info
 
@@ -48 +48 @@
         """
         Create a branch with a working tree at the base directory. If the base
-        directory is inside a Bazaar-NG style "shared repository", it will use
+        directory is inside a Bazaar style "shared repository", it will use
         that to create a branch and working tree (make sure it allows working
         trees).