Commit graph

33 commits

Author SHA1 Message Date
Robert Sparks f71c775647 Tweak mergeready so that it doesn't fail to reconstruct branch information when encountering non-existant branches.
- Legacy-Id: 18996
2021-05-14 20:50:04 +00:00
Henrik Levkowetz 85f397149e Tweaked bin/mergeready with a hint in an error situation
- Legacy-Id: 17730
2020-05-04 19:40:51 +00:00
Henrik Levkowetz 768a4dfa0a Another tweak to bin/mergeready
- Legacy-Id: 17502
2020-03-22 12:37:44 +00:00
Henrik Levkowetz 532e4d2d05 Tweaked the bin/mergeready script
- Legacy-Id: 17500
2020-03-22 11:22:30 +00:00
Henrik Levkowetz 6070101b4d Fixed a typo.
- Legacy-Id: 17056
2019-11-19 09:38:29 +00:00
Henrik Levkowetz d798196f5a Merged in [16703] from sasha@dashcare.nl:
Ref #2231 - Fix send-review-reminders and add it to daily cron
This fixes a syntax error and a Python 3 incompatibility, and adds
send-review-reminders to the daily cron script.
Important notes:
- I have not tested to what degree the existing reminders work as they
  should, as that's out of scope. It does have tests.
- I can't assess whether the virtualenv activation works in the
  production setup, and it may be obsolete as bin/daily also
  activates the virtualenv.
- The same Python 3 incompatibility (execfile() no longer exists) seems
  to exist in various other scripts.
 - Legacy-Id: 16821
Note: SVN reference [16703] has been migrated to Git commit 296b126c70
2019-10-04 13:04:37 +00:00
Henrik Levkowetz 506dcb3472 Merged in [16604] from rjsparks@nostrum.com:
Look at all scheduled sessions for a group when deciding to display a cancelled banner. Fixes #2764.
 - Legacy-Id: 16691
Note: SVN reference [16604] has been migrated to Git commit aea3c1a55b1b14f9da90d0cfb03891e7129f8632
2019-09-03 11:08:59 +00:00
Henrik Levkowetz a9b9d30eab Tweaked mergeready, and added/changed some items in the merge support files.
- Legacy-Id: 16605
2019-07-31 21:31:55 +00:00
Henrik Levkowetz 9b415e5826 More Py2/3 compatibility changes
- Legacy-Id: 16582
2019-07-23 17:29:10 +00:00
Henrik Levkowetz 3d0cca885d Py2/3 compatibility changes
- Legacy-Id: 16574
2019-07-22 17:53:26 +00:00
Henrik Levkowetz 5d87de67cd Tweaked bin/mergeready to look also for ../ready-for-merge
- Legacy-Id: 15821
2018-12-14 21:21:38 +00:00
Henrik Levkowetz 893015b8d1 Tweaked mergeready to accept an additional hold-for-merge file outside the repository.
- Legacy-Id: 14894
2018-03-21 13:12:18 +00:00
Henrik Levkowetz 044b9b8de0 Refined the selection of commit log info lines.
- Legacy-Id: 13110
2017-03-25 18:53:22 +00:00
Henrik Levkowetz 84980e53ba Tweaked mergeready
- Legacy-Id: 12571
2016-12-18 14:11:13 +00:00
Henrik Levkowetz d6df7fb731 Tweaked mergeready to use modules in working dir, and be slightly more verbose when building the mergeinfo cache.
- Legacy-Id: 12536
2016-12-15 16:09:14 +00:00
Henrik Levkowetz 1d8fd6ca3d Fixed a bug in the recent bin/mergeready code.
- Legacy-Id: 11870
2016-08-25 11:06:03 +00:00
Henrik Levkowetz 446f627164 Tweaked the bin/mergeready logic for showing unmerged commits ahead of commits marked ready to merge.
- Legacy-Id: 11802
2016-08-17 15:22:13 +00:00
Henrik Levkowetz 1dcf7b100b More bin/mergeready bugfixes.
- Legacy-Id: 11790
2016-08-15 19:35:21 +00:00
Henrik Levkowetz 679ec63cf8 Fixed a problem with the latest mergeready enhancement.
- Legacy-Id: 11788
2016-08-15 17:20:20 +00:00
Henrik Levkowetz 36aedda03a Added a check for non-merged commits ahead of commits marked as ready to merge on a branch.
- Legacy-Id: 11776
2016-08-09 20:27:39 +00:00
Henrik Levkowetz 41c47b30ad Merged in [10684] from lars@netapp.com:
Add warning about the accuracy of bibliographic information for Legacy RFCs.
 - Legacy-Id: 10688
