evolve: Graph

compat: ignore extra status feature for hg <= 4.3 stable
2018-08-02, by Pierre-Yves David
format: fix indentation level stable
2018-08-02, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
2018-08-02, by Pierre-Yves David
test-compat: merge stable into mercurial-4.6 mercurial-4.6
2018-08-02, by Pierre-Yves David
compat: disable empty topic warning on `hg phases` for hg <=4.5 stable
2018-08-02, by Pierre-Yves David
compat: restore compatibility with Mercurial <= 4.5 stable
2018-08-02, by Pierre-Yves David
test-compat: merge stable into mercurial-4.6 mercurial-4.6
2018-08-02, by Pierre-Yves David
test-compat: merge stable into mercurial-4.6 mercurial-4.6
2018-07-31, by Pierre-Yves David
branching: merge stable back into default
2018-08-01, by Pierre-Yves David
compat: improve detection of Mercurial 4.6 stable
2018-07-31, by Andrew Fischer
cleanup: use NotImplementedError instead of NotImplemented stable
2018-07-31, by Pierre-Yves David
CHANGELOG: add some entries and remove duplicated entries stable
2018-07-24, by Pulkit Goyal
branching: merge default into stable stable
2018-07-31, by Pierre-Yves David
branching: merge with the other head mercurial-4.6
2018-07-31, by Pierre-Yves David
test-compat: backed out changeset 8fe8152ff071 mercurial-4.6
2018-07-31, by Pierre-Yves David
test-compat: backed out changeset 41fc764bf28c mercurial-4.6
2018-07-31, by Pierre-Yves David
test-compat: backed out changeset dda5b2134b32 mercurial-4.6
2018-07-31, by Pierre-Yves David
test-compat: backout change to 1e103c7f7663 mercurial-4.6
2018-07-31, by Pierre-Yves David
compat: use older API for older version
2018-07-31, by Pierre-Yves David
branching: create mercurial-4.6 branch for updated test output mercurial-4.6
2018-07-31, by Pierre-Yves David
builddependencies: extract function for getting successors
2018-07-25, by Martin von Zweigbergk
builddependencies: share code between single- and multi-successor cases
2018-07-25, by Martin von Zweigbergk
builddependencies: build inverse dict from forward dict
2018-07-25, by Martin von Zweigbergk
builddependencies: remove a use of defaultdict
2018-07-25, by Martin von Zweigbergk
branching: merge with stable
2018-07-31, by Pierre-Yves David
builddependencies: don't remove found deps when divergence found (issue5946) stable
2018-07-25, by Martin von Zweigbergk
builddependencies: don't add dependency on revision outside input set stable
2018-07-25, by Martin von Zweigbergk
builddependencies: consider all divergent successors stable
2018-07-25, by Martin von Zweigbergk
tests: add test for issue5946 stable
2018-07-25, by Martin von Zweigbergk
obslog: check filtered output with folded changesets
2018-05-25, by Boris Feld
obslog: check filtered output with splitted changesets
2018-05-25, by Boris Feld
obslog: check filtered output with pruned changesets
2018-05-25, by Boris Feld
obslog: check filtered output with amended changesets
2018-05-22, by Boris Feld
tests: add a content-divergent obshistory test
2018-05-25, by Boris Feld
tests: extract the obshistory amend then fold test case into a separate file
2018-05-22, by Boris Feld
tests: extract the content-divergence test case into a separate file
2018-05-22, by Boris Feld
tests: extract the obshistory fold test case into a separate file
2018-05-22, by Boris Feld
tests: extract the obshistory lots of split test case into a separate file
2018-05-22, by Boris Feld
tests: extract the obshistory split test case into a separate file
2018-05-22, by Boris Feld
tests: extract the obshistory prune test case into a separate file
2018-05-22, by Boris Feld
tests: extract the obshistory amend test case into a separate file
2018-05-22, by Boris Feld
tests: extract obshistory setup in a separate file
2018-05-22, by Boris Feld
obslog: add a new flag to filter out non-local nodes
2018-05-22, by Boris Feld
compat: drop compatibility hack for mercurial <4.3
2018-07-26, by Pierre-Yves David
compat: temporarily move copies fix to compat.py
2018-07-21, by Pulkit Goyal
evolve: continue conflicted relocation content-divergence
2018-06-07, by Pulkit Goyal
topic: use self instead of repo in topicrepo methods stable
2018-07-18, by Anton Shestakov
evolvecmd: introduce fn to be wrapped by extensions resolving content-div
2018-07-08, by Pulkit Goyal
evolvecmd: move remaining logic to merge commit desc to existing utility fn
2018-07-08, by Pulkit Goyal
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
2018-07-08, by Pulkit Goyal
tests: add a test to demonstrate issue5925
2018-07-08, by Pulkit Goyal
test: fix possible output change from 4.7
2018-07-09, by Pierre-Yves David
state: add the get() method that evolvecmd:1836 expects
2018-07-06, by Martin von Zweigbergk
rewing: prevent rewind in case of uncommitted changes
2018-06-17, by Pierre-Yves David
rewind: default to rewinding the current stack
2018-06-17, by Pierre-Yves David
rewing: add the ability to rewind "from" revisions
2018-06-17, by Pierre-Yves David
evolve: exclude "identical" precursors from the precursors set
2018-06-17, by Pierre-Yves David
rewind: move revision selection into its own function
2018-06-17, by Pierre-Yves David
rewind: automatically rewind entire stack
2018-06-17, by Pierre-Yves David
rewind: add a test about rewinding top of stack
2018-06-17, by Pierre-Yves David
rewind: use rewinded parent when creating multiple changesets
2018-06-17, by Pierre-Yves David
rewind: add a test for rewinding a fold
2018-06-17, by Pierre-Yves David
rewind: add a test for rewinding a split
2018-06-17, by Pierre-Yves David
rewind: update the working copy if it gets obsoleted
2018-06-17, by Pierre-Yves David
rewind: add a message about obsolete changeset
2018-06-17, by Pierre-Yves David
rewind: obsolete latest successors unless instructed otherwise
2018-06-17, by Pierre-Yves David
rewind: test rewinding an amended changesets
2018-06-16, by Pierre-Yves David
rewind: add a message about the rewinded changesets
2018-06-17, by Pierre-Yves David
rewind: add a proto version of the command
2018-06-16, by Pierre-Yves David
stablesort: make sure heads are processed in sorted order
2018-06-29, by Pierre-Yves David
evolve: move the bookmarks also when updating to successor (issue5923)
2018-06-19, by Pulkit Goyal
tests: add test to demonstrate issue5923
2018-06-19, by Pulkit Goyal
changelog: add an entry about the new `evolve.interrupted` section
2018-06-28, by Pierre-Yves David
evolve: make one missed error to align other error messages
2018-06-15, by Pulkit Goyal
evolve: raise error.InterventionRequired instead of Abort when conflicts
2018-06-15, by Pulkit Goyal
changelog: add a changelog entry about divergence resolution
2018-06-14, by Pierre-Yves David
evolve: create resolved cset on successors of current parents
2018-06-14, by Pulkit Goyal
tests: fix a test case to not create conflicts
2018-06-14, by Pulkit Goyal
evolve: introduce a resolutionparent variable and store it in evolvestate
2018-06-14, by Pulkit Goyal
evolve: introduce a dirstatedance() fn to fix dirstate after parent change
2018-06-13, by Pulkit Goyal
evolve: create a new commit instead of amending one of the divergents
2018-06-13, by Pulkit Goyal
evolve: always order the revs to be evolved
2018-06-12, by Pulkit Goyal
tests: add test of resolution of content-divergent stacks
2018-06-12, by Pulkit Goyal
evolve: improve error messages when conflicts occur
2018-06-12, by Pulkit Goyal
evolve: point to `hg help evolve.interrupted` while resolving content-div
2018-06-12, by Pulkit Goyal
tests: add test about aborting content-divergence when multiple parents
2018-06-12, by Pulkit Goyal
CHANGELOG: add an entry about the --update flag
2018-06-13, by Pulkit Goyal
evolve: show unfinished information in `hg status -v` (issue5886)
2018-06-06, by Pulkit Goyal
style: drop a (commented) debug print
2018-06-12, by Denis Laxalde
tests: update tests output with changes in d0abd7949ea3 in core hg
2018-06-10, by Pulkit Goyal
branching: merge with stable
2018-06-12, by Pierre-Yves David
Added tag 8.0.1 for changeset 0887c30255a1 stable
2018-06-11, by Pulkit Goyal
packaging: prepare for 8.0.1 release stable 8.0.1
2018-06-11, by Pulkit Goyal
changelog: add a couple of missing entry stable
2018-06-11, by Pierre-Yves David
evolve: strip the extra obsmarkers if any on `hg evolve --abort`
2018-06-11, by Pulkit Goyal
evolve: store the obsmarkers to be deleted in evolvestate
2018-06-11, by Pulkit Goyal
evolve: store obsmarkers to be deleted in evolvestate
2018-06-11, by Pulkit Goyal
evolve: factor out logic to merge branches in separate function
2018-06-11, by Pulkit Goyal
tests: add more test of --stop while resolving content-divergence
2018-06-11, by Pulkit Goyal
evolve: strip the relocation commit on `hg evolve --stop`
2018-06-11, by Pulkit Goyal
evolve: declare updated and pctx variables in stopevolve()
2018-06-11, by Pulkit Goyal
evolve: store the old other divergent node after relocation in evolvestate
2018-06-10, by Pulkit Goyal
evolve: factor out logic for --stop flag in separate function
2018-06-10, by Pulkit Goyal
tests: add test for --stop flag when resolving multiparents content-div
2018-06-10, by Pulkit Goyal
evolve: move logic to continue interrupted content-div resolution to new fn
2018-06-10, by Pulkit Goyal
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
2018-06-11, by Pulkit Goyal
packaging: update tested-with statements in evolve and topic stable
2018-06-09, by Pulkit Goyal
CHANGELOG: mention about 4.6.1 compatibility stable
2018-06-09, by Pulkit Goyal
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
2018-06-08, by Pulkit Goyal
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2018-06-08, by Pulkit Goyal
test-compat: merge stable into mercurial-4.5 mercurial-4.5
2018-06-08, by Pulkit Goyal
utility: use ui.interactive() instead of checking config value stable
2018-05-22, by Pulkit Goyal
CHANGELOG: add couple of entries about things fixed stable
2018-06-08, by Pulkit Goyal
next-prev: always respect the --merge flag stable
2018-06-08, by Pulkit Goyal
next-prev: add tests showing --merge not respected in some cases stable
2018-06-08, by Pulkit Goyal
evolve: store the evolvestate if relocation results in conflicts
2018-06-07, by Pulkit Goyal
tests: add more test of resolution of content-divergent changesets
2018-06-07, by Pulkit Goyal
evolvestate: store info about relocation while resolving content-divergence
2018-06-07, by Pulkit Goyal
evolve: factor out logic to merge content divergent csets in separate fn
2018-06-07, by Pulkit Goyal
evolve: commit the transaction if conflicts occur while merging content-div
2018-06-07, by Pulkit Goyal
tests: add tests for resolving content-divergence when different parents
2018-06-07, by Pulkit Goyal
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