# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1268348559 -3600
# Node ID 909a99b92f67970299ab6968bebd6b926dfca972
# Parent  f63fb5c0cf67be1a7bc8ae485eacfdffb840a21a# Parent  f6ee02933af911b251c95815d6efc03c1ef599d4
Merge with stable

diff -r f63fb5c0cf67 -r 909a99b92f67 hgext/progress.py
--- a/hgext/progress.py	Thu Mar 11 23:44:12 2010 +0100
+++ b/hgext/progress.py	Fri Mar 12 00:02:39 2010 +0100
@@ -32,6 +32,7 @@
   width = <none> # if set, the maximum width of the progress information
                  # (that is, min(width, term width) will be used)
   clear-complete = True # clear the progress bar after it's done
+  disable = False # if true, don't show a progress bar
 
 Valid entries for the format field are topic, bar, number, unit, and
 item. item defaults to the last 20 characters of the item, but this