Rev 3155: Minor tweaks to bug tracker integration documentation (Ian Clatworthy) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Thu Jan 3 03:16:52 GMT 2008


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3155
revision-id:pqm at pqm.ubuntu.com-20080103031640-m5fqotep9qaw2jtp
parent: pqm at pqm.ubuntu.com-20080102204644-m6dav0cszl5e471x
parent: ian.clatworthy at internode.on.net-20080103022006-6e2hmwowug18rixl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-01-03 03:16:40 +0000
message:
  Minor tweaks to bug tracker integration documentation (Ian Clatworthy)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
  bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
    ------------------------------------------------------------
    revno: 3154.1.1
    revision-id:ian.clatworthy at internode.on.net-20080103022006-6e2hmwowug18rixl
    parent: pqm at pqm.ubuntu.com-20080102204644-m6dav0cszl5e471x
    parent: ian.clatworthy at internode.on.net-20080103021712-yqz18tc6u5t6r59c
    committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
    branch nick: ianc-integration
    timestamp: Thu 2008-01-03 12:20:06 +1000
    message:
      Minor tweaks to bug tracker integration documentation (Ian Clatworthy)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
      doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
    ------------------------------------------------------------
    revno: 3154.2.1
    revision-id:ian.clatworthy at internode.on.net-20080103021712-yqz18tc6u5t6r59c
    parent: pqm at pqm.ubuntu.com-20080102204644-m6dav0cszl5e471x
    committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
    branch nick: bzr.bugs-doc
    timestamp: Thu 2008-01-03 12:17:12 +1000
    message:
      Minor tweaks to bug tracker integration documentation
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
      doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
=== modified file 'NEWS'
--- a/NEWS	2008-01-02 18:47:54 +0000
+++ b/NEWS	2008-01-03 02:17:12 +0000
@@ -107,6 +107,9 @@
 
   DOCUMENTATION:
 
+   * Minor tweaks made to the bug tracker integration documentation.
+     (Ian Clatworthy)
+
    * Reference material has now be moved out of the User Guide and added
      to the User Reference. The User Reference has gained 4 sections as
      a result: Authenication Settings, Configuration Settings, Conflicts

=== modified file 'bzrlib/bugtracker.py'
--- a/bzrlib/bugtracker.py	2007-12-17 01:45:32 +0000
+++ b/bzrlib/bugtracker.py	2008-01-03 02:17:12 +0000
@@ -43,13 +43,14 @@
 """When making a commit, metadata about bugs fixed by that change can be
 recorded by using the --fixes option. For each bug marked as fixed, an
 entry is included in the 'bugs' revision property stating '<url> <status>'.
+(The only ``status`` value currently supported is ``fixed.``)
 Support for Launchpad's central bug tracker is built in. For other bug
 trackers, configuration is required in advance so that the correct URL
 can be recorded.
 
 In addition to Launchpad, Bazaar directly supports the generation of
 URLs appropriate for Bugzilla and Trac. If your project uses a different
-bug tracker, it is easy to add support for it by writing a plugin, say.
+bug tracker, it is easy to add support for it.
 If you use Bugzilla or Trac, then you only need to set a configuration
 variable which contains the base URL of the bug tracker. These options
 can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific

=== modified file 'bzrlib/help_topics/__init__.py'
--- a/bzrlib/help_topics/__init__.py	2007-12-17 01:33:01 +0000
+++ b/bzrlib/help_topics/__init__.py	2008-01-03 02:17:12 +0000
@@ -615,8 +615,8 @@
                         "Help on status flags")
 def get_bugs_topic(topic):
     from bzrlib import bugtracker
-    return "Bug Tracker Settings\n\n" + \
-        bugtracker.tracker_registry.help_topic(topic)
+    return ("Bug Tracker Settings\n\n" + 
+        bugtracker.tracker_registry.help_topic(topic))
 topic_registry.register('bugs', get_bugs_topic, 'Bug tracker settings')
 topic_registry.register('env-variables', _env_variables,
                         'Environment variable names and values')

=== modified file 'doc/en/user-guide/bug_trackers.txt'
--- a/doc/en/user-guide/bug_trackers.txt	2007-12-13 13:33:36 +0000
+++ b/doc/en/user-guide/bug_trackers.txt	2008-01-03 02:17:12 +0000
@@ -3,8 +3,8 @@
 
 Bazaar has a facility that allows you to associate a commit with a bug
 in the project's bug tracker. Other tools (or hooks) can then use this
-information to link between the commit and the bug, or to automatically
-mark the bug closed in the branches that contain the commit.
+information to generate hyperlinks between the commit and the bug, or to
+automatically mark the bug closed in the branches that contain the commit.
 
 Associating commits and bugs
 ----------------------------
@@ -34,7 +34,7 @@
 appropriate for your project's workflow.
 
 Note: This second processing stage is part of the integration provided
-by Lauchpad when it scans external or hosted branches.
+by Launchpad when it scans external or hosted branches.
 
 Making corrections
 ------------------
@@ -52,3 +52,5 @@
 order to make it again with the correct options. This is commonly done
 to correct a bad commit message and it equally applies to correcting
 metadata recorded (via ``--fixes`` for example) on the last commit.
+
+Note: ``uncommit`` is best done before incorrect revisions become public.




More information about the bazaar-commits mailing list