| pulkit |
| hg-reviewers |
It's safe (and fast) to look for copies in the null revision, and it's
incorrect not to look for them in the working copy, so let's look in
both places.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/logcmdutil.py (4 lines) | |||
| M | tests/test-status.t (2 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| styles[key] = None | styles[key] = None | ||||
| # experimental config: experimental.graphshorten | # experimental config: experimental.graphshorten | ||||
| state['graphshorten'] = ui.configbool('experimental', 'graphshorten') | state['graphshorten'] = ui.configbool('experimental', 'graphshorten') | ||||
| for rev, type, ctx, parents in dag: | for rev, type, ctx, parents in dag: | ||||
| char = formatnode(repo, ctx) | char = formatnode(repo, ctx) | ||||
| copies = None | copies = None | ||||
| if getrenamed and ctx.rev(): | if getrenamed: | ||||
| copies = [] | copies = [] | ||||
| for fn in ctx.files(): | for fn in ctx.files(): | ||||
| rename = getrenamed(fn, ctx.rev()) | rename = getrenamed(fn, ctx.rev()) | ||||
| if rename: | if rename: | ||||
| copies.append((fn, rename)) | copies.append((fn, rename)) | ||||
| edges = edgefn(type, char, state, rev, parents) | edges = edgefn(type, char, state, rev, parents) | ||||
| firstedge = next(edges) | firstedge = next(edges) | ||||
| width = firstedge[2] | width = firstedge[2] | ||||
| def displaygraphrevs(ui, repo, revs, displayer, getrenamed): | def displaygraphrevs(ui, repo, revs, displayer, getrenamed): | ||||
| revdag = graphmod.dagwalker(repo, revs) | revdag = graphmod.dagwalker(repo, revs) | ||||
| displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed) | displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed) | ||||
| def displayrevs(ui, repo, revs, displayer, getrenamed): | def displayrevs(ui, repo, revs, displayer, getrenamed): | ||||
| for rev in revs: | for rev in revs: | ||||
| ctx = repo[rev] | ctx = repo[rev] | ||||
| copies = None | copies = None | ||||
| if getrenamed is not None and rev: | if getrenamed is not None: | ||||
| copies = [] | copies = [] | ||||
| for fn in ctx.files(): | for fn in ctx.files(): | ||||
| rename = getrenamed(fn, rev) | rename = getrenamed(fn, rev) | ||||
| if rename: | if rename: | ||||
| copies.append((fn, rename)) | copies.append((fn, rename)) | ||||
| displayer.show(ctx, copies=copies) | displayer.show(ctx, copies=copies) | ||||
| displayer.flush(ctx) | displayer.flush(ctx) | ||||
| displayer.close() | displayer.close() | ||||
| parent: 0:8c55c58b4c0e | parent: 0:8c55c58b4c0e | ||||
| user: test | user: test | ||||
| date: * (glob) | date: * (glob) | ||||
| files: | files: | ||||
| M a | M a | ||||
| b | b | ||||
| R b | R b | ||||
| BROKEN: as above, 'a' should be marked a copy | |||||
| $ hg log -GTstatus -r 'wdir()' -C | $ hg log -GTstatus -r 'wdir()' -C | ||||
| o changeset: 2147483647:ffffffffffff | o changeset: 2147483647:ffffffffffff | ||||
| | parent: 0:8c55c58b4c0e | | parent: 0:8c55c58b4c0e | ||||
| ~ user: test | ~ user: test | ||||
| date: * (glob) | date: * (glob) | ||||
| files: | files: | ||||
| M a | M a | ||||
| b | |||||
| R b | R b | ||||
| Other "bug" highlight, the revision status does not report the copy information. | Other "bug" highlight, the revision status does not report the copy information. | ||||
| This is buggy behavior. | This is buggy behavior. | ||||
| $ hg commit -m 'blah' | $ hg commit -m 'blah' | ||||
| $ hg st --copies --change . | $ hg st --copies --change . | ||||