[PATCH 5 of 6] merge: don't indent "local changed %s which remote deleted" prompt
Mads Kiilerich
mads at kiilerich.com
Sun Jan 20 07:18:08 CST 2013
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1358687872 -3600
# Branch stable
# Node ID a0e2208420d688baa24bb52d9064e139a9dcc885
# Parent 217cf94d3908bff8e47dd7b120c1042320e0738c
merge: don't indent "local changed %s which remote deleted" prompt
It was usually not shown in a context where indentation helped readability and
it was inconsistent with other prompts(^H).
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -298,7 +298,7 @@ def manifestmerge(repo, p1, p2, pa, over
for f, m in sorted(prompts):
if m == "cd":
if repo.ui.promptchoice(
- _(" local changed %s which remote deleted\n"
+ _("local changed %s which remote deleted\n"
"use (c)hanged version or (d)elete?") % f,
(_("&Changed"), _("&Delete")), 0):
act("prompt delete", "r", f)
diff --git a/tests/test-merge-prompt.t b/tests/test-merge-prompt.t
--- a/tests/test-merge-prompt.t
+++ b/tests/test-merge-prompt.t
@@ -42,7 +42,7 @@ 840e2b315c1f: Fix misleading error and p
Non-interactive merge:
$ hg merge -y
- local changed file1 which remote deleted
+ local changed file1 which remote deleted
use (c)hanged version or (d)elete? c
remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? c
@@ -70,7 +70,7 @@ Interactive merge:
> c
> d
> EOF
- local changed file1 which remote deleted
+ local changed file1 which remote deleted
use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -97,11 +97,11 @@ Interactive merge with bad input:
> baz
> c
> EOF
- local changed file1 which remote deleted
+ local changed file1 which remote deleted
use (c)hanged version or (d)elete? unrecognized response
- local changed file1 which remote deleted
+ local changed file1 which remote deleted
use (c)hanged version or (d)elete? unrecognized response
- local changed file1 which remote deleted
+ local changed file1 which remote deleted
use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? unrecognized response
remote changed file2 which local deleted
@@ -126,7 +126,7 @@ Interactive merge with not enough input:
$ hg merge --config ui.interactive=true <<EOF
> d
> EOF
- local changed file1 which remote deleted
+ local changed file1 which remote deleted
use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? abort: response expected
[255]
diff --git a/tests/test-rename-merge2.t b/tests/test-rename-merge2.t
--- a/tests/test-rename-merge2.t
+++ b/tests/test-rename-merge2.t
@@ -617,7 +617,7 @@ m "um a c" "um x c" " " "10 do merg
resolving manifests
overwrite: False, partial: False
ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
- local changed a which remote deleted
+ local changed a which remote deleted
use (c)hanged version or (d)elete? c
a: prompt keep -> a
b: versions differ -> m
More information about the Mercurial-devel
mailing list