| Fri, 27 Sep 2019 06:55:05 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Mon, 09 Sep 2019 09:28:47 +0700 |
Anton Shestakov |
evolve: check that relocating makes sense in _solvedivergent() (issue5958)
stable
|
file |
diff |
annotate
|
| Mon, 16 Sep 2019 12:44:38 -0700 |
Kyle Lippincott |
cmdstate: introduce a "saver" contextmanager and use it in place of save()
|
file |
diff |
annotate
|
| Tue, 03 Sep 2019 12:48:47 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Tue, 03 Sep 2019 13:02:20 +0700 |
Anton Shestakov |
evolve: test that target is not orig in _solveunstable() (issue6097)
stable
|
file |
diff |
annotate
|
| Tue, 06 Aug 2019 15:06:38 +0200 |
Raphaël Gomès |
python3: use format-source to run byteify-strings in .py files
|
file |
diff |
annotate
|
| Tue, 06 Aug 2019 15:06:27 +0200 |
Raphaël Gomès |
python3: enforce byte prefix for vfs.open()
|
file |
diff |
annotate
|
| Tue, 06 Aug 2019 11:32:01 +0200 |
Raphaël Gomès |
python3: add raw prefix to open()-like functions
|
file |
diff |
annotate
|
| Tue, 06 Aug 2019 11:29:35 +0200 |
Raphaël Gomès |
python3: add raw prefix to "troubles"-related dicts
|
file |
diff |
annotate
|
| Tue, 06 Aug 2019 11:26:29 +0200 |
Raphaël Gomès |
python3: add raw prefix in cases harder to analyze at the token level
|
file |
diff |
annotate
|
| Tue, 06 Aug 2019 11:07:16 +0200 |
Raphaël Gomès |
python3: prefix all regex to work with python 2 and 3
|
file |
diff |
annotate
|
| Thu, 11 Jul 2019 22:56:46 +0530 |
Taapas Agrawal |
abort: added support for evolve to hg abort
|
file |
diff |
annotate
|
| Fri, 12 Jul 2019 23:43:25 +0530 |
Taapas Agrawal |
evolve: fixed lock acquire before checking state
|
file |
diff |
annotate
|
| Mon, 29 Jul 2019 13:54:57 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
file |
diff |
annotate
|
| Wed, 17 Jul 2019 12:47:37 -0700 |
Martin von Zweigbergk |
py3: redefine "troublecategories" in evolve as a dict
|
file |
diff |
annotate
|
| Wed, 17 Jul 2019 11:03:09 -0700 |
Martin von Zweigbergk |
py3: convert opts keys to bytes before passing to core APIs
|
file |
diff |
annotate
|
| Fri, 14 Jun 2019 18:44:43 -0700 |
kevpeng |
evolve: further clarify when update is performed
stable
|
file |
diff |
annotate
|
| Thu, 11 Jul 2019 14:46:17 -0700 |
Martin von Zweigbergk |
py3: replace str(ctx) by bytes(ctx)
|
file |
diff |
annotate
|
| Thu, 11 Jul 2019 14:21:23 -0700 |
Martin von Zweigbergk |
py3: replace iter.next() by next(iter)
|
file |
diff |
annotate
|
| Wed, 17 Jul 2019 18:06:14 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Wed, 03 Jul 2019 11:13:47 -0700 |
Martin von Zweigbergk |
py3: switch from iteritems() to items()
|
file |
diff |
annotate
|
| Thu, 04 Jul 2019 17:32:58 +0200 |
kevpeng |
evolve: further clarify that update is performed only when requested
stable
|
file |
diff |
annotate
|
| Thu, 04 Jul 2019 16:55:57 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Sun, 16 Jun 2019 23:39:55 +0530 |
Sushil khanchi |
evolve: fix the code flow pattern of solving obswdir par and troubled revs
|
file |
diff |
annotate
|
| Sun, 09 Jun 2019 12:07:08 +0530 |
Sushil khanchi |
evolve: refactor for consistent behavior of evolve when wdp is obsolete
|
file |
diff |
annotate
|
| Sat, 15 Jun 2019 17:17:19 +0530 |
Sushil khanchi |
evolve: backout 3027005c42c3 to reintroduce a bug for right fix
|
file |
diff |
annotate
|
| Tue, 18 Jun 2019 17:17:31 +0800 |
Anton Shestakov |
evolve: orphans that evolve into nothing don't need successors (issue5967)
stable
|
file |
diff |
annotate
|
| Sat, 08 Jun 2019 16:03:05 +0530 |
Sushil khanchi |
evolve: clarify why returning by adding inline doc
|
file |
diff |
annotate
|
| Sat, 08 Jun 2019 15:59:31 +0530 |
Sushil khanchi |
evolve: move a code block to have right value in has_some_val
|
file |
diff |
annotate
|
| Sat, 08 Jun 2019 16:09:37 +0800 |
Anton Shestakov |
evolve: correct action verb in a message
|
file |
diff |
annotate
|
| Sat, 08 Jun 2019 16:06:24 +0800 |
Anton Shestakov |
evolve: internationalize a message
|
file |
diff |
annotate
|
| Thu, 06 Jun 2019 17:37:42 +0800 |
Anton Shestakov |
evolvecmd: the proper way to deal with conflicts is to resolve them
|
file |
diff |
annotate
|
| Mon, 29 Apr 2019 23:43:16 +0530 |
Sushil khanchi |
evolve: mention that --all is default, in list of options
|
file |
diff |
annotate
|
| Sun, 05 May 2019 18:24:59 +0530 |
Sushil khanchi |
evolve: consider using three way merge to get the user for div resolution
|
file |
diff |
annotate
|
| Fri, 26 Apr 2019 01:20:08 +0530 |
Sushil khanchi |
evolve: move status msg to verbose mode in content-divergence resolution
|
file |
diff |
annotate
|
| Sat, 27 Apr 2019 22:59:48 -0400 |
Matt Harbison |
revset: switch internal uses and tests to `predecessors` from legacy name
|
file |
diff |
annotate
|
| Sat, 27 Apr 2019 22:24:30 -0400 |
Matt Harbison |
revset: add `unstable` alias for `troubled`
|
file |
diff |
annotate
|
| Thu, 25 Apr 2019 13:58:29 -0700 |
Martin von Zweigbergk |
evolve: move more of the progress-related variables together
|
file |
diff |
annotate
|
| Thu, 25 Apr 2019 14:02:11 -0700 |
Martin von Zweigbergk |
evolve: delete dead calculation of number of troubled revisions
|
file |
diff |
annotate
|
| Fri, 19 Apr 2019 10:23:53 -0700 |
Martin von Zweigbergk |
evolve: drop nested locks and transactions
|
file |
diff |
annotate
|
| Fri, 19 Apr 2019 10:22:25 -0700 |
Martin von Zweigbergk |
evolve: use single transaction also when continuing
|
file |
diff |
annotate
|
| Fri, 19 Apr 2019 09:41:39 -0700 |
Martin von Zweigbergk |
evolve: run in a single transaction
|
file |
diff |
annotate
|
| Fri, 19 Apr 2019 10:01:32 -0700 |
Martin von Zweigbergk |
evolve: extract function for solving one revision, including merges
|
file |
diff |
annotate
|
| Thu, 25 Apr 2019 17:20:32 +0800 |
Anton Shestakov |
evolve: mention that --all is the default behavior now
|
file |
diff |
annotate
|
| Thu, 25 Apr 2019 17:19:41 +0800 |
Anton Shestakov |
evolve: mention that not all successful operations currently update wdir
|
file |
diff |
annotate
|
| Tue, 23 Apr 2019 11:07:28 -0700 |
Martin von Zweigbergk |
evolve: add progress support for --continue
|
file |
diff |
annotate
|
| Tue, 23 Apr 2019 10:56:42 -0700 |
Martin von Zweigbergk |
evolve: reduce scope of progress-related variables
|
file |
diff |
annotate
|
| Tue, 23 Apr 2019 10:49:47 -0700 |
Martin von Zweigbergk |
evolve: move progress-clearing out of _cleanup()
|
file |
diff |
annotate
|
| Tue, 23 Apr 2019 10:52:33 -0700 |
Martin von Zweigbergk |
evolve: stop passing no-op "progresscb" into continueevolve()
|
file |
diff |
annotate
|
| Tue, 23 Apr 2019 09:45:45 -0700 |
Martin von Zweigbergk |
evolve: _solveunstable() update progress only once
|
file |
diff |
annotate
|
| Tue, 23 Apr 2019 09:35:34 -0700 |
Martin von Zweigbergk |
evolve: don't update progress just before clearing it
|
file |
diff |
annotate
|
| Tue, 23 Apr 2019 09:31:32 -0700 |
Martin von Zweigbergk |
evolve: clean up progress bar also when using -r
|
file |
diff |
annotate
|
| Fri, 19 Apr 2019 10:03:39 -0700 |
Martin von Zweigbergk |
evolve: increment progress *after* a whole merge commit is done
|
file |
diff |
annotate
|
| Fri, 19 Apr 2019 11:02:35 -0700 |
Martin von Zweigbergk |
evolve: use util.acceptintervention() for closing transactions
|
file |
diff |
annotate
|
| Fri, 19 Apr 2019 10:32:32 -0700 |
Martin von Zweigbergk |
evolve: use context manager for transactions
|
file |
diff |
annotate
|
| Fri, 19 Apr 2019 10:52:16 -0700 |
Martin von Zweigbergk |
evolve: use consistent message and just re-raise InterventionRequired
|
file |
diff |
annotate
|
| Fri, 19 Apr 2019 10:47:12 -0700 |
Martin von Zweigbergk |
evolve: use standard InterventionRequired instead of MergeFailure
|
file |
diff |
annotate
|
| Fri, 19 Apr 2019 10:41:56 -0700 |
Martin von Zweigbergk |
evolve: don't use exception for local flow control
|
file |
diff |
annotate
|
| Tue, 23 Apr 2019 11:02:08 -0700 |
Martin von Zweigbergk |
evolve: reduce indentation with an early return statement
|
file |
diff |
annotate
|
| Tue, 23 Apr 2019 11:01:44 -0700 |
Martin von Zweigbergk |
evolve: remove a useless return statement at end of function
|
file |
diff |
annotate
|