Kiln » largefiles » Unity
Clone URL:  

largefiles: use full name rather than "lfiles" or "big files" in user-visible messages

Changeset dbe037f9ad75…

Parent 4e1d17772b9e…

by Profile picture of User 521Andrew Pritchard <andrewp@fogcreek.com>

Changes to 32 files · Browse files at dbe037f9ad75 Showing diff from parent 4e1d17772b9e Diff from another changeset...

Change 1 of 3 Show Entire File basestore.py Stacked
 
55
56
57
58
 
59
60
61
 
116
117
118
119
 
120
121
122
 
134
135
136
137
 
138
139
140
 
141
142
143
 
55
56
57
 
58
59
60
61
 
116
117
118
 
119
120
121
122
 
134
135
136
 
137
138
139
 
140
141
142
143
@@ -55,7 +55,7 @@
  raise NotImplementedError('abstract method')     def get(self, files): - '''Get the specified big files from the store and write to local + '''Get the specified largefiles from the store and write to local   files under repo.root. files is a list of (filename, hash)   tuples. Return (success, missing), lists of files successfuly   downloaded and those not found in the store. success is a list @@ -116,7 +116,7 @@
  write = self.ui.write   failed = False   - write(_('searching %d changesets for big files\n') % len(revs)) + write(_('searching %d changesets for largefiles\n') % len(revs))   verified = set() # set of (filename, filenode) tuples     for rev in revs: @@ -134,10 +134,10 @@
  num_revs = len(verified)   num_lfiles = len(set([fname for (fname, fnode) in verified]))   if contents: - write(_('verified contents of %d revisions of %d big files\n') + write(_('verified contents of %d revisions of %d largefiles\n')   % (num_revs, num_lfiles))   else: - write(_('verified existence of %d revisions of %d big files\n') + write(_('verified existence of %d revisions of %d largefiles\n')   % (num_revs, num_lfiles))     return int(failed)
Change 1 of 5 Show Entire File lfcommands.py Stacked
 
233
234
235
236
 
237
238
239
 
246
247
248
249
 
250
251
252
 
330
331
332
333
 
334
335
 
336
337
338
 
342
343
344
345
 
346
347
348
 
349
350
351
 
421
422
423
424
 
425
426
427
 
233
234
235
 
236
237
238
239
 
246
247
248
 
249
250
251
252
 
330
331
332
 
333
334
 
335
336
337
338
 
342
343
344
 
345
346
347
 
348
349
350
351
 
421
422
423
 
424
425
426
427
@@ -233,7 +233,7 @@
  if 'l' in fctx.flags():   if renamedlfile:   raise util.Abort( - _('Renamed/copied lfile %s becomes symlink') % f) + _('Renamed/copied largefile %s becomes symlink') % f)   islfile = False   if islfile:   lfiles.add(f) @@ -246,7 +246,7 @@
  if f in ctx.manifest():   if 'l' in ctx.filectx(f).flags():   if renamed and renamed[0] in lfiles: - raise util.Abort(_('lfile %s becomes symlink') % f) + raise util.Abort(_('largefile %s becomes symlink') % f)     # lfile was modified, update standins   fullpath = rdst.wjoin(f) @@ -330,9 +330,9 @@
  return False    def uploadlfiles(ui, rsrc, rdst, files): - '''upload big files to the central store''' + '''upload largefiles to the central store'''   - # Don't upload locally. All lfiles are in the system wide cache + # Don't upload locally. All largefiles are in the system wide cache   # so the other repo can just get them from there.   if not files or rdst.local():   return @@ -342,10 +342,10 @@
  at = 0   files = filter(lambda h: not store.exists(h), files)   for hash in files: - ui.progress(_('uploading largefiles'), at, unit='lfile', total=len(files)) + ui.progress(_('uploading largefiles'), at, unit='largefile', total=len(files))   source = lfutil.findfile(rsrc, hash)   if not source: - raise util.Abort(_('Missing lfile %s needs to be uploaded') % hash) + raise util.Abort(_('Missing largefile %s needs to be uploaded') % hash)   # XXX check for errors here   store.put(source, hash)   at += 1 @@ -421,7 +421,7 @@
    lfdirstate.write()   if printed and printmessage: - ui.status(_('%d big files updated, %d removed\n') % (updated, + ui.status(_('%d largefiles updated, %d removed\n') % (updated,   removed))   finally:   wlock.release()
Change 1 of 1 Show Entire File lfutil.py Stacked
 
226
227
228
229
 
230
231
232
 
226
227
228
 
229
230
231
232
@@ -226,7 +226,7 @@
  return (modified, added, removed, missing, unknown, ignored, clean)    def listlfiles(repo, rev=None, matcher=None): - '''list big files in the working copy or specified changeset''' + '''list largefiles in the working copy or specified changeset'''     if matcher is None:   matcher = getstandinmatcher(repo)
Change 1 of 4 Show Entire File overrides.py Stacked
 
66
67
68
69
 
70
71
72
 
77
78
79
80
 
81
82
83
 
314
315
316
317
 
318
319
320
 
453
454
455
456
 
457
458
459
 
66
67
68
 
69
70
71
72
 
77
78
79
 
80
81
82
83
 
314
315
316
 
317
318
319
320
 
453
454
455
 
456
457
458
459
@@ -66,7 +66,7 @@
  nfile = f in wctx     if exact and lfile: - ui.warn(_('%s already a lfile\n') % f) + ui.warn(_('%s already a largefile\n') % f)   continue   # Don't warn the user when they attempt to add a normal tracked file.   # The normal add code will do that for us. @@ -77,7 +77,7 @@
  lfsize * 1024 * 1024) or (lfmatcher and lfmatcher(f)):   lfnames.append(f)   if ui.verbose or not exact: - ui.status(_('adding %s as lfile\n') % m.rel(f)) + ui.status(_('adding %s as a largefile\n') % m.rel(f))     bad = []   standins = [] @@ -314,7 +314,7 @@
  repo.wwrite(fcdest.path(), fcother.data(), fcother.flags())   return 0   - if repo.ui.promptchoice(_('lfile %s has a merge conflict\n' + if repo.ui.promptchoice(_('largefile %s has a merge conflict\n'   'keep (l)ocal or take (o)ther?') %   lfutil.splitstandin(orig),   (_('&Local'), _('&Other')), 0) == 0: @@ -453,7 +453,7 @@
  destlfile = dest.replace(lfutil.shortname, '')   if not opts['force'] and os.path.exists(destlfile):   raise IOError('', - _('destination lfile already exists')) + _('destination largefile already exists'))   copiedfiles.append((src, dest))   origcopyfile(src, dest)  
Change 1 of 5 Show Entire File proto.py Stacked
 
18
19
20
21
 
22
23
24
 
32
33
34
35
 
36
37
38
 
41
42
43
44
 
45
46
47
48
 
49
50
51
 
59
60
61
62
 
63
64
65
 
116
117
118
119
120
 
 
121
122
123
 
18
19
20
 
21
22
23
24
 
32
33
34
 
35
36
37
38
 
41
42
43
 
44
45
46
47
 
48
49
50
51
 
59
60
61
 
62
63
64
65
 
116
117
118
 
 
119
120
121
122
123
@@ -18,7 +18,7 @@
  'file.\n'    def putlfile(repo, proto, sha): - """putlfile puts a lfile into a repository's local cache and into the + """putlfile puts a largefile into a repository's local cache and into the   system cache."""   f = None   proto.redirect() @@ -32,7 +32,7 @@
  lfutil.copytocacheabsolute(repo, f.name, sha)   except IOError:   repo.ui.warn( - _('error: could not put received data into lfile store')) + _('error: could not put received data into largefile store'))   return wireproto.pushres(1)   finally:   if f: @@ -41,11 +41,11 @@
  return wireproto.pushres(0)    def getlfile(repo, proto, sha): - """getlfile retrieves a lfile from the repository-local cache or system + """getlfile retrieves a largefile from the repository-local cache or system   cache."""   filename = lfutil.findfile(repo, sha)   if not filename: - raise util.Abort(_('requested lfile %s not present in cache') % sha) + raise util.Abort(_('requested largefile %s not present in cache') % sha)   f = open(filename, 'rb')   length = os.fstat(f.fileno())[6]   # since we can't set an HTTP content-length header here, and mercurial core @@ -59,7 +59,7 @@
  return wireproto.streamres(generator())    def statlfile(repo, proto, sha): - """statlfile sends '2\n' if the lfile is missing, '1\n' if it has a + """statlfile sends '2\n' if the largefile is missing, '1\n' if it has a   mismatched checksum, or '0\n' if it is in good condition"""   filename = lfutil.findfile(repo, sha)   if not filename: @@ -116,8 +116,8 @@
  except (ValueError, urllib2.HTTPError):   # if the server returns anything but an integer followed by a   # newline, newline, it's not speaking our language; if we get - # an HTTP error, we can't be sure the lfile is present; either - # way, consider it missing + # an HTTP error, we can't be sure the largefile is present; + # either way, consider it missing   return 2     repo.__class__ = lfileswirerepository
Change 1 of 3 Show Entire File remotestore.py Stacked
 
4
5
6
7
 
8
9
10
 
13
14
15
16
 
17
18
19
 
46
47
48
49
 
50
51
52
 
53
54
55
 
4
5
6
 
7
8
9
10
 
13
14
15
 
16
17
18
19
 
46
47
48
 
49
50
51
 
52
53
54
55
@@ -4,7 +4,7 @@
 # This software may be used and distributed according to the terms of the  # GNU General Public License version 2 or any later version.   -'''Remote lfile store; the base class for servestore''' +'''Remote largefile store; the base class for servestore'''    from mercurial import util  from mercurial.i18n import _ @@ -13,7 +13,7 @@
 import basestore    class remotestore(basestore.basestore): - """A lfile store accessed over a network""" + """A largefile store accessed over a network"""   def __init__(self, ui, repo, url):   super(remotestore, self).__init__(ui, repo, url)   @@ -46,10 +46,10 @@
  fd.close()     def _getfile(self, tmpfile, filename, hash): - # quit if the lfile isn't there + # quit if the largefile isn't there   stat = self._stat(hash)   if stat: - raise util.Abort(_('remotestore: lfile %s is %s') % + raise util.Abort(_('remotestore: largefile %s is %s') %   (hash, stat == 1 and 'invalid' or 'missing'))     try:
Change 1 of 2 Show Entire File reposetup.py Stacked
 
20
21
22
23
 
24
25
26
 
279
280
281
282
 
283
284
285
 
20
21
22
 
23
24
25
26
 
279
280
281
 
282
283
284
285
@@ -20,7 +20,7 @@
   def reposetup(ui, repo):   # wire repositories should be given new wireproto functions but not the - # other lfiles modifications + # other largefiles modifications   if not repo.local():   return proto.wirereposetup(ui, repo)   @@ -279,7 +279,7 @@
  for file in match.files():   if lfutil.isstandin(file):   raise util.Abort( - "Don't commit lfile standin. Commit lfile.") + "Don't commit largefile standin. Commit largefile.")     # Case 2: user calls commit with specified patterns: refresh   # any matching big files.
Change 1 of 6 Show Entire File tests/​test-add.py Stacked
 
11
12
13
14
 
15
16
17
 
40
41
42
43
 
44
45
46
 
49
50
51
52
53
54
 
 
 
55
56
57
58
59
 
60
61
62
 
69
70
71
72
73
74
 
 
 
75
76
77
 
90
91
92
93
94
 
 
95
96
97
 
110
111
112
113
114
 
 
115
116
117
 
11
12
13
 
14
15
16
17
 
40
41
42
 
43
44
45
46
 
49
50
51
 
 
 
52
53
54
55
56
57
58
 
59
60
61
62
 
69
70
71
 
 
 
72
73
74
75
76
77
 
90
91
92
 
 
93
94
95
96
97
 
110
111
112
 
 
113
114
115
116
117
@@ -11,7 +11,7 @@
  '''convert unix path to local convention'''   return os.path.join(*path.split('/'))   -# add size and patterns for adding as lfiles +# add size and patterns for adding as a largefiles  hgt.updaterc({'largefiles': [('size', '2'), ('patterns', 'glob:**.dat')]})  hgt.announce('setup')  os.mkdir('repo1') @@ -40,7 +40,7 @@
   hgt.announce('add existing lfiles')  hgt.hg(['add', '--large', 'big1', rejoin('sub/big2')], - stderr='big1 already a lfile\nsub/big2 already a lfile\n') + stderr='big1 already a largefile\nsub/big2 already a largefile\n')  hgt.hg(['status'], stdout='') # clean    hgt.announce('recursive add on existing subdirectory') @@ -49,14 +49,14 @@
 hgt.writefile(rejoin('sub/big4'), '2\n')  hgt.writefile(rejoin('sub/deep/big5'), '3\n')  hgt.hg(['add', '--large', '-v', 'sub'], - stdout=('adding sub/big3 as lfile\n' - 'adding sub/big4 as lfile\n' - 'adding sub/deep/big5 as lfile\n')) + stdout=('adding sub/big3 as a largefile\n' + 'adding sub/big4 as a largefile\n' + 'adding sub/deep/big5 as a largefile\n'))  hgt.hg(['status'],   stdout=('A sub/big3\n'   'A sub/big4\n'   'A sub/deep/big5\n')) -hgt.hg(['commit', '-m', 'Add a whole subdir of big files']) +hgt.hg(['commit', '-m', 'Add a whole subdir of largefiles'])    hgt.announce('status after committing an add')  hgt.hg(['status'], stdout='') # clean @@ -69,9 +69,9 @@
 hgt.writefile(rejoin('dir/foo'), 'normal')  hgt.writefile(rejoin('dir/bigfile'), 'a'*(1024*1024*3))  hgt.hg(['add', 'dir'], - stdout=('adding dir/bigfile as lfile\n' - 'adding dir/blah.dat as lfile\n' - 'adding dir/dict.dat as lfile\n' + stdout=('adding dir/bigfile as a largefile\n' + 'adding dir/blah.dat as a largefile\n' + 'adding dir/dict.dat as a largefile\n'   'adding dir/foo\n'   'adding dir/small\n'))  hgt.hg(['status'], @@ -90,8 +90,8 @@
 hgt.writefile(rejoin('dir2/foo'), 'normal')  hgt.writefile(rejoin('dir2/bigfile'), 'a'*(1024*1024*3))  hgt.hg(['add', '--lfsize', '10', 'dir2'], - stdout=('adding dir2/blah.dat as lfile\n' - 'adding dir2/dict.dat as lfile\n' + stdout=('adding dir2/blah.dat as a largefile\n' + 'adding dir2/dict.dat as a largefile\n'   'adding dir2/bigfile\n'   'adding dir2/foo\n'   'adding dir2/small\n')) @@ -110,8 +110,8 @@
 hgt.writefile('bar.dat', 'stuff')  hgt.hg(['add', 'foo'])  hgt.hg(['add'], - stdout=('adding ../blah.dat as lfile\n' - 'adding bar.dat as lfile\n')) + stdout=('adding ../blah.dat as a largefile\n' + 'adding bar.dat as a largefile\n'))  hgt.hg(['status'],   stdout=('A blah.dat\n'   'A dir3/bar.dat\n'
Change 1 of 1 Show Entire File tests/​test-add.py.out Stacked
 
19
20
21
22
 
23
24
25
 
19
20
21
 
22
23
24
25
@@ -19,7 +19,7 @@
 % recursive add on existing subdirectory  hg add --large -v sub  hg status -hg commit -m 'Add a whole subdir of big files' +hg commit -m 'Add a whole subdir of largefiles'    % status after committing an add  hg status
Change 1 of 1 Show Entire File tests/​test-archive-r.t Stacked
 
22
23
24
25
 
26
27
28
 
22
23
24
 
25
26
27
28
@@ -22,7 +22,7 @@
  updating to branch default   3 files updated, 0 files merged, 0 files removed, 0 files unresolved   getting changed largefiles - 2 big files updated, 0 removed + 2 largefiles updated, 0 removed   $ $LHG -R r2 archive -r 0 ../archive0   $ cd ../archive0   $ cat f1
Change 1 of 7 Show Entire File tests/​test-backout.py Stacked
 
12
13
14
15
 
16
17
18
 
50
51
52
53
 
54
55
56
 
69
70
71
72
 
73
74
75
 
87
88
89
90
 
91
92
93
94
95
96
 
97
98
99
100
101
 
102
103
104
105
106
 
107
108
109
 
111
112
113
114
 
115
116
117
118
119
 
120
121
122
 
130
131
132
133
 
134
135
136
 
143
144
145
146
 
147
148
149
 
12
13
14
 
15
16
17
18
 
50
51
52
 
53
54
55
56
 
69
70
71
 
72
73
74
75
 
87
88
89
 
90
91
92
93
94
95
 
96
97
98
99
100
 
101
102
103
104
105
 
106
107
108
109
 
111
112
113
 
114
115
116
117
118
 
119
120
121
122
 
130
131
132
 
133
134
135
136
 
143
144
145
 
146
147
148
149
@@ -12,7 +12,7 @@
  '''convert unix path to local convention'''   return os.path.join(*path.split('/'))   -# add size and patterns for adding as lfiles +# add size and patterns for adding as a largefiles  hgt.updaterc()  hgt.announce('setup')  os.mkdir('repo1') @@ -50,7 +50,7 @@
 ''')  hgt.hg(['backout', '2', '-d', '3 0'],   stdout='''getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  adding ../.hglf/dir/dir/b3  adding dir/n3  changeset 3:e81107f51a59 backs out changeset 2:4f96ab858336 @@ -69,7 +69,7 @@
 hgt.asserttrue(hgt.readfile('dir/b3') == 'b3', 'file changed')  hgt.hg(['backout', '3', '-d', '4 0'],   stdout='''getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  removing ../.hglf/dir/dir/b3  removing dir/n3  changeset 4:166af621a4b3 backs out changeset 3:e81107f51a59 @@ -87,23 +87,23 @@
 hgt.announce('backout... from the past!')  hgt.hg(['backout', '2', '-d', '5 0', '--merge'],   stdout='''getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  adding ../.hglf/dir/dir/b3  adding dir/n3  created new head  changeset 5:9cb1d8a02b30 backs out changeset 2:4f96ab858336  getting changed largefiles -0 big files updated, 1 removed +0 largefiles updated, 1 removed  merging with changeset 5:9cb1d8a02b30  2 files updated, 0 files merged, 0 files removed, 0 files unresolved  (branch merge, don't forget to commit)  getting changed largefiles -1 big files updated, 0 removed +1 largefiles updated, 0 removed  ''')  hgt.hg(['commit', '-m', 'merge', '-d', '6 0'])  hgt.hg(['backout', '1', '--merge', '-d', '7 0'],   stdout='''getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  reverting ../.hglf/dir/b1  reverting ../.hglf/dir/dir/dir/b4  reverting dir/dir/n4 @@ -111,12 +111,12 @@
 created new head  changeset 7:846d81616418 backs out changeset 1:a12f28861c50  getting changed largefiles -2 big files updated, 0 removed +2 largefiles updated, 0 removed  merging with changeset 7:846d81616418  4 files updated, 0 files merged, 0 files removed, 0 files unresolved  (branch merge, don't forget to commit)  getting changed largefiles -2 big files updated, 0 removed +2 largefiles updated, 0 removed  ''')  hgt.asserttrue(hgt.readfile('n1') == 'n1', 'file should match start')  hgt.asserttrue(hgt.readfile('n2') == 'n2', 'file should match start') @@ -130,7 +130,7 @@
 hgt.hg(['up', '-r', '0'],   stdout='''4 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  ''')  hgt.asserttrue(hgt.readfile('n1') == 'n1', 'file should match start')  hgt.asserttrue(hgt.readfile('n2') == 'n2', 'file should match start') @@ -143,7 +143,7 @@
 hgt.hg(['up'],   stdout='''4 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  ''')  hgt.asserttrue(hgt.readfile('n1') == 'n1', 'file should match start')  hgt.asserttrue(hgt.readfile('n2') == 'n2', 'file should match start')
Change 1 of 5 Show Entire File tests/​test-bisect.py Stacked
 
53
54
55
56
 
57
58
59
 
61
62
63
64
 
65
66
67
 
74
75
76
77
 
78
79
80
 
94
95
96
97
 
98
99
100
101
102
103
 
104
105
106
107
108
109
 
110
111
112
113
114
115
 
116
117
118
 
126
127
128
129
 
130
 
53
54
55
 
56
57
58
59
 
61
62
63
 
64
65
66
67
 
74
75
76
 
77
78
79
80
 
94
95
96
 
97
98
99
100
101
102
 
103
104
105
106
107
108
 
109
110
111
112
113
114
 
115
116
117
118
 
126
127
128
 
129
130
@@ -53,7 +53,7 @@
  stdout='''Testing changeset 2:cc48633d63ca (4 changesets remaining, ~2 tests)  4 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -2 big files updated, 0 removed +2 largefiles updated, 0 removed  ''')  hgt.writefile('big1', 'blah')  hgt.hg(['bisect', '-g'], stdout='Testing changeset 3:0540e72bd972 (2 changesets remaining, ~1 tests)\n', stderr='abort: outstanding uncommitted changes\n', status=255) @@ -61,7 +61,7 @@
 hgt.hg(['bisect', '-g'], stdout='''Testing changeset 3:0540e72bd972 (2 changesets remaining, ~1 tests)  4 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -2 big files updated, 0 removed +2 largefiles updated, 0 removed  ''')  hgt.hg(['bisect', '-b'],   stdout='''The first bad revision is: @@ -74,7 +74,7 @@
 hgt.hg(['up'],   stdout='''4 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -2 big files updated, 0 removed +2 largefiles updated, 0 removed  ''')    hgt.announce('more changes') @@ -94,25 +94,25 @@
 hgt.hg(['up', '-r', '1'],   stdout='''4 files updated, 0 files merged, 2 files removed, 0 files unresolved  getting changed largefiles -2 big files updated, 1 removed +2 largefiles updated, 1 removed  ''')  hgt.hg(['bisect', '-g'],   stdout='''Testing changeset 3:0540e72bd972 (5 changesets remaining, ~2 tests)  4 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -2 big files updated, 0 removed +2 largefiles updated, 0 removed  ''')  hgt.hg(['bisect', '-g'],   stdout='''Testing changeset 4:b723745fafc3 (3 changesets remaining, ~1 tests)  4 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -2 big files updated, 0 removed +2 largefiles updated, 0 removed  ''')  hgt.hg(['bisect', '-g'],   stdout='''Testing changeset 5:101b1f3cf520 (2 changesets remaining, ~1 tests)  2 files updated, 0 files merged, 2 files removed, 0 files unresolved  getting changed largefiles -1 big files updated, 1 removed +1 largefiles updated, 1 removed  ''')  hgt.hg(['bisect', '-g'],   stdout='''The first bad revision is: @@ -126,5 +126,5 @@
 hgt.hg(['up'],   stdout='''2 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -1 big files updated, 0 removed +1 largefiles updated, 0 removed  ''')
Change 1 of 11 Show Entire File tests/​test-clone.py Stacked
 
21
22
23
24
 
25
26
27
 
55
56
57
58
 
59
60
61
 
65
66
67
68
 
69
70
71
72
73
 
74
75
76
 
80
81
82
83
 
84
85
86
87
88
 
89
90
91
 
95
96
97
98
 
99
100
101
102
103
 
104
105
106
 
110
111
112
113
 
114
115
116
 
120
121
122
123
 
124
125
126
127
128
 
129
130
131
 
135
136
137
138
 
139
140
141
142
143
 
144
145
146
 
150
151
152
153
 
154
155
156
157
158
 
159
160
161
 
186
187
188
189
 
190
191
192
 
203
204
205
206
 
207
208
209
210
211
212
 
213
214
 
21
22
23
 
24
25
26
27
 
55
56
57
 
58
59
60
61
 
65
66
67
 
68
69
70
71
72
 
73
74
75
76
 
80
81
82
 
83
84
85
86
87
 
88
89
90
91
 
95
96
97
 
98
99
100
101
102
 
103
104
105
106
 
110
111
112
 
113
114
115
116
 
120
121
122
 
123
124
125
126
127
 
128
129
130
131
 
135
136
137
 
138
139
140
141
142
 
143
144
145
146
 
150
151
152
 
153
154
155
156
157
 
158
159
160
161
 
186
187
188
 
189
190
191
192
 
203
204
205
 
206
207
208
209
210
211
 
212
213
214
@@ -21,7 +21,7 @@
  d2 = fd.read()   hgt.asserttrue(d1 == d2, 'Files differ %s %s %s %s' % (file1, file2, d1, d2))   -# add size and patterns for adding as lfiles +# add size and patterns for adding as a largefiles  hgt.updaterc({'largefiles': [('size', '2'), ('patterns', 'glob:**.dat')]})  hgt.announce('setup')  os.mkdir('repo1') @@ -55,7 +55,7 @@
  stdout=('updating to branch default\n'   '7 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '3 big files updated, 0 removed\n')) + '3 largefiles updated, 0 removed\n'))  files = ['normal1', 'sub/normal2', 'sub/normal3.txt', 'sub/normal4.txt', 'big1', 'sub/big2', 'sub/big3.txt']  for file in files:   assertidentical(hgt, os.path.join('repo1', file), os.path.join('repo2', file)) @@ -65,12 +65,12 @@
 hgt.hg(['up', '-r', '0'],   stdout=('2 files updated, 0 files merged, 3 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '0 big files updated, 3 removed\n')) + '0 largefiles updated, 3 removed\n'))  os.chdir('../repo2')  hgt.hg(['up', '-r', '0'],   stdout=('2 files updated, 0 files merged, 3 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '0 big files updated, 3 removed\n')) + '0 largefiles updated, 3 removed\n'))  os.chdir('..')  for file in files:   assertidentical(hgt, os.path.join('repo1', file), os.path.join('repo2', file)) @@ -80,12 +80,12 @@
 hgt.hg(['up', '-r', '1'],   stdout=('3 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '3 big files updated, 0 removed\n')) + '3 largefiles updated, 0 removed\n'))  os.chdir('../repo2')  hgt.hg(['up', '-r', '1'],   stdout=('3 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '3 big files updated, 0 removed\n')) + '3 largefiles updated, 0 removed\n'))  os.chdir('..')  for file in files:   assertidentical(hgt, os.path.join('repo1', file), os.path.join('repo2', file)) @@ -95,12 +95,12 @@
 hgt.hg(['up', '-r', '2'],   stdout=('4 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '2 big files updated, 0 removed\n')) + '2 largefiles updated, 0 removed\n'))  os.chdir('../repo2')  hgt.hg(['up', '-r', '2'],   stdout=('4 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '2 big files updated, 0 removed\n')) + '2 largefiles updated, 0 removed\n'))  os.chdir('..')  for file in files:   assertidentical(hgt, os.path.join('repo1', file), os.path.join('repo2', file)) @@ -110,7 +110,7 @@
 os.chdir('repo3')  hgt.hg(['up'], stdout=('7 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '3 big files updated, 0 removed\n')) + '3 largefiles updated, 0 removed\n'))  os.chdir('..')  for file in files:   assertidentical(hgt, os.path.join('repo2', file), os.path.join('repo3', file)) @@ -120,12 +120,12 @@
 hgt.hg(['up', '-r', '0'],   stdout=('2 files updated, 0 files merged, 3 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '0 big files updated, 3 removed\n')) + '0 largefiles updated, 3 removed\n'))  os.chdir('../repo3')  hgt.hg(['up', '-r', '0'],   stdout=('2 files updated, 0 files merged, 3 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '0 big files updated, 3 removed\n')) + '0 largefiles updated, 3 removed\n'))  os.chdir('..')  for file in files:   assertidentical(hgt, os.path.join('repo2', file), os.path.join('repo3', file)) @@ -135,12 +135,12 @@
 hgt.hg(['up', '-r', '1'],   stdout=('3 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '3 big files updated, 0 removed\n')) + '3 largefiles updated, 0 removed\n'))  os.chdir('../repo3')  hgt.hg(['up', '-r', '1'],   stdout=('3 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '3 big files updated, 0 removed\n')) + '3 largefiles updated, 0 removed\n'))  os.chdir('..')  for file in files:   assertidentical(hgt, os.path.join('repo2', file), os.path.join('repo3', file)) @@ -150,12 +150,12 @@
 hgt.hg(['up', '-r', '2'],   stdout=('4 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '2 big files updated, 0 removed\n')) + '2 largefiles updated, 0 removed\n'))  os.chdir('../repo3')  hgt.hg(['up', '-r', '2'],   stdout=('4 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '2 big files updated, 0 removed\n')) + '2 largefiles updated, 0 removed\n'))  os.chdir('..')  for file in files:   assertidentical(hgt, os.path.join('repo2', file), os.path.join('repo3', file)) @@ -186,7 +186,7 @@
 hgt.hg(['up'],   stdout='''17 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -7 big files updated, 0 removed +7 largefiles updated, 0 removed  ''')  os.chdir('..')   @@ -203,12 +203,12 @@
 hgt.hg(['up', '-r', '2'],   stdout='''0 files updated, 0 files merged, 10 files removed, 0 files unresolved  getting changed largefiles -0 big files updated, 4 removed +0 largefiles updated, 4 removed  ''')  os.chdir('../repo4')  hgt.hg(['up', '-r', '2'],   stdout='''0 files updated, 0 files merged, 10 files removed, 0 files unresolved  getting changed largefiles -0 big files updated, 4 removed +0 largefiles updated, 4 removed  ''')  os.chdir('..')
