Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 19482:499fc471296b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: add tracking of interrupted updates (issue3113) This takes advantage of the new checkunfinished infrastructure
author Matt Mackall <mpm@selenic.com>
date Thu, 25 Jul 2013 00:33:28 -0500
parents 4fed15d4c5aa
children ca76e77dd663
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Jul 25 00:00:47 2013 -0500
+++ b/mercurial/commands.py	Thu Jul 25 00:33:28 2013 -0500
@@ -5482,7 +5482,9 @@
     t = ', '.join(t)
     cleanworkdir = False
 
-    if len(parents) > 1:
+    if repo.vfs.exists('updatestate'):
+        t += _(' (interrupted update)')
+    elif len(parents) > 1:
         t += _(' (merge)')
     elif branch != parents[0].branch():
         t += _(' (new branch)')