From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web10.326.1576274955154933117 for ; Fri, 13 Dec 2019 14:09:15 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: ashley.e.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Dec 2019 14:09:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,311,1571727600"; d="scan'208";a="364422691" Received: from orsmsx102.amr.corp.intel.com ([10.22.225.129]) by orsmga004.jf.intel.com with ESMTP; 13 Dec 2019 14:09:14 -0800 Received: from orsmsx155.amr.corp.intel.com (10.22.240.21) by ORSMSX102.amr.corp.intel.com (10.22.225.129) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 13 Dec 2019 14:09:14 -0800 Received: from orsmsx116.amr.corp.intel.com ([169.254.7.30]) by ORSMSX155.amr.corp.intel.com ([169.254.7.176]) with mapi id 14.03.0439.000; Fri, 13 Dec 2019 14:09:13 -0800 From: "Desimone, Ashley E" To: "Desimone, Nathaniel L" , "devel@edk2.groups.io" CC: "Pandya, Puja" , "Bjorge, Erik C" , Bret Barkelew Subject: Re: [edk2-staging/EdkRepo] [PATCH V3 0/1] EdkRepo: Add squash command Thread-Topic: [edk2-staging/EdkRepo] [PATCH V3 0/1] EdkRepo: Add squash command Thread-Index: AQHVsYp0ka8eRN/BZkCkS65nNV9ptKe4oK8w Date: Fri, 13 Dec 2019 22:09:13 +0000 Message-ID: <4CF3A9EB60ABDA47BE7821A4DA3A0A3353CC6924@ORSMSX116.amr.corp.intel.com> References: <20191213075337.4416-1-nathaniel.l.desimone@intel.com> In-Reply-To: <20191213075337.4416-1-nathaniel.l.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMDlmMGE2NjktNzM1Yi00ZjIzLWEzMjEtNjhjZTJiN2JjMTgzIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiNENCSERXbFV4ZWY0eis3VEdxRmFSSXg1blFjNGlLMW9JRXBpbmtCNDYrNmlZUHNVbzNOVWk5OFdLaTBUdDhoMCJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.22.254.140] MIME-Version: 1.0 Return-Path: ashley.e.desimone@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ashley DeSimone -----Original Message----- From: Desimone, Nathaniel L=20 Sent: Thursday, December 12, 2019 11:54 PM To: devel@edk2.groups.io Cc: Desimone, Ashley E ; Pandya, Puja ; Bjorge, Erik C ; Bret Barkelew Subject: [edk2-staging/EdkRepo] [PATCH V3 0/1] EdkRepo: Add squash command Changes from V3 to V2: Fixed bug where edkrepo.git_automation was not added to setup.py Fixed bug where non-ASCII characters can cause encoding issues in commit_= msg.py Fixed bug where the commit_message variable was not initialized Changes from V2 to V1: Forget to commit the git_automation folder, added in V2. Cc: Ashley DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Nate DeSimone (1): EdkRepo: Add squash command edkrepo/commands/arguments/squash_args.py | 19 +++++ edkrepo/commands/hum= ble/squash_humble.py | 19 +++++ edkrepo/commands/squash_command.py | 97 +++++++++++++++++++++++ edkrepo/common/humble.py | 7 +- edkrepo/common/squash.py | 93 ++++++++++++++++++++++ edkrepo/git_automation/__init__.py | 8 ++ edkrepo/git_automation/commit_msg.py | 21 +++++ edkrepo/git_automation/rebase_squash.py | 23 ++++++ setup.py | 4 +- 9 files changed, 289 insertions(+), 2 deletions(-) create mode 100644 edk= repo/commands/arguments/squash_args.py create mode 100644 edkrepo/commands/humble/squash_humble.py create mode 100644 edkrepo/commands/squash_command.py create mode 100644 edkrepo/common/squash.py create mode 100644 edkrepo/gi= t_automation/__init__.py create mode 100644 edkrepo/git_automation/commit_msg.py create mode 100644 edkrepo/git_automation/rebase_squash.py -- 2.24.0.windows.2