# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1579905173 28800
# Node ID df2162672d2441d971312179c3afa08bb2272290
# Parent  161958ebf73c2350e8bc1e56b9466b68e91894f2
progress: delete deprecated ui.progress()

Differential Revision: https://phab.mercurial-scm.org/D7991

diff -r 161958ebf73c -r df2162672d24 mercurial/ui.py
--- a/mercurial/ui.py	Fri Jan 17 15:34:11 2020 +0100
+++ b/mercurial/ui.py	Fri Jan 24 14:32:53 2020 -0800
@@ -1939,30 +1939,6 @@
         if self._progbar is not None and self._progbar.printed:
             self._progbar.clear()
 
-    def progress(self, topic, pos, item=b"", unit=b"", total=None):
-        '''show a progress message
-
-        By default a textual progress bar will be displayed if an operation
-        takes too long. 'topic' is the current operation, 'item' is a
-        non-numeric marker of the current position (i.e. the currently
-        in-process file), 'pos' is the current numeric position (i.e.
-        revision, bytes, etc.), unit is a corresponding unit label,
-        and total is the highest expected pos.
-
-        Multiple nested topics may be active at a time.
-
-        All topics should be marked closed by setting pos to None at
-        termination.
-        '''
-        self.deprecwarn(
-            b"use ui.makeprogress() instead of ui.progress()", b"5.1"
-        )
-        progress = self.makeprogress(topic, unit, total)
-        if pos is not None:
-            progress.update(pos, item=item)
-        else:
-            progress.complete()
-
     def makeprogress(self, topic, unit=b"", total=None):
         """Create a progress helper for the specified topic"""
         if getattr(self._fmsgerr, 'structured', False):
diff -r 161958ebf73c -r df2162672d24 relnotes/next
--- a/relnotes/next	Fri Jan 17 15:34:11 2020 +0100
+++ b/relnotes/next	Fri Jan 24 14:32:53 2020 -0800
@@ -12,3 +12,5 @@
 
 == Internal API Changes ==
 
+ * The deprecated `ui.progress()` has now been deleted. Please use
+   `ui.makeprogress()` instead.