[PATCH 3 of 4] Use progress indicator for hg update

Stefano Tortarolo stefano at inventati.org
Wed Apr 30 08:04:32 CDT 2008


# HG changeset patch
# User Thomas Arendsen Hein <thomas at intevation.de>
# Date 1185174777 -7200
# Node ID 0e86daac8a7b8e5e9835b823ac4f477bb70090ce
# Parent  f79d4a6ce30fb62c9ea05478767cafef56575407
Use progress indicator for hg update

diff -r f79d4a6ce30f -r 0e86daac8a7b mercurial/merge.py
--- a/mercurial/merge.py	Wed Apr 30 14:53:34 2008 +0200
+++ b/mercurial/merge.py	Mon Jul 23 09:12:57 2007 +0200
@@ -268,6 +268,8 @@
     ms.reset(wctx.parents()[0].node())
     moves = []
 
+    progress = repo.ui.progress(_("updating"), len(action))
+
     # prescan for merges
     for a in action:
         f, m = a[:2]
@@ -339,7 +341,8 @@
         elif m == "e": # exec
             flags = a[2]
             util.set_flags(repo.wjoin(f), flags)
-
+        progress.update()
+    progress.finish()
     return updated, merged, removed, unresolved
 
 def recordupdates(repo, action, branchmerge):


More information about the Mercurial-devel mailing list