This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5745

status: extract helper for producing relative or absolute path for UI
ClosedPublic

Authored by martinvonz on Jan 30 2019, 3:19 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe6ec0737b706: status: extract helper for producing relative or absolute path for UI
rHGa997163e7fae: status: extract helper for producing relative or absolute path for UI
rHG1d6eae696cf1: status: extract helper for producing relative or absolute path for UI
Summary

I put the helper in scmutil so it can be used by most modules. I would
have put it in utils.pathutil, but I think that's supposed to be
unaware of repos.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jan 30 2019, 3:19 PM
pulkit accepted this revision.Jan 31 2019, 3:53 PM
Closed by commit rHG1d6eae696cf1: status: extract helper for producing relative or absolute path for UI (authored by martinvonz). · Explain WhyJan 31 2019, 4:26 PM
This revision was automatically updated to reflect the committed changes.
mharbison72 added a subscriber: mharbison72.Feb 1 2019, 10:35 PM
mharbison72 added inline comments.
mercurial/commands.py
5417–5418

Not sure if it's worth fixing the syntax error here before it goes public. I only noticed because I was bisecting a test failure. The next patch drops the trailing :.

yuja added a subscriber: yuja.Feb 1 2019, 10:56 PM

+ relative = pats or ui.configbool('commands', 'status.relative'):
+ uipathfn = scmutil.getuipathfn(repo, relative)

Not sure if it's worth fixing the syntax error here before it goes public. I only noticed because I was bisecting a test failure. The next patch drops the trailing :.

Fixed, thanks.

martinvonz added a comment.Feb 2 2019, 12:14 AM
In D5745#85049, @yuja wrote:

+ relative = pats or ui.configbool('commands', 'status.relative'):
+ uipathfn = scmutil.getuipathfn(repo, relative)

Not sure if it's worth fixing the syntax error here before it goes public. I only noticed because I was bisecting a test failure. The next patch drops the trailing :.

Fixed, thanks.

Thanks to both of you. I'll try to be more careful in the future.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (10 lines)
Mmercurial/scmutil.py (8 lines)

Diff 13574

mercurial/commands.py

elif change: elif change:
repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn') repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
ctx2 = scmutil.revsingle(repo, change, None) ctx2 = scmutil.revsingle(repo, change, None)
ctx1 = ctx2.p1() ctx1 = ctx2.p1()
else: else:
repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn') repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
ctx1, ctx2 = scmutil.revpair(repo, revs) ctx1, ctx2 = scmutil.revpair(repo, revs)
if pats or ui.configbool('commands', 'status.relative'): relative = pats or ui.configbool('commands', 'status.relative'):
cwd = repo.getcwd() uipathfn = scmutil.getuipathfn(repo, relative)
mharbison72Unsubmitted
Not Done

Not sure if it's worth fixing the syntax error here before it goes public. I only noticed because I was bisecting a test failure. The next patch drops the trailing :.

mharbison72: Not sure if it's worth fixing the syntax error here before it goes public. I only noticed…
else:
cwd = ''
if opts.get('print0'): if opts.get('print0'):
end = '\0' end = '\0'
else: else:
end = '\n' end = '\n'
copy = {} copy = {}
states = 'modified added removed deleted unknown ignored clean'.split() states = 'modified added removed deleted unknown ignored clean'.split()
show = [k for k in states if opts.get(k)] show = [k for k in states if opts.get(k)]
for state, char, files in changestates: for state, char, files in changestates:
if state in show: if state in show:
label = 'status.' + state label = 'status.' + state
for f in files: for f in files:
fm.startitem() fm.startitem()
fm.context(ctx=ctx2) fm.context(ctx=ctx2)
fm.data(path=f) fm.data(path=f)
fm.condwrite(showchar, 'status', '%s ', char, label=label) fm.condwrite(showchar, 'status', '%s ', char, label=label)
fm.plain(fmt % repo.pathto(f, cwd), label=label) fm.plain(fmt % uipathfn(f), label=label)
if f in copy: if f in copy:
fm.data(source=copy[f]) fm.data(source=copy[f])
fm.plain((' %s' + end) % repo.pathto(copy[f], cwd), fm.plain((' %s' + end) % uipathfn(copy[f]),
label='status.copied') label='status.copied')
if ((ui.verbose or ui.configbool('commands', 'status.verbose')) if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
and not ui.plain()): and not ui.plain()):
cmdutil.morestatus(repo, fm) cmdutil.morestatus(repo, fm)
fm.end() fm.end()
@command('summary|sum', @command('summary|sum',

mercurial/scmutil.py

if len(parents) > 1: if len(parents) > 1:
return parents return parents
if repo.ui.debugflag: if repo.ui.debugflag:
return [parents[0], repo[nullrev]] return [parents[0], repo[nullrev]]
if parents[0].rev() >= intrev(ctx) - 1: if parents[0].rev() >= intrev(ctx) - 1:
return [] return []
return parents return parents
def getuipathfn(repo, relative):
if relative:
cwd = repo.getcwd()
pathto = repo.pathto
return lambda f: pathto(f, cwd)
else:
return lambda f: f
def expandpats(pats): def expandpats(pats):
'''Expand bare globs when running on windows. '''Expand bare globs when running on windows.
On posix we assume it already has already been done by sh.''' On posix we assume it already has already been done by sh.'''
if not util.expandglobs: if not util.expandglobs:
return list(pats) return list(pats)
ret = [] ret = []
for kindpat in pats: for kindpat in pats:
kind, pat = matchmod._patsplit(kindpat, None) kind, pat = matchmod._patsplit(kindpat, None)