| hg-reviewers |
We can return before the block that prints debug messages. That block
will not be run anyway when there are no copies.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/copies.py (9 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| # that up here | # that up here | ||||
| for dst, src in copy.items(): | for dst, src in copy.items(): | ||||
| fullcopy[dst] = src | fullcopy[dst] = src | ||||
| # Sometimes we forget to add entries from "diverge" to "fullcopy", so fix | # Sometimes we forget to add entries from "diverge" to "fullcopy", so fix | ||||
| # that up here | # that up here | ||||
| for src, dsts in diverge.items(): | for src, dsts in diverge.items(): | ||||
| for dst in dsts: | for dst in dsts: | ||||
| fullcopy[dst] = src | fullcopy[dst] = src | ||||
| if fullcopy and repo.ui.debugflag: | |||||
| if not fullcopy: | |||||
| return copy, {}, diverge, renamedelete, {} | |||||
| if repo.ui.debugflag: | |||||
| repo.ui.debug(" all copies found (* = to merge, ! = divergent, " | repo.ui.debug(" all copies found (* = to merge, ! = divergent, " | ||||
| "% = renamed and deleted):\n") | "% = renamed and deleted):\n") | ||||
| for f in sorted(fullcopy): | for f in sorted(fullcopy): | ||||
| note = "" | note = "" | ||||
| if f in copy: | if f in copy: | ||||
| note += "*" | note += "*" | ||||
| if f in divergeset: | if f in divergeset: | ||||
| note += "!" | note += "!" | ||||
| if f in renamedeleteset: | if f in renamedeleteset: | ||||
| note += "%" | note += "%" | ||||
| repo.ui.debug(" src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f, | repo.ui.debug(" src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f, | ||||
| note)) | note)) | ||||
| del divergeset | del divergeset | ||||
| if not fullcopy: | |||||
| return copy, {}, diverge, renamedelete, {} | |||||
| repo.ui.debug(" checking for directory renames\n") | repo.ui.debug(" checking for directory renames\n") | ||||
| # generate a directory move map | # generate a directory move map | ||||
| d1, d2 = c1.dirs(), c2.dirs() | d1, d2 = c1.dirs(), c2.dirs() | ||||
| # Hack for adding '', which is not otherwise added, to d1 and d2 | # Hack for adding '', which is not otherwise added, to d1 and d2 | ||||
| d1.addpath('/') | d1.addpath('/') | ||||
| d2.addpath('/') | d2.addpath('/') | ||||
| invalid = set() | invalid = set() | ||||