D6709: config: add --registered flag to show all known configs

2019-08-15 Thread navaneeth.suresh (Navaneeth Suresh) 
navaneeth.suresh marked an inline comment as done.
navaneeth.suresh updated this revision to Diff 16216.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6709?vs=16209=16216

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

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

AFFECTED FILES
  mercurial/commands.py
  mercurial/ui.py
  tests/test-basic.t
  tests/test-completion.t
  tests/test-config.t
  tests/test-hgrc.t

CHANGE DETAILS

diff --git a/tests/test-hgrc.t b/tests/test-hgrc.t
--- a/tests/test-hgrc.t
+++ b/tests/test-hgrc.t
@@ -80,9 +80,9 @@
 
   $ hg showconfig --config ui.verbose=True --quiet
   bundle.mainreporoot=$TESTTMP
-  ui.verbose=False
-  ui.debug=False
-  ui.quiet=True
+  ui.verbose=no
+  ui.debug=no
+  ui.quiet=yes
 
   $ touch foobar/untracked
   $ cat >> foobar/.hg/hgrc < done
   $ HGRCPATH=configs hg config section.key
   99
+
+test --registered flag
+
+  $ hg showconfig --registered
+  annotate.git=no
+  annotate.ignoreblanklines=no
+  annotate.ignorews=no
+  annotate.ignorewsamount=no
+  annotate.ignorewseol=no
+  annotate.nobinary=no
+  annotate.nodates=no
+  annotate.noprefix=no
+  annotate.showfunc=no
+  annotate.unified=None
+  annotate.word-diff=no
+  auth.cookiefile=None
+  bookmarks.pushing=[]
+  bundle.mainreporoot=$TESTTMP (default: )
+  chgserver.idletimeout=3600
+  chgserver.skiphash=no
+  cmdserver.log=None
+  cmdserver.max-log-files=7
+  cmdserver.max-log-size=1 MB
+  cmdserver.track-log=['chgserver', 'cmdserver', 'repocache']
+  color.mode=auto
+  commands.commit.interactive.git=no
+  commands.commit.interactive.ignoreblanklines=no
+  commands.commit.interactive.ignorews=no
+  commands.commit.interactive.ignorewsamount=no
+  commands.commit.interactive.ignorewseol=no
+  commands.commit.interactive.nobinary=no
+  commands.commit.interactive.nodates=no
+  commands.commit.interactive.noprefix=no
+  commands.commit.interactive.showfunc=no
+  commands.commit.interactive.unified=None
+  commands.commit.interactive.word-diff=no
+  commands.commit.post-status=no
+  commands.rebase.requiredest=no
+  commands.resolve.confirm=no
+  commands.resolve.explicit-re-merge=no
+  commands.resolve.mark-check=none
+  commands.revert.interactive.git=no
+  commands.revert.interactive.ignoreblanklines=no
+  commands.revert.interactive.ignorews=no
+  commands.revert.interactive.ignorewsamount=no
+  commands.revert.interactive.ignorewseol=no
+  commands.revert.interactive.nobinary=no
+  commands.revert.interactive.nodates=no
+  commands.revert.interactive.noprefix=no
+  commands.revert.interactive.showfunc=no
+  commands.revert.interactive.unified=None
+  commands.revert.interactive.word-diff=no
+  commands.show.aliasprefix=[]
+  commands.status.relative=no
+  commands.status.terse=
+  commands.status.verbose=no
+  commands.update.check=None
+  commands.update.requiredest=no
+  convert.bzr.saverev=yes
+  convert.cvsps.cache=yes
+  convert.cvsps.fuzz=60
+  convert.cvsps.logencoding=None
+  convert.cvsps.mergefrom=None
+  convert.cvsps.mergeto=None
+  convert.git.committeractions=['messagedifferent']
+  convert.git.extrakeys=[]
+  convert.git.findcopiesharder=no
+  convert.git.remoteprefix=remote
+  convert.git.renamelimit=400
+  convert.git.saverev=yes
+  convert.git.similarity=50
+  convert.git.skipsubmodules=no
+  convert.hg.clonebranches=no
+  convert.hg.ignoreerrors=no
+  convert.hg.preserve-hash=no
+  convert.hg.revs=None
+  convert.hg.saverev=no
+  convert.hg.sourcename=None
+  convert.hg.startrev=None
+  convert.hg.tagsbranch=default
+  convert.hg.usebranchnames=yes
+  convert.localtimezone=no
+  convert.p4.startrev=0
+  convert.skiptags=no
+  convert.svn.branches=None
+  convert.svn.debugsvnlog=yes
+  convert.svn.startrev=0
+  convert.svn.tags=None
+  convert.svn.trunk=None
+  diff.git=no
+  diff.ignoreblanklines=no
+  diff.ignorews=no
+  diff.ignorewsamount=no
+  diff.ignorewseol=no
+  diff.nobinary=no
+  diff.nodates=no
+  diff.noprefix=no
+  diff.showfunc=no
+  diff.unified=None
+  diff.word-diff=no
+  email.bcc=None
+  email.cc=None
+  email.charsets=[]
+  email.from=None
+  email.method=smtp
+  email.reply-to=None
+  email.to=None
+  format.bookmarks-in-store=no
+  format.dotencode=yes
+  format.obsstore-version=None
+  format.revlog-compression=$BUNDLE2_COMPRESSIONS$
+  format.sparse-revlog=yes
+  format.usefncache=yes
+  format.usegeneraldelta=yes
+  format.usestore=yes
+  fsmonitor.warn_update_file_count=5
+  fsmonitor.warn_when_unused=yes
+  hostsecurity.ciphers=None
+  hostsecurity.disabletls10warning=no
+  http.timeout=None
+  http_proxy.always=no
+  http_proxy.host=None
+  http_proxy.no=[]
+  http_proxy.passwd=None
+  http_proxy.user=None
+  logtoprocess.command=None
+  logtoprocess.commandexception=None
+  logtoprocess.commandfinish=None
+  logtoprocess.develwarn=None
+  logtoprocess.uiblocked=None
+  merge.checkignored=abort
+  merge.checkunknown=abort
+  merge.followcopies=yes
+

D6695: transplant: added support for --stop flag

2019-08-15 Thread taapas1128 (Taapas Agrawal) 
taapas1128 updated this revision to Diff 16215.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6695?vs=16214=16215

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

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

AFFECTED FILES
  hgext/transplant.py
  tests/test-transplant.t

CHANGE DETAILS

diff --git a/tests/test-transplant.t b/tests/test-transplant.t
--- a/tests/test-transplant.t
+++ b/tests/test-transplant.t
@@ -2,6 +2,7 @@
   $ cat <> $HGRCPATH
   > [extensions]
   > transplant=
+  > graphlog=
   > EOF
 
 #if continueflag
@@ -19,6 +20,9 @@
   $ hg transplant --continue --all
   abort: --continue is incompatible with --branch, --all and --merge
   [255]
+  $ hg transplant --stop --all
+  abort: --stop is incompatible with --branch, --all and --merge
+  [255]
   $ hg transplant --all tip
   abort: --all requires a branch revision
   [255]
@@ -376,7 +380,8 @@
   applying 722f4667af76
   722f4667af76 transplanted to 76e321915884
 
-transplant --continue
+
+transplant --continue and --stop behaviour
 
   $ hg init ../tc
   $ cd ../tc
@@ -416,6 +421,36 @@
   $ echo foobar > foo
   $ hg ci -mfoobar
   created new head
+
+Repo log before transplant
+  $ hg glog
+  @  changeset:   4:e8643552fde5
+  |  tag: tip
+  |  parent:  0:493149fa1541
+  |  user:test
+  |  date:Thu Jan 01 00:00:00 1970 +
+  |  summary: foobar
+  |
+  | o  changeset:   3:1dab759070cf
+  | |  user:test
+  | |  date:Thu Jan 01 00:00:00 1970 +
+  | |  summary: bar2
+  | |
+  | o  changeset:   2:9d6d6b5a8275
+  | |  user:test
+  | |  date:Thu Jan 01 00:00:00 1970 +
+  | |  summary: bar
+  | |
+  | o  changeset:   1:46ae92138f3c
+  |/   user:test
+  |date:Thu Jan 01 00:00:00 1970 +
+  |summary: foo2
+  |
+  o  changeset:   0:493149fa1541
+ user:test
+ date:Thu Jan 01 00:00:00 1970 +
+ summary: foo
+  
   $ hg transplant 1:3
   applying 46ae92138f3c
   patching file foo
@@ -425,6 +460,49 @@
   abort: fix up the working directory and run hg transplant --continue
   [255]
 