Change 1 of 1 Show Entire File tests/​test-commit.py Stacked
 
32
33
34
35
 
36
37
38
 
32
33
34
 
35
36
37
38
@@ -32,7 +32,7 @@
 A dir/n2  A n1  ''') -hgt.hg(['commit', '-m', 'adding', '.hglf/b1'], status=255, stderr="abort: Don't commit lfile standin. Commit lfile.\n") +hgt.hg(['commit', '-m', 'adding', '.hglf/b1'], status=255, stderr="abort: Don't commit largefile standin. Commit largefile.\n")  hgt.hg(['status'],   stdout='''A b1  A dir/b2
Change 1 of 2 Show Entire File tests/​test-convert.py Stacked
 
166
167
168
169
 
170
171
172
 
214
215
216
217
 
218
219
220
 
166
167
168
 
169
170
171
172
 
214
215
216
 
217
218
219
220
@@ -166,7 +166,7 @@
 hgt.hg(['up'],   stdout='''8 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -6 big files updated, 0 removed +6 largefiles updated, 0 removed  ''')  hgt.asserttrue(os.path.exists('.hglf'), 'lfile standins should exist')  hgt.asserttrue(os.path.exists('.hglf/foo.dat'), 'standin should exist') @@ -214,7 +214,7 @@
 hgt.hg(['up'],   stdout='''8 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -8 big files updated, 0 removed +8 largefiles updated, 0 removed  ''')  hgt.asserttrue(os.path.exists('.hglf'), 'lfile standins should exist')  hgt.asserttrue(os.path.exists('.hglf'), 'lfile standins should exist')
