From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id ANZ2FwmpKmTqLgAASxT56A (envelope-from ) for ; Mon, 03 Apr 2023 12:23:05 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id kHSyFgmpKmQE+wAAG6o9tA (envelope-from ) for ; Mon, 03 Apr 2023 12:23:05 +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 BDA0C20017 for ; Mon, 3 Apr 2023 12:23:04 +0200 (CEST) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 326905F41A; Mon, 3 Apr 2023 10:23:02 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 754D35F38E for ; Mon, 3 Apr 2023 10:22:58 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id 017765FB82; Mon, 3 Apr 2023 06:22:56 -0400 (EDT) Received: (nullmailer pid 3923887 invoked by uid 1000); Mon, 03 Apr 2023 10:22:55 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH] CLI/git: add reset command Date: Mon, 3 Apr 2023 07:22:48 -0300 Message-Id: <20230403102248.3923874-1-david@tethera.net> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Message-ID-Hash: 56DM7HVKROMKZFQGLDAWDFVIT2AMARMZ X-Message-ID-Hash: 56DM7HVKROMKZFQGLDAWDFVIT2AMARMZ X-MailFrom: bremner@tethera.net 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-Country: DE X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680517385; a=rsa-sha256; cv=none; b=LYsCCXUMeMCLNidCVw4g4w/YpAfr4OJ4GiMmcIZ+87bRBhAPg+BcvcayjGS31Jrso989V7 JHqmSjrmuFJSfRWUQXT6ZeNmxfc7JEy617EdZ76lB9KQoAWqtfLhKL1R1IYtfPBVP53ggX KgkjQP9zrGqdLTxH7xCrWSkLKpjlJxByA0c6wIfxc0H427K8CBY8QKng0S6Rp+EStR8rPo j4isGBHGLl0CxJHrzyOV9ZKV1eXXCHwUnWc1SHa7pItfbPCtTj2gmUfwyYSMyAT9/2ksdh AwiV2xN0ooRjF/wiTLJIXJucq1qX4R5gNvWDHkR74zfYjTXIxygtRV+Dwl+vXg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1680517385; 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:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post; bh=EM/Kdlai3i6LH0M5UP2Di7De63zRdEfqI8BMLPcddCk=; b=i0rhd1GmzGsazaLY0P49bq0zUvBdwGfSMBdPYCR6XGIUnhqil8MvgaiAwRoKwgNZwL5zvV EPe4w1g0oxBHBENmt41BhWii4CvQ9dx1pcVwg+8zQ3pcDZj4grqYWyz1eIYQZXi8dxq4s7 GKW0+LyiCttoMslDd62qjY66G1c/fpipdraA9qtkBdFlQGJunXrXbxEsfkut8zie32WCQS AtoodAVx1WfgDeZ6PUY0y1YH7VlaFddLE4K9n9F4D5DZ0c4KDFoTBLxR1wvp7Xml78JQIu 0LW1VRWgvpdBumWPCFSDEVgZzhajKcT0BiEr/4dmHagSKSnuLdtyD+YtxCQozQ== X-Migadu-Spam-Score: -1.10 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=none; 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-Spam-Score: -1.10 X-Migadu-Queue-Id: BDA0C20017 X-TUID: AfHfhw5J5mxi Sometimes merging is not what we want with tags; in particular it tends to keep tags in the local repo that have been removed elsewhere. This commit provides a new reset command; the reset itself is trivial, but the work is to provide a safety check that uses the existing --force and git.safe_fraction machinery. --- notmuch-git.py | 37 +++++++++++++++++++++++++++++++++++-- test/T850-git.sh | 46 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 3 deletions(-) diff --git a/notmuch-git.py b/notmuch-git.py index 57098aae..80787814 100644 --- a/notmuch-git.py +++ b/notmuch-git.py @@ -369,7 +369,7 @@ class CachedIndex: _git(args=['read-tree', self.current_treeish], wait=True) -def check_safe_fraction(status): +def _check_fraction(change): safe = 0.1 conf = _notmuch_config_get ('git.safe_fraction') if conf and conf != '': @@ -380,7 +380,7 @@ def check_safe_fraction(status): _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: @@ -388,6 +388,25 @@ def check_safe_fraction(status): _LOG.error('Use --force to override or reconfigure git.safe_fraction.') exit(1) +def check_safe_fraction(status): + + change = len(status['added'])+len(status['deleted']) + _check_fraction(change) + +def check_diff_fraction(): + + # check number of directories (i.e. messages) changed. + change_set = set() + + with _git(args=['diff', '--name-only', 'HEAD', '@{upstream}'], + stdout=_subprocess.PIPE) as git: + for path in git.stdout: + change_set.add(_os.path.dirname(path)) + + change=len(change_set) + _check_fraction(change) + + def commit(treeish='HEAD', message=None, force=False): """ Commit prefix-matching tags from the notmuch database to Git. @@ -620,6 +639,15 @@ def push(repository=None, refspecs=None): _git(args=args, wait=True) +def reset(force=False): + """ + reset the local git branch to match the remote one + """ + if not force: + check_diff_fraction() + + _git(args=["reset","--soft","origin/master"],wait=True) + def status(): """ Show pending updates in notmuch or git repo. @@ -1048,6 +1076,7 @@ if __name__ == '__main__': 'merge', 'pull', 'push', + 'reset', 'status', ]: func = locals()[command] @@ -1142,6 +1171,10 @@ if __name__ == '__main__': 'Refspec (usually a branch name) to push. See ' 'the entry in the OPTIONS section of ' 'git-push(1) for other possibilities.')) + elif command == 'reset': + subparser.add_argument( + '-f', '--force', action='store_true', + help='reset a large fraction of tags.') args = parser.parse_args() diff --git a/test/T850-git.sh b/test/T850-git.sh index 55cec78a..ae6e7a03 100755 --- a/test/T850-git.sh +++ b/test/T850-git.sh @@ -213,6 +213,51 @@ cat < EXPECTED EOF test_expect_equal_file EXPECTED OUTPUT +test_begin_subtest "reset" +notmuch git -C reset.git -p '' clone remote.git +notmuch git -C reset.git checkout --force +notmuch tag +test4 id:20091117190054.GU3165@dottiness.seas.harvard.edu +notmuch git -C remote.git commit --force +notmuch tag -test4 id:20091117190054.GU3165@dottiness.seas.harvard.edu +notmuch git -C reset.git fetch +notmuch git -C reset.git reset +notmuch git -C reset.git checkout --force +notmuch dump id:20091117190054.GU3165@dottiness.seas.harvard.edu | grep -v '^#' > OUTPUT +cat < EXPECTED ++inbox +signed +test2 +test3 +test4 +unread -- id:20091117190054.GU3165@dottiness.seas.harvard.edu +EOF +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "reset (require force for large change)" +notmuch git -C reset2.git -p '' clone remote.git +notmuch git -C reset2.git checkout --force +notmuch tag +test5 '*' +notmuch git -C remote.git commit --force +notmuch tag -test5 '*' +notmuch git -C reset2.git fetch +test_expect_code 1 "notmuch git -C reset2.git -l debug reset" + +test_begin_subtest "reset (don't require force for large change to one message)" +notmuch git -C reset3.git -p '' clone remote.git +notmuch git -C reset3.git checkout --force +notmuch dump id:20091117190054.GU3165@dottiness.seas.harvard.edu > BEFORE +for tag in $(seq 1 100); do + notmuch tag +$tag id:20091117190054.GU3165@dottiness.seas.harvard.edu +done +notmuch git -C remote.git commit --force +notmuch restore < BEFORE +notmuch git -C reset3.git fetch +test_expect_code 0 "notmuch git -C reset3.git -l debug reset" + +test_begin_subtest "reset --force" +notmuch git -C reset4.git -p '' clone remote.git +notmuch git -C reset4.git checkout --force +notmuch tag +test6 '*' +notmuch git -C remote.git commit --force +notmuch tag -test6 '*' +notmuch git -C reset4.git fetch +test_expect_code 0 "notmuch git -C reset4.git -l debug reset --force" + test_begin_subtest "environment passed through when run as 'notmuch git'" env NOTMUCH_GIT_DIR=foo NOTMUCH_GIT_PREFIX=bar NOTMUCH_PROFILE=default notmuch git -C tags.git -p '' -ldebug status |& \ grep '^env ' | notmuch_dir_sanitize > OUTPUT @@ -305,7 +350,6 @@ prefix = env:: EOF test_expect_equal_file EXPECTED OUTPUT - test_begin_subtest "init, xdg default location" repo=home/.local/share/notmuch/default/git notmuch git -ldebug init |& grep '^repository' | notmuch_dir_sanitize > OUTPUT -- 2.39.2