##// END OF EJS Templates
largefiles: hide passwords in URLs in ui messages
Mads Kiilerich -
r19950:cce7ab96 stable
parent child Browse files
Show More
@@ -1,217 +1,219 b''
1 # Copyright 2009-2010 Gregory P. Ward
1 # Copyright 2009-2010 Gregory P. Ward
2 # Copyright 2009-2010 Intelerad Medical Systems Incorporated
2 # Copyright 2009-2010 Intelerad Medical Systems Incorporated
3 # Copyright 2010-2011 Fog Creek Software
3 # Copyright 2010-2011 Fog Creek Software
4 # Copyright 2010-2011 Unity Technologies
4 # Copyright 2010-2011 Unity Technologies
5 #
5 #
6 # This software may be used and distributed according to the terms of the
6 # This software may be used and distributed according to the terms of the
7 # GNU General Public License version 2 or any later version.
7 # GNU General Public License version 2 or any later version.
8
8
9 '''base class for store implementations and store-related utility code'''
9 '''base class for store implementations and store-related utility code'''
10
10
11 import re
11 import re
12
12
13 from mercurial import util, node, hg
13 from mercurial import util, node, hg
14 from mercurial.i18n import _
14 from mercurial.i18n import _
15
15
16 import lfutil
16 import lfutil
17
17
18 class StoreError(Exception):
18 class StoreError(Exception):
19 '''Raised when there is a problem getting files from or putting
19 '''Raised when there is a problem getting files from or putting
20 files to a central store.'''
20 files to a central store.'''
21 def __init__(self, filename, hash, url, detail):
21 def __init__(self, filename, hash, url, detail):
22 self.filename = filename
22 self.filename = filename
23 self.hash = hash
23 self.hash = hash
24 self.url = url
24 self.url = url
25 self.detail = detail
25 self.detail = detail
26
26
27 def longmessage(self):
27 def longmessage(self):
28 return (_("error getting id %s from url %s for file %s: %s\n") %
28 return (_("error getting id %s from url %s for file %s: %s\n") %
29 (self.hash, self.url, self.filename, self.detail))
29 (self.hash, util.hidepassword(self.url), self.filename,
30 self.detail))
30
31
31 def __str__(self):
32 def __str__(self):
32 return "%s: %s" % (self.url, self.detail)
33 return "%s: %s" % (util.hidepassword(self.url), self.detail)
33
34
34 class basestore(object):
35 class basestore(object):
35 def __init__(self, ui, repo, url):
36 def __init__(self, ui, repo, url):
36 self.ui = ui
37 self.ui = ui
37 self.repo = repo
38 self.repo = repo
38 self.url = url
39 self.url = url
39
40
40 def put(self, source, hash):
41 def put(self, source, hash):
41 '''Put source file into the store so it can be retrieved by hash.'''
42 '''Put source file into the store so it can be retrieved by hash.'''
42 raise NotImplementedError('abstract method')
43 raise NotImplementedError('abstract method')
43
44
44 def exists(self, hashes):
45 def exists(self, hashes):
45 '''Check to see if the store contains the given hashes. Given an
46 '''Check to see if the store contains the given hashes. Given an
46 iterable of hashes it returns a mapping from hash to bool.'''
47 iterable of hashes it returns a mapping from hash to bool.'''
47 raise NotImplementedError('abstract method')
48 raise NotImplementedError('abstract method')
48
49
49 def get(self, files):
50 def get(self, files):
50 '''Get the specified largefiles from the store and write to local
51 '''Get the specified largefiles from the store and write to local
51 files under repo.root. files is a list of (filename, hash)
52 files under repo.root. files is a list of (filename, hash)
52 tuples. Return (success, missing), lists of files successfully
53 tuples. Return (success, missing), lists of files successfully
53 downloaded and those not found in the store. success is a list
54 downloaded and those not found in the store. success is a list
54 of (filename, hash) tuples; missing is a list of filenames that
55 of (filename, hash) tuples; missing is a list of filenames that
55 we could not get. (The detailed error message will already have
56 we could not get. (The detailed error message will already have
56 been presented to the user, so missing is just supplied as a
57 been presented to the user, so missing is just supplied as a
57 summary.)'''
58 summary.)'''
58 success = []
59 success = []
59 missing = []
60 missing = []
60 ui = self.ui
61 ui = self.ui
61
62
62 at = 0
63 at = 0
63 available = self.exists(set(hash for (_filename, hash) in files))
64 available = self.exists(set(hash for (_filename, hash) in files))
64 for filename, hash in files:
65 for filename, hash in files:
65 ui.progress(_('getting largefiles'), at, unit='lfile',
66 ui.progress(_('getting largefiles'), at, unit='lfile',
66 total=len(files))
67 total=len(files))
67 at += 1
68 at += 1
68 ui.note(_('getting %s:%s\n') % (filename, hash))
69 ui.note(_('getting %s:%s\n') % (filename, hash))
69
70
70 if not available.get(hash):
71 if not available.get(hash):
71 ui.warn(_('%s: largefile %s not available from %s\n')
72 ui.warn(_('%s: largefile %s not available from %s\n')
72 % (filename, hash, self.url))
73 % (filename, hash, util.hidepassword(self.url)))
73 missing.append(filename)
74 missing.append(filename)
74 continue
75 continue
75
76
76 if self._gethash(filename, hash):
77 if self._gethash(filename, hash):
77 success.append((filename, hash))
78 success.append((filename, hash))
78 else:
79 else:
79 missing.append(filename)
80 missing.append(filename)
80
81
81 ui.progress(_('getting largefiles'), None)
82 ui.progress(_('getting largefiles'), None)
82 return (success, missing)
83 return (success, missing)
83
84
84 def _gethash(self, filename, hash):
85 def _gethash(self, filename, hash):
85 """Get file with the provided hash and store it in the local repo's
86 """Get file with the provided hash and store it in the local repo's
86 store and in the usercache.
87 store and in the usercache.
87 filename is for informational messages only.
88 filename is for informational messages only.
88 """
89 """
89 util.makedirs(lfutil.storepath(self.repo, ''))
90 util.makedirs(lfutil.storepath(self.repo, ''))
90 storefilename = lfutil.storepath(self.repo, hash)
91 storefilename = lfutil.storepath(self.repo, hash)
91
92
92 tmpname = storefilename + '.tmp'
93 tmpname = storefilename + '.tmp'
93 tmpfile = util.atomictempfile(tmpname,
94 tmpfile = util.atomictempfile(tmpname,
94 createmode=self.repo.store.createmode)
95 createmode=self.repo.store.createmode)
95
96
96 try:
97 try:
97 gothash = self._getfile(tmpfile, filename, hash)
98 gothash = self._getfile(tmpfile, filename, hash)
98 except StoreError, err:
99 except StoreError, err:
99 self.ui.warn(err.longmessage())
100 self.ui.warn(err.longmessage())
100 gothash = ""
101 gothash = ""
101 tmpfile.close()
102 tmpfile.close()
102
103
103 if gothash != hash:
104 if gothash != hash:
104 if gothash != "":
105 if gothash != "":
105 self.ui.warn(_('%s: data corruption (expected %s, got %s)\n')
106 self.ui.warn(_('%s: data corruption (expected %s, got %s)\n')
106 % (filename, hash, gothash))
107 % (filename, hash, gothash))
107 util.unlink(tmpname)
108 util.unlink(tmpname)
108 return False
109 return False
109
110
110 util.rename(tmpname, storefilename)
111 util.rename(tmpname, storefilename)
111 lfutil.linktousercache(self.repo, hash)
112 lfutil.linktousercache(self.repo, hash)
112 return True
113 return True
113
114
114 def verify(self, revs, contents=False):
115 def verify(self, revs, contents=False):
115 '''Verify the existence (and, optionally, contents) of every big
116 '''Verify the existence (and, optionally, contents) of every big
116 file revision referenced by every changeset in revs.
117 file revision referenced by every changeset in revs.
117 Return 0 if all is well, non-zero on any errors.'''
118 Return 0 if all is well, non-zero on any errors.'''
118 failed = False
119 failed = False
119
120
120 self.ui.status(_('searching %d changesets for largefiles\n') %
121 self.ui.status(_('searching %d changesets for largefiles\n') %
121 len(revs))
122 len(revs))
122 verified = set() # set of (filename, filenode) tuples
123 verified = set() # set of (filename, filenode) tuples
123
124
124 for rev in revs:
125 for rev in revs:
125 cctx = self.repo[rev]
126 cctx = self.repo[rev]
126 cset = "%d:%s" % (cctx.rev(), node.short(cctx.node()))
127 cset = "%d:%s" % (cctx.rev(), node.short(cctx.node()))
127
128
128 for standin in cctx:
129 for standin in cctx:
129 if self._verifyfile(cctx, cset, contents, standin, verified):
130 if self._verifyfile(cctx, cset, contents, standin, verified):
130 failed = True
131 failed = True
131
132
132 numrevs = len(verified)
133 numrevs = len(verified)
133 numlfiles = len(set([fname for (fname, fnode) in verified]))
134 numlfiles = len(set([fname for (fname, fnode) in verified]))
134 if contents:
135 if contents:
135 self.ui.status(
136 self.ui.status(
136 _('verified contents of %d revisions of %d largefiles\n')
137 _('verified contents of %d revisions of %d largefiles\n')
137 % (numrevs, numlfiles))
138 % (numrevs, numlfiles))
138 else:
139 else:
139 self.ui.status(
140 self.ui.status(
140 _('verified existence of %d revisions of %d largefiles\n')
141 _('verified existence of %d revisions of %d largefiles\n')
141 % (numrevs, numlfiles))
142 % (numrevs, numlfiles))
142 return int(failed)
143 return int(failed)
143
144
144 def _getfile(self, tmpfile, filename, hash):
145 def _getfile(self, tmpfile, filename, hash):
145 '''Fetch one revision of one file from the store and write it
146 '''Fetch one revision of one file from the store and write it
146 to tmpfile. Compute the hash of the file on-the-fly as it
147 to tmpfile. Compute the hash of the file on-the-fly as it
147 downloads and return the hash. Close tmpfile. Raise
148 downloads and return the hash. Close tmpfile. Raise
148 StoreError if unable to download the file (e.g. it does not
149 StoreError if unable to download the file (e.g. it does not
149 exist in the store).'''
150 exist in the store).'''
150 raise NotImplementedError('abstract method')
151 raise NotImplementedError('abstract method')
151
152
152 def _verifyfile(self, cctx, cset, contents, standin, verified):
153 def _verifyfile(self, cctx, cset, contents, standin, verified):
153 '''Perform the actual verification of a file in the store.
154 '''Perform the actual verification of a file in the store.
154 'cset' is only used in warnings.
155 'cset' is only used in warnings.
155 'contents' controls verification of content hash.
156 'contents' controls verification of content hash.
156 'standin' is the standin path of the largefile to verify.
157 'standin' is the standin path of the largefile to verify.
157 'verified' is maintained as a set of already verified files.
158 'verified' is maintained as a set of already verified files.
158 Returns _true_ if it is a standin and any problems are found!
159 Returns _true_ if it is a standin and any problems are found!
159 '''
160 '''
160 raise NotImplementedError('abstract method')
161 raise NotImplementedError('abstract method')
161
162
162 import localstore, wirestore
163 import localstore, wirestore
163
164
164 _storeprovider = {
165 _storeprovider = {
165 'file': [localstore.localstore],
166 'file': [localstore.localstore],
166 'http': [wirestore.wirestore],
167 'http': [wirestore.wirestore],
167 'https': [wirestore.wirestore],
168 'https': [wirestore.wirestore],
168 'ssh': [wirestore.wirestore],
169 'ssh': [wirestore.wirestore],
169 }
170 }
170
171
171 _scheme_re = re.compile(r'^([a-zA-Z0-9+-.]+)://')
172 _scheme_re = re.compile(r'^([a-zA-Z0-9+-.]+)://')
172
173
173 # During clone this function is passed the src's ui object
174 # During clone this function is passed the src's ui object
174 # but it needs the dest's ui object so it can read out of
175 # but it needs the dest's ui object so it can read out of
175 # the config file. Use repo.ui instead.
176 # the config file. Use repo.ui instead.
176 def _openstore(repo, remote=None, put=False):
177 def _openstore(repo, remote=None, put=False):
177 ui = repo.ui
178 ui = repo.ui
178
179
179 if not remote:
180 if not remote:
180 lfpullsource = getattr(repo, 'lfpullsource', None)
181 lfpullsource = getattr(repo, 'lfpullsource', None)
181 if lfpullsource:
182 if lfpullsource:
182 path = ui.expandpath(lfpullsource)
183 path = ui.expandpath(lfpullsource)
183 else:
184 else:
184 path = ui.expandpath('default-push', 'default')
185 path = ui.expandpath('default-push', 'default')
185
186
186 # ui.expandpath() leaves 'default-push' and 'default' alone if
187 # ui.expandpath() leaves 'default-push' and 'default' alone if
187 # they cannot be expanded: fallback to the empty string,
188 # they cannot be expanded: fallback to the empty string,
188 # meaning the current directory.
189 # meaning the current directory.
189 if path == 'default-push' or path == 'default':
190 if path == 'default-push' or path == 'default':
190 path = ''
191 path = ''
191 remote = repo
192 remote = repo
192 else:
193 else:
193 path, _branches = hg.parseurl(path)
194 path, _branches = hg.parseurl(path)
194 remote = hg.peer(repo, {}, path)
195 remote = hg.peer(repo, {}, path)
195
196
196 # The path could be a scheme so use Mercurial's normal functionality
197 # The path could be a scheme so use Mercurial's normal functionality
197 # to resolve the scheme to a repository and use its path
198 # to resolve the scheme to a repository and use its path
198 path = util.safehasattr(remote, 'url') and remote.url() or remote.path
199 path = util.safehasattr(remote, 'url') and remote.url() or remote.path
199
200
200 match = _scheme_re.match(path)
201 match = _scheme_re.match(path)
201 if not match: # regular filesystem path
202 if not match: # regular filesystem path
202 scheme = 'file'
203 scheme = 'file'
203 else:
204 else:
204 scheme = match.group(1)
205 scheme = match.group(1)
205
206
206 try:
207 try:
207 storeproviders = _storeprovider[scheme]
208 storeproviders = _storeprovider[scheme]
208 except KeyError:
209 except KeyError:
209 raise util.Abort(_('unsupported URL scheme %r') % scheme)
210 raise util.Abort(_('unsupported URL scheme %r') % scheme)
210
211
211 for classobj in storeproviders:
212 for classobj in storeproviders:
212 try:
213 try:
213 return classobj(ui, repo, remote)
214 return classobj(ui, repo, remote)
214 except lfutil.storeprotonotcapable:
215 except lfutil.storeprotonotcapable:
215 pass
216 pass
216
217
217 raise util.Abort(_('%s does not appear to be a largefile store') % path)
218 raise util.Abort(_('%s does not appear to be a largefile store') %
219 util.hidepassword(path))
@@ -1,98 +1,100 b''
1 # Copyright 2010-2011 Fog Creek Software
1 # Copyright 2010-2011 Fog Creek Software
2 # Copyright 2010-2011 Unity Technologies
2 # Copyright 2010-2011 Unity Technologies
3 #
3 #
4 # This software may be used and distributed according to the terms of the
4 # This software may be used and distributed according to the terms of the
5 # GNU General Public License version 2 or any later version.
5 # GNU General Public License version 2 or any later version.
6
6
7 '''remote largefile store; the base class for wirestore'''
7 '''remote largefile store; the base class for wirestore'''
8
8
9 import urllib2
9 import urllib2
10
10
11 from mercurial import util
11 from mercurial import util
12 from mercurial.i18n import _
12 from mercurial.i18n import _
13 from mercurial.wireproto import remotebatch
13 from mercurial.wireproto import remotebatch
14
14
15 import lfutil
15 import lfutil
16 import basestore
16 import basestore
17
17
18 class remotestore(basestore.basestore):
18 class remotestore(basestore.basestore):
19 '''a largefile store accessed over a network'''
19 '''a largefile store accessed over a network'''
20 def __init__(self, ui, repo, url):
20 def __init__(self, ui, repo, url):
21 super(remotestore, self).__init__(ui, repo, url)
21 super(remotestore, self).__init__(ui, repo, url)
22
22
23 def put(self, source, hash):
23 def put(self, source, hash):
24 if self.sendfile(source, hash):
24 if self.sendfile(source, hash):
25 raise util.Abort(
25 raise util.Abort(
26 _('remotestore: could not put %s to remote store %s')
26 _('remotestore: could not put %s to remote store %s')
27 % (source, self.url))
27 % (source, util.hidepassword(self.url)))
28 self.ui.debug(
28 self.ui.debug(
29 _('remotestore: put %s to remote store %s\n') % (source, self.url))
29 _('remotestore: put %s to remote store %s\n')
30 % (source, util.hidepassword(self.url)))
30
31
31 def exists(self, hashes):
32 def exists(self, hashes):
32 return dict((h, s == 0) for (h, s) in self._stat(hashes).iteritems())
33 return dict((h, s == 0) for (h, s) in self._stat(hashes).iteritems())
33
34
34 def sendfile(self, filename, hash):
35 def sendfile(self, filename, hash):
35 self.ui.debug('remotestore: sendfile(%s, %s)\n' % (filename, hash))
36 self.ui.debug('remotestore: sendfile(%s, %s)\n' % (filename, hash))
36 fd = None
37 fd = None
37 try:
38 try:
38 try:
39 try:
39 fd = lfutil.httpsendfile(self.ui, filename)
40 fd = lfutil.httpsendfile(self.ui, filename)
40 except IOError, e:
41 except IOError, e:
41 raise util.Abort(
42 raise util.Abort(
42 _('remotestore: could not open file %s: %s')
43 _('remotestore: could not open file %s: %s')
43 % (filename, str(e)))
44 % (filename, str(e)))
44 return self._put(hash, fd)
45 return self._put(hash, fd)
45 finally:
46 finally:
46 if fd:
47 if fd:
47 fd.close()
48 fd.close()
48
49
49 def _getfile(self, tmpfile, filename, hash):
50 def _getfile(self, tmpfile, filename, hash):
50 try:
51 try:
51 chunks = self._get(hash)
52 chunks = self._get(hash)
52 except urllib2.HTTPError, e:
53 except urllib2.HTTPError, e:
53 # 401s get converted to util.Aborts; everything else is fine being
54 # 401s get converted to util.Aborts; everything else is fine being
54 # turned into a StoreError
55 # turned into a StoreError
55 raise basestore.StoreError(filename, hash, self.url, str(e))
56 raise basestore.StoreError(filename, hash, self.url, str(e))
56 except urllib2.URLError, e:
57 except urllib2.URLError, e:
57 # This usually indicates a connection problem, so don't
58 # This usually indicates a connection problem, so don't
58 # keep trying with the other files... they will probably
59 # keep trying with the other files... they will probably
59 # all fail too.
60 # all fail too.
60 raise util.Abort('%s: %s' % (self.url, e.reason))
61 raise util.Abort('%s: %s' %
62 (util.hidepassword(self.url), e.reason))
61 except IOError, e:
63 except IOError, e:
62 raise basestore.StoreError(filename, hash, self.url, str(e))
64 raise basestore.StoreError(filename, hash, self.url, str(e))
63
65
64 return lfutil.copyandhash(chunks, tmpfile)
66 return lfutil.copyandhash(chunks, tmpfile)
65
67
66 def _verifyfile(self, cctx, cset, contents, standin, verified):
68 def _verifyfile(self, cctx, cset, contents, standin, verified):
67 filename = lfutil.splitstandin(standin)
69 filename = lfutil.splitstandin(standin)
68 if not filename:
70 if not filename:
69 return False
71 return False
70 fctx = cctx[standin]
72 fctx = cctx[standin]
71 key = (filename, fctx.filenode())
73 key = (filename, fctx.filenode())
72 if key in verified:
74 if key in verified:
73 return False
75 return False
74
76
75 verified.add(key)
77 verified.add(key)
76
78
77 expecthash = fctx.data()[0:40]
79 expecthash = fctx.data()[0:40]
78 stat = self._stat([expecthash])[expecthash]
80 stat = self._stat([expecthash])[expecthash]
79 if not stat:
81 if not stat:
80 return False
82 return False
81 elif stat == 1:
83 elif stat == 1:
82 self.ui.warn(
84 self.ui.warn(
83 _('changeset %s: %s: contents differ\n')
85 _('changeset %s: %s: contents differ\n')
84 % (cset, filename))
86 % (cset, filename))
85 return True # failed
87 return True # failed
86 elif stat == 2:
88 elif stat == 2:
87 self.ui.warn(
89 self.ui.warn(
88 _('changeset %s: %s missing\n')
90 _('changeset %s: %s missing\n')
89 % (cset, filename))
91 % (cset, filename))
90 return True # failed
92 return True # failed
91 else:
93 else:
92 raise RuntimeError('verify failed: unexpected response from '
94 raise RuntimeError('verify failed: unexpected response from '
93 'statlfile (%r)' % stat)
95 'statlfile (%r)' % stat)
94
96
95 def batch(self):
97 def batch(self):
96 '''Support for remote batching.'''
98 '''Support for remote batching.'''
97 return remotebatch(self)
99 return remotebatch(self)
98
100
@@ -1,136 +1,136 b''
1 Create user cache directory
1 Create user cache directory
2
2
3 $ USERCACHE=`pwd`/cache; export USERCACHE
3 $ USERCACHE=`pwd`/cache; export USERCACHE
4 $ cat <<EOF >> ${HGRCPATH}
4 $ cat <<EOF >> ${HGRCPATH}
5 > [extensions]
5 > [extensions]
6 > hgext.largefiles=
6 > hgext.largefiles=
7 > [largefiles]
7 > [largefiles]
8 > usercache=${USERCACHE}
8 > usercache=${USERCACHE}
9 > EOF
9 > EOF
10 $ mkdir -p ${USERCACHE}
10 $ mkdir -p ${USERCACHE}
11
11
12 Create source repo, and commit adding largefile.
12 Create source repo, and commit adding largefile.
13
13
14 $ hg init src
14 $ hg init src
15 $ cd src
15 $ cd src
16 $ echo large > large
16 $ echo large > large
17 $ hg add --large large
17 $ hg add --large large
18 $ hg commit -m 'add largefile'
18 $ hg commit -m 'add largefile'
19 $ hg rm large
19 $ hg rm large
20 $ hg commit -m 'branchhead without largefile'
20 $ hg commit -m 'branchhead without largefile'
21 $ hg up -qr 0
21 $ hg up -qr 0
22 $ cd ..
22 $ cd ..
23
23
24 Discard all cached largefiles in USERCACHE
24 Discard all cached largefiles in USERCACHE
25
25
26 $ rm -rf ${USERCACHE}
26 $ rm -rf ${USERCACHE}
27
27
28 Create mirror repo, and pull from source without largefile:
28 Create mirror repo, and pull from source without largefile:
29 "pull" is used instead of "clone" for suppression of (1) updating to
29 "pull" is used instead of "clone" for suppression of (1) updating to
30 tip (= cahcing largefile from source repo), and (2) recording source
30 tip (= cahcing largefile from source repo), and (2) recording source
31 repo as "default" path in .hg/hgrc.
31 repo as "default" path in .hg/hgrc.
32
32
33 $ hg init mirror
33 $ hg init mirror
34 $ cd mirror
34 $ cd mirror
35 $ hg pull ../src
35 $ hg pull ../src
36 pulling from ../src
36 pulling from ../src
37 requesting all changes
37 requesting all changes
38 adding changesets
38 adding changesets
39 adding manifests
39 adding manifests
40 adding file changes
40 adding file changes
41 added 2 changesets with 1 changes to 1 files
41 added 2 changesets with 1 changes to 1 files
42 (run 'hg update' to get a working copy)
42 (run 'hg update' to get a working copy)
43
43
44 Update working directory to "tip", which requires largefile("large"),
44 Update working directory to "tip", which requires largefile("large"),
45 but there is no cache file for it. So, hg must treat it as
45 but there is no cache file for it. So, hg must treat it as
46 "missing"(!) file.
46 "missing"(!) file.
47
47
48 $ hg update -r0
48 $ hg update -r0
49 getting changed largefiles
49 getting changed largefiles
50 large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:$TESTTMP/mirror (glob)
50 large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file://$TESTTMP/mirror (glob)
51 0 largefiles updated, 0 removed
51 0 largefiles updated, 0 removed
52 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
52 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
53 $ hg status
53 $ hg status
54 ! large
54 ! large
55
55
56 Update working directory to null: this cleanup .hg/largefiles/dirstate
56 Update working directory to null: this cleanup .hg/largefiles/dirstate
57
57
58 $ hg update null
58 $ hg update null
59 getting changed largefiles
59 getting changed largefiles
60 0 largefiles updated, 0 removed
60 0 largefiles updated, 0 removed
61 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
61 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
62
62
63 Update working directory to tip, again.
63 Update working directory to tip, again.
64
64
65 $ hg update -r0
65 $ hg update -r0
66 getting changed largefiles
66 getting changed largefiles
67 large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:$TESTTMP/mirror (glob)
67 large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file://$TESTTMP/mirror (glob)
68 0 largefiles updated, 0 removed
68 0 largefiles updated, 0 removed
69 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
70 $ hg status
70 $ hg status
71 ! large
71 ! large
72 $ cd ..
72 $ cd ..
73
73
74 Verify that largefiles from pulled branchheads are fetched, also to an empty repo
74 Verify that largefiles from pulled branchheads are fetched, also to an empty repo
75
75
76 $ hg init mirror2
76 $ hg init mirror2
77 $ hg -R mirror2 pull src -r0
77 $ hg -R mirror2 pull src -r0
78 pulling from src
78 pulling from src
79 adding changesets
79 adding changesets
80 adding manifests
80 adding manifests
81 adding file changes
81 adding file changes
82 added 1 changesets with 1 changes to 1 files
82 added 1 changesets with 1 changes to 1 files
83 (run 'hg update' to get a working copy)
83 (run 'hg update' to get a working copy)
84
84
85 #if unix-permissions
85 #if unix-permissions
86
86
87 Portable way to print file permissions:
87 Portable way to print file permissions:
88
88
89 $ cat > ls-l.py <<EOF
89 $ cat > ls-l.py <<EOF
90 > #!/usr/bin/env python
90 > #!/usr/bin/env python
91 > import sys, os
91 > import sys, os
92 > path = sys.argv[1]
92 > path = sys.argv[1]
93 > print '%03o' % (os.lstat(path).st_mode & 0777)
93 > print '%03o' % (os.lstat(path).st_mode & 0777)
94 > EOF
94 > EOF
95 $ chmod +x ls-l.py
95 $ chmod +x ls-l.py
96
96
97 Test that files in .hg/largefiles inherit mode from .hg/store, not
97 Test that files in .hg/largefiles inherit mode from .hg/store, not
98 from file in working copy:
98 from file in working copy:
99
99
100 $ cd src
100 $ cd src
101 $ chmod 750 .hg/store
101 $ chmod 750 .hg/store
102 $ chmod 660 large
102 $ chmod 660 large
103 $ echo change >> large
103 $ echo change >> large
104 $ hg commit -m change
104 $ hg commit -m change
105 created new head
105 created new head
106 $ ../ls-l.py .hg/largefiles/e151b474069de4ca6898f67ce2f2a7263adf8fea
106 $ ../ls-l.py .hg/largefiles/e151b474069de4ca6898f67ce2f2a7263adf8fea
107 640
107 640
108
108
109 Test permission of with files in .hg/largefiles created by update:
109 Test permission of with files in .hg/largefiles created by update:
110
110
111 $ cd ../mirror
111 $ cd ../mirror
112 $ rm -r "$USERCACHE" .hg/largefiles # avoid links
112 $ rm -r "$USERCACHE" .hg/largefiles # avoid links
113 $ chmod 750 .hg/store
113 $ chmod 750 .hg/store
114 $ hg pull ../src --update -q
114 $ hg pull ../src --update -q
115 $ ../ls-l.py .hg/largefiles/e151b474069de4ca6898f67ce2f2a7263adf8fea
115 $ ../ls-l.py .hg/largefiles/e151b474069de4ca6898f67ce2f2a7263adf8fea
116 640
116 640
117
117
118 Test permission of files created by push:
118 Test permission of files created by push:
119
119
120 $ hg serve -R ../src -d -p $HGPORT --pid-file hg.pid \
120 $ hg serve -R ../src -d -p $HGPORT --pid-file hg.pid \
121 > --config "web.allow_push=*" --config web.push_ssl=no
121 > --config "web.allow_push=*" --config web.push_ssl=no
122 $ cat hg.pid >> $DAEMON_PIDS
122 $ cat hg.pid >> $DAEMON_PIDS
123
123
124 $ echo change >> large
124 $ echo change >> large
125 $ hg commit -m change
125 $ hg commit -m change
126
126
127 $ rm -r "$USERCACHE"
127 $ rm -r "$USERCACHE"
128
128
129 $ hg push -q http://localhost:$HGPORT/
129 $ hg push -q http://localhost:$HGPORT/
130
130
131 $ ../ls-l.py ../src/.hg/largefiles/b734e14a0971e370408ab9bce8d56d8485e368a9
131 $ ../ls-l.py ../src/.hg/largefiles/b734e14a0971e370408ab9bce8d56d8485e368a9
132 640
132 640
133
133
134 $ cd ..
134 $ cd ..
135
135
136 #endif
136 #endif
@@ -1,2254 +1,2254 b''
1 $ USERCACHE="$TESTTMP/cache"; export USERCACHE
1 $ USERCACHE="$TESTTMP/cache"; export USERCACHE
2 $ mkdir "${USERCACHE}"
2 $ mkdir "${USERCACHE}"
3 $ cat >> $HGRCPATH <<EOF
3 $ cat >> $HGRCPATH <<EOF
4 > [extensions]
4 > [extensions]
5 > largefiles=
5 > largefiles=
6 > purge=
6 > purge=
7 > rebase=
7 > rebase=
8 > transplant=
8 > transplant=
9 > [phases]
9 > [phases]
10 > publish=False
10 > publish=False
11 > [largefiles]
11 > [largefiles]
12 > minsize=2
12 > minsize=2
13 > patterns=glob:**.dat
13 > patterns=glob:**.dat
14 > usercache=${USERCACHE}
14 > usercache=${USERCACHE}
15 > [hooks]
15 > [hooks]
16 > precommit=sh -c "echo \\"Invoking status precommit hook\\"; hg status"
16 > precommit=sh -c "echo \\"Invoking status precommit hook\\"; hg status"
17 > EOF
17 > EOF
18
18
19 Create the repo with a couple of revisions of both large and normal
19 Create the repo with a couple of revisions of both large and normal
20 files.
20 files.
21 Test status and dirstate of largefiles and that summary output is correct.
21 Test status and dirstate of largefiles and that summary output is correct.
22
22
23 $ hg init a
23 $ hg init a
24 $ cd a
24 $ cd a
25 $ mkdir sub
25 $ mkdir sub
26 $ echo normal1 > normal1
26 $ echo normal1 > normal1
27 $ echo normal2 > sub/normal2
27 $ echo normal2 > sub/normal2
28 $ echo large1 > large1
28 $ echo large1 > large1
29 $ echo large2 > sub/large2
29 $ echo large2 > sub/large2
30 $ hg add normal1 sub/normal2
30 $ hg add normal1 sub/normal2
31 $ hg add --large large1 sub/large2
31 $ hg add --large large1 sub/large2
32 $ hg commit -m "add files"
32 $ hg commit -m "add files"
33 Invoking status precommit hook
33 Invoking status precommit hook
34 A large1
34 A large1
35 A normal1
35 A normal1
36 A sub/large2
36 A sub/large2
37 A sub/normal2
37 A sub/normal2
38 $ touch large1 sub/large2
38 $ touch large1 sub/large2
39 $ sleep 1
39 $ sleep 1
40 $ hg st
40 $ hg st
41 $ hg debugstate --nodates
41 $ hg debugstate --nodates
42 n 644 41 .hglf/large1
42 n 644 41 .hglf/large1
43 n 644 41 .hglf/sub/large2
43 n 644 41 .hglf/sub/large2
44 n 644 8 normal1
44 n 644 8 normal1
45 n 644 8 sub/normal2
45 n 644 8 sub/normal2
46 $ hg debugstate --large
46 $ hg debugstate --large
47 n 644 7 large1
47 n 644 7 large1
48 n 644 7 sub/large2
48 n 644 7 sub/large2
49 $ echo normal11 > normal1
49 $ echo normal11 > normal1
50 $ echo normal22 > sub/normal2
50 $ echo normal22 > sub/normal2
51 $ echo large11 > large1
51 $ echo large11 > large1
52 $ echo large22 > sub/large2
52 $ echo large22 > sub/large2
53 $ hg commit -m "edit files"
53 $ hg commit -m "edit files"
54 Invoking status precommit hook
54 Invoking status precommit hook
55 M large1
55 M large1
56 M normal1
56 M normal1
57 M sub/large2
57 M sub/large2
58 M sub/normal2
58 M sub/normal2
59 $ hg sum --large
59 $ hg sum --large
60 parent: 1:ce8896473775 tip
60 parent: 1:ce8896473775 tip
61 edit files
61 edit files
62 branch: default
62 branch: default
63 commit: (clean)
63 commit: (clean)
64 update: (current)
64 update: (current)
65 largefiles: (no remote repo)
65 largefiles: (no remote repo)
66
66
67 Commit preserved largefile contents.
67 Commit preserved largefile contents.
68
68
69 $ cat normal1
69 $ cat normal1
70 normal11
70 normal11
71 $ cat large1
71 $ cat large1
72 large11
72 large11
73 $ cat sub/normal2
73 $ cat sub/normal2
74 normal22
74 normal22
75 $ cat sub/large2
75 $ cat sub/large2
76 large22
76 large22
77
77
78 Test status, subdir and unknown files
78 Test status, subdir and unknown files
79
79
80 $ echo unknown > sub/unknown
80 $ echo unknown > sub/unknown
81 $ hg st --all
81 $ hg st --all
82 ? sub/unknown
82 ? sub/unknown
83 C large1
83 C large1
84 C normal1
84 C normal1
85 C sub/large2
85 C sub/large2
86 C sub/normal2
86 C sub/normal2
87 $ hg st --all sub
87 $ hg st --all sub
88 ? sub/unknown
88 ? sub/unknown
89 C sub/large2
89 C sub/large2
90 C sub/normal2
90 C sub/normal2
91 $ rm sub/unknown
91 $ rm sub/unknown
92
92
93 Test messages and exit codes for remove warning cases
93 Test messages and exit codes for remove warning cases
94
94
95 $ hg remove -A large1
95 $ hg remove -A large1
96 not removing large1: file still exists
96 not removing large1: file still exists
97 [1]
97 [1]
98 $ echo 'modified' > large1
98 $ echo 'modified' > large1
99 $ hg remove large1
99 $ hg remove large1
100 not removing large1: file is modified (use -f to force removal)
100 not removing large1: file is modified (use -f to force removal)
101 [1]
101 [1]
102 $ echo 'new' > normalnew
102 $ echo 'new' > normalnew
103 $ hg add normalnew
103 $ hg add normalnew
104 $ echo 'new' > largenew
104 $ echo 'new' > largenew
105 $ hg add --large normalnew
105 $ hg add --large normalnew
106 normalnew already tracked!
106 normalnew already tracked!
107 $ hg remove normalnew largenew
107 $ hg remove normalnew largenew
108 not removing largenew: file is untracked
108 not removing largenew: file is untracked
109 not removing normalnew: file has been marked for add (use forget to undo)
109 not removing normalnew: file has been marked for add (use forget to undo)
110 [1]
110 [1]
111 $ rm normalnew largenew
111 $ rm normalnew largenew
112 $ hg up -Cq
112 $ hg up -Cq
113
113
114 Remove both largefiles and normal files.
114 Remove both largefiles and normal files.
115
115
116 $ hg remove normal1 large1
116 $ hg remove normal1 large1
117 $ hg status large1
117 $ hg status large1
118 R large1
118 R large1
119 $ hg commit -m "remove files"
119 $ hg commit -m "remove files"
120 Invoking status precommit hook
120 Invoking status precommit hook
121 R large1
121 R large1
122 R normal1
122 R normal1
123 $ ls
123 $ ls
124 sub
124 sub
125 $ echo "testlargefile" > large1-test
125 $ echo "testlargefile" > large1-test
126 $ hg add --large large1-test
126 $ hg add --large large1-test
127 $ hg st
127 $ hg st
128 A large1-test
128 A large1-test
129 $ hg rm large1-test
129 $ hg rm large1-test
130 not removing large1-test: file has been marked for add (use forget to undo)
130 not removing large1-test: file has been marked for add (use forget to undo)
131 [1]
131 [1]
132 $ hg st
132 $ hg st
133 A large1-test
133 A large1-test
134 $ hg forget large1-test
134 $ hg forget large1-test
135 $ hg st
135 $ hg st
136 ? large1-test
136 ? large1-test
137 $ hg remove large1-test
137 $ hg remove large1-test
138 not removing large1-test: file is untracked
138 not removing large1-test: file is untracked
139 [1]
139 [1]
140 $ hg forget large1-test
140 $ hg forget large1-test
141 not removing large1-test: file is already untracked
141 not removing large1-test: file is already untracked
142 [1]
142 [1]
143 $ rm large1-test
143 $ rm large1-test
144
144
145 Copy both largefiles and normal files (testing that status output is correct).
145 Copy both largefiles and normal files (testing that status output is correct).
146
146
147 $ hg cp sub/normal2 normal1
147 $ hg cp sub/normal2 normal1
148 $ hg cp sub/large2 large1
148 $ hg cp sub/large2 large1
149 $ hg commit -m "copy files"
149 $ hg commit -m "copy files"
150 Invoking status precommit hook
150 Invoking status precommit hook
151 A large1
151 A large1
152 A normal1
152 A normal1
153 $ cat normal1
153 $ cat normal1
154 normal22
154 normal22
155 $ cat large1
155 $ cat large1
156 large22
156 large22
157
157
158 Test moving largefiles and verify that normal files are also unaffected.
158 Test moving largefiles and verify that normal files are also unaffected.
159
159
160 $ hg mv normal1 normal3
160 $ hg mv normal1 normal3
161 $ hg mv large1 large3
161 $ hg mv large1 large3
162 $ hg mv sub/normal2 sub/normal4
162 $ hg mv sub/normal2 sub/normal4
163 $ hg mv sub/large2 sub/large4
163 $ hg mv sub/large2 sub/large4
164 $ hg commit -m "move files"
164 $ hg commit -m "move files"
165 Invoking status precommit hook
165 Invoking status precommit hook
166 A large3
166 A large3
167 A normal3
167 A normal3
168 A sub/large4
168 A sub/large4
169 A sub/normal4
169 A sub/normal4
170 R large1
170 R large1
171 R normal1
171 R normal1
172 R sub/large2
172 R sub/large2
173 R sub/normal2
173 R sub/normal2
174 $ cat normal3
174 $ cat normal3
175 normal22
175 normal22
176 $ cat large3
176 $ cat large3
177 large22
177 large22
178 $ cat sub/normal4
178 $ cat sub/normal4
179 normal22
179 normal22
180 $ cat sub/large4
180 $ cat sub/large4
181 large22
181 large22
182
182
183 Test copies and moves from a directory other than root (issue3516)
183 Test copies and moves from a directory other than root (issue3516)
184
184
185 $ cd ..
185 $ cd ..
186 $ hg init lf_cpmv
186 $ hg init lf_cpmv
187 $ cd lf_cpmv
187 $ cd lf_cpmv
188 $ mkdir dira
188 $ mkdir dira
189 $ mkdir dira/dirb
189 $ mkdir dira/dirb
190 $ touch dira/dirb/largefile
190 $ touch dira/dirb/largefile
191 $ hg add --large dira/dirb/largefile
191 $ hg add --large dira/dirb/largefile
192 $ hg commit -m "added"
192 $ hg commit -m "added"
193 Invoking status precommit hook
193 Invoking status precommit hook
194 A dira/dirb/largefile
194 A dira/dirb/largefile
195 $ cd dira
195 $ cd dira
196 $ hg cp dirb/largefile foo/largefile
196 $ hg cp dirb/largefile foo/largefile
197 $ hg ci -m "deep copy"
197 $ hg ci -m "deep copy"
198 Invoking status precommit hook
198 Invoking status precommit hook
199 A dira/foo/largefile
199 A dira/foo/largefile
200 $ find . | sort
200 $ find . | sort
201 .
201 .
202 ./dirb
202 ./dirb
203 ./dirb/largefile
203 ./dirb/largefile
204 ./foo
204 ./foo
205 ./foo/largefile
205 ./foo/largefile
206 $ hg mv foo/largefile baz/largefile
206 $ hg mv foo/largefile baz/largefile
207 $ hg ci -m "moved"
207 $ hg ci -m "moved"
208 Invoking status precommit hook
208 Invoking status precommit hook
209 A dira/baz/largefile
209 A dira/baz/largefile
210 R dira/foo/largefile
210 R dira/foo/largefile
211 $ find . | sort
211 $ find . | sort
212 .
212 .
213 ./baz
213 ./baz
214 ./baz/largefile
214 ./baz/largefile
215 ./dirb
215 ./dirb
216 ./dirb/largefile
216 ./dirb/largefile
217 ./foo
217 ./foo
218 $ cd ../../a
218 $ cd ../../a
219
219
220 #if serve
220 #if serve
221 Test display of largefiles in hgweb
221 Test display of largefiles in hgweb
222
222
223 $ hg serve -d -p $HGPORT --pid-file ../hg.pid
223 $ hg serve -d -p $HGPORT --pid-file ../hg.pid
224 $ cat ../hg.pid >> $DAEMON_PIDS
224 $ cat ../hg.pid >> $DAEMON_PIDS
225 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/?style=raw'
225 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/?style=raw'
226 200 Script output follows
226 200 Script output follows
227
227
228
228
229 drwxr-xr-x sub
229 drwxr-xr-x sub
230 -rw-r--r-- 41 large3
230 -rw-r--r-- 41 large3
231 -rw-r--r-- 9 normal3
231 -rw-r--r-- 9 normal3
232
232
233
233
234 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/sub/?style=raw'
234 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/sub/?style=raw'
235 200 Script output follows
235 200 Script output follows
236
236
237
237
238 -rw-r--r-- 41 large4
238 -rw-r--r-- 41 large4
239 -rw-r--r-- 9 normal4
239 -rw-r--r-- 9 normal4
240
240
241
241
242 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
242 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
243 #endif
243 #endif
244
244
245 Test archiving the various revisions. These hit corner cases known with
245 Test archiving the various revisions. These hit corner cases known with
246 archiving.
246 archiving.
247
247
248 $ hg archive -r 0 ../archive0
248 $ hg archive -r 0 ../archive0
249 $ hg archive -r 1 ../archive1
249 $ hg archive -r 1 ../archive1
250 $ hg archive -r 2 ../archive2
250 $ hg archive -r 2 ../archive2
251 $ hg archive -r 3 ../archive3
251 $ hg archive -r 3 ../archive3
252 $ hg archive -r 4 ../archive4
252 $ hg archive -r 4 ../archive4
253 $ cd ../archive0
253 $ cd ../archive0
254 $ cat normal1
254 $ cat normal1
255 normal1
255 normal1
256 $ cat large1
256 $ cat large1
257 large1
257 large1
258 $ cat sub/normal2
258 $ cat sub/normal2
259 normal2
259 normal2
260 $ cat sub/large2
260 $ cat sub/large2
261 large2
261 large2
262 $ cd ../archive1
262 $ cd ../archive1
263 $ cat normal1
263 $ cat normal1
264 normal11
264 normal11
265 $ cat large1
265 $ cat large1
266 large11
266 large11
267 $ cat sub/normal2
267 $ cat sub/normal2
268 normal22
268 normal22
269 $ cat sub/large2
269 $ cat sub/large2
270 large22
270 large22
271 $ cd ../archive2
271 $ cd ../archive2
272 $ ls
272 $ ls
273 sub
273 sub
274 $ cat sub/normal2
274 $ cat sub/normal2
275 normal22
275 normal22
276 $ cat sub/large2
276 $ cat sub/large2
277 large22
277 large22
278 $ cd ../archive3
278 $ cd ../archive3
279 $ cat normal1
279 $ cat normal1
280 normal22
280 normal22
281 $ cat large1
281 $ cat large1
282 large22
282 large22
283 $ cat sub/normal2
283 $ cat sub/normal2
284 normal22
284 normal22
285 $ cat sub/large2
285 $ cat sub/large2
286 large22
286 large22
287 $ cd ../archive4
287 $ cd ../archive4
288 $ cat normal3
288 $ cat normal3
289 normal22
289 normal22
290 $ cat large3
290 $ cat large3
291 large22
291 large22
292 $ cat sub/normal4
292 $ cat sub/normal4
293 normal22
293 normal22
294 $ cat sub/large4
294 $ cat sub/large4
295 large22
295 large22
296
296
297 Commit corner case: specify files to commit.
297 Commit corner case: specify files to commit.
298
298
299 $ cd ../a
299 $ cd ../a
300 $ echo normal3 > normal3
300 $ echo normal3 > normal3
301 $ echo large3 > large3
301 $ echo large3 > large3
302 $ echo normal4 > sub/normal4
302 $ echo normal4 > sub/normal4
303 $ echo large4 > sub/large4
303 $ echo large4 > sub/large4
304 $ hg commit normal3 large3 sub/normal4 sub/large4 -m "edit files again"
304 $ hg commit normal3 large3 sub/normal4 sub/large4 -m "edit files again"
305 Invoking status precommit hook
305 Invoking status precommit hook
306 M large3
306 M large3
307 M normal3
307 M normal3
308 M sub/large4
308 M sub/large4
309 M sub/normal4
309 M sub/normal4
310 $ cat normal3
310 $ cat normal3
311 normal3
311 normal3
312 $ cat large3
312 $ cat large3
313 large3
313 large3
314 $ cat sub/normal4
314 $ cat sub/normal4
315 normal4
315 normal4
316 $ cat sub/large4
316 $ cat sub/large4
317 large4
317 large4
318
318
319 One more commit corner case: commit from a subdirectory.
319 One more commit corner case: commit from a subdirectory.
320
320
321 $ cd ../a
321 $ cd ../a
322 $ echo normal33 > normal3
322 $ echo normal33 > normal3
323 $ echo large33 > large3
323 $ echo large33 > large3
324 $ echo normal44 > sub/normal4
324 $ echo normal44 > sub/normal4
325 $ echo large44 > sub/large4
325 $ echo large44 > sub/large4
326 $ cd sub
326 $ cd sub
327 $ hg commit -m "edit files yet again"
327 $ hg commit -m "edit files yet again"
328 Invoking status precommit hook
328 Invoking status precommit hook
329 M large3
329 M large3
330 M normal3
330 M normal3
331 M sub/large4
331 M sub/large4
332 M sub/normal4
332 M sub/normal4
333 $ cat ../normal3
333 $ cat ../normal3
334 normal33
334 normal33
335 $ cat ../large3
335 $ cat ../large3
336 large33
336 large33
337 $ cat normal4
337 $ cat normal4
338 normal44
338 normal44
339 $ cat large4
339 $ cat large4
340 large44
340 large44
341
341
342 Committing standins is not allowed.
342 Committing standins is not allowed.
343
343
344 $ cd ..
344 $ cd ..
345 $ echo large3 > large3
345 $ echo large3 > large3
346 $ hg commit .hglf/large3 -m "try to commit standin"
346 $ hg commit .hglf/large3 -m "try to commit standin"
347 abort: file ".hglf/large3" is a largefile standin
347 abort: file ".hglf/large3" is a largefile standin
348 (commit the largefile itself instead)
348 (commit the largefile itself instead)
349 [255]
349 [255]
350
350
351 Corner cases for adding largefiles.
351 Corner cases for adding largefiles.
352
352
353 $ echo large5 > large5
353 $ echo large5 > large5
354 $ hg add --large large5
354 $ hg add --large large5
355 $ hg add --large large5
355 $ hg add --large large5
356 large5 already a largefile
356 large5 already a largefile
357 $ mkdir sub2
357 $ mkdir sub2
358 $ echo large6 > sub2/large6
358 $ echo large6 > sub2/large6
359 $ echo large7 > sub2/large7
359 $ echo large7 > sub2/large7
360 $ hg add --large sub2
360 $ hg add --large sub2
361 adding sub2/large6 as a largefile (glob)
361 adding sub2/large6 as a largefile (glob)
362 adding sub2/large7 as a largefile (glob)
362 adding sub2/large7 as a largefile (glob)
363 $ hg st
363 $ hg st
364 M large3
364 M large3
365 A large5
365 A large5
366 A sub2/large6
366 A sub2/large6
367 A sub2/large7
367 A sub2/large7
368
368
369 Committing directories containing only largefiles.
369 Committing directories containing only largefiles.
370
370
371 $ mkdir -p z/y/x/m
371 $ mkdir -p z/y/x/m
372 $ touch z/y/x/m/large1
372 $ touch z/y/x/m/large1
373 $ touch z/y/x/large2
373 $ touch z/y/x/large2
374 $ hg add --large z/y/x/m/large1 z/y/x/large2
374 $ hg add --large z/y/x/m/large1 z/y/x/large2
375 $ hg commit -m "Subdir with directory only containing largefiles" z
375 $ hg commit -m "Subdir with directory only containing largefiles" z
376 Invoking status precommit hook
376 Invoking status precommit hook
377 M large3
377 M large3
378 A large5
378 A large5
379 A sub2/large6
379 A sub2/large6
380 A sub2/large7
380 A sub2/large7
381 A z/y/x/large2
381 A z/y/x/large2
382 A z/y/x/m/large1
382 A z/y/x/m/large1
383 $ hg rollback --quiet
383 $ hg rollback --quiet
384 $ touch z/y/x/m/normal
384 $ touch z/y/x/m/normal
385 $ hg add z/y/x/m/normal
385 $ hg add z/y/x/m/normal
386 $ hg commit -m "Subdir with mixed contents" z
386 $ hg commit -m "Subdir with mixed contents" z
387 Invoking status precommit hook
387 Invoking status precommit hook
388 M large3
388 M large3
389 A large5
389 A large5
390 A sub2/large6
390 A sub2/large6
391 A sub2/large7
391 A sub2/large7
392 A z/y/x/large2
392 A z/y/x/large2
393 A z/y/x/m/large1
393 A z/y/x/m/large1
394 A z/y/x/m/normal
394 A z/y/x/m/normal
395 $ hg st
395 $ hg st
396 M large3
396 M large3
397 A large5
397 A large5
398 A sub2/large6
398 A sub2/large6
399 A sub2/large7
399 A sub2/large7
400 $ hg rollback --quiet
400 $ hg rollback --quiet
401 $ hg revert z/y/x/large2 z/y/x/m/large1
401 $ hg revert z/y/x/large2 z/y/x/m/large1
402 $ rm z/y/x/large2 z/y/x/m/large1
402 $ rm z/y/x/large2 z/y/x/m/large1
403 $ hg commit -m "Subdir with normal contents" z
403 $ hg commit -m "Subdir with normal contents" z
404 Invoking status precommit hook
404 Invoking status precommit hook
405 M large3
405 M large3
406 A large5
406 A large5
407 A sub2/large6
407 A sub2/large6
408 A sub2/large7
408 A sub2/large7
409 A z/y/x/m/normal
409 A z/y/x/m/normal
410 $ hg st
410 $ hg st
411 M large3
411 M large3
412 A large5
412 A large5
413 A sub2/large6
413 A sub2/large6
414 A sub2/large7
414 A sub2/large7
415 $ hg rollback --quiet
415 $ hg rollback --quiet
416 $ hg revert --quiet z
416 $ hg revert --quiet z
417 $ hg commit -m "Empty subdir" z
417 $ hg commit -m "Empty subdir" z
418 abort: z: no match under directory!
418 abort: z: no match under directory!
419 [255]
419 [255]
420 $ rm -rf z
420 $ rm -rf z
421 $ hg ci -m "standin" .hglf
421 $ hg ci -m "standin" .hglf
422 abort: file ".hglf" is a largefile standin
422 abort: file ".hglf" is a largefile standin
423 (commit the largefile itself instead)
423 (commit the largefile itself instead)
424 [255]
424 [255]
425
425
426 Test "hg status" with combination of 'file pattern' and 'directory
426 Test "hg status" with combination of 'file pattern' and 'directory
427 pattern' for largefiles:
427 pattern' for largefiles:
428
428
429 $ hg status sub2/large6 sub2
429 $ hg status sub2/large6 sub2
430 A sub2/large6
430 A sub2/large6
431 A sub2/large7
431 A sub2/large7
432
432
433 Config settings (pattern **.dat, minsize 2 MB) are respected.
433 Config settings (pattern **.dat, minsize 2 MB) are respected.
434
434
435 $ echo testdata > test.dat
435 $ echo testdata > test.dat
436 $ dd bs=1k count=2k if=/dev/zero of=reallylarge > /dev/null 2> /dev/null
436 $ dd bs=1k count=2k if=/dev/zero of=reallylarge > /dev/null 2> /dev/null
437 $ hg add
437 $ hg add
438 adding reallylarge as a largefile
438 adding reallylarge as a largefile
439 adding test.dat as a largefile
439 adding test.dat as a largefile
440
440
441 Test that minsize and --lfsize handle float values;
441 Test that minsize and --lfsize handle float values;
442 also tests that --lfsize overrides largefiles.minsize.
442 also tests that --lfsize overrides largefiles.minsize.
443 (0.250 MB = 256 kB = 262144 B)
443 (0.250 MB = 256 kB = 262144 B)
444
444
445 $ dd if=/dev/zero of=ratherlarge bs=1024 count=256 > /dev/null 2> /dev/null
445 $ dd if=/dev/zero of=ratherlarge bs=1024 count=256 > /dev/null 2> /dev/null
446 $ dd if=/dev/zero of=medium bs=1024 count=128 > /dev/null 2> /dev/null
446 $ dd if=/dev/zero of=medium bs=1024 count=128 > /dev/null 2> /dev/null
447 $ hg --config largefiles.minsize=.25 add
447 $ hg --config largefiles.minsize=.25 add
448 adding ratherlarge as a largefile
448 adding ratherlarge as a largefile
449 adding medium
449 adding medium
450 $ hg forget medium
450 $ hg forget medium
451 $ hg --config largefiles.minsize=.25 add --lfsize=.125
451 $ hg --config largefiles.minsize=.25 add --lfsize=.125
452 adding medium as a largefile
452 adding medium as a largefile
453 $ dd if=/dev/zero of=notlarge bs=1024 count=127 > /dev/null 2> /dev/null
453 $ dd if=/dev/zero of=notlarge bs=1024 count=127 > /dev/null 2> /dev/null
454 $ hg --config largefiles.minsize=.25 add --lfsize=.125
454 $ hg --config largefiles.minsize=.25 add --lfsize=.125
455 adding notlarge
455 adding notlarge
456 $ hg forget notlarge
456 $ hg forget notlarge
457
457
458 Test forget on largefiles.
458 Test forget on largefiles.
459
459
460 $ hg forget large3 large5 test.dat reallylarge ratherlarge medium
460 $ hg forget large3 large5 test.dat reallylarge ratherlarge medium
461 $ hg commit -m "add/edit more largefiles"
461 $ hg commit -m "add/edit more largefiles"
462 Invoking status precommit hook
462 Invoking status precommit hook
463 A sub2/large6
463 A sub2/large6
464 A sub2/large7
464 A sub2/large7
465 R large3
465 R large3
466 ? large5
466 ? large5
467 ? medium
467 ? medium
468 ? notlarge
468 ? notlarge
469 ? ratherlarge
469 ? ratherlarge
470 ? reallylarge
470 ? reallylarge
471 ? test.dat
471 ? test.dat
472 $ hg st
472 $ hg st
473 ? large3
473 ? large3
474 ? large5
474 ? large5
475 ? medium
475 ? medium
476 ? notlarge
476 ? notlarge
477 ? ratherlarge
477 ? ratherlarge
478 ? reallylarge
478 ? reallylarge
479 ? test.dat
479 ? test.dat
480
480
481 Purge with largefiles: verify that largefiles are still in the working
481 Purge with largefiles: verify that largefiles are still in the working
482 dir after a purge.
482 dir after a purge.
483
483
484 $ hg purge --all
484 $ hg purge --all
485 $ cat sub/large4
485 $ cat sub/large4
486 large44
486 large44
487 $ cat sub2/large6
487 $ cat sub2/large6
488 large6
488 large6
489 $ cat sub2/large7
489 $ cat sub2/large7
490 large7
490 large7
491
491
492 Test addremove: verify that files that should be added as largfiles are added as
492 Test addremove: verify that files that should be added as largfiles are added as
493 such and that already-existing largfiles are not added as normal files by
493 such and that already-existing largfiles are not added as normal files by
494 accident.
494 accident.
495
495
496 $ rm normal3
496 $ rm normal3
497 $ rm sub/large4
497 $ rm sub/large4
498 $ echo "testing addremove with patterns" > testaddremove.dat
498 $ echo "testing addremove with patterns" > testaddremove.dat
499 $ echo "normaladdremove" > normaladdremove
499 $ echo "normaladdremove" > normaladdremove
500 $ hg addremove
500 $ hg addremove
501 removing sub/large4
501 removing sub/large4
502 adding testaddremove.dat as a largefile
502 adding testaddremove.dat as a largefile
503 removing normal3
503 removing normal3
504 adding normaladdremove
504 adding normaladdremove
505
505
506 Test addremove with -R
506 Test addremove with -R
507
507
508 $ hg up -C
508 $ hg up -C
509 getting changed largefiles
509 getting changed largefiles
510 1 largefiles updated, 0 removed
510 1 largefiles updated, 0 removed
511 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
511 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
512 $ rm normal3
512 $ rm normal3
513 $ rm sub/large4
513 $ rm sub/large4
514 $ echo "testing addremove with patterns" > testaddremove.dat
514 $ echo "testing addremove with patterns" > testaddremove.dat
515 $ echo "normaladdremove" > normaladdremove
515 $ echo "normaladdremove" > normaladdremove
516 $ cd ..
516 $ cd ..
517 $ hg -R a addremove
517 $ hg -R a addremove
518 removing sub/large4
518 removing sub/large4
519 adding a/testaddremove.dat as a largefile (glob)
519 adding a/testaddremove.dat as a largefile (glob)
520 removing normal3
520 removing normal3
521 adding normaladdremove
521 adding normaladdremove
522 $ cd a
522 $ cd a
523
523
524 Test 3364
524 Test 3364
525 $ hg clone . ../addrm
525 $ hg clone . ../addrm
526 updating to branch default
526 updating to branch default
527 getting changed largefiles
527 getting changed largefiles
528 3 largefiles updated, 0 removed
528 3 largefiles updated, 0 removed
529 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
529 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
530 $ cd ../addrm
530 $ cd ../addrm
531 $ cat >> .hg/hgrc <<EOF
531 $ cat >> .hg/hgrc <<EOF
532 > [hooks]
532 > [hooks]
533 > post-commit.stat=sh -c "echo \\"Invoking status postcommit hook\\"; hg status -A"
533 > post-commit.stat=sh -c "echo \\"Invoking status postcommit hook\\"; hg status -A"
534 > EOF
534 > EOF
535 $ touch foo
535 $ touch foo
536 $ hg add --large foo
536 $ hg add --large foo
537 $ hg ci -m "add foo"
537 $ hg ci -m "add foo"
538 Invoking status precommit hook
538 Invoking status precommit hook
539 A foo
539 A foo
540 Invoking status postcommit hook
540 Invoking status postcommit hook
541 C foo
541 C foo
542 C normal3
542 C normal3
543 C sub/large4
543 C sub/large4
544 C sub/normal4
544 C sub/normal4
545 C sub2/large6
545 C sub2/large6
546 C sub2/large7
546 C sub2/large7
547 $ rm foo
547 $ rm foo
548 $ hg st
548 $ hg st
549 ! foo
549 ! foo
550 hmm.. no precommit invoked, but there is a postcommit??
550 hmm.. no precommit invoked, but there is a postcommit??
551 $ hg ci -m "will not checkin"
551 $ hg ci -m "will not checkin"
552 nothing changed
552 nothing changed
553 Invoking status postcommit hook
553 Invoking status postcommit hook
554 ! foo
554 ! foo
555 C normal3
555 C normal3
556 C sub/large4
556 C sub/large4
557 C sub/normal4
557 C sub/normal4
558 C sub2/large6
558 C sub2/large6
559 C sub2/large7
559 C sub2/large7
560 [1]
560 [1]
561 $ hg addremove
561 $ hg addremove
562 removing foo
562 removing foo
563 $ hg st
563 $ hg st
564 R foo
564 R foo
565 $ hg ci -m "used to say nothing changed"
565 $ hg ci -m "used to say nothing changed"
566 Invoking status precommit hook
566 Invoking status precommit hook
567 R foo
567 R foo
568 Invoking status postcommit hook
568 Invoking status postcommit hook
569 C normal3
569 C normal3
570 C sub/large4
570 C sub/large4
571 C sub/normal4
571 C sub/normal4
572 C sub2/large6
572 C sub2/large6
573 C sub2/large7
573 C sub2/large7
574 $ hg st
574 $ hg st
575
575
576 Test 3507 (both normal files and largefiles were a problem)
576 Test 3507 (both normal files and largefiles were a problem)
577
577
578 $ touch normal
578 $ touch normal
579 $ touch large
579 $ touch large
580 $ hg add normal
580 $ hg add normal
581 $ hg add --large large
581 $ hg add --large large
582 $ hg ci -m "added"
582 $ hg ci -m "added"
583 Invoking status precommit hook
583 Invoking status precommit hook
584 A large
584 A large
585 A normal
585 A normal
586 Invoking status postcommit hook
586 Invoking status postcommit hook
587 C large
587 C large
588 C normal
588 C normal
589 C normal3
589 C normal3
590 C sub/large4
590 C sub/large4
591 C sub/normal4
591 C sub/normal4
592 C sub2/large6
592 C sub2/large6
593 C sub2/large7
593 C sub2/large7
594 $ hg remove normal
594 $ hg remove normal
595 $ hg addremove --traceback
595 $ hg addremove --traceback
596 $ hg ci -m "addremoved normal"
596 $ hg ci -m "addremoved normal"
597 Invoking status precommit hook
597 Invoking status precommit hook
598 R normal
598 R normal
599 Invoking status postcommit hook
599 Invoking status postcommit hook
600 C large
600 C large
601 C normal3
601 C normal3
602 C sub/large4
602 C sub/large4
603 C sub/normal4
603 C sub/normal4
604 C sub2/large6
604 C sub2/large6
605 C sub2/large7
605 C sub2/large7
606 $ hg up -C '.^'
606 $ hg up -C '.^'
607 getting changed largefiles
607 getting changed largefiles
608 0 largefiles updated, 0 removed
608 0 largefiles updated, 0 removed
609 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
609 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
610 $ hg remove large
610 $ hg remove large
611 $ hg addremove --traceback
611 $ hg addremove --traceback
612 $ hg ci -m "removed large"
612 $ hg ci -m "removed large"
613 Invoking status precommit hook
613 Invoking status precommit hook
614 R large
614 R large
615 created new head
615 created new head
616 Invoking status postcommit hook
616 Invoking status postcommit hook
617 C normal
617 C normal
618 C normal3
618 C normal3
619 C sub/large4
619 C sub/large4
620 C sub/normal4
620 C sub/normal4
621 C sub2/large6
621 C sub2/large6
622 C sub2/large7
622 C sub2/large7
623
623
624 Test commit -A (issue 3542)
624 Test commit -A (issue 3542)
625 $ echo large8 > large8
625 $ echo large8 > large8
626 $ hg add --large large8
626 $ hg add --large large8
627 $ hg ci -Am 'this used to add large8 as normal and commit both'
627 $ hg ci -Am 'this used to add large8 as normal and commit both'
628 Invoking status precommit hook
628 Invoking status precommit hook
629 A large8
629 A large8
630 Invoking status postcommit hook
630 Invoking status postcommit hook
631 C large8
631 C large8
632 C normal
632 C normal
633 C normal3
633 C normal3
634 C sub/large4
634 C sub/large4
635 C sub/normal4
635 C sub/normal4
636 C sub2/large6
636 C sub2/large6
637 C sub2/large7
637 C sub2/large7
638 $ rm large8
638 $ rm large8
639 $ hg ci -Am 'this used to not notice the rm'
639 $ hg ci -Am 'this used to not notice the rm'
640 removing large8
640 removing large8
641 Invoking status precommit hook
641 Invoking status precommit hook
642 R large8
642 R large8
643 Invoking status postcommit hook
643 Invoking status postcommit hook
644 C normal
644 C normal
645 C normal3
645 C normal3
646 C sub/large4
646 C sub/large4
647 C sub/normal4
647 C sub/normal4
648 C sub2/large6
648 C sub2/large6
649 C sub2/large7
649 C sub2/large7
650
650
651 Test that a standin can't be added as a large file
651 Test that a standin can't be added as a large file
652
652
653 $ touch large
653 $ touch large
654 $ hg add --large large
654 $ hg add --large large
655 $ hg ci -m "add"
655 $ hg ci -m "add"
656 Invoking status precommit hook
656 Invoking status precommit hook
657 A large
657 A large
658 Invoking status postcommit hook
658 Invoking status postcommit hook
659 C large
659 C large
660 C normal
660 C normal
661 C normal3
661 C normal3
662 C sub/large4
662 C sub/large4
663 C sub/normal4
663 C sub/normal4
664 C sub2/large6
664 C sub2/large6
665 C sub2/large7
665 C sub2/large7
666 $ hg remove large
666 $ hg remove large
667 $ touch large
667 $ touch large
668 $ hg addremove --config largefiles.patterns=**large --traceback
668 $ hg addremove --config largefiles.patterns=**large --traceback
669 adding large as a largefile
669 adding large as a largefile
670
670
671 Test that outgoing --large works (with revsets too)
671 Test that outgoing --large works (with revsets too)
672 $ hg outgoing --rev '.^' --large
672 $ hg outgoing --rev '.^' --large
673 comparing with $TESTTMP/a (glob)
673 comparing with $TESTTMP/a (glob)
674 searching for changes
674 searching for changes
675 changeset: 8:c02fd3b77ec4
675 changeset: 8:c02fd3b77ec4
676 user: test
676 user: test
677 date: Thu Jan 01 00:00:00 1970 +0000
677 date: Thu Jan 01 00:00:00 1970 +0000
678 summary: add foo
678 summary: add foo
679
679
680 changeset: 9:289dd08c9bbb
680 changeset: 9:289dd08c9bbb
681 user: test
681 user: test
682 date: Thu Jan 01 00:00:00 1970 +0000
682 date: Thu Jan 01 00:00:00 1970 +0000
683 summary: used to say nothing changed
683 summary: used to say nothing changed
684
684
685 changeset: 10:34f23ac6ac12
685 changeset: 10:34f23ac6ac12
686 user: test
686 user: test
687 date: Thu Jan 01 00:00:00 1970 +0000
687 date: Thu Jan 01 00:00:00 1970 +0000
688 summary: added
688 summary: added
689
689
690 changeset: 12:710c1b2f523c
690 changeset: 12:710c1b2f523c
691 parent: 10:34f23ac6ac12
691 parent: 10:34f23ac6ac12
692 user: test
692 user: test
693 date: Thu Jan 01 00:00:00 1970 +0000
693 date: Thu Jan 01 00:00:00 1970 +0000
694 summary: removed large
694 summary: removed large
695
695
696 changeset: 13:0a3e75774479
696 changeset: 13:0a3e75774479
697 user: test
697 user: test
698 date: Thu Jan 01 00:00:00 1970 +0000
698 date: Thu Jan 01 00:00:00 1970 +0000
699 summary: this used to add large8 as normal and commit both
699 summary: this used to add large8 as normal and commit both
700
700
701 changeset: 14:84f3d378175c
701 changeset: 14:84f3d378175c
702 user: test
702 user: test
703 date: Thu Jan 01 00:00:00 1970 +0000
703 date: Thu Jan 01 00:00:00 1970 +0000
704 summary: this used to not notice the rm
704 summary: this used to not notice the rm
705
705
706 searching for changes
706 searching for changes
707 largefiles to upload:
707 largefiles to upload:
708 foo
708 foo
709 large
709 large
710 large8
710 large8
711
711
712 $ cd ../a
712 $ cd ../a
713
713
714 Clone a largefiles repo.
714 Clone a largefiles repo.
715
715
716 $ hg clone . ../b
716 $ hg clone . ../b
717 updating to branch default
717 updating to branch default
718 getting changed largefiles
718 getting changed largefiles
719 3 largefiles updated, 0 removed
719 3 largefiles updated, 0 removed
720 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
720 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
721 $ cd ../b
721 $ cd ../b
722 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
722 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
723 7:daea875e9014 add/edit more largefiles
723 7:daea875e9014 add/edit more largefiles
724 6:4355d653f84f edit files yet again
724 6:4355d653f84f edit files yet again
725 5:9d5af5072dbd edit files again
725 5:9d5af5072dbd edit files again
726 4:74c02385b94c move files
726 4:74c02385b94c move files
727 3:9e8fbc4bce62 copy files
727 3:9e8fbc4bce62 copy files
728 2:51a0ae4d5864 remove files
728 2:51a0ae4d5864 remove files
729 1:ce8896473775 edit files
729 1:ce8896473775 edit files
730 0:30d30fe6a5be add files
730 0:30d30fe6a5be add files
731 $ cat normal3
731 $ cat normal3
732 normal33
732 normal33
733 $ cat sub/normal4
733 $ cat sub/normal4
734 normal44
734 normal44
735 $ cat sub/large4
735 $ cat sub/large4
736 large44
736 large44
737 $ cat sub2/large6
737 $ cat sub2/large6
738 large6
738 large6
739 $ cat sub2/large7
739 $ cat sub2/large7
740 large7
740 large7
741 $ hg log -qf sub2/large7
741 $ hg log -qf sub2/large7
742 7:daea875e9014
742 7:daea875e9014
743 $ cd ..
743 $ cd ..
744 $ hg clone a -r 3 c
744 $ hg clone a -r 3 c
745 adding changesets
745 adding changesets
746 adding manifests
746 adding manifests
747 adding file changes
747 adding file changes
748 added 4 changesets with 10 changes to 4 files
748 added 4 changesets with 10 changes to 4 files
749 updating to branch default
749 updating to branch default
750 getting changed largefiles
750 getting changed largefiles
751 2 largefiles updated, 0 removed
751 2 largefiles updated, 0 removed
752 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
752 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
753 $ cd c
753 $ cd c
754 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
754 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
755 3:9e8fbc4bce62 copy files
755 3:9e8fbc4bce62 copy files
756 2:51a0ae4d5864 remove files
756 2:51a0ae4d5864 remove files
757 1:ce8896473775 edit files
757 1:ce8896473775 edit files
758 0:30d30fe6a5be add files
758 0:30d30fe6a5be add files
759 $ cat normal1
759 $ cat normal1
760 normal22
760 normal22
761 $ cat large1
761 $ cat large1
762 large22
762 large22
763 $ cat sub/normal2
763 $ cat sub/normal2
764 normal22
764 normal22
765 $ cat sub/large2
765 $ cat sub/large2
766 large22
766 large22
767
767
768 Old revisions of a clone have correct largefiles content (this also
768 Old revisions of a clone have correct largefiles content (this also
769 tests update).
769 tests update).
770
770
771 $ hg update -r 1
771 $ hg update -r 1
772 getting changed largefiles
772 getting changed largefiles
773 1 largefiles updated, 0 removed
773 1 largefiles updated, 0 removed
774 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
774 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
775 $ cat large1
775 $ cat large1
776 large11
776 large11
777 $ cat sub/large2
777 $ cat sub/large2
778 large22
778 large22
779 $ cd ..
779 $ cd ..
780
780
781 Test cloning with --all-largefiles flag
781 Test cloning with --all-largefiles flag
782
782
783 $ rm "${USERCACHE}"/*
783 $ rm "${USERCACHE}"/*
784 $ hg clone --all-largefiles a a-backup
784 $ hg clone --all-largefiles a a-backup
785 updating to branch default
785 updating to branch default
786 getting changed largefiles
786 getting changed largefiles
787 3 largefiles updated, 0 removed
787 3 largefiles updated, 0 removed
788 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
788 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
789 8 additional largefiles cached
789 8 additional largefiles cached
790
790
791 $ rm "${USERCACHE}"/*
791 $ rm "${USERCACHE}"/*
792 $ hg clone --all-largefiles -u 0 a a-clone0
792 $ hg clone --all-largefiles -u 0 a a-clone0
793 updating to branch default
793 updating to branch default
794 getting changed largefiles
794 getting changed largefiles
795 2 largefiles updated, 0 removed
795 2 largefiles updated, 0 removed
796 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
796 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
797 9 additional largefiles cached
797 9 additional largefiles cached
798 $ hg -R a-clone0 sum
798 $ hg -R a-clone0 sum
799 parent: 0:30d30fe6a5be
799 parent: 0:30d30fe6a5be
800 add files
800 add files
801 branch: default
801 branch: default
802 commit: (clean)
802 commit: (clean)
803 update: 7 new changesets (update)
803 update: 7 new changesets (update)
804
804
805 $ rm "${USERCACHE}"/*
805 $ rm "${USERCACHE}"/*
806 $ hg clone --all-largefiles -u 1 a a-clone1
806 $ hg clone --all-largefiles -u 1 a a-clone1
807 updating to branch default
807 updating to branch default
808 getting changed largefiles
808 getting changed largefiles
809 2 largefiles updated, 0 removed
809 2 largefiles updated, 0 removed
810 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
810 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
811 8 additional largefiles cached
811 8 additional largefiles cached
812 $ hg -R a-clone1 verify --large --lfa --lfc
812 $ hg -R a-clone1 verify --large --lfa --lfc
813 checking changesets
813 checking changesets
814 checking manifests
814 checking manifests
815 crosschecking files in changesets and manifests
815 crosschecking files in changesets and manifests
816 checking files
816 checking files
817 10 files, 8 changesets, 24 total revisions
817 10 files, 8 changesets, 24 total revisions
818 searching 8 changesets for largefiles
818 searching 8 changesets for largefiles
819 verified contents of 13 revisions of 6 largefiles
819 verified contents of 13 revisions of 6 largefiles
820 $ hg -R a-clone1 sum
820 $ hg -R a-clone1 sum
821 parent: 1:ce8896473775
821 parent: 1:ce8896473775
822 edit files
822 edit files
823 branch: default
823 branch: default
824 commit: (clean)
824 commit: (clean)
825 update: 6 new changesets (update)
825 update: 6 new changesets (update)
826
826
827 $ rm "${USERCACHE}"/*
827 $ rm "${USERCACHE}"/*
828 $ hg clone --all-largefiles -U a a-clone-u
828 $ hg clone --all-largefiles -U a a-clone-u
829 11 additional largefiles cached
829 11 additional largefiles cached
830 $ hg -R a-clone-u sum
830 $ hg -R a-clone-u sum
831 parent: -1:000000000000 (no revision checked out)
831 parent: -1:000000000000 (no revision checked out)
832 branch: default
832 branch: default
833 commit: (clean)
833 commit: (clean)
834 update: 8 new changesets (update)
834 update: 8 new changesets (update)
835
835
836 Show computed destination directory:
836 Show computed destination directory:
837
837
838 $ mkdir xyz
838 $ mkdir xyz
839 $ cd xyz
839 $ cd xyz
840 $ hg clone ../a
840 $ hg clone ../a
841 destination directory: a
841 destination directory: a
842 updating to branch default
842 updating to branch default
843 getting changed largefiles
843 getting changed largefiles
844 3 largefiles updated, 0 removed
844 3 largefiles updated, 0 removed
845 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
845 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
846 $ cd ..
846 $ cd ..
847
847
848 Clone URL without path:
848 Clone URL without path:
849
849
850 $ hg clone file://
850 $ hg clone file://
851 abort: repository / not found!
851 abort: repository / not found!
852 [255]
852 [255]
853
853
854 Ensure base clone command argument validation
854 Ensure base clone command argument validation
855
855
856 $ hg clone -U -u 0 a a-clone-failure
856 $ hg clone -U -u 0 a a-clone-failure
857 abort: cannot specify both --noupdate and --updaterev
857 abort: cannot specify both --noupdate and --updaterev
858 [255]
858 [255]
859
859
860 $ hg clone --all-largefiles a ssh://localhost/a
860 $ hg clone --all-largefiles a ssh://localhost/a
861 abort: --all-largefiles is incompatible with non-local destination ssh://localhost/a
861 abort: --all-largefiles is incompatible with non-local destination ssh://localhost/a
862 [255]
862 [255]
863
863
864 Test pulling with --all-largefiles flag. Also test that the largefiles are
864 Test pulling with --all-largefiles flag. Also test that the largefiles are
865 downloaded from 'default' instead of 'default-push' when no source is specified
865 downloaded from 'default' instead of 'default-push' when no source is specified
866 (issue3584)
866 (issue3584)
867
867
868 $ rm -Rf a-backup
868 $ rm -Rf a-backup
869 $ hg clone -r 1 a a-backup
869 $ hg clone -r 1 a a-backup
870 adding changesets
870 adding changesets
871 adding manifests
871 adding manifests
872 adding file changes
872 adding file changes
873 added 2 changesets with 8 changes to 4 files
873 added 2 changesets with 8 changes to 4 files
874 updating to branch default
874 updating to branch default
875 getting changed largefiles
875 getting changed largefiles
876 2 largefiles updated, 0 removed
876 2 largefiles updated, 0 removed
877 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
877 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
878 $ rm "${USERCACHE}"/*
878 $ rm "${USERCACHE}"/*
879 $ cd a-backup
879 $ cd a-backup
880 $ hg pull --all-largefiles --config paths.default-push=bogus/path
880 $ hg pull --all-largefiles --config paths.default-push=bogus/path
881 pulling from $TESTTMP/a (glob)
881 pulling from $TESTTMP/a (glob)
882 searching for changes
882 searching for changes
883 adding changesets
883 adding changesets
884 adding manifests
884 adding manifests
885 adding file changes
885 adding file changes
886 added 6 changesets with 16 changes to 8 files
886 added 6 changesets with 16 changes to 8 files
887 (run 'hg update' to get a working copy)
887 (run 'hg update' to get a working copy)
888 6 largefiles cached
888 6 largefiles cached
889
889
890 redo pull with --lfrev and check it pulls largefiles for the right revs
890 redo pull with --lfrev and check it pulls largefiles for the right revs
891
891
892 $ hg rollback
892 $ hg rollback
893 repository tip rolled back to revision 1 (undo pull)
893 repository tip rolled back to revision 1 (undo pull)
894 $ hg pull -v --lfrev 'heads(pulled())+min(pulled())'
894 $ hg pull -v --lfrev 'heads(pulled())+min(pulled())'
895 pulling from $TESTTMP/a (glob)
895 pulling from $TESTTMP/a (glob)
896 searching for changes
896 searching for changes
897 all local heads known remotely
897 all local heads known remotely
898 6 changesets found
898 6 changesets found
899 adding changesets
899 adding changesets
900 adding manifests
900 adding manifests
901 adding file changes
901 adding file changes
902 added 6 changesets with 16 changes to 8 files
902 added 6 changesets with 16 changes to 8 files
903 calling hook changegroup.lfiles: <function checkrequireslfiles at *> (glob)
903 calling hook changegroup.lfiles: <function checkrequireslfiles at *> (glob)
904 (run 'hg update' to get a working copy)
904 (run 'hg update' to get a working copy)
905 pulling largefiles for revision 7
905 pulling largefiles for revision 7
906 found 971fb41e78fea4f8e0ba5244784239371cb00591 in store
906 found 971fb41e78fea4f8e0ba5244784239371cb00591 in store
907 found 0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30 in store
907 found 0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30 in store
908 found bb3151689acb10f0c3125c560d5e63df914bc1af in store
908 found bb3151689acb10f0c3125c560d5e63df914bc1af in store
909 pulling largefiles for revision 2
909 pulling largefiles for revision 2
910 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
910 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
911 0 largefiles cached
911 0 largefiles cached
912
912
913 lfpull
913 lfpull
914
914
915 $ hg lfpull -r : --config largefiles.usercache=usercache-lfpull
915 $ hg lfpull -r : --config largefiles.usercache=usercache-lfpull
916 2 largefiles cached
916 2 largefiles cached
917 $ hg lfpull -v -r 4+2 --config largefiles.usercache=usercache-lfpull
917 $ hg lfpull -v -r 4+2 --config largefiles.usercache=usercache-lfpull
918 pulling largefiles for revision 4
918 pulling largefiles for revision 4
919 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
919 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
920 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
920 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
921 pulling largefiles for revision 2
921 pulling largefiles for revision 2
922 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
922 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
923 0 largefiles cached
923 0 largefiles cached
924
924
925 $ ls usercache-lfpull/* | sort
925 $ ls usercache-lfpull/* | sort
926 usercache-lfpull/1deebade43c8c498a3c8daddac0244dc55d1331d
926 usercache-lfpull/1deebade43c8c498a3c8daddac0244dc55d1331d
927 usercache-lfpull/4669e532d5b2c093a78eca010077e708a071bb64
927 usercache-lfpull/4669e532d5b2c093a78eca010077e708a071bb64
928
928
929 $ cd ..
929 $ cd ..
930
930
931 Rebasing between two repositories does not revert largefiles to old
931 Rebasing between two repositories does not revert largefiles to old
932 revisions (this was a very bad bug that took a lot of work to fix).
932 revisions (this was a very bad bug that took a lot of work to fix).
933
933
934 $ hg clone a d
934 $ hg clone a d
935 updating to branch default
935 updating to branch default
936 getting changed largefiles
936 getting changed largefiles
937 3 largefiles updated, 0 removed
937 3 largefiles updated, 0 removed
938 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
938 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
939 $ cd b
939 $ cd b
940 $ echo large4-modified > sub/large4
940 $ echo large4-modified > sub/large4
941 $ echo normal3-modified > normal3
941 $ echo normal3-modified > normal3
942 $ hg commit -m "modify normal file and largefile in repo b"
942 $ hg commit -m "modify normal file and largefile in repo b"
943 Invoking status precommit hook
943 Invoking status precommit hook
944 M normal3
944 M normal3
945 M sub/large4
945 M sub/large4
946 $ cd ../d
946 $ cd ../d
947 $ echo large6-modified > sub2/large6
947 $ echo large6-modified > sub2/large6
948 $ echo normal4-modified > sub/normal4
948 $ echo normal4-modified > sub/normal4
949 $ hg commit -m "modify normal file largefile in repo d"
949 $ hg commit -m "modify normal file largefile in repo d"
950 Invoking status precommit hook
950 Invoking status precommit hook
951 M sub/normal4
951 M sub/normal4
952 M sub2/large6
952 M sub2/large6
953 $ cd ..
953 $ cd ..
954 $ hg clone d e
954 $ hg clone d e
955 updating to branch default
955 updating to branch default
956 getting changed largefiles
956 getting changed largefiles
957 3 largefiles updated, 0 removed
957 3 largefiles updated, 0 removed
958 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
958 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
959 $ cd d
959 $ cd d
960
960
961 More rebase testing, but also test that the largefiles are downloaded from
961 More rebase testing, but also test that the largefiles are downloaded from
962 'default-push' when no source is specified (issue3584). (The largefile from the
962 'default-push' when no source is specified (issue3584). (The largefile from the
963 pulled revision is however not downloaded but found in the local cache.)
963 pulled revision is however not downloaded but found in the local cache.)
964 Largefiles are fetched for the new pulled revision, not for existing revisions,
964 Largefiles are fetched for the new pulled revision, not for existing revisions,
965 rebased or not.
965 rebased or not.
966
966
967 $ [ ! -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
967 $ [ ! -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
968 $ hg pull --rebase --all-largefiles --config paths.default-push=bogus/path --config paths.default=../b
968 $ hg pull --rebase --all-largefiles --config paths.default-push=bogus/path --config paths.default=../b
969 pulling from $TESTTMP/b (glob)
969 pulling from $TESTTMP/b (glob)
970 searching for changes
970 searching for changes
971 adding changesets
971 adding changesets
972 adding manifests
972 adding manifests
973 adding file changes
973 adding file changes
974 added 1 changesets with 2 changes to 2 files (+1 heads)
974 added 1 changesets with 2 changes to 2 files (+1 heads)
975 Invoking status precommit hook
975 Invoking status precommit hook
976 M sub/normal4
976 M sub/normal4
977 M sub2/large6
977 M sub2/large6
978 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
978 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
979 0 largefiles cached
979 0 largefiles cached
980 nothing to rebase
980 nothing to rebase
981 $ [ -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
981 $ [ -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
982 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
982 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
983 9:598410d3eb9a modify normal file largefile in repo d
983 9:598410d3eb9a modify normal file largefile in repo d
984 8:a381d2c8c80e modify normal file and largefile in repo b
984 8:a381d2c8c80e modify normal file and largefile in repo b
985 7:daea875e9014 add/edit more largefiles
985 7:daea875e9014 add/edit more largefiles
986 6:4355d653f84f edit files yet again
986 6:4355d653f84f edit files yet again
987 5:9d5af5072dbd edit files again
987 5:9d5af5072dbd edit files again
988 4:74c02385b94c move files
988 4:74c02385b94c move files
989 3:9e8fbc4bce62 copy files
989 3:9e8fbc4bce62 copy files
990 2:51a0ae4d5864 remove files
990 2:51a0ae4d5864 remove files
991 1:ce8896473775 edit files
991 1:ce8896473775 edit files
992 0:30d30fe6a5be add files
992 0:30d30fe6a5be add files
993 $ cat normal3
993 $ cat normal3
994 normal3-modified
994 normal3-modified
995 $ cat sub/normal4
995 $ cat sub/normal4
996 normal4-modified
996 normal4-modified
997 $ cat sub/large4
997 $ cat sub/large4
998 large4-modified
998 large4-modified
999 $ cat sub2/large6
999 $ cat sub2/large6
1000 large6-modified
1000 large6-modified
1001 $ cat sub2/large7
1001 $ cat sub2/large7
1002 large7
1002 large7
1003 $ cd ../e
1003 $ cd ../e
1004 $ hg pull ../b
1004 $ hg pull ../b
1005 pulling from ../b
1005 pulling from ../b
1006 searching for changes
1006 searching for changes
1007 adding changesets
1007 adding changesets
1008 adding manifests
1008 adding manifests
1009 adding file changes
1009 adding file changes
1010 added 1 changesets with 2 changes to 2 files (+1 heads)
1010 added 1 changesets with 2 changes to 2 files (+1 heads)
1011 (run 'hg heads' to see heads, 'hg merge' to merge)
1011 (run 'hg heads' to see heads, 'hg merge' to merge)
1012 $ hg rebase
1012 $ hg rebase
1013 Invoking status precommit hook
1013 Invoking status precommit hook
1014 M sub/normal4
1014 M sub/normal4
1015 M sub2/large6
1015 M sub2/large6
1016 saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
1016 saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
1017 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1017 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1018 9:598410d3eb9a modify normal file largefile in repo d
1018 9:598410d3eb9a modify normal file largefile in repo d
1019 8:a381d2c8c80e modify normal file and largefile in repo b
1019 8:a381d2c8c80e modify normal file and largefile in repo b
1020 7:daea875e9014 add/edit more largefiles
1020 7:daea875e9014 add/edit more largefiles
1021 6:4355d653f84f edit files yet again
1021 6:4355d653f84f edit files yet again
1022 5:9d5af5072dbd edit files again
1022 5:9d5af5072dbd edit files again
1023 4:74c02385b94c move files
1023 4:74c02385b94c move files
1024 3:9e8fbc4bce62 copy files
1024 3:9e8fbc4bce62 copy files
1025 2:51a0ae4d5864 remove files
1025 2:51a0ae4d5864 remove files
1026 1:ce8896473775 edit files
1026 1:ce8896473775 edit files
1027 0:30d30fe6a5be add files
1027 0:30d30fe6a5be add files
1028 $ cat normal3
1028 $ cat normal3
1029 normal3-modified
1029 normal3-modified
1030 $ cat sub/normal4
1030 $ cat sub/normal4
1031 normal4-modified
1031 normal4-modified
1032 $ cat sub/large4
1032 $ cat sub/large4
1033 large4-modified
1033 large4-modified
1034 $ cat sub2/large6
1034 $ cat sub2/large6
1035 large6-modified
1035 large6-modified
1036 $ cat sub2/large7
1036 $ cat sub2/large7
1037 large7
1037 large7
1038
1038
1039 Log on largefiles
1039 Log on largefiles
1040
1040
1041 - same output
1041 - same output
1042 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub/large4
1042 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub/large4
1043 8:a381d2c8c80e modify normal file and largefile in repo b
1043 8:a381d2c8c80e modify normal file and largefile in repo b
1044 6:4355d653f84f edit files yet again
1044 6:4355d653f84f edit files yet again
1045 5:9d5af5072dbd edit files again
1045 5:9d5af5072dbd edit files again
1046 4:74c02385b94c move files
1046 4:74c02385b94c move files
1047 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' sub/large4
1047 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' sub/large4
1048 8:a381d2c8c80e modify normal file and largefile in repo b
1048 8:a381d2c8c80e modify normal file and largefile in repo b
1049 6:4355d653f84f edit files yet again
1049 6:4355d653f84f edit files yet again
1050 5:9d5af5072dbd edit files again
1050 5:9d5af5072dbd edit files again
1051 4:74c02385b94c move files
1051 4:74c02385b94c move files
1052
1052
1053 - .hglf only matches largefiles, without .hglf it matches 9 bco sub/normal
1053 - .hglf only matches largefiles, without .hglf it matches 9 bco sub/normal
1054 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub
1054 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub
1055 8:a381d2c8c80e modify normal file and largefile in repo b
1055 8:a381d2c8c80e modify normal file and largefile in repo b
1056 6:4355d653f84f edit files yet again
1056 6:4355d653f84f edit files yet again
1057 5:9d5af5072dbd edit files again
1057 5:9d5af5072dbd edit files again
1058 4:74c02385b94c move files
1058 4:74c02385b94c move files
1059 1:ce8896473775 edit files
1059 1:ce8896473775 edit files
1060 0:30d30fe6a5be add files
1060 0:30d30fe6a5be add files
1061 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' sub
1061 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' sub
1062 9:598410d3eb9a modify normal file largefile in repo d
1062 9:598410d3eb9a modify normal file largefile in repo d
1063 8:a381d2c8c80e modify normal file and largefile in repo b
1063 8:a381d2c8c80e modify normal file and largefile in repo b
1064 6:4355d653f84f edit files yet again
1064 6:4355d653f84f edit files yet again
1065 5:9d5af5072dbd edit files again
1065 5:9d5af5072dbd edit files again
1066 4:74c02385b94c move files
1066 4:74c02385b94c move files
1067 1:ce8896473775 edit files
1067 1:ce8896473775 edit files
1068 0:30d30fe6a5be add files
1068 0:30d30fe6a5be add files
1069
1069
1070 - globbing gives same result
1070 - globbing gives same result
1071 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' 'glob:sub/*'
1071 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' 'glob:sub/*'
1072 9:598410d3eb9a modify normal file largefile in repo d
1072 9:598410d3eb9a modify normal file largefile in repo d
1073 8:a381d2c8c80e modify normal file and largefile in repo b
1073 8:a381d2c8c80e modify normal file and largefile in repo b
1074 6:4355d653f84f edit files yet again
1074 6:4355d653f84f edit files yet again
1075 5:9d5af5072dbd edit files again
1075 5:9d5af5072dbd edit files again
1076 4:74c02385b94c move files
1076 4:74c02385b94c move files
1077 1:ce8896473775 edit files
1077 1:ce8896473775 edit files
1078 0:30d30fe6a5be add files
1078 0:30d30fe6a5be add files
1079
1079
1080 Rollback on largefiles.
1080 Rollback on largefiles.
1081
1081
1082 $ echo large4-modified-again > sub/large4
1082 $ echo large4-modified-again > sub/large4
1083 $ hg commit -m "Modify large4 again"
1083 $ hg commit -m "Modify large4 again"
1084 Invoking status precommit hook
1084 Invoking status precommit hook
1085 M sub/large4
1085 M sub/large4
1086 $ hg rollback
1086 $ hg rollback
1087 repository tip rolled back to revision 9 (undo commit)
1087 repository tip rolled back to revision 9 (undo commit)
1088 working directory now based on revision 9
1088 working directory now based on revision 9
1089 $ hg st
1089 $ hg st
1090 M sub/large4
1090 M sub/large4
1091 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1091 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1092 9:598410d3eb9a modify normal file largefile in repo d
1092 9:598410d3eb9a modify normal file largefile in repo d
1093 8:a381d2c8c80e modify normal file and largefile in repo b
1093 8:a381d2c8c80e modify normal file and largefile in repo b
1094 7:daea875e9014 add/edit more largefiles
1094 7:daea875e9014 add/edit more largefiles
1095 6:4355d653f84f edit files yet again
1095 6:4355d653f84f edit files yet again
1096 5:9d5af5072dbd edit files again
1096 5:9d5af5072dbd edit files again
1097 4:74c02385b94c move files
1097 4:74c02385b94c move files
1098 3:9e8fbc4bce62 copy files
1098 3:9e8fbc4bce62 copy files
1099 2:51a0ae4d5864 remove files
1099 2:51a0ae4d5864 remove files
1100 1:ce8896473775 edit files
1100 1:ce8896473775 edit files
1101 0:30d30fe6a5be add files
1101 0:30d30fe6a5be add files
1102 $ cat sub/large4
1102 $ cat sub/large4
1103 large4-modified-again
1103 large4-modified-again
1104
1104
1105 "update --check" refuses to update with uncommitted changes.
1105 "update --check" refuses to update with uncommitted changes.
1106 $ hg update --check 8
1106 $ hg update --check 8
1107 abort: uncommitted changes
1107 abort: uncommitted changes
1108 [255]
1108 [255]
1109
1109
1110 "update --clean" leaves correct largefiles in working copy, even when there is
1110 "update --clean" leaves correct largefiles in working copy, even when there is
1111 .orig files from revert in .hglf.
1111 .orig files from revert in .hglf.
1112
1112
1113 $ echo mistake > sub2/large7
1113 $ echo mistake > sub2/large7
1114 $ hg revert sub2/large7
1114 $ hg revert sub2/large7
1115 $ hg -q update --clean -r null
1115 $ hg -q update --clean -r null
1116 $ hg update --clean
1116 $ hg update --clean
1117 getting changed largefiles
1117 getting changed largefiles
1118 3 largefiles updated, 0 removed
1118 3 largefiles updated, 0 removed
1119 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1119 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1120 $ cat normal3
1120 $ cat normal3
1121 normal3-modified
1121 normal3-modified
1122 $ cat sub/normal4
1122 $ cat sub/normal4
1123 normal4-modified
1123 normal4-modified
1124 $ cat sub/large4
1124 $ cat sub/large4
1125 large4-modified
1125 large4-modified
1126 $ cat sub2/large6
1126 $ cat sub2/large6
1127 large6-modified
1127 large6-modified
1128 $ cat sub2/large7
1128 $ cat sub2/large7
1129 large7
1129 large7
1130 $ cat sub2/large7.orig
1130 $ cat sub2/large7.orig
1131 mistake
1131 mistake
1132 $ cat .hglf/sub2/large7.orig
1132 $ cat .hglf/sub2/large7.orig
1133 9dbfb2c79b1c40981b258c3efa1b10b03f18ad31
1133 9dbfb2c79b1c40981b258c3efa1b10b03f18ad31
1134
1134
1135 demonstrate misfeature: .orig file is overwritten on every update -C,
1135 demonstrate misfeature: .orig file is overwritten on every update -C,
1136 also when clean:
1136 also when clean:
1137 $ hg update --clean
1137 $ hg update --clean
1138 getting changed largefiles
1138 getting changed largefiles
1139 0 largefiles updated, 0 removed
1139 0 largefiles updated, 0 removed
1140 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1140 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1141 $ cat sub2/large7.orig
1141 $ cat sub2/large7.orig
1142 large7
1142 large7
1143 $ rm sub2/large7.orig .hglf/sub2/large7.orig
1143 $ rm sub2/large7.orig .hglf/sub2/large7.orig
1144
1144
1145 Now "update check" is happy.
1145 Now "update check" is happy.
1146 $ hg update --check 8
1146 $ hg update --check 8
1147 getting changed largefiles
1147 getting changed largefiles
1148 1 largefiles updated, 0 removed
1148 1 largefiles updated, 0 removed
1149 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1149 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1150 $ hg update --check
1150 $ hg update --check
1151 getting changed largefiles
1151 getting changed largefiles
1152 1 largefiles updated, 0 removed
1152 1 largefiles updated, 0 removed
1153 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1153 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1154
1154
1155 Test removing empty largefiles directories on update
1155 Test removing empty largefiles directories on update
1156 $ test -d sub2 && echo "sub2 exists"
1156 $ test -d sub2 && echo "sub2 exists"
1157 sub2 exists
1157 sub2 exists
1158 $ hg update -q null
1158 $ hg update -q null
1159 $ test -d sub2 && echo "error: sub2 should not exist anymore"
1159 $ test -d sub2 && echo "error: sub2 should not exist anymore"
1160 [1]
1160 [1]
1161 $ hg update -q
1161 $ hg update -q
1162
1162
1163 Test hg remove removes empty largefiles directories
1163 Test hg remove removes empty largefiles directories
1164 $ test -d sub2 && echo "sub2 exists"
1164 $ test -d sub2 && echo "sub2 exists"
1165 sub2 exists
1165 sub2 exists
1166 $ hg remove sub2/*
1166 $ hg remove sub2/*
1167 $ test -d sub2 && echo "error: sub2 should not exist anymore"
1167 $ test -d sub2 && echo "error: sub2 should not exist anymore"
1168 [1]
1168 [1]
1169 $ hg revert sub2/large6 sub2/large7
1169 $ hg revert sub2/large6 sub2/large7
1170
1170
1171 "revert" works on largefiles (and normal files too).
1171 "revert" works on largefiles (and normal files too).
1172 $ echo hack3 >> normal3
1172 $ echo hack3 >> normal3
1173 $ echo hack4 >> sub/normal4
1173 $ echo hack4 >> sub/normal4
1174 $ echo hack4 >> sub/large4
1174 $ echo hack4 >> sub/large4
1175 $ rm sub2/large6
1175 $ rm sub2/large6
1176 $ hg revert sub2/large6
1176 $ hg revert sub2/large6
1177 $ hg rm sub2/large6
1177 $ hg rm sub2/large6
1178 $ echo new >> sub2/large8
1178 $ echo new >> sub2/large8
1179 $ hg add --large sub2/large8
1179 $ hg add --large sub2/large8
1180 # XXX we don't really want to report that we're reverting the standin;
1180 # XXX we don't really want to report that we're reverting the standin;
1181 # that's just an implementation detail. But I don't see an obvious fix. ;-(
1181 # that's just an implementation detail. But I don't see an obvious fix. ;-(
1182 $ hg revert sub
1182 $ hg revert sub
1183 reverting .hglf/sub/large4 (glob)
1183 reverting .hglf/sub/large4 (glob)
1184 reverting sub/normal4 (glob)
1184 reverting sub/normal4 (glob)
1185 $ hg status
1185 $ hg status
1186 M normal3
1186 M normal3
1187 A sub2/large8
1187 A sub2/large8
1188 R sub2/large6
1188 R sub2/large6
1189 ? sub/large4.orig
1189 ? sub/large4.orig
1190 ? sub/normal4.orig
1190 ? sub/normal4.orig
1191 $ cat sub/normal4
1191 $ cat sub/normal4
1192 normal4-modified
1192 normal4-modified
1193 $ cat sub/large4
1193 $ cat sub/large4
1194 large4-modified
1194 large4-modified
1195 $ hg revert -a --no-backup
1195 $ hg revert -a --no-backup
1196 undeleting .hglf/sub2/large6 (glob)
1196 undeleting .hglf/sub2/large6 (glob)
1197 forgetting .hglf/sub2/large8 (glob)
1197 forgetting .hglf/sub2/large8 (glob)
1198 reverting normal3
1198 reverting normal3
1199 $ hg status
1199 $ hg status
1200 ? sub/large4.orig
1200 ? sub/large4.orig
1201 ? sub/normal4.orig
1201 ? sub/normal4.orig
1202 ? sub2/large8
1202 ? sub2/large8
1203 $ cat normal3
1203 $ cat normal3
1204 normal3-modified
1204 normal3-modified
1205 $ cat sub2/large6
1205 $ cat sub2/large6
1206 large6-modified
1206 large6-modified
1207 $ rm sub/*.orig sub2/large8
1207 $ rm sub/*.orig sub2/large8
1208
1208
1209 revert some files to an older revision
1209 revert some files to an older revision
1210 $ hg revert --no-backup -r 8 sub2
1210 $ hg revert --no-backup -r 8 sub2
1211 reverting .hglf/sub2/large6 (glob)
1211 reverting .hglf/sub2/large6 (glob)
1212 $ cat sub2/large6
1212 $ cat sub2/large6
1213 large6
1213 large6
1214 $ hg revert --no-backup -C -r '.^' sub2
1214 $ hg revert --no-backup -C -r '.^' sub2
1215 reverting .hglf/sub2/large6 (glob)
1215 reverting .hglf/sub2/large6 (glob)
1216 $ hg revert --no-backup sub2
1216 $ hg revert --no-backup sub2
1217 reverting .hglf/sub2/large6 (glob)
1217 reverting .hglf/sub2/large6 (glob)
1218 $ hg status
1218 $ hg status
1219
1219
1220 "verify --large" actually verifies largefiles
1220 "verify --large" actually verifies largefiles
1221
1221
1222 - Where Do We Come From? What Are We? Where Are We Going?
1222 - Where Do We Come From? What Are We? Where Are We Going?
1223 $ pwd
1223 $ pwd
1224 $TESTTMP/e
1224 $TESTTMP/e
1225 $ hg paths
1225 $ hg paths
1226 default = $TESTTMP/d (glob)
1226 default = $TESTTMP/d (glob)
1227
1227
1228 $ hg verify --large
1228 $ hg verify --large
1229 checking changesets
1229 checking changesets
1230 checking manifests
1230 checking manifests
1231 crosschecking files in changesets and manifests
1231 crosschecking files in changesets and manifests
1232 checking files
1232 checking files
1233 10 files, 10 changesets, 28 total revisions
1233 10 files, 10 changesets, 28 total revisions
1234 searching 1 changesets for largefiles
1234 searching 1 changesets for largefiles
1235 verified existence of 3 revisions of 3 largefiles
1235 verified existence of 3 revisions of 3 largefiles
1236
1236
1237 - introduce missing blob in local store repo and make sure that this is caught:
1237 - introduce missing blob in local store repo and make sure that this is caught:
1238 $ mv $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 .
1238 $ mv $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 .
1239 $ hg verify --large
1239 $ hg verify --large
1240 checking changesets
1240 checking changesets
1241 checking manifests
1241 checking manifests
1242 crosschecking files in changesets and manifests
1242 crosschecking files in changesets and manifests
1243 checking files
1243 checking files
1244 10 files, 10 changesets, 28 total revisions
1244 10 files, 10 changesets, 28 total revisions
1245 searching 1 changesets for largefiles
1245 searching 1 changesets for largefiles
1246 changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
1246 changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
1247 verified existence of 3 revisions of 3 largefiles
1247 verified existence of 3 revisions of 3 largefiles
1248 [1]
1248 [1]
1249
1249
1250 - introduce corruption and make sure that it is caught when checking content:
1250 - introduce corruption and make sure that it is caught when checking content:
1251 $ echo '5 cents' > $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
1251 $ echo '5 cents' > $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
1252 $ hg verify -q --large --lfc
1252 $ hg verify -q --large --lfc
1253 changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
1253 changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
1254 [1]
1254 [1]
1255
1255
1256 - cleanup
1256 - cleanup
1257 $ mv e166e74c7303192238d60af5a9c4ce9bef0b7928 $TESTTMP/d/.hg/largefiles/
1257 $ mv e166e74c7303192238d60af5a9c4ce9bef0b7928 $TESTTMP/d/.hg/largefiles/
1258
1258
1259 - verifying all revisions will fail because we didn't clone all largefiles to d:
1259 - verifying all revisions will fail because we didn't clone all largefiles to d:
1260 $ echo 'T-shirt' > $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
1260 $ echo 'T-shirt' > $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
1261 $ hg verify -q --lfa --lfc
1261 $ hg verify -q --lfa --lfc
1262 changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64 (glob)
1262 changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64 (glob)
1263 changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d (glob)
1263 changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d (glob)
1264 changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f (glob)
1264 changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f (glob)
1265 changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
1265 changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
1266 changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
1266 changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
1267 changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
1267 changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
1268 changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
1268 changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
1269 changeset 5:9d5af5072dbd: large3 references missing $TESTTMP/d/.hg/largefiles/baaf12afde9d8d67f25dab6dced0d2bf77dba47c (glob)
1269 changeset 5:9d5af5072dbd: large3 references missing $TESTTMP/d/.hg/largefiles/baaf12afde9d8d67f25dab6dced0d2bf77dba47c (glob)
1270 changeset 5:9d5af5072dbd: sub/large4 references missing $TESTTMP/d/.hg/largefiles/aeb2210d19f02886dde00dac279729a48471e2f9 (glob)
1270 changeset 5:9d5af5072dbd: sub/large4 references missing $TESTTMP/d/.hg/largefiles/aeb2210d19f02886dde00dac279729a48471e2f9 (glob)
1271 changeset 6:4355d653f84f: large3 references missing $TESTTMP/d/.hg/largefiles/7838695e10da2bb75ac1156565f40a2595fa2fa0 (glob)
1271 changeset 6:4355d653f84f: large3 references missing $TESTTMP/d/.hg/largefiles/7838695e10da2bb75ac1156565f40a2595fa2fa0 (glob)
1272 [1]
1272 [1]
1273
1273
1274 - cleanup
1274 - cleanup
1275 $ rm $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
1275 $ rm $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
1276 $ rm -f .hglf/sub/*.orig
1276 $ rm -f .hglf/sub/*.orig
1277
1277
1278 Update to revision with missing largefile - and make sure it really is missing
1278 Update to revision with missing largefile - and make sure it really is missing
1279
1279
1280 $ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0
1280 $ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0
1281 $ hg up -r 6
1281 $ hg up -r 6
1282 getting changed largefiles
1282 getting changed largefiles
1283 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d (glob)
1283 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file://$TESTTMP/d (glob)
1284 1 largefiles updated, 2 removed
1284 1 largefiles updated, 2 removed
1285 4 files updated, 0 files merged, 2 files removed, 0 files unresolved
1285 4 files updated, 0 files merged, 2 files removed, 0 files unresolved
1286 $ rm normal3
1286 $ rm normal3
1287 $ echo >> sub/normal4
1287 $ echo >> sub/normal4
1288 $ hg ci -m 'commit with missing files'
1288 $ hg ci -m 'commit with missing files'
1289 Invoking status precommit hook
1289 Invoking status precommit hook
1290 M sub/normal4
1290 M sub/normal4
1291 ! large3
1291 ! large3
1292 ! normal3
1292 ! normal3
1293 created new head
1293 created new head
1294 $ hg st
1294 $ hg st
1295 ! large3
1295 ! large3
1296 ! normal3
1296 ! normal3
1297 $ hg up -r.
1297 $ hg up -r.
1298 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1298 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1299 $ hg st
1299 $ hg st
1300 ! large3
1300 ! large3
1301 ! normal3
1301 ! normal3
1302 $ hg up -Cr.
1302 $ hg up -Cr.
1303 getting changed largefiles
1303 getting changed largefiles
1304 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d (glob)
1304 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file://$TESTTMP/d (glob)
1305 0 largefiles updated, 0 removed
1305 0 largefiles updated, 0 removed
1306 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1306 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1307 $ hg st
1307 $ hg st
1308 ! large3
1308 ! large3
1309 $ hg rollback
1309 $ hg rollback
1310 repository tip rolled back to revision 9 (undo commit)
1310 repository tip rolled back to revision 9 (undo commit)
1311 working directory now based on revision 6
1311 working directory now based on revision 6
1312
1312
1313 Merge with revision with missing largefile - and make sure it tries to fetch it.
1313 Merge with revision with missing largefile - and make sure it tries to fetch it.
1314
1314
1315 $ hg up -Cqr null
1315 $ hg up -Cqr null
1316 $ echo f > f
1316 $ echo f > f
1317 $ hg ci -Am branch
1317 $ hg ci -Am branch
1318 adding f
1318 adding f
1319 Invoking status precommit hook
1319 Invoking status precommit hook
1320 A f
1320 A f
1321 created new head
1321 created new head
1322 $ hg merge -r 6
1322 $ hg merge -r 6
1323 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1323 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1324 (branch merge, don't forget to commit)
1324 (branch merge, don't forget to commit)
1325 getting changed largefiles
1325 getting changed largefiles
1326 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d (glob)
1326 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file://$TESTTMP/d (glob)
1327 1 largefiles updated, 0 removed
1327 1 largefiles updated, 0 removed
1328
1328
1329 $ hg rollback -q
1329 $ hg rollback -q
1330 $ hg up -Cq
1330 $ hg up -Cq
1331
1331
1332 Pulling 0 revisions with --all-largefiles should not fetch for all revisions
1332 Pulling 0 revisions with --all-largefiles should not fetch for all revisions
1333
1333
1334 $ hg pull --all-largefiles
1334 $ hg pull --all-largefiles
1335 pulling from $TESTTMP/d (glob)
1335 pulling from $TESTTMP/d (glob)
1336 searching for changes
1336 searching for changes
1337 no changes found
1337 no changes found
1338
1338
1339 Merging does not revert to old versions of largefiles and also check
1339 Merging does not revert to old versions of largefiles and also check
1340 that merging after having pulled from a non-default remote works
1340 that merging after having pulled from a non-default remote works
1341 correctly.
1341 correctly.
1342
1342
1343 $ cd ..
1343 $ cd ..
1344 $ hg clone -r 7 e temp
1344 $ hg clone -r 7 e temp
1345 adding changesets
1345 adding changesets
1346 adding manifests
1346 adding manifests
1347 adding file changes
1347 adding file changes
1348 added 8 changesets with 24 changes to 10 files
1348 added 8 changesets with 24 changes to 10 files
1349 updating to branch default
1349 updating to branch default
1350 getting changed largefiles
1350 getting changed largefiles
1351 3 largefiles updated, 0 removed
1351 3 largefiles updated, 0 removed
1352 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1352 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1353 $ hg clone temp f
1353 $ hg clone temp f
1354 updating to branch default
1354 updating to branch default
1355 getting changed largefiles
1355 getting changed largefiles
1356 3 largefiles updated, 0 removed
1356 3 largefiles updated, 0 removed
1357 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1357 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1358 # Delete the largefiles in the largefiles system cache so that we have an
1358 # Delete the largefiles in the largefiles system cache so that we have an
1359 # opportunity to test that caching after a pull works.
1359 # opportunity to test that caching after a pull works.
1360 $ rm "${USERCACHE}"/*
1360 $ rm "${USERCACHE}"/*
1361 $ cd f
1361 $ cd f
1362 $ echo "large4-merge-test" > sub/large4
1362 $ echo "large4-merge-test" > sub/large4
1363 $ hg commit -m "Modify large4 to test merge"
1363 $ hg commit -m "Modify large4 to test merge"
1364 Invoking status precommit hook
1364 Invoking status precommit hook
1365 M sub/large4
1365 M sub/large4
1366 # Test --cache-largefiles flag
1366 # Test --cache-largefiles flag
1367 $ hg pull --lfrev 'heads(pulled())' ../e
1367 $ hg pull --lfrev 'heads(pulled())' ../e
1368 pulling from ../e
1368 pulling from ../e
1369 searching for changes
1369 searching for changes
1370 adding changesets
1370 adding changesets
1371 adding manifests
1371 adding manifests
1372 adding file changes
1372 adding file changes
1373 added 2 changesets with 4 changes to 4 files (+1 heads)
1373 added 2 changesets with 4 changes to 4 files (+1 heads)
1374 (run 'hg heads' to see heads, 'hg merge' to merge)
1374 (run 'hg heads' to see heads, 'hg merge' to merge)
1375 2 largefiles cached
1375 2 largefiles cached
1376 $ hg merge
1376 $ hg merge
1377 merging sub/large4
1377 merging sub/large4
1378 largefile sub/large4 has a merge conflict
1378 largefile sub/large4 has a merge conflict
1379 keep (l)ocal or take (o)ther? l
1379 keep (l)ocal or take (o)ther? l
1380 3 files updated, 1 files merged, 0 files removed, 0 files unresolved
1380 3 files updated, 1 files merged, 0 files removed, 0 files unresolved
1381 (branch merge, don't forget to commit)
1381 (branch merge, don't forget to commit)
1382 getting changed largefiles
1382 getting changed largefiles
1383 1 largefiles updated, 0 removed
1383 1 largefiles updated, 0 removed
1384 $ hg commit -m "Merge repos e and f"
1384 $ hg commit -m "Merge repos e and f"
1385 Invoking status precommit hook
1385 Invoking status precommit hook
1386 M normal3
1386 M normal3
1387 M sub/normal4
1387 M sub/normal4
1388 M sub2/large6
1388 M sub2/large6
1389 $ cat normal3
1389 $ cat normal3
1390 normal3-modified
1390 normal3-modified
1391 $ cat sub/normal4
1391 $ cat sub/normal4
1392 normal4-modified
1392 normal4-modified
1393 $ cat sub/large4
1393 $ cat sub/large4
1394 large4-merge-test
1394 large4-merge-test
1395 $ cat sub2/large6
1395 $ cat sub2/large6
1396 large6-modified
1396 large6-modified
1397 $ cat sub2/large7
1397 $ cat sub2/large7
1398 large7
1398 large7
1399
1399
1400 Test status after merging with a branch that introduces a new largefile:
1400 Test status after merging with a branch that introduces a new largefile:
1401
1401
1402 $ echo large > large
1402 $ echo large > large
1403 $ hg add --large large
1403 $ hg add --large large
1404 $ hg commit -m 'add largefile'
1404 $ hg commit -m 'add largefile'
1405 Invoking status precommit hook
1405 Invoking status precommit hook
1406 A large
1406 A large
1407 $ hg update -q ".^"
1407 $ hg update -q ".^"
1408 $ echo change >> normal3
1408 $ echo change >> normal3
1409 $ hg commit -m 'some change'
1409 $ hg commit -m 'some change'
1410 Invoking status precommit hook
1410 Invoking status precommit hook
1411 M normal3
1411 M normal3
1412 created new head
1412 created new head
1413 $ hg merge
1413 $ hg merge
1414 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1414 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1415 (branch merge, don't forget to commit)
1415 (branch merge, don't forget to commit)
1416 getting changed largefiles
1416 getting changed largefiles
1417 1 largefiles updated, 0 removed
1417 1 largefiles updated, 0 removed
1418 $ hg status
1418 $ hg status
1419 M large
1419 M large
1420
1420
1421 - make sure update of merge with removed largefiles fails as expected
1421 - make sure update of merge with removed largefiles fails as expected
1422 $ hg rm sub2/large6
1422 $ hg rm sub2/large6
1423 $ hg up -r.
1423 $ hg up -r.
1424 abort: outstanding uncommitted merges
1424 abort: outstanding uncommitted merges
1425 [255]
1425 [255]
1426
1426
1427 - revert should be able to revert files introduced in a pending merge
1427 - revert should be able to revert files introduced in a pending merge
1428 $ hg revert --all -r .
1428 $ hg revert --all -r .
1429 removing .hglf/large (glob)
1429 removing .hglf/large (glob)
1430 undeleting .hglf/sub2/large6 (glob)
1430 undeleting .hglf/sub2/large6 (glob)
1431
1431
1432 Test that a normal file and a largefile with the same name and path cannot
1432 Test that a normal file and a largefile with the same name and path cannot
1433 coexist.
1433 coexist.
1434
1434
1435 $ rm sub2/large7
1435 $ rm sub2/large7
1436 $ echo "largeasnormal" > sub2/large7
1436 $ echo "largeasnormal" > sub2/large7
1437 $ hg add sub2/large7
1437 $ hg add sub2/large7
1438 sub2/large7 already a largefile
1438 sub2/large7 already a largefile
1439
1439
1440 Test that transplanting a largefile change works correctly.
1440 Test that transplanting a largefile change works correctly.
1441
1441
1442 $ cd ..
1442 $ cd ..
1443 $ hg clone -r 8 d g
1443 $ hg clone -r 8 d g
1444 adding changesets
1444 adding changesets
1445 adding manifests
1445 adding manifests
1446 adding file changes
1446 adding file changes
1447 added 9 changesets with 26 changes to 10 files
1447 added 9 changesets with 26 changes to 10 files
1448 updating to branch default
1448 updating to branch default
1449 getting changed largefiles
1449 getting changed largefiles
1450 3 largefiles updated, 0 removed
1450 3 largefiles updated, 0 removed
1451 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1451 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1452 $ cd g
1452 $ cd g
1453 $ hg transplant -s ../d 598410d3eb9a
1453 $ hg transplant -s ../d 598410d3eb9a
1454 searching for changes
1454 searching for changes
1455 searching for changes
1455 searching for changes
1456 adding changesets
1456 adding changesets
1457 adding manifests
1457 adding manifests
1458 adding file changes
1458 adding file changes
1459 added 1 changesets with 2 changes to 2 files
1459 added 1 changesets with 2 changes to 2 files
1460 getting changed largefiles
1460 getting changed largefiles
1461 1 largefiles updated, 0 removed
1461 1 largefiles updated, 0 removed
1462 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1462 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1463 9:598410d3eb9a modify normal file largefile in repo d
1463 9:598410d3eb9a modify normal file largefile in repo d
1464 8:a381d2c8c80e modify normal file and largefile in repo b
1464 8:a381d2c8c80e modify normal file and largefile in repo b
1465 7:daea875e9014 add/edit more largefiles
1465 7:daea875e9014 add/edit more largefiles
1466 6:4355d653f84f edit files yet again
1466 6:4355d653f84f edit files yet again
1467 5:9d5af5072dbd edit files again
1467 5:9d5af5072dbd edit files again
1468 4:74c02385b94c move files
1468 4:74c02385b94c move files
1469 3:9e8fbc4bce62 copy files
1469 3:9e8fbc4bce62 copy files
1470 2:51a0ae4d5864 remove files
1470 2:51a0ae4d5864 remove files
1471 1:ce8896473775 edit files
1471 1:ce8896473775 edit files
1472 0:30d30fe6a5be add files
1472 0:30d30fe6a5be add files
1473 $ cat normal3
1473 $ cat normal3
1474 normal3-modified
1474 normal3-modified
1475 $ cat sub/normal4
1475 $ cat sub/normal4
1476 normal4-modified
1476 normal4-modified
1477 $ cat sub/large4
1477 $ cat sub/large4
1478 large4-modified
1478 large4-modified
1479 $ cat sub2/large6
1479 $ cat sub2/large6
1480 large6-modified
1480 large6-modified
1481 $ cat sub2/large7
1481 $ cat sub2/large7
1482 large7
1482 large7
1483
1483
1484 Cat a largefile
1484 Cat a largefile
1485 $ hg cat normal3
1485 $ hg cat normal3
1486 normal3-modified
1486 normal3-modified
1487 $ hg cat sub/large4
1487 $ hg cat sub/large4
1488 large4-modified
1488 large4-modified
1489 $ rm "${USERCACHE}"/*
1489 $ rm "${USERCACHE}"/*
1490 $ hg cat -r a381d2c8c80e -o cat.out sub/large4
1490 $ hg cat -r a381d2c8c80e -o cat.out sub/large4
1491 $ cat cat.out
1491 $ cat cat.out
1492 large4-modified
1492 large4-modified
1493 $ rm cat.out
1493 $ rm cat.out
1494 $ hg cat -r a381d2c8c80e normal3
1494 $ hg cat -r a381d2c8c80e normal3
1495 normal3-modified
1495 normal3-modified
1496 $ hg cat -r '.^' normal3
1496 $ hg cat -r '.^' normal3
1497 normal3-modified
1497 normal3-modified
1498 $ hg cat -r '.^' sub/large4 doesntexist
1498 $ hg cat -r '.^' sub/large4 doesntexist
1499 large4-modified
1499 large4-modified
1500 doesntexist: no such file in rev a381d2c8c80e
1500 doesntexist: no such file in rev a381d2c8c80e
1501 $ hg --cwd sub cat -r '.^' large4
1501 $ hg --cwd sub cat -r '.^' large4
1502 large4-modified
1502 large4-modified
1503 $ hg --cwd sub cat -r '.^' ../normal3
1503 $ hg --cwd sub cat -r '.^' ../normal3
1504 normal3-modified
1504 normal3-modified
1505
1505
1506 Test that renaming a largefile results in correct output for status
1506 Test that renaming a largefile results in correct output for status
1507
1507
1508 $ hg rename sub/large4 large4-renamed
1508 $ hg rename sub/large4 large4-renamed
1509 $ hg commit -m "test rename output"
1509 $ hg commit -m "test rename output"
1510 Invoking status precommit hook
1510 Invoking status precommit hook
1511 A large4-renamed
1511 A large4-renamed
1512 R sub/large4
1512 R sub/large4
1513 $ cat large4-renamed
1513 $ cat large4-renamed
1514 large4-modified
1514 large4-modified
1515 $ cd sub2
1515 $ cd sub2
1516 $ hg rename large6 large6-renamed
1516 $ hg rename large6 large6-renamed
1517 $ hg st
1517 $ hg st
1518 A sub2/large6-renamed
1518 A sub2/large6-renamed
1519 R sub2/large6
1519 R sub2/large6
1520 $ cd ..
1520 $ cd ..
1521
1521
1522 Test --normal flag
1522 Test --normal flag
1523
1523
1524 $ dd if=/dev/zero bs=2k count=11k > new-largefile 2> /dev/null
1524 $ dd if=/dev/zero bs=2k count=11k > new-largefile 2> /dev/null
1525 $ hg add --normal --large new-largefile
1525 $ hg add --normal --large new-largefile
1526 abort: --normal cannot be used with --large
1526 abort: --normal cannot be used with --large
1527 [255]
1527 [255]
1528 $ hg add --normal new-largefile
1528 $ hg add --normal new-largefile
1529 new-largefile: up to 69 MB of RAM may be required to manage this file
1529 new-largefile: up to 69 MB of RAM may be required to manage this file
1530 (use 'hg revert new-largefile' to cancel the pending addition)
1530 (use 'hg revert new-largefile' to cancel the pending addition)
1531 $ cd ..
1531 $ cd ..
1532
1532
1533 #if serve
1533 #if serve
1534 vanilla clients not locked out from largefiles servers on vanilla repos
1534 vanilla clients not locked out from largefiles servers on vanilla repos
1535 $ mkdir r1
1535 $ mkdir r1
1536 $ cd r1
1536 $ cd r1
1537 $ hg init
1537 $ hg init
1538 $ echo c1 > f1
1538 $ echo c1 > f1
1539 $ hg add f1
1539 $ hg add f1
1540 $ hg commit -m "m1"
1540 $ hg commit -m "m1"
1541 Invoking status precommit hook
1541 Invoking status precommit hook
1542 A f1
1542 A f1
1543 $ cd ..
1543 $ cd ..
1544 $ hg serve -R r1 -d -p $HGPORT --pid-file hg.pid
1544 $ hg serve -R r1 -d -p $HGPORT --pid-file hg.pid
1545 $ cat hg.pid >> $DAEMON_PIDS
1545 $ cat hg.pid >> $DAEMON_PIDS
1546 $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT r2
1546 $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT r2
1547 requesting all changes
1547 requesting all changes
1548 adding changesets
1548 adding changesets
1549 adding manifests
1549 adding manifests
1550 adding file changes
1550 adding file changes
1551 added 1 changesets with 1 changes to 1 files
1551 added 1 changesets with 1 changes to 1 files
1552 updating to branch default
1552 updating to branch default
1553 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1553 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1554
1554
1555 largefiles clients still work with vanilla servers
1555 largefiles clients still work with vanilla servers
1556 $ hg --config extensions.largefiles=! serve -R r1 -d -p $HGPORT1 --pid-file hg.pid
1556 $ hg --config extensions.largefiles=! serve -R r1 -d -p $HGPORT1 --pid-file hg.pid
1557 $ cat hg.pid >> $DAEMON_PIDS
1557 $ cat hg.pid >> $DAEMON_PIDS
1558 $ hg clone http://localhost:$HGPORT1 r3
1558 $ hg clone http://localhost:$HGPORT1 r3
1559 requesting all changes
1559 requesting all changes
1560 adding changesets
1560 adding changesets
1561 adding manifests
1561 adding manifests
1562 adding file changes
1562 adding file changes
1563 added 1 changesets with 1 changes to 1 files
1563 added 1 changesets with 1 changes to 1 files
1564 updating to branch default
1564 updating to branch default
1565 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1565 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1566 #endif
1566 #endif
1567
1567
1568
1568
1569 vanilla clients locked out from largefiles http repos
1569 vanilla clients locked out from largefiles http repos
1570 $ mkdir r4
1570 $ mkdir r4
1571 $ cd r4
1571 $ cd r4
1572 $ hg init
1572 $ hg init
1573 $ echo c1 > f1
1573 $ echo c1 > f1
1574 $ hg add --large f1
1574 $ hg add --large f1
1575 $ hg commit -m "m1"
1575 $ hg commit -m "m1"
1576 Invoking status precommit hook
1576 Invoking status precommit hook
1577 A f1
1577 A f1
1578 $ cd ..
1578 $ cd ..
1579
1579
1580 largefiles can be pushed locally (issue3583)
1580 largefiles can be pushed locally (issue3583)
1581 $ hg init dest
1581 $ hg init dest
1582 $ cd r4
1582 $ cd r4
1583 $ hg outgoing ../dest
1583 $ hg outgoing ../dest
1584 comparing with ../dest
1584 comparing with ../dest
1585 searching for changes
1585 searching for changes
1586 changeset: 0:639881c12b4c
1586 changeset: 0:639881c12b4c
1587 tag: tip
1587 tag: tip
1588 user: test
1588 user: test
1589 date: Thu Jan 01 00:00:00 1970 +0000
1589 date: Thu Jan 01 00:00:00 1970 +0000
1590 summary: m1
1590 summary: m1
1591
1591
1592 $ hg push ../dest
1592 $ hg push ../dest
1593 pushing to ../dest
1593 pushing to ../dest
1594 searching for changes
1594 searching for changes
1595 searching for changes
1595 searching for changes
1596 adding changesets
1596 adding changesets
1597 adding manifests
1597 adding manifests
1598 adding file changes
1598 adding file changes
1599 added 1 changesets with 1 changes to 1 files
1599 added 1 changesets with 1 changes to 1 files
1600
1600
1601 exit code with nothing outgoing (issue3611)
1601 exit code with nothing outgoing (issue3611)
1602 $ hg outgoing ../dest
1602 $ hg outgoing ../dest
1603 comparing with ../dest
1603 comparing with ../dest
1604 searching for changes
1604 searching for changes
1605 no changes found
1605 no changes found
1606 [1]
1606 [1]
1607 $ cd ..
1607 $ cd ..
1608
1608
1609 #if serve
1609 #if serve
1610 $ hg serve -R r4 -d -p $HGPORT2 --pid-file hg.pid
1610 $ hg serve -R r4 -d -p $HGPORT2 --pid-file hg.pid
1611 $ cat hg.pid >> $DAEMON_PIDS
1611 $ cat hg.pid >> $DAEMON_PIDS
1612 $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT2 r5
1612 $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT2 r5
1613 abort: remote error:
1613 abort: remote error:
1614
1614
1615 This repository uses the largefiles extension.
1615 This repository uses the largefiles extension.
1616
1616
1617 Please enable it in your Mercurial config file.
1617 Please enable it in your Mercurial config file.
1618 [255]
1618 [255]
1619
1619
1620 used all HGPORTs, kill all daemons
1620 used all HGPORTs, kill all daemons
1621 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
1621 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
1622 #endif
1622 #endif
1623
1623
1624 vanilla clients locked out from largefiles ssh repos
1624 vanilla clients locked out from largefiles ssh repos
1625 $ hg --config extensions.largefiles=! clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/r4 r5
1625 $ hg --config extensions.largefiles=! clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/r4 r5
1626 abort: remote error:
1626 abort: remote error:
1627
1627
1628 This repository uses the largefiles extension.
1628 This repository uses the largefiles extension.
1629
1629
1630 Please enable it in your Mercurial config file.
1630 Please enable it in your Mercurial config file.
1631 [255]
1631 [255]
1632
1632
1633 #if serve
1633 #if serve
1634
1634
1635 largefiles clients refuse to push largefiles repos to vanilla servers
1635 largefiles clients refuse to push largefiles repos to vanilla servers
1636 $ mkdir r6
1636 $ mkdir r6
1637 $ cd r6
1637 $ cd r6
1638 $ hg init
1638 $ hg init
1639 $ echo c1 > f1
1639 $ echo c1 > f1
1640 $ hg add f1
1640 $ hg add f1
1641 $ hg commit -m "m1"
1641 $ hg commit -m "m1"
1642 Invoking status precommit hook
1642 Invoking status precommit hook
1643 A f1
1643 A f1
1644 $ cat >> .hg/hgrc <<!
1644 $ cat >> .hg/hgrc <<!
1645 > [web]
1645 > [web]
1646 > push_ssl = false
1646 > push_ssl = false
1647 > allow_push = *
1647 > allow_push = *
1648 > !
1648 > !
1649 $ cd ..
1649 $ cd ..
1650 $ hg clone r6 r7
1650 $ hg clone r6 r7
1651 updating to branch default
1651 updating to branch default
1652 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1652 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1653 $ cd r7
1653 $ cd r7
1654 $ echo c2 > f2
1654 $ echo c2 > f2
1655 $ hg add --large f2
1655 $ hg add --large f2
1656 $ hg commit -m "m2"
1656 $ hg commit -m "m2"
1657 Invoking status precommit hook
1657 Invoking status precommit hook
1658 A f2
1658 A f2
1659 $ hg --config extensions.largefiles=! -R ../r6 serve -d -p $HGPORT --pid-file ../hg.pid
1659 $ hg --config extensions.largefiles=! -R ../r6 serve -d -p $HGPORT --pid-file ../hg.pid
1660 $ cat ../hg.pid >> $DAEMON_PIDS
1660 $ cat ../hg.pid >> $DAEMON_PIDS
1661 $ hg push http://localhost:$HGPORT
1661 $ hg push http://localhost:$HGPORT
1662 pushing to http://localhost:$HGPORT/
1662 pushing to http://localhost:$HGPORT/
1663 searching for changes
1663 searching for changes
1664 abort: http://localhost:$HGPORT/ does not appear to be a largefile store
1664 abort: http://localhost:$HGPORT/ does not appear to be a largefile store
1665 [255]
1665 [255]
1666 $ cd ..
1666 $ cd ..
1667
1667
1668 putlfile errors are shown (issue3123)
1668 putlfile errors are shown (issue3123)
1669 Corrupt the cached largefile in r7 and move it out of the servers usercache
1669 Corrupt the cached largefile in r7 and move it out of the servers usercache
1670 $ mv r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 .
1670 $ mv r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 .
1671 $ echo 'client side corruption' > r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
1671 $ echo 'client side corruption' > r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
1672 $ rm "$USERCACHE/4cdac4d8b084d0b599525cf732437fb337d422a8"
1672 $ rm "$USERCACHE/4cdac4d8b084d0b599525cf732437fb337d422a8"
1673 $ hg init empty
1673 $ hg init empty
1674 $ hg serve -R empty -d -p $HGPORT1 --pid-file hg.pid \
1674 $ hg serve -R empty -d -p $HGPORT1 --pid-file hg.pid \
1675 > --config 'web.allow_push=*' --config web.push_ssl=False
1675 > --config 'web.allow_push=*' --config web.push_ssl=False
1676 $ cat hg.pid >> $DAEMON_PIDS
1676 $ cat hg.pid >> $DAEMON_PIDS
1677 $ hg push -R r7 http://localhost:$HGPORT1
1677 $ hg push -R r7 http://localhost:$HGPORT1
1678 pushing to http://localhost:$HGPORT1/
1678 pushing to http://localhost:$HGPORT1/
1679 searching for changes
1679 searching for changes
1680 remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash
1680 remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash
1681 abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/ (glob)
1681 abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/ (glob)
1682 [255]
1682 [255]
1683 $ mv 4cdac4d8b084d0b599525cf732437fb337d422a8 r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
1683 $ mv 4cdac4d8b084d0b599525cf732437fb337d422a8 r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
1684 Push of file that exists on server but is corrupted - magic healing would be nice ... but too magic
1684 Push of file that exists on server but is corrupted - magic healing would be nice ... but too magic
1685 $ echo "server side corruption" > empty/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
1685 $ echo "server side corruption" > empty/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
1686 $ hg push -R r7 http://localhost:$HGPORT1
1686 $ hg push -R r7 http://localhost:$HGPORT1
1687 pushing to http://localhost:$HGPORT1/
1687 pushing to http://localhost:$HGPORT1/
1688 searching for changes
1688 searching for changes
1689 searching for changes
1689 searching for changes
1690 remote: adding changesets
1690 remote: adding changesets
1691 remote: adding manifests
1691 remote: adding manifests
1692 remote: adding file changes
1692 remote: adding file changes
1693 remote: added 2 changesets with 2 changes to 2 files
1693 remote: added 2 changesets with 2 changes to 2 files
1694 $ cat empty/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
1694 $ cat empty/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
1695 server side corruption
1695 server side corruption
1696 $ rm -rf empty
1696 $ rm -rf empty
1697
1697
1698 Push a largefiles repository to a served empty repository
1698 Push a largefiles repository to a served empty repository
1699 $ hg init r8
1699 $ hg init r8
1700 $ echo c3 > r8/f1
1700 $ echo c3 > r8/f1
1701 $ hg add --large r8/f1 -R r8
1701 $ hg add --large r8/f1 -R r8
1702 $ hg commit -m "m1" -R r8
1702 $ hg commit -m "m1" -R r8
1703 Invoking status precommit hook
1703 Invoking status precommit hook
1704 A f1
1704 A f1
1705 $ hg init empty
1705 $ hg init empty
1706 $ hg serve -R empty -d -p $HGPORT2 --pid-file hg.pid \
1706 $ hg serve -R empty -d -p $HGPORT2 --pid-file hg.pid \
1707 > --config 'web.allow_push=*' --config web.push_ssl=False
1707 > --config 'web.allow_push=*' --config web.push_ssl=False
1708 $ cat hg.pid >> $DAEMON_PIDS
1708 $ cat hg.pid >> $DAEMON_PIDS
1709 $ rm "${USERCACHE}"/*
1709 $ rm "${USERCACHE}"/*
1710 $ hg push -R r8 http://localhost:$HGPORT2/#default
1710 $ hg push -R r8 http://localhost:$HGPORT2/#default
1711 pushing to http://localhost:$HGPORT2/
1711 pushing to http://localhost:$HGPORT2/
1712 searching for changes
1712 searching for changes
1713 searching for changes
1713 searching for changes
1714 remote: adding changesets
1714 remote: adding changesets
1715 remote: adding manifests
1715 remote: adding manifests
1716 remote: adding file changes
1716 remote: adding file changes
1717 remote: added 1 changesets with 1 changes to 1 files
1717 remote: added 1 changesets with 1 changes to 1 files
1718 $ [ -f "${USERCACHE}"/02a439e5c31c526465ab1a0ca1f431f76b827b90 ]
1718 $ [ -f "${USERCACHE}"/02a439e5c31c526465ab1a0ca1f431f76b827b90 ]
1719 $ [ -f empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 ]
1719 $ [ -f empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 ]
1720
1720
1721 Clone over http, no largefiles pulled on clone.
1721 Clone over http, no largefiles pulled on clone.
1722
1722
1723 $ hg clone http://localhost:$HGPORT2/#default http-clone -U
1723 $ hg clone http://localhost:$HGPORT2/#default http-clone -U
1724 adding changesets
1724 adding changesets
1725 adding manifests
1725 adding manifests
1726 adding file changes
1726 adding file changes
1727 added 1 changesets with 1 changes to 1 files
1727 added 1 changesets with 1 changes to 1 files
1728
1728
1729 test 'verify' with remotestore:
1729 test 'verify' with remotestore:
1730
1730
1731 $ rm "${USERCACHE}"/02a439e5c31c526465ab1a0ca1f431f76b827b90
1731 $ rm "${USERCACHE}"/02a439e5c31c526465ab1a0ca1f431f76b827b90
1732 $ mv empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 .
1732 $ mv empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 .
1733 $ hg -R http-clone verify --large --lfa
1733 $ hg -R http-clone verify --large --lfa
1734 checking changesets
1734 checking changesets
1735 checking manifests
1735 checking manifests
1736 crosschecking files in changesets and manifests
1736 crosschecking files in changesets and manifests
1737 checking files
1737 checking files
1738 1 files, 1 changesets, 1 total revisions
1738 1 files, 1 changesets, 1 total revisions
1739 searching 1 changesets for largefiles
1739 searching 1 changesets for largefiles
1740 changeset 0:cf03e5bb9936: f1 missing
1740 changeset 0:cf03e5bb9936: f1 missing
1741 verified existence of 1 revisions of 1 largefiles
1741 verified existence of 1 revisions of 1 largefiles
1742 [1]
1742 [1]
1743 $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/
1743 $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/
1744 $ hg -R http-clone -q verify --large --lfa
1744 $ hg -R http-clone -q verify --large --lfa
1745
1745
1746 largefiles pulled on update - a largefile missing on the server:
1746 largefiles pulled on update - a largefile missing on the server:
1747 $ mv empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 .
1747 $ mv empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 .
1748 $ hg -R http-clone up --config largefiles.usercache=http-clone-usercache
1748 $ hg -R http-clone up --config largefiles.usercache=http-clone-usercache
1749 getting changed largefiles
1749 getting changed largefiles
1750 f1: largefile 02a439e5c31c526465ab1a0ca1f431f76b827b90 not available from http://localhost:$HGPORT2/
1750 f1: largefile 02a439e5c31c526465ab1a0ca1f431f76b827b90 not available from http://localhost:$HGPORT2/
1751 0 largefiles updated, 0 removed
1751 0 largefiles updated, 0 removed
1752 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1752 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1753 $ hg -R http-clone st
1753 $ hg -R http-clone st
1754 ! f1
1754 ! f1
1755 $ hg -R http-clone up -Cqr null
1755 $ hg -R http-clone up -Cqr null
1756
1756
1757 largefiles pulled on update - a largefile corrupted on the server:
1757 largefiles pulled on update - a largefile corrupted on the server:
1758 $ echo corruption > empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90
1758 $ echo corruption > empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90
1759 $ hg -R http-clone up --config largefiles.usercache=http-clone-usercache
1759 $ hg -R http-clone up --config largefiles.usercache=http-clone-usercache
1760 getting changed largefiles
1760 getting changed largefiles
1761 f1: data corruption (expected 02a439e5c31c526465ab1a0ca1f431f76b827b90, got 6a7bb2556144babe3899b25e5428123735bb1e27)
1761 f1: data corruption (expected 02a439e5c31c526465ab1a0ca1f431f76b827b90, got 6a7bb2556144babe3899b25e5428123735bb1e27)
1762 0 largefiles updated, 0 removed
1762 0 largefiles updated, 0 removed
1763 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1763 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1764 $ hg -R http-clone st
1764 $ hg -R http-clone st
1765 ! f1
1765 ! f1
1766 $ [ ! -f http-clone/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 ]
1766 $ [ ! -f http-clone/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 ]
1767 $ [ ! -f http-clone/f1 ]
1767 $ [ ! -f http-clone/f1 ]
1768 $ [ ! -f http-clone-usercache ]
1768 $ [ ! -f http-clone-usercache ]
1769 $ hg -R http-clone verify --large --lfc
1769 $ hg -R http-clone verify --large --lfc
1770 checking changesets
1770 checking changesets
1771 checking manifests
1771 checking manifests
1772 crosschecking files in changesets and manifests
1772 crosschecking files in changesets and manifests
1773 checking files
1773 checking files
1774 1 files, 1 changesets, 1 total revisions
1774 1 files, 1 changesets, 1 total revisions
1775 searching 1 changesets for largefiles
1775 searching 1 changesets for largefiles
1776 verified contents of 1 revisions of 1 largefiles
1776 verified contents of 1 revisions of 1 largefiles
1777 $ hg -R http-clone up -Cqr null
1777 $ hg -R http-clone up -Cqr null
1778
1778
1779 largefiles pulled on update - no server side problems:
1779 largefiles pulled on update - no server side problems:
1780 $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/
1780 $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/
1781 $ hg -R http-clone --debug up --config largefiles.usercache=http-clone-usercache
1781 $ hg -R http-clone --debug up --config largefiles.usercache=http-clone-usercache
1782 resolving manifests
1782 resolving manifests
1783 branchmerge: False, force: False, partial: False
1783 branchmerge: False, force: False, partial: False
1784 ancestor: 000000000000, local: 000000000000+, remote: cf03e5bb9936
1784 ancestor: 000000000000, local: 000000000000+, remote: cf03e5bb9936
1785 .hglf/f1: remote created -> g
1785 .hglf/f1: remote created -> g
1786 getting .hglf/f1
1786 getting .hglf/f1
1787 updating: .hglf/f1 1/1 files (100.00%)
1787 updating: .hglf/f1 1/1 files (100.00%)
1788 getting changed largefiles
1788 getting changed largefiles
1789 using http://localhost:$HGPORT2/
1789 using http://localhost:$HGPORT2/
1790 sending capabilities command
1790 sending capabilities command
1791 sending batch command
1791 sending batch command
1792 getting largefiles: 0/1 lfile (0.00%)
1792 getting largefiles: 0/1 lfile (0.00%)
1793 getting f1:02a439e5c31c526465ab1a0ca1f431f76b827b90
1793 getting f1:02a439e5c31c526465ab1a0ca1f431f76b827b90
1794 sending getlfile command
1794 sending getlfile command
1795 found 02a439e5c31c526465ab1a0ca1f431f76b827b90 in store
1795 found 02a439e5c31c526465ab1a0ca1f431f76b827b90 in store
1796 1 largefiles updated, 0 removed
1796 1 largefiles updated, 0 removed
1797 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1797 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1798
1798
1799 $ ls http-clone-usercache/*
1799 $ ls http-clone-usercache/*
1800 http-clone-usercache/02a439e5c31c526465ab1a0ca1f431f76b827b90
1800 http-clone-usercache/02a439e5c31c526465ab1a0ca1f431f76b827b90
1801
1801
1802 $ rm -rf empty http-clone*
1802 $ rm -rf empty http-clone*
1803
1803
1804 used all HGPORTs, kill all daemons
1804 used all HGPORTs, kill all daemons
1805 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
1805 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
1806
1806
1807 #endif
1807 #endif
1808
1808
1809
1809
1810 #if unix-permissions
1810 #if unix-permissions
1811
1811
1812 Clone a local repository owned by another user
1812 Clone a local repository owned by another user
1813 We have to simulate that here by setting $HOME and removing write permissions
1813 We have to simulate that here by setting $HOME and removing write permissions
1814 $ ORIGHOME="$HOME"
1814 $ ORIGHOME="$HOME"
1815 $ mkdir alice
1815 $ mkdir alice
1816 $ HOME="`pwd`/alice"
1816 $ HOME="`pwd`/alice"
1817 $ cd alice
1817 $ cd alice
1818 $ hg init pubrepo
1818 $ hg init pubrepo
1819 $ cd pubrepo
1819 $ cd pubrepo
1820 $ dd if=/dev/zero bs=1k count=11k > a-large-file 2> /dev/null
1820 $ dd if=/dev/zero bs=1k count=11k > a-large-file 2> /dev/null
1821 $ hg add --large a-large-file
1821 $ hg add --large a-large-file
1822 $ hg commit -m "Add a large file"
1822 $ hg commit -m "Add a large file"
1823 Invoking status precommit hook
1823 Invoking status precommit hook
1824 A a-large-file
1824 A a-large-file
1825 $ cd ..
1825 $ cd ..
1826 $ chmod -R a-w pubrepo
1826 $ chmod -R a-w pubrepo
1827 $ cd ..
1827 $ cd ..
1828 $ mkdir bob
1828 $ mkdir bob
1829 $ HOME="`pwd`/bob"
1829 $ HOME="`pwd`/bob"
1830 $ cd bob
1830 $ cd bob
1831 $ hg clone --pull ../alice/pubrepo pubrepo
1831 $ hg clone --pull ../alice/pubrepo pubrepo
1832 requesting all changes
1832 requesting all changes
1833 adding changesets
1833 adding changesets
1834 adding manifests
1834 adding manifests
1835 adding file changes
1835 adding file changes
1836 added 1 changesets with 1 changes to 1 files
1836 added 1 changesets with 1 changes to 1 files
1837 updating to branch default
1837 updating to branch default
1838 getting changed largefiles
1838 getting changed largefiles
1839 1 largefiles updated, 0 removed
1839 1 largefiles updated, 0 removed
1840 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1840 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1841 $ cd ..
1841 $ cd ..
1842 $ chmod -R u+w alice/pubrepo
1842 $ chmod -R u+w alice/pubrepo
1843 $ HOME="$ORIGHOME"
1843 $ HOME="$ORIGHOME"
1844
1844
1845 #endif
1845 #endif
1846
1846
1847 #if symlink
1847 #if symlink
1848
1848
1849 Symlink to a large largefile should behave the same as a symlink to a normal file
1849 Symlink to a large largefile should behave the same as a symlink to a normal file
1850 $ hg init largesymlink
1850 $ hg init largesymlink
1851 $ cd largesymlink
1851 $ cd largesymlink
1852 $ dd if=/dev/zero bs=1k count=10k of=largefile 2>/dev/null
1852 $ dd if=/dev/zero bs=1k count=10k of=largefile 2>/dev/null
1853 $ hg add --large largefile
1853 $ hg add --large largefile
1854 $ hg commit -m "commit a large file"
1854 $ hg commit -m "commit a large file"
1855 Invoking status precommit hook
1855 Invoking status precommit hook
1856 A largefile
1856 A largefile
1857 $ ln -s largefile largelink
1857 $ ln -s largefile largelink
1858 $ hg add largelink
1858 $ hg add largelink
1859 $ hg commit -m "commit a large symlink"
1859 $ hg commit -m "commit a large symlink"
1860 Invoking status precommit hook
1860 Invoking status precommit hook
1861 A largelink
1861 A largelink
1862 $ rm -f largelink
1862 $ rm -f largelink
1863 $ hg up >/dev/null
1863 $ hg up >/dev/null
1864 $ test -f largelink
1864 $ test -f largelink
1865 [1]
1865 [1]
1866 $ test -L largelink
1866 $ test -L largelink
1867 [1]
1867 [1]
1868 $ rm -f largelink # make next part of the test independent of the previous
1868 $ rm -f largelink # make next part of the test independent of the previous
1869 $ hg up -C >/dev/null
1869 $ hg up -C >/dev/null
1870 $ test -f largelink
1870 $ test -f largelink
1871 $ test -L largelink
1871 $ test -L largelink
1872 $ cd ..
1872 $ cd ..
1873
1873
1874 #endif
1874 #endif
1875
1875
1876 test for pattern matching on 'hg status':
1876 test for pattern matching on 'hg status':
1877 to boost performance, largefiles checks whether specified patterns are
1877 to boost performance, largefiles checks whether specified patterns are
1878 related to largefiles in working directory (NOT to STANDIN) or not.
1878 related to largefiles in working directory (NOT to STANDIN) or not.
1879
1879
1880 $ hg init statusmatch
1880 $ hg init statusmatch
1881 $ cd statusmatch
1881 $ cd statusmatch
1882
1882
1883 $ mkdir -p a/b/c/d
1883 $ mkdir -p a/b/c/d
1884 $ echo normal > a/b/c/d/e.normal.txt
1884 $ echo normal > a/b/c/d/e.normal.txt
1885 $ hg add a/b/c/d/e.normal.txt
1885 $ hg add a/b/c/d/e.normal.txt
1886 $ echo large > a/b/c/d/e.large.txt
1886 $ echo large > a/b/c/d/e.large.txt
1887 $ hg add --large a/b/c/d/e.large.txt
1887 $ hg add --large a/b/c/d/e.large.txt
1888 $ mkdir -p a/b/c/x
1888 $ mkdir -p a/b/c/x
1889 $ echo normal > a/b/c/x/y.normal.txt
1889 $ echo normal > a/b/c/x/y.normal.txt
1890 $ hg add a/b/c/x/y.normal.txt
1890 $ hg add a/b/c/x/y.normal.txt
1891 $ hg commit -m 'add files'
1891 $ hg commit -m 'add files'
1892 Invoking status precommit hook
1892 Invoking status precommit hook
1893 A a/b/c/d/e.large.txt
1893 A a/b/c/d/e.large.txt
1894 A a/b/c/d/e.normal.txt
1894 A a/b/c/d/e.normal.txt
1895 A a/b/c/x/y.normal.txt
1895 A a/b/c/x/y.normal.txt
1896
1896
1897 (1) no pattern: no performance boost
1897 (1) no pattern: no performance boost
1898 $ hg status -A
1898 $ hg status -A
1899 C a/b/c/d/e.large.txt
1899 C a/b/c/d/e.large.txt
1900 C a/b/c/d/e.normal.txt
1900 C a/b/c/d/e.normal.txt
1901 C a/b/c/x/y.normal.txt
1901 C a/b/c/x/y.normal.txt
1902
1902
1903 (2) pattern not related to largefiles: performance boost
1903 (2) pattern not related to largefiles: performance boost
1904 $ hg status -A a/b/c/x
1904 $ hg status -A a/b/c/x
1905 C a/b/c/x/y.normal.txt
1905 C a/b/c/x/y.normal.txt
1906
1906
1907 (3) pattern related to largefiles: no performance boost
1907 (3) pattern related to largefiles: no performance boost
1908 $ hg status -A a/b/c/d
1908 $ hg status -A a/b/c/d
1909 C a/b/c/d/e.large.txt
1909 C a/b/c/d/e.large.txt
1910 C a/b/c/d/e.normal.txt
1910 C a/b/c/d/e.normal.txt
1911
1911
1912 (4) pattern related to STANDIN (not to largefiles): performance boost
1912 (4) pattern related to STANDIN (not to largefiles): performance boost
1913 $ hg status -A .hglf/a
1913 $ hg status -A .hglf/a
1914 C .hglf/a/b/c/d/e.large.txt
1914 C .hglf/a/b/c/d/e.large.txt
1915
1915
1916 (5) mixed case: no performance boost
1916 (5) mixed case: no performance boost
1917 $ hg status -A a/b/c/x a/b/c/d
1917 $ hg status -A a/b/c/x a/b/c/d
1918 C a/b/c/d/e.large.txt
1918 C a/b/c/d/e.large.txt
1919 C a/b/c/d/e.normal.txt
1919 C a/b/c/d/e.normal.txt
1920 C a/b/c/x/y.normal.txt
1920 C a/b/c/x/y.normal.txt
1921
1921
1922 verify that largefiles doesn't break filesets
1922 verify that largefiles doesn't break filesets
1923
1923
1924 $ hg log --rev . --exclude "set:binary()"
1924 $ hg log --rev . --exclude "set:binary()"
1925 changeset: 0:41bd42f10efa
1925 changeset: 0:41bd42f10efa
1926 tag: tip
1926 tag: tip
1927 user: test
1927 user: test
1928 date: Thu Jan 01 00:00:00 1970 +0000
1928 date: Thu Jan 01 00:00:00 1970 +0000
1929 summary: add files
1929 summary: add files
1930
1930
1931 verify that large files in subrepos handled properly
1931 verify that large files in subrepos handled properly
1932 $ hg init subrepo
1932 $ hg init subrepo
1933 $ echo "subrepo = subrepo" > .hgsub
1933 $ echo "subrepo = subrepo" > .hgsub
1934 $ hg add .hgsub
1934 $ hg add .hgsub
1935 $ hg ci -m "add subrepo"
1935 $ hg ci -m "add subrepo"
1936 Invoking status precommit hook
1936 Invoking status precommit hook
1937 A .hgsub
1937 A .hgsub
1938 ? .hgsubstate
1938 ? .hgsubstate
1939 $ echo "rev 1" > subrepo/large.txt
1939 $ echo "rev 1" > subrepo/large.txt
1940 $ hg -R subrepo add --large subrepo/large.txt
1940 $ hg -R subrepo add --large subrepo/large.txt
1941 $ hg sum
1941 $ hg sum
1942 parent: 1:8ee150ea2e9c tip
1942 parent: 1:8ee150ea2e9c tip
1943 add subrepo
1943 add subrepo
1944 branch: default
1944 branch: default
1945 commit: 1 subrepos
1945 commit: 1 subrepos
1946 update: (current)
1946 update: (current)
1947 $ hg st
1947 $ hg st
1948 $ hg st -S
1948 $ hg st -S
1949 A subrepo/large.txt
1949 A subrepo/large.txt
1950 $ hg ci -S -m "commit top repo"
1950 $ hg ci -S -m "commit top repo"
1951 committing subrepository subrepo
1951 committing subrepository subrepo
1952 Invoking status precommit hook
1952 Invoking status precommit hook
1953 A large.txt
1953 A large.txt
1954 Invoking status precommit hook
1954 Invoking status precommit hook
1955 M .hgsubstate
1955 M .hgsubstate
1956 # No differences
1956 # No differences
1957 $ hg st -S
1957 $ hg st -S
1958 $ hg sum
1958 $ hg sum
1959 parent: 2:ce4cd0c527a6 tip
1959 parent: 2:ce4cd0c527a6 tip
1960 commit top repo
1960 commit top repo
1961 branch: default
1961 branch: default
1962 commit: (clean)
1962 commit: (clean)
1963 update: (current)
1963 update: (current)
1964 $ echo "rev 2" > subrepo/large.txt
1964 $ echo "rev 2" > subrepo/large.txt
1965 $ hg st -S
1965 $ hg st -S
1966 M subrepo/large.txt
1966 M subrepo/large.txt
1967 $ hg sum
1967 $ hg sum
1968 parent: 2:ce4cd0c527a6 tip
1968 parent: 2:ce4cd0c527a6 tip
1969 commit top repo
1969 commit top repo
1970 branch: default
1970 branch: default
1971 commit: 1 subrepos
1971 commit: 1 subrepos
1972 update: (current)
1972 update: (current)
1973 $ hg ci -m "this commit should fail without -S"
1973 $ hg ci -m "this commit should fail without -S"
1974 abort: uncommitted changes in subrepo subrepo
1974 abort: uncommitted changes in subrepo subrepo
1975 (use --subrepos for recursive commit)
1975 (use --subrepos for recursive commit)
1976 [255]
1976 [255]
1977
1977
1978 Add a normal file to the subrepo, then test archiving
1978 Add a normal file to the subrepo, then test archiving
1979
1979
1980 $ echo 'normal file' > subrepo/normal.txt
1980 $ echo 'normal file' > subrepo/normal.txt
1981 $ hg -R subrepo add subrepo/normal.txt
1981 $ hg -R subrepo add subrepo/normal.txt
1982
1982
1983 Lock in subrepo, otherwise the change isn't archived
1983 Lock in subrepo, otherwise the change isn't archived
1984
1984
1985 $ hg ci -S -m "add normal file to top level"
1985 $ hg ci -S -m "add normal file to top level"
1986 committing subrepository subrepo
1986 committing subrepository subrepo
1987 Invoking status precommit hook
1987 Invoking status precommit hook
1988 M large.txt
1988 M large.txt
1989 A normal.txt
1989 A normal.txt
1990 Invoking status precommit hook
1990 Invoking status precommit hook
1991 M .hgsubstate
1991 M .hgsubstate
1992 $ hg archive -S ../lf_subrepo_archive
1992 $ hg archive -S ../lf_subrepo_archive
1993 $ find ../lf_subrepo_archive | sort
1993 $ find ../lf_subrepo_archive | sort
1994 ../lf_subrepo_archive
1994 ../lf_subrepo_archive
1995 ../lf_subrepo_archive/.hg_archival.txt
1995 ../lf_subrepo_archive/.hg_archival.txt
1996 ../lf_subrepo_archive/.hgsub
1996 ../lf_subrepo_archive/.hgsub
1997 ../lf_subrepo_archive/.hgsubstate
1997 ../lf_subrepo_archive/.hgsubstate
1998 ../lf_subrepo_archive/a
1998 ../lf_subrepo_archive/a
1999 ../lf_subrepo_archive/a/b
1999 ../lf_subrepo_archive/a/b
2000 ../lf_subrepo_archive/a/b/c
2000 ../lf_subrepo_archive/a/b/c
2001 ../lf_subrepo_archive/a/b/c/d
2001 ../lf_subrepo_archive/a/b/c/d
2002 ../lf_subrepo_archive/a/b/c/d/e.large.txt
2002 ../lf_subrepo_archive/a/b/c/d/e.large.txt
2003 ../lf_subrepo_archive/a/b/c/d/e.normal.txt
2003 ../lf_subrepo_archive/a/b/c/d/e.normal.txt
2004 ../lf_subrepo_archive/a/b/c/x
2004 ../lf_subrepo_archive/a/b/c/x
2005 ../lf_subrepo_archive/a/b/c/x/y.normal.txt
2005 ../lf_subrepo_archive/a/b/c/x/y.normal.txt
2006 ../lf_subrepo_archive/subrepo
2006 ../lf_subrepo_archive/subrepo
2007 ../lf_subrepo_archive/subrepo/large.txt
2007 ../lf_subrepo_archive/subrepo/large.txt
2008 ../lf_subrepo_archive/subrepo/normal.txt
2008 ../lf_subrepo_archive/subrepo/normal.txt
2009
2009
2010 Test update with subrepos.
2010 Test update with subrepos.
2011
2011
2012 $ hg update 0
2012 $ hg update 0
2013 getting changed largefiles
2013 getting changed largefiles
2014 0 largefiles updated, 1 removed
2014 0 largefiles updated, 1 removed
2015 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
2015 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
2016 $ hg status -S
2016 $ hg status -S
2017 $ hg update tip
2017 $ hg update tip
2018 getting changed largefiles
2018 getting changed largefiles
2019 1 largefiles updated, 0 removed
2019 1 largefiles updated, 0 removed
2020 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2020 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2021 $ hg status -S
2021 $ hg status -S
2022 # modify a large file
2022 # modify a large file
2023 $ echo "modified" > subrepo/large.txt
2023 $ echo "modified" > subrepo/large.txt
2024 $ hg st -S
2024 $ hg st -S
2025 M subrepo/large.txt
2025 M subrepo/large.txt
2026 # update -C should revert the change.
2026 # update -C should revert the change.
2027 $ hg update -C
2027 $ hg update -C
2028 getting changed largefiles
2028 getting changed largefiles
2029 1 largefiles updated, 0 removed
2029 1 largefiles updated, 0 removed
2030 getting changed largefiles
2030 getting changed largefiles
2031 0 largefiles updated, 0 removed
2031 0 largefiles updated, 0 removed
2032 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2032 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2033 $ hg status -S
2033 $ hg status -S
2034
2034
2035 Test archiving a revision that references a subrepo that is not yet
2035 Test archiving a revision that references a subrepo that is not yet
2036 cloned (see test-subrepo-recursion.t):
2036 cloned (see test-subrepo-recursion.t):
2037
2037
2038 $ hg clone -U . ../empty
2038 $ hg clone -U . ../empty
2039 $ cd ../empty
2039 $ cd ../empty
2040 $ hg archive --subrepos -r tip ../archive.tar.gz
2040 $ hg archive --subrepos -r tip ../archive.tar.gz
2041 cloning subrepo subrepo from $TESTTMP/statusmatch/subrepo
2041 cloning subrepo subrepo from $TESTTMP/statusmatch/subrepo
2042 $ cd ..
2042 $ cd ..
2043
2043
2044 Test that addremove picks up largefiles prior to the initial commit (issue3541)
2044 Test that addremove picks up largefiles prior to the initial commit (issue3541)
2045
2045
2046 $ hg init addrm2
2046 $ hg init addrm2
2047 $ cd addrm2
2047 $ cd addrm2
2048 $ touch large.dat
2048 $ touch large.dat
2049 $ touch large2.dat
2049 $ touch large2.dat
2050 $ touch normal
2050 $ touch normal
2051 $ hg add --large large.dat
2051 $ hg add --large large.dat
2052 $ hg addremove -v
2052 $ hg addremove -v
2053 adding large2.dat as a largefile
2053 adding large2.dat as a largefile
2054 adding normal
2054 adding normal
2055
2055
2056 Test that forgetting all largefiles reverts to islfilesrepo() == False
2056 Test that forgetting all largefiles reverts to islfilesrepo() == False
2057 (addremove will add *.dat as normal files now)
2057 (addremove will add *.dat as normal files now)
2058 $ hg forget large.dat
2058 $ hg forget large.dat
2059 $ hg forget large2.dat
2059 $ hg forget large2.dat
2060 $ hg addremove -v
2060 $ hg addremove -v
2061 adding large.dat
2061 adding large.dat
2062 adding large2.dat
2062 adding large2.dat
2063
2063
2064 Test commit's addremove option prior to the first commit
2064 Test commit's addremove option prior to the first commit
2065 $ hg forget large.dat
2065 $ hg forget large.dat
2066 $ hg forget large2.dat
2066 $ hg forget large2.dat
2067 $ hg add --large large.dat
2067 $ hg add --large large.dat
2068 $ hg ci -Am "commit"
2068 $ hg ci -Am "commit"
2069 adding large2.dat as a largefile
2069 adding large2.dat as a largefile
2070 Invoking status precommit hook
2070 Invoking status precommit hook
2071 A large.dat
2071 A large.dat
2072 A large2.dat
2072 A large2.dat
2073 A normal
2073 A normal
2074 $ find .hglf | sort
2074 $ find .hglf | sort
2075 .hglf
2075 .hglf
2076 .hglf/large.dat
2076 .hglf/large.dat
2077 .hglf/large2.dat
2077 .hglf/large2.dat
2078
2078
2079 Test actions on largefiles using relative paths from subdir
2079 Test actions on largefiles using relative paths from subdir
2080
2080
2081 $ mkdir sub
2081 $ mkdir sub
2082 $ cd sub
2082 $ cd sub
2083 $ echo anotherlarge > anotherlarge
2083 $ echo anotherlarge > anotherlarge
2084 $ hg add --large anotherlarge
2084 $ hg add --large anotherlarge
2085 $ hg st
2085 $ hg st
2086 A sub/anotherlarge
2086 A sub/anotherlarge
2087 $ hg st anotherlarge
2087 $ hg st anotherlarge
2088 A anotherlarge
2088 A anotherlarge
2089 $ hg commit -m anotherlarge anotherlarge
2089 $ hg commit -m anotherlarge anotherlarge
2090 Invoking status precommit hook
2090 Invoking status precommit hook
2091 A sub/anotherlarge
2091 A sub/anotherlarge
2092 $ hg log anotherlarge
2092 $ hg log anotherlarge
2093 changeset: 1:9627a577c5e9
2093 changeset: 1:9627a577c5e9
2094 tag: tip
2094 tag: tip
2095 user: test
2095 user: test
2096 date: Thu Jan 01 00:00:00 1970 +0000
2096 date: Thu Jan 01 00:00:00 1970 +0000
2097 summary: anotherlarge
2097 summary: anotherlarge
2098
2098
2099 $ echo more >> anotherlarge
2099 $ echo more >> anotherlarge
2100 $ hg st .
2100 $ hg st .
2101 M anotherlarge
2101 M anotherlarge
2102 $ hg cat anotherlarge
2102 $ hg cat anotherlarge
2103 anotherlarge
2103 anotherlarge
2104 $ hg revert anotherlarge
2104 $ hg revert anotherlarge
2105 $ hg st
2105 $ hg st
2106 ? sub/anotherlarge.orig
2106 ? sub/anotherlarge.orig
2107 $ cd ..
2107 $ cd ..
2108
2108
2109 $ cd ..
2109 $ cd ..
2110
2110
2111 issue3651: summary/outgoing with largefiles shows "no remote repo"
2111 issue3651: summary/outgoing with largefiles shows "no remote repo"
2112 unexpectedly
2112 unexpectedly
2113
2113
2114 $ mkdir issue3651
2114 $ mkdir issue3651
2115 $ cd issue3651
2115 $ cd issue3651
2116
2116
2117 $ hg init src
2117 $ hg init src
2118 $ echo a > src/a
2118 $ echo a > src/a
2119 $ hg -R src add --large src/a
2119 $ hg -R src add --large src/a
2120 $ hg -R src commit -m '#0'
2120 $ hg -R src commit -m '#0'
2121 Invoking status precommit hook
2121 Invoking status precommit hook
2122 A a
2122 A a
2123
2123
2124 check messages when no remote repository is specified:
2124 check messages when no remote repository is specified:
2125 "no remote repo" route for "hg outgoing --large" is not tested here,
2125 "no remote repo" route for "hg outgoing --large" is not tested here,
2126 because it can't be reproduced easily.
2126 because it can't be reproduced easily.
2127
2127
2128 $ hg init clone1
2128 $ hg init clone1
2129 $ hg -R clone1 -q pull src
2129 $ hg -R clone1 -q pull src
2130 $ hg -R clone1 -q update
2130 $ hg -R clone1 -q update
2131 $ hg -R clone1 paths | grep default
2131 $ hg -R clone1 paths | grep default
2132 [1]
2132 [1]
2133
2133
2134 $ hg -R clone1 summary --large
2134 $ hg -R clone1 summary --large
2135 parent: 0:fc0bd45326d3 tip
2135 parent: 0:fc0bd45326d3 tip
2136 #0
2136 #0
2137 branch: default
2137 branch: default
2138 commit: (clean)
2138 commit: (clean)
2139 update: (current)
2139 update: (current)
2140 largefiles: (no remote repo)
2140 largefiles: (no remote repo)
2141
2141
2142 check messages when there is no files to upload:
2142 check messages when there is no files to upload:
2143
2143
2144 $ hg -q clone src clone2
2144 $ hg -q clone src clone2
2145 $ hg -R clone2 paths | grep default
2145 $ hg -R clone2 paths | grep default
2146 default = $TESTTMP/issue3651/src (glob)
2146 default = $TESTTMP/issue3651/src (glob)
2147
2147
2148 $ hg -R clone2 summary --large
2148 $ hg -R clone2 summary --large
2149 parent: 0:fc0bd45326d3 tip
2149 parent: 0:fc0bd45326d3 tip
2150 #0
2150 #0
2151 branch: default
2151 branch: default
2152 commit: (clean)
2152 commit: (clean)
2153 update: (current)
2153 update: (current)
2154 searching for changes
2154 searching for changes
2155 largefiles: (no files to upload)
2155 largefiles: (no files to upload)
2156 $ hg -R clone2 outgoing --large
2156 $ hg -R clone2 outgoing --large
2157 comparing with $TESTTMP/issue3651/src (glob)
2157 comparing with $TESTTMP/issue3651/src (glob)
2158 searching for changes
2158 searching for changes
2159 no changes found
2159 no changes found
2160 searching for changes
2160 searching for changes
2161 largefiles: no files to upload
2161 largefiles: no files to upload
2162 [1]
2162 [1]
2163
2163
2164 check messages when there are files to upload:
2164 check messages when there are files to upload:
2165
2165
2166 $ echo b > clone2/b
2166 $ echo b > clone2/b
2167 $ hg -R clone2 add --large clone2/b
2167 $ hg -R clone2 add --large clone2/b
2168 $ hg -R clone2 commit -m '#1'
2168 $ hg -R clone2 commit -m '#1'
2169 Invoking status precommit hook
2169 Invoking status precommit hook
2170 A b
2170 A b
2171 $ hg -R clone2 summary --large
2171 $ hg -R clone2 summary --large
2172 parent: 1:1acbe71ce432 tip
2172 parent: 1:1acbe71ce432 tip
2173 #1
2173 #1
2174 branch: default
2174 branch: default
2175 commit: (clean)
2175 commit: (clean)
2176 update: (current)
2176 update: (current)
2177 searching for changes
2177 searching for changes
2178 largefiles: 1 to upload
2178 largefiles: 1 to upload
2179 $ hg -R clone2 outgoing --large
2179 $ hg -R clone2 outgoing --large
2180 comparing with $TESTTMP/issue3651/src (glob)
2180 comparing with $TESTTMP/issue3651/src (glob)
2181 searching for changes
2181 searching for changes
2182 changeset: 1:1acbe71ce432
2182 changeset: 1:1acbe71ce432
2183 tag: tip
2183 tag: tip
2184 user: test
2184 user: test
2185 date: Thu Jan 01 00:00:00 1970 +0000
2185 date: Thu Jan 01 00:00:00 1970 +0000
2186 summary: #1
2186 summary: #1
2187
2187
2188 searching for changes
2188 searching for changes
2189 largefiles to upload:
2189 largefiles to upload:
2190 b
2190 b
2191
2191
2192
2192
2193 $ cd ..
2193 $ cd ..
2194
2194
2195 Check whether "largefiles" feature is supported only in repositories
2195 Check whether "largefiles" feature is supported only in repositories
2196 enabling largefiles extension.
2196 enabling largefiles extension.
2197
2197
2198 $ mkdir individualenabling
2198 $ mkdir individualenabling
2199 $ cd individualenabling
2199 $ cd individualenabling
2200
2200
2201 $ hg init enabledlocally
2201 $ hg init enabledlocally
2202 $ echo large > enabledlocally/large
2202 $ echo large > enabledlocally/large
2203 $ hg -R enabledlocally add --large enabledlocally/large
2203 $ hg -R enabledlocally add --large enabledlocally/large
2204 $ hg -R enabledlocally commit -m '#0'
2204 $ hg -R enabledlocally commit -m '#0'
2205 Invoking status precommit hook
2205 Invoking status precommit hook
2206 A large
2206 A large
2207
2207
2208 $ hg init notenabledlocally
2208 $ hg init notenabledlocally
2209 $ echo large > notenabledlocally/large
2209 $ echo large > notenabledlocally/large
2210 $ hg -R notenabledlocally add --large notenabledlocally/large
2210 $ hg -R notenabledlocally add --large notenabledlocally/large
2211 $ hg -R notenabledlocally commit -m '#0'
2211 $ hg -R notenabledlocally commit -m '#0'
2212 Invoking status precommit hook
2212 Invoking status precommit hook
2213 A large
2213 A large
2214
2214
2215 $ cat >> $HGRCPATH <<EOF
2215 $ cat >> $HGRCPATH <<EOF
2216 > [extensions]
2216 > [extensions]
2217 > # disable globally
2217 > # disable globally
2218 > largefiles=!
2218 > largefiles=!
2219 > EOF
2219 > EOF
2220 $ cat >> enabledlocally/.hg/hgrc <<EOF
2220 $ cat >> enabledlocally/.hg/hgrc <<EOF
2221 > [extensions]
2221 > [extensions]
2222 > # enable locally
2222 > # enable locally
2223 > largefiles=
2223 > largefiles=
2224 > EOF
2224 > EOF
2225 $ hg -R enabledlocally root
2225 $ hg -R enabledlocally root
2226 $TESTTMP/individualenabling/enabledlocally
2226 $TESTTMP/individualenabling/enabledlocally
2227 $ hg -R notenabledlocally root
2227 $ hg -R notenabledlocally root
2228 abort: unknown repository format: requires features 'largefiles' (upgrade Mercurial)!
2228 abort: unknown repository format: requires features 'largefiles' (upgrade Mercurial)!
2229 [255]
2229 [255]
2230
2230
2231 $ hg init push-dst
2231 $ hg init push-dst
2232 $ hg -R enabledlocally push push-dst
2232 $ hg -R enabledlocally push push-dst
2233 pushing to push-dst
2233 pushing to push-dst
2234 abort: required features are not supported in the destination: largefiles
2234 abort: required features are not supported in the destination: largefiles
2235 [255]
2235 [255]
2236
2236
2237 $ hg init pull-src
2237 $ hg init pull-src
2238 $ hg -R pull-src pull enabledlocally
2238 $ hg -R pull-src pull enabledlocally
2239 pulling from enabledlocally
2239 pulling from enabledlocally
2240 abort: required features are not supported in the destination: largefiles
2240 abort: required features are not supported in the destination: largefiles
2241 [255]
2241 [255]
2242
2242
2243 $ hg clone enabledlocally clone-dst
2243 $ hg clone enabledlocally clone-dst
2244 abort: unknown repository format: requires features 'largefiles' (upgrade Mercurial)!
2244 abort: unknown repository format: requires features 'largefiles' (upgrade Mercurial)!
2245 [255]
2245 [255]
2246 $ test -d clone-dst
2246 $ test -d clone-dst
2247 [1]
2247 [1]
2248 $ hg clone --pull enabledlocally clone-pull-dst
2248 $ hg clone --pull enabledlocally clone-pull-dst
2249 abort: required features are not supported in the destination: largefiles
2249 abort: required features are not supported in the destination: largefiles
2250 [255]
2250 [255]
2251 $ test -d clone-pull-dst
2251 $ test -d clone-pull-dst
2252 [1]
2252 [1]
2253
2253
2254 $ cd ..
2254 $ cd ..
@@ -1,350 +1,350 b''
1 $ USERCACHE="$TESTTMP/cache"; export USERCACHE
1 $ USERCACHE="$TESTTMP/cache"; export USERCACHE
2 $ mkdir "${USERCACHE}"
2 $ mkdir "${USERCACHE}"
3 $ cat >> $HGRCPATH <<EOF
3 $ cat >> $HGRCPATH <<EOF
4 > [extensions]
4 > [extensions]
5 > largefiles =
5 > largefiles =
6 > share =
6 > share =
7 > graphlog =
7 > graphlog =
8 > mq =
8 > mq =
9 > convert =
9 > convert =
10 > [largefiles]
10 > [largefiles]
11 > minsize = 0.5
11 > minsize = 0.5
12 > patterns = **.other
12 > patterns = **.other
13 > **.dat
13 > **.dat
14 > usercache=${USERCACHE}
14 > usercache=${USERCACHE}
15 > EOF
15 > EOF
16
16
17 "lfconvert" works
17 "lfconvert" works
18 $ hg init bigfile-repo
18 $ hg init bigfile-repo
19 $ cd bigfile-repo
19 $ cd bigfile-repo
20 $ cat >> .hg/hgrc <<EOF
20 $ cat >> .hg/hgrc <<EOF
21 > [extensions]
21 > [extensions]
22 > largefiles = !
22 > largefiles = !
23 > EOF
23 > EOF
24 $ mkdir sub
24 $ mkdir sub
25 $ dd if=/dev/zero bs=1k count=256 > large 2> /dev/null
25 $ dd if=/dev/zero bs=1k count=256 > large 2> /dev/null
26 $ dd if=/dev/zero bs=1k count=256 > large2 2> /dev/null
26 $ dd if=/dev/zero bs=1k count=256 > large2 2> /dev/null
27 $ echo normal > normal1
27 $ echo normal > normal1
28 $ echo alsonormal > sub/normal2
28 $ echo alsonormal > sub/normal2
29 $ dd if=/dev/zero bs=1k count=10 > sub/maybelarge.dat 2> /dev/null
29 $ dd if=/dev/zero bs=1k count=10 > sub/maybelarge.dat 2> /dev/null
30 $ hg addremove
30 $ hg addremove
31 adding large
31 adding large
32 adding large2
32 adding large2
33 adding normal1
33 adding normal1
34 adding sub/maybelarge.dat
34 adding sub/maybelarge.dat
35 adding sub/normal2
35 adding sub/normal2
36 $ hg commit -m"add large, normal1" large normal1
36 $ hg commit -m"add large, normal1" large normal1
37 $ hg commit -m"add sub/*" sub
37 $ hg commit -m"add sub/*" sub
38
38
39 Test tag parsing
39 Test tag parsing
40 $ cat >> .hgtags <<EOF
40 $ cat >> .hgtags <<EOF
41 > IncorrectlyFormattedTag!
41 > IncorrectlyFormattedTag!
42 > invalidhash sometag
42 > invalidhash sometag
43 > 0123456789abcdef anothertag
43 > 0123456789abcdef anothertag
44 > EOF
44 > EOF
45 $ hg add .hgtags
45 $ hg add .hgtags
46 $ hg commit -m"add large2" large2 .hgtags
46 $ hg commit -m"add large2" large2 .hgtags
47
47
48 Test link+rename largefile codepath
48 Test link+rename largefile codepath
49 $ [ -d .hg/largefiles ] && echo fail || echo pass
49 $ [ -d .hg/largefiles ] && echo fail || echo pass
50 pass
50 pass
51 $ cd ..
51 $ cd ..
52 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo
52 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo
53 initializing destination largefiles-repo
53 initializing destination largefiles-repo
54 skipping incorrectly formatted tag IncorrectlyFormattedTag!
54 skipping incorrectly formatted tag IncorrectlyFormattedTag!
55 skipping incorrectly formatted id invalidhash
55 skipping incorrectly formatted id invalidhash
56 no mapping for id 0123456789abcdef
56 no mapping for id 0123456789abcdef
57 #if symlink
57 #if symlink
58 $ hg --cwd bigfile-repo rename large2 large3
58 $ hg --cwd bigfile-repo rename large2 large3
59 $ ln -sf large bigfile-repo/large3
59 $ ln -sf large bigfile-repo/large3
60 $ hg --cwd bigfile-repo commit -m"make large2 a symlink" large2 large3
60 $ hg --cwd bigfile-repo commit -m"make large2 a symlink" large2 large3
61 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo-symlink
61 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo-symlink
62 initializing destination largefiles-repo-symlink
62 initializing destination largefiles-repo-symlink
63 skipping incorrectly formatted tag IncorrectlyFormattedTag!
63 skipping incorrectly formatted tag IncorrectlyFormattedTag!
64 skipping incorrectly formatted id invalidhash
64 skipping incorrectly formatted id invalidhash
65 no mapping for id 0123456789abcdef
65 no mapping for id 0123456789abcdef
66 abort: renamed/copied largefile large3 becomes symlink
66 abort: renamed/copied largefile large3 becomes symlink
67 [255]
67 [255]
68 #endif
68 #endif
69 $ cd bigfile-repo
69 $ cd bigfile-repo
70 $ hg strip --no-backup 2
70 $ hg strip --no-backup 2
71 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
71 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
72 $ cd ..
72 $ cd ..
73 $ rm -rf largefiles-repo largefiles-repo-symlink
73 $ rm -rf largefiles-repo largefiles-repo-symlink
74
74
75 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo
75 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo
76 initializing destination largefiles-repo
76 initializing destination largefiles-repo
77
77
78 "lfconvert" converts content correctly
78 "lfconvert" converts content correctly
79 $ cd largefiles-repo
79 $ cd largefiles-repo
80 $ hg up
80 $ hg up
81 getting changed largefiles
81 getting changed largefiles
82 2 largefiles updated, 0 removed
82 2 largefiles updated, 0 removed
83 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
83 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
84 $ hg locate
84 $ hg locate
85 .hglf/large
85 .hglf/large
86 .hglf/sub/maybelarge.dat
86 .hglf/sub/maybelarge.dat
87 normal1
87 normal1
88 sub/normal2
88 sub/normal2
89 $ cat normal1
89 $ cat normal1
90 normal
90 normal
91 $ cat sub/normal2
91 $ cat sub/normal2
92 alsonormal
92 alsonormal
93 $ "$TESTDIR/md5sum.py" large sub/maybelarge.dat
93 $ "$TESTDIR/md5sum.py" large sub/maybelarge.dat
94 ec87a838931d4d5d2e94a04644788a55 large
94 ec87a838931d4d5d2e94a04644788a55 large
95 1276481102f218c981e0324180bafd9f sub/maybelarge.dat
95 1276481102f218c981e0324180bafd9f sub/maybelarge.dat
96
96
97 "lfconvert" adds 'largefiles' to .hg/requires.
97 "lfconvert" adds 'largefiles' to .hg/requires.
98 $ cat .hg/requires
98 $ cat .hg/requires
99 dotencode
99 dotencode
100 fncache
100 fncache
101 largefiles
101 largefiles
102 revlogv1
102 revlogv1
103 store
103 store
104
104
105 "lfconvert" includes a newline at the end of the standin files.
105 "lfconvert" includes a newline at the end of the standin files.
106 $ cat .hglf/large .hglf/sub/maybelarge.dat
106 $ cat .hglf/large .hglf/sub/maybelarge.dat
107 2e000fa7e85759c7f4c254d4d9c33ef481e459a7
107 2e000fa7e85759c7f4c254d4d9c33ef481e459a7
108 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c
108 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c
109 $ cd ..
109 $ cd ..
110
110
111 add some changesets to rename/remove/merge
111 add some changesets to rename/remove/merge
112 $ cd bigfile-repo
112 $ cd bigfile-repo
113 $ hg mv -q sub stuff
113 $ hg mv -q sub stuff
114 $ hg commit -m"rename sub/ to stuff/"
114 $ hg commit -m"rename sub/ to stuff/"
115 $ hg update -q 1
115 $ hg update -q 1
116 $ echo blah >> normal3
116 $ echo blah >> normal3
117 $ echo blah >> sub/normal2
117 $ echo blah >> sub/normal2
118 $ echo blah >> sub/maybelarge.dat
118 $ echo blah >> sub/maybelarge.dat
119 $ "$TESTDIR/md5sum.py" sub/maybelarge.dat
119 $ "$TESTDIR/md5sum.py" sub/maybelarge.dat
120 1dd0b99ff80e19cff409702a1d3f5e15 sub/maybelarge.dat
120 1dd0b99ff80e19cff409702a1d3f5e15 sub/maybelarge.dat
121 $ hg commit -A -m"add normal3, modify sub/*"
121 $ hg commit -A -m"add normal3, modify sub/*"
122 adding normal3
122 adding normal3
123 created new head
123 created new head
124 $ hg rm large normal3
124 $ hg rm large normal3
125 $ hg commit -q -m"remove large, normal3"
125 $ hg commit -q -m"remove large, normal3"
126 $ hg merge
126 $ hg merge
127 merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat
127 merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat
128 warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob)
128 warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob)
129 merging stuff/maybelarge.dat incomplete! (edit conflicts, then use 'hg resolve --mark')
129 merging stuff/maybelarge.dat incomplete! (edit conflicts, then use 'hg resolve --mark')
130 merging sub/normal2 and stuff/normal2 to stuff/normal2
130 merging sub/normal2 and stuff/normal2 to stuff/normal2
131 0 files updated, 1 files merged, 0 files removed, 1 files unresolved
131 0 files updated, 1 files merged, 0 files removed, 1 files unresolved
132 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
132 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
133 [1]
133 [1]
134 $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat
134 $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat
135 $ hg resolve -m stuff/maybelarge.dat
135 $ hg resolve -m stuff/maybelarge.dat
136 $ hg commit -m"merge"
136 $ hg commit -m"merge"
137 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n"
137 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n"
138 @ 5:4884f215abda merge
138 @ 5:4884f215abda merge
139 |\
139 |\
140 | o 4:7285f817b77e remove large, normal3
140 | o 4:7285f817b77e remove large, normal3
141 | |
141 | |
142 | o 3:67e3892e3534 add normal3, modify sub/*
142 | o 3:67e3892e3534 add normal3, modify sub/*
143 | |
143 | |
144 o | 2:c96c8beb5d56 rename sub/ to stuff/
144 o | 2:c96c8beb5d56 rename sub/ to stuff/
145 |/
145 |/
146 o 1:020c65d24e11 add sub/*
146 o 1:020c65d24e11 add sub/*
147 |
147 |
148 o 0:117b8328f97a add large, normal1
148 o 0:117b8328f97a add large, normal1
149
149
150 $ cd ..
150 $ cd ..
151
151
152 lfconvert with rename, merge, and remove
152 lfconvert with rename, merge, and remove
153 $ rm -rf largefiles-repo
153 $ rm -rf largefiles-repo
154 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo
154 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo
155 initializing destination largefiles-repo
155 initializing destination largefiles-repo
156 $ cd largefiles-repo
156 $ cd largefiles-repo
157 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n"
157 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n"
158 o 5:8e05f5f2b77e merge
158 o 5:8e05f5f2b77e merge
159 |\
159 |\
160 | o 4:a5a02de7a8e4 remove large, normal3
160 | o 4:a5a02de7a8e4 remove large, normal3
161 | |
161 | |
162 | o 3:55759520c76f add normal3, modify sub/*
162 | o 3:55759520c76f add normal3, modify sub/*
163 | |
163 | |
164 o | 2:261ad3f3f037 rename sub/ to stuff/
164 o | 2:261ad3f3f037 rename sub/ to stuff/
165 |/
165 |/
166 o 1:334e5237836d add sub/*
166 o 1:334e5237836d add sub/*
167 |
167 |
168 o 0:d4892ec57ce2 add large, normal1
168 o 0:d4892ec57ce2 add large, normal1
169
169
170 $ hg locate -r 2
170 $ hg locate -r 2
171 .hglf/large
171 .hglf/large
172 .hglf/stuff/maybelarge.dat
172 .hglf/stuff/maybelarge.dat
173 normal1
173 normal1
174 stuff/normal2
174 stuff/normal2
175 $ hg locate -r 3
175 $ hg locate -r 3
176 .hglf/large
176 .hglf/large
177 .hglf/sub/maybelarge.dat
177 .hglf/sub/maybelarge.dat
178 normal1
178 normal1
179 normal3
179 normal3
180 sub/normal2
180 sub/normal2
181 $ hg locate -r 4
181 $ hg locate -r 4
182 .hglf/sub/maybelarge.dat
182 .hglf/sub/maybelarge.dat
183 normal1
183 normal1
184 sub/normal2
184 sub/normal2
185 $ hg locate -r 5
185 $ hg locate -r 5
186 .hglf/stuff/maybelarge.dat
186 .hglf/stuff/maybelarge.dat
187 normal1
187 normal1
188 stuff/normal2
188 stuff/normal2
189 $ hg update
189 $ hg update
190 getting changed largefiles
190 getting changed largefiles
191 1 largefiles updated, 0 removed
191 1 largefiles updated, 0 removed
192 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
192 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
193 $ cat stuff/normal2
193 $ cat stuff/normal2
194 alsonormal
194 alsonormal
195 blah
195 blah
196 $ "$TESTDIR/md5sum.py" stuff/maybelarge.dat
196 $ "$TESTDIR/md5sum.py" stuff/maybelarge.dat
197 1dd0b99ff80e19cff409702a1d3f5e15 stuff/maybelarge.dat
197 1dd0b99ff80e19cff409702a1d3f5e15 stuff/maybelarge.dat
198 $ cat .hglf/stuff/maybelarge.dat
198 $ cat .hglf/stuff/maybelarge.dat
199 76236b6a2c6102826c61af4297dd738fb3b1de38
199 76236b6a2c6102826c61af4297dd738fb3b1de38
200 $ cd ..
200 $ cd ..
201
201
202 "lfconvert" error cases
202 "lfconvert" error cases
203 $ hg lfconvert http://localhost/foo foo
203 $ hg lfconvert http://localhost/foo foo
204 abort: http://localhost/foo is not a local Mercurial repo
204 abort: http://localhost/foo is not a local Mercurial repo
205 [255]
205 [255]
206 $ hg lfconvert foo ssh://localhost/foo
206 $ hg lfconvert foo ssh://localhost/foo
207 abort: ssh://localhost/foo is not a local Mercurial repo
207 abort: ssh://localhost/foo is not a local Mercurial repo
208 [255]
208 [255]
209 $ hg lfconvert nosuchrepo foo
209 $ hg lfconvert nosuchrepo foo
210 abort: repository nosuchrepo not found!
210 abort: repository nosuchrepo not found!
211 [255]
211 [255]
212 $ hg share -q -U bigfile-repo shared
212 $ hg share -q -U bigfile-repo shared
213 $ printf 'bogus' > shared/.hg/sharedpath
213 $ printf 'bogus' > shared/.hg/sharedpath
214 $ hg lfconvert shared foo
214 $ hg lfconvert shared foo
215 abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus! (glob)
215 abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus! (glob)
216 [255]
216 [255]
217 $ hg lfconvert bigfile-repo largefiles-repo
217 $ hg lfconvert bigfile-repo largefiles-repo
218 initializing destination largefiles-repo
218 initializing destination largefiles-repo
219 abort: repository largefiles-repo already exists!
219 abort: repository largefiles-repo already exists!
220 [255]
220 [255]
221
221
222 add another largefile to the new largefiles repo
222 add another largefile to the new largefiles repo
223 $ cd largefiles-repo
223 $ cd largefiles-repo
224 $ dd if=/dev/zero bs=1k count=1k > anotherlarge 2> /dev/null
224 $ dd if=/dev/zero bs=1k count=1k > anotherlarge 2> /dev/null
225 $ hg add --lfsize=1 anotherlarge
225 $ hg add --lfsize=1 anotherlarge
226 $ hg commit -m "add anotherlarge (should be a largefile)"
226 $ hg commit -m "add anotherlarge (should be a largefile)"
227 $ cat .hglf/anotherlarge
227 $ cat .hglf/anotherlarge
228 3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3
228 3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3
229 $ cd ..
229 $ cd ..
230
230
231 round-trip: converting back to a normal (non-largefiles) repo with
231 round-trip: converting back to a normal (non-largefiles) repo with
232 "lfconvert --to-normal" should give the same as ../bigfile-repo
232 "lfconvert --to-normal" should give the same as ../bigfile-repo
233 $ cd largefiles-repo
233 $ cd largefiles-repo
234 $ hg lfconvert --to-normal . ../normal-repo
234 $ hg lfconvert --to-normal . ../normal-repo
235 initializing destination ../normal-repo
235 initializing destination ../normal-repo
236 $ cd ../normal-repo
236 $ cd ../normal-repo
237 $ cat >> .hg/hgrc <<EOF
237 $ cat >> .hg/hgrc <<EOF
238 > [extensions]
238 > [extensions]
239 > largefiles = !
239 > largefiles = !
240 > EOF
240 > EOF
241
241
242 # Hmmm: the changeset ID for rev 5 is different from the original
242 # Hmmm: the changeset ID for rev 5 is different from the original
243 # normal repo (../bigfile-repo), because the changelog filelist
243 # normal repo (../bigfile-repo), because the changelog filelist
244 # differs between the two incarnations of rev 5: this repo includes
244 # differs between the two incarnations of rev 5: this repo includes
245 # 'large' in the list, but ../bigfile-repo does not. Since rev 5
245 # 'large' in the list, but ../bigfile-repo does not. Since rev 5
246 # removes 'large' relative to the first parent in both repos, it seems
246 # removes 'large' relative to the first parent in both repos, it seems
247 # to me that lfconvert is doing a *better* job than
247 # to me that lfconvert is doing a *better* job than
248 # "hg remove" + "hg merge" + "hg commit".
248 # "hg remove" + "hg merge" + "hg commit".
249 # $ hg -R ../bigfile-repo debugdata -c 5
249 # $ hg -R ../bigfile-repo debugdata -c 5
250 # $ hg debugdata -c 5
250 # $ hg debugdata -c 5
251 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n"
251 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n"
252 o 6:1635824e6f59 add anotherlarge (should be a largefile)
252 o 6:1635824e6f59 add anotherlarge (should be a largefile)
253 |
253 |
254 o 5:7215f8deeaaf merge
254 o 5:7215f8deeaaf merge
255 |\
255 |\
256 | o 4:7285f817b77e remove large, normal3
256 | o 4:7285f817b77e remove large, normal3
257 | |
257 | |
258 | o 3:67e3892e3534 add normal3, modify sub/*
258 | o 3:67e3892e3534 add normal3, modify sub/*
259 | |
259 | |
260 o | 2:c96c8beb5d56 rename sub/ to stuff/
260 o | 2:c96c8beb5d56 rename sub/ to stuff/
261 |/
261 |/
262 o 1:020c65d24e11 add sub/*
262 o 1:020c65d24e11 add sub/*
263 |
263 |
264 o 0:117b8328f97a add large, normal1
264 o 0:117b8328f97a add large, normal1
265
265
266 $ hg update
266 $ hg update
267 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
267 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
268 $ hg locate
268 $ hg locate
269 anotherlarge
269 anotherlarge
270 normal1
270 normal1
271 stuff/maybelarge.dat
271 stuff/maybelarge.dat
272 stuff/normal2
272 stuff/normal2
273 $ [ -d .hg/largefiles ] && echo fail || echo pass
273 $ [ -d .hg/largefiles ] && echo fail || echo pass
274 pass
274 pass
275
275
276 $ cd ..
276 $ cd ..
277
277
278 Clearing the usercache ensures that commitctx doesn't try to cache largefiles
278 Clearing the usercache ensures that commitctx doesn't try to cache largefiles
279 from the working dir on a convert.
279 from the working dir on a convert.
280 $ rm "${USERCACHE}"/*
280 $ rm "${USERCACHE}"/*
281 $ hg convert largefiles-repo
281 $ hg convert largefiles-repo
282 assuming destination largefiles-repo-hg
282 assuming destination largefiles-repo-hg
283 initializing destination largefiles-repo-hg repository
283 initializing destination largefiles-repo-hg repository
284 scanning source...
284 scanning source...
285 sorting...
285 sorting...
286 converting...
286 converting...
287 6 add large, normal1
287 6 add large, normal1
288 5 add sub/*
288 5 add sub/*
289 4 rename sub/ to stuff/
289 4 rename sub/ to stuff/
290 3 add normal3, modify sub/*
290 3 add normal3, modify sub/*
291 2 remove large, normal3
291 2 remove large, normal3
292 1 merge
292 1 merge
293 0 add anotherlarge (should be a largefile)
293 0 add anotherlarge (should be a largefile)
294
294
295 $ hg -R largefiles-repo-hg glog --template "{rev}:{node|short} {desc|firstline}\n"
295 $ hg -R largefiles-repo-hg glog --template "{rev}:{node|short} {desc|firstline}\n"
296 o 6:17126745edfd add anotherlarge (should be a largefile)
296 o 6:17126745edfd add anotherlarge (should be a largefile)
297 |
297 |
298 o 5:9cc5aa7204f0 merge
298 o 5:9cc5aa7204f0 merge
299 |\
299 |\
300 | o 4:a5a02de7a8e4 remove large, normal3
300 | o 4:a5a02de7a8e4 remove large, normal3
301 | |
301 | |
302 | o 3:55759520c76f add normal3, modify sub/*
302 | o 3:55759520c76f add normal3, modify sub/*
303 | |
303 | |
304 o | 2:261ad3f3f037 rename sub/ to stuff/
304 o | 2:261ad3f3f037 rename sub/ to stuff/
305 |/
305 |/
306 o 1:334e5237836d add sub/*
306 o 1:334e5237836d add sub/*
307 |
307 |
308 o 0:d4892ec57ce2 add large, normal1
308 o 0:d4892ec57ce2 add large, normal1
309
309
310 Verify will fail (for now) if the usercache is purged before converting, since
310 Verify will fail (for now) if the usercache is purged before converting, since
311 largefiles are not cached in the converted repo's local store by the conversion
311 largefiles are not cached in the converted repo's local store by the conversion
312 process.
312 process.
313 $ hg -R largefiles-repo-hg verify --large --lfa
313 $ hg -R largefiles-repo-hg verify --large --lfa
314 checking changesets
314 checking changesets
315 checking manifests
315 checking manifests
316 crosschecking files in changesets and manifests
316 crosschecking files in changesets and manifests
317 checking files
317 checking files
318 8 files, 7 changesets, 12 total revisions
318 8 files, 7 changesets, 12 total revisions
319 searching 7 changesets for largefiles
319 searching 7 changesets for largefiles
320 changeset 0:d4892ec57ce2: large references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7 (glob)
320 changeset 0:d4892ec57ce2: large references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7 (glob)
321 changeset 1:334e5237836d: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob)
321 changeset 1:334e5237836d: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob)
322 changeset 2:261ad3f3f037: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob)
322 changeset 2:261ad3f3f037: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob)
323 changeset 3:55759520c76f: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob)
323 changeset 3:55759520c76f: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob)
324 changeset 5:9cc5aa7204f0: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob)
324 changeset 5:9cc5aa7204f0: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob)
325 changeset 6:17126745edfd: anotherlarge references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 (glob)
325 changeset 6:17126745edfd: anotherlarge references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 (glob)
326 verified existence of 6 revisions of 4 largefiles
326 verified existence of 6 revisions of 4 largefiles
327 [1]
327 [1]
328 $ hg -R largefiles-repo-hg showconfig paths
328 $ hg -R largefiles-repo-hg showconfig paths
329
329
330
330
331 Avoid a traceback if a largefile isn't available (issue3519)
331 Avoid a traceback if a largefile isn't available (issue3519)
332
332
333 Ensure the largefile can be cached in the source if necessary
333 Ensure the largefile can be cached in the source if necessary
334 $ hg clone -U largefiles-repo issue3519
334 $ hg clone -U largefiles-repo issue3519
335 $ rm -f "${USERCACHE}"/*
335 $ rm -f "${USERCACHE}"/*
336 $ hg lfconvert --to-normal issue3519 normalized3519
336 $ hg lfconvert --to-normal issue3519 normalized3519
337 initializing destination normalized3519
337 initializing destination normalized3519
338
338
339 Ensure the abort message is useful if a largefile is entirely unavailable
339 Ensure the abort message is useful if a largefile is entirely unavailable
340 $ rm -rf normalized3519
340 $ rm -rf normalized3519
341 $ rm "${USERCACHE}"/*
341 $ rm "${USERCACHE}"/*
342 $ rm issue3519/.hg/largefiles/*
342 $ rm issue3519/.hg/largefiles/*
343 $ rm largefiles-repo/.hg/largefiles/*
343 $ rm largefiles-repo/.hg/largefiles/*
344 $ hg lfconvert --to-normal issue3519 normalized3519
344 $ hg lfconvert --to-normal issue3519 normalized3519
345 initializing destination normalized3519
345 initializing destination normalized3519
346 large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file:$TESTTMP/largefiles-repo (glob)
346 large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file://$TESTTMP/largefiles-repo (glob)
347 abort: missing largefile 'large' from revision d4892ec57ce212905215fad1d9018f56b99202ad
347 abort: missing largefile 'large' from revision d4892ec57ce212905215fad1d9018f56b99202ad
348 [255]
348 [255]
349
349
350
350
General Comments 0
You need to be logged in to leave comments. Login now