Support for display of version names in third-party diff and merge tools

(Issue #8948) You can configure a third-party diff tool or merge tool, by specifying a tool-invocation command line in the AccuRev Preferences dialog box ( Tools > Preferences command). AccuRev passes temporary files to the third-party tools; the names of these files don't indicate which versions of the file element are being used.

There are now additional substitution patterns ( %3% , %4% , and %5% ), enabling AccuRev to pass meaningful "title" strings to the third-party tool. The tool can use these strings to label the files being compared or merged. There are many ways to invoke the file-comparison and 3-way-merge operations, but in all cases, AccuRev provides these "title" strings:

• If the file comes from the workspace tree (local disk storage) of some workspace, the title string is the full pathname of that file.
• If the file is a version located in a dynamic stream, snapshot, or workspace stream (in the AccuRev repository), the title string is the depot-relative pathname of the file element, followed by its version-ID. Example:

/./programs/server/fs.c (talon_dvt/18)

Here is the complete set of substitution patterns:

Progress bar in early stage of workspace update

(Issue #8932) The Update command now displays a progress bar while it is performing checksum calculations. This occurs after Update scans the existing files in the workspace tree, and before it copies new files to the workspace tree.

Sending Multiple Transactions to the Change Palette

(Issue #8077) The Send to Change Package command is enabled when multiple transactions are selected in these contexts:

• In a History Browser created by a Show History or Show Active Transactions command on a dynamic stream.
• In a History Browser created by clicking the Show History button next to the affectedFiles field in an AccuWork issue record. All the transactions in the affectedFiles field must contain versions in the same dynamic stream.

If different versions of the same element are included in the multiple transactions, only the most recent version is sent to the Change Palette.

Manipulating the `promote' Comment String

(Issue #7254) Each promote transaction includes a comment string (possibly null), supplied by the user who entered the Promote command. A pre-promote-trig script can modify or replace the user-supplied comment string. This is the only way to manipulate the comment string: once the promote transaction has been written to the AccuRev repository, it cannot be modified in any way.

The pre-promote-trig script can process the comment string using the following procedure. Note that the procedure must use the XML-format trigger parameters file, not the flat-text parameters file.

1. Extract the contents of the <comment> subelement from the trigger parameters file. This is the user-supplied comment string, which might include multiple text lines.
2. Extract the contents of the <output_file> subelement. This is the name of a temporary file. (The flat-text parameters file does not include this parameter; that's why you must work with the XML-format file.)
3. Perform any processing to transform, or simply replace, the user-supplied comment. You might want to include, or at least consider, other values from the parameters file.
4. Write the new comment string to the temporary file named in Step 2, in the form of a <comment> element. For example:

<comment>
17 elements promoted from stream widget_dvt
</comment>

5. End the script with a zero exit status (success).

Enhancements to GUI Usability

Enhancements to Configuration Management Functionality

Enhancements to Configuration Management Usability

When the Update command aborts because it refuses to overwrite a modified file in the workspace, it now displays a more informative message, instead of the somewhat cryptic "CRC mismatch" message.

Enhancements to Change Packages

Enhancements to Issue Management

Enhancements to Integrations

Enhancements to Administration

9185

If a depot's pre-promote-trig trigger was set to client_dispatch_promote (to enable the transaction-based integration between AccuRev and AccuWork), and the depot also mistakenly had a server-post-promote-trig trigger set, the AccuRev Server would stop and restart after the Promote command completed successfully.

9128

The limit on the length of group names was too low; group names up to 96 characters are now allowed.

9117

When a client issues an Add to Depot ( add ) command, the XML-format parameters file passed to the server_prop_trig script did not include the user-specified element type. Each <elem> element in the parameters now follows this example:

<elem
count="0"
eid="4"
elemType="text">/src/file.txt</elem>

9106

When a Merge was performed in a workspace that had been reparented, the Version Browser sometimes omitted the red line connecting the second contributor version to the new, merged version.

9101

The promote command did not include the element names in the element list it passed to a server_post_promote_trig trigger if the user specified the versions with an XML-format file containing element-ID/version-ID pairs.

9098

In the Versions pane of the History Browser, double-clicking a directory caused a "Connection lost" error box to appear. The "Open" operation is not supported for directory elements in this context.

9022

In the Version Browser, clicking on a version that was created by the Patch command caused an error if the versions included in the patch were not all currently visible.

8991

Execution of a pre-promote-trig script failed if the AccuRev client software was installed on a read-only file system.

8952

When cross-promoting a defunct version between two streams, by:

• Running the Show Issues command on the "from" stream.
• Selecting the issue whose change package contains the defunct version in the Stream Issues tab.
• Invoking the Send to Change Palette command.
• Using the Change Palette to promote the defunct version to the "to" stream.

... the status of the element in the "to" stream was (member) , instead of (defunct)(member) .

8946

When a user chose not to associate newly promoted versions with a particular issue (change package), a spurious error message appeared concerning product licensing.

8930

A previous namespace-handling improvement caused an element that was added and promoted a long time ago (prior to AccuRev 3.8) to be stranded. Namespace handling has been further improved, to provide correct behavior.

8922

In a Stream Issues tab, when multiple issues were specified in a Promote command and multiple versions of the same element were in those issues' change packages, the oldest version was promoted. Now, the newest version is promoted.

8894

The performance of the Populate command has been significantly improved when writing to a workspace or reference tree stored on a Red Hat Linux "GFS" file system.

8891

Several images were missing from the Sun Java Studio chapter in the AccuRev Integrations Manual .

8886

The Araxis diff tool and merge tool, when configured using Tools > Preferences , displayed temporary filenames for the contributors instead of version-IDs.

8885

The dialog box displayed by the Anchor command

8877

Reparenting a workspace in the StreamBrowser sometimes failed, even if the new parent stream became highlighted during the drag-and-drop operation.

8799

AccuWork queries sometimes produced incorrect results, either skipping issue records or listing records repeatedly.

8778

The AccuRev Administrator's Guide incorrectly described how an update works when executed against a replica repository. It now correctly describes how versions are copied from the master repository to the replica repository.

8752

A Java-level problem caused an attempt to expand a selection by clicking while holding down the CTRL key to fail.

8750

The streams.ndb file in the repository on a replica server could sometimes get corrupted, requiring a maintain reindex operation.

8729

When the integration (transaction-based or change-package-based) between configuration management and issue management was enabled, issue record number(s) specified by the user with promote -I were not placed in the trigger parameters file passed to a server-post-promote-trig script (or the server part of the built-in client_dispatch_promote routine).

8724

When the Patch command was invoked from the Change Palette, a spurious "Is a directory" error message would appear when the results file was kept.

8719

The Change Active User command could lead to a failure in authentication of the newly selected principal-name.

8718

If a "not authenticated" user (one whose password on the client machine does not match the password in the repository) attempted to remove a workspace, an inconsistent result occurred: the workspace tree was removed, but not the workspace stream.

8706

In the rmreplica reference page, there was a misleading description of how a depot's slice (storage area) in the replica repository is handled.

8695

Promote command behavior differs from Version 3.8.1 as regards handling Change Packages.

8688

Some cross-document links in the AccuRev documentation set were not working.

8686

The Diff command does not report correct output when a time basis is applied to a stream.

8678

Promote by Issue failed silently if source files were not in the default group of the source stream.

8676

In the File Browser, a Rename command did not highlight the current name.

8674

The Merge tool experienced intermittent failures, displaying a Communication Error 6 message.

8673

Operations in a StreamBrowser tab did not reflect stream-reparenting changes, even after a Refresh command. Note: a Refresh is required after a reparent operation, to ensure proper processing.

8645

Solaris CLI only: Checking out a file in a link-based workspace left its status as (modified) (member) instead of (member) .

8642

If the Require Manual Refresh preference was set, a Security tab ( Admin > Security ) did not display any data until a Refresh command was performed.

8640

When the File Browser was in Include/Exclude mode, the File > Open and File > Save commands were disabled when a file was selected.

8615

The repository replication scheme did not include ACLs in the data replicated to multiple sites.

8548

When the Send to Change Palette command was invoked from a History Browser that displayed the history of a dynamic stream, the Destination Stream field was being set automatically, instead of being initially unset.

2363

The command diff -a -v <stream1> -V <stream2> sometimes failed to show the differences between the two specified streams.

2792

When upgrading an AccuRev installation, the installer did not verify that it could replace all files -- for example, making sure no file to be replaced was currently busy.

2889

The Update command used to behave poorly when run in a directory that contained an external element with the same pathname as an element under Accurev's control. Now an appropriate error message is displayed.

3004

CLI commands did not check their argument lists to determine if elements were specified multiple times.

3665

The CLI revert command did not properly handle the reverting of a purge transaction on an element in a dynamic stream, if that element had never been promoted to that stream's parent.

4073

In the dialog box displayed by the transaction-based or change-package based integration between AccuRev and AccuWork, clicking Cancel incorrectly caused AccuRev to proceed as if "0" has been entered, instead of canceling the Promote command.

4298

The Diff Against Backed command did not work properly if the backing stream was a time-based stream and a new version had been promoted to the backing stream after the basis time.

4703

The Populate and Update commands did not handle existing file and directory permissions correctly.

4882

AccuRev parsed the parameters file incorrectly for a pre-create-trig or pre-keep-trig trigger. This caused an error to occur if a filename included a SPACE character.

5023

The command co -v <old-version> did not work correctly if the old version to be checked out had a different pathname from the current version.

5096

In Visual Studio or another MS-SCC application, enabling or disabling the AccuRev integration sometimes caused the application to crash.

5224

A memory leak in the GUI Merge tool caused progressively slower performance when merging multiple files.

5254

The command add -x <filename-wildcard> worked incorrectly if the wildcard did not match any external files: it added all of the workspace's external files to the depot.

5723

The Merge command failed to abort if the file in the workspace was read-only. It incorrectly created a new version and drew a merge line to it.

5797

A workspace became inaccessible if its name was changed and then its backing stream was changed, without an intervening Update .

6241

When an AccuRev integration (for example, with Eclipse) was requested to promote a group of elements, it failed to abort if one or more of the elements had (overlap) status.

6387

When submitted to the accurev xml command, XML-format files encoded as UTF-8 or Unicode caused the AccuRev Server to crash. Such files now simply cause a command error.

6495

The command merge -s <root-stream> caused the AccuRev Server to crash. (This command does not make sense, since a depot's root stream does not have a parent.)

6501

Defunct elements promoted to the depot's root stream were incorrectly appearing in a File Browser display of the root stream.

6647

Storing and retrieving of file attachments and URL attachments to AccuWork issue records did not work correctly on Unix/Linux platforms.

6729

AccuRev did not update the include rule for a file (for example incl \.\mydir\myfile.java ) if a subsequent Update caused that file's pathname to change. This in turn caused a recursive Populate command to complain spuriously about that file.

6760

A promote-by-change-package operation ( Promote command on an issue displayed in a Stream Issues tab) failed incorrectly if one of the elements in the change package already had a descendant version in the destination stream. The Promote command now silently skips over such "underlap"-status elements.

6768

A defunct element in the destination stream of a mergelist command was incorrectly listed by the command as having (backed) status in the destination stream.

6774

The AccuRev GUI would hang when started from the command line, unless the current working directory was the AccuRev bin directory.

6778

The splash screen displayed by the SCC integration listed the wrong version of AccuRev.

6821

When invoking the Merge command from the Change Palette, a hang or error would occur if the element was excluded from the workspace chosen for the merge operation.

6838

If both a file and its parent directory had namespace-level changes to be promoted, the Promote command failed with a "no path to element" error.

6841

A promote-by-change-package operation ( Promote command on an issue displayed in a Stream Issues tab) failed if one of the elements in the change package had (defunct) status.

6842

The Eclipse plug-in had a memory leak in the AccDecorator.decorateImage() function.

6925

An Update of a reference tree failed with CRC-mismatch errors after combinations of Populate commands in the reference tree and Revert to Backed commands in the corresponding stream.

6946

There was various confusion and incorrect processing with group names longer than 29 characters.

7024

After performing a Deep Overlap search, selecting a stream's overlapped version, and executing the Merge command, the overlapped version incorrectly disappeared. (The stream's overlap is not resolved until the merged version is promoted from the workspace to that stream.)

7035

After multiple elements were excluded from a workspace or stream in a single operation, all but one of the elements remained visible after switching out of Include/Exclude mode.

7060

The mergelist command incorrectly included stranded elements and defunct elements in its results.

7063

In the results of a Deep Overlap search, the entry for a dynamic stream sometimes included the status indicator (modified) . This indicator doesn't apply to versions in dynamic streams.

7189

The sample pre-create-trig script, elem_type.pl , did not take into account the -E (element type) option to the add command.

7218

After reparenting a workspace from a snapshot to a dynamic stream, versions could not be promoted from the workspace unless the workspace was updated first. (It's a best practice to update a workspace whenever it's reparented.)

7222

There was syntactical confusion on how to specify a destination change package (AccuWork issue record) in a CLI promote command. The -I <issue-number> option provides this capability.

7275

A console message was incorrectly included in the XML-format file output by the CLI command update -fix .

7288

The AccuRev Server's XML parser did not properly handle empty XML elements that were coded with a single tag. Example: < comment/>

7318

Running Add to Depot on a file whose timestamp was in the future could silently fail, or could hang the AccuRev GUI.

7326

With the change-package-based integration between AccuRev and AccuWork enabled, the AccuRev GUI would hang attempting to promote elements from a workspace whose workspace tree was not accessible from the client machine.

7350

The routine that automatically determines a file's element type incorrectly flagged a Ctrl-L character (form-feed, hex 0C) as indicating a binary file.

7394

Inheritance of include/exclude rules was not being correctly blocked by a child stream's time basis.

7400

The display of a transaction's versions by the Show History command correctly included data in the Issues column, but the display of the same transaction's versions by the Show Active Transactions command showed nothing in the Issues column.

7411

If you purged a version from a dynamic stream ( Revert to Backed command), then promoted the remaining versions in that stream's default group, a subsequent stream history would omit the purge transaction.

7414

In the Confirm Exit dialog box displayed by the File > Exit command, pressing ESC caused the exit operation to proceed instead of cancelling it.

7418

The documentation for the remove command incorrectly stated that an object processed by this command is no longer accessible. The remove command simply hides objects.

7428

The sample server_admin_trig.pl script in the examples directory did not document the fact that the trigger fires for the rmws command as well as the synonymous remove wspace .

7431

The Merge tool sometimes displayed the left-margin arrow indicators (showing which contributor provided the highlighted blocks of lines) out of sync with the blocks themselves.

7446

User-specified command lines for Diff and Merge tools in the Preferences dialog box were not preserved.

7455

The parameters files generated for triggers that fire on a Promote command (invoked on a set of elements or a set of issues) did not contain information as to which issue records were associated with the promotion.

7459

An error occurred when the user's workspace was not in the same depot as the workspaces or streams involved in a diff -v -V command (or other similar forms of the diff command).

7468

In a multi-platform environment, the status of files that were just processed with Add to Depot and Promote was not consistent between Unix/Linux clients and Windows clients.

7481

When interrupted by the user during specification of an issue record, the promote -K command still performed the keep command before aborting.

7482

When an attempt to promote a version was made from the Change Palette, a later version of that element was sometimes promoted, even if the Use Latest checkbox was cleared. (This checkbox appears in Show Details mode.)

7490

The lock and unlock reference pages incorrectly stated that the -kf and -kt options could be used in combination.

7585

In a nonempty directory tree that was newly designated as an AccuRev workspace, the Update command was overwriting files corresponding to elements. Such files are now flagged with the message, "These external files in your workspace have the same pathname ...".

7598

In the dialog box displayed by the transaction-based integration between AccuRev and AccuWork, clicking Cancel instead of selecting an issue record and clicking Ok caused the AccuRev GUI to hang.

7599

The sample server_preop_trig and server_admin_trig scripts in the examples directory did not handle SPACE characters in group names.

7949

The Merge tool lost text that was manually typed into the merge-results panel.

7950

During a "custom" AccuRev installation, the wrong version of the SCC Integration was placed in the AccuRev bin directory.

7958

If there were multiple defunct elements with the same pathname, the Update command mistakenly retrieved a non-defunct version of one of the elements from a higher-level stream.

8006

The replica sync command failed to properly update a replica repository's database files if one or more of them was busy (the AccuRev Server was performing another operation).

8046

A <cpkhist> request (AccuWork command-line interface) always returned no data.

8053

A complex series of add s, promote s, and purge s involving multiple elements with the same pathname ("twins") -- some of which were performed with a pre-V3.8 version of AccuRev -- caused non-defunct versions of elements to be inaccessible.

8664

In AccuRev 4.0, when using the AccuRev GUI to merge overlapped files, an intermittent failure occurred and displayed a Communication Error 6 on the client.