"GOT", but the "O" is a cute, smiling pufferfish. Index | Thread | Search

From:
Christian Weisgerber <naddy@mips.inka.de>
Subject:
Re: show rebase and histedit backups in tog ref view
To:
gameoftrees@openbsd.org
Date:
Sun, 23 Jan 2022 14:46:21 +0100

Download raw body.

Thread
Stefan Sperling:

> This patch allows for browing rebase/histedit backups with tog, as an
> an interactive alternative to 'got rebase -l' and 'got histedit -l'.
> 
> With refs sorted by name, backups appear towards the end up the list,
> which prevents backups from cluttering up the ref view by default.

Hmm.  Makes sense, I guess.  Users need to remember this.
I'm testing with FreeBSD's src repo, which has 3700+ refs.

> With refs sorted by date, backups appear interleaved with other refs,
> which is useful for browsing through recent backups.

Yes!

> Backups will usually appear just after their corresponding branch
> in refs/heads/.

Well...

---> refs/heads/local
     refs/remotes/origin/HEAD -> refs/remotes/origin/main
     refs/remotes/origin/main
     refs/remotes/origin/stable/12
     refs/heads/stable/13
     refs/remotes/origin/stable/13
     refs/tags/vendor/expat/2.4.3
     refs/remotes/origin/vendor/wpa
     refs/tags/vendor/wpa/2.10
     refs/remotes/origin/stable/11
     refs/remotes/origin/vendor/expat
     refs/remotes/origin/releng/12.2
     refs/remotes/origin/releng/12.3
     refs/remotes/origin/releng/13.0
     refs/tags/vendor/sqlite3/sqlite-3370200
     refs/remotes/origin/vendor/sqlite3
     refs/tags/vendor/wpa/gb26f5c0fe
     refs/tags/vendor/sqlite3/sqlite-3370100
---> refs/got/backup/rebase/local/b07f8a7723d9429628db4f9f6f08f277ea508cee
     ...

But that reflects the commit/rebase history, so it's fine.

> For people who use colors, backups are highlighted differently from
> other refs by default to make it easier to tell them apart.

That works.
Backup refs are now also displayed in the log view, which you didn't
mention, but which I noticed from reading the diff.

ok naddy

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de