| marmoute |
| hg-reviewers |
I want to add a hg cp/mv -r <rev> option to mark files as
copied/moved in an existing commit (amending that commit). The code
needs to not depend on the dirstate for that.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cmdutil.py (35 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Abandoned | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| # | # | ||||
| # hgsep => pathname that uses "/" to separate directories | # hgsep => pathname that uses "/" to separate directories | ||||
| # ossep => pathname that uses os.sep to separate directories | # ossep => pathname that uses os.sep to separate directories | ||||
| cwd = repo.getcwd() | cwd = repo.getcwd() | ||||
| targets = {} | targets = {} | ||||
| after = opts.get(b"after") | after = opts.get(b"after") | ||||
| dryrun = opts.get(b"dry_run") | dryrun = opts.get(b"dry_run") | ||||
| wctx = repo[None] | wctx = repo[None] | ||||
| pctx = wctx.p1() | |||||
| uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True) | uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True) | ||||
| def walkpat(pat): | def walkpat(pat): | ||||
| srcs = [] | srcs = [] | ||||
| if after: | |||||
| badstates = b'?' | |||||
| else: | |||||
| badstates = b'?r' | |||||
| m = scmutil.match(wctx, [pat], opts, globbed=True) | m = scmutil.match(wctx, [pat], opts, globbed=True) | ||||
| for abs in wctx.walk(m): | for abs in wctx.walk(m): | ||||
| state = repo.dirstate[abs] | |||||
| rel = uipathfn(abs) | rel = uipathfn(abs) | ||||
| exact = m.exact(abs) | exact = m.exact(abs) | ||||
| if state in badstates: | if abs not in wctx: | ||||
| if exact and state == b'?': | if abs in pctx: | ||||
| ui.warn(_(b'%s: not copying - file is not managed\n') % rel) | if not after: | ||||
| if exact and state == b'r': | if exact: | ||||
| ui.warn( | ui.warn( | ||||
| _( | _( | ||||
| b'%s: not copying - file has been marked for' | b'%s: not copying - file has been marked ' | ||||
| b' remove\n' | b'for remove\n' | ||||
| ) | ) | ||||
| % rel | % rel | ||||
| ) | ) | ||||
| continue | continue | ||||
| else: | |||||
| if exact: | |||||
| ui.warn( | |||||
| _(b'%s: not copying - file is not managed\n') % rel | |||||
| ) | |||||
| continue | |||||
| # abs: hgsep | # abs: hgsep | ||||
| # rel: ossep | # rel: ossep | ||||
| srcs.append((abs, rel, exact)) | srcs.append((abs, rel, exact)) | ||||
| return srcs | return srcs | ||||
| # abssrc: hgsep | # abssrc: hgsep | ||||
| # relsrc: ossep | # relsrc: ossep | ||||
| # otarget: ossep | # otarget: ossep | ||||