( )⚙ D1735 commands: use the new API to access hidden changesets in various commands

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1735

commands: use the new API to access hidden changesets in various commands
ClosedPublic

Authored by pulkit on Dec 19 2017, 7:10 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGb378a3d840ab: commands: use the new API to access hidden changesets in various commands
Summary

In previous patches, we have added an internal API to unhide hidden changesets.
This patch makes the following command use that api in nowarn mode i.e. there
will be no warning while accessing hidden changesets.

cat, diff, export, files, heads, identify, log, manifest, parents, status

This patch also adds test demonstarting the behaviour.

.. feature:: Accessing hidden changesets

Set config option 'experimental.directaccess = True' to access hidden
changesets from read only commands.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Dec 19 2017, 7:10 AM
yuja added a subscriber: yuja.Dec 19 2017, 9:35 AM
yuja added inline comments.
mercurial/commands.py
1283

Maybe needs if rev:?
Passing revspec=[''] seems not right.

yuja accepted this revision.Dec 26 2017, 8:43 AM
This revision is now accepted and ready to land.Dec 26 2017, 8:43 AM
yuja added inline comments.Dec 26 2017, 8:55 AM
mercurial/commands.py
1283

Can you send a followup?

Passing [''] works because parse('') raises ParseError, but
that doesn't seem legit.

Closed by commit rHGb378a3d840ab: commands: use the new API to access hidden changesets in various commands (authored by pulkit). · Explain WhyDec 26 2017, 9:11 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (26 lines)
AMtests/test-directaccess.t (156 lines)

Diff 4620

mercurial/commands.py

:``%R``: changeset revision number :``%R``: changeset revision number
:``%h``: short-form changeset hash (12 hexadecimal digits) :``%h``: short-form changeset hash (12 hexadecimal digits)
:``%r``: zero-padded changeset revision number :``%r``: zero-padded changeset revision number
:``%b``: basename of the exporting repository :``%b``: basename of the exporting repository
Returns 0 on success. Returns 0 on success.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
ctx = scmutil.revsingle(repo, opts.get('rev')) rev = opts.get('rev')
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
yujaUnsubmitted
Not Done

Maybe needs if rev:?
Passing revspec=[''] seems not right.

yuja: Maybe needs `if rev:`? Passing revspec=[''] seems not right.
yujaUnsubmitted
Not Done

Can you send a followup?

Passing [''] works because parse('') raises ParseError, but
that doesn't seem legit.

