From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web11.8330.1576223626855170278 for ; Thu, 12 Dec 2019 23:53:47 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: nathaniel.l.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Dec 2019 23:53:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,308,1571727600"; d="scan'208";a="216370886" Received: from nldesimo-desk1.amr.corp.intel.com ([10.7.159.63]) by orsmga006.jf.intel.com with ESMTP; 12 Dec 2019 23:53:44 -0800 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Ashley DeSimone , Puja Pandya , Erik Bjorge , Bret Barkelew Subject: [edk2-staging/EdkRepo] [PATCH V3 0/1] EdkRepo: Add squash command Date: Thu, 12 Dec 2019 23:53:36 -0800 Message-Id: <20191213075337.4416-1-nathaniel.l.desimone@intel.com> X-Mailer: git-send-email 2.24.0.windows.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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/humble/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 edkrepo/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/git_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