Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 60D38431FBD for ; Wed, 6 Aug 2014 16:28:11 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.1 X-Spam-Level: X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UqlTlqyuUAVe for ; Wed, 6 Aug 2014 16:28:07 -0700 (PDT) Received: from qmta11.emeryville.ca.mail.comcast.net (qmta11.emeryville.ca.mail.comcast.net [76.96.27.211]) by olra.theworths.org (Postfix) with ESMTP id 798C2431FAE for ; Wed, 6 Aug 2014 16:28:07 -0700 (PDT) Received: from omta22.emeryville.ca.mail.comcast.net ([76.96.30.89]) by qmta11.emeryville.ca.mail.comcast.net with comcast id bbB41o0021vN32cABbU6ck; Wed, 06 Aug 2014 23:28:06 +0000 Received: from odin.tremily.us ([24.18.63.50]) by omta22.emeryville.ca.mail.comcast.net with comcast id bbU51o00X152l3L8ibU6Nx; Wed, 06 Aug 2014 23:28:06 +0000 Received: by odin.tremily.us (Postfix, from userid 1000) id B018B12BD996; Wed, 6 Aug 2014 16:28:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1407367685; bh=2zJpkForLkaRNGvIYgOAjqLbqyaQoqHVVNo8zTTmMkU=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=Hqmt+mt2BIkCkJTBuRJKkydD7PWyL0lvX2Bh6WB66p/ocmdsMSylC7xg4K9nMiue3 AJq5tsiyCLfNYjVsQDnDWp10q2+nzY0LsIcvctjalNRdDXew2yVX3WFXrWv3E6bDiV Rm4aMA6Cf9FnYXpCP7s0S2IEnVJlBgx4J9eu9eNA= Date: Wed, 6 Aug 2014 16:28:05 -0700 From: "W. Trevor King" To: David Bremner Subject: Re: [PATCH v3] nmbug: Translate to Python Message-ID: <20140806232805.GI31313@odin.tremily.us> References: <84447a0ed48412e1587761d560d18cb5affd4f66.1405897133.git.wking@tremily.us> <878un36bd5.fsf@maritornes.cs.unb.ca> <874mxqe7tx.fsf@maritornes.cs.unb.ca> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="JIpyCmsTxyPLrmrM" Content-Disposition: inline In-Reply-To: <874mxqe7tx.fsf@maritornes.cs.unb.ca> OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8; url=http://tremily.us/pubkey.txt User-Agent: Mutt/1.5.23 (2014-03-12) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20140121; t=1407367686; bh=+Kp7Awa4ywgQJh92/nkH4TabvHHKOKJ5W+1mn1OpyGY=; h=Received:Received:Received:Date:From:To:Subject:Message-ID: MIME-Version:Content-Type; b=RX0Ndu/zp0DNxTmcbMCl3MM/1EgqYVs7Id6EgvmbuF/R086wSHpkzV8wH1Fx9FVnY eOSPY2kCv0u5+PAgBYyJA4XFmg01v/wFg7iu5EpH78wqsJ7E6M+iw3FgpZ/BsnNd/G wSzZ0Kqs2Dr/vwq4zLjiwGPT/RuqomLqh6b4PgI8rYYWmwN9p53qjSbPTfAe0ky8jF mioX9S2MMIs+H8/FrJ6AKb/uskkNH6a5kVD7jUw9xhlN5954jzCRf8B3ND/MflMcvR 8BLfLDavdEfvaiCOX4LdwIaHsxmvNBLUEpEtO1VdNOdQJsbpMUXQiuzTErlHoLXg3r Miqf7TzKZf1tQ== Cc: notmuch@notmuchmail.org X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Aug 2014 23:28:11 -0000 --JIpyCmsTxyPLrmrM Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Aug 05, 2014 at 10:16:10PM -0300, David Bremner wrote: > David Bremner writes: > > I did notice that merging was noticably noisier than I remembered.=20 >=20 > rejected pushes also seem noisier than before; I'm not sure the=20 > python backtrace adds anything here. >=20 > To nmbug@nmbug.tethera.net:nmbug-tags > ! [rejected] master -> master (fetch first) > error: failed to push some refs to 'nmbug@nmbug.tethera.net:nmbug-tags' > hint: Updates were rejected because the remote contains work that you do > hint: not have locally. This is usually caused by another repository push= ing > hint: to the same ref. You may want to first integrate the remote changes > hint: (e.g., 'git pull ...') before pushing again. > hint: See the 'Note about fast-forwards' in 'git push --help' for details. > Traceback (most recent call last): > File "/home/bremner/config/scripts/nmbug", line 766, in > args.func(**kwargs) > File "/home/bremner/config/scripts/nmbug", line 463, in push > _git(args=3Dargs, wait=3DTrue) > File "/home/bremner/config/scripts/nmbug", line 210, in _git > return _spawn(args=3Dargs, **kwargs) > File "/home/bremner/config/scripts/nmbug", line 193, in _spawn > args=3Dargs, status=3Dstatus, stdout=3Dstdout, stderr=3Dstderr) > __main__.SubprocessError: ['git', '--git-dir', '/home/bremner/.nmbug', 'p= ush'] exited with 1 I can drop the backtrace and just print the SubprocessError, and just show the traceback if the logging is set to =E2=80=98debug=E2=80=99. If th= at sounds reasonable, I'll to it in v4. I'm not sure what the current nmbug shows in this case. Do you want me to prune the =E2=80=98hint=E2=80=99 lines too? I usually find those to = be pretty informative, but the're not directly applicable to folks using nmbug who prefer to ignore the underlying Git layer. Ideally, we'd translate them to apply to nmbug (=E2=80=9C=E2=80=A6(e.g. nmbug pull ...) b= efore pushing=E2=80=A6=E2=80=9D), but I can't think of a maintainable way to do t= hat. Cheers, Trevor --=20 This email may be signed or encrypted with GnuPG (http://www.gnupg.org). For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy --JIpyCmsTxyPLrmrM Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJT4roEAAoJEG8/JgBt8ol8vj8P/iB9b6J1eg/ePgiY7uvtGPXd c+pzUaBrhyaEHDBdK33ajEZlz+b4V1A/cZ+mKQvYr4JaB/hutTnWI1vOWjUL10wd 8zEYH120jRWnK8kdto+jAd4IipKuLp5DbgiagxvHEpf4O2wbWq19dqmL9T+3zNCd kNbiR6azJyRrxGe7J0rEpd0VV1P94pEmwdi7a/bfCZnJXUz7cDaI6tTzPH+AxkLi ksyay5vNnioEEdsuWrtcEMNgulHmeTq5f5fVBlYX+8jQ3DZHH9fyMTrY6b1nB+T1 RSr70TlT0zvLVfnVLcSnUgHOgQ0YP02Wzpala4hdeusdDDtDbJ6kFoY6QEMYGpJa Jy5mhaG30o6O5aPY6PNtqhyfs892MoxORqavIJjQWBbK+T5hsKe2/Ckw1rxve6HU Cf+wGBdAQVGPH/Sa3vlHlemnzZzBQLOAbMCJxpRocrL4UXlCd1DZaEM92mTxvGR+ 0Mr2FD4/FYWO0vw2pd7KabR69QrzvQBKrSM7l2O3ZxE8jyhLbm2QQebqAj0Bx+Ch akzKTJAM/sUpUFIdNOOHii0H4a0eN/amaGY03mjTFRpjweHoDWdZRb1iodcnP+qJ TWvdyVgA5qHrupQcFCHYZ7f1ATLmjDemnVRY/Yj9DjF2pEUfhbb7Dtv4drXhmt5H 1fQmJVCxpXstmTx+xJBT =zonE -----END PGP SIGNATURE----- --JIpyCmsTxyPLrmrM--