changeset 5035:c5efcbbd0dc4

branching: merge with stable

--- a/CHANGELOG	Sun Dec 01 12:41:20 2019 +0530
+++ b/CHANGELOG	Thu Dec 26 21:23:30 2019 +0100
@@ -18,11 +18,13 @@
   * rewind: preserve date
   * py3: fix setup.py --version
   * py3: fix documentation generation
+  * py3: fix some exception formatting
   * debian: allow to build with python 3
   * topic: add more options to command synopsis string
   * evolve: use more often seen metavariables in command synopsis strings
   * documentation: update text and add missing figures
   * amend: cleany abort when both `--patch` and `--extract` are passed
+  * evolve: also merge the date field when solving content-divergence
 
 9.2.1 -- 2019-10-05
 -------------------

--- a/hgext3rd/pullbundle.py	Sun Dec 01 12:41:20 2019 +0530
+++ b/hgext3rd/pullbundle.py	Thu Dec 26 21:23:30 2019 +0100
@@ -392,7 +392,7 @@
         if filematcher is not None:
             cgstream = changegroup.makestream(repo, outgoing, version, source,
                                               bundlecaps=bundlecaps,
-                                              filematcher=filematcher)
+                                              matcher=filematcher)
         else:
             cgstream = changegroup.makestream(repo, outgoing, version, source,
                                               bundlecaps=bundlecaps)

--- a/hgext3rd/topic/destination.py	Sun Dec 01 12:41:20 2019 +0530
+++ b/hgext3rd/topic/destination.py	Thu Dec 26 21:23:30 2019 +0100
@@ -10,6 +10,7 @@
 from . import (
     common,
     topicmap,
+    constants,
 )
 from .evolvebits import builddependencies
 
@@ -68,11 +69,14 @@
     topic = repo.currenttopic
     if topic:
         revs = repo.revs(b'.::topic(%s)', topic)
-    else:
+    elif constants.extrakey in repo[b'.'].extra():
         revs = []
-    if not revs:
+    else:
         return None, None, None
-    node = revs.last()
+    if revs:
+        node = revs.last()
+    else:
+        node = repo[b'.'].node()
     if bookmarks.isactivewdirparent(repo):
         movemark = repo[b'.'].node()
     return node, movemark, None

--- a/tests/test-topic-dest.t	Sun Dec 01 12:41:20 2019 +0530
+++ b/tests/test-topic-dest.t	Thu Dec 26 21:23:30 2019 +0100
@@ -500,3 +500,32 @@
   pick 38eea8439aee 14 arthur
   pick 411315c48bdc 15 pompadour
   #  p, pick = use commit
+
+  $ cd ..
+
+destination check: when active topic is empty
+
+  $ hg init emptytopic
+  $ cd emptytopic
+  $ echo a > a
+  $ hg ci -Am "added a"
+  adding a
+  $ hg topic foo
+  marked working directory as topic: foo
+  $ hg up
+  clearing empty topic "foo"
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+destination check: when wdp has a topic but wdir has no active topic:
+
+  $ hg topic foo
+  marked working directory as topic: foo
+  $ echo b > b
+  $ hg ci -Am "added b"
+  adding b
+  active topic 'foo' grew its first changeset
+  (see 'hg help topics' for more information)
+  $ hg topic --clear
+  $ hg up
+  switching to topic foo
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved