Sat, 18 Aug 2018 20:24:41 +0530 |
Pulkit Goyal |
tests: demonstrate the interrupted evolve does not set p2
stable
|
changeset |
files
|
Sat, 18 Aug 2018 01:32:52 +0200 |
Pierre-Yves David |
cleanup: remove unused import
|
changeset |
files
|
Sat, 18 Aug 2018 01:03:19 +0200 |
Pierre-Yves David |
cleanup: remove old comment that lost all meaning
|
changeset |
files
|
Sat, 18 Aug 2018 01:02:52 +0200 |
Pierre-Yves David |
template: remove compatibility layer for `showobsolete`
|
changeset |
files
|
Sat, 18 Aug 2018 01:06:30 +0200 |
Pierre-Yves David |
exthelper: drop compatibility layer for `command`
|
changeset |
files
|
Sat, 18 Aug 2018 01:05:00 +0200 |
Pierre-Yves David |
topic: drop compat layer for `command`
|
changeset |
files
|
Sat, 18 Aug 2018 01:00:08 +0200 |
Pierre-Yves David |
legacy: drop compat layer for "command"
|
changeset |
files
|
Sat, 18 Aug 2018 00:59:44 +0200 |
Pierre-Yves David |
drophack: drop compat layer for "command"
|
changeset |
files
|
Sat, 18 Aug 2018 00:53:12 +0200 |
Pierre-Yves David |
compat: drop compatibility layer for updatecaches
|
changeset |
files
|
Sat, 18 Aug 2018 00:48:05 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Fri, 17 Aug 2018 16:26:44 +0200 |
Pierre-Yves David |
obshashrange: force saving of stablesort and firstmerge cache
stable
|
changeset |
files
|
Fri, 17 Aug 2018 13:31:35 +0200 |
Pierre-Yves David |
test: add a test about cache warming
stable
|
changeset |
files
|
Fri, 17 Aug 2018 12:56:13 +0200 |
Pierre-Yves David |
stablerange: save stablesort cache alongside the stablerange one
stable
|
changeset |
files
|
Fri, 17 Aug 2018 12:07:55 +0200 |
Pierre-Yves David |
obshashrange: always save stable range cache alongside the obshashrange one
stable
|
changeset |
files
|
Fri, 17 Aug 2018 12:06:43 +0200 |
Pierre-Yves David |
obshashrange: clear in-memory cache alongside the sqlite one
stable
|
changeset |
files
|
Fri, 17 Aug 2018 01:07:37 +0200 |
Pierre-Yves David |
branching: merge with fixes on stable
|
changeset |
files
|
Fri, 17 Aug 2018 01:04:49 +0200 |
Pierre-Yves David |
changelog: summarize the recent improvement
stable
|
changeset |
files
|
Fri, 17 Aug 2018 00:27:10 +0200 |
Pierre-Yves David |
obshashrange: re-enabled more selective pruning of affected range
stable
|
changeset |
files
|
Fri, 17 Aug 2018 00:23:20 +0200 |
Pierre-Yves David |
obshashrange: fix computation of affected ranges
stable
|
changeset |
files
|
Thu, 16 Aug 2018 22:45:36 +0200 |
Pierre-Yves David |
obshashrange: add more validation output to tests
stable
|
changeset |
files
|
Thu, 16 Aug 2018 21:12:57 +0200 |
Pierre-Yves David |
obshashrange: correctly detect changeset directly affected by prune
stable
|
changeset |
files
|
Thu, 16 Aug 2018 21:18:18 +0200 |
Pierre-Yves David |
obshashrange: do not search for affected ranges above the highest we have
stable
|
changeset |
files
|
Thu, 16 Aug 2018 20:49:55 +0200 |
Pierre-Yves David |
obshashrange: do not search for affected stable range cache is unavailable
stable
|
changeset |
files
|
Thu, 16 Aug 2018 20:22:19 +0200 |
Pierre-Yves David |
stablerange: build closure a bit less inefficiently
stable
|
changeset |
files
|
Thu, 16 Aug 2018 22:19:19 +0200 |
Pierre-Yves David |
discovery: make sure repository wrapping happens in the right order
stable
|
changeset |
files
|
Thu, 16 Aug 2018 11:58:07 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Thu, 16 Aug 2018 11:54:30 +0200 |
Pierre-Yves David |
changelog: add an entry about the next --evolve fix
stable
|
changeset |
files
|
Thu, 16 Aug 2018 11:53:49 +0200 |
Pierre-Yves David |
changelog: update 8.1.0 release date
stable
|
changeset |
files
|
Thu, 16 Aug 2018 11:44:32 +0200 |
Pierre-Yves David |
next: fix topic constraint in the --evolve case
stable
|
changeset |
files
|
Thu, 16 Aug 2018 11:43:53 +0200 |
Pierre-Yves David |
next: use set for membership testing
stable
|
changeset |
files
|
Tue, 14 Aug 2018 19:22:54 +0200 |
Pierre-Yves David |
test: adapt to core output change on unknown command
|
changeset |
files
|
Tue, 14 Aug 2018 19:15:35 +0200 |
Pierre-Yves David |
compat: use new style template keyword declaration
|
changeset |
files
|
Tue, 14 Aug 2018 18:32:30 +0200 |
Pierre-Yves David |
test: fix previous changeset output
|
changeset |
files
|
Tue, 14 Aug 2018 15:24:22 +0200 |
Pierre-Yves David |
obshashrange: add a test for `hg debugupdatecache`
|
changeset |
files
|
Tue, 14 Aug 2018 18:21:23 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Wed, 08 Aug 2018 20:21:34 +0900 |
Yuya Nishihara |
templatekw: do not override in-core {obsolete} keyword
stable
|
changeset |
files
|
Mon, 13 Aug 2018 12:55:10 +0200 |
Pierre-Yves David |
packaging: mark version as development version
stable
|
changeset |
files
|
Fri, 03 Aug 2018 05:43:54 +0200 |
Pierre-Yves David |
Added tag 8.1.0 for changeset 2c5d79c6459c
stable
|
changeset |
files
|
Fri, 03 Aug 2018 05:41:08 +0200 |
Pierre-Yves David |
packaging: prepare version
stable 8.1.0
|
changeset |
files
|
Fri, 03 Aug 2018 01:16:51 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
changeset |
files
|
Fri, 03 Aug 2018 00:22:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
Fri, 03 Aug 2018 00:19:47 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
Fri, 03 Aug 2018 00:19:46 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
Fri, 03 Aug 2018 00:19:45 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
Fri, 03 Aug 2018 00:52:10 +0200 |
Boris Feld |
compat: fix obslog compatiblity with 4.3
stable
|
changeset |
files
|
Thu, 02 Aug 2018 16:54:40 +0300 |
Pulkit Goyal |
compat: add a fixed version of mergecopies for hg<=4.3
stable
|
changeset |
files
|
Thu, 02 Aug 2018 02:47:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
Thu, 02 Aug 2018 02:42:15 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
Thu, 02 Aug 2018 02:42:14 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
Thu, 02 Aug 2018 04:11:54 +0200 |
Pierre-Yves David |
compat: make compatible call to ui.edit for hg <= 4.3
stable
|
changeset |
files
|
Thu, 02 Aug 2018 03:08:52 +0200 |
Pierre-Yves David |
compat: ignore extra status feature for hg <= 4.3
stable
|
changeset |
files
|
Thu, 02 Aug 2018 02:41:33 +0200 |
Pierre-Yves David |
format: fix indentation level
stable
|
changeset |
files
|
Thu, 02 Aug 2018 01:58:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
Thu, 02 Aug 2018 01:57:13 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
Thu, 02 Aug 2018 02:15:48 +0200 |
Pierre-Yves David |
compat: disable empty topic warning on `hg phases` for hg <=4.5
stable
|
changeset |
files
|
Thu, 02 Aug 2018 01:31:02 +0200 |
Pierre-Yves David |
compat: restore compatibility with Mercurial <= 4.5
stable
|
changeset |
files
|
Thu, 02 Aug 2018 01:53:01 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
Tue, 31 Jul 2018 12:54:46 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
Wed, 01 Aug 2018 23:52:10 +0200 |
Pierre-Yves David |
branching: merge stable back into default
|
changeset |
files
|
Tue, 31 Jul 2018 07:38:37 -0500 |
Andrew Fischer |
compat: improve detection of Mercurial 4.6
stable
|
changeset |
files
|
Tue, 31 Jul 2018 13:06:20 +0200 |
Pierre-Yves David |
cleanup: use NotImplementedError instead of NotImplemented
stable
|
changeset |
files
|
Tue, 24 Jul 2018 00:52:14 +0530 |
Pulkit Goyal |
CHANGELOG: add some entries and remove duplicated entries
stable
|
changeset |
files
|
Tue, 31 Jul 2018 12:52:06 +0200 |
Pierre-Yves David |
branching: merge default into stable
stable
|
changeset |
files
|
Tue, 31 Jul 2018 12:07:39 +0200 |
Pierre-Yves David |
branching: merge with the other head
mercurial-4.6
|
changeset |
files
|
Tue, 31 Jul 2018 11:48:15 +0200 |
Pierre-Yves David |
test-compat: backed out changeset 8fe8152ff071
mercurial-4.6
|
changeset |
files
|
Tue, 31 Jul 2018 11:47:20 +0200 |
Pierre-Yves David |
test-compat: backed out changeset 41fc764bf28c
mercurial-4.6
|
changeset |
files
|
Tue, 31 Jul 2018 11:46:30 +0200 |
Pierre-Yves David |
test-compat: backed out changeset dda5b2134b32
mercurial-4.6
|
changeset |
files
|
Tue, 31 Jul 2018 11:45:01 +0200 |
Pierre-Yves David |
test-compat: backout change to 1e103c7f7663
mercurial-4.6
|
changeset |
files
|
Tue, 31 Jul 2018 11:25:57 +0200 |
Pierre-Yves David |
compat: use older API for older version
|
changeset |
files
|
Tue, 31 Jul 2018 09:28:19 +0200 |
Pierre-Yves David |
branching: create mercurial-4.6 branch for updated test output
mercurial-4.6
|
changeset |
files
|
Wed, 25 Jul 2018 16:12:01 -0700 |
Martin von Zweigbergk |
builddependencies: extract function for getting successors
|
changeset |
files
|
Wed, 25 Jul 2018 16:23:25 -0700 |
Martin von Zweigbergk |
builddependencies: share code between single- and multi-successor cases
|
changeset |
files
|
Wed, 25 Jul 2018 14:33:48 -0700 |
Martin von Zweigbergk |
builddependencies: build inverse dict from forward dict
|
changeset |
files
|
Wed, 25 Jul 2018 14:21:49 -0700 |
Martin von Zweigbergk |
builddependencies: remove a use of defaultdict
|
changeset |
files
|
Tue, 31 Jul 2018 09:03:35 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Wed, 25 Jul 2018 15:30:37 -0700 |
Martin von Zweigbergk |
builddependencies: don't remove found deps when divergence found (issue5946)
stable
|
changeset |
files
|
Wed, 25 Jul 2018 14:47:16 -0700 |
Martin von Zweigbergk |
builddependencies: don't add dependency on revision outside input set
stable
|
changeset |
files
|
Wed, 25 Jul 2018 15:16:25 -0700 |
Martin von Zweigbergk |
builddependencies: consider all divergent successors
stable
|
changeset |
files
|
Wed, 25 Jul 2018 14:00:49 -0700 |
Martin von Zweigbergk |
tests: add test for issue5946
stable
|
changeset |
files
|
Fri, 25 May 2018 17:17:56 +0200 |
Boris Feld |
obslog: check filtered output with folded changesets
|
changeset |
files
|
Fri, 25 May 2018 16:50:04 +0200 |
Boris Feld |
obslog: check filtered output with splitted changesets
|
changeset |
files
|
Fri, 25 May 2018 11:52:48 +0200 |
Boris Feld |
obslog: check filtered output with pruned changesets
|
changeset |
files
|
Tue, 22 May 2018 16:48:35 +0200 |
Boris Feld |
obslog: check filtered output with amended changesets
|
changeset |
files
|
Fri, 25 May 2018 11:48:19 +0200 |
Boris Feld |
tests: add a content-divergent obshistory test
|
changeset |
files
|
Tue, 22 May 2018 17:44:05 +0200 |
Boris Feld |
tests: extract the obshistory amend then fold test case into a separate file
|
changeset |
files
|
Tue, 22 May 2018 17:42:56 +0200 |
Boris Feld |
tests: extract the content-divergence test case into a separate file
|
changeset |
files
|
Tue, 22 May 2018 17:41:57 +0200 |
Boris Feld |
tests: extract the obshistory fold test case into a separate file
|
changeset |
files
|
Tue, 22 May 2018 17:40:56 +0200 |
Boris Feld |
tests: extract the obshistory lots of split test case into a separate file
|
changeset |
files
|
Tue, 22 May 2018 17:37:51 +0200 |
Boris Feld |
tests: extract the obshistory split test case into a separate file
|
changeset |
files
|
Tue, 22 May 2018 17:37:40 +0200 |
Boris Feld |
tests: extract the obshistory prune test case into a separate file
|
changeset |
files
|
Tue, 22 May 2018 15:40:29 +0200 |
Boris Feld |
tests: extract the obshistory amend test case into a separate file
|
changeset |
files
|
Tue, 22 May 2018 15:35:54 +0200 |
Boris Feld |
tests: extract obshistory setup in a separate file
|
changeset |
files
|
Tue, 22 May 2018 12:07:24 +0200 |
Boris Feld |
obslog: add a new flag to filter out non-local nodes
|
changeset |
files
|
Thu, 26 Jul 2018 18:28:44 +0200 |
Pierre-Yves David |
compat: drop compatibility hack for mercurial <4.3
|
changeset |
files
|
Sat, 21 Jul 2018 02:42:29 +0530 |
Pulkit Goyal |
compat: temporarily move copies fix to compat.py
|
changeset |
files
|
Thu, 07 Jun 2018 18:18:30 +0530 |
Pulkit Goyal |
evolve: continue conflicted relocation content-divergence
|
changeset |
files
|
Wed, 18 Jul 2018 18:17:16 +0800 |
Anton Shestakov |
topic: use self instead of repo in topicrepo methods
stable
|
changeset |
files
|
Sun, 08 Jul 2018 22:16:17 +0530 |
Pulkit Goyal |
evolvecmd: introduce fn to be wrapped by extensions resolving content-div
|
changeset |
files
|
Sun, 08 Jul 2018 21:18:33 +0530 |
Pulkit Goyal |
evolvecmd: move remaining logic to merge commit desc to existing utility fn
|
changeset |
files
|
Sun, 08 Jul 2018 22:52:33 +0530 |
Pulkit Goyal |
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
|
changeset |
files
|
Sun, 08 Jul 2018 22:50:16 +0530 |
Pulkit Goyal |
tests: add a test to demonstrate issue5925
|
changeset |
files
|
Mon, 09 Jul 2018 01:18:40 +0200 |
Pierre-Yves David |
test: fix possible output change from 4.7
|
changeset |
files
|
Fri, 06 Jul 2018 11:36:24 -0700 |
Martin von Zweigbergk |
state: add the get() method that evolvecmd:1836 expects
|
changeset |
files
|
Sun, 17 Jun 2018 03:56:54 +0200 |
Pierre-Yves David |
rewing: prevent rewind in case of uncommitted changes
|
changeset |
files
|
Sun, 17 Jun 2018 03:46:46 +0200 |
Pierre-Yves David |
rewind: default to rewinding the current stack
|
changeset |
files
|
Sun, 17 Jun 2018 03:10:19 +0200 |
Pierre-Yves David |
rewing: add the ability to rewind "from" revisions
|
changeset |
files
|
Sun, 17 Jun 2018 03:29:34 +0200 |
Pierre-Yves David |
evolve: exclude "identical" precursors from the precursors set
|
changeset |
files
|
Sun, 17 Jun 2018 03:07:53 +0200 |
Pierre-Yves David |
rewind: move revision selection into its own function
|
changeset |
files
|
Sun, 17 Jun 2018 02:32:29 +0200 |
Pierre-Yves David |
rewind: automatically rewind entire stack
|
changeset |
files
|
Sun, 17 Jun 2018 02:22:28 +0200 |
Pierre-Yves David |
rewind: add a test about rewinding top of stack
|
changeset |
files
|
Sun, 17 Jun 2018 02:03:03 +0200 |
Pierre-Yves David |
rewind: use rewinded parent when creating multiple changesets
|
changeset |
files
|
Sun, 17 Jun 2018 00:22:31 +0200 |
Pierre-Yves David |
rewind: add a test for rewinding a fold
|
changeset |
files
|
Sun, 17 Jun 2018 01:36:30 +0200 |
Pierre-Yves David |
rewind: add a test for rewinding a split
|
changeset |
files
|
Sun, 17 Jun 2018 00:33:43 +0200 |
Pierre-Yves David |
rewind: update the working copy if it gets obsoleted
|
changeset |
files
|
Sun, 17 Jun 2018 01:04:20 +0200 |
Pierre-Yves David |
rewind: add a message about obsolete changeset
|
changeset |
files
|
Sun, 17 Jun 2018 00:15:18 +0200 |
Pierre-Yves David |
rewind: obsolete latest successors unless instructed otherwise
|
changeset |
files
|
Sat, 16 Jun 2018 23:32:22 +0200 |
Pierre-Yves David |
rewind: test rewinding an amended changesets
|
changeset |
files
|
Sun, 17 Jun 2018 00:57:09 +0200 |
Pierre-Yves David |
rewind: add a message about the rewinded changesets
|
changeset |
files
|
Sat, 16 Jun 2018 23:11:52 +0200 |
Pierre-Yves David |
rewind: add a proto version of the command
|
changeset |
files
|
Fri, 29 Jun 2018 16:51:56 +0200 |
Pierre-Yves David |
stablesort: make sure heads are processed in sorted order
|
changeset |
files
|
Tue, 19 Jun 2018 23:21:54 +0530 |
Pulkit Goyal |
evolve: move the bookmarks also when updating to successor (issue5923)
|
changeset |
files
|
Tue, 19 Jun 2018 23:21:44 +0530 |
Pulkit Goyal |
tests: add test to demonstrate issue5923
|
changeset |
files
|
Thu, 28 Jun 2018 17:26:16 +0200 |
Pierre-Yves David |
changelog: add an entry about the new `evolve.interrupted` section
|
changeset |
files
|
Fri, 15 Jun 2018 00:50:17 +0530 |
Pulkit Goyal |
evolve: make one missed error to align other error messages
|
changeset |
files
|
Fri, 15 Jun 2018 00:16:29 +0530 |
Pulkit Goyal |
evolve: raise error.InterventionRequired instead of Abort when conflicts
|
changeset |
files
|
Thu, 14 Jun 2018 02:58:30 +0200 |
Pierre-Yves David |
changelog: add a changelog entry about divergence resolution
|
changeset |
files
|
Thu, 14 Jun 2018 01:39:33 +0530 |
Pulkit Goyal |
evolve: create resolved cset on successors of current parents
|
changeset |
files
|
Thu, 14 Jun 2018 01:39:11 +0530 |
Pulkit Goyal |
tests: fix a test case to not create conflicts
|
changeset |
files
|
Thu, 14 Jun 2018 01:06:12 +0530 |
Pulkit Goyal |
evolve: introduce a resolutionparent variable and store it in evolvestate
|
changeset |
files
|
Wed, 13 Jun 2018 18:08:57 +0530 |
Pulkit Goyal |
evolve: introduce a dirstatedance() fn to fix dirstate after parent change
|
changeset |
files
|
Wed, 13 Jun 2018 17:15:10 +0530 |
Pulkit Goyal |
evolve: create a new commit instead of amending one of the divergents
|
changeset |
files
|
Tue, 12 Jun 2018 23:20:54 +0530 |
Pulkit Goyal |
evolve: always order the revs to be evolved
|
changeset |
files
|
Tue, 12 Jun 2018 21:13:02 +0530 |
Pulkit Goyal |
tests: add test of resolution of content-divergent stacks
|
changeset |
files
|
Tue, 12 Jun 2018 19:00:12 +0530 |
Pulkit Goyal |
evolve: improve error messages when conflicts occur
|
changeset |
files
|
Tue, 12 Jun 2018 04:01:19 +0530 |
Pulkit Goyal |
evolve: point to `hg help evolve.interrupted` while resolving content-div
|
changeset |
files
|
Tue, 12 Jun 2018 03:29:13 +0530 |
Pulkit Goyal |
tests: add test about aborting content-divergence when multiple parents
|
changeset |
files
|
Wed, 13 Jun 2018 15:47:19 +0530 |
Pulkit Goyal |
CHANGELOG: add an entry about the --update flag
|
changeset |
files
|
Wed, 06 Jun 2018 04:29:05 +0530 |
Pulkit Goyal |
evolve: show unfinished information in `hg status -v` (issue5886)
|
changeset |
files
|
Tue, 12 Jun 2018 13:58:14 +0200 |
Denis Laxalde |
style: drop a (commented) debug print
|
changeset |
files
|
Sun, 10 Jun 2018 20:58:55 +0530 |
Pulkit Goyal |
tests: update tests output with changes in d0abd7949ea3 in core hg
|
changeset |
files
|
Tue, 12 Jun 2018 10:40:57 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Mon, 11 Jun 2018 23:31:44 +0530 |
Pulkit Goyal |
Added tag 8.0.1 for changeset 0887c30255a1
stable
|
changeset |
files
|
Mon, 11 Jun 2018 23:30:24 +0530 |
Pulkit Goyal |
packaging: prepare for 8.0.1 release
stable 8.0.1
|
changeset |
files
|
Mon, 11 Jun 2018 20:24:45 +0200 |
Pierre-Yves David |
changelog: add a couple of missing entry
stable
|
changeset |
files
|
Mon, 11 Jun 2018 20:17:56 +0530 |
Pulkit Goyal |
evolve: strip the extra obsmarkers if any on `hg evolve --abort`
|
changeset |
files
|
Mon, 11 Jun 2018 20:13:36 +0530 |
Pulkit Goyal |
evolve: store the obsmarkers to be deleted in evolvestate
|
changeset |
files
|
Mon, 11 Jun 2018 15:52:11 +0530 |
Pulkit Goyal |
evolve: store obsmarkers to be deleted in evolvestate
|
changeset |
files
|
Mon, 11 Jun 2018 15:38:43 +0530 |
Pulkit Goyal |
evolve: factor out logic to merge branches in separate function
|
changeset |
files
|
Mon, 11 Jun 2018 01:00:57 +0530 |
Pulkit Goyal |
tests: add more test of --stop while resolving content-divergence
|
changeset |
files
|
Mon, 11 Jun 2018 00:47:28 +0530 |
Pulkit Goyal |
evolve: strip the relocation commit on `hg evolve --stop`
|
changeset |
files
|
Mon, 11 Jun 2018 00:43:39 +0530 |
Pulkit Goyal |
evolve: declare updated and pctx variables in stopevolve()
|
changeset |
files
|
Sun, 10 Jun 2018 22:52:11 +0530 |
Pulkit Goyal |
evolve: store the old other divergent node after relocation in evolvestate
|
changeset |
files
|
Sun, 10 Jun 2018 22:42:57 +0530 |
Pulkit Goyal |
evolve: factor out logic for --stop flag in separate function
|
changeset |
files
|
Sun, 10 Jun 2018 22:38:08 +0530 |
Pulkit Goyal |
tests: add test for --stop flag when resolving multiparents content-div
|
changeset |
files
|
Sun, 10 Jun 2018 20:35:48 +0530 |
Pulkit Goyal |
evolve: move logic to continue interrupted content-div resolution to new fn
|
changeset |
files
|
Mon, 11 Jun 2018 01:12:12 +0530 |
Pulkit Goyal |
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
|
changeset |
files
|
Sat, 09 Jun 2018 00:15:27 +0530 |
Pulkit Goyal |
packaging: update tested-with statements in evolve and topic
stable
|
changeset |
files
|
Sat, 09 Jun 2018 00:12:08 +0530 |
Pulkit Goyal |
CHANGELOG: mention about 4.6.1 compatibility
stable
|
changeset |
files
|
Fri, 08 Jun 2018 22:52:53 +0530 |
Pulkit Goyal |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
Fri, 08 Jun 2018 22:52:52 +0530 |
Pulkit Goyal |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
Fri, 08 Jun 2018 22:52:51 +0530 |
Pulkit Goyal |
test-compat: merge stable into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
Tue, 22 May 2018 23:51:57 +0530 |
Pulkit Goyal |
utility: use ui.interactive() instead of checking config value
stable
|
changeset |
files
|
Fri, 08 Jun 2018 19:48:53 +0530 |
Pulkit Goyal |
CHANGELOG: add couple of entries about things fixed
stable
|
changeset |
files
|
Fri, 08 Jun 2018 17:36:28 +0530 |
Pulkit Goyal |
next-prev: always respect the --merge flag
stable
|
changeset |
files
|
Fri, 08 Jun 2018 18:32:48 +0530 |
Pulkit Goyal |
next-prev: add tests showing --merge not respected in some cases
stable
|
changeset |
files
|
Thu, 07 Jun 2018 22:59:39 +0530 |
Pulkit Goyal |
evolve: store the evolvestate if relocation results in conflicts
|
changeset |
files
|
Thu, 07 Jun 2018 22:45:54 +0530 |
Pulkit Goyal |
tests: add more test of resolution of content-divergent changesets
|
changeset |
files
|
Thu, 07 Jun 2018 18:18:10 +0530 |
Pulkit Goyal |
evolvestate: store info about relocation while resolving content-divergence
|
changeset |
files
|
Thu, 07 Jun 2018 18:13:54 +0530 |
Pulkit Goyal |
evolve: factor out logic to merge content divergent csets in separate fn
|
changeset |
files
|
Thu, 07 Jun 2018 20:27:03 +0530 |
Pulkit Goyal |
evolve: commit the transaction if conflicts occur while merging content-div
|
changeset |
files
|
Thu, 07 Jun 2018 15:54:32 +0530 |
Pulkit Goyal |
tests: add tests for resolving content-divergence when different parents
|
changeset |
files
|
Fri, 01 Jun 2018 19:52:06 +0530 |
Pulkit Goyal |
evolve: implement resolution of content-divergence when on differet parents
|
changeset |
files
|
Fri, 01 Jun 2018 19:57:19 +0530 |
Pulkit Goyal |
tests: add tests for resolving content-divergence with parent change
|
changeset |
files
|
Wed, 06 Jun 2018 03:49:17 +0530 |
Pulkit Goyal |
CHANGELOG: add an entry about fixing issue5877
|
changeset |
files
|
Wed, 06 Jun 2018 03:26:47 +0530 |
Pulkit Goyal |
evolve: pop up editor if conflicts occur while merging commit messages
|
changeset |
files
|
Mon, 04 Jun 2018 01:28:02 +0530 |
Pulkit Goyal |
evolve: merge commit messages while resolving content-divergence (issue5877)
|
changeset |
files
|
Wed, 06 Jun 2018 01:19:36 +0530 |
Pulkit Goyal |
evolve: move if-else block under the right block
|
changeset |
files
|
Tue, 05 Jun 2018 22:02:24 +0530 |
Pulkit Goyal |
tests: make sure we don't result in commit messages conflict
|
changeset |
files
|
Tue, 05 Jun 2018 21:02:09 +0530 |
Pulkit Goyal |
tests: don't use mkcommit shell function in test-divergent.t
|
changeset |
files
|
Wed, 06 Jun 2018 14:35:36 +0200 |
Pierre-Yves David |
evolve: remove duplicated documentation
|
changeset |
files
|
Wed, 06 Jun 2018 04:09:49 +0530 |
Pulkit Goyal |
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
|
changeset |
files
|
Wed, 23 May 2018 01:11:59 +0530 |
Pulkit Goyal |
evolve: add a help topic `Interrupted-Evolve`
|
changeset |
files
|
Tue, 05 Jun 2018 03:37:15 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
Tue, 05 Jun 2018 03:36:40 +0200 |
Pierre-Yves David |
changelog: fix version number error
stable
|
changeset |
files
|
Thu, 24 May 2018 02:12:14 +0530 |
Pulkit Goyal |
evolve: return the new node formed only as the replacement
|
changeset |
files
|
Thu, 24 May 2018 17:04:20 +0530 |
Pulkit Goyal |
tests: add more test of --abort flag for content-divergence resolution
|
changeset |
files
|
Mon, 04 Jun 2018 04:03:02 +0530 |
Pulkit Goyal |
evolve: prompt user for branch selection while resolving content-divergence
|
changeset |
files
|
Tue, 05 Jun 2018 03:51:01 +0530 |
Pulkit Goyal |
evolve: pass the base revision in _completecontentdivergent()
|
changeset |
files
|
Tue, 05 Jun 2018 03:49:49 +0530 |
Pulkit Goyal |
evolve: store the base of content-divergents in evolvestate
|
changeset |
files
|
Tue, 05 Jun 2018 00:53:21 +0530 |
Pulkit Goyal |
evolve: use cmdrewrite.amend() instead of creating a new commit
|
changeset |
files
|
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
|