##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

context: stop catching RepoLookupError from namespace.singlenode()...
context: stop catching RepoLookupError from namespace.singlenode() As pointed out by Yuya, the RepoLookupError was there for catching errors from repo.branchtip(). However, since 885c0290f7d5 (localrepo: add ignoremissing parameter to branchtip, 2014-10-16), that should no longer happen. I think it should now be an error if a namespace raises a RepoLookupError, so we propagate the exception up and and make it easy to fix, rather than trying to interpret the changeid as nodeid prefix and raise a general "unknown revision '...'" error. I also don't think we should catch FilteredLookupError and LookupError from the changelog.rev() call, for the same reason as above: If a namespace returns a node that doesn't exist, we should provide a more helpful exception than "unknown revision '...'". Differential Revision: https://phab.mercurial-scm.org/D3145
Martin von Zweigbergk - - Load All Authors

File last commit:

r36993:795eb53f default
r37409:3198d5a2 default
Show More
test-rebase-inmemory.t
158 lines | 2.8 KiB | text/troff | Tads3Lexer
/ tests / test-rebase-inmemory.t
History | Source | Raw |Copy content |Copy permalink
Phil Cohen
tests: add a simple test for in-memory rebase...
 r35385 #require symlink execbit
$ cat << EOF >> $HGRCPATH
> [extensions]
> amend=
> rebase=
> debugdrawdag=$TESTDIR/drawdag.py
Phil Cohen
rebase: replace --inmemory flag with rebase.experimental.inmemory config...
 r35389 > [rebase]
> experimental.inmemory=1
Phil Cohen
tests: add a simple test for in-memory rebase...
 r35385 > [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)
Phil Cohen
rebase: replace --inmemory flag with rebase.experimental.inmemory config...
 r35389 $ hg rebase --debug -r b -d c | grep rebasing
Phil Cohen
tests: add a simple test for in-memory rebase...
 r35385 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)
Phil Cohen
rebase: replace --inmemory flag with rebase.experimental.inmemory config...
 r35389 $ hg rebase --debug -s b -d a | grep rebasing
Phil Cohen
tests: add a simple test for in-memory rebase...
 r35385 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)
Phil Cohen
rebase: replace --inmemory flag with rebase.experimental.inmemory config...
 r35389 $ hg rebase --debug -s 1 -d 3 | grep rebasing
Phil Cohen
tests: add a simple test for in-memory rebase...
 r35385 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.py b
b -> def
$ cat e
mno
Ensure symlink and executable files were rebased properly:
$ hg up -Cq 3
$ readlink.py e
e -> somefile
$ ls -l f | cut -c -10
-rwxr-xr-x
Martin von Zweigbergk
rebase: allow in-memory merge of the working copy parent...
 r36993 Rebase the working copy parent
Phil Cohen
tests: add a simple test for in-memory rebase...
 r35385 $ hg up -C 3
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Phil Cohen
rebase: replace --inmemory flag with rebase.experimental.inmemory config...
 r35389 $ hg rebase -r 3 -d 0 --debug | grep rebasing
Martin von Zweigbergk
rebase: allow in-memory merge of the working copy parent...
 r36993 rebasing in-memory
Phil Cohen
tests: add a simple test for in-memory rebase...
 r35385 rebasing 3:753feb6fd12a "c" (tip)
$ hg tglog
@ 3: 844a7de3e617 'c'
|
| o 2: 09c044d2cb43 'd'
| |
| o 1: fc055c3b4d33 'b'
|/
o 0: b173517d0057 'a'