Patchwork [7,of,7,mergedriver] commands.resolve: print out warning when only driver-resolved files remain

login
register
mail settings
Submitter Siddharth Agarwal
Date Oct. 17, 2015, 2:35 a.m.
Message ID <9e297e9eef1d4dc0066f.1445049320@dev6666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11154/
State Accepted
Headers show

Comments

Siddharth Agarwal - Oct. 17, 2015, 2:35 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1444896598 25200
#      Thu Oct 15 01:09:58 2015 -0700
# Node ID 9e297e9eef1d4dc0066f55dfc98e5e89a3897aaa
# Parent  ab0392a6462acbd3084b9493e12b0701b02fe0ce
commands.resolve: print out warning when only driver-resolved files remain

'hg resolve --all' will be the canonical way to run the 'conclude' step of the
merge driver.
Pierre-Yves David - Oct. 18, 2015, 12:45 p.m.
On 10/17/2015 04:35 AM, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0@fb.com>
> # Date 1444896598 25200
> #      Thu Oct 15 01:09:58 2015 -0700
> # Node ID 9e297e9eef1d4dc0066f55dfc98e5e89a3897aaa
> # Parent  ab0392a6462acbd3084b9493e12b0701b02fe0ce
> commands.resolve: print out warning when only driver-resolved files remain
>
> 'hg resolve --all' will be the canonical way to run the 'conclude' step of the
> merge driver.

These ones are pushed to the clowcopter

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5640,8 +5640,13 @@  def resolve(ui, repo, *pats, **opts):
         wlock.release()
 
     # Nudge users into finishing an unfinished operation
-    if not list(ms.unresolved()):
+    unresolvedf = list(ms.unresolved())
+    driverresolvedf = list(ms.driverresolved())
+    if not unresolvedf and not driverresolvedf:
         ui.status(_('(no more unresolved files)\n'))
+    elif not unresolvedf:
+        ui.status(_('(no more unresolved files -- '
+                    'run "hg resolve --all" to conclude)\n'))
 
     return ret