Compare commits

..

4 Commits

Author SHA1 Message Date
clrbuilder 7ea85257af Update packages file for version 36140
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-04-06 12:50:53 -07:00
Patrick McCarty 4ccec6a4d0 diff: use git diff --stat instead of requiring diffstat
Using the --stat flag also has the benefit of automatically colorizing
the output when appropriate.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2022-04-05 12:35:09 -07:00
clrbuilder c76272e46a Update packages file for version 36130
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-04-05 04:10:03 -07:00
Patrick McCarty 1559d4e0b5 log: improve query results
Comparing whether commit hashes for `HEAD` and `origin/master` are not
equal captures three typical scenarios:

1. HEAD is behind origin/master
2. HEAD is ahead of origin/master
3. HEAD is ahead of an older commit in origin/master

The intent of `make log` is to capture cases #2 and #3, and not #1, so
use `git rev-list ...` with the appropriate commit range instead.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2022-03-31 22:28:23 -07:00
2 changed files with 15 additions and 4 deletions
+4 -4
View File
@@ -159,18 +159,18 @@ status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
if [ -d "$$p/.git" ] && [ -n "$$(git -C $$p status -uno --porcelain)" ]; then echo "Uncommitted changes in $$p:"; git -C "$$p" status --short; fi ;\
done
#help diff: Runs git diff for all package repos and displays the output using
#help diffstat. Requires that diffstat is installed.
#help diff: Runs git diff for all package repos and displays the diffstat using
#help the --stat flag.
diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
(cd $$p; git status --porcelain | grep -vq '^?? ' && (echo "Uncommitted changes in: $$p"; git diff | diffstat -p1); :) ;\
(cd $$p; git status --porcelain | grep -vq '^?? ' && (echo "Uncommitted changes in: $$p"; git diff --stat); :) ;\
done
#help log: Run git log origin/master..HEAD for all package repos, thus
#help displaying any committed but unpushed changes.
log: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
( cd $$p; if [ "$$(git rev-parse --verify HEAD)" != "$$(git rev-parse --verify origin/master)" ] ; then \
( cd $$p; if [ -n "$$(git rev-list origin/master..HEAD)" ] ; then \
echo $$p ; git --no-pager log --pretty="format:%s" origin/master..HEAD ; echo ; echo;\
fi ; ) \
done
+11
View File
@@ -49,6 +49,7 @@ QGIS
R
R-AER
R-AMORE
R-ATR
R-Amelia
R-AmesHousing
R-BB
@@ -408,6 +409,7 @@ R-fixest
R-flashClust
R-flexmix
R-flexsurv
R-flextable
R-float
R-fontBitstreamVera
R-fontLiberation
@@ -431,6 +433,8 @@ R-future
R-future.apply
R-g.data
R-gam
R-gamlss.data
R-gamlss.dist
R-gamm4
R-gargle
R-gbRd
@@ -640,12 +644,14 @@ R-npsurv
R-numDeriv
R-nws
R-nycflights13
R-officer
R-openssl
R-openxlsx
R-optextras
R-optimx
R-optparse
R-ordinal
R-ordinalCont
R-orthopolynom
R-pROC
R-packrat
@@ -1503,6 +1509,7 @@ gawk
gc
gcab
gcc
gcc11
gcc7
gcc8
gcc9
@@ -3669,6 +3676,7 @@ pypi-cached_property
pypi-cachetools
pypi-cachy
pypi-capturer
pypi-cattrs
pypi-cchardet
pypi-cerberus
pypi-certifi
@@ -3764,6 +3772,7 @@ pypi-envs
pypi-eternalegypt
pypi-etuples
pypi-evdev
pypi-exceptiongroup
pypi-exdir
pypi-execnet
pypi-executing
@@ -3785,6 +3794,7 @@ pypi-flask
pypi-flatten_json
pypi-flit
pypi-flit_core
pypi-flit_scm
pypi-fontmath
pypi-freezegun
pypi-frozenlist
@@ -4670,6 +4680,7 @@ thermal_daemon
thermal_monitor
thin-provisioning-tools
threadweaver
thrift
thunar-volman
thunderbird
thunderbolt-software-user-space