Note: SVN reference [10684] has been migrated to Git commit 2ca2b92c24
2016-01-14 17:33:50 +00:00
Henrik Levkowetz 041532dc5e Tweaked (normalized) how branches are expressed by bin/mergeready.
- Legacy-Id: 10509
2015-11-19 22:19:42 +00:00
Henrik Levkowetz cc833efbd9 Added handling for an exception which can occur in bin/mergeready if a branch with merge flags is moved, for example moving it to an attic after merge.
- Legacy-Id: 10473
2015-11-14 08:11:33 +00:00
Henrik Levkowetz 693badfd94 Merged in [10379] from rjsparks@nostrum.com:
Change the acronym link on the html agenda page to go to the group's charter page rather than the charter's document page.
 - Legacy-Id: 10409
Note: SVN reference [10379] has been migrated to Git commit bf0a5e3da4
2015-11-03 14:16:44 +00:00
Henrik Levkowetz 6335cf510c Updated mergeready to work with svn 1.9, which seems to return an error for properties which aren't found.
- Legacy-Id: 10266
2015-10-22 19:41:10 +00:00
Henrik Levkowetz 9c297767cc Added branch/iola to places checked for 'ready for merge' tags in the commit messages.
- Legacy-Id: 10065
2015-08-27 11:55:21 +00:00
Henrik Levkowetz fb66c1856f Merged in [9669] from olau@iola.dk:
Summary: Make the meeting agenda code use the historic info available
for groups. In the process, added some select_related/prefetch_related
code to cut the number of database queries in the agenda down from
4000-5000 to about 50. Rewritten agenda CSV code to use Python arrays
rather than a template for improved readability/reuse. Rewritten week
view to assemble its data in Python. Plus a few other minor cleanups,
e.g. lame_description is now gone.
Fixes #1088. Branch
 - Legacy-Id: 10005
Note: SVN reference [9669] has been migrated to Git commit acda84208d
2015-08-10 19:46:11 +00:00
Henrik Levkowetz f94b49036a Updated the mergeready script to check if the 'test:unittest' property has been set to 'passed' on a changeset marked 'ready for merge'.
- Legacy-Id: 9247
2015-03-19 17:51:06 +00:00
Henrik Levkowetz 1c439cda48 Merged in [8236] from rjsparks@nostrum.com:\n Log what rebuild_reference_relations returns to diagnose #1467.
- Legacy-Id: 8360
Note: SVN reference [8236] has been migrated to Git commit b95b769267907f2ac8430893b153a7c82756265b
2014-09-28 17:53:02 +00:00
Henrik Levkowetz d633499f03 Added a count of pending merges to the script output.
- Legacy-Id: 8313
2014-09-16 19:26:48 +00:00
Henrik Levkowetz 1adec46fc5 Added some verbosity support to the mergeready script. Added support for commits containing deleted files.
- Legacy-Id: 8299
2014-09-01 19:04:11 +00:00
Henrik Levkowetz 82f6afb293 Replaced a symlink with the real file -- symlink committed by mistake.
- Legacy-Id: 7759
2014-05-20 19:49:05 +00:00
Henrik Levkowetz e78433b517 Added a utility command 'mergeready' which lists commits marked as 'Commit ready for merge' that have not yet been merged to trunk.
- Legacy-Id: 7714
2014-05-08 11:27:41 +00:00