Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 00:32:47 +0100] rev 3162
debian: drop outdate part of the description
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 00:32:24 +0100] rev 3161
debian: update Mercurial version dependencies
The debian package now reflect the actual requirement of the extension in its
current version.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 01 Nov 2017 23:51:55 +0100] rev 3160
branching: merge with stable to prepare version 7.0.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 01 Nov 2017 16:23:13 +0100] rev 3159
push: add a --publish flag
The new flag turns all element in the push to public changeset. This will help
experiment with diverse publishing workflow.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 01 Nov 2017 16:26:33 +0100] rev 3158
topic: add an option to automatically publish topic-less changeset
This new option will help playing with merge based workflow.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 30 Oct 2017 19:24:14 +0100] rev 3157
topic: add an option to enforce a single head per name in a repository
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 15 Oct 2017 00:07:21 +0530] rev 3156
revset: clean up some messy logic
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 26 Oct 2017 09:03:48 +0200] rev 3155
evolve: rename --phasedivergent flag to --phase-divergent
This makes the whole things easier to read.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 26 Oct 2017 09:02:25 +0200] rev 3154
evolve: rename --contentdivergent flag to --content-divergent
This makes the whole things easier to read.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 26 Oct 2017 08:44:50 +0200] rev 3153
pushkey: forbid usage of pushley to exchange markers
The pushkey based protocol lacks many important feature and is very slow. We
disable it to prevent any usage by mistake.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 26 Oct 2017 08:29:36 +0200] rev 3152
changelog: add an entry for 7.0.0 with recent change
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Oct 2017 04:41:17 +0200] rev 3151
compat: drop compat code for smartrevs.first
The 'first' method have been around for years.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Oct 2017 07:32:06 +0200] rev 3150
compat: drop compatibility dance around configoverride
This was introduced in hg-4.1 and we do no longer support lower versions.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Oct 2017 04:45:31 +0200] rev 3149
compat: drop support for older exchange protocol
Their have been better alternative for years. In addition they have been
officially deprecated for quite some time. So we official stop support them to
ease the maintainance.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Oct 2017 14:30:48 +0200] rev 3148
compat: drop compatibility for 'streamres' prior to 4.1
We no longer support these version.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Oct 2017 14:24:29 +0200] rev 3147
compat: drop the directaccess hacky extension
The user of this extension has forked their own version. We lighten our
maintenance burden and drop it.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Oct 2017 14:23:31 +0200] rev 3146
compat: drop the inhibit hacky extension
The user of this extension has forked their own version. We lighten our
maintenance burden and drop it.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Oct 2017 14:17:14 +0200] rev 3145
compat: drop 'lru.get' work-around for 3.9
We no longer support this version.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Oct 2017 14:13:57 +0200] rev 3144
compat: stop working around 3.8 file cache limitation
We no longer support this version.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Oct 2017 14:13:23 +0200] rev 3143
compat: simply the wrapping of '_destmergebranch'
All the version we support now use the same interface.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Oct 2017 14:12:37 +0200] rev 3142
compat: drop support for 3.8's '_destrebase' function
We no longer support this version.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Oct 2017 14:11:28 +0200] rev 3141
compat: mark version 4.1 as the minimum version required
We dropped compatibility for version 3.8, 3.9 and 4.0.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 16:08:29 +0200] rev 3140
compat: drop compatibility for Mercurial <= 4.0
We are dropping compatibility with older mercurial version. This will help us
to clean up the code base.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 16:07:09 +0200] rev 3139
packaging: mark as development version
This helps avoid confusion.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 16:05:57 +0200] rev 3138
branching: merge with stable
Prepare the 7.0.0 line.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 16:04:23 +0200] rev 3137
packaging: mark version as development version
This helps to avoid confusion.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 16:02:37 +0200] rev 3136
branching: close mercurial-4.0 branch
We are dropping support for older Mercurial version.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 16:02:10 +0200] rev 3135
branching: close mercurial-3.9 branch
We are dropping support for older Mercurial version.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 16:01:07 +0200] rev 3134
branching: close mercurial-3.8 branch
We are dropping support for older Mercurial version.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:55:12 +0200] rev 3133
util: add a small script to help with the merging of branches
We have multiple test-compat branches merging them can be a bit tedious. We add
a nice script doing so for us.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:50:22 +0200] rev 3132
test-compat: merge mercurial-3.9 into mercurial-3.8
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:50:22 +0200] rev 3131
test-compat: merge mercurial-4.0 into mercurial-3.9
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:50:21 +0200] rev 3130
test-compat: merge mercurial-4.1 into mercurial-4.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:50:20 +0200] rev 3129
test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:50:19 +0200] rev 3128
test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:50:18 +0200] rev 3127
test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:43:42 +0200] rev 3126
Added tag 6.8.0 for changeset ec0bbf26ce7f
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:41:58 +0200] rev 3125
packaging: prepare version 6.8.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:25:00 +0200] rev 3124
flake8: rename some ambiguous identifier
Apparently, pyflakes declared war on 'l'.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:11:48 +0200] rev 3123
topic: instroduce a fast path when computing stack
We do some stack related computation during transaction now. The current
inefficiency of the revset is hurting us too much. We pre-compute a subset using
native set operation to speed things up.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 23:03:11 +0200] rev 3122
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:56:52 +0200] rev 3121
test-compat: merge future 6.7.0 in mercurial-3.8 branch
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:56:21 +0200] rev 3120
test-compat: merge future 6.7.0 in mercurial-3.9 branch
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:54:58 +0200] rev 3119
test-compat: merge future 6.7.0 in mercurial-4.0 branch
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:54:41 +0200] rev 3118
test-compat: merge future 6.7.0 in mercurial-4.1 branch
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:54:08 +0200] rev 3117
test-compat: merge future 6.7.0 in mercurial-4.2 branch
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:52:55 +0200] rev 3116
test-compat: merge future 6.7.0 in mercurial-4.3 branch
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:44:12 +0200] rev 3115
obsfate: re-enables operation display in obsfate
Now that the compatibility checks are in a good shape we can re-enable more
noise in it.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:31:07 +0200] rev 3114
changelog: update to reflect latest change
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:45:33 +0200] rev 3113
test-compat: merge with mercurial-3.9 branch
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:44:52 +0200] rev 3112
test-compat: merge with mercurial-4.0 branch
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:22:14 +0200] rev 3111
compat-test: remove topic related tests for 3.9
The extension is no longer supported for 3.9
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:43:55 +0200] rev 3110
test-compat: merge with mercurial-4.1 branch
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:41:05 +0200] rev 3109
test-compat: merge with mercurial-4.2 branch
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:34:22 +0200] rev 3108
test-compat: merge with mercurial-4.3 branch
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:25:05 +0200] rev 3107
branching: merge with mercurial-4.3 branch creation
The other changeset marks the point were 'stable' is no longer about Mercurial
version 4.3.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 20:04:13 +0200] rev 3106
test-compat: revert output changes from phase renaming
We keep using the old name for the older version. test has to reflect that.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 19:32:18 +0200] rev 3105
test-compat: revert output changes related to temporary amend commit
This backed out changeset 06844693bb21 and other related changes.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 16:07:40 +0200] rev 3104
test-compat: revert ouput change to blackbox
This backed out changeset 86be70ae38b9.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 16:07:06 +0200] rev 3103
test-compat: revert ouput related to operation
This effectively backs out 4b951a9a6895.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 17:30:20 +0200] rev 3102
test-compat: revert output change in rebase
This backed out changeset d12c82fd1143 and a couple of other changes.
The change are not relevant in Mercurial < 4.4/
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 15:31:06 +0200] rev 3101
test-compat: revert output change from bundle2 capability
This backout changeset dd3eda2f7a89 not relevant for verison < 4.4.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 15:30:42 +0200] rev 3100
test-compat: revert output change on pull report
The revert the changeset from 8feb2cae7eae. Not relevant for verison < 4.4.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 15:30:16 +0200] rev 3099
test-compat: revert output change from 'phase' part
The output change were introduced in changeset from 87e349f617f9 and it not
relevant for version lower than 4.4.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 17:23:12 +0200] rev 3098
test-compat: revert output change from using core obsfate
The output update arrives in e91ca8b5ecf7.
This output is only relevant for Mercurial 4.4
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 21:29:14 +0200] rev 3097
topic: do to check to topic while amending
Right know the 'topic-mode' mess with amend. Especially in case of amending
merge where the merge is not properly detected.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 21:43:13 +0200] rev 3096
topic-mode: add missing end line in topic-mode warning
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 20:58:35 +0200] rev 3095
compat: work around the lack of configoverride in mercurial 4.0
The phase preservation will stay broken on 4.0 and below
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 19:29:56 +0200] rev 3094
compat: add an abstraction for 'scmutil.cleanupnodes'
The usage of the function was added in 103244e34a9c but is not compatible with
Mercurial <= 4.2.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:56:15 +0200] rev 3093
compat: conditionally access config item
Version 4.2 and below do not have config items support. So the extensions helper
do not register anything.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:50:26 +0200] rev 3092
compat: handle version where obsutil is not available
Version older than 4.3 is do not have the obsutil option. We need to handle
that.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:19:01 +0200] rev 3091
test: use node instead of rev in topic push tests
This makes the test more stable when revision number changes.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 17:12:03 +0200] rev 3090
test: use node instead of rev in uncommit -i test
This makes the test more stable when revision number changes.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 15:20:20 +0200] rev 3089
branching: create the mercurial-4.3 test compatibility branch
This branch will contains the expected test output with 4.3.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 15:18:51 +0200] rev 3088
branch: merge with stable to prepare 6.7 release
In addition, Mercurial 4.4-rc is out, so we need to update the expected output.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 15:13:28 +0200] rev 3087
changeloge: add details about topic-mode
Boris Feld <boris.feld@octobus.net> [Fri, 20 Oct 2017 14:00:30 +0200] rev 3086
effect-flag: remove wrapping of createmarkers for Mercurial 4.4
Now that effect-flag has landed in Mercurial 4.4, we don't need to wrap
createmarkers for this version anymore.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 14:56:03 +0200] rev 3085
stack: order the adjective of changeset
The new order give more interesting result:
* base current
* base unstable
* current unstable
It seems more harmonious this way. Base seems the most core and immutable
adjective describing the element. Then current is a volatile but important one.
Finally, unstable is less information than current, so it goes last.
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 15 Oct 2017 00:03:59 +0530] rev 3084
stack: show current and unstable also for t0 and bases
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 12:04:45 +0200] rev 3083
obsfate: use core version of obsfate if available
Let us use the upstream version whenever available. The operation display is
currently disabled to ease with the test changes.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Oct 2017 18:18:43 +0200] rev 3082
topic: register config items
There is a couple more hoops to jump through but all config items used are now
registered.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Oct 2017 18:17:47 +0200] rev 3081
directaccess: register config item if possible
Mercurial 4.4 warns about unregistered config.
Boris Feld <boris.feld@octobus.net> [Thu, 19 Oct 2017 14:46:06 +0200] rev 3080
evolve: registed configitems if available
The config are registered as 'dynamicdefault' because we still need to
explicitly pass the config option for older version of Mercurial. (4.2 and
before).
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Oct 2017 21:23:21 +0200] rev 3079
inhibit: compatibility with 4.4-rc
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Oct 2017 20:01:00 +0200] rev 3078
branching: merge with stable
Merge with the inhibit fix.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Oct 2017 19:56:18 +0200] rev 3077
inhibit: respect '--keep' when handling rebase clean up
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 18 Oct 2017 19:00:56 +0200] rev 3076
test: adapt to change from 537de0b14030
If we use phase for pull/push this impact some debug output.
CORE-TEST-OUTPUT-UPDATE: 537de0b14030
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 17 Oct 2017 17:12:38 +0200] rev 3075
test: adapt to output change from eb586ed5d8ce
Core have a more verbose output on pull. We have to update tests with it.
CORE-TEST-OUTPUT-UPDATE: eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 17 Oct 2017 17:35:05 +0200] rev 3074
compat: fix compatibility with new duplicatecopies
Changeset 754b5117622f updated the signature of 'copies.duplicatecopies'.
We can now handle the multiple version of that code for compatiblity.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 14 Oct 2017 19:14:27 +0200] rev 3073
topic: remove 'ass' from the random animal list
As much as I love donkey… this generate inappropriate names.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 14 Oct 2017 19:08:22 +0200] rev 3072
config: stop passing useless default value to config
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 14 Oct 2017 19:06:06 +0200] rev 3071
branching: merge with stable
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 14 Oct 2017 18:56:42 +0200] rev 3070
changelog: add about fixed bookmark and phase handling while changing topics
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 14 Oct 2017 18:55:43 +0200] rev 3069
changelog: add about pager support
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 13 Oct 2017 06:10:41 +0530] rev 3068
pager: add support to `hg evolve --list`
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 13 Oct 2017 06:08:32 +0530] rev 3067
pager: add support to `hg obslog`
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 13 Oct 2017 06:06:09 +0530] rev 3066
pager: add support to `hg topic`
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 13 Oct 2017 06:02:56 +0530] rev 3065
pager: add support to `hg stack`
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 14 Oct 2017 20:17:25 +0530] rev 3064
pager: add a function in compats to start pager
This will help us enabling pager when ui.pager API exists. Also we can try
plugging in the old pager API in this function and we won't have to change
anything.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 14 Oct 2017 02:39:21 +0200] rev 3063
metadata: cleanup metadata file
I'm not sure how this conflict marker survived the pre-publish test run...
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 13 Oct 2017 20:32:50 +0200] rev 3062
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 13 Oct 2017 20:28:21 +0200] rev 3061
topic: remove a silly duplicate in a revset
Spotted by Pulkit Goyal. More performance win seems to exists here, but we
starts with the obvious.
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 13 Oct 2017 10:18:52 +0530] rev 3060
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 13 Oct 2017 10:01:38 +0530] rev 3059
topics: use stack.stack() instead of stack.stackdata()
stack.stackdata() also calls stack.stack() internally. Moreover if we just want
to calculate changesetcount, troubled count, it will be cheap to calculate using
stack.stack rather than stackdata().
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 22:48:43 +0200] rev 3058
packaging: mark version as bugfix dev version
This avoid confusion when installing non tagged version.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 22:40:41 +0200] rev 3057
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 21:12:14 +0200] rev 3056
Added tag 6.7.1 for changeset 430ad68292d7
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 09 Oct 2017 19:39:13 +0530] rev 3055
obslog: remove the word "yet" from "No patch available yet"
"yet" was a bit confusing as it let me think that patch is currently not
available but can be available sometimes later. This is true for cases when it
says "context not local" but we have more messages like "no successors", "too
many successors", "changesets rebased" where we can't have a patch.
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 09 Oct 2017 19:35:32 +0530] rev 3054
obslog: spell out successor completely
If the successor is not known locally, obslog says `succ is unknown locally`
which is not a good message. This patch makes sure succ is spelled out
completely as successor.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 16:28:50 +0200] rev 3053
readme: update readme with latest fix
(also more the stack one in the right location).
Boris Feld <boris.feld@octobus.net> [Tue, 10 Oct 2017 15:52:55 +0200] rev 3052
obsfate: make the user list more readable
Separate each user in the obsfate user list by a space for readability.
Boris Feld <boris.feld@octobus.net> [Tue, 10 Oct 2017 15:28:03 +0200] rev 3051
obsfate: fix user filtering in obsfate-printer
Only hide current user only if it's the only one that create obs-markers.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 16:22:21 +0200] rev 3050
obsfate: add a test with user both current and other
This will help highlight change in the next changesets.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 16:12:44 +0200] rev 3049
obsfate: update test
The obsfate templatekw and the obsfateprinter behavior was different when
displaying or not the current user in obsfate users.
Update the test to makes the behavior fix more visible.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 16:06:22 +0200] rev 3048
packaging: prepare version 6.7.1
The are an important fix on evolve and another important fix for topic
performance, let us make a release.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 16:02:44 +0200] rev 3047
readme: add changelog for topic 0.3.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 16:02:23 +0200] rev 3046
add mention of the topic 0.3.0 version
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 16:02:04 +0200] rev 3045
readme: fix evolve 6.7.1 entry
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 15:47:11 +0200] rev 3044
topic: reorder revset for faster evaluation
When running the revset on unfiltered repository, the mutable set can get huge.
So removing the obsolete changeset first provide a large speedup. This resolve
the performance regression we were seeing since the 6.7.0 release.
Aurélien Campéas [Mon, 09 Oct 2017 17:42:30 +0200] rev 3043
topics: use stack rather than stackdata when one only wants the changeset count
There might be a significant performance impact.
Might resolve #309.
Boris Feld <boris.feld@octobus.net> [Thu, 28 Sep 2017 21:35:29 +0100] rev 3042
log: update obsfate output order
Always display successors after the verb. So instead of "rewritten by boris as
X", display "rewritten as X by boris".
07b9fcf8b6d3 did update template-based obsfate but forget to update
obsfatelineprinter.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 06 Oct 2017 10:28:09 +0200] rev 3041
test: remove bashism in test-topic-change.t
The test was broken on various machine using shell not supporting the
`{start..end}` construct.
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 05 Oct 2017 19:35:58 +0530] rev 3040
topics: handle phase correctly while changing topics
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 05 Oct 2017 19:30:22 +0530] rev 3039
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 05 Oct 2017 19:20:20 +0530] rev 3038
topics: use scmutil.cleanupnodes to create markers while changing topics
Earlier if we change topics on changesets with bookmark, the bookmark is not
moved to the new changeset as we didn't add that logic and we were creating
obsmarkers directly. This patch calls scmutil.cleanupnodes to create obsmarkes
which also handles the bookmark movement.
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 05 Oct 2017 18:13:52 +0530] rev 3037
tests: add a new test for testing changing or clearing topics
test-topic.t is getting bigger and bigger. This patch introduces a new test
which includes test for clearing and changing topics.
Since the tests are moved to a new file, this patch, removes those tests from
test-topic.t also.
Matt DeVore <matvore@google.com> [Tue, 03 Oct 2017 11:14:29 -0700] rev 3036
obscache: do not check of argument count of wrapped function
After talking with the original author of this check, it appears that it never
worked properly, since _readmarkers was always wrapped with @util.nogc.
Anton Shestakov <av6@dwimlabs.net> [Tue, 03 Oct 2017 22:51:00 +0800] rev 3035
legacy: rename lookup_errors to not be in all caps (flake8 warning)
flake8 has a plugin, pep8-naming, which is not installed by default, but is
used if available, no extra config required. This plugin checks names of
variables, classes, functions and so on against PEP-8, and it complained about
this variable:
N806 variable in function should be lowercase
Since this isn't a module-level constant, but just a helper variable used only
in one function, it's fine to just rename it.
With this error gone, flake8 output (used plugins: mccabe, naming, pycodestyle,
pyflakes) is totally clean.
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 01 Oct 2017 15:32:29 +0530] rev 3034
randomname: fix the header of the file
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 01 Oct 2017 15:22:37 +0530] rev 3033
topics: move README-topic as hgext3rd/topic/README
Before improving the docs about topics, lets move them into the topics folder.
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 01 Oct 2017 11:23:21 +0100] rev 3032
README: move CHANGELOG to a new file
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 01 Oct 2017 11:18:36 +0100] rev 3031
test: small cleanup in test-topic-mode.t
remove the mention of "new" (this won't be new soon) and use the official config
name.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 01 Oct 2017 11:13:38 +0100] rev 3030
test: add support for random-all topic mode
The 'random' mode no longer generate a random topic for merge.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 01 Oct 2017 10:44:23 +0100] rev 3029
test: rename test-topicmode to test-topic-mode
This is easier to read.
Boris Feld <boris.feld@octobus.net> [Sun, 01 Oct 2017 00:35:28 +0100] rev 3028
topicmode: add 'random' topic mode
That mode will generate a random topic name when the user is about to commit an
untopiced changeset.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 01 Oct 2017 09:10:48 +0100] rev 3027
topic: update the topic-mode hint
The hint is now shorter and reference the documentation. That should provide
more concise output with more details for user who seeks it.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 01 Oct 2017 09:05:42 +0100] rev 3026
topic: rename the 'topic-mode' help subtopic
This will help making reference to it in warning.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 01 Oct 2017 00:44:41 +0100] rev 3025
topic: add a 'enforce-all' mode
The mode abort for all commit without a topic, even merges.
Boris Feld <boris.feld@octobus.net> [Sat, 30 Sep 2017 23:18:29 +0100] rev 3024
topicmode: 'enforce' topic mode, no longer warn about untopiced merge
merging a topic back in a branch is common case, it seems sensible to not pester
the user about it.
Boris Feld <boris.feld@octobus.net> [Sat, 30 Sep 2017 23:00:21 +0100] rev 3023
topicmode: add new warning topicmode
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 01 Oct 2017 00:14:19 +0100] rev 3022
topic: add documentation for the 'topic-mode' option
This should help people to discover it.
Boris Feld <boris.feld@octobus.net> [Sat, 30 Sep 2017 22:42:52 +0100] rev 3021
test: update tests to use topic-mode enforce
Boris Feld <boris.feld@octobus.net> [Sat, 30 Sep 2017 22:24:24 +0100] rev 3020
topic: migrate experimental.enforce-topic to experimental.topic-mode
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 30 Sep 2017 12:35:49 +0100] rev 3019
test: adapt to output change from 10e162bb9bf5
The changeset 10e162bb9bf5 in code extend the list of capabilities to include
"phases=['heads']" this has a minor impact on test output
CORE-TEST-OUTPUT-UPDATE: 10e162bb9bf5
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 30 Sep 2017 11:38:08 +0100] rev 3018
merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 30 Sep 2017 11:11:04 +0100] rev 3017
stack: handle basic case of splitting with crash
hg stack used to crash horribly whenever a split was encountered. This is no
longer the case.
If the result of the split (or there successors) produce a sensible linear
result with on final head, we can just assume that head is the evolution
destination.
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 25 Sep 2017 02:29:41 +0530] rev 3016
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 25 Sep 2017 02:23:36 +0530] rev 3015
tests: update test output with commit ecc96506c49d in core
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 16:30:43 +0200] rev 3014
packaging: update version to match development version
This helps avoid confusion when installing from source.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 16:26:30 +0200] rev 3013
packaging: merge stable back into default
6.7.0 has been released.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 16:24:44 +0200] rev 3012
packaging: mark stable branch as dev bugfix version
This help avoiding confusion when installing evolve from sources.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 16:18:24 +0200] rev 3011
Added tag 6.7.0 for changeset 3a4f75c6619c
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 16:18:11 +0200] rev 3010
packaging: update debian changelog
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 16:15:56 +0200] rev 3009
packaging: update version number and testedwith version
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 01:44:29 +0200] rev 3008
packaging: mark version 6.7.0 in the source
Version ready to be released.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 01:41:46 +0200] rev 3007
packaging: update compatible version
This has been tested with 4.3 too.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 01:37:21 +0200] rev 3006
readme: prepare readme
The feature that only work with 4.3+ are flagged as such.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 01:27:40 +0200] rev 3005
compat-test: merge future 6.7.0 into 3.8 compat branch
(merging through 3.9 compat branch)
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 01:22:58 +0200] rev 3004
compat-test: merge future 6.7.0 into 3.9 compat branch
(merging through 4.0 compat branch)
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 01:18:39 +0200] rev 3003
compat-test: merge future 6.7.0 into 4.0 compat branch
(merging through 4.1 compat branch)
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 01:12:47 +0200] rev 3002
compat-test: merge future 6.7.0 into 4.1 compat branch
(mergeing through 4.2 compat branch)
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 01:07:22 +0200] rev 3001
compat-test: merge future 6.7.0 into 4.2 compat branch
Couple feature to disable and other various test impact.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 00:54:28 +0200] rev 3000
branching: merge future 6.7.0 in the stable branch
We are getting ready to release a new version.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 00:00:22 +0200] rev 2999
topic: fix topic message for mercurial 4.2 and below
Pulkit Goyal <7895pulkit@gmail.com> [Tue, 26 Sep 2017 19:05:04 +0530] rev 2998
README: mention that --age also shows the user
While I was here, I fixed the a spelling mistake in previous commit.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 24 Sep 2017 11:30:14 +0200] rev 2997
topic: try to clarify the "branch" part in stack
The idea is to clarify the meaning of "behind" with using the "target" word.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 26 Sep 2017 13:01:21 +0200] rev 2996
readme: mention the message update
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 25 Sep 2017 03:30:56 +0530] rev 2995
topics: make sure user don't pass both the age option and a topic name
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 25 Sep 2017 03:29:45 +0530] rev 2994
topics: spell out topics completely in help
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 25 Sep 2017 03:23:06 +0530] rev 2993
topics: show the user who last touched the topic in --age
This patch adds support for showing the user who last touched the topic in the
age option to `hg topics`.
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 25 Sep 2017 03:06:37 +0530] rev 2992
topics: initialize variable with default value instead of assigning later
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 25 Sep 2017 03:04:42 +0530] rev 2991
topics: improve the function signature by accepting arguments as **opts
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 26 Sep 2017 12:58:10 +0200] rev 2990
topic: merge with strip related fix
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 26 Sep 2017 12:56:03 +0200] rev 2989
topic: skip topic movement message during strip
During strip transaction the repository is not in a great state. It is simpler
to skip the computation entirely.
Aurélien Campéas [Tue, 26 Sep 2017 12:39:11 +0200] rev 2988
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas [Fri, 22 Sep 2017 18:01:29 +0200] rev 2987
topics/transaction: return immediately if we are in the middle of a transaction
Aurélien Campéas [Fri, 22 Sep 2017 16:41:37 +0200] rev 2986
topics/ui: signal when an operation entails voiding a topic
Typical situations may include:
* publish
* push (to publishing server)
* pull
* fold
Aurélien Campéas [Tue, 26 Sep 2017 12:29:15 +0200] rev 2985
topics/ui: signal when the topics command creates a new (empty) topic
Aurélien Campéas [Tue, 26 Sep 2017 12:27:43 +0200] rev 2984
topics: signal to the end user when a topic has been forgotten
Situation is:
* we're updating outside an empty topic.
* we've cleared topics
Denis Laxalde <denis.laxalde@logilab.fr> [Fri, 22 Sep 2017 13:46:41 +0200] rev 2983
topic: add a --topic option to "outgoing" command
By symmetry with "push" in the previous changeset.
Denis Laxalde <denis.laxalde@logilab.fr> [Fri, 22 Sep 2017 13:43:38 +0200] rev 2982
topic: add a --topic option to "push" command
This is symmetrical with --bookmark or --branch; it selects changesets in
specified topic as revisions to push.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 22 Sep 2017 12:48:57 +0200] rev 2981
test-compat: adapt to core change in b90bd9a98c8b
Blackbox just got a little more chatty.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 21 Sep 2017 19:34:37 +0200] rev 2980
readme: update about obslog update and documentation refresh
Aurélien Campéas [Thu, 21 Sep 2017 17:08:00 +0200] rev 2979
topic/tuto: be more precise in the top introduction about the publishing server
Indeed there is a chapter with a non-publishing one.
Aurélien Campéas [Thu, 21 Sep 2017 17:06:16 +0200] rev 2978
topics/tuto: prefer rebase over merge and remove the weird merge attempt
Aurélien Campéas [Thu, 21 Sep 2017 17:04:24 +0200] rev 2977
topics/tuto: typo fix and s/multiple/two
Aurélien Campéas [Thu, 21 Sep 2017 17:00:04 +0200] rev 2976
topics/tuto: be more complete over the de-orphaning action within a topic
Aurélien Campéas [Thu, 21 Sep 2017 16:52:05 +0200] rev 2975
topics/tuto: try to be more precise on why `hg log` output is hairy
Aurélien Campéas [Thu, 21 Sep 2017 16:42:45 +0200] rev 2974
topics/tuto: attempt to have a slightly more clear wording
Aurélien Campéas [Thu, 21 Sep 2017 16:41:42 +0200] rev 2973
topics/tuto: try to be more clear when explaining previous/next
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 21 Sep 2017 18:35:22 +0200] rev 2972
test: fix the enforce-topic configuration
There have been an error while updating this patch.
Aurélien Campéas [Thu, 21 Sep 2017 16:25:58 +0200] rev 2971
topics/tuto: clarification on the scope of the tutorial
Also we try to remain the reader that push -> publish.
Aurélien Campéas [Thu, 21 Sep 2017 15:27:20 +0200] rev 2970
topics/tuto: slightly more verbose explanation of what we are seeing
Aurélien Campéas [Thu, 21 Sep 2017 15:15:24 +0200] rev 2969
topics/tuto: spell out `hg topics` entirely
Aurélien Campéas [Thu, 21 Sep 2017 15:09:14 +0200] rev 2968
topics/tuto: activate the `enforce-topic` option
This really help users to stick within topics.
Aurélien Campéas [Thu, 21 Sep 2017 14:05:27 +0200] rev 2967
topics/tuto: highlight the behaviour on publish + update
And the fact that empty topics vanish if we update out of them.
Aurélien Campéas [Thu, 21 Sep 2017 13:04:19 +0200] rev 2966
topics/tuto: fix title underline type introduced earlier
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 21 Sep 2017 17:44:58 +0200] rev 2965
doc: update graph with latest version of doc-graph
Philippe Pepiot <phil@philpep.org> [Thu, 21 Sep 2017 17:13:46 +0200] rev 2964
flake8 docs/conf.py
Philippe Pepiot <phil@philpep.org> [Thu, 21 Sep 2017 17:13:09 +0200] rev 2963
doc: disable generating command documentation when mercurial is not up-to-date
Philippe Pepiot <phil@philpep.org> [Fri, 01 Sep 2017 08:32:17 +0200] rev 2962
doc: add documentation for evolve commands
By using a sphinx directive that call `hg help`.
Philippe Pepiot <phil@philpep.org> [Thu, 21 Sep 2017 16:11:59 +0200] rev 2961
doc: clarify undocumented features
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 21 Sep 2017 16:55:17 +0200] rev 2960
test2rst: ignore the #if/#endif line in the output
They are not useful for the rest.
Boris Feld <boris.feld@octobus.net> [Thu, 21 Sep 2017 10:45:27 +0200] rev 2959
doc: integrate graphviz graphs in tutorials
Use the mercurial-docgraph extension (https://pypi.python.org/pypi/hg-
docgraph/) in tutorials in order to have some dot graphs in the tutorials .t
files.
Then generate the doc as usual, the sphinx-graphviz extension (http://www
.sphinx-doc.org/en/stable/ext/graphviz.html) has been added and it should
handle the generation of the graphs. Please be aware that you need the dot
binary installed in your system. Please refer to the extension documentation
for more configuration.
Boris Feld <boris.feld@octobus.net> [Thu, 21 Sep 2017 10:45:06 +0200] rev 2958
doc: add a special flag for content to ignore in the rst
The testfile to rest document convertion has a new way to ignore some commands.
Alain Leufroy [Fri, 08 Sep 2017 12:10:21 +0200] rev 2957
obslog: simplify formatter keys
The formatter field keys are all prefixed with
`debugobshistory.'. This is annoyingly useless as they are already in
the `debughistory` topic.
This patch simplify these keys. For examle, on this repository `hg obslog -Tdebug -r 31cbace4c0f1` :
```
debugobshistory = [
{
'node':'31cbace4c0f1',
'shortdescription':'topics: make sure we have some restrictions on topic names',
'rev':2904,
'markers':[
]
},
{
'node':'d439a6087434',
'markers':[
{
'date':(1504176329.83902,
-7200 ),
'verb':'rewritten',
'succnodes':[
'31cbace4c0f1'
],
'effect':[
'parent'
],
'user':'Pierre-Yves David <pierre-yves.david@octobus.net>'
}
]
},
{
'node':'1e1f651704d4',
'markers':[
{
'date':(1504175088.811924,
-7200 ),
'verb':'rewritten',
'succnodes':[
'd439a6087434'
],
'effect':[
'parent'
],
'user':'Pierre-Yves David <pierre-yves.david@octobus.net>'
}
]
},
{
'node':'eb6495cf6cb1',
'markers':[
{
'date':(1504015275.001643,
-19800 ),
'verb':'rewritten',
'succnodes':[
'1e1f651704d4'
],
'effect':[
'parent',
'content'
],
'user':'Pulkit Goyal <7895pulkit@gmail.com>'
}
]
},
{
'node':'761e446e0112',
'markers':[
{
'date':(1504015201.780276,
-19800 ),
'verb':'rewritten',
'succnodes':[
'eb6495cf6cb1'
],
'effect':[
'content'
],
'user':'Pulkit Goyal <7895pulkit@gmail.com>'
}
]
},
{
'node':'531a626950bd',
'markers':[
{
'date':(1504015017.897054,
-19800 ),
'verb':'rewritten',
'succnodes':[
'761e446e0112'
],
'effect':[
'meta',
'parent',
'content'
],
'user':'Pulkit Goyal <7895pulkit@gmail.com>'
}
]
},
{
'node':'c2f9ba7329ea',
'markers':[
{
'date':(1504014136.876537,
-19800 ),
'verb':'rewritten',
'succnodes':[
'531a626950bd'
],
'effect':[
'meta'
],
'user':'Pulkit Goyal <7895pulkit@gmail.com>'
}
]
},
]
```
We now able to ask `hg obslog -r 78debdfb3e4d -T '{label("log.summary", shortdescription)}\n{if(markers, markers % " {date|age} {user|person}\n")}'`
```
doc: simplify the reference to in-core features
9 days ago Pierre-Yves David
9 days ago Pierre-Yves David
9 days ago Pierre-Yves David
9 days ago Pierre-Yves David
9 days ago Philippe Pepiot
9 days ago Philippe Pepiot
```
Alain Leufroy [Fri, 08 Sep 2017 12:03:23 +0200] rev 2956
obslog: fix `--template` with `--graph` option
The `template` option was not propagated.
Alain Leufroy [Fri, 08 Sep 2017 12:24:22 +0200] rev 2955
obslog: uniformize `_debugobshistoryrevs` and `_debugobshistorygraph` arguments
`_debugobshistoryrevs` and `_debugobshistorygraph` perform quite the
same action, the latter simply add graph support. Consequently, it
looks better for them to have the same argument list.
Alain Leufroy [Sun, 17 Sep 2017 12:45:28 +0200] rev 2954
obslog: fix --patch with --no-graph options
The repo given to _debughistorydisplaymarker which computes the diff
was filtered when graph mode is disabled.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 21 Sep 2017 15:18:28 +0200] rev 2953
commands: upgrade pdiff and pstatus to full commands
Doing so make them appears in the documentation, improving their
discoverability.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 21 Sep 2017 14:50:55 +0200] rev 2952
gup/gdown: properly mark these commands as deprecated
They are no longer displayed in the documentation.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 21 Sep 2017 10:39:49 +0200] rev 2951
Backed out changeset 1b4c92621e23
This got published by mistake.
Boris Feld <boris.feld@octobus.net> [Tue, 29 Aug 2017 16:42:40 +0200] rev 2950
doc: integrate graphviz graphs in tutorials
Use the mercurial-graphviz extension
(https://bitbucket.org/octobus/mercurial_graphviz) in tutorials in order to
have some dot graphs in the tutorials .t files.
In order to run the tests, export the GRAPHVIZ_EXTENSION variable which points
to your copy of the extension. Please be aware that pygraphviz should be
installed in your environment.
That should be sufficient for generating dot graphs in text format.
Then generate the doc as usual, the sphinx-graphviz extension (http://www
.sphinx-doc.org/en/stable/ext/graphviz.html) has been added and it should
handle the generation of the graphs. Please be aware that you need the dot
binary installed in your system. Please refer to the extension documentation
for more configuration.
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 19 Sep 2017 12:52:22 +0200] rev 2949
amend: lift the --interactive constraint on `--extract`
The uncommit logic now supports interactive selection.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 18 Sep 2017 04:31:59 +0200] rev 2948
readme: mention the topic output cleanup
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 18 Sep 2017 04:30:57 +0200] rev 2947
readme: mention the new --interactive mode for uncommit
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 18 Sep 2017 04:28:12 +0200] rev 2946
uncommit: minor comment cleanup in the test
Fix some of the sectionning and fix on comments.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 18 Sep 2017 04:20:36 +0200] rev 2945
uncommit: small cleanup of the interactive test setup
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 11 Sep 2017 18:12:06 +0200] rev 2944
tests: add tests for interactively uncommitting by mentioning files
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 11 Sep 2017 17:41:53 +0200] rev 2943
uncommit: fix the dirstate handling in `uncommit -i`
This patch fixes the dirstate handling after `hg uncommit --interactive`. This
patch is bit verbose about the logic and efforts are not put to plug the logic
into existing logic as it's easier to understand like this. Plugging this into
non-interactive logic deserves a separate patch.
Pulkit Goyal <7895pulkit@gmail.com> [Tue, 05 Sep 2017 14:35:00 +0530] rev 2942
uncommit: pre-indent a block in if-True
The block will be moved in if-else in next patch.
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 14 Sep 2017 17:23:24 +0530] rev 2941
uncommit: add an interactive option to uncommit
This patchs adds an interactive flag to uncommit command which lets you choose
hunks interactively. The implementation is as follows:
1) prompt user to select hunks to uncommit interactively
2) make a temporary commit of the hunks user selected
3) calculate the diff of temporary commit and changeset to be uncommitted
4) commit that diff which results in the changeset which should be there after
uncommiting
5) create obsmarkers as required, phases and bookmarks handling
6) reroute the working directory
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 04 Sep 2017 15:54:39 +0200] rev 2940
uncommit: pre-indent a block in if-True for the next patch
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 17 Sep 2017 19:59:25 +0200] rev 2939
topic: provide more information when behind count cannot be computed
The behind count has been confusing for various user and the associated error
message is even worth. We try to clarify it to see if that helps.
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 15 Sep 2017 23:25:38 +0530] rev 2938
topic: show the t0 even if topic is not yet touched
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 15 Sep 2017 23:13:05 +0530] rev 2937
topics: improve the description if topic is not touched
Instead of an empty stack in `hg stack` when topic does not contain any
changeset, we show `not yet touched`.
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 15 Sep 2017 22:48:55 +0530] rev 2936
topics: show working directory branch when topic is empty
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 01 Sep 2017 15:09:59 +0530] rev 2935
topics: add tests for cases when a topic is empty
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 15 Sep 2017 16:28:59 +0200] rev 2934
readme: mention compatibility with future 4.4
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 15 Sep 2017 17:20:42 +0200] rev 2933
topic: update the message used with --age for empty topic
This clarify things when a topic got emptied by publishing.
Ryan McElroy <rmcelroy@fb.com> [Wed, 30 Aug 2017 17:32:32 +0200] rev 2932
sharing: edit pass
Ryan McElroy <rmcelroy@fb.com> [Wed, 30 Aug 2017 17:32:32 +0200] rev 2931
user-guide: edit pass
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 13 Sep 2017 21:41:57 +0200] rev 2930
topic: stabilise the output of --age when date ties
We just needed to introduce sort to stabilize the output order.
Boris Feld <boris.feld@octobus.net> [Fri, 15 Sep 2017 15:48:18 +0200] rev 2929
tests: update after removing of redundant amend commit
Following e8a7c1a0565a, temporary amend commits has been removed impacting all
revision numbers in tests including amend operations.
Update tests case to use description or hashes when possible and update
revisions number when not.
Boris Feld <boris.feld@octobus.net> [Wed, 13 Sep 2017 15:13:51 +0200] rev 2928
topic: setup 'topic' value for working ctx
The way amend work in core change in e8a7c1a0565a. The intermediate commit
disappear and we can no longer rely on it to carry the topic value to amend. To
fix this, we ensure the current topic value can be retrieved through the
`workingctx.extra()` value. Since there is no way to carry a "missing" key
information in a way that survives and "dict.update" call. We also has to
introduce hacking behavior about a special empty value for topic.
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 14 Sep 2017 20:33:03 +0200] rev 2927
tests: abstract version number for test-topic-stack.t
Using explicite version number always bring trouble, this is why we have unique
description that can select changesets.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 07 Aug 2017 23:22:41 +0900] rev 2926
evolve: use registrar.templatekeyword to register template keyword functions
Now, using registrar.templatekeyword of Mercurial directly in evolve
extension should be safe enough. because it has been available since
Mercurial 3.8, and minimum Mercurial version for evolve extension is
3.8, too.
BTW, this also fixes an issue of "hg help templates" output that
template keywords "precursors" and "successors" are not displayed as
same as others, because they do not have ":KEYWORD:" prefix in their
docstring.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 10 Sep 2017 20:06:52 +0900] rev 2925
evolve: use registrar.revsetpredicate to register revset predicate functions
Now, using registrar.revsetpredicate of Mercurial directly in evolve
extension should be safe enough. because it has been available since
Mercurial 3.8, and minimum Mercurial version for evolve extension is
3.8, too.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 07 Aug 2017 23:17:13 +0900] rev 2924
topic: use registrar.revsetpredicate to register revset predicate functions
Now, using registrar.revsetpredicate of Mercurial directly in topic
extension should be safe enough. because it has been available since
Mercurial 3.8, and minimum Mercurial version for topic extension is
4.0.
This patch also removes modsetup() in topic/revset.py, because it is
useless.
BTW, this patch fixes an issue of "hg help revsets" output that custom
revset predicates are not displayed as same as others, because they
are not "inline literal" in reST syntax (``NAME``).
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 07 Aug 2017 23:24:57 +0900] rev 2923
doc: make paragraphs before example code end with "::" for reST syntax
This prevents lines in an example code from being treated as a part of
normal paragraph. For issue example, lines are folded into one
paragraph.