This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9054

rebase: fix an inconsistent hyphenation in a debug message
ClosedPublic

Authored by martinvonz on Sep 18 2020, 1:21 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1f5c548f15e5: rebase: fix an inconsistent hyphenation in a debug message
Summary

We used "rebasing on disk" but "rebasing in-memory". I believe the
former is correct, so I used that.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Sep 18 2020, 1:21 PM
pulkit accepted this revision.Sep 19 2020, 3:30 AM
This revision is now accepted and ready to land.Sep 19 2020, 3:30 AM

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)
Mtests/test-rebase-inmemory.t (8 lines)

Diff 22742

hgext/rebase.py

self.prepared = True self.prepared = True
def _assignworkingcopy(self): def _assignworkingcopy(self):
if self.inmemory: if self.inmemory:
from mercurial.context import overlayworkingctx from mercurial.context import overlayworkingctx
self.wctx = overlayworkingctx(self.repo) self.wctx = overlayworkingctx(self.repo)
self.repo.ui.debug(b"rebasing in-memory\n") self.repo.ui.debug(b"rebasing in memory\n")
else: else:
self.wctx = self.repo[None] self.wctx = self.repo[None]
self.repo.ui.debug(b"rebasing on disk\n") self.repo.ui.debug(b"rebasing on disk\n")
self.repo.ui.log( self.repo.ui.log(
b"rebase", b"rebase",
b"using in-memory rebase: %r\n", b"using in-memory rebase: %r\n",
self.inmemory, self.inmemory,
rebase_imm_used=self.inmemory, rebase_imm_used=self.inmemory,

tests/test-rebase-inmemory.t

| |
@ 0: b173517d0057 'a' @ 0: b173517d0057 'a'
$ hg cat -r 3 c $ hg cat -r 3 c
c (no-eol) c (no-eol)
$ hg cat -r 2 b $ hg cat -r 2 b
b (no-eol) b (no-eol)
$ hg rebase --debug -r b -d c | grep rebasing $ hg rebase --debug -r b -d c | grep rebasing
rebasing in-memory rebasing in memory
rebasing 2:db0e82a16a62 "b" (b) rebasing 2:db0e82a16a62 "b" (b)
$ hg tglog $ hg tglog
o 3: ca58782ad1e4 'b' o 3: ca58782ad1e4 'b'
| |
o 2: 814f6bd05178 'c' o 2: 814f6bd05178 'c'
| |
o 1: 02952614a83d 'd' o 1: 02952614a83d 'd'
| |
$ hg cat -r 3 c $ hg cat -r 3 c
c (no-eol) c (no-eol)
$ hg cat -r 2 b $ hg cat -r 2 b
b (no-eol) b (no-eol)
$ hg cat -r 3 e $ hg cat -r 3 e
somefile (no-eol) somefile (no-eol)
$ hg rebase --debug -s b -d a | grep rebasing $ hg rebase --debug -s b -d a | grep rebasing
rebasing in-memory rebasing in memory
rebasing 2:db0e82a16a62 "b" (b) rebasing 2:db0e82a16a62 "b" (b)
$ hg tglog $ hg tglog
o 3: fc055c3b4d33 'b' o 3: fc055c3b4d33 'b'
| |
| o 2: f56b71190a8f 'c' | o 2: f56b71190a8f 'c'
| | | |
| o 1: 02952614a83d 'd' | o 1: 02952614a83d 'd'
|/ |/
@ 0: b173517d0057 'a' @ 0: b173517d0057 'a'
$ hg cat -r 2 c $ hg cat -r 2 c
c (no-eol) c (no-eol)
$ hg cat -r 3 b $ hg cat -r 3 b
b (no-eol) b (no-eol)
$ hg rebase --debug -s 1 -d 3 | grep rebasing $ hg rebase --debug -s 1 -d 3 | grep rebasing
rebasing in-memory rebasing in memory
rebasing 1:02952614a83d "d" (d) rebasing 1:02952614a83d "d" (d)
rebasing 2:f56b71190a8f "c" rebasing 2:f56b71190a8f "c"
$ hg tglog $ hg tglog
o 3: 753feb6fd12a 'c' o 3: 753feb6fd12a 'c'
| |
o 2: 09c044d2cb43 'd' o 2: 09c044d2cb43 'd'
| |
o 1: fc055c3b4d33 'b' o 1: fc055c3b4d33 'b'
e -> somefile e -> somefile
$ ls -l f | cut -c -10 $ ls -l f | cut -c -10
-rwxr-xr-x -rwxr-xr-x
Rebase the working copy parent Rebase the working copy parent
$ hg up -C 3 $ hg up -C 3
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase -r 3 -d 0 --debug | grep rebasing $ hg rebase -r 3 -d 0 --debug | grep rebasing
rebasing in-memory rebasing in memory
rebasing 3:753feb6fd12a "c" (tip) rebasing 3:753feb6fd12a "c" (tip)
$ hg tglog $ hg tglog
@ 3: 844a7de3e617 'c' @ 3: 844a7de3e617 'c'
| |
| o 2: 09c044d2cb43 'd' | o 2: 09c044d2cb43 'd'
| | | |
| o 1: fc055c3b4d33 'b' | o 1: fc055c3b4d33 'b'
|/ |/