go-x-review, branch v1.0.1

hack

2021-02-18T21:25:55Z

Change-Id: I1c289dde45230a3362f54037ea18023278b05ffd

git-codereview: fix active rebase detection

2021-02-18T21:25:49Z

A sync + merge conflict + git rebase --continue can leave behind a REBASE_HEAD even though it really should not. So don't use that as the signal that there's an active rebase. The rebase-merge directory is a better signal and seems to be cleaned up more diligently than REBASE_HEAD. Change-Id: Ie5bc20156e19fc7ce3e32333babea784242dc770 Reviewed-on: https://go-review.googlesource.com/c/review/+/293838 Trust: Russ Cox Run-TryBot: Russ Cox Reviewed-by: Katie Hockman

git-codereview: document sync-branch

2021-02-17T14:21:55Z

Change-Id: If5f9018bc1a87444df44c4d8ae853908ee283154 Reviewed-on: https://go-review.googlesource.com/c/review/+/283613 Trust: Russ Cox Run-TryBot: Russ Cox TryBot-Result: Go Bot Reviewed-by: Filippo Valsorda

git-codereview: fix runDirErr to actually use the passed directory

2021-02-12T15:00:19Z

Change-Id: I39f16f70e928999674b4f6f60c505ca0a51c46a9 Reviewed-on: https://go-review.googlesource.com/c/review/+/290211 Trust: Filippo Valsorda Run-TryBot: Filippo Valsorda TryBot-Result: Go Bot Reviewed-by: Russ Cox

git-codereview: avoid race in loadGerritOrigin

2021-01-27T23:04:16Z

Use a mutex in loadGerritOrigin to avoid race when called in parallel by "git coderevew pending". Add a new initialized field so that the code knows when auth has been initialized. Adjust tests accordingly. The test is simply "go test -race". Fixes golang/go#43670 Change-Id: Ifb060fca6ed463f1d11a2959d03fca5e14e238c6 Reviewed-on: https://go-review.googlesource.com/c/review/+/287012 Trust: Ian Lance Taylor Run-TryBot: Ian Lance Taylor TryBot-Result: Go Bot Reviewed-by: Bryan C. Mills

git-codereview: fix buglet in 'reword' related to work trees

2021-01-15T16:51:21Z

The reword command was trying to store a saved messages file in the subdirectory .git in the repo root; this doesn't work well if multiple work trees are in use and the user is working in a non-main work tree. Use "git rev-parse --git-path ." instead of "git rev-parse --show-top-level" to find the location for the saved messages file. Fixes golang/go#43695. Change-Id: Ie0b3e810ad585fe1c18805f4070736335a2ef2b5 Reviewed-on: https://go-review.googlesource.com/c/review/+/283646 Run-TryBot: Than McIntosh TryBot-Result: Go Bot Reviewed-by: Russ Cox Trust: Than McIntosh

git-codereview: add sync-branch -merge-back-to-parent

2021-01-13T14:40:17Z

Dev branches come to an end. Making sync-branch help that process instead of forcing people to follow a playbook will help avoid mistakes. The flag name was chosen to be very unlikely to be used accidentally, and the commit subject and message both are distinct to make clear to reviewers what they are being asked to +2. The Merge List is also included in full and is likely to be quite large, yet another signal for everyone involved about the magnitude and weight of the change. Change-Id: I91cdda2b85cd3811711a339f4f3290fee109022e Reviewed-on: https://go-review.googlesource.com/c/review/+/282534 Trust: Russ Cox Reviewed-by: Matthew Dempsky

git-codereview: clean up detached HEAD mode

2021-01-13T14:40:11Z

Long ago I decided to return origin/HEAD from b.OriginBranch in detached HEAD mode, thinking it would cause obvious failures. But the joke was on me - origin/HEAD is a real thing in git, and HEAD tracking origin/HEAD is not the right answer on dev branches. Now that each branch's codereview.cfg typically has the branch info we need, we can use that in detached HEAD mode to be able to provide useful displays in commands like "git pending". And we can be careful not to do that when we don't know the actual branch. This commit cleans all that up. Change-Id: I0e59bcb6f9b61e0cdce7a27299b7f29fef8e7048 Reviewed-on: https://go-review.googlesource.com/c/review/+/282616 Trust: Russ Cox Reviewed-by: Matthew Dempsky

git-codereview: add reword command

2021-01-13T14:40:05Z

Quoting the new docs: The reword command edits pending commit messages. git codereview reword [commit...] Reword opens the editor on the commit message for each named commit in turn. When all the editing is finished, it applies the changes to the pending commits. If no commit is listed, reword applies to the most recent pending commit. Reword is similar in effect to running “git codereview rebase-work” and changing the script action for the named commits to “reword”, or (with no arguments) to “git commit --amend”, but it only affects the commit messages, not the state of the git staged index, nor any checked-out files. This more careful implementation makes it safe to use when there are local changes or, for example, when tests are running that would be broken by temporary changes to the checked-out tree, as would happen during “git codereview rebase-work”. Change-Id: I38ac939b8530bf237c6cafb911f2b17d22eaca60 Reviewed-on: https://go-review.googlesource.com/c/review/+/279718 Trust: Russ Cox Reviewed-by: Matthew Dempsky

git-codereview: new sync-branch and related fixes

2021-01-13T14:39:58Z

This CL adds a new command, "git codereview sync-branch", which does the appropriate git merge for the current branch. This CL also fixes a bug in "git codereview branchpoint", and therefore also commands like "git codereview pending", which was getting the branchpoint wrong for merges, with the effect that a merge showed too many pending CLs. This CL also fixes a bug in "git codereview change", which was formerly willing to run "git checkout" with a pending merge, which had the effect of flattening the merge mysteriously. Now it detects the merge and refuses to run. All of this should make merges easier and less error-prone as we use dev branches more often. With the earlier CL in this stack that allows working directly on local branches, this is now a great way to run a merge updating dev.regabi: git change dev.regabi git sync-branch (with appropriate aliases to avoid typing "codereview"). Fixes golang/go#26201. Change-Id: Ic24603123ca5135a72004309f5bb208ff149c9eb Reviewed-on: https://go-review.googlesource.com/c/review/+/279772 Trust: Russ Cox Run-TryBot: Russ Cox TryBot-Result: Go Bot Reviewed-by: Matthew Dempsky