+  $ hg transplant --stop
+  stopped the interrupted transplant
+  working directory is now at e8643552fde5
+Repo log after abort
+  $ hg glog
+  @  changeset:   4:e8643552fde5
+  |  tag: tip
+  |  parent:  0:493149fa1541
+  |  user:test
+  |  date:Thu Jan 01 00:00:00 1970 +
+  |  summary: foobar
+  |
+  | o  changeset:   3:1dab759070cf
+  | |  user:test
+  | |  date:Thu Jan 01 00:00:00 1970 +
+  | |  summary: bar2
+  | |
+  | o  changeset:   2:9d6d6b5a8275
+  | |  user:test
+  | |  date:Thu Jan 01 00:00:00 1970 +
+  | |  summary: bar
+  | |
+  | o  changeset:   1:46ae92138f3c
+  |/   user:test
+  |date:Thu Jan 01 00:00:00 1970 +
+  |summary: foo2
+  |
+  o  changeset:   0:493149fa1541
+ user:test
+ date:Thu Jan 01 00:00:00 1970 +
+ summary: foo
+  
+  $ hg transplant 1:3
+  applying 46ae92138f3c
+  file added already exists
+  1 out of 1 hunks FAILED -- saving rejects to file added.rej
+  patching file foo
+  Hunk #1 FAILED at 0
+  1 out of 1 hunks FAILED -- saving rejects to file foo.rej
+  patch failed to apply
+  abort: fix up the working directory and run hg transplant --continue
+  [255]
+
 transplant -c shouldn't use an old changeset
 
   $ hg up -C
@@ -436,6 +514,9 @@
   abort: no transplant to continue (continueflag !)
   abort: no operation in progress (no-continueflag !)
   [255]
+  $ hg transplant --stop
+  abort: no interrupted transplant found
+  [255]
   $ hg transplant 1
   applying 46ae92138f3c
   patching file foo
@@ -489,23 +570,23 @@
   [255]
   $ hg transplant 1:3
   abort: transplant in progress
-  (use 'hg transplant --continue' or 'hg update' to abort)
+  (use 'hg transplant --continue' or 'hg transplant --stop')
   [255]
   $ hg status -v
   A bar
+  ? added.rej
   ? baz.rej
   ? foo.rej
   # The repository is in an unfinished *transplant* state.
   
   # To continue:hg transplant --continue
-  # To abort:   hg update
+  # To stop:hg transplant --stop
   
   $ echo fixed > baz
   $ hg continue
   9d6d6b5a8275 transplanted as d80c49962290
   applying 1dab759070cf
   1dab759070cf transplanted to aa0ffe6bd5ae
-
   $ cd ..
 
 Issue: Test transplant --merge
diff --git a/hgext/transplant.py b/hgext/transplant.py
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -412,6 +412,17 @@
 # this is kept only to reduce changes in a patch.
 pass
 
+def stop(self, ui, repo):
+"""logic to stop an interrupted transplant"""
+if self.canresume():
+startctx = repo['.']
+hg.updaterepo(repo, startctx.node(), overwrite=True)
+ui.status(_("stopped the interrupted transplant\n"))
+

D6695: transplant: added support for --stop flag

2019-08-15 Thread taapas1128 (Taapas Agrawal) 
taapas1128 edited the summary of this revision.
taapas1128 retitled this revision from "transplant: added support for --abort 
flag" to "transplant: added support for --stop flag".
taapas1128 marked an inline comment as done.
taapas1128 updated this revision to Diff 16214.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6695?vs=16162=16214

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

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

AFFECTED FILES
  hgext/transplant.py
  tests/test-transplant.t

CHANGE DETAILS

diff --git a/tests/test-transplant.t b/tests/test-transplant.t
--- a/tests/test-transplant.t
+++ b/tests/test-transplant.t
@@ -2,6 +2,7 @@
   $ cat <> $HGRCPATH
   > [extensions]
   > transplant=
+  > graphlog=
   > EOF
 
 #if continueflag
@@ -19,6 +20,9 @@
   $ hg transplant --continue --all
   abort: --continue is incompatible with --branch, --all and --merge
   [255]
+  $ hg transplant --stop --all
+  abort: --stop is incompatible with --branch, --all and --merge
+  [255]
   $ hg transplant --all tip
   abort: --all requires a branch revision
   [255]
@@ -376,7 +380,8 @@
   applying 722f4667af76
   722f4667af76 transplanted to 76e321915884
 
-transplant --continue
+
+transplant --continue and --abort behaviour
 
   $ hg init ../tc
   $ cd ../tc
@@ -416,6 +421,36 @@
   $ echo foobar > foo
   $ hg ci -mfoobar
   created new head
+
+Repo log before transplant
+  $ hg glog
+  @  changeset:   4:e8643552fde5
+  |  tag: tip
+  |  parent:  0:493149fa1541
+  |  user:test
+  |  date:Thu Jan 01 00:00:00 1970 +
+  |  summary: foobar
+  |
+  | o  changeset:   3:1dab759070cf
+  | |  user:test
+  | |  date:Thu Jan 01 00:00:00 1970 +
+  | |  summary: bar2
+  | |
+  | o  changeset:   2:9d6d6b5a8275
+  | |  user:test
+  | |  date:Thu Jan 01 00:00:00 1970 +
+  | |  summary: bar
+  | |
+  | o  changeset:   1:46ae92138f3c
+  |/   user:test
+  |date:Thu Jan 01 00:00:00 1970 +
+  |summary: foo2
+  |
+  o  changeset:   0:493149fa1541
+ user:test
+ date:Thu Jan 01 00:00:00 1970 +
+ summary: foo
+  
   $ hg transplant 1:3
   applying 46ae92138f3c
   patching file foo
@@ -425,6 +460,49 @@
   abort: fix up the working directory and run hg transplant --continue
   [255]
 
+  $ hg transplant --stop
+  stopped the interrupted transplant
+  working directory is now at e8643552fde5
+Repo log after abort
+  $ hg glog
+  @  changeset:   4:e8643552fde5
+  |  tag: tip
+  |  parent:  0:493149fa1541
+  |  user:test
+  |  date:Thu Jan 01 00:00:00 1970 +
+  |  summary: foobar
+  |
+  | o  changeset:   3:1dab759070cf
+  | |  user:test
+  | |  date:Thu Jan 01 00:00:00 1970 +
+  | |  summary: bar2
+  | |
+  | o  changeset:   2:9d6d6b5a8275
+  | |  user:test
+  | |  date:Thu Jan 01 00:00:00 1970 +
+  | |  summary: bar
+  | |
+  | o  changeset:   1:46ae92138f3c
+  |/   user:test
+  |date:Thu Jan 01 00:00:00 1970 +
+  |summary: foo2
+  |
+  o  changeset:   0:493149fa1541
+ user:test
+ date:Thu Jan 01 00:00:00 1970 +
+ summary: foo
+  
+  $ hg transplant 1:3
+  applying 46ae92138f3c
+  file added already exists
+  1 out of 1 hunks FAILED -- saving rejects to file added.rej
+  patching file foo
+  Hunk #1 FAILED at 0
+  1 out of 1 hunks FAILED -- saving rejects to file foo.rej
+  patch failed to apply
+  abort: fix up the working directory and run hg transplant --continue
+  [255]
+
 transplant -c shouldn't use an old changeset
 
   $ hg up -C
@@ -436,6 +514,9 @@
   abort: no transplant to continue (continueflag !)
   abort: no operation in progress (no-continueflag !)
   [255]
+  $ hg transplant --stop
+  abort: no interrupted transplant found
+  [255]
   $ hg transplant 1
   applying 46ae92138f3c
   patching file foo
@@ -489,23 +570,23 @@
   [255]
   $ hg transplant 1:3
   abort: transplant in progress
-  (use 'hg transplant --continue' or 'hg update' to abort)
+  (use 'hg transplant --continue' or 'hg transplant --stop')
   [255]
   $ hg status -v
   A bar
+  ? added.rej
   ? baz.rej
   ? foo.rej
   # The repository is in an unfinished *transplant* state.
   
   # To continue:hg transplant --continue
-  # To abort:   hg update
+  # To stop:hg transplant --stop
   
   $ echo fixed > baz
   $ hg continue
   9d6d6b5a8275 transplanted as d80c49962290
   applying 1dab759070cf
   1dab759070cf transplanted to aa0ffe6bd5ae
-
   $ cd ..
 
 Issue: Test transplant --merge
diff --git a/hgext/transplant.py b/hgext/transplant.py
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -412,6 +412,17 @@
 # this is kept only to reduce changes in a patch.
 pass
 
+def stop(self, ui, repo):
+"""logic to stop an interrupted

D6479: shelve: first prototype of storing/restoring unresolved changes

2019-08-15 Thread navaneeth.suresh (Navaneeth Suresh) 
navaneeth.suresh added a comment.


  In D6479#98737 , @durin42 wrote:
  
  > The only thing I'm curious about really is why we have extrastorage and 
usualstorge. Can we get away with only one of those choices instead of having 
more options?
  
  The ultimate goal is to store the mergestate info in the changeset extras 
only. But, now , it has no support to store the local version of the files 
which are stored in the mergestate. This lacks info when the user gets 
conflicts other than a usual `hg merge`.

REPOSITORY
  rHG Mercurial

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

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

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

D6695: transplant: added support for --abort flag

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


  Let's rename this to `transplant --stop` instead.

REPOSITORY
  rHG Mercurial

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

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

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

D6728: config: add experimental argument to the config registrar

2019-08-15 Thread navaneeth.suresh (Navaneeth Suresh) 
Closed by commit rHGe67d9b6bad4d: config: add experimental argument to the 
config registrar (authored by navaneeth.suresh).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs 
Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6728?vs=16208=16213

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

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

AFFECTED FILES
  contrib/perf.py
  hgext/fsmonitor/__init__.py
  hgext/remotefilelog/__init__.py
  hgext/sqlitestore.py
  mercurial/configitems.py

CHANGE DETAILS

diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -39,13 +39,14 @@
 """
 
 def __init__(self, section, name, default=None, alias=(),
- generic=False, priority=0):
+ generic=False, priority=0, experimental=False):
 self.section = section
 self.name = name
 self.default = default
 self.alias = list(alias)
 self.generic = generic
 self.priority = priority
