2018-06-02 |
Pulkit Goyal |
tests: add tests for conflicts while respecting commands.update.check
stable
|
changeset |
files
|
2018-06-02 |
Pulkit Goyal |
next: respect `commands.update.check` config option in `hg next` (issue5808)
stable
|
changeset |
files
|
2018-06-02 |
Pulkit Goyal |
prev: respect `commands.update.check` config option in `hg prev` (issue5808)
stable
|
changeset |
files
|
2018-06-02 |
Pulkit Goyal |
tests: add test demonstrating issue5808
stable
|
changeset |
files
|
2018-06-02 |
Pulkit Goyal |
next: bail out early in `hg next --evolve` if dirty wdir
stable
|
changeset |
files
|
2018-06-02 |
Pulkit Goyal |
tests: add test of `hg next --evolve` with dirty working directory
stable
|
changeset |
files
|
2018-06-02 |
Pulkit Goyal |
CHANGELOG: add an entry about fixing issue5897
stable
|
changeset |
files
|
2018-05-26 |
Pulkit Goyal |
evolve: fix `hg abort` when hg next --evolve leads to conflicts (issue5897)
stable
|
changeset |
files
|
2018-05-29 |
Pulkit Goyal |
tests: add a test demonstrating issue5897
stable
|
changeset |
files
|
2018-05-24 |
Pulkit Goyal |
evolve: add an `--update` flag to `hg evolve` command
|
changeset |
files
|
2018-05-23 |
Pulkit Goyal |
tests: add tests for testing --abort while content-divergence resolution
|
changeset |
files
|
2018-05-23 |
Pulkit Goyal |
evolve: fix storage of replacements and temprevs node in evolvestate
|
changeset |
files
|
2018-05-23 |
Pulkit Goyal |
tests: add more tests related to aborting while resolving phase-divergence
|
changeset |
files
|
2018-05-23 |
Denis Laxalde |
topic: suggest to clear a topic that becomes empty
|
changeset |
files
|
2018-05-23 |
Denis Laxalde |
topic: display a hint pointing at help when a topic becomes non-empty
|
changeset |
files
|
2018-05-24 |
Pierre-Yves David |
branching: merge with compat fix on default
|
changeset |
files
|
2018-05-23 |
Pulkit Goyal |
evolve: add compat for repair.stripbmrevset which is moved to scmutil
stable
|
changeset |
files
|
2018-05-23 |
Pierre-Yves David |
evolve: update the readme with more information about contribution
stable
|
changeset |
files
|
2018-05-23 |
Denis Laxalde |
topic: dedent items about publishing behavior in docstring
stable
|
changeset |
files
|
2018-05-23 |
Denis Laxalde |
topic: use preformatted block for config snippets documentation
stable
|
changeset |
files
|
2018-05-23 |
Denis Laxalde |
tests: add a test for "hg help -e topic"
stable
|
changeset |
files
|
2018-05-22 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
2018-05-22 |
Pulkit Goyal |
content-div: add test showing `--stop` works during interrupted resolution
|
changeset |
files
|
2018-04-23 |
Pulkit Goyal |
evolve: create new commit while resolving content-divergence
|
changeset |
files
|
2018-05-22 |
Pulkit Goyal |
content-divergence: store the resolved revs in evolvestate['replacements']
|
changeset |
files
|
2018-05-22 |
Pulkit Goyal |
utility: use ui.interactive() instead of checking config value
|
changeset |
files
|
2018-05-22 |
Pulkit Goyal |
evolve: make `--abort` strip the temporary revs created during resolution
|
changeset |
files
|
2018-05-22 |
Pulkit Goyal |
evolve: store a list of temprevs in evolvestate
|
changeset |
files
|
2018-05-22 |
Pulkit Goyal |
evolve: check for None before adding in set of revisions to strip
|
changeset |
files
|
2018-05-22 |
Pulkit Goyal |
evolve: return the new replacement node to be stored in evolvestate
|
changeset |
files
|
2018-05-22 |
Pulkit Goyal |
evolve: don't make values of replacements dict lists
|
changeset |
files
|
2018-05-22 |
Pulkit Goyal |
tests: add a test file `--abort` flag while resolving phase-divergence
|
changeset |
files
|
2018-05-16 |
Martin von Zweigbergk |
evolve: pass revisions as strings to commands.*()
stable
|
changeset |
files
|
2018-05-22 |
Pulkit Goyal |
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
|
changeset |
files
|
2018-05-21 |
Pierre-Yves David |
branching: merge with branch for stable
|
changeset |
files
|
2018-05-21 |
Boris Feld |
compat: update obshashrange test output
|
changeset |
files
|
2018-05-21 |
Boris Feld |
test: update to new outputs
|
changeset |
files
|
2018-05-21 |
Boris Feld |
compat: fix obslog with Mercurial 4.6+
|
changeset |
files
|
2018-05-19 |
Faheem Mitha |
debian: add line to clean-docs target to delete additional docs file
stable
|
changeset |
files
|
2018-05-14 |
Martin von Zweigbergk |
amend: use context manager for locks (issue5887)
stable
|
changeset |
files
|
2018-05-11 |
Martin von Zweigbergk |
evolve: point to '--abort' in verbose status message
stable
|
changeset |
files
|
2018-04-22 |
Pulkit Goyal |
evolvecmd: add comments and new lines in content-divergence handling logic
|
changeset |
files
|
2018-04-29 |
Pulkit Goyal |
evolve: show cset hash in "merging conetnt-divergent changeset"
|
changeset |
files
|
2018-04-29 |
Pulkit Goyal |
evolve: show cset hash in "update to local conflict" message
|
changeset |
files
|
2018-04-29 |
Pulkit Goyal |
evolve: use hg.updaterepo() instead of hg.update() to hide stats
|
changeset |
files
|
2018-04-29 |
Pulkit Goyal |
evolve: fix the conflicts error message during content-divergence resolution
|
changeset |
files
|
2018-04-29 |
Pulkit Goyal |
evolve: add logic to continue interrupted content-divergence resolution
|
changeset |
files
|
2018-04-29 |
Pulkit Goyal |
evolve: store the evolvestate file when encountering conflicts
|
changeset |
files
|
2018-04-29 |
Pulkit Goyal |
evolve: take out logic to complete phase-divergence in separate fn
|
changeset |
files
|
2018-04-29 |
Pulkit Goyal |
evolve: store divergent nodes in evolvestate when resolving content-divergence
|
changeset |
files
|
2018-05-02 |
Pierre-Yves David |
branching: merge stable into default
|
changeset |
files
|
2018-04-28 |
Pulkit Goyal |
tests: add test showing `hg evolve --stop` works fine with phase-divergence
stable
|
changeset |
files
|
2018-04-28 |
Pulkit Goyal |
tests: rename the test file to add 'orphan' in the name
stable
|
changeset |
files
|
2018-04-27 |
Anton Shestakov |
tests: test that `hg obslog wdir()` aborts with a useful message
stable
|
changeset |
files
|
2018-04-27 |
Anton Shestakov |
obshistory: make obslog work when a commit doesn't have any description
stable
|
changeset |
files
|
2018-04-27 |
Anton Shestakov |
obshistory: use a more appropriate type for obslog entries
stable
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
packaging: mark as development version
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
branching: merge with latest release
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
packaking: mark as development version
stable
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
Added tag 8.0.0 for changeset 116cdd8c102a
stable
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
packaging: update version number
stable 8.0.0
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
packagin: update `tested-with` statement
stable
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
changelog: mention 4.6 compatibility
stable
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
Changelog: pre-version gardening
stable
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
testcompat: update output for Mercurial 4.3
mercurial-4.3
|
changeset |
files
|
2018-04-23 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
2018-04-23 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
2018-04-24 |
Pierre-Yves David |
testcompat: revert output change from new capabilities
mercurial-4.5
|
changeset |
files
|
2018-04-24 |
Pierre-Yves David |
testcompat: revert output change from 54a469cd5b26
mercurial-4.5
|
changeset |
files
|
2018-04-24 |
Pierre-Yves David |
testcompat: revert output change from 1de6ba0ac6d7
mercurial-4.5
|
changeset |
files
|
2018-04-23 |
Pierre-Yves David |
testcompat: merge stable into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
2018-04-24 |
Pierre-Yves David |
compat: handle different `ui.edit` signature with Mercurial 4.3
stable
|
changeset |
files
|
2018-04-24 |
Pierre-Yves David |
wirepeer: try modern module first
stable
|
changeset |
files
|
2018-04-24 |
Pierre-Yves David |
compat: handle lack of allpredecessors for Mercurial 4.3
stable
|
changeset |
files
|
2018-04-23 |
Pierre-Yves David |
branching: merge further fix into stable
stable
|
changeset |
files
|
2018-04-23 |
Pierre-Yves David |
wrapping: fix a silly error were we checking on module and wrapping the other
|
changeset |
files
|
2018-04-23 |
Pierre-Yves David |
brancing: merge next release into default
stable
|
changeset |
files
|
2018-04-21 |
Pierre-Yves David |
test-compat: open mercurial-4.5 branch
mercurial-4.5
|
changeset |
files
|
2018-04-22 |
Pierre-Yves David |
evolve: point to '--abort' in error message
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
compat: drop compatibility layer for pager
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
compat: drop compatibility layer for duplicatecopies
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
compat: drop compatibility layer for bookmark.applychanges
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
compat: from compatibility layer for allprecursors
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
compat: drop compatibility layer for successorssets
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
compat: drop compatibility wrapper for "relevantmarkers"
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
compat: drop compat layer for cleanupnodes
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
compat: from compatibility layer for createmarkers
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
compat: drop obsutile layer
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
compat: drop vfsmod compat layer
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
evolve: use in code filtered error for 4.6
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
documentation: refer to 4.3 in the help text
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
topic: remove compatibility for older version in discovery wrapping
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
obscache: drop compat layer to access public changeset
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
obscache: drop compat layer for obsmarkers reading
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
template: drop compatibility layer
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
timer: drop compat layer for time
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
compat: drop support for Mercurial 4.2
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
compat: close test-compat branch for mercurial-4.2
mercurial-4.2
|
changeset |
files
|
2018-04-19 |
Martin von Zweigbergk |
evolve: add support for hg >= b4d85bc1
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
discovery: handle deletion of 'wireproto' module
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
evolve: handle wireproto module deletion for registering new commands
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
minitopic: handle wireproto module change from b4d85bc122bd
|
changeset |
files
|
2018-04-19 |
Pierre-Yves David |
topic: handle wireproto module change from b4d85bc122bd
|
changeset |
files
|
2018-04-19 |
Martin von Zweigbergk |
obsexchange: remove unused import of wireprotoserver
|
changeset |
files
|
2018-04-18 |
Pierre-Yves David |
compat: rename resolvepartialhexnodeid to resolvehexnodeidprefix
|
changeset |
files
|
2018-04-17 |
Pierre-Yves David |
compat: access datestr in a way compatible with verison prior to 4.6
|
changeset |
files
|
2018-04-17 |
Pierre-Yves David |
compat: fallback to compatible partial lookup prior to 4.6
|
changeset |
files
|
2018-04-17 |
Pierre-Yves David |
import: adapt to fd1dd79cff20
|
changeset |
files
|
2018-04-17 |
Pierre-Yves David |
import: grab the expected node value on the fly
|
changeset |
files
|
2018-04-17 |
Pierre-Yves David |
import: use a less direct approach to store the expected node
|
changeset |
files
|
2018-04-17 |
Pierre-Yves David |
compat: adapt `amend --patch` to the new `patch.extract` API
|
changeset |
files
|
2018-04-17 |
Pierre-Yves David |
compat: deal with change in the wireproto module
|
changeset |
files
|
2018-04-16 |
Martin von Zweigbergk |
branching: merge with stable
|
changeset |
files
|
2018-04-16 |
Pierre-Yves David |
topic: allow '.' in topic names
|
changeset |
files
|
2018-04-16 |
Martin von Zweigbergk |
relocate: look up partial nodeids in unfiltered repo
|
changeset |
files
|
2018-04-16 |
Pierre-Yves David |
compat: avoid using partial node ID in lookup
|
changeset |
files
|
2018-04-15 |
Pierre-Yves David |
test: apply output change from protocaps
|
changeset |
files
|