1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417
|
import datetime
import json
from .. import core
from .. import utils
from ..i18n import N_
from ..models import prefs
# put summary at the end b/c it can contain
# any number of funky characters, including the separator
LOGFMT = r'format:%H%x01%P%x01%d%x01%an%x01%ad%x01%ae%x01%s'
LOGSEP = chr(0x01)
STAGE = 'STAGE'
WORKTREE = 'WORKTREE'
class CommitFactory:
root_generation = 0
commits = {}
@classmethod
def reset(cls):
cls.commits.clear()
cls.root_generation = 0
@classmethod
def new(cls, context, oid=None, log_entry=None):
if not oid and log_entry:
oid = log_entry[: context.model.oid_len]
try:
commit = cls.commits[oid]
if log_entry and not commit.parsed:
commit.parse(log_entry)
cls.root_generation = max(commit.generation, cls.root_generation)
except KeyError:
commit = Commit(context, oid=oid, log_entry=log_entry)
if not log_entry:
cls.root_generation += 1
commit.generation = max(commit.generation, cls.root_generation)
cls.commits[oid] = commit
return commit
class DAG:
def __init__(self, ref, count):
self.ref = ref
self.count = count
self.display_status = True
self.overrides = {}
def set_ref(self, ref):
changed = ref != self.ref
if changed:
self.ref = ref
return changed
def set_count(self, count):
changed = count != self.count
if changed:
self.count = count
return changed
def set_arguments(self, args):
if args is None:
return
if self.set_count(args.count):
self.overrides['count'] = args.count
if hasattr(args, 'args') and args.args:
ref = core.list2cmdline(args.args)
if self.set_ref(ref):
self.overrides['ref'] = ref
def set_display_status(self, enabled):
"""Should we display the worktree status?"""
self.display_status = enabled
def overridden(self, opt):
return opt in self.overrides
def paths(self):
all_refs = utils.shell_split(self.ref)
if '--' in all_refs:
all_refs = all_refs[all_refs.index('--') :]
return [p for p in all_refs if p and core.exists(p)]
class Commit:
root_generation = 0
__slots__ = (
'context',
'oid',
'summary',
'parents',
'children',
'branches',
'tags',
'author',
'authdate',
'email',
'generation',
'column',
'row',
'parsed',
)
def __init__(self, context, oid=None, log_entry=None):
self.context = context
self.oid = oid
self.summary = None
self.parents = []
self.children = []
self.tags = []
self.branches = []
self.email = None
self.author = None
self.authdate = None
self.parsed = False
self.generation = CommitFactory.root_generation
self.column = None
self.row = None
if log_entry:
self.parse(log_entry)
def parse(self, log_entry, sep=LOGSEP):
oid_len = self.context.model.oid_len
self.oid = log_entry[:oid_len]
after_oid = log_entry[oid_len + 1 :]
details = after_oid.split(sep, 5)
(parents, tags, author, authdate, email, summary) = details
self.summary = summary if summary else ''
self.author = author if author else ''
self.authdate = authdate if authdate else ''
self.email = email if email else ''
if parents:
generation = None
for parent_oid in parents.split(' '):
parent = CommitFactory.new(self.context, oid=parent_oid)
parent.children.append(self)
if generation is None:
generation = parent.generation + 1
self.parents.append(parent)
generation = max(parent.generation + 1, generation)
self.generation = generation
if tags:
for tag in tags[2:-1].split(', '):
self.add_label(tag)
self.parsed = True
return self
def add_label(self, tag):
"""Add tag/branch labels from `git log --decorate ....`"""
if tag.startswith('tag: '):
tag = tag[5:] # strip off "tag: " leaving refs/tags/
if tag.startswith('refs/heads/'):
branch = tag[11:]
self.branches.append(branch)
if tag.startswith('refs/'):
# strip off refs/ leaving just tags/XXX remotes/XXX heads/XXX
tag = tag[5:]
if tag.endswith('/HEAD'):
return
# Git 2.4 Release Notes (draft)
# =============================
#
# Backward compatibility warning(s)
# ---------------------------------
#
# This release has a few changes in the user-visible output from
# Porcelain commands. These are not meant to be parsed by scripts, but
# the users still may want to be aware of the changes:
#
# * Output from "git log --decorate" (and "%d" format specifier used in
# the userformat "--format=<string>" parameter "git log" family of
# command takes) used to list "HEAD" just like other tips of branch
# names, separated with a comma in between. E.g.
#
# $ git log --decorate -1 main
# commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD, main)
# ...
#
# This release updates the output slightly when HEAD refers to the tip
# of a branch whose name is also shown in the output. The above is
# shown as:
#
# $ git log --decorate -1 main
# commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD -> main)
# ...
#
# C.f. http://thread.gmane.org/gmane.linux.kernel/1931234
head_arrow = 'HEAD -> '
if tag.startswith(head_arrow):
self.tags.append('HEAD')
self.add_label(tag[len(head_arrow) :])
else:
self.tags.append(tag)
def __str__(self):
return self.oid
def data(self):
return {
'oid': self.oid,
'summary': self.summary,
'author': self.author,
'authdate': self.authdate,
'parents': [p.oid for p in self.parents],
'tags': self.tags,
}
def __repr__(self):
return json.dumps(self.data(), sort_keys=True, indent=4, default=list)
def is_fork(self):
"""Returns True if the node is a fork"""
return len(self.children) > 1
def is_merge(self):
"""Returns True if the node is a fork"""
return len(self.parents) > 1
class RepoReader:
def __init__(self, context, params, allow_git_init=True):
self.context = context
self.params = params
self.git = context.git
self.returncode = 0
self._allow_git_init = allow_git_init
self._objects = {}
self._cmd = [
'git',
'-c',
'log.abbrevCommit=false',
'-c',
'log.showSignature=false',
'log',
'--topo-order',
'--decorate=full',
'--pretty=' + LOGFMT,
]
self._cached = False
"""Indicates that all data has been read"""
self._topo_list = []
"""List of commits objects in topological order"""
cached = property(lambda self: self._cached)
"""Return True when no commits remain to be read"""
def __len__(self):
return len(self._topo_list)
def reset(self):
CommitFactory.reset()
self._cached = False
self._topo_list = []
def get(self):
"""Generator function returns Commit objects found by the params"""
if self._cached:
for commit in self._topo_list:
yield commit
return
self.reset()
ref_args = utils.shell_split(self.params.ref)
cmd = (
self._cmd
+ ['-%d' % self.params.count]
+ ['--date=%s' % prefs.logdate(self.context)]
+ ['--no-patch']
+ ref_args
)
commit = None
# When _allow_git_init is True then we detect the "git init" state
# by checking whether any local branches currently exist.
if not self._allow_git_init or self.context.model.local_branches:
status, out, _ = core.run_command(cmd)
oid_len = self.context.model.oid_len
for log_entry in reversed(out.splitlines()):
if not log_entry:
break
oid = log_entry[:oid_len]
try:
commit = self._objects[oid]
except KeyError:
try:
commit = CommitFactory.new(self.context, log_entry=log_entry)
except (KeyError, ValueError):
continue
self._objects[commit.oid] = commit
self._topo_list.append(commit)
yield commit
else:
# git init
status = 0
self._top_commit = commit
self._cached = True
self.returncode = status
def get_worktree_commits(self):
"""A Commit object that represents unstaged modified changes in a worktree"""
if self.returncode != 0 or not self.params.display_status:
return None, None
context = self.context
model = context.model
if not model.modified and not model.staged and not model.unmerged:
return None, None
parents = []
parent_commit = self._top_commit
status, head, _ = context.git.rev_parse('HEAD', _readonly=True)
if status != 0:
# "git init" should include worktree and stage entries.
# We do not early out with None and leave the parents list empty.
pass
elif parent_commit:
# Is the top-most commit also our current HEAD?
# If so we'll include worktree and stage placeholder commits
# otherwise we should early out and omit these entries.
if head != parent_commit.oid:
return None, None
parents = [parent_commit]
author, email = context.cfg.get_author()
if model.commitmsg:
summary = model.commitmsg.split('\n', 1)[0]
else:
summary = ''
if summary:
stage_summary = f'STAGE: {summary}'
worktree_summary = f'WORKTREE: {summary}'
else:
stage_summary = N_('STAGE: changes ready to commit')
worktree_summary = N_('WORKTREE: unstaged changes')
authdate = get_date_for_current_time(context)
stage_commit = None
worktree_commit = None
if model.staged:
stage_commit = Commit(context, oid=STAGE)
stage_commit.add_label(STAGE)
stage_commit.parents = parents
stage_commit.summary = stage_summary
stage_commit.author = author
stage_commit.email = email
stage_commit.authdate = authdate
stage_commit.parsed = True
if parent_commit:
parent_commit.children.append(stage_commit)
stage_commit.generation = parent_commit.generation + 1
# Update state for the subsequent WORKTREE pseudo-commit.
parents = [stage_commit]
parent_commit = stage_commit
if model.modified or model.unmerged:
worktree_commit = Commit(context, oid=WORKTREE)
worktree_commit.add_label(WORKTREE)
worktree_commit.parents = parents
worktree_commit.summary = worktree_summary
worktree_commit.author = author
worktree_commit.email = email
worktree_commit.authdate = authdate
worktree_commit.parsed = True
if parent_commit:
parent_commit.children.append(worktree_commit)
worktree_commit.generation = parent_commit.generation + 1
return stage_commit, worktree_commit
def __getitem__(self, oid):
return self._objects[oid]
def items(self):
return list(self._objects.items())
def get_date_for_current_time(context):
"""Return the current time formatted according to the cola.logdate configuration"""
DateFormat = prefs.DateFormat
logdate = prefs.logdate(context)
now = datetime.datetime.now().astimezone()
if logdate == DateFormat.DEFAULT:
authdate = now.strftime('%c %z')
elif logdate == DateFormat.HUMAN:
authdate = now.strftime('%a %b %d %H:%M')
elif logdate == DateFormat.LOCAL:
authdate = now.strftime('%c')
elif logdate == DateFormat.ISO:
authdate = now.strftime('%Y-%m-%d %H:%M:%S %z')
elif logdate == DateFormat.ISO_STRICT:
authdate = now.strftime('%Y-%m-%dT%H:%M:%S%z')
elif logdate == DateFormat.RAW:
authdate = now.strftime('%s %z')
elif logdate == DateFormat.RELATIVE:
authdate = '0 seconds ago'
elif logdate == DateFormat.RFC:
authdate = now.strftime('%a, %e %b %Y %H:%M:%S %z')
elif logdate == DateFormat.SHORT:
authdate = now.strftime('%Y-%m-%d')
elif logdate == DateFormat.UNIX:
authdate = now.strftime('%s')
elif DateFormat.is_custom(logdate):
fmt = DateFormat.get_custom_format(logdate)
authdate = now.strftime(fmt)
else:
authdate = now.strftime('%c %z')
return authdate
|