From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id KPc0KWVoxGIImAAAbAwnHQ (envelope-from ) for ; Tue, 05 Jul 2022 18:35:49 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id +JsGKWVoxGLVNwEAauVa8A (envelope-from ) for ; Tue, 05 Jul 2022 18:35:49 +0200 Received: from mail.notmuchmail.org (yantan.tethera.net [135.181.149.255]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1A2232CFAB for ; Tue, 5 Jul 2022 18:35:48 +0200 (CEST) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id D60725E017; Tue, 5 Jul 2022 16:35:45 +0000 (UTC) Received: from meesny.iki.fi (meesny.iki.fi [195.140.195.201]) by mail.notmuchmail.org (Postfix) with ESMTPS id 1B1095E010 for ; Tue, 5 Jul 2022 16:35:43 +0000 (UTC) Received: from c53 (gw1.nor.fi [185.218.193.67]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: too) by meesny.iki.fi (Postfix) with ESMTPSA id 9CA5C20168; Tue, 5 Jul 2022 19:35:41 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=meesny; t=1657038941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6CpOmnhJj9vqZEJ528K4XC8wyP+FVP0shF7fBLCtkUE=; b=qYs5TYhoBTh6vvi+YKASxwtej5VUjfSfdPxqe2DhthKZhKwI0DaUXT7G63UxLAEH5gq2JD MjKPNo4msJti89lAihofkZJfyttxUJ8bxRx2N5aN2GNYUyn8ZvnTGdkDL5cLGh/P9W/lSO 1dK/fl8sN6aIy3EmNra+y403HLIlew8= From: Tomi Ollila To: David Bremner , notmuch@notmuchmail.org Subject: Re: [PATCH] CLI/git: replace most mentions of nmbug In-Reply-To: <20220704153348.2060325-1-david@tethera.net> References: <20220704153348.2060325-1-david@tethera.net> User-Agent: Notmuch/0.36+55~gfb9633d (https://notmuchmail.org) Emacs/27.1 X-Face: HhBM'cA~ MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=meesny; t=1657038941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6CpOmnhJj9vqZEJ528K4XC8wyP+FVP0shF7fBLCtkUE=; b=tCoY5lTtQF6f62lQCI/gk+kiuz6wMYdLzukUR0t6RI+GZW71511/r8FmIZOzJbZt9liRa4 KGJjYYMSU1qZgyNRqH/GMXwYzY08WAetehS+VAC0b3GG0VRynjH1q8w7uT/msoVs765l2X dOItjd8+sSHO0jXf1H2/uz1rc6zVhnI= ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=too smtp.mailfrom=tomi.ollila@iki.fi ARC-Seal: i=1; s=meesny; d=iki.fi; t=1657038941; a=rsa-sha256; cv=none; b=rrM6T4/6Tg+AWdcpjF/KUtXHGzjgahJ3YawT3JaDwPSk4F8WKSZpRFxkp2AlXnBJqHosqr Kx5SiOc6Pmzm00z9Svkh2wo2UYV4dsqbusTRYBpUdh1VOhjYyJrMakRmuyVYybFzjHbfdT LcOfdBPWr9ijH1D04DGJeoS3hQYMvMo= Message-ID-Hash: MOPULQMUKEJ5BCK7H72E2PPLJRAPU45V X-Message-ID-Hash: MOPULQMUKEJ5BCK7H72E2PPLJRAPU45V X-MailFrom: tomi.ollila@iki.fi X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: DE ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1657038949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=gPH3aV4O04d90D5RF9jk3bOrjp0DaScvxcywYNvykY4=; b=L1KD/+PABFuEaI5DNNw5frAmXKJ53fTDXSoa01MkS6iaNgZe7tBB68/khZDE8mLax0qWzk Ww4iRKQybWWJAFenqF58d5wmfu92xIc41vdpW75MgnUlKGCIOQqshDLHWlfMKahMtyf/VZ clHHRiaKCYllcDCBxXUGiHrmGTEVKAIYu3F8pBrIlZyV4EoNOh7K2OVY1zF/0WMlwVq4Fc GmuPeSPKkkVs+pki4X/j2MiCiMTTegN0p0NrOCso16YxnotZaxuHAKb1qx+RHmxSqmpufC JBfvaHP8HGQm3V/LNlgnAQVWr4WQpEunsuXJmQdiItLNBQQ85v5rnn8LU+0Dig== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1657038949; a=rsa-sha256; cv=fail; b=eBvTrqaB5m/HWYnW1asSp5Qw71cb5bhWUJmVCVgL8YvEm20IsowVYw6brthnUFkQOZ8yqi HHDPvAtiwBGOF2ZB0FxLQVjUrMlnDkqAffKjSkJKUYajGU/DmySCP8WoHK6tnhlKvUA+rz ixTEaoUSsg4aXeedw5vNeiUCuONhDgENpBSQaDoGX9an2FWhdvJRCo4hGJz8sq+e5H7uN9 H86hVTwQfKgN6u9GhG1eXPpA+mmu/pnluxEEpVczNwTTlU2HlwYesZgPuDVyKiRrgxJiIj gDZt566U/5zqo15XmdWlJQVJOXLz3JV/Xmmggni40GTer79ugZEnVlMcB4v5zg== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=meesny header.b=qYs5TYho; arc=reject ("signature check failed: fail, {[1] = sig:iki.fi:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: 2.22 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=meesny header.b=qYs5TYho; arc=reject ("signature check failed: fail, {[1] = sig:iki.fi:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 1A2232CFAB X-Spam-Score: 2.22 X-Migadu-Scanner: scn0.migadu.com X-TUID: bGyBoJz7umxy On Mon, Jul 04 2022, David Bremner wrote: > Particularly in help messages, nmbug is confusing for users who may > have never heard of it. Good Progress! LGTM! Tomi > --- > notmuch-git.py | 40 ++++++++++++++++++++-------------------- > 1 file changed, 20 insertions(+), 20 deletions(-) > > diff --git a/notmuch-git.py b/notmuch-git.py > index eac24a46..42de074e 100644 > --- a/notmuch-git.py > +++ b/notmuch-git.py > @@ -40,7 +40,7 @@ from urllib.parse import quote as _quote > 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()) > > @@ -260,7 +260,7 @@ def get_tags(prefix=None): > > 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'. > > @@ -278,13 +278,13 @@ def archive(treeish='HEAD', args=()): > > 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, > @@ -454,7 +454,7 @@ def fetch(remote=None): > > def init(remote=None,format_version=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. > @@ -542,9 +542,9 @@ def _insist_committed(): > _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) > > @@ -566,7 +566,7 @@ def pull(repository=None, refspecs=None): > 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]: > @@ -584,7 +584,7 @@ def merge(reference='@{upstream}'): > 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]]: > @@ -599,8 +599,8 @@ def log(args=()): > """ > 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) > @@ -609,7 +609,7 @@ def log(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'] > @@ -632,13 +632,13 @@ def status(): > > * 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 > @@ -646,7 +646,7 @@ def status(): > 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 > @@ -939,15 +939,15 @@ def _unpack_diff_lines(stream): > > 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']) > -- > 2.35.2 > > _______________________________________________ > notmuch mailing list -- notmuch@notmuchmail.org > To unsubscribe send an email to notmuch-leave@notmuchmail.org