evolve: Graph

evolve: implement resolution of content-divergence when on differet parents
2018-06-01, by Pulkit Goyal
tests: add tests for resolving content-divergence with parent change
2018-06-01, by Pulkit Goyal
CHANGELOG: add an entry about fixing issue5877
2018-06-06, by Pulkit Goyal
evolve: pop up editor if conflicts occur while merging commit messages
2018-06-06, by Pulkit Goyal
evolve: merge commit messages while resolving content-divergence (issue5877)
2018-06-04, by Pulkit Goyal
evolve: move if-else block under the right block
2018-06-06, by Pulkit Goyal
tests: make sure we don't result in commit messages conflict
2018-06-05, by Pulkit Goyal
tests: don't use mkcommit shell function in test-divergent.t
2018-06-05, by Pulkit Goyal
evolve: remove duplicated documentation
2018-06-06, by Pierre-Yves David
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
2018-06-06, by Pulkit Goyal
evolve: add a help topic `Interrupted-Evolve`
2018-05-23, by Pulkit Goyal
branching: merge with stable
2018-06-05, by Pierre-Yves David
changelog: fix version number error stable
2018-06-05, by Pierre-Yves David
evolve: return the new node formed only as the replacement
2018-05-24, by Pulkit Goyal
tests: add more test of --abort flag for content-divergence resolution
2018-05-24, by Pulkit Goyal
evolve: prompt user for branch selection while resolving content-divergence
2018-06-04, by Pulkit Goyal
evolve: pass the base revision in _completecontentdivergent()
2018-06-05, by Pulkit Goyal
evolve: store the base of content-divergents in evolvestate
2018-06-05, by Pulkit Goyal
evolve: use cmdrewrite.amend() instead of creating a new commit
2018-06-05, by Pulkit Goyal
corecompat: update the tests output to show phase update summary
2018-06-03, by Pulkit Goyal
CHANGELOG: add an entry about issue 5808 being fixed stable
2018-06-03, by Pulkit Goyal
next-prev: replace the error hint to mention about `--merge` flag stable
2018-06-03, by Pulkit Goyal
tests: add tests for conflicts while respecting commands.update.check stable
2018-06-03, by Pulkit Goyal
next: respect `commands.update.check` config option in `hg next` (issue5808) stable
2018-06-03, by Pulkit Goyal
prev: respect `commands.update.check` config option in `hg prev` (issue5808) stable
2018-06-03, by Pulkit Goyal
tests: add test demonstrating issue5808 stable
2018-06-03, by Pulkit Goyal
next: bail out early in `hg next --evolve` if dirty wdir stable
2018-06-03, by Pulkit Goyal
tests: add test of `hg next --evolve` with dirty working directory stable
2018-06-03, by Pulkit Goyal
CHANGELOG: add an entry about fixing issue5897 stable
2018-06-03, by Pulkit Goyal
evolve: fix `hg abort` when hg next --evolve leads to conflicts (issue5897) stable
2018-05-27, by Pulkit Goyal
tests: add a test demonstrating issue5897 stable
2018-05-30, by Pulkit Goyal
evolve: add an `--update` flag to `hg evolve` command
2018-05-24, by Pulkit Goyal
tests: add tests for testing --abort while content-divergence resolution
2018-05-24, by Pulkit Goyal
evolve: fix storage of replacements and temprevs node in evolvestate
2018-05-24, by Pulkit Goyal
tests: add more tests related to aborting while resolving phase-divergence
2018-05-24, by Pulkit Goyal
topic: suggest to clear a topic that becomes empty
2018-05-23, by Denis Laxalde
topic: display a hint pointing at help when a topic becomes non-empty
2018-05-23, by Denis Laxalde
branching: merge with compat fix on default
2018-05-24, by Pierre-Yves David
evolve: add compat for repair.stripbmrevset which is moved to scmutil stable
2018-05-24, by Pulkit Goyal
evolve: update the readme with more information about contribution stable
2018-05-23, by Pierre-Yves David
topic: dedent items about publishing behavior in docstring stable
2018-05-23, by Denis Laxalde
topic: use preformatted block for config snippets documentation stable
2018-05-23, by Denis Laxalde
tests: add a test for "hg help -e topic" stable
2018-05-23, by Denis Laxalde
branching: merge with stable
2018-05-23, by Pierre-Yves David
content-div: add test showing `--stop` works during interrupted resolution
2018-05-22, by Pulkit Goyal
evolve: create new commit while resolving content-divergence
2018-04-23, by Pulkit Goyal
content-divergence: store the resolved revs in evolvestate['replacements']
2018-05-22, by Pulkit Goyal
utility: use ui.interactive() instead of checking config value
2018-05-22, by Pulkit Goyal
evolve: make `--abort` strip the temporary revs created during resolution
2018-05-23, by Pulkit Goyal
evolve: store a list of temprevs in evolvestate
2018-05-23, by Pulkit Goyal
evolve: check for None before adding in set of revisions to strip
2018-05-23, by Pulkit Goyal
evolve: return the new replacement node to be stored in evolvestate
2018-05-23, by Pulkit Goyal
evolve: don't make values of replacements dict lists
2018-05-23, by Pulkit Goyal
tests: add a test file `--abort` flag while resolving phase-divergence
2018-05-23, by Pulkit Goyal
evolve: pass revisions as strings to commands.*() stable
2018-05-15, by Martin von Zweigbergk
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
2018-05-23, by Pulkit Goyal
branching: merge with branch for stable
2018-05-21, by Pierre-Yves David
compat: update obshashrange test output
2018-05-21, by Boris Feld
test: update to new outputs
2018-05-21, by Boris Feld
compat: fix obslog with Mercurial 4.6+
2018-05-21, by Boris Feld
debian: add line to clean-docs target to delete additional docs file stable
2018-05-19, by Faheem Mitha
amend: use context manager for locks (issue5887) stable
2018-05-14, by Martin von Zweigbergk
evolve: point to '--abort' in verbose status message stable
2018-05-10, by Martin von Zweigbergk
evolvecmd: add comments and new lines in content-divergence handling logic
2018-04-22, by Pulkit Goyal
evolve: show cset hash in "merging conetnt-divergent changeset"
2018-04-29, by Pulkit Goyal
evolve: show cset hash in "update to local conflict" message
2018-04-29, by Pulkit Goyal
evolve: use hg.updaterepo() instead of hg.update() to hide stats
2018-04-29, by Pulkit Goyal
evolve: fix the conflicts error message during content-divergence resolution
2018-04-29, by Pulkit Goyal
evolve: add logic to continue interrupted content-divergence resolution
2018-04-29, by Pulkit Goyal
evolve: store the evolvestate file when encountering conflicts
2018-04-29, by Pulkit Goyal
evolve: take out logic to complete phase-divergence in separate fn
2018-04-29, by Pulkit Goyal
evolve: store divergent nodes in evolvestate when resolving content-divergence
2018-04-29, by Pulkit Goyal
branching: merge stable into default
2018-05-02, by Pierre-Yves David
tests: add test showing `hg evolve --stop` works fine with phase-divergence stable
2018-04-28, by Pulkit Goyal
tests: rename the test file to add 'orphan' in the name stable
2018-04-28, by Pulkit Goyal
tests: test that `hg obslog wdir()` aborts with a useful message stable
2018-04-27, by Anton Shestakov
obshistory: make obslog work when a commit doesn't have any description stable
2018-04-27, by Anton Shestakov
obshistory: use a more appropriate type for obslog entries stable
2018-04-27, by Anton Shestakov
packaging: mark as development version
2018-04-25, by Pierre-Yves David
branching: merge with latest release
2018-04-25, by Pierre-Yves David
packaking: mark as development version stable
2018-04-25, by Pierre-Yves David
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
2018-04-25, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2018-04-25, by Pierre-Yves David
test-compat: merge stable into mercurial-4.5 mercurial-4.5
2018-04-25, by Pierre-Yves David
Added tag 8.0.0 for changeset 116cdd8c102a stable
2018-04-25, by Pierre-Yves David
packaging: update version number stable 8.0.0
2018-04-25, by Pierre-Yves David
packagin: update `tested-with` statement stable
2018-04-25, by Pierre-Yves David
changelog: mention 4.6 compatibility stable
2018-04-25, by Pierre-Yves David
Changelog: pre-version gardening stable
2018-04-25, by Pierre-Yves David
testcompat: update output for Mercurial 4.3 mercurial-4.3
2018-04-25, by Pierre-Yves David
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
2018-04-23, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2018-04-23, by Pierre-Yves David
testcompat: revert output change from new capabilities mercurial-4.5
2018-04-24, by Pierre-Yves David
testcompat: revert output change from 54a469cd5b26 mercurial-4.5
2018-04-24, by Pierre-Yves David
testcompat: revert output change from 1de6ba0ac6d7 mercurial-4.5
2018-04-24, by Pierre-Yves David
testcompat: merge stable into mercurial-4.5 mercurial-4.5
2018-04-23, by Pierre-Yves David
compat: handle different `ui.edit` signature with Mercurial 4.3 stable
2018-04-24, by Pierre-Yves David
wirepeer: try modern module first stable
2018-04-24, by Pierre-Yves David
compat: handle lack of allpredecessors for Mercurial 4.3 stable
2018-04-24, by Pierre-Yves David
branching: merge further fix into stable stable
2018-04-23, by Pierre-Yves David
wrapping: fix a silly error were we checking on module and wrapping the other
2018-04-23, by Pierre-Yves David
brancing: merge next release into default stable
2018-04-23, by Pierre-Yves David
test-compat: open mercurial-4.5 branch mercurial-4.5
2018-04-21, by Pierre-Yves David
evolve: point to '--abort' in error message
2018-04-22, by Pierre-Yves David
compat: drop compatibility layer for pager
2018-04-19, by Pierre-Yves David
compat: drop compatibility layer for duplicatecopies
2018-04-19, by Pierre-Yves David
compat: drop compatibility layer for bookmark.applychanges
2018-04-19, by Pierre-Yves David
compat: from compatibility layer for allprecursors
2018-04-19, by Pierre-Yves David
compat: drop compatibility layer for successorssets
2018-04-19, by Pierre-Yves David
compat: drop compatibility wrapper for "relevantmarkers"
2018-04-19, by Pierre-Yves David
compat: drop compat layer for cleanupnodes
2018-04-19, by Pierre-Yves David
compat: from compatibility layer for createmarkers
2018-04-19, by Pierre-Yves David
compat: drop obsutile layer
2018-04-19, by Pierre-Yves David
compat: drop vfsmod compat layer
2018-04-19, by Pierre-Yves David
evolve: use in code filtered error for 4.6
2018-04-19, by Pierre-Yves David
documentation: refer to 4.3 in the help text
2018-04-19, by Pierre-Yves David
topic: remove compatibility for older version in discovery wrapping
2018-04-19, by Pierre-Yves David
obscache: drop compat layer to access public changeset
2018-04-19, by Pierre-Yves David
obscache: drop compat layer for obsmarkers reading
2018-04-19, by Pierre-Yves David
template: drop compatibility layer
2018-04-19, by Pierre-Yves David
timer: drop compat layer for time
2018-04-19, by Pierre-Yves David
compat: drop support for Mercurial 4.2
2018-04-19, by Pierre-Yves David
compat: close test-compat branch for mercurial-4.2 mercurial-4.2
2018-04-19, by Pierre-Yves David
evolve: add support for hg >= b4d85bc1
2018-04-18, by Martin von Zweigbergk
discovery: handle deletion of 'wireproto' module
2018-04-19, by Pierre-Yves David
evolve: handle wireproto module deletion for registering new commands
2018-04-19, by Pierre-Yves David
minitopic: handle wireproto module change from b4d85bc122bd
2018-04-19, by Pierre-Yves David
topic: handle wireproto module change from b4d85bc122bd
2018-04-19, by Pierre-Yves David
obsexchange: remove unused import of wireprotoserver
2018-04-18, by Martin von Zweigbergk
compat: rename resolvepartialhexnodeid to resolvehexnodeidprefix
2018-04-18, by Pierre-Yves David
compat: access datestr in a way compatible with verison prior to 4.6
2018-04-17, by Pierre-Yves David
compat: fallback to compatible partial lookup prior to 4.6
2018-04-17, by Pierre-Yves David
import: adapt to fd1dd79cff20
2018-04-17, by Pierre-Yves David
import: grab the expected node value on the fly
2018-04-17, by Pierre-Yves David
import: use a less direct approach to store the expected node
2018-04-17, by Pierre-Yves David
compat: adapt `amend --patch` to the new `patch.extract` API
2018-04-17, by Pierre-Yves David
compat: deal with change in the wireproto module
2018-04-17, by Pierre-Yves David
branching: merge with stable
2018-04-16, by Martin von Zweigbergk
topic: allow '.' in topic names
2018-04-16, by Pierre-Yves David
relocate: look up partial nodeids in unfiltered repo
2018-04-16, by Martin von Zweigbergk
compat: avoid using partial node ID in lookup
2018-04-16, by Pierre-Yves David
test: apply output change from protocaps
2018-04-16, by Pierre-Yves David
test: update output to match upstream
2018-04-15, by Pierre-Yves David
evolve: don't pass stringified int to repo.__getitem__
2018-04-13, by Martin von Zweigbergk
patch: offer the user a chance to fix the patch if it fails to apply
2018-04-11, by Pierre-Yves David
amend: add a new flag `--patch` to `hg amend`
2018-03-18, by Pulkit Goyal
stablerangecache: include units in ui.progress() calls
2018-04-12, by Anton Shestakov
stablerange: include units in ui.progress() calls
2018-04-12, by Anton Shestakov
tests: add test demonstarting issue5833 is fixed
2018-04-06, by Pulkit Goyal
utility: convert node from MultipleSuccessorsError to rev numbers (issue5832)
2018-04-06, by Pulkit Goyal
tests: add a test demonstarting issue5832 traceback
2018-04-06, by Pulkit Goyal
CHANGELOG: add an entry about `hg evolve --abort`
2018-04-06, by Pulkit Goyal
evolve: restore bookmarks correctly after `hg evolve --abort`
2018-03-29, by Pulkit Goyal
topic-ext: restrict the format of topic names
2018-03-29, by Pulkit Goyal
serverminitopic: wrap context.changectx.branch instead of context.changectx
2018-04-06, by Pulkit Goyal
templatekw: remove obsfatedata templatekw
2018-04-06, by Boris Feld
evolve: do not exit 1 when there are no troubled changesets (issue5823)
2018-03-29, by Kyle Lippincott
changelog: add an entry about the memory fixes
2018-04-06, by Pierre-Yves David
safeguard: use self instead of repo in noautopublishrepo.checkpush()
2018-04-06, by Anton Shestakov
stablerangecache: use self instead of repo in stablerangerepo.stablerange()
2018-04-06, by Anton Shestakov
obscache: use self instead of repo in obscacherepo.updatecaches()
2018-04-06, by Anton Shestakov
templatekw: fix templatedata for 46
2018-04-04, by Boris Feld
style: fix a couple of pyflakes complains
2018-03-31, by Pierre-Yves David
evolve: add a `--abort` flag for `hg evolve` command
2018-03-29, by Pulkit Goyal
evolve: don't allow updating or commiting when there is interrupted evolve
2018-03-29, by Pulkit Goyal
evolve: internationalize the entry of --list in hg evolve help
2018-03-28, by Pulkit Goyal
evolve: add evolvestate as an argument to _finalizerelocate()
2018-03-28, by Pulkit Goyal
evolve: add evolvestate as an argument to evolvecmd.relocate()
2018-03-28, by Pulkit Goyal
tests: add test about handling phase-divergent merges
2018-03-28, by Pulkit Goyal
evolve: show a message when evolution leads to no changes to commit
2018-03-28, by Pulkit Goyal
evolve: pass the instability category to relocate() and _finalizerelocate()
2018-03-28, by Pulkit Goyal
tests: add more tests for solving phase-divergence using `hg evolve`
2018-03-28, by Pulkit Goyal
evolve: handle interrupted phase-divergence resolution gracefully
2018-03-24, by Pulkit Goyal
evolve: move logic to resolve phase-divergence in a new function
2018-03-24, by Pulkit Goyal
evolve: store the precursor of phase-divergent in evolvestate
2018-03-24, by Pulkit Goyal
evolve: move logic to complete interrupted relocation to new fn
2018-03-24, by Pulkit Goyal
evolve: move logic to complete interrupted orphan resolution to new fn
2018-03-24, by Pulkit Goyal
evolve: write data to evolvestate in case on conflicts in phase-divergence
2018-03-23, by Pulkit Goyal
evolve: explicitly turn revs to list before storing into evolvestate
2018-03-23, by Pulkit Goyal
tests: add tests of content+parent change creating phase-divergence
2018-03-23, by Pulkit Goyal
tests: show first line of commit message in test-evolve-phase-divergence.t
2018-03-23, by Pulkit Goyal
evolve: make sure bookmarks are moved after phase-divergence resolution
2018-03-23, by Pulkit Goyal
evolve: use the new rebased changeset to resolve phase-divergence
2018-03-23, by Pulkit Goyal
evolvecmd: add a detailed comment and some newlines
2018-03-23, by Pulkit Goyal
tests: add one more test case about handling of phase-divergence by evolve
2018-03-23, by Pulkit Goyal
tests: add more tests for handling of phase divergence by `hg evolve`
2018-03-23, by Pulkit Goyal
tests: temporary delete the merge test of handling phase divergence
2018-03-23, by Pulkit Goyal
tests: various comment on test-evolve-phase-divergence
2018-03-30, by Pulkit Goyal
tests: make test-evolve-phase-divergence more descriptive
2018-03-30, by Pulkit Goyal
compat: use updateresult API if available
2018-03-30, by Pierre-Yves David
compat: provide an explicit default value to the 'odiff' config
2018-03-30, by Pierre-Yves David
compat: keep passing arguments as keyword argument
2018-03-29, by Pierre-Yves David
compat: search for stringmatcher in the new location
2018-03-29, by Pierre-Yves David
rebase: update the rebase wrapping to works with hg 4.6
2018-03-29, by Boris Feld
compat: call current obsolete.createmarkers(), not one from load time stable
2018-03-23, by Martin von Zweigbergk
tests: rename test-evolve-bumped to test-evolve-phase-divergence.t
2018-03-23, by Pulkit Goyal
evolve: replace bumped in function name to phasedivergence
2018-03-23, by Pulkit Goyal
evolve: drop duplicate import of rewriteutil._bookmarksupdater
2018-03-23, by Pulkit Goyal
obslog: more 4.1 code compatibility drop
2018-03-22, by Pierre-Yves David
template: drop some 4.1 compatibility code
2018-03-22, by Pierre-Yves David
checkheads: drop upstreamed code
2018-03-22, by Pierre-Yves David
obslog: cleanup patch handling after 4.1 compat drop
2018-03-22, by Pierre-Yves David
packaging: further mark 4.1 support as dropped
2018-03-22, by Pierre-Yves David
branching: merge with stable
2018-03-22, by Pierre-Yves David
tests: extend the globing to the user name stable
2018-03-22, by Pierre-Yves David
branching: close mercurial-4.1 test branch mercurial-4.1
2018-03-22, by Pierre-Yves David
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
2018-03-15, by Pulkit Goyal
compat: drop support for Mercurial 4.1
2018-03-22, by Pierre-Yves David
packaging: mark versiond as devel versions
2018-03-22, by Pierre-Yves David
packaging: merge stable back into default
2018-03-22, by Pierre-Yves David
packaging: mark version as devel version stable
2018-03-22, by Pierre-Yves David
Added tag 7.3.0 for changeset e4ac2e2c2086 stable
2018-03-22, by Pierre-Yves David
test-compat: merge mercurial-4.2 into mercurial-4.1 mercurial-4.1
2018-03-21, by Pierre-Yves David
test-compat: merge mercurial-4.3 into mercurial-4.2 mercurial-4.2
2018-03-21, by Pierre-Yves David
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
2018-03-21, by Pierre-Yves David
test-compat: merge stable into mercurial-4.4 mercurial-4.4
2018-03-21, by Pierre-Yves David
branching: merge future 7.3.0 into stable stable 7.3.0
2018-03-21, by Pierre-Yves David
tests: update test output for the stable branch stable
2018-03-21, by Pierre-Yves David
debian: add version 7.3.0 to changelog
2018-03-21, by Pierre-Yves David
packaging: update version numbers
2018-03-21, by Pierre-Yves David
changelog: prepare release 7.3.0
2018-03-21, by Pierre-Yves David
tests: updated tested with version
2018-03-21, by Pierre-Yves David
__init__: show some internationalization love
2018-03-21, by Pulkit Goyal
evolvecmd: show some internationalization love
2018-03-21, by Pulkit Goyal
utility: make sure prompt text is internationalized
2018-03-21, by Pulkit Goyal
test: do not use revision number
2018-03-21, by Pierre-Yves David
compat: use mergetoolopts from commands.py
2018-03-21, by Pierre-Yves David
branching: merge stable into default
2018-03-21, by Pierre-Yves David
evolve: add a `--stop` flag for `hg evolve` command
2018-03-20, by Pulkit Goyal
obsexchange: make compatible with some unreleased 4.5 versions
2018-03-19, by Martin von Zweigbergk
compat: make override of createmarkers work on wrapped function
2018-03-19, by Martin von Zweigbergk
previous/next: add -m short form for --merge
2018-03-19, by Martin von Zweigbergk
evolve: handle stabilization of merge changeset with both parents obsoleted
2018-03-18, by Pulkit Goyal
state: add __setitem__() for cmdstate class
2018-03-19, by Pulkit Goyal
evolve: preserve the order of merge parents in `hg evolve --continue`
2018-03-19, by Pulkit Goyal
topics: include "operation" metadata in obsmarkers
2018-03-12, by Martin von Zweigbergk
grab: include "operation" metadata in obsmarkers
2018-03-12, by Martin von Zweigbergk
touch: include "operation" metadata in obsmarkers
2018-03-12, by Martin von Zweigbergk
split: include "operation" metadata in obsmarkers
2018-03-12, by Martin von Zweigbergk
prune: include "operation" metadata in obsmarkers
2018-03-12, by Martin von Zweigbergk
metaedit: include "operation" metadata in obsmarkers
2018-03-12, by Martin von Zweigbergk
fold: include "operation" metadata in obsmarkers
2018-03-12, by Martin von Zweigbergk
uncommit: include "operation" metadata in obsmarkers
2018-03-12, by Martin von Zweigbergk
evolve: include "operation" metadata in obsmarkers
2018-03-12, by Martin von Zweigbergk
amend: include "operation" metadata in obsmarkers
2018-03-12, by Martin von Zweigbergk
compat: add wrapper for obsolete.createmarkers() that accepts "operation" arg
2018-03-16, by Martin von Zweigbergk
tests: do not glob out fixed dates
2018-03-12, by Martin von Zweigbergk
evolve: de-duplicate some function calls
2018-03-16, by Pulkit Goyal
evolve: move deletion of evolvestate out of continueevolve() function
2018-03-16, by Pulkit Goyal
evolve: load evolvestate before passing to continueevolve()
2018-03-16, by Pulkit Goyal
evolve: move the handling for non-continue part in else conditional
2018-03-16, by Pulkit Goyal
evolve: move the logic of continuation handling of `hg evolve` in own fn
2018-03-14, by Pulkit Goyal
CHANGELOG: add an entry about next and prev being interactive
2018-03-16, by Pulkit Goyal
prev: show changeset hash in --dry-run instead of rev numbers
2018-03-16, by Pulkit Goyal
prev: prompt user to choose parent in case of multiple parents
2018-03-16, by Pulkit Goyal
next: cleanup logic around return by returning early
2018-03-16, by Pulkit Goyal