| Mon, 29 Jul 2019 11:40:20 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Mon, 29 Jul 2019 11:40:18 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Mon, 29 Jul 2019 11:40:16 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Mon, 29 Jul 2019 11:40:14 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-5.0
mercurial-5.0
|
changeset |
files
|
| Thu, 25 Jul 2019 18:29:59 +0200 |
Pierre-Yves David |
test-compat: opening test compatibility branch for mercurial 5.0
mercurial-5.0
|
changeset |
files
|
| Mon, 29 Jul 2019 12:45:29 +0200 |
Pierre-Yves David |
test-compat: close branch for mercurial-4.0
mercurial-4.4
|
changeset |
files
|
| Thu, 25 Jul 2019 09:59:41 -0700 |
Kyle Lippincott |
prune: fix small grammatical issues in help text
stable
|
changeset |
files
|
| Fri, 19 Jul 2019 17:40:45 +0800 |
Anton Shestakov |
docs: update evolve-faq.rst with new prune flag and proper vocabulary
stable
|
changeset |
files
|
| Fri, 19 Jul 2019 17:25:29 +0800 |
Anton Shestakov |
prune: spell --successor flag without any unnecessary shortcuts
stable
|
changeset |
files
|
| Wed, 17 Jul 2019 12:47:37 -0700 |
Martin von Zweigbergk |
py3: redefine "troublecategories" in evolve as a dict
|
changeset |
files
|
| Fri, 12 Jul 2019 08:11:39 -0700 |
Martin von Zweigbergk |
py3: store to __doc__ as str (unicode on py3)
|
changeset |
files
|
| Wed, 17 Jul 2019 12:47:20 -0700 |
Martin von Zweigbergk |
py3: also catch ImportError when relative import fails
|
changeset |
files
|
| Fri, 12 Jul 2019 10:26:41 -0700 |
Martin von Zweigbergk |
py3: convert exceptions to bytes using pycompat.bytestr()
|
changeset |
files
|
| Thu, 11 Jul 2019 16:00:25 -0700 |
Martin von Zweigbergk |
py3: use "%d" for formatting integers
|
changeset |
files
|
| Fri, 12 Jul 2019 08:17:25 -0700 |
Martin von Zweigbergk |
py3: avoid "%s" for formatting None
|
changeset |
files
|
| Fri, 12 Jul 2019 08:16:30 -0700 |
Martin von Zweigbergk |
py3: use "%f" for formatting floating point number
|
changeset |
files
|
| Thu, 11 Jul 2019 15:30:43 -0700 |
Martin von Zweigbergk |
py3: fix progress() functions to not use "%s" with int
|
changeset |
files
|
| Wed, 17 Jul 2019 11:45:37 -0700 |
Martin von Zweigbergk |
py3: make random topic name generation consistent across py2/py3
|
changeset |
files
|
| Fri, 12 Jul 2019 17:02:35 -0700 |
Martin von Zweigbergk |
py3: convert str to bytes before passing to core exception
|
changeset |
files
|
| Wed, 17 Jul 2019 11:03:09 -0700 |
Martin von Zweigbergk |
py3: convert opts keys to bytes before passing to core APIs
|
changeset |
files
|
| Fri, 14 Jun 2019 18:44:43 -0700 |
kevpeng |
evolve: further clarify when update is performed
stable
|
changeset |
files
|
| Thu, 11 Jul 2019 15:30:40 -0700 |
Martin von Zweigbergk |
py3: avoid comparing int and None
|
changeset |
files
|
| Thu, 11 Jul 2019 21:48:37 -0700 |
Martin von Zweigbergk |
py3: avoid "%r" for list of byte strings, which produces b'' on py3
|
changeset |
files
|
| Thu, 11 Jul 2019 21:48:02 -0700 |
Martin von Zweigbergk |
py3: avoid "%r" for byte string, which produces b'' on py3
|
changeset |
files
|
| Thu, 11 Jul 2019 14:46:17 -0700 |
Martin von Zweigbergk |
py3: replace str(ctx) by bytes(ctx)
|
changeset |
files
|
| Thu, 11 Jul 2019 16:04:17 -0700 |
Martin von Zweigbergk |
py3: use inspect.signature() instead of inspect.getargspec() on py3
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: use array.array.{to,from}bytes() on py3
|
changeset |
files
|
| Thu, 11 Jul 2019 14:31:32 -0700 |
Martin von Zweigbergk |
py3: config values can be bytes, but never unicode
|
changeset |
files
|
| Sat, 13 Jul 2019 00:17:03 -0700 |
Martin von Zweigbergk |
py3: call branchmap.items() on py3 and continue to call iteritems() on py2
|
changeset |
files
|
| Fri, 12 Jul 2019 23:24:04 -0700 |
Martin von Zweigbergk |
py3: switch from iteritems() to items() in the topics extension
|
changeset |
files
|
| Sun, 14 Jul 2019 22:34:36 -0700 |
Martin von Zweigbergk |
py3: filter() now returns a generator, so wrap when we need a list
|
changeset |
files
|
| Fri, 12 Jul 2019 23:19:50 -0700 |
Martin von Zweigbergk |
py3: don't depend on map() iterating over its input
|
changeset |
files
|
| Thu, 11 Jul 2019 16:49:01 -0700 |
Martin von Zweigbergk |
py3: implement __bool__ in addition to __nonzero__
|
changeset |
files
|
| Thu, 11 Jul 2019 14:21:23 -0700 |
Martin von Zweigbergk |
py3: replace iter.next() by next(iter)
|
changeset |
files
|
| Thu, 11 Jul 2019 14:16:48 -0700 |
Martin von Zweigbergk |
py3: replace xrange() by range()
|
changeset |
files
|
| Thu, 11 Jul 2019 12:19:49 -0700 |
Martin von Zweigbergk |
py3: read sqlite3 data as bytes
|
changeset |
files
|
| Thu, 11 Jul 2019 12:11:43 -0700 |
Martin von Zweigbergk |
py3: sqlite3.connect() expects str arguments
|
changeset |
files
|
| Fri, 12 Jul 2019 23:00:11 -0700 |
Martin von Zweigbergk |
cleanup: remove check only needed for hg versions before 4.4
|
changeset |
files
|
| Fri, 12 Jul 2019 08:20:24 -0700 |
Martin von Zweigbergk |
split: remove an unnecessary (and confusingly typed) fallback revision
|
changeset |
files
|
| Thu, 11 Jul 2019 22:23:32 -0700 |
Martin von Zweigbergk |
evolve: rename variable "children" to "child" where it's clearly singular
|
changeset |
files
|
| Thu, 11 Jul 2019 16:24:13 -0700 |
Martin von Zweigbergk |
evolve: remove some unused variables
|
changeset |
files
|
| Thu, 11 Jul 2019 09:38:42 -0700 |
Martin von Zweigbergk |
py3: back out 23323092f0a7
|
changeset |
files
|
| Wed, 17 Jul 2019 18:06:14 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 17 Jul 2019 17:58:44 +0200 |
Sushil khanchi |
touch: fix the inconsistent behavior of divergence catching logic (issue6107)
stable
|
changeset |
files
|
| Sat, 29 Jun 2019 14:28:35 +0530 |
Sushil khanchi |
touch: add test which shows touch can fail to warn about divergence
stable
|
changeset |
files
|
| Wed, 17 Jul 2019 17:58:40 +0200 |
Sushil khanchi |
touch: clarify some inline documentation
stable
|
changeset |
files
|
| Mon, 15 Jul 2019 16:53:07 -0700 |
Martin von Zweigbergk |
tests: update output for new branch cache messsages from Mercurial
|
changeset |
files
|
| Sat, 13 Jul 2019 18:22:34 +0800 |
Anton Shestakov |
metaedit: allow operations on merge commits with some conditions
|
changeset |
files
|
| Thu, 11 Jul 2019 18:07:03 +0800 |
Anton Shestakov |
fold: allow operations on merge commits with some conditions
|
changeset |
files
|
| Thu, 11 Jul 2019 17:04:08 +0800 |
Anton Shestakov |
rewind: make sure merge commits include files from p1 and p2
|
changeset |
files
|
| Wed, 10 Jul 2019 18:16:38 +0800 |
Anton Shestakov |
touch: make sure merge commits include files from p1 and p2
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: make `import hgext3rd.evolve` work
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: use bytes for template keyword registrations
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: convert _origdoc to sysstr to match __doc__
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: use bytes for revset predicate registrations
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: use bytes for wireprotocol command registration
|
changeset |
files
|
| Tue, 09 Jul 2019 10:56:42 -0700 |
Martin von Zweigbergk |
py3: use byte strings for @command registrations
|
changeset |
files
|
| Wed, 03 Jul 2019 11:13:47 -0700 |
Martin von Zweigbergk |
py3: switch from iteritems() to items()
|
changeset |
files
|
| Wed, 03 Jul 2019 11:37:29 -0700 |
Martin von Zweigbergk |
py3: make metadata values be byte strings as Mercurial expects
|
changeset |
files
|
| Tue, 09 Jul 2019 21:49:37 -0700 |
Martin von Zweigbergk |
tests: update output for shorted prompts from Mercurial
|
changeset |
files
|
| Thu, 11 Jul 2019 10:07:39 +0200 |
Pierre-Yves David |
tests: update output for shorted prompts from Mercurial
|
changeset |
files
|
| Tue, 09 Jul 2019 17:08:34 +0800 |
Anton Shestakov |
rewriteutil: allow rewriting merge commits (issue4561)
|
changeset |
files
|
| Tue, 09 Jul 2019 17:02:44 +0800 |
Anton Shestakov |
tests: show what happens when trying to hg touch a merge commit
|
changeset |
files
|
| Thu, 04 Jul 2019 17:32:58 +0200 |
kevpeng |
evolve: further clarify that update is performed only when requested
stable
|
changeset |
files
|
| Fri, 14 Jun 2019 22:46:58 +0530 |
Sushil khanchi |
touch: let's not use util.acceptintervention() as it's not required
|
changeset |
files
|
| Thu, 04 Jul 2019 16:55:57 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 26 Jun 2019 21:11:25 +0530 |
Sushil khanchi |
evolve: use right value for branch name when finding branch heads
|
changeset |
files
|
| Tue, 25 Jun 2019 21:54:22 +0530 |
Sushil khanchi |
evolve: fix confusion in branch heads checking logic when topic in play
|
changeset |
files
|
| Sun, 14 Apr 2019 12:55:46 +0530 |
Sushil khanchi |
topic: add tests to demonstrate topic confuses the branchhead checking logic
|
changeset |
files
|
| Mon, 01 Jul 2019 19:15:57 +0530 |
Sushil khanchi |
evolve: fix the inconsistent behaviour of prune (issue6137)
stable
|
changeset |
files
|
| Tue, 02 Jul 2019 21:00:46 +0530 |
Sushil khanchi |
prune: add tests to demonstrate issue6137
stable
|
changeset |
files
|
| Sun, 30 Jun 2019 23:50:57 +0530 |
Sushil khanchi |
compat: fix `setupevolveunfinished` for upstream
|
changeset |
files
|
| Sat, 29 Jun 2019 18:21:57 +0800 |
Anton Shestakov |
prune: update to the successor of wdir also with --pair/--biject (issue6142)
stable
|
changeset |
files
|
| Sat, 22 Jun 2019 18:37:21 +0800 |
Anton Shestakov |
tests: demonstrate prune --pair not moving bookmark correctly
stable
|
changeset |
files
|
| Tue, 02 Jul 2019 10:17:42 +0200 |
Pierre-Yves David |
oops: backed out changeset 7ac40b4ea24c
|
changeset |
files
|
| Sun, 30 Jun 2019 23:50:57 +0530 |
Sushil khanchi |
compat: fix `setupevolveunfinished` for upstream
|
changeset |
files
|
| Sun, 16 Jun 2019 23:39:55 +0530 |
Sushil khanchi |
evolve: fix the code flow pattern of solving obswdir par and troubled revs
|
changeset |
files
|
| Sun, 09 Jun 2019 12:07:08 +0530 |
Sushil khanchi |
evolve: refactor for consistent behavior of evolve when wdp is obsolete
|
changeset |
files
|
| Sat, 15 Jun 2019 17:17:19 +0530 |
Sushil khanchi |
evolve: backout 3027005c42c3 to reintroduce a bug for right fix
|
changeset |
files
|
| Fri, 14 Jun 2019 18:17:03 +0800 |
Anton Shestakov |
pick: register pickstate as an unfinished state
stable
|
changeset |
files
|
| Fri, 14 Jun 2019 18:14:57 +0800 |
Anton Shestakov |
pick: rename variable for unfinishedstates
stable
|
changeset |
files
|
| Fri, 14 Jun 2019 18:26:24 +0800 |
Anton Shestakov |
pick: actually delete pickstate if --abort is given
stable
|
changeset |
files
|
| Tue, 18 Jun 2019 17:17:31 +0800 |
Anton Shestakov |
evolve: orphans that evolve into nothing don't need successors (issue5967)
stable
|
changeset |
files
|
| Sat, 22 Dec 2018 18:31:32 +0800 |
Anton Shestakov |
tests: demonstrate obsmarker creation after discarding conflicting changes
stable
|
changeset |
files
|
| Fri, 07 Jun 2019 18:14:48 +0800 |
Anton Shestakov |
pick: remove transaction on the whole command (issue6037)
stable
|
changeset |
files
|
| Sun, 23 Dec 2018 01:02:36 +0800 |
Anton Shestakov |
tests: demonstrate hg pick forgetting files after conflicts
stable
|
changeset |
files
|
| Thu, 13 Jun 2019 13:27:26 +0800 |
Anton Shestakov |
packaging: follow hg's supported python version (>= 2.7)
stable
|
changeset |
files
|
| Thu, 13 Jun 2019 13:19:44 +0800 |
Anton Shestakov |
packaging: require hg 4.5 also for usage, not just for building
stable
|
changeset |
files
|
| Tue, 11 Jun 2019 10:04:11 +0200 |
Philippe Pepiot |
packaging: require mercurial >= 4.5
stable
|
changeset |
files
|
| Sat, 08 Jun 2019 16:03:05 +0530 |
Sushil khanchi |
evolve: clarify why returning by adding inline doc
|
changeset |
files
|
| Sat, 08 Jun 2019 15:59:31 +0530 |
Sushil khanchi |
evolve: move a code block to have right value in has_some_val
|
changeset |
files
|
| Sat, 27 Apr 2019 13:09:34 +0530 |
Sushil khanchi |
topic: add tests which demonstrate topicset failure of FilteredRepoLookupError
|
changeset |
files
|
| Sat, 08 Jun 2019 16:57:34 +0800 |
Anton Shestakov |
pick: reduce configoverride() scope
|
changeset |
files
|
| Sat, 08 Jun 2019 16:09:37 +0800 |
Anton Shestakov |
evolve: correct action verb in a message
|
changeset |
files
|
| Sat, 08 Jun 2019 16:06:24 +0800 |
Anton Shestakov |
evolve: internationalize a message
|
changeset |
files
|
| Thu, 06 Jun 2019 17:37:42 +0800 |
Anton Shestakov |
evolvecmd: the proper way to deal with conflicts is to resolve them
|
changeset |
files
|
| Wed, 05 Jun 2019 17:56:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Wed, 05 Jun 2019 17:46:06 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Wed, 05 Jun 2019 17:45:45 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Wed, 05 Jun 2019 17:42:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Wed, 05 Jun 2019 17:39:32 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Wed, 05 Jun 2019 17:38:32 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Fri, 07 Jun 2019 02:25:02 +0200 |
Pierre-Yves David |
branching: merge with 9.0.0
|
changeset |
files
|
| Fri, 07 Jun 2019 02:24:08 +0200 |
Pierre-Yves David |
branching: merge back with stable
|
changeset |
files
|
| Fri, 07 Jun 2019 02:22:05 +0200 |
Pierre-Yves David |
packaging: mark as development versions
stable
|
changeset |
files
|
| Fri, 07 Jun 2019 02:15:50 +0200 |
Pierre-Yves David |
Added tag 9.0.0 for changeset 756db65030c6
stable
|
changeset |
files
|
| Thu, 06 Jun 2019 14:24:19 +0200 |
Pierre-Yves David |
packaging: prepare release 9.0.0
stable 9.0.0
|
changeset |
files
|
| Thu, 06 Jun 2019 14:32:25 +0200 |
Pierre-Yves David |
doc: clarify the status of configuration of the obshashrange protocol
stable
|
changeset |
files
|
| Thu, 06 Jun 2019 13:26:44 +0200 |
Pierre-Yves David |
changelog: add various missing bits
stable
|
changeset |
files
|
| Wed, 05 Jun 2019 19:45:35 +0200 |
Pierre-Yves David |
templatekw: keep compatibility with Mercurial 4.5
stable
|
changeset |
files
|
| Wed, 05 Jun 2019 17:21:45 +0200 |
Pierre-Yves David |
test: adjust output to stable branch
stable
|
changeset |
files
|
| Tue, 04 Jun 2019 11:08:44 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Sat, 01 Jun 2019 02:30:14 +0200 |
Joerg Sonnenberger |
templates: don't alias keywords directly
stable
|
changeset |
files
|
| Tue, 28 May 2019 16:46:18 +0800 |
Anton Shestakov |
stack: remove 'topic.' prefix from colors/labels
|
changeset |
files
|
| Sat, 18 May 2019 16:56:47 +0800 |
Anton Shestakov |
stack: handle hash sizes when --debug flag is provided
|
changeset |
files
|
| Fri, 17 May 2019 17:50:25 +0800 |
Anton Shestakov |
stack: always provide (full) node hash to non-default --template
|
changeset |
files
|
| Fri, 17 May 2019 17:42:06 +0800 |
Anton Shestakov |
stack: remove unnecessary prefix from stack output with non-default --template
|
changeset |
files
|
| Fri, 17 May 2019 17:59:58 +0800 |
Anton Shestakov |
stack: provide context to formatter with non-default --template
|
changeset |
files
|
| Sat, 11 May 2019 17:14:32 +0800 |
Anton Shestakov |
stack: leverage labelsgen() to produce all needed labels for fm.write()
|
changeset |
files
|
| Wed, 08 May 2019 16:00:34 +0800 |
Anton Shestakov |
stack: check if stack is empty more pythonically
|
changeset |
files
|