Change 1 of 1 Show Entire File tests/​test-converttags.py Stacked
 
162
163
164
165
 
166
167
168
169
170
 
171
172
173
174
175
 
176
177
178
179
180
 
181
182
183
184
185
 
186
187
188
 
162
163
164
 
165
166
167
168
169
 
170
171
172
173
174
 
175
176
177
178
179
 
180
181
182
183
184
 
185
186
187
188
@@ -162,27 +162,27 @@
 ''')  hgt.hg(['up', '-r', '0'], stdout='''6 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -2 big files updated, 0 removed +2 largefiles updated, 0 removed  ''')  hgt.assertfalse(os.path.exists('.hgtags'), "hgtags doesn't match")  hgt.hg(['up', '-r', '1'], stdout='''6 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -4 big files updated, 0 removed +4 largefiles updated, 0 removed  ''')  hgt.assertfalse(os.path.exists('.hgtags'), "hgtags doesn't match")  hgt.hg(['up', '-r', '2'], stdout='''1 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  ''')  hgt.asserttrue(hgt.readfile('.hgtags') == '375267a9a304fa24d1d164553fdb25b2af68a61d first\n', "hgtags doesn't match")  hgt.hg(['up', '-r', '3'], stdout='''1 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  ''')  hgt.asserttrue(hgt.readfile('.hgtags') == '375267a9a304fa24d1d164553fdb25b2af68a61d first\nc844d4acbd96c195fef5fc16f66860b75c4668f6 second\n', "hgtags doesn't match")  hgt.hg(['up', '-r', '4'], stdout='''1 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  ''')  hgt.asserttrue(hgt.readfile('.hgtags') == '375267a9a304fa24d1d164553fdb25b2af68a61d first\nc844d4acbd96c195fef5fc16f66860b75c4668f6 second\n5cf84a2e6fa4bc22b415a53eb773453e0fda7720 last\n', "hgtags doesn't match")  
Change 1 of 2 Show Entire File tests/​test-copyrename.py Stacked
 
10
11
12
13
 
14
15
16
 
380
381
382
383
384
385
386
 
 
 
 
387
388
389
 
10
11
12
 
13
14
15
16
 
380
381
382
 
 
 
 
383
384
385
386
387
388
389
@@ -10,7 +10,7 @@
 def checkfile(file, contents):   hgt.asserttrue(hgt.readfile(file) == contents, 'file contents dont match')   -# add size and patterns for adding as lfiles +# add size and patterns for adding as a largefiles  hgt.updaterc()  hgt.announce('setup')  os.mkdir('repo1') @@ -380,10 +380,10 @@
 hgt.writefile('c/b3', 'b3')  hgt.writefile('b/b/b4', 'b4')  hgt.hg(['add', '--large'], - stdout='''adding b/b/b4 as lfile -adding b/b2 as lfile -adding b1 as lfile -adding c/b3 as lfile + stdout='''adding b/b/b4 as a largefile +adding b/b2 as a largefile +adding b1 as a largefile +adding c/b3 as a largefile  ''')  hgt.hg(['commit', '-m', 'add files'])  hgt.hg(['rename', '.', '../dest'],
Change 1 of 1 Show Entire File tests/​test-edit.py Stacked
 
11
12
13
14
 
15
16
17
 
11
12
13
 
14
15
16
17
@@ -11,7 +11,7 @@
  '''convert unix path to local convention'''   return os.path.join(*path.split('/'))   -# add size and patterns for adding as lfiles +# add size and patterns for adding as a largefiles  hgt.updaterc()  hgt.announce('setup')  os.mkdir('repo1')
Change 1 of 4 Show Entire File tests/​test-fetch.py Stacked
 
20
21
22
23
24
 
 
25
26
27
 
29
30
31
32
 
33
34
35
 
48
49
50
51
 
52
53
54
 
67
68
69
70
 
71
72
73
74
75
76
 
77
78
 
20
21
22
 
 
23
24
25
26
27
 
29
30
31
 
32
33
34
35
 
48
49
50
 
51
52
53
54
 
67
68
69
 
70
71
72
73
74
75
 
76
77
78
@@ -20,8 +20,8 @@
 hgt.writefile('dir/b2', 'b2')  hgt.hg(['add', 'n1', 'dir/n2'])  hgt.hg(['add', '--large'], - stdout='''adding b1 as lfile -adding dir/b2 as lfile + stdout='''adding b1 as a largefile +adding dir/b2 as a largefile  ''')  hgt.hg(['commit', '-m', 'add files'])  os.chdir('..') @@ -29,7 +29,7 @@
  stdout='''updating to branch default  4 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -2 big files updated, 0 removed +2 largefiles updated, 0 removed  ''')  os.chdir('repo1')  hgt.writefile('n1', 'n11') @@ -48,7 +48,7 @@
 added 1 changesets with 2 changes to 2 files  2 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -1 big files updated, 0 removed +1 largefiles updated, 0 removed  ''')  hgt.hg(['mv', 'dir/n2', 'n2'])  hgt.hg(['mv', 'dir/b2', 'b2']) @@ -67,12 +67,12 @@
 updating to 3:46a1bf42008d  2 files updated, 0 files merged, 2 files removed, 0 files unresolved  getting changed largefiles -1 big files updated, 1 removed +1 largefiles updated, 1 removed  merging with 2:bb292cc33358  merging b2 and dir/b2 to b2  merging n2 and dir/n2 to n2  0 files updated, 2 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -1 big files updated, 0 removed +1 largefiles updated, 0 removed  new changeset 4:f2480f3cc82b merges remote changes with local  ''')
Change 1 of 3 Show Entire File tests/​test-forget.py Stacked
 
11
12
13
14
 
15
16
17
 
57
58
59
60
 
61
62
63
 
68
69
70
71
 
72
73
74
 
11
12
13
 
14
15
16
17
 
57
58
59
 
60
61
62
63
 
68
69
70
 
71
72
73
74
@@ -11,7 +11,7 @@
  '''convert unix path to local convention'''   return os.path.join(*path.split('/'))   -# add size and patterns for adding as lfiles +# add size and patterns for adding as a largefiles  hgt.updaterc({'largefiles': [('size', '2'), ('patterns', 'glob:**.dat')]})  hgt.announce('setup')  os.mkdir('repo1') @@ -57,7 +57,7 @@
 hgt.hg(['up', '-r', '1'],   stdout=('3 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '1 big files updated, 0 removed\n')) + '1 largefiles updated, 0 removed\n'))  hgt.asserttrue(os.path.exists('sub/normal3.txt'), 'added file doesnt exist')  hgt.asserttrue(os.path.exists('sub/normal4.txt'), 'added file doesnt exist')  hgt.asserttrue(os.path.exists('sub/big3.txt'), 'added file doesnt exist') @@ -68,7 +68,7 @@
 hgt.hg(['up'],   stdout=('0 files updated, 0 files merged, 3 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '0 big files updated, 1 removed\n')) + '0 largefiles updated, 1 removed\n'))  hgt.assertfalse(os.path.exists('sub/normal3.txt'), 'removed file exists')  hgt.assertfalse(os.path.exists('sub/normal4.txt'), 'removed file exists')  hgt.assertfalse(os.path.exists('sub/big3.txt'), 'removed file exists')
Change 1 of 2 Show Entire File tests/​test-outgoing.py Stacked
 
19
20
21
22
23
 
 
24
25
26
 
28
29
30
31
 
32
33
34
 
19
20
21
 
 
22
23
24
25
26
 
28
29
30
 
31
32
33
34
@@ -19,8 +19,8 @@
 hgt.writefile('dir/b2', 'b2')  hgt.hg(['add', 'n1', 'dir/n2'])  hgt.hg(['add', '--large'], - stdout='''adding b1 as lfile -adding dir/b2 as lfile + stdout='''adding b1 as a largefile +adding dir/b2 as a largefile  ''')  hgt.hg(['commit', '-m', 'add files'])  os.chdir('..') @@ -28,7 +28,7 @@
  stdout='''updating to branch default  4 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -2 big files updated, 0 removed +2 largefiles updated, 0 removed  ''')  os.chdir('repo2')  hgt.writefile('n1', 'n11')
