upstream/mercurial-mirror Commit - r42755:4cafbd3b

1

== New Features ==

1

== New Features ==

2

3

* New config `commands.commit.post-status` shows status after successful

3

* New config `commands.commit.post-status` shows status after successful

4

commit.

4

commit.

5

6

* `hg root` now has templating support, including support for showing

6

* `hg root` now has templating support, including support for showing

7

where a repo share's source is. See `hg help -v root` for details.

7

where a repo share's source is. See `hg help -v root` for details.

8

9

* New `--force-close-branch` flag for `hg commit` to forcibly close

10

branch from a non-head changeset.

11

9

12

10

== New Experimental Features ==

13

== New Experimental Features ==

11

14

12

* New config `experimental.log.topo` makes `hg log -G` use

15

* New config `experimental.log.topo` makes `hg log -G` use

13

topological sorting. This is especially useful for aliases since it

16

topological sorting. This is especially useful for aliases since it

14

lets the alias accept an `-r` option while still using topological

17

lets the alias accept an `-r` option while still using topological

15

sorting with or without the `-r` (unlike if you use the `sort(...,

18

sorting with or without the `-r` (unlike if you use the `sort(...,

16

topo)` revset).

19

topo)` revset).

17

20

18

21

19

== Bug Fixes ==

22

== Bug Fixes ==

20

23

21

* issue4292: "hg log and {files} {file_adds} {file_mods} {file_dels}

24

* issue4292: "hg log and {files} {file_adds} {file_mods} {file_dels}

22

in template show wrong files on merged revision". See details in

25

in template show wrong files on merged revision". See details in

23

"Backwards Compatibility Changes".

26

"Backwards Compatibility Changes".

24

27

25

28

26

== Backwards Compatibility Changes ==

29

== Backwards Compatibility Changes ==

27

30

28

* Removed (experimental) support for log graph lines mixing

31

* Removed (experimental) support for log graph lines mixing

29

parent/grandparent styles. Setting

32

parent/grandparent styles. Setting

30

e.g. `experimental.graphstyle.parent = !` and

33

e.g. `experimental.graphstyle.parent = !` and

31

`experimental.graphstyle.grandparent = 3.` would use `!` for the

34

`experimental.graphstyle.grandparent = 3.` would use `!` for the

32

first three lines of the graph and then `.`. This is no longer

35

first three lines of the graph and then `.`. This is no longer

33

supported.

36

supported.

34

37

35

* If `ui.origbackuppath` had been (incorrectly) configured to point

38

* If `ui.origbackuppath` had been (incorrectly) configured to point

36

to a file, we will now replace that file by a directory and put

39

to a file, we will now replace that file by a directory and put

37

backups in that directory. This is similar to how we would

40

backups in that directory. This is similar to how we would

38

previously replace files *in* the configured directory by

41

previously replace files *in* the configured directory by

39

subdirectories.

42

subdirectories.

40

43

41

* Template keyword `{file_mods}`, `{file_adds}`, and `{file_dels}`

44

* Template keyword `{file_mods}`, `{file_adds}`, and `{file_dels}`

42

have changed behavior on merge commits. They used to be relative to

45

have changed behavior on merge commits. They used to be relative to

43

the first parent, but they now consider both parents. `{file_adds}`

46

the first parent, but they now consider both parents. `{file_adds}`

44

shows files that exists in the commit but did not exist in either

47

shows files that exists in the commit but did not exist in either

45

parent. `{file_dels}` shows files that do not exist in the commit

48

parent. `{file_dels}` shows files that do not exist in the commit

46

but existed in either parent. `{file_mods}` show the remaining

49

but existed in either parent. `{file_mods}` show the remaining

47

files from `{files}` that were not in the other two

50

files from `{files}` that were not in the other two

48

sets.

51

sets.

49

52

50

53

51

== Internal API Changes ==

54

== Internal API Changes ==

52

55

53

* Matchers are no longer iterable. Use `match.files()` instead.

56

* Matchers are no longer iterable. Use `match.files()` instead.

54

57

55

* `match.visitdir()` and `match.visitchildrenset()` now expect the

58

* `match.visitdir()` and `match.visitchildrenset()` now expect the

56

empty string instead of '.' to indicate the root directory.

59

empty string instead of '.' to indicate the root directory.

57

60

58

* `util.dirs()` and `util.finddirs()` now include an entry for the

61

* `util.dirs()` and `util.finddirs()` now include an entry for the

59

root directory (empty string).

62

root directory (empty string).

60

63

61

* shelve is no longer an extension now. it will be turned on by default.

64

* shelve is no longer an extension now. it will be turned on by default.

62

65

63

* New API to manage unfinished operations: Earlier there were distinct APIs

66

* New API to manage unfinished operations: Earlier there were distinct APIs

64

which dealt with unfinished states and separate lists maintaining them

67

which dealt with unfinished states and separate lists maintaining them

65

that are `cmdutil.afterresolvestates`, `cmdutil.unfinishedstates` and

68

that are `cmdutil.afterresolvestates`, `cmdutil.unfinishedstates` and

66

`cmdutil.STATES`. Now these have been unified to a single

69

`cmdutil.STATES`. Now these have been unified to a single

67

API which handles the various states and their utilities. This API

70

API which handles the various states and their utilities. This API

68

has been added to `state.py`. Now instead of adding to these 3 lists

71

has been added to `state.py`. Now instead of adding to these 3 lists

69

independently a state for a new operation can be registered using

72

independently a state for a new operation can be registered using

70

`addunfinished()` in `state` module.

73

`addunfinished()` in `state` module.

71

74

72

* `cmdutil.checkunfinished()` now includes detection for merge too.

75

* `cmdutil.checkunfinished()` now includes detection for merge too.

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             == New Features ==
              * New config `commands.commit.post-status` shows status after successful
              commit.
              * `hg root` now has templating support, including support for showing
                where a repo share's source is. See `hg help -v root` for details.
+             * New `--force-close-branch` flag for `hg commit` to forcibly close
+               branch from a non-head changeset.
             == New Experimental Features ==
              * New config `experimental.log.topo` makes `hg log -G` use
                topological sorting. This is especially useful for aliases since it
                lets the alias accept an `-r` option while still using topological
                sorting with or without the `-r` (unlike if you use the `sort(...,
                topo)` revset).
             == Bug Fixes  ==
              * issue4292: "hg log and {files} {file_adds} {file_mods} {file_dels}
                in template show wrong files on merged revision". See details in
                "Backwards Compatibility Changes".
             == Backwards Compatibility Changes ==
              * Removed (experimental) support for log graph lines mixing
                parent/grandparent styles. Setting
                e.g. `experimental.graphstyle.parent = !` and
                `experimental.graphstyle.grandparent = 3.` would use `!` for the
                first three lines of the graph and then `.`. This is no longer
                supported.
              * If `ui.origbackuppath` had been (incorrectly) configured to point
                to a file, we will now replace that file by a directory and put
                backups in that directory. This is similar to how we would
                previously replace files *in* the configured directory by
                subdirectories.
             * Template keyword `{file_mods}`, `{file_adds}`, and `{file_dels}`
                have changed behavior on merge commits. They used to be relative to
                the first parent, but they now consider both parents. `{file_adds}`
                shows files that exists in the commit but did not exist in either
                parent. `{file_dels}` shows files that do not exist in the commit
                but existed in either parent. `{file_mods}` show the remaining
                files from `{files}` that were not in the other two
                sets.
             == Internal API Changes ==
              * Matchers are no longer iterable. Use `match.files()` instead.
              * `match.visitdir()` and `match.visitchildrenset()` now expect the
                empty string instead of '.' to indicate the root directory.
              * `util.dirs()` and `util.finddirs()` now include an entry for the
                root directory (empty string).
              * shelve is no longer an extension now. it will be turned on by default.
              * New API to manage unfinished operations: Earlier there were distinct APIs
                which dealt with unfinished states and separate lists maintaining them
                that are `cmdutil.afterresolvestates`, `cmdutil.unfinishedstates` and
                `cmdutil.STATES`. Now these have been unified to a single
                API which handles the various states and their utilities. This API
                has been added to `state.py`. Now instead of adding to these 3 lists
                independently a state for a new operation can be registered using
                `addunfinished()` in `state` module.
              * `cmdutil.checkunfinished()` now includes detection for merge too.