39/fef4d8bf46a70a2f44122908f0176d347e53b3

   1 Return-Path: <wking@tremily.us>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 0D23A431FC3\r
   6         for <notmuch@notmuchmail.org>; Sun, 20 Jul 2014 16:34:09 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.1\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id vCuJ-QNsLVki for <notmuch@notmuchmail.org>;\r
  17         Sun, 20 Jul 2014 16:34:05 -0700 (PDT)\r
  18 Received: from qmta08.emeryville.ca.mail.comcast.net\r
  19         (qmta08.emeryville.ca.mail.comcast.net [76.96.30.80])\r
  20         by olra.theworths.org (Postfix) with ESMTP id F080C431FAE\r
  21         for <notmuch@notmuchmail.org>; Sun, 20 Jul 2014 16:34:04 -0700 (PDT)\r
  22 Received: from omta04.emeryville.ca.mail.comcast.net ([76.96.30.35])\r
  23         by qmta08.emeryville.ca.mail.comcast.net with comcast\r
  24         id UnYP1o0040lTkoCA8na4Zo; Sun, 20 Jul 2014 23:34:04 +0000\r
  25 Received: from odin.tremily.us ([24.18.63.50])\r
  26         by omta04.emeryville.ca.mail.comcast.net with comcast\r
  27         id Una31o00A152l3L8Qna39o; Sun, 20 Jul 2014 23:34:04 +0000\r
  28 Received: by odin.tremily.us (Postfix, from userid 1000)\r
  29         id 0EF6E12AB0D1; Sun, 20 Jul 2014 16:34:02 -0700 (PDT)\r
  30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin;\r
  31         t=1405899243; bh=ZJ6FrWJErCCe/vlY8Il+/Fl01xBjSSh/r8JMqzRXmA0=;\r
  32         h=Date:From:To:Cc:Subject:References:In-Reply-To;\r
  33         b=hKW2UgH4d71DQFj5OpHxhu1TJj/gm/VWURKURX0rIinb8ourdnF7wMyvULiZrcSyV\r
  34         pOg4BKmJVfvPXEE/1HIL4Ub3jCSgjeL/+65yD6L3bND+9MLMDSuEx/Ql56pEkDLbfx\r
  35         7fOqnHyij/qL9lqCe+P5TCg13m4wEhFcdWXSISM4=\r
  36 Date: Sun, 20 Jul 2014 16:34:02 -0700\r
  37 From: "W. Trevor King" <wking@tremily.us>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: Re: [PATCH v3] nmbug: Translate to Python\r
  40 Message-ID: <20140720233402.GU8744@odin>\r
  41 References:\r
  42  <84447a0ed48412e1587761d560d18cb5affd4f66.1405897133.git.wking@tremily.us>\r
  43 MIME-Version: 1.0\r
  44 Content-Type: multipart/signed; micalg=pgp-sha1;\r
  45         protocol="application/pgp-signature"; boundary="EyuBRJR0MsVMWKTf"\r
  46 Content-Disposition: inline\r
  47 In-Reply-To:\r
  48  <84447a0ed48412e1587761d560d18cb5affd4f66.1405897133.git.wking@tremily.us>\r
  49 OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8;\r
  50         url=http://tremily.us/pubkey.txt\r
  51 User-Agent: Mutt/1.5.23 (2014-03-12)\r
  52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
  53         s=q20140121; t=1405899244;\r
  54         bh=rMMuk6dSK2dYfTx0qDsnAgXQ0++7O8xqUZ6ednmkggM=;\r
  55         h=Received:Received:Received:Date:From:To:Subject:Message-ID:\r
  56         MIME-Version:Content-Type;\r
  57         b=r0ssCPKZlKPZojh6cjNQT4k38WSUdOo0cf1YkDDV2MeuBrkEUFPOm7RYsDNOLgmJI\r
  58         1UEH+bNRwu/JilIEYSN9S4H88/fZTWM9kGUQoueos3IwF6v/dUWpNQ4bM4MMljcDjk\r
  59         6ssJgyCFXGMxla1T/YIpS9cwLwPniOxbcEclcJEhvoMiueCiSwkVJ5O7VNBECW70gt\r
  60         kwQjjRmd9otGchkwVuZdpvU1snU0+VuXHAoXfewDLC8Hhx0CZ9hK3MS4iKYz9S2XUV\r
  61         Bv8Ua1ZZq7iMHNVCNp6xTAhWFIIumohvObRwjy2pgImhGV3nUyNCA7IIWdSt4XGxMY\r
  62         ev7OGViclFWaQ==\r
  63 Cc: David Bremner <bremner@debian.org>\r
  64 X-BeenThere: notmuch@notmuchmail.org\r
  65 X-Mailman-Version: 2.1.13\r
  66 Precedence: list\r
  67 List-Id: "Use and development of the notmuch mail system."\r
  68         <notmuch.notmuchmail.org>\r
  69 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  71 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  72 List-Post: <mailto:notmuch@notmuchmail.org>\r
  73 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  74 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  75         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  76 X-List-Received-Date: Sun, 20 Jul 2014 23:34:09 -0000\r
  77 \r
  78 \r
  79 --EyuBRJR0MsVMWKTf\r
  80 Content-Type: text/plain; charset=us-ascii\r
  81 Content-Disposition: inline\r
  82 Content-Transfer-Encoding: quoted-printable\r
  83 \r
  84 On Sun, Jul 20, 2014 at 03:59:49PM -0700, W. Trevor King wrote:\r
  85 > +def pull(repository=3DNone, refspecs=3DNone):\r
  86 > +    """\r
  87 > +    Pull (merge) remote repository changes to notmuch.\r
  88 > +\r
  89 > +    'pull' is equivalent to 'fetch' followed by 'merge'.  We use the\r
  90 > +    Git-configured repository for your current branch\r
  91 > +    (branch.<name>.repository, likely 'origin', and\r
  92 > +    branch.<name>.merge, likely 'master').\r
  93 > +    """\r
  94 > +    _insist_committed()\r
  95 > +    if refspecs and not repository:\r
  96 > +        repository =3D _get_remote()\r
  97 > +    args =3D ['pull']\r
  98 > +    if repository:\r
  99 > +        args.append(repository)\r
 100 > +    if refspecs:\r
 101 > +        args.extend(refspecs)\r
 102 > +    with _tempfile.TemporaryDirectory(prefix=3D'nmbug-merge.') as workdi=\r
 103 r:\r
 104 > +        _git(args=3Dargs, additional_env=3D{'GIT_WORK_TREE': workdir}, w=\r
 105 ait=3DTrue)\r
 106 > +    checkout()\r
 107 \r
 108 The TemporaryDirectory prefix should probably be 'nmbug-pull.'.\r
 109 Queued for v4.\r
 110 \r
 111 > +def log(args=3D()):\r
 112 > +    """\r
 113 > +    A simple wrapper for 'git log'.\r
 114 > +\r
 115 > +    After running 'nmbug fetch', you can inspect the changes with\r
 116 > +    'nmbug log HEAD..@{upstream}'.\r
 117 > +    """\r
 118 > +    # we don't want output trapping here, because we want the pager.\r
 119 > +    args =3D ['git', '--git-dir', NMBGIT, 'log', '--name-status'] + list=\r
 120 (args)\r
 121 > +    _LOG.debug('exec {args}'.format(args=3Dargs))\r
 122 > +    _os.execvp('git', args)\r
 123 \r
 124 I don't exec any other commands.  Maybe we want '_git(args=3Dargs,\r
 125 wait=3DTrue)' here (with the appropriate args adjustments)?\r
 126 \r
 127 > +def _diff_index(index, filter):\r
 128 > +    """Get an {id: {tag, ...}} dict for a given filter.\r
 129 > +\r
 130 > +    For example, use 'A' to find added tags, and 'D' to find deleted tag=\r
 131 s.\r
 132 > +    """\r
 133 \r
 134 I'll shift the summary onto the next line here to match the pattern\r
 135 set by the command functions (e.g. archive()).  They *need* the\r
 136 summary to be on the line after the opening triple-quote to support\r
 137 the textwrap.dedent() help used for the argument parser.\r
 138 \r
 139 There were also a few docstrings missing the trailing period\r
 140 recommended by PEP 257 [1] (for _hex_quote, get_tags, _read_tree,\r
 141 fetch, _index_tags, and _unpack_diff_lines).  I'll add those periods\r
 142 in v4.\r
 143 \r
 144 Cheers,\r
 145 Trevor\r
 146 \r
 147 [1]: http://legacy.python.org/dev/peps/pep-0257/#one-line-docstrings\r
 148 \r
 149 --=20\r
 150 This email may be signed or encrypted with GnuPG (http://www.gnupg.org).\r
 151 For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy\r
 152 \r
 153 --EyuBRJR0MsVMWKTf\r
 154 Content-Type: application/pgp-signature; name="signature.asc"\r
 155 Content-Description: OpenPGP digital signature\r
 156 \r
 157 -----BEGIN PGP SIGNATURE-----\r
 158 Version: GnuPG v2\r
 159 \r
 160 iQIcBAEBAgAGBQJTzFHoAAoJEG8/JgBt8ol8ojwQANRlzEOwwEk/7JDlujBTlkAI\r
 161 KvNZOgFOukk+znjPd2ui+cLKvvsdx+Ph2NRPPOLNL6tXVgYfNOVre4IuHmH/VSPt\r
 162 eQLR4jHS5TN46NsjbuqyvXY+O0mJ4h8HsXG50iPoS4WZ6hPCUMbWmtgMbkJ0APDQ\r
 163 uIVjsvoTs1QYjZsiERUOCwcwiFk/kiHxWuRAe5jfwSgtCcPiSXVv4Zx2g9MxS1tQ\r
 164 X+PU0wDRtmeI4Kj6z7jPe3uexb/775zwhfZj2dVBS/+rrMwZEGSJ6xRTQDTOZp/O\r
 165 RNSBjJLdiEeSOKDSLvo2p1syLp86o89W0FZoecqHsLiDUEbHCi0zk7zXmJAKyXno\r
 166 NsAxferOd8Tg70VCJHzqi7UqP3/T3S6PYQJnjZq+bJrTwzzonKYJmZqvuClvK/fn\r
 167 XEiioAR55ELxfLU5Cm9vOjci7l3TIhdH9OCvEULk7+tUc3zNJPk2Wv/wHF9nq63f\r
 168 wAoEfELG1+c4KRVXnB9u3EtjSy9OhATz60hZzDKD+8NggJf1N6EuCjGHPS5uY4Gu\r
 169 YCSogMpYboy18WFHFJlOjgdc/P/MU/NuzsBPo2VZ1Jn4UWdpPs3egrRD6uRJDZ6i\r
 170 8GUcoHMtVx3U9U3Ba6OcMSMuHfBDFKFKY0KfeM+gRklJuTQH64Kd31z/kB98ULVq\r
 171 ZdokQXzxf7hlFDeBvEZG\r
 172 =ZCO6\r
 173 -----END PGP SIGNATURE-----\r
 174 \r
 175 --EyuBRJR0MsVMWKTf--\r