Change 1 of 2 Show Entire File tests/​test-permissions.py Stacked
 
117
118
119
120
 
121
122
123
124
125
126
127
 
128
129
130
 
158
159
160
161
 
162
163
 
117
118
119
 
120
121
122
123
124
125
126
 
127
128
129
130
 
158
159
160
 
161
162
163
@@ -117,14 +117,14 @@
 if windows:   hgt.hg(['backout', '-r', '2'],   stdout='''getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  reverting foo/dir/n3  changeset 3:ec78d51da14e backs out changeset 2:a1b9f52f7dce  ''')  else:   hgt.hg(['backout', '-r', '2'],   stdout='''getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  reverting .hglf/b1  reverting .hglf/foo/b2  reverting foo/dir/n3 @@ -158,6 +158,6 @@
  stdout='''updating to branch default  6 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -3 big files updated, 0 removed +3 largefiles updated, 0 removed  ''')  common.checkrepos(hgt, 'repo1', 'repo2', [0, 1, 2, 3])
Change 1 of 12 Show Entire File tests/​test-pushpull.py Stacked
 
26
27
28
29
 
30
31
32
 
60
61
62
63
 
64
65
66
 
103
104
105
106
107
108
109
 
 
 
 
110
111
112
 
191
192
193
194
 
195
196
197
 
208
209
210
211
 
212
213
214
 
237
238
239
240
 
241
242
243
 
253
254
255
256
 
257
258
259
 
283
284
285
286
 
287
288
289
 
299
300
301
302
 
303
304
305
 
328
329
330
331
 
332
333
334
 
346
347
348
349
 
350
351
352
 
370
371
372
373
 
374
375
376
 
26
27
28
 
29
30
31
32
 
60
61
62
 
63
64
65
66
 
103
104
105
 
 
 
 
106
107
108
109
110
111
112
 
191
192
193
 
194
195
196
197
 
208
209
210
 
211
212
213
214
 
237
238
239
 
240
241
242
243
 
253
254
255
 
256
257
258
259
 
283
284
285
 
286
287
288
289
 
299
300
301
 
302
303
304
305
 
328
329
330
 
331
332
333
334
 
346
347
348
 
349
350
351
352
 
370
371
372
 
373
374
375
376
@@ -26,7 +26,7 @@
  stdout='''updating to branch default  4 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -2 big files updated, 0 removed +2 largefiles updated, 0 removed  ''')  common.checkrepos(hgt, 'repo1', 'repo2', [0])   @@ -60,7 +60,7 @@
  stdout='''4 files updated, 0 files merged, 0 files removed, 0 files unresolved  (branch merge, don't forget to commit)  getting changed largefiles -2 big files updated, 0 removed +2 largefiles updated, 0 removed  ''')  hgt.asserttrue(os.path.exists('b3'), 'merged lfile should exist')  hgt.asserttrue(os.path.exists('.hglf/b3'), 'merged lfile should exist') @@ -103,10 +103,10 @@
 hgt.writefile('dir/blahblah', 'should not add')  hgt.writefile('dir/stuffnthings', 'should not add')  hgt.hg(['add', '--large', 'glob:**.foo'], - stdout='''adding dir/b1.foo as lfile -adding dir/b2.foo as lfile -adding dir/b3.foo as lfile -adding dir/b4.foo as lfile + stdout='''adding dir/b1.foo as a largefile +adding dir/b2.foo as a largefile +adding dir/b3.foo as a largefile +adding dir/b4.foo as a largefile  ''')  hgt.hg(['commit', '-m', 'add some files'])  hgt.hg(['status', '-A'], @@ -191,7 +191,7 @@
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved  (branch merge, don't forget to commit)  getting changed largefiles -1 big files updated, 0 removed +1 largefiles updated, 0 removed  ''')  hgt.asserttrue(hgt.readfile('dir/b2222.foo') == 'foo2', 'merge failed')  hgt.hg(['commit', '-m', 'merge']) @@ -208,7 +208,7 @@
 hgt.hg(['up'],   stdout='''2 files updated, 0 files merged, 2 files removed, 0 files unresolved  getting changed largefiles -1 big files updated, 1 removed +1 largefiles updated, 1 removed  ''')  os.chdir('..')  common.checkrepos(hgt, 'repo1', 'repo2', [0, 3, 4, 5, 8]) @@ -237,7 +237,7 @@
  stdout='''0 files updated, 0 files merged, 0 files removed, 0 files unresolved  (branch merge, don't forget to commit)  getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  ''')  hgt.hg(['commit', '-m', 'merge'])  os.chdir('../repo2') @@ -253,7 +253,7 @@
 hgt.hg(['up'],   stdout='''0 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  ''')  os.chdir('..')  common.checkrepos(hgt, 'repo1', 'repo2', [0, 3, 4, 5, 8, 11]) @@ -283,7 +283,7 @@
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved  (branch merge, don't forget to commit)  getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  ''')  hgt.hg(['commit', '-m', 'merge'])  hgt.hg(['push', '../repo1'], @@ -299,7 +299,7 @@
 hgt.hg(['up'],   stdout='''2 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -1 big files updated, 0 removed +1 largefiles updated, 0 removed  ''')  os.chdir('..')  common.checkrepos(hgt, 'repo1', 'repo2', [0, 3, 4, 5, 8, 11, 14]) @@ -328,7 +328,7 @@
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved  (branch merge, don't forget to commit)  getting changed largefiles -1 big files updated, 0 removed +1 largefiles updated, 0 removed  ''')  hgt.asserttrue(hgt.readfile('dir/b3.foo') == 'changechangechange', 'merge failed')  hgt.asserttrue(hgt.readfile('dir/b3333.foo') == 'changechangechange', 'merge failed') @@ -346,7 +346,7 @@
 hgt.hg(['up'],   stdout='''4 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -2 big files updated, 0 removed +2 largefiles updated, 0 removed  ''')  os.chdir('..')  common.checkrepos(hgt, 'repo1', 'repo2', [0, 3, 4, 5, 8, 11, 14, 17]) @@ -370,7 +370,7 @@
 hgt.hg(['up'],   stdout='''13 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  ''', stderr='''b1: Can't get file locally  (no default or default-push path set in hgrc)  dir/b1.foo: Can't get file locally
Change 1 of 6 Show Entire File tests/​test-rebase.py Stacked
 
25
26
27
28
 
29
30
31
 
41
42
43
44
 
45
46
47
 
81
82
83
84
 
85
86
87
 
102
103
104
105
 
106
107
108
 
122
123
124
125
 
126
127
128
 
161
162
163
164
 
165
166
 
25
26
27
 
28
29
30
31
 
41
42
43
 
44
45
46
47
 
81
82
83
 
84
85
86
87
 
102
103
104
 
105
106
107
108
 
122
123
124
 
125
126
127
128
 
161
162
163
 
164
165
166
@@ -25,7 +25,7 @@
  stdout='''updating to branch default  2 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -1 big files updated, 0 removed +1 largefiles updated, 0 removed  ''')  os.chdir('repo1')  hgt.writefile('b1', 'b11') @@ -41,7 +41,7 @@
 adding file changes  added 1 changesets with 1 changes to 1 files (+1 heads)  getting changed largefiles -1 big files updated, 0 removed +1 largefiles updated, 0 removed  saved backup bundle to $HGTMP/test-rebase.py/repo2/.hg/strip-backup/04efa399c7b0-backup.hg  nothing to rebase  ''') @@ -81,7 +81,7 @@
 hgt.hg(['update', '--clean'],   stdout='''0 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  ''')  hgt.asserttrue(hgt.readfile('b1') == 'b11', "file contents don't match")   @@ -102,7 +102,7 @@
  stdout='''updating to branch default  2 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -1 big files updated, 0 removed +1 largefiles updated, 0 removed  ''')  os.chdir('repo3')  hgt.writefile('b1', 'b11') @@ -122,7 +122,7 @@
   hgt.hg(['rebase'],   stdout='''getting changed largefiles -1 big files updated, 0 removed +1 largefiles updated, 0 removed  saved backup bundle to $HGTMP/test-rebase.py/repo4/.hg/strip-backup/e1ea3a163b7e-backup.hg  ''')  hgt.hg(['out', '--large'], @@ -161,6 +161,6 @@
 hgt.hg(['update', '--clean'],   stdout='''0 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -0 big files updated, 0 removed +0 largefiles updated, 0 removed  ''')  hgt.asserttrue(hgt.readfile('b1') == 'b11', "file contents don't match")
Change 1 of 3 Show Entire File tests/​test-remove.py Stacked
 
11
12
13
14
 
15
16
17
 
59
60
61
62
 
63
64
65
 
72
73
74
75
 
76
77
78
 
11
12
13
 
14
15
16
17
 
59
60
61
 
62
63
64
65
 
72
73
74
 
75
76
77
78
@@ -11,7 +11,7 @@
  '''convert unix path to local convention'''   return os.path.join(*path.split('/'))   -# add size and patterns for adding as lfiles +# add size and patterns for adding as a largefiles  hgt.updaterc({'largefiles': [('size', '2'), ('patterns', 'glob:**.dat')]})  hgt.announce('setup')  os.mkdir('repo1') @@ -59,7 +59,7 @@
 hgt.hg(['up', '-r', '1'],   stdout=('3 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '1 big files updated, 0 removed\n')) + '1 largefiles updated, 0 removed\n'))  hgt.asserttrue(os.path.exists('sub/normal3.txt'), 'added file doesnt exist')  hgt.asserttrue(os.path.exists('sub/normal4.txt'), 'added file doesnt exist')  hgt.asserttrue(os.path.exists('sub/big3.txt'), 'added file doesnt exist') @@ -72,7 +72,7 @@
 hgt.hg(['up'],   stdout=('0 files updated, 0 files merged, 3 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '0 big files updated, 1 removed\n')) + '0 largefiles updated, 1 removed\n'))  hgt.assertfalse(os.path.exists('sub/normal3.txt'), 'removed file exists')  hgt.assertfalse(os.path.exists('sub/normal4.txt'), 'removed file exists')  hgt.assertfalse(os.path.exists('sub/big3.txt'), 'removed file exists')
Change 1 of 1 Show Entire File tests/​test-requires.t Stacked
 
38
39
40
41
 
42
43
44
 
38
39
40
 
41
42
43
44
@@ -38,7 +38,7 @@
  updating to branch default   1 files updated, 0 files merged, 0 files removed, 0 files unresolved   getting changed largefiles - 1 big files updated, 0 removed + 1 largefiles updated, 0 removed   $ grep largefiles r3c/.hg/requires   largefiles  
Change 1 of 3 Show Entire File tests/​test-revert.py Stacked
 
10
11
12
13
 
14
15
16
 
28
29
30
31
32
33
34
 
 
 
 
35
36
37
 
282
283
284
285
286
 
 
287
288
289
 
10
11
12
 
13
14
15
16
 
28
29
30
 
 
 
 
31
32
33
34
35
36
37
 
282
283
284
 
 
285
286
287
288
289
@@ -10,7 +10,7 @@
 def checkfile(file, contents):   hgt.asserttrue(hgt.readfile(file) == contents, 'file contents dont match')   -# add size and patterns for adding as lfiles +# add size and patterns for adding as a largefiles  hgt.updaterc()  hgt.announce('setup')  os.mkdir('repo1') @@ -28,10 +28,10 @@
 hgt.writefile('dir/b3', 'b3')  hgt.writefile('dir/dir/b4.txt', 'b4')  hgt.hg(['add', '--large'], - stdout=('adding b1 as lfile\n' - 'adding b2.txt as lfile\n' - 'adding dir/b3 as lfile\n' - 'adding dir/dir/b4.txt as lfile\n')) + stdout=('adding b1 as a largefile\n' + 'adding b2.txt as a largefile\n' + 'adding dir/b3 as a largefile\n' + 'adding dir/dir/b4.txt as a largefile\n'))  hgt.hg(['status'],   stdout=('A b1\n'   'A b2.txt\n' @@ -282,8 +282,8 @@
 hgt.hg(['status'], stdout='''? b2  ? b3  ''') -hgt.hg(['add', '--large'], stdout='''adding b2 as lfile -adding b3 as lfile +hgt.hg(['add', '--large'], stdout='''adding b2 as a largefile +adding b3 as a largefile  ''')  hgt.hg(['revert', 'b3'])  hgt.hg(['status'], stdout='''A b2
Change 1 of 5 Show Entire File tests/​test-serve.t Stacked
 
24
25
26
27
 
28
29
30
 
38
39
40
41
 
42
43
44
 
73
74
75
76
 
77
78
79
 
103
104
105
106
 
107
108
109
 
157
158
159
160
 
161
162
163
 
24
25
26
 
27
28
29
30
 
38
39
40
 
41
42
43
44
 
73
74
75
 
76
77
78
79
 
103
104
105
 
106
107
108
109
 
157
158
159
 
160
161
162
163
@@ -24,7 +24,7 @@
  updating to branch default   2 files updated, 0 files merged, 0 files removed, 0 files unresolved   getting changed largefiles - 1 big files updated, 0 removed + 1 largefiles updated, 0 removed   $ ls $PWD/cache1 | diff r2/.hglf/f1 -   $ kill $(cat serve.pid)   @@ -38,7 +38,7 @@
  updating to branch default   2 files updated, 0 files merged, 0 files removed, 0 files unresolved   getting changed largefiles - 1 big files updated, 0 removed + 1 largefiles updated, 0 removed    Pull tests setup   $ mkdir r4 @@ -73,7 +73,7 @@
  $ $LHG --config largefiles.systemcache=$PWD/../cache3 up   1 files updated, 0 files merged, 0 files removed, 0 files unresolved   getting changed largefiles - 1 big files updated, 0 removed + 1 largefiles updated, 0 removed   $ ls $PWD/../cache3 | diff .hglf/f2 -   $ cd ..   $ kill $(cat serve.pid) @@ -103,7 +103,7 @@
  $ $LHG --config largefiles.systemcache=$PWD/../cache4 up   1 files updated, 0 files merged, 0 files removed, 0 files unresolved   getting changed largefiles - 1 big files updated, 0 removed + 1 largefiles updated, 0 removed   $ ls $PWD/../cache4 | diff .hglf/f2 -   $ cd ..   @@ -157,7 +157,7 @@
  updating to branch default   2 files updated, 0 files merged, 0 files removed, 0 files unresolved   getting changed largefiles - 1 big files updated, 0 removed + 1 largefiles updated, 0 removed   $ cd r9   $ cat >> .hg/hgrc <<!   > [ui]
Change 1 of 1 Show Entire File tests/​test-status.py Stacked
 
10
11
12
13
 
14
15
16
 
10
11
12
 
13
14
15
16
@@ -10,7 +10,7 @@
 def checkfile(file, contents):   hgt.asserttrue(hgt.readfile(file) == contents, 'file contents dont match')   -# add size and patterns for adding as lfiles +# add size and patterns for adding as a largefiles  hgt.updaterc()  hgt.announce('setup')  os.mkdir('repo1')
Change 1 of 2 Show Entire File tests/​test-summary.py Stacked
 
19
20
21
22
23
 
 
24
25
26
 
28
29
30
31
 
32
33
34
 
19
20
21
 
 
22
23
24
25
26
 
28
29
30
 
31
32
33
34
@@ -19,8 +19,8 @@
 hgt.writefile('dir/b2', 'b2')  hgt.hg(['add', 'n1', 'dir/n2'])  hgt.hg(['add', '--large'], - stdout='''adding b1 as lfile -adding dir/b2 as lfile + stdout='''adding b1 as a largefile +adding dir/b2 as a largefile  ''')  hgt.hg(['commit', '-m', 'add files'])  os.chdir('..') @@ -28,7 +28,7 @@
  stdout='''updating to branch default  4 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -2 big files updated, 0 removed +2 largefiles updated, 0 removed  ''')  os.chdir('repo2')  hgt.writefile('n1', 'n11')
Change 1 of 8 Show Entire File tests/​test-update.py Stacked
 
79
80
81
82
 
83
84
85
86
87
 
88
89
90
 
93
94
95
96
 
97
98
99
 
101
102
103
104
 
105
106
107
 
109
110
111
112
 
113
114
115
 
117
118
119
120
 
121
122
123
124
125
 
126
127
128
129
130
131
 
132
133
134
135
136
 
137
138
139
140
141
142
 
143
144
145
146
147
 
148
149
150
 
153
154
155
156
 
157
158
159
160
 
161
162
163
 
171
172
173
174
 
175
176
177
 
180
181
182
183
 
184
185
186
 
79
80
81
 
82
83
84
85
86
 
87
88
89
90
 
93
94
95
 
96
97
98
99
 
101
102
103
 
104
105
106
107
 
109
110
111
 
112
113
114
115
 
117
118
119
 
120
121
122
123
124
 
125
126
127
128
129
130
 
131
132
133
134
135
 
136
137
138
139
140
141
 
142
143
144
145
146
 
147
148
149
150
 
153
154
155
 
156
157
158
159
 
160
161
162
163
 
171
172
173
 
174
175
176
177
 
180
181
182
 
183
184
185
186
@@ -79,12 +79,12 @@
 hgt.hg(['up', '-r', '0'],   stdout=('7 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '3 big files updated, 0 removed\n')) + '3 largefiles updated, 0 removed\n'))  checkfiles(0)  hgt.hg(['up'],   stdout=('7 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '3 big files updated, 0 removed\n')) + '3 largefiles updated, 0 removed\n'))    hgt.announce('change files and update check')  hgt.writefile('big1', 'b14') @@ -93,7 +93,7 @@
 hgt.hg(['up', '-C'],   stdout=('0 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '1 big files updated, 0 removed\n')) + '1 largefiles updated, 0 removed\n'))  checkfiles(3)  hgt.writefile('normal1', 'n14')  hgt.hg(['up', '-c', '-r' ,'2'], @@ -101,7 +101,7 @@
 hgt.hg(['up', '-C'],   stdout=('1 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '0 big files updated, 0 removed\n')) + '0 largefiles updated, 0 removed\n'))  checkfiles(3)  hgt.writefile('sub/big3.txt', 'tomissoooooooocool')  hgt.hg(['up', '--check', '-r', '0'], @@ -109,7 +109,7 @@
 hgt.hg(['up', '-C'],   stdout=('0 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '1 big files updated, 0 removed\n')) + '1 largefiles updated, 0 removed\n'))  checkfiles(3)    hgt.announce('change files and update clean') @@ -117,34 +117,34 @@
 hgt.hg(['up', '-C', '-r', '0'],   stdout=('7 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '3 big files updated, 0 removed\n')) + '3 largefiles updated, 0 removed\n'))  checkfiles(0)  hgt.hg(['up'],   stdout=('7 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '3 big files updated, 0 removed\n')) + '3 largefiles updated, 0 removed\n'))  checkfiles(3)  hgt.writefile('normal1', 'n14')  hgt.hg(['up', '-C', '-r' ,'1'],   stdout=('7 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '3 big files updated, 0 removed\n')) + '3 largefiles updated, 0 removed\n'))  checkfiles(1)  hgt.hg(['up'],   stdout=('7 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '3 big files updated, 0 removed\n')) + '3 largefiles updated, 0 removed\n'))  checkfiles(3)  hgt.writefile('sub/big3.txt', 'tomissoooooooocool')  hgt.hg(['up', '--clean', '-r', '2'],   stdout=('5 files updated, 0 files merged, 2 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '2 big files updated, 1 removed\n')) + '2 largefiles updated, 1 removed\n'))  checkfiles(2)  hgt.hg(['up'],   stdout=('7 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '3 big files updated, 0 removed\n')) + '3 largefiles updated, 0 removed\n'))  checkfiles(3)    hgt.announce('change lfile and normal update') @@ -153,11 +153,11 @@
 os.chdir('dir')  hgt.hg(['up', '-y', '-r', '0'],   stdout='''merging sub/big2 -lfile sub/big2 has a merge conflict +largefile sub/big2 has a merge conflict  keep (l)ocal or take (o)ther? l  6 files updated, 1 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -2 big files updated, 0 removed +2 largefiles updated, 0 removed  ''')  os.chdir('..')  hgt.asserttrue(hgt.readfile('normal1') == 'n10', 'files dont match') @@ -171,7 +171,7 @@
 hgt.hg(['up', '--clean'],   stdout=('7 files updated, 0 files merged, 0 files removed, 0 files unresolved\n'   'getting changed largefiles\n' - '3 big files updated, 0 removed\n')) + '3 largefiles updated, 0 removed\n'))  os.chdir('..')  checkfiles(3)  hgt.writefile('big1', 'b12') @@ -180,7 +180,7 @@
 hgt.hg(['up', '-y', '-r', '2'],   stdout='''5 files updated, 0 files merged, 2 files removed, 0 files unresolved  getting changed largefiles -1 big files updated, 1 removed +1 largefiles updated, 1 removed  ''')  os.chdir('..')  checkfiles(2)
Change 1 of 8 Show Entire File tests/​test-verify.py Stacked
 
19
20
21
22
23
 
 
24
25
26
 
28
29
30
31
 
32
33
34
 
44
45
46
47
48
 
 
49
50
51
 
54
55
56
57
58
 
 
59
60
61
 
72
73
74
75
76
 
 
77
78
79
 
81
82
83
84
85
 
 
86
87
88
 
91
92
93
94
95
 
 
96
97
98
 
100
101
102
103
104
 
 
105
 
19
20
21
 
 
22
23
24
25
26
 
28
29
30
 
31
32
33
34
 
44
45
46
 
 
47
48
49
50
51
 
54
55
56
 
 
57
58
59
60
61
 
72
73
74
 
 
75
76
77
78
79
 
81
82
83
 
 
84
85
86
87
88
 
91
92
93
 
 
94
95
96
97
98
 
100
101
102
 
 
103
104
105
@@ -19,8 +19,8 @@
 hgt.writefile('dir/b2', 'b2')  hgt.hg(['add', 'n1', 'dir/n2'])  hgt.hg(['add', '--large'], - stdout='''adding b1 as lfile -adding dir/b2 as lfile + stdout='''adding b1 as a largefile +adding dir/b2 as a largefile  ''')  hgt.hg(['commit', '-m', 'add files'])  os.chdir('..') @@ -28,7 +28,7 @@
  stdout='''updating to branch default  4 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed largefiles -2 big files updated, 0 removed +2 largefiles updated, 0 removed  ''')  os.chdir('repo2')  hgt.writefile('n1', 'n11') @@ -44,8 +44,8 @@
 crosschecking files in changesets and manifests  checking files  4 files, 1 changesets, 4 total revisions -searching 1 changesets for big files -verified existence of 2 revisions of 2 big files +searching 1 changesets for largefiles +verified existence of 2 revisions of 2 largefiles  ''')  os.chdir('../repo2')  hgt.hg(['verify', '--large'], @@ -54,8 +54,8 @@
 crosschecking files in changesets and manifests  checking files  4 files, 2 changesets, 6 total revisions -searching 1 changesets for big files -verified existence of 2 revisions of 2 big files +searching 1 changesets for largefiles +verified existence of 2 revisions of 2 largefiles  ''')  hgt.hg(['push', '../repo1'],   stdout='''pushing to ../repo1 @@ -72,8 +72,8 @@
 crosschecking files in changesets and manifests  checking files  4 files, 2 changesets, 6 total revisions -searching 2 changesets for big files -verified existence of 3 revisions of 2 big files +searching 2 changesets for largefiles +verified existence of 3 revisions of 2 largefiles  ''')  hgt.hg(['verify', '--large', '--lfc', '--lfa'],   stdout='''checking changesets @@ -81,8 +81,8 @@
 crosschecking files in changesets and manifests  checking files  4 files, 2 changesets, 6 total revisions -searching 2 changesets for big files -verified contents of 3 revisions of 2 big files +searching 2 changesets for largefiles +verified contents of 3 revisions of 2 largefiles  ''')  os.chdir('../repo1')  hgt.hg(['verify', '--large', '--lfc'], @@ -91,8 +91,8 @@
 crosschecking files in changesets and manifests  checking files  4 files, 2 changesets, 6 total revisions -searching 1 changesets for big files -verified contents of 2 revisions of 2 big files +searching 1 changesets for largefiles +verified contents of 2 revisions of 2 largefiles  ''')  hgt.hg(['verify', '--large', '--lfc', '--lfa'],   stdout='''checking changesets @@ -100,6 +100,6 @@
 crosschecking files in changesets and manifests  checking files  4 files, 2 changesets, 6 total revisions -searching 2 changesets for big files -verified contents of 3 revisions of 2 big files +searching 2 changesets for largefiles +verified contents of 3 revisions of 2 largefiles  ''')