[PULL] git-gui pull request
mbox series

Message ID 20190917201334.hfbvuisdwkwgvwg5@yadavpratyush.com
State New
Headers show
Series
  • [PULL] git-gui pull request
Related show

Pull-request

https://github.com/prati0100/git-gui.git

Message

Pratyush Yadav Sept. 17, 2019, 8:13 p.m. UTC
Hi Junio,

There were some topics and discussion related to git-gui in flight. Most 
of them have been stabilized, and merged in. So I think it's a good time 
to pull in those changes.

---
The following changes since commit 
5ab72271e16ac23c269f5019a74a7b1d65170e47:

  Merge remote-tracking branch 'philoakley/dup-gui' (2017-03-18 15:35:09 +0000)

are available in the Git repository at:

  https://github.com/prati0100/git-gui.git 

for you to fetch changes up to f7a8834ba4aa20ec750833cf8d30d9a9fed5eade:

  Merge branch 'bp/amend-toggle-bind' (2019-09-14 23:23:12 +0530)

----------------------------------------------------------------
Bert Wesarg (2):
      git-gui: convert new/amend commit radiobutton to checkbutton
      git-gui: add horizontal scrollbar to commit buffer

Birger Skogeng Pedersen (2):
      git-gui: add hotkeys to set widget focus
      git-gui: add hotkey to toggle "Amend Last Commit"

Pratyush Yadav (9):
      git-gui: allow reverting selected lines
      git-gui: allow reverting selected hunk
      git-gui: return early when patch fails to apply
      git-gui: allow undoing last revert
      Merge branch 'bp/widget-focus-hotkeys'
      Merge branch 'py/revert-hunks-lines'
      Merge branch 'bw/amend-checkbutton'
      Merge branch 'bw/commit-scrollbuffer'
      Merge branch 'bp/amend-toggle-bind'

 git-gui.sh          | 140 ++++++++++++++++++++++++++++++++++++++++------------
 lib/checkout_op.tcl |   6 +--
 lib/commit.tcl      |   4 +-
 lib/diff.tcl        |  96 +++++++++++++++++++++++++++++------
 lib/index.tcl       |   8 +--
 5 files changed, 199 insertions(+), 55 deletions(-)

Comments

Denton Liu Sept. 17, 2019, 8:50 p.m. UTC | #1
Hi Pratyush,

Since you're the maintainer now, you should submit a patch to
Documentation/SubmittingPatches to change

	- `git-gui/` comes from git-gui project, maintained by Pat Thoyts:

		git://repo.or.cz/git-gui.git

to have your own information.

On Wed, Sep 18, 2019 at 01:43:34AM +0530, Pratyush Yadav wrote:
> Hi Junio,
> 
> There were some topics and discussion related to git-gui in flight. Most 
> of them have been stabilized, and merged in. So I think it's a good time 
> to pull in those changes.
> 
> ---
> The following changes since commit 
> 5ab72271e16ac23c269f5019a74a7b1d65170e47:
> 
>   Merge remote-tracking branch 'philoakley/dup-gui' (2017-03-18 15:35:09 +0000)
> 
> are available in the Git repository at:
> 
>   https://github.com/prati0100/git-gui.git 
> 
> for you to fetch changes up to f7a8834ba4aa20ec750833cf8d30d9a9fed5eade:
> 
>   Merge branch 'bp/amend-toggle-bind' (2019-09-14 23:23:12 +0530)
> 
> ----------------------------------------------------------------
> Bert Wesarg (2):
>       git-gui: convert new/amend commit radiobutton to checkbutton
>       git-gui: add horizontal scrollbar to commit buffer
> 
> Birger Skogeng Pedersen (2):
>       git-gui: add hotkeys to set widget focus
>       git-gui: add hotkey to toggle "Amend Last Commit"
> 
> Pratyush Yadav (9):
>       git-gui: allow reverting selected lines
>       git-gui: allow reverting selected hunk
>       git-gui: return early when patch fails to apply
>       git-gui: allow undoing last revert
>       Merge branch 'bp/widget-focus-hotkeys'
>       Merge branch 'py/revert-hunks-lines'
>       Merge branch 'bw/amend-checkbutton'
>       Merge branch 'bw/commit-scrollbuffer'
>       Merge branch 'bp/amend-toggle-bind'

Seems like this list is missing

	Pat Thoyts (1):
		  Merge remote-tracking branch 'philoakley/dup-gui'

	Philip Oakley (4):
		  git-gui: remove duplicate entries from .gitconfig's gui.recentrepo
		  git gui: cope with duplicates in _get_recentrepo
		  git gui: de-dup selected repo from recentrepo history
		  git gui: allow for a long recentrepo list

which should be in your PR but aren't in mainline Git yet.

> 
>  git-gui.sh          | 140 ++++++++++++++++++++++++++++++++++++++++------------
>  lib/checkout_op.tcl |   6 +--
>  lib/commit.tcl      |   4 +-
>  lib/diff.tcl        |  96 +++++++++++++++++++++++++++++------
>  lib/index.tcl       |   8 +--
>  5 files changed, 199 insertions(+), 55 deletions(-)
> 
> -- 
> Regards,
> Pratyush Yadav
Denton Liu Sept. 17, 2019, 10:51 p.m. UTC | #2
On Tue, Sep 17, 2019 at 01:50:51PM -0700, Denton Liu wrote:

