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