( )⚙ D1652 tests: add a simple test for in-memory rebase

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1652

tests: add a simple test for in-memory rebase
ClosedPublic

Authored by phillco on Dec 11 2017, 1:21 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGb9bdee046cc2: tests: add a simple test for in-memory rebase
Summary

This is just a very simple start, but verifies some of the basic cases of an
in-memory rebase.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Dec 11 2017, 1:21 AM
phillco updated this revision to Diff 4346.Dec 11 2017, 1:23 AM
phillco updated this revision to Diff 4347.Dec 11 2017, 1:29 AM
phillco updated this revision to Diff 4348.Dec 11 2017, 1:43 AM
dlax added a subscriber: dlax.Dec 11 2017, 2:59 AM
durin42 accepted this revision.Dec 11 2017, 11:24 AM
This revision is now accepted and ready to land.Dec 11 2017, 11:24 AM
Closed by commit rHGb9bdee046cc2: tests: add a simple test for in-memory rebase (authored by phillco). · Explain WhyDec 11 2017, 11:58 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)
AMtests/test-rebase-inmemory.t (156 lines)

Diff 4346

hgext/rebase.py

self.ui.status(_('reopening closed branch head %s\n') % dest) self.ui.status(_('reopening closed branch head %s\n') % dest)
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("rebasing in-memory\n")
else: else:
self.wctx = self.repo[None] self.wctx = self.repo[None]
self.repo.ui.debug("rebasing on disk\n")
def _performrebase(self, tr): def _performrebase(self, tr):
self._assignworkingcopy() self._assignworkingcopy()
repo, ui = self.repo, self.ui repo, ui = self.repo, self.ui
if self.keepbranchesf: if self.keepbranchesf:
# insert _savebranch at the start of extrafns so if # insert _savebranch at the start of extrafns so if
# there's a user-provided extrafn it can clobber branch if # there's a user-provided extrafn it can clobber branch if
# desired # desired

tests/test-rebase-inmemory.t

  • This file was added.
$ cat << EOF >> $HGRCPATH
> [extensions]
> amend=
> rebase=
> debugdrawdag=$TESTDIR/drawdag.py
> [diff]
> git=1
> [alias]
> tglog = log -G --template "{rev}: {node|short} '{desc}'\n"
> EOF
Rebase a simple DAG:
$ hg init repo1
$ cd repo1
$ hg debugdrawdag <<'EOS'
> c b
> |/
> d
> |
> a
> EOS
$ hg up -C a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg tglog
o 3: 814f6bd05178 'c'
|
| o 2: db0e82a16a62 'b'
|/
o 1: 02952614a83d 'd'
|
@ 0: b173517d0057 'a'
$ hg cat -r 3 c
c (no-eol)
$ hg cat -r 2 b
b (no-eol)
$ hg rebase --inmemory --debug -r b -d c | grep rebasing
rebasing in-memory
rebasing 2:db0e82a16a62 "b" (b)
$ hg tglog
o 3: ca58782ad1e4 'b'
|
o 2: 814f6bd05178 'c'
|
o 1: 02952614a83d 'd'
|
@ 0: b173517d0057 'a'
$ hg cat -r 3 b
b (no-eol)
$ hg cat -r 2 c
c (no-eol)
Case 2:
$ hg init repo2
$ cd repo2
$ hg debugdrawdag <<'EOS'
> c b
> |/
> d
> |
> a
> EOS
Add a symlink and executable file:
$ hg up -C c
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ ln -s somefile e
$ echo f > f
$ chmod +x f
$ hg add e f
$ hg amend -q
$ hg up -Cq a
Write files to the working copy, and ensure they're still there after the rebase
$ echo "abc" > a
$ ln -s def b
$ echo "ghi" > c
$ echo "jkl" > d
$ echo "mno" > e
$ hg tglog
o 3: f56b71190a8f 'c'
|
| o 2: db0e82a16a62 'b'
|/
o 1: 02952614a83d 'd'
|
@ 0: b173517d0057 'a'
$ hg cat -r 3 c
c (no-eol)
$ hg cat -r 2 b
b (no-eol)
$ hg cat -r 3 e
somefile (no-eol)
$ hg rebase --inmemory --debug -s b -d a | grep rebasing
rebasing in-memory
rebasing 2:db0e82a16a62 "b" (b)
$ hg tglog
o 3: fc055c3b4d33 'b'
|
| o 2: f56b71190a8f 'c'
| |
| o 1: 02952614a83d 'd'
|/
@ 0: b173517d0057 'a'
$ hg cat -r 2 c
c (no-eol)
$ hg cat -r 3 b
b (no-eol)
$ hg rebase --inmemory --debug -s 1 -d 3 | grep rebasing
rebasing in-memory
rebasing 1:02952614a83d "d" (d)
rebasing 2:f56b71190a8f "c"
$ hg tglog
o 3: 753feb6fd12a 'c'
|
o 2: 09c044d2cb43 'd'
|
o 1: fc055c3b4d33 'b'
|
@ 0: b173517d0057 'a'
Ensure working copy files are still there:
$ cat a
abc
$ readlink b
def
$ cat e
mno
Ensure symlink and executable files were rebased properly:
$ hg up -Cq 3
$ readlink e
somefile
$ ls -l f | cut -f1 -d ' '
-rwxr-xr-x
Rebase the working copy parent, which should default to an on-disk merge even if
we requested in-memory.
$ hg up -C 3
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase -r 3 -d 0 --inmemory --debug | grep rebasing
rebasing on disk
rebasing 3:753feb6fd12a "c" (tip)
$ hg tglog
@ 3: 844a7de3e617 'c'
|
| o 2: 09c044d2cb43 'd'
| |
| o 1: fc055c3b4d33 'b'
|/
o 0: b173517d0057 'a'