Rev 4732: (andrew) Add 'location-alias' help topic. (#337834) in file:///home/pqm/archives/thelove/bzr/2.0/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.0/

------------------------------------------------------------
revno: 4732 [merge]
revision-id: pqm at pqm.ubuntu.com-20100212060033-mxzts4mblzr8svym
parent: pqm at pqm.ubuntu.com-20100212044951-a34u2j4bd0etf3hu
parent: andrew.bennetts at canonical.com-20100212035631-k0jt90wokzhesysd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.0
timestamp: Fri 2010-02-12 06:00:33 +0000
message:
  (andrew) Add 'location-alias' help topic. (#337834)
added:
  bzrlib/help_topics/en/location-alias.txt locationalias.txt-20100211071747-8cyf9n9xw0j3ypaz-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
=== modified file 'NEWS'
--- a/NEWS	2010-02-11 08:47:14 +0000
+++ b/NEWS	2010-02-12 06:00:33 +0000
@@ -22,6 +22,12 @@
   ``UnboundLocalError``.
   (Andrew Bennetts, #423563)
 
+Documentation
+*************
+
+* Added ``location-alias`` help topic.
+  (Andrew Bennetts, #337834)
+
 bzr 2.0.4
 #########
 

=== modified file 'bzrlib/help_topics/__init__.py'
--- a/bzrlib/help_topics/__init__.py	2009-10-26 23:21:57 +0000
+++ b/bzrlib/help_topics/__init__.py	2010-02-11 07:18:20 +0000
@@ -245,6 +245,19 @@
         out += "\nSupported modifiers::\n\n  " + \
             '  '.join(decl)
 
+    out += """\
+\nBazaar supports all of the standard parts within the URL::
+
+  <protocol>://[user[:password]@]host[:port]/[path]
+
+allowing URLs such as::
+
+  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk
+
+Many commands that accept URLs also accept location aliases too.  See
+`bzr help location-alias`.
+"""
+
     return out
 
 
@@ -713,6 +726,8 @@
                         'Types of conflicts and what to do about them')
 topic_registry.register('debug-flags', _load_from_file,
                         'Options to show or record debug information')
+topic_registry.register('location-alias', _load_from_file,
+                        'Aliases for remembered locations')
 topic_registry.register('log-formats', _load_from_file,
                         'Details on the logging formats available')
 topic_registry.register('diverged-branches', _load_from_file,

=== added file 'bzrlib/help_topics/en/location-alias.txt'
--- a/bzrlib/help_topics/en/location-alias.txt	1970-01-01 00:00:00 +0000
+++ b/bzrlib/help_topics/en/location-alias.txt	2010-02-11 07:18:20 +0000
@@ -0,0 +1,19 @@
+Location aliases
+================
+
+Bazaar defines several aliases for locations associated with a branch.  These
+can be used with most commands that expect a location, such as `bzr push`.
+
+The aliases are::
+
+  :parent    the parent of this branch
+  :submit    the submit branch for this branch
+  :public    the public location of this branch
+  :bound     the branch this branch is bound to, for bound branches
+  :push      the saved location used for `bzr push` with no arguments
+  :this      this branch
+
+For example, to push to the parent location::
+
+    bzr push :parent
+