[...]

> > ----------------------------------------------------------------
> > Bert Wesarg (2):
> >       git-gui: convert new/amend commit radiobutton to checkbutton
> >       git-gui: add horizontal scrollbar to commit buffer
> > 
> > Birger Skogeng Pedersen (2):
> >       git-gui: add hotkeys to set widget focus
> >       git-gui: add hotkey to toggle "Amend Last Commit"
> > 
> > Pratyush Yadav (9):
> >       git-gui: allow reverting selected lines
> >       git-gui: allow reverting selected hunk
> >       git-gui: return early when patch fails to apply
> >       git-gui: allow undoing last revert
> >       Merge branch 'bp/widget-focus-hotkeys'
> >       Merge branch 'py/revert-hunks-lines'
> >       Merge branch 'bw/amend-checkbutton'
> >       Merge branch 'bw/commit-scrollbuffer'
> >       Merge branch 'bp/amend-toggle-bind'
> 
> Seems like this list is missing
> 
> 	Pat Thoyts (1):
> 		  Merge remote-tracking branch 'philoakley/dup-gui'
> 
> 	Philip Oakley (4):
> 		  git-gui: remove duplicate entries from .gitconfig's gui.recentrepo
> 		  git gui: cope with duplicates in _get_recentrepo
> 		  git gui: de-dup selected repo from recentrepo history
> 		  git gui: allow for a long recentrepo list
> 
> which should be in your PR but aren't in mainline Git yet.

Sorry, my mistake. Turns out these were merged a couple of years ago in
90dbf226ba (Merge branch 'js/msgfmt-on-windows' of ../git-gui into
js/git-gui-msgfmt-on-windows, 2017-07-25).

> 
> > 
> >  git-gui.sh          | 140 ++++++++++++++++++++++++++++++++++++++++------------
> >  lib/checkout_op.tcl |   6 +--
> >  lib/commit.tcl      |   4 +-
> >  lib/diff.tcl        |  96 +++++++++++++++++++++++++++++------
> >  lib/index.tcl       |   8 +--
> >  5 files changed, 199 insertions(+), 55 deletions(-)
> > 
> > -- 
> > Regards,
> > Pratyush Yadav
Junio C Hamano Sept. 18, 2019, 7:23 p.m. UTC | #3
Denton Liu <liu.denton@gmail.com> writes:

> Hi Pratyush,
>
> Since you're the maintainer now, you should submit a patch to
> Documentation/SubmittingPatches to change
>
> 	- `git-gui/` comes from git-gui project, maintained by Pat Thoyts:
>
> 		git://repo.or.cz/git-gui.git
>
> to have your own information.

There also is MaintNotes on the todo branch, which I'll take care
of.

FWIW, the following update to the draft release notes will be part
of what I'll push out, together with the "Third batch" update to the
master.

diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt
index e123d2daa6..ff48d8582c 100644
--- a/Documentation/RelNotes/2.24.0.txt
+++ b/Documentation/RelNotes/2.24.0.txt
@@ -11,6 +11,9 @@ Backward compatibility note
 
 UI, Workflows & Features
 
+ * We now have an active interim maintainer for the Git-Gui part of
+   the system.  Praise and thank Pratyush Yadav for volunteering.
+
  * The command line parser learned "--end-of-options" notation; the
    standard convention for scripters to have hardcoded set of options
    first on the command line, and force the command to treat end-user
@@ -28,6 +31,21 @@ UI, Workflows & Features
  * Device-tree files learned their own userdiff patterns.
    (merge 3c81760bc6 sb/userdiff-dts later to maint).
 
+ * "git rebase --rebase-merges" learned to drive different merge
+   strategies and pass strategy specific options to them.
+
+ * A new "pre-merge-commit" hook has been introduced.
+
+ * Command line completion updates for "git -c var.name=val" have been
+   added.
+
+ * The lazy clone machinery has been taught that there can be more
+   than one promisor remote and consult them in order when downloading
+   missing objects on demand.
+
+ * The list-objects-filter API (used to create a sparse/lazy clone)
+   learned to take a combined filter specification.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -39,6 +57,20 @@ Performance, Internal Implementation, Development Support etc.
 
  * Further clean-up of the initialization code.
 
+ * xmalloc() used to have a mechanism to ditch memory and address
+   space resources as the last resort upon seeing an allocation
+   failure from the underlying malloc(), which made the code complex
+   and thread-unsafe with dubious benefit, as major memory resource
+   users already do limit their uses with various other mechanisms.
+   It has been simplified away.
+
+ * Unnecessary full-tree diff in "git log -L" machinery has been
+   optimized away.
+
+ * The http transport lacked some optimization the native transports
+   learned to avoid unnecessary ref advertisement, which has been
+   corrected.
+
 
 Fixes since v2.23
 -----------------
@@ -99,6 +131,10 @@ Fixes since v2.23
    subsequent steps.
    (merge 2c65d90f75 bc/reread-attributes-during-rebase later to maint).
 
+ * Tell cURL library to use the same malloc() implementation, with the
+   xmalloc() wrapper, as the rest of the system, for consistency.
+   (merge 93b980e58f cb/curl-use-xmalloc later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge d1387d3895 en/fast-import-merge-doc later to maint).
    (merge 1c24a54ea4 bm/repository-layout-typofix later to maint).