Meta: rename 'pu' to 'seen'
Junio C Hamano committed
Jun 22, 2020 at 17:20 UTC
c483b4cf74d046fca1c36f7de0be9373d97e3ea2
11 files changed
+44
-44
CheckPush
+5
-5
@@ -45,7 +45,7 @@ for range in $(
45
fi
46
prev_branch=$branch
47
done
48
-) pu..jch
48
+) seen..jch
49
do
50
lg=$(git log --oneline "$range")
51
if test -n "$lg"
@@ -59,7 +59,7 @@ if ! next_equiv=$(git rev-parse --verify 'jch^{/^### match next}' 2>/dev/null) |
59
! git diff --stat --exit-code next $next_equiv
60
then
61
next_tree=$(git rev-parse next^{tree}) &&
62
- next_equiv=$(git rev-list --first-parent master..pu |
62
+ next_equiv=$(git rev-list --first-parent master..seen |
63
xargs -n1 sh -c '
64
echo $(git rev-parse $1^{tree}) $1
65
' - | sed -n -e "s/^$next_tree //p"
@@ -69,12 +69,12 @@ fi
69
if test -n "$next_equiv"
70
then
71
jch=$(git rev-list --first-parent master..jch | wc -l) &&
72
- pu=$(git rev-list --first-parent master..pu | wc -l) &&
72
+ seen=$(git rev-list --first-parent master..seen | wc -l) &&
73
next=$(git rev-list --first-parent master..$next_equiv | wc -l) &&
74
if test $jch -le $next
75
then
76
- echo "master..$jch..jch..$next..next..$pu..pu"
76
+ echo "master..$jch..jch..$next..next..$seen..seen"
77
else
78
- echo "master..$next..next..$jch..jch..$pu..pu"
78
+ echo "master..$next..next..$jch..jch..$seen..seen"
79
fi
80
fi
Doit
+1
-1
@@ -1,6 +1,6 @@
1
#!/bin/sh
2
3
-test -n "$branches" || branches='next master maint jch pu'
3
+test -n "$branches" || branches='next master maint jch seen'
4
5
changed=
6
for b in $branches
Dothem
+1
-1
@@ -65,7 +65,7 @@ then
65
exit 1
66
fi
67
fi
68
-test -n "$branches" || branches='next master maint jch pu'
68
+test -n "$branches" || branches='next master maint jch seen'
69
test -n "$jobs" || jobs=-j2
70
71
find_installed () {
KO
+1
-1
@@ -29,4 +29,4 @@ fi
29
git show-branch --topo-order $ko/master master
30
git show-branch --topo-order $ko/maint maint
31
git show-branch --topo-order $ko/next next
32
-git show-branch --topo-order $ko/pu pu
32
+git show-branch --topo-order $ko/seen seen
MaintNotes
+17
-17
@@ -152,7 +152,7 @@ viewed online at:
152
* How various branches are used.
153
154
There are four branches in git.git repository that track the source tree
155
-of git: "master", "maint", "next", and "pu".
155
+of git: "master", "maint", "next", and "seen".
156
157
The "master" branch is meant to contain what are very well tested and
158
ready to be used in a production setting. Every now and then, a
@@ -196,23 +196,23 @@ is merged to "master". Please help this process by building & using the
196
"next" branch for your daily work, and reporting any new bugs you find to
197
the mailing list, before the breakage is merged down to the "master".
198
199
-The "pu" (proposed updates) branch bundles all the remaining topic
200
-branches the maintainer happens to have seen. There is no guarantee that
201
-the maintainer has enough bandwidth to pick up any and all topics that
202
-are remotely promising from the list traffic, so please do not read
203
-too much into a topic being on (or not on) the "pu" branch. This
204
-branch is mainly to remind the maintainer that the topics in them may
205
-turn out to be interesting when they are polished, nothing more. The
206
-topics on this branch aren't usually complete, well tested, or well
207
-documented and they often need further work. When a topic that was
208
-in "pu" proves to be in a testable shape, it is merged to "next".
209
-
210
-You can run "git log --first-parent master..pu" to see what topics are
199
+The "seen" (formerly "pu", proposed updates) branch bundles all the
200
+remaining topic branches the maintainer happens to have seen. There
201
+is no guarantee that the maintainer has enough bandwidth to pick up any
202
+and all topics that are remotely promising from the list traffic, so
203
+please do not read too much into a topic being on (or not on) the "seen"
204
+branch. This branch is mainly to remind the maintainer that the topics
205
+in them may turn out to be interesting when they are polished, nothing
206
+more. The topics on this branch aren't usually complete, well tested,
207
+or well documented and they often need further work. When a topic that
208
+was in "seen" proves to be in a testable shape, it is merged to "next".
209
+
210
+You can run "git log --first-parent master..seen" to see what topics are
211
currently in flight. Sometimes, an idea that looked promising turns out
212
-to be not so good and the topic can be dropped from "pu" in such a case.
212
+to be not so good and the topic can be dropped from "seen" in such a case.
213
The output of the above "git log" talks about a "jch" branch, which is an
214
-early part of the "pu" branch; that branch contains all topics that
215
-are in "next" and a bit more (but not all of "pu") and is used by the
214
+early part of the "seen" branch; that branch contains all topics that
215
+are in "next" and a bit more (but not all of "seen") and is used by the
216
maintainer for his daily work.
217
218
The two branches "master" and "maint" are never rewound, and "next"
@@ -222,7 +222,7 @@ using the topics that didn't make the cut in the feature release.
222
Some topics that used to be in "next" during the previous cycle may
223
get ejected from "next" when this happens.
224
225
-A natural consequence of how "next" and "pu" bundles topics together
225
+A natural consequence of how "next" and "seen" bundles topics together
226
is that until a topic is merged to "next", updates to it is expected
227
by replacing the patch(es) in the topic with an improved version,
228
and once a topic is merged to "next", updates to it needs to come as
Make
+1
-1
@@ -215,7 +215,7 @@ export LANG LC_ALL
215
branch=$(determine_branch)
216
217
case "$branch" in
218
-next | maint | master | pu | jch)
218
+next | maint | master | seen | jch)
219
prefix="$inst_prefix/git-$branch"
220
;;
221
snap)
V
+1
-1
@@ -14,7 +14,7 @@ inst_prefix=$(
14
echo $HOME
15
)
16
17
-for v in maint master next pu jch
17
+for v in maint master next seen jch
18
do
19
installed=$(
20
test -f "$inst_prefix/git-$v/bin/git" &&
WCBCC
+1
-1
@@ -3,7 +3,7 @@
3
BASE=${1-HEAD}
4
5
(
6
- echo pu
6
+ echo seen
7
sed -ne 's/^\* \([^ ]*\) ([-0-9]*) [1-9][0-9]* commits\{0,1\}$/\1/p' \
8
Meta/whats-cooking.txt |
9
while read branch
cook
+13
-13
@@ -107,7 +107,7 @@ Returns a hash:
107
=cut
108
109
sub get_commit {
110
- my (@base) = qw(master next pu);
110
+ my (@base) = qw(master next seen);
111
my $fh;
112
open($fh, '-|',
113
qw(git for-each-ref),
@@ -182,7 +182,7 @@ sub get_commit {
182
my $co = $commit{$sha1};
183
if (exists $co->{'branch'}{'next'}) {
184
$sign = '+';
185
- } elsif (exists $co->{'branch'}{'pu'}) {
185
+ } elsif (exists $co->{'branch'}{'seen'}) {
186
$sign = '-';
187
} else {
188
$sign = '.';
@@ -254,11 +254,11 @@ sub get_commit {
254
# NEEDSWORK:
255
# This is done a bit too early. We grabbed all
256
# under refs/heads/??/* without caring if they are
257
- # merged to 'pu' yet, and it is correct because
257
+ # merged to 'seen' yet, and it is correct because
258
# we want to describe a topic that is in the old
259
- # edition that is tentatively kicked out of 'pu'.
259
+ # edition that is tentatively kicked out of 'seen'.
260
# However, we do not want to say a topic is used
261
- # by a new topic that is not yet in 'pu'!
261
+ # by a new topic that is not yet in 'seen'!
262
my $relation = describe_relation($topic{$branch});
263
$topic{$branch}{'desc'} = $head . $list;
264
if ($relation) {
@@ -286,9 +286,9 @@ sub blurb_text {
286
$next_at ||= '0' x 40;
287
$text ||= <<'EOF';
288
Here are the topics that have been cooking. Commits prefixed with '-' are
289
-only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
290
-The ones marked with '.' do not appear in any of the integration branches,
291
-but I am still holding onto them.
289
+only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
290
+with '+' are in 'next'. The ones marked with '.' do not appear in any of
291
+the integration branches, but I am still holding onto them.
292
293
You can find the changes described here in the integration branches of the
294
repositories listed at
@@ -546,7 +546,7 @@ sub update_issue {
546
return $incremental;
547
}
548
549
-sub topic_in_pu {
549
+sub topic_in_seen {
550
my ($topic_desc) = @_;
551
for my $line (split(/\n/, $topic_desc)) {
552
if ($line =~ /^ [+-] /) {
@@ -624,7 +624,7 @@ sub merge_cooking {
624
for my $topic (sort keys %{$current}) {
625
if (!exists $td->{$topic}) {
626
# Ignore new topics without anything merged
627
- if (topic_in_pu($current->{$topic}{'desc'})) {
627
+ if (topic_in_seen($current->{$topic}{'desc'})) {
628
push @new_topic, $topic;
629
}
630
next;
@@ -737,7 +737,7 @@ sub wildo {
737
if (/^\* (\S+) \(([-0-9]+)\) (\d+) commits?$/) {
738
wildo_flush_topic($in_section, \%what, $topic);
739
740
- # tip-date, next-date, topic, count, pu-count
740
+ # tip-date, next-date, topic, count, seen-count
741
$topic = [$2, $too_recent, $1, $3, 0];
742
$in_desc = undef;
743
next;
@@ -778,10 +778,10 @@ sub wildo {
778
for $topic (sort { (($a->[1] cmp $b->[1]) ||
779
($a->[0] cmp $b->[0])) }
780
@{$what{$what}}) {
781
- my ($tip, $next, $name, $count, $pu) = @$topic;
781
+ my ($tip, $next, $name, $count, $seen) = @$topic;
782
my ($sign);
783
$tip =~ s/^\d{4}-//;
784
- if (($next eq $too_recent) || (0 < $pu)) {
784
+ if (($next eq $too_recent) || (0 < $seen)) {
785
$sign = "-";
786
$next = " " x 6;
787
} else {
git-topic.perl
+1
-1
@@ -8,7 +8,7 @@ use Getopt::Long;
8
9
my $topic_pattern = '??*/*';
10
my $base = 'next';
11
-my @stage = qw(next pu);
11
+my @stage = qw(next seen);
12
my @mark = ('.', '?', '-', '+');
13
my $all = 0;
14
my $merges = 0;
pre-applypatch
+2
-2
@@ -2,7 +2,7 @@
2
3
. git-sh-setup
4
5
-# Avoid duplicated test numbers --- checking 'pu' is enough
5
+# Avoid duplicated test numbers --- checking 'seen' is enough
6
# as we will usually add, but never remove them.
7
added=$(
8
git diff-index --cached --name-only --diff-filter=A HEAD -- t |
@@ -12,7 +12,7 @@ if test -n "$added"
12
then
13
bad=
14
exists=$(
15
- git ls-tree --name-only pu:t |
15
+ git ls-tree --name-only seen:t |
16
sed -ne 's|^\(t[0-9][0-9][0-9][0-9]\)-.*\.sh$|\1|p' |
17
tr "\012" " "
18
)