Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • mercurial/mercurial-devel
1 result
Show changes
Showing
with 17 additions and 72 deletions
...@@ -106,7 +106,6 @@ ...@@ -106,7 +106,6 @@
share-safe share-safe
sparserevlog sparserevlog
store store
testonly-simplestore (reposimplestore !)
"lfconvert" includes a newline at the end of the standin files. "lfconvert" includes a newline at the end of the standin files.
$ cat .hglf/large .hglf/sub/maybelarge.dat $ cat .hglf/large .hglf/sub/maybelarge.dat
......
#require no-reposimplestore no-chg #require no-chg
This tests the interaction between the largefiles and lfs extensions, and This tests the interaction between the largefiles and lfs extensions, and
conversion from largefiles -> lfs. conversion from largefiles -> lfs.
......
#require serve no-reposimplestore no-chg #require serve no-chg
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
......
#testcases lfsremote-on lfsremote-off #testcases lfsremote-on lfsremote-off
#require serve no-reposimplestore no-chg #require serve no-chg
This test splits `hg serve` with and without using the extension into separate This test splits `hg serve` with and without using the extension into separate
tests cases. The tests are broken down as follows, where "LFS"/"No-LFS" tests cases. The tests are broken down as follows, where "LFS"/"No-LFS"
......
#require no-reposimplestore no-chg #require no-chg
#testcases git-server hg-server #testcases git-server hg-server
#if git-server #if git-server
......
#require no-reposimplestore no-chg #require no-chg
$ hg init requirements $ hg init requirements
$ cd requirements $ cd requirements
......
#require repobundlerepo
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [extensions] > [extensions]
> mq= > mq=
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
share-safe share-safe
sparserevlog sparserevlog
store store
testonly-simplestore (reposimplestore !)
$ hg tracked $ hg tracked
I path:dir/src/f10 I path:dir/src/f10
......
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
share-safe share-safe
sparserevlog sparserevlog
store store
testonly-simplestore (reposimplestore !)
$ hg tracked $ hg tracked
I path:dir/src/f10 I path:dir/src/f10
......
...@@ -105,8 +105,7 @@ ...@@ -105,8 +105,7 @@
remote: adding file changes remote: adding file changes
remote: transaction abort! remote: transaction abort!
remote: rollback completed remote: rollback completed
remote: abort: data/inside2/f@4a1aa07735e673e20c00fae80f40dc301ee30616: unknown parent (reporevlogstore !) remote: abort: data/inside2/f@4a1aa07735e673e20c00fae80f40dc301ee30616: unknown parent
remote: abort: data/inside2/f/index@4a1aa07735e6: no node (reposimplestore !)
abort: stream ended unexpectedly (got 0 bytes, expected 4) abort: stream ended unexpectedly (got 0 bytes, expected 4)
[255] [255]
......
...@@ -190,9 +190,7 @@ ...@@ -190,9 +190,7 @@
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
looking for local changes to affected paths looking for local changes to affected paths
deleting data/dir1/dirA/bar.i (reporevlogstore !) deleting data/dir1/dirA/bar.i
deleting data/dir1/dirA/bar/0eca1d0cbdaea4651d1d04d71976a6d2d9bfaae5 (reposimplestore !)
deleting data/dir1/dirA/bar/index (reposimplestore !)
deleting unwanted files from working copy deleting unwanted files from working copy
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
...@@ -247,9 +245,7 @@ ...@@ -247,9 +245,7 @@
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
looking for local changes to affected paths looking for local changes to affected paths
deleting data/dir1/dirA/foo.i (reporevlogstore !) deleting data/dir1/dirA/foo.i
deleting data/dir1/dirA/foo/162caeb3d55dceb1fee793aa631ac8c73fcb8b5e (reposimplestore !)
deleting data/dir1/dirA/foo/index (reposimplestore !)
deleting unwanted files from working copy deleting unwanted files from working copy
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
......
#require no-reposimplestore
$ . "$TESTDIR/narrow-library.sh" $ . "$TESTDIR/narrow-library.sh"
create full repo create full repo
......
#require no-reposimplestore
$ . "$TESTDIR/narrow-library.sh" $ . "$TESTDIR/narrow-library.sh"
$ hg init master $ hg init master
......
...@@ -124,7 +124,6 @@ ...@@ -124,7 +124,6 @@
$ hg strip . $ hg strip .
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)
#if repobundlerepo
$ hg pull .hg/strip-backup/*-backup.hg $ hg pull .hg/strip-backup/*-backup.hg
pulling from .hg/strip-backup/*-backup.hg (glob) pulling from .hg/strip-backup/*-backup.hg (glob)
searching for changes searching for changes
...@@ -171,4 +170,3 @@ ...@@ -171,4 +170,3 @@
added 3 changesets with 2 changes to 1 files (+1 heads) added 3 changesets with 2 changes to 1 files (+1 heads)
new changesets *:* (glob) new changesets *:* (glob)
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
#endif
...@@ -145,5 +145,5 @@ ...@@ -145,5 +145,5 @@
* (glob) * (glob)
moving unwanted changesets to backup moving unwanted changesets to backup
saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
deleting data/d0/f.i (reporevlogstore !) deleting data/d0/f.i
deleting meta/d0/00manifest.i (tree !) deleting meta/d0/00manifest.i (tree !)
...@@ -149,7 +149,4 @@ ...@@ -149,7 +149,4 @@
deleting meta/d0/00manifest.i (tree !) deleting meta/d0/00manifest.i (tree !)
deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !)
deleting data/d0/f/index (reposimplestore !)
deleting unwanted files from working copy deleting unwanted files from working copy
$ hg log -T "{rev}: {desc} {outsidenarrow}\n" $ hg log -T "{rev}: {desc} {outsidenarrow}\n"
...@@ -179,5 +176,5 @@ ...@@ -179,5 +176,5 @@
looking for local changes to affected paths looking for local changes to affected paths
moving unwanted changesets to backup moving unwanted changesets to backup
saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
deleting data/d0/f.i (reporevlogstore !) deleting data/d0/f.i
deleting meta/d0/00manifest.i (tree !) deleting meta/d0/00manifest.i (tree !)
...@@ -183,7 +180,4 @@ ...@@ -183,7 +180,4 @@
deleting meta/d0/00manifest.i (tree !) deleting meta/d0/00manifest.i (tree !)
deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !)
deleting data/d0/f/index (reposimplestore !)
deleting unwanted files from working copy deleting unwanted files from working copy
Updates off of stripped commit if necessary Updates off of stripped commit if necessary
...@@ -200,5 +194,5 @@ ...@@ -200,5 +194,5 @@
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
moving unwanted changesets to backup moving unwanted changesets to backup
saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
deleting data/d3/f.i (reporevlogstore !) deleting data/d3/f.i
deleting meta/d3/00manifest.i (tree !) deleting meta/d3/00manifest.i (tree !)
...@@ -204,7 +198,4 @@ ...@@ -204,7 +198,4 @@
deleting meta/d3/00manifest.i (tree !) deleting meta/d3/00manifest.i (tree !)
deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
deleting data/d3/f/99fa7136105a15e2045ce3d9152e4837c5349e4d (reposimplestore !)
deleting data/d3/f/index (reposimplestore !)
deleting unwanted files from working copy deleting unwanted files from working copy
$ hg log -T '{desc}\n' -r . $ hg log -T '{desc}\n' -r .
add d10/f add d10/f
...@@ -225,5 +216,5 @@ ...@@ -225,5 +216,5 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
moving unwanted changesets to backup moving unwanted changesets to backup
saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
deleting data/d3/f.i (reporevlogstore !) deleting data/d3/f.i
deleting meta/d3/00manifest.i (tree !) deleting meta/d3/00manifest.i (tree !)
...@@ -229,7 +220,4 @@ ...@@ -229,7 +220,4 @@
deleting meta/d3/00manifest.i (tree !) deleting meta/d3/00manifest.i (tree !)
deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
deleting data/d3/f/5ce0767945cbdbca3b924bb9fbf5143f72ab40ac (reposimplestore !)
deleting data/d3/f/index (reposimplestore !)
deleting unwanted files from working copy deleting unwanted files from working copy
$ hg id $ hg id
000000000000 000000000000
...@@ -287,5 +275,5 @@ ...@@ -287,5 +275,5 @@
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
looking for local changes to affected paths looking for local changes to affected paths
deleting data/d0/f.i (reporevlogstore !) deleting data/d0/f.i
deleting meta/d0/00manifest.i (tree !) deleting meta/d0/00manifest.i (tree !)
...@@ -291,6 +279,4 @@ ...@@ -291,6 +279,4 @@
deleting meta/d0/00manifest.i (tree !) deleting meta/d0/00manifest.i (tree !)
deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
deleting data/d0/f/index (reposimplestore !)
deleting unwanted files from working copy deleting unwanted files from working copy
$ hg tracked $ hg tracked
$ hg files $ hg files
...@@ -348,5 +334,5 @@ ...@@ -348,5 +334,5 @@
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
looking for local changes to affected paths looking for local changes to affected paths
deleting data/d6/f.i (reporevlogstore !) deleting data/d6/f.i
deleting meta/d6/00manifest.i (tree !) deleting meta/d6/00manifest.i (tree !)
...@@ -352,8 +338,6 @@ ...@@ -352,8 +338,6 @@
deleting meta/d6/00manifest.i (tree !) deleting meta/d6/00manifest.i (tree !)
deleting data/d6/f/7339d30678f451ac8c3f38753beeb4cf2e1655c7 (reposimplestore !)
deleting data/d6/f/index (reposimplestore !)
deleting unwanted files from working copy deleting unwanted files from working copy
$ hg tracked $ hg tracked
I path:d0 I path:d0
I path:d3 I path:d3
I path:d9 I path:d9
...@@ -355,8 +339,7 @@ ...@@ -355,8 +339,7 @@
deleting unwanted files from working copy deleting unwanted files from working copy
$ hg tracked $ hg tracked
I path:d0 I path:d0
I path:d3 I path:d3
I path:d9 I path:d9
#if repofncache
$ hg debugrebuildfncache $ hg debugrebuildfncache
fncache already up to date fncache already up to date
...@@ -361,6 +344,5 @@ ...@@ -361,6 +344,5 @@
$ hg debugrebuildfncache $ hg debugrebuildfncache
fncache already up to date fncache already up to date
#endif
$ find * $ find *
d0 d0
d0/f d0/f
...@@ -373,12 +355,10 @@ ...@@ -373,12 +355,10 @@
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
looking for local changes to affected paths looking for local changes to affected paths
deleting data/d3/f.i (reporevlogstore !) deleting data/d3/f.i
deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
deleting data/d3/f/index (reposimplestore !)
deleting unwanted files from working copy deleting unwanted files from working copy
$ hg tracked $ hg tracked
I path:d0 I path:d0
I path:d3 I path:d3
I path:d9 I path:d9
X path:d3/f X path:d3/f
...@@ -379,9 +359,8 @@ ...@@ -379,9 +359,8 @@
deleting unwanted files from working copy deleting unwanted files from working copy
$ hg tracked $ hg tracked
I path:d0 I path:d0
I path:d3 I path:d3
I path:d9 I path:d9
X path:d3/f X path:d3/f
#if repofncache
$ hg debugrebuildfncache $ hg debugrebuildfncache
fncache already up to date fncache already up to date
...@@ -386,6 +365,5 @@ ...@@ -386,6 +365,5 @@
$ hg debugrebuildfncache $ hg debugrebuildfncache
fncache already up to date fncache already up to date
#endif
$ find * $ find *
d0 d0
d0/f d0/f
...@@ -396,5 +374,5 @@ ...@@ -396,5 +374,5 @@
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
looking for local changes to affected paths looking for local changes to affected paths
deleting data/d0/f.i (reporevlogstore !) deleting data/d0/f.i
deleting meta/d0/00manifest.i (tree !) deleting meta/d0/00manifest.i (tree !)
...@@ -400,9 +378,7 @@ ...@@ -400,9 +378,7 @@
deleting meta/d0/00manifest.i (tree !) deleting meta/d0/00manifest.i (tree !)
deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
deleting data/d0/f/index (reposimplestore !)
deleting unwanted files from working copy deleting unwanted files from working copy
$ hg tracked $ hg tracked
I path:d3 I path:d3
I path:d9 I path:d9
X path:d0 X path:d0
X path:d3/f X path:d3/f
...@@ -403,9 +379,8 @@ ...@@ -403,9 +379,8 @@
deleting unwanted files from working copy deleting unwanted files from working copy
$ hg tracked $ hg tracked
I path:d3 I path:d3
I path:d9 I path:d9
X path:d0 X path:d0
X path:d3/f X path:d3/f
#if repofncache
$ hg debugrebuildfncache $ hg debugrebuildfncache
fncache already up to date fncache already up to date
...@@ -410,6 +385,5 @@ ...@@ -410,6 +385,5 @@
$ hg debugrebuildfncache $ hg debugrebuildfncache
fncache already up to date fncache already up to date
#endif
$ find * $ find *
d9 d9
d9/f d9/f
......
...@@ -1406,7 +1406,6 @@ ...@@ -1406,7 +1406,6 @@
o 0:4b34ecfb0d56 (draft) [ ] A o 0:4b34ecfb0d56 (draft) [ ] A
#if repobundlerepo
$ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg
comparing with ../repo-bundleoverlay comparing with ../repo-bundleoverlay
searching for changes searching for changes
...@@ -1419,7 +1418,6 @@ ...@@ -1419,7 +1418,6 @@
|/ |/
o 0:4b34ecfb0d56 (draft) [ ] A o 0:4b34ecfb0d56 (draft) [ ] A
#endif
#if serve #if serve
...@@ -1606,8 +1604,7 @@ ...@@ -1606,8 +1604,7 @@
phase-heads -- {} (mandatory: True) phase-heads -- {} (mandatory: True)
e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft
#if repobundlerepo
$ hg pull .hg/strip-backup/e008cf283490-*-backup.hg $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg
pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg
searching for changes searching for changes
no changes found no changes found
...@@ -1610,8 +1607,7 @@ ...@@ -1610,8 +1607,7 @@
$ hg pull .hg/strip-backup/e008cf283490-*-backup.hg $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg
pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg
searching for changes searching for changes
no changes found no changes found
#endif
$ hg debugobsolete $ hg debugobsolete
e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
$ hg log -G $ hg log -G
......
#require unix-permissions no-root reporevlogstore #require unix-permissions no-root
#testcases dirstate-v1 dirstate-v2 #testcases dirstate-v1 dirstate-v2
......
...@@ -548,7 +548,6 @@ ...@@ -548,7 +548,6 @@
Pulling from bundle does not alter phases of changeset not present in the bundle Pulling from bundle does not alter phases of changeset not present in the bundle
#if repobundlerepo
$ hg bundle --base 1 -r 6 -r 3 ../partial-bundle.hg $ hg bundle --base 1 -r 6 -r 3 ../partial-bundle.hg
5 changesets found 5 changesets found
$ hg pull ../partial-bundle.hg $ hg pull ../partial-bundle.hg
...@@ -578,7 +577,6 @@ ...@@ -578,7 +577,6 @@
| |
o 0 public a-A - 054250a37db4 o 0 public a-A - 054250a37db4
#endif
Pushing to Publish=False (unknown changeset) Pushing to Publish=False (unknown changeset)
......
...@@ -123,7 +123,6 @@ ...@@ -123,7 +123,6 @@
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
#if reporevlogstore
Test spurious filelog entries: Test spurious filelog entries:
...@@ -190,8 +189,6 @@ ...@@ -190,8 +189,6 @@
$ cd .. $ cd ..
#endif
Test push hook locking Test push hook locking
===================== =====================
......
...@@ -75,8 +75,6 @@ ...@@ -75,8 +75,6 @@
relink relink
#if no-reposimplestore
$ hg relink --debug --config progress.debug=true | fix_path $ hg relink --debug --config progress.debug=true | fix_path
relinking $TESTTMP/repo/.hg/store to $TESTTMP/clone/.hg/store relinking $TESTTMP/repo/.hg/store to $TESTTMP/clone/.hg/store
tip has 2 files, estimated total number of files: 3 tip has 2 files, estimated total number of files: 3
...@@ -106,5 +104,3 @@ ...@@ -106,5 +104,3 @@
repo/.hg/store/data/a.i == clone/.hg/store/data/a.i repo/.hg/store/data/a.i == clone/.hg/store/data/a.i
$ "$PYTHON" arelinked.py repo/.hg/store/data/b.i clone/.hg/store/data/b.i $ "$PYTHON" arelinked.py repo/.hg/store/data/b.i clone/.hg/store/data/b.i
repo/.hg/store/data/b.i != clone/.hg/store/data/b.i repo/.hg/store/data/b.i != clone/.hg/store/data/b.i
#endif