From patchwork Fri May 12 17:13:57 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [2,of,2] rebase: rename "target" to "destination" in messages
From: via Mercurial-devel <mercurial-devel@mercurial-scm.org>
X-Patchwork-Id: 20587
Message-Id: <14de3fe1263874dc34fa.1494609237@martinvonz.svl.corp.google.com>
To: mercurial-devel@mercurial-scm.org
Date: Fri, 12 May 2017 10:13:57 -0700

# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1494567495 25200
#      Thu May 11 22:38:15 2017 -0700
# Node ID 14de3fe1263874dc34face3420b38ad1541f83d3
# Parent  274ef5ba4e1f09935f8db9afb5491b6974312edf
rebase: rename "target" to "destination" in messages

The help text for rebase calls it "the destination" (never "target"),
so let's use that in messages as well.

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -905,7 +905,7 @@
         repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1]))
         mergemod.update(repo, p1, False, True)
     else:
-        repo.ui.debug(" already in target\n")
+        repo.ui.debug(" already in destination\n")
     repo.dirstate.write(repo.currenttransaction())
     repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev]))
     if base is not None:
@@ -1191,8 +1191,8 @@
         if dstates:
             descendants = set(repo.changelog.descendants(dstates))
         if descendants - set(dstates):
-            repo.ui.warn(_("warning: new changesets detected on target branch, "
-                        "can't strip\n"))
+            repo.ui.warn(_("warning: new changesets detected on destination "
+                           "branch, can't strip\n"))
             cleanup = False
 
         if cleanup:
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -250,7 +250,7 @@
   rebased as 19c888675e13
   rebasing 10:2f2496ddf49d "merge" (tip)
    future parents are 11 and 7
-   already in target
+   already in destination
    merge against 10:2f2496ddf49d
      detach base 9:e31216eec445
     searching for copies back to rev 3
diff --git a/tests/test-rebase-interruptions.t b/tests/test-rebase-interruptions.t
--- a/tests/test-rebase-interruptions.t
+++ b/tests/test-rebase-interruptions.t
@@ -186,7 +186,7 @@
 Abort the rebasing:
 
   $ hg rebase --abort
-  warning: new changesets detected on target branch, can't strip
+  warning: new changesets detected on destination branch, can't strip
   rebase aborted
 
   $ hg tglog