Patchwork [evolve-ext] evolve: tell user which "base of divergent changeset" is not found

login
register
mail settings
Submitter Martin von Zweigbergk
Date Nov. 21, 2014, 12:12 a.m.
Message ID <4bdcce0a02d971344e90.1416528769@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/6813/
State Accepted
Delegated to: Matt Mackall
Headers show

Comments

Martin von Zweigbergk - Nov. 21, 2014, 12:12 a.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1416528724 28800
#      Thu Nov 20 16:12:04 2014 -0800
# Node ID 4bdcce0a02d971344e909d16155029cff9240e3c
# Parent  8d28bb4fc1278fad77646f176d19d89982b0c408
evolve: tell user which "base of divergent changeset" is not found
Pierre-Yves David - Nov. 21, 2014, 1:05 a.m.
On 11/20/2014 04:12 PM, Martin von Zweigbergk wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz@google.com>
> # Date 1416528724 28800
> #      Thu Nov 20 16:12:04 2014 -0800
> # Node ID 4bdcce0a02d971344e909d16155029cff9240e3c
> # Parent  8d28bb4fc1278fad77646f176d19d89982b0c408
> evolve: tell user which "base of divergent changeset" is not found

Pushed to main, thanks.

Thanks

Patch

diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -1576,7 +1576,7 @@ 
         newer = [n for n in newer if n and ctx.node() not in n]
         if newer:
             return base, tuple(ctx._repo[o] for o in newer[0])
-    raise util.Abort('base of divergent changeset not found',
+    raise util.Abort("base of divergent changeset %s not found" % ctx,
                      hint='this case is not yet handled')