equal
deleted
inserted
replaced
10 import itertools |
10 import itertools |
11 import os |
11 import os |
12 import posixpath |
12 import posixpath |
13 |
13 |
14 from .i18n import _ |
14 from .i18n import _ |
15 from .node import ( |
15 from .node import nullrev, wdirrev |
16 nullid, |
|
17 nullrev, |
|
18 wdirid, |
|
19 wdirrev, |
|
20 ) |
|
21 |
16 |
22 from .thirdparty import attr |
17 from .thirdparty import attr |
23 |
18 |
24 from . import ( |
19 from . import ( |
25 dagop, |
20 dagop, |
355 ) |
350 ) |
356 |
351 |
357 if self.ui.debugflag: |
352 if self.ui.debugflag: |
358 mnode = ctx.manifestnode() |
353 mnode = ctx.manifestnode() |
359 if mnode is None: |
354 if mnode is None: |
360 mnode = wdirid |
355 mnode = self.repo.nodeconstants.wdirid |
361 mrev = wdirrev |
356 mrev = wdirrev |
362 else: |
357 else: |
363 mrev = self.repo.manifestlog.rev(mnode) |
358 mrev = self.repo.manifestlog.rev(mnode) |
364 self.ui.write( |
359 self.ui.write( |
365 columns[b'manifest'] |
360 columns[b'manifest'] |
503 [fm.hexfunc(c.node()) for c in ctx.parents()], name=b'node' |
498 [fm.hexfunc(c.node()) for c in ctx.parents()], name=b'node' |
504 ), |
499 ), |
505 ) |
500 ) |
506 |
501 |
507 if self.ui.debugflag or b'manifest' in datahint: |
502 if self.ui.debugflag or b'manifest' in datahint: |
508 fm.data(manifest=fm.hexfunc(ctx.manifestnode() or wdirid)) |
503 fm.data( |
|
504 manifest=fm.hexfunc( |
|
505 ctx.manifestnode() or self.repo.nodeconstants.wdirid |
|
506 ) |
|
507 ) |
509 if self.ui.debugflag or b'extra' in datahint: |
508 if self.ui.debugflag or b'extra' in datahint: |
510 fm.data(extra=fm.formatdict(ctx.extra())) |
509 fm.data(extra=fm.formatdict(ctx.extra())) |
511 |
510 |
512 if ( |
511 if ( |
513 self.ui.debugflag |
512 self.ui.debugflag |
989 |
988 |
990 def _initialrevs(repo, wopts): |
989 def _initialrevs(repo, wopts): |
991 """Return the initial set of revisions to be filtered or followed""" |
990 """Return the initial set of revisions to be filtered or followed""" |
992 if wopts.revspec: |
991 if wopts.revspec: |
993 revs = scmutil.revrange(repo, wopts.revspec) |
992 revs = scmutil.revrange(repo, wopts.revspec) |
994 elif wopts.follow and repo.dirstate.p1() == nullid: |
993 elif wopts.follow and repo.dirstate.p1() == repo.nullid: |
995 revs = smartset.baseset() |
994 revs = smartset.baseset() |
996 elif wopts.follow: |
995 elif wopts.follow: |
997 revs = repo.revs(b'.') |
996 revs = repo.revs(b'.') |
998 else: |
997 else: |
999 revs = smartset.spanset(repo) |
998 revs = smartset.spanset(repo) |