← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help_topics.py

  • Committer: Ian Clatworthy
  • Date: 2007-07-03 00:40:04 UTC
  • mfrom: (2520.1.7 113436.1)
  • mto: This revision was merged to the branch mainline in revision 2573.
  • Revision ID: ian.clatworthy@internode.on.net-20070703004004-qilp1re0a7q9rag3
Merge Daniel Watkin's fix for #113436

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics.py
357
357
               this will update the tree to match the branch.
358
358
"""
359
359
 
 
360
_status_flags = \
 
361
"""Status Flags
 
362
 
 
363
Status flags are used to summarise changes to the working tree in a concise
 
364
manner.  They are in the form:
 
365
   xxx   <filename>
 
366
where the columns' meanings are as follows.
 
367
 
 
368
Column 1: versioning / renames
 
369
  + File versioned
 
370
  - File unversioned
 
371
  R File renamed
 
372
  ? File unknown
 
373
  C File has conflicts
 
374
  P Entry for a pending merge (not a file)
 
375
 
 
376
Column 2: Contents
 
377
  N File created
 
378
  D File deleted
 
379
  K File kind changed
 
380
  M File modified
 
381
 
 
382
Column 3: Execute
 
383
  * The execute bit was changed
 
384
"""
 
385
 
360
386
 
361
387
topic_registry.register("revisionspec", _help_on_revisionspec,
362
388
                        "Explain how to use --revision")
372
398
                        'Information on what a checkout is')
373
399
topic_registry.register('urlspec', _help_on_transport,
374
400
                        "Supported transport protocols")
 
401
topic_registry.register('status-flags', _status_flags,
 
402
                        "Help on status flags")
375
403
def get_bugs_topic(topic):
376
404
    from bzrlib import bugtracker
377
405
    return bugtracker.tracker_registry.help_topic(topic)