History - Kiln » Unity3D

Kiln »

Unity3D Unity 3D's proposed fixes and extensions to Kiln BFiles

Clone URL:

Pushed to 7 repositories ·

View In Graph Contained in tip

tip Fix revert so that it works correctly for cases other than 'revert --all'. Previously all bfiles were reverted regardless of what patterns were supplied.

Changeset b0916a4160dd …

Parent d0975634cee1 …

by Na'Tosha Bard <natosha@unity3d.com> Jun 30 11 at 10:56 AM

Changes to 3 files · Browse files at b0916a4160dd Showing diff from parent d0975634cee1 Diff from another changeset...

Change 1 of 4 Show Changes Only Show Entire File Loading... kbfiles/bfcommands.py Stacked
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 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 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 151 152 153 154 155 156 157 158 159 160 161 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 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 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 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 151 152 153 154 155 156 157 158 159 160 161 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 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525	`'''High-level command functions: bfadd() et. al, plus the cmdtable.'''` `import os` `import shutil` `from mercurial import util, match as match_, hg, node, context, error` `from mercurial.i18n import _` `import bfutil, basestore` `# -- Commands ----------------------------------------------------------` `def bfconvert(ui, src, dest, pats, opts):` `'''Convert a repository to a repository using bfiles` `Convert source repository creating an identical` `repository, except that all files that match the` `patterns given, or are over a given size will` `be added as bfiles. The size of a file is the size of the` `first version of the file. After running this command you` `will need to set the store then run bfput on the new` `repository to upload the bfiles to the central store.` `'''` `if opts['tonormal']:` `tobfile = False` `else:` `tobfile = True` `size = opts['size']` `if not size:` `size = ui.config(bfutil.long_name, 'size', default=None)` `try:` `size = int(size)` `except ValueError:` `raise util.Abort(_('bfiles.size must be integer, was %s\n') % size)` `except TypeError:` `raise util.Abort(_('size must be specified'))` `try:` `rsrc = hg.repository(ui, src)` `if not rsrc.local():` `raise util.Abort(_('%s is not a local Mercurial repo') % src)` `except error.RepoError, err:` `ui.traceback()` `raise util.Abort(err.args[0])` `if os.path.exists(dest):` `if not os.path.isdir(dest):` `raise util.Abort(_('destination %s already exists') % dest)` `elif os.listdir(dest):` `raise util.Abort(_('destination %s is not empty') % dest)` `try:` `ui.status(_('initializing destination %s\n') % dest)` `rdst = hg.repository(ui, dest, create=True)` `if not rdst.local():` `raise util.Abort(_('%s is not a local Mercurial repo') % dest)` `except error.RepoError:` `ui.traceback()` `raise util.Abort(_('%s is not a repo') % dest)` `try:` `# Lock destination to prevent modification while it is converted to.` `# Don't need to lock src because we are just reading from its history` `# which can't change.` `dst_lock = rdst.lock()` `# Get a list of all changesets in the source. The easy way to do this` `# is to simply walk the changelog, using changelog.nodesbewteen().` `# Take a look at mercurial/revlog.py:639 for more details.` `# Use a generator instead of a list to decrease memory usage` `ctxs = (rsrc[ctx] for ctx in rsrc.changelog.nodesbetween(None, rsrc.heads())[0])` `revmap = {node.nullid: node.nullid}` `if tobfile:` `bfiles = set()` `normalfiles = set()` `if not pats:` `pats = ui.config(bfutil.long_name, 'patterns', default=())` `if pats:` `pats = pats.split(' ')` `if pats:` `matcher = match_.match(rsrc.root, '', list(pats))` `else:` `matcher = None` `bfiletohash = {}` `for ctx in ctxs:` `ui.progress(_('Converting revisions'), ctx.rev(), unit=_('revision'), total=rsrc['tip'].rev())` `_bfconvert_addchangeset(rsrc, rdst, ctx, revmap,` `bfiles, normalfiles, matcher, size, bfiletohash)` `ui.progress(_('Converting revisions'), None)` `if os.path.exists(rdst.wjoin(bfutil.short_name)):` `shutil.rmtree(rdst.wjoin(bfutil.short_name))` `for f in bfiletohash.keys():` `if os.path.isfile(rdst.wjoin(f)):` `os.unlink(rdst.wjoin(f))` `try:` `os.removedirs(os.path.dirname(rdst.wjoin(f)))` `except:` `pass` `else:` `for ctx in ctxs:` `ui.progress(_('Converting revisions'), ctx.rev(), unit=_('revision'), total=rsrc['tip'].rev())` `_addchangeset(ui, rsrc, rdst, ctx, revmap)` `ui.progress(_('Converting revisions'), None)` `except:` `# we failed, remove the new directory` `shutil.rmtree(rdst.root)` `raise` `finally:` `dst_lock.release()` `def _addchangeset(ui, rsrc, rdst, ctx, revmap):` `# Convert src parents to dst parents` `parents = []` `for p in ctx.parents():` `parents.append(revmap[p.node()])` `while len(parents) < 2:` `parents.append(node.nullid)` `# Generate list of changed files` `files = set(ctx.files())` `if node.nullid not in parents:` `mc = ctx.manifest()` `mp1 = ctx.parents()[0].manifest()` `mp2 = ctx.parents()[1].manifest()` `for f in mp1:` `if f not in mc:` `files.add(f)` `for f in mp2:` `if f not in mc:` `files.add(f)` `for f in mc:` `if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, None):` `files.add(f)` `def getfilectx(repo, memctx, f):` `if bfutil.standin(f) in files:` `# if the file isn't in the manifest then it was removed` `# or renamed, raise IOError to indicate this` `try:` `fctx = ctx.filectx(bfutil.standin(f))` `except error.LookupError:` `raise IOError()` `renamed = fctx.renamed()` `if renamed:` `renamed = bfutil.split_standin(renamed[0])` `hash = fctx.data().strip()` `path = bfutil.find_file(rsrc, hash)` `### TODO: What if the file is not cached?` `data = ''` `with open(path, 'rb') as fd:` `data = fd.read()` `return context.memfilectx(f, data, 'l' in fctx.flags(),` `'x' in fctx.flags(), renamed)` `else:` `try:` `fctx = ctx.filectx(f)` `except error.LookupError:` `raise IOError()` `renamed = fctx.renamed()` `if renamed:` `renamed = renamed[0]` `data = fctx.data()` `if f == '.hgtags':` `newdata = []` `for line in data.splitlines():` `id, name = line.split(' ', 1)` `newdata.append('%s %s\n' % (node.hex(revmap[node.bin(id)]), name))` `data = ''.join(newdata)` `return context.memfilectx(f, data, 'l' in fctx.flags(),` `'x' in fctx.flags(), renamed)` `dstfiles = []` `for file in files:` `if bfutil.is_standin(file):` `dstfiles.append(bfutil.split_standin(file))` `else:` `dstfiles.append(file)` `# Commit` `mctx = context.memctx(rdst, parents, ctx.description(), dstfiles,` `getfilectx, ctx.user(), ctx.date(), ctx.extra())` `ret = rdst.commitctx(mctx)` `rdst.dirstate.setparents(ret)` `revmap[ctx.node()] = rdst.changelog.tip()` `def _bfconvert_addchangeset(rsrc, rdst, ctx, revmap, bfiles, normalfiles, matcher, size, bfiletohash):` `# Convert src parents to dst parents` `parents = []` `for p in ctx.parents():` `parents.append(revmap[p.node()])` `while len(parents) < 2:` `parents.append(node.nullid)` `# Generate list of changed files` `files = set(ctx.files())` `if node.nullid not in parents:` `mc = ctx.manifest()` `mp1 = ctx.parents()[0].manifest()` `mp2 = ctx.parents()[1].manifest()` `for f in mp1:` `if f not in mc:` `files.add(f)` `for f in mp2:` `if f not in mc:` `files.add(f)` `for f in mc:` `if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, None):` `files.add(f)` `dstfiles = []` `for f in files:` `if f not in bfiles and f not in normalfiles:` `isbfile = _is_bfile(f, ctx, matcher, size)` `# If this file was renamed or copied then copy` `# the bfileness of its predecessor` `if f in ctx.manifest():` `fctx = ctx.filectx(f)` `renamed = fctx.renamed()` `renamedbfile = renamed and renamed[0] in bfiles` `isbfile \|= renamedbfile` `if 'l' in fctx.flags():` `if renamedbfile:` `raise util.Abort(_('Renamed/copied bfile %s becomes symlink') % f)` `isbfile = False` `if isbfile:` `bfiles.add(f)` `else:` `normalfiles.add(f)` `if f in bfiles:` `dstfiles.append(bfutil.standin(f))` `# bfile in manifest if it has not been removed/renamed` `if f in ctx.manifest():` `if 'l' in ctx.filectx(f).flags():` `if renamed and renamed[0] in bfiles:` `raise util.Abort(_('bfile %s becomes symlink') % f)` `# bfile was modified, update standins` `fullpath = rdst.wjoin(f)` `bfutil.create_dir(os.path.dirname(fullpath))` `m = util.sha1('')` `m.update(ctx[f].data())` `hash = m.hexdigest()` `if f not in bfiletohash or bfiletohash[f] != hash:` `with open(fullpath, 'wb') as fd:` `fd.write(ctx[f].data())` `executable = 'x' in ctx[f].flags()` `os.chmod(fullpath, bfutil.get_mode(executable))` `bfutil.write_standin(rdst, bfutil.standin(f), hash, executable)` `bfiletohash[f] = hash` `else:` `# normal file` `dstfiles.append(f)` `def getfilectx(repo, memctx, f):` `if bfutil.is_standin(f):` `# if the file isn't in the manifest then it was removed` `# or renamed, raise IOError to indicate this` `srcfname = bfutil.split_standin(f)` `try:` `fctx = ctx.filectx(srcfname)` `except error.LookupError:` `raise IOError()` `renamed = fctx.renamed()` `if renamed:` `# standin is always a bfile because bfileness` `# doesn't change after rename or copy` `renamed = bfutil.standin(renamed[0])` `return context.memfilectx(f, bfiletohash[srcfname], 'l' in fctx.flags(),` `'x' in fctx.flags(), renamed)` `else:` `try:` `fctx = ctx.filectx(f)` `except error.LookupError:` `raise IOError()` `renamed = fctx.renamed()` `if renamed:` `renamed = renamed[0]` `data = fctx.data()` `if f == '.hgtags':` `newdata = []` `for line in data.splitlines():` `id, name = line.split(' ', 1)` `newdata.append('%s %s\n' % (node.hex(revmap[node.bin(id)]), name))` `data = ''.join(newdata)` `return context.memfilectx(f, data, 'l' in fctx.flags(),` `'x' in fctx.flags(), renamed)` `# Commit` `mctx = context.memctx(rdst, parents, ctx.description(), dstfiles,` `getfilectx, ctx.user(), ctx.date(), ctx.extra())` `ret = rdst.commitctx(mctx)` `rdst.dirstate.setparents(ret)` `revmap[ctx.node()] = rdst.changelog.tip()` `def _is_bfile(file, ctx, matcher, size):` `'''` `A file is a bfile if it matches a pattern or is over` `the given size.` `'''` `# Never store hgtags or hgignore as bfiles` `if file == '.hgtags' or file == '.hgignore' or file == '.hgsigs':` `return False` `if matcher and matcher(file):` `return True` `try:` `return ctx.filectx(file).size() >= size 1024 * 1024` `except error.LookupError:` `return False` `def upload_bfiles(ui, rsrc, rdst, files):` `'''upload big files to the central store'''` `if not files:` `return` `# Don't upload locally. All bfiles are in the system wide cache` `# so the other repo can just get them from there.` `if not rdst.path.startswith('http'):` `return` `store = basestore._open_store(rsrc, rdst.path, put=True)` `at = 0` `for hash in files:` `ui.progress(_('Uploading bfiles'), at, unit='bfile', total=len(files))` `if store.exists(hash):` `at += 1` `continue` `source = bfutil.find_file(rsrc, hash)` `if not source:` `raise util.Abort(_('Missing bfile %s needs to be uploaded') % hash)` `# XXX check for errors here` `store.put(source, hash)` `at += 1` `ui.progress('Uploading bfiles', None)` `def verify_bfiles(ui, repo, all=False, contents=False):` `'''Verify that every big file revision in the current changeset` `exists in the central store. With --contents, also verify that` `the contents of each big file revision are correct (SHA-1 hash` `matches the revision ID). With --all, check every changeset in` `this repository.'''` `if all:` `# Pass a list to the function rather than an iterator because we know a list will work.` `revs = range(len(repo))` `else:` `revs = ['.']` `store = basestore._open_store(repo)` `return store.verify(revs, contents=contents)` -`def revert_bfiles(ui, repo):`+`def revert_bfiles(ui, repo, file_list=None):` `wlock = repo.wlock()` `try:` `bfdirstate = bfutil.open_bfdirstate(ui, repo)` `s = bfdirstate.status(match_.always(repo.root, repo.getcwd()), [], False, False, False)` `(unsure, modified, added, removed, missing, unknown, ignored, clean) = s` `bfiles = bfutil.list_bfiles(repo)` `toget = []` `at = 0` `updated = 0` `for bfile in bfiles:`-`if not os.path.exists(repo.wjoin(bfutil.standin(bfile))):`-`bfdirstate.remove(bfile)`-`continue`-`if os.path.exists(repo.wjoin(bfutil.standin(os.path.join(bfile + '.orig')))):`-`shutil.copyfile(repo.wjoin(bfile), repo.wjoin(bfile + '.orig'))`-`at += 1`-`expectedhash = repo[None][bfutil.standin(bfile)].data().strip()`-`mode = os.stat(repo.wjoin(bfutil.standin(bfile))).st_mode`-`if not os.path.exists(repo.wjoin(bfile)) or expectedhash != bfutil.hashfile(repo.wjoin(bfile)):`-`path = bfutil.find_file(repo, expectedhash)`-`if path is None:`-`toget.append((bfile, expectedhash))`-`else:`-`util.makedirs(os.path.dirname(repo.wjoin(bfile)))`-`shutil.copy(path, repo.wjoin(bfile))`+`if file_list == None or bfile in file_list:`+`if not os.path.exists(repo.wjoin(bfutil.standin(bfile))):`+`bfdirstate.remove(bfile)`+`continue`+`if os.path.exists(repo.wjoin(bfutil.standin(os.path.join(bfile + '.orig')))):`+`shutil.copyfile(repo.wjoin(bfile), repo.wjoin(bfile + '.orig'))`+`at += 1`+`expectedhash = repo[None][bfutil.standin(bfile)].data().strip()`+`mode = os.stat(repo.wjoin(bfutil.standin(bfile))).st_mode`+`if not os.path.exists(repo.wjoin(bfile)) or expectedhash != bfutil.hashfile(repo.wjoin(bfile)):`+`path = bfutil.find_file(repo, expectedhash)`+`if path is None:`+`toget.append((bfile, expectedhash))`+`else:`+`util.makedirs(os.path.dirname(repo.wjoin(bfile)))`+`shutil.copy(path, repo.wjoin(bfile))`+`os.chmod(repo.wjoin(bfile), mode)`+`updated += 1`+`if bfutil.standin(bfile) not in repo['.']:`+`bfdirstate.add(bfutil.unixpath(bfile))`+`elif expectedhash == repo['.'][bfutil.standin(bfile)].data().strip():`+`bfdirstate.normal(bfutil.unixpath(bfile))`+`else:`+`bfutil.dirstate_normaldirty(bfdirstate, bfutil.unixpath(bfile))`+`elif os.path.exists(repo.wjoin(bfile)) and mode != os.stat(repo.wjoin(bfile)).st_mode:` `os.chmod(repo.wjoin(bfile), mode)` `updated += 1` `if bfutil.standin(bfile) not in repo['.']:` `bfdirstate.add(bfutil.unixpath(bfile))` `elif expectedhash == repo['.'][bfutil.standin(bfile)].data().strip():` `bfdirstate.normal(bfutil.unixpath(bfile))` `else:` `bfutil.dirstate_normaldirty(bfdirstate, bfutil.unixpath(bfile))`-`elif os.path.exists(repo.wjoin(bfile)) and mode != os.stat(repo.wjoin(bfile)).st_mode:`-`os.chmod(repo.wjoin(bfile), mode)`-`updated += 1`-`if bfutil.standin(bfile) not in repo['.']:`-`bfdirstate.add(bfutil.unixpath(bfile))`-`elif expectedhash == repo['.'][bfutil.standin(bfile)].data().strip():`-`bfdirstate.normal(bfutil.unixpath(bfile))`-`else:`-`bfutil.dirstate_normaldirty(bfdirstate, bfutil.unixpath(bfile))` `if toget:` `store = basestore._open_store(repo)` `(success, missing) = store.get(toget)` `else:` `success, missing = [], []` `for (filename, hash) in success:` `mode = os.stat(repo.wjoin(bfutil.standin(filename))).st_mode` `os.chmod(repo.wjoin(filename), mode)` `updated += 1` `if bfutil.standin(filename) not in repo['.']:` `bfdirstate.add(bfutil.unixpath(filename))` `elif hash == repo['.'][bfutil.standin(filename)].data().strip():` `bfdirstate.normal(bfutil.unixpath(filename))` `else:` `bfutil.dirstate_normaldirty(bfdirstate, bfutil.unixpath(filename))` `removed = 0` `for bfile in bfdirstate:`-`if not os.path.exists(repo.wjoin(bfutil.standin(bfile))):`-`if os.path.exists(repo.wjoin(bfile)):`-`os.unlink(repo.wjoin(bfile))`-`removed += 1`-`if bfutil.standin(bfile) in repo['.']:`-`bfdirstate.remove(bfutil.unixpath(bfile))`-`else:`-`bfdirstate.forget(bfutil.unixpath(bfile))`-`else:`-`state = repo.dirstate[bfutil.standin(bfile)]`-`if state == 'n':`-`bfdirstate.normal(bfile)`-`elif state == 'r':`-`bfdirstate.remove(bfile)`-`elif state == 'a':`-`bfdirstate.add(bfile)`-`elif state == '?':`-`bfdirstate.forget(bfile)`+`if file_list == None or bfile in file_list:`+`if not os.path.exists(repo.wjoin(bfutil.standin(bfile))):`+`if os.path.exists(repo.wjoin(bfile)):`+`os.unlink(repo.wjoin(bfile))`+`removed += 1`+`if bfutil.standin(bfile) in repo['.']:`+`bfdirstate.remove(bfutil.unixpath(bfile))`+`else:`+`bfdirstate.forget(bfutil.unixpath(bfile))`+`else:`+`state = repo.dirstate[bfutil.standin(bfile)]`+`if state == 'n':`+`bfdirstate.normal(bfile)`+`elif state == 'r':`+`bfdirstate.remove(bfile)`+`elif state == 'a':`+`bfdirstate.add(bfile)`+`elif state == '?':`+`bfdirstate.forget(bfile)` `bfdirstate.write()` `finally:` `wlock.release()` `def update_bfiles(ui, repo):` `wlock = repo.wlock()` `try:` `bfdirstate = bfutil.open_bfdirstate(ui, repo)` `s = bfdirstate.status(match_.always(repo.root, repo.getcwd()), [], False, False, False)` `(unsure, modified, added, removed, missing, unknown, ignored, clean) = s` `bfiles = bfutil.list_bfiles(repo)` `toget = []` `at = 0` `updated = 0` `removed = 0` `printed = False` `if bfiles:` `ui.status(_('Getting changed bfiles\n'))` `printed = True` `for bfile in bfiles:` `at += 1` `if os.path.exists(repo.wjoin(bfile)) and not os.path.exists(repo.wjoin(bfutil.standin(bfile))):` `os.unlink(repo.wjoin(bfile))` `removed += 1` `bfdirstate.forget(bfutil.unixpath(bfile))` `continue` `expectedhash = repo[None][bfutil.standin(bfile)].data().strip()` `mode = os.stat(repo.wjoin(bfutil.standin(bfile))).st_mode` `if not os.path.exists(repo.wjoin(bfile)) or expectedhash != bfutil.hashfile(repo.wjoin(bfile)):` `path = bfutil.find_file(repo, expectedhash)` `if not path:` `toget.append((bfile, expectedhash))` `else:` `util.makedirs(os.path.dirname(repo.wjoin(bfile)))` `shutil.copy(path, repo.wjoin(bfile))` `os.chmod(repo.wjoin(bfile), mode)` `updated += 1` `bfdirstate.normal(bfutil.unixpath(bfile))` `elif os.path.exists(repo.wjoin(bfile)) and mode != os.stat(repo.wjoin(bfile)).st_mode:` `os.chmod(repo.wjoin(bfile), mode)` `updated += 1` `bfdirstate.normal(bfutil.unixpath(bfile))` `if toget:` `store = basestore._open_store(repo)` `(success, missing) = store.get(toget)` `else:` `success, missing = [],[]` `for (filename, hash) in success:` `mode = os.stat(repo.wjoin(bfutil.standin(filename))).st_mode` `os.chmod(repo.wjoin(filename), mode)` `updated += 1` `bfdirstate.normal(bfutil.unixpath(filename))` `for bfile in bfdirstate:` `if bfile not in bfiles:` `if os.path.exists(repo.wjoin(bfile)):` `if not printed:` `ui.status(_('Getting changed bfiles\n'))` `printed = True` `os.unlink(repo.wjoin(bfile))` `removed += 1` `bfdirstate.forget(bfutil.unixpath(bfile))` `bfdirstate.write()` `if printed:` `ui.status(_('%d big files updated, %d removed\n') % (updated, removed))` `finally:` `wlock.release()` `# -- hg commands declarations ------------------------------------------------` `cmdtable = {` `'kbfconvert': (bfconvert,` `[('s', 'size', 0, 'All files over this size '` `'(in megabytes) will be considered bfiles. This can also be specified in your hgrc as [bfiles].size.'),` `('','tonormal',False, 'Convert from a bfiles repo to a normal repo')],` `_('hg kbfconvert SOURCE DEST [FILE ...]')),` `}`

Change 1 of 3 Show Changes Only Show Entire File Loading... kbfiles/bfsetup.py Stacked
700 701 702 703 704 705 730 731 732 733 734 735 736 738 739 740 741 742 743 744 745 746 747	700 701 702 703 704 705 706 707 708 709 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 752 753 754 755 756 757 758 759 760 761 762 763 764 765	@@ -700,6 +700,10 @@ `return result` +`# When the user calls revert, we have to be careful to not revert any changes to other`+`# bfiles accidentally. This means we have to keep track of the bfiles that are`+`# being reverted so we only pull down the necessary bfiles.`+`#` `# Standins are only updated (to match the hash of bfiles) before commits.` `# Update the standins then run the original revert (changing the matcher to hit standins` `# instead of bfiles). Based on the resulting standins update the bfiles. Then return the`@@ -730,7 +734,17 @@ `orig_matchfn = m.matchfn` `def matchfn(f):` `if bfutil.is_standin(f):`-`return orig_matchfn(bfutil.split_standin(f)) and (f in repo[None] or f in ctx)`+`# We need to keep track of what bfiles are being matched so we know which`+`# ones to update later (otherwise we revert changes to other bfiles`+`# accidentally). This is repo specific, so duckpunch the repo object to`+`# keep the list of bfiles for us later.`+`if(orig_matchfn(bfutil.split_standin(f)) and (f in repo[None] or f in ctx)):`+`bfiles_list = getattr(repo, "_bfiles_to_update", [])`+`bfiles_list.append(bfutil.split_standin(f))`+`repo._bfiles_to_update = bfiles_list;`+`return True`+`else:`+`return False` `return orig_matchfn(f)` `m.matchfn = matchfn` `return m`@@ -738,10 +752,14 @@ `orig(ui, repo, pats, *opts)` `finally:` `cmdutil.match = oldmatch`-`bfcommands.revert_bfiles(ui, repo)`+`bfiles_list = getattr(repo, "_bfiles_to_update", [])`+`bfcommands.revert_bfiles(ui, repo, bfiles_list)`+`# Empty out the bfiles list so we start fresh next time`+`repo._bfiles_to_update = []` `for bfile in modified:`-`if os.path.exists(repo.wjoin(bfutil.standin(bfile))) and bfile in repo['.']:`-`bfutil.write_standin(repo, bfutil.standin(bfile), repo['.'][bfile].data().strip(), 'x' in repo['.'][bfile].flags())`+`if bfile in bfiles_list:`+`if os.path.exists(repo.wjoin(bfutil.standin(bfile))) and bfile in repo['.']:`+`bfutil.write_standin(repo, bfutil.standin(bfile), repo['.'][bfile].data().strip(), 'x' in repo['.'][bfile].flags())` `finally:` `wlock.release()`

