| pulkit |
| hg-reviewers |
| 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 (2 lines) | |||
| M | relnotes/next (3 lines) | |||
| M | tests/test-log.t (20 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| def _makehunksfilter(self, ctx): | def _makehunksfilter(self, ctx): | ||||
| return None | return None | ||||
| def showdiff(self, ui, ctx, diffopts, graphwidth=0, stat=False): | def showdiff(self, ui, ctx, diffopts, graphwidth=0, stat=False): | ||||
| diffordiffstat( | diffordiffstat( | ||||
| ui, | ui, | ||||
| ctx.repo(), | ctx.repo(), | ||||
| diffopts, | diffopts, | ||||
| ctx.p1(), | diff_parent(ctx), | ||||
| ctx, | ctx, | ||||
| match=self._makefilematcher(ctx), | match=self._makefilematcher(ctx), | ||||
| stat=stat, | stat=stat, | ||||
| graphwidth=graphwidth, | graphwidth=graphwidth, | ||||
| hunksfilterfn=self._makehunksfilter(ctx), | hunksfilterfn=self._makehunksfilter(ctx), | ||||
| ) | ) | ||||
| == New Features == | == New Features == | ||||
| * `hg purge` is now a core command using `--confirm` by default. | * `hg purge` is now a core command using `--confirm` by default. | ||||
| * The `rev-branch-cache` is now updated incrementally whenever changesets | * The `rev-branch-cache` is now updated incrementally whenever changesets | ||||
| are added. | are added. | ||||
| == New Experimental Features == | == New Experimental Features == | ||||
| * There's a new `diff.merge` config option to show the changes | * There's a new `diff.merge` config option to show the changes | ||||
| relative to an automerge for merge changesets. This makes it | relative to an automerge for merge changesets. This makes it | ||||
| easier to detect and review manual changes performed in merge | easier to detect and review manual changes performed in merge | ||||
| changesets. It is only supported by `hg diff --change` so far. | changesets. It is supported by `hg diff --change`, `hg log -p` | ||||
| `hg incoming -p`, and `hg outgoing -p` so far. | |||||
| == Bug Fixes == | == Bug Fixes == | ||||
| == Backwards Compatibility Changes == | == Backwards Compatibility Changes == | ||||
| == Internal API Changes == | == Internal API Changes == | ||||
| * `changelog.branchinfo` is deprecated and will be removed after 5.8. | * `changelog.branchinfo` is deprecated and will be removed after 5.8. | ||||
| It is superseded by `changelogrevision.branchinfo`. | It is superseded by `changelogrevision.branchinfo`. | ||||
| -b | -b | ||||
| +c | +c | ||||
| diff -r b09be438c43a -r 8e07aafe1edc b | diff -r b09be438c43a -r 8e07aafe1edc b | ||||
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
| +++ b/b Thu Jan 01 00:00:00 1970 +0000 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | ||||
| @@ -0,0 +1,1 @@ | @@ -0,0 +1,1 @@ | ||||
| +b | +b | ||||
| Test that diff.merge is respected (file b was added on one side and | |||||
| and therefore merged cleanly) | |||||
| $ hg log -pr 3 --config diff.merge=yes | |||||
| changeset: 3:8e07aafe1edc | |||||
| tag: tip | |||||
| parent: 2:b09be438c43a | |||||
| parent: 1:925d80f479bb | |||||
| user: test | |||||
| date: Thu Jan 01 00:00:00 1970 +0000 | |||||
| summary: 3 | |||||
| diff -r 8e07aafe1edc a | |||||
| --- a/a Thu Jan 01 00:00:00 1970 +0000 | |||||
| +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |||||
| @@ -1,1 +1,1 @@ | |||||
| -b | |||||
| +c | |||||
| $ cd .. | $ cd .. | ||||
| 'hg log -r rev fn' when last(filelog(fn)) != rev | 'hg log -r rev fn' when last(filelog(fn)) != rev | ||||
| $ hg init simplelog | $ hg init simplelog | ||||
| $ cd simplelog | $ cd simplelog | ||||
| $ echo f > a | $ echo f > a | ||||
| $ hg ci -Am'a' -d '0 0' | $ hg ci -Am'a' -d '0 0' | ||||