Patchwork [2,of,2,STABLE] histedit: add description about exit code

login
register
mail settings
Submitter Katsunori FUJIWARA
Date Oct. 26, 2013, 3:41 p.m.
Message ID <0a8a6a4184b6f88d6bbe.1382802109@juju>
Download mbox | patch
Permalink /patch/2824/
State Accepted
Commit 1e13a5a9c66e24348be9d9b684cbf38c5a848087
Headers show

Comments

Katsunori FUJIWARA - Oct. 26, 2013, 3:41 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1382801065 -32400
#      Sun Oct 27 00:24:25 2013 +0900
# Branch stable
# Node ID 0a8a6a4184b6f88d6bbeb0ade59bc531b6ea6077
# Parent  ce74c20e699eaeeb2e0bf0767dd5a1f8d9e8326a
histedit: add description about exit code
Matt Mackall - Nov. 1, 2013, 9:46 p.m.
On Sun, 2013-10-27 at 00:41 +0900, FUJIWARA Katsunori wrote:
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
> # Date 1382801065 -32400
> #      Sun Oct 27 00:24:25 2013 +0900
> # Branch stable
> # Node ID 0a8a6a4184b6f88d6bbeb0ade59bc531b6ea6077
> # Parent  ce74c20e699eaeeb2e0bf0767dd5a1f8d9e8326a
> histedit: add description about exit code

Queued for stable, thanks.

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -471,6 +471,10 @@ 
     instead of --outgoing to specify edit target revision exactly in
     such ambiguous situation. See :hg:`help revsets` for detail about
     selecting revisions.
+
+    Returns 0 on success, 1 if user intervention is required (not only
+    for intentional "edit" command, but also for resolving unexpected
+    conflicts).
     """
     # TODO only abort if we try and histedit mq patches, not just
     # blanket if mq patches are applied somewhere