Merge lp://staging/~jml/bzr-loom/up-down-alias into lp://staging/bzr-loom
Proposed by
Jonathan Lange
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp://staging/~jml/bzr-loom/up-down-alias |
Merge into: | lp://staging/bzr-loom |
To merge this branch: | bzr merge lp://staging/~jml/bzr-loom/up-down-alias |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Collins (community) | Approve | ||
Review via email: mp+1778@code.staging.launchpad.net |
To post a comment you must log in.
Hey Rob,
This branch adds aliases for up-thread and down-thread ('up' and 'down' respectively). It also updates their _see_alsos so that they refer to each other.
No tests, I'm afraid. I hope that's not a problem.
Diff below.
=== modified file 'NEWS'
--- NEWS 2008-07-25 05:24:06 +0000
+++ NEWS 2008-11-19 07:17:59 +0000
@@ -24,6 +24,9 @@
* ``bzr push`` now pushes the last-loom rather than creating an empty loom.
(Robert Collins, #201613)
+ * ``up`` and ``down`` are now aliases for ``up-thread`` and
+ ``down-thread`` respectively.
+
BUGFIXES:
API BREAKS:
=== modified file 'commands.py'
--- commands.py 2008-11-17 00:58:00 +0000
+++ commands.py 2008-11-19 07:16:33 +0000
@@ -284,7 +284,8 @@
"""
takes_args = ['thread?']
- _see_also = ['switch']
+ aliases = ['down']
+ _see_also = ['switch', 'up-thread']
def run(self, thread=None): WorkingTree. open_containing ('.')
help= 'Automatically commit and merge repeatedly.')]
(wt, path) = workingtree.
@@ -316,6 +317,9 @@
takes_options = ['merge-type', Option('auto',
+ aliases = ['up'] WorkingTree. open_containing ('.')
branch. require_ loom_branch( tree.branch)
+ _see_also = ['down-thread', 'switch']
+
def run(self, merge_type=None, auto=False):
(tree, path) = workingtree.