Commits

Show all
Author Commit Message Labels Comments Date
Pierre-Yves David
update readme
Pierre-Yves David
evolve: update cmddebugrecordpruneparents to the new markers creation API The parents information are now first class citizen. (caught by laurent using pylint)
Pierre-Yves David
evolve: drop useless return This return statement is never reached. This a actually a good new because its variable was undefined. We remove it. (caught by laurent using pylint)
Laurent Charignon
evolve: add missing import (caught by pylint)
Laurent Charignon
evolve: improve transaction related code to use the lock module Refactored some of the places where we are using locking in evolve to use the lock module and write less code. This should also fix a couple of bug where tr could be None at release time.
Laurent Charignon
evolve: remove unused variables As suggested by pyflakes, remove 5 unused variables in the evolve module.
Laurent Charignon
evolve: remove unused code in _evolveany remove some code that was doing nothing useful in _evolveany.
Laurent Charignon
evove: remove unused imports Three imports where unused in the evolve module.
Pierre-Yves David
tests: ensure we keep capturing output In 3.4, output capture with bundle2 is disabled by default on local push.
Laurent Charignon
inhibit: updating to a obsolete commit prints warning message We move the inhibition marker in the same wlock than the update operation, this clears the warning message. To make it work we display the warning message on lock release in evolve.
Branches
default
Pierre-Yves David
evolve: stop conditional wrapping of _checkinvalidmarkers We support down to Mercurial 3.3, all such version have this function.
Branches
default
Pierre-Yves David
evolve: stop conditional wrapping of _getbundleobsmarkerpart We support down to Mercurial 3.3, all such version have this function.
Branches
default
Pierre-Yves David
evolve: stop conditional wrapping of _pushdiscoveryobsmarkers We support down to Mercurial 3.3, all such version have this function.
Branches
default
Pierre-Yves David
merge with stable
Branches
default
Pierre-Yves David
test-inhibit: test bookmark -D without prune enabled The --config option were dropped for lack of documentation.
Branches
default
Laurent Charignon
inhibit: fix devel warning _inhibitmarkers was taking a transaction without the proper lock. Adding the lock removes the warnings.
Branches
default
Laurent Charignon
evolve: add -i flag to amend command The -i flag was missing because it is not a global flag of the commit command. We can't make it a global flag yet as it is used in many places where it would not be appropriate so we just add it for this occurrence. Also, we only want to add it when commit supports it (otherwise it wouldn't work with older versions of mercurial)
Pierre-Yves David
prune: prune fix transaction pattern I forgot to amend.
Branches
default
DurhamG
prune: fix pruning w/ bookmarks and inhibit Previously prune would create the obsolesence markers, then try to fix up the bookmarks. With inhibit enabled, the act of closing a transaction for the bookmark step caused it to unhide commits that were trying to be pruned. The fix is to put the whole thing in a transaction.
Branches
default
DurhamG
inhibit: remove book -D dependency on cmdprune Bookmark -D was relying on the prune command to be registered, which isn't the case if we've disabled evolve commands. Instead, let's just hard code the arguments. The real fix would be to abstract away the 'I want to prune commits' functionality in evolve to a reusable function, but this will do for now.
Branches
default
DurhamG
inhibit: wrap repo.commit to inhibit nodes Rebase was failing if you rebased a commit, stripped it, then rebased it again. This is because the node was still hidden and we needed repo.commit to uninhibit it.
Branches
default
Pierre-Yves David
merge with stable
Branches
default
Pierre-Yves David
tests: ensure we keep capturing output In 3.4, output capture with bundle2 is disabled by default on local push.
Branches
default
Pierre-Yves David
update readme Mentions greg ward work in documentation.
Greg Ward
docs: format concepts guide better, with literal blocks
Greg Ward
docs: fix slightly unconventional .rst markup
Greg Ward
docs: remove unused/obsolete figures
Greg Ward
docs: remove obsolete documentation evolve-collaboration.rst replaced by sharing.rst instability.rst introduction to the concept for Mercurial developers -- no longer needed since most are now convinced obs-concept.rst largely replaced by the user guide obs-implementation.rst more for Mercurial developers; the source code is probably more accurate and up-to-date qsync.rst the extension this referred to no longer ex…
Greg Ward
docs: add a table of contents This silences many sphinx warnings about documents not included in any toctree. Still need to delete obsolete .rst files to silence the rest of the warnings.
Pierre-Yves David
merge with stable
Branches
default
  1. Prev
  2. Next