Mercurial > hg-stable
changeset 45518:1f5c548f15e5
rebase: fix an inconsistent hyphenation in a debug message
We used "rebasing on disk" but "rebasing in-memory". I believe the
former is correct, so I used that.
Differential Revision: https://phab.mercurial-scm.org/D9054
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 18 Sep 2020 10:04:02 -0700 |
| parents | df87821081ee |
| children | e29cd888fd17 |
| files | hgext/rebase.py tests/test-rebase-inmemory.t |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Tue Sep 15 15:03:07 2020 +0200 +++ b/hgext/rebase.py Fri Sep 18 10:04:02 2020 -0700 @@ -448,7 +448,7 @@ from mercurial.context import overlayworkingctx self.wctx = overlayworkingctx(self.repo) - self.repo.ui.debug(b"rebasing in-memory\n") + self.repo.ui.debug(b"rebasing in memory\n") else: self.wctx = self.repo[None] self.repo.ui.debug(b"rebasing on disk\n")
--- a/tests/test-rebase-inmemory.t Tue Sep 15 15:03:07 2020 +0200 +++ b/tests/test-rebase-inmemory.t Fri Sep 18 10:04:02 2020 -0700 @@ -41,7 +41,7 @@ $ hg cat -r 2 b b (no-eol) $ hg rebase --debug -r b -d c | grep rebasing - rebasing in-memory + rebasing in memory rebasing 2:db0e82a16a62 "b" (b) $ hg tglog o 3: ca58782ad1e4 'b' @@ -101,7 +101,7 @@ $ hg cat -r 3 e somefile (no-eol) $ hg rebase --debug -s b -d a | grep rebasing - rebasing in-memory + rebasing in memory rebasing 2:db0e82a16a62 "b" (b) $ hg tglog o 3: fc055c3b4d33 'b' @@ -117,7 +117,7 @@ $ hg cat -r 3 b b (no-eol) $ hg rebase --debug -s 1 -d 3 | grep rebasing - rebasing in-memory + rebasing in memory rebasing 1:02952614a83d "d" (d) rebasing 2:f56b71190a8f "c" $ hg tglog @@ -148,7 +148,7 @@ $ hg up -C 3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg rebase -r 3 -d 0 --debug | grep rebasing - rebasing in-memory + rebasing in memory rebasing 3:753feb6fd12a "c" (tip) $ hg tglog @ 3: 844a7de3e617 'c'