1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367
|
Release 9.6.1 July, 2025
- Fix a timing problem that only occurs on MacOS, where a tooltip would
be invoked on a Close button that had already been destroyed.
- In the trace window, separated the command stdout from the file operations,
mostly so that I could see the startup UI-matching with the file ops
without seeing the very verbose stdout trace.
- Touched up several little cosmetic issues.
Release 9.6 July, 2025
- Fix things that Tk 9.x broke:
Scope of variables in namespaces is more restricted.
Tilde (~) is not expanded in pathnames unless it's done explicitly with
the new "file tildeexpand" operation. That means plain files and
directories starting with a ~ character are now allowed. In tkrev's
directory list, they're prefixed with "./" so they can be used more or
less normally.
When reading and writing files, the encoding profile is set to tcl8,
preserving permissive behavior for files with extended characters.
- Incorporated Michael Moran's tildChk proc from tkdiff, to smooth out when and
when not to do tilde expansion, with some degree of backward compatibilty.
Previously, tcl always did tilde expansion.
- Update tkdiff to version 6.0, which supports Tk 9.x
- In RCS, a function to add a tag (symbolic name) has been added.
- Added attribute "-topmost yes" to the dialogs. On KDE, they were diving
behind the main window when focus auto raise activated.
- Can sometimes get UI colors from a gtk3-style gtk-main.css file, if
"Match GTK or CDE colors" is enabled
- Removed some things from the contrib directory. I'm not including the
early fork of dirdiff anymore. The script to set up files for the vendor
merge module is now in the teststuff directory. The only thing left is
cvsdiff, a script that enables tkrev to use gvim instead of tkdiff to
compare files by setting the "Diff Visualizer" preference.
Release 9.5 March, 2025
- Bug #158, require Tk 8.6. Rolling version number of tkrev to reflect that
it's a substantive change.
- Fix bug #157, cvs_add dialog has undefined variable
Release 9.4.9 December, 2024
- Deal with renamed files in both SVN and GIT. Fixes bug #156, at least
when Git itself reports the source and destination files correctly.
- Changed all the gif images to png to make editing them easier.
Release 9.4.8 November, 2024
- Fix bug #155, to make "git remove" unix-remove the files like in the CVS
module
- Annotation browser functions were broken when invoked from the branch browser
in a CVS directory.
- When only the branch browser exists because it was invoked with --log, the
module browser will now start properly.
- Give the module browser something to do (list the *,v files recursively) in
an RCS directory
- Fix a regression with the initial writing of the .tkrev-picklists file
- UI enhancements:
- Use ttk::checkbutton and ttk::radiobutton to make the UI look better on
various platforms
- Add some ability to follow a GTK3 or KDE desktop environment, but hide that,
and the old CDE stuff, behind a variable cvscfg(match_desktop). Add ability
to match NsCDE desktop too. Isolate the variable and proc names of the color
and font stuff and put it into one file so it's more modular.
- Rehabilitate setting some colors in .Xdefaults or .Xresources, and enable
setting some fonts from there
- If tracing levels F or D (File or Debug) are turned on, the trace window will
display the colors and fonts used.
Release 9.4.7 August, 2024
- Update tkdiff to 5.7
- Display better in themes with a dark background. Use ttk::scrollbar and
refine the use of ttk::combobox.
- Take the info about Xdefaults and "option add" out of the help. It mostly
doesn't work anymore due to theming.
Release 9.4.6 September, 2023
- Add cvscfg(large_icons) which, if non-zero, causes the user interface
icons to be enlarged by a (integer) factor of $cvscfg(icon_mag)
- Adjust the height of the treeview rows in case the text or icons
are very large
- Fix the "show diffs in changed files" button in CVS by adding
a new function cvs_diff. Patch won't work there.
- Measure the font height for the Treeview because it doesn't adjust
adequately by itself, and if you use a huge font the rows overlap
Release 9.4.5 March, 2023
- Upgrade tkdiff to 5.6. The previous version included here, 5.5.2,
had a nasty crash
Release 9.4.4 September, 2022
- Fixed bug #154, manpage now installs in share/man/man1
- Update tkdiff to v5.5.2
Release 9.4.3 April, 2022
- Fixed bug #153 problem recognizing trunk/branches/tags in Subversion
Release 9.4.2 April, 2022
- Added a preference for which version control system to prefer if a directory
has both, for example local RCS files in a Git directory, and a --vcs command
line option to override it if desired
- tkdiff updated to version 5.4
- Speeded up tag collection in SVN a little, by filtering the svn list output
to eliminate tag copies that don't contain the file of interest
Release 9.4.1 September, 2021
- Restore branch browser's diff functionality so it works if one, or no, files
are selected.
- Fix "show file changes in a commit" in Subversion branch browser
- Update tkdiff to version 5.2.1
Release 9.4 December, 2020
- Change name from TkCVS to TkRev. Your ~/.tkcvs file will be copied to ~/.tkrev
if you don't have the latter yet, so your settings will be transferred.
- Re-worked the help so that it re-uses one window during a help session. It opens
with a table of contents, and has a button to go back to that.
- Added a search function for the help window.
Release 9.3.3 November, 2020
- tkdiff version 5.1
- fix crash when starting up with a file whose CVS log can't be read
- On dual-monitor setups on MacOS, tooltips on the rightmost of two side-by-side
screens were moved to the left screen. Fixed.
Release 9.3.2 January, 2020
- Fix Bug #152 typo in cvs remove and cvs add
- SVN diagram fixes from Knute Beneke
Tags could corrupt the revkind info, resulting in a bad branch diagram.
If an actual branch bases on a deleted branch it would not be shown.
- Fix silly typo in RCS checkin confirmation dialog
- Fix uninitialized variable in search initialization
Release 9.3.1 November, 2019
- Git Tools menus for gitk and git-gui now work in the log and annotation
browsers as well as in the workdir browser
- Fix bug #150, "cvs update only works when a single file is selected"
- Fix bug #151, "cvs add does not work"
- In Git branch diagram, the current branch as well as the master are
now always shown
Release 9.3 October, 2019
- Enhanced the annotation browser so that when you click on a line of text, it
puts the revision number in an entry and you can view or show the log of that
revision of the file. In git and svn, you can also show the changed files
and show the difference of that revision from the previous one.
- Added a toolbar menu for the annotation browser. It now has the same
toplevel status as the workdir and repository browsers.
- Re-worked Hide and Show a little. They weren't working for SVN at all,
and not quite working as advertized for CVS. For Git, it works
differently, not forcing a tracked file to show, as .cvsignore and
svn:ignore do.
- Added a label to show if the current directory has .cvsignore, svn:ignore,
or .gitignore
- Made the log button in the workdir browser do a full list of commit
comments, the equivalent of "verbose." Shortened the header for CVS.
$cvslog(ldetail) is gone. You can still do short logs from the Reports
menu.
- In the working directory browser, got CVS and SVN to show the log
date. In CVS, it takes a little longer because it has to do one "cvs log"
command. It will only do it if the date column is mapped.
- If there are locked files in CVS or SVN, or editors in CVS, put that
in the Authors column, appended to the author's name
- The "Go" bookmarks menu didn't really work with the module browser. Fixed.
Release 9.2.3 September, 2019
- Got the colors working properly for Git annotate. Now newer ones are
redder, as they should be.
- Added a button to the annotation browser so you can open the workdir
browser if you used the -blame command line
- Save the geometry of the annotation browser.
Release 9.2.2 September, 2019
- Allow spaces in git "since" option, such as "2 years ago". If the log
or blame is empty, report what the since option was.
- Fixed the bindings in the text viewing windows so that copy-to-clipboard
works. Home and End work now also.
- Fixed a bad thing that happened under certain conditions in the workdir
browser if a filename had spaces.
Release 9.2.1 September, 2019
- In git branch diagram, show commit date instead of author date
- Add a patch button to the workdir browser for CVS, SVN, and Git. It does a
diff of all the changed files.
- Add a file diff button to the branch browser in Git, and change the icon of
the one that lists changed files, so the patch buttons in the workdir and
branch browsers do similar things.
- Introduce an "invert" tag in the viewer window, and use it in
patch_colortags to make each new file stand out.
- Fixed broken module-level patch dialog for CVS and SVN.
Release 9.2 September, 2019
- For Git, added the ability to choose a range of lines in the text view
of a file, and send that range of lines to the annotation browser.
View the selected file in a git repository, select some lines, and
press the "Annotate selection" button.
- Added a button to the branch browser to do "git show" or "svn diff" on
a selected commit, listing the files changed in that commit.
- Speeded up the SVN module browser by not pre-scanning subdirectories
- SVN patches (#103) from Knut Beneke:
- If a svn branch is copied from a tag it is not shown in 9.1.8
- Sometimes a svn log -g produces a non consecutive list, thus resulting in an
erroneous branch diagram
- If a commit affected more than one branch 9.1.8 would crash
- The parsing of svn comments is buggy
- If a branch is added and not copied 9.1.8 would get completly confused,
resulting in an almost empty branch diagram
- Do not scroll to the end of the viewer output
- Use verbose svn log output when not otherwise specified
- Add a config cvscfg(gitsince) to limit log diagrams and annotations to
a time depth
Release 9.1.8 August, 2019
- When git log is drawn with logcfg(show_branches) OFF, it shows the branch
names as tags, since that's the way they are in the git log and it doesn't
cost anything to get them. cvscfg(gitlog_opts) is not used.
- Gave the working directory browser a separate button for the fast diagram,
so it can co-exist with regular branching diagrams and can have its own
git options.
- Added a sort button to the tags popup on the branch diagram, ticket #149
Release 9.1.7 August, 2019
- Found some things that didn't work with Tk8.5 and older versions of git, and
fixed the offending things.
- Implement logcfg(show_branches) so that if a diagram without branches is
desired, time isn't spent getting them. This works in CVS, SVN, and GIT.
- Encourage "master" to be the main trunk in a git diagram.
- For the Git branch filter, assume that master is always included, so that
the regex only applies to branches other than the master.
- If a file is created on a side branch that we're drawing and has merged into
our trunk, try to draw a merge arrow. Sometimes we succeed.
- Fix Bug #148, crash when diagramming a very deep CVS branch
Release 9.1.6 July, 2019
- Change behavior of cvscfg(toomany_tags) for Subversion. Instead of all-or-nothing,
it now processes the max number of the most recent of the tags
- Change the Revision number labels of the selected files in the branch browser to
readonly entries, so the contents can be copied
- Put more of the branch drawing options in the preferences menu
- Fix You are Here sometimes not being drawn
- Change invocation of gitk to gitk --all
Release 9.1.5 July, 2019
- Improve appearance and behavior of prefs dialog, and fix embarrassing typos.
Release 9.1.4 July, 2019
- Made a preferences dialog under the TkCVS menu
Some of the logcfg options, such as scale and
show_empty_branches are now global in scope throughout, so
that the new preferences dialog will work.
- Added an option to filter the branches to be diagrammed for Git.
- Continued improvement in sorting out branches and in drawing.
Release 9.1.3 July, 2019
- Put an item to invoke gitk in both the workdir and branch browser
- Enable Git branching diagram with disjuct subtrees
- When getting rev-list of branches, limit the time with --since an hour
before the earliest commit we got in the log, since older ones
will be useless to us anyway.
Release 9.1.2 July, 2019
- For SVN and GIT, you can now start the branch browser with no file selected.
It will diagram "."
- Modified the search in the branch browser so it searches all the data for the
revisions, not just the revision number. Several boxes may match a search.
The current one is highlighted in a brighter color than the other matching
boxes.
- Add a new option for the git branchlog:
# Which groups of git branches to consider. F can't be excluded.
# F only those captured in the file log
# L local, found by "git branch"
# R remote, found by "git branch -r"
set cvscfg(gitbranchgroups) "FL"
- Worked on performance and accuracy of the branch diagram. More protection
against looping.
- Moved the menubars into a separate file so they're a little more modular
Release 9.1.1 June, 2019
- In Subversion, draw the branch diagram while the tags are still being
collected.
- Also in Subversion, add the ability to draw separately rooted trees in
the branch browser when a file is added on a branch
- Add confirmation dialogs to the git fetch and push procs containing the
--dry-run output so user can confirm or cancel
- Change "View" menu on branch browser to "Diagram" so Apple doesn't mess with
it and break it
Release 9.1 June, 2019
- Re-implemented the working directory browser with ttk::treeview
- added options to be used with git log for constructing a branch diagram
- In the branch browser, replaced the transient window for listing excessive
tags with an embedded listbox
- A lot of minor adjustments to everything
Release 9.0.8 May, 2019
- Added a menu for git log options to the branch browser
- When collecting branches in Git, and also tags in SVN, draw something
on the canvas so the user knows it's working.
- Draw the blue branch boxes at the top for Git, because that's more
how Git defines them than from an event at the bottom
- You are Here is working again when currently not at the
tip of a branch
- Re-implemented the picklists with ttk::combobox
- Fixed a bunch of random bugs
Release 9.0.7 May, 2019
- Re-implemented the module browser with ttk::treeview
- When on branch-of-a-branch, look for diagram elements in the immediate
fetch origin as well as the default .git repository
Release 9.0.6 April, 2019
- small fix to sometimes-missing rootrev($path)
- put a platform-wide iconphoto on tkdiff
Release 9.0.5 April, 2019
- cvscfg(gitdetail) variable to make git listing faster by skipping the
"git log -n 1" for each file. Set in ~/.tkcvs or site_def
- cvscfg(gitmaxhist) variable to set how far back to go in a long history
Set in ~/.tkcvs or site_def
- Completely reworked the branch diagram builder. It relies less on git
invocations and more on its own inferences. It's both faster and better,
I hope
- Fixes in tkdiff for MacOS
Release 9.0.4 April, 2019
- Fix a lot of crashes
Release 9.0.3 April, 2019
- Fix subdirectories in git
- Hide .git file in worktree directory
- Rationalize the text files in the test generator, and "leave_a_mess" in
subdirectories
Release 9.0.2 January, 2019
- Add an entry for the comment when tagging in Subversion or Git
- Fix regressions and errors in Subversion branching and tagging
Release 9.0.1 December, 2018
- Roll back a svn command line option that was too new
- Fix the test scripts so they run on Windows again
Release 9.0 December, 2018
- Added Git functionality!
- Speeded up branch browsing in Subversion substantially
- Updated tkdiff to version 4.3.5
- Made the Module Browser more independent of the Working Directory
Browser. You can now move around among repositories of different
version control systems.
- Updated MacOS UI to compatibility with version 10.x (High Sierra)
- Many user interface tweaks:
- Made a Copy/Paste right-mouse-button popup for the text widgets, so
you can copy text from them
- Re-arranged the Report and Status detail menus for more efficiency
- I'm no longer making stand-alone MacOS or Windows packages. You can
still run it from the Tcl/Tk code on those platforms.revbranches($new_branchparent)
Release 8.2.4 (not officially released)
- Implicit -dir on invocation. added use case: tkcvs <dir>
Same as tkcvs -dir <file> (patch #101 by Maxim Yanchenko)
- Fix Bug #3602137 "Typo in error string"
- Save last column-sort to preferences automatically
- Fix Bug #3573395 When using the "Clear all" button in the "Commit Changes"
windows, a "extra characters after close-quote" error appears
Release 8.2.3 November, 2011
- Works with Subversion 1.7 (no .svn directory at lower levels)
- Make the CVS module-level file browser searchable
- Choice of sorting files in the working directory by filename or by status is
now a persistent preference
- Unwork-around some work-arounds for wish8.5, which are fixed now
- Fix Bug #2797830 "Bookmark with space can't be deleted"
- TkDiff 4.2 (works with Subversion 1.7)
Release 8.2.2 May, 2010
- Make the propget svn:mergeinfo branch diagram behave more like our merge
tags, i.e. show only the first merge point instead of all revisions
containing the merge. This should improve performance relative to version
8.2, too.
- Improve performance in large Subversion directories
- Fix CDE font problem
- Show date of directories, too. Fix sort-by-revision in SVN directory.
- Roll back svn update --accept postpone because it doesn't work with older
clients
- Clean up finished namespaces for some exec viewers
Release 8.2.1 January, 2010
- History of commit log messages is kept, so you can copy-and-paste previous
messages that you've used during the current session.
- When a directory is refreshed in the Working Directory Browser, the scroll
position is restored.
- Locking and unlocking for SVN, and some additional SVN-specific right-click
popups (Matthias Vorwerk)
- Icons for symbolic links in a SVN directory (Matthias Vorwerk)
- SVN output parsing change (xml-regexp-based) (Matthias Vorwerk)
- Subversion Branch diagram can find branchpoint for a file that wasn't
revised at that point (Steve Schwarm)
- CVS branch browser no longer fooled by a log comment containing a dashed line
of exactly the same length as the log's normal delimiter, although you may
not see the rest of the comment
- tksvn2bcompare.pl added to contrib directory. It enables the use of
"bcompare" in place of tkdiff. (Adam McLaurin)
- Add a note to the FAQ about running the X11 version of TkCVS on the Mac.
- Fix mixed-up tooltips in the File Browser opened from the Module Browser.
- Fix Reports->Status recursive/local switch on cvscfg(recurse)
- Button in the CVS "Update with Options" dialog to make it easier to update
a sticky-tagged file to the current directory tag (Jacques Klein)
- Change tkcvs.tcl so it can be made into a starkit more easily
Release 8.2 November, 2008
- Merge arrows are drawn in the Branch Browser for merges tracked by
Subversion 1.5's mergeinfo property and CVSNT's mergepoint feature.
- The branch diagram can be searched to find a version, date, tag, or author
- Log browser always produces a verbose log of revisions on the selected branch
instead of obeying the Directory Browser's "Log Detail" setting
- If your SVN repository has a structure similar to trunk, branches, and tags
but with different names, you can tell TkCVS about it by setting variables in
tkcvs_def.tcl:
set cvscfg(svn_trunkdir) "elephants"
set cvscfg(svn_branchdir) "dogs"
set cvscfg(svn_tagdir) "ducklings"
- Fix a bash-ism in contrib/cvsdiff
- Changed the trace levels so that "F" lets you get the CVS/SVN stdout without
the whole debug output
Release 8.1 November, 2007
- Rework the merge functionality. There's only one dialog for tagging, which
you OK when you're ready to commit the merges.
- Use panedwindow for the Workdir Browser. It has advantages and disadvantages,
but it will have more advantages when we can migrate to tk8.5. Change the
highlighting so it goes across all columns, and enable selection from all
columns.
- Add a menu item to do "svn resolved"
- Fix [ 1824733 ] CVS menu in SVN work area for changed file
- Fix invocation of tkdiff when one SVN revision is selected in the branch
browser, diffing it against the current file like the cvs behavior
- Add options to use -l and not use -P in cvs update-with-options.
- Improve visibility of searched item in annotation text.
- Fix for when an e-mail address appears in svn status in https protocol
- Remove white boxes around Aqua pill-style buttons
Release 8.0.4 May, 2007
- The Branch Browser detects lack of a trunk directory, warns that
it can't do much without that structure, and continues without it.
- Fix [ 1483057 ] Empty Branch Diagram for deleted files (TkSVN)
If a file had been removed from the trunk and was diagrammed from a
branch, some or all of the diagram could be missing.
- Fix [ 1673519 ] tcl error with SVN->Browse the Log Diagram
- Fix [ 1581111 ] svn url trouble with French localization
- Ask for confirmation before reverting files
- Display TkCVS version in window title of workdir and module browsers.
- Don't fail if CVS gives a date format that tcl can't handle
- Added a button for a text history log of the file to the branch browser.
- Added a command line option -annotate or -blame to open the annotation
browser from the command line
- The "New Directory" button is back
- cvscfg(svn_branch_filter) and cvscfg(svn_branch_max_count) to filter
which branches to draw in the log browser
- Delete the exec namespaces after the execs are finished. This should
cause better memory usage behavior.
- Add a contrib directory containing a wrapper for gvimdiff to replace
tkdiff, and a program to compare the contents of directories.
Release 8.0.3 March, 2006
- Automatic tagging of merges works for SVN the same as CVS
- Working directory browser observes svn_ignore
- Clean up some filenames-with spaces issues
- TkDiff 4.1.3
Release 8.0.2 January, 2006
- Fix error in Branch Diagram when searching for merge tags
- cvscfg(mergetrunkname) option to replace the literal "trunk" in the code
with an arbitrary string
- Branch Browser in SVN will diff a single selection in the tree with the
file in the current directory
- Fix strange "SVN Path" in top entry of Branch Browser (only cosmetic)
- Lengthen maximum length of error message to trigger an error popup in
exec. That lets a cvs log failure due to a permission problem tell us
what went wrong.
Release 8.0.1 January, 2006
- Fix a couple of undefined variables
- Add log button to workdir browser and change the cvs_log function to
eliminate post-processing, using syntax highlighting instead
Release 8.0 December, 2005
- The Annotation browser optionally shows line numbers.
- Multiple branch-browser fixes for Subversion:
- Treat branchpoints as real revisions, so they have both a blue box and
a black one in the diagram. It's rather inelegant, but it works with the
way the branch browser was designed. Solves problem of branches not
being drawn if they branch straignt from another branchpoint.
- Send URL paths instead of -r <file> arguments to the diff, svn-cat, and
annotation commands because Subversion doesn't cross branch boundaries with
simple revision arguments, and doesn't tell you that it's not giving you
the revision you asked for.
- Bugfix: relative URL path in Branch Browser is constructed correctly for
path depths > 2
- The Branch Browser counts the tags when making a Subversion diagram and gives
you a chance to skip the tag step if there are many, where "many" is defined
by cvscfg(toomany_tags). Constructing the branch diagram for Subversion is
extremely inefficient, and drawing the tags can take longer than it's worth.
- For Subversion directories, the Module Browser shows the number of items
within the folder instead of the "svn list -v" info string. That may
help you decide whether to open the folder or not.
- The Branch Browser positions the diagram so "you are here" is in the visible
canvas, fixing a long-time nagging irritation.
Release 8.0b1 December, 2005
- TkCVS now supports Subversion. This involved a major re-organization of the
program, and many things have changed a little. The program will detect
which revision-control system a directory is under and react appropriately.
The previously undocumented RCS support is explicit now and has been enhanced
somewhat.
- Command line "tkcvs <file>" will open the log browser without the -log
option.
- The annotation browser estimates how many days per color or revs per color to
use, so cvscfg(dayspercolor) and cvscfg(revspercolor) are gone. You can
still change it per file in the annotation browser.
- The directory-level CVS Merge Tool has a pull-down with a list of the tags,
to make it easier to "merge since" a tag.
- TkDiff 4.1.1, which has a security patch.
Release 7.2.4 July, 2005
- Fix problem with confirmation dialog
Release 7.2.3 July, 2005
- Close file descriptor for stderr output, which could exhaust the
maximum number of open files.
- Re-work the pop-up dialogs so they appear in the center of their parent
window, not the middle of the screen (or between the two screens.)
- The branch browser can now diff two versions even if it was invoked from
the Module Browser and the file isn't checked out.
- TkDiff 4.1 (Tk8.4 recommended but not required)
- The bookmarks stay in alphabetical order.
Release 7.2.2 November, 2004
- Handle UTF time format in cvs 1.12.8 log. The author field no longer
gets lost during parsing.
- Modify the exec module so that it gives back the GUI while the background
process is running
- If using an external editor for commit messages (use_cvseditor), don't
display the dialog but go straight to the editor.
- New menu functions to set or unset the -kb (keyword-binary) flag
- Added a button to save the contents of a log-viewer window to a file
- Choose whether to update the working directory after branching. TkCVS has
always updated the working directory to be on the new branch, though
cvs itself doesn't do that. Now TkCVS gives you the choice.
- Change the cvs log options so the merging tool doesn't have a problem
with certain combinations of cvs clients and servers (1.10 client and
1.12 server was one such bad combination)
- Fix default cvscfg(editor). The defaults are now
set cvscfg(editor) "xterm"
set cvscfg(editorargs) "-e vi"
- TkDiff 4.0.2
Release 7.2.1 April, 2004
- Vendor Merge is back, rehabilitated by Eugene Lee, its author.
- Bug fixes:
892051 apply the tag ignores user input
892050 merge changes to current doesn't do that
(No report) Clear entry containing tag instead of appending, so tag
doesn't grow if dialog is re-opened.
Fixed a few problems with defaults in tkcvs_def.tcl.
- The installer no longer hardcodes the library path in tkcvs. The program
now figures out where it is at runtime.
- You can now configure how many lines to keep in the trace window with
$cvscfg(trace_savelines)
- Import dialog has better defaults. Version default is the same as
you get if you don't supply the -b option on the command line.
- Don't show stderr in CVS Commit dialog, since if there are many directories
they may make too much output and make you miss what you were interested in.
Release 7.2 January 1, 2004
- More merging functionality. Helps you tag the merged-from and merged-to
versions, and if you use the tagnames properly, draws curving arrows between
them to show where merges occurred. The tagnames are configurable with the
cvscfg(mergetoformat) and cvscfg(mergefromformat) variables.
- Requires Tk 8.4 for the curved lines.
- Fixed bug in annotation browser wherein it didn't change colors when
"Days per Color" changed.
- No longer pops an error dialog if the background exec fails. Just beeps at
you. The command's output should tell you what happened.
- TkDiff v4.0:
"r" key binding to recompute diffs
fix for diff symbols in Change Bars disappearing
preferences for showing whitespace differences
better tolerance of Windows filenames
Release 7.1.4 November 6, 2003
- Bugfix for hangs in 7.1.3
- Bugfix for uninitialized X1 coordinate
Release 7.1.3 October 20, 2003
- Compatible with CVS 1.11.8, which lost the global -l flag.
- Mainline tkdiff is back. Tkdiff is on Sourceforge now and there's an
official beta, which is pretty stable.
- Annotation browsing is available from the log branch browser. There's also
a button on the main window to make it more likely that people will discover
the function, which can be most useful.
- Merging will work to the branch as well as to the trunk in the logcanvas
browser.
- Solved a few problems with the exec functionality. High CPU usage is gone.
It now gives back the UI (to one degree or another) and captures stderr (both)
instead of doing one or the other.
- Made a filter for single-line module-diff (patch) output. Now files that
were added, removed, or changed are easier to pick out visually.
- Added an Apply button to the module-level checkout, export, and patch
dialogs. Since they don't save state, you could have to type the same
thing over and over on subsequent operations.
Release 7.1.2 December 21, 2002
- Fix exec problems. Exit status is detected properly. There's a new trace
level so you can see what CVS says on stderr.
- Log browser no longer gives a stack trace if it can't figure out where to put
the "you are here" guy. It just draws the diagram without him.
- The correct highlight foreground is used in the canvas so the highlighted text
is readable with Windows color schemes.
- Directory-level merge now picks up new directories (-d flag.) It should be
an option, but you get bitten worse without -d than with it.
Release 7.1.1 November 13, 2002
- Fix right-mouse button problem that showed up in the contextual popup for the
current directory canvas. Fixed an area-select problem while I was at it.
- Fix reversed -j arguments in the merge_diff dialog
- Required Tk version is 8.3, not 8.1
Release 7.1 November 10, 2002
- New graphical tool to help with merging directories and seeing an overview
of the branches.
- New, completely re-written, branching diagram. Much more sensible and
pleasing to the eye. Contributed by Mike Jagdis
- You can invoke the log browser from the command line:
tkcvs [-dir directory] [-root cvsroot] [-win workdir|module] [-log file]
Saves a lot of time if you're working with a remote repository and you
only want to browse one file. Contributed by John Lash.
- Option to use an external editor for commit messages so the rcsinfo template
feature can be used. Terminal-based editors only for now, unless you don't mind
a superfluous shell window popping up in addition to your GUI-based editor.
Contributed by Mike Jagdis.
- A picklist keeps a temporary history of directories visited. Favorite places
can be bookmarked.
- Capability to browse RCS files, in case you find yourself in an
rcs-controlled directory. You can't do checkins and checkouts, but you can
see which files are under RCS control, which ones differ from the checked-in
version, and who has them locked.
- A heavily patched TkDiff that works in AquaTK, in case you're a MacOS X fan.
TkCVS does pretty well in AquaTK as-is, with a few tweaks to tkcvs_def.tcl.
- More intuitive module-operation dialogs contributed by Mike Jagdis.
- Re-arranged buttons. There's a somewhat overwhelming array, but now almost
everything is there without resorting to the menus. I've tried to organize
them helpfully. In addition, the ones that do CVS functions are disabled
when in a non-CVS directory.
- The ".." directory has been removed from the browser, and we now have a
"go up" button instead. Saves space in the list and keeps people from doing
unfortunate things to ".."
- Namespace problems eliminated in log browser. Now you can have as many
open as you like. Contributed by Mike Jagdis
- Improved viewer for command output. It has multi-command capability.
That is used to advantage by the import routine, which used to open "waaaay
too many windows." Contributed by Mike Jagdis
- Smoother (faster?) scrolling in the directory and module browsers, due to
eliminating the windows-within-a-canvas method of drawing icons.
Contributed by John Cerney.
- Patch for filtering and color coding "cvs update" output, contributed by
Laurent Duperval.
- Since there are more ways you can start tkcvs, the exiting had to be cleaned
up so you don't accidentally exit, or worse, leave a windowless wish running.
Contributed by Mike Jagdis.
- Enhanced dialog for importing a module. Contributed by Mike Jagdis
- Always sort by filename so that even if the files are sorted some other way,
they are sub-sorted in alphabetical order.
- If the edit file button is clicked with nothing selected, a dialog box pops
up to allow input of a (new?) file name rather than erroring. (Mike Jagdis)
- There was a call to "cat" in exec.tcl. It's gone now, so Windows users don't
have to have cat.exe anymore.
- Repaired a bug in which if you did an import and the "Group Aliases in a
Folder" option was set, the aliases would be duplicated in the browser.
- These days X is usually set up to map mouse wheel motion to button 4/5
events. Patch adds bindings for buttons for and 5 so that the mouse wheel
can be used to scroll under X. (Mike Jagdis)
Release 7.0.3 January 23, 2002
- Improved the algorithm for building the tree in the module browser, making
it less error-prone.
- Recursive add respects .cvsignore and $cvscfg(ignore_file_filter)
- The Working Directory Browser parses the "Sticky Options" field and uses
a different icon if a locally-added or up-to-date file is binary (-kb).
- The Log Browser color-codes the selected revisions so you can visually
match the log text with the box in the branching diagram.
- The dialog for module-level tagging (cvs rtag) is a little more
informative (and the code is a little less rococo).
- The installer has a new option "-finaldest", to facilitate building
debian-style packages.
- The man page is installed in man1 instead of mann.
- The tooltips no longer persist until the operation started by the button
is finished.
Release 7.0.2 October 19, 2001
- Fixed duplicate items when using Control-B1 to add items to the selection
in the workdir browser.
- Several bugfixes to the module browser. You can now have "&" composites
at the end of a nested module without blowing it out of the graphical
tree structure. Also fixed bugs in finding a module's title and choosing
the right icon.
- The ability to group alias modules in their own folder is back, but as an
option cvscfg(aliasfolder). It defaults to true.
- There's now an Options menu in the module browser to turn tracing on and
off and temporarily change the display of alias modules.
- New "File->Module File" item in the module browser menu displays the
CVSROOT/modules file in a text window.
- Do a "file join" on the CVSROOT variable to put it in the native
path format. That helps with a PC and a Samba-mounted repository
and doesn't seem to hurt anything else.
Release 7.0.1 September 3, 2001
- By popular demand, made file selection in the main canvas conform more to
the Shift-click-adds-range and Ctrl-click-adds-single model.
- Made the CDE parameter thing more bullet-proof. It shouldn't fail if
something is missing now.
- After a module import, it renames the original directory and checks out
into a fresh one. Otherwise, the checkout isn't recursive and you get a
lot of "independently added by a second party" messages.
- Commented out the tkwaits that were causing the commit and merge dialogs
to disappear in some window managers. Unfortunately they may have to
be un-commented back on some systems, especially Mandrake, which seems to
exhibit timing problems sometimes.
- If a file's log message had a line containing only "=" characters, the
logcanvas browser would drop all the revisions that came after it. It will
still do it if there are exactly 77 equal signs, but not otherwise.
Release 7.0 June 2, 2001
- Improved main file-browsing window. It now has icons to indicate the status
of the files. The right mouse button activates context-sensitive popup menus.
As a consequence of using a canvas widget instead of a listbox, the selection
mechanism is different. It's click to select, shift-click to add selection,
click-on-background to deselect all. The right button does an area select.
- The module browser reads whatever information is available in the
modules file via "cvs checkout -c" before it looks for the tkcvs-specific
extensions. Thus if there is a modules file at all, some information
will be available without the additional comments.
- Options are specified via the options database instead of with cvscfg
variables. If the window manager is CDE, its options are used by default.
- The state of the main windows is remembered between sessions.
- Bugs in display of the Editors column are fixed.
- Finally found a good home for the "Checkout with Options" dialog. Someone
pointed out that it belongs in the File menu next to the simple Update item.
I'm convinced that that's right.
- The module browser window is paned so that you can adjust the relative
width of the columns.
- CVS version 1.11 is supported better.
Release 6.4 October 12, 2000
- An optional column to show who's editing, and buttons to edit and unedit.
- The file list can be sorted up or down by each column.
- Filenames containing spaces are now permissible.
- Some configuration options can be saved.
- Most output windows are searchable.
- New reports
- cvs annotate
- cvs log showing only the latest commit
- Option to show only a few tags for each revision in the branch browser.
- Some bug fixes.
- TkCVS 6.4 requires Tcl/Tk8.1 or better! Sorry, 8.0 has problems on too many
platforms. Besides, a regular expression parser that doesn't understand
[\s\t]+ just isn't good enough. :-(
Release 6.3
The bugfixes have finally caught up with the new features,
and we are declaring a stable release.
This is the first release that runs "native" on Windows - that is, without
either the Cygnus emulation layer or a whole lot of fiddling.
Release 6.3.b2 (bugfix)
- Fix the tag dialog so that it can be invoked more than once.
- Insert "tkwait visibility" before "wm withdraw" for the larger dialogs
to avert race conditions which occurred on slower framebuffers.
Release 6.3.b1
- New graphical Module Browser. I reworked a BWidget implementation that
was contributed by Marcel Koelewijn. Then I moved some of the buttons and
menus from the workdir to the module browser if they seemed more related
to modules than to the working directory. Then I updated the help text to
reflect the changes.
- The GUI and listbox fonts are now configurable.
- TkCVS now looks for a file called "site_def" in the installation directory.
That's a good place to define your tagcolours and other site-specific
things. It won't be overwritten by installs like tkcvs_def.tcl is.
- Some contributions by Andrew Johnson:
Added the ability to select an editor based on a pattern match on the
filename (eg to launch gimp on .gif files, etc). User configurable
with the cvscfg(editors) variable and it defaults to the cvscfg(editor)
setting for backwards compatibility.
Fixed scrolling in the workdir listboxes so they remain synchronized if
you drag one up or down with the middle mouse button.
- User-configurable debug output, contributed by Marcel Koelewijn. Tinkerers
will like this.
- Featurecide:
Buttons are always graphical and tooltips are always on. You don't have
a choice anymore.
Log level "last" was removed because it didn't seem to work.
You can't count on the most recent checkin coming first or last,
especially on a branch.
Support for old versions of CVS was removed.
- Replaced the calls to awk with internal tcl parsing. It slows down
the workdir listing some, but it solves portability problems and it's
cleaner. Also replaced execs of rm, mv, and cp with tcl file commands.
- Put scrollbars on the text windows in the Log Browser so you can see how
long the log messages are.
- Put a fill color in the revision rectangles in the log browser so that
you can select them by clicking anywhere instead of just on the border.
- Added a conflict-merge proc, translated from a shell script by Bryan Ogawa.
- Between Marcel and me, the Vendor Merge functionality is rehabilitated,
working with remote repositories, and using the new module browser.
At least I think it's working.
- And of course I've been messing with the icons.
Release 6.2.b3
- Added a button to the filebrowser to list the tags of a file.
- Fixed a bug in logbrowsing from the filebrowser.
- Scroll to the top of log canvas, so the most recent activity shows first.
- Changed the bitmap for iconified workdir and module windows.
Release 6.2.b2
- Fixed the invocation of the logbrowser from the module filelist.
Release 6.2.b1
- Made tkcvs more remote-client friendly by replacing all calls which
change directory to the repository with CVS commands. You can now
get a file list from the Module Browser remotely, although it can be slow.
- Colorized the icons.
- Fixed the module browser so it will display directory trees that
are more than two levels deep.
- Made the reports behave the way the help file says they do.
The 'by name' lists weren't confined to the selected module
like the helpfile said, but now they are.
- Prevent "runaway tkdiff." If no file is selected, tell the user to
select one.
- Display "sticky tags" in the logcanvas browser. Fixed another
branching bug. The x offsets of the tag labels aren't perfect -
we'll have to do a real place-and-route algorithm some day.
- Added a checkbox for the -F argument to cvs tag, because everyone
argues about whether it should force or not. Let's let them
decide.
- Folded in some more changes to help it run on Windows.
- Fixed the "Go" menu so it remembers where we've been. Don't know
when that got broken.
Release 6.1.a8:
- Quotes in comment strings stopped passing thru when exec_command was
implemented. Added a regsub to fix it. Dollar signs are still OK.
- Changed "rsh -l user host" to "rsh host -l user" because some
implementations of rsh don't understand the former.
- Fixed some erratic behavior when a remote module file isn't read
successfully.
- read the .cvsignore file in the working directory and add it to
the ignore patterns which were optionally set in tkcvs_def.
- Bugfix: filter "no file xyz" out of getFiles so it doesn't try to commit them.
Release 6.1.a7:
- Jo Wahle has redone building the workdir columns so it's much faster, and
fixed a bug in which merge conflicts would cause it to get confused.
- I parsed the branch info from the cvs log to take the guesswork
out of the branching tree.
- Stephen Kick improved logcanvas sizing so tags on the top
revision don't disappear off the top of the canvas.
Release 6.1.a6:
- Fix some bugs. Put in a dialog to tell you if your rsh to a cvs
server failed. Fixed the listing of arguments in the "are you sure?"
dialog. Improved the logcanvas' ability to find a parent node
in a strange revision sequence.
Release 6.1.a5:
- Put in some configuration options to run on DOS/Windows. Contributed
by Christoph Jaeschke.
NOTE: I don't have a Wintel machine to test on (strange but true.)
The configuration options are only tested on unix.
- Changed the report commands to run under exec_command. I missed
some last time.
Release 6.1.a4:
- Run lengthy cvs operations in the background to avoid locking up the
GUI. Contributed by Christoph Jaeschke.
- Upgrade tkdiff from v2.03 to 3.0-beta-6, which looks like it's going
to be final. Tkdiff has its own editor preference now, so we don't
have to kludge one in at install time.
- The cvscheck script is integrated into the tcl code. Contributed
by Christoph Jaeschke.
Release 6.1.a3:
- Bugfixes. Module browser looks at the repository that the current
CVS directory is in. TkDiff2.03 is patched so that it will work with
two un-checked-out files.
Release 6.1.a2:
- Upgrade from tkdiff v1.0 to v2.03
- Fix the bug in the module browser so that the current module always
matches the X selection.
- Added command-line options
-dir directory
-root cvsroot
-win (workdir|module)
- Logfile browser doesn't try to evaluate dollar signs in comments
anymore, so you can use them with impunity.
-------------------------------------------------------------------------------
Release 6.1.a1 was put together by Dorothy Robinson. It contains bugfixes and
enhancements provided by users. Please don't blame Del for my mistakes.
In general, I rolled in patches but didn't do anything with suggestions
unless they were very simple. The most noticeable changes are:
- Showing the current tag of each file and the directory in the main
window, so users know right away whether they are on a branch or not.
Providing more information and options in the update dialog box.
This group of changes was contributed by Jo Wahle. It reflects use
in a production environment where users are sometimes inexperienced.
It's informative without getting in the way, I think.
- The install script has been updated for Wish8.0, and it should now
work on FreeBSD.
- ~/.tkcvs is sourced on startup.
- The help file no longer talks about marking files, which was obsolete.
- The log browser has been reworked to show the tagnames and to draw branches
more intelligently, making better use of horizontal space. Blame me for
this one.
- Import checks out the modules file before trying to change it. This
was from M.E. Smith.
|