yuja: Can you send a followup? Passing `['']` works because `parse('')` raises ParseError, but that…
ctx = scmutil.revsingle(repo, rev)
m = scmutil.match(ctx, (file1,) + pats, opts) m = scmutil.match(ctx, (file1,) + pats, opts)
fntemplate = opts.pop('output', '') fntemplate = opts.pop('output', '')
if cmdutil.isstdiofilename(fntemplate): if cmdutil.isstdiofilename(fntemplate):
fntemplate = '' fntemplate = ''
if fntemplate: if fntemplate:
fm = formatter.nullformatter(ui, 'cat') fm = formatter.nullformatter(ui, 'cat')
else: else:
change = opts.get('change') change = opts.get('change')
stat = opts.get('stat') stat = opts.get('stat')
reverse = opts.get('reverse') reverse = opts.get('reverse')
if revs and change: if revs and change:
msg = _('cannot specify --rev and --change at the same time') msg = _('cannot specify --rev and --change at the same time')
raise error.Abort(msg) raise error.Abort(msg)
elif change: elif change:
repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
node2 = scmutil.revsingle(repo, change, None).node() node2 = scmutil.revsingle(repo, change, None).node()
node1 = repo[node2].p1().node() node1 = repo[node2].p1().node()
else: else:
repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
node1, node2 = scmutil.revpair(repo, revs) node1, node2 = scmutil.revpair(repo, revs)
if reverse: if reverse:
node1, node2 = node2, node1 node1, node2 = node2, node1
diffopts = patch.diffallopts(ui, opts) diffopts = patch.diffallopts(ui, opts)
m = scmutil.match(repo[node2], pats, opts) m = scmutil.match(repo[node2], pats, opts)
ui.pager('diff') ui.pager('diff')
hg export -r "outgoing()" -o "%n-%m.patch" hg export -r "outgoing()" -o "%n-%m.patch"
Returns 0 on success. Returns 0 on success.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
changesets += tuple(opts.get('rev', [])) changesets += tuple(opts.get('rev', []))
if not changesets: if not changesets:
changesets = ['.'] changesets = ['.']
repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
revs = scmutil.revrange(repo, changesets) revs = scmutil.revrange(repo, changesets)
if not revs: if not revs:
raise error.Abort(_("export requires at least one changeset")) raise error.Abort(_("export requires at least one changeset"))
if len(revs) > 1: if len(revs) > 1:
ui.note(_('exporting patches:\n')) ui.note(_('exporting patches:\n'))
else: else:
ui.note(_('exporting patch:\n')) ui.note(_('exporting patch:\n'))
ui.pager('export') ui.pager('export')
See :hg:`help patterns` and :hg:`help filesets` for more information See :hg:`help patterns` and :hg:`help filesets` for more information
on specifying file patterns. on specifying file patterns.
Returns 0 if a match is found, 1 otherwise. Returns 0 if a match is found, 1 otherwise.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
ctx = scmutil.revsingle(repo, opts.get('rev'), None) rev = opts.get('rev')
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
ctx = scmutil.revsingle(repo, rev, None)
end = '\n' end = '\n'
if opts.get('print0'): if opts.get('print0'):
end = '\0' end = '\0'
fmt = '%s' + end fmt = '%s' + end
m = scmutil.match(ctx, pats, opts) m = scmutil.match(ctx, pats, opts)
ui.pager('files') ui.pager('files')
If -t/--topo is specified, named branch mechanics will be ignored and only If -t/--topo is specified, named branch mechanics will be ignored and only
topological heads (changesets with no children) will be shown. topological heads (changesets with no children) will be shown.
Returns 0 if matching heads are found, 1 if not. Returns 0 if matching heads are found, 1 if not.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
start = None start = None
if 'rev' in opts: rev = opts.get('rev')
start = scmutil.revsingle(repo, opts['rev'], None).node() if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
start = scmutil.revsingle(repo, rev, None).node()
if opts.get('topo'): if opts.get('topo'):
heads = [repo[h] for h in repo.heads(start)] heads = [repo[h] for h in repo.heads(start)]
else: else:
heads = [] heads = []
for branch in repo.branchmap(): for branch in repo.branchmap():
heads += repo.branchheads(branch, start, opts.get('closed')) heads += repo.branchheads(branch, start, opts.get('closed'))
heads = [repo[h] for h in heads] heads = [repo[h] for h in heads]
# multiple bookmarks for a single parent separated by '/' # multiple bookmarks for a single parent separated by '/'
bm = '/'.join(bms) bm = '/'.join(bms)
if bm: if bm:
output.append(bm) output.append(bm)
fm.data(node=hex(remoterev)) fm.data(node=hex(remoterev))
fm.data(bookmarks=fm.formatlist(bms, name='bookmark')) fm.data(bookmarks=fm.formatlist(bms, name='bookmark'))
else: else:
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
ctx = scmutil.revsingle(repo, rev, None) ctx = scmutil.revsingle(repo, rev, None)
if ctx.rev() is None: if ctx.rev() is None:
ctx = repo[None] ctx = repo[None]
parents = ctx.parents() parents = ctx.parents()
taglist = [] taglist = []
for p in parents: for p in parents:
taglist.extend(p.tags()) taglist.extend(p.tags())
opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))] opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
del opts['follow'] del opts['follow']
if opts.get('graph'): if opts.get('graph'):
if linerange: if linerange:
raise error.Abort(_('graph not supported with line range patterns')) raise error.Abort(_('graph not supported with line range patterns'))
return cmdutil.graphlog(ui, repo, pats, opts) return cmdutil.graphlog(ui, repo, pats, opts)
repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts) revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
hunksfilter = None hunksfilter = None
if linerange: if linerange:
revs, lrfilematcher, hunksfilter = cmdutil.getloglinerangerevs( revs, lrfilematcher, hunksfilter = cmdutil.getloglinerangerevs(
repo, revs, opts) repo, revs, opts)
if filematcher is not None and lrfilematcher is not None: if filematcher is not None and lrfilematcher is not None:
if rev and node: if rev and node:
raise error.Abort(_("please specify just one revision")) raise error.Abort(_("please specify just one revision"))
if not node: if not node:
node = rev node = rev
char = {'l': '@', 'x': '*', '': ''} char = {'l': '@', 'x': '*', '': ''}
mode = {'l': '644', 'x': '755', '': '644'} mode = {'l': '644', 'x': '755', '': '644'}
repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
ctx = scmutil.revsingle(repo, node) ctx = scmutil.revsingle(repo, node)
mf = ctx.manifest() mf = ctx.manifest()
ui.pager('manifest') ui.pager('manifest')
for f in ctx: for f in ctx:
fm.startitem() fm.startitem()
fl = ctx[f].flags() fl = ctx[f].flags()
fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))" hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
See :hg:`summary` and :hg:`help revsets` for related information. See :hg:`summary` and :hg:`help revsets` for related information.
Returns 0 on success. Returns 0 on success.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
ctx = scmutil.revsingle(repo, opts.get('rev'), None) rev = opts.get('rev')
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
ctx = scmutil.revsingle(repo, rev, None)
if file_: if file_:
m = scmutil.match(ctx, (file_,), opts) m = scmutil.match(ctx, (file_,), opts)
if m.anypats() or len(m.files()) != 1: if m.anypats() or len(m.files()) != 1:
raise error.Abort(_('can only specify an explicit filename')) raise error.Abort(_('can only specify an explicit filename'))
file_ = m.files()[0] file_ = m.files()[0]
filenodes = [] filenodes = []
for cp in ctx.parents(): for cp in ctx.parents():
if revs and change: if revs and change:
msg = _('cannot specify --rev and --change at the same time') msg = _('cannot specify --rev and --change at the same time')
raise error.Abort(msg) raise error.Abort(msg)
elif revs and terse: elif revs and terse:
msg = _('cannot use --terse with --rev') msg = _('cannot use --terse with --rev')
raise error.Abort(msg) raise error.Abort(msg)
elif change: elif change:
repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
node2 = scmutil.revsingle(repo, change, None).node() node2 = scmutil.revsingle(repo, change, None).node()
node1 = repo[node2].p1().node() node1 = repo[node2].p1().node()
else: else:
repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
node1, node2 = scmutil.revpair(repo, revs) node1, node2 = scmutil.revpair(repo, revs)
if pats or ui.configbool('commands', 'status.relative'): if pats or ui.configbool('commands', 'status.relative'):
cwd = repo.getcwd() cwd = repo.getcwd()
else: else:
cwd = '' cwd = ''
if opts.get('print0'): if opts.get('print0'):

