Changeset 67fb04c0fd2d…
Parent e7abefc60fd9…
by Andrew Pritchard <andrewp@fogcreek.com>
Changes to 33 files · Browse files at 67fb04c0fd2d Showing diff from parent e7abefc60fd9 Diff from another changeset...
@@ -151,7 +151,7 @@ '''
raise NotImplementedError('abstract method')
-import localstore, kilnstore, wirestore
+import localstore, wirestore
_storeprovider = {
'file': [localstore.localstore],
|
@@ -1,4 +1,4 @@ - '''Remote lfile store; the base class for servestore and kilnstore'''
+'''Remote lfile store; the base class for servestore'''
from mercurial import util
from mercurial.i18n import _
|
@@ -40,7 +40,7 @@
version = getversion()
-class BfilesTester(hgtest.Tester):
+class LfilesTester(hgtest.Tester):
def updaterc(self, extraconfig=None):
'''Append configuration settings to $HGRCPATH to configure lfiles
for the current run, plus any additional settings in extraconfig.
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
def rejoin(path):
'''convert unix path to local convention'''
|
@@ -1,12 +1,12 @@ #!/usr/bin/env python
#
-# Test basic kiln interaction
+# Test that addremove cannot be run on largefiles repos
import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
hgt.updaterc()
hgt.announce('test with lfiles')
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
hgt.updaterc()
hgt.announce('setup')
|
@@ -6,7 +6,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
def rejoin(path):
'''convert unix path to local convention'''
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
hgt.updaterc()
hgt.announce('setup')
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
def rejoin(path):
'''convert unix path to local convention'''
|
@@ -7,7 +7,7 @@ import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
hgt.updaterc()
hgt.announce('test')
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
hgt.announce('setup')
os.mkdir('repo1')
os.chdir('repo1')
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
hgt.updaterc()
hgt.announce('setup')
os.mkdir('repo1')
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
def checkfile(file, contents):
hgt.asserttrue(hgt.readfile(file) == contents, 'file contents dont match')
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
def rejoin(path):
'''convert unix path to local convention'''
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
# add size and patterns for adding as largefiles
hgt.updaterc({'extensions':[('fetch','')]})
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
def rejoin(path):
'''convert unix path to local convention'''
|
@@ -1,6 +1,6 @@ Setup
- $ export KBFILES="--config extensions.largefiles=$TESTDIR/.."
- $ export KHG="hg $KBFILES"
+ $ export LARGEFILES="--config extensions.largefiles=$TESTDIR/.."
+ $ export LHG="hg $LARGEFILES"
Non-lfiles clients not locked out from lfiles servers on non-lfiles repos
$ mkdir r1
@@ -10,7 +10,7 @@ $ hg add f1
$ hg com -m "m1"
$ cd ..
- $ $KHG serve -R r1 -d -p 8001 --pid-file serve.pid
+ $ $LHG serve -R r1 -d -p 8001 --pid-file serve.pid
$ hg clone http://localhost:8001 r2
requesting all changes
adding changesets
@@ -23,7 +23,7 @@
lfiles clients still work with non-lfiles servers
$ hg serve -R r1 -d -p 8001 --pid-file serve.pid
- $ $KHG clone http://localhost:8001 r3
+ $ $LHG clone http://localhost:8001 r3
requesting all changes
adding changesets
adding manifests
@@ -36,12 +36,12 @@Non-lfiles clients locked out from lfiles servers serving lfiles repos
$ mkdir r4
$ cd r4
- $ $KHG init
+ $ $LHG init
$ echo c1 > f1
- $ $KHG add --large f1
- $ $KHG com -m "m1"
+ $ $LHG add --large f1
+ $ $LHG com -m "m1"
$ cd ..
- $ $KHG serve -R r4 -d -p 8001 --pid-file serve.pid
+ $ $LHG serve -R r4 -d -p 8001 --pid-file serve.pid
$ hg clone http://localhost:8001 r5
abort: remote error:
@@ -52,7 +52,7 @@ $ kill $(cat serve.pid)
Same thing for ssh clones
- $ hg clone -e "python $TESTDIR/dummyssh" --remotecmd "$KHG" ssh://user@dummy/r4 r5
+ $ hg clone -e "python $TESTDIR/dummyssh" --remotecmd "$LHG" ssh://user@dummy/r4 r5
abort: remote error:
This repository uses the largefiles extension.
@@ -63,25 +63,25 @@lfiles clients refuse to push lfiles repos to non-lfiles servers
$ mkdir r6
$ cd r6
- $ $KHG init
+ $ $LHG init
$ echo c1 > f1
- $ $KHG add f1
- $ $KHG com -m "m1"
+ $ $LHG add f1
+ $ $LHG com -m "m1"
$ cat >> .hg/hgrc <<!
> [web]
> push_ssl = false
> allow_push = *
> !
$ cd ..
- $ $KHG clone r6 r7
+ $ $LHG clone r6 r7
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd r7
$ echo c2 > f2
- $ $KHG add --large f2
- $ $KHG com -m "m2"
+ $ $LHG add --large f2
+ $ $LHG com -m "m2"
$ hg -R ../r6 serve -d -p 8001 --pid-file ../serve.pid
- $ $KHG push http://localhost:8001
+ $ $LHG push http://localhost:8001
pushing to http://localhost:8001/
searching for changes
abort: ('%s does not appear to be a lfile store', 'http://localhost:8001/')
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
hgt.updaterc()
hgt.announce('setup')
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
hgt.updaterc()
hgt.announce('setup')
|
@@ -6,7 +6,7 @@ import common
import stat
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
windows = os.name == 'nt'
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
hgt.updaterc({'extensions': [('purge', '')]})
hgt.announce('setup')
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
# add size and patterns for adding as largefiles
hgt.updaterc()
|
@@ -6,7 +6,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
hgt.updaterc()
hgt.announce('setup')
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
def rejoin(path):
'''convert unix path to local convention'''
|
@@ -6,7 +6,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
hgt.announce('setup')
|
@@ -1,11 +1,11 @@ Setup
- $ export KBFILES="--config extensions.largefiles=$TESTDIR/.."
- $ export KHG="hg $KBFILES"
+ $ export LARGEFILES="--config extensions.largefiles=$TESTDIR/.."
+ $ export LHG="hg $LARGEFILES"
Requirement not added to new repos
$ mkdir r1
$ cd r1
- $ $KHG init
+ $ $LHG init
$ grep largefiles .hg/requires
[1]
$ cd ..
@@ -13,14 +13,14 @@Requirement added to repos with .hglf directories
$ mkdir r2
$ cd r2
- $ $KHG init
+ $ $LHG init
$ mkdir .hglf
$ echo "0000000000000000000000000000000000000000" > .hglf/f1
$ hg add .hglf/f1
$ hg com -m "m1"
$ grep largefiles .hg/requires
[1]
- $ $KHG status
+ $ $LHG status
! f1
$ grep largefiles .hg/requires
largefiles
@@ -29,12 +29,12 @@Requirement added when cloning largefiles repos
$ mkdir r3
$ cd r3
- $ $KHG init
+ $ $LHG init
$ echo c1 > f1
- $ $KHG add --large f1
- $ $KHG com -m "m1"
+ $ $LHG add --large f1
+ $ $LHG com -m "m1"
$ cd ..
- $ $KHG clone r3 r3c
+ $ $LHG clone r3 r3c
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
@@ -45,10 +45,10 @@Requirement added when committing a lfile
$ mkdir r4
$ cd r4
- $ $KHG init
+ $ $LHG init
$ echo c1 > f1
- $ $KHG add --large f1
- $ $KHG com -m "m1"
+ $ $LHG add --large f1
+ $ $LHG com -m "m1"
$ grep largefiles .hg/requires
largefiles
$ cd ..
@@ -56,22 +56,22 @@Requirement added when pulling largefiles into a non-largefiles repo
$ mkdir r5
$ cd r5
- $ $KHG init
+ $ $LHG init
$ echo c1 > f1
- $ $KHG add f1
- $ $KHG com -m "m1"
+ $ $LHG add f1
+ $ $LHG com -m "m1"
$ cd ..
- $ $KHG clone r5 r6
+ $ $LHG clone r5 r6
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd r6
$ grep largefiles .hg/requires
[1]
$ echo c2 > f2
- $ $KHG add --large f2
- $ $KHG com -m "m2"
+ $ $LHG add --large f2
+ $ $LHG com -m "m2"
$ cd ../r5
- $ $KHG pull ../r6
+ $ $LHG pull ../r6
pulling from ../r6
searching for changes
adding changesets
@@ -86,19 +86,19 @@Requirement added when pushing largefiles into a non-largefiles repo
$ mkdir r7
$ cd r7
- $ $KHG init
+ $ $LHG init
$ echo c1 > f1
- $ $KHG add f1
- $ $KHG com -m "m1"
+ $ $LHG add f1
+ $ $LHG com -m "m1"
$ cd ..
- $ $KHG clone r7 r8
+ $ $LHG clone r7 r8
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd r8
$ echo c2 > f2
- $ $KHG add --large f2
- $ $KHG com -m "m2"
- $ $KHG push ../r7
+ $ $LHG add --large f2
+ $ $LHG com -m "m2"
+ $ $LHG push ../r7
pushing to ../r7
searching for changes
searching for changes
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
def checkfile(file, contents):
hgt.asserttrue(hgt.readfile(file) == contents, 'file contents dont match')
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
hgt.updaterc()
hgt.announce('setup')
|
|
|
@@ -1,21 +1,21 @@ Setup
- $ export KBFILES='--config extensions.largefiles=$TESTDIR/..'
- $ export KHG="hg $KBFILES"
+ $ export LARGEFILES='--config extensions.largefiles=$TESTDIR/..'
+ $ export LHG="hg $LARGEFILES"
Clone tests setup
$ mkdir r1
$ cd r1
- $ $KHG init
+ $ $LHG init
$ echo c1 > f1
$ echo c2 > f2
- $ $KHG add --large f1
- $ $KHG add f2
- $ $KHG com -m "m1"
+ $ $LHG add --large f1
+ $ $LHG add f2
+ $ $LHG com -m "m1"
$ cd ..
Clone over http
- $ $KHG serve -R r1 -d -p 8001 --pid-file serve.pid
- $ $KHG --config largefiles.systemcache=$PWD/cache1 clone http://localhost:8001 r2
+ $ $LHG serve -R r1 -d -p 8001 --pid-file serve.pid
+ $ $LHG --config largefiles.systemcache=$PWD/cache1 clone http://localhost:8001 r2
requesting all changes
adding changesets
adding manifests
@@ -29,7 +29,7 @@ $ kill $(cat serve.pid)
Clone over ssh
- $ $KHG --config largefiles.systemcache=$PWD/cache2 clone -e "python $TESTDIR/dummyssh" --remotecmd "$KHG" ssh://user@dummy/r1 r3
+ $ $LHG --config largefiles.systemcache=$PWD/cache2 clone -e "python $TESTDIR/dummyssh" --remotecmd "$LHG" ssh://user@dummy/r1 r3
requesting all changes
adding changesets
adding manifests
@@ -43,18 +43,18 @@Pull tests setup
$ mkdir r4
$ cd r4
- $ $KHG init
+ $ $LHG init
$ echo c1 > f1
- $ $KHG add f1
- $ $KHG com -m "m1"
+ $ $LHG add f1
+ $ $LHG com -m "m1"
$ echo c2 > f2
- $ $KHG add --large f2
- $ $KHG com -m "m2"
+ $ $LHG add --large f2
+ $ $LHG com -m "m2"
$ cd ..
Pull over http
- $ $KHG serve -R r4 -d -p 8001 --pid-file serve.pid
- $ $KHG clone http://localhost:8001 -r 0 r5
+ $ $LHG serve -R r4 -d -p 8001 --pid-file serve.pid
+ $ $LHG clone http://localhost:8001 -r 0 r5
adding changesets
adding manifests
adding file changes
@@ -62,7 +62,7 @@ updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd r5
- $ $KHG pull
+ $ $LHG pull
pulling from http://localhost:8001/
searching for changes
adding changesets
@@ -70,7 +70,7 @@ adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
- $ $KHG --config largefiles.systemcache=$PWD/../cache3 up
+ $ $LHG --config largefiles.systemcache=$PWD/../cache3 up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
1 big files updated, 0 removed
@@ -79,7 +79,7 @@ $ kill $(cat serve.pid)
Pull over ssh
- $ $KHG clone -e "python $TESTDIR/dummyssh" --remotecmd "$KHG" ssh://user@dummy/r4 -r 0 r6
+ $ $LHG clone -e "python $TESTDIR/dummyssh" --remotecmd "$LHG" ssh://user@dummy/r4 -r 0 r6
adding changesets
adding manifests
adding file changes
@@ -89,10 +89,10 @@ $ cd r6
$ cat >> .hg/hgrc <<!
> [ui]
- > remotecmd=$KHG
+ > remotecmd=$LHG
> ssh=python $TESTDIR/dummyssh
> !
- $ $KHG pull
+ $ $LHG pull
pulling from ssh://user@dummy/r4
searching for changes
adding changesets
@@ -100,7 +100,7 @@ adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
- $ $KHG --config largefiles.systemcache=$PWD/../cache4 up
+ $ $LHG --config largefiles.systemcache=$PWD/../cache4 up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
1 big files updated, 0 removed
@@ -110,10 +110,10 @@Push tests setup
$ mkdir r7
$ cd r7
- $ $KHG init
+ $ $LHG init
$ echo c1 > f1
- $ $KHG add f1
- $ $KHG com -m "m1"
+ $ $LHG add f1
+ $ $LHG com -m "m1"
$ cd ..
Push over http
@@ -122,8 +122,8 @@ > allow_push = *
> push_ssl = false
> !
- $ $KHG --config largefiles.systemcache=$PWD/cache5 serve -R r7 -d -p 8001 --pid-file serve.pid
- $ $KHG clone http://localhost:8001 r8
+ $ $LHG --config largefiles.systemcache=$PWD/cache5 serve -R r7 -d -p 8001 --pid-file serve.pid
+ $ $LHG clone http://localhost:8001 r8
requesting all changes
adding changesets
adding manifests
@@ -133,9 +133,9 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd r8
$ echo c2 > f2
- $ $KHG add --large f2
- $ $KHG com -m "m2"
- $ $KHG push
+ $ $LHG add --large f2
+ $ $LHG com -m "m2"
+ $ $LHG push
pushing to http://localhost:8001/
searching for changes
searching for changes
@@ -148,7 +148,7 @@ $ kill $(cat serve.pid)
Push over ssh
- $ $KHG clone -e "python $TESTDIR/dummyssh" --remotecmd "$KHG" ssh://user@dummy/r7 r9
+ $ $LHG clone -e "python $TESTDIR/dummyssh" --remotecmd "$LHG" ssh://user@dummy/r7 r9
requesting all changes
adding changesets
adding manifests
@@ -161,13 +161,13 @@ $ cd r9
$ cat >> .hg/hgrc <<!
> [ui]
- > remotecmd=$KHG --config largefiles.systemcache=$PWD/../cache6
+ > remotecmd=$LHG --config largefiles.systemcache=$PWD/../cache6
> ssh=python $TESTDIR/dummyssh
> !
$ echo c3 > f3
- $ $KHG add --large f3
- $ $KHG com -m "m3"
- $ $KHG push
+ $ $LHG add --large f3
+ $ $LHG com -m "m3"
+ $ $LHG push
pushing to ssh://user@dummy/r7
searching for changes
searching for changes
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
def checkfile(file, contents):
hgt.asserttrue(hgt.readfile(file) == contents, 'file contents dont match')
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
hgt.updaterc()
hgt.announce('setup')
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
def rejoin(path):
'''convert unix path to local convention'''
|
@@ -5,7 +5,7 @@ import os
import common
-hgt = common.BfilesTester()
+hgt = common.LfilesTester()
hgt.updaterc()
hgt.announce('setup')
|
Loading...