Mercurial > hg-stable
changeset 32289:27e67cfea27f
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.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 11 May 2017 22:38:15 -0700 |
| parents | b47e6b0ba6ca |
| children | 8a137ef6e5da |
| files | hgext/rebase.py tests/test-rebase-conflicts.t tests/test-rebase-interruptions.t |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Thu May 11 22:38:03 2017 -0700 +++ b/hgext/rebase.py Thu May 11 22:38:15 2017 -0700 @@ -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:
--- a/tests/test-rebase-conflicts.t Thu May 11 22:38:03 2017 -0700 +++ b/tests/test-rebase-conflicts.t Thu May 11 22:38:15 2017 -0700 @@ -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
--- a/tests/test-rebase-interruptions.t Thu May 11 22:38:03 2017 -0700 +++ b/tests/test-rebase-interruptions.t Thu May 11 22:38:15 2017 -0700 @@ -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