D6764: match: simplify the regexps created for glob patterns

2019-08-25 Thread valentin.gatienbaron (Valentin Gatien-Baron) 
valentin.gatienbaron created this revision.
Herald added subscribers: mercurial-devel, kevincox, durin42.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  For legibility of the resulting regexes, although it may help with
  performance as well.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6764

AFFECTED FILES
  mercurial/match.py
  rust/hg-core/src/filepatterns.rs
  rust/hg-core/src/utils.rs
  tests/test-hgignore.t
  tests/test-walk.t

CHANGE DETAILS

diff --git a/tests/test-walk.t b/tests/test-walk.t
--- a/tests/test-walk.t
+++ b/tests/test-walk.t
@@ -100,7 +100,7 @@
   f  mammals/skunk  skunk
   $ hg debugwalk -v -I 'relglob:*k'
   * matcher:
-  
+  
   f  beans/black../beans/black
   f  fenugreek  ../fenugreek
   f  mammals/skunk  skunk
@@ -108,7 +108,7 @@
   * matcher:
   ,
-m2=>
+m2=>
   f  mammals/skunk  skunk
   $ hg debugwalk -v -I 're:.*k$'
   * matcher:
diff --git a/tests/test-hgignore.t b/tests/test-hgignore.t
--- a/tests/test-hgignore.t
+++ b/tests/test-hgignore.t
@@ -177,7 +177,7 @@
   ? a.c
   ? syntax
   $ hg debugignore
-  
+  
 
   $ cd ..
   $ echo > .hg/testhgignorerel
@@ -224,7 +224,7 @@
   A b.o
 
   $ hg debugignore
-  
+  
 
   $ hg debugignore b.o
   b.o is ignored
diff --git a/rust/hg-core/src/utils.rs b/rust/hg-core/src/utils.rs
--- a/rust/hg-core/src/utils.rs
+++ b/rust/hg-core/src/utils.rs
@@ -41,6 +41,7 @@
 fn trim_end() -> 
 fn trim_start() -> 
 fn trim() -> 
+fn chop_prefix(, needle:&[u8]) -> Option<&[u8]>;
 }
 
 fn is_not_whitespace(c: ) -> bool {
@@ -81,4 +82,12 @@
 fn trim() -> &[u8] {
 self.trim_start().trim_end()
 }
+
+fn chop_prefix(, needle:&[u8]) -> Option<&[u8]> {
+if self.starts_with(needle) {
+Some([needle.len()..])
+} else {
+None
+}
+}
 }
diff --git a/rust/hg-core/src/filepatterns.rs b/rust/hg-core/src/filepatterns.rs
--- a/rust/hg-core/src/filepatterns.rs
+++ b/rust/hg-core/src/filepatterns.rs
@@ -184,14 +184,22 @@
 res.extend(b"[^/]+$");
 res
 }
+PatternSyntax::RelGlob => {
+let mut res: Vec = vec![];
+let glob_re = glob_to_re(pattern);
+if let Some(rest) = glob_re.chop_prefix(b"[^/]*") {
+res.extend(b".*");
+res.extend(rest);
+} else {
+res.extend(b"(?:|.*/)");
+res.extend(glob_re);
+}
+res.extend(globsuffix.iter());
+res
+}
 PatternSyntax::Glob
-| PatternSyntax::RelGlob
 | PatternSyntax::RootGlob => {
 let mut res: Vec = vec![];
-if syntax == PatternSyntax::RelGlob {
-res.extend(b"(?:|.*/)");
-}
-
 res.extend(glob_to_re(pattern));
 res.extend(globsuffix.iter());
 res
@@ -268,8 +276,8 @@
 continue;
 }
 