Change 1 of 1 Show Changes Only Show Entire File Loading... tests/test-revert.py Stacked
211 212 213	211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244	@@ -211,3 +211,34 @@ `? b2.txt.orig` `? n2.txt.orig` `''')`+`# Test that modifying a normal file and a bfile, then reverting the normal file,`+`# does not alter the bfile`+`os.chdir('..')`+`os.mkdir('repo2')`+`os.chdir('repo2')`+`hgt.hg(['init', '-q'])`+`hgt.writefile('n1', 'n1')`+`hgt.hg(['add', 'n1'])`+`hgt.hg(['commit', '-m', 'added normal file'])`+`hgt.writefile('b1', 'b1')`+`hgt.hg(['add', '--bf', 'b1'])`+`hgt.hg(['commit', '-m', 'added bfile'])`+`hgt.writefile('n1', 'n11')`+`hgt.writefile('b1', 'b11')`+`hgt.hg(['revert', 'n1'])`+`hgt.asserttrue(hgt.readfile('b1') == 'b11', 'file chnaged')`+`# Test that modifying 2 bfiles and reverting one of the bfiles, does not alter the`+`# second bfile`+`os.chdir('..')`+`os.mkdir('repo3')`+`hgt.hg(['init', '-q'])`+`hgt.writefile('b1', 'b1')`+`hgt.hg(['add', '--bf', 'b1'])`+`hgt.hg(['commit', '-m', 'added first bfile'])`+`hgt.writefile('b2', 'b2')`+`hgt.hg(['add', '--bf', 'b2'])`+`hgt.hg(['commit', '-m', 'added second bfile'])`+`hgt.writefile('b1', 'b11')`+`hgt.writefile('b2', 'b22')`+`hgt.hg(['revert', 'b1'])`+`hgt.asserttrue(hgt.readfile('b2') == 'b22', 'file chnaged')`

Diff Options

tip Fix revert so that it works correctly for cases other than 'revert --all'. Previously all bfiles were reverted regardless of what patterns were supplied.

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

tip Fix revert so that it works correctly for cases other than 'revert --all'. Previously all bfiles were reverted regardless of what patterns were supplied.

Diff to b0916a4160dd

Attach a Trello Card

Add a tag

Your session has expired