equal
deleted
inserted
replaced
375 if gp and gp.mode: |
375 if gp and gp.mode: |
376 x = gp.mode & 0100 != 0 |
376 x = gp.mode & 0100 != 0 |
377 dst = os.path.join(repo.root, gp.path) |
377 dst = os.path.join(repo.root, gp.path) |
378 # patch won't create empty files |
378 # patch won't create empty files |
379 if ctype == 'ADD' and not os.path.exists(dst): |
379 if ctype == 'ADD' and not os.path.exists(dst): |
380 repo.wwrite(gp.path, '') |
380 repo.wwrite(gp.path, '', x and 'x' or '') |
381 util.set_exec(dst, x) |
381 else: |
|
382 util.set_exec(dst, x) |
382 cmdutil.addremove(repo, cfiles, wlock=wlock) |
383 cmdutil.addremove(repo, cfiles, wlock=wlock) |
383 files = patches.keys() |
384 files = patches.keys() |
384 files.extend([r for r in removes if r not in files]) |
385 files.extend([r for r in removes if r not in files]) |
385 files.sort() |
386 files.sort() |
386 |
387 |