[edk2-devel] [edk2-staging/EdkRepo] [PATCH V3 0/1] EdkRepo: Add squash command

Nate DeSimone posted 1 patch 4 years, 4 months ago
Failed in applying to current master (apply log)
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
[edk2-devel] [edk2-staging/EdkRepo] [PATCH V3 0/1] EdkRepo: Add squash command
Posted by Nate DeSimone 4 years, 4 months ago
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 <ashley.e.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>

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


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#52200): https://edk2.groups.io/g/devel/message/52200
Mute This Topic: https://groups.io/mt/68524275/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH V3 0/1] EdkRepo: Add squash command
Posted by Desimone, Ashley E 4 years, 4 months ago
Reviewed-by: Ashley DeSimone <ashley.e.desimone@intel.com>

-----Original Message-----
From: Desimone, Nathaniel L 
Sent: Thursday, December 12, 2019 11:54 PM
To: devel@edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>; Bjorge, Erik C <erik.c.bjorge@intel.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>
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 <ashley.e.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>

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


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#52215): https://edk2.groups.io/g/devel/message/52215
Mute This Topic: https://groups.io/mt/68524275/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-