from urllib.parse import unquote as _unquote
import json as _json
-_LOG = _logging.getLogger('nmbug')
+_LOG = _logging.getLogger('notmuch-git')
_LOG.setLevel(_logging.WARNING)
_LOG.addHandler(_logging.StreamHandler())
prefix = TAG_PREFIX
return '(tag (starts-with "{:s}"))'.format(prefix.replace('"','\\\"'))
+def count_messages(prefix=None):
+ "count messages with a given prefix."
+ (status, stdout, stderr) = _spawn(
+ args=['notmuch', 'count', '--query=sexp', _tag_query(prefix)],
+ stdout=_subprocess.PIPE, wait=True)
+ if status != 0:
+ _LOG.error("failed to run notmuch config")
+ sys.exit(1)
+ return int(stdout.rstrip())
+
def get_tags(prefix=None):
"Get a list of tags with a given prefix."
(status, stdout, stderr) = _spawn(
def archive(treeish='HEAD', args=()):
"""
- Dump a tar archive of the current nmbug tag set.
+ Dump a tar archive of the current notmuch-git tag set.
Using 'git archive'.
def clone(repository):
"""
- Create a local nmbug repository from a remote source.
+ Create a local notmuch-git repository from a remote source.
This wraps 'git clone', adding some options to avoid creating a
working tree while preserving remote-tracking branches and
upstreams.
"""
- with _tempfile.TemporaryDirectory(prefix='nmbug-clone.') as workdir:
+ with _tempfile.TemporaryDirectory(prefix='notmuch-git-clone.') as workdir:
_spawn(
args=[
'git', 'clone', '--no-checkout', '--separate-git-dir', NOTMUCH_GIT_DIR,
_git(args=['read-tree', self.current_treeish], wait=True)
-def commit(treeish='HEAD', message=None):
+def check_safe_fraction(status):
+ safe = 0.1
+ conf = _notmuch_config_get ('git.safe_fraction')
+ if conf and conf != '':
+ safe=float(conf)
+
+ total = count_messages (TAG_PREFIX)
+ if total == 0:
+ _LOG.error('No existing tags with given prefix, stopping.'.format(safe))
+ _LOG.error('Use --force to override.')
+ exit(1)
+ change = len(status['added'])+len(status['deleted'])
+ fraction = change/total
+ _LOG.debug('total messages {:d}, change: {:d}, fraction: {:f}'.format(total,change,fraction))
+ if fraction > safe:
+ _LOG.error('safe fraction {:f} exceeded, stopping.'.format(safe))
+ _LOG.error('Use --force to override or reconfigure git.safe_fraction.')
+ exit(1)
+
+def commit(treeish='HEAD', message=None, force=False):
"""
Commit prefix-matching tags from the notmuch database to Git.
"""
_LOG.warning('Nothing to commit')
return
+ if not force:
+ check_safe_fraction (status)
+
with CachedIndex(NOTMUCH_GIT_DIR, treeish) as index:
try:
_update_index(status=status)
def init(remote=None):
"""
- Create an empty nmbug repository.
+ Create an empty notmuch-git repository.
This wraps 'git init' with a few extra steps to support subsequent
status and commit commands.
wait=True)
-def checkout():
+def checkout(force=None):
"""
Update the notmuch database from Git.
to Git.
"""
status = get_status()
+
+ if not force:
+ check_safe_fraction(status)
+
with _spawn(
args=['notmuch', 'tag', '--batch'], stdin=_subprocess.PIPE) as p:
for id, tags in status['added'].items():
_LOG.error('\n'.join([
'Uncommitted changes to {prefix}* tags in notmuch',
'',
- "For a summary of changes, run 'nmbug status'",
- "To save your changes, run 'nmbug commit' before merging/pull",
- "To discard your changes, run 'nmbug checkout'",
+ "For a summary of changes, run 'notmuch-git status'",
+ "To save your changes, run 'notmuch-git commit' before merging/pull",
+ "To discard your changes, run 'notmuch-git checkout'",
]).format(prefix=TAG_PREFIX))
_sys.exit(1)
args.append(repository)
if refspecs:
args.extend(refspecs)
- with _tempfile.TemporaryDirectory(prefix='nmbug-pull.') as workdir:
+ with _tempfile.TemporaryDirectory(prefix='notmuch-git-pull.') as workdir:
for command in [
['reset', '--hard'],
args]:
The default reference is '@{upstream}'.
"""
_insist_committed()
- with _tempfile.TemporaryDirectory(prefix='nmbug-merge.') as workdir:
+ with _tempfile.TemporaryDirectory(prefix='notmuch-git-merge.') as workdir:
for command in [
['reset', '--hard'],
['merge', reference]]:
"""
A simple wrapper for 'git log'.
- After running 'nmbug fetch', you can inspect the changes with
- 'nmbug log HEAD..@{upstream}'.
+ After running 'notmuch-git fetch', you can inspect the changes with
+ 'notmuch-git log HEAD..@{upstream}'.
"""
# we don't want output trapping here, because we want the pager.
args = ['log', '--name-status', '--no-renames'] + list(args)
def push(repository=None, refspecs=None):
- "Push the local nmbug Git state to a remote repository."
+ "Push the local notmuch-git Git state to a remote repository."
if refspecs and not repository:
repository = _get_remote()
args = ['push']
* A
- Tag is present in notmuch database, but not committed to nmbug
- (equivalently, tag has been deleted in nmbug repo, e.g. by a
+ Tag is present in notmuch database, but not committed to notmuch-git
+ (equivalently, tag has been deleted in notmuch-git repo, e.g. by a
pull, but not restored to notmuch database).
* D
- Tag is present in nmbug repo, but not restored to notmuch
+ Tag is present in notmuch-git repo, but not restored to notmuch
database (equivalently, tag has been deleted in notmuch).
* U
Message is unknown (missing from local notmuch database).
The second character (if present) represents a difference between
- local and upstream branches. Typically 'nmbug fetch' needs to be
+ local and upstream branches. Typically 'notmuch-git fetch' needs to be
run to update this.
* a
def _help(parser, command=None):
"""
- Show help for an nmbug command.
+ Show help for an notmuch-git command.
Because some folks prefer:
- $ nmbug help COMMAND
+ $ notmuch-git help COMMAND
to
- $ nmbug COMMAND --help
+ $ notmuch-git COMMAND --help
"""
if command:
parser.parse_args([command, '--help'])
help=(
"Argument passed through to 'git archive'. Set anything "
'before <tree-ish>, see git-archive(1) for details.'))
+ elif command == 'checkout':
+ subparser.add_argument(
+ '-f', '--force', action='store_true',
+ help='checkout a large fraction of tags.')
elif command == 'clone':
subparser.add_argument(
'repository',
'URLS section of git-clone(1) for more information on '
'specifying repositories.'))
elif command == 'commit':
+ subparser.add_argument(
+ '-f', '--force', action='store_true',
+ help='commit a large fraction of tags.')
subparser.add_argument(
'message', metavar='MESSAGE', default='', nargs='?',
help='Text for the commit message.')