This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1760

commands: check for empty rev before passing to scmutil.unhidehashlikerevs
ClosedPublic

Authored by pulkit on Dec 26 2017, 2:16 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGba0fb0e33c3a: commands: check for empty rev before passing to scmutil.unhidehashlikerevs

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 26 2017, 2:16 PM
yuja requested changes to this revision.Dec 27 2017, 7:22 AM
yuja added a subscriber: yuja.

Can you update the other callers which pass ['']?

This revision now requires changes to proceed.Dec 27 2017, 7:22 AM
pulkit updated this revision to Diff 4659.Dec 28 2017, 2:40 PM
yuja accepted this revision.Jan 4 2018, 3:49 AM
This revision is now accepted and ready to land.Jan 4 2018, 3:49 AM
Closed by commit rHGba0fb0e33c3a: commands: check for empty rev before passing to scmutil.unhidehashlikerevs (authored by pulkit). · Explain WhyJan 4 2018, 4:06 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (15 lines)

Diff 4684

mercurial/commands.py

:``%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)
rev = opts.get('rev') rev = opts.get('rev')
if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
ctx = scmutil.revsingle(repo, rev) 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')
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)
rev = opts.get('rev') rev = opts.get('rev')
if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
ctx = scmutil.revsingle(repo, rev, None) 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)
# 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:
if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') 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())
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'}
if node:
repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn') 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])
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)
rev = opts.get('rev') rev = opts.get('rev')
if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
ctx = scmutil.revsingle(repo, rev, None) 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 = []