##// END OF EJS Templates
shelve: improve help text for --patch and --stat...
shelve: improve help text for --patch and --stat It's not currently obvious why "hg shelve -p" fails, since -p doesn't take an argument. Differential Revision: https://phab.mercurial-scm.org/D3949

File last commit:

r37334:9954d0e2 default
r38736:abcf500d default
Show More
journal.py
524 lines | 19.1 KiB | text/x-python | PythonLexer
Martijn Pieters
journal: new experimental extension...
r29443 # journal.py
#
# Copyright 2014-2016 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Jun Wu
journal: use lowercase for docstring title...
r31600 """track previous positions of bookmarks (EXPERIMENTAL)
Martijn Pieters
journal: new experimental extension...
r29443
This extension adds a new command: `hg journal`, which shows you where
bookmarks were previously located.
"""
from __future__ import absolute_import
import collections
Martijn Pieters
journal: add share extension support...
r29503 import errno
Martijn Pieters
journal: new experimental extension...
r29443 import os
Martijn Pieters
journal: add dirstate tracking...
r29502 import weakref
Martijn Pieters
journal: new experimental extension...
r29443
from mercurial.i18n import _
from mercurial import (
bookmarks,
cmdutil,
dispatch,
Pulkit Goyal
py3: replace __str__ to __bytes__ in hgext/journal.py...
r36684 encoding,
Martijn Pieters
journal: new experimental extension...
r29443 error,
extensions,
Martijn Pieters
journal: add share extension support...
r29503 hg,
Martijn Pieters
journal: add dirstate tracking...
r29502 localrepo,
lock,
Yuya Nishihara
cmdutil: drop aliases for logcmdutil functions (API)...
r35906 logcmdutil,
Martijn Pieters
journal: new experimental extension...
r29443 node,
Pulkit Goyal
py3: handle keyword arguments in hgext/journal.py...
r35001 pycompat,
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 registrar,
Martijn Pieters
journal: new experimental extension...
r29443 util,
)
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 from mercurial.utils import (
dateutil,
Yuya Nishihara
procutil: bulk-replace function calls to point to new module
r37138 procutil,
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 stringutil,
)
Martijn Pieters
journal: new experimental extension...
r29443
cmdtable = {}
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 command = registrar.command(cmdtable)
Martijn Pieters
journal: new experimental extension...
r29443
Augie Fackler
extensions: change magic "shipped with hg" string...
r29841 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
Martijn Pieters
journal: new experimental extension...
r29443 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
Augie Fackler
extensions: change magic "shipped with hg" string...
r29841 testedwith = 'ships-with-hg-core'
Martijn Pieters
journal: new experimental extension...
r29443
# storage format version; increment when the format changes
storageversion = 0
# namespaces
bookmarktype = 'bookmark'
Martijn Pieters
journal: add dirstate tracking...
r29502 wdirparenttype = 'wdirparent'
Martijn Pieters
journal: add share extension support...
r29503 # In a shared repository, what shared feature name is used
# to indicate this namespace is shared with the source?
sharednamespaces = {
bookmarktype: hg.sharedbookmarks,
}
Martijn Pieters
journal: new experimental extension...
r29443
# Journal recording, register hooks and storage object
def extsetup(ui):
extensions.wrapfunction(dispatch, 'runcommand', runcommand)
extensions.wrapfunction(bookmarks.bmstore, '_write', recordbookmarks)
FUJIWARA Katsunori
journal: use wrapfilecache instead of wrapfunction on func of filecache...
r33384 extensions.wrapfilecache(
localrepo.localrepository, 'dirstate', wrapdirstate)
Martijn Pieters
journal: add share extension support...
r29503 extensions.wrapfunction(hg, 'postshare', wrappostshare)
extensions.wrapfunction(hg, 'copystore', unsharejournal)
Martijn Pieters
journal: new experimental extension...
r29443
def reposetup(ui, repo):
if repo.local():
repo.journal = journalstorage(repo)
Boris Feld
repovfs: add a ward to check if locks are properly taken...
r33436 repo._wlockfreeprefix.add('namejournal')
Martijn Pieters
journal: new experimental extension...
r29443
FUJIWARA Katsunori
journal: execute setup procedures for already instantiated dirstate...
r33383 dirstate, cached = localrepo.isfilecached(repo, 'dirstate')
if cached:
# already instantiated dirstate isn't yet marked as
# "journal"-ing, even though repo.dirstate() was already
# wrapped by own wrapdirstate()
_setupdirstate(repo, dirstate)
Martijn Pieters
journal: new experimental extension...
r29443 def runcommand(orig, lui, repo, cmd, fullargs, *args):
"""Track the command line options for recording in the journal"""
journalstorage.recordcommand(*fullargs)
return orig(lui, repo, cmd, fullargs, *args)
FUJIWARA Katsunori
journal: execute setup procedures for already instantiated dirstate...
r33383 def _setupdirstate(repo, dirstate):
dirstate.journalstorage = repo.journal
dirstate.addparentchangecallback('journal', recorddirstateparents)
Martijn Pieters
journal: add dirstate tracking...
r29502 # hooks to record dirstate changes
def wrapdirstate(orig, repo):
"""Make journal storage available to the dirstate object"""
dirstate = orig(repo)
if util.safehasattr(repo, 'journal'):
FUJIWARA Katsunori
journal: execute setup procedures for already instantiated dirstate...
r33383 _setupdirstate(repo, dirstate)
Martijn Pieters
journal: add dirstate tracking...
r29502 return dirstate
Mateusz Kwapich
journal: use the dirstate parentchange callbacks...
r29773 def recorddirstateparents(dirstate, old, new):
Martijn Pieters
journal: add dirstate tracking...
r29502 """Records all dirstate parent changes in the journal."""
Mateusz Kwapich
journal: use the dirstate parentchange callbacks...
r29773 old = list(old)
new = list(new)
Martijn Pieters
journal: add dirstate tracking...
r29502 if util.safehasattr(dirstate, 'journalstorage'):
Mateusz Kwapich
journal: use the dirstate parentchange callbacks...
r29773 # only record two hashes if there was a merge
oldhashes = old[:1] if old[1] == node.nullid else old
newhashes = new[:1] if new[1] == node.nullid else new
dirstate.journalstorage.record(
wdirparenttype, '.', oldhashes, newhashes)
Martijn Pieters
journal: add dirstate tracking...
r29502
# hooks to record bookmark changes (both local and remote)
Martijn Pieters
journal: new experimental extension...
r29443 def recordbookmarks(orig, store, fp):
"""Records all bookmark changes in the journal."""
repo = store._repo
if util.safehasattr(repo, 'journal'):
oldmarks = bookmarks.bmstore(repo)
for mark, value in store.iteritems():
oldvalue = oldmarks.get(mark, node.nullid)
if value != oldvalue:
repo.journal.record(bookmarktype, mark, oldvalue, value)
return orig(store, fp)
Martijn Pieters
journal: add share extension support...
r29503 # shared repository support
def _readsharedfeatures(repo):
"""A set of shared features for this repository"""
try:
return set(repo.vfs.read('shared').splitlines())
except IOError as inst:
if inst.errno != errno.ENOENT:
raise
return set()
def _mergeentriesiter(*iterables, **kwargs):
"""Given a set of sorted iterables, yield the next entry in merged order
Note that by default entries go from most recent to oldest.
"""
Pulkit Goyal
py3: handle keyword arguments in hgext/journal.py...
r35001 order = kwargs.pop(r'order', max)
Martijn Pieters
journal: add share extension support...
r29503 iterables = [iter(it) for it in iterables]
# this tracks still active iterables; iterables are deleted as they are
# exhausted, which is why this is a dictionary and why each entry also
# stores the key. Entries are mutable so we can store the next value each
# time.
iterable_map = {}
for key, it in enumerate(iterables):
try:
iterable_map[key] = [next(it), key, it]
except StopIteration:
# empty entry, can be ignored
pass
while iterable_map:
value, key, it = order(iterable_map.itervalues())
yield value
try:
iterable_map[key][0] = next(it)
except StopIteration:
# this iterable is empty, remove it from consideration
del iterable_map[key]
def wrappostshare(orig, sourcerepo, destrepo, **kwargs):
"""Mark this shared working copy as sharing journal information"""
Pierre-Yves David
journal: take wlock for writting the 'shared' file...
r29756 with destrepo.wlock():
orig(sourcerepo, destrepo, **kwargs)
with destrepo.vfs('shared', 'a') as fp:
fp.write('journal\n')
Martijn Pieters
journal: add share extension support...
r29503
def unsharejournal(orig, ui, repo, repopath):
"""Copy shared journal entries into this repo when unsharing"""
if (repo.path == repopath and repo.shared() and
util.safehasattr(repo, 'journal')):
Gregory Szorc
hg: move share._getsrcrepo into core...
r36177 sharedrepo = hg.sharedreposource(repo)
Martijn Pieters
journal: add share extension support...
r29503 sharedfeatures = _readsharedfeatures(repo)
Martin von Zweigbergk
cleanup: use set literals...
r32291 if sharedrepo and sharedfeatures > {'journal'}:
Martijn Pieters
journal: add share extension support...
r29503 # there is a shared repository and there are shared journal entries
# to copy. move shared date over from source to destination but
# move the local file first
Pierre-Yves David
journal: rename on disk files to 'namejournal'...
r29870 if repo.vfs.exists('namejournal'):
Pierre-Yves David
journal: directly use repo.vfs.join...
r31330 journalpath = repo.vfs.join('namejournal')
Martijn Pieters
journal: add share extension support...
r29503 util.rename(journalpath, journalpath + '.bak')
storage = repo.journal
local = storage._open(
Pierre-Yves David
journal: rename on disk files to 'namejournal'...
r29870 repo.vfs, filename='namejournal.bak', _newestfirst=False)
Martijn Pieters
journal: add share extension support...
r29503 shared = (
e for e in storage._open(sharedrepo.vfs, _newestfirst=False)
if sharednamespaces.get(e.namespace) in sharedfeatures)
for entry in _mergeentriesiter(local, shared, order=min):
storage._write(repo.vfs, entry)
return orig(ui, repo, repopath)
Martijn Pieters
journal: new experimental extension...
r29443 class journalentry(collections.namedtuple(
Mateusz Kwapich
py3: namedtuple takes unicode (journal ext)...
r30131 u'journalentry',
u'timestamp user command namespace name oldhashes newhashes')):
Martijn Pieters
journal: new experimental extension...
r29443 """Individual journal entry
* timestamp: a mercurial (time, timezone) tuple
* user: the username that ran the command
* namespace: the entry namespace, an opaque string
* name: the name of the changed item, opaque string with meaning in the
namespace
* command: the hg command that triggered this record
* oldhashes: a tuple of one or more binary hashes for the old location
* newhashes: a tuple of one or more binary hashes for the new location
Handles serialisation from and to the storage format. Fields are
separated by newlines, hashes are written out in hex separated by commas,
timestamp and timezone are separated by a space.
"""
@classmethod
def fromstorage(cls, line):
(time, user, command, namespace, name,
oldhashes, newhashes) = line.split('\n')
timestamp, tz = time.split()
timestamp, tz = float(timestamp), int(tz)
oldhashes = tuple(node.bin(hash) for hash in oldhashes.split(','))
newhashes = tuple(node.bin(hash) for hash in newhashes.split(','))
return cls(
(timestamp, tz), user, command, namespace, name,
oldhashes, newhashes)
Pulkit Goyal
py3: replace __str__ to __bytes__ in hgext/journal.py...
r36684 def __bytes__(self):
"""bytes representation for storage"""
Pulkit Goyal
py3: use pycompat.bytestr() intsead of str...
r37334 time = ' '.join(map(pycompat.bytestr, self.timestamp))
Martijn Pieters
journal: new experimental extension...
r29443 oldhashes = ','.join([node.hex(hash) for hash in self.oldhashes])
newhashes = ','.join([node.hex(hash) for hash in self.newhashes])
return '\n'.join((
time, self.user, self.command, self.namespace, self.name,
oldhashes, newhashes))
Pulkit Goyal
py3: replace __str__ to __bytes__ in hgext/journal.py...
r36684 __str__ = encoding.strmethod(__bytes__)
Martijn Pieters
journal: new experimental extension...
r29443 class journalstorage(object):
"""Storage for journal entries
Martijn Pieters
journal: add share extension support...
r29503 Entries are divided over two files; one with entries that pertain to the
local working copy *only*, and one with entries that are shared across
multiple working copies when shared using the share extension.
Martijn Pieters
journal: new experimental extension...
r29443 Entries are stored with NUL bytes as separators. See the journalentry
class for the per-entry structure.
The file format starts with an integer version, delimited by a NUL.
Martijn Pieters
journal: add dirstate tracking...
r29502 This storage uses a dedicated lock; this makes it easier to avoid issues
with adding entries that added when the regular wlock is unlocked (e.g.
the dirstate).
Martijn Pieters
journal: new experimental extension...
r29443 """
_currentcommand = ()
Martijn Pieters
journal: add dirstate tracking...
r29502 _lockref = None
Martijn Pieters
journal: new experimental extension...
r29443
def __init__(self, repo):
Yuya Nishihara
procutil: bulk-replace function calls to point to new module
r37138 self.user = procutil.getuser()
Martijn Pieters
journal: add dirstate tracking...
r29502 self.ui = repo.ui
Martijn Pieters
journal: new experimental extension...
r29443 self.vfs = repo.vfs
Martijn Pieters
journal: add share extension support...
r29503 # is this working copy using a shared storage?
self.sharedfeatures = self.sharedvfs = None
if repo.shared():
features = _readsharedfeatures(repo)
Gregory Szorc
hg: move share._getsrcrepo into core...
r36177 sharedrepo = hg.sharedreposource(repo)
Martijn Pieters
journal: add share extension support...
r29503 if sharedrepo is not None and 'journal' in features:
self.sharedvfs = sharedrepo.vfs
self.sharedfeatures = features
Martijn Pieters
journal: new experimental extension...
r29443 # track the current command for recording in journal entries
@property
def command(self):
commandstr = ' '.join(
Yuya Nishihara
procutil: bulk-replace function calls to point to new module
r37138 map(procutil.shellquote, journalstorage._currentcommand))
Martijn Pieters
journal: new experimental extension...
r29443 if '\n' in commandstr:
# truncate multi-line commands
commandstr = commandstr.partition('\n')[0] + ' ...'
return commandstr
@classmethod
def recordcommand(cls, *fullargs):
"""Set the current hg arguments, stored with recorded entries"""
# Set the current command on the class because we may have started
# with a non-local repo (cloning for example).
cls._currentcommand = fullargs
Pierre-Yves David
journal: properly check for held lock (issue5349)...
r29928 def _currentlock(self, lockref):
"""Returns the lock if it's held, or None if it's not.
(This is copied from the localrepo class)
"""
if lockref is None:
return None
l = lockref()
if l is None or not l.held:
return None
return l
Martijn Pieters
journal: add share extension support...
r29503 def jlock(self, vfs):
Martijn Pieters
journal: add dirstate tracking...
r29502 """Create a lock for the journal file"""
Pierre-Yves David
journal: properly check for held lock (issue5349)...
r29928 if self._currentlock(self._lockref) is not None:
Martijn Pieters
journal: add dirstate tracking...
r29502 raise error.Abort(_('journal lock does not support nesting'))
Martijn Pieters
journal: add share extension support...
r29503 desc = _('journal of %s') % vfs.base
Martijn Pieters
journal: add dirstate tracking...
r29502 try:
Pierre-Yves David
journal: rename on disk files to 'namejournal'...
r29870 l = lock.lock(vfs, 'namejournal.lock', 0, desc=desc)
Martijn Pieters
journal: add dirstate tracking...
r29502 except error.LockHeld as inst:
self.ui.warn(
_("waiting for lock on %s held by %r\n") % (desc, inst.locker))
# default to 600 seconds timeout
l = lock.lock(
Pierre-Yves David
journal: rename on disk files to 'namejournal'...
r29870 vfs, 'namejournal.lock',
Boris Feld
lock: use configint for 'ui.timeout' config...
r35208 self.ui.configint("ui", "timeout"), desc=desc)
Martijn Pieters
journal: add dirstate tracking...
r29502 self.ui.warn(_("got lock after %s seconds\n") % l.delay)
self._lockref = weakref.ref(l)
return l
Martijn Pieters
journal: new experimental extension...
r29443 def record(self, namespace, name, oldhashes, newhashes):
"""Record a new journal entry
* namespace: an opaque string; this can be used to filter on the type
of recorded entries.
* name: the name defining this entry; for bookmarks, this is the
bookmark name. Can be filtered on when retrieving entries.
* oldhashes and newhashes: each a single binary hash, or a list of
binary hashes. These represent the old and new position of the named
item.
"""
if not isinstance(oldhashes, list):
oldhashes = [oldhashes]
if not isinstance(newhashes, list):
newhashes = [newhashes]
entry = journalentry(
Boris Feld
util: extract all date-related utils in utils/dateutil module...
r36625 dateutil.makedate(), self.user, self.command, namespace, name,
Martijn Pieters
journal: new experimental extension...
r29443 oldhashes, newhashes)
Martijn Pieters
journal: add share extension support...
r29503 vfs = self.vfs
if self.sharedvfs is not None:
# write to the shared repository if this feature is being
# shared between working copies.
if sharednamespaces.get(namespace) in self.sharedfeatures:
vfs = self.sharedvfs
self._write(vfs, entry)
def _write(self, vfs, entry):
with self.jlock(vfs):
Martijn Pieters
journal: new experimental extension...
r29443 version = None
# open file in amend mode to ensure it is created if missing
Jun Wu
journal: do not use atomictemp (issue5338)...
r33924 with vfs('namejournal', mode='a+b') as f:
Martijn Pieters
journal: new experimental extension...
r29443 f.seek(0, os.SEEK_SET)
# Read just enough bytes to get a version number (up to 2
# digits plus separator)
version = f.read(3).partition('\0')[0]
Pulkit Goyal
py3: use b"%d" to covert integer to bytes instead of str...
r36686 if version and version != "%d" % storageversion:
Martijn Pieters
journal: new experimental extension...
r29443 # different version of the storage. Exit early (and not
# write anything) if this is not a version we can handle or
# the file is corrupt. In future, perhaps rotate the file
# instead?
Martijn Pieters
journal: add dirstate tracking...
r29502 self.ui.warn(
Martijn Pieters
journal: new experimental extension...
r29443 _("unsupported journal file version '%s'\n") % version)
return
if not version:
# empty file, write version first
Pulkit Goyal
py3: use b"%d" to covert integer to bytes instead of str...
r36686 f.write(("%d" % storageversion) + '\0')
Martijn Pieters
journal: new experimental extension...
r29443 f.seek(0, os.SEEK_END)
Pulkit Goyal
py3: use bytes() instead of str()...
r36685 f.write(bytes(entry) + '\0')
Martijn Pieters
journal: new experimental extension...
r29443
def filtered(self, namespace=None, name=None):
"""Yield all journal entries with the given namespace or name
Both the namespace and the name are optional; if neither is given all
entries in the journal are produced.
Martijn Pieters
journal: add support for seaching by pattern...
r29504 Matching supports regular expressions by using the `re:` prefix
(use `literal:` to match names or namespaces that start with `re:`)
Martijn Pieters
journal: new experimental extension...
r29443 """
Martijn Pieters
journal: add support for seaching by pattern...
r29504 if namespace is not None:
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 namespace = stringutil.stringmatcher(namespace)[-1]
Martijn Pieters
journal: add support for seaching by pattern...
r29504 if name is not None:
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 name = stringutil.stringmatcher(name)[-1]
Martijn Pieters
journal: new experimental extension...
r29443 for entry in self:
Martijn Pieters
journal: add support for seaching by pattern...
r29504 if namespace is not None and not namespace(entry.namespace):
Martijn Pieters
journal: new experimental extension...
r29443 continue
Martijn Pieters
journal: add support for seaching by pattern...
r29504 if name is not None and not name(entry.name):
Martijn Pieters
journal: new experimental extension...
r29443 continue
yield entry
def __iter__(self):
"""Iterate over the storage
Yields journalentry instances for each contained journal record.
"""
Martijn Pieters
journal: add share extension support...
r29503 local = self._open(self.vfs)
if self.sharedvfs is None:
return local
# iterate over both local and shared entries, but only those
# shared entries that are among the currently shared features
shared = (
e for e in self._open(self.sharedvfs)
if sharednamespaces.get(e.namespace) in self.sharedfeatures)
return _mergeentriesiter(local, shared)
Pierre-Yves David
journal: rename on disk files to 'namejournal'...
r29870 def _open(self, vfs, filename='namejournal', _newestfirst=True):
Martijn Pieters
journal: add share extension support...
r29503 if not vfs.exists(filename):
Martijn Pieters
journal: new experimental extension...
r29443 return
Martijn Pieters
journal: add share extension support...
r29503 with vfs(filename) as f:
Martijn Pieters
journal: new experimental extension...
r29443 raw = f.read()
lines = raw.split('\0')
version = lines and lines[0]
Pulkit Goyal
py3: use b"%d" to covert integer to bytes instead of str...
r36686 if version != "%d" % storageversion:
Martijn Pieters
journal: new experimental extension...
r29443 version = version or _('not available')
raise error.Abort(_("unknown journal file version '%s'") % version)
Martijn Pieters
journal: add share extension support...
r29503 # Skip the first line, it's a version number. Normally we iterate over
# these in reverse order to list newest first; only when copying across
# a shared storage do we forgo reversing.
lines = lines[1:]
if _newestfirst:
lines = reversed(lines)
Martijn Pieters
journal: new experimental extension...
r29443 for line in lines:
if not line:
continue
yield journalentry.fromstorage(line)
# journal reading
# log options that don't make sense for journal
_ignoreopts = ('no-merges', 'graph')
@command(
'journal', [
Martijn Pieters
journal: add dirstate tracking...
r29502 ('', 'all', None, 'show history for all names'),
Martijn Pieters
journal: new experimental extension...
r29443 ('c', 'commits', None, 'show commit metadata'),
Yuya Nishihara
commands: move templates of common command options to cmdutil (API)...
r32375 ] + [opt for opt in cmdutil.logopts if opt[1] not in _ignoreopts],
Martijn Pieters
journal: new experimental extension...
r29443 '[OPTION]... [BOOKMARKNAME]')
def journal(ui, repo, *args, **opts):
Martijn Pieters
journal: add dirstate tracking...
r29502 """show the previous position of bookmarks and the working copy
Martijn Pieters
journal: new experimental extension...
r29443
Martijn Pieters
journal: add dirstate tracking...
r29502 The journal is used to see the previous commits that bookmarks and the
working copy pointed to. By default the previous locations for the working
copy. Passing a bookmark name will show all the previous positions of
that bookmark. Use the --all switch to show previous locations for all
bookmarks and the working copy; each line will then include the bookmark
name, or '.' for the working copy, as well.
Martijn Pieters
journal: new experimental extension...
r29443
Martijn Pieters
journal: add support for seaching by pattern...
r29504 If `name` starts with `re:`, the remainder of the name is treated as
a regular expression. To match a name that actually starts with `re:`,
use the prefix `literal:`.
Martijn Pieters
journal: new experimental extension...
r29443 By default hg journal only shows the commit hash and the command that was
running at that time. -v/--verbose will show the prior hash, the user, and
the time at which it happened.
Use -c/--commits to output log information on each commit hash; at this
point you can use the usual `--patch`, `--git`, `--stat` and `--template`
switches to alter the log output for these.
`hg journal -T json` can be used to produce machine readable output.
"""
Pulkit Goyal
py3: handle keyword arguments in hgext/journal.py...
r35001 opts = pycompat.byteskwargs(opts)
Martijn Pieters
journal: add dirstate tracking...
r29502 name = '.'
if opts.get('all'):
if args:
raise error.Abort(
_("You can't combine --all and filtering on a name"))
name = None
Martijn Pieters
journal: new experimental extension...
r29443 if args:
Martijn Pieters
journal: add dirstate tracking...
r29502 name = args[0]
Martijn Pieters
journal: new experimental extension...
r29443
fm = ui.formatter('journal', opts)
if opts.get("template") != "json":
Martijn Pieters
journal: add dirstate tracking...
r29502 if name is None:
displayname = _('the working copy and bookmarks')
Martijn Pieters
journal: new experimental extension...
r29443 else:
Martijn Pieters
journal: add dirstate tracking...
r29502 displayname = "'%s'" % name
ui.status(_("previous locations of %s:\n") % displayname)
Martijn Pieters
journal: new experimental extension...
r29443
Yuya Nishihara
cmdutil: drop aliases for logcmdutil functions (API)...
r35906 limit = logcmdutil.getlimit(opts)
Martijn Pieters
journal: new experimental extension...
r29443 entry = None
Jun Wu
journal: use pager...
r35478 ui.pager('journal')
Martijn Pieters
journal: add dirstate tracking...
r29502 for count, entry in enumerate(repo.journal.filtered(name=name)):
Martijn Pieters
journal: new experimental extension...
r29443 if count == limit:
break
Yuya Nishihara
journal: use fm.formatlist() to pass hashes in appropriate type (BC)
r29677 newhashesstr = fm.formatlist(map(fm.hexfunc, entry.newhashes),
name='node', sep=',')
oldhashesstr = fm.formatlist(map(fm.hexfunc, entry.oldhashes),
name='node', sep=',')
Martijn Pieters
journal: new experimental extension...
r29443
fm.startitem()
fm.condwrite(ui.verbose, 'oldhashes', '%s -> ', oldhashesstr)
fm.write('newhashes', '%s', newhashesstr)
Martijn Pieters
journal: add dirstate tracking...
r29502 fm.condwrite(ui.verbose, 'user', ' %-8s', entry.user)
Martijn Pieters
journal: add support for seaching by pattern...
r29504 fm.condwrite(
opts.get('all') or name.startswith('re:'),
'name', ' %-8s', entry.name)
Martijn Pieters
journal: new experimental extension...
r29443
Yuya Nishihara
journal: use fm.formatdate() to pass date tuple in appropriate type (BC)
r29679 timestring = fm.formatdate(entry.timestamp, '%Y-%m-%d %H:%M %1%2')
Martijn Pieters
journal: new experimental extension...
r29443 fm.condwrite(ui.verbose, 'date', ' %s', timestring)
fm.write('command', ' %s\n', entry.command)
if opts.get("commits"):
Yuya Nishihara
logcmdutil: drop default arguments from changesetdisplayer/templater() calls
r35972 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
Martijn Pieters
journal: new experimental extension...
r29443 for hash in entry.newhashes:
try:
ctx = repo[hash]
displayer.show(ctx)
except error.RepoLookupError as e:
Pulkit Goyal
py3: use pycompat.bytestr() to convert error messages to bytes...
r36671 fm.write('repolookuperror', "%s\n\n", pycompat.bytestr(e))
Martijn Pieters
journal: new experimental extension...
r29443 displayer.close()
fm.end()
if entry is None:
ui.status(_("no recorded locations\n"))