Mercurial > hg

changeset 45803:84eb4c833c41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <augie@google.com>
date Mon, 02 Nov 2020 14:39:43 -0500
parents ff7e0ca666e8 (current diff) f59c5d9f56b8 (diff)
children 6991f3014311
files relnotes/5.6 relnotes/next
diffstat 6 files changed, 48 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsigs	Tue Oct 13 05:15:44 2020 +0200
+++ b/.hgsigs	Mon Nov 02 14:39:43 2020 -0500
@@ -203,3 +203,4 @@
 f62bb5d07848ca598aa860a517394130b61bf2ee 0 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
+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
--- a/.hgtags	Tue Oct 13 05:15:44 2020 +0200
+++ b/.hgtags	Mon Nov 02 14:39:43 2020 -0500
@@ -216,3 +216,4 @@
 f62bb5d07848ca598aa860a517394130b61bf2ee 5.5.1
 07731064ac41dacdf0ec869ebd05c2e848c14fbf 5.5.2
 0e06a7ab9e0d5c65af4e511aee1e0342998799df 5.6rc0
+18c17d63fdabd009e70bf994e5efb7db422f4f7f 5.6
--- a/i18n/hggettext	Tue Oct 13 05:15:44 2020 +0200
+++ b/i18n/hggettext	Mon Nov 02 14:39:43 2020 -0500
@@ -123,7 +123,7 @@
     if not cmdtable:
         # Maybe we are processing mercurial.commands?
         cmdtable = getattr(mod, 'table', {})
-    functions.extend((c[0], False) for c in cmdtable.itervalues())
+    functions.extend((c[0], False) for c in cmdtable.values())
 
     for func, rstrip in functions:
         if func.__doc__:
--- a/mercurial/metadata.py	Tue Oct 13 05:15:44 2020 +0200
+++ b/mercurial/metadata.py	Mon Nov 02 14:39:43 2020 -0500
@@ -1,4 +1,4 @@
-# coding: utf8
+# coding: utf-8
 # metadata.py -- code related to various metadata computation and access.
 #
 # Copyright 2019 Google, Inc <martinvonz@google.com>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/relnotes/5.6	Mon Nov 02 14:39:43 2020 -0500
@@ -0,0 +1,44 @@
+== New Features ==
+
+ * `hg mv -A` can now be used with `--at-rev`. It behaves just like
+   `hg cp -A --at-rev`, i.e. it marks the destination as a copy of the
+   source whether or not the source still exists (but the source must
+   exist in the parent revision).
+
+ * New revset predicate `diffcontains(pattern)` for filtering revisions
+   in the same way as `hg grep --diff pattern`.
+
+ * The memory footprint per changeset and per file during pull/unbundle
+   operations has been significantly reduced.
+
+
+== New Experimental Features ==
+
+
+
+== Bug Fixes ==
+
+
+
+== Backwards Compatibility Changes ==
+
+
+
+== Internal API Changes ==
+
+ * `merge.update()` is now private (renamed to `_update()`). Hopefully
+   the higher-level functions available in the same module cover your
+   use cases.
+
+ * `phases.registernew` now takes a set of revisions instead of a list
+   of nodes. `phases.advanceboundary` takes an optional set of revisions
+   in addition to the list of nodes. The corresponeding members of the
+   `phasecache` class follow this change.
+
+ * The `addgroup` member of `revlog` classes no longer keeps a list of
+   all found nodes. It now returns True iff a node was found in the group.
+   An optional callback for duplicated nodes can be used by callers to keep
+   track of all nodes themselve.
+
+ * The `_chaininfocache` of `revlog` classes has been changed from a dict
+   to a LRU cache.
--- a/relnotes/next	Tue Oct 13 05:15:44 2020 +0200
+++ b/relnotes/next	Mon Nov 02 14:39:43 2020 -0500
@@ -1,12 +1,5 @@
 == New Features ==
 
- * `hg mv -A` can now be used with `--at-rev`. It behaves just like
-   `hg cp -A --at-rev`, i.e. it marks the destination as a copy of the
-   source whether or not the source still exists (but the source must
-   exist in the parent revision).
-
- * New revset predicate `diffcontains(pattern)` for filtering revisions
-   in the same way as `hg grep --diff pattern`.
 
  * The memory footprint per changeset and per file during pull/unbundle
    operations has been significantly reduced.
@@ -26,9 +19,6 @@
 
 == Internal API Changes ==
 
- * `merge.update()` is now private (renamed to `_update()`). Hopefully
-   the higher-level functions available in the same module cover your
-   use cases.
 
  * `phases.registernew` now takes a set of revisions instead of a list
    of nodes. `phases.advanceboundary` takes an optional set of revisions