+self.experimental = experimental
 self._re = None
 if generic:
 self._re = re.compile(self.name)
@@ -166,6 +167,7 @@
 )
 coreconfigitem('censor', 'policy',
 default='abort',
+experimental=True,
 )
 coreconfigitem('chgserver', 'idletimeout',
 default=3600,
@@ -184,9 +186,11 @@
 )
 coreconfigitem('cmdserver', 'max-repo-cache',
 default=0,
+experimental=True,
 )
 coreconfigitem('cmdserver', 'message-encodings',
 default=list,
+experimental=True,
 )
 coreconfigitem('cmdserver', 'track-log',
 default=lambda: ['chgserver', 'cmdserver', 'repocache'],
@@ -207,6 +211,7 @@
 )
 coreconfigitem('commands', 'grep.all-files',
 default=False,
+experimental=True,
 )
 coreconfigitem('commands', 'resolve.confirm',
 default=False,
@@ -226,6 +231,7 @@
 )
 coreconfigitem('commands', 'status.skipstates',
 default=[],
+experimental=True,
 )
 coreconfigitem('commands', 'status.terse',
 default='',
@@ -314,6 +320,7 @@
 )
 coreconfigitem('convert', 'ignoreancestorcheck',
 default=False,
+experimental=True,
 )
 coreconfigitem('convert', 'localtimezone',
 default=False,
@@ -687,18 +694,22 @@
 )
 coreconfigitem('format', 'chunkcachesize',
 default=None,
+experimental=True,
 )
 coreconfigitem('format', 'dotencode',
 default=True,
 )
 coreconfigitem('format', 'generaldelta',
 default=False,
+experimental=True,
 )
 coreconfigitem('format', 'manifestcachesize',
 default=None,
+experimental=True,
 )
 coreconfigitem('format', 'maxchainlen',
 default=dynamicdefault,
+experimental=True,
 )
 coreconfigitem('format', 'obsstore-version',
 default=None,
@@ -721,6 +732,7 @@
 )
 coreconfigitem('format', 'internal-phase',
 default=False,
+experimental=True,
 )
 coreconfigitem('fsmonitor', 'warn_when_unused',
 default=True,
@@ -826,6 +838,7 @@
 )
 coreconfigitem('merge', 'preferancestor',
 default=lambda: ['*'],
+experimental=True,
 )
 coreconfigitem('merge', 'strict-capability-check',
 default=False,
@@ -1010,6 +1023,7 @@
 )
 coreconfigitem('storage', 'new-repo-backend',
 default='revlogv1',
+experimental=True,
 )
 coreconfigitem('storage', 'revlog.optimize-delta-parent-choice',
 default=True,
@@ -1120,6 +1134,7 @@
 )
 coreconfigitem('sparse', 'missingwarning',
 default=True,
+experimental=True,
 )
 coreconfigitem('subrepos', 'allowed',
 default=dynamicdefault,  # to make backporting simpler
@@ -1466,6 +1481,7 @@
 )
 coreconfigitem('web', 'view',
 default='served',
+experimental=True,
 )
 coreconfigitem('worker', 'backgroundclose',
 default=dynamicdefault,
diff --git a/hgext/sqlitestore.py b/hgext/sqlitestore.py
--- a/hgext/sqlitestore.py
+++ b/hgext/sqlitestore.py
@@ -90,7 +90,8 @@
 
 # experimental config: storage.sqlite.compression
 configitem('storage', 'sqlite.compression',
-   default='zstd' if zstd else 'zlib')
+   default='zstd' if zstd else 'zlib',
+   experimental=True)
 
 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' 
for
 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
diff --git a/hgext/remotefilelog/__init__.py b/hgext/remotefilelog/__init__.py
--- a/hgext/remotefilelog/__init__.py
+++ b/hgext/remotefilelog/__init__.py
@@ -219,7 +219,7 @@
 
 configitem('remotefilelog', 'gcrepack', default=False)
 configitem('remotefilelog', 'repackonhggc', default=False)
-configitem('repack', 'chainorphansbysize', default=True)
+configitem('repack', 'chainorphansbysize', default=True, experimental=True)
 
 configitem('packs', 'maxpacksize', default=0)
 configitem('packs', 'maxchainlen', default=1000)
diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py
---

D6729: tests: use `tr -d` and not `tr --delete` since the latter is absent on BSD tr(1)

2019-08-15 Thread durin42 (Augie Fackler) 
durin42 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/D6729

AFFECTED FILES
  tests/test-merge-combination.t

CHANGE DETAILS

diff --git a/tests/test-merge-combination.t b/tests/test-merge-combination.t
--- a/tests/test-merge-combination.t
+++ b/tests/test-merge-combination.t
@@ -57,7 +57,7 @@
   >fi
   >   else expected=a
   >   fi
-  >   got=`hg log -r 3 --template '{files}\n' | tr --delete 'e '`
+  >   got=`hg log -r 3 --template '{files}\n' | tr -d 'e '`
   >   if [ "$got" = "$expected" ]
   >   then echo "$line$conflicts: agree on \"$got\""
   >   else echo "$line$conflicts: hg said \"$got\", expected 
\"$expected\""



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

D6699: unshelve: abort on using --keep and --interactive together

2019-08-15 Thread navaneeth.suresh (Navaneeth Suresh) 
navaneeth.suresh updated this revision to Diff 16211.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6699?vs=16168=16211

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

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

AFFECTED FILES
  mercurial/shelve.py
  tests/test-shelve.t

CHANGE DETAILS

diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -1456,3 +1456,7 @@
   record this change to 'bar2'?
   (enter ? for help) [Ynesfdaq?] y
   
+-- test for --interactive --keep
+  $ hg unshelve -i --keep
+  abort: --keep on --interactive is not yet supported
+  [255]
diff --git a/mercurial/shelve.py b/mercurial/shelve.py
--- a/mercurial/shelve.py
+++ b/mercurial/shelve.py
@@ -941,6 +941,8 @@
 if opts.get("name"):
 shelved.append(opts["name"])
 
+if interactive and opts.get('keep'):
+raise error.Abort(_('--keep on --interactive is not yet supported'))
 if abortf or continuef:
 if abortf and continuef:
 raise error.Abort(_('cannot use both abort and continue'))



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

D6709: config: add --registered flag to show all known configs

2019-08-15 Thread durin42 (Augie Fackler) 
durin42 added a comment.
durin42 accepted this revision as: durin42.


  Looks good to me, but I want someone else to put eyes on it before it gets 
pushed.

REPOSITORY
  rHG Mercurial

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

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

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

D6725: tests: split joint repo/changelog fake into one for each type

2019-08-15 Thread durin42 (Augie Fackler) 
Closed by commit rHG034b2bf377f0: tests: split joint repo/changelog fake into 
one for each type (authored by durin42).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6725?vs=16182=16210

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

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

AFFECTED FILES
  tests/test-rust-discovery.py

CHANGE DETAILS

diff --git a/tests/test-rust-discovery.py b/tests/test-rust-discovery.py
--- a/tests/test-rust-discovery.py
+++ b/tests/test-rust-discovery.py
@@ -31,11 +31,14 @@
 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00'
 )
 
+class fakechangelog(object):
+def __init__(self, idx):
+self.index = idx
+
 class fakerepo(object):
 def __init__(self, idx):
 """Just make so that self.changelog.index is the given idx."""
-self.index = idx
-self.changelog = self
+self.changelog = fakechangelog(idx)
 
 @unittest.skipIf(PartialDiscovery is None or cparsers is None,
  "rustext or the C Extension parsers module "



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

D6479: shelve: first prototype of storing/restoring unresolved changes

2019-08-15 Thread durin42 (Augie Fackler) 
durin42 added a comment.


  The only thing I'm curious about really is why we have extrastorage and 
usualstorge. Can we get away with only one of those choices instead of having 
more options?

INLINE COMMENTS

> shelve.py:432
> +
> +def _storeunresolvedmerge(ui, repo, name=None, extra=None):
> +"""Store the mergestate information in changeset extra

I think I'd like to see at least two changes here: one that introduces the code 
for storing merge state in extra, and then a second that uses it in shelve.

> shelve.py:434
> +"""Store the mergestate information in changeset extra
> +if config option `experimental.store-in-extra` is set True.
> +

why aren't we just going all in on using extra for this? It feels less likely 
to lose data.

REPOSITORY
  rHG Mercurial

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

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

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

D6699: unshelve: abort on using --keep and --interactive together

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

INLINE COMMENTS

> shelve.py:970
>  basename = shelved[0]
> +if interactive and opts.get('keep'):
> +raise error.Abort(_('--keep on --interactive is not yet supported'))

Sorry for missing this earlier, let's move this check above. Maybe before line 
944 on this side.

REPOSITORY
  rHG Mercurial

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

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

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

D6709: config: add --registered flag to show all known configs

2019-08-15 Thread navaneeth.suresh (Navaneeth Suresh) 
navaneeth.suresh added a comment.


  In D6709#98718 , @marmoute wrote:
  
  > I get 28 of them.
  > I think we need to add an `experimental` or `status` argument ot the config 
registration.
  
  Created D6728  to add an `experimental` 
argument to the config registrar and made it as a parent revision.

REPOSITORY
  rHG Mercurial

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

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

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

D6709: config: add --registered flag to show all known configs

2019-08-15 Thread navaneeth.suresh (Navaneeth Suresh) 
navaneeth.suresh updated this revision to Diff 16209.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6709?vs=16172=16209

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

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

AFFECTED FILES
  mercurial/commands.py
  mercurial/ui.py
  tests/test-completion.t
  tests/test-config.t

CHANGE DETAILS

diff --git a/tests/test-config.t b/tests/test-config.t
--- a/tests/test-config.t
+++ b/tests/test-config.t
@@ -224,3 +224,736 @@
   > done
   $ HGRCPATH=configs hg config section.key
   99
+
+test --registered flag
+
+  $ hg showconfig --registered
+  annotate.git=no
+  annotate.ignoreblanklines=no
+  annotate.ignorews=no
+  annotate.ignorewsamount=no
+  annotate.ignorewseol=no
+  annotate.nobinary=no
+  annotate.nodates=no
+  annotate.noprefix=no
+  annotate.showfunc=no
+  annotate.unified=None
+  annotate.word-diff=no
+  auth.cookiefile=None
+  bookmarks.pushing=[]
+  bundle.mainreporoot=$TESTTMP (default: )
+  chgserver.idletimeout=3600
+  chgserver.skiphash=no
+  cmdserver.log=None
+  cmdserver.max-log-files=7
+  cmdserver.max-log-size=1 MB
+  cmdserver.track-log=['chgserver', 'cmdserver', 'repocache']
+  color.mode=auto
+  commands.commit.interactive.git=no
+  commands.commit.interactive.ignoreblanklines=no
+  commands.commit.interactive.ignorews=no
+  commands.commit.interactive.ignorewsamount=no
+  commands.commit.interactive.ignorewseol=no
+  commands.commit.interactive.nobinary=no
+  commands.commit.interactive.nodates=no
+  commands.commit.interactive.noprefix=no
+  commands.commit.interactive.showfunc=no
+  commands.commit.interactive.unified=None
+  commands.commit.interactive.word-diff=no
+  commands.commit.post-status=no
+  commands.rebase.requiredest=no
+  commands.resolve.confirm=no
+  commands.resolve.explicit-re-merge=no
+  commands.resolve.mark-check=none
+  commands.revert.interactive.git=no
+  commands.revert.interactive.ignoreblanklines=no
+  commands.revert.interactive.ignorews=no
+  commands.revert.interactive.ignorewsamount=no
+  commands.revert.interactive.ignorewseol=no
+  commands.revert.interactive.nobinary=no
+  commands.revert.interactive.nodates=no
+  commands.revert.interactive.noprefix=no
+  commands.revert.interactive.showfunc=no
+  commands.revert.interactive.unified=None
+  commands.revert.interactive.word-diff=no
+  commands.show.aliasprefix=[]
+  commands.status.relative=no
+  commands.status.terse=
+  commands.status.verbose=no
+  commands.update.check=None
+  commands.update.requiredest=no
+  convert.bzr.saverev=yes
+  convert.cvsps.cache=yes
+  convert.cvsps.fuzz=60
+  convert.cvsps.logencoding=None
+  convert.cvsps.mergefrom=None
+  convert.cvsps.mergeto=None
+  convert.git.committeractions=['messagedifferent']
+  convert.git.extrakeys=[]
+  convert.git.findcopiesharder=no
+  convert.git.remoteprefix=remote
+  convert.git.renamelimit=400
+  convert.git.saverev=yes
+  convert.git.similarity=50
+  convert.git.skipsubmodules=no
+  convert.hg.clonebranches=no
+  convert.hg.ignoreerrors=no
+  convert.hg.preserve-hash=no
+  convert.hg.revs=None
+  convert.hg.saverev=no
+  convert.hg.sourcename=None
+  convert.hg.startrev=None
+  convert.hg.tagsbranch=default
+  convert.hg.usebranchnames=yes
+  convert.localtimezone=no
+  convert.p4.startrev=0
+  convert.skiptags=no
+  convert.svn.branches=None
+  convert.svn.debugsvnlog=yes
+  convert.svn.startrev=0
+  convert.svn.tags=None
+  convert.svn.trunk=None
+  diff.git=no
+  diff.ignoreblanklines=no
+  diff.ignorews=no
+  diff.ignorewsamount=no
+  diff.ignorewseol=no
+  diff.nobinary=no
+  diff.nodates=no
+  diff.noprefix=no
+  diff.showfunc=no
+  diff.unified=None
+  diff.word-diff=no
+  email.bcc=None
+  email.cc=None
+  email.charsets=[]
+  email.from=None
+  email.method=smtp
+  email.reply-to=None
+  email.to=None
+  format.bookmarks-in-store=no
+  format.dotencode=yes
+  format.obsstore-version=None
+  format.revlog-compression=$BUNDLE2_COMPRESSIONS$
+  format.sparse-revlog=yes
+  format.usefncache=yes
+  format.usegeneraldelta=yes
+  format.usestore=yes
+  fsmonitor.warn_update_file_count=5
+  fsmonitor.warn_when_unused=yes
+  hostsecurity.ciphers=None
+  hostsecurity.disabletls10warning=no
+  http.timeout=None
+  http_proxy.always=no
+  http_proxy.host=None
+  http_proxy.no=[]
+  http_proxy.passwd=None
+  http_proxy.user=None
+  logtoprocess.command=None
+  logtoprocess.commandexception=None
+  logtoprocess.commandfinish=None
+  logtoprocess.develwarn=None
+  logtoprocess.uiblocked=None
+  merge.checkignored=abort
+  merge.checkunknown=abort
+  merge.followcopies=yes
+  merge.on-failure=continue
+  merge.strict-capability-check=no
+  pager.ignore=[]
+  patch.eol=strict
+  patch.fuzz=2
+  paths.default=None
+  paths.default-push=None
+  phases.checksubrepos=follow
+  phases.new-commit=draft
+  phases.publish=yes
+  profiling.enabled=no
+  profiling.format=text
+  profiling.freq=1000
+  profiling.limit=30
+

D6728: config: add experimental argument to the config registrar

2019-08-15 Thread navaneeth.suresh (Navaneeth Suresh) 
navaneeth.suresh created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Until now, there are almost 28 config items which are considered as
  `experimental` but, not present in the `experimental` section of
  the registrar. This patch adds an `experimental` argument to the
  config registrar to mark such config items.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  contrib/perf.py
  hgext/fsmonitor/__init__.py
  hgext/remotefilelog/__init__.py
  hgext/sqlitestore.py
  mercurial/configitems.py

CHANGE DETAILS

diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -39,13 +39,14 @@
 """
 
 def __init__(self, section, name, default=None, alias=(),
- generic=False, priority=0):
+ generic=False, priority=0, experimental=False):
 self.section = section
 self.name = name
 self.default = default
 self.alias = list(alias)
 self.generic = generic
 self.priority = priority
+self.experimental = experimental
 self._re = None
 if generic:
 self._re = re.compile(self.name)
@@ -166,6 +167,7 @@
 )
 coreconfigitem('censor', 'policy',
 default='abort',
+experimental=True,
 )
 coreconfigitem('chgserver', 'idletimeout',
 default=3600,
@@ -184,9 +186,11 @@
 )
 coreconfigitem('cmdserver', 'max-repo-cache',
 default=0,
+experimental=True,
 )
 coreconfigitem('cmdserver', 'message-encodings',
 default=list,
+experimental=True,
 )
 coreconfigitem('cmdserver', 'track-log',
 default=lambda: ['chgserver', 'cmdserver', 'repocache'],
@@ -207,6 +211,7 @@
 )
 coreconfigitem('commands', 'grep.all-files',
 default=False,
+experimental=True,
 )
 coreconfigitem('commands', 'resolve.confirm',
 default=False,
@@ -226,6 +231,7 @@
 )
 coreconfigitem('commands', 'status.skipstates',
 default=[],
+experimental=True,
 )
 coreconfigitem('commands', 'status.terse',
 default='',
@@ -314,6 +320,7 @@
 )
 coreconfigitem('convert', 'ignoreancestorcheck',
 default=False,
+experimental=True,
 )
 coreconfigitem('convert', 'localtimezone',
 default=False,
@@ -684,18 +691,22 @@
 )
 coreconfigitem('format', 'chunkcachesize',
 default=None,
+experimental=True,
 )
 coreconfigitem('format', 'dotencode',
 default=True,
 )
 coreconfigitem('format', 'generaldelta',
 default=False,
+experimental=True,
 )
 coreconfigitem('format', 'manifestcachesize',
 default=None,
+experimental=True,
 )
 coreconfigitem('format', 'maxchainlen',
 default=dynamicdefault,
+experimental=True,
 )
 coreconfigitem('format', 'obsstore-version',
 default=None,
@@ -718,6 +729,7 @@
 )
 coreconfigitem('format', 'internal-phase',
 default=False,
+experimental=True,
 )
 coreconfigitem('fsmonitor', 'warn_when_unused',
 default=True,
@@ -823,6 +835,7 @@
 )
 coreconfigitem('merge', 'preferancestor',
 default=lambda: ['*'],
+experimental=True,
 )
 coreconfigitem('merge', 'strict-capability-check',
 default=False,
@@ -1007,6 +1020,7 @@
 )
 coreconfigitem('storage', 'new-repo-backend',
 default='revlogv1',
+experimental=True,
 )
 coreconfigitem('storage', 'revlog.optimize-delta-parent-choice',
 default=True,
@@ -1117,6 +1131,7 @@
 )
 coreconfigitem('sparse', 'missingwarning',
 default=True,
+experimental=True,
 )
 coreconfigitem('subrepos', 'allowed',
 default=dynamicdefault,  # to make backporting simpler
@@ -1463,6 +1478,7 @@
 )
 coreconfigitem('web', 'view',
 default='served',
+experimental=True,
 )
 coreconfigitem('worker', 'backgroundclose',
 default=dynamicdefault,
diff --git a/hgext/sqlitestore.py b/hgext/sqlitestore.py
--- a/hgext/sqlitestore.py
+++ b/hgext/sqlitestore.py
@@ -90,7 +90,8 @@
 
 # experimental config: storage.sqlite.compression
 configitem('storage', 'sqlite.compression',
-   default='zstd' if zstd else 'zlib')
+   default='zstd' if zstd else 'zlib',
+   experimental=True)
 
 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' 
for
 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
diff --git a/hgext/remotefilelog/__init__.py b/hgext/remotefilelog/__init__.py
--- a/hgext/remotefilelog/__init__.py
+++ b/hgext/remotefilelog/__init__.py
@@ -219,7 +219,7 @@
 
 configitem('remotefilelog', 'gcrepack', default=False)
 configitem('remotefilelog', 'repackonhggc', default=False)
-configitem('repack', 'chainorphansbysize', default=True)
+configitem('repack', 'chainorphansbysize', default=True, experimental=True)
 
 configitem('packs', 'maxpacksize', default=0)
 configitem('packs', 'maxchainlen', default=1000)
diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py
--- a/hgext/fsmonitor/__init__.py
+++

mercurial@42736: 2 new changesets

2019-08-15 Thread Mercurial Commits 
2 new changesets in mercurial:

https://www.mercurial-scm.org/repo/hg/rev/5154701a5413
changeset:   42735:5154701a5413
user:Georges Racinet 
date:Wed Jun 12 14:18:12 2019 +0100
summary: rust-discovery: accept the new 'respectsize' init arg

https://www.mercurial-scm.org/repo/hg/rev/b6f3f704a561
changeset:   42736:b6f3f704a561
bookmark:@
tag: tip
user:Georges Racinet 
date:Wed Jun 12 14:31:41 2019 +0100
summary: rust-discovery: read the index from a repo passed at init

-- 
Repository URL: https://www.mercurial-scm.org/repo/hg
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH 08 of 15] rawdata: update callers in lfs' wrapper

2019-08-15 Thread Pierre-Yves David 
# HG changeset patch
# User Pierre-Yves David 
# Date 1565201432 -7200
#  Wed Aug 07 20:10:32 2019 +0200
# Node ID b094039a12306e919e2a5ba27e31fe1c8255f15c
# Parent  1e6c47c85559934cb827abfabe9e8c84e7674d77
# EXP-Topic rawdata
# Available At https://bitbucket.org/octobus/mercurial-devel/
#  hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 
b094039a1230
rawdata: update callers in lfs' wrapper

We update callers incrementally because this help bisecting failures. This was
useful during development, so we expect it might be useful again in the future.

diff --git a/hgext/lfs/wrapper.py b/hgext/lfs/wrapper.py
--- a/hgext/lfs/wrapper.py
+++ b/hgext/lfs/wrapper.py
@@ -169,7 +169,7 @@ def filelogaddrevision(orig, self, text,
 # Wrapping may also be applied by remotefilelog
 def filelogrenamed(orig, self, node):
 if _islfs(self, node):
-rawtext = self._revlog.revision(node, raw=True)
+rawtext = self._revlog.rawdata(node)
 if not rawtext:
 return False
 metadata = pointer.deserialize(rawtext)
@@ -183,7 +183,7 @@ def filelogrenamed(orig, self, node):
 def filelogsize(orig, self, rev):
 if _islfs(self, rev=rev):
 # fast path: use lfs metadata to answer size
-rawtext = self._revlog.revision(rev, raw=True)
+rawtext = self._revlog.rawdata(rev)
 metadata = pointer.deserialize(rawtext)
 return int(metadata['size'])
 return orig(self, rev)
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH 14 of 15] rawdata: update callers in storageutils

2019-08-15 Thread Pierre-Yves David 
# HG changeset patch
# User Pierre-Yves David 
# Date 1565201510 -7200
#  Wed Aug 07 20:11:50 2019 +0200
# Node ID e6c5a10e85b7c7edcaf89b3472a6b5121128
# Parent  6e8516552f75a8b1f0e1b2169bdf1004aa48e534
# EXP-Topic rawdata
# Available At https://bitbucket.org/octobus/mercurial-devel/
#  hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 
e6c5a10e85b7
rawdata: update callers in storageutils

We update callers incrementally because this help bisecting failures. This was
useful during development, so we expect it might be useful again in the future.

diff --git a/mercurial/utils/storageutil.py b/mercurial/utils/storageutil.py
--- a/mercurial/utils/storageutil.py
+++ b/mercurial/utils/storageutil.py
@@ -304,9 +304,9 @@ def emitrevisions(store, nodes, nodesord
 
 ``rawsizefn`` (optional)
Callable receiving a revision number and returning the length of the
-   ``store.revision(rev, raw=True)``.
+   ``store.rawdata(rev)``.
 
-   If not defined, ``len(store.revision(rev, raw=True))`` will be called.
+   If not defined, ``len(store.rawdata(rev))`` will be called.
 
 ``revdifffn`` (optional)
Callable receiving a pair of revision numbers that returns a delta
@@ -422,7 +422,7 @@ def emitrevisions(store, nodes, nodesord
 if revisiondata:
 if store.iscensored(baserev) or store.iscensored(rev):
 try:
-revision = store.revision(node, raw=True)
+revision = store.rawdata(node)
 except error.CensoredNodeError as e:
 revision = e.tombstone
 
@@ -430,19 +430,18 @@ def emitrevisions(store, nodes, nodesord
 if rawsizefn:
 baserevisionsize = rawsizefn(baserev)
 else:
-baserevisionsize = len(store.revision(baserev,
-  raw=True))
+baserevisionsize = len(store.rawdata(baserev))
 
 elif (baserev == nullrev
 and deltamode != repository.CG_DELTAMODE_PREV):
-revision = store.revision(node, raw=True)
+revision = store.rawdata(node)
 available.add(rev)
 else:
 if revdifffn:
 delta = revdifffn(baserev, rev)
 else:
-delta = mdiff.textdiff(store.revision(baserev, raw=True),
-   store.revision(rev, raw=True))
+delta = mdiff.textdiff(store.rawdata(baserev),
+   store.rawdata(rev))
 
 available.add(rev)
 
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH 15 of 15] rawdata: update callers in shallowbundle

2019-08-15 Thread Pierre-Yves David 
# HG changeset patch
# User Pierre-Yves David 
# Date 1565201527 -7200
#  Wed Aug 07 20:12:07 2019 +0200
# Node ID 6a6fd8c0311985905619ea3eb8df330af3ecb001
# Parent  e6c5a10e85b7c7edcaf89b3472a6b5121128
# EXP-Topic rawdata
# Available At https://bitbucket.org/octobus/mercurial-devel/
#  hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 
6a6fd8c03119
rawdata: update callers in shallowbundle

We update callers incrementally because this help bisecting failures. This was
useful during development, so we expect it might be useful again in the future.

diff --git a/hgext/remotefilelog/shallowbundle.py 
b/hgext/remotefilelog/shallowbundle.py
--- a/hgext/remotefilelog/shallowbundle.py
+++ b/hgext/remotefilelog/shallowbundle.py
@@ -124,7 +124,7 @@ class shallowcg1packer(changegroup.cgpac
 def nodechunk(self, revlog, node, prevnode, linknode):
 prefix = ''
 if prevnode == nullid:
-delta = revlog.revision(node, raw=True)
+delta = revlog.rawdata(node)
 prefix = mdiff.trivialdiffheader(len(delta))
 else:
 # Actually uses remotefilelog.revdiff which works on nodes, not 
revs
@@ -267,7 +267,7 @@ def addchangegroupfiles(orig, repo, sour
 if not available(f, node, f, deltabase):
 continue
 
-base = fl.revision(deltabase, raw=True)
+base = fl.rawdata(deltabase)
 text = mdiff.patch(base, delta)
 if not isinstance(text, bytes):
 text = bytes(text)
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH 11 of 15] rawdata: update callers in testing/storage.py

2019-08-15 Thread Pierre-Yves David 
# HG changeset patch
# User Pierre-Yves David 
# Date 1565201472 -7200
#  Wed Aug 07 20:11:12 2019 +0200
# Node ID 2f47b0a312a8a05000f6ea55d6fc2825acc68ae5
# Parent  36d14c6047e70afc3a8445692084857a06a57370
# EXP-Topic rawdata
# Available At https://bitbucket.org/octobus/mercurial-devel/
#  hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 
2f47b0a312a8
rawdata: update callers in testing/storage.py

We update callers incrementally because this help bisecting failures. This was
useful during development, so we expect it might be useful again in the future.

diff --git a/mercurial/testing/storage.py b/mercurial/testing/storage.py
--- a/mercurial/testing/storage.py
+++ b/mercurial/testing/storage.py
@@ -421,7 +421,7 @@ class ifiledatatests(basetestcase):
 f.size(i)
 
 self.assertEqual(f.revision(nullid), b'')
-self.assertEqual(f.revision(nullid, raw=True), b'')
+self.assertEqual(f.rawdata(nullid), b'')
 
 with self.assertRaises(error.LookupError):
 f.revision(b'\x01' * 20)
@@ -473,7 +473,7 @@ class ifiledatatests(basetestcase):
 f.size(1)
 
 self.assertEqual(f.revision(node), fulltext)
-self.assertEqual(f.revision(node, raw=True), fulltext)
+self.assertEqual(f.rawdata(node), fulltext)
 
 self.assertEqual(f.read(node), fulltext)
 
@@ -545,11 +545,11 @@ class ifiledatatests(basetestcase):
 f.size(3)
 
 self.assertEqual(f.revision(node0), fulltext0)
-self.assertEqual(f.revision(node0, raw=True), fulltext0)
+self.assertEqual(f.rawdata(node0), fulltext0)
 self.assertEqual(f.revision(node1), fulltext1)
-self.assertEqual(f.revision(node1, raw=True), fulltext1)
+self.assertEqual(f.rawdata(node1), fulltext1)
 self.assertEqual(f.revision(node2), fulltext2)
-self.assertEqual(f.revision(node2, raw=True), fulltext2)
+self.assertEqual(f.rawdata(node2), fulltext2)
 
 with self.assertRaises(error.LookupError):
 f.revision(b'\x01' * 20)
@@ -819,9 +819,9 @@ class ifiledatatests(basetestcase):
 self.assertEqual(f.size(2), len(fulltext2))
 
 self.assertEqual(f.revision(node1), stored1)
-self.assertEqual(f.revision(node1, raw=True), stored1)
+self.assertEqual(f.rawdata(node1), stored1)
 self.assertEqual(f.revision(node2), stored2)
-self.assertEqual(f.revision(node2, raw=True), stored2)
+self.assertEqual(f.rawdata(node2), stored2)
 
 self.assertEqual(f.read(node1), fulltext1)
 self.assertEqual(f.read(node2), fulltext2)
@@ -862,10 +862,10 @@ class ifiledatatests(basetestcase):
 self.assertEqual(f.size(1), len(fulltext1))
 
 self.assertEqual(f.revision(node0), stored0)
-self.assertEqual(f.revision(node0, raw=True), stored0)
+self.assertEqual(f.rawdata(node0), stored0)
 
 self.assertEqual(f.revision(node1), stored1)
-self.assertEqual(f.revision(node1, raw=True), stored1)
+self.assertEqual(f.rawdata(node1), stored1)
 
 self.assertEqual(f.read(node0), fulltext0)
 self.assertEqual(f.read(node1), fulltext1)
@@ -896,10 +896,10 @@ class ifiledatatests(basetestcase):
 with self.assertRaises(error.StorageError):
 f.revision(node1)
 
-# raw=True still verifies because there are no special storage
+# rawdata() still verifies because there are no special storage
 # settings.
 with self.assertRaises(error.StorageError):
-f.revision(node1, raw=True)
+f.rawdata(node1)
 
 # read() behaves like revision().
 with self.assertRaises(error.StorageError):
@@ -909,7 +909,7 @@ class ifiledatatests(basetestcase):
 # reading/validating the fulltext to return rename metadata.
 
 def testbadnoderevisionraw(self):
-# Like above except we test revision(raw=True) first to isolate
+# Like above except we test rawdata() first to isolate
 # revision caching behavior.
 f = self._makefilefn()
 
@@ -924,10 +924,10 @@ class ifiledatatests(basetestcase):
rawtext=fulltext1)
 
 with self.assertRaises(error.StorageError):
-f.revision(node1, raw=True)
+f.rawdata(node1)
 
 with self.assertRaises(error.StorageError):
-f.revision(node1, raw=True)
+f.rawdata(node1)
 
 def testbadnoderevisionraw(self):
 # Like above except we test read() first to isolate revision caching
@@ -1002,13 +1002,13 @@ class ifiledatatests(basetestcase):
 f.revision(1)
 
 with self.assertRaises(error.CensoredNodeError):
-f.revision(1, raw=True)
+f.rawdata(1)
 
 with self.assertRaises(error.CensoredNodeError):
 f.read(1)
 
 def testcensoredrawrevision(self):
-# Like above, except we do the revision(raw=True) request

[PATCH 12 of 15] rawdata: update callers in repository

2019-08-15 Thread Pierre-Yves David 
# HG changeset patch
# User Pierre-Yves David 
# Date 1565201482 -7200
#  Wed Aug 07 20:11:22 2019 +0200
# Node ID acb5122380b83993dc724135e45a041097199044
# Parent  2f47b0a312a8a05000f6ea55d6fc2825acc68ae5
# EXP-Topic rawdata
# Available At https://bitbucket.org/octobus/mercurial-devel/
#  hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 
acb5122380b8
rawdata: update callers in repository

We update callers incrementally because this help bisecting failures. This was
useful during development, so we expect it might be useful again in the future.

diff --git a/mercurial/repository.py b/mercurial/repository.py
--- a/mercurial/repository.py
+++ b/mercurial/repository.py
@@ -1202,7 +1202,7 @@ class imanifeststorage(interfaceutil.Int
 def rawsize(rev):
 """Obtain the size of tracked data.
 
-Is equivalent to ``len(m.revision(node, raw=True))``.
+Is equivalent to ``len(m.rawdata(node))``.
 
 TODO this method is only used by upgrade code and may be removed.
 """
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH 13 of 15] rawdata: update callers in delta utils

2019-08-15 Thread Pierre-Yves David 
# HG changeset patch
# User Pierre-Yves David 
# Date 1565201495 -7200
#  Wed Aug 07 20:11:35 2019 +0200
# Node ID 6e8516552f75a8b1f0e1b2169bdf1004aa48e534
# Parent  acb5122380b83993dc724135e45a041097199044
# EXP-Topic rawdata
# Available At https://bitbucket.org/octobus/mercurial-devel/
#  hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 
6e8516552f75
rawdata: update callers in delta utils

We update callers incrementally because this help bisecting failures. This was
useful during development, so we expect it might be useful again in the future.

diff --git a/mercurial/revlogutils/deltas.py b/mercurial/revlogutils/deltas.py
--- a/mercurial/revlogutils/deltas.py
+++ b/mercurial/revlogutils/deltas.py
@@ -925,7 +925,7 @@ class deltacomputer(object):
 header = mdiff.replacediffheader(revlog.rawsize(base), len(t))
 delta = header + t
 else:
-ptext = revlog.revision(base, _df=fh, raw=True)
+ptext = revlog.rawdata(base, _df=fh)
 delta = mdiff.textdiff(ptext, t)
 
 return delta
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH 10 of 15] rawdata: update callers in test-revlog-raw

2019-08-15 Thread Pierre-Yves David 
# HG changeset patch
# User Pierre-Yves David 
# Date 1565210509 -7200
#  Wed Aug 07 22:41:49 2019 +0200
# Node ID 36d14c6047e70afc3a8445692084857a06a57370
# Parent  706b2c50740d509c24aac72db2c3b66e0d0880a8
# EXP-Topic rawdata
# Available At https://bitbucket.org/octobus/mercurial-devel/
#  hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 
36d14c6047e7
rawdata: update callers in test-revlog-raw

We update callers incrementally because this help bisecting failures. This was
useful during development, so we expect it might be useful again in the future.

diff --git a/tests/test-revlog-raw.py b/tests/test-revlog-raw.py
--- a/tests/test-revlog-raw.py
+++ b/tests/test-revlog-raw.py
@@ -161,7 +161,7 @@ def lowlevelcopy(rlog, tr, destname=b'_d
 p1 = rlog.node(r - 1)
 p2 = node.nullid
 if r == 0 or (rlog.flags(r) & revlog.REVIDX_EXTSTORED):
-text = rlog.revision(r, raw=True)
+text = rlog.rawdata(r)
 cachedelta = None
 else:
 # deltaparent cannot have EXTSTORED flag.
@@ -268,7 +268,7 @@ def writecases(rlog, tr):
 abort('rev %d: wrong rawsize' % rev)
 if rlog.revision(rev, raw=False) != text:
 abort('rev %d: wrong text' % rev)
-if rlog.revision(rev, raw=True) != rawtext:
+if rlog.rawdata(rev) != rawtext:
 abort('rev %d: wrong rawtext' % rev)
 result.append((text, rawtext))
 
@@ -293,7 +293,10 @@ def checkrevlog(rlog, expected):
 nlog = newrevlog()
 for rev in revorder:
 for raw in raworder:
-t = nlog.revision(rev, raw=raw)
+if raw:
+t = nlog.rawdata(rev)
+else:
+t = nlog.revision(rev)
 if t != expected[rev][int(raw)]:
 abort('rev %d: corrupted %stext'
   % (rev, raw and 'raw' or ''))
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH 09 of 15] rawdata: update callers in lfs' tests

2019-08-15 Thread Pierre-Yves David 
# HG changeset patch
# User Pierre-Yves David 
# Date 1565201443 -7200
#  Wed Aug 07 20:10:43 2019 +0200
# Node ID 706b2c50740d509c24aac72db2c3b66e0d0880a8
# Parent  b094039a12306e919e2a5ba27e31fe1c8255f15c
# EXP-Topic rawdata
# Available At https://bitbucket.org/octobus/mercurial-devel/
#  hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 
706b2c50740d
rawdata: update callers in lfs' tests

We update callers incrementally because this help bisecting failures. This was
useful during development, so we expect it might be useful again in the future.

diff --git a/tests/test-lfs.t b/tests/test-lfs.t
--- a/tests/test-lfs.t
+++ b/tests/test-lfs.t
@@ -701,7 +701,7 @@ absence doesn't cause an abort.)
   > if len(fl) == 0:
   > continue
   > sizes = [fl._revlog.rawsize(i) for i in fl]
-  > texts = [fl.revision(i, raw=True) for i in fl]
+  > texts = [fl.rawdata(i) for i in fl]
   > flags = [int(fl._revlog.flags(i)) for i in fl]
   > hashes = [hash(t) for t in texts]
   > pycompat.stdout.write(b'  %s: rawsizes=%r flags=%r hashes=%s\n'
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH 06 of 15] rawdata: update callers in debugcommands

2019-08-15 Thread Pierre-Yves David 
# HG changeset patch
# User Pierre-Yves David 
# Date 1565201408 -7200
#  Wed Aug 07 20:10:08 2019 +0200
# Node ID 3de6d776f3515adf35f1b9abcb4c2cd9d398d7ef
# Parent  333d279ffd3109ce7e2e899fe7b513e1334174e7
# EXP-Topic rawdata
# Available At https://bitbucket.org/octobus/mercurial-devel/
#  hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 
3de6d776f351
rawdata: update callers in debugcommands

We update callers incrementally because this help bisecting failures. This was
useful during development, so we expect it might be useful again in the future.

diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -562,7 +562,7 @@ def debugdata(ui, repo, file_, rev=None,
 raise error.CommandError('debugdata', _('invalid arguments'))
 r = cmdutil.openstorage(repo, 'debugdata', file_, opts)
 try:
-ui.write(r.revision(r.lookup(rev), raw=True))
+ui.write(r.rawdata(r.lookup(rev)))
 except KeyError:
 raise error.Abort(_('invalid revision identifier %s') % rev)
 
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH 07 of 15] rawdata: update caller in wireprotov2server

2019-08-15 Thread Pierre-Yves David 
# HG changeset patch
# User Pierre-Yves David 
# Date 1565201424 -7200
#  Wed Aug 07 20:10:24 2019 +0200
# Node ID 1e6c47c85559934cb827abfabe9e8c84e7674d77
# Parent  3de6d776f3515adf35f1b9abcb4c2cd9d398d7ef
# EXP-Topic rawdata
# Available At https://bitbucket.org/octobus/mercurial-devel/
#  hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 
1e6c47c85559
rawdata: update caller in wireprotov2server

We update callers incrementally because this help bisecting failures. This was
useful during development, so we expect it might be useful again in the future.

diff --git a/mercurial/wireprotov2server.py b/mercurial/wireprotov2server.py
--- a/mercurial/wireprotov2server.py
+++ b/mercurial/wireprotov2server.py
@@ -937,7 +937,7 @@ def changesetdata(repo, proto, revisions
 followingdata = []
 
 if b'revision' in fields:
-revisiondata = cl.revision(node, raw=True)
+revisiondata = cl.rawdata(node)
 followingmeta.append((b'revision', len(revisiondata)))
 followingdata.append(revisiondata)
 
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH 03 of 15] rawdata: update callers in bundlerepo

2019-08-15 Thread Pierre-Yves David 
# HG changeset patch
# User Pierre-Yves David 
# Date 1565201350 -7200
#  Wed Aug 07 20:09:10 2019 +0200
# Node ID bd9d982bf37ab1f03250c468673e6b863524370c
# Parent  521bb18efd231f6d6b45666a9828e6e8fae0a650
# EXP-Topic rawdata
# Available At https://bitbucket.org/octobus/mercurial-devel/
#  hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 
bd9d982bf37a
rawdata: update callers in bundlerepo

We update callers incrementally because this help bisecting failures. This was
useful during development, so we expect it might be useful again in the future.

diff --git a/mercurial/bundlerepo.py b/mercurial/bundlerepo.py
--- a/mercurial/bundlerepo.py
+++ b/mercurial/bundlerepo.py
@@ -105,8 +105,8 @@ class bundlerevlog(revlog.revlog):
 elif rev1 <= self.repotiprev and rev2 <= self.repotiprev:
 return revlog.revlog.revdiff(self, rev1, rev2)
 
-return mdiff.textdiff(self.revision(rev1, raw=True),
-  self.revision(rev2, raw=True))
+return mdiff.textdiff(self.rawdata(rev1),
+  self.rawdata(rev2))
 
 def revision(self, nodeorrev, _df=None, raw=False):
 """return an uncompressed revision of a given node or revision
@@ -153,7 +153,7 @@ class bundlerevlog(revlog.revlog):
 # Revlog subclasses may override 'revision' method to modify format of
 # content retrieved from revlog. To use bundlerevlog with such class 
one
 # needs to override 'baserevision' and make more specific call here.
-return revlog.revlog.revision(self, nodeorrev, raw=True)
+return revlog.revlog.rawdata(self, nodeorrev)
 
 def addrevision(self, *args, **kwargs):
 raise NotImplementedError
@@ -184,7 +184,7 @@ class bundlechangelog(bundlerevlog, chan
 oldfilter = self.filteredrevs
 try:
 self.filteredrevs = ()
-return changelog.changelog.revision(self, nodeorrev, raw=True)
+return changelog.changelog.rawdata(self, nodeorrev)
 finally:
 self.filteredrevs = oldfilter
 
@@ -209,7 +209,7 @@ class bundlemanifest(bundlerevlog, manif
 if node in self.fulltextcache:
 result = '%s' % self.fulltextcache[node]
 else:
-result = manifest.manifestrevlog.revision(self, nodeorrev, 
raw=True)
+result = manifest.manifestrevlog.rawdata(self, nodeorrev)
 return result
 
 def dirlog(self, d):
@@ -227,7 +227,7 @@ class bundlefilelog(filelog.filelog):
 cgunpacker, linkmapper)
 
 def baserevision(self, nodeorrev):
-return filelog.filelog.revision(self, nodeorrev, raw=True)
+return filelog.filelog.rawdata(self, nodeorrev)
 
 class bundlepeer(localrepo.localpeer):
 def canpush(self):
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH 04 of 15] rawdata: update caller in remotefilelog

2019-08-15 Thread Pierre-Yves David 
# HG changeset patch
# User Pierre-Yves David 
# Date 1565210112 -7200
#  Wed Aug 07 22:35:12 2019 +0200
# Node ID 475f24d36ed010725534e60e0ea0a2a0d9d914ff
# Parent  bd9d982bf37ab1f03250c468673e6b863524370c
# EXP-Topic rawdata
# Available At https://bitbucket.org/octobus/mercurial-devel/
#  hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 
475f24d36ed0
rawdata: update caller in remotefilelog

We update callers incrementally because this help bisecting failures. This was
useful during development, so we expect it might be useful again in the future.

diff --git a/hgext/remotefilelog/contentstore.py 
b/hgext/remotefilelog/contentstore.py
--- a/hgext/remotefilelog/contentstore.py
+++ b/hgext/remotefilelog/contentstore.py
@@ -264,7 +264,7 @@ class manifestrevlogstore(object):
 self._repackstartlinkrev = 0
 
 def get(self, name, node):
-return self._revlog(name).revision(node, raw=True)
+return self._revlog(name).rawdata(node)
 
 def getdelta(self, name, node):
 revision = self.get(name, node)
diff --git a/hgext/remotefilelog/fileserverclient.py 
b/hgext/remotefilelog/fileserverclient.py
--- a/hgext/remotefilelog/fileserverclient.py
+++ b/hgext/remotefilelog/fileserverclient.py
@@ -569,7 +569,7 @@ class fileserverclient(object):
 node = bin(id)
 rlog = self.repo.file(file)
 if rlog.flags(node) & revlog.REVIDX_EXTSTORED:
-text = rlog.revision(node, raw=True)
+text = rlog.rawdata(node)
 p = _lfsmod.pointer.deserialize(text)
 oid = p.oid()
 if not store.has(oid):
diff --git a/hgext/remotefilelog/remotefilelog.py 
b/hgext/remotefilelog/remotefilelog.py
--- a/hgext/remotefilelog/remotefilelog.py
+++ b/hgext/remotefilelog/remotefilelog.py
@@ -262,7 +262,7 @@ class remotefilelog(object):
 revision = None
 delta = self.revdiff(basenode, node)
 else:
-revision = self.revision(node, raw=True)
+revision = self.rawdata(node)
 delta = None
 yield revlog.revlogrevisiondelta(
 node=node,
@@ -277,8 +277,8 @@ class remotefilelog(object):
 )
 
 def revdiff(self, node1, node2):
-return mdiff.textdiff(self.revision(node1, raw=True),
-  self.revision(node2, raw=True))
+return mdiff.textdiff(self.rawdata(node1),
+  self.rawdata(node2))
 
 def lookup(self, node):
 if len(node) == 40:
diff --git a/hgext/remotefilelog/remotefilelogserver.py 
b/hgext/remotefilelog/remotefilelogserver.py
--- a/hgext/remotefilelog/remotefilelogserver.py
+++ b/hgext/remotefilelog/remotefilelogserver.py
@@ -335,7 +335,7 @@ def createfileblob(filectx):
 text = filectx.data()
 else:
 # lfs, read raw revision data
-text = flog.revision(frev, raw=True)
+text = flog.rawdata(frev)
 
 repo = filectx._repo
 
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH 01 of 15] rawdata: update caller in revlog

2019-08-15 Thread Pierre-Yves David 
# HG changeset patch
# User Pierre-Yves David 
# Date 1565201306 -7200
#  Wed Aug 07 20:08:26 2019 +0200
# Node ID 66af150744d04f984d0300fb71ff93ceb2dc28a9
# Parent  bbe71b5afd02c764639780bfe763348d5e5d7a6b
# EXP-Topic rawdata
# Available At https://bitbucket.org/octobus/mercurial-devel/
#  hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 
66af150744d0
rawdata: update caller in revlog

We update callers incrementally because this help bisecting failures. This was
useful during development, so we expect it might be useful again in the future.

diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -679,7 +679,7 @@ class revlog(object):
 if l >= 0:
 return l
 
-t = self.revision(rev, raw=True)
+t = self.rawdata(rev)
 return len(t)
 
 def size(self, rev):
@@ -1639,8 +1639,8 @@ class revlog(object):
 if rev1 != nullrev and self.deltaparent(rev2) == rev1:
 return bytes(self._chunk(rev2))
 
-return mdiff.textdiff(self.revision(rev1, raw=True),
-  self.revision(rev2, raw=True))
+return mdiff.textdiff(self.rawdata(rev1),
+  self.rawdata(rev2))
 
 def revision(self, nodeorrev, _df=None, raw=False):
 """return an uncompressed revision of a given node or revision
@@ -2478,7 +2478,7 @@ class revlog(object):
 cachedelta = (dp, bytes(self._chunk(rev)))
 
 if not cachedelta:
-rawtext = self.revision(rev, raw=True)
+rawtext = self.rawdata(rev)
 
 
 if deltareuse == self.DELTAREUSEFULLADD:
@@ -2556,7 +2556,7 @@ class revlog(object):
 'revision having delta stored'))
 rawtext = self._chunk(rev)
 else:
-rawtext = self.revision(rev, raw=True)
+rawtext = self.rawdata(rev)
 
 newrl.addrawrevision(rawtext, tr, self.linkrev(rev), p1, p2, node,
  self.flags(rev))
@@ -2614,8 +2614,8 @@ class revlog(object):
 #   rawtext[0:2]=='\1\n'| False  | True   | True  | ?
 #
 # "rawtext" means the raw text stored in revlog data, which
-# could be retrieved by "revision(rev, raw=True)". "text"
-# mentioned below is "revision(rev, raw=False)".
+# could be retrieved by "rawdata(rev)". "text"
+# mentioned below is "revision(rev)".
 #
 # There are 3 different lengths stored physically:
 #  1. L1: rawsize, stored in revlog index
@@ -2657,7 +2657,7 @@ class revlog(object):
 self.revision(node)
 
 l1 = self.rawsize(rev)
-l2 = len(self.revision(node, raw=True))
+l2 = len(self.rawdata(node))
 
 if l1 != l2:
 yield revlogproblem(
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH 05 of 15] rawdata: update callers in sqlitestore

2019-08-15 Thread Pierre-Yves David 
# HG changeset patch
# User Pierre-Yves David 
# Date 1565201393 -7200
#  Wed Aug 07 20:09:53 2019 +0200
# Node ID 333d279ffd3109ce7e2e899fe7b513e1334174e7
# Parent  475f24d36ed010725534e60e0ea0a2a0d9d914ff
# EXP-Topic rawdata
# Available At https://bitbucket.org/octobus/mercurial-devel/
#  hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 
333d279ffd31
rawdata: update callers in sqlitestore

We update callers incrementally because this help bisecting failures. This was
useful during development, so we expect it might be useful again in the future.

diff --git a/hgext/sqlitestore.py b/hgext/sqlitestore.py
--- a/hgext/sqlitestore.py
+++ b/hgext/sqlitestore.py
@@ -656,8 +656,7 @@ class sqlitefilestore(object):
 # patch operation.
 if baserev != nullrev and self.iscensored(baserev):
 hlen = struct.calcsize('>lll')
-oldlen = len(self.revision(deltabase, raw=True,
-   _verifyhash=False))
+oldlen = len(self.rawdata(deltabase, _verifyhash=False))
 newlen = len(delta) - hlen
 
 if delta[:hlen] != mdiff.replacediffheader(oldlen, newlen):
@@ -666,7 +665,7 @@ class sqlitefilestore(object):
 
 if (not (storeflags & FLAG_CENSORED)
 and storageutil.deltaiscensored(
-delta, baserev, lambda x: len(self.revision(x, 
raw=True:
+delta, baserev, lambda x: len(self.rawdata(x:
 storeflags |= FLAG_CENSORED
 
 linkrev = linkmapper(linknode)
@@ -719,7 +718,7 @@ class sqlitefilestore(object):
 
 # This restriction is cargo culted from revlogs and makes no sense for
 # SQLite, since columns can be resized at will.
-if len(tombstone) > len(self.revision(censornode, raw=True)):
+if len(tombstone) > len(self.rawdata(censornode)):
 raise error.Abort(_('censor tombstone must be no longer than '
 'censored data'))
 
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH 02 of 15] rawdata: update callers in context

2019-08-15 Thread Pierre-Yves David 
# HG changeset patch
# User Pierre-Yves David 
# Date 1565201315 -7200
#  Wed Aug 07 20:08:35 2019 +0200
# Node ID 521bb18efd231f6d6b45666a9828e6e8fae0a650
# Parent  66af150744d04f984d0300fb71ff93ceb2dc28a9
# EXP-Topic rawdata
# Available At https://bitbucket.org/octobus/mercurial-devel/
#  hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 
521bb18efd23
rawdata: update callers in context

We update callers incrementally because this help bisecting failures. This was
useful during development, so we expect it might be useful again in the future.

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -1053,7 +1053,7 @@ class filectx(basefilectx):
filelog=self._filelog, changeid=changeid)
 
 def rawdata(self):
-return self._filelog.revision(self._filenode, raw=True)
+return self._filelog.rawdata(self._filenode)
 
 def rawflags(self):
 """low-level revlog flags"""
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6709: config: add --registered flag to show all known configs

2019-08-15 Thread marmoute (Pierre-Yves David) 
marmoute added a comment.


  I get 28 of them.
  
  I think we need to add an `experimental` or `status` argument ot the config 
registration.
  
> ag --nofilename '# experimental config:.*' -o | sort -u
# experimental config: censor.policy
# experimental config: cmdserver.max-repo-cache
# experimental config: cmdserver.message-encodings
# experimental config: commands.grep.all-files
# experimental config: commands.status.skipstates
# experimental config: convert.ignoreancestorcheck
# experimental config: experimental.graphshorten
# experimental config: experimental.graphstyle.*
# experimental config: experimental.hook-track-tags
# experimental config: format.chunkcachesize
# experimental config: format.generaldelta
# experimental config: format.internal-phase
# experimental config: format.manifestcachesize
# experimental config: format.maxchainlen
# experimental config: fsmonitor.verbose
# experimental config: merge.preferancestor
# experimental config: patchbomb.publicurl
# experimental config: perf.all-timing
# experimental config: perf.parentscount
# experimental config: perf.presleep
# experimental config: perf.run-limits
# experimental config: perf.stub
# experimental config: repack.chainorphansbysize
# experimental config: sparse.missingwarning
# experimental config: storage.new-repo-backend
# experimental config: storage.sqlite.compression
# experimental config: web.view

REPOSITORY
  rHG Mercurial

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

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

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

D6709: config: add --registered flag to show all known configs

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


  In D6709#98716 , @marmoute wrote:
  
  > We will need more than just matching the categoie name to detect 
experimental/deprecated config. There are such option outside of the 
`experimental` section, and we still need to hide them by default. You can grep 
for `# experimental config:` to see some example.
  
  I only see one of them `rebase.experimental.inmemory`. I think it will be 
nice to have configs option correctly put inside `experimental` section instead 
of adding more filtering here.

REPOSITORY
  rHG Mercurial

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

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

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