-if line.starts_with(b"syntax:") {
-let syntax = line[b"syntax:".len()..].trim();
+if let Some(syntax) = line.chop_prefix(b"syntax:") {
+let syntax = syntax.trim();
 
 if let Some(rel_syntax) = SYNTAXES.get(syntax) {
 current_syntax = rel_syntax;
diff --git a/mercurial/match.py b/mercurial/match.py
--- a/mercurial/match.py
+++ b/mercurial/match.py
@@ -1223,7 +1223,12 @@
 # Anything after the pattern must be a non-directory.
 return escaped + '[^/]+$'
 if kind == 'relglob':
-return '(?:|.*/)' + _globre(pat) + globsuffix
+globre = _globre(pat)
+if globre.startswith('[^/]*'):
+# When pat has the form *XYZ (common), make the returned regex more
+# legible by returning the regex for **XYZ instead of **/*XYZ.
+return '.*' + globre[len('[^/]*'):] + globsuffix
+return '(?:|.*/)' + globre + globsuffix
 if kind == 'relre':
 if pat.startswith('^'):
 return pat



To: valentin.gatienbaron, #hg-reviewers
Cc: durin42, kevincox, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6765: rustfilepatterns: shorter code for concatenating slices

2019-08-25 Thread valentin.gatienbaron (Valentin Gatien-Baron) 
valentin.gatienbaron created this revision.
Herald added subscribers: mercurial-devel, kevincox, durin42.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6765

AFFECTED FILES
  rust/hg-core/src/filepatterns.rs

CHANGE DETAILS

diff --git a/rust/hg-core/src/filepatterns.rs b/rust/hg-core/src/filepatterns.rs
--- a/rust/hg-core/src/filepatterns.rs
+++ b/rust/hg-core/src/filepatterns.rs
@@ -158,26 +158,20 @@
 if pattern[0] == b'^' {
 return pattern.to_owned();
 }
-let mut res = b".*".to_vec();
-res.extend(pattern);
-res
+[".*"[..], pattern].concat()
 }
 PatternSyntax::Path | PatternSyntax::RelPath => {
 if pattern == b"." {
 return vec![];
 }
-let mut pattern = escape_pattern(pattern);
-pattern.extend(b"(?:/|$)");
-pattern
+[_pattern(pattern), "(?:/|$)"[..]].concat()
 }
 PatternSyntax::RootFiles => {
 let mut res = if pattern == b"." {
 vec![]
 } else {
 // Pattern is a directory name.
-let mut as_vec: Vec = escape_pattern(pattern);
-as_vec.push(b'/');
-as_vec
+[_pattern(pattern), "/"[..]].concat()
 };
 
 // Anything after the pattern must be a non-directory.
@@ -185,24 +179,16 @@
 res
 }
 PatternSyntax::RelGlob => {
-let mut res: Vec = vec![];
 let glob_re = glob_to_re(pattern);
 if let Some(rest) = glob_re.chop_prefix(b"[^/]*") {
-res.extend(b".*");
-res.extend(rest);
+[".*"[..], rest, globsuffix].concat()
 } else {
-res.extend(b"(?:|.*/)");
-res.extend(glob_re);
+["(?:|.*/)"[..], _re, globsuffix].concat()
 }
-res.extend(globsuffix.iter());
-res
 }
 PatternSyntax::Glob
 | PatternSyntax::RootGlob => {
-let mut res: Vec = vec![];
-res.extend(glob_to_re(pattern));
-res.extend(globsuffix.iter());
-res
+[_to_re(pattern), globsuffix].concat()
 }
 }
 }



To: valentin.gatienbaron, #hg-reviewers
Cc: durin42, kevincox, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6763: tests: show the pattern generated for a relative glob

2019-08-25 Thread valentin.gatienbaron (Valentin Gatien-Baron) 
valentin.gatienbaron created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6763

AFFECTED FILES
  tests/test-hgignore.t

CHANGE DETAILS

diff --git a/tests/test-hgignore.t b/tests/test-hgignore.t
--- a/tests/test-hgignore.t
+++ b/tests/test-hgignore.t
@@ -176,6 +176,8 @@
   ? .hgignore
   ? a.c
   ? syntax
+  $ hg debugignore
+  
 
   $ cd ..
   $ echo > .hg/testhgignorerel



To: valentin.gatienbaron, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6704: config: add defaultvalue template keyword

2019-08-25 Thread yuja (Yuya Nishihara) 
yuja added a comment.


  >   `hg config -T '{defaultvalue}'` shows a bunch of entries like ``, which is clearly not something we want to show the 
user. Also `hg config -T json` crashes for a similar reason 
(`mercurial.error.ProgrammingError: cannot encode `).
  
  Yup. That's mostly because of configitems.dynamicdefault.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6704/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6704

To: navaneeth.suresh, #hg-reviewers
Cc: martinvonz, yuja, durin42, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: D6704: config: add defaultvalue template keyword

2019-08-25 Thread Yuya Nishihara 
>   `hg config -T '{defaultvalue}'` shows a bunch of entries like ` object at 0x7fc4295c00f0>`, which is clearly not something we want to show 
> the user. Also `hg config -T json` crashes for a similar reason 
> (`mercurial.error.ProgrammingError: cannot encode  0x7fdd1a6a20f0>`).

Yup. That's mostly because of configitems.dynamicdefault.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6704: config: add defaultvalue template keyword

2019-08-25 Thread martinvonz (Martin von Zweigbergk) 
martinvonz added a comment.


  `hg config -T '{defaultvalue}'` shows a bunch of entries like ``, which is clearly not something we want to show the user. 
Also `hg config -T json` crashes for a similar reason 
(`mercurial.error.ProgrammingError: cannot encode `).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6704/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6704

To: navaneeth.suresh, #hg-reviewers
Cc: martinvonz, yuja, durin42, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6754: contrib: proof of concept script to build Mac packages without system python

2019-08-25 Thread mharbison72 (Matt Harbison) 
mharbison72 added a comment.
mharbison72 added a subscriber: durin42.


  In D6754#99255 , @indygreg wrote:
  
  > This looks promising.
  > I don't want to tell you not to work on this, but my bold plan is to get 
Mercurial using PyOxidizer and leaning on PyOxidizer for packaging. This will 
require shipping a Python 3 Mercurial, however.
  
  Thanks for the pointers.
  
  I'm broadly aware of the plans to use PyOxidizer for py3, and hope to use it 
for thg too.  I started this with nothing more in mind than making the 
installer support more than 10.14.  But since it links against the system 
python, setting the MACOS_DEPLOYMENT_TARGET (or whatever it's called) errors 
out.  So I tried allowing PYTHON to be overridden in the makefile, so it could 
be pointed to the python.org install and go back to 10.9.  But @durin42 locked 
it into the system python in da1848f07c6a 
, 
and things just kinda snowballed from there.  He mentioned on IRC that a 
pyinstaller dependency wouldn't be great, and also maybe we don't want to be 
completely tied to PyOxidizer.  (I took it as don't preclude other methods, but 
maybe that needs to be clarified.)
  
  > Until PyOxidizer is ready, you may want to look into Beeware's Briefcase 
tool for packaging macOS applications. It also provides its own self-contained 
Python distribution. I'm not sure if it works with Python 2.7, however.
  
  There at least appears to be a package visible in pip27, but the docs talk 
about building a *.app, which isn't going to be useful for us.
  
  > You may also be interested in 
https://github.com/indygreg/python-build-standalone for self-contained Python 
distributions. Only works with Python 3.7+ at the moment now, though. The 
pre-built distributions on GitHub having a working Python install in them. All 
the Python C extensions are statically linked into the `python` executable.
  
  I'll try to find time to play with this in the next week or so.  I'm not sure 
what it would take to support py2, but I'd rather everybody poured their effort 
in elsewhere at this point.  @durin42 mentioned on IRC that it's long past time 
to get off the system python, but the only real deadline is that it won't be in 
10.16 a year from now.  Hopefully the codebase is still supporting py2 then, 
but maybe the py3 support is good enough that we don't need an official py2 
installer?  End of py2 support doesn't seem like a big deal, unless some 
horrible TLS bug is found.
  
  I suppose a reasonable fix for supporting more OS versions is to spin up a 
10.9 VM and build there.  I don't have one right now, but I do have a machine 
that is going to be setup to host various Mac VMs, and I don't have a problem 
building the installer on it if there's interest.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6754/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6754

To: mharbison72, #hg-reviewers
Cc: durin42, indygreg, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH STABLE] python-zstandard: apply big-endian fix (issue6188)

2019-08-25 Thread Julien Cristau 
Hi Greg,

On Sun, Aug 25, 2019 at 09:01:58 -0700, Gregory Szorc wrote:

> # HG changeset patch
> # User Gregory Szorc 
> # Date 1566748826 25200
> #  Sun Aug 25 09:00:26 2019 -0700
> # Branch stable
> # Node ID 0da517c3ff6ce9e0ea014a85fb7344eca61b97b2
> # Parent  7521e6d18057bfc41614d63c85424c50ee114cdf
> python-zstandard: apply big-endian fix (issue6188)
> 
For what it's worth the test failure from issue6188 happens with or
without this patch, and affects both 32 and 64bit builds.

Cheers,
Julien
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

2019-08-25 Thread navaneeth.suresh (Navaneeth Suresh) 
Closed by commit rHG3332bde53714: exchange: abort on pushing bookmarks pointing 
to secret changesets (issue6159) (authored by navaneeth.suresh).
This revision was automatically updated to reflect the committed changes.

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D6731?vs=16305=16315#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6731?vs=16305=16315

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6731/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6731

AFFECTED FILES
  mercurial/exchange.py
  tests/test-bookmarks-pushpull.t

CHANGE DETAILS

diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -1344,39 +1344,9 @@
   $ hg commit -qAm_ --config phases.new-commit=secret
 
 Pushing the bookmark "foo" now fails as it contains a secret changeset
-#if b2-pushkey
-  $ hg push -r foo
-  pushing to $TESTTMP/issue6159remote
-  searching for changes
-  no changes found (ignored 1 secret changesets)
-  abort: updating bookmark foo failed!
-  [255]
-#endif
-
-#if b2-binary
   $ hg push -r foo
   pushing to $TESTTMP/issue6159remote
   searching for changes
   no changes found (ignored 1 secret changesets)
-  updating bookmark foo
-  [1]
-#endif
-
-Now the "remote" repo contains a bookmark pointing to a nonexistent revision
-  $ cd ../issue6159remote
-#if b2-pushkey
-  $ hg bookmark
-   * foo   0:1599bc8b897a
-  $ hg log -r 1599bc8b897a
-  0:1599bc8b897a _ (no-eol)
-#endif
-
-#if b2-binary
-  $ hg bookmark
-  no bookmarks set
-  $ cat .hg/bookmarks
-  cf489fd8a374cab73c2dc19e899bde6fe3a43f8f foo
-  $ hg log -r cf489fd8a374
-  abort: unknown revision 'cf489fd8a374'!
+  abort: cannot push bookmark foo as it points to a secret changeset
   [255]
-#endif
diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -1034,6 +1034,12 @@
 return 'delete'
 return 'update'
 
+def _abortonsecretctx(pushop, node, b):
+"""abort if a given bookmark points to a secret changeset"""
+if node and pushop.repo[node].phase() == phases.secret:
+raise error.Abort(_('cannot push bookmark %s as it points to a secret'
+' changeset') % b)
+
 def _pushb2bookmarkspart(pushop, bundler):
 pushop.stepsdone.add('bookmarks')
 if not pushop.outbookmarks:
@@ -1042,6 +1048,7 @@
 allactions = []
 data = []
 for book, old, new in pushop.outbookmarks:
+_abortonsecretctx(pushop, new, book)
 new = bin(new)
 data.append((book, new))
 allactions.append((book, _bmaction(old, new)))
@@ -1070,6 +1077,7 @@
 assert False
 
 for book, old, new in pushop.outbookmarks:
+_abortonsecretctx(pushop, new, book)
 part = bundler.newpart('pushkey')
 part.addparam('namespace', enc('bookmarks'))
 part.addparam('key', enc(book))



To: navaneeth.suresh, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6740: tests: add test to demonstrate issue6159

2019-08-25 Thread navaneeth.suresh (Navaneeth Suresh) 
Closed by commit rHGcf9dbc7377de: tests: add test to demonstrate issue6159 
(authored by navaneeth.suresh).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6740?vs=16298=16314

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6740/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6740

AFFECTED FILES
  tests/test-bookmarks-pushpull.t

CHANGE DETAILS

diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -1322,3 +1322,61 @@
   abort: push failed on remote
   [255]
 #endif
+
+-- test for pushing bookmarks pointing to secret changesets
+
+Set up a "remote" repo
+  $ hg init issue6159remote
+  $ cd issue6159remote
+  $ echo a > a
+  $ hg add a
+  $ hg commit -m_
+  $ hg bookmark foo
+  $ cd ..
+
+Clone a local repo
+  $ hg clone -q issue6159remote issue6159local
+  $ cd issue6159local
+  $ hg up -qr foo
+  $ echo b > b
+
+Move the bookmark "foo" to point at a secret changeset
+  $ hg commit -qAm_ --config phases.new-commit=secret
+
+Pushing the bookmark "foo" now fails as it contains a secret changeset
+#if b2-pushkey
+  $ hg push -r foo
+  pushing to $TESTTMP/issue6159remote
+  searching for changes
+  no changes found (ignored 1 secret changesets)
+  abort: updating bookmark foo failed!
+  [255]
+#endif
+
+#if b2-binary
+  $ hg push -r foo
+  pushing to $TESTTMP/issue6159remote
+  searching for changes
+  no changes found (ignored 1 secret changesets)
+  updating bookmark foo
+  [1]
+#endif
+
+Now the "remote" repo contains a bookmark pointing to a nonexistent revision
+  $ cd ../issue6159remote
+#if b2-pushkey
+  $ hg bookmark
+   * foo   0:1599bc8b897a
+  $ hg log -r 1599bc8b897a
+  0:1599bc8b897a _ (no-eol)
+#endif
+
+#if b2-binary
+  $ hg bookmark
+  no bookmarks set
+  $ cat .hg/bookmarks
+  cf489fd8a374cab73c2dc19e899bde6fe3a43f8f foo
+  $ hg log -r cf489fd8a374
+  abort: unknown revision 'cf489fd8a374'!
+  [255]
+#endif



To: navaneeth.suresh, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6754: contrib: proof of concept script to build Mac packages without system python

2019-08-25 Thread indygreg (Gregory Szorc) 
indygreg added a comment.


  This looks promising.
  
  I don't want to tell you not to work on this, but my bold plan is to get 
Mercurial using PyOxidizer and leaning on PyOxidizer for packaging. This will 
require shipping a Python 3 Mercurial, however.
  
  Until PyOxidizer is ready, you may want to look into Beeware's Briefcase tool 
for packaging macOS applications. It also provides its own self-contained 
Python distribution. I'm not sure if it works with Python 2.7, however.
  
  You may also be interested in 
https://github.com/indygreg/python-build-standalone for self-contained Python 
distributions. Only works with Python 3.7+ at the moment now, though. The 
pre-built distributions on GitHub having a working Python install in them. All 
the Python C extensions are statically linked into the `python` executable.

INLINE COMMENTS

> make_osx.sh:16
> +# TODO: Don't install this into the virtual environment. Also, use 
> docutils-python3
> +python -m pip install docutils
> +

We should be pinning versions and hashes when installing anything from the 
network. For reproducibility and security.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6754/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6754

To: mharbison72, #hg-reviewers
Cc: indygreg, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6741: interfaces: create a new folder for interfaces and move repository.py in it

2019-08-25 Thread pulkit (Pulkit Goyal) 
Closed by commit rHG268662aac075: interfaces: create a new folder for 
interfaces and move repository.py in it (authored by pulkit).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6741?vs=16259=16312

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6741/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6741

AFFECTED FILES
  contrib/import-checker.py
  hgext/lfs/__init__.py
  hgext/lfs/wrapper.py
  hgext/narrow/__init__.py
  hgext/narrow/narrowbundle2.py
  hgext/narrow/narrowcommands.py
  hgext/sqlitestore.py
  mercurial/changegroup.py
  mercurial/exchange.py
  mercurial/exchangev2.py
  mercurial/filelog.py
  mercurial/hg.py
  mercurial/httppeer.py
  mercurial/interfaces/__init__.py
  mercurial/interfaces/repository.py
  mercurial/localrepo.py
  mercurial/manifest.py
  mercurial/narrowspec.py
  mercurial/repository.py
  mercurial/revlog.py
  mercurial/revlogutils/constants.py
  mercurial/streamclone.py
  mercurial/testing/storage.py
  mercurial/utils/storageutil.py
  mercurial/wireprotov1peer.py
  setup.py
  tests/notcapable
  tests/pullext.py
  tests/simplestorerepo.py
  tests/test-check-interfaces.py
  tests/wireprotosimplecache.py

CHANGE DETAILS

diff --git a/tests/wireprotosimplecache.py b/tests/wireprotosimplecache.py
--- a/tests/wireprotosimplecache.py
+++ b/tests/wireprotosimplecache.py
@@ -10,12 +10,14 @@
 from mercurial import (
 extensions,
 registrar,
-repository,
 util,
 wireprotoserver,
 wireprototypes,
 wireprotov2server,
 )
+from mercurial.interfaces import (
+repository,
+)
 from mercurial.utils import (
 interfaceutil,
 stringutil,
diff --git a/tests/test-check-interfaces.py b/tests/test-check-interfaces.py
--- a/tests/test-check-interfaces.py
+++ b/tests/test-check-interfaces.py
@@ -14,6 +14,9 @@
 'test-repo']):
 sys.exit(80)
 
+from mercurial.interfaces import (
+repository,
+)
 from mercurial.thirdparty.zope import (
 interface as zi,
 )
@@ -27,7 +30,6 @@
 localrepo,
 manifest,
 pycompat,
-repository,
 revlog,
 sshpeer,
 statichttprepo,
diff --git a/tests/simplestorerepo.py b/tests/simplestorerepo.py
--- a/tests/simplestorerepo.py
+++ b/tests/simplestorerepo.py
@@ -32,11 +32,13 @@
 localrepo,
 mdiff,
 pycompat,
-repository,
 revlog,
 store,
 verify,
 )
+from mercurial.interfaces import (
+repository,
+)
 from mercurial.utils import (
 cborutil,
 interfaceutil,
diff --git a/tests/pullext.py b/tests/pullext.py
--- a/tests/pullext.py
+++ b/tests/pullext.py
@@ -13,6 +13,8 @@
 error,
 extensions,
 localrepo,
+)
+from mercurial.interfaces import (
 repository,
 )
 
diff --git a/tests/notcapable b/tests/notcapable
--- a/tests/notcapable
+++ b/tests/notcapable
@@ -6,7 +6,8 @@
 fi
 
 cat > notcapable-$CAP.py << EOF
-from mercurial import extensions, localrepo, repository
+from mercurial import extensions, localrepo
+from mercurial.interfaces import repository
 def extsetup(ui):
 extensions.wrapfunction(repository.peer, 'capable', wrapcapable)
 extensions.wrapfunction(localrepo.localrepository, 'peer', wrappeer)
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1067,6 +1067,7 @@
 'mercurial.cext',
 'mercurial.cffi',
 'mercurial.hgweb',
+'mercurial.interfaces',
 'mercurial.pure',
 'mercurial.thirdparty',
 'mercurial.thirdparty.attr',
diff --git a/mercurial/wireprotov1peer.py b/mercurial/wireprotov1peer.py
--- a/mercurial/wireprotov1peer.py
+++ b/mercurial/wireprotov1peer.py
@@ -22,10 +22,12 @@
 error,
 pushkey as pushkeymod,
 pycompat,
-repository,
 util,
 wireprototypes,
 )
+from .interfaces import (
+repository,
+)
 from .utils import (
 interfaceutil,
 )
diff --git a/mercurial/utils/storageutil.py b/mercurial/utils/storageutil.py
--- a/mercurial/utils/storageutil.py
+++ b/mercurial/utils/storageutil.py
@@ -22,8 +22,8 @@
 error,
 mdiff,
 pycompat,
-repository,
 )
+from ..interfaces import repository
 
 _nullhash = hashlib.sha1(nullid)
 
diff --git a/mercurial/testing/storage.py b/mercurial/testing/storage.py
--- a/mercurial/testing/storage.py
+++ b/mercurial/testing/storage.py
@@ -17,6 +17,8 @@
 from .. import (
 error,
 mdiff,
+)
+from ..interfaces import (
 repository,
 )
 from ..utils import (
diff --git a/mercurial/streamclone.py b/mercurial/streamclone.py
--- a/mercurial/streamclone.py
+++ b/mercurial/streamclone.py
@@ -12,13 +12,15 @@
 import struct
 
 from .i18n import _
+from .interfaces import (
+repository,
+)
 from . import (
 cacheutil,
 error,
 narrowspec,
 phases,
 pycompat,
-repository,
 store,
 util,
 )
diff --git a/mercurial/revlogutils/constants.py 
b/mercurial/revlogutils/constants.py
---

D6742: interfaceutil: move to interfaces/

2019-08-25 Thread pulkit (Pulkit Goyal) 
Closed by commit rHG2c4f656c8e9f: interfaceutil: move to interfaces/ (authored 
by pulkit).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6742?vs=16260=16311

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6742/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6742

AFFECTED FILES
  hgext/sqlitestore.py
  mercurial/filelog.py
  mercurial/httppeer.py
  mercurial/interfaces/repository.py
  mercurial/interfaces/util.py
  mercurial/localrepo.py
  mercurial/manifest.py
  mercurial/revlog.py
  mercurial/utils/interfaceutil.py
  mercurial/wireprotoserver.py
  mercurial/wireprototypes.py
  mercurial/wireprotov1peer.py
  mercurial/wireprotov2server.py
  tests/simplestorerepo.py
  tests/wireprotosimplecache.py

CHANGE DETAILS

diff --git a/tests/wireprotosimplecache.py b/tests/wireprotosimplecache.py
--- a/tests/wireprotosimplecache.py
+++ b/tests/wireprotosimplecache.py
@@ -17,9 +17,9 @@
 )
 from mercurial.interfaces import (
 repository,
+util as interfaceutil,
 )
 from mercurial.utils import (
-interfaceutil,
 stringutil,
 )
 
diff --git a/tests/simplestorerepo.py b/tests/simplestorerepo.py
--- a/tests/simplestorerepo.py
+++ b/tests/simplestorerepo.py
@@ -38,10 +38,10 @@
 )
 from mercurial.interfaces import (
 repository,
+util as interfaceutil,
 )
 from mercurial.utils import (
 cborutil,
-interfaceutil,
 storageutil,
 )
 from mercurial.revlogutils import (
diff --git a/mercurial/wireprotov2server.py b/mercurial/wireprotov2server.py
--- a/mercurial/wireprotov2server.py
+++ b/mercurial/wireprotov2server.py
@@ -28,9 +28,11 @@
 wireprotoframing,
 wireprototypes,
 )
+from .interfaces import (
+util as interfaceutil,
+)
 from .utils import (
 cborutil,
-interfaceutil,
 stringutil,
 )
 
diff --git a/mercurial/wireprotov1peer.py b/mercurial/wireprotov1peer.py
--- a/mercurial/wireprotov1peer.py
+++ b/mercurial/wireprotov1peer.py
@@ -27,9 +27,7 @@
 )
 from .interfaces import (
 repository,
-)
-from .utils import (
-interfaceutil,
+util as interfaceutil,
 )
 
 urlreq = util.urlreq
diff --git a/mercurial/wireprototypes.py b/mercurial/wireprototypes.py
--- a/mercurial/wireprototypes.py
+++ b/mercurial/wireprototypes.py
@@ -17,9 +17,11 @@
 error,
 util,
 )
+from .interfaces import (
+util as interfaceutil,
+)
 from .utils import (
 compression,
-interfaceutil,
 )
 
 # Names of the SSH protocol implementations.
diff --git a/mercurial/wireprotoserver.py b/mercurial/wireprotoserver.py
--- a/mercurial/wireprotoserver.py
+++ b/mercurial/wireprotoserver.py
@@ -21,10 +21,12 @@
 wireprotov1server,
 wireprotov2server,
 )
+from .interfaces import (
+util as interfaceutil,
+)
 from .utils import (
 cborutil,
 compression,
-interfaceutil,
 )
 
 stringio = util.stringio
diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -70,13 +70,13 @@
 )
 from .interfaces import (
 repository,
+util as interfaceutil,
 )
 from .revlogutils import (
 deltas as deltautil,
 flagutil,
 )
 from .utils import (
-interfaceutil,
 storageutil,
 stringutil,
 )
diff --git a/mercurial/manifest.py b/mercurial/manifest.py
--- a/mercurial/manifest.py
+++ b/mercurial/manifest.py
@@ -29,9 +29,7 @@
 )
 from .interfaces import (
 repository,
-)
-from .utils import (
-interfaceutil,
+util as interfaceutil,
 )
 
 parsers = policy.importmod(r'parsers')
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -68,10 +68,10 @@
 
 from .interfaces import (
 repository,
+util as interfaceutil,
 )
 
 from .utils import (
-interfaceutil,
 procutil,
 stringutil,
 )
diff --git a/mercurial/utils/interfaceutil.py b/mercurial/interfaces/util.py
rename from mercurial/utils/interfaceutil.py
rename to mercurial/interfaces/util.py
--- a/mercurial/utils/interfaceutil.py
+++ b/mercurial/interfaces/util.py
@@ -1,4 +1,4 @@
-# interfaceutil.py - Utilities for declaring interfaces.
+# util.py - Utilities for declaring interfaces.
 #
 # Copyright 2018 Gregory Szorc 
 #
diff --git a/mercurial/interfaces/repository.py 
b/mercurial/interfaces/repository.py
--- a/mercurial/interfaces/repository.py
+++ b/mercurial/interfaces/repository.py
@@ -11,8 +11,8 @@
 from .. import (
 error,
 )
-from ..utils import (
-interfaceutil,
+from . import (
+util as interfaceutil,
 )
 
 # When narrowing is finalized and no longer subject to format changes,
diff --git a/mercurial/httppeer.py b/mercurial/httppeer.py
--- a/mercurial/httppeer.py
+++ b/mercurial/httppeer.py
@@ -16,9 +16,6 @@
 import weakref
 
 from .i18n import _
-from .interfaces import (
-repository,
-)
 from . import (
 bundle2,
 error,
@@ -33,9 +30,12 @@
 wireprotov2peer,
 wireprotov2server,

D6753: contrib: simplify the genosxversion.py command to find the hg libraries

2019-08-25 Thread mharbison72 (Matt Harbison) 
Closed by commit rHG197e7326b8b8: contrib: simplify the genosxversion.py 
command to find the hg libraries (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6753?vs=16287=16313

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6753/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6753

AFFECTED FILES
  contrib/genosxversion.py

CHANGE DETAILS

diff --git a/contrib/genosxversion.py b/contrib/genosxversion.py
--- a/contrib/genosxversion.py
+++ b/contrib/genosxversion.py
@@ -2,14 +2,13 @@
 from __future__ import absolute_import, print_function
 
 import argparse
-import json
 import os
 import subprocess
 import sys
 
 # Always load hg libraries from the hg we can find on $PATH.
-hglib = json.loads(subprocess.check_output(
-['hg', 'debuginstall', '-Tjson']))[0]['hgmodules']
+hglib = subprocess.check_output(
+['hg', 'debuginstall', '-T', '{hgmodules}'])
 sys.path.insert(0, os.path.dirname(hglib))
 
 from mercurial import util



To: mharbison72, #hg-reviewers, indygreg
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6762: packaging: add Bullseye, remove Jessie

2019-08-25 Thread av6 (Anton Shestakov) 
Closed by commit rHG0a50a4232db7: packaging: add Bullseye, remove Jessie 
(authored by av6).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6762?vs=16308=16310

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6762/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6762

AFFECTED FILES
  contrib/packaging/Makefile

CHANGE DETAILS

diff --git a/contrib/packaging/Makefile b/contrib/packaging/Makefile
--- a/contrib/packaging/Makefile
+++ b/contrib/packaging/Makefile
@@ -1,9 +1,9 @@
 $(eval HGROOT := $(shell cd ../..; pwd))
 
 DEBIAN_CODENAMES := \
-  jessie \
   stretch \
-  buster
+  buster \
+  bullseye
 
 UBUNTU_CODENAMES := \
   xenial \



To: av6, #hg-reviewers, indygreg
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6761: packaging: add Cosmic and Disco, remove Trusty and Artful

2019-08-25 Thread av6 (Anton Shestakov) 
Closed by commit rHG0363bb086c57: packaging: add Cosmic and Disco, remove 
Trusty and Artful (authored by av6).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6761?vs=16307=16309

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6761/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6761

AFFECTED FILES
  contrib/packaging/Makefile

CHANGE DETAILS

diff --git a/contrib/packaging/Makefile b/contrib/packaging/Makefile
--- a/contrib/packaging/Makefile
+++ b/contrib/packaging/Makefile
@@ -6,10 +6,10 @@
   buster
 
 UBUNTU_CODENAMES := \
-  trusty \
   xenial \
-  artful \
   bionic \
+  cosmic \
+  disco
 
 FEDORA_RELEASES := \
   20 \



To: av6, #hg-reviewers, indygreg
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6741: interfaces: create a new folder for interfaces and move repository.py in it

2019-08-25 Thread indygreg (Gregory Szorc) 
This revision is now accepted and ready to land.
indygreg added a comment.
indygreg accepted this revision.


  It sounds like we're in agreement that interfaces need to be split. Moving 
everything to a sub-package seems like a logical first step.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6741/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6741

To: pulkit, indygreg, durin42, martinvonz, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH STABLE] python-zstandard: apply big-endian fix (issue6188)

2019-08-25 Thread Gregory Szorc 
# HG changeset patch
# User Gregory Szorc 
# Date 1566748826 25200
#  Sun Aug 25 09:00:26 2019 -0700
# Branch stable
# Node ID 0da517c3ff6ce9e0ea014a85fb7344eca61b97b2
# Parent  7521e6d18057bfc41614d63c85424c50ee114cdf
python-zstandard: apply big-endian fix (issue6188)

This is a port of commit d4baf1f95b811f40773f5df0d8780fb2111ba6f5
from the upstream project to fix python-zstandard on 64-bit big-endian.

diff --git a/contrib/python-zstandard/c-ext/decompressor.c 
b/contrib/python-zstandard/c-ext/decompressor.c
--- a/contrib/python-zstandard/c-ext/decompressor.c
+++ b/contrib/python-zstandard/c-ext/decompressor.c
@@ -68,13 +68,13 @@ static int Decompressor_init(ZstdDecompr
};
 
ZstdCompressionDict* dict = NULL;
-   size_t maxWindowSize = 0;
+   Py_ssize_t maxWindowSize = 0;
ZSTD_format_e format = ZSTD_f_zstd1;
 
self->dctx = NULL;
self->dict = NULL;
 
-   if (!PyArg_ParseTupleAndKeywords(args, kwargs, 
"|O!II:ZstdDecompressor", kwlist,
+   if (!PyArg_ParseTupleAndKeywords(args, kwargs, 
"|O!nI:ZstdDecompressor", kwlist,
, , , )) {
return -1;
}
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

2019-08-25 Thread pulkit (Pulkit Goyal) 
pulkit added a comment.


  Queued the patches for stable, many thanks!

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6731/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6731

To: navaneeth.suresh, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

2019-08-25 Thread pulkit (Pulkit Goyal) 
This revision is now accepted and ready to land.
pulkit added inline comments.
pulkit accepted this revision.

INLINE COMMENTS

> test-bookmarks-pushpull.t:1347
>  Pushing the bookmark "foo" now fails as it contains a secret changeset
>  #if b2-pushkey
>$ hg push -r foo

removing the casing in flight as it's no longer required.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6731/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6731

To: navaneeth.suresh, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6738: unshelve: add --unresolved flag to unshelve mergestate with unresolved files

2019-08-25 Thread pulkit (Pulkit Goyal) 
pulkit added inline comments.

INLINE COMMENTS

> navaneeth.suresh wrote in shelve.py:754
> i had tried to support it earlier. but, it throws the following error. i 
> think it's okay to use the latest format only since, we haven't stored any 
> mergestate using the previous format. the repo won't get corrupted.
> 
>   +  Traceback (most recent call last):
>   +File "/tmp/hgtests.TEheee/install/bin/hg", line 43, in 
>   +  dispatch.run()
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 99, in run
>   +  status = dispatch(req)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 225, in dispatch
>   +  ret = _runcatch(req) or 0
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 376, in _runcatch
>   +  return _callcatch(ui, _runcatchfunc)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 384, in _callcatch
>   +  return scmutil.callcatch(ui, func)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/scmutil.py", 
> line 167, in callcatch
>   +  return func()
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 367, in _runcatchfunc
>   +  return _dispatch(req)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 1021, in _dispatch
>   +  cmdpats, cmdoptions)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 756, in runcommand
>   +  ret = _runcommand(ui, options, cmd, d)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 1030, in _runcommand
>   +  return cmdfunc()
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", 
> line 1018, in 
>   +  d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/util.py", line 
> 1682, in check
>   +  return func(*args, **kwargs)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/commands.py", 
> line 6229, in unshelve
>   +  return shelvemod.dounshelve(ui, repo, *shelved, **opts)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/shelve.py", 
> line 1090, in dounshelve
>   +  restoreunresolvedshelve(ui, repo, shelvectx, basename)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/shelve.py", 
> line 754, in restoreunresolvedshelve
>   +  ms._writerecords(_decodemergerecords(records))
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/merge.py", line 
> 452, in _writerecords
>   +  self._writerecordsv1(records)
>   +File "/tmp/hgtests.TEheee/install/lib/python/mercurial/merge.py", line 
> 460, in _writerecordsv1
>   +  assert lrecords[0] == RECORD_LOCAL
>   +  AssertionError
>   +  [1]

Then we are somehow parsing or building the records in not correct way.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6738/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6738

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6761: packaging: add Cosmic and Disco, remove Trusty and Artful

2019-08-25 Thread av6 (Anton Shestakov) 
av6 added a comment.


  Intended for stable.
  
  Confirming that building the packages for Cosmic and Disco actually works is 
very much welcome.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6761/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6761

To: av6, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6762: packaging: add Bullseye, remove Jessie

2019-08-25 Thread av6 (Anton Shestakov) 
av6 added a comment.


  Intended for stable.
  
  Confirming that building the package for Bullseye actually works is very much 
welcome.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6762/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6762

To: av6, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6762: packaging: add Bullseye, remove Jessie

2019-08-25 Thread av6 (Anton Shestakov) 
av6 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Jessie is oldoldstable now, and Bullseye is going to be the next stable (now
  testing). We're continuing to support the current oldstable, stable and 
testing
  releases.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6762

AFFECTED FILES
  contrib/packaging/Makefile

CHANGE DETAILS

diff --git a/contrib/packaging/Makefile b/contrib/packaging/Makefile
--- a/contrib/packaging/Makefile
+++ b/contrib/packaging/Makefile
@@ -1,9 +1,9 @@
 $(eval HGROOT := $(shell cd ../..; pwd))
 
 DEBIAN_CODENAMES := \
-  jessie \
   stretch \
-  buster
+  buster \
+  bullseye
 
 UBUNTU_CODENAMES := \
   xenial \



To: av6, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6761: packaging: add Cosmic and Disco, remove Trusty and Artful

2019-08-25 Thread av6 (Anton Shestakov) 
av6 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  - Trusty was publicly supported until 2019-04-30
  - Artful was publicly supported until 2018-07-19
  - Cosmic was publicly supported until 2019-07-18
  - Disco will be publicly supported until 2020-01
  
  Cosmic is officially out-of-date, but since it still may be in use, and 
because
  we didn't add it when it first came out, I think it would be nice to support 
it
  until the next time somebody decides to update this list of Ubuntu releases.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6761

AFFECTED FILES
  contrib/packaging/Makefile

CHANGE DETAILS

diff --git a/contrib/packaging/Makefile b/contrib/packaging/Makefile
--- a/contrib/packaging/Makefile
+++ b/contrib/packaging/Makefile
@@ -6,10 +6,10 @@
   buster
 
 UBUNTU_CODENAMES := \
-  trusty \
   xenial \
-  artful \
   bionic \
+  cosmic \
+  disco
 
 FEDORA_RELEASES := \
   20 \



To: av6, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel