Commits

Show all
Author Commit Message Labels Comments Date
Laurent Charignon
inhibit: add missing locking in wrapper for obsmarker creation The develwarning for transaction without lock rightfully pointed out to this issue. Before this patch we were not locking in the transaction for obsmarker creation and therefore showing the warnings.
Bookmarks
@
André Sintzoff
evolve: fix typo in fold docstring
André Sintzoff
evolve: remove trailing spaces
Laurent Charignon
evolve: dedupe divergents when running evolve --all --any or evolve --rev Before this patch, when running evolve --all --any or evolve --rev with the --divergent flag, we were selecting all of the divergents. After solving the first one, its counterparts would get pruned and potentially hidden which would crash when trying to resolve them. This patch introduces logic to dedupe the divergents to be resolved by keeping only one per group of divergent with the lower revisi…
Laurent Charignon
evolve: remove unused warning message in _solvedivergent Before this patch, we were checking for a case where a divergent changeset could be public and printing a warning in that case. When we compute the divergent set in the obsolete module we explicitely look for not public() changesets. This patch removes this unused warning.
Pierre-Yves David
compat: use svfs instead of sopener The "new" attribute is about 2 years old so let's move on.
Pierre-Yves David
fold: avoid using x:y in the help Suggesting "x:y" is a bad idea because x:y is a very deceptive revset.
Laurent Charignon
evolve: improve the help of the fold command The help of the fold command needed a little rework. This patch makes it a little less verbose and adds an example. It also highlights a little more the importance of the --exact flag.
Pierre-Yves David
Added tag 5.2.0 for changeset 44a9dcb3fefc
Pierre-Yves David
merge with 3.3
Tags
5.2.0
Pierre-Yves David
fix version number
Branches
mercurial-3.3
Pierre-Yves David
fix debian changelog
Branches
mercurial-3.3
Pierre-Yves David
Added tag 5.2.0 for changeset 00026533ff9f
Pierre-Yves David
merge with preparation for version 5.2.0
Pierre-Yves David
prepare version 5.2
Branches
mercurial-3.3
Pierre-Yves David
merge back with 3.3 compat branch
Pierre-Yves David
tests: adapt the test for Mercurial 3.3 Some fix in the obsolete parent directory warning where also necessary.
Branches
mercurial-3.3
Pierre-Yves David
merge with stable Test are updated to run with current mercurial stable (3.4.1)
Pierre-Yves David
next: add a --evolve option When on a topological head, this option will trigger the evolution of a unstable changeset that will result in a children of the current working copy parent. This should ease stacked changesets workflow by allowing to stick to prev and next to move through a stack of diff, evolving part of it on demand when needed. In case of ambiguity, the command will ask the user to choose. We need a better d…
Branches
default
Pierre-Yves David
next: print some message when on a head with some aspiring children Being on a head does not necessary means that this is the end of the road. It is likely that some changesets could be evolve as children. We detect this case and provide a hint.
Branches
default
Pierre-Yves David
next: reword error output We move to a more compact and direct phrasing. I'm not fully happy about it yet, but this is a step forward. The listing of candidate should maybe be moved behind a --verbose flag (and such verbose flag be suggested in the error). G: changed tests/test-prev-next.t
Branches
default
Pierre-Yves David
next: refactor the command code We make the conditional flatter and the return more straight forward. This will make addition of more complex cases more straightforward in future changesets.
Branches
default
Pierre-Yves David
next: add extensive testing to the 'next' command We are going to introduce more complexity to it. We add the full extend of the case we want tested to see how they evolve later.
Branches
default
Pierre-Yves David
readme: add an entry about the obsolete wdir parent hint
Branches
default
Pierre-Yves David
evolve: add a hint when the parent working copy become obsolete This should help people find the right commands to recover from this situation.
Branches
default
Pierre-Yves David
evolve: better error message when command is Ambiguous Having more data help the user.
Branches
default
Laurent Charignon
evolve: mechanism to load some commands selectively This patch introduces a new config option: experimental.evolutioncommands to load evolve's command selectively. It is part of a sequence of patches to make evolve's command respect the value of experimental.evolution. Once these commands are ready and actually respect the flag, they are safe to use and can be enabled with the mechanism developed in this patch.
Branches
default
Laurent Charignon
evolve: clarify code in _singlesuccessor Before this patch we were not very explicit with this while condition in _singlesuccessor. This patch makes it more legible.
Branches
default
Pierre-Yves David
merge with stable
Branches
default
Pierre-Yves David
merge with inactive compat branch
  1. Prev
  2. Next