Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/patch.py @ 4232:0d51eb296fb9
Merge with crew-stable
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 16 Mar 2007 00:45:18 -0300 |
parents | 1253703853a8 24c22a3f2ef8 |
children | 47ba52121433 |
comparison
equal
deleted
inserted
replaced
4224:2a8b6d78d7ee | 4232:0d51eb296fb9 |
---|---|
357 copies = [] | 357 copies = [] |
358 removes = {} | 358 removes = {} |
359 cfiles = patches.keys() | 359 cfiles = patches.keys() |
360 cwd = repo.getcwd() | 360 cwd = repo.getcwd() |
361 if cwd: | 361 if cwd: |
362 cfiles = [util.pathto(cwd, f) for f in patches.keys()] | 362 cfiles = [util.pathto(repo.root, cwd, f) for f in patches.keys()] |
363 for f in patches: | 363 for f in patches: |
364 ctype, gp = patches[f] | 364 ctype, gp = patches[f] |
365 if ctype == 'RENAME': | 365 if ctype == 'RENAME': |
366 copies.append((gp.oldpath, gp.path, gp.copymod)) | 366 copies.append((gp.oldpath, gp.path, gp.copymod)) |
367 removes[gp.oldpath] = 1 | 367 removes[gp.oldpath] = 1 |