Merge lp:~jr/bzr-builddeb/builddeb-do-rename into lp:bzr-builddeb

[Jonathan Riddell]

Acronym should not be used by default. Rename bd-do to builddeb-do and set bd-do alias.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 10/3/2011 1:07 PM, Jonathan Riddell wrote:
> Jonathan Riddell has proposed merging
> lp:~jr/bzr-builddeb/builddeb-do-rename into lp:bzr-builddeb.
>
> Requested reviews: Bzr-builddeb-hackers (bzr-builddeb-hackers)
>
> For more details, see:
> https://code.launchpad.net/~jr/bzr-builddeb/builddeb-do-rename/+merge/77903
>
> Acronym should not be used by default. Rename bd-do to
> builddeb-do and set bd-do alias.
>

Looks good to me. Though I think I cannot actually vote on builddeb
proposals.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk6Jmn0ACgkQJdeBCYSNAANECgCfXmoQY3JHlHEMSPPaCQrT3+3/
+7cAn1Jpf5bbF1dT+jyOQ6RldWk+x8nU
=Z7vY
-----END PGP SIGNATURE-----

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file '__init__.py'
--- __init__.py	2011-10-01 00:18:46 +0000
+++ __init__.py	2011-10-03 11:08:26 +0000
@@ -35,7 +35,7 @@
 
 
 commands = {
-        "bd_do": [],
+        "builddeb_do": ["bd_do"],
         "builddeb": ["bd"],
         "dep3_patch": [],
         "dh_make": ["dh_make"],
 
=== modified file 'cmds.py'
--- cmds.py	2011-09-29 10:11:07 +0000
+++ cmds.py	2011-10-03 11:08:26 +0000
@@ -992,7 +992,7 @@
                     location, component, tag_name))
 
 
-class cmd_bd_do(Command):
+class cmd_builddeb_do(Command):
     """Run a command in an exported package, copying the result back.
 
     For a merge mode package the full source is not available, making some
@@ -1002,7 +1002,7 @@
 
     For instance:
 
-      bzr bd-do
+      bzr builddeb-do
 
     will run a shell in the unpacked source. Any changes you make in the
     ``debian/`` directory (and only those made in that directory) will be copied
@@ -1011,13 +1011,14 @@
 
     You can also specify single commands to be run, e.g.
 
-      bzr bd-do "dpatch-edit-patch 01-fix-build"
+      bzr builddeb-do "dpatch-edit-patch 01-fix-build"
 
     Note that only the first argument is used as the command, and so the above
     example had to be quoted.
     """
 
     takes_args = ['command*']
+    aliases = ['bd-do']
 
     def run(self, command_list=None):
         t = WorkingTree.open_containing('.')[0]
 
=== modified file 'doc/user_manual/merge.rst'
--- doc/user_manual/merge.rst	2008-08-27 12:54:12 +0000
+++ doc/user_manual/merge.rst	2011-10-03 11:08:26 +0000
@@ -117,7 +117,7 @@
 any files to reflect changes in the upstream build, for instance updating
 ``debian/rules``, or ``debian/install``. The last part is updating any
 patches against the upstream code to work against the latest
-version. To make this easier you can use the ``bd-do`` command. This runs
+version. To make this easier you can use the ``builddeb-do`` command. This runs
 the specified command in an exported directory (so you have the full source
 of the package available). If the command is successful then the contents
 of ``debian/`` is copied back to your branch. If the command fails then
@@ -126,7 +126,7 @@
 
 For instance you can run::
 
-  bzr bd-do
+  bzr builddeb-do
 
 and have a shell in the unpacked source directory. You can then run any
 commands that you would like. If you then exit the shell normally the contents
@@ -135,10 +135,10 @@
 abort any changes, and they will not show up in your branch.
 
 You can also run any command by passing it as the first argument to the
-``bd-do`` command. For instance if you use ``dpatch`` in your package the
+``builddeb-do`` command. For instance if you use ``dpatch`` in your package the
 following may be useful::
 
-  bzr bd-do "dpatch-edit-patch 01-fix-build"
+  bzr builddeb-do "dpatch-edit-patch 01-fix-build"
 
 Note that only the first argument is used, so the command had to be quoted.
 The command is run through the shell, so you can execute multiple commands