1. Greg Ward
  2. mutable-history
  3. Branches

Branches

default

View source
default
Author Commit Message Date Builds
1 commit behind stable.
Greg Ward
docs: cover 'touch' command
Greg Ward
docs: explain that obsolete is not hidden
Greg Ward
docs: explain --hidden option Also move the discussion of revision numbers up, and splice the explanation of --hidden into it.
Greg Ward
docs: tweak wording, punctuation for better readability
Greg Ward
docs: flesh out unfinished bits in the intro page
Greg Ward
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward
docs (sharing): more scattered wording tweaks
Greg Ward
docs: sharing guide: clarify end-game of "Example 2" - push to dev-repo, rather than pulling into it (consistent with how we work the multiple developer scenario later) - explicitly demonstrate that public changesets are immutable
Greg Ward
docs: minor tweaks to sharing guide (suggested by timeless)
Greg Ward
docs: add code review scenario to sharing guide The idea is to demonstrate a simpler multiple-developer situation that does not involve getting into trouble. The final scenario illustrates Alice and Bob getting into trouble with bumped and divergent changesets by amending each other's history. The required tests and text are all written, but will need to be heavily revised because of the inserted scenario.
Greg Ward
docs: add a bit more hierarchy to the sharing guide
Greg Ward
docs: update sharing guide based (mostly) on marmoute's review - don't claim certain scenarios are more/less common, just simple/advanced - mention code review as a multiple-developer scenario (not described in detail yet!) - suggest "hg config --edit --local" instead of "cat >> .hg/hgrc" - use -q less often (and show resulting output) - edit some section headers to be consistent with user guide (example numbers; "amend" instead of "amending") (These a…
Pierre-Yves David
merge with stable
Pierre-Yves David
merge with stable
Pierre-Yves David
inhibit: explicitly test for None It is always better to check for None explicitly.
DurhamG
setup: allow including inhibit in the build Adds the INCLUDE_INHIBIT environment variable to allow including the inhibit extension in the build.
Laurent Charignon
inhibit: Add -D option to the bookmark command The -D option for bookmark is similar to the -B option for strip. It deletes the bookmark and prunes the changes underneath it that are not reachable.
Laurent Charignon
inhibit: don't leave any obsolete commit visible after closing transaction We add a callback to wrap the transaction closure to identify commits that are obsolete and visible. We inhibit them to prevent the user to see instability in the UI.
Laurent Charignon
evolve: apply prune update before creating obsolescence markers Prune used to compute the destination commit to update to after creating the obsolescence markers. This is a commit to prevent a bug that would occur with the changes in inhibit for transactions (next commit). Indeed, with that change in inhibit, when creating the obsolescence markers in prune, they would get inhibited right away and we wouldn't update to the first non obsolete parent but stay on…
Pierre-Yves David
test-inhibit: check graph after prune We want to ensure prune keep working even with inhibit.
Pierre-Yves David
test-inhibit: drop trailing white space
Laurent Charignon
tests: make tests work on Mac OS wc -m adds spacing before the results, we trim them to make the test pass on Mac OS.
Pierre-Yves David
merge with stable
Laurent Charignon
inhibit: ensure that no obsolete changesets are visible after a bookmark change When creating a bookmark, we could reveal obsolete changesets. We are inhibiting the obsolete changesets resulting from a bookmark change. There are two ways to record bookmark changes to disk and we wrap both.
Laurent Charignon
inhibit: ensure no visible changesets are obsolete after an update When updating to a commit we want to inhibit any obsolete commit affecting the changeset we are updating to. In other words we don't want any visible commit to be obsolete.
Laurent Charignon
inhibit: enable direct access from parsing the revset tree To enable direct access we: - detect explicit hexadical reference to node in the revset tree - add these hashes to the static blockers to make them and their parent visible for the command to run
Pierre-Yves David
evolve: change config option name I forgot to amend...
DurhamG
config: allow disabling commands Now that upstream Mercurial has multiple options for obsolete configuration, we can allow enabling and disabling of evolve commands.
Pierre-Yves David
inhibit: Add some inhibition clearing mechanism We do not want to keep inhibition marker around for ever. So we are removing the one applying on public changeset.
Pierre-Yves David
add a 'inhibit' extension This extension will be used to reduce the scope of evolve in order to make some of its features available to the mass earlier. See extension documentation for details.
Matt Harbison
tests: use 'wget' instead of 'curl' for Windows compatibility The whole test suite now runs without skips, and the only two failures are a bookmark cache issue in test-prune.t, and a local output vs remote output reordering when pushing to ssh. The latter anyway is a core problem.
Matt Harbison
tests: import killdaemons.py from Mercurial 1cfded2fa1a9 This contains updated functionality to kill the server process on Windows, which is needed to run the test-*server.t tests. This version requires the pids to be passed as an argument instead of via $DAEMON_PIDS.
DurhamG
prune: add --keep to not touch the working copy In order to more closely emulate strip, lets add --keep to leave the working copy untouched when we do our prune.
DurhamG
strip: add the option for wrapping the strip command Adds an experimental option for wrapping the existing strip command and replacing its functionality with prune. It currently doesn't handle the --keep case, but an upcoming patch will address that.
DurhamG
wrapcommand: fix wrapping extensions that aren't enabled The extension command wrapping would previously fail if the extension wasn't enabled. Let's just eat that silently.
DurhamG
wrapcommand: allow adding additional arguments to commands This allows eh.wrapcommand to specify additional parameters to be added to the commands being wrapped. This will be useful when wrapping strip in the future.
DurhamG
pushexperiment: remove use of obsolete._enabled pushexperiment.py was using obsolete._enabled but it didn't cause any tests to fail so I didn't see it. Let's go ahead and replace it with the new obsolete.isenabled() api.
DurhamG
oldobsolete: remove use of obsolete._enabled obsolete._enabled is deprecated. Switch to the newer obsolete.isenabled() logic.
DurhamG
server4simple: remove use of obsolete._enabled obsolete._enabled is deprecated, so let's replace it's uses.
DurhamG
config: remove uses of obsolete._enabled Upstream Mercurial will be removing obsolete._enabled soon, so switch all our uses of it to use the new obsolete.isenabled(repo, option) function.
DurhamG
config: enable all obsolete options Upstream Mercurial has moved away from obsolete._enabled as the obsolete flag to a series of options. This patch makes evolve enable all the options automatically if the user hasn't enabled any already. This preserves the existing evolve experience of not having to configure anything.
Pierre-Yves David
merge with stable
Pierre-Yves David
merge stable into default
Pierre-Yves David
merge stable in default