tests/test-directaccess.t

  • This file was added.
Tests for access level on hidden commits by various commands on based of their
type.
Setting the required config to start this
$ cat >> $HGRCPATH <<EOF
> [experimental]
> evolution=createmarkers, allowunstable
> directaccess=True
> directaccess.revnums=True
> [extensions]
> amend =
> EOF
$ hg init repo
$ cd repo
$ for ch in a b c; do touch $ch; echo "foo" >> $ch; hg ci -Aqm "Added "$ch; done
$ hg log -G -T '{rev}:{node} {desc}' --hidden
@ 2:28ad74487de9599d00d81085be739c61fc340652 Added c
|
o 1:29becc82797a4bc11ec8880b58eaecd2ab3e7760 Added b
|
o 0:18d04c59bb5d2d4090ad9a5b59bd6274adb63add Added a
$ echo "bar" >> c
$ hg amend
$ hg log -G -T '{rev}:{node} {desc}' --hidden
@ 3:2443a0e664694756d8b435d06b6ad84f941b6fc0 Added c
|
| x 2:28ad74487de9599d00d81085be739c61fc340652 Added c
|/
o 1:29becc82797a4bc11ec8880b58eaecd2ab3e7760 Added b
|
o 0:18d04c59bb5d2d4090ad9a5b59bd6274adb63add Added a
Testing read only commands on the hidden revision
Testing with rev number
$ hg exp 2 --config experimental.directaccess.revnums=False
abort: hidden revision '2'!
(use --hidden to access hidden revisions)
[255]
$ hg exp 2
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 28ad74487de9599d00d81085be739c61fc340652
# Parent 29becc82797a4bc11ec8880b58eaecd2ab3e7760
Added c
diff -r 29becc82797a -r 28ad74487de9 c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/c Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+foo
$ hg log -r 2
changeset: 2:28ad74487de9
user: test
date: Thu Jan 01 00:00:00 1970 +0000
obsolete: rewritten using amend as 3:2443a0e66469
summary: Added c
$ hg identify -r 2
28ad74487de9
$ hg status --change 2
A c
$ hg status --change 2 --config experimental.directaccess.revnums=False
abort: hidden revision '2'!
(use --hidden to access hidden revisions)
[255]
$ hg diff -c 2
diff -r 29becc82797a -r 28ad74487de9 c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/c Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+foo
Testing with hash
`hg export`
$ hg exp 28ad74
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 28ad74487de9599d00d81085be739c61fc340652
# Parent 29becc82797a4bc11ec8880b58eaecd2ab3e7760
Added c
diff -r 29becc82797a -r 28ad74487de9 c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/c Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+foo
`hg log`
$ hg log -r 28ad74
changeset: 2:28ad74487de9
user: test
date: Thu Jan 01 00:00:00 1970 +0000
obsolete: rewritten using amend as 3:2443a0e66469
summary: Added c
`hg cat`
$ hg cat -r 28ad74 c
foo
`hg diff`
$ hg diff -c 28ad74
diff -r 29becc82797a -r 28ad74487de9 c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/c Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+foo
`hg files`
$ hg files -r 28ad74
a
b
c
`hg identify`
$ hg identify -r 28ad74
28ad74487de9
`hg status`
$ hg status --change 28ad74
A c
Commands with undefined cmdtype should not work right now
$ hg phase -r 28ad74
abort: hidden revision '28ad74'!
(use --hidden to access hidden revisions)
[255]
$ hg phase -r 2
abort: hidden revision '2'!
(use --hidden to access hidden revisions)
[255]